From fedora-extras-commits at redhat.com Thu Sep 1 02:33:38 2005 From: fedora-extras-commits at redhat.com (Aaron Kurtz (dragoon)) Date: Wed, 31 Aug 2005 22:33:38 -0400 Subject: rpms/feh/FC-4 feh.spec,1.5,1.6 sources,1.3,1.4 .cvsignore,1.3,1.4 Message-ID: <200509010233.j812XcUF029438@cvs-int.fedora.redhat.com> Author: dragoon Update of /cvs/extras/rpms/feh/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29369/FC-4 Modified Files: feh.spec sources .cvsignore Log Message: * Wed Aug 31 2005 Aaron Kurtz - 1.3.4-1 - bump to 1.3.4 Index: feh.spec =================================================================== RCS file: /cvs/extras/rpms/feh/FC-4/feh.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- feh.spec 16 Jun 2005 09:34:11 -0000 1.5 +++ feh.spec 1 Sep 2005 02:33:36 -0000 1.6 @@ -1,6 +1,9 @@ +# No desktop file for feh. It may be a GUI program, but it needs +# file names or it just spits out the help. + Name: feh -Version: 1.3.1 -Release: 3%{?dist} +Version: 1.3.4 +Release: 1%{?dist} Summary: Fast command line image viewer using Imlib2 Group: Applications/Multimedia @@ -44,6 +47,9 @@ %{_mandir}/man[^3]/* %changelog +* Wed Aug 31 2005 Aaron Kurtz - 1.3.4-1 +- bump to 1.3.4 + * Thu Jun 16 2005 Aaron Kurtz - 1.3.1-3 - do it right this time Index: sources =================================================================== RCS file: /cvs/extras/rpms/feh/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 3 May 2005 16:14:18 -0000 1.3 +++ sources 1 Sep 2005 02:33:36 -0000 1.4 @@ -1 +1 @@ -0a3dfe65b795fed29a9aa1bc250d92d1 feh-1.3.1.tar.gz +3d35ba3d2f0693b019800787f1103891 feh-1.3.4.tar.gz Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/feh/FC-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 3 May 2005 16:14:18 -0000 1.3 +++ .cvsignore 1 Sep 2005 02:33:36 -0000 1.4 @@ -1 +1 @@ -feh-1.3.1.tar.gz +feh-1.3.4.tar.gz From fedora-extras-commits at redhat.com Thu Sep 1 02:33:32 2005 From: fedora-extras-commits at redhat.com (Aaron Kurtz (dragoon)) Date: Wed, 31 Aug 2005 22:33:32 -0400 Subject: rpms/feh/devel feh.spec,1.5,1.6 sources,1.3,1.4 .cvsignore,1.3,1.4 Message-ID: <200509010234.j812Y3Jt029443@cvs-int.fedora.redhat.com> Author: dragoon Update of /cvs/extras/rpms/feh/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29369/devel Modified Files: feh.spec sources .cvsignore Log Message: * Wed Aug 31 2005 Aaron Kurtz - 1.3.4-1 - bump to 1.3.4 Index: feh.spec =================================================================== RCS file: /cvs/extras/rpms/feh/devel/feh.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- feh.spec 16 Jun 2005 09:34:11 -0000 1.5 +++ feh.spec 1 Sep 2005 02:33:30 -0000 1.6 @@ -1,6 +1,9 @@ +# No desktop file for feh. It may be a GUI program, but it needs +# file names or it just spits out the help. + Name: feh -Version: 1.3.1 -Release: 3%{?dist} +Version: 1.3.4 +Release: 1%{?dist} Summary: Fast command line image viewer using Imlib2 Group: Applications/Multimedia @@ -44,6 +47,9 @@ %{_mandir}/man[^3]/* %changelog +* Wed Aug 31 2005 Aaron Kurtz - 1.3.4-1 +- bump to 1.3.4 + * Thu Jun 16 2005 Aaron Kurtz - 1.3.1-3 - do it right this time Index: sources =================================================================== RCS file: /cvs/extras/rpms/feh/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 3 May 2005 16:14:18 -0000 1.3 +++ sources 1 Sep 2005 02:33:30 -0000 1.4 @@ -1 +1 @@ -0a3dfe65b795fed29a9aa1bc250d92d1 feh-1.3.1.tar.gz +3d35ba3d2f0693b019800787f1103891 feh-1.3.4.tar.gz Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/feh/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 3 May 2005 16:14:18 -0000 1.3 +++ .cvsignore 1 Sep 2005 02:33:30 -0000 1.4 @@ -1 +1 @@ -feh-1.3.1.tar.gz +feh-1.3.4.tar.gz From fedora-extras-commits at redhat.com Thu Sep 1 02:33:33 2005 From: fedora-extras-commits at redhat.com (Aaron Kurtz (dragoon)) Date: Wed, 31 Aug 2005 22:33:33 -0400 Subject: rpms/feh/FC-3 feh.spec,1.5,1.6 sources,1.3,1.4 .cvsignore,1.3,1.4 Message-ID: <200509010234.j812Y3Nu029448@cvs-int.fedora.redhat.com> Author: dragoon Update of /cvs/extras/rpms/feh/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29369/FC-3 Modified Files: feh.spec sources .cvsignore Log Message: * Wed Aug 31 2005 Aaron Kurtz - 1.3.4-1 - bump to 1.3.4 Index: feh.spec =================================================================== RCS file: /cvs/extras/rpms/feh/FC-3/feh.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- feh.spec 16 Jun 2005 09:34:11 -0000 1.5 +++ feh.spec 1 Sep 2005 02:33:31 -0000 1.6 @@ -1,6 +1,9 @@ +# No desktop file for feh. It may be a GUI program, but it needs +# file names or it just spits out the help. + Name: feh -Version: 1.3.1 -Release: 3%{?dist} +Version: 1.3.4 +Release: 1%{?dist} Summary: Fast command line image viewer using Imlib2 Group: Applications/Multimedia @@ -44,6 +47,9 @@ %{_mandir}/man[^3]/* %changelog +* Wed Aug 31 2005 Aaron Kurtz - 1.3.4-1 +- bump to 1.3.4 + * Thu Jun 16 2005 Aaron Kurtz - 1.3.1-3 - do it right this time Index: sources =================================================================== RCS file: /cvs/extras/rpms/feh/FC-3/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 3 May 2005 16:16:10 -0000 1.3 +++ sources 1 Sep 2005 02:33:31 -0000 1.4 @@ -1 +1 @@ -0a3dfe65b795fed29a9aa1bc250d92d1 feh-1.3.1.tar.gz +3d35ba3d2f0693b019800787f1103891 feh-1.3.4.tar.gz Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/feh/FC-3/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 3 May 2005 16:16:10 -0000 1.3 +++ .cvsignore 1 Sep 2005 02:33:31 -0000 1.4 @@ -1 +1 @@ -feh-1.3.1.tar.gz +feh-1.3.4.tar.gz From fedora-extras-commits at redhat.com Thu Sep 1 07:33:57 2005 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Thu, 1 Sep 2005 03:33:57 -0400 Subject: rpms/pam_ssh/FC-4 pam_ssh.spec,1.3,1.4 Message-ID: <200509010733.j817Xvne003718@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/pam_ssh/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3699 Modified Files: pam_ssh.spec Log Message: add a .1 to release to be able to make a new tag Index: pam_ssh.spec =================================================================== RCS file: /cvs/extras/rpms/pam_ssh/FC-4/pam_ssh.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- pam_ssh.spec 26 Aug 2005 21:44:42 -0000 1.3 +++ pam_ssh.spec 1 Sep 2005 07:33:54 -0000 1.4 @@ -1,6 +1,6 @@ Name: pam_ssh Version: 1.91 -Release: 8%{?dist} +Release: 8.1%{?dist} Summary: PAM module for use with SSH keys and ssh-agent Source: http://dl.sourceforge.net/sourceforge/pam-ssh/pam_ssh-%{version}.tar.bz2 URL: http://sourceforge.net/projects/pam-ssh/ From fedora-extras-commits at redhat.com Thu Sep 1 07:47:46 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Thu, 1 Sep 2005 03:47:46 -0400 Subject: rpms/moin/devel README-rpm,1.1,1.2 Message-ID: <200509010747.j817lk3R003802@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/moin/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3778 Modified Files: README-rpm Log Message: Change user/group separator in chown from "." to ":" (#167151). Index: README-rpm =================================================================== RCS file: /cvs/extras/rpms/moin/devel/README-rpm,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- README-rpm 15 Jun 2005 11:10:06 -0000 1.1 +++ README-rpm 1 Sep 2005 07:47:44 -0000 1.2 @@ -6,7 +6,7 @@ cp -a /usr/share/moin/{data,underlay} $DESTDIR cp -a /usr/share/moin/server/moin.cgi $DESTDIR/cgi-bin cp -a /usr/share/moin/config/wikiconfig.py $DESTDIR/cgi-bin -chown -R apache.apache $DESTDIR/{data,underlay} +chown -R apache:apache $DESTDIR/{data,underlay} cat > /etc/httpd/conf.d/mywiki.conf < From fedora-extras-commits at redhat.com Thu Sep 1 08:52:59 2005 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Thu, 1 Sep 2005 04:52:59 -0400 Subject: rpms/perl-HTML-Scrubber - New directory Message-ID: <200509010852.j818qx3S005899@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-HTML-Scrubber In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5875/perl-HTML-Scrubber Log Message: Directory /cvs/extras/rpms/perl-HTML-Scrubber added to the repository From fedora-extras-commits at redhat.com Thu Sep 1 08:53:00 2005 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Thu, 1 Sep 2005 04:53:00 -0400 Subject: rpms/perl-HTML-Scrubber/devel - New directory Message-ID: <200509010853.j818r073005904@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-HTML-Scrubber/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5875/perl-HTML-Scrubber/devel Log Message: Directory /cvs/extras/rpms/perl-HTML-Scrubber/devel added to the repository From fedora-extras-commits at redhat.com Thu Sep 1 08:53:16 2005 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Thu, 1 Sep 2005 04:53:16 -0400 Subject: rpms/perl-HTML-Scrubber Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200509010853.j818rGKT005951@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-HTML-Scrubber In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5922 Added Files: Makefile import.log Log Message: Setup of module perl-HTML-Scrubber --- NEW FILE Makefile --- # Top level Makefile for module perl-HTML-Scrubber all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Thu Sep 1 08:53:17 2005 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Thu, 1 Sep 2005 04:53:17 -0400 Subject: rpms/perl-HTML-Scrubber/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200509010853.j818rHpo005956@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-HTML-Scrubber/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5922/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-HTML-Scrubber --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Thu Sep 1 08:53:50 2005 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Thu, 1 Sep 2005 04:53:50 -0400 Subject: rpms/perl-HTML-Scrubber import.log,1.1,1.2 Message-ID: <200509010854.j818sLBg006037@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-HTML-Scrubber In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5990 Modified Files: import.log Log Message: auto-import perl-HTML-Scrubber-0.08-2 on branch devel from perl-HTML-Scrubber-0.08-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-HTML-Scrubber/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 1 Sep 2005 08:53:14 -0000 1.1 +++ import.log 1 Sep 2005 08:53:48 -0000 1.2 @@ -0,0 +1 @@ +perl-HTML-Scrubber-0_08-2:HEAD:perl-HTML-Scrubber-0.08-2.src.rpm:1125564820 From fedora-extras-commits at redhat.com Thu Sep 1 08:53:51 2005 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Thu, 1 Sep 2005 04:53:51 -0400 Subject: rpms/perl-HTML-Scrubber/devel perl-HTML-Scrubber.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200509010854.j818sLx9006041@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-HTML-Scrubber/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5990/devel Modified Files: .cvsignore sources Added Files: perl-HTML-Scrubber.spec Log Message: auto-import perl-HTML-Scrubber-0.08-2 on branch devel from perl-HTML-Scrubber-0.08-2.src.rpm --- NEW FILE perl-HTML-Scrubber.spec --- Name: perl-HTML-Scrubber Version: 0.08 Release: 2%{?dist} Summary: Library for scrubbing/sanitizing html Group: Development/Libraries License: GPL or Artistic URL: http://search.cpan.org/dist/HTML-Scrubber/ Source0: http://www.cpan.org/authors/id/P/PO/PODMASTER/HTML-Scrubber-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl BuildRequires: perl(HTML::Parser) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description If you wanna "scrub" or "sanitize" html input in a reliable an flexible fashion, then this module is for you. I wasn't satisfied with HTML::Sanitizer because it is based on HTML::TreeBuilder, so I thought I'd write something similar that works directly with HTML::Parser. %prep %setup -q -n HTML-Scrubber-%{version} %{__perl} -pi -e 's/\r\n/\n/' Changes LICENSE README Scrubber.pm %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' chmod -R u+w $RPM_BUILD_ROOT/* %check make test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc Changes LICENSE README %{perl_vendorlib}/* %{_mandir}/man3/*.3* %changelog * Thu Aug 11 2005 Jose Pedro Oliveira - 0.08-2 - Disttag. * Wed Mar 23 2005 Jose Pedro Oliveira - 0.08-1 - First build. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-HTML-Scrubber/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 1 Sep 2005 08:53:15 -0000 1.1 +++ .cvsignore 1 Sep 2005 08:53:49 -0000 1.2 @@ -0,0 +1 @@ +HTML-Scrubber-0.08.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-HTML-Scrubber/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 1 Sep 2005 08:53:15 -0000 1.1 +++ sources 1 Sep 2005 08:53:49 -0000 1.2 @@ -0,0 +1 @@ +abadf246e528f3e2d31717ef8a1d90f2 HTML-Scrubber-0.08.tar.gz From fedora-extras-commits at redhat.com Thu Sep 1 08:55:52 2005 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Thu, 1 Sep 2005 04:55:52 -0400 Subject: rpms/perl-Module-Versions-Report - New directory Message-ID: <200509010855.j818tqeK006146@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Module-Versions-Report In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6126/perl-Module-Versions-Report Log Message: Directory /cvs/extras/rpms/perl-Module-Versions-Report added to the repository From fedora-extras-commits at redhat.com Thu Sep 1 08:55:53 2005 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Thu, 1 Sep 2005 04:55:53 -0400 Subject: rpms/perl-Module-Versions-Report/devel - New directory Message-ID: <200509010855.j818trau006151@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Module-Versions-Report/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6126/perl-Module-Versions-Report/devel Log Message: Directory /cvs/extras/rpms/perl-Module-Versions-Report/devel added to the repository From fedora-extras-commits at redhat.com Thu Sep 1 08:56:23 2005 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Thu, 1 Sep 2005 04:56:23 -0400 Subject: rpms/perl-Module-Versions-Report Makefile, NONE, 1.1 import.log, NONE, 1.1 Message-ID: <200509010856.j818uNEd006203@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Module-Versions-Report In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6174 Added Files: Makefile import.log Log Message: Setup of module perl-Module-Versions-Report --- NEW FILE Makefile --- # Top level Makefile for module perl-Module-Versions-Report all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Thu Sep 1 08:56:23 2005 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Thu, 1 Sep 2005 04:56:23 -0400 Subject: rpms/perl-Module-Versions-Report/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200509010856.j818uNVe006208@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Module-Versions-Report/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6174/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-Module-Versions-Report --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Thu Sep 1 08:57:00 2005 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Thu, 1 Sep 2005 04:57:00 -0400 Subject: rpms/perl-Module-Versions-Report import.log,1.1,1.2 Message-ID: <200509010857.j818v0jD006277@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Module-Versions-Report In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6242 Modified Files: import.log Log Message: auto-import perl-Module-Versions-Report-1.02-2 on branch devel from perl-Module-Versions-Report-1.02-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-Module-Versions-Report/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 1 Sep 2005 08:56:21 -0000 1.1 +++ import.log 1 Sep 2005 08:56:58 -0000 1.2 @@ -0,0 +1 @@ +perl-Module-Versions-Report-1_02-2:HEAD:perl-Module-Versions-Report-1.02-2.src.rpm:1125565009 From fedora-extras-commits at redhat.com Thu Sep 1 08:57:01 2005 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Thu, 1 Sep 2005 04:57:01 -0400 Subject: rpms/perl-Module-Versions-Report/devel perl-Module-Versions-Report.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200509010857.j818v11P006284@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Module-Versions-Report/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6242/devel Modified Files: .cvsignore sources Added Files: perl-Module-Versions-Report.spec Log Message: auto-import perl-Module-Versions-Report-1.02-2 on branch devel from perl-Module-Versions-Report-1.02-2.src.rpm --- NEW FILE perl-Module-Versions-Report.spec --- Name: perl-Module-Versions-Report Version: 1.02 Release: 2%{?dist} Summary: Report versions of all modules in memory Group: Development/Libraries License: GPL or Artistic URL: http://search.cpan.org/dist/Module-Versions-Report/ Source0: http://www.cpan.org/authors/id/S/SB/SBURKE/Module-Versions-Report-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description If you add "use Module::Versions::Report;" to a program (especially handy if your program is one that demonstrates a bug in some module), then when the program has finished running, you well get a report detailing the all modules in memory, and noting the version of each (for modules that defined a $VERSION, at least). %prep %setup -q -n Module-Versions-Report-%{version} %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' chmod -R u+w $RPM_BUILD_ROOT/* %check make test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc ChangeLog README %{perl_vendorlib}/* %{_mandir}/man3/*.3* %changelog * Wed Aug 10 2005 Jose Pedro Oliveira - 1.02-2 - Disttag. * Tue Mar 22 2005 Jose Pedro Oliveira - 1.02-1 - First build. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Module-Versions-Report/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 1 Sep 2005 08:56:21 -0000 1.1 +++ .cvsignore 1 Sep 2005 08:56:59 -0000 1.2 @@ -0,0 +1 @@ +Module-Versions-Report-1.02.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Module-Versions-Report/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 1 Sep 2005 08:56:21 -0000 1.1 +++ sources 1 Sep 2005 08:56:59 -0000 1.2 @@ -0,0 +1 @@ +a2ef9353386df4c4e49c7e4031c45bd3 Module-Versions-Report-1.02.tar.gz From fedora-extras-commits at redhat.com Thu Sep 1 08:59:49 2005 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Thu, 1 Sep 2005 04:59:49 -0400 Subject: rpms/perl-Carp-Assert-More - New directory Message-ID: <200509010859.j818xnhD006402@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Carp-Assert-More In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6378/perl-Carp-Assert-More Log Message: Directory /cvs/extras/rpms/perl-Carp-Assert-More added to the repository From fedora-extras-commits at redhat.com Thu Sep 1 08:59:49 2005 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Thu, 1 Sep 2005 04:59:49 -0400 Subject: rpms/perl-Carp-Assert-More/devel - New directory Message-ID: <200509010859.j818xnF4006407@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Carp-Assert-More/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6378/perl-Carp-Assert-More/devel Log Message: Directory /cvs/extras/rpms/perl-Carp-Assert-More/devel added to the repository From fedora-extras-commits at redhat.com Thu Sep 1 09:00:10 2005 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Thu, 1 Sep 2005 05:00:10 -0400 Subject: rpms/perl-Carp-Assert-More Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200509010900.j8190A3m006459@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Carp-Assert-More In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6424 Added Files: Makefile import.log Log Message: Setup of module perl-Carp-Assert-More --- NEW FILE Makefile --- # Top level Makefile for module perl-Carp-Assert-More all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Thu Sep 1 09:00:10 2005 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Thu, 1 Sep 2005 05:00:10 -0400 Subject: rpms/perl-Carp-Assert-More/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200509010900.j8190Am8006464@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Carp-Assert-More/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6424/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-Carp-Assert-More --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Thu Sep 1 09:00:44 2005 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Thu, 1 Sep 2005 05:00:44 -0400 Subject: rpms/perl-Carp-Assert-More import.log,1.1,1.2 Message-ID: <200509010900.j8190iZT006527@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Carp-Assert-More In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6492 Modified Files: import.log Log Message: auto-import perl-Carp-Assert-More-1.10-1 on branch devel from perl-Carp-Assert-More-1.10-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-Carp-Assert-More/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 1 Sep 2005 09:00:08 -0000 1.1 +++ import.log 1 Sep 2005 09:00:42 -0000 1.2 @@ -0,0 +1 @@ +perl-Carp-Assert-More-1_10-1:HEAD:perl-Carp-Assert-More-1.10-1.src.rpm:1125565233 From fedora-extras-commits at redhat.com Thu Sep 1 09:00:44 2005 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Thu, 1 Sep 2005 05:00:44 -0400 Subject: rpms/perl-Carp-Assert-More/devel perl-Carp-Assert-More.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200509010900.j8190i5B006534@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Carp-Assert-More/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6492/devel Modified Files: .cvsignore sources Added Files: perl-Carp-Assert-More.spec Log Message: auto-import perl-Carp-Assert-More-1.10-1 on branch devel from perl-Carp-Assert-More-1.10-1.src.rpm --- NEW FILE perl-Carp-Assert-More.spec --- Name: perl-Carp-Assert-More Version: 1.10 Release: 1%{?dist} Summary: Convenience wrappers around Carp::Assert Group: Development/Libraries License: GPL or Artistic URL: http://search.cpan.org/dist/Carp-Assert-More/ Source0: http://www.cpan.org/authors/id/P/PE/PETDANCE/Carp-Assert-More-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl BuildRequires: perl(Carp::Assert), perl(Test::Exception) BuildRequires: perl(Test::Pod), perl(Test::Pod::Coverage) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description Carp::Assert::More is a set of wrappers around the Carp::Assert functions to make the habit of writing assertions even easier. %prep %setup -q -n Carp-Assert-More-%{version} %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' chmod -R u+w $RPM_BUILD_ROOT/* %check make test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc Changes %{perl_vendorlib}/Carp/Assert/ %{_mandir}/man3/*.3* %changelog * Thu Aug 11 2005 Jose Pedro Oliveira - 1.10-1 - First build. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Carp-Assert-More/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 1 Sep 2005 09:00:08 -0000 1.1 +++ .cvsignore 1 Sep 2005 09:00:42 -0000 1.2 @@ -0,0 +1 @@ +Carp-Assert-More-1.10.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Carp-Assert-More/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 1 Sep 2005 09:00:08 -0000 1.1 +++ sources 1 Sep 2005 09:00:42 -0000 1.2 @@ -0,0 +1 @@ +7a601c7ceab092a5010bf4dcda62c659 Carp-Assert-More-1.10.tar.gz From fedora-extras-commits at redhat.com Thu Sep 1 09:40:12 2005 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Thu, 1 Sep 2005 05:40:12 -0400 Subject: rpms/pam_ssh/FC-3 pam_ssh.spec,1.3,1.4 Message-ID: <200509010940.j819eCJo007966@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/pam_ssh/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7935 Modified Files: pam_ssh.spec Log Message: add .1 to the release as there is a .1 for the fc4 package Index: pam_ssh.spec =================================================================== RCS file: /cvs/extras/rpms/pam_ssh/FC-3/pam_ssh.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- pam_ssh.spec 26 Aug 2005 21:44:42 -0000 1.3 +++ pam_ssh.spec 1 Sep 2005 09:40:09 -0000 1.4 @@ -1,6 +1,6 @@ Name: pam_ssh Version: 1.91 -Release: 8%{?dist} +Release: 8.1%{?dist} Summary: PAM module for use with SSH keys and ssh-agent Source: http://dl.sourceforge.net/sourceforge/pam-ssh/pam_ssh-%{version}.tar.bz2 URL: http://sourceforge.net/projects/pam-ssh/ From fedora-extras-commits at redhat.com Thu Sep 1 12:08:48 2005 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Thu, 1 Sep 2005 08:08:48 -0400 Subject: rpms/perl-Text-WikiFormat - New directory Message-ID: <200509011208.j81C8mFB012578@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Text-WikiFormat In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12554/perl-Text-WikiFormat Log Message: Directory /cvs/extras/rpms/perl-Text-WikiFormat added to the repository From fedora-extras-commits at redhat.com Thu Sep 1 12:08:48 2005 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Thu, 1 Sep 2005 08:08:48 -0400 Subject: rpms/perl-Text-WikiFormat/devel - New directory Message-ID: <200509011208.j81C8mLr012583@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Text-WikiFormat/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12554/perl-Text-WikiFormat/devel Log Message: Directory /cvs/extras/rpms/perl-Text-WikiFormat/devel added to the repository From fedora-extras-commits at redhat.com Thu Sep 1 12:09:09 2005 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Thu, 1 Sep 2005 08:09:09 -0400 Subject: rpms/perl-Text-WikiFormat Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200509011209.j81C99kW012628@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Text-WikiFormat In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12599 Added Files: Makefile import.log Log Message: Setup of module perl-Text-WikiFormat --- NEW FILE Makefile --- # Top level Makefile for module perl-Text-WikiFormat all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Thu Sep 1 12:09:10 2005 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Thu, 1 Sep 2005 08:09:10 -0400 Subject: rpms/perl-Text-WikiFormat/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200509011209.j81C9Age012633@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Text-WikiFormat/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12599/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-Text-WikiFormat --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Thu Sep 1 12:09:44 2005 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Thu, 1 Sep 2005 08:09:44 -0400 Subject: rpms/perl-Text-WikiFormat import.log,1.1,1.2 Message-ID: <200509011210.j81CAEUr012705@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Text-WikiFormat In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12667 Modified Files: import.log Log Message: auto-import perl-Text-WikiFormat-0.76-2 on branch devel from perl-Text-WikiFormat-0.76-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-Text-WikiFormat/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 1 Sep 2005 12:09:07 -0000 1.1 +++ import.log 1 Sep 2005 12:09:41 -0000 1.2 @@ -0,0 +1 @@ +perl-Text-WikiFormat-0_76-2:HEAD:perl-Text-WikiFormat-0.76-2.src.rpm:1125576574 From fedora-extras-commits at redhat.com Thu Sep 1 12:09:44 2005 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Thu, 1 Sep 2005 08:09:44 -0400 Subject: rpms/perl-Text-WikiFormat/devel perl-Text-WikiFormat.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200509011210.j81CAEV1012709@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Text-WikiFormat/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12667/devel Modified Files: .cvsignore sources Added Files: perl-Text-WikiFormat.spec Log Message: auto-import perl-Text-WikiFormat-0.76-2 on branch devel from perl-Text-WikiFormat-0.76-2.src.rpm --- NEW FILE perl-Text-WikiFormat.spec --- Name: perl-Text-WikiFormat Version: 0.76 Release: 2%{?dist} Summary: Translate Wiki formatted text into other formats Group: Development/Libraries License: GPL or Artistic URL: http://search.cpan.org/dist/Text-WikiFormat/ Source0: http://www.cpan.org/authors/id/C/CH/CHROMATIC/Text-WikiFormat-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl BuildRequires: perl(Module::Build) BuildRequires: perl(URI::Escape) BuildRequires: perl(Test::Pod), perl(Test::Pod::Coverage) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description The original Wiki web site had a very simple interface to edit and to add pages. Its formatting rules are simple and easy to use. They are also easy to translate into other, more complicated markup languages with this module. It creates HTML by default, but can produce valid POD, DocBook, XML, or any other format imaginable. %prep %setup -q -n Text-WikiFormat-%{version} %build %{__perl} Build.PL installdirs=vendor ./Build %install rm -rf $RPM_BUILD_ROOT ./Build install destdir=$RPM_BUILD_ROOT create_packlist=0 chmod -R u+w $RPM_BUILD_ROOT/* %check mv t/0-signature.t t/0.signature.t.skip ./Build test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc ARTISTIC Changes GPL README %{perl_vendorlib}/Text/ %{_mandir}/man3/*.3* %changelog * Thu Sep 1 2005 Jose Pedro Oliveira - 0.76-2 - Disabled the signature test. * Fri Aug 26 2005 Jose Pedro Oliveira - 0.76-1 - First build. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Text-WikiFormat/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 1 Sep 2005 12:09:08 -0000 1.1 +++ .cvsignore 1 Sep 2005 12:09:42 -0000 1.2 @@ -0,0 +1 @@ +Text-WikiFormat-0.76.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Text-WikiFormat/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 1 Sep 2005 12:09:08 -0000 1.1 +++ sources 1 Sep 2005 12:09:42 -0000 1.2 @@ -0,0 +1 @@ +70bc20c8d058bf64df24e384d36748d1 Text-WikiFormat-0.76.tar.gz From fedora-extras-commits at redhat.com Thu Sep 1 18:23:47 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Thu, 1 Sep 2005 14:23:47 -0400 Subject: extras-buildsys/server UserInterface.py,1.52,1.53 Message-ID: <200509011823.j81INlF8021404@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/server In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21385/server Modified Files: UserInterface.py Log Message: Fix traceback Index: UserInterface.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/UserInterface.py,v retrieving revision 1.52 retrieving revision 1.53 diff -u -r1.52 -r1.53 --- UserInterface.py 31 Aug 2005 18:25:50 -0000 1.52 +++ UserInterface.py 1 Sep 2005 18:23:45 -0000 1.53 @@ -411,7 +411,7 @@ jobrec['epoch'] = job['epoch'] jobrec['version'] = job['version'] jobrec['release'] = job['release'] - base_url = self._server_cfg.get_str("UI", "log_url") + base_url = self._cfg.get_str("UI", "log_url") target_str = "%s-%s-%s" % (jobrec['target_distro'], jobrec['target_target'], jobrec['target_repo']) log_url = PackageJob.make_job_log_url(base_url, target_str, str(uid), jobrec['package'], jobrec['version'], From fedora-extras-commits at redhat.com Thu Sep 1 18:28:34 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Thu, 1 Sep 2005 14:28:34 -0400 Subject: extras-buildsys/www job.psp,1.11,1.12 Message-ID: <200509011828.j81ISYaT021441@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/www In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21422/www Modified Files: job.psp Log Message: Fix target usage Index: job.psp =================================================================== RCS file: /cvs/fedora/extras-buildsys/www/job.psp,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- job.psp 25 Aug 2005 18:15:14 -0000 1.11 +++ job.psp 1 Sep 2005 18:28:32 -0000 1.12 @@ -41,6 +41,11 @@ else: title = job['package'] # endif + + target_distro = job['target_distro'] + target_target = job['target_target'] + target_repo = job['target_repo'] + target_str = "%s-%s-%s" % (target_distro, target_target, target_repo) %> @@ -49,7 +54,7 @@
- + From fedora-extras-commits at redhat.com Thu Sep 1 18:45:03 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Thu, 1 Sep 2005 14:45:03 -0400 Subject: extras-buildsys ChangeLog,1.113,1.114 Message-ID: <200509011845.j81Ij31t021685@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21650 Modified Files: ChangeLog Log Message: 2005-09-01 Dan Williams * www/builders.psp - Better unavailable builders display Index: ChangeLog =================================================================== RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v retrieving revision 1.113 retrieving revision 1.114 diff -u -r1.113 -r1.114 --- ChangeLog 31 Aug 2005 19:55:29 -0000 1.113 +++ ChangeLog 1 Sep 2005 18:45:01 -0000 1.114 @@ -1,3 +1,8 @@ +2005-09-01 Dan Williams + + * www/builders.psp + - Better unavailable builders display + 2005-08-31 Dan Williams * server/BuilderManager.py From fedora-extras-commits at redhat.com Thu Sep 1 18:45:03 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Thu, 1 Sep 2005 14:45:03 -0400 Subject: extras-buildsys/www builders.psp,1.9,1.10 Message-ID: <200509011845.j81Ij3J7021691@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/www In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21650/www Modified Files: builders.psp Log Message: 2005-09-01 Dan Williams * www/builders.psp - Better unavailable builders display Index: builders.psp =================================================================== RCS file: /cvs/fedora/extras-buildsys/www/builders.psp,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- builders.psp 31 Aug 2005 19:31:00 -0000 1.9 +++ builders.psp 1 Sep 2005 18:45:01 -0000 1.10 @@ -43,16 +43,18 @@ unavail_color = '' if builder['alive'] == False: unavail_color = 'color="#ff4444"' + slots_text = "unavailable" + else: + num_building = builder['num_slots'] - builder['free_slots'] + slots_text = "%s/%s" % (num_building, builder['num_slots']) # endif - - num_building = builder['num_slots'] - builder['free_slots'] %>
<%=str(job['uid'])%>: <%=title%>  (<%=job['status']%>)
Target:<%=str(job['target'])%>
Target:<%=target_str%>
Submitter:<%=despam_user(job['username'])%>
Source:<%=str(job['source'])%>
Started:<%=str(time.ctime(job['starttime']))%>
From fedora-extras-commits at redhat.com Thu Sep 1 18:56:08 2005 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Thu, 1 Sep 2005 14:56:08 -0400 Subject: rpms/pam_ssh/devel pam_ssh.spec,1.3,1.4 Message-ID: <200509011856.j81Iu8Vn021749@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/pam_ssh/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21730 Modified Files: pam_ssh.spec Log Message: add a .1 to the release too Index: pam_ssh.spec =================================================================== RCS file: /cvs/extras/rpms/pam_ssh/devel/pam_ssh.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- pam_ssh.spec 26 Aug 2005 21:44:42 -0000 1.3 +++ pam_ssh.spec 1 Sep 2005 18:56:06 -0000 1.4 @@ -1,6 +1,6 @@ Name: pam_ssh Version: 1.91 -Release: 8%{?dist} +Release: 8.1%{?dist} Summary: PAM module for use with SSH keys and ssh-agent Source: http://dl.sourceforge.net/sourceforge/pam-ssh/pam_ssh-%{version}.tar.bz2 URL: http://sourceforge.net/projects/pam-ssh/ From fedora-extras-commits at redhat.com Thu Sep 1 19:54:51 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Thu, 1 Sep 2005 15:54:51 -0400 Subject: extras-buildsys/builder builder.py,1.40,1.41 Message-ID: <200509011954.j81Jspl1023230@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/builder In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23211/builder Modified Files: builder.py Log Message: Clean up more stuff Index: builder.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/builder/builder.py,v retrieving revision 1.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- builder.py 31 Aug 2005 18:29:17 -0000 1.40 +++ builder.py 1 Sep 2005 19:54:49 -0000 1.41 @@ -436,6 +436,11 @@ if self._mock_config.has_key('statedir'): shutil.rmtree(self._mock_config['statedir'], ignore_errors=True) + source_dir = os.path.abspath(os.path.join(self._mock_config['rootdir'], "../source")) + # Ensure we're actually deleteing the job's sourcedir + if source_dir.endswith(os.path.join(self._uniqid, "source")): + shutil.rmtree(source_dir, ignore_errors=True) + def run(self): while True: if self._die: From fedora-extras-commits at redhat.com Thu Sep 1 20:29:33 2005 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Thu, 1 Sep 2005 16:29:33 -0400 Subject: rpms/supertux/FC-3 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 supertux.spec, 1.4, 1.5 Message-ID: <200509012029.j81KTXSF024596@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/supertux/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24571 Modified Files: .cvsignore sources supertux.spec Log Message: Update to 0.1.3. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/supertux/FC-3/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 13 Jan 2005 13:30:45 -0000 1.3 +++ .cvsignore 1 Sep 2005 20:29:31 -0000 1.4 @@ -1 +1 @@ -supertux-0.1.2.tar.bz2 +supertux-0.1.3.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/supertux/FC-3/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 13 Jan 2005 13:30:45 -0000 1.3 +++ sources 1 Sep 2005 20:29:31 -0000 1.4 @@ -1 +1 @@ -7c10acf574f09ae5cb9eb2a4b9bf93ff supertux-0.1.2.tar.bz2 +f2fc288459f33d5cd8f645fbca737a63 supertux-0.1.3.tar.bz2 Index: supertux.spec =================================================================== RCS file: /cvs/extras/rpms/supertux/FC-3/supertux.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- supertux.spec 13 Jan 2005 13:30:45 -0000 1.4 +++ supertux.spec 1 Sep 2005 20:29:31 -0000 1.5 @@ -1,23 +1,23 @@ Name: supertux -Version: 0.1.2 -Release: 1 -Epoch: 0 -Summary: A jump'n run like game similar to Mario Bros +Version: 0.1.3 +Release: 1%{?dist} + +Summary: Jump'n run like game similar to Mario Bros Group: Amusements/Games License: GPL -URL: http://super-tux.sourceforge.net/ -Source0: http://dl.sf.net/super-tux/supertux-0.1.2.tar.bz2 -Source1: %{name}.desktop +URL: http://supertux.berlios.de/ +Source0: http://download.berlios.de/supertux/supertux-%{version}.tar.bz2 +Source1: %{name}.desktop BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: SDL-devel >= 0:1.2.4, SDL_image-devel, SDL_mixer-devel -BuildRequires: zlib-devel, desktop-file-utils +BuildRequires: SDL-devel >= 1.2.4, SDL_image-devel, SDL_mixer-devel +BuildRequires: zlib-devel, desktop-file-utils %description SuperTux is a jump'n run like game, with strong inspiration from the Super Mario Bros games for Nintendo. - + Run and jump through multiple worlds, fighting off enemies by jumping on them or bumping them from below. Grabbing power-ups and other stuff on the way. @@ -47,7 +47,7 @@ rm -rf $RPM_BUILD_ROOT -%files +%files %defattr(-,root,root,-) %doc AUTHORS COPYING ChangeLog NEWS README TODO LEVELDESIGN %{_bindir}/* @@ -56,6 +56,15 @@ %{_datadir}/pixmaps/* %changelog +* Thu Sep 01 2005 Steven Pritchard 0.1.3-1 +- Update to 0.1.3 + +* Sun May 22 2005 Jeremy Katz - 0.1.2-3 +- rebuild on all arches + +* Fri Apr 7 2005 Michael Schwendt +- rebuilt + * Sun Oct 03 2004 Panu Matilainen 0:0.1.2-1 - update to 0.1.2 From fedora-extras-commits at redhat.com Thu Sep 1 20:29:40 2005 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Thu, 1 Sep 2005 16:29:40 -0400 Subject: rpms/supertux/FC-4 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 supertux.spec, 1.7, 1.8 Message-ID: <200509012029.j81KTeEl024627@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/supertux/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24602 Modified Files: .cvsignore sources supertux.spec Log Message: Update to 0.1.3. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/supertux/FC-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 13 Jan 2005 13:30:45 -0000 1.3 +++ .cvsignore 1 Sep 2005 20:29:38 -0000 1.4 @@ -1 +1 @@ -supertux-0.1.2.tar.bz2 +supertux-0.1.3.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/supertux/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 13 Jan 2005 13:30:45 -0000 1.3 +++ sources 1 Sep 2005 20:29:38 -0000 1.4 @@ -1 +1 @@ -7c10acf574f09ae5cb9eb2a4b9bf93ff supertux-0.1.2.tar.bz2 +f2fc288459f33d5cd8f645fbca737a63 supertux-0.1.3.tar.bz2 Index: supertux.spec =================================================================== RCS file: /cvs/extras/rpms/supertux/FC-4/supertux.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- supertux.spec 22 May 2005 22:24:07 -0000 1.7 +++ supertux.spec 1 Sep 2005 20:29:38 -0000 1.8 @@ -1,13 +1,13 @@ Name: supertux -Version: 0.1.2 -Release: 3 +Version: 0.1.3 +Release: 1%{?dist} Summary: Jump'n run like game similar to Mario Bros Group: Amusements/Games License: GPL -URL: http://super-tux.sourceforge.net/ -Source0: http://dl.sf.net/super-tux/supertux-0.1.2.tar.bz2 +URL: http://supertux.berlios.de/ +Source0: http://download.berlios.de/supertux/supertux-%{version}.tar.bz2 Source1: %{name}.desktop BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -56,6 +56,9 @@ %{_datadir}/pixmaps/* %changelog +* Thu Sep 01 2005 Steven Pritchard 0.1.3-1 +- Update to 0.1.3 + * Sun May 22 2005 Jeremy Katz - 0.1.2-3 - rebuild on all arches From fedora-extras-commits at redhat.com Thu Sep 1 20:29:47 2005 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Thu, 1 Sep 2005 16:29:47 -0400 Subject: rpms/supertux/devel .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 supertux.spec, 1.7, 1.8 Message-ID: <200509012029.j81KTlpc024659@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/supertux/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24633 Modified Files: .cvsignore sources supertux.spec Log Message: Update to 0.1.3. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/supertux/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 13 Jan 2005 13:30:45 -0000 1.3 +++ .cvsignore 1 Sep 2005 20:29:45 -0000 1.4 @@ -1 +1 @@ -supertux-0.1.2.tar.bz2 +supertux-0.1.3.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/supertux/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 13 Jan 2005 13:30:45 -0000 1.3 +++ sources 1 Sep 2005 20:29:45 -0000 1.4 @@ -1 +1 @@ -7c10acf574f09ae5cb9eb2a4b9bf93ff supertux-0.1.2.tar.bz2 +f2fc288459f33d5cd8f645fbca737a63 supertux-0.1.3.tar.bz2 Index: supertux.spec =================================================================== RCS file: /cvs/extras/rpms/supertux/devel/supertux.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- supertux.spec 22 May 2005 22:24:07 -0000 1.7 +++ supertux.spec 1 Sep 2005 20:29:45 -0000 1.8 @@ -1,13 +1,13 @@ Name: supertux -Version: 0.1.2 -Release: 3 +Version: 0.1.3 +Release: 1%{?dist} Summary: Jump'n run like game similar to Mario Bros Group: Amusements/Games License: GPL -URL: http://super-tux.sourceforge.net/ -Source0: http://dl.sf.net/super-tux/supertux-0.1.2.tar.bz2 +URL: http://supertux.berlios.de/ +Source0: http://download.berlios.de/supertux/supertux-%{version}.tar.bz2 Source1: %{name}.desktop BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -56,6 +56,9 @@ %{_datadir}/pixmaps/* %changelog +* Thu Sep 01 2005 Steven Pritchard 0.1.3-1 +- Update to 0.1.3 + * Sun May 22 2005 Jeremy Katz - 0.1.2-3 - rebuild on all arches From fedora-extras-commits at redhat.com Thu Sep 1 20:36:14 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Thu, 1 Sep 2005 16:36:14 -0400 Subject: extras-buildsys ChangeLog,1.114,1.115 Message-ID: <200509012036.j81KaESP024856@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24808 Modified Files: ChangeLog Log Message: 2005-09-01 Dan Williams * client/client.py server/Repo.py server/UserInterface.py - Implement package upload functionality using 'scp' as part of the 'build' command Index: ChangeLog =================================================================== RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v retrieving revision 1.114 retrieving revision 1.115 diff -u -r1.114 -r1.115 --- ChangeLog 1 Sep 2005 18:45:01 -0000 1.114 +++ ChangeLog 1 Sep 2005 20:36:12 -0000 1.115 @@ -1,5 +1,13 @@ 2005-09-01 Dan Williams + * client/client.py + server/Repo.py + server/UserInterface.py + - Implement package upload functionality using 'scp' as + part of the 'build' command + +2005-09-01 Dan Williams + * www/builders.psp - Better unavailable builders display From fedora-extras-commits at redhat.com Thu Sep 1 20:36:15 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Thu, 1 Sep 2005 16:36:15 -0400 Subject: extras-buildsys/server Repo.py, 1.15, 1.16 UserInterface.py, 1.53, 1.54 Message-ID: <200509012036.j81KaFlZ024867@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/server In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24808/server Modified Files: Repo.py UserInterface.py Log Message: 2005-09-01 Dan Williams * client/client.py server/Repo.py server/UserInterface.py - Implement package upload functionality using 'scp' as part of the 'build' command Index: Repo.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/Repo.py,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- Repo.py 31 Aug 2005 15:58:52 -0000 1.15 +++ Repo.py 1 Sep 2005 20:36:12 -0000 1.16 @@ -21,6 +21,7 @@ import commands import popen2 import fcntl +import stat import EmailUtils @@ -34,12 +35,22 @@ if not os.path.exists(repodir): print "Error: Repository directory '%s' does not exist." % repodir os._exit(1) - self._repodir = os.path.join(repodir, self._target_cfg.target_string()) + + target_str = self._target_cfg.target_string() + self._repodir = os.path.join(repodir, target_str) if not os.path.exists(self._repodir): os.makedirs(self._repodir) - self._repo_cache_dir = os.path.join(repodir, "cache", self._target_cfg.target_string()) + + self._repo_cache_dir = os.path.join(repodir, "cache", target_str) if not os.path.exists(self._repo_cache_dir): os.makedirs(self._repo_cache_dir) + + parent_cfg = self._target_cfg.parent_cfg() + upload_dir = os.path.join(parent_cfg.get_str("Directories", "server_work_dir"), "srpm_upload_dir", target_str) + if not os.path.exists(upload_dir): + os.makedirs(upload_dir) + os.chmod(upload_dir, stat.S_IRWXU | stat.S_IRWXG | stat.S_IRWXO) + self._lock = threading.Lock() self._repo_additions = [] self._lock_count = 0 Index: UserInterface.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/UserInterface.py,v retrieving revision 1.53 retrieving revision 1.54 diff -u -r1.53 -r1.54 --- UserInterface.py 1 Sep 2005 18:23:45 -0000 1.53 +++ UserInterface.py 1 Sep 2005 20:36:12 -0000 1.54 @@ -499,6 +499,14 @@ dbcx.commit() return (0, "Success.") + def srpm_upload_dir(self, target_alias): + target_cfg = resolve_target(self._cfg, target_alias) + if not target_cfg: + return (-1, "") + target_str = target_cfg.target_string() + work_dir = self._cfg.get_str("Directories", "server_work_dir") + return (0, os.path.join(work_dir, "srpm_upload_dir", target_str)) + def api_version(self): return XMLRPC_API_VERSION @@ -639,6 +647,12 @@ return UserInterface.finish(self, final_uid_list) + def srpm_upload_dir(self, target_alias): + user = AuthedXMLRPCServer.get_authinfo() + if not user or not user.own_jobs: + return (-1, "Insufficient privileges.") + return UserInterface.srpm_upload_dir(self, target_alias) + class UserInterfaceNoAuth(UserInterface): """ From fedora-extras-commits at redhat.com Thu Sep 1 20:36:14 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Thu, 1 Sep 2005 16:36:14 -0400 Subject: extras-buildsys/client client.py,1.30,1.31 Message-ID: <200509012036.j81KaEA5024862@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/client In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24808/client Modified Files: client.py Log Message: 2005-09-01 Dan Williams * client/client.py server/Repo.py server/UserInterface.py - Implement package upload functionality using 'scp' as part of the 'build' command Index: client.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/client/client.py,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- client.py 29 Aug 2005 19:28:45 -0000 1.30 +++ client.py 1 Sep 2005 20:36:12 -0000 1.31 @@ -46,6 +46,8 @@ self.add_section("Server") self.set_option("Server", "use_ssl", "yes") self.set_option("Server", "address", "https://127.0.0.1:8887") + self.set_option("Server", "allow_uploads", "no") + self.set_option("Server", "upload_user", "me") self.add_section("User") self.set_option("User", "email", "foo at it.com") @@ -142,19 +144,69 @@ return cfg_email def _cmd_build(self, args): - if len(args) != 3: + if len(args) != 2 and len(args) != 3: raise CommandException("Invalid command. The 'build' command takes 3 arguments.") - package = args[0] - source = args[1] - target_alias = args[2] + + # Be smart about local SRPMs getting enqueued + if args[0].find('/') != -1 and os.path.exists(args[0]): + # We were given an RPM, find the package name + import rpmUtils + ts = rpmUtils.transaction.initReadOnlyTransaction() + hdr = rpmUtils.miscutils.hdrFromPackage(ts, args[0]) + package = hdr['name'] + source = args[0] + target_alias = args[1] + del hdr + del ts + else: + package = args[0] + source = args[1] + target_alias = args[2] + is_srpm = False if source.endswith(".src.rpm"): if not os.path.exists(source): raise CommandException("The SRPM %s does not exist." % source) - self._enqueue(package, source, target_alias) - - def _enqueue(self, package, source, target_alias): - """ Enqueue a package on the server by CVS tag """ + is_srpm = True + source = os.path.abspath(os.path.expanduser(source)) + self._enqueue(is_srpm, package, source, target_alias) + + def _upload_srpm(self, host, source, target_alias): + # Get the package upload directory from the server + (err, path) = self._server.srpm_upload_dir(target_alias) + if err != 0: + print "Error: Could not upload package %s. " \ + "reason: couldn't get upload dir for %s" % (source, target_alias) + return (-1, source) + + upload_file = os.path.join(path, os.path.basename(source)) + user = None + if self._cfg.has_option("Server", "upload_user"): + user = self._cfg.get_str("Server", "upload_user") + else: + import pwd + user = pwd.getpwuid(os.getuid())[0] + cmd = "/usr/bin/scp %s %s@%s:%s" % (source, user, host, upload_file) + print "Executing: %s" % cmd + os.system(cmd) + return (0, upload_file) + + def _enqueue(self, is_srpm, package, source, target_alias): + """ Enqueue a package on the server """ + + if self._cfg.get_bool("Server", "allow_uploads"): + import urllib + addr = self._cfg.get_str("Server", "address") + if addr.startswith("http") or addr.startswith("https"): + idx = addr.find('//') + addr = addr[idx:] + host_port, path = urllib.splithost(addr) + host, port = urllib.splitport(host_port) + # Don't upload if we're going to scp to the same machine we're on + if is_srpm and socket.gethostname() != host: + (err, source) = self._upload_srpm(host, source, target_alias) + if err == -1: + sys.exit(1) use_ssl = self._cfg.get_bool("Server", "use_ssl") if use_ssl: From fedora-extras-commits at redhat.com Thu Sep 1 20:49:24 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 1 Sep 2005 16:49:24 -0400 Subject: rpms/perl-Class-DBI-Plugin-Type/devel - New directory Message-ID: <200509012049.j81KnOk4024960@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Class-DBI-Plugin-Type/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24935/perl-Class-DBI-Plugin-Type/devel Log Message: Directory /cvs/extras/rpms/perl-Class-DBI-Plugin-Type/devel added to the repository From fedora-extras-commits at redhat.com Thu Sep 1 20:49:24 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 1 Sep 2005 16:49:24 -0400 Subject: rpms/perl-Class-DBI-Plugin-Type - New directory Message-ID: <200509012049.j81KnO7A024955@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Class-DBI-Plugin-Type In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24935/perl-Class-DBI-Plugin-Type Log Message: Directory /cvs/extras/rpms/perl-Class-DBI-Plugin-Type added to the repository From fedora-extras-commits at redhat.com Thu Sep 1 20:49:38 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 1 Sep 2005 16:49:38 -0400 Subject: rpms/perl-Class-DBI-Plugin-Type Makefile, NONE, 1.1 import.log, NONE, 1.1 Message-ID: <200509012049.j81Kncp7025009@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Class-DBI-Plugin-Type In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24980 Added Files: Makefile import.log Log Message: Setup of module perl-Class-DBI-Plugin-Type --- NEW FILE Makefile --- # Top level Makefile for module perl-Class-DBI-Plugin-Type all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Thu Sep 1 20:49:38 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 1 Sep 2005 16:49:38 -0400 Subject: rpms/perl-Class-DBI-Plugin-Type/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200509012049.j81Knc6r025014@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Class-DBI-Plugin-Type/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24980/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-Class-DBI-Plugin-Type --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Thu Sep 1 20:49:58 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 1 Sep 2005 16:49:58 -0400 Subject: rpms/perl-Class-DBI-Plugin-Type import.log,1.1,1.2 Message-ID: <200509012049.j81KnwAI025083@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Class-DBI-Plugin-Type In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25048 Modified Files: import.log Log Message: auto-import perl-Class-DBI-Plugin-Type-0.02-3 on branch devel from perl-Class-DBI-Plugin-Type-0.02-3.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-Class-DBI-Plugin-Type/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 1 Sep 2005 20:49:36 -0000 1.1 +++ import.log 1 Sep 2005 20:49:56 -0000 1.2 @@ -0,0 +1 @@ +perl-Class-DBI-Plugin-Type-0_02-3:HEAD:perl-Class-DBI-Plugin-Type-0.02-3.src.rpm:1125607792 From fedora-extras-commits at redhat.com Thu Sep 1 20:49:59 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 1 Sep 2005 16:49:59 -0400 Subject: rpms/perl-Class-DBI-Plugin-Type/devel perl-Class-DBI-Plugin-Type.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200509012050.j81KnxOM025090@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Class-DBI-Plugin-Type/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25048/devel Modified Files: .cvsignore sources Added Files: perl-Class-DBI-Plugin-Type.spec Log Message: auto-import perl-Class-DBI-Plugin-Type-0.02-3 on branch devel from perl-Class-DBI-Plugin-Type-0.02-3.src.rpm --- NEW FILE perl-Class-DBI-Plugin-Type.spec --- Name: perl-Class-DBI-Plugin-Type Version: 0.02 Release: 3%{?dist} Summary: Determine type information for columns Group: Development/Libraries License: GPL or Artistic URL: http://search.cpan.org/dist/Class-DBI-Plugin-Type Source0: http://search.cpan.org/CPAN/authors/id/S/SI/SIMON/Class-DBI-Plugin-Type-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(Class::DBI::Plugin), perl(DBD::SQLite) Requires: perl(Class::DBI::Plugin) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description %{summary}. %prep %setup -q -n Class-DBI-Plugin-Type-%{version} perldoc -t perlartistic > Artistic perldoc -t perlgpl > COPYING %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' chmod -R u+w $RPM_BUILD_ROOT/* %check make test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc Artistic COPYING Changes %{perl_vendorlib}/Class/DBI/Plugin/ %{_mandir}/man3/*.3* %changelog * Wed Aug 31 2005 Paul Howarth 0.02-3 - remove redundant BR: perl - use %{?_smp_mflags} with make in %%build - include license text - add BR: perl(DBD::SQLite) for %%check * Fri Jul 8 2005 Tom "spot" Callaway 0.02-2 - cleanups * Wed Jul 6 2005 Tom "spot" Callaway 0.02-1 - Initial package for Fedora Extras Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Class-DBI-Plugin-Type/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 1 Sep 2005 20:49:36 -0000 1.1 +++ .cvsignore 1 Sep 2005 20:49:57 -0000 1.2 @@ -0,0 +1 @@ +Class-DBI-Plugin-Type-0.02.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Class-DBI-Plugin-Type/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 1 Sep 2005 20:49:36 -0000 1.1 +++ sources 1 Sep 2005 20:49:57 -0000 1.2 @@ -0,0 +1 @@ +2f80426ccc67629543404ee9376a6d3e Class-DBI-Plugin-Type-0.02.tar.gz From fedora-extras-commits at redhat.com Thu Sep 1 20:55:58 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 1 Sep 2005 16:55:58 -0400 Subject: owners owners.list,1.156,1.157 Message-ID: <200509012055.j81Ktwkx025956@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25937 Modified Files: owners.list Log Message: perl-Class-DBI-Plugin-Type Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.156 retrieving revision 1.157 diff -u -r1.156 -r1.157 --- owners.list 31 Aug 2005 22:55:35 -0000 1.156 +++ owners.list 1 Sep 2005 20:55:56 -0000 1.157 @@ -565,6 +565,7 @@ Fedora Extras|perl-Class-Data-Inheritable|Inheritable, overridable class data|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Class-DBI|Simple Database Abstraction|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Class-DBI-Plugin|Abstract base class for Class::DBI plugins|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-Class-DBI-Plugin-Type|Determine type information for columns|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Class-MethodMaker|Create generic methods for OO Perl|dgregor at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Class-ReturnValue|Class::ReturnValue Perl module|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Class-Trigger|Mixin to add / call inheritable triggers|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com From fedora-extras-commits at redhat.com Thu Sep 1 21:31:09 2005 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Thu, 1 Sep 2005 17:31:09 -0400 Subject: rpms/unison/FC-4 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 unison.spec, 1.13, 1.14 Message-ID: <200509012131.j81LV9Ob027456@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/unison/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27433 Modified Files: .cvsignore sources unison.spec Log Message: new version 2.13.16 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/unison/FC-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 31 Jul 2005 12:38:19 -0000 1.3 +++ .cvsignore 1 Sep 2005 21:31:07 -0000 1.4 @@ -1 +1 @@ -unison-2.12.0.tar.gz +unison-2.13.16.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/unison/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 31 Jul 2005 12:38:19 -0000 1.3 +++ sources 1 Sep 2005 21:31:07 -0000 1.4 @@ -1 +1 @@ -c2b818e77e95951b5db0b95272e385a2 unison-2.12.0.tar.gz +a79bf5f4ebf2a1eaf15b1ac97f827374 unison-2.13.16.tar.gz Index: unison.spec =================================================================== RCS file: /cvs/extras/rpms/unison/FC-4/unison.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- unison.spec 31 Jul 2005 12:39:57 -0000 1.13 +++ unison.spec 1 Sep 2005 21:31:07 -0000 1.14 @@ -1,5 +1,5 @@ Name: unison -Version: 2.12.0 +Version: 2.13.16 Release: 1%{?dist} Summary: File-synchronization tool @@ -7,7 +7,7 @@ Group: Applications/File License: GPL URL: http://www.cis.upenn.edu/~bcpierce/unison -Source: http://www.cis.upenn.edu/~bcpierce/unison/download/releases/stable/unison-2.12.0.tar.gz +Source: http://www.cis.upenn.edu/~bcpierce/unison/download/releases/stable/unison-2.13.16.tar.gz Source1: unison.png BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ocaml >= 3.08, lablgtk >= 2.4.0, tetex-latex @@ -68,6 +68,9 @@ %{_datadir}/pixmaps/* %changelog +* Thu Sep 1 2005 Gerard Milmeister - 2.13.16 +- New Version 2.13.16 + * Sun Jul 31 2005 Gerard Milmeister - 2.12.0-0 - New Version 2.12.0 From fedora-extras-commits at redhat.com Thu Sep 1 21:31:51 2005 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Thu, 1 Sep 2005 17:31:51 -0400 Subject: rpms/unison/FC-3 sources,1.3,1.4 unison.spec,1.7,1.8 Message-ID: <200509012131.j81LVpH2027526@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/unison/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27505 Modified Files: sources unison.spec Log Message: new version 2.13.16 Index: sources =================================================================== RCS file: /cvs/extras/rpms/unison/FC-3/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 4 Aug 2005 07:52:57 -0000 1.3 +++ sources 1 Sep 2005 21:31:49 -0000 1.4 @@ -1 +1 @@ -c2b818e77e95951b5db0b95272e385a2 unison-2.12.0.tar.gz +a79bf5f4ebf2a1eaf15b1ac97f827374 unison-2.13.16.tar.gz Index: unison.spec =================================================================== RCS file: /cvs/extras/rpms/unison/FC-3/unison.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- unison.spec 4 Aug 2005 07:52:57 -0000 1.7 +++ unison.spec 1 Sep 2005 21:31:49 -0000 1.8 @@ -1,5 +1,5 @@ Name: unison -Version: 2.12.0 +Version: 2.13.16 Release: 1%{?dist} Summary: File-synchronization tool @@ -7,7 +7,7 @@ Group: Applications/File License: GPL URL: http://www.cis.upenn.edu/~bcpierce/unison -Source: http://www.cis.upenn.edu/~bcpierce/unison/download/releases/stable/unison-2.12.0.tar.gz +Source: http://www.cis.upenn.edu/~bcpierce/unison/download/releases/stable/unison-2.13.16.tar.gz Source1: unison.png BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ocaml >= 3.08, lablgtk >= 2.4.0, tetex-latex @@ -68,6 +68,9 @@ %{_datadir}/pixmaps/* %changelog +* Thu Sep 1 2005 Gerard Milmeister - 2.13.16 +- New Version 2.13.16 + * Sun Jul 31 2005 Gerard Milmeister - 2.12.0-0 - New Version 2.12.0 From fedora-extras-commits at redhat.com Thu Sep 1 21:32:45 2005 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Thu, 1 Sep 2005 17:32:45 -0400 Subject: rpms/unison/devel sources,1.3,1.4 unison.spec,1.12,1.13 Message-ID: <200509012132.j81LWjkv027591@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/unison/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27570 Modified Files: sources unison.spec Log Message: new version 2.13.16 Index: sources =================================================================== RCS file: /cvs/extras/rpms/unison/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 31 Jul 2005 12:42:18 -0000 1.3 +++ sources 1 Sep 2005 21:32:43 -0000 1.4 @@ -1 +1 @@ -c2b818e77e95951b5db0b95272e385a2 unison-2.12.0.tar.gz +a79bf5f4ebf2a1eaf15b1ac97f827374 unison-2.13.16.tar.gz Index: unison.spec =================================================================== RCS file: /cvs/extras/rpms/unison/devel/unison.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- unison.spec 31 Jul 2005 12:42:18 -0000 1.12 +++ unison.spec 1 Sep 2005 21:32:43 -0000 1.13 @@ -1,5 +1,5 @@ Name: unison -Version: 2.12.0 +Version: 2.13.16 Release: 1%{?dist} Summary: File-synchronization tool @@ -7,7 +7,7 @@ Group: Applications/File License: GPL URL: http://www.cis.upenn.edu/~bcpierce/unison -Source: http://www.cis.upenn.edu/~bcpierce/unison/download/releases/stable/unison-2.12.0.tar.gz +Source: http://www.cis.upenn.edu/~bcpierce/unison/download/releases/stable/unison-2.13.16.tar.gz Source1: unison.png BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ocaml >= 3.08, lablgtk >= 2.4.0, tetex-latex @@ -68,6 +68,9 @@ %{_datadir}/pixmaps/* %changelog +* Thu Sep 1 2005 Gerard Milmeister - 2.13.16 +- New Version 2.13.16 + * Sun Jul 31 2005 Gerard Milmeister - 2.12.0-0 - New Version 2.12.0 From fedora-extras-commits at redhat.com Fri Sep 2 01:30:39 2005 From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh)) Date: Thu, 1 Sep 2005 21:30:39 -0400 Subject: rpms/scim-hangul/FC-3 scim-hangul-0.2.0-ignore-invisible-char.patch, NONE, 1.1 scim-hangul.spec, 1.5, 1.6 Message-ID: <200509020130.j821UdPH000618@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/extras/rpms/scim-hangul/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv596 Modified Files: scim-hangul.spec Added Files: scim-hangul-0.2.0-ignore-invisible-char.patch Log Message: * Fri Sep 2 2005 Akira TAGOH - 0.2.0-5.fc3.1 - scim-hangul-0.2.0-ignore-invisible-char.patch: backported from Core to fix the problem with 3bul Yetgeul. - correct Release. it has to be greater than the previous Release. scim-hangul-0.2.0-ignore-invisible-char.patch: --- NEW FILE scim-hangul-0.2.0-ignore-invisible-char.patch --- diff -ruN --exclude .libs --exclude .deps --exclude 'stamp*' --exclude '*.la' --exclude mozilla --exclude '*o' --exclude POTFILES --exclude '*spec' --exclude 'Makefile*' --exclude 'config*' --exclude libtool scim-hangul-0.2.0.orig/src/hangulinputcontext.c scim-hangul-0.2.0/src/hangulinputcontext.c --- scim-hangul-0.2.0.orig/src/hangulinputcontext.c 2004-12-27 14:19:31.000000000 +0900 +++ scim-hangul-0.2.0/src/hangulinputcontext.c 2005-08-25 13:57:43.000000000 +0900 @@ -93,6 +93,10 @@ { int n = 0; + if (!buffer->choseong && !buffer->jungseong && !buffer->jongseong) { + buf[0] = L'\0'; + return 0; + } if (buffer->choseong) { buf[n++] = buffer->choseong; } else { Index: scim-hangul.spec =================================================================== RCS file: /cvs/extras/rpms/scim-hangul/FC-3/scim-hangul.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- scim-hangul.spec 25 Aug 2005 14:25:30 -0000 1.5 +++ scim-hangul.spec 2 Sep 2005 01:30:37 -0000 1.6 @@ -1,12 +1,13 @@ Name: scim-hangul Version: 0.2.0 -Release: 5.1%{?dist} +Release: 5.%{?dist}.1 License: GPL URL: http://www.scim-im.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildRequires: scim-devel >= 1.2.0 Source0: http://prdownloads.sourceforge.net/scim/%{name}-%{version}.tar.gz +Patch0: scim-hangul-0.2.0-ignore-invisible-char.patch Summary: Hangul Input Method Engine for SCIM @@ -17,11 +18,12 @@ %prep %setup -q -n %{name}-%{version} +%patch0 -p1 -b .invisible-char %build %configure --disable-static -make %{?_smp_mflags} +make %{?_smp_mflags} %install @@ -47,11 +49,16 @@ %changelog +* Fri Sep 2 2005 Akira TAGOH - 0.2.0-5.fc3.1 +- scim-hangul-0.2.0-ignore-invisible-char.patch: backported from Core to fix + the problem with 3bul Yetgeul. +- correct Release. it has to be greater than the previous Release. + * Wed Aug 24 2005 Ryo Dairiki - 0.2.0-5.1 - Minor fixes on spec file -* Tue Aug 23 2005 Akira TAGOH - 0.2.0-5.fc4 -- Imported for FC-4. +* Tue Aug 23 2005 Akira TAGOH - 0.2.0-5.fc3 +- Imported for FC-3. * Tue Aug 16 2005 Akira TAGOH - 0.2.0-4.fc5 - Rebuild. From fedora-extras-commits at redhat.com Fri Sep 2 01:38:48 2005 From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh)) Date: Thu, 1 Sep 2005 21:38:48 -0400 Subject: rpms/scim-hangul/FC-3 scim-hangul.spec,1.6,1.7 Message-ID: <200509020138.j821cmqS000647@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/extras/rpms/scim-hangul/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv628 Modified Files: scim-hangul.spec Log Message: Index: scim-hangul.spec =================================================================== RCS file: /cvs/extras/rpms/scim-hangul/FC-3/scim-hangul.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- scim-hangul.spec 2 Sep 2005 01:30:37 -0000 1.6 +++ scim-hangul.spec 2 Sep 2005 01:38:46 -0000 1.7 @@ -1,6 +1,6 @@ Name: scim-hangul Version: 0.2.0 -Release: 5.%{?dist}.1 +Release: 5%{?dist}.1 License: GPL URL: http://www.scim-im.org/ From fedora-extras-commits at redhat.com Fri Sep 2 01:56:57 2005 From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh)) Date: Thu, 1 Sep 2005 21:56:57 -0400 Subject: rpms/scim-hangul/FC-4 scim-hangul.spec,1.5,1.6 Message-ID: <200509020156.j821uvr7000776@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/extras/rpms/scim-hangul/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv757 Modified Files: scim-hangul.spec Log Message: * Fri Sep 2 2005 Akira TAGOH - 0.2.0-5.2 - scim-hangul-0.2.0-ignore-invisible-char.patch: backported from Core to fix the problem with 3bul Yetgeul. - correct Release. it has to be greater than the previous Release. Index: scim-hangul.spec =================================================================== RCS file: /cvs/extras/rpms/scim-hangul/FC-4/scim-hangul.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- scim-hangul.spec 25 Aug 2005 14:25:07 -0000 1.5 +++ scim-hangul.spec 2 Sep 2005 01:56:55 -0000 1.6 @@ -1,12 +1,13 @@ Name: scim-hangul Version: 0.2.0 -Release: 5.1%{?dist} +Release: 5%{?dist}.2 License: GPL URL: http://www.scim-im.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildRequires: scim-devel >= 1.2.0 Source0: http://prdownloads.sourceforge.net/scim/%{name}-%{version}.tar.gz +Patch0: scim-hangul-0.2.0-ignore-invisible-char.patch Summary: Hangul Input Method Engine for SCIM @@ -17,11 +18,12 @@ %prep %setup -q -n %{name}-%{version} +%patch0 -p1 -b .invisible-char %build %configure --disable-static -make %{?_smp_mflags} +make %{?_smp_mflags} %install @@ -47,11 +49,16 @@ %changelog +* Fri Sep 2 2005 Akira TAGOH - 0.2.0-5.2 +- scim-hangul-0.2.0-ignore-invisible-char.patch: backported from Core to fix + the problem with 3bul Yetgeul. +- correct Release. it has to be greater than the previous Release. + * Wed Aug 24 2005 Ryo Dairiki - 0.2.0-5.1 - Minor fixes on spec file -* Tue Aug 23 2005 Akira TAGOH - 0.2.0-5.fc4 -- Imported for FC-4. +* Tue Aug 23 2005 Akira TAGOH - 0.2.0-5 +- Imported into Extras. * Tue Aug 16 2005 Akira TAGOH - 0.2.0-4.fc5 - Rebuild. From fedora-extras-commits at redhat.com Fri Sep 2 01:58:19 2005 From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh)) Date: Thu, 1 Sep 2005 21:58:19 -0400 Subject: rpms/scim-hangul/FC-3 scim-hangul.spec,1.7,1.8 Message-ID: <200509020158.j821wJPn000801@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/extras/rpms/scim-hangul/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv782 Modified Files: scim-hangul.spec Log Message: Index: scim-hangul.spec =================================================================== RCS file: /cvs/extras/rpms/scim-hangul/FC-3/scim-hangul.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- scim-hangul.spec 2 Sep 2005 01:38:46 -0000 1.7 +++ scim-hangul.spec 2 Sep 2005 01:58:17 -0000 1.8 @@ -1,6 +1,6 @@ Name: scim-hangul Version: 0.2.0 -Release: 5%{?dist}.1 +Release: 5%{?dist}.2 License: GPL URL: http://www.scim-im.org/ @@ -49,7 +49,7 @@ %changelog -* Fri Sep 2 2005 Akira TAGOH - 0.2.0-5.fc3.1 +* Fri Sep 2 2005 Akira TAGOH - 0.2.0-5.2 - scim-hangul-0.2.0-ignore-invisible-char.patch: backported from Core to fix the problem with 3bul Yetgeul. - correct Release. it has to be greater than the previous Release. @@ -57,8 +57,8 @@ * Wed Aug 24 2005 Ryo Dairiki - 0.2.0-5.1 - Minor fixes on spec file -* Tue Aug 23 2005 Akira TAGOH - 0.2.0-5.fc3 -- Imported for FC-3. +* Tue Aug 23 2005 Akira TAGOH - 0.2.0-5 +- Imported into Extras. * Tue Aug 16 2005 Akira TAGOH - 0.2.0-4.fc5 - Rebuild. From fedora-extras-commits at redhat.com Fri Sep 2 02:55:45 2005 From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh)) Date: Thu, 1 Sep 2005 22:55:45 -0400 Subject: rpms/scim-hangul/FC-4 scim-hangul-0.2.0-ignore-invisible-char.patch, NONE, 1.1 Message-ID: <200509020255.j822tjIN002299@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/extras/rpms/scim-hangul/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2279 Added Files: scim-hangul-0.2.0-ignore-invisible-char.patch Log Message: scim-hangul-0.2.0-ignore-invisible-char.patch: --- NEW FILE scim-hangul-0.2.0-ignore-invisible-char.patch --- diff -ruN --exclude .libs --exclude .deps --exclude 'stamp*' --exclude '*.la' --exclude mozilla --exclude '*o' --exclude POTFILES --exclude '*spec' --exclude 'Makefile*' --exclude 'config*' --exclude libtool scim-hangul-0.2.0.orig/src/hangulinputcontext.c scim-hangul-0.2.0/src/hangulinputcontext.c --- scim-hangul-0.2.0.orig/src/hangulinputcontext.c 2004-12-27 14:19:31.000000000 +0900 +++ scim-hangul-0.2.0/src/hangulinputcontext.c 2005-08-25 13:57:43.000000000 +0900 @@ -93,6 +93,10 @@ { int n = 0; + if (!buffer->choseong && !buffer->jungseong && !buffer->jongseong) { + buf[0] = L'\0'; + return 0; + } if (buffer->choseong) { buf[n++] = buffer->choseong; } else { From fedora-extras-commits at redhat.com Fri Sep 2 06:43:42 2005 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Fri, 2 Sep 2005 02:43:42 -0400 Subject: rpms/BibTool - New directory Message-ID: <200509020643.j826hgTH008560@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/BibTool In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8540/BibTool Log Message: Directory /cvs/extras/rpms/BibTool added to the repository From fedora-extras-commits at redhat.com Fri Sep 2 06:43:42 2005 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Fri, 2 Sep 2005 02:43:42 -0400 Subject: rpms/BibTool/devel - New directory Message-ID: <200509020643.j826hgTu008565@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/BibTool/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8540/BibTool/devel Log Message: Directory /cvs/extras/rpms/BibTool/devel added to the repository From fedora-extras-commits at redhat.com Fri Sep 2 06:44:00 2005 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Fri, 2 Sep 2005 02:44:00 -0400 Subject: rpms/BibTool Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200509020644.j826i0Q6008614@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/BibTool In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8585 Added Files: Makefile import.log Log Message: Setup of module BibTool --- NEW FILE Makefile --- # Top level Makefile for module BibTool all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Fri Sep 2 06:44:00 2005 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Fri, 2 Sep 2005 02:44:00 -0400 Subject: rpms/BibTool/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200509020644.j826i0DT008619@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/BibTool/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8585/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module BibTool --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Fri Sep 2 06:44:45 2005 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Fri, 2 Sep 2005 02:44:45 -0400 Subject: rpms/BibTool import.log,1.1,1.2 Message-ID: <200509020645.j826jFLE008702@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/BibTool In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8658 Modified Files: import.log Log Message: auto-import BibTool-2.48-3 on branch devel from BibTool-2.48-3.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/BibTool/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 2 Sep 2005 06:43:58 -0000 1.1 +++ import.log 2 Sep 2005 06:44:42 -0000 1.2 @@ -0,0 +1 @@ +BibTool-2_48-3:HEAD:BibTool-2.48-3.src.rpm:1125643280 From fedora-extras-commits at redhat.com Fri Sep 2 06:44:45 2005 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Fri, 2 Sep 2005 02:44:45 -0400 Subject: rpms/BibTool/devel BibTool.spec, NONE, 1.1 bibtool-AutoConf-makefile.in-honor_DESTDIR.diff, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200509020644.j826ijDY008693@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/BibTool/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8658/devel Modified Files: .cvsignore sources Added Files: BibTool.spec bibtool-AutoConf-makefile.in-honor_DESTDIR.diff Log Message: auto-import BibTool-2.48-3 on branch devel from BibTool-2.48-3.src.rpm --- NEW FILE BibTool.spec --- Summary: A Tool for manipulating BibTeX data bases Name: BibTool Version: 2.48 Release: 3%{?dist} Group: Applications/Publishing Source: ftp://ftp.dante.de/tex-archive/biblio/bibtex/utils/bibtool/BibTool-%{version}.tar.gz URL: http://www.gerd-neugebauer.de/software/TeX/BibTool.en.html Patch: bibtool-AutoConf-makefile.in-honor_DESTDIR.diff License: GPL BuildRequires: tetex-latex BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description BibTeX provides an easy to use means to integrate citations and bibliographies into LaTeX documents. But the user is left alone with the management of the BibTeX files. The program BibTool is intended to fill this gap. BibTool allows the manipulation of BibTeX files which goes beyond the possibilities --- and intentions --- of BibTeX. %prep %setup %patch sed -i -e 's%^#!/usr/local/bin/tclsh%#!/usr/bin/tclsh%' Tcl/bibtool.tcl sed -i -e 's%^#!/usr/local/bin/perl%#!/usr/bin/perl%' Perl/bibtool.pl %build %configure --libdir=%{_datadir} make %{?_smp_mflags} make doc %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT make install-man DESTDIR=$RPM_BUILD_ROOT %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc Changes.xml COPYING INSTALL README THANKS Doc/*.dvi Perl Tcl %{_bindir}/bibtool %{_datadir}/BibTool/ %{_mandir}/man1/bibtool* %changelog * Fri Sep 2 2005 Patrice Dumas 2.48-3 - change shebangs in example scripts * Thu Jul 14 2005 Patrice Dumas 2.48-2 - update to 2.48 - use fedora template * Mon Sep 10 2001 Lenny Cartier 2.44-1mdk - added in contribs by Guillaume Rousse - first mdk release bibtool-AutoConf-makefile.in-honor_DESTDIR.diff: --- NEW FILE bibtool-AutoConf-makefile.in-honor_DESTDIR.diff --- --- AutoConf/makefile.in.save 2005-07-14 11:27:45.000000000 +0200 +++ AutoConf/makefile.in 2005-07-14 11:27:06.000000000 +0200 @@ -499,46 +499,46 @@ install: install.bin install.lib install.bin install-exec: bibtool$(EXT) - -$(INSTALL_DIR) $(BINDIR) - $(INSTALL) bibtool$(EXT) $(BINDIR) + -$(INSTALL_DIR) $(DESTDIR)$(BINDIR) + $(INSTALL) bibtool$(EXT) $(DESTDIR)$(BINDIR) INSTALL_LIB_FILES = Lib$(DIR_SEP)*.* install.lib install-data: - -$(INSTALL_DIR) $(LIBDIR) + -$(INSTALL_DIR) $(DESTDIR)$(LIBDIR) for lib in $(INSTALL_LIB_FILES); do \ - $(INSTALL_DATA) $$lib $(LIBDIR); \ + $(INSTALL_DATA) $$lib $(DESTDIR)$(LIBDIR); \ done INSTALL_INCLUDE_FILES = $(HFILES) install.include install-include: - -$(INSTALL_DIR) $(INCLUDEDIR) + -$(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR) for inc in $(INSTALL_INCLUDE_FILES); do \ - $(INSTALL_DATA) $$inc $(INCLUDEDIR); \ + $(INSTALL_DATA) $$inc $(DESTDIR)$(INCLUDEDIR); \ done install.man install-man: - -$(INSTALL_DIR) $(MANDIR)$(DIR_SEP)man$(MANSECT) + -$(INSTALL_DIR) $(DESTDIR)$(MANDIR)$(DIR_SEP)man$(MANSECT) $(INSTALL) Doc$(DIR_SEP)bibtool.1 \ - $(MANDIR)$(DIR_SEP)man$(MANSECT)$(DIR_SEP)bibtool.$(MANSECT) + $(DESTDIR)$(MANDIR)$(DIR_SEP)man$(MANSECT)$(DIR_SEP)bibtool.$(MANSECT) uninstall: uninstall.bin uninstall.lib uninstall.bin uninstall-exec: - -$(RM) $(BINDIR)$(DIR_SEP)bibtool$(EXT) + -$(RM) $(DESTDIR)$(BINDIR)$(DIR_SEP)bibtool$(EXT) uninstall.lib uninstall-data: - -$(RM) $(LIBDIR) + -$(RM) $(DESTDIR)$(LIBDIR) uninstall.include uninstall-include: - -$(RM) $(INCLUDEDIR) + -$(RM) $(DESTDIR)$(INCLUDEDIR) uninstall.man uninstall-man: - -$(RM) $(MANDIR)$(DIR_SEP)man$(MANSECT)$(DIR_SEP)bibtool.$(MANSECT) + -$(RM) $(DESTDIR)$(MANDIR)$(DIR_SEP)man$(MANSECT)$(DIR_SEP)bibtool.$(MANSECT) status: - @echo $(LIBDIR) + @echo $(DESTDIR)$(LIBDIR) # ============================================================================= # DO NOT DELETE THIS LINE -- make depend depends on it. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/BibTool/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 2 Sep 2005 06:43:58 -0000 1.1 +++ .cvsignore 2 Sep 2005 06:44:43 -0000 1.2 @@ -0,0 +1 @@ +BibTool-2.48.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/BibTool/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 2 Sep 2005 06:43:58 -0000 1.1 +++ sources 2 Sep 2005 06:44:43 -0000 1.2 @@ -0,0 +1 @@ +20ebb18ea55e5f64b67f5b8edaa0d6fa BibTool-2.48.tar.gz From fedora-extras-commits at redhat.com Fri Sep 2 07:15:21 2005 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Fri, 2 Sep 2005 03:15:21 -0400 Subject: rpms/pam_ssh/devel pam_ssh.spec,1.4,1.5 Message-ID: <200509020715.j827FLQt010204@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/pam_ssh/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10148/devel Modified Files: pam_ssh.spec Log Message: Bump release for all the branches to trigger a rebuild Index: pam_ssh.spec =================================================================== RCS file: /cvs/extras/rpms/pam_ssh/devel/pam_ssh.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- pam_ssh.spec 1 Sep 2005 18:56:06 -0000 1.4 +++ pam_ssh.spec 2 Sep 2005 07:15:18 -0000 1.5 @@ -1,6 +1,6 @@ Name: pam_ssh Version: 1.91 -Release: 8.1%{?dist} +Release: 9%{?dist} Summary: PAM module for use with SSH keys and ssh-agent Source: http://dl.sourceforge.net/sourceforge/pam-ssh/pam_ssh-%{version}.tar.bz2 URL: http://sourceforge.net/projects/pam-ssh/ @@ -52,6 +52,9 @@ %dir %{_localstatedir}/run/pam_ssh %changelog +* Fri Sep 2 2005 1.91-9 +- bump release + * Fri Aug 26 2005 1.91-8 - add --with-pam-dir switch for ./configure From fedora-extras-commits at redhat.com Fri Sep 2 07:15:15 2005 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Fri, 2 Sep 2005 03:15:15 -0400 Subject: rpms/pam_ssh/FC-3 pam_ssh.spec,1.4,1.5 Message-ID: <200509020715.j827FjhL010212@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/pam_ssh/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10148/FC-3 Modified Files: pam_ssh.spec Log Message: Bump release for all the branches to trigger a rebuild Index: pam_ssh.spec =================================================================== RCS file: /cvs/extras/rpms/pam_ssh/FC-3/pam_ssh.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- pam_ssh.spec 1 Sep 2005 09:40:09 -0000 1.4 +++ pam_ssh.spec 2 Sep 2005 07:15:13 -0000 1.5 @@ -1,6 +1,6 @@ Name: pam_ssh Version: 1.91 -Release: 8.1%{?dist} +Release: 9%{?dist} Summary: PAM module for use with SSH keys and ssh-agent Source: http://dl.sourceforge.net/sourceforge/pam-ssh/pam_ssh-%{version}.tar.bz2 URL: http://sourceforge.net/projects/pam-ssh/ @@ -52,6 +52,9 @@ %dir %{_localstatedir}/run/pam_ssh %changelog +* Fri Sep 2 2005 1.91-9 +- bump release + * Fri Aug 26 2005 1.91-8 - add --with-pam-dir switch for ./configure From fedora-extras-commits at redhat.com Fri Sep 2 07:15:15 2005 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Fri, 2 Sep 2005 03:15:15 -0400 Subject: rpms/pam_ssh/FC-4 pam_ssh.spec,1.4,1.5 Message-ID: <200509020715.j827Fj3T010215@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/pam_ssh/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10148/FC-4 Modified Files: pam_ssh.spec Log Message: Bump release for all the branches to trigger a rebuild Index: pam_ssh.spec =================================================================== RCS file: /cvs/extras/rpms/pam_ssh/FC-4/pam_ssh.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- pam_ssh.spec 1 Sep 2005 07:33:54 -0000 1.4 +++ pam_ssh.spec 2 Sep 2005 07:15:13 -0000 1.5 @@ -1,6 +1,6 @@ Name: pam_ssh Version: 1.91 -Release: 8.1%{?dist} +Release: 9%{?dist} Summary: PAM module for use with SSH keys and ssh-agent Source: http://dl.sourceforge.net/sourceforge/pam-ssh/pam_ssh-%{version}.tar.bz2 URL: http://sourceforge.net/projects/pam-ssh/ @@ -52,6 +52,9 @@ %dir %{_localstatedir}/run/pam_ssh %changelog +* Fri Sep 2 2005 1.91-9 +- bump release + * Fri Aug 26 2005 1.91-8 - add --with-pam-dir switch for ./configure From fedora-extras-commits at redhat.com Fri Sep 2 10:11:32 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Fri, 2 Sep 2005 06:11:32 -0400 Subject: owners owners.list,1.157,1.158 Message-ID: <200509021011.j82ABW1M015688@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15669 Modified Files: owners.list Log Message: take over libsidplay and xmms-sid from Panu Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.157 retrieving revision 1.158 diff -u -r1.157 -r1.158 --- owners.list 1 Sep 2005 20:55:56 -0000 1.157 +++ owners.list 2 Sep 2005 10:11:29 -0000 1.158 @@ -418,7 +418,7 @@ Fedora Extras|libsafe|For bugs related to the libsafe component|sgrubb at redhat.com|extras-qa at fedoraproject.org|wtogami at redhat.com Fedora Extras|libsamplerate|A library for performing sample rate conversion on audio|anvil at livna.org|extras-qa at fedoraproject.org| Fedora Extras|libshout|icecast source streaming library|thomas at apestaart.org|extras-qa at fedoraproject.org| -Fedora Extras|libsidplay|A Commodore 64 music player and SID chip emulator library|pmatilai at laiskiainen.org|extras-qa at fedoraproject.org| +Fedora Extras|libsidplay|A Commodore 64 music player and SID chip emulator library|bugs.michael at gmx.net|extras-qa at fedoraproject.org| Fedora Extras|libsigc++20|The Typesafe Signal Framework for C++|denisleroy at yahoo.com|extras-qa at fedoraproject.org| Fedora Extras|libsigc++|Typesafe Signal Framework for C++|compton at pcompton.com|extras-qa at fedoraproject.org| Fedora Extras|libsigsegv|Handling page faults in user mode|rdieter at math.unl.edu|extras-qa at fedoraproject.org| @@ -998,7 +998,7 @@ Fedora Extras|xmms-flac|XMMS plugin needed to play FLAC (Free Lossless Audio Codec) files|matthias at rpmforge.net|extras-qa at fedoraproject.org| Fedora Extras|xmms-lirc|Plugin to use LIRC supported infrared devices in XMMS|matthias at rpmforge.net|extras-qa at fedoraproject.org| Fedora Extras|xmms-modplug|Modplug Plugin for XMMS|ville.skytta at iki.fi|extras-qa at fedoraproject.org| -Fedora Extras|xmms-sid|SIDPlay input plugin for X MultiMedia System (XMMS)|pmatilai at laiskiainen.org|extras-qa at fedoraproject.org| +Fedora Extras|xmms-sid|SIDPlay input plugin for X MultiMedia System (XMMS)|bugs.michael at gmx.net|extras-qa at fedoraproject.org| Fedora Extras|xmms-skins|Skins for the X MultiMedia System|matthias at rpmforge.net|extras-qa at fedoraproject.org| Fedora Extras|xmms-speex|X MultiMedia System input plugin to play speex files|matthias at rpmforge.net|extras-qa at fedoraproject.org| Fedora Extras|xmms|The X MultiMedia System, a media player which resembles Winamp|matthias at rpmforge.net|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Fri Sep 2 10:45:35 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Fri, 2 Sep 2005 06:45:35 -0400 Subject: rpms/lighttpd/devel .cvsignore, 1.8, 1.9 lighttpd.spec, 1.12, 1.13 sources, 1.8, 1.9 Message-ID: <200509021045.j82AjZ1h015773@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/lighttpd/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15750 Modified Files: .cvsignore lighttpd.spec sources Log Message: Update to 1.4.3, change install to have modules still work. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/lighttpd/devel/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 30 Aug 2005 16:22:19 -0000 1.8 +++ .cvsignore 2 Sep 2005 10:45:33 -0000 1.9 @@ -1 +1 @@ -lighttpd-1.4.2.tar.gz +lighttpd-1.4.3.tar.gz Index: lighttpd.spec =================================================================== RCS file: /cvs/extras/rpms/lighttpd/devel/lighttpd.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- lighttpd.spec 30 Aug 2005 16:22:19 -0000 1.12 +++ lighttpd.spec 2 Sep 2005 10:45:33 -0000 1.13 @@ -2,7 +2,7 @@ Summary: Lightning fast webserver with light system requirements Name: lighttpd -Version: 1.4.2 +Version: 1.4.3 Release: 1%{?dist} License: BSD Group: System Environment/Daemons @@ -81,8 +81,7 @@ %install %{__rm} -rf %{buildroot} -%makeinstall \ - libdir="%{buildroot}%{_libdir}/lighttpd" +%{__make} install DESTDIR=%{buildroot} # Install included init script and sysconfig entry %{__install} -D -p -m 0755 doc/rc.lighttpd.redhat \ @@ -169,6 +168,11 @@ %changelog +* Fri Sep 2 2005 Matthias Saou 1.4.3-1 +- Update to 1.4.3. +- No longer override libdir at make install stage, use DESTDIR instead, as + the resulting binary would now have referenced to %%{buildroot} :-( + * Tue Aug 30 2005 Matthias Saou 1.4.2-1 - Update to 1.4.2. Index: sources =================================================================== RCS file: /cvs/extras/rpms/lighttpd/devel/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 30 Aug 2005 16:22:19 -0000 1.8 +++ sources 2 Sep 2005 10:45:33 -0000 1.9 @@ -1 +1 @@ -c26eea734490129a45e465ac0f327e4a lighttpd-1.4.2.tar.gz +5a08721c2ea7fbfc6790a1cf0063c8ef lighttpd-1.4.3.tar.gz From fedora-extras-commits at redhat.com Fri Sep 2 10:46:15 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Fri, 2 Sep 2005 06:46:15 -0400 Subject: rpms/inkscape/devel .cvsignore, 1.6, 1.7 inkscape.spec, 1.21, 1.22 sources, 1.6, 1.7 Message-ID: <200509021046.j82AkFJ7015844@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/inkscape/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15821 Modified Files: .cvsignore inkscape.spec sources Log Message: * Thu Sep 1 2005 Michael Schwendt - 0.42.2-1 - update to 0.42.2 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/inkscape/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 26 Jul 2005 01:09:18 -0000 1.6 +++ .cvsignore 2 Sep 2005 10:46:13 -0000 1.7 @@ -1,2 +1,2 @@ -inkscape-0.42.tar.bz2 -inkscape-0.42.tar.bz2.sig +inkscape-0.42.2.tar.bz2 +inkscape-0.42.2.tar.bz2.sig Index: inkscape.spec =================================================================== RCS file: /cvs/extras/rpms/inkscape/devel/inkscape.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- inkscape.spec 18 Aug 2005 21:56:51 -0000 1.21 +++ inkscape.spec 2 Sep 2005 10:46:13 -0000 1.22 @@ -1,6 +1,6 @@ Name: inkscape -Version: 0.42 -Release: 3%{?dist} +Version: 0.42.2 +Release: 1%{?dist} Summary: Vector-based drawing program using SVG Group: Applications/Productivity @@ -104,6 +104,9 @@ %changelog +* Thu Sep 1 2005 Michael Schwendt - 0.42.2-1 +- update to 0.42.2 + * Thu Aug 18 2005 Michael Schwendt - 0.42-3 - rebuilt - add patch to repair link-check of GC >= 6.5 (needs pthread and dl) Index: sources =================================================================== RCS file: /cvs/extras/rpms/inkscape/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 26 Jul 2005 01:09:18 -0000 1.6 +++ sources 2 Sep 2005 10:46:13 -0000 1.7 @@ -1,2 +1,2 @@ -4af587b942647bf9e27861e2238844c8 inkscape-0.42.tar.bz2 -e0a299ff70044fd9a424961bd3ad8c13 inkscape-0.42.tar.bz2.sig +a27172087018e850e92e97e52b5dad08 inkscape-0.42.2.tar.bz2 +40858e2f3f205525929076c9cb3ea075 inkscape-0.42.2.tar.bz2.sig From fedora-extras-commits at redhat.com Fri Sep 2 10:54:48 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Fri, 2 Sep 2005 06:54:48 -0400 Subject: owners owners.list,1.158,1.159 Message-ID: <200509021054.j82Asm9K015917@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15898 Modified Files: owners.list Log Message: wesnoth (Battle for Wesnoth) is without maintainer, although I've developed the package further some time for Panu -- might continue up to 1.0 Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.158 retrieving revision 1.159 diff -u -r1.158 -r1.159 --- owners.list 2 Sep 2005 10:11:29 -0000 1.158 +++ owners.list 2 Sep 2005 10:54:45 -0000 1.159 @@ -947,7 +947,7 @@ Fedora Extras|w3c-markup-validator|W3C Markup Validator|ville.skytta at iki.fi|extras-qa at fedoraproject.org| Fedora Extras|w3m-el|W3m interface for Emacs|tagoh at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|wbxml2|Library and tools to parse, encode and handle WBXML documents|pmatilai at laiskiainen.org|extras-qa at fedoraproject.org| -Fedora Extras|wesnoth|Battle for Wesnoth is a fantasy turn-based strategy game|pmatilai at laiskiainen.org|extras-qa at fedoraproject.org| +Fedora Extras|wesnoth|Battle for Wesnoth is a fantasy turn-based strategy game|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|bugs.michael at gmx.net Fedora Extras|whowatch|Displays informations about the users currently logged in|nos at utelsystems.com|extras-qa at fedoraproject.org| Fedora Extras|WindowMaker|A fast, feature rich Window manager|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org| Fedora Extras|wine|A Windows 16/32 bit emulator|pmatilai at laiskiainen.org|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Fri Sep 2 11:15:35 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Fri, 2 Sep 2005 07:15:35 -0400 Subject: rpms/glibmm24/devel glibmm.spec,1.5,1.6 Message-ID: <200509021115.j82BFZOo017260@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/glibmm24/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17241 Modified Files: glibmm.spec Log Message: * Fri Sep 2 2005 Michael Schwendt - 2.6.1-2 - rebuild for gcc-c++-4.0.1-12 result for GLIBMM_CXX_ALLOWS_STATIC_INLINE_NPOS check changed Index: glibmm.spec =================================================================== RCS file: /cvs/extras/rpms/glibmm24/devel/glibmm.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- glibmm.spec 28 Apr 2005 22:31:10 -0000 1.5 +++ glibmm.spec 2 Sep 2005 11:15:33 -0000 1.6 @@ -1,7 +1,6 @@ Name: glibmm24 Version: 2.6.1 -Release: 1 - +Release: 2 Summary: C++ interface for GTK2 (a GUI library for X) Group: System Environment/Libraries @@ -78,6 +77,10 @@ %{_datadir}/aclocal/*.m4 %changelog +* Fri Sep 2 2005 Michael Schwendt - 2.6.1-2 +- rebuild for gcc-c++-4.0.1-12 + result for GLIBMM_CXX_ALLOWS_STATIC_INLINE_NPOS check changed + * Sat Apr 9 2005 Denis Leroy - 2.6.1-1 - Update to version 2.6.1 From fedora-extras-commits at redhat.com Fri Sep 2 12:16:22 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Fri, 2 Sep 2005 08:16:22 -0400 Subject: rpms/lyx/FC-3 find_helpers.sh,NONE,1.1 lyx.spec,1.9,1.10 Message-ID: <200509021216.j82CGMi8018758@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/lyx/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18708/FC-3 Modified Files: lyx.spec Added Files: find_helpers.sh Log Message: * Fri Sep 02 2005 Rex Dieter 1.3.6-4 - leave out kde-redhat bits in Fedora Extras build - define/use safer (esp for x86_64) QTDIR bits ***** Error reading new file: [Errno 2] No such file or directory: 'find_helpers.sh' Index: lyx.spec =================================================================== RCS file: /cvs/extras/rpms/lyx/FC-3/lyx.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- lyx.spec 23 Aug 2005 15:13:10 -0000 1.9 +++ lyx.spec 2 Sep 2005 12:16:20 -0000 1.10 @@ -2,7 +2,7 @@ Summary: WYSIWYM (What You See Is What You Mean) document processor Name: lyx Version: 1.3.6 -Release: 4%{?dist} +Release: 4%{?dist}%{?kde} License: GPL Group: Applications/Publishing @@ -16,6 +16,10 @@ # "borrow" kde's crystal icon for lyx Source2: lyx-crystal.png +# TODO: use this find_helpers.sh script at runtime, instead of depending on +# lyx's configure and %%triggers +Source10: find_helpers.sh + BuildRequires: desktop-file-utils BuildRequires: aiksaurus-devel BuildRequires: aspell-devel @@ -35,8 +39,11 @@ Requires: htmlview BuildRequires: qt-devel >= 1:3.3 -%define qt_ver %(rpm -q --qf '%%{version}' qt-devel ) +%if "%{?kde}" != "%{nil}" +# kde-redhat crud, not needed in Fedora Extras +%define qt_ver %{expand:%%(rpm -q --qf '%%{VERSION}' qt-devel )} Requires: qt >= 1:%{qt_ver} +%endif %description @@ -65,8 +72,10 @@ %build -unset LINGUAS ||: -unset QTDIR ||: ; . /etc/profile.d/qt.sh +test -f /etc/profile.d/qt.sh && unset QTDIR || : ; . /etc/profile.d/qt.sh +export QTLIB=${QTDIR}/lib;QTINC=${QTDIR}/include + +unset LINGUAS ||: %{?gcc296: export CXXFLAGS="$RPM_OPT_FLAGS -ftemplate-depth-44" } @@ -95,7 +104,7 @@ mv ${RPM_BUILD_ROOT}%{_datadir}/lyx/tex \ ${RPM_BUILD_ROOT}${texmf}/tex/latex/lyx -# KDE has a nice builtin crystalsvg icon, but this is for gnome's benefit +# KDE already has a nice builtin crystalsvg icon, but this is for gnome's benefit install -p -m644 -D %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/pixmaps/lyx.png mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications @@ -152,7 +161,11 @@ %changelog -* Fri Aug 05 2005 Rex Dieter 1.3.6-4 +* Fri Sep 02 2005 Rex Dieter 1.3.6-4 +- leave out kde-redhat bits in Fedora Extras build +- define/use safer (esp for x86_64) QTDIR bits + +* Fri Aug 05 2005 Rex Dieter 1.3.6-3 - touchup helpers script - fix for (sometimes missing) PSres.upr From fedora-extras-commits at redhat.com Fri Sep 2 12:16:23 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Fri, 2 Sep 2005 08:16:23 -0400 Subject: rpms/lyx/devel find_helpers.sh,NONE,1.1 lyx.spec,1.13,1.14 Message-ID: <200509021216.j82CGNkf018770@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/lyx/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18708/devel Modified Files: lyx.spec Added Files: find_helpers.sh Log Message: * Fri Sep 02 2005 Rex Dieter 1.3.6-4 - leave out kde-redhat bits in Fedora Extras build - define/use safer (esp for x86_64) QTDIR bits ***** Error reading new file: [Errno 2] No such file or directory: 'find_helpers.sh' Index: lyx.spec =================================================================== RCS file: /cvs/extras/rpms/lyx/devel/lyx.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- lyx.spec 23 Aug 2005 15:13:09 -0000 1.13 +++ lyx.spec 2 Sep 2005 12:16:21 -0000 1.14 @@ -2,7 +2,7 @@ Summary: WYSIWYM (What You See Is What You Mean) document processor Name: lyx Version: 1.3.6 -Release: 4%{?dist} +Release: 4%{?dist}%{?kde} License: GPL Group: Applications/Publishing @@ -16,6 +16,10 @@ # "borrow" kde's crystal icon for lyx Source2: lyx-crystal.png +# TODO: use this find_helpers.sh script at runtime, instead of depending on +# lyx's configure and %%triggers +Source10: find_helpers.sh + BuildRequires: desktop-file-utils BuildRequires: aiksaurus-devel BuildRequires: aspell-devel @@ -35,8 +39,11 @@ Requires: htmlview BuildRequires: qt-devel >= 1:3.3 -%define qt_ver %(rpm -q --qf '%%{version}' qt-devel ) +%if "%{?kde}" != "%{nil}" +# kde-redhat crud, not needed in Fedora Extras +%define qt_ver %{expand:%%(rpm -q --qf '%%{VERSION}' qt-devel )} Requires: qt >= 1:%{qt_ver} +%endif %description @@ -65,8 +72,10 @@ %build -unset LINGUAS ||: -unset QTDIR ||: ; . /etc/profile.d/qt.sh +test -f /etc/profile.d/qt.sh && unset QTDIR || : ; . /etc/profile.d/qt.sh +export QTLIB=${QTDIR}/lib;QTINC=${QTDIR}/include + +unset LINGUAS ||: %{?gcc296: export CXXFLAGS="$RPM_OPT_FLAGS -ftemplate-depth-44" } @@ -95,7 +104,7 @@ mv ${RPM_BUILD_ROOT}%{_datadir}/lyx/tex \ ${RPM_BUILD_ROOT}${texmf}/tex/latex/lyx -# KDE has a nice builtin crystalsvg icon, but this is for gnome's benefit +# KDE already has a nice builtin crystalsvg icon, but this is for gnome's benefit install -p -m644 -D %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/pixmaps/lyx.png mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications @@ -152,7 +161,11 @@ %changelog -* Fri Aug 05 2005 Rex Dieter 1.3.6-4 +* Fri Sep 02 2005 Rex Dieter 1.3.6-4 +- leave out kde-redhat bits in Fedora Extras build +- define/use safer (esp for x86_64) QTDIR bits + +* Fri Aug 05 2005 Rex Dieter 1.3.6-3 - touchup helpers script - fix for (sometimes missing) PSres.upr From fedora-extras-commits at redhat.com Fri Sep 2 12:16:22 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Fri, 2 Sep 2005 08:16:22 -0400 Subject: rpms/lyx/FC-4 find_helpers.sh,NONE,1.1 lyx.spec,1.12,1.13 Message-ID: <200509021216.j82CGMhv018764@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/lyx/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18708/FC-4 Modified Files: lyx.spec Added Files: find_helpers.sh Log Message: * Fri Sep 02 2005 Rex Dieter 1.3.6-4 - leave out kde-redhat bits in Fedora Extras build - define/use safer (esp for x86_64) QTDIR bits ***** Error reading new file: [Errno 2] No such file or directory: 'find_helpers.sh' Index: lyx.spec =================================================================== RCS file: /cvs/extras/rpms/lyx/FC-4/lyx.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- lyx.spec 23 Aug 2005 15:13:09 -0000 1.12 +++ lyx.spec 2 Sep 2005 12:16:20 -0000 1.13 @@ -2,7 +2,7 @@ Summary: WYSIWYM (What You See Is What You Mean) document processor Name: lyx Version: 1.3.6 -Release: 4%{?dist} +Release: 4%{?dist}%{?kde} License: GPL Group: Applications/Publishing @@ -16,6 +16,10 @@ # "borrow" kde's crystal icon for lyx Source2: lyx-crystal.png +# TODO: use this find_helpers.sh script at runtime, instead of depending on +# lyx's configure and %%triggers +Source10: find_helpers.sh + BuildRequires: desktop-file-utils BuildRequires: aiksaurus-devel BuildRequires: aspell-devel @@ -35,8 +39,11 @@ Requires: htmlview BuildRequires: qt-devel >= 1:3.3 -%define qt_ver %(rpm -q --qf '%%{version}' qt-devel ) +%if "%{?kde}" != "%{nil}" +# kde-redhat crud, not needed in Fedora Extras +%define qt_ver %{expand:%%(rpm -q --qf '%%{VERSION}' qt-devel )} Requires: qt >= 1:%{qt_ver} +%endif %description @@ -65,8 +72,10 @@ %build -unset LINGUAS ||: -unset QTDIR ||: ; . /etc/profile.d/qt.sh +test -f /etc/profile.d/qt.sh && unset QTDIR || : ; . /etc/profile.d/qt.sh +export QTLIB=${QTDIR}/lib;QTINC=${QTDIR}/include + +unset LINGUAS ||: %{?gcc296: export CXXFLAGS="$RPM_OPT_FLAGS -ftemplate-depth-44" } @@ -95,7 +104,7 @@ mv ${RPM_BUILD_ROOT}%{_datadir}/lyx/tex \ ${RPM_BUILD_ROOT}${texmf}/tex/latex/lyx -# KDE has a nice builtin crystalsvg icon, but this is for gnome's benefit +# KDE already has a nice builtin crystalsvg icon, but this is for gnome's benefit install -p -m644 -D %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/pixmaps/lyx.png mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications @@ -152,7 +161,11 @@ %changelog -* Fri Aug 05 2005 Rex Dieter 1.3.6-4 +* Fri Sep 02 2005 Rex Dieter 1.3.6-4 +- leave out kde-redhat bits in Fedora Extras build +- define/use safer (esp for x86_64) QTDIR bits + +* Fri Aug 05 2005 Rex Dieter 1.3.6-3 - touchup helpers script - fix for (sometimes missing) PSres.upr From fedora-extras-commits at redhat.com Fri Sep 2 12:34:43 2005 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Fri, 2 Sep 2005 08:34:43 -0400 Subject: owners owners.list,1.159,1.160 Message-ID: <200509021234.j82CYhHp018853@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18834 Modified Files: owners.list Log Message: New packages: perl-Carp-Assert-More perl-HTML-Scrubber perl-Module-Versions-Report perl-Text-WikiFormat Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.159 retrieving revision 1.160 diff -u -r1.159 -r1.160 --- owners.list 2 Sep 2005 10:54:45 -0000 1.159 +++ owners.list 2 Sep 2005 12:34:41 -0000 1.160 @@ -555,6 +555,7 @@ Fedora Extras|perl-Cache-Cache|Cache-Cache module for perl|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Cache-Simple-TimedExpiry|Cache::Simple::TimedExpiry Perl module|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Carp-Assert|Executable comments|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-Carp-Assert-More|Convenience wrappers around Carp::Assert|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-CGI-Simple|Simple totally OO CGI interface that is CGI.pm compliant|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-CGI-Untaint|Process CGI input parameters|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-CGI-Untaint-date|Validate a date|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com @@ -610,6 +611,7 @@ Fedora Extras|perl-Gtk2|Perl interface to the 2.x series of the Gimp Toolkit library|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Heap|A collection of routines for managing a heap data structure|thm at duke.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-HTML-Format|HTML formatter modules|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-HTML-Scrubber|Library for scrubbing/sanitizing html|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-HTML-Template|Perl module to use HTML Templates|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-HTML-Template-Expr|Expression support extension for HTML::Template|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-HTML-Tree|HTML tree handling modules for Perl|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com @@ -647,6 +649,7 @@ Fedora Extras|perl-Module-CoreList|Perl core modules indexed by perl versions|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Module-Refresh|Refresh %INC files when updated on disk|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Module-Signature|CPAN signature management utilities and modules|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-Module-Versions-Report|Report versions of all modules in memory|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Net-CIDR-Lite|Net::CIDR::Lite perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Net-IP|Perl module for manipulation of IPv4 and IPv6 addresses|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Net-Netmask|Perl module for manipulation and lookup of IP network blocks|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com @@ -697,6 +700,7 @@ Fedora Extras|perl-Text-Reform|Manual text wrapping and reformatting|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Text-Shellwords|A thin wrapper around the shellwords.pl package|thm at duke.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Text-Template|Expand template text with embedded Perl|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-Text-WikiFormat|Translate Wiki formatted text into other formats|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Text-Wrapper|Simple word wrapping perl module|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perltidy|Tool for indenting and reformatting Perl scripts|ville.skytta at iki.fi|extras-qa at fedoraproject.org| Fedora Extras|perl-Tie-DBI|Tie hashes to DBI relational databases|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com From fedora-extras-commits at redhat.com Fri Sep 2 14:35:14 2005 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Fri, 2 Sep 2005 10:35:14 -0400 Subject: rpms/freeciv/devel .cvsignore, 1.7, 1.8 freeciv.spec, 1.14, 1.15 sources, 1.7, 1.8 Message-ID: <200509021435.j82EZEHj021647@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/freeciv/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21624 Modified Files: .cvsignore freeciv.spec sources Log Message: * Fri Sep 2 2005 Brian Pepple - 2.0.5-3 - Update to 2.0.5. - Enable debug info. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/freeciv/devel/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 29 Jul 2005 16:00:46 -0000 1.7 +++ .cvsignore 2 Sep 2005 14:35:12 -0000 1.8 @@ -1,2 +1,2 @@ -freeciv-2.0.4.tar.bz2 +freeciv-2.0.5.tar.bz2 stdsounds3.tar.gz Index: freeciv.spec =================================================================== RCS file: /cvs/extras/rpms/freeciv/devel/freeciv.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- freeciv.spec 17 Aug 2005 00:01:45 -0000 1.14 +++ freeciv.spec 2 Sep 2005 14:35:12 -0000 1.15 @@ -1,6 +1,6 @@ Name: freeciv -Version: 2.0.4 -Release: 4%{?dist} +Version: 2.0.5 +Release: 3%{?dist} Summary: The Freeciv multi-player strategy game Group: Amusements/Games @@ -39,8 +39,7 @@ %patch2 -p0 -b .aifill %build -%configure --enable-debug=no \ - --enable-client=gtk2 +%configure --enable-client=gtk2 make %{?_smp_mflags} %install @@ -91,6 +90,10 @@ %{_mandir}/man6/civclient.6.gz %changelog +* Fri Sep 2 2005 Brian Pepple - 2.0.5-3 +- Update to 2.0.5. +- Enable debug info. + * Tue Aug 16 2005 Brian Pepple - 2.0.4-4 - Rebuild for cairo dep. Index: sources =================================================================== RCS file: /cvs/extras/rpms/freeciv/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 29 Jul 2005 16:00:46 -0000 1.7 +++ sources 2 Sep 2005 14:35:12 -0000 1.8 @@ -1,2 +1,2 @@ -833befa003eefda244f49d349bdb585c freeciv-2.0.4.tar.bz2 +cc224a166f914b3404291c6fe997f90a freeciv-2.0.5.tar.bz2 77215914712f2f351092918f5e41e39e stdsounds3.tar.gz From fedora-extras-commits at redhat.com Fri Sep 2 14:36:50 2005 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Fri, 2 Sep 2005 10:36:50 -0400 Subject: rpms/freeciv/FC-4 .cvsignore, 1.7, 1.8 freeciv.spec, 1.12, 1.13 sources, 1.7, 1.8 Message-ID: <200509021436.j82EaoKc021726@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/freeciv/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21703 Modified Files: .cvsignore freeciv.spec sources Log Message: * Fri Sep 2 2005 Brian Pepple - 2.0.5-2 - Updateto 2.0.5. - Enable debug info. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/freeciv/FC-4/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 29 Jul 2005 16:17:22 -0000 1.7 +++ .cvsignore 2 Sep 2005 14:36:47 -0000 1.8 @@ -1,2 +1,2 @@ -freeciv-2.0.4.tar.bz2 +freeciv-2.0.5.tar.bz2 stdsounds3.tar.gz Index: freeciv.spec =================================================================== RCS file: /cvs/extras/rpms/freeciv/FC-4/freeciv.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- freeciv.spec 29 Jul 2005 16:17:22 -0000 1.12 +++ freeciv.spec 2 Sep 2005 14:36:47 -0000 1.13 @@ -1,6 +1,6 @@ Name: freeciv -Version: 2.0.4 -Release: 1%{?dist} +Version: 2.0.5 +Release: 2%{?dist} Summary: The Freeciv multi-player strategy game Group: Amusements/Games @@ -39,8 +39,7 @@ %patch2 -p0 -b .aifill %build -%configure --enable-debug=no \ - --enable-client=gtk2 +%configure --enable-client=gtk2 make %{?_smp_mflags} %install @@ -91,6 +90,10 @@ %{_mandir}/man6/civclient.6.gz %changelog +* Fri Sep 2 2005 Brian Pepple - 2.0.5-2 +- Updateto 2.0.5. +- Enable debug info. + * Thu Jul 28 2005 Brian Pepple - 2.0.4-1 - Update to 2.0.4. - Use new stdsounds. Index: sources =================================================================== RCS file: /cvs/extras/rpms/freeciv/FC-4/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 29 Jul 2005 16:17:22 -0000 1.7 +++ sources 2 Sep 2005 14:36:48 -0000 1.8 @@ -1,2 +1,2 @@ -833befa003eefda244f49d349bdb585c freeciv-2.0.4.tar.bz2 +cc224a166f914b3404291c6fe997f90a freeciv-2.0.5.tar.bz2 77215914712f2f351092918f5e41e39e stdsounds3.tar.gz From fedora-extras-commits at redhat.com Fri Sep 2 22:28:12 2005 From: fedora-extras-commits at redhat.com (Marc Maurer (uwog)) Date: Fri, 2 Sep 2005 18:28:12 -0400 Subject: rpms/abiword/devel abiword.spec,1.15,1.16 Message-ID: <200509022228.j82MSiwN002668@cvs-int.fedora.redhat.com> Author: uwog Update of /cvs/extras/rpms/abiword/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2649 Modified Files: abiword.spec Log Message: Enable the abimathview plugin Index: abiword.spec =================================================================== RCS file: /cvs/extras/rpms/abiword/devel/abiword.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- abiword.spec 21 Aug 2005 12:40:16 -0000 1.15 +++ abiword.spec 2 Sep 2005 22:28:08 -0000 1.16 @@ -3,7 +3,7 @@ Summary: The AbiWord word processor Name: abiword Version: 2.3.5 -Release: 1 +Release: 2 Epoch: 1 Group: Applications/Editors License: GPL @@ -32,6 +32,7 @@ BuildRequires: libwmf-devel BuildRequires: aiksaurus-gtk-devel >= 1.2.1 BuildRequires: link-grammar-devel >= 4.1.3 +BuildRequires: gtkmathview >= 0.7.3 # gnome build deps BuildRequires: libbonobo-devel @@ -66,7 +67,7 @@ cd ../abiword-plugins libtoolize --copy --force ./nextgen.sh -%configure --disable-gda --disable-abimathview --with-abiword=../abi +%configure --disable-gda --with-abiword=../abi sed 's/^predep_objects=.*/predep_objects=\"\"/' < libtool > libtool.foo sed 's/^postdep_objects=.*/postdep_objects=\"\"/' < libtool.foo > libtool make @@ -132,6 +133,9 @@ %{_datadir}/icons/*png %changelog +* Sat Sep 3 2005 Marc Maurer - 1:2.3.5-1 +- Enable the abimathview plugin + * Sun Aug 21 2005 Marc Maurer - 1:2.3.5-1 - Update to 2.3.5 From fedora-extras-commits at redhat.com Fri Sep 2 22:30:23 2005 From: fedora-extras-commits at redhat.com (Marc Maurer (uwog)) Date: Fri, 2 Sep 2005 18:30:23 -0400 Subject: rpms/abiword/devel abiword.spec,1.16,1.17 Message-ID: <200509022230.j82MUNVg002723@cvs-int.fedora.redhat.com> Author: uwog Update of /cvs/extras/rpms/abiword/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2704 Modified Files: abiword.spec Log Message: rebuild Index: abiword.spec =================================================================== RCS file: /cvs/extras/rpms/abiword/devel/abiword.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- abiword.spec 2 Sep 2005 22:28:08 -0000 1.16 +++ abiword.spec 2 Sep 2005 22:30:21 -0000 1.17 @@ -3,7 +3,7 @@ Summary: The AbiWord word processor Name: abiword Version: 2.3.5 -Release: 2 +Release: 3 Epoch: 1 Group: Applications/Editors License: GPL @@ -133,7 +133,10 @@ %{_datadir}/icons/*png %changelog -* Sat Sep 3 2005 Marc Maurer - 1:2.3.5-1 +* Sat Sep 3 2005 Marc Maurer - 1:2.3.5-3 +- Rebuild + +* Sat Sep 3 2005 Marc Maurer - 1:2.3.5-2 - Enable the abimathview plugin * Sun Aug 21 2005 Marc Maurer - 1:2.3.5-1 From fedora-extras-commits at redhat.com Fri Sep 2 22:45:33 2005 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Fri, 2 Sep 2005 18:45:33 -0400 Subject: rpms/perl-Locale-Maketext-Fuzzy - New directory Message-ID: <200509022245.j82MjX8d002860@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Locale-Maketext-Fuzzy In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2836/perl-Locale-Maketext-Fuzzy Log Message: Directory /cvs/extras/rpms/perl-Locale-Maketext-Fuzzy added to the repository From fedora-extras-commits at redhat.com Fri Sep 2 22:45:34 2005 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Fri, 2 Sep 2005 18:45:34 -0400 Subject: rpms/perl-Locale-Maketext-Fuzzy/devel - New directory Message-ID: <200509022245.j82MjYHm002865@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Locale-Maketext-Fuzzy/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2836/perl-Locale-Maketext-Fuzzy/devel Log Message: Directory /cvs/extras/rpms/perl-Locale-Maketext-Fuzzy/devel added to the repository From fedora-extras-commits at redhat.com Fri Sep 2 22:45:51 2005 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Fri, 2 Sep 2005 18:45:51 -0400 Subject: rpms/perl-Locale-Maketext-Fuzzy Makefile, NONE, 1.1 import.log, NONE, 1.1 Message-ID: <200509022245.j82MjpCa002916@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Locale-Maketext-Fuzzy In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2881 Added Files: Makefile import.log Log Message: Setup of module perl-Locale-Maketext-Fuzzy --- NEW FILE Makefile --- # Top level Makefile for module perl-Locale-Maketext-Fuzzy all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Fri Sep 2 22:45:52 2005 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Fri, 2 Sep 2005 18:45:52 -0400 Subject: rpms/perl-Locale-Maketext-Fuzzy/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200509022245.j82MjqnY002921@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Locale-Maketext-Fuzzy/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2881/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-Locale-Maketext-Fuzzy --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Fri Sep 2 22:46:25 2005 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Fri, 2 Sep 2005 18:46:25 -0400 Subject: rpms/perl-Locale-Maketext-Fuzzy import.log,1.1,1.2 Message-ID: <200509022246.j82MkP52002984@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Locale-Maketext-Fuzzy In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2949 Modified Files: import.log Log Message: auto-import perl-Locale-Maketext-Fuzzy-0.02-1 on branch devel from perl-Locale-Maketext-Fuzzy-0.02-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-Locale-Maketext-Fuzzy/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 2 Sep 2005 22:45:49 -0000 1.1 +++ import.log 2 Sep 2005 22:46:23 -0000 1.2 @@ -0,0 +1 @@ +perl-Locale-Maketext-Fuzzy-0_02-1:HEAD:perl-Locale-Maketext-Fuzzy-0.02-1.src.rpm:1125701174 From fedora-extras-commits at redhat.com Fri Sep 2 22:46:26 2005 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Fri, 2 Sep 2005 18:46:26 -0400 Subject: rpms/perl-Locale-Maketext-Fuzzy/devel perl-Locale-Maketext-Fuzzy.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200509022246.j82MkQiV002991@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Locale-Maketext-Fuzzy/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2949/devel Modified Files: .cvsignore sources Added Files: perl-Locale-Maketext-Fuzzy.spec Log Message: auto-import perl-Locale-Maketext-Fuzzy-0.02-1 on branch devel from perl-Locale-Maketext-Fuzzy-0.02-1.src.rpm --- NEW FILE perl-Locale-Maketext-Fuzzy.spec --- Name: perl-Locale-Maketext-Fuzzy Version: 0.02 Release: 1%{?dist} Summary: Maketext from already interpolated strings Group: Development/Libraries License: GPL or Artistic URL: http://search.cpan.org/dist/Locale-Maketext-Fuzzy/ Source0: http://www.cpan.org/authors/id/A/AU/AUTRIJUS/Locale-Maketext-Fuzzy-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description This module is a subclass of Locale::Maketext, with additional support for localizing messages that already contains interpolated variables. This is most useful when the messages are returned by external modules -- for example, to match "dir: command not foundr" against "[_1]: command not found". %prep %setup -q -n Locale-Maketext-Fuzzy-%{version} %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' chmod -R u+w $RPM_BUILD_ROOT/* %check make test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc Changes README %{perl_vendorlib}/Locale/ %{_mandir}/man3/*.3* %changelog * Thu Aug 11 2005 Jose Pedro Oliveira - 0.02-1 - Update to Fedora Extras template. * Sun Oct 31 2004 Jose Pedro Oliveira - 0:0.02-0.fdr.1 - First build. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Locale-Maketext-Fuzzy/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 2 Sep 2005 22:45:49 -0000 1.1 +++ .cvsignore 2 Sep 2005 22:46:24 -0000 1.2 @@ -0,0 +1 @@ +Locale-Maketext-Fuzzy-0.02.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Locale-Maketext-Fuzzy/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 2 Sep 2005 22:45:49 -0000 1.1 +++ sources 2 Sep 2005 22:46:24 -0000 1.2 @@ -0,0 +1 @@ +0425610d448900a774ed253eb678c559 Locale-Maketext-Fuzzy-0.02.tar.gz From fedora-extras-commits at redhat.com Fri Sep 2 22:49:40 2005 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Fri, 2 Sep 2005 18:49:40 -0400 Subject: rpms/perl-Hook-LexWrap - New directory Message-ID: <200509022249.j82MneSV003092@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Hook-LexWrap In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3072/perl-Hook-LexWrap Log Message: Directory /cvs/extras/rpms/perl-Hook-LexWrap added to the repository From fedora-extras-commits at redhat.com Fri Sep 2 22:49:41 2005 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Fri, 2 Sep 2005 18:49:41 -0400 Subject: rpms/perl-Hook-LexWrap/devel - New directory Message-ID: <200509022249.j82Mnf0b003097@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Hook-LexWrap/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3072/perl-Hook-LexWrap/devel Log Message: Directory /cvs/extras/rpms/perl-Hook-LexWrap/devel added to the repository From fedora-extras-commits at redhat.com Fri Sep 2 22:50:00 2005 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Fri, 2 Sep 2005 18:50:00 -0400 Subject: rpms/perl-Hook-LexWrap Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200509022250.j82Mo0hb003146@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Hook-LexWrap In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3117 Added Files: Makefile import.log Log Message: Setup of module perl-Hook-LexWrap --- NEW FILE Makefile --- # Top level Makefile for module perl-Hook-LexWrap all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Fri Sep 2 22:50:00 2005 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Fri, 2 Sep 2005 18:50:00 -0400 Subject: rpms/perl-Hook-LexWrap/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200509022250.j82Mo0Yo003151@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Hook-LexWrap/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3117/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-Hook-LexWrap --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Fri Sep 2 22:50:34 2005 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Fri, 2 Sep 2005 18:50:34 -0400 Subject: rpms/perl-Hook-LexWrap import.log,1.1,1.2 Message-ID: <200509022251.j82Mp48m003223@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Hook-LexWrap In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3185 Modified Files: import.log Log Message: auto-import perl-Hook-LexWrap-0.20-1 on branch devel from perl-Hook-LexWrap-0.20-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-Hook-LexWrap/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 2 Sep 2005 22:49:58 -0000 1.1 +++ import.log 2 Sep 2005 22:50:32 -0000 1.2 @@ -0,0 +1 @@ +perl-Hook-LexWrap-0_20-1:HEAD:perl-Hook-LexWrap-0.20-1.src.rpm:1125701423 From fedora-extras-commits at redhat.com Fri Sep 2 22:50:34 2005 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Fri, 2 Sep 2005 18:50:34 -0400 Subject: rpms/perl-Hook-LexWrap/devel perl-Hook-LexWrap.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200509022251.j82Mp5EY003227@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Hook-LexWrap/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3185/devel Modified Files: .cvsignore sources Added Files: perl-Hook-LexWrap.spec Log Message: auto-import perl-Hook-LexWrap-0.20-1 on branch devel from perl-Hook-LexWrap-0.20-1.src.rpm --- NEW FILE perl-Hook-LexWrap.spec --- Name: perl-Hook-LexWrap Version: 0.20 Release: 1%{?dist} Summary: Lexically scoped subroutine wrappers Group: Development/Libraries License: GPL or Artistic URL: http://search.cpan.org/dist/Hook-LexWrap/ Source0: http://www.cpan.org/authors/id/D/DC/DCONWAY/Hook-LexWrap-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description Hook::LexWrap allows you to install a pre- or post-wrapper (or both) around an existing subroutine. Unlike other modules that provide this capacity (e.g. Hook::PreAndPost and Hook::WrapSub), Hook::LexWrap implements wrappers in such a way that the standard `caller' function works correctly within the wrapped subroutine. %prep %setup -q -n Hook-LexWrap-%{version} chmod a-x Changes README lib/Hook/*.pm %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' chmod -R u+w $RPM_BUILD_ROOT/* %check make test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc Changes README %{perl_vendorlib}/Hook/ %{_mandir}/man3/*.3* %changelog * Fri Aug 26 2005 Jose Pedro Oliveira - 0.20-1 - First build. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Hook-LexWrap/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 2 Sep 2005 22:49:58 -0000 1.1 +++ .cvsignore 2 Sep 2005 22:50:32 -0000 1.2 @@ -0,0 +1 @@ +Hook-LexWrap-0.20.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Hook-LexWrap/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 2 Sep 2005 22:49:58 -0000 1.1 +++ sources 2 Sep 2005 22:50:32 -0000 1.2 @@ -0,0 +1 @@ +e3aaeb59a3adddc80ed3867e4d16654e Hook-LexWrap-0.20.tar.gz From fedora-extras-commits at redhat.com Sat Sep 3 01:34:13 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Fri, 2 Sep 2005 21:34:13 -0400 Subject: rpms/libnet10/FC-3 libnet10.spec,1.4,1.5 Message-ID: <200509030134.j831YDWq007279@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/libnet10/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7246/FC-3 Modified Files: libnet10.spec Log Message: sync with devel -- in preparation for new libnet-devel version Index: libnet10.spec =================================================================== RCS file: /cvs/extras/rpms/libnet10/FC-3/libnet10.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- libnet10.spec 10 Dec 2004 22:03:05 -0000 1.4 +++ libnet10.spec 3 Sep 2005 01:34:10 -0000 1.5 @@ -1,8 +1,7 @@ -Summary: High-level API (toolkit) allowing the application programmer to construct and inject network packets. +Summary: High-level API (toolkit) to construct and inject network packets Name: libnet10 Version: 1.0.2a -Release: 5 -Epoch: 0 +Release: 8%{?dist} URL: http://www.packetfactory.net/libnet/ License: BSD Group: System Environment/Libraries @@ -10,11 +9,13 @@ Patch0: gcc33.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Obsoletes: libnet < 1.1.0 -Provides: libnet = %{epoch}:%{version}-%{release} +Obsoletes: libnet-devel < 1.1.0 +Provides: libnet = %{version}-%{release} +Provides: libnet-devel = %{version}-%{release} %description Libnet is a high-level API (toolkit) allowing the application programmer to -construct and inject network packets. It provides a portable and simplified +construct and inject network packets. It provides a portable and simplified interface for low-level network packet shaping, handling and injection. Libnet hides much of the tedium of packet creation from the application programmer such as multiplexing, buffer management, arcane packet header information, @@ -35,7 +36,7 @@ %build %configure -make %{?_smp_mflags} +make %{?_smp_mflags} CFLAGS="${RPM_OPT_FLAGS}" @@ -69,6 +70,17 @@ %changelog +* Sun Aug 28 2005 Michael Schwendt - 1.0.2a-8 +- add versioned Obsoletes/Provides for libnet and libnet-devel + so libnet/libnet-devel >= 1.1.0 upgrade this and don't just conflict +- pass CFLAGS to make explicitly + +* Sun May 22 2005 Jeremy Katz - 1.0.2a-7 +- rebuild on all arches + +* Fri Apr 7 2005 Michael Schwendt +- rebuilt + * Wed Sep 17 2003 Phillip Compton - 0:1.0.2a-0.fdr.5 - Fixed last header file permission. From fedora-extras-commits at redhat.com Sat Sep 3 01:34:13 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Fri, 2 Sep 2005 21:34:13 -0400 Subject: rpms/libnet10/FC-4 libnet10.spec,1.7,1.8 Message-ID: <200509030134.j831YD0w007285@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/libnet10/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7246/FC-4 Modified Files: libnet10.spec Log Message: sync with devel -- in preparation for new libnet-devel version Index: libnet10.spec =================================================================== RCS file: /cvs/extras/rpms/libnet10/FC-4/libnet10.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- libnet10.spec 23 May 2005 00:03:09 -0000 1.7 +++ libnet10.spec 3 Sep 2005 01:34:11 -0000 1.8 @@ -1,8 +1,7 @@ Summary: High-level API (toolkit) to construct and inject network packets Name: libnet10 Version: 1.0.2a -Release: 7 - +Release: 8%{?dist} URL: http://www.packetfactory.net/libnet/ License: BSD Group: System Environment/Libraries @@ -10,7 +9,9 @@ Patch0: gcc33.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Obsoletes: libnet < 1.1.0 +Obsoletes: libnet-devel < 1.1.0 Provides: libnet = %{version}-%{release} +Provides: libnet-devel = %{version}-%{release} %description Libnet is a high-level API (toolkit) allowing the application programmer to @@ -35,7 +36,7 @@ %build %configure -make %{?_smp_mflags} +make %{?_smp_mflags} CFLAGS="${RPM_OPT_FLAGS}" @@ -69,6 +70,11 @@ %changelog +* Sun Aug 28 2005 Michael Schwendt - 1.0.2a-8 +- add versioned Obsoletes/Provides for libnet and libnet-devel + so libnet/libnet-devel >= 1.1.0 upgrade this and don't just conflict +- pass CFLAGS to make explicitly + * Sun May 22 2005 Jeremy Katz - 1.0.2a-7 - rebuild on all arches From fedora-extras-commits at redhat.com Sat Sep 3 04:20:59 2005 From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio)) Date: Sat, 3 Sep 2005 00:20:59 -0400 Subject: rpms/pexpect/devel .cvsignore, 1.3, 1.4 pexpect.spec, 1.7, 1.8 sources, 1.3, 1.4 Message-ID: <200509030420.j834Kxme011447@cvs-int.fedora.redhat.com> Author: toshio Update of /cvs/extras/rpms/pexpect/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11424 Modified Files: .cvsignore pexpect.spec sources Log Message: - Update to version 0.99999b. - Add dist tag. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/pexpect/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 8 Nov 2004 05:12:26 -0000 1.3 +++ .cvsignore 3 Sep 2005 04:20:56 -0000 1.4 @@ -1,3 +1,3 @@ -pexpect-0.999.tgz +pexpect-0.99999b.tgz pexpect-doc.tgz pexpect-examples.tgz Index: pexpect.spec =================================================================== RCS file: /cvs/extras/rpms/pexpect/devel/pexpect.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- pexpect.spec 6 Apr 2005 22:13:29 -0000 1.7 +++ pexpect.spec 3 Sep 2005 04:20:56 -0000 1.8 @@ -4,8 +4,8 @@ Summary: Expect module for Python Name: pexpect -Version: 0.999 -Release: 3 +Version: 0.99999b +Release: 1%{?dist} License: PSFL Group: Development/Languages @@ -46,21 +46,9 @@ # needed by the chess* examples.... Moving them to examples for now. cp ANSI.py screen.py FSM.py examples -#touch %{name}-ghost.files -#for file in $(find $RPM_BUILD_ROOT -type f -name "*.py"); do -#for suffix in c o; do -#if [ ! -e "$file$suffix" ]; then -#touch "$file$suffix" -#echo "%ghost $file$suffix" | sed "s|$RPM_BUILD_ROOT||" \ -#>> %{name}-ghost.files -#fi -#done -#done - %clean rm -rf $RPM_BUILD_ROOT -#%files -f %{name}-ghost.files %files %defattr(-,root,root,-) %{python_sitelib}/pexpect.py @@ -70,6 +58,10 @@ %doc README.txt doc examples %changelog +* Fri Sep 2 2005 Toshio Kuratomi 0.99999b +- Update to version 0.99999b. +- Add dist tag. + * Fri Apr 7 2005 Michael Schwendt - rebuilt Index: sources =================================================================== RCS file: /cvs/extras/rpms/pexpect/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 8 Nov 2004 05:12:26 -0000 1.3 +++ sources 3 Sep 2005 04:20:56 -0000 1.4 @@ -1,3 +1,3 @@ -e426e5f54d323aaf392008c9eb35131d pexpect-0.999.tgz +c5435bfd4a3705efdf898b46b344da09 pexpect-0.99999b.tgz 69bfc0056938f561875289651c8715ad pexpect-doc.tgz ee05cad1d7b6b4de0dc74bc16330b852 pexpect-examples.tgz From fedora-extras-commits at redhat.com Sat Sep 3 05:12:49 2005 From: fedora-extras-commits at redhat.com (Tim Lauridsen (timlau)) Date: Sat, 3 Sep 2005 01:12:49 -0400 Subject: rpms/yumex/devel sources,1.3,1.4 yumex.spec,1.3,1.4 Message-ID: <200509030512.j835CnHB012839@cvs-int.fedora.redhat.com> Author: timlau Update of /cvs/extras/rpms/yumex/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12818 Modified Files: sources yumex.spec Log Message: updated devel to 0.42-04 Index: sources =================================================================== RCS file: /cvs/extras/rpms/yumex/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 17 Aug 2005 09:48:39 -0000 1.3 +++ sources 3 Sep 2005 05:12:47 -0000 1.4 @@ -1 +1 @@ -8df6733cf79c6c375341e29d7a37d6ba yumex-0.42-1.tar.gz +01b20730d2f56c0a836c4d17951871d4 yumex-0.42-4.tar.gz Index: yumex.spec =================================================================== RCS file: /cvs/extras/rpms/yumex/devel/yumex.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- yumex.spec 17 Aug 2005 09:48:39 -0000 1.3 +++ yumex.spec 3 Sep 2005 05:12:47 -0000 1.4 @@ -1,8 +1,8 @@ -%define build_v 1 +%define build_v 4 Name: yumex Version: 0.42 -Release: 1.0%{?dist} +Release: 4.0%{?dist} Summary: Yum Extender graphical package management tool Group: Applications/System @@ -67,6 +67,18 @@ %{_datadir}/applications/fedora-%{name}.desktop %changelog +* Tue Aug 30 2005 Tim Lauridsen - 0.42-4.0 +- Release 0.42-4.0 +- Fixed delete repo on repos page. (Rightclick + Delete now working) +- Fixed UTF-8 bugs, when strings are encoded with iso-8859-1. +* Sat Aug 20 2005 Tim Lauridsen - 0.42-3.0 +- Release 0.42-3.0 +- Fixed Dependencies not resolved bug. +* Wed Aug 17 2005 Tim Lauridsen - 0.42-2.0 +- Release 0.42-2.0 +- Fixed TypeError in yumexBase.errorlog in yumbase.py + + * Wed Aug 17 2005 Tim Lauridsen - 0.42-1.0 - Release 0.42 - Added Requires: pygtk2-libglade (Bugzilla 163439) From fedora-extras-commits at redhat.com Sat Sep 3 08:57:34 2005 From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard)) Date: Sat, 3 Sep 2005 04:57:34 -0400 Subject: rpms/perl-Jcode/FC-4 .cvsignore, 1.3, 1.4 perl-Jcode.spec, 1.7, 1.8 sources, 1.3, 1.4 Message-ID: <200509030858.j838w4S0017557@cvs-int.fedora.redhat.com> Author: abompard Update of /cvs/extras/rpms/perl-Jcode/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17515/FC-4 Modified Files: .cvsignore perl-Jcode.spec sources Log Message: - update to 2.03 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Jcode/FC-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 8 Dec 2004 17:46:27 -0000 1.3 +++ .cvsignore 3 Sep 2005 08:57:32 -0000 1.4 @@ -1 +1 @@ -Jcode-0.88.tar.gz +Jcode-2.03.tar.gz Index: perl-Jcode.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Jcode/FC-4/perl-Jcode.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- perl-Jcode.spec 6 Apr 2005 22:13:06 -0000 1.7 +++ perl-Jcode.spec 3 Sep 2005 08:57:32 -0000 1.8 @@ -1,15 +1,13 @@ -%{!?perl_vendorarch: %define perl_vendorarch %(eval "`%{__perl} -V:installvendorarch`"; echo $installvendorarch)} - Name: perl-Jcode -Version: 0.88 -Release: 2 +Version: 2.03 +Release: 1%{?dist} Summary: Perl extension interface for converting Japanese text License: GPL or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Jcode/ -Source0: http://www.cpan.org/authors/id/D/DA/DANKOGAI/Jcode-0.88.tar.gz +Source0: http://www.cpan.org/authors/id/D/DA/DANKOGAI/Jcode-2.03.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: perl >= 1:5.6.1 @@ -25,21 +23,18 @@ %build CFLAGS="$RPM_OPT_FLAGS" %{__perl} Makefile.PL INSTALLDIRS=vendor -%{__perl} -pi -e 's/^\tLD_RUN_PATH=[^\s]+\s*/\t/' Makefile make %{?_smp_mflags} OPTIMIZE="$RPM_OPT_FLAGS" %install rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT -find $RPM_BUILD_ROOT -type f -a \( -name .packlist \ - -o \( -name '*.bs' -a -empty \) -o -name _test.pl -o -name '*_install.pl' \ - \) -exec rm -f {} ';' +find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' +find $RPM_BUILD_ROOT -type f -name '*.bs' -a -size 0 -exec rm -f {} ';' find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' chmod -R u+w $RPM_BUILD_ROOT/* - -%check || : +%check make test @@ -50,12 +45,15 @@ %files %defattr(-,root,root,-) %doc Changes README -%{perl_vendorarch}/auto/Jcode -%{perl_vendorarch}/Jcode* +%{perl_vendorlib}/Jcode* %{_mandir}/man3/*.3* %changelog +* Sat Sep 03 2005 Aurelien Bompard 2.03-1 +- update to 2.03 +- be closer to perl spec template + * Fri Apr 7 2005 Michael Schwendt - rebuilt Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Jcode/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 8 Dec 2004 17:46:27 -0000 1.3 +++ sources 3 Sep 2005 08:57:32 -0000 1.4 @@ -1 +1 @@ -49d4c96b209d3e7feed25b4847ec8fb1 Jcode-0.88.tar.gz +8d285ebf5e5d4f60938829a2c11bdef6 Jcode-2.03.tar.gz From fedora-extras-commits at redhat.com Sat Sep 3 08:57:34 2005 From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard)) Date: Sat, 3 Sep 2005 04:57:34 -0400 Subject: rpms/perl-Jcode/devel .cvsignore, 1.3, 1.4 perl-Jcode.spec, 1.7, 1.8 sources, 1.3, 1.4 Message-ID: <200509030858.j838w5x7017562@cvs-int.fedora.redhat.com> Author: abompard Update of /cvs/extras/rpms/perl-Jcode/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17515/devel Modified Files: .cvsignore perl-Jcode.spec sources Log Message: - update to 2.03 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Jcode/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 8 Dec 2004 17:46:27 -0000 1.3 +++ .cvsignore 3 Sep 2005 08:57:32 -0000 1.4 @@ -1 +1 @@ -Jcode-0.88.tar.gz +Jcode-2.03.tar.gz Index: perl-Jcode.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Jcode/devel/perl-Jcode.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- perl-Jcode.spec 6 Apr 2005 22:13:06 -0000 1.7 +++ perl-Jcode.spec 3 Sep 2005 08:57:32 -0000 1.8 @@ -1,15 +1,13 @@ -%{!?perl_vendorarch: %define perl_vendorarch %(eval "`%{__perl} -V:installvendorarch`"; echo $installvendorarch)} - Name: perl-Jcode -Version: 0.88 -Release: 2 +Version: 2.03 +Release: 1%{?dist} Summary: Perl extension interface for converting Japanese text License: GPL or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Jcode/ -Source0: http://www.cpan.org/authors/id/D/DA/DANKOGAI/Jcode-0.88.tar.gz +Source0: http://www.cpan.org/authors/id/D/DA/DANKOGAI/Jcode-2.03.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: perl >= 1:5.6.1 @@ -25,21 +23,18 @@ %build CFLAGS="$RPM_OPT_FLAGS" %{__perl} Makefile.PL INSTALLDIRS=vendor -%{__perl} -pi -e 's/^\tLD_RUN_PATH=[^\s]+\s*/\t/' Makefile make %{?_smp_mflags} OPTIMIZE="$RPM_OPT_FLAGS" %install rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT -find $RPM_BUILD_ROOT -type f -a \( -name .packlist \ - -o \( -name '*.bs' -a -empty \) -o -name _test.pl -o -name '*_install.pl' \ - \) -exec rm -f {} ';' +find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' +find $RPM_BUILD_ROOT -type f -name '*.bs' -a -size 0 -exec rm -f {} ';' find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' chmod -R u+w $RPM_BUILD_ROOT/* - -%check || : +%check make test @@ -50,12 +45,15 @@ %files %defattr(-,root,root,-) %doc Changes README -%{perl_vendorarch}/auto/Jcode -%{perl_vendorarch}/Jcode* +%{perl_vendorlib}/Jcode* %{_mandir}/man3/*.3* %changelog +* Sat Sep 03 2005 Aurelien Bompard 2.03-1 +- update to 2.03 +- be closer to perl spec template + * Fri Apr 7 2005 Michael Schwendt - rebuilt Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Jcode/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 8 Dec 2004 17:46:27 -0000 1.3 +++ sources 3 Sep 2005 08:57:32 -0000 1.4 @@ -1 +1 @@ -49d4c96b209d3e7feed25b4847ec8fb1 Jcode-0.88.tar.gz +8d285ebf5e5d4f60938829a2c11bdef6 Jcode-2.03.tar.gz From fedora-extras-commits at redhat.com Sat Sep 3 10:13:35 2005 From: fedora-extras-commits at redhat.com (Dawid Gajownik (gajownik)) Date: Sat, 3 Sep 2005 06:13:35 -0400 Subject: rpms/gajim import.log,1.2,1.3 Message-ID: <200509031013.j83ADZhM020386@cvs-int.fedora.redhat.com> Author: gajownik Update of /cvs/extras/rpms/gajim In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20350 Modified Files: import.log Log Message: auto-import gajim-0.8.1-1 on branch devel from gajim-0.8.1-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/gajim/import.log,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- import.log 24 Aug 2005 13:09:53 -0000 1.2 +++ import.log 3 Sep 2005 10:13:33 -0000 1.3 @@ -1 +1,2 @@ gajim-0_8-2:HEAD:gajim-0.8-2.src.rpm:1124889138 +gajim-0_8_1-1:HEAD:gajim-0.8.1-1.src.rpm:1125742592 From fedora-extras-commits at redhat.com Sat Sep 3 10:13:35 2005 From: fedora-extras-commits at redhat.com (Dawid Gajownik (gajownik)) Date: Sat, 3 Sep 2005 06:13:35 -0400 Subject: rpms/gajim/devel gajim-0.8.1.remote.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 gajim.spec, 1.4, 1.5 sources, 1.2, 1.3 gajim-0.8.remote.patch, 1.1, NONE gajim-remote.py, 1.1, NONE Message-ID: <200509031013.j83ADZh2020395@cvs-int.fedora.redhat.com> Author: gajownik Update of /cvs/extras/rpms/gajim/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20350/devel Modified Files: .cvsignore gajim.spec sources Added Files: gajim-0.8.1.remote.patch Removed Files: gajim-0.8.remote.patch gajim-remote.py Log Message: auto-import gajim-0.8.1-1 on branch devel from gajim-0.8.1-1.src.rpm gajim-0.8.1.remote.patch: --- NEW FILE gajim-0.8.1.remote.patch --- diff -Nurp gajim-0.8.1.orig/scripts/gajim-remote gajim-0.8.1/scripts/gajim-remote --- gajim-0.8.1.orig/scripts/gajim-remote 2005-09-02 16:06:46.000000000 +0200 +++ gajim-0.8.1/scripts/gajim-remote 2005-09-03 11:04:13.000000000 +0200 @@ -22,6 +22,6 @@ if [ `id -u` -eq 0 ]; then echo "You must not launch gajim-remote as root, it is INSECURE" fi -cd PREFIX/share/gajim/scripts +cd PREFIX/share/gajim/src export PYTHONPATH="$PYTHONPATH:PREFIXLIB/gajim" python gajim-remote.py $@ diff -Nurp gajim-0.8.1.orig/scripts/gajim-remote.py gajim-0.8.1/scripts/gajim-remote.py --- gajim-0.8.1.orig/scripts/gajim-remote.py 2005-09-02 16:06:46.000000000 +0200 +++ gajim-0.8.1/scripts/gajim-remote.py 2005-09-03 11:05:11.000000000 +0200 @@ -32,7 +32,7 @@ import signal signal.signal(signal.SIGINT, signal.SIG_DFL) # ^C exits the application -import i18n +from common import i18n _ = i18n._ i18n.init() Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gajim/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 24 Aug 2005 13:09:53 -0000 1.2 +++ .cvsignore 3 Sep 2005 10:13:33 -0000 1.3 @@ -1 +1 @@ -gajim-0.8.tar.bz2 +gajim-0.8.1.tar.bz2 Index: gajim.spec =================================================================== RCS file: /cvs/extras/rpms/gajim/devel/gajim.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- gajim.spec 24 Aug 2005 18:56:35 -0000 1.4 +++ gajim.spec 3 Sep 2005 10:13:33 -0000 1.5 @@ -2,19 +2,17 @@ %define use_internal_modules 0 Name: gajim -Version: 0.8 -Release: 5%{?dist} +Version: 0.8.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 -# http://trac.gajim.org/file/trunk/scripts/gajim-remote.py?rev=3170&format=raw -Source1: http://trac.gajim.org/file/trunk/scripts/gajim-remote.py Patch0: gajim-0.8.cflags.patch Patch1: gajim-0.8.po.patch -Patch2: gajim-0.8.remote.patch +Patch2: gajim-0.8.1.remote.patch Patch3: gajim-0.8.aplay.patch Patch4: gajim-0.8.x86_64.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -79,11 +77,15 @@ --delete-original \ %{buildroot}%{_datadir}/applications/gajim.desktop +# These lines and gajim-0.8.1.remote.patch are a workaround +# for broken i18n module import +mv %{buildroot}%{_datadir}/gajim/scripts/gajim-remote.py \ + %{buildroot}%{_datadir}/gajim/src/gajim-remote.py +rmdir %{buildroot}%{_datadir}/gajim/scripts + + %find_lang %{name} -install -p -m 0755 %{SOURCE1} %{buildroot}%{_datadir}/gajim/src -sed -e 's/^import i18n$/from common import i18n/g' -i \ - %{buildroot}%{_datadir}/gajim/src/gajim-remote.py %clean rm -rf %{buildroot} @@ -101,6 +103,10 @@ %{_mandir}/man1/gajim* %changelog +* Sat Sep 3 2005 Dawid Gajownik - 0.8.1-1 +- Version 0.8.1 +- drop gajim-remote.py file (included in tarball) + * Wed Aug 24 2005 Dawid Gajownik - 0.8-5 - Don't build internal modules Index: sources =================================================================== RCS file: /cvs/extras/rpms/gajim/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 24 Aug 2005 13:09:53 -0000 1.2 +++ sources 3 Sep 2005 10:13:33 -0000 1.3 @@ -1 +1 @@ -1f9b4864c56d744d1e6f1c0b42afc4e9 gajim-0.8.tar.bz2 +d4cbbd64078b9c93fdd1492c27dbcdab gajim-0.8.1.tar.bz2 --- gajim-0.8.remote.patch DELETED --- --- gajim-remote.py DELETED --- From fedora-extras-commits at redhat.com Sat Sep 3 10:16:55 2005 From: fedora-extras-commits at redhat.com (Dawid Gajownik (gajownik)) Date: Sat, 3 Sep 2005 06:16:55 -0400 Subject: rpms/gajim import.log,1.3,1.4 Message-ID: <200509031017.j83AHQ8p020515@cvs-int.fedora.redhat.com> Author: gajownik Update of /cvs/extras/rpms/gajim In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20474 Modified Files: import.log Log Message: auto-import gajim-0.8.1-1 on branch FC-4 from gajim-0.8.1-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/gajim/import.log,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- import.log 3 Sep 2005 10:13:33 -0000 1.3 +++ import.log 3 Sep 2005 10:16:53 -0000 1.4 @@ -1,2 +1,3 @@ gajim-0_8-2:HEAD:gajim-0.8-2.src.rpm:1124889138 gajim-0_8_1-1:HEAD:gajim-0.8.1-1.src.rpm:1125742592 +gajim-0_8_1-1:FC-4:gajim-0.8.1-1.src.rpm:1125742792 From fedora-extras-commits at redhat.com Sat Sep 3 10:16:56 2005 From: fedora-extras-commits at redhat.com (Dawid Gajownik (gajownik)) Date: Sat, 3 Sep 2005 06:16:56 -0400 Subject: rpms/gajim/FC-4 gajim-0.8.1.remote.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 gajim.spec, 1.4, 1.5 sources, 1.2, 1.3 gajim-0.8.remote.patch, 1.1, NONE gajim-remote.py, 1.1, NONE Message-ID: <200509031017.j83AHQwS020520@cvs-int.fedora.redhat.com> Author: gajownik Update of /cvs/extras/rpms/gajim/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20474/FC-4 Modified Files: .cvsignore gajim.spec sources Added Files: gajim-0.8.1.remote.patch Removed Files: gajim-0.8.remote.patch gajim-remote.py Log Message: auto-import gajim-0.8.1-1 on branch FC-4 from gajim-0.8.1-1.src.rpm gajim-0.8.1.remote.patch: --- NEW FILE gajim-0.8.1.remote.patch --- diff -Nurp gajim-0.8.1.orig/scripts/gajim-remote gajim-0.8.1/scripts/gajim-remote --- gajim-0.8.1.orig/scripts/gajim-remote 2005-09-02 16:06:46.000000000 +0200 +++ gajim-0.8.1/scripts/gajim-remote 2005-09-03 11:04:13.000000000 +0200 @@ -22,6 +22,6 @@ if [ `id -u` -eq 0 ]; then echo "You must not launch gajim-remote as root, it is INSECURE" fi -cd PREFIX/share/gajim/scripts +cd PREFIX/share/gajim/src export PYTHONPATH="$PYTHONPATH:PREFIXLIB/gajim" python gajim-remote.py $@ diff -Nurp gajim-0.8.1.orig/scripts/gajim-remote.py gajim-0.8.1/scripts/gajim-remote.py --- gajim-0.8.1.orig/scripts/gajim-remote.py 2005-09-02 16:06:46.000000000 +0200 +++ gajim-0.8.1/scripts/gajim-remote.py 2005-09-03 11:05:11.000000000 +0200 @@ -32,7 +32,7 @@ import signal signal.signal(signal.SIGINT, signal.SIG_DFL) # ^C exits the application -import i18n +from common import i18n _ = i18n._ i18n.init() Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gajim/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 24 Aug 2005 13:09:53 -0000 1.2 +++ .cvsignore 3 Sep 2005 10:16:54 -0000 1.3 @@ -1 +1 @@ -gajim-0.8.tar.bz2 +gajim-0.8.1.tar.bz2 Index: gajim.spec =================================================================== RCS file: /cvs/extras/rpms/gajim/FC-4/gajim.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- gajim.spec 24 Aug 2005 18:58:51 -0000 1.4 +++ gajim.spec 3 Sep 2005 10:16:54 -0000 1.5 @@ -2,19 +2,17 @@ %define use_internal_modules 0 Name: gajim -Version: 0.8 -Release: 5%{?dist} +Version: 0.8.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 -# http://trac.gajim.org/file/trunk/scripts/gajim-remote.py?rev=3170&format=raw -Source1: http://trac.gajim.org/file/trunk/scripts/gajim-remote.py Patch0: gajim-0.8.cflags.patch Patch1: gajim-0.8.po.patch -Patch2: gajim-0.8.remote.patch +Patch2: gajim-0.8.1.remote.patch Patch3: gajim-0.8.aplay.patch Patch4: gajim-0.8.x86_64.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -79,11 +77,15 @@ --delete-original \ %{buildroot}%{_datadir}/applications/gajim.desktop +# These lines and gajim-0.8.1.remote.patch are a workaround +# for broken i18n module import +mv %{buildroot}%{_datadir}/gajim/scripts/gajim-remote.py \ + %{buildroot}%{_datadir}/gajim/src/gajim-remote.py +rmdir %{buildroot}%{_datadir}/gajim/scripts + + %find_lang %{name} -install -p -m 0755 %{SOURCE1} %{buildroot}%{_datadir}/gajim/src -sed -e 's/^import i18n$/from common import i18n/g' -i \ - %{buildroot}%{_datadir}/gajim/src/gajim-remote.py %clean rm -rf %{buildroot} @@ -101,6 +103,10 @@ %{_mandir}/man1/gajim* %changelog +* Sat Sep 3 2005 Dawid Gajownik - 0.8.1-1 +- Version 0.8.1 +- drop gajim-remote.py file (included in tarball) + * Wed Aug 24 2005 Dawid Gajownik - 0.8-5 - Don't build internal modules Index: sources =================================================================== RCS file: /cvs/extras/rpms/gajim/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 24 Aug 2005 13:09:53 -0000 1.2 +++ sources 3 Sep 2005 10:16:54 -0000 1.3 @@ -1 +1 @@ -1f9b4864c56d744d1e6f1c0b42afc4e9 gajim-0.8.tar.bz2 +d4cbbd64078b9c93fdd1492c27dbcdab gajim-0.8.1.tar.bz2 --- gajim-0.8.remote.patch DELETED --- --- gajim-remote.py DELETED --- From fedora-extras-commits at redhat.com Sat Sep 3 10:51:10 2005 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Sat, 3 Sep 2005 06:51:10 -0400 Subject: owners owners.list,1.160,1.161 Message-ID: <200509031051.j83ApAK1020703@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20681 Modified Files: owners.list Log Message: Add BibTool Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.160 retrieving revision 1.161 diff -u -r1.160 -r1.161 --- owners.list 2 Sep 2005 12:34:41 -0000 1.160 +++ owners.list 3 Sep 2005 10:51:08 -0000 1.161 @@ -47,6 +47,7 @@ Fedora Extras|bazaar|A distributed revision control system|shahms at shahms.com|extras-qa at fedoraproject.org| Fedora Extras|bbkeys|Completely configurable key-combo grabber for blackbox|matthias at rpmforge.net|extras-qa at fedoraproject.org| Fedora Extras|bchunk|CD image format converter from .bin/.cue to .iso/.cdr|bugs.michael at gmx.net|extras-qa at fedoraproject.org| +Fedora Extras|BibTool|A Tool for manipulating BibTeX data bases|pertusus at free.fr|extras-qa at fedoraproject.org| Fedora Extras|bin2iso|Convert ".bin" files into ISO or WAV|anvil at livna.org|extras-qa at fedoraproject.org| Fedora Extras|bittorrent|BitTorrent swarming network file transfer tool|paul at city-fan.org|extras-qa at fedoraproject.org| Fedora Extras|blackbox|Very small and fast Window Manager|matthias at rpmforge.net|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Sat Sep 3 14:13:06 2005 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Sat, 3 Sep 2005 10:13:06 -0400 Subject: rpms/nexuiz-data/devel .cvsignore, 1.2, 1.3 nexuiz-data.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200509031413.j83ED6L0026050@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/rpms/nexuiz-data/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26027 Modified Files: .cvsignore nexuiz-data.spec sources Log Message: * Fri Sep 02 2005 Adrian Reber - 1.2-1 - updated to 1.2 - included serverfix12.zip Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/nexuiz-data/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Jul 2005 21:57:05 -0000 1.2 +++ .cvsignore 3 Sep 2005 14:13:03 -0000 1.3 @@ -1 +1,2 @@ -nexuiz-data-1.1.tar +nexuiz-data-1.2.tar +serverfix12.zip Index: nexuiz-data.spec =================================================================== RCS file: /cvs/extras/rpms/nexuiz-data/devel/nexuiz-data.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- nexuiz-data.spec 8 Jul 2005 21:57:05 -0000 1.1 +++ nexuiz-data.spec 3 Sep 2005 14:13:03 -0000 1.2 @@ -1,20 +1,21 @@ -%define datadate 20050703 +%define datadate 20050818 Summary: Game data for the Nexuiz first person shooter Name: nexuiz-data -Version: 1.1 +Version: 1.2 Release: 1 License: GPL Group: Amusements/Games URL: http://www.nexuiz.com/ # Source is custom, obtained with : # wget http://dl.sf.net/sourceforge/nexuiz/nexuiz11.zip -# unzip nexuiz11.zip -# mkdir nexuiz-data-1.1/ -# mv Nexuiz/data/ Nexuiz/Readme.htm Nexuiz/sources/darkplaces/COPYING \ -# nexuiz-data-1.1/ -# tar cvf nexuiz-data-1.1.tar nexuiz-data-1.1/ -Source: nexuiz-data-%{version}.tar +# unzip nexuiz12.zip +# mkdir nexuiz-data-1.2/ +# mv Nexuiz/data/ Nexuiz/Readme.htm Nexuiz/gpl.txt \ +# nexuiz-data-1.2/ +# tar cvf nexuiz-data-1.2.tar nexuiz-data-1.2/ +Source0: nexuiz-data-%{version}.tar +Source1: http://dl.sf.net/sourceforge/nexuiz/serverfix12.zip BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -23,28 +24,34 @@ focused on providing basic, old style deathmatches. Data (textures, maps, sounds and models) required to play nexuiz. -This includes 17 maps, 28 playable characters and 10 music tracks. %prep %setup -q %{__sed} -i 's/\r//' Readme.htm +%{__unzip} %{SOURCE1} data/data20050830.pk3 %build %install %{__rm} -rf %{buildroot} -%{__install} -D -p data/data%{datadate}.pk3 \ - %{buildroot}%{_datadir}/nexuiz/data/data%{datadate}.pk3 +%{__mkdir_p} %{buildroot}%{_datadir}/nexuiz/data/ +%{__install} -p data/data%{datadate}-full.pk3 \ + data/data20050830.pk3 \ + %{buildroot}%{_datadir}/nexuiz/data/ %clean %{__rm} -rf %{buildroot} %files %defattr(0644, root, root, 0755) -%doc Readme.htm COPYING +%doc Readme.htm gpl.txt cvars.txt mapping.txt %{_datadir}/nexuiz/ %changelog +* Fri Sep 02 2005 Adrian Reber - 1.2-1 +- updated to 1.2 +- included serverfix12.zip + * Fri Jul 8 2005 Matthias Saou 1.1-0 - Split off data from the main package, will make fixing the binaries much easier and allow sharing this noarch package between archs. It also avoids Index: sources =================================================================== RCS file: /cvs/extras/rpms/nexuiz-data/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Jul 2005 21:57:05 -0000 1.2 +++ sources 3 Sep 2005 14:13:03 -0000 1.3 @@ -1 +1,2 @@ -c177cce8cf6ac9134d1d9b8a08dc3272 nexuiz-data-1.1.tar +d6cc369900e6356a21daf4b95297c7f3 nexuiz-data-1.2.tar +6e5f8fe6b9933f628779121eb31c9550 serverfix12.zip From fedora-extras-commits at redhat.com Sat Sep 3 14:14:04 2005 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Sat, 3 Sep 2005 10:14:04 -0400 Subject: rpms/nexuiz/devel .cvsignore, 1.2, 1.3 nexuiz.spec, 1.3, 1.4 sources, 1.2, 1.3 Message-ID: <200509031414.j83EE4tW026113@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/rpms/nexuiz/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26090 Modified Files: .cvsignore nexuiz.spec sources Log Message: * Fri Sep 02 2005 Adrian Reber - 1.2-1 - updated to 1.2 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/nexuiz/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 9 Jul 2005 11:59:33 -0000 1.2 +++ .cvsignore 3 Sep 2005 14:14:02 -0000 1.3 @@ -1 +1 @@ -nexuiz-1.1.tar.bz2 +nexuizenginesource20050814beta1.zip Index: nexuiz.spec =================================================================== RCS file: /cvs/extras/rpms/nexuiz/devel/nexuiz.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- nexuiz.spec 16 Aug 2005 08:15:54 -0000 1.3 +++ nexuiz.spec 3 Sep 2005 14:14:02 -0000 1.4 @@ -1,17 +1,14 @@ Summary: Multiplayer, deathmatch oriented first person shooter Name: nexuiz -Version: 1.1 -Release: 2%{?dist} +Version: 1.2 +Release: 1%{?dist} License: GPL Group: Amusements/Games URL: http://www.nexuiz.com/ # Source is custom, obtained with : -# wget http://dl.sf.net/sourceforge/nexuiz/nexuiz11.zip -# unzip nexuiz11.zip -# mkdir nexuiz-1.1/ -# mv Nexuiz/sources/darkplaces/* Nexuiz/Readme.htm nexuiz-1.1/ -# tar cjvf nexuiz-1.1.tar.bz2 nexuiz-1.1/ -Source: nexuiz-%{version}.tar.bz2 +# wget http://dl.sf.net/sourceforge/nexuiz/nexuiz12.zip +# unzip nexuiz12.zip Nexuiz/nexuizenginesource20050814beta1.zip +Source: nexuizenginesource20050814beta1.zip Patch0: nexuiz-1.0-basedir.patch Patch1: nexuiz-1.1-nostrip.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -22,7 +19,7 @@ # and therefore it isn't picked up by RPM during build Requires: libz.so.1 libvorbis.so.0 libvorbisfile.so.3 libjpeg.so.62 Requires: desktop-file-utils >= 0.9 -Requires: nexuiz-data +Requires: nexuiz-data = %{version} Requires(post): desktop-file-utils Requires(postun): desktop-file-utils @@ -34,7 +31,7 @@ %package server Group: Amusements/Games Summary: Dedicated server for the Nexuiz first person shooter -Requires: nexuiz-data +Requires: nexuiz-data = %{version} # This is necessary as these libraries are loaded during runtime # and therefore it isn't picked up by RPM during build Requires: libz.so.1 @@ -47,10 +44,10 @@ %prep -%setup -q +%setup -q -n darkplaces %patch0 -p0 -b .basedir %patch1 -p0 -b .nostrip -%{__sed} -i 's/\r//' Readme.htm +%{__sed} -i 's/\r//' darkplaces.txt %build @@ -111,18 +108,21 @@ %files %defattr(-,root,root,-) -%doc Readme.htm COPYING +%doc COPYING ChangeLog darkplaces.txt %{_bindir}/nexuiz-glx %{_datadir}/icons/hicolor/*/apps/nexuiz.png %{_datadir}/applications/*%{name}.desktop %files server %defattr(-,root,root,-) -%doc Readme.htm COPYING +%doc COPYING ChangeLog darkplaces.txt %{_bindir}/nexuiz-dedicated %changelog +* Fri Sep 02 2005 Adrian Reber - 1.2-1 +- updated to 1.2 + * Tue Aug 16 2005 Adrian Reber - 1.1-2 - support building on RHEL4 (#165522) Index: sources =================================================================== RCS file: /cvs/extras/rpms/nexuiz/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 9 Jul 2005 11:59:33 -0000 1.2 +++ sources 3 Sep 2005 14:14:02 -0000 1.3 @@ -1 +1 @@ -a2177339360d4ad19816c66a7dfd0353 nexuiz-1.1.tar.bz2 +f46eab779e2d5d08bd21dad648a1e62f nexuizenginesource20050814beta1.zip From fedora-extras-commits at redhat.com Sat Sep 3 14:35:50 2005 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Sat, 3 Sep 2005 10:35:50 -0400 Subject: rpms/nexuiz/devel nexuiz.spec,1.4,1.5 Message-ID: <200509031435.j83EZoCh026224@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/rpms/nexuiz/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26205 Modified Files: nexuiz.spec Log Message: * Fri Sep 02 2005 Adrian Reber - 1.2-2 - another try without smp_mflags Index: nexuiz.spec =================================================================== RCS file: /cvs/extras/rpms/nexuiz/devel/nexuiz.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- nexuiz.spec 3 Sep 2005 14:14:02 -0000 1.4 +++ nexuiz.spec 3 Sep 2005 14:35:48 -0000 1.5 @@ -1,7 +1,7 @@ Summary: Multiplayer, deathmatch oriented first person shooter Name: nexuiz Version: 1.2 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: Amusements/Games URL: http://www.nexuiz.com/ @@ -51,7 +51,7 @@ %build -%{__make} %{?_smp_mflags} cl-release sv-release OPTIM_RELEASE="$RPM_OPT_FLAGS" +%{__make} cl-release sv-release OPTIM_RELEASE="$RPM_OPT_FLAGS" convert nexuiz.ico nexuiz.png @@ -120,6 +120,9 @@ %changelog +* Fri Sep 02 2005 Adrian Reber - 1.2-2 +- another try without smp_mflags + * Fri Sep 02 2005 Adrian Reber - 1.2-1 - updated to 1.2 From fedora-extras-commits at redhat.com Sat Sep 3 14:41:06 2005 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Sat, 3 Sep 2005 10:41:06 -0400 Subject: rpms/nexuiz-data/devel nexuiz-data.spec,1.2,1.3 Message-ID: <200509031441.j83Ef6gv026303@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/rpms/nexuiz-data/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26284 Modified Files: nexuiz-data.spec Log Message: * Sat Sep 03 2005 Adrian Reber - 1.2-2 - I should really test my changes before check-in Index: nexuiz-data.spec =================================================================== RCS file: /cvs/extras/rpms/nexuiz-data/devel/nexuiz-data.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- nexuiz-data.spec 3 Sep 2005 14:13:03 -0000 1.2 +++ nexuiz-data.spec 3 Sep 2005 14:41:04 -0000 1.3 @@ -3,7 +3,7 @@ Summary: Game data for the Nexuiz first person shooter Name: nexuiz-data Version: 1.2 -Release: 1 +Release: 2 License: GPL Group: Amusements/Games URL: http://www.nexuiz.com/ @@ -44,10 +44,13 @@ %files %defattr(0644, root, root, 0755) -%doc Readme.htm gpl.txt cvars.txt mapping.txt +%doc Readme.htm gpl.txt data/cvars.txt data/mapping.txt %{_datadir}/nexuiz/ %changelog +* Sat Sep 03 2005 Adrian Reber - 1.2-2 +- I should really test my changes before check-in + * Fri Sep 02 2005 Adrian Reber - 1.2-1 - updated to 1.2 - included serverfix12.zip From fedora-extras-commits at redhat.com Sat Sep 3 16:38:46 2005 From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl)) Date: Sat, 3 Sep 2005 12:38:46 -0400 Subject: rpms/icu/devel icu.spec,1.5,1.6 Message-ID: <200509031638.j83Gckun029038@cvs-int.fedora.redhat.com> Author: thl Update of /cvs/extras/rpms/icu/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29019 Modified Files: icu.spec Log Message: Use dist and remove some parms from optflags that gcc32 cannot handle Index: icu.spec =================================================================== RCS file: /cvs/extras/rpms/icu/devel/icu.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- icu.spec 2 Aug 2005 10:23:41 -0000 1.5 +++ icu.spec 3 Sep 2005 16:38:44 -0000 1.6 @@ -2,7 +2,7 @@ Name: icu Version: 3.4 -Release: 2 +Release: 3%{?dist} Summary: International Components for Unicode Group: Applications/Text @@ -61,7 +61,7 @@ %build cd source %if %{gcc32} -%{expand: %%define optflags %(echo %{optflags} | sed -e s/-mtune=/-mcpu=/)} +%{expand: %%define optflags %(echo %{optflags} | sed -e 's/-mtune=/-mcpu=/;s/-fstack-protector//; s/--param=ssp-buffer-size=4//')} export CC=gcc32 CXX=g++32 %endif %configure --with-data-packaging=library --disable-samples @@ -132,6 +132,11 @@ %changelog +* Wed Aug 31 2005 Thorsten Leemhuis - 3.4-3 +- Use dist +- gcc32 does not understand -fstack-protector and + --param=ssp-buffer-size=4 + * Tue Aug 2 2005 Ville Skytt?? - 3.4-2 - 3.4. From fedora-extras-commits at redhat.com Sat Sep 3 17:00:55 2005 From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl)) Date: Sat, 3 Sep 2005 13:00:55 -0400 Subject: rpms/mail-notification/devel mail-notification.spec,1.9,1.10 Message-ID: <200509031700.j83H0tVN029221@cvs-int.fedora.redhat.com> Author: thl Update of /cvs/extras/rpms/mail-notification/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29202 Modified Files: mail-notification.spec Log Message: rebuild Index: mail-notification.spec =================================================================== RCS file: /cvs/extras/rpms/mail-notification/devel/mail-notification.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- mail-notification.spec 19 Aug 2005 17:15:52 -0000 1.9 +++ mail-notification.spec 3 Sep 2005 17:00:53 -0000 1.10 @@ -1,6 +1,6 @@ Name: mail-notification Version: 2.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Status icon that informs you if you have new mail Group: Applications/Internet @@ -113,6 +113,9 @@ %changelog +* Sat Sep 03 2005 Thorsten Leemhuis - 2.0-3 +- rebuild for new icu + * Fri Aug 19 2005 Thorsten Leemhuis - 2.0-2 - rebuild From fedora-extras-commits at redhat.com Sat Sep 3 17:49:33 2005 From: fedora-extras-commits at redhat.com (Anthony Green (green)) Date: Sat, 3 Sep 2005 13:49:33 -0400 Subject: rpms/jogl - New directory Message-ID: <200509031749.j83HnXvo030680@cvs-int.fedora.redhat.com> Author: green Update of /cvs/extras/rpms/jogl In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30660/jogl Log Message: Directory /cvs/extras/rpms/jogl added to the repository From fedora-extras-commits at redhat.com Sat Sep 3 17:49:34 2005 From: fedora-extras-commits at redhat.com (Anthony Green (green)) Date: Sat, 3 Sep 2005 13:49:34 -0400 Subject: rpms/jogl/devel - New directory Message-ID: <200509031749.j83HnYT1030685@cvs-int.fedora.redhat.com> Author: green Update of /cvs/extras/rpms/jogl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30660/jogl/devel Log Message: Directory /cvs/extras/rpms/jogl/devel added to the repository From fedora-extras-commits at redhat.com Sat Sep 3 17:49:59 2005 From: fedora-extras-commits at redhat.com (Anthony Green (green)) Date: Sat, 3 Sep 2005 13:49:59 -0400 Subject: rpms/jogl Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200509031749.j83Hnxav030740@cvs-int.fedora.redhat.com> Author: green Update of /cvs/extras/rpms/jogl In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30705 Added Files: Makefile import.log Log Message: Setup of module jogl --- NEW FILE Makefile --- # Top level Makefile for module jogl all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Sat Sep 3 17:50:00 2005 From: fedora-extras-commits at redhat.com (Anthony Green (green)) Date: Sat, 3 Sep 2005 13:50:00 -0400 Subject: rpms/jogl/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200509031750.j83Ho02q030745@cvs-int.fedora.redhat.com> Author: green Update of /cvs/extras/rpms/jogl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30705/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module jogl --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Sat Sep 3 17:51:47 2005 From: fedora-extras-commits at redhat.com (Anthony Green (green)) Date: Sat, 3 Sep 2005 13:51:47 -0400 Subject: rpms/jogl/devel SGIFreeSWLicB.1.1.ps, NONE, 1.1 jogl-README.txt, NONE, 1.1 jogl.properties, NONE, 1.1 jogl.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200509031751.j83HplaG030834@cvs-int.fedora.redhat.com> Author: green Update of /cvs/extras/rpms/jogl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30789/devel Modified Files: .cvsignore sources Added Files: SGIFreeSWLicB.1.1.ps jogl-README.txt jogl.properties jogl.spec Log Message: auto-import jogl-1.1.1-1 on branch devel from jogl-1.1.1-1.src.rpm --- NEW FILE SGIFreeSWLicB.1.1.ps --- %!PS-Adobe-3.0 %%Title: Microsoft Word - SGIFreeSWLicBWordV1.1020022.doc %%Creator: Windows NT 4.0 %%CreationDate: 12:39 4/24/2000 %%Pages: (atend) %%BoundingBox: 13 13 599 780 %%LanguageLevel: 2 %%DocumentNeededFonts: (atend) %%DocumentSuppliedFonts: (atend) %%EndComments %%BeginProlog %%BeginResource: procset NTPSOct95 /NTPSOct95 100 dict dup begin/bd{bind def}bind def/ld{load def}bd/ed{exch def} bd/a{currentpoint}bd/c/curveto ld/d/dup ld/e/eofill ld/f/fill ld/tr/translate ld/gr/grestore ld/gs/gsave ld/j/setlinejoin ld/L/lineto ld/M/moveto ld/n /newpath ld/cp/closepath ld/rm/rmoveto ld/sl/setlinewidth ld/sd/setdash ld/g /setgray ld/r/setrgbcolor ld/s/stroke ld/t/show ld/aw/awidthshow ld/im /imagemask ld/MS{moveto show}bd/SF{findfont exch scalefont setfont}bd/SM{cmtx setmatrix}bd/MF{findfont exch makefont setfont}bd/CM{/cmtx matrix currentmatrix def}bd/B{M exch dup 0 rlt exch 0 exch rlt neg 0 rlt}bd/CB{B cp eoclip}bd/EA{1 index 0/G0 put 4 string 1 1 4 -1 roll{3 copy neg exch cvs dup 0 71 put cvn 3 -1 roll exch put}for pop}bd/rlt/rlineto ld/L2?/languagelevel where{pop languagelevel 2 ge}{false}ifelse def end def %%EndResource %%EndProlog %%BeginSetup [{0 /languagelevel where{pop languagelevel 2 ge}{false}ifelse {1 dict dup/JobTimeout 4 -1 roll put setuserparams} {statusdict/setjobtimeout get exec}ifelse }stopped cleartomark [{120 /languagelevel where{pop languagelevel 2 ge}{false}ifelse {1 dict dup/WaitTimeout 4 -1 roll put setuserparams} {statusdict/waittimeout 3 -1 roll put}ifelse }stopped cleartomark /#copies 1 def [{ %%BeginFeature: *Resolution 600dpi << /HWResolution [600 600]>> setpagedevice %%EndFeature } stopped cleartomark [{ %%BeginFeature: *HPHalftone Enhanced << /Install { currentpagedevice /HWResolution get dup 0 get 600 eq exch 1 get 600 eq and {/EnhancedColorRendering600} {/EnhancedColorRendering} ifelse /ColorRendering findresource setcolorrendering /EnhancedHalftone /Halftone findresource sethalftone { } settransfer false setstrokeadjust } >> setpagedevice currentpagedevice /HWResolution get dup 0 get 600 eq exch 1 get 600 eq and { << /PostRenderingEnhance false >> setpagedevice }if /setscreen { 3 {pop} repeat } def /setcolorscreen { 12 {pop} repeat } def /sethalftone { pop } def %%EndFeature } stopped cleartomark [{ %%BeginFeature: *Smoothing True << /PostRenderingEnhance true >> setpagedevice %%EndFeature } stopped cleartomark [{ %%BeginFeature: *MediaType None <> setpagedevice %%EndFeature } stopped cleartomark [{ %%BeginFeature: *PageSize Letter <> setpagedevice %%EndFeature } stopped cleartomark [{ %%BeginFeature: *Duplex None <> setpagedevice %%EndFeature } stopped cleartomark [{ %%BeginFeature: *OutputBin Upper <> setpagedevice %%EndFeature } stopped cleartomark %%EndSetup NTPSOct95 begin %%Page: 1 1 NTPSOct95 /PageSV save put 13.238 780.059 translate 72 600 div dup neg scale 0 0 transform .25 add round .25 sub exch .25 add round .25 sub exch itransform translate %%IncludeFont: Times-Bold [100 0 0 -100 0 0]/Times-Bold MF (S)490 635 MS (G)546 635 MS (I)623 635 MS ( )662 635 MS (F)687 635 MS (R)748 635 MS (E)820 635 MS (E)887 635 MS ( )954 635 MS (S)979 635 MS (O)1035 635 MS (F)1113 635 MS (T)1173 635 MS (W)1240 635 MS (A)1340 635 MS (R)1412 635 MS (E)1484 635 MS ( )1551 635 MS (L)1576 635 MS (I)1643 635 MS (C)1682 635 MS (E)1754 635 MS (N)1821 635 MS (S)1893 635 MS (E)1949 635 MS ( )2016 635 MS (B)2041 635 MS ( )2108 635 MS (\()2133 635 MS (V)2166 635 MS (e)2238 635 MS (r)2282 635 MS (s)2326 635 MS (i)2365 635 MS (o)2393 635 MS (n)2443 635 MS ( )2499 635 MS (1)2524 635 MS (.)2574 635 MS (1)2599 635 MS ( )2649 635 MS ([)2674 635 MS (0)2707 635 MS (2)2757 635 MS (/)2807 635 MS (2)2835 635 MS (2)2885 635 MS (/)2935 635 MS (2)2963 635 MS (0)3013 635 MS (0)3063 635 MS (0)3113 635 MS (])3163 635 MS (\))3196 635 MS (1)490 834 MS (.)540 834 MS %%IncludeFont: Helvetica-Bold [100 0 0 -100 0 0]/Helvetica-Bold MF ( )565 834 MS [100 0 0 -100 0 0]/Times-Bold MF (D)790 834 MS (e)862 834 MS (f)906 834 MS (i)940 834 MS (n)968 834 MS (i)1024 834 MS (t)1052 834 MS (i)1085 834 MS (o)1113 834 MS (n)1163 834 MS (s)1219 834 MS (.)1258 834 MS %%IncludeFont: Times-Roman [100 0 0 -100 0 0]/Times-Roman MF (1)490 1029 MS (.)540 1029 MS (1)565 1029 MS (.)615 1029 MS %%IncludeFont: Helvetica [100 0 0 -100 0 0]/Helvetica MF ( )640 1029 MS [100 0 0 -100 0 0]/Times-Bold MF (")790 1029 MS (A)846 1029 MS (d)918 1029 MS (d)974 1029 MS (i)1030 1029 MS (t)1058 1029 MS (i)1091 1029 MS (o)1119 1029 MS (n)1168 1029 MS (a)1224 1029 MS (l)1274 1029 MS ( )1302 1029 MS (N)1327 1029 MS (o)1399 1029 MS (t)1449 1029 MS (i)1482 1029 MS (c)1510 1029 MS (e)1554 1029 MS ( )1598 1029 MS (P)1623 1029 MS (r)1684 1029 MS (o)1728 1029 MS (v)1778 1029 MS (i)1828 1029 MS (s)1856 1029 MS (i)1895 1029 MS (o)1923 1029 MS (n)1973 1029 MS (s)2029 1029 MS (")2068 1029 MS [100 0 0 -100 0 0]/Times-Roman MF ( )2124 1029 MS (m)2149 1029 MS (e)2227 1029 MS (a)2271 1029 MS (n)2315 1029 MS (s)2365 1029 MS ( )2404 1029 MS (s)2429 1029 MS (u)2468 1029 MS (c)2518 1029 MS (h)2562 1029 MS ( )2612 1029 MS (a)2637 1029 MS (d)2681 1029 MS (d)2731 1029 MS (i)2781 1029 MS (t)2809 1029 MS (i)2837 1029 MS (o)2865 1029 MS (n)2915 1029 MS (a)2965 1029 MS (l)3009 1029 MS ( )3037 1029 MS (p)3062 1029 MS (r)3112 1029 MS (o)3145 1029 MS (v)3195 1029 MS (i)3245 1029 MS (s)3273 1029 MS (i)3312 1029 MS (o)3340 1029 MS (n)3390 1029 MS (s)3440 1029 MS ( )3479 1029 MS (a)3504 1029 MS (s)3548 1029 MS ( )3587 1029 MS (a)3612 1029 MS (p)3656 1029 MS (p)3706 1029 MS (e)3756 1029 MS (a)3800 1029 MS (r)3844 1029 MS ( )3878 1029 MS (i)3903 1029 MS (n)3931 1029 MS ( )3981 1029 MS (t)4006 1029 MS (h)4034 1029 MS (e)4084 1029 MS (N)490 1144 MS (o)562 1144 MS (t)612 1144 MS (i)640 1144 MS (c)668 1144 MS (e)712 1144 MS ( )756 1144 MS (i)781 1144 MS (n)809 1144 MS ( )859 1144 MS (O)884 1144 MS (r)956 1144 MS (i)989 1144 MS (g)1018 1144 MS (i)1067 1144 MS (n)1095 1144 MS (a)1145 1144 MS (l)1189 1144 MS ( )1217 1144 MS (C)1242 1144 MS (o)1309 1144 MS (d)1359 1144 MS (e)1409 1144 MS ( )1453 1144 MS (u)1478 1144 MS (n)1528 1144 MS (d)1578 1144 MS (e)1628 1144 MS (r)1672 1144 MS ( )1705 1144 MS (t)1730 1144 MS (h)1758 1144 MS (e)1809 1144 MS ( )1853 1144 MS (h)1878 1144 MS (e)1928 1144 MS (a)1972 1144 MS (d)2016 1144 MS (i)2066 1144 MS (n)2094 1144 MS (g)2145 1144 MS ( )2194 1144 MS (")2220 1144 MS (A)2260 1144 MS (d)2332 1144 MS (d)2382 1144 MS (i)2432 1144 MS (t)2460 1144 MS (i)2488 1144 MS (o)2516 1144 MS (n)2566 1144 MS (a)2616 1144 MS (l)2660 1144 MS ( )2688 1144 MS (N)2713 1144 MS (o)2785 1144 MS (t)2835 1144 MS (i)2863 1144 MS (c)2891 1144 MS (e)2935 1144 MS ( )2979 1144 MS (P)3004 1144 MS (r)3060 1144 MS (o)3093 1144 MS (v)3143 1144 MS (i)3193 1144 MS (s)3221 1144 MS (i)3260 1144 MS (o)3288 1144 MS (n)3338 1144 MS (s)3388 1144 MS (.)3427 1144 MS (")3453 1144 MS (1)490 1343 MS (.)540 1343 MS (2)565 1343 MS (.)615 1343 MS [100 0 0 -100 0 0]/Helvetica MF ( )640 1343 MS [100 0 0 -100 0 0]/Times-Bold MF (")790 1343 MS (C)846 1343 MS (o)918 1343 MS (v)968 1343 MS (e)1018 1343 MS (r)1062 1343 MS (e)1106 1343 MS (d)1150 1343 MS ( )1206 1343 MS (C)1231 1343 MS (o)1303 1343 MS (d)1353 1343 MS (e)1409 1343 MS (")1453 1343 MS [100 0 0 -100 0 0]/Times-Roman MF ( )1509 1343 MS (m)1534 1343 MS (e)1612 1343 MS (a)1656 1343 MS (n)1700 1343 MS (s)1750 1343 MS ( )1789 1343 MS (t)1814 1343 MS (h)1842 1343 MS (e)1892 1343 MS ( )1936 1343 MS (O)1961 1343 MS (r)2033 1343 MS (i)2066 1343 MS (g)2095 1343 MS (i)2144 1343 MS (n)2172 1343 MS (a)2222 1343 MS (l)2266 1343 MS ( )2294 1343 MS (C)2319 1343 MS (o)2386 1343 MS (d)2436 1343 MS (e)2486 1343 MS ( )2530 1343 MS (o)2555 1343 MS (r)2606 1343 MS ( )2639 1343 MS (M)2664 1343 MS (o)2753 1343 MS (d)2803 1343 MS (i)2853 1343 MS (f)2881 1343 MS (i)2914 1343 MS (c)2942 1343 MS (a)2986 1343 MS (t)3030 1343 MS (i)3058 1343 MS (o)3086 1343 MS (n)3136 1343 MS (s)3186 1343 MS (,)3225 1343 MS ( )3250 1343 MS (o)3275 1343 MS (r)3325 1343 MS ( )3358 1343 MS (a)3383 1343 MS (n)3427 1343 MS (y)3479 1343 MS ( )3527 1343 MS (c)3553 1343 MS (o)3597 1343 MS (m)3647 1343 MS (b)3725 1343 MS (i)3775 1343 MS (n)3803 1343 MS (a)3853 1343 MS (t)3897 1343 MS (i)3925 1343 MS (o)3953 1343 MS (n)4003 1343 MS ( )4053 1343 MS (t)4078 1343 MS (h)4106 1343 MS (e)4156 1343 MS (r)4200 1343 MS (e)4233 1343 MS (o)4277 1343 MS (f)4328 1343 MS (.)4361 1343 MS (1)490 1541 MS (.)540 1541 MS (3)565 1541 MS (.)615 1541 MS [100 0 0 -100 0 0]/Helvetica MF ( )640 1541 MS [100 0 0 -100 0 0]/Times-Bold MF (")790 1541 MS (H)846 1541 MS (a)924 1541 MS (r)974 1541 MS (d)1018 1541 MS (w)1074 1541 MS (a)1147 1541 MS (r)1197 1541 MS (e)1241 1541 MS (")1285 1541 MS [100 0 0 -100 0 0]/Times-Roman MF ( )1341 1541 MS (m)1366 1541 MS (e)1444 1541 MS (a)1488 1541 MS (n)1532 1541 MS (s)1582 1541 MS ( )1621 1541 MS (a)1646 1541 MS (n)1690 1541 MS (y)1741 1541 MS ( )1789 1541 MS (p)1814 1541 MS (h)1864 1541 MS (y)1916 1541 MS (s)1964 1541 MS (i)2003 1541 MS (c)2031 1541 MS (a)2075 1541 MS (l)2119 1541 MS ( )2147 1541 MS (d)2172 1541 MS (e)2222 1541 MS (v)2266 1541 MS (i)2316 1541 MS (c)2345 1541 MS (e)2389 1541 MS ( )2433 1541 MS (t)2458 1541 MS (h)2486 1541 MS (a)2536 1541 MS (t)2580 1541 MS ( )2608 1541 MS (a)2633 1541 MS (c)2678 1541 MS (c)2722 1541 MS (e)2766 1541 MS (p)2810 1541 MS (t)2860 1541 MS (s)2888 1541 MS ( )2927 1541 MS (i)2952 1541 MS (n)2980 1541 MS (p)3030 1541 MS (u)3080 1541 MS (t)3130 1541 MS (,)3158 1541 MS ( )3183 1541 MS (p)3208 1541 MS (r)3258 1541 MS (o)3291 1541 MS (c)3341 1541 MS (e)3386 1541 MS (s)3430 1541 MS (s)3469 1541 MS (e)3508 1541 MS (s)3552 1541 MS ( )3591 1541 MS (i)3616 1541 MS (n)3644 1541 MS (p)3694 1541 MS (u)3744 1541 MS (t)3794 1541 MS (,)3822 1541 MS ( )3847 1541 MS (s)3872 1541 MS (t)3911 1541 MS (o)3939 1541 MS (r)3989 1541 MS (e)4022 1541 MS (s)4066 1541 MS ( )4105 1541 MS (t)4130 1541 MS (h)4158 1541 MS (e)4208 1541 MS (r)490 1656 MS (e)523 1656 MS (s)567 1656 MS (u)606 1656 MS (l)656 1656 MS (t)684 1656 MS (s)712 1656 MS ( )751 1656 MS (o)776 1656 MS (f)826 1656 MS ( )859 1656 MS (p)884 1656 MS (r)934 1656 MS (o)967 1656 MS (c)1017 1656 MS (e)1062 1656 MS (s)1106 1656 MS (s)1145 1656 MS (i)1184 1656 MS (n)1212 1656 MS (g)1262 1656 MS (,)1311 1656 MS ( )1336 1656 MS (a)1362 1656 MS (n)1406 1656 MS (d)1456 1656 MS (/)1506 1656 MS (o)1534 1656 MS (r)1584 1656 MS ( )1617 1656 MS (p)1642 1656 MS (r)1692 1656 MS (o)1725 1656 MS (v)1775 1656 MS (i)1825 1656 MS (d)1853 1656 MS (e)1903 1656 MS (s)1947 1656 MS ( )1986 1656 MS (o)2011 1656 MS (u)2061 1656 MS (t)2111 1656 MS (p)2139 1656 MS (u)2189 1656 MS (t)2239 1656 MS (.)2267 1656 MS (1)490 1854 MS (.)540 1854 MS (4)565 1854 MS (.)615 1854 MS [100 0 0 -100 0 0]/Helvetica MF ( )640 1854 MS [100 0 0 -100 0 0]/Times-Bold MF (")790 1854 MS (L)846 1854 MS (a)913 1854 MS (r)963 1854 MS (g)1007 1854 MS (e)1057 1854 MS (r)1101 1854 MS ( )1145 1854 MS (W)1170 1854 MS (o)1270 1854 MS (r)1320 1854 MS (k)1364 1854 MS (")1420 1854 MS [100 0 0 -100 0 0]/Times-Roman MF ( )1476 1854 MS (m)1501 1854 MS (e)1579 1854 MS (a)1623 1854 MS (n)1667 1854 MS (s)1717 1854 MS ( )1756 1854 MS (a)1781 1854 MS ( )1825 1854 MS (w)1850 1854 MS (o)1922 1854 MS (r)1972 1854 MS (k)2005 1854 MS ( )2055 1854 MS (t)2080 1854 MS (h)2108 1854 MS (a)2159 1854 MS (t)2203 1854 MS ( )2231 1854 MS (c)2256 1854 MS (o)2300 1854 MS (m)2350 1854 MS (b)2428 1854 MS (i)2478 1854 MS (n)2506 1854 MS (e)2556 1854 MS (s)2600 1854 MS ( )2639 1854 MS (C)2664 1854 MS (o)2731 1854 MS (v)2781 1854 MS (e)2831 1854 MS (r)2875 1854 MS (e)2908 1854 MS (d)2952 1854 MS ( )3002 1854 MS (C)3027 1854 MS (o)3094 1854 MS (d)3144 1854 MS (e)3195 1854 MS ( )3239 1854 MS (o)3264 1854 MS (r)3314 1854 MS ( )3347 1854 MS (p)3372 1854 MS (o)3422 1854 MS (r)3472 1854 MS (t)3505 1854 MS (i)3533 1854 MS (o)3561 1854 MS (n)3611 1854 MS (s)3661 1854 MS ( )3700 1854 MS (t)3725 1854 MS (h)3753 1854 MS (e)3803 1854 MS (r)3847 1854 MS (e)3880 1854 MS (o)3924 1854 MS (f)3974 1854 MS ( )4007 1854 MS (w)4033 1854 MS (i)4105 1854 MS (t)4133 1854 MS (h)4161 1854 MS (c)490 1969 MS (o)534 1969 MS (d)584 1969 MS (e)634 1969 MS ( )678 1969 MS (n)703 1969 MS (o)753 1969 MS (t)803 1969 MS ( )831 1969 MS (g)857 1969 MS (o)906 1969 MS (v)956 1969 MS (e)1006 1969 MS (r)1050 1969 MS (n)1083 1969 MS (e)1134 1969 MS (d)1178 1969 MS ( )1228 1969 MS (b)1253 1969 MS (y)1305 1969 MS ( )1353 1969 MS (t)1378 1969 MS (h)1406 1969 MS (e)1456 1969 MS ( )1500 1969 MS (t)1525 1969 MS (e)1553 1969 MS (r)1597 1969 MS (m)1630 1969 MS (s)1708 1969 MS ( )1747 1969 MS (o)1772 1969 MS (f)1822 1969 MS ( )1855 1969 MS (t)1880 1969 MS (h)1908 1969 MS (i)1958 1969 MS (s)1986 1969 MS ( )2025 1969 MS (L)2051 1969 MS (i)2111 1969 MS (c)2139 1969 MS (e)2184 1969 MS (n)2228 1969 MS (s)2278 1969 MS (e)2317 1969 MS (.)2361 1969 MS (1)490 2168 MS (.)540 2168 MS (5)565 2168 MS (.)615 2168 MS [100 0 0 -100 0 0]/Helvetica MF ( )640 2168 MS [100 0 0 -100 0 0]/Times-Bold MF (")790 2168 MS (L)846 2168 MS (i)913 2168 MS (c)941 2168 MS (e)985 2168 MS (n)1029 2168 MS (s)1085 2168 MS (a)1124 2168 MS (b)1174 2168 MS (l)1230 2168 MS (e)1258 2168 MS (")1302 2168 MS [100 0 0 -100 0 0]/Times-Roman MF ( )1358 2168 MS (m)1382 2168 MS (e)1460 2168 MS (a)1504 2168 MS (n)1548 2168 MS (s)1598 2168 MS ( )1637 2168 MS (h)1662 2168 MS (a)1712 2168 MS (v)1756 2168 MS (i)1806 2168 MS (n)1834 2168 MS (g)1884 2168 MS ( )1933 2168 MS (t)1958 2168 MS (h)1986 2168 MS (e)2037 2168 MS ( )2081 2168 MS (r)2106 2168 MS (i)2139 2168 MS (g)2168 2168 MS (h)2217 2168 MS (t)2267 2168 MS ( )2295 2168 MS (t)2320 2168 MS (o)2348 2168 MS ( )2398 2168 MS (g)2423 2168 MS (r)2472 2168 MS (a)2506 2168 MS (n)2550 2168 MS (t)2600 2168 MS (,)2628 2168 MS ( )2653 2168 MS (t)2678 2168 MS (o)2706 2168 MS ( )2756 2168 MS (t)2781 2168 MS (h)2809 2168 MS (e)2859 2168 MS ( )2903 2168 MS (m)2928 2168 MS (a)3006 2168 MS (x)3050 2168 MS (i)3101 2168 MS (m)3129 2168 MS (u)3207 2168 MS (m)3257 2168 MS ( )3335 2168 MS (e)3360 2168 MS (x)3404 2168 MS (t)3454 2168 MS (e)3482 2168 MS (n)3526 2168 MS (t)3576 2168 MS ( )3604 2168 MS (p)3629 2168 MS (o)3679 2168 MS (s)3729 2168 MS (s)3768 2168 MS (i)3807 2168 MS (b)3835 2168 MS (l)3885 2168 MS (e)3913 2168 MS (,)3957 2168 MS ( )3982 2168 MS (w)4007 2168 MS (h)4079 2168 MS (e)4129 2168 MS (t)4173 2168 MS (h)4201 2168 MS (e)4251 2168 MS (r)4295 2168 MS (a)490 2282 MS (t)534 2282 MS ( )562 2282 MS (t)587 2282 MS (h)615 2282 MS (e)665 2282 MS ( )709 2282 MS (t)734 2282 MS (i)762 2282 MS (m)790 2282 MS (e)868 2282 MS ( )912 2282 MS (o)937 2282 MS (f)987 2282 MS ( )1020 2282 MS (t)1045 2282 MS (h)1073 2282 MS (e)1123 2282 MS ( )1167 2282 MS (i)1192 2282 MS (n)1220 2282 MS (i)1270 2282 MS (t)1298 2282 MS (i)1326 2282 MS (a)1354 2282 MS (l)1398 2282 MS ( )1426 2282 MS (g)1451 2282 MS (r)1500 2282 MS (a)1534 2282 MS (n)1578 2282 MS (t)1628 2282 MS ( )1656 2282 MS (o)1681 2282 MS (r)1731 2282 MS ( )1764 2282 MS (s)1789 2282 MS (u)1828 2282 MS (b)1878 2282 MS (s)1928 2282 MS (e)1967 2282 MS (q)2011 2282 MS (u)2061 2282 MS (e)2111 2282 MS (n)2155 2282 MS (t)2205 2282 MS (l)2233 2282 MS (y)2263 2282 MS ( )2311 2282 MS (a)2336 2282 MS (c)2381 2282 MS (q)2425 2282 MS (u)2475 2282 MS (i)2525 2282 MS (r)2553 2282 MS (e)2586 2282 MS (d)2630 2282 MS (,)2680 2282 MS ( )2705 2282 MS (a)2731 2282 MS (n)2775 2282 MS (y)2827 2282 MS ( )2875 2282 MS (a)2900 2282 MS (n)2944 2282 MS (d)2994 2282 MS ( )3044 2282 MS (a)3069 2282 MS (l)3113 2282 MS (l)3141 2282 MS ( )3169 2282 MS (o)3194 2282 MS (f)3244 2282 MS ( )3277 2282 MS (t)3302 2282 MS (h)3330 2282 MS (e)3380 2282 MS ( )3424 2282 MS (r)3450 2282 MS (i)3483 2282 MS (g)3512 2282 MS (h)3561 2282 MS (t)3611 2282 MS (s)3639 2282 MS ( )3678 2282 MS (c)3703 2282 MS (o)3747 2282 MS (n)3797 2282 MS (v)3847 2282 MS (e)3897 2282 MS (y)3943 2282 MS (e)3991 2282 MS (d)4035 2282 MS ( )4085 2282 MS (h)4110 2282 MS (e)4161 2282 MS (r)4205 2282 MS (e)4239 2282 MS (i)4283 2282 MS (n)4311 2282 MS (.)4361 2282 MS (1)490 2482 MS (.)540 2482 MS (6)565 2482 MS (.)615 2482 MS [100 0 0 -100 0 0]/Helvetica MF ( )640 2482 MS [100 0 0 -100 0 0]/Times-Bold MF (")790 2482 MS (L)846 2482 MS (i)913 2482 MS (c)941 2482 MS (e)985 2482 MS (n)1029 2482 MS (s)1085 2482 MS (e)1124 2482 MS (")1168 2482 MS [100 0 0 -100 0 0]/Times-Roman MF ( )1224 2482 MS (m)1249 2482 MS (e)1327 2482 MS (a)1371 2482 MS (n)1415 2482 MS (s)1465 2482 MS ( )1504 2482 MS (t)1529 2482 MS (h)1557 2482 MS (i)1607 2482 MS (s)1635 2482 MS ( )1674 2482 MS (d)1699 2482 MS (o)1749 2482 MS (c)1799 2482 MS (u)1843 2482 MS (m)1893 2482 MS (e)1971 2482 MS (n)2015 2482 MS (t)2065 2482 MS (.)2093 2482 MS (1)490 2679 MS (.)540 2679 MS (7)565 2679 MS (.)615 2679 MS [100 0 0 -100 0 0]/Helvetica MF ( )640 2679 MS [100 0 0 -100 0 0]/Times-Bold MF (")790 2679 MS (L)846 2679 MS (i)913 2679 MS (c)941 2679 MS (e)985 2679 MS (n)1029 2679 MS (s)1085 2679 MS (e)1124 2679 MS (d)1168 2679 MS ( )1224 2679 MS (P)1249 2679 MS (a)1309 2679 MS (t)1359 2679 MS (e)1392 2679 MS (n)1436 2679 MS (t)1492 2679 MS (s)1525 2679 MS (")1564 2679 MS [100 0 0 -100 0 0]/Times-Roman MF ( )1620 2679 MS (m)1645 2679 MS (e)1723 2679 MS (a)1767 2679 MS (n)1811 2679 MS (s)1861 2679 MS ( )1900 2679 MS (p)1925 2679 MS (a)1975 2679 MS (t)2019 2679 MS (e)2048 2679 MS (n)2092 2679 MS (t)2142 2679 MS ( )2170 2679 MS (c)2195 2679 MS (l)2239 2679 MS (a)2267 2679 MS (i)2311 2679 MS (m)2339 2679 MS (s)2417 2679 MS ( )2456 2679 MS (L)2482 2679 MS (i)2541 2679 MS (c)2570 2679 MS (e)2614 2679 MS (n)2658 2679 MS (s)2708 2679 MS (a)2747 2679 MS (b)2791 2679 MS (l)2841 2679 MS (e)2870 2679 MS ( )2914 2679 MS (b)2939 2679 MS (y)2991 2679 MS ( )3039 2679 MS (S)3064 2679 MS (G)3120 2679 MS (I)3193 2679 MS ( )3225 2679 MS (t)3250 2679 MS (h)3278 2679 MS (a)3328 2679 MS (t)3372 2679 MS ( )3400 2679 MS (a)3425 2679 MS (r)3469 2679 MS (e)3503 2679 MS ( )3547 2679 MS (i)3572 2679 MS (n)3600 2679 MS (f)3650 2679 MS (r)3683 2679 MS (i)3716 2679 MS (n)3744 2679 MS (g)3795 2679 MS (e)3844 2679 MS (d)3888 2679 MS ( )3938 2679 MS (b)3963 2679 MS (y)4015 2679 MS ( )4063 2679 MS (t)4088 2679 MS (h)4116 2679 MS (e)4167 2679 MS ( )4211 2679 MS (u)4236 2679 MS (s)4286 2679 MS (e)4325 2679 MS (o)490 2794 MS (r)540 2794 MS ( )573 2794 MS (s)598 2794 MS (a)637 2794 MS (l)681 2794 MS (e)709 2794 MS ( )753 2794 MS (o)778 2794 MS (f)828 2794 MS ( )861 2794 MS (O)886 2794 MS (r)959 2794 MS (i)992 2794 MS (g)1020 2794 MS (i)1069 2794 MS (n)1097 2794 MS (a)1148 2794 MS (l)1192 2794 MS ( )1220 2794 MS (C)1245 2794 MS (o)1312 2794 MS (d)1362 2794 MS (e)1412 2794 MS ( )1456 2794 MS (o)1481 2794 MS (r)1531 2794 MS ( )1564 2794 MS (a)1589 2794 MS (n)1633 2794 MS (y)1685 2794 MS ( )1733 2794 MS (M)1758 2794 MS (o)1847 2794 MS (d)1897 2794 MS (i)1947 2794 MS (f)1975 2794 MS (i)2008 2794 MS (c)2036 2794 MS (a)2081 2794 MS (t)2125 2794 MS (i)2153 2794 MS (o)2181 2794 MS (n)2231 2794 MS (s)2281 2794 MS ( )2320 2794 MS (p)2345 2794 MS (r)2395 2794 MS (o)2428 2794 MS (v)2478 2794 MS (i)2528 2794 MS (d)2556 2794 MS (e)2606 2794 MS (d)2650 2794 MS ( )2700 2794 MS (b)2725 2794 MS (y)2777 2794 MS ( )2825 2794 MS (S)2850 2794 MS (G)2906 2794 MS (I)2979 2794 MS (,)3011 2794 MS ( )3036 2794 MS (o)3061 2794 MS (r)3111 2794 MS ( )3144 2794 MS (a)3170 2794 MS (n)3214 2794 MS (y)3266 2794 MS ( )3314 2794 MS (c)3339 2794 MS (o)3383 2794 MS (m)3433 2794 MS (b)3511 2794 MS (i)3561 2794 MS (n)3589 2794 MS (a)3639 2794 MS (t)3683 2794 MS (i)3711 2794 MS (o)3739 2794 MS (n)3789 2794 MS ( )3839 2794 MS (t)3864 2794 MS (h)3892 2794 MS (e)3942 2794 MS (r)3986 2794 MS (e)4019 2794 MS (o)4063 2794 MS (f)4114 2794 MS (.)4147 2794 MS (1)490 2993 MS (.)540 2993 MS (8)565 2993 MS (.)615 2993 MS [100 0 0 -100 0 0]/Helvetica MF ( )640 2993 MS [100 0 0 -100 0 0]/Times-Bold MF (")790 2993 MS (M)846 2993 MS (o)940 2993 MS (d)990 2993 MS (i)1046 2993 MS (f)1074 2993 MS (i)1107 2993 MS (c)1135 2993 MS (a)1179 2993 MS (t)1229 2993 MS (i)1262 2993 MS (o)1290 2993 MS (n)1340 2993 MS (s)1396 2993 MS (")1435 2993 MS ( )1491 2993 MS [100 0 0 -100 0 0]/Times-Roman MF (m)1516 2993 MS (e)1594 2993 MS (a)1638 2993 MS (n)1682 2993 MS (s)1732 2993 MS ( )1771 2993 MS (a)1796 2993 MS (n)1840 2993 MS (y)1891 2993 MS ( )1939 2993 MS (a)1964 2993 MS (d)2008 2993 MS (d)2058 2993 MS (i)2108 2993 MS (t)2136 2993 MS (i)2164 2993 MS (o)2192 2993 MS (n)2242 2993 MS ( )2292 2993 MS (t)2317 2993 MS (o)2345 2993 MS ( )2395 2993 MS (o)2420 2993 MS (r)2470 2993 MS ( )2503 2993 MS (d)2528 2993 MS (e)2578 2993 MS (l)2622 2993 MS (e)2650 2993 MS (t)2694 2993 MS (i)2722 2993 MS (o)2750 2993 MS (n)2800 2993 MS ( )2850 2993 MS (f)2875 2993 MS (r)2908 2993 MS (o)2941 2993 MS (m)2991 2993 MS ( )3069 2993 MS (t)3094 2993 MS (h)3122 2993 MS (e)3172 2993 MS ( )3216 2993 MS (s)3241 2993 MS (u)3280 2993 MS (b)3330 2993 MS (s)3380 2993 MS (t)3419 2993 MS (a)3447 2993 MS (n)3491 2993 MS (c)3542 2993 MS (e)3586 2993 MS ( )3630 2993 MS (o)3655 2993 MS (r)3706 2993 MS ( )3739 2993 MS (s)3764 2993 MS (t)3803 2993 MS (r)3831 2993 MS (u)3864 2993 MS (c)3914 2993 MS (t)3958 2993 MS (u)3986 2993 MS (r)4036 2993 MS (e)4069 2993 MS ( )4113 2993 MS (o)4138 2993 MS (f)4189 2993 MS ( )4222 2993 MS (t)4247 2993 MS (h)4275 2993 MS (e)4325 2993 MS (O)490 3108 MS (r)562 3108 MS (i)595 3108 MS (g)623 3108 MS (i)672 3108 MS (n)700 3108 MS (a)750 3108 MS (l)794 3108 MS ( )822 3108 MS (C)847 3108 MS (o)914 3108 MS (d)964 3108 MS (e)1014 3108 MS ( )1058 3108 MS (o)1083 3108 MS (r)1134 3108 MS ( )1167 3108 MS (a)1192 3108 MS (n)1236 3108 MS (y)1288 3108 MS ( )1336 3108 MS (p)1361 3108 MS (r)1411 3108 MS (e)1445 3108 MS (v)1489 3108 MS (i)1539 3108 MS (o)1567 3108 MS (u)1617 3108 MS (s)1667 3108 MS ( )1706 3108 MS (M)1731 3108 MS (o)1820 3108 MS (d)1870 3108 MS (i)1920 3108 MS (f)1948 3108 MS (i)1981 3108 MS (c)2009 3108 MS (a)2053 3108 MS (t)2097 3108 MS (i)2125 3108 MS (o)2153 3108 MS (n)2203 3108 MS (s)2253 3108 MS (.)2292 3108 MS ( )2317 3108 MS (W)2342 3108 MS (h)2437 3108 MS (e)2487 3108 MS (n)2531 3108 MS ( )2581 3108 MS (C)2606 3108 MS (o)2673 3108 MS (v)2723 3108 MS (e)2773 3108 MS (r)2817 3108 MS (e)2850 3108 MS (d)2894 3108 MS ( )2944 3108 MS (C)2969 3108 MS (o)3036 3108 MS (d)3086 3108 MS (e)3136 3108 MS ( )3180 3108 MS (i)3205 3108 MS (s)3233 3108 MS ( )3272 3108 MS (r)3297 3108 MS (e)3331 3108 MS (l)3375 3108 MS (e)3403 3108 MS (a)3447 3108 MS (s)3491 3108 MS (e)3530 3108 MS (d)3575 3108 MS ( )3625 3108 MS (a)3650 3108 MS (s)3694 3108 MS ( )3733 3108 MS (a)3758 3108 MS ( )3802 3108 MS (s)3827 3108 MS (e)3867 3108 MS (r)3911 3108 MS (i)3944 3108 MS (e)3972 3108 MS (s)4016 3108 MS ( )4055 3108 MS (o)4080 3108 MS (f)4130 3108 MS ( )4163 3108 MS (f)4189 3108 MS (i)4222 3108 MS (l)4250 3108 MS (e)4278 3108 MS (s)4322 3108 MS (,)4361 3108 MS (a)490 3222 MS ( )534 3222 MS (M)559 3222 MS (o)648 3222 MS (d)698 3222 MS (i)748 3222 MS (f)776 3222 MS (i)809 3222 MS (c)837 3222 MS (a)881 3222 MS (t)925 3222 MS (i)953 3222 MS (o)981 3222 MS (n)1031 3222 MS ( )1081 3222 MS (i)1106 3222 MS (s)1134 3222 MS (:)1173 3222 MS (A)640 3421 MS (.)712 3421 MS [100 0 0 -100 0 0]/Helvetica MF ( )737 3421 MS [100 0 0 -100 0 0]/Times-Roman MF (A)790 3421 MS (n)862 3421 MS (y)913 3421 MS ( )961 3421 MS (a)987 3421 MS (d)1031 3421 MS (d)1081 3421 MS (i)1131 3421 MS (t)1159 3421 MS (i)1187 3421 MS (o)1215 3421 MS (n)1265 3421 MS ( )1315 3421 MS (t)1340 3421 MS (o)1368 3421 MS ( )1418 3421 MS (t)1443 3421 MS (h)1471 3421 MS (e)1521 3421 MS ( )1565 3421 MS (c)1590 3421 MS (o)1634 3421 MS (n)1684 3421 MS (t)1734 3421 MS (e)1762 3421 MS (n)1806 3421 MS (t)1856 3421 MS (s)1884 3421 MS ( )1923 3421 MS (o)1948 3421 MS (f)1998 3421 MS ( )2031 3421 MS (a)2056 3421 MS ( )2100 3421 MS (f)2125 3421 MS (i)2158 3421 MS (l)2186 3421 MS (e)2214 3421 MS ( )2258 3421 MS (c)2284 3421 MS (o)2328 3421 MS (n)2378 3421 MS (t)2428 3421 MS (a)2456 3421 MS (i)2500 3421 MS (n)2528 3421 MS (i)2578 3421 MS (n)2606 3421 MS (g)2656 3421 MS ( )2705 3421 MS (O)2731 3421 MS (r)2803 3421 MS (i)2836 3421 MS (g)2865 3421 MS (i)2914 3421 MS (n)2942 3421 MS (a)2992 3421 MS (l)3036 3421 MS ( )3064 3421 MS (C)3089 3421 MS (o)3156 3421 MS (d)3206 3421 MS (e)3256 3421 MS ( )3300 3421 MS (a)3325 3421 MS (n)3369 3421 MS (d)3419 3421 MS (/)3469 3421 MS (o)3497 3421 MS (r)3547 3421 MS ( )3580 3421 MS (a)3606 3421 MS (d)3650 3421 MS (d)3700 3421 MS (i)3750 3421 MS (t)3778 3421 MS (i)3806 3421 MS (o)3834 3421 MS (n)3884 3421 MS ( )3934 3421 MS (t)3959 3421 MS (o)3987 3421 MS ( )4037 3421 MS (o)4062 3421 MS (r)4112 3421 MS (d)790 3535 MS (e)840 3535 MS (l)884 3535 MS (e)912 3535 MS (t)956 3535 MS (i)984 3535 MS (o)1012 3535 MS (n)1062 3535 MS ( )1112 3535 MS (f)1137 3535 MS (r)1170 3535 MS (o)1203 3535 MS (m)1253 3535 MS ( )1331 3535 MS (t)1356 3535 MS (h)1384 3535 MS (e)1434 3535 MS ( )1478 3535 MS (c)1503 3535 MS (o)1547 3535 MS (n)1597 3535 MS (t)1647 3535 MS (e)1675 3535 MS (n)1719 3535 MS (t)1769 3535 MS (s)1797 3535 MS ( )1836 3535 MS (o)1861 3535 MS (f)1911 3535 MS ( )1944 3535 MS (a)1970 3535 MS ( )2014 3535 MS (f)2039 3535 MS (i)2072 3535 MS (l)2100 3535 MS (e)2128 3535 MS ( )2172 3535 MS (c)2197 3535 MS (o)2241 3535 MS (n)2291 3535 MS (t)2341 3535 MS (a)2370 3535 MS (i)2414 3535 MS (n)2442 3535 MS (i)2492 3535 MS (n)2520 3535 MS (g)2570 3535 MS ( )2619 3535 MS (p)2644 3535 MS (r)2694 3535 MS (e)2728 3535 MS (v)2772 3535 MS (i)2822 3535 MS (o)2850 3535 MS (u)2900 3535 MS (s)2950 3535 MS ( )2989 3535 MS (M)3014 3535 MS (o)3103 3535 MS (d)3153 3535 MS (i)3203 3535 MS (f)3231 3535 MS (i)3264 3535 MS (c)3292 3535 MS (a)3336 3535 MS (t)3380 3535 MS (i)3408 3535 MS (o)3436 3535 MS (n)3486 3535 MS (s)3536 3535 MS (.)3575 3535 MS (B)640 3735 MS (.)706 3735 MS [100 0 0 -100 0 0]/Helvetica MF ( )731 3735 MS [100 0 0 -100 0 0]/Times-Roman MF (A)790 3735 MS (n)862 3735 MS (y)913 3735 MS ( )961 3735 MS (n)986 3735 MS (e)1037 3735 MS (w)1081 3735 MS ( )1153 3735 MS (f)1178 3735 MS (i)1211 3735 MS (l)1239 3735 MS (e)1267 3735 MS ( )1311 3735 MS (t)1336 3735 MS (h)1364 3735 MS (a)1414 3735 MS (t)1458 3735 MS ( )1486 3735 MS (c)1511 3735 MS (o)1555 3735 MS (n)1605 3735 MS (t)1655 3735 MS (a)1684 3735 MS (i)1728 3735 MS (n)1756 3735 MS (s)1806 3735 MS ( )1845 3735 MS (a)1870 3735 MS (n)1914 3735 MS (y)1966 3735 MS ( )2014 3735 MS (p)2039 3735 MS (a)2089 3735 MS (r)2133 3735 MS (t)2166 3735 MS ( )2194 3735 MS (o)2219 3735 MS (f)2270 3735 MS ( )2303 3735 MS (t)2328 3735 MS (h)2356 3735 MS (e)2406 3735 MS ( )2450 3735 MS (O)2475 3735 MS (r)2547 3735 MS (i)2580 3735 MS (g)2609 3735 MS (i)2658 3735 MS (n)2686 3735 MS (a)2736 3735 MS (l)2780 3735 MS ( )2808 3735 MS (C)2833 3735 MS (o)2900 3735 MS (d)2950 3735 MS (e)3000 3735 MS ( )3044 3735 MS (o)3069 3735 MS (r)3119 3735 MS ( )3152 3735 MS (p)3177 3735 MS (r)3228 3735 MS (e)3261 3735 MS (v)3305 3735 MS (i)3355 3735 MS (o)3383 3735 MS (u)3433 3735 MS (s)3483 3735 MS ( )3522 3735 MS (M)3547 3735 MS (o)3636 3735 MS (d)3686 3735 MS (i)3736 3735 MS (f)3764 3735 MS (i)3797 3735 MS (c)3825 3735 MS (a)3869 3735 MS (t)3913 3735 MS (i)3941 3735 MS (o)3969 3735 MS (n)4019 3735 MS (s)4069 3735 MS (.)4108 3735 MS (1)490 3932 MS (.)540 3932 MS (9)565 3932 MS (.)615 3932 MS [100 0 0 -100 0 0]/Helvetica MF ( )640 3932 MS [100 0 0 -100 0 0]/Times-Bold MF (")790 3932 MS (N)846 3932 MS (o)918 3932 MS (t)968 3932 MS (i)1001 3932 MS (c)1029 3932 MS (e)1073 3932 MS (")1117 3932 MS [100 0 0 -100 0 0]/Times-Roman MF ( )1173 3932 MS (m)1198 3932 MS (e)1276 3932 MS (a)1320 3932 MS (n)1364 3932 MS (s)1414 3932 MS ( )1453 3932 MS (a)1478 3932 MS (n)1522 3932 MS (y)1574 3932 MS ( )1622 3932 MS (n)1647 3932 MS (o)1697 3932 MS (t)1747 3932 MS (i)1775 3932 MS (c)1803 3932 MS (e)1847 3932 MS ( )1891 3932 MS (i)1916 3932 MS (n)1944 3932 MS ( )1994 3932 MS (O)2019 3932 MS (r)2092 3932 MS (i)2125 3932 MS (g)2153 3932 MS (i)2202 3932 MS (n)2230 3932 MS (a)2281 3932 MS (l)2325 3932 MS ( )2353 3932 MS (C)2378 3932 MS (o)2445 3932 MS (d)2495 3932 MS (e)2545 3932 MS ( )2589 3932 MS (o)2614 3932 MS (r)2664 3932 MS ( )2697 3932 MS (C)2722 3932 MS (o)2789 3932 MS (v)2839 3932 MS (e)2889 3932 MS (r)2933 3932 MS (e)2967 3932 MS (d)3011 3932 MS ( )3061 3932 MS (C)3086 3932 MS (o)3153 3932 MS (d)3203 3932 MS (e)3253 3932 MS (,)3297 3932 MS ( )3322 3932 MS (a)3347 3932 MS (s)3391 3932 MS ( )3430 3932 MS (r)3455 3932 MS (e)3489 3932 MS (q)3533 3932 MS (u)3583 3932 MS (i)3633 3932 MS (r)3661 3932 MS (e)3694 3932 MS (d)3738 3932 MS ( )3788 3932 MS (b)3813 3932 MS (y)3865 3932 MS ( )3913 3932 MS (a)3939 3932 MS (n)3983 3932 MS (d)4033 3932 MS ( )4083 3932 MS (i)4108 3932 MS (n)4136 3932 MS (c)490 4047 MS (o)534 4047 MS (m)584 4047 MS (p)662 4047 MS (l)712 4047 MS (i)740 4047 MS (a)768 4047 MS (n)812 4047 MS (c)862 4047 MS (e)906 4047 MS ( )950 4047 MS (w)975 4047 MS (i)1047 4047 MS (t)1075 4047 MS (h)1103 4047 MS ( )1153 4047 MS (t)1178 4047 MS (h)1206 4047 MS (i)1256 4047 MS (s)1284 4047 MS ( )1323 4047 MS (L)1349 4047 MS (i)1408 4047 MS (c)1436 4047 MS (e)1480 4047 MS (n)1525 4047 MS (s)1575 4047 MS (e)1614 4047 MS (.)1658 4047 MS (1)490 4246 MS (.)540 4246 MS (1)565 4246 MS (0)615 4246 MS (.)665 4246 MS [100 0 0 -100 0 0]/Helvetica MF ( )690 4246 MS [100 0 0 -100 0 0]/Times-Bold MF (")790 4246 MS (O)846 4246 MS (r)924 4246 MS (i)968 4246 MS (g)996 4246 MS (i)1046 4246 MS (n)1074 4246 MS (a)1130 4246 MS (l)1180 4246 MS ( )1208 4246 MS (C)1233 4246 MS (o)1305 4246 MS (d)1355 4246 MS (e)1411 4246 MS (")1454 4246 MS [100 0 0 -100 0 0]/Times-Roman MF ( )1510 4246 MS (m)1535 4246 MS (e)1613 4246 MS (a)1657 4246 MS (n)1701 4246 MS (s)1751 4246 MS ( )1790 4246 MS (s)1815 4246 MS (o)1854 4246 MS (u)1904 4246 MS (r)1954 4246 MS (c)1987 4246 MS (e)2031 4246 MS ( )2075 4246 MS (c)2100 4246 MS (o)2144 4246 MS (d)2194 4246 MS (e)2245 4246 MS ( )2289 4246 MS (o)2314 4246 MS (f)2364 4246 MS ( )2397 4246 MS (c)2422 4246 MS (o)2466 4246 MS (m)2516 4246 MS (p)2594 4246 MS (u)2644 4246 MS (t)2694 4246 MS (e)2722 4246 MS (r)2767 4246 MS ( )2800 4246 MS (s)2825 4246 MS (o)2864 4246 MS (f)2914 4246 MS (t)2947 4246 MS (w)2975 4246 MS (a)3047 4246 MS (r)3092 4246 MS (e)3125 4246 MS ( )3169 4246 MS (c)3194 4246 MS (o)3238 4246 MS (d)3288 4246 MS (e)3339 4246 MS ( )3383 4246 MS (t)3408 4246 MS (h)3436 4246 MS (a)3486 4246 MS (t)3530 4246 MS ( )3558 4246 MS (i)3583 4246 MS (s)3611 4246 MS ( )3650 4246 MS (d)3675 4246 MS (e)3725 4246 MS (s)3769 4246 MS (c)3808 4246 MS (r)3852 4246 MS (i)3885 4246 MS (b)3913 4246 MS (e)3964 4246 MS (d)4008 4246 MS ( )4058 4246 MS (i)4083 4246 MS (n)4111 4246 MS ( )4161 4246 MS (t)4186 4246 MS (h)4214 4246 MS (e)4264 4246 MS (s)490 4361 MS (o)529 4361 MS (u)579 4361 MS (r)629 4361 MS (c)662 4361 MS (e)706 4361 MS ( )750 4361 MS (c)775 4361 MS (o)819 4361 MS (d)869 4361 MS (e)920 4361 MS ( )964 4361 MS (N)989 4361 MS (o)1061 4361 MS (t)1111 4361 MS (i)1139 4361 MS (c)1167 4361 MS (e)1211 4361 MS ( )1255 4361 MS (r)1281 4361 MS (e)1314 4361 MS (q)1358 4361 MS (u)1408 4361 MS (i)1458 4361 MS (r)1486 4361 MS (e)1520 4361 MS (d)1564 4361 MS ( )1614 4361 MS (b)1639 4361 MS (y)1691 4361 MS ( )1739 4361 MS (E)1764 4361 MS (x)1825 4361 MS (h)1876 4361 MS (i)1926 4361 MS (b)1954 4361 MS (i)2004 4361 MS (t)2032 4361 MS ( )2060 4361 MS (A)2085 4361 MS ( )2157 4361 MS (a)2182 4361 MS (s)2226 4361 MS ( )2265 4361 MS (O)2290 4361 MS (r)2362 4361 MS (i)2395 4361 MS (g)2423 4361 MS (i)2472 4361 MS (n)2500 4361 MS (a)2550 4361 MS (l)2594 4361 MS ( )2622 4361 MS (C)2647 4361 MS (o)2714 4361 MS (d)2764 4361 MS (e)2814 4361 MS (,)2858 4361 MS ( )2883 4361 MS (a)2908 4361 MS (n)2952 4361 MS (d)3002 4361 MS ( )3052 4361 MS (u)3077 4361 MS (p)3127 4361 MS (d)3177 4361 MS (a)3228 4361 MS (t)3272 4361 MS (e)3300 4361 MS (s)3344 4361 MS ( )3383 4361 MS (a)3408 4361 MS (n)3452 4361 MS (d)3502 4361 MS ( )3552 4361 MS (e)3578 4361 MS (r)3622 4361 MS (r)3655 4361 MS (o)3688 4361 MS (r)3739 4361 MS ( )3772 4361 MS (c)3797 4361 MS (o)3841 4361 MS (r)3891 4361 MS (r)3925 4361 MS (e)3958 4361 MS (c)4002 4361 MS (t)4046 4361 MS (i)4074 4361 MS (o)4102 4361 MS (n)4152 4361 MS (s)4202 4361 MS (s)490 4475 MS (p)529 4475 MS (e)579 4475 MS (c)623 4475 MS (i)667 4475 MS (f)695 4475 MS (i)728 4475 MS (c)756 4475 MS (a)800 4475 MS (l)844 4475 MS (l)872 4475 MS (y)902 4475 MS ( )950 4475 MS (t)975 4475 MS (h)1003 4475 MS (e)1053 4475 MS (r)1097 4475 MS (e)1131 4475 MS (t)1175 4475 MS (o)1203 4475 MS (.)1253 4475 MS (1)490 4674 MS (.)540 4674 MS (1)565 4674 MS (1)615 4674 MS (.)665 4674 MS [100 0 0 -100 0 0]/Helvetica MF ( )690 4674 MS [100 0 0 -100 0 0]/Times-Bold MF (")790 4674 MS (R)846 4674 MS (e)918 4674 MS (c)962 4674 MS (i)1006 4674 MS (p)1034 4674 MS (i)1090 4674 MS (e)1118 4674 MS (n)1162 4674 MS (t)1218 4674 MS (")1251 4674 MS ( )1307 4674 MS [100 0 0 -100 0 0]/Times-Roman MF (m)1332 4674 MS (e)1410 4674 MS (a)1454 4674 MS (n)1498 4674 MS (s)1548 4674 MS ( )1587 4674 MS (a)1612 4674 MS (n)1656 4674 MS ( )1706 4674 MS (i)1731 4674 MS (n)1759 4674 MS (d)1809 4674 MS (i)1859 4674 MS (v)1887 4674 MS (i)1937 4674 MS (d)1965 4674 MS (u)2015 4674 MS (a)2065 4674 MS (l)2109 4674 MS ( )2137 4674 MS (o)2162 4674 MS (r)2212 4674 MS ( )2245 4674 MS (a)2270 4674 MS ( )2314 4674 MS (l)2339 4674 MS (e)2367 4674 MS (g)2412 4674 MS (a)2461 4674 MS (l)2505 4674 MS ( )2533 4674 MS (e)2558 4674 MS (n)2602 4674 MS (t)2652 4674 MS (i)2680 4674 MS (t)2708 4674 MS (y)2738 4674 MS ( )2786 4674 MS (e)2811 4674 MS (x)2855 4674 MS (e)2906 4674 MS (r)2950 4674 MS (c)2983 4674 MS (i)3027 4674 MS (s)3055 4674 MS (i)3094 4674 MS (n)3122 4674 MS (g)3173 4674 MS ( )3222 4674 MS (r)3247 4674 MS (i)3280 4674 MS (g)3309 4674 MS (h)3358 4674 MS (t)3408 4674 MS (s)3436 4674 MS ( )3475 4674 MS (u)3500 4674 MS (n)3550 4674 MS (d)3600 4674 MS (e)3650 4674 MS (r)3694 4674 MS (,)3727 4674 MS ( )3752 4674 MS (a)3778 4674 MS (n)3822 4674 MS (d)3872 4674 MS ( )3922 4674 MS (c)3947 4674 MS (o)3991 4674 MS (m)4041 4674 MS (p)4119 4674 MS (l)4169 4674 MS (y)4199 4674 MS (i)4246 4674 MS (n)4274 4674 MS (g)4325 4674 MS (w)490 4789 MS (i)562 4789 MS (t)590 4789 MS (h)618 4789 MS ( )668 4789 MS (a)693 4789 MS (l)737 4789 MS (l)765 4789 MS ( )793 4789 MS (o)818 4789 MS (f)868 4789 MS ( )901 4789 MS (t)926 4789 MS (h)954 4789 MS (e)1004 4789 MS ( )1048 4789 MS (t)1073 4789 MS (e)1101 4789 MS (r)1145 4789 MS (m)1178 4789 MS (s)1256 4789 MS ( )1295 4789 MS (o)1320 4789 MS (f)1370 4789 MS (,)1403 4789 MS ( )1428 4789 MS (t)1453 4789 MS (h)1481 4789 MS (i)1531 4789 MS (s)1559 4789 MS ( )1598 4789 MS (L)1624 4789 MS (i)1683 4789 MS (c)1712 4789 MS (e)1756 4789 MS (n)1800 4789 MS (s)1850 4789 MS (e)1889 4789 MS ( )1933 4789 MS (o)1958 4789 MS (r)2009 4789 MS ( )2042 4789 MS (a)2067 4789 MS ( )2111 4789 MS (f)2136 4789 MS (u)2169 4789 MS (t)2219 4789 MS (u)2247 4789 MS (r)2297 4789 MS (e)2331 4789 MS ( )2375 4789 MS (v)2400 4789 MS (e)2450 4789 MS (r)2494 4789 MS (s)2527 4789 MS (i)2566 4789 MS (o)2594 4789 MS (n)2644 4789 MS ( )2694 4789 MS (o)2719 4789 MS (f)2769 4789 MS ( )2802 4789 MS (t)2827 4789 MS (h)2855 4789 MS (i)2905 4789 MS (s)2933 4789 MS ( )2972 4789 MS (L)2998 4789 MS (i)3058 4789 MS (c)3086 4789 MS (e)3131 4789 MS (n)3175 4789 MS (s)3225 4789 MS (e)3264 4789 MS ( )3308 4789 MS (i)3333 4789 MS (s)3361 4789 MS (s)3400 4789 MS (u)3439 4789 MS (e)3489 4789 MS (d)3533 4789 MS ( )3583 4789 MS (u)3608 4789 MS (n)3658 4789 MS (d)3708 4789 MS (e)3758 4789 MS (r)3803 4789 MS ( )3836 4789 MS (S)3861 4789 MS (e)3917 4789 MS (c)3961 4789 MS (t)4005 4789 MS (i)4033 4789 MS (o)4061 4789 MS (n)4111 4789 MS ( )4161 4789 MS (8)4186 4789 MS (.)4236 4789 MS (F)490 4904 MS (o)545 4904 MS (r)595 4904 MS ( )628 4904 MS (l)653 4904 MS (e)681 4904 MS (g)726 4904 MS (a)775 4904 MS (l)819 4904 MS ( )847 4904 MS (e)873 4904 MS (n)917 4904 MS (t)967 4904 MS (i)995 4904 MS (t)1023 4904 MS (i)1051 4904 MS (e)1079 4904 MS (s)1123 4904 MS (,)1162 4904 MS ( )1187 4904 MS (")1212 4904 MS (R)1252 4904 MS (e)1319 4904 MS (c)1363 4904 MS (i)1407 4904 MS (p)1435 4904 MS (i)1485 4904 MS (e)1513 4904 MS (n)1557 4904 MS (t)1607 4904 MS (")1636 4904 MS ( )1676 4904 MS (i)1701 4904 MS (n)1729 4904 MS (c)1779 4904 MS (l)1823 4904 MS (u)1851 4904 MS (d)1901 4904 MS (e)1951 4904 MS (s)1995 4904 MS ( )2034 4904 MS (a)2060 4904 MS (n)2104 4904 MS (y)2156 4904 MS ( )2204 4904 MS (e)2229 4904 MS (n)2273 4904 MS (t)2323 4904 MS (i)2351 4904 MS (t)2379 4904 MS (y)2408 4904 MS ( )2456 4904 MS (t)2481 4904 MS (h)2509 4904 MS (a)2560 4904 MS (t)2604 4904 MS ( )2632 4904 MS (c)2657 4904 MS (o)2701 4904 MS (n)2751 4904 MS (t)2801 4904 MS (r)2829 4904 MS (o)2862 4904 MS (l)2912 4904 MS (s)2940 4904 MS (,)2979 4904 MS ( )3004 4904 MS (i)3029 4904 MS (s)3057 4904 MS ( )3096 4904 MS (c)3121 4904 MS (o)3165 4904 MS (n)3215 4904 MS (t)3265 4904 MS (r)3293 4904 MS (o)3326 4904 MS (l)3376 4904 MS (l)3404 4904 MS (e)3432 4904 MS (d)3476 4904 MS ( )3526 4904 MS (b)3551 4904 MS (y)3603 4904 MS (,)3651 4904 MS ( )3676 4904 MS (o)3701 4904 MS (r)3751 4904 MS ( )3784 4904 MS (i)3809 4904 MS (s)3837 4904 MS ( )3876 4904 MS (u)3901 4904 MS (n)3951 4904 MS (d)4001 4904 MS (e)4051 4904 MS (r)4095 4904 MS (c)490 5019 MS (o)534 5019 MS (m)584 5019 MS (m)662 5019 MS (o)740 5019 MS (n)790 5019 MS ( )840 5019 MS (c)865 5019 MS (o)909 5019 MS (n)959 5019 MS (t)1009 5019 MS (r)1037 5019 MS (o)1070 5019 MS (l)1120 5019 MS ( )1148 5019 MS (w)1173 5019 MS (i)1245 5019 MS (t)1273 5019 MS (h)1301 5019 MS ( )1351 5019 MS (R)1376 5019 MS (e)1443 5019 MS (c)1487 5019 MS (i)1531 5019 MS (p)1559 5019 MS (i)1609 5019 MS (e)1637 5019 MS (n)1681 5019 MS (t)1731 5019 MS (.)1759 5019 MS ( )1784 5019 MS (F)1809 5019 MS (o)1864 5019 MS (r)1914 5019 MS ( )1947 5019 MS (p)1972 5019 MS (u)2022 5019 MS (r)2073 5019 MS (p)2106 5019 MS (o)2156 5019 MS (s)2206 5019 MS (e)2245 5019 MS (s)2289 5019 MS ( )2328 5019 MS (o)2353 5019 MS (f)2403 5019 MS ( )2436 5019 MS (t)2461 5019 MS (h)2489 5019 MS (i)2539 5019 MS (s)2567 5019 MS ( )2606 5019 MS (d)2631 5019 MS (e)2681 5019 MS (f)2725 5019 MS (i)2758 5019 MS (n)2786 5019 MS (i)2836 5019 MS (t)2864 5019 MS (i)2892 5019 MS (o)2920 5019 MS (n)2970 5019 MS (,)3020 5019 MS ( )3045 5019 MS (")3070 5019 MS (c)3111 5019 MS (o)3155 5019 MS (n)3205 5019 MS (t)3255 5019 MS (r)3283 5019 MS (o)3316 5019 MS (l)3366 5019 MS (")3394 5019 MS ( )3434 5019 MS (o)3459 5019 MS (f)3510 5019 MS ( )3543 5019 MS (a)3568 5019 MS (n)3612 5019 MS ( )3662 5019 MS (e)3687 5019 MS (n)3731 5019 MS (t)3781 5019 MS (i)3809 5019 MS (t)3837 5019 MS (y)3867 5019 MS ( )3915 5019 MS (m)3940 5019 MS (e)4018 5019 MS (a)4062 5019 MS (n)4106 5019 MS (s)4156 5019 MS ( )4195 5019 MS (\()4221 5019 MS (a)4254 5019 MS (\))4298 5019 MS (t)490 5134 MS (h)518 5134 MS (e)568 5134 MS ( )612 5134 MS (p)637 5134 MS (o)687 5134 MS (w)737 5134 MS (e)809 5134 MS (r)853 5134 MS (,)886 5134 MS ( )911 5134 MS (d)936 5134 MS (i)986 5134 MS (r)1014 5134 MS (e)1048 5134 MS (c)1092 5134 MS (t)1136 5134 MS ( )1164 5134 MS (o)1189 5134 MS (r)1239 5134 MS ( )1272 5134 MS (i)1297 5134 MS (n)1325 5134 MS (d)1375 5134 MS (i)1425 5134 MS (r)1453 5134 MS (e)1486 5134 MS (c)1531 5134 MS (t)1575 5134 MS (,)1603 5134 MS ( )1628 5134 MS (t)1653 5134 MS (o)1681 5134 MS ( )1731 5134 MS (d)1756 5134 MS (i)1806 5134 MS (r)1834 5134 MS (e)1867 5134 MS (c)1911 5134 MS (t)1955 5134 MS ( )1983 5134 MS (o)2008 5134 MS (r)2058 5134 MS ( )2091 5134 MS (m)2116 5134 MS (a)2194 5134 MS (n)2238 5134 MS (a)2289 5134 MS (g)2334 5134 MS (e)2383 5134 MS ( )2427 5134 MS (s)2452 5134 MS (u)2491 5134 MS (c)2542 5134 MS (h)2586 5134 MS ( )2636 5134 MS (e)2661 5134 MS (n)2705 5134 MS (t)2755 5134 MS (i)2783 5134 MS (t)2811 5134 MS (y)2840 5134 MS (,)2888 5134 MS ( )2913 5134 MS (o)2938 5134 MS (r)2989 5134 MS ( )3022 5134 MS (\()3047 5134 MS (b)3080 5134 MS (\))3130 5134 MS ( )3163 5134 MS (o)3188 5134 MS (w)3238 5134 MS (n)3310 5134 MS (e)3361 5134 MS (r)3405 5134 MS (s)3438 5134 MS (h)3477 5134 MS (i)3527 5134 MS (p)3555 5134 MS ( )3605 5134 MS (o)3630 5134 MS (f)3680 5134 MS ( )3713 5134 MS (f)3738 5134 MS (i)3771 5134 MS (f)3800 5134 MS (t)3833 5134 MS (y)3862 5134 MS ( )3910 5134 MS (p)3935 5134 MS (e)3986 5134 MS (r)4030 5134 MS (c)4063 5134 MS (e)4108 5134 MS (n)4152 5134 MS (t)4202 5134 MS (\()490 5249 MS (5)523 5249 MS (0)573 5249 MS (%)623 5249 MS (\))706 5249 MS ( )739 5249 MS (o)764 5249 MS (r)814 5249 MS ( )847 5249 MS (m)872 5249 MS (o)950 5249 MS (r)1000 5249 MS (e)1034 5249 MS ( )1078 5249 MS (o)1103 5249 MS (f)1153 5249 MS ( )1186 5249 MS (t)1211 5249 MS (h)1239 5249 MS (e)1289 5249 MS ( )1333 5249 MS (o)1358 5249 MS (u)1408 5249 MS (t)1458 5249 MS (s)1486 5249 MS (t)1525 5249 MS (a)1553 5249 MS (n)1597 5249 MS (d)1647 5249 MS (i)1697 5249 MS (n)1725 5249 MS (g)1776 5249 MS ( )1825 5249 MS (s)1850 5249 MS (h)1889 5249 MS (a)1939 5249 MS (r)1984 5249 MS (e)2017 5249 MS (s)2061 5249 MS ( )2100 5249 MS (o)2125 5249 MS (r)2175 5249 MS ( )2208 5249 MS (b)2233 5249 MS (e)2284 5249 MS (n)2328 5249 MS (e)2378 5249 MS (f)2422 5249 MS (i)2455 5249 MS (c)2483 5249 MS (i)2527 5249 MS (a)2556 5249 MS (l)2600 5249 MS ( )2628 5249 MS (o)2653 5249 MS (w)2703 5249 MS (n)2775 5249 MS (e)2825 5249 MS (r)2869 5249 MS (s)2902 5249 MS (h)2941 5249 MS (i)2991 5249 MS (p)3019 5249 MS ( )3069 5249 MS (o)3094 5249 MS (f)3144 5249 MS ( )3177 5249 MS (s)3202 5249 MS (u)3241 5249 MS (c)3292 5249 MS (h)3336 5249 MS ( )3386 5249 MS (e)3411 5249 MS (n)3455 5249 MS (t)3505 5249 MS (i)3533 5249 MS (t)3561 5249 MS (y)3590 5249 MS (.)3638 5249 MS (1)490 5447 MS (.)540 5447 MS (1)565 5447 MS (2)615 5447 MS (.)665 5447 MS [100 0 0 -100 0 0]/Helvetica MF ( )690 5447 MS [100 0 0 -100 0 0]/Times-Bold MF (")790 5447 MS (R)846 5447 MS (e)918 5447 MS (c)962 5447 MS (i)1006 5447 MS (p)1034 5447 MS (i)1090 5447 MS (e)1118 5447 MS (n)1162 5447 MS (t)1218 5447 MS ( )1251 5447 MS (P)1276 5447 MS (a)1336 5447 MS (t)1386 5447 MS (e)1420 5447 MS (n)1464 5447 MS (t)1520 5447 MS (s)1553 5447 MS (")1592 5447 MS ( )1648 5447 MS [100 0 0 -100 0 0]/Times-Roman MF (m)1673 5447 MS (e)1751 5447 MS (a)1795 5447 MS (n)1839 5447 MS (s)1889 5447 MS ( )1928 5447 MS (p)1953 5447 MS (a)2003 5447 MS (t)2047 5447 MS (e)2075 5447 MS (n)2119 5447 MS (t)2169 5447 MS ( )2197 5447 MS (c)2222 5447 MS (l)2266 5447 MS (a)2295 5447 MS (i)2339 5447 MS (m)2367 5447 MS (s)2445 5447 MS ( )2484 5447 MS (L)2510 5447 MS (i)2569 5447 MS (c)2597 5447 MS (e)2642 5447 MS (n)2686 5447 MS (s)2736 5447 MS (a)2775 5447 MS (b)2819 5447 MS (l)2869 5447 MS (e)2897 5447 MS ( )2941 5447 MS (b)2966 5447 MS (y)3018 5447 MS ( )3066 5447 MS (a)3092 5447 MS ( )3136 5447 MS (R)3161 5447 MS (e)3228 5447 MS (c)3272 5447 MS (i)3316 5447 MS (p)3344 5447 MS (i)3394 5447 MS (e)3422 5447 MS (n)3466 5447 MS (t)3516 5447 MS ( )3544 5447 MS (t)3569 5447 MS (h)3597 5447 MS (a)3647 5447 MS (t)3691 5447 MS ( )3719 5447 MS (a)3744 5447 MS (r)3789 5447 MS (e)3822 5447 MS ( )3866 5447 MS (i)3891 5447 MS (n)3919 5447 MS (f)3969 5447 MS (r)4002 5447 MS (i)4035 5447 MS (n)4063 5447 MS (g)4114 5447 MS (e)4163 5447 MS (d)4207 5447 MS ( )4257 5447 MS (b)4282 5447 MS (y)4334 5447 MS (t)490 5562 MS (h)518 5562 MS (e)568 5562 MS ( )612 5562 MS (u)637 5562 MS (s)687 5562 MS (e)726 5562 MS ( )770 5562 MS (o)795 5562 MS (r)845 5562 MS ( )878 5562 MS (s)903 5562 MS (a)942 5562 MS (l)986 5562 MS (e)1014 5562 MS ( )1058 5562 MS (o)1083 5562 MS (f)1134 5562 MS ( )1167 5562 MS (O)1192 5562 MS (r)1264 5562 MS (i)1297 5562 MS (g)1326 5562 MS (i)1375 5562 MS (n)1403 5562 MS (a)1453 5562 MS (l)1497 5562 MS ( )1525 5562 MS (C)1550 5562 MS (o)1617 5562 MS (d)1667 5562 MS (e)1717 5562 MS ( )1761 5562 MS (o)1786 5562 MS (r)1836 5562 MS ( )1869 5562 MS (a)1895 5562 MS (n)1939 5562 MS (y)1991 5562 MS ( )2039 5562 MS (M)2064 5562 MS (o)2153 5562 MS (d)2203 5562 MS (i)2253 5562 MS (f)2281 5562 MS (i)2314 5562 MS (c)2342 5562 MS (a)2386 5562 MS (t)2430 5562 MS (i)2458 5562 MS (o)2486 5562 MS (n)2536 5562 MS (s)2586 5562 MS ( )2625 5562 MS (p)2650 5562 MS (r)2700 5562 MS (o)2733 5562 MS (v)2783 5562 MS (i)2833 5562 MS (d)2861 5562 MS (e)2911 5562 MS (d)2955 5562 MS ( )3005 5562 MS (b)3030 5562 MS (y)3082 5562 MS ( )3130 5562 MS (S)3155 5562 MS (G)3211 5562 MS (I)3284 5562 MS (,)3316 5562 MS ( )3341 5562 MS (o)3366 5562 MS (r)3417 5562 MS ( )3450 5562 MS (a)3475 5562 MS (n)3519 5562 MS (y)3571 5562 MS ( )3619 5562 MS (c)3645 5562 MS (o)3689 5562 MS (m)3739 5562 MS (b)3817 5562 MS (i)3867 5562 MS (n)3895 5562 MS (a)3945 5562 MS (t)3989 5562 MS (i)4017 5562 MS (o)4045 5562 MS (n)4095 5562 MS (t)490 5677 MS (h)518 5677 MS (e)568 5677 MS (r)612 5677 MS (e)645 5677 MS (o)689 5677 MS (f)739 5677 MS (.)772 5677 MS (1)490 5876 MS (.)540 5876 MS (1)565 5876 MS (3)615 5876 MS (.)665 5876 MS [100 0 0 -100 0 0]/Helvetica MF ( )690 5876 MS [100 0 0 -100 0 0]/Times-Bold MF (")790 5876 MS (S)846 5876 MS (G)902 5876 MS (I)979 5876 MS (")1018 5876 MS [100 0 0 -100 0 0]/Times-Roman MF ( )1074 5876 MS (m)1099 5876 MS (e)1177 5876 MS (a)1221 5876 MS (n)1265 5876 MS (s)1315 5876 MS ( )1354 5876 MS (S)1379 5876 MS (i)1435 5876 MS (l)1463 5876 MS (i)1491 5876 MS (c)1519 5876 MS (o)1563 5876 MS (n)1613 5876 MS ( )1663 5876 MS (G)1688 5876 MS (r)1760 5876 MS (a)1793 5876 MS (p)1837 5876 MS (h)1887 5876 MS (i)1937 5876 MS (c)1965 5876 MS (s)2009 5876 MS (,)2048 5876 MS ( )2073 5876 MS (I)2099 5876 MS (n)2131 5876 MS (c)2181 5876 MS (.)2225 5876 MS showpage %%Page: 2 2 13.238 780.059 translate 72 600 div dup neg scale 0 0 transform .25 add round .25 sub exch .25 add round .25 sub exch itransform translate [100 0 0 -100 0 0]/Times-Roman MF (1)490 592 MS (.)540 592 MS (1)565 592 MS (4)615 592 MS (.)665 592 MS [100 0 0 -100 0 0]/Helvetica MF ( )690 592 MS [100 0 0 -100 0 0]/Times-Bold MF (")790 592 MS (S)846 592 MS (G)902 592 MS (I)979 592 MS ( )1018 592 MS (P)1043 592 MS (a)1103 592 MS (t)1153 592 MS (e)1187 592 MS (n)1231 592 MS (t)1287 592 MS (s)1320 592 MS (")1359 592 MS ( )1415 592 MS [100 0 0 -100 0 0]/Times-Roman MF (m)1440 592 MS (e)1518 592 MS (a)1562 592 MS (n)1606 592 MS (s)1656 592 MS ( )1695 592 MS (p)1720 592 MS (a)1770 592 MS (t)1814 592 MS (e)1842 592 MS (n)1886 592 MS (t)1936 592 MS ( )1964 592 MS (c)1989 592 MS (l)2033 592 MS (a)2061 592 MS (i)2105 592 MS (m)2133 592 MS (s)2211 592 MS ( )2250 592 MS (L)2276 592 MS (i)2336 592 MS (c)2364 592 MS (e)2409 592 MS (n)2453 592 MS (s)2503 592 MS (a)2542 592 MS (b)2586 592 MS (l)2636 592 MS (e)2664 592 MS ( )2708 592 MS (b)2733 592 MS (y)2785 592 MS ( )2833 592 MS (S)2858 592 MS (G)2914 592 MS (I)2987 592 MS ( )3019 592 MS (o)3044 592 MS (t)3094 592 MS (h)3122 592 MS (e)3172 592 MS (r)3217 592 MS ( )3250 592 MS (t)3275 592 MS (h)3303 592 MS (a)3353 592 MS (n)3397 592 MS ( )3447 592 MS (t)3472 592 MS (h)3500 592 MS (e)3550 592 MS ( )3594 592 MS (L)3620 592 MS (i)3680 592 MS (c)3708 592 MS (e)3753 592 MS (n)3797 592 MS (s)3847 592 MS (e)3886 592 MS (d)3930 592 MS ( )3980 592 MS (P)4005 592 MS (a)4061 592 MS (t)4105 592 MS (e)4133 592 MS (n)4177 592 MS (t)4227 592 MS (s)4255 592 MS (.)4294 592 MS [100 0 0 -100 0 0]/Times-Bold MF (2)490 792 MS (.)540 792 MS [100 0 0 -100 0 0]/Helvetica-Bold MF ( )565 792 MS [100 0 0 -100 0 0]/Times-Bold MF (L)790 792 MS (i)857 792 MS (c)885 792 MS (e)929 792 MS (n)973 792 MS (s)1029 792 MS (e)1068 792 MS ( )1112 792 MS (G)1137 792 MS (r)1214 792 MS (a)1258 792 MS (n)1308 792 MS (t)1364 792 MS ( )1397 792 MS (a)1422 792 MS (n)1472 792 MS (d)1528 792 MS ( )1584 792 MS (R)1609 792 MS (e)1681 792 MS (s)1725 792 MS (t)1764 792 MS (r)1797 792 MS (i)1842 792 MS (c)1870 792 MS (t)1914 792 MS (i)1947 792 MS (o)1975 792 MS (n)2025 792 MS (s)2081 792 MS (.)2120 792 MS [100 0 0 -100 0 0]/Times-Roman MF (2)490 988 MS (.)540 988 MS (1)565 988 MS (.)615 988 MS [100 0 0 -100 0 0]/Helvetica MF ( )640 988 MS [100 0 0 -100 0 0]/Times-Bold MF (S)790 988 MS (G)846 988 MS (I)923 988 MS ( )962 988 MS (L)987 988 MS (i)1054 988 MS (c)1082 988 MS (e)1126 988 MS (n)1170 988 MS (s)1226 988 MS (e)1265 988 MS ( )1309 988 MS (G)1334 988 MS (r)1412 988 MS (a)1456 988 MS (n)1506 988 MS (t)1562 988 MS (.)1595 988 MS [100 0 0 -100 0 0]/Times-Roman MF ( )1620 988 MS (S)1645 988 MS (u)1701 988 MS (b)1751 988 MS (j)1801 988 MS (e)1829 988 MS (c)1873 988 MS (t)1917 988 MS ( )1945 988 MS (t)1970 988 MS (o)1998 988 MS ( )2048 988 MS (t)2073 988 MS (h)2101 988 MS (e)2151 988 MS ( )2195 988 MS (t)2220 988 MS (e)2248 988 MS (r)2292 988 MS (m)2325 988 MS (s)2403 988 MS ( )2442 988 MS (o)2467 988 MS (f)2517 988 MS ( )2550 988 MS (t)2575 988 MS (h)2603 988 MS (i)2653 988 MS (s)2681 988 MS ( )2720 988 MS (L)2746 988 MS (i)2805 988 MS (c)2833 988 MS (e)2878 988 MS (n)2922 988 MS (s)2972 988 MS (e)3012 988 MS ( )3056 988 MS (a)3081 988 MS (n)3125 988 MS (d)3175 988 MS ( )3225 988 MS (a)3250 988 MS (n)3294 988 MS (y)3346 988 MS ( )3394 988 MS (t)3419 988 MS (h)3447 988 MS (i)3497 988 MS (r)3525 988 MS (d)3558 988 MS ( )3608 988 MS (p)3633 988 MS (a)3684 988 MS (r)3728 988 MS (t)3761 988 MS (y)3791 988 MS ( )3839 988 MS (i)3864 988 MS (n)3892 988 MS (t)3942 988 MS (e)3970 988 MS (l)4014 988 MS (l)4042 988 MS (e)4070 988 MS (c)4114 988 MS (t)4158 988 MS (u)4186 988 MS (a)4236 988 MS (l)4280 988 MS (p)490 1103 MS (r)540 1103 MS (o)573 1103 MS (p)623 1103 MS (e)673 1103 MS (r)717 1103 MS (t)750 1103 MS (y)780 1103 MS ( )828 1103 MS (c)853 1103 MS (l)897 1103 MS (a)925 1103 MS (i)969 1103 MS (m)997 1103 MS (s)1075 1103 MS (,)1114 1103 MS ( )1139 1103 MS (f)1164 1103 MS (o)1197 1103 MS (r)1247 1103 MS ( )1280 1103 MS (t)1305 1103 MS (h)1333 1103 MS (e)1384 1103 MS ( )1428 1103 MS (d)1453 1103 MS (u)1503 1103 MS (r)1553 1103 MS (a)1586 1103 MS (t)1630 1103 MS (i)1658 1103 MS (o)1686 1103 MS (n)1736 1103 MS ( )1786 1103 MS (o)1811 1103 MS (f)1861 1103 MS ( )1894 1103 MS (i)1919 1103 MS (n)1947 1103 MS (t)1997 1103 MS (e)2025 1103 MS (l)2069 1103 MS (l)2097 1103 MS (e)2125 1103 MS (c)2170 1103 MS (t)2214 1103 MS (u)2242 1103 MS (a)2292 1103 MS (l)2336 1103 MS ( )2364 1103 MS (p)2389 1103 MS (r)2439 1103 MS (o)2472 1103 MS (p)2522 1103 MS (e)2572 1103 MS (r)2617 1103 MS (t)2650 1103 MS (y)2679 1103 MS ( )2727 1103 MS (p)2752 1103 MS (r)2803 1103 MS (o)2836 1103 MS (t)2886 1103 MS (e)2914 1103 MS (c)2958 1103 MS (t)3002 1103 MS (i)3030 1103 MS (o)3058 1103 MS (n)3108 1103 MS (s)3158 1103 MS ( )3197 1103 MS (i)3222 1103 MS (n)3250 1103 MS (h)3300 1103 MS (e)3350 1103 MS (r)3394 1103 MS (e)3428 1103 MS (n)3472 1103 MS (t)3522 1103 MS ( )3550 1103 MS (i)3575 1103 MS (n)3603 1103 MS ( )3653 1103 MS (t)3678 1103 MS (h)3706 1103 MS (e)3756 1103 MS ( )3800 1103 MS (O)3825 1103 MS (r)3897 1103 MS (i)3930 1103 MS (g)3959 1103 MS (i)4008 1103 MS (n)4036 1103 MS (a)4086 1103 MS (l)4130 1103 MS (C)490 1218 MS (o)557 1218 MS (d)607 1218 MS (e)657 1218 MS (,)701 1218 MS ( )726 1218 MS (S)751 1218 MS (G)807 1218 MS (I)880 1218 MS ( )911 1218 MS (h)936 1218 MS (e)987 1218 MS (r)1031 1218 MS (e)1064 1218 MS (b)1108 1218 MS (y)1160 1218 MS ( )1208 1218 MS (g)1234 1218 MS (r)1284 1218 MS (a)1317 1218 MS (n)1361 1218 MS (t)1411 1218 MS (s)1439 1218 MS ( )1478 1218 MS (R)1503 1218 MS (e)1570 1218 MS (c)1614 1218 MS (i)1658 1218 MS (p)1686 1218 MS (i)1736 1218 MS (e)1764 1218 MS (n)1808 1218 MS (t)1858 1218 MS ( )1886 1218 MS (a)1911 1218 MS ( )1955 1218 MS (w)1981 1218 MS (o)2053 1218 MS (r)2103 1218 MS (l)2136 1218 MS (d)2164 1218 MS (w)2214 1218 MS (i)2286 1218 MS (d)2314 1218 MS (e)2364 1218 MS (,)2408 1218 MS ( )2433 1218 MS (r)2458 1218 MS (o)2491 1218 MS (y)2543 1218 MS (a)2591 1218 MS (l)2636 1218 MS (t)2664 1218 MS (y)2693 1218 MS (-)2741 1218 MS (f)2775 1218 MS (r)2808 1218 MS (e)2842 1218 MS (e)2886 1218 MS (,)2930 1218 MS ( )2955 1218 MS (n)2980 1218 MS (o)3030 1218 MS (n)3080 1218 MS (-)3130 1218 MS (e)3163 1218 MS (x)3207 1218 MS (c)3258 1218 MS (l)3302 1218 MS (u)3330 1218 MS (s)3380 1218 MS (i)3419 1218 MS (v)3447 1218 MS (e)3497 1218 MS ( )3541 1218 MS (l)3566 1218 MS (i)3594 1218 MS (c)3622 1218 MS (e)3666 1218 MS (n)3710 1218 MS (s)3760 1218 MS (e)3800 1218 MS (,)3844 1218 MS ( )3869 1218 MS (t)3894 1218 MS (o)3922 1218 MS ( )3972 1218 MS (d)3997 1218 MS (o)4047 1218 MS ( )4097 1218 MS (t)4122 1218 MS (h)4150 1218 MS (e)4200 1218 MS (f)490 1333 MS (o)523 1333 MS (l)573 1333 MS (l)601 1333 MS (o)629 1333 MS (w)679 1333 MS (i)751 1333 MS (n)779 1333 MS (g)829 1333 MS (:)878 1333 MS ( )906 1333 MS (\()931 1333 MS (i)964 1333 MS (\))992 1333 MS ( )1025 1333 MS (u)1050 1333 MS (n)1100 1333 MS (d)1150 1333 MS (e)1200 1333 MS (r)1245 1333 MS ( )1278 1333 MS (c)1303 1333 MS (o)1347 1333 MS (p)1397 1333 MS (y)1449 1333 MS (r)1497 1333 MS (i)1530 1333 MS (g)1559 1333 MS (h)1608 1333 MS (t)1658 1333 MS (s)1686 1333 MS ( )1725 1333 MS (L)1751 1333 MS (i)1811 1333 MS (c)1839 1333 MS (e)1884 1333 MS (n)1928 1333 MS (s)1978 1333 MS (a)2017 1333 MS (b)2061 1333 MS (l)2111 1333 MS (e)2139 1333 MS ( )2183 1333 MS (b)2208 1333 MS (y)2260 1333 MS ( )2308 1333 MS (S)2333 1333 MS (G)2389 1333 MS (I)2462 1333 MS (,)2494 1333 MS ( )2519 1333 MS (t)2544 1333 MS (o)2572 1333 MS ( )2622 1333 MS (r)2647 1333 MS (e)2681 1333 MS (p)2725 1333 MS (r)2775 1333 MS (o)2808 1333 MS (d)2858 1333 MS (u)2908 1333 MS (c)2958 1333 MS (e)3003 1333 MS (,)3047 1333 MS ( )3072 1333 MS (d)3097 1333 MS (i)3147 1333 MS (s)3175 1333 MS (t)3214 1333 MS (r)3242 1333 MS (i)3275 1333 MS (b)3303 1333 MS (u)3353 1333 MS (t)3403 1333 MS (e)3431 1333 MS (,)3475 1333 MS ( )3500 1333 MS (c)3525 1333 MS (r)3569 1333 MS (e)3603 1333 MS (a)3647 1333 MS (t)3691 1333 MS (e)3719 1333 MS ( )3763 1333 MS (d)3788 1333 MS (e)3839 1333 MS (r)3883 1333 MS (i)3916 1333 MS (v)3944 1333 MS (a)3994 1333 MS (t)4038 1333 MS (i)4066 1333 MS (v)4094 1333 MS (e)4144 1333 MS (w)490 1448 MS (o)562 1448 MS (r)612 1448 MS (k)645 1448 MS (s)695 1448 MS ( )734 1448 MS (f)759 1448 MS (r)792 1448 MS (o)825 1448 MS (m)875 1448 MS (,)953 1448 MS ( )978 1448 MS (a)1003 1448 MS (n)1047 1448 MS (d)1097 1448 MS (,)1147 1448 MS ( )1172 1448 MS (t)1197 1448 MS (o)1225 1448 MS ( )1275 1448 MS (t)1300 1448 MS (h)1328 1448 MS (e)1378 1448 MS ( )1422 1448 MS (e)1448 1448 MS (x)1492 1448 MS (t)1543 1448 MS (e)1571 1448 MS (n)1615 1448 MS (t)1665 1448 MS ( )1693 1448 MS (a)1718 1448 MS (p)1762 1448 MS (p)1812 1448 MS (l)1862 1448 MS (i)1890 1448 MS (c)1918 1448 MS (a)1962 1448 MS (b)2006 1448 MS (l)2056 1448 MS (e)2084 1448 MS (,)2128 1448 MS ( )2153 1448 MS (d)2178 1448 MS (i)2228 1448 MS (s)2256 1448 MS (p)2295 1448 MS (l)2345 1448 MS (a)2373 1448 MS (y)2418 1448 MS ( )2466 1448 MS (a)2492 1448 MS (n)2536 1448 MS (d)2586 1448 MS ( )2636 1448 MS (p)2661 1448 MS (e)2711 1448 MS (r)2755 1448 MS (f)2789 1448 MS (o)2822 1448 MS (r)2872 1448 MS (m)2905 1448 MS ( )2983 1448 MS (t)3008 1448 MS (h)3036 1448 MS (e)3086 1448 MS ( )3130 1448 MS (O)3155 1448 MS (r)3228 1448 MS (i)3261 1448 MS (g)3289 1448 MS (i)3338 1448 MS (n)3366 1448 MS (a)3416 1448 MS (l)3460 1448 MS ( )3488 1448 MS (C)3513 1448 MS (o)3580 1448 MS (d)3630 1448 MS (e)3680 1448 MS ( )3724 1448 MS (a)3750 1448 MS (n)3794 1448 MS (d)3844 1448 MS (/)3894 1448 MS (o)3922 1448 MS (r)3972 1448 MS ( )4005 1448 MS (a)4030 1448 MS (n)4074 1448 MS (y)4126 1448 MS (M)490 1563 MS (o)579 1563 MS (d)629 1563 MS (i)679 1563 MS (f)707 1563 MS (i)740 1563 MS (c)768 1563 MS (a)812 1563 MS (t)856 1563 MS (i)884 1563 MS (o)912 1563 MS (n)962 1563 MS (s)1012 1563 MS ( )1051 1563 MS (p)1076 1563 MS (r)1126 1563 MS (o)1159 1563 MS (v)1209 1563 MS (i)1259 1563 MS (d)1287 1563 MS (e)1337 1563 MS (d)1381 1563 MS ( )1431 1563 MS (b)1456 1563 MS (y)1506 1563 MS ( )1555 1563 MS (S)1580 1563 MS (G)1636 1563 MS (I)1710 1563 MS ( )1742 1563 MS (a)1767 1563 MS (l)1811 1563 MS (o)1839 1563 MS (n)1889 1563 MS (e)1939 1563 MS ( )1983 1563 MS (a)2009 1563 MS (n)2053 1563 MS (d)2103 1563 MS (/)2153 1563 MS (o)2181 1563 MS (r)2231 1563 MS ( )2264 1563 MS (a)2289 1563 MS (s)2333 1563 MS ( )2372 1563 MS (p)2397 1563 MS (a)2448 1563 MS (r)2492 1563 MS (t)2525 1563 MS ( )2553 1563 MS (o)2578 1563 MS (f)2628 1563 MS ( )2661 1563 MS (a)2686 1563 MS ( )2730 1563 MS (L)2756 1563 MS (a)2816 1563 MS (r)2861 1563 MS (g)2895 1563 MS (e)2944 1563 MS (r)2989 1563 MS ( )3022 1563 MS (W)3047 1563 MS (o)3142 1563 MS (r)3192 1563 MS (k)3225 1563 MS (;)3275 1563 MS ( )3303 1563 MS (a)3328 1563 MS (n)3372 1563 MS (d)3422 1563 MS ( )3472 1563 MS (\()3497 1563 MS (i)3530 1563 MS (i)3558 1563 MS (\))3586 1563 MS ( )3619 1563 MS (u)3644 1563 MS (n)3694 1563 MS (d)3744 1563 MS (e)3794 1563 MS (r)3839 1563 MS ( )3872 1563 MS (a)3897 1563 MS (n)3941 1563 MS (y)3993 1563 MS (L)490 1678 MS (i)550 1678 MS (c)578 1678 MS (e)623 1678 MS (n)667 1678 MS (s)717 1678 MS (a)756 1678 MS (b)800 1678 MS (l)850 1678 MS (e)878 1678 MS ( )922 1678 MS (P)947 1678 MS (a)1003 1678 MS (t)1047 1678 MS (e)1075 1678 MS (n)1119 1678 MS (t)1169 1678 MS (s)1197 1678 MS (,)1236 1678 MS ( )1261 1678 MS (t)1286 1678 MS (o)1314 1678 MS ( )1364 1678 MS (m)1389 1678 MS (a)1467 1678 MS (k)1511 1678 MS (e)1561 1678 MS (,)1605 1678 MS ( )1630 1678 MS (h)1655 1678 MS (a)1706 1678 MS (v)1750 1678 MS (e)1800 1678 MS ( )1844 1678 MS (m)1869 1678 MS (a)1947 1678 MS (d)1991 1678 MS (e)2042 1678 MS (,)2086 1678 MS ( )2111 1678 MS (u)2136 1678 MS (s)2186 1678 MS (e)2225 1678 MS (,)2269 1678 MS ( )2294 1678 MS (s)2319 1678 MS (e)2358 1678 MS (l)2402 1678 MS (l)2430 1678 MS (,)2458 1678 MS ( )2483 1678 MS (o)2508 1678 MS (f)2558 1678 MS (f)2592 1678 MS (e)2625 1678 MS (r)2669 1678 MS ( )2702 1678 MS (f)2728 1678 MS (o)2761 1678 MS (r)2811 1678 MS ( )2844 1678 MS (s)2869 1678 MS (a)2908 1678 MS (l)2952 1678 MS (e)2980 1678 MS (,)3024 1678 MS ( )3049 1678 MS (i)3074 1678 MS (m)3102 1678 MS (p)3180 1678 MS (o)3230 1678 MS (r)3280 1678 MS (t)3313 1678 MS ( )3341 1678 MS (a)3366 1678 MS (n)3410 1678 MS (d)3460 1678 MS (/)3510 1678 MS (o)3538 1678 MS (r)3589 1678 MS ( )3622 1678 MS (o)3647 1678 MS (t)3697 1678 MS (h)3725 1678 MS (e)3775 1678 MS (r)3819 1678 MS (w)3852 1678 MS (i)3924 1678 MS (s)3952 1678 MS (e)3991 1678 MS ( )4035 1678 MS (t)4060 1678 MS (r)4088 1678 MS (a)4122 1678 MS (n)4166 1678 MS (s)4216 1678 MS (f)4255 1678 MS (e)4288 1678 MS (r)4333 1678 MS (t)490 1793 MS (h)518 1793 MS (e)568 1793 MS ( )612 1793 MS (O)637 1793 MS (r)709 1793 MS (i)742 1793 MS (g)770 1793 MS (i)819 1793 MS (n)847 1793 MS (a)898 1793 MS (l)942 1793 MS ( )970 1793 MS (C)995 1793 MS (o)1062 1793 MS (d)1112 1793 MS (e)1162 1793 MS ( )1206 1793 MS (a)1231 1793 MS (n)1275 1793 MS (d)1325 1793 MS (/)1375 1793 MS (o)1403 1793 MS (r)1453 1793 MS ( )1486 1793 MS (a)1511 1793 MS (n)1555 1793 MS (y)1607 1793 MS ( )1655 1793 MS (M)1680 1793 MS (o)1769 1793 MS (d)1819 1793 MS (i)1869 1793 MS (f)1897 1793 MS (i)1930 1793 MS (c)1959 1793 MS (a)2003 1793 MS (t)2047 1793 MS (i)2075 1793 MS (o)2103 1793 MS (n)2153 1793 MS (s)2203 1793 MS ( )2242 1793 MS (p)2267 1793 MS (r)2317 1793 MS (o)2350 1793 MS (v)2400 1793 MS (i)2450 1793 MS (d)2478 1793 MS (e)2528 1793 MS (d)2572 1793 MS ( )2622 1793 MS (b)2647 1793 MS (y)2699 1793 MS ( )2747 1793 MS (S)2772 1793 MS (G)2828 1793 MS (I)2901 1793 MS (.)2933 1793 MS ( )2958 1793 MS (R)2983 1793 MS (e)3050 1793 MS (c)3095 1793 MS (i)3139 1793 MS (p)3167 1793 MS (i)3217 1793 MS (e)3245 1793 MS (n)3289 1793 MS (t)3339 1793 MS ( )3367 1793 MS (a)3392 1793 MS (c)3436 1793 MS (c)3481 1793 MS (e)3525 1793 MS (p)3569 1793 MS (t)3619 1793 MS (s)3647 1793 MS ( )3686 1793 MS (t)3711 1793 MS (h)3739 1793 MS (e)3789 1793 MS ( )3833 1793 MS (t)3858 1793 MS (e)3886 1793 MS (r)3930 1793 MS (m)3963 1793 MS (s)4041 1793 MS ( )4080 1793 MS (a)4105 1793 MS (n)4149 1793 MS (d)4199 1793 MS (c)490 1908 MS (o)534 1908 MS (n)584 1908 MS (d)634 1908 MS (i)684 1908 MS (t)712 1908 MS (i)740 1908 MS (o)768 1908 MS (n)818 1908 MS (s)868 1908 MS ( )907 1908 MS (o)932 1908 MS (f)982 1908 MS ( )1015 1908 MS (t)1040 1908 MS (h)1068 1908 MS (i)1118 1908 MS (s)1146 1908 MS ( )1185 1908 MS (L)1211 1908 MS (i)1270 1908 MS (c)1298 1908 MS (e)1342 1908 MS (n)1386 1908 MS (s)1436 1908 MS (e)1475 1908 MS ( )1519 1908 MS (b)1544 1908 MS (y)1596 1908 MS ( )1644 1908 MS (u)1669 1908 MS (n)1719 1908 MS (d)1769 1908 MS (e)1820 1908 MS (r)1864 1908 MS (t)1897 1908 MS (a)1925 1908 MS (k)1969 1908 MS (i)2019 1908 MS (n)2047 1908 MS (g)2098 1908 MS ( )2147 1908 MS (a)2173 1908 MS (n)2217 1908 MS (y)2269 1908 MS ( )2317 1908 MS (o)2342 1908 MS (f)2392 1908 MS ( )2425 1908 MS (t)2450 1908 MS (h)2478 1908 MS (e)2528 1908 MS ( )2572 1908 MS (a)2597 1908 MS (f)2642 1908 MS (o)2675 1908 MS (r)2725 1908 MS (e)2758 1908 MS (m)2802 1908 MS (e)2881 1908 MS (n)2925 1908 MS (t)2975 1908 MS (i)3003 1908 MS (o)3031 1908 MS (n)3081 1908 MS (e)3131 1908 MS (d)3175 1908 MS ( )3225 1908 MS (a)3250 1908 MS (c)3294 1908 MS (t)3338 1908 MS (i)3366 1908 MS (o)3394 1908 MS (n)3444 1908 MS (s)3494 1908 MS (.)3533 1908 MS ( )3558 1908 MS (T)3583 1908 MS (h)3644 1908 MS (e)3694 1908 MS ( )3738 1908 MS (p)3763 1908 MS (a)3814 1908 MS (t)3858 1908 MS (e)3886 1908 MS (n)3930 1908 MS (t)3980 1908 MS ( )4008 1908 MS (l)4033 1908 MS (i)4061 1908 MS (c)4089 1908 MS (e)4133 1908 MS (n)4177 1908 MS (s)4227 1908 MS (e)4266 1908 MS (s)490 2023 MS (h)529 2023 MS (a)579 2023 MS (l)623 2023 MS (l)651 2023 MS ( )679 2023 MS (a)704 2023 MS (p)748 2023 MS (p)798 2023 MS (l)848 2023 MS (y)877 2023 MS ( )925 2023 MS (t)950 2023 MS (o)978 2023 MS ( )1028 2023 MS (t)1053 2023 MS (h)1081 2023 MS (e)1131 2023 MS ( )1175 2023 MS (C)1200 2023 MS (o)1267 2023 MS (v)1317 2023 MS (e)1367 2023 MS (r)1411 2023 MS (e)1445 2023 MS (d)1489 2023 MS ( )1539 2023 MS (C)1564 2023 MS (o)1631 2023 MS (d)1681 2023 MS (e)1731 2023 MS ( )1775 2023 MS (i)1800 2023 MS (f)1828 2023 MS (,)1861 2023 MS ( )1886 2023 MS (a)1911 2023 MS (t)1955 2023 MS ( )1983 2023 MS (t)2008 2023 MS (h)2036 2023 MS (e)2086 2023 MS ( )2130 2023 MS (t)2155 2023 MS (i)2183 2023 MS (m)2211 2023 MS (e)2289 2023 MS ( )2333 2023 MS (a)2359 2023 MS (n)2403 2023 MS (y)2455 2023 MS ( )2503 2023 MS (r)2528 2023 MS (e)2561 2023 MS (l)2605 2023 MS (a)2633 2023 MS (t)2677 2023 MS (e)2706 2023 MS (d)2750 2023 MS ( )2800 2023 MS (M)2825 2023 MS (o)2914 2023 MS (d)2964 2023 MS (i)3014 2023 MS (f)3042 2023 MS (i)3075 2023 MS (c)3103 2023 MS (a)3147 2023 MS (t)3191 2023 MS (i)3219 2023 MS (o)3247 2023 MS (n)3297 2023 MS ( )3347 2023 MS (i)3372 2023 MS (s)3400 2023 MS ( )3439 2023 MS (a)3464 2023 MS (d)3508 2023 MS (d)3558 2023 MS (e)3608 2023 MS (d)3652 2023 MS (,)3702 2023 MS ( )3727 2023 MS (s)3752 2023 MS (u)3791 2023 MS (c)3842 2023 MS (h)3886 2023 MS ( )3936 2023 MS (a)3961 2023 MS (d)4005 2023 MS (d)4055 2023 MS (i)4105 2023 MS (t)4133 2023 MS (i)4161 2023 MS (o)4189 2023 MS (n)4239 2023 MS (o)490 2138 MS (f)540 2138 MS ( )573 2138 MS (t)598 2138 MS (h)626 2138 MS (e)676 2138 MS ( )720 2138 MS (M)745 2138 MS (o)834 2138 MS (d)884 2138 MS (i)934 2138 MS (f)962 2138 MS (i)995 2138 MS (c)1023 2138 MS (a)1067 2138 MS (t)1111 2138 MS (i)1139 2138 MS (o)1167 2138 MS (n)1217 2138 MS ( )1267 2138 MS (c)1292 2138 MS (a)1336 2138 MS (u)1380 2138 MS (s)1430 2138 MS (e)1469 2138 MS (s)1514 2138 MS ( )1553 2138 MS (s)1578 2138 MS (u)1617 2138 MS (c)1667 2138 MS (h)1711 2138 MS ( )1761 2138 MS (c)1786 2138 MS (o)1830 2138 MS (m)1880 2138 MS (b)1958 2138 MS (i)2008 2138 MS (n)2036 2138 MS (a)2086 2138 MS (t)2130 2138 MS (i)2158 2138 MS (o)2186 2138 MS (n)2236 2138 MS ( )2286 2138 MS (t)2311 2138 MS (o)2339 2138 MS ( )2389 2138 MS (b)2414 2138 MS (e)2464 2138 MS ( )2508 2138 MS (c)2533 2138 MS (o)2577 2138 MS (v)2628 2138 MS (e)2678 2138 MS (r)2722 2138 MS (e)2756 2138 MS (d)2800 2138 MS ( )2850 2138 MS (b)2875 2138 MS (y)2927 2138 MS ( )2975 2138 MS (t)3000 2138 MS (h)3028 2138 MS (e)3078 2138 MS ( )3122 2138 MS (L)3148 2138 MS (i)3208 2138 MS (c)3236 2138 MS (e)3280 2138 MS (n)3324 2138 MS (s)3374 2138 MS (e)3414 2138 MS (d)3458 2138 MS ( )3508 2138 MS (P)3533 2138 MS (a)3589 2138 MS (t)3633 2138 MS (e)3661 2138 MS (n)3705 2138 MS (t)3755 2138 MS (s)3783 2138 MS (.)3822 2138 MS ( )3847 2138 MS (T)3872 2138 MS (h)3933 2138 MS (e)3983 2138 MS ( )4027 2138 MS (p)4052 2138 MS (a)4103 2138 MS (t)4147 2138 MS (e)4175 2138 MS (n)4219 2138 MS (t)4269 2138 MS (l)490 2253 MS (i)518 2253 MS (c)546 2253 MS (e)590 2253 MS (n)634 2253 MS (s)684 2253 MS (e)723 2253 MS ( )767 2253 MS (i)792 2253 MS (n)820 2253 MS ( )870 2253 MS (S)895 2253 MS (e)951 2253 MS (c)995 2253 MS (t)1039 2253 MS (i)1067 2253 MS (o)1095 2253 MS (n)1145 2253 MS ( )1195 2253 MS (2)1220 2253 MS (.)1270 2253 MS (1)1295 2253 MS (\()1345 2253 MS (i)1378 2253 MS (i)1406 2253 MS (\))1434 2253 MS ( )1467 2253 MS (s)1492 2253 MS (h)1531 2253 MS (a)1581 2253 MS (l)1625 2253 MS (l)1653 2253 MS ( )1681 2253 MS (n)1706 2253 MS (o)1756 2253 MS (t)1806 2253 MS ( )1834 2253 MS (a)1859 2253 MS (p)1903 2253 MS (p)1953 2253 MS (l)2003 2253 MS (y)2032 2253 MS ( )2080 2253 MS (t)2105 2253 MS (o)2133 2253 MS ( )2183 2253 MS (a)2209 2253 MS (n)2253 2253 MS (y)2305 2253 MS ( )2353 2253 MS (o)2378 2253 MS (t)2428 2253 MS (h)2456 2253 MS (e)2506 2253 MS (r)2550 2253 MS ( )2583 2253 MS (c)2609 2253 MS (o)2653 2253 MS (m)2703 2253 MS (b)2781 2253 MS (i)2831 2253 MS (n)2859 2253 MS (a)2909 2253 MS (t)2953 2253 MS (i)2981 2253 MS (o)3009 2253 MS (n)3059 2253 MS (s)3109 2253 MS ( )3148 2253 MS (t)3173 2253 MS (h)3201 2253 MS (a)3251 2253 MS (t)3295 2253 MS ( )3323 2253 MS (i)3348 2253 MS (n)3376 2253 MS (c)3426 2253 MS (l)3470 2253 MS (u)3498 2253 MS (d)3548 2253 MS (e)3598 2253 MS ( )3642 2253 MS (t)3667 2253 MS (h)3695 2253 MS (e)3745 2253 MS ( )3789 2253 MS (M)3814 2253 MS (o)3903 2253 MS (d)3953 2253 MS (i)4003 2253 MS (f)4031 2253 MS (i)4064 2253 MS (c)4092 2253 MS (a)4136 2253 MS (t)4180 2253 MS (i)4208 2253 MS (o)4236 2253 MS (n)4286 2253 MS (.)4336 2253 MS (N)490 2368 MS (o)562 2368 MS ( )612 2368 MS (p)637 2368 MS (a)687 2368 MS (t)731 2368 MS (e)759 2368 MS (n)803 2368 MS (t)853 2368 MS ( )881 2368 MS (l)906 2368 MS (i)934 2368 MS (c)962 2368 MS (e)1006 2368 MS (n)1050 2368 MS (s)1100 2368 MS (e)1139 2368 MS ( )1183 2368 MS (i)1208 2368 MS (s)1236 2368 MS ( )1275 2368 MS (p)1300 2368 MS (r)1350 2368 MS (o)1383 2368 MS (v)1433 2368 MS (i)1483 2368 MS (d)1511 2368 MS (e)1561 2368 MS (d)1605 2368 MS ( )1655 2368 MS (u)1680 2368 MS (n)1730 2368 MS (d)1780 2368 MS (e)1831 2368 MS (r)1875 2368 MS ( )1908 2368 MS (S)1933 2368 MS (G)1989 2368 MS (I)2062 2368 MS ( )2094 2368 MS (P)2119 2368 MS (a)2175 2368 MS (t)2219 2368 MS (e)2247 2368 MS (n)2291 2368 MS (t)2341 2368 MS (s)2369 2368 MS ( )2408 2368 MS (f)2433 2368 MS (o)2467 2368 MS (r)2517 2368 MS ( )2550 2368 MS (i)2575 2368 MS (n)2603 2368 MS (f)2653 2368 MS (r)2686 2368 MS (i)2719 2368 MS (n)2747 2368 MS (g)2798 2368 MS (e)2847 2368 MS (m)2891 2368 MS (e)2970 2368 MS (n)3014 2368 MS (t)3064 2368 MS (s)3092 2368 MS ( )3131 2368 MS (o)3156 2368 MS (f)3206 2368 MS ( )3239 2368 MS (S)3264 2368 MS (G)3320 2368 MS (I)3393 2368 MS ( )3425 2368 MS (P)3450 2368 MS (a)3506 2368 MS (t)3550 2368 MS (e)3578 2368 MS (n)3622 2368 MS (t)3672 2368 MS (s)3700 2368 MS ( )3739 2368 MS (b)3764 2368 MS (y)3814 2368 MS (M)490 2483 MS (o)579 2483 MS (d)629 2483 MS (i)679 2483 MS (f)707 2483 MS (i)740 2483 MS (c)768 2483 MS (a)812 2483 MS (t)856 2483 MS (i)884 2483 MS (o)912 2483 MS (n)962 2483 MS (s)1012 2483 MS ( )1051 2483 MS (n)1076 2483 MS (o)1126 2483 MS (t)1176 2483 MS ( )1204 2483 MS (p)1229 2483 MS (r)1279 2483 MS (o)1312 2483 MS (v)1362 2483 MS (i)1412 2483 MS (d)1440 2483 MS (e)1490 2483 MS (d)1534 2483 MS ( )1584 2483 MS (b)1609 2483 MS (y)1660 2483 MS ( )1708 2483 MS (S)1733 2483 MS (G)1789 2483 MS (I)1863 2483 MS ( )1895 2483 MS (o)1920 2483 MS (r)1970 2483 MS ( )2003 2483 MS (c)2028 2483 MS (o)2072 2483 MS (m)2122 2483 MS (b)2200 2483 MS (i)2250 2483 MS (n)2278 2483 MS (a)2328 2483 MS (t)2372 2483 MS (i)2400 2483 MS (o)2428 2483 MS (n)2478 2483 MS (s)2528 2483 MS ( )2567 2483 MS (o)2592 2483 MS (f)2642 2483 MS ( )2675 2483 MS (O)2700 2483 MS (r)2773 2483 MS (i)2806 2483 MS (g)2834 2483 MS (i)2883 2483 MS (n)2911 2483 MS (a)2962 2483 MS (l)3006 2483 MS ( )3034 2483 MS (C)3059 2483 MS (o)3126 2483 MS (d)3176 2483 MS (e)3226 2483 MS ( )3270 2483 MS (a)3295 2483 MS (n)3339 2483 MS (d)3389 2483 MS ( )3439 2483 MS (M)3464 2483 MS (o)3553 2483 MS (d)3603 2483 MS (i)3653 2483 MS (f)3681 2483 MS (i)3714 2483 MS (c)3742 2483 MS (a)3786 2483 MS (t)3830 2483 MS (i)3858 2483 MS (o)3886 2483 MS (n)3936 2483 MS (s)3986 2483 MS ( )4025 2483 MS (n)4050 2483 MS (o)4100 2483 MS (t)4150 2483 MS (p)490 2597 MS (r)540 2597 MS (o)573 2597 MS (v)623 2597 MS (i)673 2597 MS (d)701 2597 MS (e)751 2597 MS (d)795 2597 MS ( )845 2597 MS (b)870 2597 MS (y)922 2597 MS ( )970 2597 MS (S)995 2597 MS (G)1051 2597 MS (I)1124 2597 MS (.)1156 2597 MS (2)490 2796 MS (.)540 2796 MS (2)565 2796 MS (.)615 2796 MS [100 0 0 -100 0 0]/Helvetica MF ( )640 2796 MS [100 0 0 -100 0 0]/Times-Bold MF (R)790 2796 MS (e)862 2796 MS (c)906 2796 MS (i)950 2796 MS (p)978 2796 MS (i)1034 2796 MS (e)1062 2796 MS (n)1106 2796 MS (t)1162 2796 MS ( )1195 2796 MS (L)1220 2796 MS (i)1287 2796 MS (c)1315 2796 MS (e)1359 2796 MS (n)1403 2796 MS (s)1459 2796 MS (e)1498 2796 MS ( )1542 2796 MS (G)1567 2796 MS (r)1645 2796 MS (a)1689 2796 MS (n)1739 2796 MS (t)1795 2796 MS (.)1828 2796 MS [100 0 0 -100 0 0]/Times-Roman MF ( )1853 2796 MS (S)1878 2796 MS (u)1934 2796 MS (b)1984 2796 MS (j)2034 2796 MS (e)2062 2796 MS (c)2106 2796 MS (t)2150 2796 MS ( )2178 2796 MS (t)2203 2796 MS (o)2231 2796 MS ( )2281 2796 MS (t)2306 2796 MS (h)2334 2796 MS (e)2384 2796 MS ( )2428 2796 MS (t)2453 2796 MS (e)2481 2796 MS (r)2525 2796 MS (m)2558 2796 MS (s)2636 2796 MS ( )2675 2796 MS (o)2700 2796 MS (f)2750 2796 MS ( )2783 2796 MS (t)2808 2796 MS (h)2836 2796 MS (i)2886 2796 MS (s)2914 2796 MS ( )2953 2796 MS (L)2979 2796 MS (i)3039 2796 MS (c)3067 2796 MS (e)3111 2796 MS (n)3155 2796 MS (s)3205 2796 MS (e)3245 2796 MS ( )3289 2796 MS (a)3314 2796 MS (n)3358 2796 MS (d)3408 2796 MS ( )3458 2796 MS (a)3483 2796 MS (n)3527 2796 MS (y)3579 2796 MS ( )3627 2796 MS (t)3652 2796 MS (h)3680 2796 MS (i)3730 2796 MS (r)3758 2796 MS (d)3791 2796 MS ( )3841 2796 MS (p)3866 2796 MS (a)3917 2796 MS (r)3961 2796 MS (t)3994 2796 MS (y)4024 2796 MS (i)490 2911 MS (n)518 2911 MS (t)568 2911 MS (e)596 2911 MS (l)640 2911 MS (l)668 2911 MS (e)696 2911 MS (c)740 2911 MS (t)784 2911 MS (u)812 2911 MS (a)862 2911 MS (l)906 2911 MS ( )934 2911 MS (p)959 2911 MS (r)1009 2911 MS (o)1042 2911 MS (p)1092 2911 MS (e)1142 2911 MS (r)1186 2911 MS (t)1219 2911 MS (y)1249 2911 MS ( )1297 2911 MS (c)1322 2911 MS (l)1366 2911 MS (a)1395 2911 MS (i)1439 2911 MS (m)1467 2911 MS (s)1545 2911 MS (,)1584 2911 MS ( )1609 2911 MS (R)1634 2911 MS (e)1701 2911 MS (c)1745 2911 MS (i)1789 2911 MS (p)1817 2911 MS (i)1867 2911 MS (e)1895 2911 MS (n)1939 2911 MS (t)1989 2911 MS ( )2017 2911 MS (h)2042 2911 MS (e)2092 2911 MS (r)2136 2911 MS (e)2169 2911 MS (b)2213 2911 MS (y)2265 2911 MS ( )2313 2911 MS (g)2339 2911 MS (r)2389 2911 MS (a)2422 2911 MS (n)2466 2911 MS (t)2516 2911 MS (s)2544 2911 MS ( )2583 2911 MS (S)2608 2911 MS (G)2664 2911 MS (I)2737 2911 MS ( )2769 2911 MS (a)2794 2911 MS (n)2838 2911 MS (d)2888 2911 MS ( )2938 2911 MS (a)2964 2911 MS (n)3008 2911 MS (y)3060 2911 MS ( )3108 2911 MS (o)3133 2911 MS (t)3183 2911 MS (h)3211 2911 MS (e)3261 2911 MS (r)3305 2911 MS ( )3338 2911 MS (R)3363 2911 MS (e)3430 2911 MS (c)3475 2911 MS (i)3519 2911 MS (p)3547 2911 MS (i)3597 2911 MS (e)3625 2911 MS (n)3669 2911 MS (t)3719 2911 MS (s)3747 2911 MS ( )3786 2911 MS (a)3811 2911 MS ( )3855 2911 MS (w)3880 2911 MS (o)3952 2911 MS (r)4002 2911 MS (l)4035 2911 MS (d)4063 2911 MS (w)4113 2911 MS (i)4185 2911 MS (d)4213 2911 MS (e)4264 2911 MS (,)4308 2911 MS (r)490 3026 MS (o)523 3026 MS (y)574 3026 MS (a)622 3026 MS (l)666 3026 MS (t)694 3026 MS (y)724 3026 MS (-)772 3026 MS (f)806 3026 MS (r)839 3026 MS (e)873 3026 MS (e)917 3026 MS (,)961 3026 MS ( )986 3026 MS (n)1011 3026 MS (o)1061 3026 MS (n)1111 3026 MS (-)1161 3026 MS (e)1195 3026 MS (x)1239 3026 MS (c)1290 3026 MS (l)1334 3026 MS (u)1362 3026 MS (s)1412 3026 MS (i)1451 3026 MS (v)1479 3026 MS (e)1529 3026 MS ( )1573 3026 MS (l)1598 3026 MS (i)1626 3026 MS (c)1654 3026 MS (e)1698 3026 MS (n)1742 3026 MS (s)1792 3026 MS (e)1831 3026 MS (,)1875 3026 MS ( )1900 3026 MS (u)1925 3026 MS (n)1975 3026 MS (d)2025 3026 MS (e)2075 3026 MS (r)2119 3026 MS ( )2152 3026 MS (a)2178 3026 MS (n)2222 3026 MS (y)2274 3026 MS ( )2322 3026 MS (R)2347 3026 MS (e)2414 3026 MS (c)2458 3026 MS (i)2502 3026 MS (p)2530 3026 MS (i)2580 3026 MS (e)2608 3026 MS (n)2652 3026 MS (t)2702 3026 MS ( )2730 3026 MS (P)2755 3026 MS (a)2811 3026 MS (t)2855 3026 MS (e)2883 3026 MS (n)2927 3026 MS (t)2977 3026 MS (s)3005 3026 MS (,)3044 3026 MS ( )3069 3026 MS (t)3094 3026 MS (o)3122 3026 MS ( )3172 3026 MS (m)3197 3026 MS (a)3275 3026 MS (k)3319 3026 MS (e)3369 3026 MS (,)3413 3026 MS ( )3438 3026 MS (h)3463 3026 MS (a)3514 3026 MS (v)3558 3026 MS (e)3608 3026 MS ( )3652 3026 MS (m)3677 3026 MS (a)3755 3026 MS (d)3799 3026 MS (e)3850 3026 MS (,)3894 3026 MS ( )3919 3026 MS (u)3944 3026 MS (s)3994 3026 MS (e)4033 3026 MS (,)4077 3026 MS ( )4102 3026 MS (s)4127 3026 MS (e)4166 3026 MS (l)4210 3026 MS (l)4238 3026 MS (,)4266 3026 MS (o)490 3141 MS (f)540 3141 MS (f)573 3141 MS (e)606 3141 MS (r)650 3141 MS ( )683 3141 MS (f)709 3141 MS (o)742 3141 MS (r)792 3141 MS ( )825 3141 MS (s)850 3141 MS (a)889 3141 MS (l)933 3141 MS (e)961 3141 MS (,)1005 3141 MS ( )1030 3141 MS (i)1055 3141 MS (m)1083 3141 MS (p)1161 3141 MS (o)1211 3141 MS (r)1261 3141 MS (t)1294 3141 MS ( )1322 3141 MS (a)1347 3141 MS (n)1391 3141 MS (d)1441 3141 MS (/)1491 3141 MS (o)1519 3141 MS (r)1570 3141 MS ( )1603 3141 MS (o)1628 3141 MS (t)1678 3141 MS (h)1706 3141 MS (e)1756 3141 MS (r)1800 3141 MS (w)1833 3141 MS (i)1905 3141 MS (s)1933 3141 MS (e)1972 3141 MS ( )2016 3141 MS (t)2041 3141 MS (r)2069 3141 MS (a)2103 3141 MS (n)2147 3141 MS (s)2197 3141 MS (f)2236 3141 MS (e)2269 3141 MS (r)2314 3141 MS ( )2347 3141 MS (t)2372 3141 MS (h)2400 3141 MS (e)2450 3141 MS ( )2494 3141 MS (O)2519 3141 MS (r)2591 3141 MS (i)2624 3141 MS (g)2653 3141 MS (i)2702 3141 MS (n)2730 3141 MS (a)2780 3141 MS (l)2824 3141 MS ( )2852 3141 MS (C)2877 3141 MS (o)2944 3141 MS (d)2994 3141 MS (e)3044 3141 MS ( )3088 3141 MS (a)3114 3141 MS (n)3158 3141 MS (d)3208 3141 MS (/)3258 3141 MS (o)3286 3141 MS (r)3336 3141 MS ( )3369 3141 MS (a)3394 3141 MS (n)3438 3141 MS (y)3490 3141 MS ( )3538 3141 MS (M)3563 3141 MS (o)3652 3141 MS (d)3702 3141 MS (i)3752 3141 MS (f)3780 3141 MS (i)3813 3141 MS (c)3841 3141 MS (a)3886 3141 MS (t)3930 3141 MS (i)3958 3141 MS (o)3986 3141 MS (n)4036 3141 MS (s)4086 3141 MS (p)490 3255 MS (r)540 3255 MS (o)573 3255 MS (v)623 3255 MS (i)673 3255 MS (d)701 3255 MS (e)751 3255 MS (d)795 3255 MS ( )845 3255 MS (b)870 3255 MS (y)922 3255 MS ( )970 3255 MS (S)995 3255 MS (G)1051 3255 MS (I)1124 3255 MS (.)1156 3255 MS (2)490 3454 MS (.)540 3454 MS (3)565 3454 MS (.)615 3454 MS [100 0 0 -100 0 0]/Helvetica MF ( )640 3454 MS [100 0 0 -100 0 0]/Times-Bold MF (N)790 3454 MS (o)862 3454 MS ( )912 3454 MS (L)937 3454 MS (i)1004 3454 MS (c)1032 3454 MS (e)1076 3454 MS (n)1120 3454 MS (s)1176 3454 MS (e)1215 3454 MS ( )1259 3454 MS (F)1285 3454 MS (o)1345 3454 MS (r)1395 3454 MS ( )1439 3454 MS (H)1464 3454 MS (a)1542 3454 MS (r)1592 3454 MS (d)1636 3454 MS (w)1692 3454 MS (a)1765 3454 MS (r)1815 3454 MS (e)1859 3454 MS ( )1903 3454 MS (I)1928 3454 MS (m)1968 3454 MS (p)2050 3454 MS (l)2106 3454 MS (e)2134 3454 MS (m)2179 3454 MS (e)2261 3454 MS (n)2305 3454 MS (t)2361 3454 MS (a)2394 3454 MS (t)2445 3454 MS (i)2478 3454 MS (o)2506 3454 MS (n)2556 3454 MS (s)2612 3454 MS (.)2651 3454 MS [100 0 0 -100 0 0]/Times-Roman MF ( )2676 3454 MS (T)2701 3454 MS (h)2762 3454 MS (e)2812 3454 MS ( )2856 3454 MS (l)2881 3454 MS (i)2909 3454 MS (c)2937 3454 MS (e)2981 3454 MS (n)3025 3454 MS (s)3075 3454 MS (e)3114 3454 MS (s)3158 3454 MS ( )3197 3454 MS (g)3223 3454 MS (r)3272 3454 MS (a)3306 3454 MS (n)3350 3454 MS (t)3400 3454 MS (e)3428 3454 MS (d)3472 3454 MS ( )3522 3454 MS (i)3547 3454 MS (n)3575 3454 MS ( )3625 3454 MS (S)3650 3454 MS (e)3706 3454 MS (c)3750 3454 MS (t)3794 3454 MS (i)3822 3454 MS (o)3850 3454 MS (n)3900 3454 MS ( )3950 3454 MS (2)3975 3454 MS (.)4025 3454 MS (1)4050 3454 MS ( )4100 3454 MS (a)4125 3454 MS (n)4169 3454 MS (d)4219 3454 MS (2)490 3569 MS (.)540 3569 MS (2)565 3569 MS ( )615 3569 MS (a)640 3569 MS (r)684 3569 MS (e)717 3569 MS ( )761 3569 MS (n)786 3569 MS (o)836 3569 MS (t)886 3569 MS ( )914 3569 MS (a)939 3569 MS (p)983 3569 MS (p)1033 3569 MS (l)1083 3569 MS (i)1111 3569 MS (c)1139 3569 MS (a)1184 3569 MS (b)1228 3569 MS (l)1278 3569 MS (e)1306 3569 MS ( )1350 3569 MS (t)1375 3569 MS (o)1403 3569 MS ( )1453 3569 MS (i)1478 3569 MS (m)1506 3569 MS (p)1584 3569 MS (l)1634 3569 MS (e)1662 3569 MS (m)1706 3569 MS (e)1784 3569 MS (n)1828 3569 MS (t)1878 3569 MS (a)1906 3569 MS (t)1950 3569 MS (i)1978 3569 MS (o)2006 3569 MS (n)2056 3569 MS ( )2106 3569 MS (i)2131 3569 MS (n)2159 3569 MS ( )2209 3569 MS (H)2234 3569 MS (a)2306 3569 MS (r)2350 3569 MS (d)2383 3569 MS (w)2433 3569 MS (a)2505 3569 MS (r)2550 3569 MS (e)2583 3569 MS ( )2627 3569 MS (o)2652 3569 MS (f)2703 3569 MS ( )2736 3569 MS (t)2761 3569 MS (h)2789 3569 MS (e)2839 3569 MS ( )2883 3569 MS (a)2908 3569 MS (l)2952 3569 MS (g)2981 3569 MS (o)3030 3569 MS (r)3080 3569 MS (i)3113 3569 MS (t)3141 3569 MS (h)3169 3569 MS (m)3219 3569 MS (s)3297 3569 MS ( )3336 3569 MS (e)3361 3569 MS (m)3405 3569 MS (b)3483 3569 MS (o)3533 3569 MS (d)3583 3569 MS (i)3633 3569 MS (e)3661 3569 MS (d)3705 3569 MS ( )3755 3569 MS (i)3780 3569 MS (n)3808 3569 MS ( )3858 3569 MS (t)3883 3569 MS (h)3911 3569 MS (e)3961 3569 MS ( )4005 3569 MS (O)4030 3569 MS (r)4102 3569 MS (i)4135 3569 MS (g)4164 3569 MS (i)4213 3569 MS (n)4241 3569 MS (a)4291 3569 MS (l)4335 3569 MS (C)490 3684 MS (o)557 3684 MS (d)607 3684 MS (e)657 3684 MS ( )701 3684 MS (o)726 3684 MS (r)776 3684 MS ( )809 3684 MS (a)834 3684 MS (n)878 3684 MS (y)930 3684 MS ( )978 3684 MS (M)1003 3684 MS (o)1092 3684 MS (d)1142 3684 MS (i)1192 3684 MS (f)1220 3684 MS (i)1253 3684 MS (c)1281 3684 MS (a)1325 3684 MS (t)1369 3684 MS (i)1397 3684 MS (o)1425 3684 MS (n)1475 3684 MS (s)1525 3684 MS ( )1564 3684 MS (p)1589 3684 MS (r)1639 3684 MS (o)1672 3684 MS (v)1722 3684 MS (i)1772 3684 MS (d)1800 3684 MS (e)1850 3684 MS (d)1894 3684 MS ( )1944 3684 MS (b)1969 3684 MS (y)2021 3684 MS ( )2069 3684 MS (S)2094 3684 MS (G)2150 3684 MS (I)2224 3684 MS ( )2256 3684 MS (.)2281 3684 MS [100 0 0 -100 0 0]/Times-Bold MF (3)490 3885 MS (.)540 3885 MS [100 0 0 -100 0 0]/Helvetica-Bold MF ( )565 3885 MS [100 0 0 -100 0 0]/Times-Bold MF (R)790 3885 MS (e)862 3885 MS (d)906 3885 MS (i)962 3885 MS (s)990 3885 MS (t)1029 3885 MS (r)1062 3885 MS (i)1106 3885 MS (b)1134 3885 MS (u)1190 3885 MS (t)1246 3885 MS (i)1279 3885 MS (o)1307 3885 MS (n)1357 3885 MS (s)1413 3885 MS (.)1452 3885 MS [100 0 0 -100 0 0]/Times-Roman MF (3)490 4081 MS (.)540 4081 MS (1)565 4081 MS (.)615 4081 MS [100 0 0 -100 0 0]/Helvetica MF ( )640 4081 MS [100 0 0 -100 0 0]/Times-Bold MF (R)790 4081 MS (e)862 4081 MS (t)906 4081 MS (e)939 4081 MS (n)983 4081 MS (t)1039 4081 MS (i)1072 4081 MS (o)1100 4081 MS (n)1150 4081 MS ( )1206 4081 MS (o)1231 4081 MS (f)1281 4081 MS ( )1315 4081 MS (N)1340 4081 MS (o)1412 4081 MS (t)1462 4081 MS (i)1495 4081 MS (c)1523 4081 MS (e)1567 4081 MS (/)1611 4081 MS (C)1639 4081 MS (o)1711 4081 MS (p)1761 4081 MS (y)1817 4081 MS ( )1867 4081 MS (o)1892 4081 MS (f)1942 4081 MS ( )1976 4081 MS (L)2001 4081 MS (i)2068 4081 MS (c)2096 4081 MS (e)2140 4081 MS (n)2184 4081 MS (s)2240 4081 MS (e)2279 4081 MS (.)2323 4081 MS [100 0 0 -100 0 0]/Times-Roman MF ( )2348 4081 MS (T)2373 4081 MS (h)2434 4081 MS (e)2484 4081 MS ( )2528 4081 MS (N)2553 4081 MS (o)2625 4081 MS (t)2675 4081 MS (i)2703 4081 MS (c)2731 4081 MS (e)2775 4081 MS ( )2819 4081 MS (s)2844 4081 MS (e)2884 4081 MS (t)2928 4081 MS ( )2956 4081 MS (f)2981 4081 MS (o)3014 4081 MS (r)3064 4081 MS (t)3097 4081 MS (h)3125 4081 MS ( )3175 4081 MS (i)3200 4081 MS (n)3228 4081 MS ( )3278 4081 MS (E)3303 4081 MS (x)3364 4081 MS (h)3415 4081 MS (i)3465 4081 MS (b)3493 4081 MS (i)3543 4081 MS (t)3571 4081 MS ( )3599 4081 MS (A)3624 4081 MS (,)3696 4081 MS ( )3721 4081 MS (b)3746 4081 MS (e)3796 4081 MS (l)3840 4081 MS (o)3868 4081 MS (w)3918 4081 MS (,)3990 4081 MS ( )4015 4081 MS (m)4040 4081 MS (u)4118 4081 MS (s)4168 4081 MS (t)4207 4081 MS ( )4235 4081 MS (b)4260 4081 MS (e)4310 4081 MS (c)490 4196 MS (o)534 4196 MS (n)584 4196 MS (s)634 4196 MS (p)673 4196 MS (i)723 4196 MS (c)751 4196 MS (u)795 4196 MS (o)845 4196 MS (u)895 4196 MS (s)945 4196 MS (l)984 4196 MS (y)1013 4196 MS ( )1061 4196 MS (r)1087 4196 MS (e)1120 4196 MS (t)1164 4196 MS (a)1192 4196 MS (i)1236 4196 MS (n)1264 4196 MS (e)1314 4196 MS (d)1358 4196 MS ( )1408 4196 MS (o)1433 4196 MS (r)1483 4196 MS ( )1517 4196 MS (i)1542 4196 MS (n)1570 4196 MS (c)1620 4196 MS (l)1664 4196 MS (u)1692 4196 MS (d)1742 4196 MS (e)1792 4196 MS (d)1836 4196 MS ( )1886 4196 MS (i)1911 4196 MS (n)1939 4196 MS ( )1989 4196 MS (a)2014 4196 MS (n)2058 4196 MS (y)2110 4196 MS ( )2158 4196 MS (a)2184 4196 MS (n)2228 4196 MS (d)2278 4196 MS ( )2328 4196 MS (a)2353 4196 MS (l)2397 4196 MS (l)2425 4196 MS ( )2453 4196 MS (r)2478 4196 MS (e)2511 4196 MS (d)2555 4196 MS (i)2605 4196 MS (s)2633 4196 MS (t)2672 4196 MS (r)2700 4196 MS (i)2733 4196 MS (b)2761 4196 MS (u)2811 4196 MS (t)2861 4196 MS (i)2889 4196 MS (o)2917 4196 MS (n)2967 4196 MS (s)3017 4196 MS ( )3056 4196 MS (o)3081 4196 MS (f)3131 4196 MS ( )3164 4196 MS (C)3189 4196 MS (o)3256 4196 MS (v)3306 4196 MS (e)3356 4196 MS (r)3400 4196 MS (e)3433 4196 MS (d)3477 4196 MS ( )3527 4196 MS (C)3552 4196 MS (o)3619 4196 MS (d)3669 4196 MS (e)3719 4196 MS (.)3763 4196 MS ( )3788 4196 MS (F)3813 4196 MS (o)3868 4196 MS (r)3918 4196 MS (d)490 4311 MS (i)540 4311 MS (s)568 4311 MS (t)607 4311 MS (r)635 4311 MS (i)668 4311 MS (b)696 4311 MS (u)746 4311 MS (t)796 4311 MS (i)824 4311 MS (o)852 4311 MS (n)902 4311 MS (s)952 4311 MS ( )991 4311 MS (o)1016 4311 MS (f)1066 4311 MS ( )1099 4311 MS (t)1124 4311 MS (h)1152 4311 MS (e)1202 4311 MS ( )1246 4311 MS (C)1271 4311 MS (o)1338 4311 MS (v)1388 4311 MS (e)1438 4311 MS (r)1482 4311 MS (e)1515 4311 MS (d)1559 4311 MS ( )1609 4311 MS (C)1634 4311 MS (o)1701 4311 MS (d)1751 4311 MS (e)1801 4311 MS ( )1845 4311 MS (i)1870 4311 MS (n)1898 4311 MS ( )1948 4311 MS (s)1973 4311 MS (o)2012 4311 MS (u)2062 4311 MS (r)2112 4311 MS (c)2145 4311 MS (e)2189 4311 MS ( )2233 4311 MS (c)2259 4311 MS (o)2303 4311 MS (d)2353 4311 MS (e)2403 4311 MS ( )2447 4311 MS (f)2472 4311 MS (o)2505 4311 MS (r)2556 4311 MS (m)2589 4311 MS (,)2667 4311 MS ( )2692 4311 MS (t)2717 4311 MS (h)2745 4311 MS (e)2795 4311 MS ( )2839 4311 MS (N)2864 4311 MS (o)2936 4311 MS (t)2986 4311 MS (i)3014 4311 MS (c)3042 4311 MS (e)3086 4311 MS ( )3130 4311 MS (m)3155 4311 MS (u)3233 4311 MS (s)3283 4311 MS (t)3322 4311 MS ( )3350 4311 MS (a)3375 4311 MS (p)3419 4311 MS (p)3469 4311 MS (e)3519 4311 MS (a)3564 4311 MS (r)3608 4311 MS ( )3641 4311 MS (i)3666 4311 MS (n)3694 4311 MS ( )3744 4311 MS (e)3769 4311 MS (v)3813 4311 MS (e)3864 4311 MS (r)3908 4311 MS (y)3943 4311 MS ( )3991 4311 MS (f)4016 4311 MS (i)4049 4311 MS (l)4077 4311 MS (e)4105 4311 MS ( )4149 4311 MS (t)4174 4311 MS (h)4202 4311 MS (a)4253 4311 MS (t)4297 4311 MS (c)490 4426 MS (a)534 4426 MS (n)578 4426 MS ( )628 4426 MS (i)653 4426 MS (n)681 4426 MS (c)731 4426 MS (l)775 4426 MS (u)803 4426 MS (d)853 4426 MS (e)903 4426 MS ( )947 4426 MS (a)973 4426 MS ( )1017 4426 MS (t)1042 4426 MS (e)1070 4426 MS (x)1114 4426 MS (t)1165 4426 MS ( )1193 4426 MS (c)1218 4426 MS (o)1262 4426 MS (m)1312 4426 MS (m)1390 4426 MS (e)1468 4426 MS (n)1512 4426 MS (t)1562 4426 MS (s)1590 4426 MS ( )1629 4426 MS (f)1654 4426 MS (i)1687 4426 MS (e)1715 4426 MS (l)1759 4426 MS (d)1787 4426 MS (;)1837 4426 MS ( )1865 4426 MS (i)1890 4426 MS (n)1918 4426 MS ( )1968 4426 MS (e)1993 4426 MS (x)2037 4426 MS (e)2088 4426 MS (c)2132 4426 MS (u)2176 4426 MS (t)2226 4426 MS (a)2254 4426 MS (b)2298 4426 MS (l)2348 4426 MS (e)2376 4426 MS ( )2420 4426 MS (f)2445 4426 MS (o)2478 4426 MS (r)2528 4426 MS (m)2561 4426 MS (,)2639 4426 MS ( )2664 4426 MS (t)2689 4426 MS (h)2717 4426 MS (e)2767 4426 MS ( )2811 4426 MS (N)2836 4426 MS (o)2908 4426 MS (t)2958 4426 MS (i)2986 4426 MS (c)3014 4426 MS (e)3058 4426 MS ( )3102 4426 MS (a)3127 4426 MS (n)3171 4426 MS (d)3221 4426 MS ( )3271 4426 MS (a)3297 4426 MS ( )3341 4426 MS (c)3366 4426 MS (o)3410 4426 MS (p)3460 4426 MS (y)3512 4426 MS ( )3560 4426 MS (o)3585 4426 MS (f)3636 4426 MS ( )3669 4426 MS (t)3694 4426 MS (h)3722 4426 MS (i)3772 4426 MS (s)3800 4426 MS ( )3839 4426 MS (L)3865 4426 MS (i)3924 4426 MS (c)3952 4426 MS (e)3997 4426 MS (n)4041 4426 MS (s)4091 4426 MS (e)4130 4426 MS /IsChar{exch/CharStrings get exch known}bd/MapCh{3 -1 roll/Encoding get 3 1 roll put}bd/MapDegree{dup 16#b0 exch/degree IsChar{/degree}{/ring}ifelse MapCh} bd/MapBB{dup 16#a6 exch/brokenbar IsChar{/brokenbar}{/bar}ifelse MapCh}bd /reencode{findfont begin currentdict dup length dict begin{1 index/FID ne{def} {pop pop}ifelse}forall/FontName exch def dup length 0 ne{/Encoding Encoding 256 array copy def 0 exch{dup type/nametype eq{Encoding 2 index 2 index put pop 1 add}{exch pop}ifelse}forall}if pop currentdict dup end end/FontName get exch definefont dup MapDegree MapBB}bd/LATENC[0/grave/acute/circumflex/tilde/macron /breve/dotaccent/dieresis/ring/cedilla/hungarumlaut/ogonek/caron/dotlessi/fi/fl /Lslash/lslash/Zcaron/zcaron/minus/.notdef/.notdef/.notdef/.notdef/.notdef /.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/space/exclam/quotedbl /numbersign/dollar/percent/ampersand/quotesingle/parenleft/parenright/asterisk /plus/comma/hyphen/period/slash/zero/one/two/three/four/five/six/seven/eight /nine/colon/semicolon/less/equal/greater/question/at/A/B/C/D/E/F/G/H/I/J/K/L/M /N/O/P/Q/R/S/T/U/V/W/X/Y/Z/bracketleft/backslash/bracketright/asciicircum /underscore/grave/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/braceleft /bar/braceright/asciitilde/.notdef/.notdef/.notdef/quotesinglbase/florin /quotedblbase/ellipsis/dagger/daggerdbl/circumflex/perthousand/Scaron /guilsinglleft/OE/.notdef/.notdef/.notdef/.notdef/quoteleft/quoteright /quotedblleft/quotedblright/bullet/endash/emdash/tilde/trademark/scaron /guilsinglright/oe/.notdef/.notdef/Ydieresis/.notdef/exclamdown/cent/sterling /currency/yen/brokenbar/section/dieresis/copyright/ordfeminine/guillemotleft /logicalnot/hyphen/registered/macron/degree/plusminus/twosuperior/threesuperior /acute/mu/paragraph/periodcentered/cedilla/onesuperior/ordmasculine /guillemotright/onequarter/onehalf/threequarters/questiondown/Agrave/Aacute /Acircumflex/Atilde/Adieresis/Aring/AE/Ccedilla/Egrave/Eacute/Ecircumflex /Edieresis/Igrave/Iacute/Icircumflex/Idieresis/Eth/Ntilde/Ograve/Oacute /Ocircumflex/Otilde/Odieresis/multiply/Oslash/Ugrave/Uacute/Ucircumflex /Udieresis/Yacute/Thorn/germandbls/agrave/aacute/acircumflex/atilde/adieresis /aring/ae/ccedilla/egrave/eacute/ecircumflex/edieresis/igrave/iacute /icircumflex/idieresis/eth/ntilde/ograve/oacute/ocircumflex/otilde/odieresis /divide/oslash/ugrave/uacute/ucircumflex/udieresis/yacute/thorn/ydieresis]def LATENC /_Times-Roman /Times-Roman reencode [100 0 0 -100 0 0]/_Times-Roman MF (m)490 4541 MS (u)568 4541 MS (s)618 4541 MS (t)657 4541 MS ( )685 4541 MS (a)710 4541 MS (p)754 4541 MS (p)804 4541 MS (e)854 4541 MS (a)898 4541 MS (r)942 4541 MS ( )975 4541 MS (i)1000 4541 MS (n)1028 4541 MS ( )1078 4541 MS (r)1103 4541 MS (e)1136 4541 MS (l)1180 4541 MS (a)1209 4541 MS (t)1253 4541 MS (e)1281 4541 MS (d)1325 4541 MS ( )1375 4541 MS (d)1400 4541 MS (o)1450 4541 MS (c)1500 4541 MS (u)1544 4541 MS (m)1594 4541 MS (e)1672 4541 MS (n)1716 4541 MS (t)1766 4541 MS (a)1795 4541 MS (t)1839 4541 MS (i)1867 4541 MS (o)1895 4541 MS (n)1945 4541 MS ( )1995 4541 MS (o)2020 4541 MS (r)2070 4541 MS ( )2103 4541 MS (c)2128 4541 MS (o)2172 4541 MS (l)2222 4541 MS (l)2250 4541 MS (a)2278 4541 MS (t)2322 4541 MS (e)2350 4541 MS (r)2394 4541 MS (a)2428 4541 MS (l)2472 4541 MS ( )2500 4541 MS (w)2525 4541 MS (h)2597 4541 MS (e)2647 4541 MS (r)2691 4541 MS (e)2725 4541 MS ( )2769 4541 MS (t)2794 4541 MS (h)2822 4541 MS (e)2872 4541 MS ( )2916 4541 MS (R)2941 4541 MS (e)3008 4541 MS (c)3052 4541 MS (i)3096 4541 MS (p)3124 4541 MS (i)3174 4541 MS (e)3202 4541 MS (n)3246 4541 MS (t)3296 4541 MS (\222)3324 4541 MS (s)3357 4541 MS ( )3396 4541 MS (r)3422 4541 MS (i)3455 4541 MS (g)3484 4541 MS (h)3533 4541 MS (t)3583 4541 MS (s)3611 4541 MS ( )3650 4541 MS (r)3675 4541 MS (e)3708 4541 MS (l)3752 4541 MS (a)3780 4541 MS (t)3824 4541 MS (i)3852 4541 MS (n)3880 4541 MS (g)3931 4541 MS ( )3980 4541 MS (t)4005 4541 MS (o)4033 4541 MS (C)490 4656 MS (o)557 4656 MS (v)607 4656 MS (e)657 4656 MS (r)701 4656 MS (e)734 4656 MS (d)778 4656 MS ( )828 4656 MS (C)853 4656 MS (o)920 4656 MS (d)970 4656 MS (e)1020 4656 MS ( )1064 4656 MS (a)1089 4656 MS (r)1134 4656 MS (e)1167 4656 MS ( )1211 4656 MS (d)1236 4656 MS (e)1286 4656 MS (s)1330 4656 MS (c)1370 4656 MS (r)1414 4656 MS (i)1447 4656 MS (b)1475 4656 MS (e)1525 4656 MS (d)1569 4656 MS (.)1619 4656 MS ( )1644 4656 MS (A)1669 4656 MS (n)1741 4656 MS (y)1793 4656 MS ( )1841 4656 MS (A)1867 4656 MS (d)1939 4656 MS (d)1989 4656 MS (i)2039 4656 MS (t)2067 4656 MS (i)2095 4656 MS (o)2123 4656 MS (n)2173 4656 MS (a)2223 4656 MS (l)2267 4656 MS ( )2295 4656 MS (N)2320 4656 MS (o)2392 4656 MS (t)2442 4656 MS (i)2470 4656 MS (c)2498 4656 MS (e)2542 4656 MS ( )2586 4656 MS (P)2611 4656 MS (r)2667 4656 MS (o)2700 4656 MS (v)2750 4656 MS (i)2800 4656 MS (s)2828 4656 MS (i)2867 4656 MS (o)2895 4656 MS (n)2945 4656 MS (s)2995 4656 MS ( )3034 4656 MS (w)3059 4656 MS (h)3131 4656 MS (i)3181 4656 MS (c)3209 4656 MS (h)3253 4656 MS ( )3303 4656 MS (a)3328 4656 MS (c)3372 4656 MS (t)3416 4656 MS (u)3444 4656 MS (a)3494 4656 MS (l)3538 4656 MS (l)3566 4656 MS (y)3596 4656 MS ( )3644 4656 MS (a)3669 4656 MS (p)3713 4656 MS (p)3763 4656 MS (e)3814 4656 MS (a)3858 4656 MS (r)3903 4656 MS (s)3936 4656 MS ( )3975 4656 MS (i)4000 4656 MS (n)4028 4656 MS ( )4078 4656 MS (t)4103 4656 MS (h)4131 4656 MS (e)4181 4656 MS (O)490 4770 MS (r)562 4770 MS (i)595 4770 MS (g)623 4770 MS (i)672 4770 MS (n)700 4770 MS (a)750 4770 MS (l)794 4770 MS ( )822 4770 MS (C)847 4770 MS (o)914 4770 MS (d)964 4770 MS (e)1014 4770 MS ( )1058 4770 MS (m)1083 4770 MS (u)1161 4770 MS (s)1211 4770 MS (t)1250 4770 MS ( )1278 4770 MS (a)1303 4770 MS (l)1347 4770 MS (s)1375 4770 MS (o)1414 4770 MS ( )1464 4770 MS (b)1489 4770 MS (e)1539 4770 MS ( )1583 4770 MS (r)1609 4770 MS (e)1642 4770 MS (t)1686 4770 MS (a)1714 4770 MS (i)1758 4770 MS (n)1786 4770 MS (e)1836 4770 MS (d)1880 4770 MS ( )1930 4770 MS (o)1955 4770 MS (r)2006 4770 MS ( )2039 4770 MS (i)2064 4770 MS (n)2092 4770 MS (c)2142 4770 MS (l)2186 4770 MS (u)2214 4770 MS (d)2264 4770 MS (e)2314 4770 MS (d)2358 4770 MS ( )2408 4770 MS (i)2433 4770 MS (n)2461 4770 MS ( )2511 4770 MS (a)2536 4770 MS (n)2580 4770 MS (y)2632 4770 MS ( )2680 4770 MS (a)2706 4770 MS (n)2750 4770 MS (d)2800 4770 MS ( )2850 4770 MS (a)2875 4770 MS (l)2919 4770 MS (l)2947 4770 MS ( )2975 4770 MS (r)3000 4770 MS (e)3033 4770 MS (d)3077 4770 MS (i)3127 4770 MS (s)3155 4770 MS (t)3194 4770 MS (r)3222 4770 MS (i)3255 4770 MS (b)3283 4770 MS (u)3333 4770 MS (t)3383 4770 MS (i)3411 4770 MS (o)3439 4770 MS (n)3489 4770 MS (s)3539 4770 MS ( )3578 4770 MS (o)3603 4770 MS (f)3653 4770 MS ( )3686 4770 MS (C)3711 4770 MS (o)3778 4770 MS (v)3828 4770 MS (e)3878 4770 MS (r)3922 4770 MS (e)3956 4770 MS (d)4000 4770 MS ( )4050 4770 MS (C)4075 4770 MS (o)4142 4770 MS (d)4192 4770 MS (e)4242 4770 MS (.)4286 4770 MS (3)490 4969 MS (.)540 4969 MS (2)565 4969 MS (.)615 4969 MS [100 0 0 -100 0 0]/Helvetica MF ( )640 4969 MS [100 0 0 -100 0 0]/Times-Bold MF (A)790 4969 MS (l)862 4969 MS (t)890 4969 MS (e)923 4969 MS (r)967 4969 MS (n)1011 4969 MS (a)1067 4969 MS (t)1117 4969 MS (i)1150 4969 MS (v)1178 4969 MS (e)1228 4969 MS ( )1272 4969 MS (L)1297 4969 MS (i)1364 4969 MS (c)1392 4969 MS (e)1436 4969 MS (n)1480 4969 MS (s)1536 4969 MS (e)1575 4969 MS (.)1619 4969 MS ( )1644 4969 MS [100 0 0 -100 0 0]/_Times-Roman MF (P)1669 4969 MS (r)1725 4969 MS (o)1758 4969 MS (v)1808 4969 MS (i)1858 4969 MS (d)1886 4969 MS (e)1936 4969 MS (d)1981 4969 MS ( )2031 4969 MS (t)2056 4969 MS (h)2084 4969 MS (a)2134 4969 MS (t)2178 4969 MS ( )2206 4969 MS (R)2231 4969 MS (e)2298 4969 MS (c)2342 4969 MS (i)2386 4969 MS (p)2414 4969 MS (i)2464 4969 MS (e)2492 4969 MS (n)2536 4969 MS (t)2586 4969 MS ( )2614 4969 MS (i)2639 4969 MS (s)2667 4969 MS ( )2706 4969 MS (i)2731 4969 MS (n)2759 4969 MS ( )2809 4969 MS (c)2834 4969 MS (o)2878 4969 MS (m)2928 4969 MS (p)3006 4969 MS (l)3056 4969 MS (i)3084 4969 MS (a)3112 4969 MS (n)3156 4969 MS (c)3206 4969 MS (e)3250 4969 MS ( )3294 4969 MS (w)3319 4969 MS (i)3391 4969 MS (t)3419 4969 MS (h)3447 4969 MS ( )3497 4969 MS (t)3522 4969 MS (h)3550 4969 MS (e)3600 4969 MS ( )3644 4969 MS (t)3669 4969 MS (e)3697 4969 MS (r)3742 4969 MS (m)3775 4969 MS (s)3853 4969 MS ( )3892 4969 MS (o)3917 4969 MS (f)3967 4969 MS ( )4000 4969 MS (t)4025 4969 MS (h)4053 4969 MS (i)4103 4969 MS (s)4131 4969 MS (L)490 5084 MS (i)550 5084 MS (c)578 5084 MS (e)623 5084 MS (n)667 5084 MS (s)717 5084 MS (e)756 5084 MS (,)800 5084 MS ( )825 5084 MS (R)850 5084 MS (e)917 5084 MS (c)961 5084 MS (i)1005 5084 MS (p)1033 5084 MS (i)1083 5084 MS (e)1111 5084 MS (n)1155 5084 MS (t)1205 5084 MS ( )1233 5084 MS (m)1258 5084 MS (a)1336 5084 MS (y)1382 5084 MS (,)1430 5084 MS ( )1455 5084 MS (s)1480 5084 MS (o)1519 5084 MS ( )1569 5084 MS (l)1594 5084 MS (o)1622 5084 MS (n)1672 5084 MS (g)1723 5084 MS ( )1772 5084 MS (a)1797 5084 MS (s)1841 5084 MS ( )1880 5084 MS (w)1906 5084 MS (i)1978 5084 MS (t)2006 5084 MS (h)2034 5084 MS (o)2084 5084 MS (u)2134 5084 MS (t)2184 5084 MS ( )2212 5084 MS (d)2237 5084 MS (e)2287 5084 MS (r)2331 5084 MS (o)2364 5084 MS (g)2415 5084 MS (a)2464 5084 MS (t)2508 5084 MS (i)2536 5084 MS (o)2564 5084 MS (n)2614 5084 MS ( )2664 5084 MS (o)2689 5084 MS (f)2739 5084 MS ( )2772 5084 MS (a)2797 5084 MS (n)2841 5084 MS (y)2893 5084 MS ( )2941 5084 MS (o)2966 5084 MS (f)3017 5084 MS ( )3050 5084 MS (S)3075 5084 MS (G)3131 5084 MS (I)3204 5084 MS (\222)3236 5084 MS (s)3269 5084 MS ( )3308 5084 MS (r)3333 5084 MS (i)3366 5084 MS (g)3395 5084 MS (h)3444 5084 MS (t)3494 5084 MS (s)3522 5084 MS ( )3561 5084 MS (i)3586 5084 MS (n)3614 5084 MS ( )3664 5084 MS (a)3689 5084 MS (n)3733 5084 MS (d)3783 5084 MS ( )3833 5084 MS (t)3858 5084 MS (o)3886 5084 MS ( )3936 5084 MS (t)3961 5084 MS (h)3989 5084 MS (e)4039 5084 MS (O)490 5199 MS (r)562 5199 MS (i)595 5199 MS (g)623 5199 MS (i)672 5199 MS (n)700 5199 MS (a)750 5199 MS (l)794 5199 MS ( )822 5199 MS (C)847 5199 MS (o)914 5199 MS (d)964 5199 MS (e)1014 5199 MS (,)1058 5199 MS ( )1083 5199 MS (d)1108 5199 MS (i)1158 5199 MS (s)1186 5199 MS (t)1225 5199 MS (r)1253 5199 MS (i)1286 5199 MS (b)1314 5199 MS (u)1364 5199 MS (t)1414 5199 MS (e)1442 5199 MS ( )1486 5199 MS (t)1511 5199 MS (h)1539 5199 MS (e)1589 5199 MS ( )1633 5199 MS (s)1658 5199 MS (o)1697 5199 MS (u)1747 5199 MS (r)1798 5199 MS (c)1831 5199 MS (e)1875 5199 MS ( )1919 5199 MS (c)1945 5199 MS (o)1989 5199 MS (d)2039 5199 MS (e)2089 5199 MS ( )2133 5199 MS (a)2159 5199 MS (n)2203 5199 MS (d)2253 5199 MS (/)2303 5199 MS (o)2331 5199 MS (r)2381 5199 MS ( )2414 5199 MS (e)2439 5199 MS (x)2483 5199 MS (e)2534 5199 MS (c)2578 5199 MS (u)2622 5199 MS (t)2672 5199 MS (a)2700 5199 MS (b)2744 5199 MS (l)2794 5199 MS (e)2822 5199 MS ( )2866 5199 MS (v)2891 5199 MS (e)2942 5199 MS (r)2986 5199 MS (s)3019 5199 MS (i)3058 5199 MS (o)3086 5199 MS (n)3136 5199 MS (\()3186 5199 MS (s)3219 5199 MS (\))3258 5199 MS ( )3291 5199 MS (o)3316 5199 MS (f)3366 5199 MS ( )3399 5199 MS (C)3424 5199 MS (o)3491 5199 MS (v)3541 5199 MS (e)3591 5199 MS (r)3636 5199 MS (e)3669 5199 MS (d)3713 5199 MS ( )3763 5199 MS (C)3788 5199 MS (o)3855 5199 MS (d)3905 5199 MS (e)3955 5199 MS ( )3999 5199 MS (u)4024 5199 MS (n)4074 5199 MS (d)4124 5199 MS (e)4175 5199 MS (r)4219 5199 MS (\()490 5314 MS (1)523 5314 MS (\))573 5314 MS ( )606 5314 MS (t)631 5314 MS (h)659 5314 MS (i)709 5314 MS (s)737 5314 MS ( )776 5314 MS (L)802 5314 MS (i)861 5314 MS (c)889 5314 MS (e)934 5314 MS (n)978 5314 MS (s)1028 5314 MS (e)1067 5314 MS (;)1111 5314 MS ( )1139 5314 MS (\()1164 5314 MS (2)1197 5314 MS (\))1247 5314 MS ( )1280 5314 MS (a)1306 5314 MS ( )1350 5314 MS (l)1375 5314 MS (i)1403 5314 MS (c)1431 5314 MS (e)1475 5314 MS (n)1519 5314 MS (s)1569 5314 MS (e)1609 5314 MS ( )1653 5314 MS (i)1678 5314 MS (d)1706 5314 MS (e)1756 5314 MS (n)1800 5314 MS (t)1850 5314 MS (i)1878 5314 MS (c)1906 5314 MS (a)1950 5314 MS (l)1994 5314 MS ( )2022 5314 MS (t)2047 5314 MS (o)2075 5314 MS ( )2125 5314 MS (t)2150 5314 MS (h)2178 5314 MS (i)2228 5314 MS (s)2256 5314 MS ( )2295 5314 MS (L)2321 5314 MS (i)2380 5314 MS (c)2408 5314 MS (e)2453 5314 MS (n)2497 5314 MS (s)2547 5314 MS (e)2586 5314 MS ( )2630 5314 MS (b)2655 5314 MS (u)2705 5314 MS (t)2755 5314 MS ( )2783 5314 MS (f)2808 5314 MS (o)2841 5314 MS (r)2891 5314 MS ( )2924 5314 MS (o)2949 5314 MS (n)3000 5314 MS (l)3050 5314 MS (y)3079 5314 MS ( )3127 5314 MS (s)3152 5314 MS (u)3191 5314 MS (c)3242 5314 MS (h)3286 5314 MS ( )3336 5314 MS (c)3361 5314 MS (h)3405 5314 MS (a)3455 5314 MS (n)3499 5314 MS (g)3549 5314 MS (e)3599 5314 MS (s)3644 5314 MS ( )3683 5314 MS (a)3708 5314 MS (s)3752 5314 MS ( )3791 5314 MS (a)3816 5314 MS (r)3861 5314 MS (e)3894 5314 MS ( )3938 5314 MS (n)3963 5314 MS (e)4013 5314 MS (c)4058 5314 MS (e)4102 5314 MS (s)4146 5314 MS (s)4185 5314 MS (a)4224 5314 MS (r)4269 5314 MS (y)4304 5314 MS (i)490 5429 MS (n)518 5429 MS ( )568 5429 MS (o)593 5429 MS (r)643 5429 MS (d)676 5429 MS (e)726 5429 MS (r)770 5429 MS ( )803 5429 MS (t)828 5429 MS (o)856 5429 MS ( )906 5429 MS (c)931 5429 MS (l)975 5429 MS (a)1003 5429 MS (r)1047 5429 MS (i)1080 5429 MS (f)1109 5429 MS (y)1144 5429 MS ( )1192 5429 MS (R)1217 5429 MS (e)1284 5429 MS (c)1328 5429 MS (i)1372 5429 MS (p)1400 5429 MS (i)1450 5429 MS (e)1478 5429 MS (n)1522 5429 MS (t)1572 5429 MS (\222)1600 5429 MS (s)1633 5429 MS ( )1672 5429 MS (r)1697 5429 MS (o)1730 5429 MS (l)1780 5429 MS (e)1808 5429 MS ( )1852 5429 MS (a)1878 5429 MS (s)1922 5429 MS ( )1961 5429 MS (l)1986 5429 MS (i)2014 5429 MS (c)2042 5429 MS (e)2086 5429 MS (n)2130 5429 MS (s)2180 5429 MS (o)2219 5429 MS (r)2269 5429 MS ( )2302 5429 MS (o)2327 5429 MS (f)2378 5429 MS ( )2411 5429 MS (M)2436 5429 MS (o)2525 5429 MS (d)2575 5429 MS (i)2625 5429 MS (f)2653 5429 MS (i)2686 5429 MS (c)2714 5429 MS (a)2758 5429 MS (t)2802 5429 MS (i)2830 5429 MS (o)2858 5429 MS (n)2908 5429 MS (s)2958 5429 MS (;)2997 5429 MS ( )3025 5429 MS (a)3050 5429 MS (n)3094 5429 MS (d)3144 5429 MS (/)3194 5429 MS (o)3222 5429 MS (r)3272 5429 MS ( )3305 5429 MS (\()3330 5429 MS (3)3363 5429 MS (\))3414 5429 MS ( )3447 5429 MS (a)3472 5429 MS ( )3516 5429 MS (l)3541 5429 MS (i)3569 5429 MS (c)3597 5429 MS (e)3641 5429 MS (n)3685 5429 MS (s)3735 5429 MS (e)3775 5429 MS ( )3819 5429 MS (o)3844 5429 MS (f)3894 5429 MS (R)490 5544 MS (e)557 5544 MS (c)601 5544 MS (i)645 5544 MS (p)673 5544 MS (i)723 5544 MS (e)751 5544 MS (n)795 5544 MS (t)845 5544 MS (\222)873 5544 MS (s)906 5544 MS ( )945 5544 MS (c)970 5544 MS (h)1014 5544 MS (o)1064 5544 MS (o)1114 5544 MS (s)1164 5544 MS (i)1203 5544 MS (n)1231 5544 MS (g)1282 5544 MS (,)1331 5544 MS ( )1356 5544 MS (c)1381 5544 MS (o)1425 5544 MS (n)1475 5544 MS (t)1525 5544 MS (a)1553 5544 MS (i)1597 5544 MS (n)1625 5544 MS (i)1675 5544 MS (n)1703 5544 MS (g)1754 5544 MS ( )1803 5544 MS (t)1828 5544 MS (e)1856 5544 MS (r)1900 5544 MS (m)1933 5544 MS (s)2011 5544 MS ( )2050 5544 MS (d)2075 5544 MS (i)2125 5544 MS (f)2153 5544 MS (f)2186 5544 MS (e)2220 5544 MS (r)2264 5544 MS (e)2297 5544 MS (n)2341 5544 MS (t)2391 5544 MS ( )2419 5544 MS (f)2444 5544 MS (r)2478 5544 MS (o)2511 5544 MS (m)2561 5544 MS ( )2639 5544 MS (t)2664 5544 MS (h)2692 5544 MS (i)2742 5544 MS (s)2770 5544 MS ( )2809 5544 MS (L)2835 5544 MS (i)2894 5544 MS (c)2922 5544 MS (e)2967 5544 MS (n)3011 5544 MS (s)3061 5544 MS (e)3100 5544 MS (,)3144 5544 MS ( )3169 5544 MS (p)3194 5544 MS (r)3244 5544 MS (o)3277 5544 MS (v)3327 5544 MS (i)3377 5544 MS (d)3405 5544 MS (e)3456 5544 MS (d)3500 5544 MS ( )3550 5544 MS (t)3575 5544 MS (h)3603 5544 MS (a)3653 5544 MS (t)3697 5544 MS ( )3725 5544 MS (t)3750 5544 MS (h)3778 5544 MS (e)3828 5544 MS ( )3872 5544 MS (l)3897 5544 MS (i)3925 5544 MS (c)3953 5544 MS (e)3997 5544 MS (n)4041 5544 MS (s)4091 5544 MS (e)4130 5544 MS (t)490 5659 MS (e)518 5659 MS (r)562 5659 MS (m)595 5659 MS (s)673 5659 MS ( )712 5659 MS (i)737 5659 MS (n)765 5659 MS (c)815 5659 MS (l)859 5659 MS (u)887 5659 MS (d)937 5659 MS (e)987 5659 MS ( )1031 5659 MS (t)1056 5659 MS (h)1084 5659 MS (i)1134 5659 MS (s)1162 5659 MS ( )1201 5659 MS (S)1226 5659 MS (e)1282 5659 MS (c)1326 5659 MS (t)1370 5659 MS (i)1398 5659 MS (o)1426 5659 MS (n)1476 5659 MS ( )1526 5659 MS (3)1551 5659 MS ( )1601 5659 MS (a)1626 5659 MS (n)1670 5659 MS (d)1720 5659 MS ( )1770 5659 MS (S)1795 5659 MS (e)1851 5659 MS (c)1895 5659 MS (t)1939 5659 MS (i)1967 5659 MS (o)1995 5659 MS (n)2045 5659 MS (s)2095 5659 MS ( )2134 5659 MS (4)2159 5659 MS (,)2209 5659 MS ( )2234 5659 MS (6)2259 5659 MS (,)2309 5659 MS ( )2334 5659 MS (7)2359 5659 MS (,)2409 5659 MS ( )2434 5659 MS (1)2459 5659 MS (0)2509 5659 MS (,)2559 5659 MS ( )2584 5659 MS (1)2609 5659 MS (2)2659 5659 MS (,)2709 5659 MS ( )2734 5659 MS (a)2759 5659 MS (n)2803 5659 MS (d)2853 5659 MS ( )2903 5659 MS (1)2928 5659 MS (3)2978 5659 MS (,)3028 5659 MS ( )3053 5659 MS (w)3078 5659 MS (h)3150 5659 MS (i)3200 5659 MS (c)3228 5659 MS (h)3272 5659 MS ( )3322 5659 MS (t)3347 5659 MS (e)3375 5659 MS (r)3420 5659 MS (m)3453 5659 MS (s)3531 5659 MS ( )3570 5659 MS (m)3595 5659 MS (a)3673 5659 MS (y)3719 5659 MS ( )3767 5659 MS (n)3792 5659 MS (o)3842 5659 MS (t)3892 5659 MS ( )3920 5659 MS (b)3945 5659 MS (e)3995 5659 MS (m)490 5774 MS (o)568 5774 MS (d)618 5774 MS (i)668 5774 MS (f)696 5774 MS (i)729 5774 MS (e)757 5774 MS (d)801 5774 MS ( )851 5774 MS (o)876 5774 MS (r)926 5774 MS ( )959 5774 MS (s)984 5774 MS (u)1023 5774 MS (p)1073 5774 MS (e)1123 5774 MS (r)1167 5774 MS (s)1200 5774 MS (e)1239 5774 MS (d)1283 5774 MS (e)1334 5774 MS (d)1378 5774 MS ( )1428 5774 MS (b)1453 5774 MS (y)1503 5774 MS ( )1552 5774 MS (a)1578 5774 MS (n)1622 5774 MS (y)1672 5774 MS ( )1721 5774 MS (o)1747 5774 MS (t)1797 5774 MS (h)1825 5774 MS (e)1875 5774 MS (r)1920 5774 MS ( )1953 5774 MS (t)1978 5774 MS (e)2006 5774 MS (r)2050 5774 MS (m)2083 5774 MS (s)2161 5774 MS ( )2200 5774 MS (o)2225 5774 MS (f)2275 5774 MS ( )2308 5774 MS (s)2333 5774 MS (u)2372 5774 MS (c)2422 5774 MS (h)2466 5774 MS ( )2516 5774 MS (l)2541 5774 MS (i)2569 5774 MS (c)2597 5774 MS (e)2642 5774 MS (n)2686 5774 MS (s)2736 5774 MS (e)2775 5774 MS (.)2819 5774 MS ( )2844 5774 MS (I)2869 5774 MS (f)2902 5774 MS ( )2936 5774 MS (R)2961 5774 MS (e)3028 5774 MS (c)3072 5774 MS (i)3116 5774 MS (p)3144 5774 MS (i)3194 5774 MS (e)3222 5774 MS (n)3266 5774 MS (t)3316 5774 MS ( )3344 5774 MS (e)3369 5774 MS (l)3413 5774 MS (e)3441 5774 MS (c)3486 5774 MS (t)3530 5774 MS (s)3558 5774 MS ( )3597 5774 MS (t)3622 5774 MS (o)3650 5774 MS ( )3700 5774 MS (u)3725 5774 MS (s)3775 5774 MS (e)3814 5774 MS ( )3858 5774 MS (a)3883 5774 MS (n)3927 5774 MS (y)3979 5774 MS ( )4027 5774 MS (l)4052 5774 MS (i)4080 5774 MS (c)4108 5774 MS (e)4152 5774 MS (n)4196 5774 MS (s)4246 5774 MS (e)4286 5774 MS showpage %%Page: 3 3 13.238 780.059 translate 72 600 div dup neg scale 0 0 transform .25 add round .25 sub exch .25 add round .25 sub exch itransform translate [100 0 0 -100 0 0]/Times-Roman MF (o)490 591 MS (t)540 591 MS (h)568 591 MS (e)618 591 MS (r)662 591 MS ( )695 591 MS (t)720 591 MS (h)748 591 MS (a)798 591 MS (n)842 591 MS ( )892 591 MS (t)917 591 MS (h)945 591 MS (i)995 591 MS (s)1023 591 MS ( )1062 591 MS (L)1088 591 MS (i)1147 591 MS (c)1175 591 MS (e)1220 591 MS (n)1264 591 MS (s)1314 591 MS (e)1353 591 MS (,)1397 591 MS ( )1422 591 MS (R)1447 591 MS (e)1514 591 MS (c)1559 591 MS (i)1603 591 MS (p)1631 591 MS (i)1681 591 MS (e)1709 591 MS (n)1753 591 MS (t)1803 591 MS ( )1831 591 MS (m)1856 591 MS (u)1934 591 MS (s)1984 591 MS (t)2023 591 MS ( )2051 591 MS (m)2076 591 MS (a)2154 591 MS (k)2198 591 MS (e)2248 591 MS ( )2292 591 MS (i)2317 591 MS (t)2345 591 MS ( )2373 591 MS (a)2398 591 MS (b)2442 591 MS (s)2492 591 MS (o)2531 591 MS (l)2581 591 MS (u)2609 591 MS (t)2659 591 MS (e)2687 591 MS (l)2731 591 MS (y)2760 591 MS ( )2808 591 MS (c)2833 591 MS (l)2877 591 MS (e)2906 591 MS (a)2950 591 MS (r)2994 591 MS ( )3027 591 MS (t)3052 591 MS (h)3080 591 MS (a)3131 591 MS (t)3175 591 MS ( )3203 591 MS (a)3228 591 MS (n)3272 591 MS (y)3324 591 MS ( )3372 591 MS (o)3397 591 MS (f)3447 591 MS ( )3480 591 MS (i)3505 591 MS (t)3533 591 MS (s)3561 591 MS ( )3600 591 MS (t)3625 591 MS (e)3653 591 MS (r)3697 591 MS (m)3730 591 MS (s)3808 591 MS ( )3847 591 MS (w)3872 591 MS (h)3944 591 MS (i)3994 591 MS (c)4022 591 MS (h)4066 591 MS ( )4116 591 MS (d)4141 591 MS (i)4191 591 MS (f)4219 591 MS (f)4252 591 MS (e)4286 591 MS (r)4330 591 MS (f)490 706 MS (r)523 706 MS (o)556 706 MS (m)606 706 MS ( )684 706 MS (t)709 706 MS (h)737 706 MS (i)787 706 MS (s)815 706 MS ( )854 706 MS (L)880 706 MS (i)939 706 MS (c)967 706 MS (e)1012 706 MS (n)1056 706 MS (s)1106 706 MS (e)1145 706 MS ( )1189 706 MS (a)1214 706 MS (r)1259 706 MS (e)1292 706 MS ( )1336 706 MS (o)1361 706 MS (f)1411 706 MS (f)1445 706 MS (e)1478 706 MS (r)1522 706 MS (e)1556 706 MS (d)1600 706 MS ( )1650 706 MS (b)1675 706 MS (y)1727 706 MS ( )1775 706 MS (R)1800 706 MS (e)1867 706 MS (c)1911 706 MS (i)1955 706 MS (p)1983 706 MS (i)2033 706 MS (e)2061 706 MS (n)2105 706 MS (t)2155 706 MS ( )2183 706 MS (a)2208 706 MS (l)2252 706 MS (o)2280 706 MS (n)2330 706 MS (e)2380 706 MS (,)2424 706 MS ( )2449 706 MS (a)2475 706 MS (n)2519 706 MS (d)2569 706 MS ( )2619 706 MS (n)2644 706 MS (o)2694 706 MS (t)2744 706 MS ( )2772 706 MS (b)2797 706 MS (y)2849 706 MS ( )2897 706 MS (S)2922 706 MS (G)2978 706 MS (I)3051 706 MS (.)3083 706 MS ( )3108 706 MS (I)3134 706 MS (t)3166 706 MS ( )3194 706 MS (i)3219 706 MS (s)3247 706 MS ( )3286 706 MS (e)3311 706 MS (m)3355 706 MS (p)3433 706 MS (h)3483 706 MS (a)3533 706 MS (s)3577 706 MS (i)3616 706 MS (z)3644 706 MS (e)3689 706 MS (d)3733 706 MS ( )3783 706 MS (t)3808 706 MS (h)3836 706 MS (a)3886 706 MS (t)3930 706 MS ( )3958 706 MS (t)3983 706 MS (h)4011 706 MS (i)4061 706 MS (s)4089 706 MS (L)490 821 MS (i)550 821 MS (c)578 821 MS (e)623 821 MS (n)667 821 MS (s)717 821 MS (e)756 821 MS ( )800 821 MS (i)825 821 MS (s)853 821 MS ( )892 821 MS (a)917 821 MS ( )961 821 MS (l)986 821 MS (i)1014 821 MS (m)1042 821 MS (i)1120 821 MS (t)1148 821 MS (e)1176 821 MS (d)1220 821 MS ( )1270 821 MS (l)1295 821 MS (i)1323 821 MS (c)1351 821 MS (e)1395 821 MS (n)1439 821 MS (s)1489 821 MS (e)1528 821 MS (,)1572 821 MS ( )1597 821 MS (a)1622 821 MS (n)1666 821 MS (d)1716 821 MS (,)1766 821 MS ( )1791 821 MS (r)1817 821 MS (e)1850 821 MS (g)1895 821 MS (a)1945 821 MS (r)1989 821 MS (d)2022 821 MS (l)2072 821 MS (e)2100 821 MS (s)2144 821 MS (s)2183 821 MS ( )2222 821 MS (o)2247 821 MS (f)2297 821 MS ( )2330 821 MS (t)2355 821 MS (h)2383 821 MS (e)2433 821 MS ( )2477 821 MS (l)2502 821 MS (i)2530 821 MS (c)2558 821 MS (e)2603 821 MS (n)2647 821 MS (s)2697 821 MS (e)2736 821 MS ( )2780 821 MS (f)2805 821 MS (o)2838 821 MS (r)2889 821 MS (m)2922 821 MS ( )3000 821 MS (e)3025 821 MS (m)3069 821 MS (p)3147 821 MS (l)3197 821 MS (o)3225 821 MS (y)3276 821 MS (e)3324 821 MS (d)3369 821 MS ( )3419 821 MS (b)3444 821 MS (y)3496 821 MS ( )3544 821 MS (R)3569 821 MS (e)3636 821 MS (c)3680 821 MS (i)3724 821 MS (p)3752 821 MS (i)3802 821 MS (e)3830 821 MS (n)3874 821 MS (t)3924 821 MS ( )3952 821 MS (i)3977 821 MS (n)4005 821 MS (a)490 936 MS (c)534 936 MS (c)578 936 MS (o)622 936 MS (r)672 936 MS (d)705 936 MS (a)756 936 MS (n)800 936 MS (c)850 936 MS (e)895 936 MS ( )939 936 MS (w)964 936 MS (i)1036 936 MS (t)1064 936 MS (h)1092 936 MS ( )1142 936 MS (t)1167 936 MS (h)1195 936 MS (i)1245 936 MS (s)1273 936 MS ( )1312 936 MS (S)1337 936 MS (e)1393 936 MS (c)1437 936 MS (t)1481 936 MS (i)1509 936 MS (o)1537 936 MS (n)1587 936 MS ( )1637 936 MS (3)1662 936 MS (.)1712 936 MS (2)1737 936 MS (,)1787 936 MS ( )1812 936 MS (R)1837 936 MS (e)1904 936 MS (c)1948 936 MS (i)1992 936 MS (p)2020 936 MS (i)2070 936 MS (e)2098 936 MS (n)2142 936 MS (t)2192 936 MS ( )2220 936 MS (m)2245 936 MS (a)2323 936 MS (y)2368 936 MS ( )2416 936 MS (r)2441 936 MS (e)2475 936 MS (l)2519 936 MS (i)2547 936 MS (c)2575 936 MS (e)2619 936 MS (n)2663 936 MS (s)2713 936 MS (e)2753 936 MS ( )2797 936 MS (o)2822 936 MS (n)2872 936 MS (l)2922 936 MS (y)2951 936 MS ( )2999 936 MS (s)3024 936 MS (u)3063 936 MS (c)3114 936 MS (h)3158 936 MS ( )3208 936 MS (r)3233 936 MS (i)3266 936 MS (g)3295 936 MS (h)3344 936 MS (t)3394 936 MS (s)3422 936 MS (,)3461 936 MS ( )3486 936 MS (i)3511 936 MS (n)3539 936 MS ( )3589 936 MS (O)3614 936 MS (r)3686 936 MS (i)3719 936 MS (g)3748 936 MS (i)3797 936 MS (n)3825 936 MS (a)3875 936 MS (l)3919 936 MS ( )3947 936 MS (C)3972 936 MS (o)4039 936 MS (d)4089 936 MS (e)4139 936 MS ( )4183 936 MS (a)4208 936 MS (n)4252 936 MS (d)4302 936 MS (M)490 1051 MS (o)579 1051 MS (d)629 1051 MS (i)679 1051 MS (f)707 1051 MS (i)740 1051 MS (c)768 1051 MS (a)812 1051 MS (t)856 1051 MS (i)884 1051 MS (o)912 1051 MS (n)962 1051 MS (s)1012 1051 MS ( )1051 1051 MS (b)1076 1051 MS (y)1127 1051 MS ( )1175 1051 MS (S)1200 1051 MS (G)1256 1051 MS (I)1329 1051 MS (,)1361 1051 MS ( )1386 1051 MS (a)1412 1051 MS (s)1456 1051 MS ( )1495 1051 MS (i)1520 1051 MS (t)1548 1051 MS ( )1576 1051 MS (h)1601 1051 MS (a)1651 1051 MS (s)1695 1051 MS ( )1734 1051 MS (a)1759 1051 MS (c)1803 1051 MS (t)1847 1051 MS (u)1875 1051 MS (a)1925 1051 MS (l)1969 1051 MS (l)1997 1051 MS (y)2027 1051 MS ( )2075 1051 MS (b)2100 1051 MS (e)2150 1051 MS (e)2195 1051 MS (n)2239 1051 MS ( )2289 1051 MS (g)2315 1051 MS (r)2364 1051 MS (a)2397 1051 MS (n)2441 1051 MS (t)2491 1051 MS (e)2519 1051 MS (d)2564 1051 MS ( )2614 1051 MS (b)2639 1051 MS (y)2691 1051 MS ( )2739 1051 MS (S)2764 1051 MS (G)2820 1051 MS (I)2893 1051 MS ( )2925 1051 MS (i)2950 1051 MS (n)2978 1051 MS ( )3028 1051 MS (t)3053 1051 MS (h)3081 1051 MS (i)3131 1051 MS (s)3159 1051 MS ( )3198 1051 MS (L)3224 1051 MS (i)3283 1051 MS (c)3311 1051 MS (e)3356 1051 MS (n)3400 1051 MS (s)3450 1051 MS (e)3489 1051 MS (.)3533 1051 MS (3)490 1249 MS (.)540 1249 MS (3)565 1249 MS (.)615 1249 MS [100 0 0 -100 0 0]/Helvetica MF ( )640 1249 MS [100 0 0 -100 0 0]/Times-Bold MF (I)790 1249 MS (n)829 1249 MS (d)885 1249 MS (e)941 1249 MS (m)985 1249 MS (n)1067 1249 MS (i)1123 1249 MS (t)1151 1249 MS (y)1184 1249 MS (.)1234 1249 MS ( )1259 1249 MS [100 0 0 -100 0 0]/Times-Roman MF (R)1284 1249 MS (e)1351 1249 MS (c)1395 1249 MS (i)1439 1249 MS (p)1467 1249 MS (i)1517 1249 MS (e)1545 1249 MS (n)1589 1249 MS (t)1639 1249 MS ( )1667 1249 MS (h)1692 1249 MS (e)1742 1249 MS (r)1786 1249 MS (e)1820 1249 MS (b)1864 1249 MS (y)1916 1249 MS ( )1964 1249 MS (a)1989 1249 MS (g)2034 1249 MS (r)2084 1249 MS (e)2117 1249 MS (e)2161 1249 MS (s)2205 1249 MS ( )2244 1249 MS (t)2269 1249 MS (o)2297 1249 MS ( )2347 1249 MS (i)2372 1249 MS (n)2400 1249 MS (d)2450 1249 MS (e)2500 1249 MS (m)2544 1249 MS (n)2622 1249 MS (i)2672 1249 MS (f)2700 1249 MS (y)2735 1249 MS ( )2783 1249 MS (S)2808 1249 MS (G)2864 1249 MS (I)2937 1249 MS ( )2969 1249 MS (f)2995 1249 MS (o)3028 1249 MS (r)3078 1249 MS ( )3111 1249 MS (a)3136 1249 MS (n)3180 1249 MS (y)3232 1249 MS ( )3280 1249 MS (l)3305 1249 MS (i)3333 1249 MS (a)3361 1249 MS (b)3405 1249 MS (i)3455 1249 MS (l)3483 1249 MS (i)3511 1249 MS (t)3539 1249 MS (y)3568 1249 MS ( )3616 1249 MS (i)3641 1249 MS (n)3669 1249 MS (c)3720 1249 MS (u)3764 1249 MS (r)3814 1249 MS (r)3847 1249 MS (e)3881 1249 MS (d)3925 1249 MS ( )3975 1249 MS (b)4000 1249 MS (y)4052 1249 MS ( )4100 1249 MS (S)4125 1249 MS (G)4181 1249 MS (I)4254 1249 MS (a)490 1364 MS (s)534 1364 MS ( )573 1364 MS (a)598 1364 MS ( )642 1364 MS (r)667 1364 MS (e)700 1364 MS (s)744 1364 MS (u)783 1364 MS (l)833 1364 MS (t)861 1364 MS ( )889 1364 MS (o)914 1364 MS (f)964 1364 MS ( )997 1364 MS (a)1023 1364 MS (n)1067 1364 MS (y)1119 1364 MS ( )1167 1364 MS (s)1192 1364 MS (u)1231 1364 MS (c)1281 1364 MS (h)1325 1364 MS ( )1375 1364 MS (a)1400 1364 MS (l)1444 1364 MS (t)1472 1364 MS (e)1500 1364 MS (r)1545 1364 MS (n)1578 1364 MS (a)1628 1364 MS (t)1672 1364 MS (i)1700 1364 MS (v)1728 1364 MS (e)1778 1364 MS ( )1822 1364 MS (l)1847 1364 MS (i)1875 1364 MS (c)1903 1364 MS (e)1947 1364 MS (n)1991 1364 MS (s)2041 1364 MS (e)2081 1364 MS ( )2125 1364 MS (t)2150 1364 MS (e)2178 1364 MS (r)2222 1364 MS (m)2255 1364 MS (s)2333 1364 MS ( )2372 1364 MS (R)2397 1364 MS (e)2464 1364 MS (c)2508 1364 MS (i)2552 1364 MS (p)2580 1364 MS (i)2630 1364 MS (e)2658 1364 MS (n)2702 1364 MS (t)2752 1364 MS ( )2780 1364 MS (o)2805 1364 MS (f)2855 1364 MS (f)2889 1364 MS (e)2922 1364 MS (r)2966 1364 MS (s)2999 1364 MS (.)3038 1364 MS (4)490 1563 MS (.)540 1563 MS [100 0 0 -100 0 0]/Helvetica MF ( )565 1563 MS [100 0 0 -100 0 0]/Times-Bold MF (T)790 1563 MS (e)857 1563 MS (r)901 1563 MS (m)946 1563 MS (i)1028 1563 MS (n)1056 1563 MS (a)1112 1563 MS (t)1162 1563 MS (i)1195 1563 MS (o)1223 1563 MS (n)1273 1563 MS (.)1329 1563 MS ( )1354 1563 MS [100 0 0 -100 0 0]/Times-Roman MF (T)1379 1563 MS (h)1440 1563 MS (i)1490 1563 MS (s)1518 1563 MS ( )1557 1563 MS (L)1583 1563 MS (i)1642 1563 MS (c)1670 1563 MS (e)1714 1563 MS (n)1758 1563 MS (s)1808 1563 MS (e)1848 1563 MS ( )1892 1563 MS (a)1917 1563 MS (n)1961 1563 MS (d)2011 1563 MS ( )2061 1563 MS (t)2086 1563 MS (h)2114 1563 MS (e)2164 1563 MS ( )2208 1563 MS (r)2234 1563 MS (i)2267 1563 MS (g)2295 1563 MS (h)2344 1563 MS (t)2394 1563 MS (s)2422 1563 MS ( )2461 1563 MS (g)2487 1563 MS (r)2536 1563 MS (a)2570 1563 MS (n)2614 1563 MS (t)2664 1563 MS (e)2692 1563 MS (d)2736 1563 MS ( )2786 1563 MS (h)2811 1563 MS (e)2861 1563 MS (r)2906 1563 MS (e)2939 1563 MS (u)2983 1563 MS (n)3033 1563 MS (d)3083 1563 MS (e)3133 1563 MS (r)3178 1563 MS ( )3211 1563 MS (w)3236 1563 MS (i)3308 1563 MS (l)3336 1563 MS (l)3364 1563 MS ( )3392 1563 MS (t)3417 1563 MS (e)3445 1563 MS (r)3489 1563 MS (m)3522 1563 MS (i)3600 1563 MS (n)3628 1563 MS (a)3678 1563 MS (t)3722 1563 MS (e)3750 1563 MS ( )3794 1563 MS (a)3819 1563 MS (u)3863 1563 MS (t)3913 1563 MS (o)3941 1563 MS (m)3991 1563 MS (a)4069 1563 MS (t)4113 1563 MS (i)4141 1563 MS (c)4169 1563 MS (a)4214 1563 MS (l)4258 1563 MS (l)4286 1563 MS (y)4314 1563 MS (i)490 1678 MS (f)518 1678 MS ( )551 1678 MS (R)576 1678 MS (e)643 1678 MS (c)687 1678 MS (i)731 1678 MS (p)759 1678 MS (i)809 1678 MS (e)837 1678 MS (n)881 1678 MS (t)931 1678 MS ( )959 1678 MS (b)984 1678 MS (r)1034 1678 MS (e)1067 1678 MS (a)1111 1678 MS (c)1156 1678 MS (h)1200 1678 MS (e)1250 1678 MS (s)1294 1678 MS ( )1333 1678 MS (a)1358 1678 MS (n)1403 1678 MS (y)1455 1678 MS ( )1503 1678 MS (t)1528 1678 MS (e)1556 1678 MS (r)1600 1678 MS (m)1633 1678 MS ( )1711 1678 MS (h)1736 1678 MS (e)1786 1678 MS (r)1830 1678 MS (e)1864 1678 MS (i)1908 1678 MS (n)1936 1678 MS ( )1986 1678 MS (a)2011 1678 MS (n)2055 1678 MS (d)2105 1678 MS ( )2155 1678 MS (f)2180 1678 MS (a)2214 1678 MS (i)2258 1678 MS (l)2286 1678 MS (s)2314 1678 MS ( )2353 1678 MS (t)2378 1678 MS (o)2406 1678 MS ( )2456 1678 MS (c)2481 1678 MS (u)2525 1678 MS (r)2575 1678 MS (e)2608 1678 MS ( )2652 1678 MS (s)2677 1678 MS (u)2716 1678 MS (c)2766 1678 MS (h)2810 1678 MS ( )2860 1678 MS (b)2885 1678 MS (r)2936 1678 MS (e)2969 1678 MS (a)3014 1678 MS (c)3058 1678 MS (h)3102 1678 MS ( )3152 1678 MS (w)3177 1678 MS (i)3249 1678 MS (t)3277 1678 MS (h)3305 1678 MS (i)3355 1678 MS (n)3383 1678 MS ( )3433 1678 MS (3)3458 1678 MS (0)3508 1678 MS ( )3558 1678 MS (d)3583 1678 MS (a)3633 1678 MS (y)3679 1678 MS (s)3727 1678 MS ( )3766 1678 MS (t)3791 1678 MS (h)3819 1678 MS (e)3869 1678 MS (r)3913 1678 MS (e)3947 1678 MS (o)3991 1678 MS (f)4041 1678 MS (.)4074 1678 MS ( )4099 1678 MS (A)4124 1678 MS (n)4196 1678 MS (y)4248 1678 MS (s)490 1793 MS (u)529 1793 MS (b)579 1793 MS (l)629 1793 MS (i)657 1793 MS (c)685 1793 MS (e)729 1793 MS (n)773 1793 MS (s)823 1793 MS (e)862 1793 MS ( )906 1793 MS (t)931 1793 MS (o)959 1793 MS ( )1009 1793 MS (t)1034 1793 MS (h)1062 1793 MS (e)1112 1793 MS ( )1156 1793 MS (C)1181 1793 MS (o)1248 1793 MS (v)1298 1793 MS (e)1348 1793 MS (r)1392 1793 MS (e)1425 1793 MS (d)1469 1793 MS ( )1519 1793 MS (C)1544 1793 MS (o)1611 1793 MS (d)1661 1793 MS (e)1711 1793 MS ( )1755 1793 MS (t)1780 1793 MS (h)1808 1793 MS (a)1859 1793 MS (t)1903 1793 MS ( )1931 1793 MS (i)1956 1793 MS (s)1984 1793 MS ( )2023 1793 MS (p)2048 1793 MS (r)2098 1793 MS (o)2131 1793 MS (p)2181 1793 MS (e)2231 1793 MS (r)2275 1793 MS (l)2308 1793 MS (y)2338 1793 MS ( )2386 1793 MS (g)2412 1793 MS (r)2461 1793 MS (a)2494 1793 MS (n)2539 1793 MS (t)2589 1793 MS (e)2617 1793 MS (d)2661 1793 MS ( )2711 1793 MS (s)2736 1793 MS (h)2775 1793 MS (a)2825 1793 MS (l)2869 1793 MS (l)2897 1793 MS ( )2925 1793 MS (s)2950 1793 MS (u)2989 1793 MS (r)3039 1793 MS (v)3072 1793 MS (i)3122 1793 MS (v)3150 1793 MS (e)3200 1793 MS ( )3244 1793 MS (a)3269 1793 MS (n)3313 1793 MS (y)3365 1793 MS ( )3413 1793 MS (t)3438 1793 MS (e)3467 1793 MS (r)3511 1793 MS (m)3544 1793 MS (i)3622 1793 MS (n)3650 1793 MS (a)3700 1793 MS (t)3744 1793 MS (i)3772 1793 MS (o)3800 1793 MS (n)3850 1793 MS ( )3900 1793 MS (o)3925 1793 MS (f)3975 1793 MS ( )4008 1793 MS (t)4033 1793 MS (h)4061 1793 MS (i)4111 1793 MS (s)4139 1793 MS (L)490 1908 MS (i)550 1908 MS (c)578 1908 MS (e)623 1908 MS (n)667 1908 MS (s)717 1908 MS (e)756 1908 MS (,)800 1908 MS ( )825 1908 MS (a)850 1908 MS (b)894 1908 MS (s)944 1908 MS (e)984 1908 MS (n)1028 1908 MS (t)1078 1908 MS ( )1106 1908 MS (t)1131 1908 MS (e)1159 1908 MS (r)1203 1908 MS (m)1236 1908 MS (i)1314 1908 MS (n)1342 1908 MS (a)1392 1908 MS (t)1436 1908 MS (i)1464 1908 MS (o)1492 1908 MS (n)1542 1908 MS ( )1592 1908 MS (b)1617 1908 MS (y)1668 1908 MS ( )1716 1908 MS (t)1741 1908 MS (h)1769 1908 MS (e)1820 1908 MS ( )1864 1908 MS (t)1889 1908 MS (e)1917 1908 MS (r)1961 1908 MS (m)1994 1908 MS (s)2072 1908 MS ( )2111 1908 MS (o)2136 1908 MS (f)2186 1908 MS ( )2219 1908 MS (s)2244 1908 MS (u)2283 1908 MS (c)2333 1908 MS (h)2377 1908 MS ( )2427 1908 MS (s)2452 1908 MS (u)2491 1908 MS (b)2541 1908 MS (l)2591 1908 MS (i)2619 1908 MS (c)2647 1908 MS (e)2692 1908 MS (n)2736 1908 MS (s)2786 1908 MS (e)2825 1908 MS (.)2869 1908 MS ( )2894 1908 MS (P)2919 1908 MS (r)2975 1908 MS (o)3008 1908 MS (v)3058 1908 MS (i)3108 1908 MS (s)3136 1908 MS (i)3175 1908 MS (o)3203 1908 MS (n)3253 1908 MS (s)3303 1908 MS ( )3342 1908 MS (t)3367 1908 MS (h)3395 1908 MS (a)3445 1908 MS (t)3489 1908 MS (,)3517 1908 MS ( )3542 1908 MS (b)3567 1908 MS (y)3618 1908 MS ( )3666 1908 MS (t)3691 1908 MS (h)3719 1908 MS (e)3770 1908 MS (i)3814 1908 MS (r)3842 1908 MS ( )3875 1908 MS (n)3900 1908 MS (a)3950 1908 MS (t)3994 1908 MS (u)4022 1908 MS (r)4072 1908 MS (e)4106 1908 MS (,)4150 1908 MS (m)490 2022 MS (u)568 2022 MS (s)618 2022 MS (t)657 2022 MS ( )685 2022 MS (r)710 2022 MS (e)743 2022 MS (m)787 2022 MS (a)865 2022 MS (i)909 2022 MS (n)937 2022 MS ( )987 2022 MS (i)1012 2022 MS (n)1040 2022 MS ( )1090 2022 MS (e)1115 2022 MS (f)1159 2022 MS (f)1192 2022 MS (e)1225 2022 MS (c)1270 2022 MS (t)1314 2022 MS ( )1342 2022 MS (b)1367 2022 MS (e)1417 2022 MS (y)1463 2022 MS (o)1511 2022 MS (n)1561 2022 MS (d)1611 2022 MS ( )1661 2022 MS (t)1686 2022 MS (h)1714 2022 MS (e)1764 2022 MS ( )1808 2022 MS (t)1833 2022 MS (e)1861 2022 MS (r)1906 2022 MS (m)1939 2022 MS (i)2017 2022 MS (n)2045 2022 MS (a)2095 2022 MS (t)2139 2022 MS (i)2167 2022 MS (o)2195 2022 MS (n)2245 2022 MS ( )2295 2022 MS (o)2320 2022 MS (f)2370 2022 MS ( )2403 2022 MS (t)2428 2022 MS (h)2456 2022 MS (i)2506 2022 MS (s)2534 2022 MS ( )2573 2022 MS (L)2598 2022 MS (i)2657 2022 MS (c)2686 2022 MS (e)2731 2022 MS (n)2775 2022 MS (s)2825 2022 MS (e)2864 2022 MS (,)2908 2022 MS ( )2933 2022 MS (s)2958 2022 MS (h)2997 2022 MS (a)3047 2022 MS (l)3091 2022 MS (l)3119 2022 MS ( )3147 2022 MS (s)3172 2022 MS (u)3211 2022 MS (r)3261 2022 MS (v)3294 2022 MS (i)3344 2022 MS (v)3372 2022 MS (e)3422 2022 MS (.)3466 2022 MS (5)490 2221 MS (.)540 2221 MS [100 0 0 -100 0 0]/Helvetica MF ( )565 2221 MS [100 0 0 -100 0 0]/Times-Bold MF (N)790 2221 MS (o)862 2221 MS ( )912 2221 MS (T)937 2221 MS (r)1004 2221 MS (a)1048 2221 MS (d)1098 2221 MS (e)1154 2221 MS (m)1199 2221 MS (a)1281 2221 MS (r)1331 2221 MS (k)1375 2221 MS ( )1431 2221 MS (O)1456 2221 MS (r)1534 2221 MS ( )1578 2221 MS (O)1603 2221 MS (t)1681 2221 MS (h)1714 2221 MS (e)1770 2221 MS (r)1814 2221 MS ( )1858 2221 MS (R)1884 2221 MS (i)1956 2221 MS (g)1984 2221 MS (h)2034 2221 MS (t)2090 2221 MS (s)2123 2221 MS (.)2162 2221 MS ( )2187 2221 MS [100 0 0 -100 0 0]/Times-Roman MF (T)2212 2221 MS (h)2273 2221 MS (i)2323 2221 MS (s)2351 2221 MS ( )2390 2221 MS (L)2416 2221 MS (i)2475 2221 MS (c)2503 2221 MS (e)2548 2221 MS (n)2592 2221 MS (s)2642 2221 MS (e)2681 2221 MS ( )2725 2221 MS (d)2750 2221 MS (o)2800 2221 MS (e)2850 2221 MS (s)2894 2221 MS ( )2933 2221 MS (n)2958 2221 MS (o)3008 2221 MS (t)3058 2221 MS ( )3086 2221 MS (g)3112 2221 MS (r)3161 2221 MS (a)3195 2221 MS (n)3239 2221 MS (t)3289 2221 MS ( )3317 2221 MS (a)3342 2221 MS (n)3386 2221 MS (y)3438 2221 MS ( )3486 2221 MS (r)3511 2221 MS (i)3544 2221 MS (g)3573 2221 MS (h)3622 2221 MS (t)3672 2221 MS (s)3700 2221 MS ( )3739 2221 MS (t)3764 2221 MS (o)3792 2221 MS (:)3842 2221 MS ( )3870 2221 MS (\()3895 2221 MS (i)3928 2221 MS (\))3956 2221 MS ( )3989 2221 MS (a)4014 2221 MS (n)4058 2221 MS (y)4110 2221 MS (s)490 2336 MS (o)529 2336 MS (f)579 2336 MS (t)612 2336 MS (w)640 2336 MS (a)712 2336 MS (r)756 2336 MS (e)789 2336 MS ( )833 2336 MS (a)859 2336 MS (p)903 2336 MS (a)953 2336 MS (r)997 2336 MS (t)1030 2336 MS ( )1058 2336 MS (f)1083 2336 MS (r)1117 2336 MS (o)1150 2336 MS (m)1200 2336 MS ( )1278 2336 MS (t)1303 2336 MS (h)1331 2336 MS (e)1381 2336 MS ( )1425 2336 MS (C)1450 2336 MS (o)1517 2336 MS (v)1567 2336 MS (e)1617 2336 MS (r)1661 2336 MS (e)1695 2336 MS (d)1739 2336 MS ( )1789 2336 MS (C)1814 2336 MS (o)1881 2336 MS (d)1931 2336 MS (e)1981 2336 MS (,)2025 2336 MS ( )2050 2336 MS (n)2075 2336 MS (o)2125 2336 MS (r)2175 2336 MS ( )2208 2336 MS (s)2233 2336 MS (h)2272 2336 MS (a)2322 2336 MS (l)2366 2336 MS (l)2394 2336 MS ( )2422 2336 MS (a)2447 2336 MS (n)2491 2336 MS (y)2543 2336 MS ( )2591 2336 MS (o)2616 2336 MS (t)2666 2336 MS (h)2694 2336 MS (e)2744 2336 MS (r)2789 2336 MS ( )2822 2336 MS (r)2847 2336 MS (i)2880 2336 MS (g)2909 2336 MS (h)2958 2336 MS (t)3008 2336 MS (s)3036 2336 MS ( )3075 2336 MS (o)3100 2336 MS (r)3150 2336 MS ( )3183 2336 MS (l)3208 2336 MS (i)3236 2336 MS (c)3264 2336 MS (e)3308 2336 MS (n)3352 2336 MS (s)3402 2336 MS (e)3442 2336 MS (s)3486 2336 MS ( )3525 2336 MS (n)3550 2336 MS (o)3600 2336 MS (t)3650 2336 MS ( )3678 2336 MS (e)3703 2336 MS (x)3747 2336 MS (p)3798 2336 MS (r)3848 2336 MS (e)3881 2336 MS (s)3925 2336 MS (s)3964 2336 MS (l)4003 2336 MS (y)4032 2336 MS (g)490 2451 MS (r)539 2451 MS (a)573 2451 MS (n)617 2451 MS (t)667 2451 MS (e)695 2451 MS (d)739 2451 MS ( )789 2451 MS (h)814 2451 MS (e)864 2451 MS (r)909 2451 MS (e)942 2451 MS (u)986 2451 MS (n)1036 2451 MS (d)1086 2451 MS (e)1136 2451 MS (r)1181 2451 MS ( )1214 2451 MS (a)1239 2451 MS (r)1283 2451 MS (i)1316 2451 MS (s)1344 2451 MS (e)1383 2451 MS ( )1427 2451 MS (b)1452 2451 MS (y)1502 2451 MS ( )1551 2451 MS (i)1577 2451 MS (m)1605 2451 MS (p)1683 2451 MS (l)1733 2451 MS (i)1761 2451 MS (c)1789 2451 MS (a)1833 2451 MS (t)1877 2451 MS (i)1905 2451 MS (o)1933 2451 MS (n)1983 2451 MS (,)2033 2451 MS ( )2058 2451 MS (e)2083 2451 MS (s)2127 2451 MS (t)2166 2451 MS (o)2194 2451 MS (p)2244 2451 MS (p)2294 2451 MS (e)2344 2451 MS (l)2388 2451 MS ( )2416 2451 MS (o)2441 2451 MS (r)2492 2451 MS ( )2525 2451 MS (o)2550 2451 MS (t)2600 2451 MS (h)2628 2451 MS (e)2678 2451 MS (r)2722 2451 MS (w)2755 2451 MS (i)2827 2451 MS (s)2855 2451 MS (e)2894 2451 MS ( )2938 2451 MS (w)2964 2451 MS (i)3036 2451 MS (t)3064 2451 MS (h)3092 2451 MS ( )3142 2451 MS (r)3167 2451 MS (e)3200 2451 MS (s)3244 2451 MS (p)3283 2451 MS (e)3333 2451 MS (c)3378 2451 MS (t)3422 2451 MS ( )3450 2451 MS (t)3475 2451 MS (o)3503 2451 MS ( )3553 2451 MS (t)3578 2451 MS (h)3606 2451 MS (e)3656 2451 MS ( )3700 2451 MS (C)3725 2451 MS (o)3792 2451 MS (v)3842 2451 MS (e)3892 2451 MS (r)3936 2451 MS (e)3969 2451 MS (d)4013 2451 MS ( )4063 2451 MS (C)4088 2451 MS (o)4155 2451 MS (d)4205 2451 MS (e)4255 2451 MS (;)4299 2451 MS (\()490 2566 MS (i)523 2566 MS (i)551 2566 MS (\))579 2566 MS ( )612 2566 MS (a)637 2566 MS (n)681 2566 MS (y)733 2566 MS ( )781 2566 MS (t)806 2566 MS (r)834 2566 MS (a)867 2566 MS (d)911 2566 MS (e)961 2566 MS ( )1005 2566 MS (n)1030 2566 MS (a)1081 2566 MS (m)1125 2566 MS (e)1203 2566 MS (,)1247 2566 MS ( )1272 2566 MS (t)1297 2566 MS (r)1325 2566 MS (a)1358 2566 MS (d)1403 2566 MS (e)1453 2566 MS (m)1497 2566 MS (a)1575 2566 MS (r)1619 2566 MS (k)1652 2566 MS ( )1702 2566 MS (o)1727 2566 MS (r)1778 2566 MS ( )1811 2566 MS (s)1836 2566 MS (e)1875 2566 MS (r)1919 2566 MS (v)1952 2566 MS (i)2002 2566 MS (c)2030 2566 MS (e)2075 2566 MS ( )2119 2566 MS (m)2144 2566 MS (a)2222 2566 MS (r)2266 2566 MS (k)2299 2566 MS ( )2349 2566 MS (w)2375 2566 MS (h)2447 2566 MS (a)2497 2566 MS (t)2541 2566 MS (s)2569 2566 MS (o)2608 2566 MS (e)2658 2566 MS (v)2702 2566 MS (e)2752 2566 MS (r)2797 2566 MS (,)2830 2566 MS ( )2855 2566 MS (i)2880 2566 MS (n)2908 2566 MS (c)2958 2566 MS (l)3002 2566 MS (u)3030 2566 MS (d)3080 2566 MS (i)3130 2566 MS (n)3158 2566 MS (g)3209 2566 MS ( )3258 2566 MS (w)3283 2566 MS (i)3355 2566 MS (t)3383 2566 MS (h)3411 2566 MS (o)3461 2566 MS (u)3511 2566 MS (t)3561 2566 MS ( )3589 2566 MS (l)3614 2566 MS (i)3642 2566 MS (m)3670 2566 MS (i)3748 2566 MS (t)3776 2566 MS (a)3804 2566 MS (t)3848 2566 MS (i)3876 2566 MS (o)3904 2566 MS (n)3954 2566 MS ( )4004 2566 MS (a)4029 2566 MS (n)4073 2566 MS (y)4124 2566 MS (r)490 2681 MS (e)523 2681 MS (l)567 2681 MS (a)595 2681 MS (t)639 2681 MS (e)667 2681 MS (d)711 2681 MS ( )761 2681 MS (r)786 2681 MS (i)819 2681 MS (g)848 2681 MS (h)897 2681 MS (t)947 2681 MS ( )975 2681 MS (f)1000 2681 MS (o)1033 2681 MS (r)1084 2681 MS ( )1117 2681 MS (p)1142 2681 MS (u)1192 2681 MS (r)1242 2681 MS (p)1275 2681 MS (o)1325 2681 MS (s)1375 2681 MS (e)1414 2681 MS (s)1458 2681 MS ( )1497 2681 MS (o)1522 2681 MS (f)1572 2681 MS ( )1605 2681 MS (e)1631 2681 MS (n)1675 2681 MS (d)1725 2681 MS (o)1775 2681 MS (r)1825 2681 MS (s)1858 2681 MS (e)1897 2681 MS (m)1941 2681 MS (e)2020 2681 MS (n)2064 2681 MS (t)2114 2681 MS ( )2142 2681 MS (o)2167 2681 MS (r)2217 2681 MS ( )2250 2681 MS (p)2275 2681 MS (r)2325 2681 MS (o)2358 2681 MS (m)2408 2681 MS (o)2486 2681 MS (t)2536 2681 MS (i)2564 2681 MS (o)2592 2681 MS (n)2642 2681 MS ( )2692 2681 MS (o)2717 2681 MS (f)2767 2681 MS ( )2800 2681 MS (p)2825 2681 MS (r)2875 2681 MS (o)2908 2681 MS (d)2958 2681 MS (u)3008 2681 MS (c)3058 2681 MS (t)3102 2681 MS (s)3130 2681 MS ( )3169 2681 MS (d)3194 2681 MS (e)3244 2681 MS (r)3289 2681 MS (i)3322 2681 MS (v)3350 2681 MS (e)3400 2681 MS (d)3444 2681 MS ( )3494 2681 MS (f)3519 2681 MS (r)3552 2681 MS (o)3586 2681 MS (m)3636 2681 MS ( )3714 2681 MS (t)3739 2681 MS (h)3767 2681 MS (e)3817 2681 MS ( )3861 2681 MS (C)3886 2681 MS (o)3953 2681 MS (v)4003 2681 MS (e)4053 2681 MS (r)4097 2681 MS (e)4130 2681 MS (d)4174 2681 MS (C)490 2796 MS (o)557 2796 MS (d)607 2796 MS (e)657 2796 MS (,)701 2796 MS ( )726 2796 MS (w)751 2796 MS (i)823 2796 MS (t)851 2796 MS (h)879 2796 MS (o)929 2796 MS (u)979 2796 MS (t)1029 2796 MS ( )1057 2796 MS (p)1082 2796 MS (r)1132 2796 MS (i)1165 2796 MS (o)1193 2796 MS (r)1243 2796 MS ( )1276 2796 MS (w)1301 2796 MS (r)1373 2796 MS (i)1406 2796 MS (t)1434 2796 MS (t)1462 2796 MS (e)1490 2796 MS (n)1534 2796 MS ( )1584 2796 MS (p)1609 2796 MS (e)1659 2796 MS (r)1703 2796 MS (m)1736 2796 MS (i)1814 2796 MS (s)1842 2796 MS (s)1881 2796 MS (i)1920 2796 MS (o)1948 2796 MS (n)1998 2796 MS ( )2048 2796 MS (o)2073 2796 MS (f)2123 2796 MS ( )2156 2796 MS (S)2181 2796 MS (G)2237 2796 MS (I)2310 2796 MS (;)2342 2796 MS ( )2370 2796 MS (o)2395 2796 MS (r)2445 2796 MS ( )2478 2796 MS (\()2503 2796 MS (i)2536 2796 MS (i)2564 2796 MS (i)2592 2796 MS (\))2620 2796 MS ( )2653 2796 MS (a)2678 2796 MS (n)2722 2796 MS (y)2774 2796 MS ( )2822 2796 MS (t)2847 2796 MS (i)2875 2796 MS (t)2903 2796 MS (l)2931 2796 MS (e)2959 2796 MS ( )3003 2796 MS (t)3028 2796 MS (o)3056 2796 MS ( )3106 2796 MS (o)3131 2796 MS (r)3181 2796 MS ( )3214 2796 MS (o)3239 2796 MS (w)3289 2796 MS (n)3361 2796 MS (e)3411 2796 MS (r)3456 2796 MS (s)3489 2796 MS (h)3528 2796 MS (i)3578 2796 MS (p)3606 2796 MS ( )3656 2796 MS (o)3681 2796 MS (f)3731 2796 MS ( )3764 2796 MS (t)3789 2796 MS (h)3817 2796 MS (e)3867 2796 MS ( )3911 2796 MS (O)3936 2796 MS (r)4008 2796 MS (i)4041 2796 MS (g)4070 2796 MS (i)4119 2796 MS (n)4147 2796 MS (a)4197 2796 MS (l)4241 2796 MS (C)490 2911 MS (o)557 2911 MS (d)607 2911 MS (e)657 2911 MS (,)701 2911 MS ( )726 2911 MS (w)751 2911 MS (h)823 2911 MS (i)873 2911 MS (c)901 2911 MS (h)945 2911 MS ( )995 2911 MS (s)1020 2911 MS (h)1059 2911 MS (a)1109 2911 MS (l)1153 2911 MS (l)1181 2911 MS ( )1209 2911 MS (a)1234 2911 MS (t)1278 2911 MS ( )1306 2911 MS (a)1331 2911 MS (l)1375 2911 MS (l)1403 2911 MS ( )1431 2911 MS (t)1456 2911 MS (i)1484 2911 MS (m)1512 2911 MS (e)1590 2911 MS (s)1634 2911 MS ( )1673 2911 MS (r)1698 2911 MS (e)1731 2911 MS (m)1775 2911 MS (a)1853 2911 MS (i)1897 2911 MS (n)1925 2911 MS (s)1975 2911 MS ( )2014 2911 MS (w)2039 2911 MS (i)2111 2911 MS (t)2139 2911 MS (h)2167 2911 MS ( )2217 2911 MS (S)2242 2911 MS (G)2298 2911 MS (I)2371 2911 MS (.)2403 2911 MS ( )2428 2911 MS (A)2453 2911 MS (l)2525 2911 MS (l)2553 2911 MS ( )2581 2911 MS (r)2606 2911 MS (i)2639 2911 MS (g)2668 2911 MS (h)2717 2911 MS (t)2767 2911 MS (s)2795 2911 MS ( )2834 2911 MS (i)2859 2911 MS (n)2887 2911 MS ( )2937 2911 MS (t)2962 2911 MS (h)2990 2911 MS (e)3040 2911 MS ( )3084 2911 MS (O)3109 2911 MS (r)3181 2911 MS (i)3214 2911 MS (g)3243 2911 MS (i)3292 2911 MS (n)3320 2911 MS (a)3370 2911 MS (l)3414 2911 MS ( )3442 2911 MS (C)3467 2911 MS (o)3534 2911 MS (d)3584 2911 MS (e)3634 2911 MS ( )3678 2911 MS (n)3703 2911 MS (o)3753 2911 MS (t)3803 2911 MS ( )3831 2911 MS (e)3856 2911 MS (x)3900 2911 MS (p)3951 2911 MS (r)4001 2911 MS (e)4034 2911 MS (s)4078 2911 MS (s)4117 2911 MS (l)4156 2911 MS (y)4185 2911 MS (g)490 3025 MS (r)539 3025 MS (a)573 3025 MS (n)617 3025 MS (t)667 3025 MS (e)695 3025 MS (d)739 3025 MS ( )789 3025 MS (u)814 3025 MS (n)864 3025 MS (d)914 3025 MS (e)964 3025 MS (r)1009 3025 MS ( )1042 3025 MS (t)1067 3025 MS (h)1095 3025 MS (i)1145 3025 MS (s)1173 3025 MS ( )1212 3025 MS (L)1238 3025 MS (i)1297 3025 MS (c)1325 3025 MS (e)1370 3025 MS (n)1414 3025 MS (s)1464 3025 MS (e)1503 3025 MS ( )1547 3025 MS (a)1572 3025 MS (r)1617 3025 MS (e)1650 3025 MS ( )1694 3025 MS (r)1719 3025 MS (e)1753 3025 MS (s)1797 3025 MS (e)1836 3025 MS (r)1880 3025 MS (v)1913 3025 MS (e)1964 3025 MS (d)2008 3025 MS (.)2058 3025 MS (6)490 3224 MS (.)540 3224 MS [100 0 0 -100 0 0]/Helvetica MF ( )565 3224 MS [100 0 0 -100 0 0]/Times-Bold MF (C)790 3224 MS (o)862 3224 MS (m)913 3224 MS (p)995 3224 MS (l)1051 3224 MS (i)1079 3224 MS (a)1107 3224 MS (n)1157 3224 MS (c)1213 3224 MS (e)1257 3224 MS ( )1301 3224 MS (w)1326 3224 MS (i)1399 3224 MS (t)1427 3224 MS (h)1460 3224 MS ( )1516 3224 MS (L)1541 3224 MS (a)1608 3224 MS (w)1657 3224 MS (s)1730 3224 MS (;)1769 3224 MS ( )1802 3224 MS (N)1827 3224 MS (o)1899 3224 MS (n)1949 3224 MS (-)2005 3224 MS (I)2038 3224 MS (n)2077 3224 MS (f)2132 3224 MS (r)2166 3224 MS (i)2210 3224 MS (n)2238 3224 MS (g)2294 3224 MS (e)2344 3224 MS (m)2388 3224 MS (e)2470 3224 MS (n)2514 3224 MS (t)2570 3224 MS (.)2603 3224 MS [100 0 0 -100 0 0]/Times-Roman MF ( )2628 3224 MS (T)2653 3224 MS (h)2714 3224 MS (e)2764 3224 MS (r)2808 3224 MS (e)2842 3224 MS ( )2886 3224 MS (a)2912 3224 MS (r)2956 3224 MS (e)2989 3224 MS ( )3033 3224 MS (v)3058 3224 MS (a)3109 3224 MS (r)3153 3224 MS (i)3186 3224 MS (o)3214 3224 MS (u)3264 3224 MS (s)3314 3224 MS ( )3353 3224 MS (w)3378 3224 MS (o)3450 3224 MS (r)3500 3224 MS (l)3533 3224 MS (d)3561 3224 MS (w)3611 3224 MS (i)3683 3224 MS (d)3711 3224 MS (e)3761 3224 MS ( )3805 3224 MS (l)3830 3224 MS (a)3858 3224 MS (w)3903 3224 MS (s)3975 3224 MS (,)4014 3224 MS (r)490 3339 MS (e)523 3339 MS (g)568 3339 MS (u)617 3339 MS (l)667 3339 MS (a)695 3339 MS (t)739 3339 MS (i)767 3339 MS (o)795 3339 MS (n)845 3339 MS (s)895 3339 MS (,)934 3339 MS ( )959 3339 MS (a)984 3339 MS (n)1028 3339 MS (d)1078 3339 MS ( )1128 3339 MS (e)1153 3339 MS (x)1197 3339 MS (e)1248 3339 MS (c)1292 3339 MS (u)1336 3339 MS (t)1386 3339 MS (i)1414 3339 MS (v)1442 3339 MS (e)1492 3339 MS ( )1536 3339 MS (o)1561 3339 MS (r)1611 3339 MS (d)1644 3339 MS (e)1695 3339 MS (r)1739 3339 MS (s)1772 3339 MS ( )1811 3339 MS (a)1836 3339 MS (p)1880 3339 MS (p)1930 3339 MS (l)1980 3339 MS (i)2008 3339 MS (c)2036 3339 MS (a)2081 3339 MS (b)2125 3339 MS (l)2175 3339 MS (e)2203 3339 MS ( )2247 3339 MS (t)2272 3339 MS (o)2300 3339 MS ( )2350 3339 MS (d)2375 3339 MS (i)2425 3339 MS (s)2453 3339 MS (p)2492 3339 MS (o)2542 3339 MS (s)2592 3339 MS (i)2631 3339 MS (t)2659 3339 MS (i)2687 3339 MS (o)2715 3339 MS (n)2765 3339 MS (s)2815 3339 MS ( )2854 3339 MS (o)2879 3339 MS (f)2929 3339 MS ( )2962 3339 MS (C)2987 3339 MS (o)3054 3339 MS (v)3104 3339 MS (e)3154 3339 MS (r)3198 3339 MS (e)3231 3339 MS (d)3275 3339 MS ( )3325 3339 MS (C)3350 3339 MS (o)3417 3339 MS (d)3467 3339 MS (e)3517 3339 MS (,)3561 3339 MS ( )3586 3339 MS (i)3611 3339 MS (n)3639 3339 MS (c)3689 3339 MS (l)3733 3339 MS (u)3761 3339 MS (d)3811 3339 MS (i)3861 3339 MS (n)3889 3339 MS (g)3939 3339 MS ( )3988 3339 MS (w)4014 3339 MS (i)4086 3339 MS (t)4114 3339 MS (h)4142 3339 MS (o)4192 3339 MS (u)4242 3339 MS (t)4292 3339 MS (l)490 3454 MS (i)518 3454 MS (m)546 3454 MS (i)624 3454 MS (t)652 3454 MS (a)680 3454 MS (t)724 3454 MS (i)752 3454 MS (o)780 3454 MS (n)830 3454 MS ( )880 3454 MS (e)905 3454 MS (x)948 3454 MS (p)999 3454 MS (o)1049 3454 MS (r)1099 3454 MS (t)1132 3454 MS (,)1160 3454 MS ( )1185 3454 MS (r)1210 3454 MS (e)1243 3454 MS (-)1287 3454 MS (e)1320 3454 MS (x)1364 3454 MS (p)1415 3454 MS (o)1465 3454 MS (r)1515 3454 MS (t)1548 3454 MS (,)1576 3454 MS ( )1601 3454 MS (a)1626 3454 MS (n)1670 3454 MS (d)1720 3454 MS ( )1770 3454 MS (i)1795 3454 MS (m)1823 3454 MS (p)1901 3454 MS (o)1951 3454 MS (r)2001 3454 MS (t)2034 3454 MS ( )2062 3454 MS (c)2087 3454 MS (o)2131 3454 MS (n)2181 3454 MS (t)2231 3454 MS (r)2259 3454 MS (o)2292 3454 MS (l)2342 3454 MS ( )2370 3454 MS (l)2395 3454 MS (a)2423 3454 MS (w)2467 3454 MS (s)2539 3454 MS (,)2578 3454 MS ( )2603 3454 MS (r)2628 3454 MS (e)2661 3454 MS (g)2706 3454 MS (u)2755 3454 MS (l)2805 3454 MS (a)2833 3454 MS (t)2877 3454 MS (i)2905 3454 MS (o)2933 3454 MS (n)2983 3454 MS (s)3033 3454 MS (,)3072 3454 MS ( )3097 3454 MS (a)3122 3454 MS (n)3166 3454 MS (d)3216 3454 MS ( )3266 3454 MS (e)3292 3454 MS (x)3336 3454 MS (e)3387 3454 MS (c)3431 3454 MS (u)3475 3454 MS (t)3525 3454 MS (i)3553 3454 MS (v)3581 3454 MS (e)3631 3454 MS ( )3675 3454 MS (o)3700 3454 MS (r)3750 3454 MS (d)3783 3454 MS (e)3833 3454 MS (r)3877 3454 MS (s)3910 3454 MS (,)3949 3454 MS ( )3974 3454 MS (o)3999 3454 MS (f)4050 3454 MS ( )4083 3454 MS (t)4108 3454 MS (h)4136 3454 MS (e)4186 3454 MS (U)490 3569 MS (.)562 3569 MS (S)587 3569 MS (.)643 3569 MS ( )668 3569 MS (g)693 3569 MS (o)742 3569 MS (v)792 3569 MS (e)842 3569 MS (r)887 3569 MS (n)920 3569 MS (m)970 3569 MS (e)1048 3569 MS (n)1092 3569 MS (t)1142 3569 MS ( )1170 3569 MS (a)1195 3569 MS (n)1239 3569 MS (d)1289 3569 MS ( )1339 3569 MS (o)1364 3569 MS (t)1414 3569 MS (h)1442 3569 MS (e)1492 3569 MS (r)1536 3569 MS ( )1569 3569 MS (c)1595 3569 MS (o)1639 3569 MS (u)1689 3569 MS (n)1739 3569 MS (t)1789 3569 MS (r)1817 3569 MS (i)1850 3569 MS (e)1878 3569 MS (s)1922 3569 MS (,)1961 3569 MS ( )1986 3569 MS (a)2011 3569 MS (n)2055 3569 MS (d)2105 3569 MS ( )2155 3569 MS (R)2180 3569 MS (e)2247 3569 MS (c)2292 3569 MS (i)2336 3569 MS (p)2364 3569 MS (i)2414 3569 MS (e)2442 3569 MS (n)2486 3569 MS (t)2536 3569 MS ( )2564 3569 MS (i)2589 3569 MS (s)2617 3569 MS ( )2656 3569 MS (r)2681 3569 MS (e)2714 3569 MS (m)2758 3569 MS (i)2836 3569 MS (n)2864 3569 MS (d)2914 3569 MS (e)2964 3569 MS (d)3008 3569 MS ( )3058 3569 MS (i)3083 3569 MS (t)3111 3569 MS ( )3139 3569 MS (i)3164 3569 MS (s)3192 3569 MS ( )3231 3569 MS (o)3256 3569 MS (b)3306 3569 MS (l)3356 3569 MS (i)3384 3569 MS (g)3412 3569 MS (e)3461 3569 MS (d)3505 3569 MS ( )3555 3569 MS (t)3580 3569 MS (o)3608 3569 MS ( )3658 3569 MS (o)3683 3569 MS (b)3733 3569 MS (e)3783 3569 MS (y)3829 3569 MS ( )3877 3569 MS (s)3902 3569 MS (u)3941 3569 MS (c)3992 3569 MS (h)4036 3569 MS ( )4086 3569 MS (l)4111 3569 MS (a)4139 3569 MS (w)4183 3569 MS (s)4255 3569 MS (,)4294 3569 MS (r)490 3684 MS (e)523 3684 MS (g)568 3684 MS (u)617 3684 MS (l)667 3684 MS (a)695 3684 MS (t)739 3684 MS (i)767 3684 MS (o)795 3684 MS (n)845 3684 MS (s)895 3684 MS (,)934 3684 MS ( )959 3684 MS (a)984 3684 MS (n)1028 3684 MS (d)1078 3684 MS ( )1128 3684 MS (e)1153 3684 MS (x)1197 3684 MS (e)1248 3684 MS (c)1292 3684 MS (u)1336 3684 MS (t)1386 3684 MS (i)1414 3684 MS (v)1442 3684 MS (e)1492 3684 MS ( )1536 3684 MS (o)1561 3684 MS (r)1611 3684 MS (d)1644 3684 MS (e)1695 3684 MS (r)1739 3684 MS (s)1772 3684 MS (.)1811 3684 MS ( )1836 3684 MS (R)1861 3684 MS (e)1928 3684 MS (c)1972 3684 MS (i)2016 3684 MS (p)2044 3684 MS (i)2094 3684 MS (e)2122 3684 MS (n)2166 3684 MS (t)2216 3684 MS ( )2244 3684 MS (m)2269 3684 MS (a)2347 3684 MS (y)2393 3684 MS ( )2441 3684 MS (n)2466 3684 MS (o)2516 3684 MS (t)2566 3684 MS ( )2594 3684 MS (d)2619 3684 MS (i)2669 3684 MS (s)2697 3684 MS (t)2736 3684 MS (r)2764 3684 MS (i)2797 3684 MS (b)2825 3684 MS (u)2875 3684 MS (t)2925 3684 MS (e)2953 3684 MS ( )2997 3684 MS (C)3022 3684 MS (o)3089 3684 MS (v)3139 3684 MS (e)3189 3684 MS (r)3233 3684 MS (e)3267 3684 MS (d)3311 3684 MS ( )3361 3684 MS (C)3386 3684 MS (o)3453 3684 MS (d)3503 3684 MS (e)3553 3684 MS ( )3597 3684 MS (t)3622 3684 MS (h)3650 3684 MS (a)3700 3684 MS (t)3744 3684 MS ( )3772 3684 MS (\()3797 3684 MS (i)3830 3684 MS (\))3858 3684 MS ( )3891 3684 MS (i)3916 3684 MS (n)3944 3684 MS ( )3994 3684 MS (a)4019 3684 MS (n)4063 3684 MS (y)4115 3684 MS ( )4163 3684 MS (w)4188 3684 MS (a)4261 3684 MS (y)4307 3684 MS (i)490 3799 MS (n)518 3799 MS (f)568 3799 MS (r)601 3799 MS (i)634 3799 MS (n)662 3799 MS (g)712 3799 MS (e)762 3799 MS (s)806 3799 MS ( )845 3799 MS (\()870 3799 MS (d)903 3799 MS (i)953 3799 MS (r)981 3799 MS (e)1014 3799 MS (c)1059 3799 MS (t)1103 3799 MS (l)1131 3799 MS (y)1160 3799 MS ( )1208 3799 MS (o)1233 3799 MS (r)1284 3799 MS ( )1317 3799 MS (c)1342 3799 MS (o)1386 3799 MS (n)1436 3799 MS (t)1486 3799 MS (r)1514 3799 MS (i)1547 3799 MS (b)1575 3799 MS (u)1625 3799 MS (t)1675 3799 MS (o)1703 3799 MS (r)1753 3799 MS (i)1786 3799 MS (l)1814 3799 MS (y)1844 3799 MS (\))1892 3799 MS ( )1925 3799 MS (a)1950 3799 MS (n)1994 3799 MS (y)2046 3799 MS ( )2094 3799 MS (i)2119 3799 MS (n)2147 3799 MS (t)2197 3799 MS (e)2225 3799 MS (l)2269 3799 MS (l)2297 3799 MS (e)2325 3799 MS (c)2370 3799 MS (t)2414 3799 MS (u)2442 3799 MS (a)2492 3799 MS (l)2536 3799 MS ( )2564 3799 MS (p)2589 3799 MS (r)2639 3799 MS (o)2672 3799 MS (p)2722 3799 MS (e)2772 3799 MS (r)2816 3799 MS (t)2849 3799 MS (y)2879 3799 MS ( )2927 3799 MS (r)2953 3799 MS (i)2986 3799 MS (g)3014 3799 MS (h)3063 3799 MS (t)3113 3799 MS (s)3141 3799 MS ( )3180 3799 MS (o)3205 3799 MS (f)3255 3799 MS ( )3288 3799 MS (a)3314 3799 MS (n)3358 3799 MS (y)3410 3799 MS ( )3458 3799 MS (k)3483 3799 MS (i)3533 3799 MS (n)3561 3799 MS (d)3611 3799 MS ( )3661 3799 MS (o)3686 3799 MS (f)3736 3799 MS ( )3769 3799 MS (a)3794 3799 MS (n)3838 3799 MS (y)3890 3799 MS ( )3938 3799 MS (o)3963 3799 MS (t)4013 3799 MS (h)4041 3799 MS (e)4091 3799 MS (r)4136 3799 MS (p)490 3914 MS (e)540 3914 MS (r)584 3914 MS (s)617 3914 MS (o)656 3914 MS (n)706 3914 MS ( )756 3914 MS (o)781 3914 MS (r)831 3914 MS ( )864 3914 MS (e)889 3914 MS (n)933 3914 MS (t)983 3914 MS (i)1011 3914 MS (t)1039 3914 MS (y)1069 3914 MS ( )1117 3914 MS (o)1142 3914 MS (r)1192 3914 MS ( )1225 3914 MS (\()1250 3914 MS (i)1283 3914 MS (i)1311 3914 MS (\))1339 3914 MS ( )1372 3914 MS (b)1397 3914 MS (r)1447 3914 MS (e)1480 3914 MS (a)1525 3914 MS (c)1570 3914 MS (h)1614 3914 MS (e)1664 3914 MS (s)1708 3914 MS ( )1747 3914 MS (a)1772 3914 MS (n)1816 3914 MS (y)1868 3914 MS ( )1916 3914 MS (r)1942 3914 MS (e)1975 3914 MS (p)2019 3914 MS (r)2069 3914 MS (e)2103 3914 MS (s)2147 3914 MS (e)2186 3914 MS (n)2230 3914 MS (t)2280 3914 MS (a)2308 3914 MS (t)2352 3914 MS (i)2380 3914 MS (o)2408 3914 MS (n)2458 3914 MS ( )2508 3914 MS (o)2533 3914 MS (r)2583 3914 MS ( )2616 3914 MS (w)2641 3914 MS (a)2714 3914 MS (r)2758 3914 MS (r)2791 3914 MS (a)2825 3914 MS (n)2869 3914 MS (t)2919 3914 MS (y)2949 3914 MS (,)2997 3914 MS ( )3022 3914 MS (e)3047 3914 MS (x)3091 3914 MS (p)3142 3914 MS (r)3192 3914 MS (e)3225 3914 MS (s)3269 3914 MS (s)3308 3914 MS (,)3347 3914 MS ( )3372 3914 MS (i)3397 3914 MS (m)3425 3914 MS (p)3503 3914 MS (l)3553 3914 MS (i)3581 3914 MS (e)3609 3914 MS (d)3653 3914 MS ( )3703 3914 MS (o)3728 3914 MS (r)3778 3914 MS ( )3811 3914 MS (s)3836 3914 MS (t)3875 3914 MS (a)3903 3914 MS (t)3947 3914 MS (u)3975 3914 MS (t)4025 3914 MS (o)4053 3914 MS (r)4103 3914 MS (y)4137 3914 MS (,)4185 3914 MS ( )4210 3914 MS (t)4235 3914 MS (o)4263 3914 MS (w)490 4029 MS (h)562 4029 MS (i)612 4029 MS (c)640 4029 MS (h)684 4029 MS (,)734 4029 MS ( )759 4029 MS (u)784 4029 MS (n)834 4029 MS (d)884 4029 MS (e)934 4029 MS (r)978 4029 MS ( )1011 4029 MS (a)1037 4029 MS (n)1081 4029 MS (y)1133 4029 MS ( )1181 4029 MS (a)1206 4029 MS (p)1250 4029 MS (p)1300 4029 MS (l)1350 4029 MS (i)1378 4029 MS (c)1406 4029 MS (a)1450 4029 MS (b)1494 4029 MS (l)1544 4029 MS (e)1572 4029 MS ( )1616 4029 MS (l)1641 4029 MS (a)1670 4029 MS (w)1714 4029 MS (,)1786 4029 MS ( )1811 4029 MS (i)1836 4029 MS (t)1864 4029 MS ( )1892 4029 MS (m)1917 4029 MS (i)1995 4029 MS (g)2023 4029 MS (h)2072 4029 MS (t)2122 4029 MS ( )2150 4029 MS (b)2175 4029 MS (e)2225 4029 MS ( )2269 4029 MS (d)2294 4029 MS (e)2345 4029 MS (e)2389 4029 MS (m)2433 4029 MS (e)2511 4029 MS (d)2555 4029 MS ( )2605 4029 MS (t)2630 4029 MS (o)2658 4029 MS ( )2708 4029 MS (h)2733 4029 MS (a)2783 4029 MS (v)2827 4029 MS (e)2878 4029 MS ( )2922 4029 MS (b)2947 4029 MS (e)2997 4029 MS (e)3041 4029 MS (n)3085 4029 MS ( )3135 4029 MS (s)3160 4029 MS (u)3199 4029 MS (b)3249 4029 MS (j)3299 4029 MS (e)3328 4029 MS (c)3372 4029 MS (t)3416 4029 MS (.)3444 4029 MS (7)490 4227 MS (.)540 4227 MS [100 0 0 -100 0 0]/Helvetica MF ( )565 4227 MS [100 0 0 -100 0 0]/Times-Bold MF (C)790 4227 MS (l)862 4227 MS (a)890 4227 MS (i)940 4227 MS (m)968 4227 MS (s)1050 4227 MS ( )1089 4227 MS (o)1114 4227 MS (f)1164 4227 MS ( )1198 4227 MS (I)1223 4227 MS (n)1262 4227 MS (f)1318 4227 MS (r)1352 4227 MS (i)1396 4227 MS (n)1424 4227 MS (g)1480 4227 MS (e)1530 4227 MS (m)1574 4227 MS (e)1656 4227 MS (n)1700 4227 MS (t)1756 4227 MS (.)1789 4227 MS ( )1814 4227 MS [100 0 0 -100 0 0]/Times-Roman MF (I)1839 4227 MS (f)1872 4227 MS ( )1906 4227 MS (R)1931 4227 MS (e)1998 4227 MS (c)2042 4227 MS (i)2086 4227 MS (p)2114 4227 MS (i)2164 4227 MS (e)2192 4227 MS (n)2236 4227 MS (t)2286 4227 MS ( )2314 4227 MS (l)2339 4227 MS (e)2367 4227 MS (a)2411 4227 MS (r)2456 4227 MS (n)2489 4227 MS (s)2539 4227 MS ( )2578 4227 MS (o)2603 4227 MS (f)2653 4227 MS ( )2686 4227 MS (a)2711 4227 MS (n)2755 4227 MS (y)2805 4227 MS ( )2854 4227 MS (t)2880 4227 MS (h)2908 4227 MS (i)2958 4227 MS (r)2986 4227 MS (d)3019 4227 MS ( )3069 4227 MS (p)3094 4227 MS (a)3145 4227 MS (r)3189 4227 MS (t)3222 4227 MS (y)3252 4227 MS ( )3300 4227 MS (c)3325 4227 MS (l)3369 4227 MS (a)3397 4227 MS (i)3441 4227 MS (m)3469 4227 MS ( )3547 4227 MS (t)3572 4227 MS (h)3600 4227 MS (a)3650 4227 MS (t)3694 4227 MS ( )3722 4227 MS (a)3747 4227 MS (n)3791 4227 MS (y)3841 4227 MS ( )3890 4227 MS (d)3916 4227 MS (i)3966 4227 MS (s)3994 4227 MS (p)4033 4227 MS (o)4083 4227 MS (s)4133 4227 MS (i)4172 4227 MS (t)4200 4227 MS (i)4228 4227 MS (o)4256 4227 MS (n)4306 4227 MS (o)490 4342 MS (f)540 4342 MS ( )573 4342 MS (C)598 4342 MS (o)665 4342 MS (v)715 4342 MS (e)765 4342 MS (r)809 4342 MS (e)842 4342 MS (d)886 4342 MS ( )936 4342 MS (C)961 4342 MS (o)1028 4342 MS (d)1078 4342 MS (e)1128 4342 MS ( )1172 4342 MS (a)1198 4342 MS (n)1242 4342 MS (d)1292 4342 MS (/)1342 4342 MS (o)1370 4342 MS (r)1420 4342 MS ( )1453 4342 MS (f)1478 4342 MS (u)1511 4342 MS (n)1561 4342 MS (c)1611 4342 MS (t)1655 4342 MS (i)1683 4342 MS (o)1711 4342 MS (n)1761 4342 MS (a)1811 4342 MS (l)1855 4342 MS (i)1883 4342 MS (t)1911 4342 MS (y)1941 4342 MS ( )1989 4342 MS (w)2014 4342 MS (h)2086 4342 MS (o)2136 4342 MS (l)2186 4342 MS (l)2214 4342 MS (y)2244 4342 MS ( )2292 4342 MS (o)2317 4342 MS (r)2367 4342 MS ( )2400 4342 MS (p)2425 4342 MS (a)2475 4342 MS (r)2519 4342 MS (t)2552 4342 MS (i)2580 4342 MS (a)2608 4342 MS (l)2652 4342 MS (l)2680 4342 MS (y)2710 4342 MS ( )2758 4342 MS (i)2783 4342 MS (n)2811 4342 MS (f)2861 4342 MS (r)2894 4342 MS (i)2927 4342 MS (n)2955 4342 MS (g)3006 4342 MS (e)3056 4342 MS (s)3100 4342 MS ( )3139 4342 MS (t)3164 4342 MS (h)3192 4342 MS (e)3242 4342 MS ( )3286 4342 MS (t)3311 4342 MS (h)3339 4342 MS (i)3389 4342 MS (r)3417 4342 MS (d)3450 4342 MS ( )3500 4342 MS (p)3525 4342 MS (a)3575 4342 MS (r)3619 4342 MS (t)3652 4342 MS (y)3682 4342 MS (')3730 4342 MS (s)3748 4342 MS ( )3787 4342 MS (i)3812 4342 MS (n)3840 4342 MS (t)3890 4342 MS (e)3918 4342 MS (l)3962 4342 MS (l)3990 4342 MS (e)4018 4342 MS (c)4062 4342 MS (t)4106 4342 MS (u)4134 4342 MS (a)4185 4342 MS (l)4229 4342 MS (p)490 4457 MS (r)540 4457 MS (o)573 4457 MS (p)623 4457 MS (e)673 4457 MS (r)717 4457 MS (t)750 4457 MS (y)780 4457 MS ( )828 4457 MS (r)853 4457 MS (i)886 4457 MS (g)915 4457 MS (h)964 4457 MS (t)1014 4457 MS (s)1042 4457 MS (,)1081 4457 MS ( )1106 4457 MS (R)1131 4457 MS (e)1198 4457 MS (c)1242 4457 MS (i)1286 4457 MS (p)1314 4457 MS (i)1364 4457 MS (e)1392 4457 MS (n)1436 4457 MS (t)1486 4457 MS ( )1514 4457 MS (w)1539 4457 MS (i)1611 4457 MS (l)1639 4457 MS (l)1667 4457 MS ( )1695 4457 MS (p)1720 4457 MS (r)1770 4457 MS (o)1803 4457 MS (m)1853 4457 MS (p)1931 4457 MS (t)1981 4457 MS (l)2009 4457 MS (y)2038 4457 MS ( )2086 4457 MS (n)2111 4457 MS (o)2161 4457 MS (t)2211 4457 MS (i)2239 4457 MS (f)2267 4457 MS (y)2302 4457 MS ( )2350 4457 MS (S)2375 4457 MS (G)2431 4457 MS (I)2504 4457 MS ( )2536 4457 MS (o)2561 4457 MS (f)2611 4457 MS ( )2644 4457 MS (s)2669 4457 MS (u)2708 4457 MS (c)2759 4457 MS (h)2803 4457 MS ( )2853 4457 MS (c)2878 4457 MS (l)2922 4457 MS (a)2950 4457 MS (i)2994 4457 MS (m)3022 4457 MS (.)3100 4457 MS (8)490 4656 MS (.)540 4656 MS [100 0 0 -100 0 0]/Helvetica MF ( )565 4656 MS [100 0 0 -100 0 0]/Times-Bold MF (V)753 4656 MS (e)825 4656 MS (r)869 4656 MS (s)913 4656 MS (i)952 4656 MS (o)980 4656 MS (n)1030 4656 MS (s)1086 4656 MS ( )1125 4656 MS (o)1150 4656 MS (f)1200 4656 MS ( )1234 4656 MS (t)1259 4656 MS (h)1292 4656 MS (e)1348 4656 MS ( )1392 4656 MS (L)1417 4656 MS (i)1484 4656 MS (c)1512 4656 MS (e)1556 4656 MS (n)1600 4656 MS (s)1656 4656 MS (e)1695 4656 MS (.)1739 4656 MS [100 0 0 -100 0 0]/Times-Roman MF ( )1764 4656 MS (S)1789 4656 MS (G)1845 4656 MS (I)1917 4656 MS ( )1948 4656 MS (m)1973 4656 MS (a)2051 4656 MS (y)2097 4656 MS ( )2145 4656 MS (p)2170 4656 MS (u)2220 4656 MS (b)2270 4656 MS (l)2320 4656 MS (i)2348 4656 MS (s)2376 4656 MS (h)2415 4656 MS ( )2465 4656 MS (r)2490 4656 MS (e)2524 4656 MS (v)2568 4656 MS (i)2618 4656 MS (s)2646 4656 MS (e)2685 4656 MS (d)2729 4656 MS ( )2779 4656 MS (a)2804 4656 MS (n)2848 4656 MS (d)2898 4656 MS (/)2948 4656 MS (o)2976 4656 MS (r)3026 4656 MS ( )3059 4656 MS (n)3084 4656 MS (e)3135 4656 MS (w)3179 4656 MS ( )3251 4656 MS (v)3276 4656 MS (e)3326 4656 MS (r)3371 4656 MS (s)3404 4656 MS (i)3443 4656 MS (o)3471 4656 MS (n)3521 4656 MS (s)3571 4656 MS ( )3610 4656 MS (o)3635 4656 MS (f)3685 4656 MS ( )3718 4656 MS (t)3743 4656 MS (h)3771 4656 MS (e)3821 4656 MS ( )3865 4656 MS (L)3891 4656 MS (i)3950 4656 MS (c)3979 4656 MS (e)4023 4656 MS (n)4067 4656 MS (s)4117 4656 MS (e)4157 4656 MS (f)490 4771 MS (r)523 4771 MS (o)556 4771 MS (m)606 4771 MS ( )684 4771 MS (t)709 4771 MS (i)737 4771 MS (m)765 4771 MS (e)843 4771 MS ( )887 4771 MS (t)912 4771 MS (o)940 4771 MS ( )990 4771 MS (t)1015 4771 MS (i)1043 4771 MS (m)1071 4771 MS (e)1149 4771 MS (,)1193 4771 MS ( )1218 4771 MS (e)1243 4771 MS (a)1287 4771 MS (c)1331 4771 MS (h)1375 4771 MS ( )1425 4771 MS (w)1450 4771 MS (i)1522 4771 MS (t)1550 4771 MS (h)1578 4771 MS ( )1628 4771 MS (a)1653 4771 MS ( )1697 4771 MS (d)1722 4771 MS (i)1772 4771 MS (s)1800 4771 MS (t)1839 4771 MS (i)1867 4771 MS (n)1895 4771 MS (g)1945 4771 MS (u)1994 4771 MS (i)2044 4771 MS (s)2072 4771 MS (h)2111 4771 MS (i)2161 4771 MS (n)2189 4771 MS (g)2240 4771 MS ( )2289 4771 MS (v)2314 4771 MS (e)2364 4771 MS (r)2409 4771 MS (s)2442 4771 MS (i)2481 4771 MS (o)2509 4771 MS (n)2559 4771 MS ( )2609 4771 MS (n)2634 4771 MS (u)2684 4771 MS (m)2734 4771 MS (b)2812 4771 MS (e)2862 4771 MS (r)2906 4771 MS (.)2939 4771 MS ( )2964 4771 MS (O)2989 4771 MS (n)3061 4771 MS (c)3111 4771 MS (e)3156 4771 MS ( )3200 4771 MS (C)3225 4771 MS (o)3292 4771 MS (v)3342 4771 MS (e)3392 4771 MS (r)3436 4771 MS (e)3470 4771 MS (d)3514 4771 MS ( )3564 4771 MS (C)3589 4771 MS (o)3656 4771 MS (d)3706 4771 MS (e)3756 4771 MS ( )3800 4771 MS (h)3825 4771 MS (a)3875 4771 MS (s)3919 4771 MS ( )3958 4771 MS (b)3983 4771 MS (e)4033 4771 MS (e)4078 4771 MS (n)4122 4771 MS (p)490 4886 MS (u)540 4886 MS (b)590 4886 MS (l)640 4886 MS (i)668 4886 MS (s)696 4886 MS (h)735 4886 MS (e)785 4886 MS (d)829 4886 MS ( )879 4886 MS (u)904 4886 MS (n)954 4886 MS (d)1004 4886 MS (e)1054 4886 MS (r)1098 4886 MS ( )1131 4886 MS (a)1156 4886 MS ( )1200 4886 MS (p)1225 4886 MS (a)1275 4886 MS (r)1320 4886 MS (t)1353 4886 MS (i)1381 4886 MS (c)1409 4886 MS (u)1453 4886 MS (l)1503 4886 MS (a)1531 4886 MS (r)1575 4886 MS ( )1608 4886 MS (v)1633 4886 MS (e)1684 4886 MS (r)1728 4886 MS (s)1761 4886 MS (i)1800 4886 MS (o)1828 4886 MS (n)1878 4886 MS ( )1928 4886 MS (o)1953 4886 MS (f)2003 4886 MS ( )2036 4886 MS (t)2061 4886 MS (h)2089 4886 MS (e)2139 4886 MS ( )2183 4886 MS (L)2209 4886 MS (i)2269 4886 MS (c)2297 4886 MS (e)2342 4886 MS (n)2386 4886 MS (s)2436 4886 MS (e)2475 4886 MS (,)2519 4886 MS ( )2544 4886 MS (R)2569 4886 MS (e)2636 4886 MS (c)2680 4886 MS (i)2724 4886 MS (p)2752 4886 MS (i)2802 4886 MS (e)2830 4886 MS (n)2874 4886 MS (t)2924 4886 MS ( )2952 4886 MS (m)2977 4886 MS (a)3055 4886 MS (y)3101 4886 MS (,)3149 4886 MS ( )3174 4886 MS (f)3200 4886 MS (o)3233 4886 MS (r)3283 4886 MS ( )3316 4886 MS (t)3341 4886 MS (h)3369 4886 MS (e)3419 4886 MS ( )3463 4886 MS (d)3488 4886 MS (u)3538 4886 MS (r)3589 4886 MS (a)3622 4886 MS (t)3666 4886 MS (i)3694 4886 MS (o)3722 4886 MS (n)3772 4886 MS ( )3822 4886 MS (o)3847 4886 MS (f)3897 4886 MS ( )3930 4886 MS (t)3955 4886 MS (h)3983 4886 MS (e)4033 4886 MS (l)490 5001 MS (i)518 5001 MS (c)546 5001 MS (e)590 5001 MS (n)634 5001 MS (s)684 5001 MS (e)723 5001 MS (,)767 5001 MS ( )792 5001 MS (c)817 5001 MS (o)861 5001 MS (n)911 5001 MS (t)961 5001 MS (i)989 5001 MS (n)1017 5001 MS (u)1067 5001 MS (e)1117 5001 MS ( )1161 5001 MS (t)1186 5001 MS (o)1214 5001 MS ( )1264 5001 MS (u)1289 5001 MS (s)1339 5001 MS (e)1378 5001 MS ( )1422 5001 MS (i)1447 5001 MS (t)1475 5001 MS ( )1503 5001 MS (u)1528 5001 MS (n)1578 5001 MS (d)1628 5001 MS (e)1678 5001 MS (r)1722 5001 MS ( )1755 5001 MS (t)1780 5001 MS (h)1808 5001 MS (e)1859 5001 MS ( )1903 5001 MS (t)1928 5001 MS (e)1956 5001 MS (r)2000 5001 MS (m)2033 5001 MS (s)2111 5001 MS ( )2150 5001 MS (o)2175 5001 MS (f)2225 5001 MS ( )2258 5001 MS (t)2283 5001 MS (h)2311 5001 MS (a)2361 5001 MS (t)2405 5001 MS ( )2433 5001 MS (v)2458 5001 MS (e)2508 5001 MS (r)2553 5001 MS (s)2586 5001 MS (i)2625 5001 MS (o)2653 5001 MS (n)2703 5001 MS (,)2753 5001 MS ( )2778 5001 MS (o)2803 5001 MS (r)2853 5001 MS ( )2886 5001 MS (c)2911 5001 MS (h)2955 5001 MS (o)3005 5001 MS (o)3055 5001 MS (s)3105 5001 MS (e)3144 5001 MS ( )3188 5001 MS (t)3213 5001 MS (o)3241 5001 MS ( )3291 5001 MS (u)3316 5001 MS (s)3366 5001 MS (e)3406 5001 MS ( )3450 5001 MS (s)3475 5001 MS (u)3514 5001 MS (c)3564 5001 MS (h)3608 5001 MS ( )3658 5001 MS (C)3683 5001 MS (o)3750 5001 MS (v)3800 5001 MS (e)3850 5001 MS (r)3894 5001 MS (e)3928 5001 MS (d)3972 5001 MS ( )4022 5001 MS (C)4047 5001 MS (o)4114 5001 MS (d)4164 5001 MS (e)4214 5001 MS (u)490 5116 MS (n)540 5116 MS (d)590 5116 MS (e)640 5116 MS (r)684 5116 MS ( )717 5116 MS (t)742 5116 MS (h)770 5116 MS (e)820 5116 MS ( )864 5116 MS (t)889 5116 MS (e)917 5116 MS (r)961 5116 MS (m)994 5116 MS (s)1072 5116 MS ( )1111 5116 MS (o)1136 5116 MS (f)1186 5116 MS ( )1219 5116 MS (a)1245 5116 MS (n)1289 5116 MS (y)1341 5116 MS ( )1389 5116 MS (s)1414 5116 MS (u)1453 5116 MS (b)1503 5116 MS (s)1553 5116 MS (e)1592 5116 MS (q)1636 5116 MS (u)1686 5116 MS (e)1736 5116 MS (n)1780 5116 MS (t)1830 5116 MS ( )1858 5116 MS (v)1883 5116 MS (e)1934 5116 MS (r)1978 5116 MS (s)2011 5116 MS (i)2050 5116 MS (o)2078 5116 MS (n)2128 5116 MS ( )2178 5116 MS (p)2203 5116 MS (u)2253 5116 MS (b)2303 5116 MS (l)2353 5116 MS (i)2381 5116 MS (s)2409 5116 MS (h)2448 5116 MS (e)2498 5116 MS (d)2542 5116 MS ( )2592 5116 MS (b)2617 5116 MS (y)2669 5116 MS ( )2717 5116 MS (S)2742 5116 MS (G)2798 5116 MS (I)2871 5116 MS (.)2903 5116 MS ( )2928 5116 MS (S)2953 5116 MS (u)3009 5116 MS (b)3059 5116 MS (j)3109 5116 MS (e)3137 5116 MS (c)3181 5116 MS (t)3225 5116 MS ( )3253 5116 MS (t)3278 5116 MS (o)3306 5116 MS ( )3356 5116 MS (t)3381 5116 MS (h)3409 5116 MS (e)3459 5116 MS ( )3503 5116 MS (p)3528 5116 MS (r)3578 5116 MS (o)3611 5116 MS (v)3661 5116 MS (i)3711 5116 MS (s)3739 5116 MS (i)3778 5116 MS (o)3806 5116 MS (n)3856 5116 MS (s)3906 5116 MS ( )3945 5116 MS (o)3970 5116 MS (f)4020 5116 MS (S)490 5231 MS (e)546 5231 MS (c)590 5231 MS (t)634 5231 MS (i)662 5231 MS (o)690 5231 MS (n)740 5231 MS (s)790 5231 MS ( )829 5231 MS (3)854 5231 MS ( )904 5231 MS (a)929 5231 MS (n)973 5231 MS (d)1023 5231 MS ( )1073 5231 MS (4)1098 5231 MS ( )1148 5231 MS (o)1173 5231 MS (f)1223 5231 MS ( )1256 5231 MS (t)1281 5231 MS (h)1309 5231 MS (i)1359 5231 MS (s)1387 5231 MS ( )1426 5231 MS (L)1452 5231 MS (i)1511 5231 MS (c)1539 5231 MS (e)1584 5231 MS (n)1628 5231 MS (s)1678 5231 MS (e)1717 5231 MS (,)1761 5231 MS ( )1786 5231 MS (o)1811 5231 MS (n)1861 5231 MS (l)1911 5231 MS (y)1941 5231 MS ( )1989 5231 MS (S)2014 5231 MS (G)2070 5231 MS (I)2143 5231 MS ( )2175 5231 MS (m)2200 5231 MS (a)2278 5231 MS (y)2324 5231 MS ( )2372 5231 MS (m)2397 5231 MS (o)2475 5231 MS (d)2525 5231 MS (i)2575 5231 MS (f)2603 5231 MS (y)2638 5231 MS ( )2686 5231 MS (t)2711 5231 MS (h)2739 5231 MS (e)2789 5231 MS ( )2833 5231 MS (t)2858 5231 MS (e)2886 5231 MS (r)2931 5231 MS (m)2964 5231 MS (s)3042 5231 MS ( )3081 5231 MS (a)3106 5231 MS (p)3150 5231 MS (p)3200 5231 MS (l)3250 5231 MS (i)3278 5231 MS (c)3306 5231 MS (a)3350 5231 MS (b)3394 5231 MS (l)3444 5231 MS (e)3472 5231 MS ( )3516 5231 MS (t)3541 5231 MS (o)3569 5231 MS ( )3619 5231 MS (C)3644 5231 MS (o)3711 5231 MS (v)3761 5231 MS (e)3811 5231 MS (r)3856 5231 MS (e)3889 5231 MS (d)3933 5231 MS ( )3983 5231 MS (C)4008 5231 MS (o)4075 5231 MS (d)4125 5231 MS (e)4175 5231 MS (c)490 5345 MS (r)534 5345 MS (e)567 5345 MS (a)611 5345 MS (t)655 5345 MS (e)684 5345 MS (d)728 5345 MS ( )778 5345 MS (u)803 5345 MS (n)853 5345 MS (d)903 5345 MS (e)953 5345 MS (r)997 5345 MS ( )1030 5345 MS (t)1055 5345 MS (h)1083 5345 MS (i)1133 5345 MS (s)1161 5345 MS ( )1200 5345 MS (L)1226 5345 MS (i)1286 5345 MS (c)1314 5345 MS (e)1358 5345 MS (n)1403 5345 MS (s)1453 5345 MS (e)1492 5345 MS (.)1536 5345 MS (9)490 5544 MS (.)540 5544 MS [100 0 0 -100 0 0]/Helvetica MF ( )565 5544 MS [100 0 0 -100 0 0]/Times-Bold MF (D)790 5544 MS (I)862 5544 MS (S)901 5544 MS (C)957 5544 MS (L)1029 5544 MS (A)1096 5544 MS (I)1168 5544 MS (M)1207 5544 MS (E)1301 5544 MS (R)1368 5544 MS ( )1440 5544 MS (O)1465 5544 MS (F)1543 5544 MS ( )1603 5544 MS (W)1628 5544 MS (A)1728 5544 MS (R)1800 5544 MS (R)1873 5544 MS (A)1945 5544 MS (N)2017 5544 MS (T)2089 5544 MS (Y)2156 5544 MS (.)2228 5544 MS [100 0 0 -100 0 0]/Times-Roman MF ( )2253 5544 MS (C)2278 5544 MS (O)2345 5544 MS (V)2417 5544 MS (E)2489 5544 MS (R)2550 5544 MS (E)2617 5544 MS (D)2678 5544 MS ( )2750 5544 MS (C)2775 5544 MS (O)2842 5544 MS (D)2914 5544 MS (E)2987 5544 MS ( )3048 5544 MS (I)3074 5544 MS (S)3106 5544 MS ( )3162 5544 MS (P)3187 5544 MS (R)3243 5544 MS (O)3310 5544 MS (V)3382 5544 MS (I)3455 5544 MS (D)3487 5544 MS (E)3559 5544 MS (D)3620 5544 MS ( )3692 5544 MS (")3718 5544 MS (A)3758 5544 MS (S)3830 5544 MS ( )3886 5544 MS (I)3912 5544 MS (S)3944 5544 MS (.)4000 5544 MS (")4026 5544 MS ( )4066 5544 MS (A)4091 5544 MS (L)4164 5544 MS (L)4225 5544 MS (E)490 5659 MS (X)551 5659 MS (P)623 5659 MS (R)679 5659 MS (E)746 5659 MS (S)807 5659 MS (S)863 5659 MS ( )919 5659 MS (A)944 5659 MS (N)1016 5659 MS (D)1088 5659 MS ( )1160 5659 MS (I)1186 5659 MS (M)1217 5659 MS (P)1306 5659 MS (L)1363 5659 MS (I)1424 5659 MS (E)1456 5659 MS (D)1517 5659 MS ( )1589 5659 MS (W)1614 5659 MS (A)1709 5659 MS (R)1781 5659 MS (R)1848 5659 MS (A)1915 5659 MS (N)1987 5659 MS (T)2059 5659 MS (I)2121 5659 MS (E)2153 5659 MS (S)2214 5659 MS ( )2270 5659 MS (A)2295 5659 MS (N)2367 5659 MS (D)2439 5659 MS ( )2511 5659 MS (C)2536 5659 MS (O)2603 5659 MS (N)2676 5659 MS (D)2748 5659 MS (I)2821 5659 MS (T)2853 5659 MS (I)2915 5659 MS (O)2947 5659 MS (N)3020 5659 MS (S)3092 5659 MS ( )3148 5659 MS (A)3173 5659 MS (R)3245 5659 MS (E)3312 5659 MS ( )3373 5659 MS (D)3398 5659 MS (I)3471 5659 MS (S)3503 5659 MS (C)3559 5659 MS (L)3627 5659 MS (A)3687 5659 MS (I)3760 5659 MS (M)3792 5659 MS (E)3881 5659 MS (D)3942 5659 MS (,)4014 5659 MS (I)490 5774 MS (N)522 5774 MS (C)594 5774 MS (L)662 5774 MS (U)722 5774 MS (D)795 5774 MS (I)868 5774 MS (N)900 5774 MS (G)973 5774 MS (,)1045 5774 MS ( )1070 5774 MS (W)1095 5774 MS (I)1191 5774 MS (T)1222 5774 MS (H)1284 5774 MS (O)1356 5774 MS (U)1428 5774 MS (T)1500 5774 MS ( )1561 5774 MS (L)1587 5774 MS (I)1648 5774 MS (M)1680 5774 MS (I)1771 5774 MS (T)1803 5774 MS (A)1864 5774 MS (T)1936 5774 MS (I)1998 5774 MS (O)2030 5774 MS (N)2103 5774 MS (,)2175 5774 MS ( )2200 5774 MS (A)2225 5774 MS (N)2297 5774 MS (Y)2369 5774 MS ( )2441 5774 MS (I)2468 5774 MS (M)2500 5774 MS (P)2589 5774 MS (L)2646 5774 MS (I)2707 5774 MS (E)2739 5774 MS (D)2800 5774 MS ( )2872 5774 MS (W)2897 5774 MS (A)2992 5774 MS (R)3064 5774 MS (R)3131 5774 MS (A)3198 5774 MS (N)3270 5774 MS (T)3342 5774 MS (I)3404 5774 MS (E)3436 5774 MS (S)3497 5774 MS ( )3553 5774 MS (A)3578 5774 MS (N)3650 5774 MS (D)3722 5774 MS showpage %%Page: 4 4 13.238 780.059 translate 72 600 div dup neg scale 0 0 transform .25 add round .25 sub exch .25 add round .25 sub exch itransform translate [100 0 0 -100 0 0]/Times-Roman MF (C)490 591 MS (O)557 591 MS (N)629 591 MS (D)701 591 MS (I)774 591 MS (T)806 591 MS (I)868 591 MS (O)900 591 MS (N)973 591 MS (S)1045 591 MS ( )1101 591 MS (O)1126 591 MS (F)1198 591 MS ( )1253 591 MS (M)1278 591 MS (E)1367 591 MS (R)1428 591 MS (C)1495 591 MS (H)1562 591 MS (A)1634 591 MS (N)1706 591 MS (T)1778 591 MS (A)1839 591 MS (B)1912 591 MS (I)1979 591 MS (L)2012 591 MS (I)2073 591 MS (T)2105 591 MS (Y)2167 591 MS (,)2239 591 MS ( )2264 591 MS (S)2289 591 MS (A)2345 591 MS (T)2417 591 MS (I)2479 591 MS (S)2511 591 MS (F)2568 591 MS (A)2623 591 MS (C)2695 591 MS (T)2762 591 MS (O)2823 591 MS (R)2895 591 MS (Y)2962 591 MS ( )3034 591 MS (Q)3059 591 MS (U)3131 591 MS (A)3203 591 MS (L)3276 591 MS (I)3337 591 MS (T)3369 591 MS (Y)3431 591 MS (,)3503 591 MS ( )3528 591 MS (F)3553 591 MS (I)3610 591 MS (T)3642 591 MS (N)3703 591 MS (E)3775 591 MS (S)3836 591 MS (S)3892 591 MS ( )3948 591 MS (F)3973 591 MS (O)4029 591 MS (R)4101 591 MS ( )4168 591 MS (A)4193 591 MS (P)490 706 MS (A)546 706 MS (R)618 706 MS (T)685 706 MS (I)747 706 MS (C)778 706 MS (U)845 706 MS (L)918 706 MS (A)978 706 MS (R)1050 706 MS ( )1117 706 MS (P)1142 706 MS (U)1198 706 MS (R)1270 706 MS (P)1337 706 MS (O)1393 706 MS (S)1465 706 MS (E)1521 706 MS (,)1582 706 MS ( )1607 706 MS (A)1632 706 MS (N)1704 706 MS (D)1776 706 MS ( )1848 706 MS (N)1873 706 MS (O)1945 706 MS (N)2017 706 MS (-)2090 706 MS (I)2123 706 MS (N)2155 706 MS (F)2228 706 MS (R)2283 706 MS (I)2352 706 MS (N)2384 706 MS (G)2456 706 MS (E)2528 706 MS (M)2589 706 MS (E)2678 706 MS (N)2740 706 MS (T)2812 706 MS (.)2873 706 MS ( )2898 706 MS (S)2923 706 MS (G)2979 706 MS (I)3052 706 MS ( )3084 706 MS (A)3109 706 MS (S)3181 706 MS (S)3237 706 MS (U)3293 706 MS (M)3365 706 MS (E)3454 706 MS (S)3515 706 MS ( )3571 706 MS (N)3596 706 MS (O)3668 706 MS ( )3740 706 MS (R)3765 706 MS (I)3833 706 MS (S)3864 706 MS (K)3920 706 MS ( )3992 706 MS (A)4018 706 MS (S)4090 706 MS ( )4146 706 MS (T)4171 706 MS (O)4232 706 MS (T)490 821 MS (H)551 821 MS (E)623 821 MS ( )684 821 MS (Q)709 821 MS (U)781 821 MS (A)853 821 MS (L)926 821 MS (I)987 821 MS (T)1019 821 MS (Y)1081 821 MS ( )1153 821 MS (A)1178 821 MS (N)1250 821 MS (D)1322 821 MS ( )1394 821 MS (P)1419 821 MS (E)1475 821 MS (R)1536 821 MS (F)1603 821 MS (O)1659 821 MS (R)1731 821 MS (M)1798 821 MS (A)1887 821 MS (N)1959 821 MS (C)2031 821 MS (E)2098 821 MS ( )2159 821 MS (O)2184 821 MS (F)2256 821 MS ( )2311 821 MS (T)2336 821 MS (H)2398 821 MS (E)2470 821 MS ( )2531 821 MS (S)2556 821 MS (O)2612 821 MS (F)2684 821 MS (T)2739 821 MS (W)2800 821 MS (A)2895 821 MS (R)2967 821 MS (E)3034 821 MS (.)3095 821 MS ( )3120 821 MS (S)3145 821 MS (H)3201 821 MS (O)3273 821 MS (U)3345 821 MS (L)3418 821 MS (D)3478 821 MS ( )3550 821 MS (T)3575 821 MS (H)3637 821 MS (E)3709 821 MS ( )3770 821 MS (S)3795 821 MS (O)3851 821 MS (F)3923 821 MS (T)3978 821 MS (W)4039 821 MS (A)4134 821 MS (R)4206 821 MS (E)4273 821 MS (P)490 936 MS (R)546 936 MS (O)613 936 MS (V)685 936 MS (E)757 936 MS ( )818 936 MS (D)843 936 MS (E)915 936 MS (F)976 936 MS (E)1031 936 MS (C)1092 936 MS (T)1159 936 MS (I)1221 936 MS (V)1253 936 MS (E)1325 936 MS ( )1386 936 MS (I)1413 936 MS (N)1445 936 MS ( )1517 936 MS (A)1542 936 MS (N)1614 936 MS (Y)1686 936 MS ( )1758 936 MS (R)1783 936 MS (E)1850 936 MS (S)1911 936 MS (P)1967 936 MS (E)2023 936 MS (C)2084 936 MS (T)2151 936 MS (,)2212 936 MS ( )2237 936 MS (S)2262 936 MS (G)2318 936 MS (I)2391 936 MS ( )2423 936 MS (A)2448 936 MS (S)2520 936 MS (S)2576 936 MS (U)2632 936 MS (M)2704 936 MS (E)2793 936 MS (S)2854 936 MS ( )2910 936 MS (N)2935 936 MS (O)3007 936 MS ( )3079 936 MS (C)3104 936 MS (O)3171 936 MS (S)3243 936 MS (T)3299 936 MS ( )3360 936 MS (O)3385 936 MS (R)3457 936 MS ( )3524 936 MS (L)3549 936 MS (I)3610 936 MS (A)3642 936 MS (B)3715 936 MS (I)3783 936 MS (L)3816 936 MS (I)3877 936 MS (T)3909 936 MS (Y)3970 936 MS ( )4042 936 MS (F)4068 936 MS (O)4123 936 MS (R)4195 936 MS (S)490 1051 MS (E)546 1051 MS (R)607 1051 MS (V)674 1051 MS (I)747 1051 MS (C)778 1051 MS (I)846 1051 MS (N)878 1051 MS (G)950 1051 MS (,)1022 1051 MS ( )1047 1051 MS (R)1072 1051 MS (E)1139 1051 MS (P)1200 1051 MS (A)1256 1051 MS (I)1329 1051 MS (R)1361 1051 MS ( )1428 1051 MS (O)1453 1051 MS (R)1525 1051 MS ( )1592 1051 MS (C)1617 1051 MS (O)1684 1051 MS (R)1756 1051 MS (R)1823 1051 MS (E)1890 1051 MS (C)1951 1051 MS (T)2018 1051 MS (I)2080 1051 MS (O)2112 1051 MS (N)2184 1051 MS (.)2256 1051 MS ( )2281 1051 MS (T)2306 1051 MS (H)2367 1051 MS (I)2441 1051 MS (S)2472 1051 MS ( )2528 1051 MS (D)2553 1051 MS (I)2627 1051 MS (S)2658 1051 MS (C)2714 1051 MS (L)2782 1051 MS (A)2842 1051 MS (I)2916 1051 MS (M)2948 1051 MS (E)3037 1051 MS (R)3098 1051 MS ( )3165 1051 MS (O)3190 1051 MS (F)3262 1051 MS ( )3317 1051 MS (W)3342 1051 MS (A)3437 1051 MS (R)3509 1051 MS (R)3576 1051 MS (A)3643 1051 MS (N)3715 1051 MS (T)3787 1051 MS (Y)3848 1051 MS ( )3920 1051 MS (I)3946 1051 MS (S)3978 1051 MS ( )4034 1051 MS (A)4059 1051 MS (N)4131 1051 MS (E)490 1166 MS (S)551 1166 MS (S)607 1166 MS (E)663 1166 MS (N)724 1166 MS (T)796 1166 MS (I)858 1166 MS (A)889 1166 MS (L)962 1166 MS ( )1022 1166 MS (P)1047 1166 MS (A)1103 1166 MS (R)1175 1166 MS (T)1242 1166 MS ( )1303 1166 MS (O)1328 1166 MS (F)1401 1166 MS ( )1456 1166 MS (T)1481 1166 MS (H)1542 1166 MS (I)1615 1166 MS (S)1647 1166 MS ( )1703 1166 MS (L)1729 1166 MS (I)1790 1166 MS (C)1822 1166 MS (E)1889 1166 MS (N)1950 1166 MS (S)2022 1166 MS (E)2078 1166 MS (.)2139 1166 MS ( )2164 1166 MS (N)2189 1166 MS (O)2262 1166 MS ( )2334 1166 MS (U)2359 1166 MS (S)2431 1166 MS (E)2487 1166 MS ( )2548 1166 MS (O)2573 1166 MS (F)2645 1166 MS ( )2700 1166 MS (A)2726 1166 MS (N)2798 1166 MS (Y)2870 1166 MS ( )2942 1166 MS (C)2967 1166 MS (O)3034 1166 MS (V)3106 1166 MS (E)3178 1166 MS (R)3239 1166 MS (E)3306 1166 MS (D)3367 1166 MS ( )3439 1166 MS (C)3464 1166 MS (O)3531 1166 MS (D)3603 1166 MS (E)3676 1166 MS ( )3737 1166 MS (I)3763 1166 MS (S)3794 1166 MS (A)490 1281 MS (U)562 1281 MS (T)634 1281 MS (H)695 1281 MS (O)767 1281 MS (R)839 1281 MS (I)907 1281 MS (Z)939 1281 MS (E)1000 1281 MS (D)1061 1281 MS ( )1133 1281 MS (H)1159 1281 MS (E)1231 1281 MS (R)1292 1281 MS (E)1359 1281 MS (U)1420 1281 MS (N)1492 1281 MS (D)1564 1281 MS (E)1636 1281 MS (R)1697 1281 MS ( )1764 1281 MS (E)1789 1281 MS (X)1850 1281 MS (C)1922 1281 MS (E)1989 1281 MS (P)2050 1281 MS (T)2106 1281 MS ( )2167 1281 MS (S)2192 1281 MS (U)2248 1281 MS (B)2320 1281 MS (J)2386 1281 MS (E)2426 1281 MS (C)2487 1281 MS (T)2554 1281 MS ( )2615 1281 MS (T)2640 1281 MS (O)2701 1281 MS ( )2773 1281 MS (T)2798 1281 MS (H)2859 1281 MS (I)2932 1281 MS (S)2964 1281 MS ( )3020 1281 MS (D)3045 1281 MS (I)3118 1281 MS (S)3150 1281 MS (C)3206 1281 MS (L)3274 1281 MS (A)3334 1281 MS (I)3407 1281 MS (M)3439 1281 MS (E)3528 1281 MS (R)3589 1281 MS (.)3656 1281 MS (1)490 1479 MS (0)540 1479 MS (.)590 1479 MS [100 0 0 -100 0 0]/Helvetica MF ( )615 1479 MS [100 0 0 -100 0 0]/Times-Bold MF (L)790 1479 MS (I)857 1479 MS (M)896 1479 MS (I)990 1479 MS (T)1029 1479 MS (A)1096 1479 MS (T)1168 1479 MS (I)1235 1479 MS (O)1274 1479 MS (N)1352 1479 MS ( )1424 1479 MS (O)1449 1479 MS (F)1527 1479 MS ( )1587 1479 MS (L)1612 1479 MS (I)1679 1479 MS (A)1718 1479 MS (B)1790 1479 MS (I)1857 1479 MS (L)1896 1479 MS (I)1963 1479 MS (T)2002 1479 MS (Y)2069 1479 MS (.)2141 1479 MS [100 0 0 -100 0 0]/Times-Roman MF ( )2166 1479 MS (U)2191 1479 MS (N)2263 1479 MS (D)2335 1479 MS (E)2407 1479 MS (R)2468 1479 MS ( )2535 1479 MS (N)2560 1479 MS (O)2632 1479 MS ( )2704 1479 MS (C)2729 1479 MS (I)2797 1479 MS (R)2828 1479 MS (C)2895 1479 MS (U)2962 1479 MS (M)3034 1479 MS (S)3123 1479 MS (T)3179 1479 MS (A)3240 1479 MS (N)3312 1479 MS (C)3384 1479 MS (E)3451 1479 MS (S)3512 1479 MS ( )3568 1479 MS (N)3593 1479 MS (O)3665 1479 MS (R)3737 1479 MS ( )3804 1479 MS (L)3829 1479 MS (E)3889 1479 MS (G)3951 1479 MS (A)4023 1479 MS (L)4096 1479 MS (T)490 1594 MS (H)551 1594 MS (E)623 1594 MS (O)684 1594 MS (R)756 1594 MS (Y)823 1594 MS (,)895 1594 MS ( )920 1594 MS (W)945 1594 MS (H)1040 1594 MS (E)1112 1594 MS (T)1173 1594 MS (H)1234 1594 MS (E)1306 1594 MS (R)1367 1594 MS ( )1434 1594 MS (T)1459 1594 MS (O)1520 1594 MS (R)1592 1594 MS (T)1659 1594 MS ( )1720 1594 MS (\()1745 1594 MS (I)1779 1594 MS (N)1811 1594 MS (C)1883 1594 MS (L)1951 1594 MS (U)2011 1594 MS (D)2083 1594 MS (I)2157 1594 MS (N)2189 1594 MS (G)2261 1594 MS (,)2333 1594 MS ( )2358 1594 MS (W)2383 1594 MS (I)2479 1594 MS (T)2511 1594 MS (H)2572 1594 MS (O)2645 1594 MS (U)2717 1594 MS (T)2789 1594 MS ( )2850 1594 MS (L)2876 1594 MS (I)2937 1594 MS (M)2969 1594 MS (I)3059 1594 MS (T)3091 1594 MS (A)3153 1594 MS (T)3225 1594 MS (I)3287 1594 MS (O)3319 1594 MS (N)3392 1594 MS (,)3464 1594 MS ( )3489 1594 MS (N)3514 1594 MS (E)3586 1594 MS (G)3647 1594 MS (L)3720 1594 MS (I)3781 1594 MS (G)3813 1594 MS (E)3886 1594 MS (N)3947 1594 MS (C)4019 1594 MS (E)4086 1594 MS ( )4147 1594 MS (O)4172 1594 MS (R)4244 1594 MS (S)490 1709 MS (T)546 1709 MS (R)607 1709 MS (I)675 1709 MS (C)706 1709 MS (T)773 1709 MS ( )834 1709 MS (L)860 1709 MS (I)921 1709 MS (A)953 1709 MS (B)1026 1709 MS (I)1093 1709 MS (L)1126 1709 MS (I)1187 1709 MS (T)1219 1709 MS (Y)1281 1709 MS (\))1353 1709 MS (,)1386 1709 MS ( )1411 1709 MS (C)1436 1709 MS (O)1503 1709 MS (N)1575 1709 MS (T)1647 1709 MS (R)1708 1709 MS (A)1775 1709 MS (C)1847 1709 MS (T)1914 1709 MS (,)1975 1709 MS ( )2000 1709 MS (O)2025 1709 MS (R)2097 1709 MS ( )2164 1709 MS (O)2189 1709 MS (T)2261 1709 MS (H)2323 1709 MS (E)2395 1709 MS (R)2456 1709 MS (W)2523 1709 MS (I)2619 1709 MS (S)2650 1709 MS (E)2706 1709 MS (,)2767 1709 MS ( )2792 1709 MS (S)2817 1709 MS (H)2873 1709 MS (A)2945 1709 MS (L)3018 1709 MS (L)3079 1709 MS ( )3139 1709 MS (S)3164 1709 MS (G)3220 1709 MS (I)3293 1709 MS ( )3325 1709 MS (O)3350 1709 MS (R)3422 1709 MS ( )3489 1709 MS (A)3514 1709 MS (N)3587 1709 MS (Y)3659 1709 MS ( )3731 1709 MS (S)3756 1709 MS (G)3812 1709 MS (I)3885 1709 MS (L)490 1824 MS (I)551 1824 MS (C)583 1824 MS (E)650 1824 MS (N)711 1824 MS (S)783 1824 MS (O)839 1824 MS (R)911 1824 MS ( )978 1824 MS (B)1004 1824 MS (E)1070 1824 MS ( )1131 1824 MS (L)1157 1824 MS (I)1218 1824 MS (A)1250 1824 MS (B)1323 1824 MS (L)1390 1824 MS (E)1450 1824 MS ( )1511 1824 MS (F)1537 1824 MS (O)1592 1824 MS (R)1664 1824 MS ( )1731 1824 MS (A)1756 1824 MS (N)1828 1824 MS (Y)1900 1824 MS ( )1972 1824 MS (D)1998 1824 MS (I)2071 1824 MS (R)2103 1824 MS (E)2170 1824 MS (C)2231 1824 MS (T)2298 1824 MS (,)2359 1824 MS ( )2384 1824 MS (I)2410 1824 MS (N)2442 1824 MS (D)2514 1824 MS (I)2588 1824 MS (R)2619 1824 MS (E)2686 1824 MS (C)2747 1824 MS (T)2814 1824 MS (,)2875 1824 MS ( )2900 1824 MS (S)2925 1824 MS (P)2981 1824 MS (E)3037 1824 MS (C)3098 1824 MS (I)3166 1824 MS (A)3198 1824 MS (L)3271 1824 MS (,)3331 1824 MS ( )3356 1824 MS (I)3382 1824 MS (N)3414 1824 MS (C)3486 1824 MS (I)3553 1824 MS (D)3586 1824 MS (E)3659 1824 MS (N)3720 1824 MS (T)3792 1824 MS (A)3853 1824 MS (L)3926 1824 MS (,)3986 1824 MS ( )4011 1824 MS (O)4037 1824 MS (R)4109 1824 MS (C)490 1939 MS (O)557 1939 MS (N)629 1939 MS (S)701 1939 MS (E)757 1939 MS (Q)818 1939 MS (U)890 1939 MS (E)962 1939 MS (N)1023 1939 MS (T)1095 1939 MS (I)1157 1939 MS (A)1189 1939 MS (L)1262 1939 MS ( )1322 1939 MS (D)1348 1939 MS (A)1420 1939 MS (M)1492 1939 MS (A)1581 1939 MS (G)1653 1939 MS (E)1725 1939 MS (S)1786 1939 MS ( )1842 1939 MS (O)1867 1939 MS (F)1940 1939 MS ( )1995 1939 MS (A)2020 1939 MS (N)2092 1939 MS (Y)2164 1939 MS ( )2236 1939 MS (C)2261 1939 MS (H)2328 1939 MS (A)2401 1939 MS (R)2473 1939 MS (A)2540 1939 MS (C)2612 1939 MS (T)2679 1939 MS (E)2740 1939 MS (R)2801 1939 MS ( )2868 1939 MS (I)2894 1939 MS (N)2926 1939 MS (C)2998 1939 MS (L)3066 1939 MS (U)3126 1939 MS (D)3198 1939 MS (I)3271 1939 MS (N)3303 1939 MS (G)3376 1939 MS (,)3448 1939 MS ( )3473 1939 MS (W)3498 1939 MS (I)3594 1939 MS (T)3625 1939 MS (H)3687 1939 MS (O)3759 1939 MS (U)3831 1939 MS (T)3903 1939 MS (L)490 2054 MS (I)551 2054 MS (M)583 2054 MS (I)674 2054 MS (T)706 2054 MS (A)767 2054 MS (T)839 2054 MS (I)901 2054 MS (O)933 2054 MS (N)1006 2054 MS (,)1078 2054 MS ( )1103 2054 MS (D)1128 2054 MS (A)1200 2054 MS (M)1272 2054 MS (A)1361 2054 MS (G)1434 2054 MS (E)1506 2054 MS (S)1567 2054 MS ( )1623 2054 MS (F)1648 2054 MS (O)1703 2054 MS (R)1775 2054 MS ( )1842 2054 MS (L)1868 2054 MS (O)1928 2054 MS (S)2000 2054 MS (S)2056 2054 MS ( )2112 2054 MS (O)2137 2054 MS (F)2209 2054 MS ( )2264 2054 MS (G)2289 2054 MS (O)2362 2054 MS (O)2434 2054 MS (D)2506 2054 MS (W)2578 2054 MS (I)2674 2054 MS (L)2707 2054 MS (L)2768 2054 MS (,)2828 2054 MS ( )2853 2054 MS (W)2878 2054 MS (O)2973 2054 MS (R)3045 2054 MS (K)3112 2054 MS ( )3184 2054 MS (S)3209 2054 MS (T)3265 2054 MS (O)3326 2054 MS (P)3398 2054 MS (P)3454 2054 MS (A)3510 2054 MS (G)3582 2054 MS (E)3654 2054 MS (,)3715 2054 MS ( )3740 2054 MS (L)3766 2054 MS (O)3826 2054 MS (S)3898 2054 MS (S)3954 2054 MS ( )4010 2054 MS (O)4035 2054 MS (F)4107 2054 MS (D)490 2169 MS (A)562 2169 MS (T)634 2169 MS (A)695 2169 MS (,)767 2169 MS ( )792 2169 MS (C)817 2169 MS (O)884 2169 MS (M)956 2169 MS (P)1045 2169 MS (U)1101 2169 MS (T)1173 2169 MS (E)1234 2169 MS (R)1295 2169 MS ( )1362 2169 MS (F)1387 2169 MS (A)1442 2169 MS (I)1515 2169 MS (L)1548 2169 MS (U)1608 2169 MS (R)1680 2169 MS (E)1748 2169 MS ( )1809 2169 MS (O)1834 2169 MS (R)1906 2169 MS ( )1973 2169 MS (M)1998 2169 MS (A)2087 2169 MS (L)2160 2169 MS (F)2220 2169 MS (U)2276 2169 MS (N)2348 2169 MS (C)2420 2169 MS (T)2487 2169 MS (I)2549 2169 MS (O)2581 2169 MS (N)2653 2169 MS (,)2725 2169 MS ( )2750 2169 MS (O)2776 2169 MS (R)2848 2169 MS ( )2915 2169 MS (A)2940 2169 MS (N)3012 2169 MS (Y)3084 2169 MS ( )3156 2169 MS (A)3181 2169 MS (N)3253 2169 MS (D)3326 2169 MS ( )3398 2169 MS (A)3423 2169 MS (L)3496 2169 MS (L)3556 2169 MS ( )3616 2169 MS (O)3642 2169 MS (T)3714 2169 MS (H)3776 2169 MS (E)3848 2169 MS (R)3909 2169 MS (C)490 2284 MS (O)557 2284 MS (M)629 2284 MS (M)718 2284 MS (E)807 2284 MS (R)868 2284 MS (C)935 2284 MS (I)1003 2284 MS (A)1034 2284 MS (L)1107 2284 MS ( )1167 2284 MS (D)1192 2284 MS (A)1264 2284 MS (M)1336 2284 MS (A)1425 2284 MS (G)1497 2284 MS (E)1570 2284 MS (S)1631 2284 MS ( )1687 2284 MS (O)1712 2284 MS (R)1784 2284 MS ( )1851 2284 MS (L)1877 2284 MS (O)1937 2284 MS (S)2009 2284 MS (S)2065 2284 MS (E)2121 2284 MS (S)2182 2284 MS (,)2238 2284 MS ( )2263 2284 MS (E)2288 2284 MS (V)2349 2284 MS (E)2421 2284 MS (N)2482 2284 MS ( )2554 2284 MS (I)2580 2284 MS (F)2612 2284 MS ( )2667 2284 MS (S)2692 2284 MS (U)2748 2284 MS (C)2820 2284 MS (H)2887 2284 MS ( )2959 2284 MS (P)2984 2284 MS (A)3040 2284 MS (R)3112 2284 MS (T)3179 2284 MS (Y)3240 2284 MS ( )3312 2284 MS (S)3337 2284 MS (H)3393 2284 MS (A)3465 2284 MS (L)3537 2284 MS (L)3598 2284 MS ( )3658 2284 MS (H)3684 2284 MS (A)3756 2284 MS (V)3829 2284 MS (E)3901 2284 MS ( )3962 2284 MS (B)3987 2284 MS (E)4054 2284 MS (E)4115 2284 MS (N)4176 2284 MS (I)490 2399 MS (N)522 2399 MS (F)595 2399 MS (O)650 2399 MS (R)722 2399 MS (M)789 2399 MS (E)878 2399 MS (D)939 2399 MS ( )1011 2399 MS (O)1037 2399 MS (F)1109 2399 MS ( )1164 2399 MS (T)1189 2399 MS (H)1250 2399 MS (E)1323 2399 MS ( )1384 2399 MS (P)1409 2399 MS (O)1465 2399 MS (S)1537 2399 MS (S)1593 2399 MS (I)1650 2399 MS (B)1682 2399 MS (I)1749 2399 MS (L)1782 2399 MS (I)1843 2399 MS (T)1875 2399 MS (Y)1937 2399 MS ( )2009 2399 MS (O)2034 2399 MS (F)2106 2399 MS ( )2161 2399 MS (S)2186 2399 MS (U)2242 2399 MS (C)2314 2399 MS (H)2381 2399 MS ( )2453 2399 MS (D)2478 2399 MS (A)2551 2399 MS (M)2623 2399 MS (A)2712 2399 MS (G)2784 2399 MS (E)2856 2399 MS (S)2917 2399 MS (.)2973 2399 MS ( )2998 2399 MS (T)3023 2399 MS (H)3084 2399 MS (I)3157 2399 MS (S)3189 2399 MS ( )3245 2399 MS (L)3271 2399 MS (I)3332 2399 MS (M)3364 2399 MS (I)3455 2399 MS (T)3487 2399 MS (A)3548 2399 MS (T)3620 2399 MS (I)3682 2399 MS (O)3714 2399 MS (N)3787 2399 MS ( )3859 2399 MS (O)3884 2399 MS (F)3957 2399 MS (L)490 2514 MS (I)551 2514 MS (A)583 2514 MS (B)656 2514 MS (I)724 2514 MS (L)757 2514 MS (I)818 2514 MS (T)850 2514 MS (Y)911 2514 MS ( )983 2514 MS (S)1008 2514 MS (H)1064 2514 MS (A)1136 2514 MS (L)1209 2514 MS (L)1270 2514 MS ( )1330 2514 MS (N)1356 2514 MS (O)1428 2514 MS (T)1500 2514 MS ( )1561 2514 MS (A)1586 2514 MS (P)1658 2514 MS (P)1714 2514 MS (L)1771 2514 MS (Y)1831 2514 MS ( )1903 2514 MS (T)1928 2514 MS (O)1989 2514 MS ( )2061 2514 MS (L)2087 2514 MS (I)2148 2514 MS (A)2180 2514 MS (B)2253 2514 MS (I)2321 2514 MS (L)2354 2514 MS (I)2415 2514 MS (T)2447 2514 MS (Y)2508 2514 MS ( )2581 2514 MS (F)2606 2514 MS (O)2661 2514 MS (R)2733 2514 MS ( )2800 2514 MS (D)2825 2514 MS (E)2897 2514 MS (A)2959 2514 MS (T)3031 2514 MS (H)3092 2514 MS ( )3164 2514 MS (O)3189 2514 MS (R)3261 2514 MS ( )3328 2514 MS (P)3353 2514 MS (E)3409 2514 MS (R)3470 2514 MS (S)3537 2514 MS (O)3593 2514 MS (N)3665 2514 MS (A)3737 2514 MS (L)3810 2514 MS ( )3870 2514 MS (I)3896 2514 MS (N)3928 2514 MS (J)4000 2514 MS (U)4040 2514 MS (R)4112 2514 MS (Y)4179 2514 MS (R)490 2629 MS (E)557 2629 MS (S)618 2629 MS (U)674 2629 MS (L)747 2629 MS (T)806 2629 MS (I)868 2629 MS (N)900 2629 MS (G)973 2629 MS ( )1045 2629 MS (F)1070 2629 MS (R)1125 2629 MS (O)1192 2629 MS (M)1264 2629 MS ( )1353 2629 MS (S)1378 2629 MS (G)1434 2629 MS (I)1506 2629 MS (')1539 2629 MS (s)1557 2629 MS ( )1596 2629 MS (N)1621 2629 MS (E)1693 2629 MS (G)1755 2629 MS (L)1828 2629 MS (I)1889 2629 MS (G)1921 2629 MS (E)1993 2629 MS (N)2055 2629 MS (C)2127 2629 MS (E)2194 2629 MS ( )2255 2629 MS (T)2280 2629 MS (O)2341 2629 MS ( )2413 2629 MS (T)2438 2629 MS (H)2499 2629 MS (E)2571 2629 MS ( )2632 2629 MS (E)2657 2629 MS (X)2718 2629 MS (T)2790 2629 MS (E)2852 2629 MS (N)2913 2629 MS (T)2985 2629 MS ( )3046 2629 MS (A)3071 2629 MS (P)3143 2629 MS (P)3199 2629 MS (L)3256 2629 MS (I)3317 2629 MS (C)3348 2629 MS (A)3416 2629 MS (B)3488 2629 MS (L)3554 2629 MS (E)3615 2629 MS ( )3677 2629 MS (L)3703 2629 MS (A)3763 2629 MS (W)3835 2629 MS (P)490 2744 MS (R)546 2744 MS (O)613 2744 MS (H)685 2744 MS (I)758 2744 MS (B)790 2744 MS (I)857 2744 MS (T)889 2744 MS (S)950 2744 MS ( )1006 2744 MS (S)1031 2744 MS (U)1087 2744 MS (C)1159 2744 MS (H)1226 2744 MS ( )1298 2744 MS (L)1324 2744 MS (I)1385 2744 MS (M)1417 2744 MS (I)1506 2744 MS (T)1538 2744 MS (A)1600 2744 MS (T)1673 2744 MS (I)1735 2744 MS (O)1767 2744 MS (N)1839 2744 MS (.)1911 2744 MS ( )1936 2744 MS (S)1961 2744 MS (O)2017 2744 MS (M)2089 2744 MS (E)2178 2744 MS ( )2239 2744 MS (J)2264 2744 MS (U)2304 2744 MS (R)2376 2744 MS (I)2444 2744 MS (S)2475 2744 MS (D)2531 2744 MS (I)2604 2744 MS (C)2636 2744 MS (T)2703 2744 MS (I)2766 2744 MS (O)2798 2744 MS (N)2870 2744 MS (S)2942 2744 MS ( )2998 2744 MS (D)3023 2744 MS (O)3095 2744 MS ( )3167 2744 MS (N)3192 2744 MS (O)3265 2744 MS (T)3337 2744 MS ( )3398 2744 MS (A)3423 2744 MS (L)3496 2744 MS (L)3556 2744 MS (O)3616 2744 MS (W)3689 2744 MS ( )3784 2744 MS (T)3809 2744 MS (H)3870 2744 MS (E)3942 2744 MS (E)490 2859 MS (X)551 2859 MS (C)623 2859 MS (L)691 2859 MS (U)750 2859 MS (S)822 2859 MS (I)879 2859 MS (O)911 2859 MS (N)984 2859 MS ( )1056 2859 MS (O)1081 2859 MS (R)1153 2859 MS ( )1220 2859 MS (L)1246 2859 MS (I)1307 2859 MS (M)1339 2859 MS (I)1429 2859 MS (T)1461 2859 MS (A)1523 2859 MS (T)1595 2859 MS (I)1657 2859 MS (O)1689 2859 MS (N)1761 2859 MS ( )1833 2859 MS (O)1859 2859 MS (F)1931 2859 MS ( )1986 2859 MS (I)2013 2859 MS (N)2045 2859 MS (C)2117 2859 MS (I)2185 2859 MS (D)2217 2859 MS (E)2289 2859 MS (N)2350 2859 MS (T)2422 2859 MS (A)2483 2859 MS (L)2557 2859 MS ( )2617 2859 MS (O)2642 2859 MS (R)2714 2859 MS ( )2781 2859 MS (C)2806 2859 MS (O)2873 2859 MS (N)2945 2859 MS (S)3017 2859 MS (E)3073 2859 MS (Q)3134 2859 MS (U)3206 2859 MS (E)3278 2859 MS (N)3339 2859 MS (T)3411 2859 MS (I)3474 2859 MS (A)3506 2859 MS (L)3579 2859 MS ( )3639 2859 MS (D)3664 2859 MS (A)3736 2859 MS (M)3808 2859 MS (A)3898 2859 MS (G)3970 2859 MS (E)4042 2859 MS (S)4103 2859 MS (,)4159 2859 MS ( )4184 2859 MS (S)4209 2859 MS (O)4265 2859 MS (T)490 2974 MS (H)551 2974 MS (A)623 2974 MS (T)695 2974 MS ( )756 2974 MS (E)781 2974 MS (X)842 2974 MS (C)914 2974 MS (L)982 2974 MS (U)1042 2974 MS (S)1114 2974 MS (I)1171 2974 MS (O)1203 2974 MS (N)1275 2974 MS ( )1347 2974 MS (A)1373 2974 MS (N)1445 2974 MS (D)1517 2974 MS ( )1589 2974 MS (L)1615 2974 MS (I)1676 2974 MS (M)1708 2974 MS (I)1799 2974 MS (T)1831 2974 MS (A)1892 2974 MS (T)1964 2974 MS (I)2026 2974 MS (O)2058 2974 MS (N)2131 2974 MS ( )2203 2974 MS (M)2228 2974 MS (A)2317 2974 MS (Y)2389 2974 MS ( )2461 2974 MS (N)2486 2974 MS (O)2559 2974 MS (T)2631 2974 MS ( )2692 2974 MS (A)2717 2974 MS (P)2789 2974 MS (P)2845 2974 MS (L)2902 2974 MS (Y)2961 2974 MS ( )3033 2974 MS (T)3059 2974 MS (O)3120 2974 MS ( )3192 2974 MS (R)3217 2974 MS (E)3284 2974 MS (C)3345 2974 MS (I)3413 2974 MS (P)3444 2974 MS (I)3501 2974 MS (E)3533 2974 MS (N)3595 2974 MS (T)3667 2974 MS (.)3728 2974 MS (1)490 3172 MS (1)540 3172 MS (.)590 3172 MS [100 0 0 -100 0 0]/Helvetica MF ( )615 3172 MS [100 0 0 -100 0 0]/Times-Bold MF (I)790 3172 MS (n)829 3172 MS (d)885 3172 MS (e)941 3172 MS (m)985 3172 MS (n)1067 3172 MS (i)1123 3172 MS (t)1151 3172 MS (y)1184 3172 MS (.)1234 3172 MS ( )1259 3172 MS [100 0 0 -100 0 0]/Times-Roman MF (R)1284 3172 MS (e)1351 3172 MS (c)1395 3172 MS (i)1439 3172 MS (p)1467 3172 MS (i)1517 3172 MS (e)1545 3172 MS (n)1589 3172 MS (t)1639 3172 MS ( )1667 3172 MS (s)1692 3172 MS (h)1731 3172 MS (a)1781 3172 MS (l)1825 3172 MS (l)1853 3172 MS ( )1881 3172 MS (b)1906 3172 MS (e)1956 3172 MS ( )2000 3172 MS (s)2025 3172 MS (o)2064 3172 MS (l)2114 3172 MS (e)2142 3172 MS (l)2186 3172 MS (y)2216 3172 MS ( )2264 3172 MS (r)2289 3172 MS (e)2323 3172 MS (s)2367 3172 MS (p)2406 3172 MS (o)2456 3172 MS (n)2506 3172 MS (s)2556 3172 MS (i)2595 3172 MS (b)2623 3172 MS (l)2673 3172 MS (e)2701 3172 MS ( )2745 3172 MS (f)2770 3172 MS (o)2803 3172 MS (r)2853 3172 MS ( )2886 3172 MS (d)2911 3172 MS (a)2961 3172 MS (m)3005 3172 MS (a)3084 3172 MS (g)3129 3172 MS (e)3178 3172 MS (s)3222 3172 MS ( )3261 3172 MS (a)3286 3172 MS (r)3331 3172 MS (i)3364 3172 MS (s)3392 3172 MS (i)3431 3172 MS (n)3459 3172 MS (g)3509 3172 MS (,)3558 3172 MS ( )3583 3172 MS (d)3608 3172 MS (i)3658 3172 MS (r)3686 3172 MS (e)3720 3172 MS (c)3764 3172 MS (t)3808 3172 MS (l)3836 3172 MS (y)3866 3172 MS ( )3914 3172 MS (o)3939 3172 MS (r)3989 3172 MS (i)490 3287 MS (n)518 3287 MS (d)568 3287 MS (i)618 3287 MS (r)646 3287 MS (e)679 3287 MS (c)723 3287 MS (t)767 3287 MS (l)795 3287 MS (y)824 3287 MS (,)872 3287 MS ( )897 3287 MS (o)922 3287 MS (u)972 3287 MS (t)1022 3287 MS ( )1050 3287 MS (o)1075 3287 MS (f)1125 3287 MS ( )1158 3287 MS (i)1183 3287 MS (t)1211 3287 MS (s)1239 3287 MS ( )1278 3287 MS (u)1303 3287 MS (t)1353 3287 MS (i)1381 3287 MS (l)1409 3287 MS (i)1437 3287 MS (z)1465 3287 MS (a)1510 3287 MS (t)1554 3287 MS (i)1582 3287 MS (o)1610 3287 MS (n)1660 3287 MS ( )1710 3287 MS (o)1735 3287 MS (f)1785 3287 MS ( )1818 3287 MS (r)1843 3287 MS (i)1876 3287 MS (g)1904 3287 MS (h)1953 3287 MS (t)2003 3287 MS (s)2031 3287 MS ( )2070 3287 MS (u)2095 3287 MS (n)2145 3287 MS (d)2195 3287 MS (e)2245 3287 MS (r)2289 3287 MS ( )2322 3287 MS (t)2347 3287 MS (h)2375 3287 MS (i)2425 3287 MS (s)2453 3287 MS ( )2492 3287 MS (L)2517 3287 MS (i)2577 3287 MS (c)2606 3287 MS (e)2650 3287 MS (n)2694 3287 MS (s)2744 3287 MS (e)2784 3287 MS (.)2828 3287 MS ( )2853 3287 MS (R)2878 3287 MS (e)2945 3287 MS (c)2989 3287 MS (i)3033 3287 MS (p)3061 3287 MS (i)3111 3287 MS (e)3139 3287 MS (n)3183 3287 MS (t)3233 3287 MS ( )3261 3287 MS (w)3286 3287 MS (i)3358 3287 MS (l)3386 3287 MS (l)3414 3287 MS ( )3442 3287 MS (d)3467 3287 MS (e)3517 3287 MS (f)3561 3287 MS (e)3595 3287 MS (n)3639 3287 MS (d)3689 3287 MS (,)3739 3287 MS ( )3764 3287 MS (i)3789 3287 MS (n)3817 3287 MS (d)3867 3287 MS (e)3917 3287 MS (m)3961 3287 MS (n)4039 3287 MS (i)4089 3287 MS (f)4117 3287 MS (y)4152 3287 MS ( )4200 3287 MS (a)4225 3287 MS (n)4269 3287 MS (d)4319 3287 MS (h)490 3402 MS (o)540 3402 MS (l)590 3402 MS (d)618 3402 MS ( )668 3402 MS (h)693 3402 MS (a)743 3402 MS (r)787 3402 MS (m)820 3402 MS (l)898 3402 MS (e)926 3402 MS (s)970 3402 MS (s)1009 3402 MS ( )1048 3402 MS (S)1073 3402 MS (i)1129 3402 MS (l)1157 3402 MS (i)1185 3402 MS (c)1213 3402 MS (o)1257 3402 MS (n)1307 3402 MS ( )1357 3402 MS (G)1382 3402 MS (r)1454 3402 MS (a)1487 3402 MS (p)1531 3402 MS (h)1581 3402 MS (i)1631 3402 MS (c)1659 3402 MS (s)1703 3402 MS (,)1742 3402 MS ( )1767 3402 MS (I)1793 3402 MS (n)1825 3402 MS (c)1875 3402 MS (.)1919 3402 MS ( )1944 3402 MS (f)1970 3402 MS (r)2003 3402 MS (o)2036 3402 MS (m)2086 3402 MS ( )2164 3402 MS (a)2189 3402 MS (n)2233 3402 MS (d)2283 3402 MS ( )2333 3402 MS (a)2359 3402 MS (g)2404 3402 MS (a)2453 3402 MS (i)2497 3402 MS (n)2525 3402 MS (s)2575 3402 MS (t)2614 3402 MS ( )2642 3402 MS (a)2667 3402 MS (n)2711 3402 MS (y)2763 3402 MS ( )2811 3402 MS (l)2836 3402 MS (o)2864 3402 MS (s)2914 3402 MS (s)2953 3402 MS (,)2992 3402 MS ( )3017 3402 MS (l)3042 3402 MS (i)3070 3402 MS (a)3098 3402 MS (b)3142 3402 MS (i)3192 3402 MS (l)3220 3402 MS (i)3248 3402 MS (t)3276 3402 MS (y)3305 3402 MS (,)3353 3402 MS ( )3378 3402 MS (d)3403 3402 MS (a)3453 3402 MS (m)3497 3402 MS (a)3575 3402 MS (g)3620 3402 MS (e)3670 3402 MS (s)3714 3402 MS (,)3753 3402 MS ( )3778 3402 MS (c)3803 3402 MS (o)3847 3402 MS (s)3897 3402 MS (t)3936 3402 MS (s)3964 3402 MS ( )4003 3402 MS (o)4028 3402 MS (r)4078 3402 MS (e)490 3517 MS (x)534 3517 MS (p)585 3517 MS (e)635 3517 MS (n)679 3517 MS (s)729 3517 MS (e)768 3517 MS (s)812 3517 MS ( )851 3517 MS (\()876 3517 MS (i)909 3517 MS (n)937 3517 MS (c)987 3517 MS (l)1031 3517 MS (u)1059 3517 MS (d)1109 3517 MS (i)1159 3517 MS (n)1187 3517 MS (g)1237 3517 MS ( )1286 3517 MS (t)1311 3517 MS (h)1339 3517 MS (e)1389 3517 MS ( )1433 3517 MS (p)1458 3517 MS (a)1508 3517 MS (y)1554 3517 MS (m)1602 3517 MS (e)1681 3517 MS (n)1725 3517 MS (t)1775 3517 MS ( )1803 3517 MS (o)1828 3517 MS (f)1878 3517 MS ( )1911 3517 MS (r)1936 3517 MS (e)1970 3517 MS (a)2014 3517 MS (s)2058 3517 MS (o)2097 3517 MS (n)2147 3517 MS (a)2197 3517 MS (b)2241 3517 MS (l)2291 3517 MS (e)2320 3517 MS ( )2364 3517 MS (a)2389 3517 MS (t)2433 3517 MS (t)2461 3517 MS (o)2489 3517 MS (r)2539 3517 MS (n)2572 3517 MS (e)2622 3517 MS (y)2668 3517 MS (s)2716 3517 MS ( )2755 3517 MS (f)2780 3517 MS (e)2814 3517 MS (e)2858 3517 MS (s)2902 3517 MS (\))2941 3517 MS ( )2974 3517 MS (a)3000 3517 MS (r)3044 3517 MS (i)3077 3517 MS (s)3105 3517 MS (i)3144 3517 MS (n)3172 3517 MS (g)3223 3517 MS ( )3272 3517 MS (o)3297 3517 MS (u)3347 3517 MS (t)3397 3517 MS ( )3425 3517 MS (o)3450 3517 MS (f)3500 3517 MS ( )3533 3517 MS (R)3558 3517 MS (e)3625 3517 MS (c)3669 3517 MS (i)3713 3517 MS (p)3741 3517 MS (i)3791 3517 MS (e)3819 3517 MS (n)3863 3517 MS (t)3913 3517 MS (')3942 3517 MS (s)3959 3517 MS ( )3998 3517 MS (u)4023 3517 MS (s)4073 3517 MS (e)4112 3517 MS (,)4156 3517 MS (m)490 3632 MS (o)568 3632 MS (d)618 3632 MS (i)668 3632 MS (f)696 3632 MS (i)729 3632 MS (c)757 3632 MS (a)801 3632 MS (t)845 3632 MS (i)873 3632 MS (o)901 3632 MS (n)951 3632 MS (,)1001 3632 MS ( )1026 3632 MS (r)1051 3632 MS (e)1084 3632 MS (p)1128 3632 MS (r)1178 3632 MS (o)1211 3632 MS (d)1261 3632 MS (u)1311 3632 MS (c)1361 3632 MS (t)1405 3632 MS (i)1433 3632 MS (o)1461 3632 MS (n)1511 3632 MS ( )1561 3632 MS (a)1586 3632 MS (n)1630 3632 MS (d)1680 3632 MS ( )1730 3632 MS (d)1755 3632 MS (i)1805 3632 MS (s)1833 3632 MS (t)1872 3632 MS (r)1900 3632 MS (i)1933 3632 MS (b)1961 3632 MS (u)2011 3632 MS (t)2061 3632 MS (i)2089 3632 MS (o)2117 3632 MS (n)2167 3632 MS ( )2217 3632 MS (o)2242 3632 MS (f)2292 3632 MS ( )2325 3632 MS (t)2350 3632 MS (h)2378 3632 MS (e)2428 3632 MS ( )2472 3632 MS (C)2497 3632 MS (o)2564 3632 MS (v)2614 3632 MS (e)2664 3632 MS (r)2708 3632 MS (e)2742 3632 MS (d)2786 3632 MS ( )2836 3632 MS (C)2861 3632 MS (o)2928 3632 MS (d)2978 3632 MS (e)3028 3632 MS ( )3072 3632 MS (o)3097 3632 MS (r)3147 3632 MS ( )3180 3632 MS (o)3205 3632 MS (u)3255 3632 MS (t)3305 3632 MS ( )3333 3632 MS (o)3358 3632 MS (f)3408 3632 MS ( )3441 3632 MS (a)3467 3632 MS (n)3511 3632 MS (y)3561 3632 MS ( )3610 3632 MS (r)3636 3632 MS (e)3669 3632 MS (p)3713 3632 MS (r)3764 3632 MS (e)3797 3632 MS (s)3841 3632 MS (e)3880 3632 MS (n)3924 3632 MS (t)3974 3632 MS (a)4003 3632 MS (t)4047 3632 MS (i)4075 3632 MS (o)4103 3632 MS (n)4153 3632 MS ( )4203 3632 MS (o)4228 3632 MS (r)4278 3632 MS (w)490 3747 MS (a)562 3747 MS (r)606 3747 MS (r)639 3747 MS (a)673 3747 MS (n)717 3747 MS (t)767 3747 MS (y)796 3747 MS ( )844 3747 MS (m)869 3747 MS (a)948 3747 MS (d)992 3747 MS (e)1042 3747 MS ( )1086 3747 MS (b)1111 3747 MS (y)1163 3747 MS ( )1211 3747 MS (R)1236 3747 MS (e)1303 3747 MS (c)1347 3747 MS (i)1391 3747 MS (p)1419 3747 MS (i)1469 3747 MS (e)1497 3747 MS (n)1541 3747 MS (t)1591 3747 MS (.)1619 3747 MS (1)490 3946 MS (2)540 3946 MS (.)590 3946 MS [100 0 0 -100 0 0]/Helvetica MF ( )615 3946 MS [100 0 0 -100 0 0]/Times-Bold MF (U)790 3946 MS (.)862 3946 MS (S)887 3946 MS (.)943 3946 MS ( )968 3946 MS (G)993 3946 MS (o)1070 3946 MS (v)1120 3946 MS (e)1170 3946 MS (r)1214 3946 MS (n)1258 3946 MS (m)1315 3946 MS (e)1398 3946 MS (n)1442 3946 MS (t)1498 3946 MS ( )1531 3946 MS (E)1556 3946 MS (n)1623 3946 MS (d)1679 3946 MS ( )1735 3946 MS (U)1760 3946 MS (s)1832 3946 MS (e)1871 3946 MS (r)1915 3946 MS (s)1959 3946 MS (.)1998 3946 MS ( )2023 3946 MS [100 0 0 -100 0 0]/Times-Roman MF (T)2048 3946 MS (h)2109 3946 MS (e)2159 3946 MS ( )2203 3946 MS (C)2228 3946 MS (o)2295 3946 MS (v)2345 3946 MS (e)2395 3946 MS (r)2439 3946 MS (e)2473 3946 MS (d)2517 3946 MS ( )2567 3946 MS (C)2592 3946 MS (o)2659 3946 MS (d)2709 3946 MS (e)2759 3946 MS ( )2803 3946 MS (i)2828 3946 MS (s)2856 3946 MS ( )2895 3946 MS (a)2920 3946 MS ( )2964 3946 MS (")2990 3946 MS (c)3030 3946 MS (o)3074 3946 MS (m)3124 3946 MS (m)3202 3946 MS (e)3280 3946 MS (r)3324 3946 MS (c)3358 3946 MS (i)3402 3946 MS (a)3430 3946 MS (l)3474 3946 MS ( )3502 3946 MS (i)3527 3946 MS (t)3555 3946 MS (e)3583 3946 MS (m)3627 3946 MS (")3705 3946 MS ( )3745 3946 MS (c)3771 3946 MS (o)3815 3946 MS (n)3865 3946 MS (s)3915 3946 MS (i)3954 3946 MS (s)3982 3946 MS (t)4021 3946 MS (i)4049 3946 MS (n)4077 3946 MS (g)4127 3946 MS ( )4176 3946 MS (o)4201 3946 MS (f)4251 3946 MS (")490 4061 MS (c)530 4061 MS (o)574 4061 MS (m)624 4061 MS (m)702 4061 MS (e)780 4061 MS (r)824 4061 MS (c)858 4061 MS (i)902 4061 MS (a)930 4061 MS (l)974 4061 MS ( )1002 4061 MS (c)1027 4061 MS (o)1071 4061 MS (m)1121 4061 MS (p)1199 4061 MS (u)1249 4061 MS (t)1299 4061 MS (e)1327 4061 MS (r)1372 4061 MS ( )1405 4061 MS (s)1430 4061 MS (o)1469 4061 MS (f)1519 4061 MS (t)1552 4061 MS (w)1580 4061 MS (a)1652 4061 MS (r)1696 4061 MS (e)1730 4061 MS (")1775 4061 MS ( )1815 4061 MS (a)1840 4061 MS (s)1884 4061 MS ( )1923 4061 MS (s)1948 4061 MS (u)1987 4061 MS (c)2037 4061 MS (h)2081 4061 MS ( )2131 4061 MS (t)2156 4061 MS (e)2184 4061 MS (r)2229 4061 MS (m)2262 4061 MS (s)2340 4061 MS ( )2379 4061 MS (a)2404 4061 MS (r)2448 4061 MS (e)2482 4061 MS ( )2526 4061 MS (d)2551 4061 MS (e)2601 4061 MS (f)2645 4061 MS (i)2678 4061 MS (n)2706 4061 MS (e)2756 4061 MS (d)2800 4061 MS ( )2850 4061 MS (i)2875 4061 MS (n)2903 4061 MS ( )2953 4061 MS (t)2978 4061 MS (i)3006 4061 MS (t)3034 4061 MS (l)3062 4061 MS (e)3090 4061 MS ( )3134 4061 MS (4)3159 4061 MS (8)3209 4061 MS ( )3259 4061 MS (o)3284 4061 MS (f)3334 4061 MS ( )3367 4061 MS (t)3392 4061 MS (h)3420 4061 MS (e)3470 4061 MS ( )3514 4061 MS (C)3539 4061 MS (o)3606 4061 MS (d)3656 4061 MS (e)3706 4061 MS ( )3750 4061 MS (o)3775 4061 MS (f)3826 4061 MS ( )3859 4061 MS (F)3884 4061 MS (e)3940 4061 MS (d)3984 4061 MS (e)4034 4061 MS (r)4078 4061 MS (a)4112 4061 MS (l)4156 4061 MS (R)490 4176 MS (e)557 4176 MS (g)601 4176 MS (u)650 4176 MS (l)700 4176 MS (a)728 4176 MS (t)772 4176 MS (i)800 4176 MS (o)828 4176 MS (n)878 4176 MS (s)928 4176 MS ( )967 4176 MS (a)992 4176 MS (n)1036 4176 MS (d)1086 4176 MS ( )1136 4176 MS (a)1162 4176 MS (l)1206 4176 MS (l)1234 4176 MS ( )1262 4176 MS (U)1287 4176 MS (.)1359 4176 MS (S)1384 4176 MS (.)1440 4176 MS ( )1465 4176 MS (G)1490 4176 MS (o)1562 4176 MS (v)1612 4176 MS (e)1662 4176 MS (r)1706 4176 MS (n)1739 4176 MS (m)1789 4176 MS (e)1867 4176 MS (n)1911 4176 MS (t)1961 4176 MS ( )1989 4176 MS (E)2014 4176 MS (n)2075 4176 MS (d)2125 4176 MS ( )2175 4176 MS (U)2200 4176 MS (s)2272 4176 MS (e)2312 4176 MS (r)2356 4176 MS (s)2389 4176 MS ( )2428 4176 MS (a)2453 4176 MS (c)2497 4176 MS (q)2542 4176 MS (u)2592 4176 MS (i)2642 4176 MS (r)2670 4176 MS (e)2703 4176 MS ( )2747 4176 MS (o)2772 4176 MS (n)2822 4176 MS (l)2872 4176 MS (y)2902 4176 MS ( )2950 4176 MS (t)2975 4176 MS (h)3003 4176 MS (e)3053 4176 MS ( )3097 4176 MS (r)3122 4176 MS (i)3155 4176 MS (g)3184 4176 MS (h)3233 4176 MS (t)3283 4176 MS (s)3311 4176 MS ( )3350 4176 MS (s)3375 4176 MS (e)3414 4176 MS (t)3458 4176 MS ( )3486 4176 MS (f)3511 4176 MS (o)3544 4176 MS (r)3594 4176 MS (t)3627 4176 MS (h)3655 4176 MS ( )3705 4176 MS (i)3730 4176 MS (n)3758 4176 MS ( )3808 4176 MS (t)3833 4176 MS (h)3861 4176 MS (i)3911 4176 MS (s)3939 4176 MS ( )3978 4176 MS (L)4004 4176 MS (i)4063 4176 MS (c)4092 4176 MS (e)4136 4176 MS (n)4180 4176 MS (s)4230 4176 MS (e)4270 4176 MS (a)490 4290 MS (n)534 4290 MS (d)584 4290 MS ( )634 4290 MS (a)659 4290 MS (r)703 4290 MS (e)736 4290 MS ( )780 4290 MS (s)805 4290 MS (u)844 4290 MS (b)894 4290 MS (j)944 4290 MS (e)973 4290 MS (c)1017 4290 MS (t)1061 4290 MS ( )1089 4290 MS (t)1114 4290 MS (o)1142 4290 MS ( )1192 4290 MS (t)1217 4290 MS (h)1245 4290 MS (e)1295 4290 MS ( )1339 4290 MS (t)1364 4290 MS (e)1392 4290 MS (r)1436 4290 MS (m)1469 4290 MS (s)1547 4290 MS ( )1586 4290 MS (o)1611 4290 MS (f)1661 4290 MS ( )1694 4290 MS (t)1719 4290 MS (h)1747 4290 MS (i)1797 4290 MS (s)1825 4290 MS ( )1864 4290 MS (L)1890 4290 MS (i)1950 4290 MS (c)1978 4290 MS (e)2022 4290 MS (n)2066 4290 MS (s)2116 4290 MS (e)2156 4290 MS (.)2200 4290 MS (1)490 4489 MS (3)540 4489 MS (.)590 4489 MS [100 0 0 -100 0 0]/Helvetica MF ( )615 4489 MS [100 0 0 -100 0 0]/Times-Bold MF (M)790 4489 MS (i)884 4489 MS (s)912 4489 MS (c)951 4489 MS (e)995 4489 MS (l)1039 4489 MS (l)1067 4489 MS (a)1095 4489 MS (n)1145 4489 MS (e)1201 4489 MS (o)1245 4489 MS (u)1295 4489 MS (s)1351 4489 MS (.)1390 4489 MS ( )1415 4489 MS [100 0 0 -100 0 0]/Times-Roman MF (T)1440 4489 MS (h)1501 4489 MS (i)1551 4489 MS (s)1579 4489 MS ( )1618 4489 MS (L)1644 4489 MS (i)1703 4489 MS (c)1731 4489 MS (e)1775 4489 MS (n)1819 4489 MS (s)1869 4489 MS (e)1909 4489 MS ( )1953 4489 MS (r)1978 4489 MS (e)2011 4489 MS (p)2055 4489 MS (r)2106 4489 MS (e)2139 4489 MS (s)2183 4489 MS (e)2222 4489 MS (n)2266 4489 MS (t)2316 4489 MS (s)2344 4489 MS ( )2383 4489 MS (t)2408 4489 MS (h)2436 4489 MS (e)2486 4489 MS ( )2530 4489 MS (c)2556 4489 MS (o)2600 4489 MS (m)2650 4489 MS (p)2728 4489 MS (l)2778 4489 MS (e)2806 4489 MS (t)2850 4489 MS (e)2878 4489 MS ( )2922 4489 MS (a)2947 4489 MS (g)2992 4489 MS (r)3042 4489 MS (e)3075 4489 MS (e)3119 4489 MS (m)3163 4489 MS (e)3242 4489 MS (n)3286 4489 MS (t)3336 4489 MS ( )3364 4489 MS (c)3389 4489 MS (o)3433 4489 MS (n)3483 4489 MS (c)3533 4489 MS (e)3577 4489 MS (r)3622 4489 MS (n)3655 4489 MS (i)3705 4489 MS (n)3733 4489 MS (g)3784 4489 MS ( )3833 4489 MS (t)3858 4489 MS (h)3886 4489 MS (e)3936 4489 MS ( )3980 4489 MS (i)4005 4489 MS (t)4033 4489 MS (s)4061 4489 MS (s)490 4604 MS (u)529 4604 MS (b)579 4604 MS (j)629 4604 MS (e)657 4604 MS (c)701 4604 MS (t)745 4604 MS ( )773 4604 MS (m)798 4604 MS (a)876 4604 MS (t)920 4604 MS (t)948 4604 MS (e)976 4604 MS (r)1020 4604 MS (.)1053 4604 MS ( )1078 4604 MS (I)1104 4604 MS (f)1136 4604 MS ( )1169 4604 MS (a)1195 4604 MS (n)1239 4604 MS (y)1291 4604 MS ( )1339 4604 MS (p)1364 4604 MS (r)1414 4604 MS (o)1447 4604 MS (v)1497 4604 MS (i)1547 4604 MS (s)1575 4604 MS (i)1614 4604 MS (o)1642 4604 MS (n)1692 4604 MS ( )1742 4604 MS (o)1767 4604 MS (f)1817 4604 MS ( )1850 4604 MS (t)1875 4604 MS (h)1903 4604 MS (i)1953 4604 MS (s)1981 4604 MS ( )2020 4604 MS (L)2046 4604 MS (i)2105 4604 MS (c)2134 4604 MS (e)2178 4604 MS (n)2222 4604 MS (s)2272 4604 MS (e)2311 4604 MS ( )2355 4604 MS (i)2380 4604 MS (s)2408 4604 MS ( )2447 4604 MS (h)2472 4604 MS (e)2522 4604 MS (l)2566 4604 MS (d)2594 4604 MS ( )2644 4604 MS (t)2669 4604 MS (o)2697 4604 MS ( )2747 4604 MS (b)2772 4604 MS (e)2822 4604 MS ( )2866 4604 MS (u)2891 4604 MS (n)2941 4604 MS (e)2992 4604 MS (n)3036 4604 MS (f)3086 4604 MS (o)3119 4604 MS (r)3169 4604 MS (c)3203 4604 MS (e)3247 4604 MS (a)3292 4604 MS (b)3336 4604 MS (l)3386 4604 MS (e)3414 4604 MS (,)3458 4604 MS ( )3483 4604 MS (s)3508 4604 MS (u)3547 4604 MS (c)3597 4604 MS (h)3641 4604 MS ( )3691 4604 MS (p)3716 4604 MS (r)3766 4604 MS (o)3799 4604 MS (v)3849 4604 MS (i)3899 4604 MS (s)3927 4604 MS (i)3966 4604 MS (o)3994 4604 MS (n)4044 4604 MS ( )4094 4604 MS (s)4119 4604 MS (h)4158 4604 MS (a)4208 4604 MS (l)4252 4604 MS (l)4280 4604 MS (b)490 4719 MS (e)540 4719 MS ( )584 4719 MS (r)609 4719 MS (e)642 4719 MS (f)686 4719 MS (o)719 4719 MS (r)770 4719 MS (m)803 4719 MS (e)881 4719 MS (d)925 4719 MS ( )975 4719 MS (s)1000 4719 MS (o)1039 4719 MS ( )1089 4719 MS (a)1114 4719 MS (s)1158 4719 MS ( )1197 4719 MS (t)1222 4719 MS (o)1250 4719 MS ( )1300 4719 MS (a)1325 4719 MS (c)1370 4719 MS (h)1414 4719 MS (i)1464 4719 MS (e)1492 4719 MS (v)1536 4719 MS (e)1586 4719 MS ( )1630 4719 MS (a)1656 4719 MS (s)1700 4719 MS ( )1739 4719 MS (n)1764 4719 MS (e)1814 4719 MS (a)1858 4719 MS (r)1903 4719 MS (l)1936 4719 MS (y)1965 4719 MS ( )2013 4719 MS (a)2039 4719 MS (s)2083 4719 MS ( )2122 4719 MS (p)2147 4719 MS (o)2197 4719 MS (s)2247 4719 MS (s)2286 4719 MS (i)2325 4719 MS (b)2353 4719 MS (l)2403 4719 MS (e)2431 4719 MS ( )2475 4719 MS (t)2500 4719 MS (h)2528 4719 MS (e)2578 4719 MS ( )2622 4719 MS (s)2647 4719 MS (a)2686 4719 MS (m)2730 4719 MS (e)2808 4719 MS ( )2852 4719 MS (l)2877 4719 MS (e)2905 4719 MS (g)2950 4719 MS (a)3000 4719 MS (l)3044 4719 MS ( )3072 4719 MS (a)3097 4719 MS (n)3141 4719 MS (d)3191 4719 MS ( )3241 4719 MS (e)3266 4719 MS (c)3311 4719 MS (o)3355 4719 MS (n)3405 4719 MS (o)3455 4719 MS (m)3505 4719 MS (i)3583 4719 MS (c)3611 4719 MS ( )3655 4719 MS (e)3680 4719 MS (f)3724 4719 MS (f)3758 4719 MS (e)3791 4719 MS (c)3836 4719 MS (t)3880 4719 MS ( )3908 4719 MS (a)3933 4719 MS (s)3977 4719 MS ( )4016 4719 MS (t)4041 4719 MS (h)4069 4719 MS (e)4119 4719 MS (o)490 4834 MS (r)540 4834 MS (i)573 4834 MS (g)601 4834 MS (i)650 4834 MS (n)678 4834 MS (a)728 4834 MS (l)772 4834 MS ( )800 4834 MS (p)825 4834 MS (r)875 4834 MS (o)908 4834 MS (v)958 4834 MS (i)1008 4834 MS (s)1036 4834 MS (i)1075 4834 MS (o)1103 4834 MS (n)1153 4834 MS ( )1203 4834 MS (a)1228 4834 MS (n)1272 4834 MS (d)1322 4834 MS ( )1372 4834 MS (t)1397 4834 MS (h)1425 4834 MS (e)1475 4834 MS ( )1519 4834 MS (r)1545 4834 MS (e)1578 4834 MS (m)1622 4834 MS (a)1700 4834 MS (i)1744 4834 MS (n)1772 4834 MS (d)1822 4834 MS (e)1873 4834 MS (r)1917 4834 MS ( )1950 4834 MS (o)1975 4834 MS (f)2025 4834 MS ( )2058 4834 MS (t)2083 4834 MS (h)2111 4834 MS (i)2161 4834 MS (s)2189 4834 MS ( )2228 4834 MS (L)2254 4834 MS (i)2313 4834 MS (c)2342 4834 MS (e)2386 4834 MS (n)2430 4834 MS (s)2480 4834 MS (e)2519 4834 MS ( )2564 4834 MS (w)2589 4834 MS (i)2661 4834 MS (l)2689 4834 MS (l)2717 4834 MS ( )2745 4834 MS (r)2770 4834 MS (e)2803 4834 MS (m)2847 4834 MS (a)2925 4834 MS (i)2969 4834 MS (n)2997 4834 MS ( )3047 4834 MS (i)3072 4834 MS (n)3100 4834 MS ( )3150 4834 MS (e)3175 4834 MS (f)3219 4834 MS (f)3253 4834 MS (e)3286 4834 MS (c)3330 4834 MS (t)3374 4834 MS (.)3402 4834 MS ( )3427 4834 MS (T)3452 4834 MS (h)3513 4834 MS (i)3563 4834 MS (s)3591 4834 MS ( )3630 4834 MS (L)3656 4834 MS (i)3716 4834 MS (c)3744 4834 MS (e)3789 4834 MS (n)3833 4834 MS (s)3883 4834 MS (e)3922 4834 MS ( )3966 4834 MS (s)3991 4834 MS (h)4030 4834 MS (a)4080 4834 MS (l)4124 4834 MS (l)4152 4834 MS ( )4180 4834 MS (b)4205 4834 MS (e)4255 4834 MS (g)490 4949 MS (o)539 4949 MS (v)589 4949 MS (e)639 4949 MS (r)684 4949 MS (n)717 4949 MS (e)767 4949 MS (d)811 4949 MS ( )861 4949 MS (b)886 4949 MS (y)938 4949 MS ( )986 4949 MS (a)1011 4949 MS (n)1056 4949 MS (d)1106 4949 MS ( )1156 4949 MS (c)1181 4949 MS (o)1225 4949 MS (n)1275 4949 MS (s)1325 4949 MS (t)1364 4949 MS (r)1392 4949 MS (u)1425 4949 MS (e)1475 4949 MS (d)1519 4949 MS ( )1569 4949 MS (i)1594 4949 MS (n)1622 4949 MS ( )1672 4949 MS (a)1697 4949 MS (c)1742 4949 MS (c)1786 4949 MS (o)1830 4949 MS (r)1881 4949 MS (d)1914 4949 MS (a)1964 4949 MS (n)2008 4949 MS (c)2058 4949 MS (e)2103 4949 MS ( )2147 4949 MS (w)2172 4949 MS (i)2244 4949 MS (t)2272 4949 MS (h)2300 4949 MS ( )2350 4949 MS (t)2375 4949 MS (h)2403 4949 MS (e)2453 4949 MS ( )2497 4949 MS (l)2522 4949 MS (a)2550 4949 MS (w)2594 4949 MS (s)2666 4949 MS ( )2705 4949 MS (o)2730 4949 MS (f)2780 4949 MS ( )2813 4949 MS (t)2838 4949 MS (h)2866 4949 MS (e)2917 4949 MS ( )2961 4949 MS (U)2986 4949 MS (n)3058 4949 MS (i)3108 4949 MS (t)3136 4949 MS (e)3164 4949 MS (d)3208 4949 MS ( )3258 4949 MS (S)3283 4949 MS (t)3339 4949 MS (a)3367 4949 MS (t)3411 4949 MS (e)3439 4949 MS (s)3483 4949 MS ( )3522 4949 MS (a)3547 4949 MS (n)3591 4949 MS (d)3641 4949 MS ( )3691 4949 MS (t)3716 4949 MS (h)3744 4949 MS (e)3794 4949 MS ( )3838 4949 MS (S)3863 4949 MS (t)3919 4949 MS (a)3947 4949 MS (t)3991 4949 MS (e)4019 4949 MS ( )4063 4949 MS (o)4088 4949 MS (f)4138 4949 MS (C)490 5064 MS (a)557 5064 MS (l)601 5064 MS (i)629 5064 MS (f)657 5064 MS (o)690 5064 MS (r)740 5064 MS (n)773 5064 MS (i)823 5064 MS (a)851 5064 MS ( )895 5064 MS (a)920 5064 MS (s)964 5064 MS ( )1003 5064 MS (a)1028 5064 MS (p)1072 5064 MS (p)1122 5064 MS (l)1172 5064 MS (i)1200 5064 MS (e)1228 5064 MS (d)1272 5064 MS ( )1322 5064 MS (t)1347 5064 MS (o)1375 5064 MS ( )1425 5064 MS (a)1450 5064 MS (g)1494 5064 MS (r)1544 5064 MS (e)1578 5064 MS (e)1622 5064 MS (m)1666 5064 MS (e)1745 5064 MS (n)1789 5064 MS (t)1839 5064 MS (s)1867 5064 MS ( )1906 5064 MS (e)1931 5064 MS (n)1975 5064 MS (t)2025 5064 MS (e)2053 5064 MS (r)2097 5064 MS (e)2131 5064 MS (d)2175 5064 MS ( )2225 5064 MS (i)2250 5064 MS (n)2278 5064 MS (t)2328 5064 MS (o)2356 5064 MS ( )2406 5064 MS (a)2431 5064 MS (n)2475 5064 MS (d)2525 5064 MS ( )2575 5064 MS (t)2600 5064 MS (o)2628 5064 MS ( )2678 5064 MS (b)2703 5064 MS (e)2753 5064 MS ( )2797 5064 MS (p)2822 5064 MS (e)2872 5064 MS (r)2916 5064 MS (f)2950 5064 MS (o)2983 5064 MS (r)3033 5064 MS (m)3066 5064 MS (e)3144 5064 MS (d)3188 5064 MS ( )3238 5064 MS (e)3264 5064 MS (n)3308 5064 MS (t)3358 5064 MS (i)3386 5064 MS (r)3414 5064 MS (e)3447 5064 MS (l)3491 5064 MS (y)3519 5064 MS ( )3568 5064 MS (w)3594 5064 MS (i)3666 5064 MS (t)3694 5064 MS (h)3722 5064 MS (i)3772 5064 MS (n)3800 5064 MS ( )3850 5064 MS (C)3875 5064 MS (a)3942 5064 MS (l)3986 5064 MS (i)4014 5064 MS (f)4042 5064 MS (o)4075 5064 MS (r)4125 5064 MS (n)4158 5064 MS (i)4208 5064 MS (a)4236 5064 MS (b)490 5179 MS (e)540 5179 MS (t)584 5179 MS (w)612 5179 MS (e)684 5179 MS (e)728 5179 MS (n)772 5179 MS ( )822 5179 MS (C)847 5179 MS (a)914 5179 MS (l)958 5179 MS (i)986 5179 MS (f)1014 5179 MS (o)1047 5179 MS (r)1097 5179 MS (n)1130 5179 MS (i)1180 5179 MS (a)1209 5179 MS ( )1253 5179 MS (r)1278 5179 MS (e)1311 5179 MS (s)1355 5179 MS (i)1394 5179 MS (d)1422 5179 MS (e)1472 5179 MS (n)1516 5179 MS (t)1566 5179 MS (s)1594 5179 MS (.)1633 5179 MS ( )1658 5179 MS (A)1683 5179 MS (n)1755 5179 MS (y)1807 5179 MS ( )1855 5179 MS (l)1880 5179 MS (i)1908 5179 MS (t)1936 5179 MS (i)1964 5179 MS (g)1993 5179 MS (a)2042 5179 MS (t)2086 5179 MS (i)2114 5179 MS (o)2142 5179 MS (n)2192 5179 MS ( )2242 5179 MS (r)2267 5179 MS (e)2300 5179 MS (l)2344 5179 MS (a)2372 5179 MS (t)2416 5179 MS (i)2444 5179 MS (n)2472 5179 MS (g)2522 5179 MS ( )2572 5179 MS (t)2597 5179 MS (o)2625 5179 MS ( )2675 5179 MS (t)2700 5179 MS (h)2728 5179 MS (i)2778 5179 MS (s)2806 5179 MS ( )2845 5179 MS (L)2871 5179 MS (i)2930 5179 MS (c)2958 5179 MS (e)3003 5179 MS (n)3047 5179 MS (s)3097 5179 MS (e)3136 5179 MS ( )3180 5179 MS (s)3205 5179 MS (h)3244 5179 MS (a)3294 5179 MS (l)3338 5179 MS (l)3366 5179 MS ( )3394 5179 MS (b)3419 5179 MS (e)3469 5179 MS ( )3513 5179 MS (s)3538 5179 MS (u)3577 5179 MS (b)3627 5179 MS (j)3677 5179 MS (e)3706 5179 MS (c)3750 5179 MS (t)3794 5179 MS ( )3822 5179 MS (t)3847 5179 MS (o)3875 5179 MS ( )3925 5179 MS (t)3950 5179 MS (h)3978 5179 MS (e)4028 5179 MS (e)490 5294 MS (x)534 5294 MS (c)585 5294 MS (l)629 5294 MS (u)657 5294 MS (s)707 5294 MS (i)746 5294 MS (v)774 5294 MS (e)824 5294 MS ( )868 5294 MS (j)893 5294 MS (u)921 5294 MS (r)971 5294 MS (i)1004 5294 MS (s)1032 5294 MS (d)1071 5294 MS (i)1121 5294 MS (c)1149 5294 MS (t)1193 5294 MS (i)1221 5294 MS (o)1249 5294 MS (n)1299 5294 MS ( )1349 5294 MS (o)1374 5294 MS (f)1424 5294 MS ( )1457 5294 MS (t)1482 5294 MS (h)1510 5294 MS (e)1560 5294 MS ( )1604 5294 MS (F)1629 5294 MS (e)1684 5294 MS (d)1728 5294 MS (e)1778 5294 MS (r)1822 5294 MS (a)1856 5294 MS (l)1900 5294 MS ( )1928 5294 MS (C)1953 5294 MS (o)2020 5294 MS (u)2070 5294 MS (r)2120 5294 MS (t)2153 5294 MS (s)2181 5294 MS ( )2220 5294 MS (o)2245 5294 MS (f)2295 5294 MS ( )2328 5294 MS (t)2353 5294 MS (h)2381 5294 MS (e)2431 5294 MS ( )2475 5294 MS (N)2500 5294 MS (o)2572 5294 MS (r)2622 5294 MS (t)2655 5294 MS (h)2683 5294 MS (e)2734 5294 MS (r)2778 5294 MS (n)2811 5294 MS ( )2861 5294 MS (D)2886 5294 MS (i)2958 5294 MS (s)2986 5294 MS (t)3025 5294 MS (r)3053 5294 MS (i)3086 5294 MS (c)3114 5294 MS (t)3158 5294 MS ( )3186 5294 MS (o)3211 5294 MS (f)3261 5294 MS ( )3294 5294 MS (C)3319 5294 MS (a)3386 5294 MS (l)3430 5294 MS (i)3458 5294 MS (f)3486 5294 MS (o)3519 5294 MS (r)3569 5294 MS (n)3602 5294 MS (i)3652 5294 MS (a)3681 5294 MS ( )3725 5294 MS (\()3750 5294 MS (o)3783 5294 MS (r)3833 5294 MS (,)3866 5294 MS ( )3891 5294 MS (a)3917 5294 MS (b)3961 5294 MS (s)4011 5294 MS (e)4050 5294 MS (n)4094 5294 MS (t)4144 5294 MS (s)490 5409 MS (u)529 5409 MS (b)579 5409 MS (j)629 5409 MS (e)657 5409 MS (c)701 5409 MS (t)745 5409 MS ( )773 5409 MS (m)798 5409 MS (a)876 5409 MS (t)920 5409 MS (t)948 5409 MS (e)976 5409 MS (r)1020 5409 MS ( )1053 5409 MS (j)1078 5409 MS (u)1106 5409 MS (r)1156 5409 MS (i)1189 5409 MS (s)1217 5409 MS (d)1256 5409 MS (i)1306 5409 MS (c)1334 5409 MS (t)1378 5409 MS (i)1406 5409 MS (o)1434 5409 MS (n)1484 5409 MS ( )1534 5409 MS (i)1559 5409 MS (n)1587 5409 MS ( )1637 5409 MS (s)1662 5409 MS (u)1701 5409 MS (c)1751 5409 MS (h)1795 5409 MS ( )1845 5409 MS (c)1870 5409 MS (o)1914 5409 MS (u)1964 5409 MS (r)2014 5409 MS (t)2047 5409 MS (s)2075 5409 MS (,)2114 5409 MS ( )2139 5409 MS (t)2164 5409 MS (h)2192 5409 MS (e)2242 5409 MS ( )2286 5409 MS (c)2311 5409 MS (o)2355 5409 MS (u)2405 5409 MS (r)2456 5409 MS (t)2489 5409 MS (s)2517 5409 MS ( )2556 5409 MS (o)2581 5409 MS (f)2631 5409 MS ( )2664 5409 MS (t)2689 5409 MS (h)2717 5409 MS (e)2767 5409 MS ( )2811 5409 MS (S)2836 5409 MS (t)2892 5409 MS (a)2920 5409 MS (t)2964 5409 MS (e)2992 5409 MS ( )3036 5409 MS (o)3061 5409 MS (f)3111 5409 MS ( )3144 5409 MS (C)3169 5409 MS (a)3236 5409 MS (l)3280 5409 MS (i)3308 5409 MS (f)3336 5409 MS (o)3369 5409 MS (r)3419 5409 MS (n)3452 5409 MS (i)3502 5409 MS (a)3530 5409 MS (\))3575 5409 MS (,)3608 5409 MS ( )3633 5409 MS (w)3658 5409 MS (i)3730 5409 MS (t)3758 5409 MS (h)3786 5409 MS ( )3836 5409 MS (v)3861 5409 MS (e)3911 5409 MS (n)3955 5409 MS (u)4005 5409 MS (e)4055 5409 MS ( )4099 5409 MS (l)4124 5409 MS (y)4154 5409 MS (i)4202 5409 MS (n)4230 5409 MS (g)4281 5409 MS (e)490 5524 MS (x)534 5524 MS (c)585 5524 MS (l)629 5524 MS (u)657 5524 MS (s)707 5524 MS (i)746 5524 MS (v)774 5524 MS (e)824 5524 MS (l)868 5524 MS (y)897 5524 MS ( )944 5524 MS (i)969 5524 MS (n)997 5524 MS ( )1047 5524 MS (S)1072 5524 MS (a)1128 5524 MS (n)1172 5524 MS (t)1222 5524 MS (a)1250 5524 MS ( )1294 5524 MS (C)1319 5524 MS (l)1386 5524 MS (a)1414 5524 MS (r)1459 5524 MS (a)1492 5524 MS ( )1536 5524 MS (C)1561 5524 MS (o)1628 5524 MS (u)1678 5524 MS (n)1728 5524 MS (t)1778 5524 MS (y)1808 5524 MS (,)1856 5524 MS ( )1881 5524 MS (C)1906 5524 MS (a)1973 5524 MS (l)2017 5524 MS (i)2045 5524 MS (f)2073 5524 MS (o)2106 5524 MS (r)2156 5524 MS (n)2189 5524 MS (i)2239 5524 MS (a)2267 5524 MS (,)2311 5524 MS ( )2336 5524 MS (w)2361 5524 MS (i)2433 5524 MS (t)2461 5524 MS (h)2489 5524 MS ( )2539 5524 MS (t)2564 5524 MS (h)2592 5524 MS (e)2642 5524 MS ( )2686 5524 MS (l)2711 5524 MS (o)2739 5524 MS (s)2789 5524 MS (i)2828 5524 MS (n)2856 5524 MS (g)2906 5524 MS ( )2955 5524 MS (p)2980 5524 MS (a)3031 5524 MS (r)3075 5524 MS (t)3108 5524 MS (y)3138 5524 MS ( )3186 5524 MS (r)3211 5524 MS (e)3245 5524 MS (s)3289 5524 MS (p)3328 5524 MS (o)3378 5524 MS (n)3428 5524 MS (s)3478 5524 MS (i)3517 5524 MS (b)3545 5524 MS (l)3595 5524 MS (e)3623 5524 MS ( )3667 5524 MS (f)3692 5524 MS (o)3725 5524 MS (r)3775 5524 MS ( )3808 5524 MS (c)3833 5524 MS (o)3877 5524 MS (s)3927 5524 MS (t)3966 5524 MS (s)3994 5524 MS (,)4033 5524 MS (i)490 5639 MS (n)518 5639 MS (c)568 5639 MS (l)612 5639 MS (u)640 5639 MS (d)690 5639 MS (i)740 5639 MS (n)768 5639 MS (g)818 5639 MS ( )867 5639 MS (w)892 5639 MS (i)964 5639 MS (t)992 5639 MS (h)1020 5639 MS (o)1070 5639 MS (u)1120 5639 MS (t)1170 5639 MS ( )1198 5639 MS (l)1223 5639 MS (i)1251 5639 MS (m)1279 5639 MS (i)1357 5639 MS (t)1385 5639 MS (a)1413 5639 MS (t)1457 5639 MS (i)1485 5639 MS (o)1513 5639 MS (n)1563 5639 MS (,)1613 5639 MS ( )1638 5639 MS (c)1663 5639 MS (o)1707 5639 MS (u)1757 5639 MS (r)1807 5639 MS (t)1840 5639 MS ( )1868 5639 MS (c)1893 5639 MS (o)1937 5639 MS (s)1987 5639 MS (t)2026 5639 MS (s)2054 5639 MS ( )2093 5639 MS (a)2118 5639 MS (n)2162 5639 MS (d)2212 5639 MS ( )2262 5639 MS (r)2287 5639 MS (e)2320 5639 MS (a)2364 5639 MS (s)2408 5639 MS (o)2447 5639 MS (n)2497 5639 MS (a)2548 5639 MS (b)2592 5639 MS (l)2642 5639 MS (e)2670 5639 MS ( )2714 5639 MS (a)2739 5639 MS (t)2783 5639 MS (t)2811 5639 MS (o)2839 5639 MS (r)2889 5639 MS (n)2922 5639 MS (e)2972 5639 MS (y)3018 5639 MS (s)3066 5639 MS ( )3105 5639 MS (f)3131 5639 MS (e)3164 5639 MS (e)3208 5639 MS (s)3252 5639 MS ( )3291 5639 MS (a)3317 5639 MS (n)3361 5639 MS (d)3411 5639 MS ( )3461 5639 MS (e)3486 5639 MS (x)3530 5639 MS (p)3581 5639 MS (e)3631 5639 MS (n)3675 5639 MS (s)3725 5639 MS (e)3764 5639 MS (s)3808 5639 MS (.)3847 5639 MS ( )3872 5639 MS (T)3897 5639 MS (h)3958 5639 MS (e)4008 5639 MS (a)490 5754 MS (p)534 5754 MS (p)584 5754 MS (l)634 5754 MS (i)662 5754 MS (c)690 5754 MS (a)734 5754 MS (t)778 5754 MS (i)806 5754 MS (o)834 5754 MS (n)884 5754 MS ( )934 5754 MS (o)959 5754 MS (f)1009 5754 MS ( )1042 5754 MS (t)1067 5754 MS (h)1095 5754 MS (e)1145 5754 MS ( )1189 5754 MS (U)1214 5754 MS (n)1286 5754 MS (i)1336 5754 MS (t)1364 5754 MS (e)1392 5754 MS (d)1436 5754 MS ( )1486 5754 MS (N)1511 5754 MS (a)1584 5754 MS (t)1628 5754 MS (i)1656 5754 MS (o)1684 5754 MS (n)1734 5754 MS (s)1784 5754 MS ( )1823 5754 MS (C)1848 5754 MS (o)1915 5754 MS (n)1965 5754 MS (v)2015 5754 MS (e)2065 5754 MS (n)2109 5754 MS (t)2159 5754 MS (i)2187 5754 MS (o)2215 5754 MS (n)2265 5754 MS ( )2315 5754 MS (o)2340 5754 MS (n)2390 5754 MS ( )2440 5754 MS (C)2465 5754 MS (o)2532 5754 MS (n)2582 5754 MS (t)2632 5754 MS (r)2660 5754 MS (a)2693 5754 MS (c)2737 5754 MS (t)2781 5754 MS (s)2809 5754 MS ( )2848 5754 MS (f)2873 5754 MS (o)2906 5754 MS (r)2956 5754 MS ( )2989 5754 MS (t)3014 5754 MS (h)3042 5754 MS (e)3092 5754 MS ( )3136 5754 MS (I)3162 5754 MS (n)3194 5754 MS (t)3244 5754 MS (e)3272 5754 MS (r)3317 5754 MS (n)3350 5754 MS (a)3400 5754 MS (t)3444 5754 MS (i)3472 5754 MS (o)3500 5754 MS (n)3550 5754 MS (a)3600 5754 MS (l)3644 5754 MS ( )3672 5754 MS (S)3697 5754 MS (a)3753 5754 MS (l)3797 5754 MS (e)3825 5754 MS ( )3869 5754 MS (o)3894 5754 MS (f)3944 5754 MS ( )3977 5754 MS (G)4003 5754 MS (o)4075 5754 MS (o)4125 5754 MS (d)4175 5754 MS (s)4225 5754 MS ( )4264 5754 MS (i)4289 5754 MS (s)4317 5754 MS (e)490 5869 MS (x)534 5869 MS (p)585 5869 MS (r)635 5869 MS (e)668 5869 MS (s)712 5869 MS (s)751 5869 MS (l)790 5869 MS (y)819 5869 MS ( )867 5869 MS (e)892 5869 MS (x)936 5869 MS (c)987 5869 MS (l)1031 5869 MS (u)1059 5869 MS (d)1109 5869 MS (e)1159 5869 MS (d)1203 5869 MS (.)1253 5869 MS ( )1278 5869 MS (A)1303 5869 MS (n)1375 5869 MS (y)1427 5869 MS ( )1475 5869 MS (l)1500 5869 MS (a)1528 5869 MS (w)1572 5869 MS ( )1644 5869 MS (o)1669 5869 MS (r)1720 5869 MS ( )1753 5869 MS (r)1778 5869 MS (e)1811 5869 MS (g)1856 5869 MS (u)1905 5869 MS (l)1955 5869 MS (a)1983 5869 MS (t)2027 5869 MS (i)2055 5869 MS (o)2083 5869 MS (n)2133 5869 MS ( )2183 5869 MS (t)2208 5869 MS (h)2236 5869 MS (a)2286 5869 MS (t)2330 5869 MS ( )2358 5869 MS (p)2383 5869 MS (r)2433 5869 MS (o)2466 5869 MS (v)2516 5869 MS (i)2566 5869 MS (d)2594 5869 MS (e)2645 5869 MS (s)2689 5869 MS ( )2728 5869 MS (t)2753 5869 MS (h)2781 5869 MS (a)2831 5869 MS (t)2875 5869 MS ( )2903 5869 MS (t)2928 5869 MS (h)2956 5869 MS (e)3006 5869 MS ( )3050 5869 MS (l)3075 5869 MS (a)3103 5869 MS (n)3147 5869 MS (g)3198 5869 MS (u)3247 5869 MS (a)3297 5869 MS (g)3342 5869 MS (e)3392 5869 MS ( )3436 5869 MS (o)3461 5869 MS (f)3511 5869 MS ( )3544 5869 MS (a)3569 5869 MS ( )3613 5869 MS (c)3639 5869 MS (o)3683 5869 MS (n)3733 5869 MS (t)3783 5869 MS (r)3811 5869 MS (a)3844 5869 MS (c)3889 5869 MS (t)3933 5869 MS ( )3961 5869 MS (s)3986 5869 MS (h)4025 5869 MS (a)4075 5869 MS (l)4119 5869 MS (l)4147 5869 MS ( )4175 5869 MS (b)4200 5869 MS (e)4250 5869 MS showpage %%Page: 5 5 13.238 780.059 translate 72 600 div dup neg scale 0 0 transform .25 add round .25 sub exch .25 add round .25 sub exch itransform translate [100 0 0 -100 0 0]/Times-Roman MF (c)490 591 MS (o)534 591 MS (n)584 591 MS (s)634 591 MS (t)673 591 MS (r)701 591 MS (u)734 591 MS (e)784 591 MS (d)828 591 MS ( )878 591 MS (a)903 591 MS (g)948 591 MS (a)998 591 MS (i)1042 591 MS (n)1070 591 MS (s)1120 591 MS (t)1159 591 MS ( )1187 591 MS (t)1212 591 MS (h)1240 591 MS (e)1290 591 MS ( )1334 591 MS (d)1359 591 MS (r)1409 591 MS (a)1442 591 MS (f)1486 591 MS (t)1519 591 MS (e)1547 591 MS (r)1592 591 MS ( )1625 591 MS (s)1650 591 MS (h)1689 591 MS (a)1739 591 MS (l)1783 591 MS (l)1811 591 MS ( )1839 591 MS (n)1864 591 MS (o)1914 591 MS (t)1964 591 MS ( )1992 591 MS (a)2017 591 MS (p)2061 591 MS (p)2111 591 MS (l)2161 591 MS (y)2191 591 MS ( )2239 591 MS (t)2264 591 MS (o)2292 591 MS ( )2342 591 MS (t)2367 591 MS (h)2395 591 MS (i)2445 591 MS (s)2473 591 MS ( )2512 591 MS (L)2537 591 MS (i)2597 591 MS (c)2625 591 MS (e)2670 591 MS (n)2714 591 MS (s)2764 591 MS (e)2803 591 MS (.)2847 591 MS [100 0 0 -100 0 0]/Times-Bold MF (E)490 792 MS (x)557 792 MS (h)607 792 MS (i)663 792 MS (b)691 792 MS (i)747 792 MS (t)775 792 MS ( )808 792 MS (A)833 792 MS (L)490 988 MS (i)557 988 MS (c)585 988 MS (e)629 988 MS (n)673 988 MS (s)729 988 MS (e)768 988 MS ( )812 988 MS (A)837 988 MS (p)909 988 MS (p)965 988 MS (l)1021 988 MS (i)1049 988 MS (c)1077 988 MS (a)1121 988 MS (b)1171 988 MS (i)1227 988 MS (l)1255 988 MS (i)1283 988 MS (t)1311 988 MS (y)1344 988 MS (.)1394 988 MS ( )1419 988 MS [100 0 0 -100 0 0]/Times-Roman MF (E)1444 988 MS (x)1505 988 MS (c)1555 988 MS (e)1599 988 MS (p)1643 988 MS (t)1693 988 MS ( )1721 988 MS (t)1746 988 MS (o)1774 988 MS ( )1824 988 MS (t)1849 988 MS (h)1877 988 MS (e)1927 988 MS ( )1971 988 MS (e)1996 988 MS (x)2040 988 MS (t)2091 988 MS (e)2119 988 MS (n)2163 988 MS (t)2213 988 MS ( )2241 988 MS (p)2266 988 MS (o)2316 988 MS (r)2366 988 MS (t)2399 988 MS (i)2427 988 MS (o)2455 988 MS (n)2505 988 MS (s)2555 988 MS ( )2594 988 MS (o)2619 988 MS (f)2669 988 MS ( )2702 988 MS (t)2727 988 MS (h)2755 988 MS (i)2805 988 MS (s)2833 988 MS ( )2872 988 MS (f)2897 988 MS (i)2930 988 MS (l)2957 988 MS (e)2985 988 MS ( )3029 988 MS (a)3054 988 MS (r)3098 988 MS (e)3131 988 MS ( )3175 988 MS (m)3200 988 MS (a)3278 988 MS (d)3322 988 MS (e)3372 988 MS ( )3416 988 MS (s)3441 988 MS (u)3480 988 MS (b)3530 988 MS (j)3580 988 MS (e)3609 988 MS (c)3653 988 MS (t)3697 988 MS ( )3725 988 MS (t)3750 988 MS (o)3778 988 MS ( )3828 988 MS (a)3853 988 MS (n)3897 988 MS (a)490 1103 MS (l)534 1103 MS (t)562 1103 MS (e)590 1103 MS (r)634 1103 MS (n)667 1103 MS (a)717 1103 MS (t)761 1103 MS (i)789 1103 MS (v)817 1103 MS (e)867 1103 MS ( )911 1103 MS (l)936 1103 MS (i)964 1103 MS (c)992 1103 MS (e)1036 1103 MS (n)1080 1103 MS (s)1130 1103 MS (e)1170 1103 MS ( )1214 1103 MS (a)1239 1103 MS (s)1283 1103 MS ( )1322 1103 MS (p)1347 1103 MS (e)1397 1103 MS (r)1442 1103 MS (m)1475 1103 MS (i)1553 1103 MS (t)1581 1103 MS (t)1609 1103 MS (e)1637 1103 MS (d)1681 1103 MS ( )1731 1103 MS (i)1756 1103 MS (n)1784 1103 MS ( )1834 1103 MS (t)1859 1103 MS (h)1887 1103 MS (e)1937 1103 MS ( )1981 1103 MS (S)2006 1103 MS (G)2062 1103 MS (I)2135 1103 MS ( )2166 1103 MS (F)2192 1103 MS (r)2247 1103 MS (e)2281 1103 MS (e)2325 1103 MS ( )2369 1103 MS (S)2394 1103 MS (o)2450 1103 MS (f)2500 1103 MS (t)2533 1103 MS (w)2561 1103 MS (a)2633 1103 MS (r)2678 1103 MS (e)2711 1103 MS ( )2755 1103 MS (L)2781 1103 MS (i)2841 1103 MS (c)2869 1103 MS (e)2914 1103 MS (n)2958 1103 MS (s)3008 1103 MS (e)3047 1103 MS ( )3091 1103 MS (B)3117 1103 MS (,)3183 1103 MS ( )3208 1103 MS (V)3233 1103 MS (e)3305 1103 MS (r)3350 1103 MS (s)3383 1103 MS (i)3422 1103 MS (o)3450 1103 MS (n)3500 1103 MS ( )3550 1103 MS (1)3575 1103 MS (.)3625 1103 MS (1)3650 1103 MS ( )3700 1103 MS (\()3725 1103 MS (t)3758 1103 MS (h)3786 1103 MS (e)3836 1103 MS ( )3880 1103 MS (")3906 1103 MS (L)3947 1103 MS (i)4007 1103 MS (c)4035 1103 MS (e)4079 1103 MS (n)4123 1103 MS (s)4173 1103 MS (e)4213 1103 MS (")4257 1103 MS (\))4298 1103 MS (,)4331 1103 MS (t)490 1218 MS (h)518 1218 MS (e)568 1218 MS ( )612 1218 MS (c)637 1218 MS (o)681 1218 MS (n)731 1218 MS (t)781 1218 MS (e)809 1218 MS (n)853 1218 MS (t)903 1218 MS (s)931 1218 MS ( )970 1218 MS (o)995 1218 MS (f)1045 1218 MS ( )1078 1218 MS (t)1103 1218 MS (h)1131 1218 MS (i)1181 1218 MS (s)1209 1218 MS ( )1248 1218 MS (f)1273 1218 MS (i)1306 1218 MS (l)1334 1218 MS (e)1362 1218 MS ( )1406 1218 MS (a)1431 1218 MS (r)1475 1218 MS (e)1508 1218 MS ( )1553 1218 MS (s)1578 1218 MS (u)1617 1218 MS (b)1667 1218 MS (j)1717 1218 MS (e)1745 1218 MS (c)1789 1218 MS (t)1833 1218 MS ( )1861 1218 MS (o)1886 1218 MS (n)1936 1218 MS (l)1986 1218 MS (y)2016 1218 MS ( )2064 1218 MS (t)2089 1218 MS (o)2117 1218 MS ( )2167 1218 MS (t)2192 1218 MS (h)2220 1218 MS (e)2270 1218 MS ( )2314 1218 MS (p)2339 1218 MS (r)2389 1218 MS (o)2422 1218 MS (v)2472 1218 MS (i)2522 1218 MS (s)2550 1218 MS (i)2589 1218 MS (o)2617 1218 MS (n)2667 1218 MS (s)2717 1218 MS ( )2756 1218 MS (o)2781 1218 MS (f)2831 1218 MS ( )2864 1218 MS (t)2889 1218 MS (h)2917 1218 MS (e)2967 1218 MS ( )3011 1218 MS (L)3037 1218 MS (i)3097 1218 MS (c)3125 1218 MS (e)3170 1218 MS (n)3214 1218 MS (s)3264 1218 MS (e)3303 1218 MS (.)3347 1218 MS ( )3372 1218 MS (Y)3397 1218 MS (o)3469 1218 MS (u)3519 1218 MS ( )3569 1218 MS (m)3594 1218 MS (a)3672 1218 MS (y)3718 1218 MS ( )3766 1218 MS (n)3791 1218 MS (o)3841 1218 MS (t)3891 1218 MS ( )3919 1218 MS (u)3944 1218 MS (s)3994 1218 MS (e)4033 1218 MS ( )4077 1218 MS (t)4102 1218 MS (h)4130 1218 MS (i)4180 1218 MS (s)4208 1218 MS (f)490 1333 MS (i)523 1333 MS (l)551 1333 MS (e)579 1333 MS ( )623 1333 MS (e)648 1333 MS (x)692 1333 MS (c)743 1333 MS (e)787 1333 MS (p)831 1333 MS (t)881 1333 MS ( )909 1333 MS (i)934 1333 MS (n)962 1333 MS ( )1012 1333 MS (c)1037 1333 MS (o)1081 1333 MS (m)1131 1333 MS (p)1209 1333 MS (l)1259 1333 MS (i)1287 1333 MS (a)1315 1333 MS (n)1359 1333 MS (c)1409 1333 MS (e)1453 1333 MS ( )1497 1333 MS (w)1522 1333 MS (i)1594 1333 MS (t)1622 1333 MS (h)1650 1333 MS ( )1700 1333 MS (t)1725 1333 MS (h)1753 1333 MS (e)1803 1333 MS ( )1847 1333 MS (L)1873 1333 MS (i)1933 1333 MS (c)1961 1333 MS (e)2006 1333 MS (n)2050 1333 MS (s)2100 1333 MS (e)2139 1333 MS (.)2183 1333 MS ( )2208 1333 MS (Y)2233 1333 MS (o)2305 1333 MS (u)2355 1333 MS ( )2405 1333 MS (m)2430 1333 MS (a)2508 1333 MS (y)2554 1333 MS ( )2602 1333 MS (o)2627 1333 MS (b)2677 1333 MS (t)2727 1333 MS (a)2755 1333 MS (i)2799 1333 MS (n)2827 1333 MS ( )2877 1333 MS (a)2903 1333 MS ( )2947 1333 MS (c)2972 1333 MS (o)3016 1333 MS (p)3066 1333 MS (y)3118 1333 MS ( )3166 1333 MS (o)3191 1333 MS (f)3241 1333 MS ( )3274 1333 MS (t)3299 1333 MS (h)3327 1333 MS (e)3378 1333 MS ( )3422 1333 MS (L)3448 1333 MS (i)3507 1333 MS (c)3535 1333 MS (e)3580 1333 MS (n)3624 1333 MS (s)3674 1333 MS (e)3714 1333 MS ( )3758 1333 MS (a)3783 1333 MS (t)3827 1333 MS ( )3855 1333 MS (S)3880 1333 MS (i)3936 1333 MS (l)3964 1333 MS (i)3992 1333 MS (c)4020 1333 MS (o)4064 1333 MS (n)4114 1333 MS (G)490 1448 MS (r)562 1448 MS (a)595 1448 MS (p)639 1448 MS (h)689 1448 MS (i)739 1448 MS (c)767 1448 MS (s)811 1448 MS (,)850 1448 MS ( )875 1448 MS (I)901 1448 MS (n)933 1448 MS (c)984 1448 MS (.)1028 1448 MS (,)1053 1448 MS ( )1078 1448 MS (a)1103 1448 MS (t)1147 1448 MS (t)1175 1448 MS (n)1203 1448 MS (:)1253 1448 MS ( )1281 1448 MS (L)1307 1448 MS (e)1367 1448 MS (g)1412 1448 MS (a)1461 1448 MS (l)1505 1448 MS ( )1533 1448 MS (S)1558 1448 MS (e)1614 1448 MS (r)1658 1448 MS (v)1691 1448 MS (i)1741 1448 MS (c)1770 1448 MS (e)1814 1448 MS (s)1858 1448 MS (,)1897 1448 MS ( )1922 1448 MS (1)1947 1448 MS (6)1997 1448 MS (0)2047 1448 MS (0)2097 1448 MS ( )2147 1448 MS (A)2172 1448 MS (m)2244 1448 MS (p)2322 1448 MS (h)2372 1448 MS (i)2422 1448 MS (t)2450 1448 MS (h)2478 1448 MS (e)2528 1448 MS (a)2572 1448 MS (t)2616 1448 MS (r)2644 1448 MS (e)2678 1448 MS ( )2722 1448 MS (P)2747 1448 MS (a)2803 1448 MS (r)2847 1448 MS (k)2880 1448 MS (w)2930 1448 MS (a)3003 1448 MS (y)3049 1448 MS (,)3097 1448 MS ( )3122 1448 MS (M)3147 1448 MS (o)3236 1448 MS (u)3286 1448 MS (n)3336 1448 MS (t)3386 1448 MS (a)3414 1448 MS (i)3458 1448 MS (n)3486 1448 MS ( )3536 1448 MS (V)3561 1448 MS (i)3633 1448 MS (e)3661 1448 MS (w)3705 1448 MS (,)3777 1448 MS ( )3802 1448 MS (C)3827 1448 MS (A)3894 1448 MS ( )3966 1448 MS (9)3991 1448 MS (4)4041 1448 MS (0)4091 1448 MS (4)4141 1448 MS (3)4191 1448 MS (-)4242 1448 MS (1)490 1562 MS (3)540 1562 MS (5)590 1562 MS (1)640 1562 MS (,)690 1562 MS ( )715 1562 MS (o)740 1562 MS (r)790 1562 MS ( )823 1562 MS (a)848 1562 MS (t)892 1562 MS (:)920 1562 MS (h)490 1762 MS (t)540 1762 MS (t)568 1762 MS (p)596 1762 MS (:)646 1762 MS (/)674 1762 MS (/)702 1762 MS (o)730 1762 MS (s)780 1762 MS (s)819 1762 MS (.)858 1762 MS (s)883 1762 MS (g)922 1762 MS (i)971 1762 MS (.)999 1762 MS (c)1024 1762 MS (o)1068 1762 MS (m)1118 1762 MS (/)1196 1762 MS (p)1224 1762 MS (r)1274 1762 MS (o)1307 1762 MS (j)1357 1762 MS (e)1385 1762 MS (c)1429 1762 MS (t)1473 1762 MS (s)1501 1762 MS (/)1540 1762 MS (F)1568 1762 MS (r)1623 1762 MS (e)1656 1762 MS (e)1701 1762 MS (B)1745 1762 MS (N)490 1959 MS (o)562 1959 MS (t)612 1959 MS (e)640 1959 MS ( )684 1959 MS (t)709 1959 MS (h)737 1959 MS (a)787 1959 MS (t)831 1959 MS (,)859 1959 MS ( )884 1959 MS (a)909 1959 MS (s)953 1959 MS ( )992 1959 MS (p)1017 1959 MS (r)1067 1959 MS (o)1100 1959 MS (v)1150 1959 MS (i)1200 1959 MS (d)1228 1959 MS (e)1278 1959 MS (d)1322 1959 MS ( )1372 1959 MS (i)1397 1959 MS (n)1425 1959 MS ( )1475 1959 MS (t)1500 1959 MS (h)1528 1959 MS (e)1578 1959 MS ( )1622 1959 MS (L)1648 1959 MS (i)1708 1959 MS (c)1736 1959 MS (e)1781 1959 MS (n)1825 1959 MS (s)1875 1959 MS (e)1914 1959 MS (,)1958 1959 MS ( )1983 1959 MS (t)2008 1959 MS (h)2036 1959 MS (e)2086 1959 MS ( )2130 1959 MS (S)2155 1959 MS (o)2211 1959 MS (f)2261 1959 MS (t)2294 1959 MS (w)2322 1959 MS (a)2395 1959 MS (r)2439 1959 MS (e)2472 1959 MS ( )2516 1959 MS (i)2541 1959 MS (s)2569 1959 MS ( )2608 1959 MS (d)2633 1959 MS (i)2683 1959 MS (s)2711 1959 MS (t)2750 1959 MS (r)2778 1959 MS (i)2811 1959 MS (b)2839 1959 MS (u)2889 1959 MS (t)2939 1959 MS (e)2967 1959 MS (d)3011 1959 MS ( )3061 1959 MS (o)3086 1959 MS (n)3136 1959 MS ( )3186 1959 MS (a)3211 1959 MS (n)3255 1959 MS ( )3305 1959 MS (")3331 1959 MS (A)3371 1959 MS (S)3443 1959 MS ( )3499 1959 MS (I)3525 1959 MS (S)3557 1959 MS (")3614 1959 MS ( )3654 1959 MS (b)3679 1959 MS (a)3729 1959 MS (s)3773 1959 MS (i)3812 1959 MS (s)3840 1959 MS (,)3879 1959 MS ( )3904 1959 MS (w)3929 1959 MS (i)4001 1959 MS (t)4029 1959 MS (h)4057 1959 MS ( )4107 1959 MS (A)4132 1959 MS (L)4205 1959 MS (L)4266 1959 MS (E)490 2074 MS (X)551 2074 MS (P)623 2074 MS (R)679 2074 MS (E)746 2074 MS (S)807 2074 MS (S)863 2074 MS ( )919 2074 MS (A)944 2074 MS (N)1016 2074 MS (D)1088 2074 MS ( )1160 2074 MS (I)1186 2074 MS (M)1217 2074 MS (P)1306 2074 MS (L)1363 2074 MS (I)1424 2074 MS (E)1456 2074 MS (D)1517 2074 MS ( )1589 2074 MS (W)1614 2074 MS (A)1709 2074 MS (R)1781 2074 MS (R)1848 2074 MS (A)1915 2074 MS (N)1987 2074 MS (T)2059 2074 MS (I)2121 2074 MS (E)2153 2074 MS (S)2214 2074 MS ( )2270 2074 MS (A)2295 2074 MS (N)2367 2074 MS (D)2439 2074 MS ( )2511 2074 MS (C)2536 2074 MS (O)2603 2074 MS (N)2676 2074 MS (D)2748 2074 MS (I)2821 2074 MS (T)2853 2074 MS (I)2915 2074 MS (O)2947 2074 MS (N)3020 2074 MS (S)3092 2074 MS ( )3148 2074 MS (D)3173 2074 MS (I)3246 2074 MS (S)3278 2074 MS (C)3334 2074 MS (L)3402 2074 MS (A)3462 2074 MS (I)3534 2074 MS (M)3566 2074 MS (E)3656 2074 MS (D)3717 2074 MS (,)3789 2074 MS (I)490 2189 MS (N)522 2189 MS (C)594 2189 MS (L)662 2189 MS (U)722 2189 MS (D)795 2189 MS (I)868 2189 MS (N)900 2189 MS (G)973 2189 MS (,)1045 2189 MS ( )1070 2189 MS (W)1095 2189 MS (I)1191 2189 MS (T)1222 2189 MS (H)1284 2189 MS (O)1356 2189 MS (U)1428 2189 MS (T)1500 2189 MS ( )1561 2189 MS (L)1587 2189 MS (I)1648 2189 MS (M)1680 2189 MS (I)1771 2189 MS (T)1803 2189 MS (A)1864 2189 MS (T)1936 2189 MS (I)1998 2189 MS (O)2030 2189 MS (N)2103 2189 MS (,)2175 2189 MS ( )2200 2189 MS (A)2225 2189 MS (N)2297 2189 MS (Y)2369 2189 MS ( )2441 2189 MS (I)2468 2189 MS (M)2500 2189 MS (P)2589 2189 MS (L)2646 2189 MS (I)2707 2189 MS (E)2739 2189 MS (D)2800 2189 MS ( )2872 2189 MS (W)2897 2189 MS (A)2992 2189 MS (R)3064 2189 MS (R)3131 2189 MS (A)3198 2189 MS (N)3270 2189 MS (T)3342 2189 MS (I)3404 2189 MS (E)3436 2189 MS (S)3497 2189 MS ( )3553 2189 MS (A)3578 2189 MS (N)3650 2189 MS (D)3722 2189 MS (C)490 2304 MS (O)557 2304 MS (N)629 2304 MS (D)701 2304 MS (I)774 2304 MS (T)806 2304 MS (I)868 2304 MS (O)900 2304 MS (N)973 2304 MS (S)1045 2304 MS ( )1101 2304 MS (O)1126 2304 MS (F)1198 2304 MS ( )1253 2304 MS (M)1278 2304 MS (E)1367 2304 MS (R)1428 2304 MS (C)1495 2304 MS (H)1562 2304 MS (A)1634 2304 MS (N)1706 2304 MS (T)1778 2304 MS (A)1839 2304 MS (B)1912 2304 MS (I)1979 2304 MS (L)2012 2304 MS (I)2073 2304 MS (T)2105 2304 MS (Y)2167 2304 MS (,)2239 2304 MS ( )2264 2304 MS (S)2289 2304 MS (A)2345 2304 MS (T)2417 2304 MS (I)2479 2304 MS (S)2511 2304 MS (F)2568 2304 MS (A)2623 2304 MS (C)2695 2304 MS (T)2762 2304 MS (O)2823 2304 MS (R)2895 2304 MS (Y)2962 2304 MS ( )3034 2304 MS (Q)3059 2304 MS (U)3131 2304 MS (A)3203 2304 MS (L)3276 2304 MS (I)3337 2304 MS (T)3369 2304 MS (Y)3431 2304 MS (,)3503 2304 MS ( )3528 2304 MS (F)3553 2304 MS (I)3610 2304 MS (T)3642 2304 MS (N)3703 2304 MS (E)3775 2304 MS (S)3836 2304 MS (S)3892 2304 MS ( )3948 2304 MS (F)3973 2304 MS (O)4029 2304 MS (R)4101 2304 MS ( )4168 2304 MS (A)4193 2304 MS (P)490 2419 MS (A)546 2419 MS (R)618 2419 MS (T)685 2419 MS (I)747 2419 MS (C)778 2419 MS (U)845 2419 MS (L)918 2419 MS (A)978 2419 MS (R)1050 2419 MS ( )1117 2419 MS (P)1142 2419 MS (U)1198 2419 MS (R)1270 2419 MS (P)1337 2419 MS (O)1393 2419 MS (S)1465 2419 MS (E)1521 2419 MS (,)1582 2419 MS ( )1607 2419 MS (A)1632 2419 MS (N)1704 2419 MS (D)1776 2419 MS ( )1848 2419 MS (N)1873 2419 MS (O)1945 2419 MS (N)2017 2419 MS (-)2090 2419 MS (I)2123 2419 MS (N)2155 2419 MS (F)2228 2419 MS (R)2283 2419 MS (I)2352 2419 MS (N)2384 2419 MS (G)2456 2419 MS (E)2528 2419 MS (M)2589 2419 MS (E)2678 2419 MS (N)2740 2419 MS (T)2812 2419 MS (.)2873 2419 MS [100 0 0 -100 0 0]/Times-Bold MF (O)490 2618 MS (r)568 2618 MS (i)612 2618 MS (g)640 2618 MS (i)690 2618 MS (n)718 2618 MS (a)774 2618 MS (l)824 2618 MS ( )852 2618 MS (C)877 2618 MS (o)949 2618 MS (d)999 2618 MS (e)1055 2618 MS (.)1099 2618 MS ( )1124 2618 MS [100 0 0 -100 0 0]/Times-Roman MF (T)1149 2618 MS (h)1210 2618 MS (e)1260 2618 MS ( )1304 2618 MS (O)1329 2618 MS (r)1401 2618 MS (i)1434 2618 MS (g)1462 2618 MS (i)1511 2618 MS (n)1539 2618 MS (a)1589 2618 MS (l)1633 2618 MS ( )1661 2618 MS (C)1686 2618 MS (o)1753 2618 MS (d)1803 2618 MS (e)1853 2618 MS ( )1897 2618 MS (i)1922 2618 MS (s)1950 2618 MS (:)1989 2618 MS ( )2017 2618 MS ([)2042 2618 MS (n)2076 2618 MS (a)2126 2618 MS (m)2170 2618 MS (e)2248 2618 MS ( )2292 2618 MS (o)2317 2618 MS (f)2367 2618 MS ( )2400 2618 MS (s)2425 2618 MS (o)2464 2618 MS (f)2514 2618 MS (t)2547 2618 MS (w)2575 2618 MS (a)2648 2618 MS (r)2692 2618 MS (e)2725 2618 MS (,)2769 2618 MS ( )2794 2618 MS (v)2819 2618 MS (e)2870 2618 MS (r)2914 2618 MS (s)2947 2618 MS (i)2986 2618 MS (o)3014 2618 MS (n)3064 2618 MS ( )3114 2618 MS (n)3139 2618 MS (u)3189 2618 MS (m)3239 2618 MS (b)3317 2618 MS (e)3367 2618 MS (r)3411 2618 MS (,)3444 2618 MS ( )3469 2618 MS (a)3495 2618 MS (n)3539 2618 MS (d)3589 2618 MS ( )3639 2618 MS (r)3664 2618 MS (e)3697 2618 MS (l)3741 2618 MS (e)3769 2618 MS (a)3814 2618 MS (s)3858 2618 MS (e)3897 2618 MS ( )3941 2618 MS (d)3966 2618 MS (a)4017 2618 MS (t)4061 2618 MS (e)4089 2618 MS (])4133 2618 MS (,)4167 2618 MS (d)490 2733 MS (e)540 2733 MS (v)584 2733 MS (e)634 2733 MS (l)678 2733 MS (o)706 2733 MS (p)756 2733 MS (e)806 2733 MS (d)850 2733 MS ( )900 2733 MS (b)925 2733 MS (y)977 2733 MS ( )1025 2733 MS (S)1050 2733 MS (i)1106 2733 MS (l)1134 2733 MS (i)1162 2733 MS (c)1190 2733 MS (o)1234 2733 MS (n)1284 2733 MS ( )1334 2733 MS (G)1359 2733 MS (r)1431 2733 MS (a)1464 2733 MS (p)1508 2733 MS (h)1558 2733 MS (i)1608 2733 MS (c)1636 2733 MS (s)1680 2733 MS (,)1719 2733 MS ( )1744 2733 MS (I)1771 2733 MS (n)1803 2733 MS (c)1853 2733 MS (.)1897 2733 MS ( )1922 2733 MS (T)1947 2733 MS (h)2008 2733 MS (e)2059 2733 MS ( )2103 2733 MS (O)2128 2733 MS (r)2200 2733 MS (i)2233 2733 MS (g)2262 2733 MS (i)2311 2733 MS (n)2339 2733 MS (a)2389 2733 MS (l)2433 2733 MS ( )2461 2733 MS (C)2486 2733 MS (o)2553 2733 MS (d)2603 2733 MS (e)2653 2733 MS ( )2697 2733 MS (i)2722 2733 MS (s)2750 2733 MS ( )2789 2733 MS (C)2814 2733 MS (o)2881 2733 MS (p)2931 2733 MS (y)2982 2733 MS (r)3030 2733 MS (i)3063 2733 MS (g)3092 2733 MS (h)3141 2733 MS (t)3191 2733 MS ( )3219 2733 MS (\()3245 2733 MS (c)3278 2733 MS (\))3322 2733 MS ( )3355 2733 MS ([)3380 2733 MS (d)3414 2733 MS (a)3464 2733 MS (t)3508 2733 MS (e)3536 2733 MS (s)3580 2733 MS ( )3619 2733 MS (o)3644 2733 MS (f)3694 2733 MS ( )3727 2733 MS (f)3753 2733 MS (i)3786 2733 MS (r)3814 2733 MS (s)3847 2733 MS (t)3886 2733 MS (p)490 2848 MS (u)540 2848 MS (b)590 2848 MS (l)640 2848 MS (i)668 2848 MS (c)696 2848 MS (a)740 2848 MS (t)784 2848 MS (i)812 2848 MS (o)840 2848 MS (n)890 2848 MS (,)940 2848 MS ( )965 2848 MS (a)990 2848 MS (s)1034 2848 MS ( )1073 2848 MS (a)1098 2848 MS (p)1142 2848 MS (p)1192 2848 MS (e)1242 2848 MS (a)1286 2848 MS (r)1331 2848 MS (i)1364 2848 MS (n)1392 2848 MS (g)1443 2848 MS ( )1492 2848 MS (i)1517 2848 MS (n)1545 2848 MS ( )1595 2848 MS (t)1620 2848 MS (h)1648 2848 MS (e)1698 2848 MS ( )1742 2848 MS (N)1767 2848 MS (o)1839 2848 MS (t)1889 2848 MS (i)1917 2848 MS (c)1945 2848 MS (e)1989 2848 MS ( )2033 2848 MS (i)2058 2848 MS (n)2086 2848 MS ( )2136 2848 MS (t)2161 2848 MS (h)2189 2848 MS (e)2239 2848 MS ( )2283 2848 MS (O)2308 2848 MS (r)2381 2848 MS (i)2414 2848 MS (g)2442 2848 MS (i)2491 2848 MS (n)2519 2848 MS (a)2570 2848 MS (l)2614 2848 MS ( )2642 2848 MS (C)2667 2848 MS (o)2734 2848 MS (d)2784 2848 MS (e)2834 2848 MS (])2878 2848 MS ( )2912 2848 MS (S)2937 2848 MS (i)2993 2848 MS (l)3021 2848 MS (i)3049 2848 MS (c)3077 2848 MS (o)3121 2848 MS (n)3171 2848 MS ( )3221 2848 MS (G)3246 2848 MS (r)3318 2848 MS (a)3351 2848 MS (p)3395 2848 MS (h)3445 2848 MS (i)3495 2848 MS (c)3523 2848 MS (s)3567 2848 MS (,)3606 2848 MS ( )3631 2848 MS (I)3657 2848 MS (n)3688 2848 MS (c)3739 2848 MS (.)3783 2848 MS ( )3808 2848 MS (C)3833 2848 MS (o)3900 2848 MS (p)3950 2848 MS (y)4002 2848 MS (r)4050 2848 MS (i)4083 2848 MS (g)4112 2848 MS (h)4161 2848 MS (t)4211 2848 MS ( )4239 2848 MS (i)4264 2848 MS (n)4292 2848 MS (a)490 2962 MS (n)534 2962 MS (y)585 2962 MS ( )633 2962 MS (p)658 2962 MS (o)708 2962 MS (r)759 2962 MS (t)792 2962 MS (i)820 2962 MS (o)848 2962 MS (n)898 2962 MS (s)948 2962 MS ( )987 2962 MS (c)1012 2962 MS (r)1056 2962 MS (e)1089 2962 MS (a)1134 2962 MS (t)1178 2962 MS (e)1206 2962 MS (d)1250 2962 MS ( )1300 2962 MS (b)1325 2962 MS (y)1377 2962 MS ( )1425 2962 MS (t)1450 2962 MS (h)1478 2962 MS (i)1528 2962 MS (r)1556 2962 MS (d)1589 2962 MS ( )1639 2962 MS (p)1664 2962 MS (a)1714 2962 MS (r)1758 2962 MS (t)1791 2962 MS (i)1819 2962 MS (e)1847 2962 MS (s)1891 2962 MS ( )1930 2962 MS (i)1955 2962 MS (s)1983 2962 MS ( )2022 2962 MS (a)2047 2962 MS (s)2091 2962 MS ( )2130 2962 MS (i)2155 2962 MS (n)2183 2962 MS (d)2233 2962 MS (i)2283 2962 MS (c)2311 2962 MS (a)2356 2962 MS (t)2400 2962 MS (e)2428 2962 MS (d)2472 2962 MS ( )2522 2962 MS (e)2547 2962 MS (l)2591 2962 MS (s)2619 2962 MS (e)2658 2962 MS (w)2703 2962 MS (h)2775 2962 MS (e)2825 2962 MS (r)2869 2962 MS (e)2903 2962 MS ( )2947 2962 MS (h)2972 2962 MS (e)3022 2962 MS (r)3066 2962 MS (e)3100 2962 MS (i)3144 2962 MS (n)3172 2962 MS (.)3222 2962 MS ( )3247 2962 MS (A)3272 2962 MS (l)3344 2962 MS (l)3372 2962 MS ( )3400 2962 MS (R)3425 2962 MS (i)3492 2962 MS (g)3520 2962 MS (h)3569 2962 MS (t)3619 2962 MS (s)3647 2962 MS ( )3686 2962 MS (R)3711 2962 MS (e)3778 2962 MS (s)3822 2962 MS (e)3861 2962 MS (r)3905 2962 MS (v)3938 2962 MS (e)3989 2962 MS (d)4033 2962 MS (.)4083 2962 MS [100 0 0 -100 0 0]/Times-Bold MF (A)490 3161 MS (d)562 3161 MS (d)618 3161 MS (i)674 3161 MS (t)702 3161 MS (i)735 3161 MS (o)763 3161 MS (n)813 3161 MS (a)869 3161 MS (l)919 3161 MS ( )947 3161 MS (N)972 3161 MS (o)1044 3161 MS (t)1094 3161 MS (i)1127 3161 MS (c)1155 3161 MS (e)1199 3161 MS ( )1243 3161 MS (P)1268 3161 MS (r)1328 3161 MS (o)1372 3161 MS (v)1422 3161 MS (i)1472 3161 MS (s)1500 3161 MS (i)1539 3161 MS (o)1567 3161 MS (n)1617 3161 MS (s)1673 3161 MS (:)1712 3161 MS ( )1745 3161 MS [100 0 0 -100 0 0]/Times-Roman MF ([)1770 3161 MS (s)1804 3161 MS (u)1843 3161 MS (c)1893 3161 MS (h)1937 3161 MS ( )1987 3161 MS (a)2012 3161 MS (d)2056 3161 MS (d)2106 3161 MS (i)2156 3161 MS (t)2184 3161 MS (i)2212 3161 MS (o)2240 3161 MS (n)2290 3161 MS (a)2340 3161 MS (l)2384 3161 MS ( )2412 3161 MS (p)2437 3161 MS (r)2487 3161 MS (o)2520 3161 MS (v)2570 3161 MS (i)2620 3161 MS (s)2648 3161 MS (i)2687 3161 MS (o)2715 3161 MS (n)2765 3161 MS (s)2815 3161 MS (,)2854 3161 MS ( )2879 3161 MS (i)2904 3161 MS (f)2932 3161 MS ( )2965 3161 MS (a)2990 3161 MS (n)3034 3161 MS (y)3085 3161 MS (,)3133 3161 MS ( )3158 3161 MS (a)3184 3161 MS (s)3228 3161 MS ( )3267 3161 MS (a)3292 3161 MS (p)3336 3161 MS (p)3386 3161 MS (e)3437 3161 MS (a)3481 3161 MS (r)3525 3161 MS ( )3558 3161 MS (i)3583 3161 MS (n)3611 3161 MS ( )3661 3161 MS (t)3686 3161 MS (h)3714 3161 MS (e)3764 3161 MS ( )3808 3161 MS (N)3833 3161 MS (o)3905 3161 MS (t)3955 3161 MS (i)3983 3161 MS (c)4011 3161 MS (e)4056 3161 MS ( )4100 3161 MS (i)4125 3161 MS (n)4153 3161 MS ( )4203 3161 MS (t)4228 3161 MS (h)4256 3161 MS (e)4306 3161 MS (O)490 3275 MS (r)562 3275 MS (i)595 3275 MS (g)623 3275 MS (i)672 3275 MS (n)700 3275 MS (a)750 3275 MS (l)794 3275 MS ( )822 3275 MS (C)847 3275 MS (o)914 3275 MS (d)964 3275 MS (e)1014 3275 MS ( )1058 3275 MS (u)1083 3275 MS (n)1133 3275 MS (d)1183 3275 MS (e)1234 3275 MS (r)1278 3275 MS ( )1311 3275 MS (t)1336 3275 MS (h)1364 3275 MS (e)1414 3275 MS ( )1458 3275 MS (h)1483 3275 MS (e)1534 3275 MS (a)1578 3275 MS (d)1622 3275 MS (i)1672 3275 MS (n)1700 3275 MS (g)1751 3275 MS ( )1800 3275 MS (")1826 3275 MS (A)1866 3275 MS (d)1938 3275 MS (d)1988 3275 MS (i)2038 3275 MS (t)2066 3275 MS (i)2094 3275 MS (o)2122 3275 MS (n)2172 3275 MS (a)2222 3275 MS (l)2266 3275 MS ( )2294 3275 MS (N)2319 3275 MS (o)2391 3275 MS (t)2441 3275 MS (i)2469 3275 MS (c)2497 3275 MS (e)2541 3275 MS ( )2585 3275 MS (P)2610 3275 MS (r)2666 3275 MS (o)2699 3275 MS (v)2749 3275 MS (i)2799 3275 MS (s)2827 3275 MS (i)2866 3275 MS (o)2894 3275 MS (n)2944 3275 MS (s)2994 3275 MS (")3033 3275 MS (])3073 3275 MS showpage PageSV restore %%Trailer %%DocumentNeededFonts: %%+ Helvetica %%+ Helvetica-Bold %%+ Times-Bold %%+ Times-Roman %%DocumentSuppliedFonts: end %%Pages: 5 %%EOF --- NEW FILE jogl-README.txt --- JOGL javadoc documentation is available in the jogl-javadoc RPM package. Each JOGL source file is licensed under one of the two following licenses. See the JOGL source code for details. ============================================================================= /* * Copyright (c) 2003 Sun Microsystems, 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: * * - Redistribution of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * - Redistribution in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * * Neither the name of Sun Microsystems, Inc. or the names of * contributors may be used to endorse or promote products derived from * this software without specific prior written permission. * * This software is provided "AS IS," without a warranty of any kind. ALL * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES, * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN * MIDROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY, * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. * * You acknowledge that this software is not designed or intended for use * in the design, construction, operation or maintenance of any nuclear * facility. * * Sun gratefully acknowledges that this software was originally authored * and developed by Kenneth Bradley Russell and Christopher John Kline. */ ============================================================================= /* ** License Applicability. Except to the extent portions of this file are ** made subject to an alternative license as permitted in the SGI Free ** Software License B, Version 1.1 (the "License"), the contents of this ** file are subject only to the provisions of the License. You may not use ** this file except in compliance with the License. You may obtain a copy ** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600 ** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at: ** ** http://oss.sgi.com/projects/FreeB ** ** Note that, as provided in the License, the Software is distributed on an ** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS ** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND ** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A ** PARTICULAR PURPOSE, AND NON-INFRINGEMENT. ** ** Original Code. The Original Code is: OpenGL Sample Implementation, ** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics, ** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc. ** Copyright in any portions created by third parties is as indicated ** elsewhere herein. All Rights Reserved. ** ** Additional Notice Provisions: The application programming interfaces ** established by SGI in conjunction with the Original Code are The ** OpenGL(R) Graphics System: A Specification (Version 1.2.1), released ** April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version ** 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X ** Window System(R) (Version 1.3), released October 19, 1998. This software ** was created using the OpenGL(R) version 1.2.1 Sample Implementation ** published by SGI, but has not been independently verified as being ** compliant with the OpenGL(R) version 1.2.1 Specification. ** ** Author: Eric Veach, July 1994 ** Java Port: Pepijn Van Eeckhoudt, July 2003 ** Java Port: Nathan Parker Burg, August 2003 */ ============================================================================= --- NEW FILE jogl.properties --- ############################################################################### # The host specific properties. The build will inform you of required # properties. This file must be copied into your home directory (pointed # to by the Java system property user.home) and the copy modified appropriately. ############################################################################### # # java.home.dir is usually inferred from the java.home variable. # If it appears the build is failing because of an inability to # find e.g. JAWT or JNI headers, override this to point to the # root directory of your JDK. # # java.home.dir=C:/jdk1.4.2 # # The required antlr.jar property that is the full path to the antlr.jar # including the name of the jar # # Windows # antlr.jar=C:/Users/kbr/ANTLR/antlr-2.7.2/antlr.jar # Linux antlr.jar=/usr/share/java/antlr-2.7.4.jar # Mac OS X # antlr.jar=/Users/kbr/antlr-2.7.2/antlr.jar # Solaris # antlr.jar=/export/kbr/ANTLR/antlr-2.7.2/antlr.jar # # Force the use of jikes in +E (emacs) mode # NOTE: this is optional # #build.compiler=jikes #build.compiler.emacs=true # # If you are building on Windows with Visual C++ 6.0 and have installed # the compiler in somewhere other than the default location, modify this # to point to the absolute path of the VC98 directory # vc6.root=C:/Program Files/Microsoft Visual Studio/VC98 # # If you are building on Windows with Visual C++ 7.0 and have installed # the compiler in somewhere other than the default location, modify this # to point to the absolute path of the VC98 directory # vc7.root=C:/Program Files/Microsoft Visual Studio .NET/Vc7 # # If you are building the Cg binding (by specifying -Djogl.cg=1 to the # Ant build) and have installed the Cg SDK in somewhere other than the # default location, modify the appropriate variable to point to the # absolute path of the lib directory # windows.cg.lib=C:/Program Files/Nvidia Corporation/Cg/lib x11.cg.lib=/usr/lib --- NEW FILE jogl.spec --- Name: jogl Version: 1.1.1 Release: 1 Epoch: 0 Summary: Java bindings for the OpenGL API Group: System Environment/Libraries License: BSD URL: http://jogl.dev.java.net/ Source0: jogl-src.zip Source1: jogl.properties Source2: SGIFreeSWLicB.1.1.ps Source3: jogl-README.txt BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ant, antlr, jpackage-utils >= 0:1.5 BuildRequires: xorg-x11-devel BuildRequires: java-gcj-compat-devel >= 1.0.31 Requires(post): java-gcj-compat >= 1.0.31 Requires(postun): java-gcj-compat >= 1.0.31 %description The JOGL Project hosts a reference implementation of the Java bindings for OpenGL API, and is designed to provide hardware-supported 3D graphics to applications written in the Java programming language. Is is part of a suite of open-source technologies initiated bu the Game Technology Group at Sun Microsystems. JOGL provides full access to the APIs in the OpenGL 1.5 specification as well as nearly all vendor extensions, and integrated with the AWT and Swing widget sets. %package javadoc Summary: Javadoc for %{name} Group: Development/Documentation #BuildRequires: java-javadoc %description javadoc %{summary}. %prep %setup -q -n jogl cp %{SOURCE1} . cp %{SOURCE2} . cp %{SOURCE3} . %build (cd make && ant -Duser.home=%{_topdir}/SOURCES linux javadoc.dev.x11) # Rename the jar into a versioned jar name and create the .so version. mv build/jogl.jar build/%{name}-%{version}.jar %install rm -rf $RPM_BUILD_ROOT install -dm 755 $RPM_BUILD_ROOT%{_javadir} install -pm 644 build/%{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar install -dm 755 $RPM_BUILD_ROOT%{_libdir} install -pm 755 build/obj/libjogl.so $RPM_BUILD_ROOT%{_libdir}/libjogl.so install -dm 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} cp -pR javadoc_jogl_dev/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} aot-compile-rpm %clean rm -rf $RPM_BUILD_ROOT %post %{_bindir}/rebuild-gcj-db ldconfig %postun %{_bindir}/rebuild-gcj-db ldconfig %post javadoc rm -f %{_javadocdir}/%{name} ln -s %{name}-%{version} %{_javadocdir}/%{name} %files %defattr(644,root,root,755) %doc SGIFreeSWLicB.1.1.ps %doc jogl-README.txt %doc doc/* %{_javadir}/*.jar %{_libdir}/gcj/* %{_libdir}/*.so # %attr(-,root,root) %{_libdir}/gcj/%{name} %files javadoc %defattr(644,root,root,755) %doc %{_javadocdir}/%{name}-%{version} %ghost %doc %{_javadocdir}/%{name} %changelog * Thu Sep 1 2005 Anthony Green - 0:1.1.1-1 - Use aot-compile-rpm and other fixes from Tom Fitzsimmons. * Mon Aug 22 2005 Anthony Green - 0:1.1b12-2fc4 - Add --as-needed linker options. * Mon Jun 20 2005 Anthony Green - 0:1.1b12-1fc4 - Upgrade to 1.1 beta 12. - Rebuilt on real FC4 system. * Mon May 16 2005 Anthony Green - 0:1.1b11-1fc - Build requires xorg-x11-devel. - Switch to aot-compile from find-and-nativify. - Upgrade to 1.1 beta 11. * Sun Apr 3 2005 Anthony Green - 0:1.1b10-1fc - Created. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/jogl/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 3 Sep 2005 17:49:58 -0000 1.1 +++ .cvsignore 3 Sep 2005 17:51:45 -0000 1.2 @@ -0,0 +1 @@ +jogl-src.zip Index: sources =================================================================== RCS file: /cvs/extras/rpms/jogl/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 3 Sep 2005 17:49:58 -0000 1.1 +++ sources 3 Sep 2005 17:51:45 -0000 1.2 @@ -0,0 +1 @@ +a5d6b630a17b41227ab41506c826277b jogl-src.zip From fedora-extras-commits at redhat.com Sat Sep 3 17:51:46 2005 From: fedora-extras-commits at redhat.com (Anthony Green (green)) Date: Sat, 3 Sep 2005 13:51:46 -0400 Subject: rpms/jogl import.log,1.1,1.2 Message-ID: <200509031751.j83Hpkgq030829@cvs-int.fedora.redhat.com> Author: green Update of /cvs/extras/rpms/jogl In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30789 Modified Files: import.log Log Message: auto-import jogl-1.1.1-1 on branch devel from jogl-1.1.1-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/jogl/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 3 Sep 2005 17:49:57 -0000 1.1 +++ import.log 3 Sep 2005 17:51:44 -0000 1.2 @@ -0,0 +1 @@ +jogl-1_1_1-1:HEAD:jogl-1.1.1-1.src.rpm:1125769878 From fedora-extras-commits at redhat.com Sat Sep 3 17:55:40 2005 From: fedora-extras-commits at redhat.com (Anthony Green (green)) Date: Sat, 3 Sep 2005 13:55:40 -0400 Subject: owners owners.list,1.161,1.162 Message-ID: <200509031755.j83Htexb030895@cvs-int.fedora.redhat.com> Author: green Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30876 Modified Files: owners.list Log Message: Add entry for jogl. Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.161 retrieving revision 1.162 diff -u -r1.161 -r1.162 --- owners.list 3 Sep 2005 10:51:08 -0000 1.161 +++ owners.list 3 Sep 2005 17:55:38 -0000 1.162 @@ -336,6 +336,7 @@ Fedora Extras|jhead|Tool for displaying EXIF data embedded in JPEG images|adrian at lisas.de|extras-qa at fedoraproject.org| Fedora Extras|jikes|A Java source file to bytecode compiler|ville.skytta at iki.fi|extras-qa at fedoraproject.org| Fedora Extras|jlint|Java program checker|ville.skytta at iki.fi|extras-qa at fedoraproject.org| +Fedora Extras|jogl|Java bindings for the OpenGL API|green at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|john|John the Ripper password cracker|ghenry at suretecsystems.com|extras-qa at fedoraproject.org| Fedora Extras|jpgraph|An OO graph drawing class library for PHP|gauret at free.fr|extras-qa at fedoraproject.org| Fedora Extras|js|JavaScript interpreter|matthias at rpmforge.net|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Sat Sep 3 18:19:41 2005 From: fedora-extras-commits at redhat.com (Anthony Green (green)) Date: Sat, 3 Sep 2005 14:19:41 -0400 Subject: rpms/jogl/devel jogl.spec,1.1,1.2 Message-ID: <200509031819.j83IJfGw032250@cvs-int.fedora.redhat.com> Author: green Update of /cvs/extras/rpms/jogl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32231 Modified Files: jogl.spec Log Message: Add some debug output to the build process in order to debug the FE build. Index: jogl.spec =================================================================== RCS file: /cvs/extras/rpms/jogl/devel/jogl.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- jogl.spec 3 Sep 2005 17:51:45 -0000 1.1 +++ jogl.spec 3 Sep 2005 18:19:39 -0000 1.2 @@ -43,7 +43,8 @@ cp %{SOURCE3} . %build -(cd make && ant -Duser.home=%{_topdir}/SOURCES linux javadoc.dev.x11) +ls -l /usr/share/java +(cd make && ant -verbose -Duser.home=%{_topdir}/SOURCES linux javadoc.dev.x11) # Rename the jar into a versioned jar name and create the .so version. mv build/jogl.jar build/%{name}-%{version}.jar From fedora-extras-commits at redhat.com Sat Sep 3 18:26:18 2005 From: fedora-extras-commits at redhat.com (Anthony Green (green)) Date: Sat, 3 Sep 2005 14:26:18 -0400 Subject: rpms/jogl/devel jogl.spec,1.2,1.3 Message-ID: <200509031826.j83IQIlj032314@cvs-int.fedora.redhat.com> Author: green Update of /cvs/extras/rpms/jogl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32295 Modified Files: jogl.spec Log Message: Bumped release number. Make build more verbose. Index: jogl.spec =================================================================== RCS file: /cvs/extras/rpms/jogl/devel/jogl.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- jogl.spec 3 Sep 2005 18:19:39 -0000 1.2 +++ jogl.spec 3 Sep 2005 18:26:16 -0000 1.3 @@ -1,6 +1,6 @@ Name: jogl Version: 1.1.1 -Release: 1 +Release: 2 Epoch: 0 Summary: Java bindings for the OpenGL API @@ -96,6 +96,10 @@ %ghost %doc %{_javadocdir}/%{name} %changelog +* Sat Sep 3 2005 Anthony Green - 0:1.1.1-2 +- Make build more verbose to debug build problems on FE build + infrastructure. + * Thu Sep 1 2005 Anthony Green - 0:1.1.1-1 - Use aot-compile-rpm and other fixes from Tom Fitzsimmons. From fedora-extras-commits at redhat.com Sat Sep 3 18:33:12 2005 From: fedora-extras-commits at redhat.com (John Patrick Mahowald (jpmahowa)) Date: Sat, 3 Sep 2005 14:33:12 -0400 Subject: owners owners.list,1.162,1.163 Message-ID: <200509031833.j83IXC9D032390@cvs-int.fedora.redhat.com> Author: jpmahowa Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32369 Modified Files: owners.list Log Message: CC fixed on smeg and pyxdg Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.162 retrieving revision 1.163 diff -u -r1.162 -r1.163 --- owners.list 3 Sep 2005 17:55:38 -0000 1.162 +++ owners.list 3 Sep 2005 18:33:10 -0000 1.163 @@ -791,7 +791,7 @@ Fedora Extras|python-twisted|Event-driven networking framework written in Python|thomas at apestaart.org|extras-qa at fedoraproject.org| Fedora Extras|pygsl|GNU Scientific Library Interface for python|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| Fedora Extras|pytz|World Timezone Definitions for Python|orion at cora.nwra.com|extras-qa at fedoraproject.org| -Fedora Extras|pyxdg|PyXDG is a python library to access freedesktop.org standards|jpmahowald at gmail.com|extras-qa at fedoraproject.org|foolish at fedoraforum.org +Fedora Extras|pyxdg|PyXDG is a python library to access freedesktop.org standards|jpmahowald at gmail.com|extras-qa at fedoraproject.org|foolish at guezz.net Fedora Extras|pyzor|Pyzor collaborative spam filtering system|wtogami at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|qa-assistant|Graphical quality assurance report generator|toshio at tiki-lounge.com|extras-qa at fedoraproject.org| Fedora Extras|qascade|QT port of classic puzzle game|ville.skytta at iki.fi|extras-qa at fedoraproject.org| @@ -860,7 +860,7 @@ Fedora Extras|sirius|Othello for Gnome|compton at pcompton.com|extras-qa at fedoraproject.org| Fedora Extras|skencil|A vector drawing program|gemi at bluewin.ch|extras-qa at fedoraproject.org| Fedora Extras|skkdic|Japanese dictionaries for skk input|petersen at redhat.com|extras-qa at fedoraproject.org| -Fedora Extras|smeg|Simple menu editor for GNOME|jpmahowald at gmail.com|extras-qa at fedoraproject.org|foolish at fedoraforum.org +Fedora Extras|smeg|Simple menu editor for GNOME|jpmahowald at gmail.com|extras-qa at fedoraproject.org|foolish at guezz.net Fedora Extras|snort|An intrusion detection system|compton at pcompton.com|extras-qa at fedoraproject.org| Fedora Extras|snownews|A RSS/RDF news aggregator|shishz at hotpop.com|extras-qa at fedoraproject.org| Fedora Extras|sodipodi|Vector-based drawing program|compton at pcompton.com|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Sat Sep 3 18:34:29 2005 From: fedora-extras-commits at redhat.com (Anthony Green (green)) Date: Sat, 3 Sep 2005 14:34:29 -0400 Subject: rpms/jogl/devel jogl.spec,1.3,1.4 Message-ID: <200509031834.j83IYTrk032415@cvs-int.fedora.redhat.com> Author: green Update of /cvs/extras/rpms/jogl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32396 Modified Files: jogl.spec Log Message: BuildRequire ant-antlr Index: jogl.spec =================================================================== RCS file: /cvs/extras/rpms/jogl/devel/jogl.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- jogl.spec 3 Sep 2005 18:26:16 -0000 1.3 +++ jogl.spec 3 Sep 2005 18:34:27 -0000 1.4 @@ -1,6 +1,6 @@ Name: jogl Version: 1.1.1 -Release: 2 +Release: 3 Epoch: 0 Summary: Java bindings for the OpenGL API @@ -13,7 +13,7 @@ Source3: jogl-README.txt BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: ant, antlr, jpackage-utils >= 0:1.5 +BuildRequires: ant, antlr, ant-antlr, jpackage-utils >= 0:1.5 BuildRequires: xorg-x11-devel BuildRequires: java-gcj-compat-devel >= 1.0.31 Requires(post): java-gcj-compat >= 1.0.31 @@ -43,8 +43,7 @@ cp %{SOURCE3} . %build -ls -l /usr/share/java -(cd make && ant -verbose -Duser.home=%{_topdir}/SOURCES linux javadoc.dev.x11) +(cd make && ant -Duser.home=%{_topdir}/SOURCES linux javadoc.dev.x11) # Rename the jar into a versioned jar name and create the .so version. mv build/jogl.jar build/%{name}-%{version}.jar @@ -96,6 +95,9 @@ %ghost %doc %{_javadocdir}/%{name} %changelog +* Sat Sep 3 2005 Anthony Green - 0:1.1.1-3 +- BuildRequire ant-antlr. + * Sat Sep 3 2005 Anthony Green - 0:1.1.1-2 - Make build more verbose to debug build problems on FE build infrastructure. From fedora-extras-commits at redhat.com Sat Sep 3 18:55:29 2005 From: fedora-extras-commits at redhat.com (Anthony Green (green)) Date: Sat, 3 Sep 2005 14:55:29 -0400 Subject: rpms/jogl/devel jogl-ppc.patch,NONE,1.1 jogl.spec,1.4,1.5 Message-ID: <200509031855.j83ItTpa032518@cvs-int.fedora.redhat.com> Author: green Update of /cvs/extras/rpms/jogl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32496 Modified Files: jogl.spec Added Files: jogl-ppc.patch Log Message: Add ppc patch. jogl-ppc.patch: --- NEW FILE jogl-ppc.patch --- --- src/net/java/games/gluegen/StructLayout.java~ 2005-05-27 14:24:16.000000000 -0700 +++ src/net/java/games/gluegen/StructLayout.java 2005-09-03 11:50:26.000000000 -0700 @@ -124,6 +124,7 @@ public class StructLayout { if ((os.startsWith("windows") && cpu.equals("x86")) || (os.startsWith("linux") && cpu.equals("i386")) || (os.startsWith("linux") && cpu.equals("amd64")) || + (os.startsWith("linux") && cpu.equals("ppc")) || (os.startsWith("linux") && cpu.equals("ia64")) || (os.startsWith("sunos") && cpu.equals("sparc")) || (os.startsWith("sunos") && cpu.equals("x86")) || Index: jogl.spec =================================================================== RCS file: /cvs/extras/rpms/jogl/devel/jogl.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- jogl.spec 3 Sep 2005 18:34:27 -0000 1.4 +++ jogl.spec 3 Sep 2005 18:55:27 -0000 1.5 @@ -1,6 +1,6 @@ Name: jogl Version: 1.1.1 -Release: 3 +Release: 4 Epoch: 0 Summary: Java bindings for the OpenGL API @@ -11,6 +11,7 @@ Source1: jogl.properties Source2: SGIFreeSWLicB.1.1.ps Source3: jogl-README.txt +Patch0: jogl-ppc.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ant, antlr, ant-antlr, jpackage-utils >= 0:1.5 @@ -38,6 +39,7 @@ %prep %setup -q -n jogl +%patch0 -p0 cp %{SOURCE1} . cp %{SOURCE2} . cp %{SOURCE3} . @@ -95,6 +97,9 @@ %ghost %doc %{_javadocdir}/%{name} %changelog +* Sat Sep 3 2005 Anthony Green - 0:1.1.1-4 +- Add ppc build patch. + * Sat Sep 3 2005 Anthony Green - 0:1.1.1-3 - BuildRequire ant-antlr. From fedora-extras-commits at redhat.com Sat Sep 3 19:36:44 2005 From: fedora-extras-commits at redhat.com (Anthony Green (green)) Date: Sat, 3 Sep 2005 15:36:44 -0400 Subject: rpms/jogl/devel jogl-nojavadoclink.patch, NONE, 1.1 jogl.spec, 1.5, 1.6 Message-ID: <200509031936.j83Jai7M001435@cvs-int.fedora.redhat.com> Author: green Update of /cvs/extras/rpms/jogl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1413 Modified Files: jogl.spec Added Files: jogl-nojavadoclink.patch Log Message: Add nojavadoclink patch. jogl-nojavadoclink.patch: --- NEW FILE jogl-nojavadoclink.patch --- --- make/build.xml~ 2005-05-13 16:35:36.000000000 -0700 +++ make/build.xml 2005-09-03 12:32:23.000000000 -0700 @@ -928,8 +928,7 @@ + source="1.4" /> @@ -938,8 +937,7 @@ + source="1.4" /> @@ -949,8 +947,7 @@ + source="1.4" /> @@ -959,8 +956,7 @@ + source="1.4" /> Index: jogl.spec =================================================================== RCS file: /cvs/extras/rpms/jogl/devel/jogl.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- jogl.spec 3 Sep 2005 18:55:27 -0000 1.5 +++ jogl.spec 3 Sep 2005 19:36:42 -0000 1.6 @@ -1,6 +1,6 @@ Name: jogl Version: 1.1.1 -Release: 4 +Release: 5 Epoch: 0 Summary: Java bindings for the OpenGL API @@ -12,6 +12,7 @@ Source2: SGIFreeSWLicB.1.1.ps Source3: jogl-README.txt Patch0: jogl-ppc.patch +Patch1: jogl-nojavadoclink.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ant, antlr, ant-antlr, jpackage-utils >= 0:1.5 @@ -40,6 +41,7 @@ %prep %setup -q -n jogl %patch0 -p0 +%patch1 -p0 cp %{SOURCE1} . cp %{SOURCE2} . cp %{SOURCE3} . @@ -97,6 +99,10 @@ %ghost %doc %{_javadocdir}/%{name} %changelog +* Sat Sep 3 2005 Anthony Green - 0:1.1.1-5 +- Add nojavadoclink patch so we don't end up referencing Sun's + javadocs. + * Sat Sep 3 2005 Anthony Green - 0:1.1.1-4 - Add ppc build patch. From fedora-extras-commits at redhat.com Sat Sep 3 20:40:19 2005 From: fedora-extras-commits at redhat.com (Anthony Green (green)) Date: Sat, 3 Sep 2005 16:40:19 -0400 Subject: rpms/jogl/devel jogl-ppctools.patch,NONE,1.1 jogl.spec,1.6,1.7 Message-ID: <200509032040.j83KeJiJ002833@cvs-int.fedora.redhat.com> Author: green Update of /cvs/extras/rpms/jogl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2811 Modified Files: jogl.spec Added Files: jogl-ppctools.patch Log Message: ppc build fixes. only build for x86 and ppc for now. remove epoch:0. jogl-ppctools.patch: --- NEW FILE jogl-ppctools.patch --- *** make/build.xml.old 2005-09-03 13:17:38.000000000 -0700 --- make/build.xml 2005-09-03 13:17:46.000000000 -0700 *************** *** 202,207 **** --- 202,208 ---- + *************** *** 315,320 **** --- 316,329 ---- + + + + + + + + *************** *** 684,689 **** --- 693,702 ---- + + + + *************** *** 885,890 **** --- 898,906 ---- + + + *************** Use a platform specific target: linux, *** 1093,1098 **** --- 1109,1125 ---- + + + + + + + + + Index: jogl.spec =================================================================== RCS file: /cvs/extras/rpms/jogl/devel/jogl.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- jogl.spec 3 Sep 2005 19:36:42 -0000 1.6 +++ jogl.spec 3 Sep 2005 20:40:16 -0000 1.7 @@ -1,7 +1,8 @@ +ExclusiveArch: %{ix86} ppc + Name: jogl Version: 1.1.1 -Release: 5 -Epoch: 0 +Release: 6 Summary: Java bindings for the OpenGL API Group: System Environment/Libraries @@ -13,9 +14,10 @@ Source3: jogl-README.txt Patch0: jogl-ppc.patch Patch1: jogl-nojavadoclink.patch +Patch2: jogl-ppctools.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: ant, antlr, ant-antlr, jpackage-utils >= 0:1.5 +BuildRequires: ant, antlr, ant-antlr, jpackage-utils >= 1.5 BuildRequires: xorg-x11-devel BuildRequires: java-gcj-compat-devel >= 1.0.31 Requires(post): java-gcj-compat >= 1.0.31 @@ -42,12 +44,19 @@ %setup -q -n jogl %patch0 -p0 %patch1 -p0 +%patch2 -p0 cp %{SOURCE1} . cp %{SOURCE2} . cp %{SOURCE3} . %build -(cd make && ant -Duser.home=%{_topdir}/SOURCES linux javadoc.dev.x11) + +TARGET=linux +%ifarch ppc +TARGET=linux.ppc +%endif + +(cd make && ant -Duser.home=%{_topdir}/SOURCES $TARGET javadoc.dev.x11) # Rename the jar into a versioned jar name and create the .so version. mv build/jogl.jar build/%{name}-%{version}.jar @@ -99,6 +108,10 @@ %ghost %doc %{_javadocdir}/%{name} %changelog +* Sat Sep 3 2005 Anthony Green - 0:1.1.1-6 +- Add ppctools patch and only build for x86 and ppc for now. +- Remove Epoch. + * Sat Sep 3 2005 Anthony Green - 0:1.1.1-5 - Add nojavadoclink patch so we don't end up referencing Sun's javadocs. From fedora-extras-commits at redhat.com Sat Sep 3 21:11:03 2005 From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio)) Date: Sat, 3 Sep 2005 17:11:03 -0400 Subject: owners owners.list,1.163,1.164 Message-ID: <200509032111.j83LB3Sk004221@cvs-int.fedora.redhat.com> Author: toshio Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4200 Modified Files: owners.list Log Message: * Toshio now owns pexpect Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.163 retrieving revision 1.164 diff -u -r1.163 -r1.164 --- owners.list 3 Sep 2005 18:33:10 -0000 1.163 +++ owners.list 3 Sep 2005 21:11:01 -0000 1.164 @@ -727,7 +727,7 @@ Fedora Extras|perl-XML-Writer|A simple Perl module for writing XML documents|thm at duke.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-XML-XPath|XPath parser and evaluator for Perl|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-YAML|YAML Ain't Markup Language (tm)|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com -Fedora Extras|pexpect|Expect module for Python|pmatilai at laiskiainen.org|extras-qa at fedoraproject.org| +Fedora Extras|pexpect|Expect module for Python|toshio at tiki-lounge.com|extras-qa at fedoraproject.org| Fedora Extras|pgadmin3|Graphical client for PostgreSQL|ghenry at suretecsystems.com|extras-qa at fedoraproject.org| Fedora Extras|php-adodb|Active Data Objects Data Base|gauret at free.fr|extras-qa at fedoraproject.org| Fedora Extras|php-eaccelerator|PHP accelerator, optimizer, encoder and dynamic content cacher|matthias at rpmforge.net|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Sat Sep 3 21:49:52 2005 From: fedora-extras-commits at redhat.com (Anthony Green (green)) Date: Sat, 3 Sep 2005 17:49:52 -0400 Subject: rpms/jogl/devel jogl.spec,1.7,1.8 Message-ID: <200509032150.j83LobBc004290@cvs-int.fedora.redhat.com> Author: green Update of /cvs/extras/rpms/jogl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4270 Modified Files: jogl.spec Log Message: Clean uap javadoc handling as per ville.skytta at iki.fi's suggestions in bugzilla. Index: jogl.spec =================================================================== RCS file: /cvs/extras/rpms/jogl/devel/jogl.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- jogl.spec 3 Sep 2005 20:40:16 -0000 1.7 +++ jogl.spec 3 Sep 2005 21:49:45 -0000 1.8 @@ -2,7 +2,7 @@ Name: jogl Version: 1.1.1 -Release: 6 +Release: 7 Summary: Java bindings for the OpenGL API Group: System Environment/Libraries @@ -88,10 +88,6 @@ %{_bindir}/rebuild-gcj-db ldconfig -%post javadoc -rm -f %{_javadocdir}/%{name} -ln -s %{name}-%{version} %{_javadocdir}/%{name} - %files %defattr(644,root,root,755) %doc SGIFreeSWLicB.1.1.ps @@ -105,9 +101,13 @@ %files javadoc %defattr(644,root,root,755) %doc %{_javadocdir}/%{name}-%{version} -%ghost %doc %{_javadocdir}/%{name} +%doc %{_javadocdir}/%{name} %changelog +* Sat Sep 3 2005 Anthony Green - 0:1.1.1-7 +- Removed %ghost for javadoc, and remove javadoc post scriptlet, + as per ville.skytta at iki.fi's suggestion. + * Sat Sep 3 2005 Anthony Green - 0:1.1.1-6 - Add ppctools patch and only build for x86 and ppc for now. - Remove Epoch. From fedora-extras-commits at redhat.com Sat Sep 3 22:07:59 2005 From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez)) Date: Sat, 3 Sep 2005 18:07:59 -0400 Subject: rpms/notecase/FC-4 notecase.spec,1.11,1.12 Message-ID: <200509032207.j83M7x7h005643@cvs-int.fedora.redhat.com> Author: ivazquez Update of /cvs/extras/rpms/notecase/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5591/FC-4 Modified Files: notecase.spec Log Message: - Fixed help file path (#166562) - Use sed instead of dos2unix Index: notecase.spec =================================================================== RCS file: /cvs/extras/rpms/notecase/FC-4/notecase.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- notecase.spec 23 Jul 2005 07:53:24 -0000 1.11 +++ notecase.spec 3 Sep 2005 22:07:57 -0000 1.12 @@ -1,6 +1,6 @@ Name: notecase Version: 1.0.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A hierarchical note manager Group: Applications/Productivity @@ -11,7 +11,7 @@ Patch1: notecase-1.0.0-paths.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: gtk2-devel >= 2.4 desktop-file-utils gettext /usr/bin/dos2unix +BuildRequires: gtk2-devel >= 2.4 desktop-file-utils gettext Requires(post): desktop-file-utils shared-mime-info Requires(postun): desktop-file-utils shared-mime-info @@ -26,9 +26,10 @@ %setup -q -n notecase %patch -p1 %patch1 -p1 -b .paths -find docs -type f -exec /usr/bin/dos2unix \{\} \; -/usr/bin/dos2unix readme.txt -sed -i -e 's!\(#define HELP_FILE_PATH\).*!\1 "%{_docdir}/%{name}-%{version}/help.ncd"! +find docs -type f -exec sed -i -e 's/\r//g' \{\} \; +sed -i -e 's/\r//g' readme.txt +%define ncdhelppath %(sed 's|^%{_prefix}||' <<< "%{_docdir}") +sed -i -e 's!\(#define HELP_FILE_PATH\).*!\1 "%{ncdhelppath}/%{name}-%{version}/help.ncd"! s!\(#define LOCALE_DIR\).*!\1 "%{_datadir}/locale/"!' src/config.h %build @@ -66,6 +67,10 @@ %{_datadir}/mime/packages/%{name}.xml %changelog +* Sat Sep 3 2005 Ignacio Vazquez-Abrams 1.0.0-2 +- Fixed help file path (#166562) +- Use sed instead of dos2unix + * Sat Jul 23 2005 Ignacio Vazquez-Abrams 1.0.0-1 - Upstream update From fedora-extras-commits at redhat.com Sat Sep 3 22:08:00 2005 From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez)) Date: Sat, 3 Sep 2005 18:08:00 -0400 Subject: rpms/notecase/devel notecase.spec,1.11,1.12 Message-ID: <200509032208.j83M80WS005650@cvs-int.fedora.redhat.com> Author: ivazquez Update of /cvs/extras/rpms/notecase/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5591/devel Modified Files: notecase.spec Log Message: - Fixed help file path (#166562) - Use sed instead of dos2unix Index: notecase.spec =================================================================== RCS file: /cvs/extras/rpms/notecase/devel/notecase.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- notecase.spec 23 Jul 2005 07:53:25 -0000 1.11 +++ notecase.spec 3 Sep 2005 22:07:58 -0000 1.12 @@ -1,6 +1,6 @@ Name: notecase Version: 1.0.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A hierarchical note manager Group: Applications/Productivity @@ -11,7 +11,7 @@ Patch1: notecase-1.0.0-paths.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: gtk2-devel >= 2.4 desktop-file-utils gettext /usr/bin/dos2unix +BuildRequires: gtk2-devel >= 2.4 desktop-file-utils gettext Requires(post): desktop-file-utils shared-mime-info Requires(postun): desktop-file-utils shared-mime-info @@ -26,9 +26,10 @@ %setup -q -n notecase %patch -p1 %patch1 -p1 -b .paths -find docs -type f -exec /usr/bin/dos2unix \{\} \; -/usr/bin/dos2unix readme.txt -sed -i -e 's!\(#define HELP_FILE_PATH\).*!\1 "%{_docdir}/%{name}-%{version}/help.ncd"! +find docs -type f -exec sed -i -e 's/\r//g' \{\} \; +sed -i -e 's/\r//g' readme.txt +%define ncdhelppath %(sed 's|^%{_prefix}||' <<< "%{_docdir}") +sed -i -e 's!\(#define HELP_FILE_PATH\).*!\1 "%{ncdhelppath}/%{name}-%{version}/help.ncd"! s!\(#define LOCALE_DIR\).*!\1 "%{_datadir}/locale/"!' src/config.h %build @@ -66,6 +67,10 @@ %{_datadir}/mime/packages/%{name}.xml %changelog +* Sat Sep 3 2005 Ignacio Vazquez-Abrams 1.0.0-2 +- Fixed help file path (#166562) +- Use sed instead of dos2unix + * Sat Jul 23 2005 Ignacio Vazquez-Abrams 1.0.0-1 - Upstream update From fedora-extras-commits at redhat.com Sat Sep 3 22:07:58 2005 From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez)) Date: Sat, 3 Sep 2005 18:07:58 -0400 Subject: rpms/notecase/FC-3 notecase.spec,1.11,1.12 Message-ID: <200509032208.j83M8WL9005653@cvs-int.fedora.redhat.com> Author: ivazquez Update of /cvs/extras/rpms/notecase/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5591/FC-3 Modified Files: notecase.spec Log Message: - Fixed help file path (#166562) - Use sed instead of dos2unix Index: notecase.spec =================================================================== RCS file: /cvs/extras/rpms/notecase/FC-3/notecase.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- notecase.spec 28 Jul 2005 14:19:54 -0000 1.11 +++ notecase.spec 3 Sep 2005 22:07:56 -0000 1.12 @@ -1,6 +1,6 @@ Name: notecase Version: 1.0.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A hierarchical note manager Group: Applications/Productivity @@ -11,7 +11,7 @@ Patch1: notecase-1.0.0-paths.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: gtk2-devel >= 2.4 desktop-file-utils gettext /usr/bin/dos2unix +BuildRequires: gtk2-devel >= 2.4 desktop-file-utils gettext Requires(post): desktop-file-utils shared-mime-info Requires(postun): desktop-file-utils shared-mime-info @@ -26,9 +26,10 @@ %setup -q -n notecase %patch -p1 %patch1 -p1 -b .paths -find docs -type f -exec /usr/bin/dos2unix \{\} \; -/usr/bin/dos2unix readme.txt -sed -i -e 's!\(#define HELP_FILE_PATH\).*!\1 "%{_docdir}/%{name}-%{version}/help.ncd"! +find docs -type f -exec sed -i -e 's/\r//g' \{\} \; +sed -i -e 's/\r//g' readme.txt +%define ncdhelppath %(sed 's|^%{_prefix}||' <<< "%{_docdir}") +sed -i -e 's!\(#define HELP_FILE_PATH\).*!\1 "%{ncdhelppath}/%{name}-%{version}/help.ncd"! s!\(#define LOCALE_DIR\).*!\1 "%{_datadir}/locale/"!' src/config.h %build @@ -66,6 +67,10 @@ %{_datadir}/mime/packages/%{name}.xml %changelog +* Sat Sep 3 2005 Ignacio Vazquez-Abrams 1.0.0-2 +- Fixed help file path (#166562) +- Use sed instead of dos2unix + * Sat Jul 23 2005 Ignacio Vazquez-Abrams 1.0.0-1 - Upstream update From fedora-extras-commits at redhat.com Sat Sep 3 22:30:15 2005 From: fedora-extras-commits at redhat.com (Anthony Green (green)) Date: Sat, 3 Sep 2005 18:30:15 -0400 Subject: rpms/jogl/devel jogl.spec,1.8,1.9 Message-ID: <200509032230.j83MUFHL005762@cvs-int.fedora.redhat.com> Author: green Update of /cvs/extras/rpms/jogl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5743 Modified Files: jogl.spec Log Message: Add %{?dist} to the release tag. Index: jogl.spec =================================================================== RCS file: /cvs/extras/rpms/jogl/devel/jogl.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- jogl.spec 3 Sep 2005 21:49:45 -0000 1.8 +++ jogl.spec 3 Sep 2005 22:30:13 -0000 1.9 @@ -2,7 +2,7 @@ Name: jogl Version: 1.1.1 -Release: 7 +Release: 8%{?dist} Summary: Java bindings for the OpenGL API Group: System Environment/Libraries @@ -104,6 +104,9 @@ %doc %{_javadocdir}/%{name} %changelog +* Sat Sep 3 2005 Anthony Green - 0:1.1.1-8 +- Add %{?dist} to the release tag. + * Sat Sep 3 2005 Anthony Green - 0:1.1.1-7 - Removed %ghost for javadoc, and remove javadoc post scriptlet, as per ville.skytta at iki.fi's suggestion. From fedora-extras-commits at redhat.com Sat Sep 3 22:32:30 2005 From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio)) Date: Sat, 3 Sep 2005 18:32:30 -0400 Subject: rpms/pexpect/devel LICENSE,NONE,1.1 pexpect.spec,1.8,1.9 Message-ID: <200509032232.j83MWUfs005840@cvs-int.fedora.redhat.com> Author: toshio Update of /cvs/extras/rpms/pexpect/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5813 Modified Files: pexpect.spec Added Files: LICENSE Log Message: - Add LICENSE File. - Make noarch. - Remove executable permissions from the modules copied to examples. --- NEW FILE LICENSE --- A. HISTORY OF THE SOFTWARE ========================== Python was created in the early 1990s by Guido van Rossum at Stichting Mathematisch Centrum (CWI, see http://www.cwi.nl) in the Netherlands as a successor of a language called ABC. Guido remains Python's principal author, although it includes many contributions from others. In 1995, Guido continued his work on Python at the Corporation for National Research Initiatives (CNRI, see http://www.cnri.reston.va.us) in Reston, Virginia where he released several versions of the software. In May 2000, Guido and the Python core development team moved to BeOpen.com to form the BeOpen PythonLabs team. In October of the same year, the PythonLabs team moved to Digital Creations (now Zope Corporation, see http://www.zope.com). In 2001, the Python Software Foundation (PSF, see http://www.python.org/psf/) was formed, a non-profit organization created specifically to own Python-related Intellectual Property. Zope Corporation is a sponsoring member of the PSF. All Python releases are Open Source (see http://www.opensource.org for the Open Source Definition). Historically, most, but not all, Python releases have also been GPL-compatible; the table below summarizes the various releases. Release Derived Year Owner GPL- from compatible? (1) 0.9.0 thru 1.2 1991-1995 CWI yes 1.3 thru 1.5.2 1.2 1995-1999 CNRI yes 1.6 1.5.2 2000 CNRI no 2.0 1.6 2000 BeOpen.com no 1.6.1 1.6 2001 CNRI yes (2) 2.1 2.0+1.6.1 2001 PSF no 2.0.1 2.0+1.6.1 2001 PSF yes 2.1.1 2.1+2.0.1 2001 PSF yes 2.2 2.1.1 2001 PSF yes 2.1.2 2.1.1 2002 PSF yes 2.1.3 2.1.2 2002 PSF yes 2.2.1 2.2 2002 PSF yes 2.2.2 2.2.1 2002 PSF yes 2.2.3 2.2.2 2003 PSF yes 2.3 2.2.2 2002-2003 PSF yes 2.3.1 2.3 2002-2003 PSF yes 2.3.2 2.3.1 2002-2003 PSF yes 2.3.3 2.3.2 2002-2003 PSF yes 2.3.4 2.3.3 2004 PSF yes 2.3.5 2.3.4 2005 PSF yes 2.4 2.3 2004 PSF yes 2.4.1 2.4.1 2005 PSF yes Footnotes: (1) GPL-compatible doesn't mean that we're distributing Python under the GPL. All Python licenses, unlike the GPL, let you distribute a modified version without making your changes open source. The GPL-compatible licenses make it possible to combine Python with other software that is released under the GPL; the others don't. (2) According to Richard Stallman, 1.6.1 is not GPL-compatible, because its license has a choice of law clause. According to CNRI, however, Stallman's lawyer has told CNRI's lawyer that 1.6.1 is "not incompatible" with the GPL. Thanks to the many outside volunteers who have worked under Guido's direction to make these releases possible. B. TERMS AND CONDITIONS FOR ACCESSING OR OTHERWISE USING PYTHON =============================================================== PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2 -------------------------------------------- 1. This LICENSE AGREEMENT is between the Python Software Foundation ("PSF"), and the Individual or Organization ("Licensee") accessing and otherwise using this software ("Python") in source or binary form and its associated documentation. 2. Subject to the terms and conditions of this License Agreement, PSF hereby grants Licensee a nonexclusive, royalty-free, world-wide license to reproduce, analyze, test, perform and/or display publicly, prepare derivative works, distribute, and otherwise use Python alone or in any derivative version, provided, however, that PSF's License Agreement and PSF's notice of copyright, i.e., "Copyright (c) 2001, 2002, 2003, 2004 Python Software Foundation; All Rights Reserved" are retained in Python alone or in any derivative version prepared by Licensee. 3. In the event Licensee prepares a derivative work that is based on or incorporates Python or any part thereof, and wants to make the derivative work available to others as provided herein, then Licensee hereby agrees to include in any such work a brief summary of the changes made to Python. 4. PSF is making Python available to Licensee on an "AS IS" basis. PSF MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, PSF MAKES NO AND DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON WILL NOT INFRINGE ANY THIRD PARTY RIGHTS. 5. PSF SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON, OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF. 6. This License Agreement will automatically terminate upon a material breach of its terms and conditions. 7. Nothing in this License Agreement shall be deemed to create any relationship of agency, partnership, or joint venture between PSF and Licensee. This License Agreement does not grant permission to use PSF trademarks or trade name in a trademark sense to endorse or promote products or services of Licensee, or any third party. 8. By copying, installing or otherwise using Python, Licensee agrees to be bound by the terms and conditions of this License Agreement. BEOPEN.COM LICENSE AGREEMENT FOR PYTHON 2.0 ------------------------------------------- BEOPEN PYTHON OPEN SOURCE LICENSE AGREEMENT VERSION 1 1. This LICENSE AGREEMENT is between BeOpen.com ("BeOpen"), having an office at 160 Saratoga Avenue, Santa Clara, CA 95051, and the Individual or Organization ("Licensee") accessing and otherwise using this software in source or binary form and its associated documentation ("the Software"). 2. Subject to the terms and conditions of this BeOpen Python License Agreement, BeOpen hereby grants Licensee a non-exclusive, royalty-free, world-wide license to reproduce, analyze, test, perform and/or display publicly, prepare derivative works, distribute, and otherwise use the Software alone or in any derivative version, provided, however, that the BeOpen Python License is retained in the Software, alone or in any derivative version prepared by Licensee. 3. BeOpen is making the Software available to Licensee on an "AS IS" basis. BEOPEN MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, BEOPEN MAKES NO AND DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE SOFTWARE WILL NOT INFRINGE ANY THIRD PARTY RIGHTS. 4. BEOPEN SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF THE SOFTWARE FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS A RESULT OF USING, MODIFYING OR DISTRIBUTING THE SOFTWARE, OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF. 5. This License Agreement will automatically terminate upon a material breach of its terms and conditions. 6. This License Agreement shall be governed by and interpreted in all respects by the law of the State of California, excluding conflict of law provisions. Nothing in this License Agreement shall be deemed to create any relationship of agency, partnership, or joint venture between BeOpen and Licensee. This License Agreement does not grant permission to use BeOpen trademarks or trade names in a trademark sense to endorse or promote products or services of Licensee, or any third party. As an exception, the "BeOpen Python" logos available at http://www.pythonlabs.com/logos.html may be used according to the permissions granted on that web page. 7. By copying, installing or otherwise using the software, Licensee agrees to be bound by the terms and conditions of this License Agreement. CNRI LICENSE AGREEMENT FOR PYTHON 1.6.1 --------------------------------------- 1. This LICENSE AGREEMENT is between the Corporation for National Research Initiatives, having an office at 1895 Preston White Drive, Reston, VA 20191 ("CNRI"), and the Individual or Organization ("Licensee") accessing and otherwise using Python 1.6.1 software in source or binary form and its associated documentation. 2. Subject to the terms and conditions of this License Agreement, CNRI hereby grants Licensee a nonexclusive, royalty-free, world-wide license to reproduce, analyze, test, perform and/or display publicly, prepare derivative works, distribute, and otherwise use Python 1.6.1 alone or in any derivative version, provided, however, that CNRI's License Agreement and CNRI's notice of copyright, i.e., "Copyright (c) 1995-2001 Corporation for National Research Initiatives; All Rights Reserved" are retained in Python 1.6.1 alone or in any derivative version prepared by Licensee. Alternately, in lieu of CNRI's License Agreement, Licensee may substitute the following text (omitting the quotes): "Python 1.6.1 is made available subject to the terms and conditions in CNRI's License Agreement. This Agreement together with Python 1.6.1 may be located on the Internet using the following unique, persistent identifier (known as a handle): 1895.22/1013. This Agreement may also be obtained from a proxy server on the Internet using the following URL: http://hdl.handle.net/1895.22/1013". 3. In the event Licensee prepares a derivative work that is based on or incorporates Python 1.6.1 or any part thereof, and wants to make the derivative work available to others as provided herein, then Licensee hereby agrees to include in any such work a brief summary of the changes made to Python 1.6.1. 4. CNRI is making Python 1.6.1 available to Licensee on an "AS IS" basis. CNRI MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, CNRI MAKES NO AND DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON 1.6.1 WILL NOT INFRINGE ANY THIRD PARTY RIGHTS. 5. CNRI SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON 1.6.1 FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON 1.6.1, OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF. 6. This License Agreement will automatically terminate upon a material breach of its terms and conditions. 7. This License Agreement shall be governed by the federal intellectual property law of the United States, including without limitation the federal copyright law, and, to the extent such U.S. federal law does not apply, by the law of the Commonwealth of Virginia, excluding Virginia's conflict of law provisions. Notwithstanding the foregoing, with regard to derivative works based on Python 1.6.1 that incorporate non-separable material that was previously distributed under the GNU General Public License (GPL), the law of the Commonwealth of Virginia shall govern this License Agreement only as to issues arising under or with respect to Paragraphs 4, 5, and 7 of this License Agreement. Nothing in this License Agreement shall be deemed to create any relationship of agency, partnership, or joint venture between CNRI and Licensee. This License Agreement does not grant permission to use CNRI trademarks or trade name in a trademark sense to endorse or promote products or services of Licensee, or any third party. 8. By clicking on the "ACCEPT" button where indicated, or by copying, installing or otherwise using Python 1.6.1, Licensee agrees to be bound by the terms and conditions of this License Agreement. ACCEPT CWI LICENSE AGREEMENT FOR PYTHON 0.9.0 THROUGH 1.2 -------------------------------------------------- Copyright (c) 1991 - 1995, Stichting Mathematisch Centrum Amsterdam, The Netherlands. All rights reserved. Permission to use, copy, modify, and distribute this software and its documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all copies and that both that copyright notice and this permission notice appear in supporting documentation, and that the name of Stichting Mathematisch Centrum or CWI not be used in advertising or publicity pertaining to distribution of the software without specific, written prior permission. STICHTING MATHEMATISCH CENTRUM DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL STICHTING MATHEMATISCH CENTRUM BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. Index: pexpect.spec =================================================================== RCS file: /cvs/extras/rpms/pexpect/devel/pexpect.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- pexpect.spec 3 Sep 2005 04:20:56 -0000 1.8 +++ pexpect.spec 3 Sep 2005 22:32:28 -0000 1.9 @@ -5,17 +5,19 @@ Summary: Expect module for Python Name: pexpect Version: 0.99999b -Release: 1%{?dist} +Release: 2%{?dist} -License: PSFL +License: PSF Group: Development/Languages URL: http://pexpect.sourceforge.net Source: http://download.sourceforge.net/pexpect/%{name}-%{version}.tgz Source1: http://download.sourceforge.net/pexpect/pexpect-doc.tgz Source2: http://download.sourceforge.net/pexpect/pexpect-examples.tgz +Source10: LICENSE BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root Requires: python-abi = %{pyver} -BuildRequires: python-devel >= 2.2 +BuildRequires: python +BuildArch: noarch %description Pexpect is a pure Python module for spawning child applications; controlling @@ -35,6 +37,7 @@ %prep %setup -q -a1 -a2 rm -rf $(find . -type d -name CVS) +cp %{SOURCE10} . %build %{__python} setup.py build @@ -44,6 +47,7 @@ # These are apparently works in progress and thus not installed. But they are # needed by the chess* examples.... Moving them to examples for now. +chmod a-x ANSI.py screen.py FSM.py cp ANSI.py screen.py FSM.py examples %clean @@ -55,9 +59,14 @@ %{python_sitelib}/pexpect.pyc %ghost %{python_sitelib}/pexpect.pyo -%doc README.txt doc examples +%doc README.txt doc examples LICENSE %changelog +* Sat Sep 3 2005 Toshio Kuratomi 0.99999b-2 +- Add LICENSE File. +- Make noarch. +- Remove executable permissions from the modules copied to examples. + * Fri Sep 2 2005 Toshio Kuratomi 0.99999b - Update to version 0.99999b. - Add dist tag. From fedora-extras-commits at redhat.com Sat Sep 3 23:38:39 2005 From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma)) Date: Sat, 3 Sep 2005 19:38:39 -0400 Subject: rpms/grhino - New directory Message-ID: <200509032338.j83Ncdmm007311@cvs-int.fedora.redhat.com> Author: salimma Update of /cvs/extras/rpms/grhino In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7285/grhino Log Message: Directory /cvs/extras/rpms/grhino added to the repository From fedora-extras-commits at redhat.com Sat Sep 3 23:38:39 2005 From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma)) Date: Sat, 3 Sep 2005 19:38:39 -0400 Subject: rpms/grhino/devel - New directory Message-ID: <200509032338.j83NcdXt007316@cvs-int.fedora.redhat.com> Author: salimma Update of /cvs/extras/rpms/grhino/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7285/grhino/devel Log Message: Directory /cvs/extras/rpms/grhino/devel added to the repository From fedora-extras-commits at redhat.com Sat Sep 3 23:38:56 2005 From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma)) Date: Sat, 3 Sep 2005 19:38:56 -0400 Subject: rpms/grhino Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200509032338.j83Ncu6l007367@cvs-int.fedora.redhat.com> Author: salimma Update of /cvs/extras/rpms/grhino In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7332 Added Files: Makefile import.log Log Message: Setup of module grhino --- NEW FILE Makefile --- # Top level Makefile for module grhino all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Sat Sep 3 23:38:56 2005 From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma)) Date: Sat, 3 Sep 2005 19:38:56 -0400 Subject: rpms/grhino/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200509032339.j83NcuY8007372@cvs-int.fedora.redhat.com> Author: salimma Update of /cvs/extras/rpms/grhino/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7332/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module grhino --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Sat Sep 3 23:41:00 2005 From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma)) Date: Sat, 3 Sep 2005 19:41:00 -0400 Subject: rpms/grhino import.log,1.1,1.2 Message-ID: <200509032341.j83Nf0V3007470@cvs-int.fedora.redhat.com> Author: salimma Update of /cvs/extras/rpms/grhino In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7433 Modified Files: import.log Log Message: auto-import grhino-0.15.0-2.fc4 on branch devel from grhino-0.15.0-2.fc4.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/grhino/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 3 Sep 2005 23:38:54 -0000 1.1 +++ import.log 3 Sep 2005 23:40:58 -0000 1.2 @@ -0,0 +1 @@ +grhino-0_15_0-2_fc4:HEAD:grhino-0.15.0-2.fc4.src.rpm:1125790852 From fedora-extras-commits at redhat.com Sat Sep 3 23:41:00 2005 From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma)) Date: Sat, 3 Sep 2005 19:41:00 -0400 Subject: rpms/grhino/devel grhino-Makefile-in.patch, NONE, 1.1 grhino.desktop, NONE, 1.1 grhino.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200509032341.j83Nf0ZS007480@cvs-int.fedora.redhat.com> Author: salimma Update of /cvs/extras/rpms/grhino/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7433/devel Modified Files: .cvsignore sources Added Files: grhino-Makefile-in.patch grhino.desktop grhino.spec Log Message: auto-import grhino-0.15.0-2.fc4 on branch devel from grhino-0.15.0-2.fc4.src.rpm grhino-Makefile-in.patch: --- NEW FILE grhino-Makefile-in.patch --- diff -ru grhino-0.15.0-orig/Makefile.in grhino-0.15.0/Makefile.in --- grhino-0.15.0-orig/Makefile.in 2005-04-15 09:03:04.000000000 -0500 +++ grhino-0.15.0/Makefile.in 2005-08-20 16:33:54.000000000 -0500 @@ -444,82 +444,82 @@ $(adBeginSubdir) $@ $(adEndSubdir) install_mkdir : - if [ ! -e "$(bindir)" ]; then \ - mkdir -p "$(bindir)"; \ - chmod 755 "$(bindir)"; \ - fi - if [ ! -e "$(pattern_dir)" ]; then \ - mkdir -p "$(pattern_dir)"; \ - chmod 755 "$(pattern_dir)"; \ - fi - if [ ! -e "$(book_dir)" ]; then \ - mkdir -p "$(book_dir)"; \ - chmod 755 "$(book_dir)"; \ - fi - if [ ! -e "$(theme_dir)" ]; then \ - mkdir -p "$(theme_dir)"; \ - chmod 755 "$(theme_dir)"; \ - fi - if [ ! -e "$(theme_dir)/small" ]; then \ - mkdir -p "$(theme_dir)/small"; \ - chmod 755 "$(theme_dir)/small"; \ - fi - if [ ! -e "$(helpdir)" ]; then \ - mkdir -p "$(helpdir)"; \ - chmod 755 "$(helpdir)"; \ - fi - if [ ! -e "$(helpdir)/C" ]; then \ - mkdir -p "$(helpdir)/C"; \ - chmod 755 "$(helpdir)/C"; \ - fi - if [ ! -e "$(helpdir)/C/figures" ]; then \ - mkdir -p "$(helpdir)/C/figures"; \ - chmod 755 "$(helpdir)/C/figures"; \ + if [ ! -e "$(DESTDIR)$(bindir)" ]; then \ + mkdir -p "$(DESTDIR)$(bindir)"; \ + chmod 755 "$(DESTDIR)$(bindir)"; \ + fi + if [ ! -e "$(DESTDIR)$(pattern_dir)" ]; then \ + mkdir -p "$(DESTDIR)$(pattern_dir)"; \ + chmod 755 "$(DESTDIR)$(pattern_dir)"; \ + fi + if [ ! -e "$(DESTDIR)$(book_dir)" ]; then \ + mkdir -p "$(DESTDIR)$(book_dir)"; \ + chmod 755 "$(DESTDIR)$(book_dir)"; \ + fi + if [ ! -e "$(DESTDIR)$(theme_dir)" ]; then \ + mkdir -p "$(DESTDIR)$(theme_dir)"; \ + chmod 755 "$(DESTDIR)$(theme_dir)"; \ + fi + if [ ! -e "$(DESTDIR)$(theme_dir)/small" ]; then \ + mkdir -p "$(DESTDIR)$(theme_dir)/small"; \ + chmod 755 "$(DESTDIR)$(theme_dir)/small"; \ + fi + if [ ! -e "$(DESTDIR)$(helpdir)" ]; then \ + mkdir -p "$(DESTDIR)$(helpdir)"; \ + chmod 755 "$(DESTDIR)$(helpdir)"; \ + fi + if [ ! -e "$(DESTDIR)$(helpdir)/C" ]; then \ + mkdir -p "$(DESTDIR)$(helpdir)/C"; \ + chmod 755 "$(DESTDIR)$(helpdir)/C"; \ + fi + if [ ! -e "$(DESTDIR)$(helpdir)/C/figures" ]; then \ + mkdir -p "$(DESTDIR)$(helpdir)/C/figures"; \ + chmod 755 "$(DESTDIR)$(helpdir)/C/figures"; \ fi install : install_mkdir - -$(INSTALL_PROGRAM) grhino "$(bindir)/grhino" - -$(INSTALL_PROGRAM) gtp-rhino "$(bindir)/gtp-rhino" - $(INSTALL_DATA) "$(srcdir)/row1.bin" "$(pattern_dir)/row1.bin" - $(INSTALL_DATA) "$(srcdir)/row2.bin" "$(pattern_dir)/row2.bin" - $(INSTALL_DATA) "$(srcdir)/row3.bin" "$(pattern_dir)/row3.bin" - $(INSTALL_DATA) "$(srcdir)/row4.bin" "$(pattern_dir)/row4.bin" - $(INSTALL_DATA) "$(srcdir)/diag1.bin" "$(pattern_dir)/diag1.bin" - $(INSTALL_DATA) "$(srcdir)/diag2.bin" "$(pattern_dir)/diag2.bin" - $(INSTALL_DATA) "$(srcdir)/diag3.bin" "$(pattern_dir)/diag3.bin" - $(INSTALL_DATA) "$(srcdir)/diag4.bin" "$(pattern_dir)/diag4.bin" - $(INSTALL_DATA) "$(srcdir)/diag5.bin" "$(pattern_dir)/diag5.bin" - $(INSTALL_DATA) "$(srcdir)/corner5x2.bin" "$(pattern_dir)/corner5x2.bin" - $(INSTALL_DATA) "$(srcdir)/book.bin" "$(book_dir)/book.bin" - $(INSTALL_DATA) "$(srcdir)/help/C/legal.xml" "$(helpdir)/C/legal.xml" - -scrollkeeper-preinstall "$(helpdir)/C/grhino.xml" \ - "$(srcdir)/help/C/grhino-C.omf.in" "$(helpdir)/C/grhino-C.omf" - $(INSTALL_DATA) "$(srcdir)/help/C/grhino.xml" "$(helpdir)/C/grhino.xml" + -$(INSTALL_PROGRAM) grhino "$(DESTDIR)$(bindir)/grhino" + -$(INSTALL_PROGRAM) gtp-rhino "$(DESTDIR)$(bindir)/gtp-rhino" + $(INSTALL_DATA) "$(srcdir)/row1.bin" "$(DESTDIR)$(pattern_dir)/row1.bin" + $(INSTALL_DATA) "$(srcdir)/row2.bin" "$(DESTDIR)$(pattern_dir)/row2.bin" + $(INSTALL_DATA) "$(srcdir)/row3.bin" "$(DESTDIR)$(pattern_dir)/row3.bin" + $(INSTALL_DATA) "$(srcdir)/row4.bin" "$(DESTDIR)$(pattern_dir)/row4.bin" + $(INSTALL_DATA) "$(srcdir)/diag1.bin" "$(DESTDIR)$(pattern_dir)/diag1.bin" + $(INSTALL_DATA) "$(srcdir)/diag2.bin" "$(DESTDIR)$(pattern_dir)/diag2.bin" + $(INSTALL_DATA) "$(srcdir)/diag3.bin" "$(DESTDIR)$(pattern_dir)/diag3.bin" + $(INSTALL_DATA) "$(srcdir)/diag4.bin" "$(DESTDIR)$(pattern_dir)/diag4.bin" + $(INSTALL_DATA) "$(srcdir)/diag5.bin" "$(DESTDIR)$(pattern_dir)/diag5.bin" + $(INSTALL_DATA) "$(srcdir)/corner5x2.bin" "$(DESTDIR)$(pattern_dir)/corner5x2.bin" + $(INSTALL_DATA) "$(srcdir)/book.bin" "$(DESTDIR)$(book_dir)/book.bin" + $(INSTALL_DATA) "$(srcdir)/help/C/legal.xml" "$(DESTDIR)$(helpdir)/C/legal.xml" + -scrollkeeper-preinstall "$(DESTDIR)$(helpdir)/C/grhino.xml" \ + "$(srcdir)/help/C/grhino-C.omf.in" "$(DESTDIR)$(helpdir)/C/grhino-C.omf" + $(INSTALL_DATA) "$(srcdir)/help/C/grhino.xml" "$(DESTDIR)$(helpdir)/C/grhino.xml" $(INSTALL_DATA) "$(srcdir)/help/C/figures/gamelist.png" \ - "$(helpdir)/C/figures/gamelist.png" + "$(DESTDIR)$(helpdir)/C/figures/gamelist.png" $(INSTALL_DATA) "$(srcdir)/help/C/figures/history.png" \ - "$(helpdir)/C/figures/history.png" + "$(DESTDIR)$(helpdir)/C/figures/history.png" $(INSTALL_DATA) "$(srcdir)/help/C/figures/mainwindow.png" \ - "$(helpdir)/C/figures/mainwindow.png" + "$(DESTDIR)$(helpdir)/C/figures/mainwindow.png" $(INSTALL_DATA) "$(srcdir)/help/C/figures/pattern.png" \ - "$(helpdir)/C/figures/pattern.png" + "$(DESTDIR)$(helpdir)/C/figures/pattern.png" $(INSTALL_DATA) "$(srcdir)/help/C/figures/prefs-ai.png" \ - "$(helpdir)/C/figures/prefs-ai.png" + "$(DESTDIR)$(helpdir)/C/figures/prefs-ai.png" $(INSTALL_DATA) "$(srcdir)/help/C/figures/prefs-board.png" \ - "$(helpdir)/C/figures/prefs-board.png" + "$(DESTDIR)$(helpdir)/C/figures/prefs-board.png" $(INSTALL_DATA) "$(srcdir)/help/C/figures/prefs-theme.png" \ - "$(helpdir)/C/figures/prefs-theme.png" - $(INSTALL_DATA) "$(srcdir)/theme/small/black.xpm" "$(theme_dir)/small/black.xpm" - $(INSTALL_DATA) "$(srcdir)/theme/small/black_last.xpm" "$(theme_dir)/small/black_last.xpm" - $(INSTALL_DATA) "$(srcdir)/theme/small/bottom.xpm" "$(theme_dir)/small/bottom.xpm" - $(INSTALL_DATA) "$(srcdir)/theme/small/empty.xpm" "$(theme_dir)/small/empty.xpm" - $(INSTALL_DATA) "$(srcdir)/theme/small/hint_black.xpm" "$(theme_dir)/small/hint_black.xpm" - $(INSTALL_DATA) "$(srcdir)/theme/small/hint_white.xpm" "$(theme_dir)/small/hint_white.xpm" - $(INSTALL_DATA) "$(srcdir)/theme/small/left.xpm" "$(theme_dir)/small/left.xpm" - $(INSTALL_DATA) "$(srcdir)/theme/small/right.xpm" "$(theme_dir)/small/right.xpm" - $(INSTALL_DATA) "$(srcdir)/theme/small/top.xpm" "$(theme_dir)/small/top.xpm" - $(INSTALL_DATA) "$(srcdir)/theme/small/white.xpm" "$(theme_dir)/small/white.xpm" - $(INSTALL_DATA) "$(srcdir)/theme/small/white_last.xpm" "$(theme_dir)/small/white_last.xpm" + "$(DESTDIR)$(helpdir)/C/figures/prefs-theme.png" + $(INSTALL_DATA) "$(srcdir)/theme/small/black.xpm" "$(DESTDIR)$(theme_dir)/small/black.xpm" + $(INSTALL_DATA) "$(srcdir)/theme/small/black_last.xpm" "$(DESTDIR)$(theme_dir)/small/black_last.xpm" + $(INSTALL_DATA) "$(srcdir)/theme/small/bottom.xpm" "$(DESTDIR)$(theme_dir)/small/bottom.xpm" + $(INSTALL_DATA) "$(srcdir)/theme/small/empty.xpm" "$(DESTDIR)$(theme_dir)/small/empty.xpm" + $(INSTALL_DATA) "$(srcdir)/theme/small/hint_black.xpm" "$(DESTDIR)$(theme_dir)/small/hint_black.xpm" + $(INSTALL_DATA) "$(srcdir)/theme/small/hint_white.xpm" "$(DESTDIR)$(theme_dir)/small/hint_white.xpm" + $(INSTALL_DATA) "$(srcdir)/theme/small/left.xpm" "$(DESTDIR)$(theme_dir)/small/left.xpm" + $(INSTALL_DATA) "$(srcdir)/theme/small/right.xpm" "$(DESTDIR)$(theme_dir)/small/right.xpm" + $(INSTALL_DATA) "$(srcdir)/theme/small/top.xpm" "$(DESTDIR)$(theme_dir)/small/top.xpm" + $(INSTALL_DATA) "$(srcdir)/theme/small/white.xpm" "$(DESTDIR)$(theme_dir)/small/white.xpm" + $(INSTALL_DATA) "$(srcdir)/theme/small/white_last.xpm" "$(DESTDIR)$(theme_dir)/small/white_last.xpm" if [ ! "@GMSGFMT@" = ":" ]; then \ cd po; \ $(MAKE) prefix="$(prefix)" DESTDIR="$(DESTDIR)" install; \ --- NEW FILE grhino.desktop --- [Desktop Entry] Encoding=UTF-8 Name=GRhino GenericName=GNOME2 Othello/Reversi game Comment=An Othello/Reversi game for GNOME 2 Exec=grhino #Icon= Terminal=false Type=Application Version=0.15.0 Categories=Application;GNOME;Game;BoardGame; StartupNotify=true --- NEW FILE grhino.spec --- Name: grhino Version: 0.15.0 Release: 2%{?dist} Summary: Othello/Reversi game Group: Amusements/Games License: GPL URL: http://rhino.sourceforge.net/ Source0: http://dl.sourceforge.net/rhino/grhino-%{version}.tar.gz Source1: %{name}.desktop Patch0: grhino-Makefile-in.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils BuildRequires: libgnomeui-devel BuildRequires: scrollkeeper #Requires: Requires(post): scrollkeeper Requires(postun): scrollkeeper %description GRhino, or Rhino its former name, is an Othello/Reversi game on Linux and other UNIX-like systems as long as GNOME 2 libraries are installed. It is currently under development and a new version is available occasionally. What distinguish GRhino from most other Othello games is that GRhino will be targeted for experienced Othello players. Strong AI is the main focus with some additional good, useful features (like an endgame solver) is planned. The ultimate target strength of the AI is that it should be able to beat the best human player at the highest difficulty level. Beating Logistello (the strongest program available) is not in the plan :) GRhino supports the Go/Game Text Protocol (GTP), allowing it to be used as an engine for a GTP-compliant controller like Quarry. Othello is a registered trademark of Tsukuda Original, licensed by Anjar Co., copyright 1973, 1990 Pressman Toy Corporation. %prep %setup -q %patch0 -p1 %build %configure make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT # move omf files mkdir -p $RPM_BUILD_ROOT%{_datadir}/omf/grhino/ mv $RPM_BUILD_ROOT%{_datadir}/gnome/help/grhino/*/grhino-*.omf $RPM_BUILD_ROOT%{_datadir}/omf/grhino/ # desktop file #mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications desktop-file-install --vendor fedora \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ --add-category X-Fedora \ %{SOURCE1} %find_lang %{name} %post scrollkeeper-update -q -o %{_datadir}/omf/%{name} || : %postun scrollkeeper-update -q || : %clean rm -rf $RPM_BUILD_ROOT %files -f %{name}.lang %defattr(-,root,root,-) %doc ChangeLog COPYING NEWS README TODO %{_bindir}/grhino %{_bindir}/gtp-rhino %{_datadir}/applications/*.desktop #%{_datadir}/locale/*/LC_MESSAGES/quarry.mo %{_datadir}/gnome/help/grhino/ %{_datadir}/grhino-%{version}/ %{_datadir}/omf/grhino/ %changelog * Fri Sep 2 2005 Michel Salim - 0.15.0-2 - changed BuildReq from libgnome-devel to libgnomeui-devel, which requires the former * Sat Aug 20 2005 Michel Salim - 0.15.0-1 - initial package Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/grhino/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 3 Sep 2005 23:38:54 -0000 1.1 +++ .cvsignore 3 Sep 2005 23:40:58 -0000 1.2 @@ -0,0 +1 @@ +grhino-0.15.0.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/grhino/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 3 Sep 2005 23:38:54 -0000 1.1 +++ sources 3 Sep 2005 23:40:58 -0000 1.2 @@ -0,0 +1 @@ +9f510356c0cfafe32165a582d872655f grhino-0.15.0.tar.gz From fedora-extras-commits at redhat.com Sat Sep 3 23:44:48 2005 From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma)) Date: Sat, 3 Sep 2005 19:44:48 -0400 Subject: owners owners.list,1.164,1.165 Message-ID: <200509032344.j83Nim7u007543@cvs-int.fedora.redhat.com> Author: salimma Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7519 Modified Files: owners.list Log Message: Added grhino to owners.list Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.164 retrieving revision 1.165 diff -u -r1.164 -r1.165 --- owners.list 3 Sep 2005 21:11:01 -0000 1.164 +++ owners.list 3 Sep 2005 23:44:46 -0000 1.165 @@ -269,6 +269,7 @@ Fedora Extras|gramps|Genealogical Research and Analysis Management Programming System|bdpepple at ameritech.net|extras-qa at fedoraproject.org| Fedora Extras|graphviz|Graph Visualization Tools|oliver at linux-kernel.at|extras-qa at fedoraproject.org|ellson at research.att.com Fedora Extras|graveman|A frontend for cdrtools, dvd+rw-tools and sox|gemi at bluewin.ch|extras-qa at fedoraproject.org| +Fedora Extras|grhino|Othello/Reversi game|michel.salim at gmail.com|extras-qa at fedoraproject.org| Fedora Extras|grip|Front-end for CD rippers and Ogg Vorbis encoders|adrian at lisas.de|extras-qa at fedoraproject.org| Fedora Extras|grisbi|Personal finances manager|gauret at free.fr|extras-qa at fedoraproject.org| Fedora Extras|gstreamer-python|Python bindings for GStreamer|thomas at apestaart.org|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Sat Sep 3 23:48:54 2005 From: fedora-extras-commits at redhat.com (Marc Maurer (uwog)) Date: Sat, 3 Sep 2005 19:48:54 -0400 Subject: owners owners.list,1.165,1.166 Message-ID: <200509032348.j83Nmsr5007588@cvs-int.fedora.redhat.com> Author: uwog Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7569 Modified Files: owners.list Log Message: Update email address Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.165 retrieving revision 1.166 diff -u -r1.165 -r1.166 --- owners.list 3 Sep 2005 23:44:46 -0000 1.165 +++ owners.list 3 Sep 2005 23:48:52 -0000 1.166 @@ -12,11 +12,11 @@ Fedora Extras|abcde|A Better CD Encoder|ville.skytta at iki.fi|extras-qa at fedoraproject.org| Fedora Extras|abe|A scrolling, platform-jumping, ancient pyramid exploring game|pmatilai at laiskiainen.org|extras-qa at fedoraproject.org| Fedora Extras|abicheck|ABI checking tool|bugs.michael at gmx.net|extras-qa at fedoraproject.org| -Fedora Extras|abiword|The AbiWord word processor|j.m.maurer at student.utwente.nl|extras-qa at fedoraproject.org| +Fedora Extras|abiword|The AbiWord word processor|uwog at uwog.net|extras-qa at fedoraproject.org| Fedora Extras|adns|Advanced, easy to use, asynchronous-capable DNS client library|colin at fedoraproject.org|extras-qa at fedoraproject.org| Fedora Extras|advancecomp|Recompression utilities for .PNG, .MNG and .ZIP files|matthias at rpmforge.net|extras-qa at fedoraproject.org| Fedora Extras|aide|Intrusion detection environment|bugs.michael at gmx.net|extras-qa at fedoraproject.org| -Fedora Extras|aiksaurus|A thesaurus library|j.m.maurer at student.utwente.nl|extras-qa at fedoraproject.org| +Fedora Extras|aiksaurus|A thesaurus library|uwog at uwog.net|extras-qa at fedoraproject.org| Fedora Extras|airsnort|Wireless LAN (WLAN) tool which recovers encryption keys|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org| Fedora Extras|allegro|A game programming library|jnovy at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|alsa-firmware|Firmware for several ALSA-Supported soundcards|fedora at leemhuis.info|extras-qa at fedoraproject.org| @@ -142,7 +142,7 @@ Fedora Extras|eet|A library designed to write an arbitary set of chunks of data to a file|ivazquez at ivazquez.net|extras-qa at fedoraproject.org| Fedora Extras|elmo|Terminal-based mail client|gauret at free.fr|extras-qa at fedoraproject.org| Fedora Extras|emacs-auctex|Enhanced TeX modes for Emacsen|ed at eh3.com|extras-qa at fedoraproject.org| -Fedora Extras|enchant|An Enchanting Spell Checking Library|j.m.maurer at student.utwente.nl|extras-qa at fedoraproject.org| +Fedora Extras|enchant|An Enchanting Spell Checking Library|uwog at uwog.net|extras-qa at fedoraproject.org| Fedora Extras|enemies-of-carlotta|A simple mailing list manager|redhat-bugzilla at camperquake.de|extras-qa at fedoraproject.org| Fedora Extras|enigma|Clone of the ATARI game Oxyd|fedora at leemhuis.info|extras-qa at fedoraproject.org| Fedora Extras|epiphany-extensions|Extensions for Epiphany, the GNOME web browser|caillon at redhat.com|extras-qa at fedoraproject.org| @@ -277,7 +277,7 @@ Fedora Extras|GtkAda|An Ada95 graphical toolkit based on Gtk+|gemi at bluewin.ch|extras-qa at fedoraproject.org| Fedora Extras|gtkglarea2|An OpenGL GTK widget|anvil at livna.org|extras-qa at fedoraproject.org| Fedora Extras|gtkglext|OpenGL Extension to GTK|rc040203 at freenet.de|extras-qa at fedoraproject.org| -Fedora Extras|gtkmathview|Library for rendering MathML documents|j.m.maurer at student.utwente.nl|extras-qa at fedoraproject.org| +Fedora Extras|gtkmathview|Library for rendering MathML documents|uwog at uwog.net|extras-qa at fedoraproject.org| Fedora Extras|gtkmm20|A C++ interface for GTK2 (a GUI library for X)|denisleroy at yahoo.com|extras-qa at fedoraproject.org| Fedora Extras|gtkmm24|A C++ interface for GTK2 (a GUI library for X)|denisleroy at yahoo.com|extras-qa at fedoraproject.org| Fedora Extras|Gtk-Perl|Perl extensions for GTK+|matthias at rpmforge.net|extras-qa at fedoraproject.org| @@ -442,7 +442,7 @@ Fedora Extras|liferea|An RSS/RDF feed reader|bdpepple at ameritech.net|extras-qa at fedoraproject.org| Fedora Extras|lighttpd|Lightning fast webserver with light system requirements|matthias at rpmforge.net|extras-qa at fedoraproject.org| Fedora Extras|lincvs|Graphical CVS Client|compton at pcompton.com|extras-qa at fedoraproject.org| -Fedora Extras|link-grammar|Library that can perform grammar checking|j.m.maurer at student.utwente.nl|extras-qa at fedoraproject.org| +Fedora Extras|link-grammar|Library that can perform grammar checking|uwog at uwog.net|extras-qa at fedoraproject.org| Fedora Extras|linphone|Phone anywhere in the whole world by using the Internet|ivazquez at ivazquez.net|extras-qa at fedoraproject.org| Fedora Extras|linux_logo|The linux logo - a colorful console penguin logo|matthias at rpmforge.net|extras-qa at fedoraproject.org| Fedora Extras|lirc|The Linux Infrared Remote Control package|ville.skytta at iki.fi|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Sun Sep 4 13:17:47 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sun, 4 Sep 2005 09:17:47 -0400 Subject: rpms/xsupplicant/devel xsupplicant-1.2.1-docsfix.patch, NONE, 1.1 xsupplicant-1.2.1-gcc4-cleanups.patch, NONE, 1.1 sources, 1.2, 1.3 xsupplicant.spec, 1.1, 1.2 Message-ID: <200509041317.j84DHlqH030667@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/xsupplicant/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30591/devel Modified Files: sources xsupplicant.spec Added Files: xsupplicant-1.2.1-docsfix.patch xsupplicant-1.2.1-gcc4-cleanups.patch Log Message: Bump to 1.2.1, fix a LOT of signed/unsigned mistakes in the code. xsupplicant-1.2.1-docsfix.patch: --- NEW FILE xsupplicant-1.2.1-docsfix.patch --- --- xsupplicant-1.2.1/doc/builddocs.sh.BAD 2005-09-03 08:20:54.000000000 -0500 +++ xsupplicant-1.2.1/doc/builddocs.sh 2005-09-03 08:22:29.000000000 -0500 @@ -4,7 +4,7 @@ # best option is just to require users of this script to define # the variable on their own? not quite sure, I guess that's why # it's hard coded for now... -JADE_PUB=/usr/share/doc/openjade-1.3/pubtext +JADE_PUB=/usr/share/doc/openjade-*/pubtext SGML_CATALOG_FILES=/usr/sgml-tools/dtd/catalog:/etc/sgml/catalog:/usr/share/doc/openjade-1.3.2/catalog:/home/chris/t/docbook-dsssl-1.97/catalog mkdir -p html @@ -33,7 +33,7 @@ # create the txt docs echo -n "Building the TXT docs..." -lynx -dump -nolist html/Open1x-UserGuide.html > txt/Open1x-UserGuide.txt +links -dump html/Open1x-UserGuide.html > txt/Open1x-UserGuide.txt if [ $? -ne 0 ] then echo "Error! Build failed!" xsupplicant-1.2.1-gcc4-cleanups.patch: --- NEW FILE xsupplicant-1.2.1-gcc4-cleanups.patch --- --- xsupplicant-1.2.1/src/cardif/linux/cardif_hostap_driver.c.BAD 2005-09-03 17:50:21.000000000 -0500 +++ xsupplicant-1.2.1/src/cardif/linux/cardif_hostap_driver.c 2005-09-03 17:50:50.000000000 -0500 @@ -326,7 +326,7 @@ debug_printf(DEBUG_NORMAL, "alg=%s key_idx=%d set_tx=%d seq_len=%d key_len=%d\n", alg_name, key_idx, set_tx, seq_len, key_len); debug_printf(DEBUG_NORMAL, "KeyRSC = "); - debug_hex_printf(DEBUG_NORMAL, seq, seq_len); + debug_hex_printf(DEBUG_NORMAL, (u_char *) seq, seq_len); if (seq_len > 8) { @@ -350,7 +350,7 @@ memset(param->sta_addr, 0xff, ETH_ALEN); - strncpy(param->u.crypt.alg, alg_name, HOSTAP_CRYPT_ALG_NAME_LEN); + strncpy((char *) param->u.crypt.alg, alg_name, HOSTAP_CRYPT_ALG_NAME_LEN); param->u.crypt.flags = set_tx ? HOSTAP_CRYPT_FLAG_SET_TX_KEY : 0; param->u.crypt.idx = key_idx; memcpy(param->u.crypt.seq, seq, seq_len); --- xsupplicant-1.2.1/src/cardif/linux/cardif_linux_wext.c.BAD 2005-09-03 17:51:02.000000000 -0500 +++ xsupplicant-1.2.1/src/cardif/linux/cardif_linux_wext.c 2005-09-03 17:53:08.000000000 -0500 @@ -119,10 +119,10 @@ // We set the key index to 0x80, to force key 0 to be set to all 0s, // and to have key 0 be set as the default transmit key. - cardif_set_wep_key(thisint, (char *)&zerokey, keylen, 0x80); - cardif_set_wep_key(thisint, (char *)&zerokey, keylen, 0x01); - cardif_set_wep_key(thisint, (char *)&zerokey, keylen, 0x02); - cardif_set_wep_key(thisint, (char *)&zerokey, keylen, 0x03); + cardif_set_wep_key(thisint, (u_char *)&zerokey, keylen, 0x80); + cardif_set_wep_key(thisint, (u_char *)&zerokey, keylen, 0x01); + cardif_set_wep_key(thisint, (u_char *)&zerokey, keylen, 0x02); + cardif_set_wep_key(thisint, (u_char *)&zerokey, keylen, 0x03); } /************************************************************** @@ -947,10 +947,10 @@ if (config_ssid_get_ssid_abilities() & RSN_IE) { - cardif_linux_wext_get_wpa2_ie(intdata, wpaie, &len); + cardif_linux_wext_get_wpa2_ie(intdata, (char *) wpaie, &len); } else if (config_ssid_get_ssid_abilities() & WPA_IE) { - cardif_linux_wext_get_wpa_ie(intdata, wpaie, &len); + cardif_linux_wext_get_wpa_ie(intdata, (char *) wpaie, &len); } if (len > 0) @@ -965,11 +965,11 @@ intdata->flags |= DONTSCAN; cardif_linux_wext_set_ssid(intdata, newssid); - bssid = config_ssid_get_mac(); + bssid = (char *) config_ssid_get_mac(); if (bssid != NULL) { debug_printf(DEBUG_INT, "Dest. BSSID : "); - debug_hex_printf(DEBUG_INT, bssid, 6); + debug_hex_printf(DEBUG_INT, (u_char *) bssid, 6); } // cardif_linux_wext_set_bssid(intdata, bssid); --- xsupplicant-1.2.1/src/cardif/linux/cardif_ipw_driver.c.BAD 2005-09-03 17:54:57.000000000 -0500 +++ xsupplicant-1.2.1/src/cardif/linux/cardif_ipw_driver.c 2005-09-03 17:57:23.000000000 -0500 @@ -240,7 +240,7 @@ wpa2_gen_ie(intdata, iedata, ielen); debug_printf(DEBUG_INT, "Setting WPA2 IE : "); - debug_hex_printf(DEBUG_INT, iedata, *ielen); + debug_hex_printf(DEBUG_INT, (u_char *) iedata, *ielen); debug_printf(DEBUG_INT, "\n"); return XENONE; @@ -372,7 +372,7 @@ param = (struct ipw_param *) buf; param->cmd = IPW_CMD_SET_ENCRYPTION; memset(param->sta_addr, 0xff, 6); - strncpy(param->u.crypt.alg, alg_name, IPW_CRYPT_ALG_NAME_LEN); + strncpy((char *) param->u.crypt.alg, alg_name, IPW_CRYPT_ALG_NAME_LEN); param->u.crypt.set_tx = set_tx ? 1 : 0; param->u.crypt.idx = key_idx; memcpy(param->u.crypt.seq, seq, seq_len); @@ -422,7 +422,7 @@ { int ret; - ret = ipw_mlme(intdata->intName, intdata->source_mac, + ret = ipw_mlme(intdata->intName, (u8 *) intdata->source_mac, IPW_MLME_STA_DISASSOC, reason_code); if (ret <0) return ret; @@ -458,16 +458,16 @@ if (config_ssid_get_ssid_abilities() & RSN_IE) { - cardif_ipw_driver_get_wpa2_ie(intdata, wpaie, &len); + cardif_ipw_driver_get_wpa2_ie(intdata, (char *) wpaie, &len); } else if (config_ssid_get_ssid_abilities() & WPA_IE) { - cardif_ipw_driver_get_wpa_ie(intdata, wpaie, &len); + cardif_ipw_driver_get_wpa_ie(intdata, (char *) wpaie, &len); } // Length needs to be > 0 in order to indicate that we have an IE to set. if ((len < 255) && (len >= 0)) { - if (cardif_ipw_driver_set_wpa_ie(intdata->intName, wpaie, len) < 0) + if (cardif_ipw_driver_set_wpa_ie(intdata->intName, (char *) wpaie, len) < 0) { debug_printf(DEBUG_NORMAL, "Couldn't set WPA/RSN IE on device %s!\n", intdata->intName); --- xsupplicant-1.2.1/src/cardif/linux/cardif_linux_rtnetlink.c.BAD 2005-09-03 17:43:05.000000000 -0500 +++ xsupplicant-1.2.1/src/cardif/linux/cardif_linux_rtnetlink.c 2005-09-03 17:49:49.000000000 -0500 @@ -269,13 +269,13 @@ memcpy(&custom, &tptr[12], (iwe->len - 12)); debug_printf(DEBUG_INT, "(Custom) Value : %s\n", custom); - if (strncmp("wpa_ie=", custom, 7) == 0) + if (strncmp("wpa_ie=", (char *) custom, 7) == 0) { SET_FLAG(flags, WPA_IE); debug_printf(DEBUG_INT, "AP appears to support WPA!\n"); - temp = (char *)malloc((iwe->len - 12)/2); - process_hex(&custom[7], (iwe->len - 12-7), temp); - wpa_parse_ie(temp); + temp = (u_char *)malloc((iwe->len - 12)/2); + process_hex((char *) &custom[7], (iwe->len - 12-7), (char *) temp); + wpa_parse_ie((char *) temp); temp_wpa = temp; temp_wpa_len = ((iwe->len - 12)/2); @@ -285,13 +285,13 @@ temp = NULL; } - if (strncmp("rsn_ie=", custom, 7) == 0) + if (strncmp("rsn_ie=", (char *) custom, 7) == 0) { SET_FLAG(flags, RSN_IE); debug_printf(DEBUG_INT, "AP appears to support WPA2/802.11i!\n"); - temp = (char *)malloc((iwe->len - 12)/2); - process_hex(&custom[7], (iwe->len - 12-7), temp); - wpa2_parse_ie(temp); + temp = (u_char *)malloc((iwe->len - 12)/2); + process_hex((char *) &custom[7], (iwe->len - 12-7), (char *) temp); + wpa2_parse_ie((char *) temp); temp_rsn = temp; temp_rsn_len = ((iwe->len - 12)/2); @@ -381,10 +381,10 @@ "but the WPA_IE or RSN_IE flag(s) aren't set!?!\n"); } - if (strcmp(essid, intdata->cur_essid) == 0) + if (strcmp((char *) essid, intdata->cur_essid) == 0) { debug_printf(DEBUG_INT, "Adding this SSID data!\n"); - config_ssids_add(essid, flags, wpa_ie, wpa_ie_len, rsn_ie, + config_ssids_add((char *) essid, flags, wpa_ie, wpa_ie_len, rsn_ie, rsn_ie_len, freq, stale_mac); } @@ -440,10 +440,10 @@ } } - if (strcmp(essid, intdata->cur_essid) == 0) + if (strcmp((char *) essid, intdata->cur_essid) == 0) { debug_printf(DEBUG_INT, "Adding this SSID data!\n"); - config_ssids_add(essid, flags, wpa_ie, wpa_ie_len, rsn_ie, + config_ssids_add((char *) essid, flags, wpa_ie, wpa_ie_len, rsn_ie, rsn_ie_len, freq, mac); } @@ -490,8 +490,8 @@ // Then harvest the data. debug_printf(DEBUG_INT, "Reaping data. (Size : %d)\n", iwr.u.data.length); - cardif_linux_rtnetlink_reap(idata, (char *)buffer, - ((char *)buffer + iwr.u.data.length)); + cardif_linux_rtnetlink_reap(idata, (u_char *)buffer, + ((u_char *)buffer + iwr.u.data.length)); UNSET_FLAG(idata->flags, SCANNING); @@ -519,7 +519,7 @@ } remain = recvfrom(rtnl_sock, buf, sizeof(buf), MSG_DONTWAIT, - (struct sockaddr *)&rtnl_data, &rtnl_data_size); + (struct sockaddr *)&rtnl_data, (u_int *) &rtnl_data_size); if (remain >= 0) { // We need a pointer to the buffer to work with. @@ -927,7 +927,7 @@ case SIOCGIWAP: memcpy(mac, iwe->u.ap_addr.sa_data, 6); debug_printf(DEBUG_INT, "AP MAC : "); - debug_hex_printf(DEBUG_INT, mac, 6); + debug_hex_printf(DEBUG_INT, (u_char *) mac, 6); if (cardif_linux_rtnetlink_validate(idata, (u_char *)&mac) == 1) { // We have changed to associated mode. Populate the destination @@ -987,7 +987,7 @@ memcpy(buf, custom, iwe->u.data.length); buf[iwe->u.data.length] = '\0'; debug_printf(DEBUG_NORMAL, "Custom Data : \n"); - debug_hex_dump(DEBUG_NORMAL, buf, iwe->u.data.length); + debug_hex_dump(DEBUG_NORMAL, (u_char *) buf, iwe->u.data.length); cardif_linux_rtnetlink_check_custom(idata, buf); break; --- xsupplicant-1.2.1/src/cardif/linux/cardif_ndiswrapper_driver.c.BAD 2005-09-03 17:53:21.000000000 -0500 +++ xsupplicant-1.2.1/src/cardif/linux/cardif_ndiswrapper_driver.c 2005-09-03 17:54:27.000000000 -0500 @@ -202,11 +202,11 @@ wpa_key.addr = addr; wpa_key.key_index = key_idx; wpa_key.set_tx = set_tx; - wpa_key.seq = seq; + wpa_key.seq = (u_char *) seq; wpa_key.seq_len = seq_len; debug_printf(DEBUG_NORMAL, "SEQ : "); - debug_hex_printf(DEBUG_NORMAL, seq, seq_len); - wpa_key.key = key; + debug_hex_printf(DEBUG_NORMAL, (u_char *) seq, seq_len); + wpa_key.key = (u_char *) key; wpa_key.key_len = key_len; debug_printf(DEBUG_INT, "Setting key.. alg=%d idx=%d tx=%d seqlen=%d " @@ -304,11 +304,11 @@ bzero(&wpa_inf, sizeof(wpa_inf)); memcpy(buf, ssid, strlen(ssid)); - wpa_inf.bssid = (char *)config_ssid_get_mac(); - wpa_inf.ssid = (char *)&buf; + wpa_inf.bssid = (u_char *)config_ssid_get_mac(); + wpa_inf.ssid = (u_char *)&buf; wpa_inf.ssid_len = strlen(ssid); wpa_inf.freq = config_ssid_get_freq(); - wpa_inf.wpa_ie = (char *)&wpaie; + wpa_inf.wpa_ie = (u_char *)&wpaie; wpa_inf.wpa_ie_len = ielen; wpa_inf.pairwise_suite = network_data->wpa_pairwise_crypt; --- xsupplicant-1.2.1/src/cardif/linux/linux_core.c.BAD 2005-09-03 17:39:55.000000000 -0500 +++ xsupplicant-1.2.1/src/cardif/linux/linux_core.c 2005-09-03 17:42:28.000000000 -0500 @@ -116,11 +116,11 @@ { if (wepdata->key[keyidx] != NULL) { - klen = strlen(wepdata->key[keyidx]); + klen = strlen((char *) wepdata->key[keyidx]); if (((klen/2) == 5) || ((klen/2) == 13)) { // We have a valid length key. So, convert it, and set it. - process_hex(wepdata->key[keyidx], klen, key); + process_hex((char *) wepdata->key[keyidx], klen, key); // Calculate the proper key index. t = keyidx-1; @@ -130,9 +130,9 @@ debug_printf(DEBUG_INT, "Setting TX key! [%d]\n", wepdata->tx_key); t |= 0x80; - cardif_set_wep_key(intcur, key, (klen/2), t); + cardif_set_wep_key(intcur, (u_char *) key, (klen/2), t); } else { - cardif_set_wep_key(intcur, key, (klen/2), t); + cardif_set_wep_key(intcur, (u_char *) key, (klen/2), t); } } } --- xsupplicant-1.2.1/src/cardif/linux/cardif_linux.c.BAD 2005-09-03 17:37:20.000000000 -0500 +++ xsupplicant-1.2.1/src/cardif/linux/cardif_linux.c 2005-09-03 17:39:29.000000000 -0500 @@ -78,7 +78,7 @@ cardif_GetBSSID(intdata, curbssid); debug_printf(DEBUG_INT, "Current BSSID is "); - debug_hex_printf(DEBUG_INT, curbssid, 6); + debug_hex_printf(DEBUG_INT, (u_char *) curbssid, 6); memset(newmac, 0x00, 6); if (memcmp(newmac, curbssid, 6) == 0) @@ -463,7 +463,7 @@ { if (wireless == NULL) return -1; - return wireless->set_tkip_key(thisint, addr, keyidx, settx, seq, seqlen, + return wireless->set_tkip_key(thisint, (u_char *) addr, keyidx, settx, seq, seqlen, key, keylen); } @@ -478,7 +478,7 @@ { if (wireless == NULL) return -1; - return wireless->set_ccmp_key(thisint, addr, keyidx, settx, seq, seqlen, + return wireless->set_ccmp_key(thisint, (u_char *) addr, keyidx, settx, seq, seqlen, key, keylen); } @@ -746,7 +746,7 @@ { // Since we now know this frame is for us, record the address it // came from. - snmp_dot1xSuppLastEapolFrameSource((char *)&resultframe[6]); + snmp_dot1xSuppLastEapolFrameSource((u_char *)&resultframe[6]); resultsize = newsize; --- xsupplicant-1.2.1/src/psk.c.BAD 2005-09-03 09:24:53.000000000 -0500 +++ xsupplicant-1.2.1/src/psk.c 2005-09-03 09:25:15.000000000 -0500 @@ -50,7 +50,7 @@ // OpenSSL takes the parameters in a different order than what is // defined in F.8.2, so even though it looks wrong, this is correct. ;) HMAC(EVP_sha1(), password, strlen(password), digest, ssidlength+4, - digest1, &k); + digest1, (u_int *) &k); /* output = U1 */ memcpy(output, digest1, SHA_DIGEST_LENGTH); @@ -59,7 +59,7 @@ { /* Un = PRF(P, Un-1) */ HMAC(EVP_sha1(), password, strlen(password), digest1, SHA_DIGEST_LENGTH, - digest, &k); + digest, (u_int *) &k); memcpy(digest1, digest, k); /* output = output xor Un */ --- xsupplicant-1.2.1/src/mic.c.BAD 2005-09-03 09:24:01.000000000 -0500 +++ xsupplicant-1.2.1/src/mic.c 2005-09-03 09:24:43.000000000 -0500 @@ -44,14 +44,14 @@ { case 1: // Do an MD5 HMAC - HMAC(EVP_md5(), key, keylen, datain, insize, mic, &i); + HMAC(EVP_md5(), key, keylen, (u_char *) datain, insize, (u_char *) mic, (u_int *) &i); break; case 2: // Do an SHA1 HMAC // Since the HMAC will be 20 bytes, and we only need 16, we must use // a temporary variable. - HMAC(EVP_sha1(), key, keylen, datain, insize, (char *)&sha_hmac, &i); + HMAC(EVP_sha1(), key, keylen, (u_char *) datain, insize, (u_char *)&sha_hmac, (u_int *) &i); memcpy(mic, &sha_hmac, 16); break; } --- xsupplicant-1.2.1/src/config.h.BAD 2005-09-03 08:39:44.000000000 -0500 +++ xsupplicant-1.2.1/src/config.h 2005-09-03 08:39:53.000000000 -0500 @@ -341,6 +341,7 @@ char config_get_association(); char *config_get_logfile(); int config_get_ipc_gid(); +int config_get_stale_key_timeout(); char config_get_destination(); char *config_get_log_facility(); void config_set_forced_profile(char *); --- xsupplicant-1.2.1/src/eap.c.BAD 2005-09-03 08:34:21.000000000 -0500 +++ xsupplicant-1.2.1/src/eap.c 2005-09-03 08:38:27.000000000 -0500 @@ -191,9 +191,9 @@ switch (eap_request_auth(network_data->activemethod, network_data->methods, - &thisint->recvframe[OFFSET_TO_EAP], + (char *) &thisint->recvframe[OFFSET_TO_EAP], thisint->recv_size, - &thisint->sendframe[OFFSET_TO_EAP], &eapsize)) + (char *) &thisint->sendframe[OFFSET_TO_EAP], &eapsize)) { case XINNERSUCCESS: // We got a LEAP success, so we need to tell the state machine to @@ -231,7 +231,7 @@ if ((eapolver < 1) || (eapolver > MAX_EAPOL_VER)) eapolver = snmp_get_dot1xSuppLastEapolFrameVersion(); - eapol_build_header(EAP_PACKET, eapsize, eapolver, thisint->sendframe); + eapol_build_header(EAP_PACKET, eapsize, eapolver, (char *) thisint->sendframe); thisint->send_size = eapsize+OFFSET_TO_EAP; return XENONE; } @@ -284,7 +284,7 @@ eap_request_id(network_data->identity, eapdata->eap_identifier, - &thisint->sendframe[OFFSET_TO_EAP], &eapsize); + (char *) &thisint->sendframe[OFFSET_TO_EAP], &eapsize); eapolver = network_data->force_eapol_ver; @@ -295,7 +295,7 @@ if ((eapolver < 1) || (eapolver > MAX_EAPOL_VER)) eapolver = snmp_get_dot1xSuppLastEapolFrameVersion(); - eapol_build_header(EAP_PACKET, eapsize, eapolver, thisint->sendframe); + eapol_build_header(EAP_PACKET, eapsize, eapolver, (char *) thisint->sendframe); thisint->send_size = eapsize+OFFSET_TO_EAP; return XENONE; @@ -379,7 +379,7 @@ // We need to determine how long the string that we were returned is. // So, take the EAP length value, and subtract 5 to account for the EAP // header. - strncpy(&myval[0], &inframe[OFFSET_TO_DATA], (ntohs(myeap->eap_length)-5)); + strncpy(&myval[0], (char *) &inframe[OFFSET_TO_DATA], (ntohs(myeap->eap_length)-5)); debug_printf(DEBUG_NORMAL, "EAP Notification : %s\n", &myval[0]); bzero(thisint->recvframe, thisint->recv_size); @@ -814,8 +814,8 @@ if ((pwd_needed != 1) || (activemethod->tempPwd != NULL)) { switch ((*eaphandlers[eapmethod].eap_auth_handlers)(activemethod, - tosendframe, eapinsize, - &outframe[sizeof(struct eap_header)], + (u_char *) tosendframe, eapinsize, + (u_char *) &outframe[sizeof(struct eap_header)], eapsize)) { case XINNERSUCCESS: @@ -962,9 +962,9 @@ (*eaphandlers[eapmethod].eap_auth_get_keys)(thisint); - thisint->statemachine->PMK = thisint->keyingMaterial; + thisint->statemachine->PMK = (char *) thisint->keyingMaterial; debug_printf(DEBUG_INT, "PMK Keys (%d) :\n", thisint->keyingLength); - debug_hex_dump(DEBUG_INT, thisint->statemachine->PMK, thisint->keyingLength); + debug_hex_dump(DEBUG_INT, (u_char *) thisint->statemachine->PMK, thisint->keyingLength); debug_printf(DEBUG_INT, "WEP Keys (%d) :\n", thisint->keyingLength); debug_hex_dump(DEBUG_INT, thisint->keyingMaterial, thisint->keyingLength); --- xsupplicant-1.2.1/src/eapol_key_type2.c.BAD 2005-09-03 09:34:10.000000000 -0500 +++ xsupplicant-1.2.1/src/eapol_key_type2.c 2005-09-03 16:32:47.000000000 -0500 @@ -172,7 +172,7 @@ case 2: // XXX BROKEN! FIX! bzero(key, 16); - aes_unwrap(&intdata->statemachine->PTK[16], (keylen-8)/8, keypayload, + aes_unwrap((u_char *) &intdata->statemachine->PTK[16], (keylen-8)/8, keypayload, key); break; @@ -238,12 +238,12 @@ } debug_printf(DEBUG_INT, "PMK : "); - debug_hex_printf(DEBUG_INT, intdata->statemachine->PMK, 32); - wpa_PRF(intdata->statemachine->PMK, 32, "Pairwise key expansion", 22, - (char *)&prfdata, 76, retval, 64); + debug_hex_printf(DEBUG_INT, (u_char *) intdata->statemachine->PMK, 32); + wpa_PRF((u_char *) intdata->statemachine->PMK, 32, (u_char *) "Pairwise key expansion", 22, + (u_char *)&prfdata, 76, (u_char *) retval, 64); debug_printf(DEBUG_INT, "PTK : "); - debug_hex_printf(DEBUG_INT, retval, 64); + debug_hex_printf(DEBUG_INT, (u_char *) retval, 64); return retval; } @@ -310,10 +310,10 @@ eapolver = snmp_get_dot1xSuppLastEapolFrameVersion(); eapol_build_header(EAPOL_KEY, (intdata->send_size-OFFSET_TO_EAPOL-4), - eapolver, intdata->sendframe); + eapolver, (char *) intdata->sendframe); memcpy(key, intdata->statemachine->PTK, 16); - mic_wpa_populate(intdata->sendframe, intdata->send_size+4, key, 16); + mic_wpa_populate((char *) intdata->sendframe, intdata->send_size+4, key, 16); cardif_sendframe(intdata); intdata->statemachine->eapolEap = FALSE; @@ -394,7 +394,7 @@ bzero(rc4_ek, 32); memcpy(rc4_ek, inkeydata->key_iv, 16); memcpy(&rc4_ek[16], &intdata->statemachine->PTK[16], 16); - rc4_skip(rc4_ek, 32, 256, keydata, value16); + rc4_skip((u_char *) rc4_ek, 32, 256, keydata, value16); debug_printf(DEBUG_INT, "Decrypted data : (%d)\n", value16); debug_hex_dump(DEBUG_INT, keydata, value16); @@ -410,17 +410,17 @@ wpa_common_swap_rx_tx_mic(keydata); debug_printf(DEBUG_INT, "Setting GTK with index of %d\n", keyindex); - cardif_set_tkip_key(intdata, allfs, keyindex, FALSE, inkeydata->key_rsc, - 6, keydata, value16); + cardif_set_tkip_key(intdata, (char *) allfs, keyindex, FALSE, (char *) inkeydata->key_rsc, + 6, (char *) keydata, value16); break; case 2: // First, decrypt the GTK bzero(key, 16); - aes_unwrap(&intdata->statemachine->PTK[16], (value16-8)/8, keydata, - key); + aes_unwrap((u_char *) &intdata->statemachine->PTK[16], (value16-8)/8, keydata, + (u_char *) key); - cardif_set_ccmp_key(intdata, NULL, keyindex, FALSE, inkeydata->key_rsc, + cardif_set_ccmp_key(intdata, NULL, keyindex, FALSE, (char *) inkeydata->key_rsc, 6, key, (value16-8)); break; } @@ -446,13 +446,13 @@ eapolver = snmp_get_dot1xSuppLastEapolFrameVersion(); eapol_build_header(EAPOL_KEY, (intdata->send_size-OFFSET_TO_EAPOL-4), - eapolver, intdata->sendframe); + eapolver, (char *) intdata->sendframe); memcpy(key, intdata->statemachine->PTK, 16); - mic_wpa_populate(intdata->sendframe, intdata->send_size+4, key, 16); + mic_wpa_populate((char *) intdata->sendframe, intdata->send_size+4, key, 16); // Dump what we built. - eapol_key_type2_dump(intdata, intdata->sendframe); + eapol_key_type2_dump(intdata, (char *) intdata->sendframe); if (network_data->methods->method_num == WPA_PSK) { @@ -560,13 +560,13 @@ eapolver = snmp_get_dot1xSuppLastEapolFrameVersion(); eapol_build_header(EAPOL_KEY, (intdata->send_size-OFFSET_TO_EAPOL-4), - eapolver, intdata->sendframe); + eapolver, (char *) intdata->sendframe); memcpy(key, intdata->statemachine->PTK, 16); - mic_wpa_populate(intdata->sendframe, intdata->send_size+4, key, 16); + mic_wpa_populate((char *) intdata->sendframe, intdata->send_size+4, key, 16); // Dump what we built. - eapol_key_type2_dump(intdata, intdata->sendframe); + eapol_key_type2_dump(intdata, (char *) intdata->sendframe); } /******************************************************** @@ -596,7 +596,7 @@ memcpy(iedata, indata, len); debug_printf(DEBUG_INT, "Got an IE of : \n"); - debug_hex_dump(DEBUG_INT, iedata, len); + debug_hex_dump(DEBUG_INT, (u_char *) iedata, len); // XXX Todo : Verify the IE against the IE we have from the AP. @@ -869,20 +869,20 @@ eapolver = snmp_get_dot1xSuppLastEapolFrameVersion(); eapol_build_header(EAPOL_KEY, (intdata->send_size-OFFSET_TO_EAPOL-4), - eapolver, intdata->sendframe); + eapolver, (char *) intdata->sendframe); memcpy(key, intdata->statemachine->PTK, 16); - mic_wpa_populate(intdata->sendframe, intdata->send_size+4, key, 16); + mic_wpa_populate((char *) intdata->sendframe, intdata->send_size+4, key, 16); // Dump what we built. - eapol_key_type2_dump(intdata, intdata->sendframe); + eapol_key_type2_dump(intdata, (char *) intdata->sendframe); // Get TK1 value16 = ntohs(inkeydata->key_length); memcpy(key, (char *)&intdata->statemachine->PTK[32], value16); debug_printf(DEBUG_INT, "TK1 : "); - debug_hex_printf(DEBUG_INT, key, value16); + debug_hex_printf(DEBUG_INT, (u_char *) key, value16); cardif_sendframe(intdata); intdata->statemachine->eapolEap = FALSE; @@ -902,12 +902,12 @@ bzero(rc4_ek, 32); memcpy(rc4_ek, inkeydata->key_iv, 16); memcpy(&rc4_ek[16], &intdata->statemachine->PTK[16], 16); - rc4_skip(rc4_ek, 32, 256, keydata, keylen); + rc4_skip((u_char *) rc4_ek, 32, 256, keydata, keylen); break; case 2: aesval = (uint8_t *)malloc(keylen); - if (aes_unwrap(&intdata->statemachine->PTK[16], (keylen-8)/8, keydata, + if (aes_unwrap((u_char *) &intdata->statemachine->PTK[16], (keylen-8)/8, keydata, aesval)) { debug_printf(DEBUG_NORMAL, "Failed AES unwrap!\n"); @@ -943,13 +943,13 @@ { case 1: wpa_common_swap_rx_tx_mic(gtk); - cardif_set_tkip_key(intdata, allfs, keyindex, txkey, - inkeydata->key_rsc, RSC_LEN, gtk, value16); + cardif_set_tkip_key(intdata, (char*) allfs, keyindex, txkey, + (char *) inkeydata->key_rsc, RSC_LEN, (char *) gtk, value16); break; case 2: - cardif_set_ccmp_key(intdata, allfs, keyindex, txkey, - inkeydata->key_rsc, RSC_LEN, gtk, value16); + cardif_set_ccmp_key(intdata, (char *) allfs, keyindex, txkey, + (char *) inkeydata->key_rsc, RSC_LEN, (char *) gtk, value16); break; } @@ -973,15 +973,15 @@ case 1: // We need to swap the TX/RX MIC values since we are the supplicant. // (Thanks to Jouni Malinen for pointing this out!) - wpa_common_swap_rx_tx_mic(key); + wpa_common_swap_rx_tx_mic((u_char *) key); cardif_set_tkip_key(intdata, intdata->dest_mac, 0, TRUE, - inkeydata->key_rsc, RSC_LEN, key, value16); + (char *) inkeydata->key_rsc, RSC_LEN, key, value16); break; case 2: cardif_set_ccmp_key(intdata, intdata->dest_mac, 0, TRUE, - inkeydata->key_rsc, RSC_LEN, key, value16); + (char *) inkeydata->key_rsc, RSC_LEN, key, value16); break; } } @@ -1008,7 +1008,7 @@ if (keyflags & WPA2_KEY_MIC_FLAG) { - if (mic_wpa_validate(intdata->recvframe, intdata->recv_size, + if (mic_wpa_validate((char *) intdata->recvframe, intdata->recv_size, intdata->statemachine->PTK, 16) == FALSE) { intdata->statemachine->MICVerified = TRUE; @@ -1058,7 +1058,7 @@ eapolver = snmp_get_dot1xSuppLastEapolFrameVersion(); eapol_build_header(EAPOL_KEY, (intdata->recv_size-OFFSET_TO_EAPOL-4), - eapolver, intdata->recvframe); + eapolver, (char *) intdata->recvframe); cardif_sendframe(intdata); intdata->statemachine->eapolEap = FALSE; } @@ -1127,8 +1127,8 @@ } // We have an ASCII password, so calculate it. - if (psk_wpa_pbkdf2(psk->key, intdata->cur_essid, - strlen(intdata->cur_essid), (char *)&tpmk) + if (psk_wpa_pbkdf2(psk->key, (u_char *) intdata->cur_essid, + strlen(intdata->cur_essid), (u_char *)&tpmk) == TRUE) { intdata->statemachine->PMK = (char *)malloc(32); @@ -1168,7 +1168,7 @@ } } - eapol_key_type2_dump(intdata, inframe); + eapol_key_type2_dump(intdata, (char *) inframe); eapol_key_type2_determine_key(intdata); --- xsupplicant-1.2.1/src/eap_types/otp/eapotp.c.BAD 2005-09-03 17:26:09.000000000 -0500 +++ xsupplicant-1.2.1/src/eap_types/otp/eapotp.c 2005-09-03 17:26:47.000000000 -0500 @@ -123,7 +123,7 @@ /* debug_printf(DEBUG_NORMAL, "Response : "); gets(&resp); */ - strcpy(outframe, resp); + strcpy((char *) outframe, resp); *outsize = strlen(resp); return *outsize; --- xsupplicant-1.2.1/src/eap_types/tls/tls_funcs.c.BAD 2005-09-03 16:38:06.000000000 -0500 +++ xsupplicant-1.2.1/src/eap_types/tls/tls_funcs.c 2005-09-03 16:42:46.000000000 -0500 @@ -445,7 +445,7 @@ } debug_printf(DEBUG_AUTHTYPES, "Packet in (%d) :\n", insize); - debug_hex_dump(DEBUG_AUTHTYPES, inframe, insize); + debug_hex_dump(DEBUG_AUTHTYPES, (u_char *) inframe, insize); // First, make sure we don't have any errors. err = ERR_get_error(); @@ -563,7 +563,7 @@ if ((mytls_vars->resuming != 1) || (mytls_vars->quickResponse != TRUE)) { - if (((*dophase2)(thisint, tlsptr, (insize-tlsindex), outframe, + if (((*dophase2)(thisint, (u_char *) tlsptr, (insize-tlsindex), outframe, outsize)) != XENONE) { debug_printf(DEBUG_NORMAL, "Phase 2 failure!\n"); @@ -578,7 +578,7 @@ } } } else { - rtnVal = tls_funcs_parse(thisint, tlsptr, (insize-tlsindex), outframe, outsize, chunksize); + rtnVal = tls_funcs_parse(thisint, (u_char *) tlsptr, (insize-tlsindex), outframe, outsize, chunksize); if (rtnVal < 0) { debug_printf(DEBUG_NORMAL, "Couldn't parse TLS data.\n"); @@ -642,7 +642,7 @@ if ((mytls_vars->resuming != 1) || (mytls_vars->quickResponse != TRUE)) { - if ((*dophase2)(thisint, tlsptr, (insize-tlsindex), + if ((*dophase2)(thisint, (u_char *) tlsptr, (insize-tlsindex), outframe, outsize) != XENONE) { debug_printf(DEBUG_NORMAL, "Phase 2 Failure.\n"); @@ -1083,32 +1083,32 @@ /* P_MD5 */ hash = EVP_md5(); /* Initialize A_MD5 */ - HMAC(hash, S1, L_S1, P_seed, P_seed_len, A_MD5, &hashed_len); + HMAC(hash, S1, L_S1, P_seed, P_seed_len, A_MD5, (u_int *) &hashed_len); for (i = 0; i < MD5_iterations; i++) { HMAC_Init(&ctx, S1, L_S1, hash); HMAC_Update(&ctx, A_MD5, MD5_DIGEST_LENGTH); HMAC_Update(&ctx, P_seed, P_seed_len); - HMAC_Final(&ctx, P_MD5_buf + i*(MD5_DIGEST_LENGTH), &hashed_len); + HMAC_Final(&ctx, P_MD5_buf + i*(MD5_DIGEST_LENGTH), (u_int *) &hashed_len); HMAC_cleanup(&ctx); HMAC(hash, S1, L_S1, A_MD5, MD5_DIGEST_LENGTH, - A_MD5, &hashed_len); + A_MD5, (u_int *) &hashed_len); } /* do P_SHA1 */ hash = EVP_sha1(); /* Initialize A_SHA1 */ - HMAC(hash, S2, L_S2, P_seed, P_seed_len, A_SHA1, &hashed_len); + HMAC(hash, S2, L_S2, P_seed, P_seed_len, A_SHA1, (u_int *) &hashed_len); for (i = 0; i < SHA1_iterations; i++) { HMAC_Init(&ctx, S2, L_S2, hash); HMAC_Update(&ctx, A_SHA1, SHA_DIGEST_LENGTH); HMAC_Update(&ctx, P_seed, P_seed_len); - HMAC_Final(&ctx, P_SHA1_buf + i*(SHA_DIGEST_LENGTH), &hashed_len); + HMAC_Final(&ctx, P_SHA1_buf + i*(SHA_DIGEST_LENGTH), (u_int *) &hashed_len); HMAC_cleanup(&ctx); HMAC(hash, S2, L_S2, A_SHA1, SHA_DIGEST_LENGTH, - A_SHA1, &hashed_len); + A_SHA1, (u_int *) &hashed_len); } /* XOR Them for the answer */ for (i = 0; i < outlen; i++) { --- xsupplicant-1.2.1/src/eap_types/tls/tls_crypt.c.BAD 2005-09-03 16:58:16.000000000 -0500 +++ xsupplicant-1.2.1/src/eap_types/tls/tls_crypt.c 2005-09-03 16:58:35.000000000 -0500 @@ -72,7 +72,7 @@ memcpy(p, mytls_vars->ssl->s3->server_random, SSL3_RANDOM_SIZE); tls_funcs_PRF(SSL_get_session(mytls_vars->ssl)->master_key, SSL_get_session(mytls_vars->ssl)->master_key_length, - sesskey, sesskeylen, seed, + (u_char *) sesskey, sesskeylen, seed, SSL3_RANDOM_SIZE * 2, retblock, TLS_SESSION_KEY_SIZE); --- xsupplicant-1.2.1/src/eap_types/tls/eaptls.c.BAD 2005-09-03 16:33:36.000000000 -0500 +++ xsupplicant-1.2.1/src/eap_types/tls/eaptls.c 2005-09-03 16:36:48.000000000 -0500 @@ -192,7 +192,7 @@ // Make sure we have something to process... if (dataoffs == NULL) return XENONE; - retVal=tls_funcs_decode_packet(thisint, dataoffs, insize, outframe, outsize, + retVal=tls_funcs_decode_packet(thisint, (char *) dataoffs, insize, (char *) outframe, outsize, NULL, userdata->chunk_size); return retVal; @@ -222,7 +222,7 @@ free(thisint->keyingMaterial); } - thisint->keyingMaterial = tls_funcs_gen_keyblock(network_data->activemethod); + thisint->keyingMaterial = (u_char *) tls_funcs_gen_keyblock(network_data->activemethod); thisint->keyingLength = 32; if (thisint->keyingMaterial == NULL) return -1; --- xsupplicant-1.2.1/src/eap_types/peap/eappeap.c.BAD 2005-09-03 17:16:00.000000000 -0500 +++ xsupplicant-1.2.1/src/eap_types/peap/eappeap.c 2005-09-03 17:16:47.000000000 -0500 @@ -239,7 +239,7 @@ set_peap_version(p2d, peap_version); // Tell PEAP what version we want to use. dataoffs[0] = ((uint8_t)dataoffs[0] & 0xfc); // Mask out the version bits. - if (tls_funcs_decode_packet(thisint, dataoffs, insize, outframe, outsize, + if (tls_funcs_decode_packet(thisint, (char *) dataoffs, insize, (char *) outframe, outsize, (phase2_call)peap_do_phase2, userdata->chunk_size) != XENONE) { @@ -335,7 +335,7 @@ { free(thisint->keyingMaterial); } - thisint->keyingMaterial = tls_funcs_gen_keyblock(network_data->activemethod); + thisint->keyingMaterial = (u_char *) tls_funcs_gen_keyblock(network_data->activemethod); thisint->keyingLength = 32; if (thisint->keyingMaterial == NULL) return -1; --- xsupplicant-1.2.1/src/eap_types/peap/peap_phase2.c.BAD 2005-09-03 17:17:38.000000000 -0500 +++ xsupplicant-1.2.1/src/eap_types/peap/peap_phase2.c 2005-09-03 17:21:23.000000000 -0500 @@ -160,7 +160,7 @@ switch ((uint8_t)eapvalue) { case EAP_REQUEST: - eap_request_id(thisint->eapdata->identity, eapid, out, out_size); + eap_request_id(thisint->eapdata->identity, eapid, (char *) out, out_size); break; case EAP_SUCCESS: @@ -192,7 +192,7 @@ return; } eap_request_auth(thisint->activemethod, thisint->eapdata->eap_conf_data, - in, in_size, out, out_size); + (char *) in, in_size, (char *) out, out_size); break; } free(new_frame); @@ -249,7 +249,7 @@ if (eframe != 1) { - peap_pad_frame(in, in_size, padded_frame, &padded_size); + peap_pad_frame(in, in_size, (u_char *) padded_frame, &padded_size); } new_frame = (char *)malloc(1024); @@ -259,12 +259,12 @@ return; } - do_peap_version1(thisint, padded_frame, padded_size, new_frame, + do_peap_version1(thisint, (u_char *) padded_frame, padded_size, (u_char *) new_frame, &new_frame_size); free(padded_frame); if (eframe !=1) { - peap_unpad_frame(new_frame, new_frame_size, out, out_size); + peap_unpad_frame((u_char *) new_frame, new_frame_size, out, out_size); } else { memcpy(out, new_frame, new_frame_size); *out_size = new_frame_size; @@ -330,14 +330,14 @@ p2d->eapdata->identity = peapconf->identity; p2d->eapdata->ias_quirk = peapconf->ias_quirk; - decr_data = (char *)malloc(1550); + decr_data = (u_char *)malloc(1550); if (decr_data == NULL) { debug_printf(DEBUG_NORMAL, "Couldn't allocate memory for decryption buffer!\n"); return XEMALLOC; } - encr_data = (char *)malloc(1550); + encr_data = (u_char *)malloc(1550); if (encr_data == NULL) { debug_printf(DEBUG_NORMAL, "Couldn't allocate memory for encryption buffer!\n"); --- xsupplicant-1.2.1/src/eap_types/mschapv2/eapmschapv2.c.BAD 2005-09-03 17:09:07.000000000 -0500 +++ xsupplicant-1.2.1/src/eap_types/mschapv2/eapmschapv2.c 2005-09-03 17:15:29.000000000 -0500 @@ -153,13 +153,13 @@ myvars->AuthenticatorChallenge = NULL; } - myvars->AuthenticatorChallenge = (u_char *)malloc(16); + myvars->AuthenticatorChallenge = (char *)malloc(16); if (myvars->AuthenticatorChallenge == NULL) return XEMALLOC; memcpy(myvars->AuthenticatorChallenge, &challenge->Challenge, 16); debug_printf(DEBUG_AUTHTYPES, "Authenticator Challenge : "); - debug_hex_printf(DEBUG_AUTHTYPES, myvars->AuthenticatorChallenge, 16); + debug_hex_printf(DEBUG_AUTHTYPES, (u_char *) myvars->AuthenticatorChallenge, 16); if (myvars->PeerChallenge != NULL) { @@ -168,13 +168,13 @@ } // Ignore the RADIUS host, we probably don't care. - myvars->PeerChallenge = (u_char *)malloc(16); + myvars->PeerChallenge = (char *)malloc(16); if (myvars->PeerChallenge == NULL) return XEMALLOC; - RAND_bytes(myvars->PeerChallenge, 16); + RAND_bytes((u_char *) myvars->PeerChallenge, 16); debug_printf(DEBUG_AUTHTYPES, "Generated PeerChallenge : "); - debug_hex_printf(DEBUG_AUTHTYPES, myvars->PeerChallenge,16); + debug_hex_printf(DEBUG_AUTHTYPES, (u_char *) myvars->PeerChallenge,16); if (myvars->NtResponse != NULL) { @@ -182,14 +182,14 @@ myvars->NtResponse = NULL; } - myvars->NtResponse = (u_char *)malloc(24); + myvars->NtResponse = (char *)malloc(24); if (myvars->NtResponse == NULL) return XEMALLOC; GenerateNTResponse(myvars->AuthenticatorChallenge, myvars->PeerChallenge, username, userdata->password, myvars->NtResponse); debug_printf(DEBUG_AUTHTYPES, "myvars->NtResponse = "); - debug_hex_printf(DEBUG_AUTHTYPES, myvars->NtResponse, 24); + debug_hex_printf(DEBUG_AUTHTYPES, (u_char *) myvars->NtResponse, 24); response->OpCode = MS_CHAPV2_RESPONSE; response->MS_CHAPv2_ID = challenge->MS_CHAPv2_ID; @@ -219,7 +219,7 @@ CheckAuthenticatorResponse(userdata->password, myvars->NtResponse, myvars->PeerChallenge, myvars->AuthenticatorChallenge, - username, (u_char *)&recv[0], &respOk); + username, (char *)&recv[0], &respOk); if (respOk == 1) { @@ -227,15 +227,15 @@ outframe[0] = MS_CHAPV2_SUCCESS; // We were successful, so generate keying material. - NtPasswordHash(userdata->password, (u_char *)&NtHash); - HashNtPasswordHash((u_char *)&NtHash, (u_char *)&NtHashHash); - GetMasterKey((u_char *)&NtHashHash, myvars->NtResponse, (u_char *)&MasterKey); + NtPasswordHash(userdata->password, (char *)&NtHash); + HashNtPasswordHash((char *)&NtHash, (char *)&NtHashHash); + GetMasterKey((char *)&NtHashHash, myvars->NtResponse, (char *)&MasterKey); // Now, get the send key. - GetAsymetricStartKey((u_char *)&MasterKey, (u_char *)&mppeSend, 16, TRUE, FALSE); + GetAsymetricStartKey((char *)&MasterKey, (char *)&mppeSend, 16, TRUE, FALSE); // And the recv key. - GetAsymetricStartKey((u_char *)&MasterKey, (u_char *)&mppeRecv, 16, FALSE, FALSE); + GetAsymetricStartKey((char *)&MasterKey, (char *)&mppeRecv, 16, FALSE, FALSE); // Finally, populate our myvars->keyingMaterial. if (myvars->keyingMaterial != NULL) @@ -243,7 +243,7 @@ free(myvars->keyingMaterial); myvars->keyingMaterial = NULL; } - myvars->keyingMaterial = (u_char *)malloc(64); // 32 bytes each. + myvars->keyingMaterial = (char *)malloc(64); // 32 bytes each. if (myvars->keyingMaterial == NULL) return XEMALLOC; bzero(myvars->keyingMaterial, 64); @@ -294,7 +294,7 @@ free(thisint->keyingMaterial); } - thisint->keyingMaterial = (char *)malloc(64); + thisint->keyingMaterial = (u_char *)malloc(64); if (thisint->keyingMaterial == NULL) return -1; memcpy(thisint->keyingMaterial, myconf->keyingMaterial, 64); --- xsupplicant-1.2.1/src/eap_types/mschapv2/mschapv2.c.BAD 2005-09-03 17:01:58.000000000 -0500 +++ xsupplicant-1.2.1/src/eap_types/mschapv2/mschapv2.c 2005-09-03 17:04:49.000000000 -0500 @@ -46,7 +46,7 @@ EVP_DigestUpdate(&cntx, PeerChallenge, 16); EVP_DigestUpdate(&cntx, AuthenticatorChallenge, 16); EVP_DigestUpdate(&cntx, UserName, strlen(UserName)); - EVP_DigestFinal(&cntx, (char *)&Digest, &retLen); + EVP_DigestFinal(&cntx, (u_char *)&Digest, (u_int *) &retLen); memcpy(Challenge, Digest, 8); } @@ -96,7 +96,7 @@ EVP_DigestInit(&cntx, EVP_md4()); EVP_DigestUpdate(&cntx, uniPassword, len); - EVP_DigestFinal(&cntx, (char *)&retVal, (int *)&i); + EVP_DigestFinal(&cntx, (u_char *)&retVal, (u_int *)&i); memcpy(PasswordHash, &retVal, 16); free(uniPassword); } @@ -114,7 +114,7 @@ EVP_DigestInit(&cntx, EVP_md4()); EVP_DigestUpdate(&cntx, PasswordHash, 16); - EVP_DigestFinal(&cntx, PasswordHashHash, &i); + EVP_DigestFinal(&cntx, (u_char *) PasswordHashHash, (u_int *) &i); } // Shamelessly take from the hostap code written by Jouni Malinen @@ -231,7 +231,7 @@ EVP_DigestUpdate(&context, &PasswordHashHash, 16); EVP_DigestUpdate(&context, NTResponse, 24); EVP_DigestUpdate(&context, Magic1, 39); - EVP_DigestFinal(&context, (char *)&Digest, &Digest_len); + EVP_DigestFinal(&context, (u_char *)&Digest, (u_int *) &Digest_len); ChallengeHash(PeerChallenge, AuthenticatorChallenge, UserName, Challenge); @@ -239,7 +239,7 @@ EVP_DigestUpdate(&context, &Digest, 20); EVP_DigestUpdate(&context, &Challenge, 8); EVP_DigestUpdate(&context, Magic2, 41); - EVP_DigestFinal(&context, (char *)&Digest, &Digest_len); + EVP_DigestFinal(&context, (u_char *)&Digest, (u_int *) &Digest_len); memcpy(AuthenticatorResponse, &Digest, Digest_len); } @@ -287,12 +287,12 @@ return; } - des_encrypt(Challenge, PasswordHash, Response); - des_encrypt(Challenge, PasswordHash + 7, Response+8); + des_encrypt((uint8_t *) Challenge, (uint8_t *) PasswordHash, (uint8_t *) Response); + des_encrypt((uint8_t *) Challenge, (uint8_t *) PasswordHash + 7, (uint8_t *) Response+8); zpwd[0] = PasswordHash[14]; zpwd[1] = PasswordHash[15]; memset(zpwd + 2, 0, 5); - des_encrypt(Challenge, zpwd, Response+16); + des_encrypt((uint8_t *) Challenge, zpwd, (uint8_t *) Response+16); } void NtChallengeResponse(char *Challenge, char *Password, char *Response) @@ -323,18 +323,18 @@ ChallengeHash(PeerChallenge, AuthenticatorChallenge, UserName, (char *)&Challenge); debug_printf(DEBUG_AUTHTYPES, "PeerChallenge : "); - debug_hex_printf(DEBUG_AUTHTYPES, PeerChallenge, 8); + debug_hex_printf(DEBUG_AUTHTYPES, (u_char *) PeerChallenge, 8); debug_printf(DEBUG_AUTHTYPES, "AuthenticatorChallenge : "); - debug_hex_printf(DEBUG_AUTHTYPES, AuthenticatorChallenge, 8); + debug_hex_printf(DEBUG_AUTHTYPES, (u_char *) AuthenticatorChallenge, 8); debug_printf(DEBUG_AUTHTYPES, "Username : %s\n",UserName); debug_printf(DEBUG_AUTHTYPES, "Challenge : "); - debug_hex_printf(DEBUG_AUTHTYPES, Challenge, 8); + debug_hex_printf(DEBUG_AUTHTYPES, (u_char *) Challenge, 8); NtPasswordHash(Password, (char *)&PasswordHash); debug_printf(DEBUG_AUTHTYPES, "PasswordHash : "); - debug_hex_printf(DEBUG_AUTHTYPES, PasswordHash, 16); + debug_hex_printf(DEBUG_AUTHTYPES, (u_char *) PasswordHash, 16); ChallengeResponse(Challenge, (char *)&PasswordHash, Response); debug_printf(DEBUG_AUTHTYPES, "Response : "); - debug_hex_printf(DEBUG_AUTHTYPES, Response, 24); + debug_hex_printf(DEBUG_AUTHTYPES, (u_char *) Response, 24); } void GetMasterKey(char *PasswordHashHash, char *NTResponse, char *MasterKey) @@ -360,7 +360,7 @@ EVP_DigestUpdate(&cntx, PasswordHashHash, 16); EVP_DigestUpdate(&cntx, NTResponse, 24); EVP_DigestUpdate(&cntx, (char *)&Magic1, 27); - EVP_DigestFinal(&cntx, (char *)&Digest, &retLen); + EVP_DigestFinal(&cntx, (u_char *)&Digest, (u_int *) &retLen); memcpy(MasterKey, &Digest, 16); } @@ -386,7 +386,7 @@ EVP_DigestUpdate(&cntx, APR, 24); EVP_DigestUpdate(&cntx, PC, 8); EVP_DigestUpdate(&cntx, PR, 24); - EVP_DigestFinal(&cntx, (char *)&Digest, &retLen); + EVP_DigestFinal(&cntx, (u_char *)&Digest, (u_int *) &retLen); memcpy(MasterKey, &Digest, 16); @@ -461,7 +461,7 @@ EVP_DigestUpdate(&cntx, SHSpad1, 40); EVP_DigestUpdate(&cntx, (char *)&Magic, 84); EVP_DigestUpdate(&cntx, SHSpad2, 40); - EVP_DigestFinal(&cntx, (char *)&Digest, &retLen); + EVP_DigestFinal(&cntx, (u_char *)&Digest, (u_int *)&retLen); memcpy(SessionKey, &Digest, SessionKeyLength); } --- xsupplicant-1.2.1/src/eap_types/ttls/eapttls.c.BAD 2005-09-03 16:43:18.000000000 -0500 +++ xsupplicant-1.2.1/src/eap_types/ttls/eapttls.c 2005-09-03 16:44:20.000000000 -0500 @@ -215,7 +215,7 @@ // Make sure we have a valid packet to process. if (dataoffs == NULL) return XENONE; - result=tls_funcs_decode_packet(thisint, dataoffs, insize, outframe, outsize, + result=tls_funcs_decode_packet(thisint, (char *) dataoffs, insize, (char *) outframe, outsize, (phase2_call)ttls_do_phase2, userdata->chunk_size); if (result != 0) @@ -250,7 +250,7 @@ free(thisint->keyingMaterial); } - thisint->keyingMaterial = tls_funcs_gen_keyblock(network_data->activemethod); + thisint->keyingMaterial = (u_char *) tls_funcs_gen_keyblock(network_data->activemethod); thisint->keyingLength = 32; if (thisint->keyingMaterial == NULL) return -1; --- xsupplicant-1.2.1/src/eap_types/ttls/ttlsphase2.c.BAD 2005-09-03 16:45:26.000000000 -0500 +++ xsupplicant-1.2.1/src/eap_types/ttls/ttlsphase2.c 2005-09-03 16:57:41.000000000 -0500 @@ -184,7 +184,7 @@ username_size = strlen(username); // Send the Username AVP - build_avp(USER_NAME_AVP, 0, MANDITORY_FLAG, username, username_size, out_data, &avp_out_size); + build_avp(USER_NAME_AVP, 0, MANDITORY_FLAG, (uint8_t *) username, username_size, (uint8_t *) out_data, &avp_out_size); avp_offset = avp_out_size; @@ -200,7 +200,7 @@ id = challenge[16]; // Send the MS-CHAP AVP - build_avp(MS_CHAP_CHALLENGE, MS_VENDOR_ATTR, (MANDITORY_FLAG | VENDOR_FLAG), (char *)&mschap_challenge, 16, &out_data[avp_offset], &avp_out_size); + build_avp(MS_CHAP_CHALLENGE, MS_VENDOR_ATTR, (MANDITORY_FLAG | VENDOR_FLAG), (uint8_t *) &mschap_challenge, 16, (uint8_t *) &out_data[avp_offset], &avp_out_size); avp_offset+=avp_out_size; @@ -217,7 +217,7 @@ memcpy(&mschap_answer[2], &mschap_challenge, 16); memcpy(&mschap_answer[26], &mschap_result, 24); - build_avp(MS_CHAP2_RESPONSE, MS_VENDOR_ATTR, (MANDITORY_FLAG | VENDOR_FLAG), (char *)&mschap_answer, 50, &out_data[avp_offset], &avp_out_size); + build_avp(MS_CHAP2_RESPONSE, MS_VENDOR_ATTR, (MANDITORY_FLAG | VENDOR_FLAG), (uint8_t *) &mschap_answer, 50, (uint8_t *) &out_data[avp_offset], &avp_out_size); avp_offset+=avp_out_size; *out_size = avp_offset; } @@ -283,7 +283,7 @@ username_size = strlen(username); // Send the Username AVP - build_avp(USER_NAME_AVP, 0, MANDITORY_FLAG, username, username_size, out_data, &avp_out_size); + build_avp(USER_NAME_AVP, 0, MANDITORY_FLAG, (uint8_t *) username, username_size, (uint8_t *) out_data, &avp_out_size); avp_offset = avp_out_size; @@ -299,7 +299,7 @@ id = challenge[8]; // Send the MS-CHAP AVP - build_avp(MS_CHAP_CHALLENGE, MS_VENDOR_ATTR, (MANDITORY_FLAG | VENDOR_FLAG), (char *)&mschap_challenge, 8, &out_data[avp_offset], &avp_out_size); + build_avp(MS_CHAP_CHALLENGE, MS_VENDOR_ATTR, (MANDITORY_FLAG | VENDOR_FLAG), (uint8_t *) &mschap_challenge, 8, (uint8_t *) &out_data[avp_offset], &avp_out_size); avp_offset+=avp_out_size; @@ -313,7 +313,7 @@ mschap_answer[1] = 1; // Use NT Style Passwords. memcpy((char *)&mschap_answer[26], (char *)&mschap_result, 24); - build_avp(MS_CHAP_RESPONSE, MS_VENDOR_ATTR, (MANDITORY_FLAG | VENDOR_FLAG), (char *)&mschap_answer, 50, &out_data[avp_offset], &avp_out_size); + build_avp(MS_CHAP_RESPONSE, MS_VENDOR_ATTR, (MANDITORY_FLAG | VENDOR_FLAG), (uint8_t *) &mschap_answer, 50, (uint8_t *) &out_data[avp_offset], &avp_out_size); avp_offset+=avp_out_size; *out_size = avp_offset; @@ -386,12 +386,12 @@ username = phase2data->username; } username_size = strlen(username); - build_avp(USER_NAME_AVP, 0, MANDITORY_FLAG, username, username_size, out_data, &avp_out_size); + build_avp(USER_NAME_AVP, 0, MANDITORY_FLAG, (uint8_t *) username, username_size, (uint8_t *) out_data, &avp_out_size); avp_offset = avp_out_size; // Get the implicit challenge. - challenge = implicit_challenge(thisint); + challenge = (u_char *) implicit_challenge(thisint); if (challenge == NULL) { debug_printf(DEBUG_NORMAL, "Invalid implicit challenge in ttls_do_chap()!\n"); @@ -409,9 +409,9 @@ return; } - user_passwd = phase2data->password; + user_passwd = (u_char *) phase2data->password; - tohash = (char *)malloc(1+16+strlen(user_passwd)); + tohash = (u_char *)malloc(1+16+strlen((char *) user_passwd)); if (tohash == NULL) { debug_printf(DEBUG_NORMAL, "Error with malloc of \"tohash\" in ttls_do_chap().\n"); @@ -419,13 +419,13 @@ } tohash[0] = session_id; - memcpy(&tohash[1], user_passwd, strlen(user_passwd)); - memcpy(&tohash[1+strlen(user_passwd)], &chap_challenge, 16); - hashlen = 1+strlen(user_passwd)+16; + memcpy(&tohash[1], user_passwd, strlen((char *) user_passwd)); + memcpy(&tohash[1+strlen((char *) user_passwd)], &chap_challenge, 16); + hashlen = 1+strlen((char *) user_passwd)+16; EVP_DigestInit(ctx, EVP_md5()); EVP_DigestUpdate(ctx, tohash, hashlen); - EVP_DigestFinal(ctx, (char *)&chap_hash[1], (int *)&md5_length); + EVP_DigestFinal(ctx, (u_char *)&chap_hash[1], (u_int *)&md5_length); if (md5_length != 16) // We didn't get back a valid hash! { @@ -433,11 +433,11 @@ } chap_hash[0]=session_id; - build_avp(CHAP_PASSWORD_AVP, 0, MANDITORY_FLAG, chap_hash, 17, &out_data[avp_offset], &avp_out_size); + build_avp(CHAP_PASSWORD_AVP, 0, MANDITORY_FLAG, chap_hash, 17, (uint8_t *) &out_data[avp_offset], &avp_out_size); avp_offset += avp_out_size; - build_avp(CHAP_CHALLENGE_AVP, 0, MANDITORY_FLAG, (char *)&chap_challenge, 16, &out_data[avp_offset], &avp_out_size); + build_avp(CHAP_CHALLENGE_AVP, 0, MANDITORY_FLAG, (uint8_t *) &chap_challenge, 16, (uint8_t *) &out_data[avp_offset], &avp_out_size); if (tohash != NULL) { @@ -518,8 +518,8 @@ avp_offset = 0; - build_avp(USER_NAME_AVP, 0, MANDITORY_FLAG, username, - strlen(username), out_data, &avp_out_size); + build_avp(USER_NAME_AVP, 0, MANDITORY_FLAG, (uint8_t *) username, + strlen(username), (uint8_t *) out_data, &avp_out_size); avp_offset += avp_out_size; @@ -537,7 +537,7 @@ bzero(tempbuf, passwd_size); memcpy(tempbuf, phase2data->password, strlen(phase2data->password)); - build_avp(USER_PASSWORD_AVP, 0, MANDITORY_FLAG, tempbuf, passwd_size, &out_data[avp_offset], &avp_out_size); + build_avp(USER_PASSWORD_AVP, 0, MANDITORY_FLAG, (uint8_t *) tempbuf, passwd_size, (uint8_t *) &out_data[avp_offset], &avp_out_size); *out_size = avp_offset + avp_out_size; @@ -548,7 +548,7 @@ } debug_printf(DEBUG_AUTHTYPES, "Returning from do_pap :\n"); - debug_hex_dump(DEBUG_AUTHTYPES, out_data, *out_size); + debug_hex_dump(DEBUG_AUTHTYPES, (u_char *) out_data, *out_size); } // We don't do anything with the "in" stuff for now.. @@ -567,7 +567,7 @@ } debug_printf(DEBUG_AUTHTYPES, "Encrypted Inner (%d) : \n", in_size); - debug_hex_dump(DEBUG_AUTHTYPES, in, in_size); + debug_hex_dump(DEBUG_AUTHTYPES, (u_char *) in, in_size); userdata = (struct config_eap_ttls *)thisint->eap_conf_data; @@ -597,10 +597,10 @@ if ((in_size > 0) && (in[0] != 0x14)) { // We have something to decrypt! - tls_crypt_decrypt(thisint, in, in_size, decr_data, &decrsize); + tls_crypt_decrypt(thisint, (u_char *) in, in_size, (u_char *) decr_data, &decrsize); debug_printf(DEBUG_AUTHTYPES, "Decrypted Inner (%d) : \n", in_size); - debug_hex_dump(DEBUG_AUTHTYPES, decr_data, decrsize); + debug_hex_dump(DEBUG_AUTHTYPES, (u_char *) decr_data, decrsize); if (decr_data[0] == 0x00) { @@ -638,11 +638,11 @@ return XENONE; } - tls_crypt_encrypt_nolen(thisint, toencout, toencsize, out, out_size); + tls_crypt_encrypt_nolen(thisint, (u_char *) toencout, toencsize, (u_char *) out, out_size); free(toencout); debug_printf(DEBUG_AUTHTYPES, "Returning from (TTLS) do_phase2 : \n"); - debug_hex_dump(DEBUG_AUTHTYPES, out, *out_size); + debug_hex_dump(DEBUG_AUTHTYPES, (u_char *) out, *out_size); return XENONE; } --- xsupplicant-1.2.1/src/eap_types/leap/eapleap.c.BAD 2005-09-03 17:22:01.000000000 -0500 +++ xsupplicant-1.2.1/src/eap_types/leap/eapleap.c 2005-09-03 17:25:57.000000000 -0500 @@ -50,7 +50,7 @@ unicodePass[2 * i + 1] = 0; } /* Encrypt plain text password to a 16-byte MD4 hash */ - md4_calc(MD4Hash, unicodePass, passLen * 2); + md4_calc(MD4Hash, (u_char *) unicodePass, passLen * 2); } void leap_mschap(char * password, char * response) { @@ -64,7 +64,7 @@ ntPwdHash(MD4Hash, password); md4_calc(MD4HashHash, MD4Hash, 16); - ChallengeResponse(leapchallenges->apc, MD4HashHash, response); + ChallengeResponse((char *) leapchallenges->apc, (char *) MD4HashHash, response); } @@ -199,7 +199,7 @@ // LEAP shouldn't be used as an inner type, so we should be able to get // away with this. - data = dataoffs-5; + data = (char *) dataoffs-5; eapheader = (struct eap_header *)data; switch (eapheader->eap_code) { @@ -279,7 +279,7 @@ memset(chall_response, 0x0, 8); NtChallengeResponse((char *)leaprequest->randval, userdata->password, (char *)&chall_response); - GenerateNTResponse((char *)leapchallenges->pr, (char *)leapchallenges->pc, username, userdata->password, chall_response); + GenerateNTResponse((char *)leapchallenges->pr, (char *)leapchallenges->pc, username, userdata->password, (char *) chall_response); // store Access Point Challenge memcpy((uint8_t *)leapchallenges->apc, (char *)chall_response, 8); @@ -337,7 +337,7 @@ leapresponse = (struct leap_responses *)dataoffs; - challenge_response_got = (char *)malloc(leapresponse->count+1); + challenge_response_got = (u_char *)malloc(leapresponse->count+1); if (!challenge_response_got) { debug_printf(DEBUG_NORMAL, "(EAP-LEAP) challenge_response_got is NULL after malloc!\n"); } @@ -350,7 +350,7 @@ memset(challenge_response_expected, 0x0, 24); // Calculate the 24 bytes MS-CHAP Challenge Response - leap_mschap(userdata->password, challenge_response_expected); + leap_mschap(userdata->password, (char *) challenge_response_expected); if (memcmp(challenge_response_got, challenge_response_expected, 24) == 0) { debug_printf(DEBUG_AUTHTYPES, "(EAP-LEAP) AP ChallengeResponse got is valid.\n"); @@ -386,7 +386,7 @@ debug_printf(DEBUG_AUTHTYPES, "(EAP-LEAP) leapchallenges->apr : "); debug_hex_printf(DEBUG_AUTHTYPES, (uint8_t *)leapchallenges->apr, 24); - GetMasterLEAPKey((char *)MD4HashHash, leapchallenges->apc, leapchallenges->apr, leapchallenges->pc, leapchallenges->pr, (char *)&MasterKey); + GetMasterLEAPKey((char *)MD4HashHash, (char *) leapchallenges->apc, (char *) leapchallenges->apr, (char *) leapchallenges->pc, (char *) leapchallenges->pr, (char *)&MasterKey); debug_printf(DEBUG_AUTHTYPES, "MasterLEAPKey : "); debug_hex_printf(DEBUG_AUTHTYPES, (unsigned char *)&MasterKey, 16); @@ -444,7 +444,7 @@ mydata = (struct leap_data *)network_data->activemethod->eap_data; // Right now, we don't return anything from LEAP. - thisint->keyingMaterial = mydata->keyingMaterial; + thisint->keyingMaterial = (u_char *) mydata->keyingMaterial; thisint->keyingLength = 16; // We only use 16 bytes for this keying material! return 0; --- xsupplicant-1.2.1/src/wpa_common.c.BAD 2005-09-03 08:42:16.000000000 -0500 +++ xsupplicant-1.2.1/src/wpa_common.c 2005-09-03 08:42:30.000000000 -0500 @@ -201,7 +201,7 @@ // This is a little different than the reference implementation, // because OpenSSL takes parameters in a different order. HMAC(EVP_sha1(), key, key_len, input, total_len, &output[currentindex], - &k); + (u_int *) &k); currentindex += 20; input[total_len-1]++; } --- xsupplicant-1.2.1/src/eapol_key_type1.c.BAD 2005-09-03 08:40:11.000000000 -0500 +++ xsupplicant-1.2.1/src/eapol_key_type1.c 2005-09-03 08:41:54.000000000 -0500 @@ -107,7 +107,7 @@ if (calchmac == NULL) return XEMALLOC; HMAC(EVP_md5(), thisint->keyingMaterial+32, - thisint->keyingLength, framecpy, framesize, calchmac, &outlen); + thisint->keyingLength, (u_char *) framecpy, framesize, (u_char *) calchmac, (u_int *) &outlen); // Now, we need to compare the calculated HMAC to the one sent to us. keydata = (struct key_packet *)&inframe[4]; --- xsupplicant-1.2.1/src/eapol.c.BAD 2005-09-03 08:30:37.000000000 -0500 +++ xsupplicant-1.2.1/src/eapol.c 2005-09-03 08:30:45.000000000 -0500 @@ -122,7 +122,7 @@ // an EAP request that is valid. If we don't have any config informtion, // we should just bail here, and not return an error. - inframe = (u_char *)&workint->recvframe; + inframe = (char *)&workint->recvframe; temp = (struct eapol_header *)&inframe[OFFSET_PAST_MAC]; --- xsupplicant-1.2.1/src/statemachine.c.BAD 2005-09-03 08:32:13.000000000 -0500 +++ xsupplicant-1.2.1/src/statemachine.c 2005-09-03 08:33:13.000000000 -0500 @@ -619,7 +619,7 @@ } } - eapol_build_header(EAPOL_LOGOFF, 0, eapolver, thisint->sendframe); + eapol_build_header(EAPOL_LOGOFF, 0, eapolver, (char *) thisint->sendframe); thisint->send_size = OFFSET_TO_EAP; snmp_dot1xSuppEapolLogoffFramesTx(); @@ -664,7 +664,7 @@ } eapol_build_header(EAPOL_START, 0, network_data->force_eapol_ver, - thisint->sendframe); + (char *) thisint->sendframe); thisint->send_size = OFFSET_TO_EAP; snmp_dot1xSuppEapolStartFramesTx(); --- xsupplicant-1.2.1/src/config_ssid.c.BAD 2005-09-03 08:30:08.000000000 -0500 +++ xsupplicant-1.2.1/src/config_ssid.c 2005-09-03 08:30:24.000000000 -0500 @@ -151,7 +151,7 @@ if (wpa_ie != NULL) { - cur->wpa_ie = (char *)malloc(wpa_ie_len); + cur->wpa_ie = (unsigned char *)malloc(wpa_ie_len); if (cur->wpa_ie == NULL) { debug_printf(DEBUG_NORMAL, "Couldn't allocate memory for wpa_ie! " @@ -168,7 +168,7 @@ if (rsn_ie != NULL) { - cur->rsn_ie = (char *)malloc(rsn_ie_len); + cur->rsn_ie = (unsigned char *)malloc(rsn_ie_len); if (cur->rsn_ie == NULL) { debug_printf(DEBUG_NORMAL, "Couldn't allocate memory for rsn_ie! " --- xsupplicant-1.2.1/src/xsup_ipc.c.BAD 2005-09-03 17:27:32.000000000 -0500 +++ xsupplicant-1.2.1/src/xsup_ipc.c 2005-09-03 17:29:17.000000000 -0500 @@ -144,7 +144,7 @@ } debug_printf(DEBUG_INT, "(IPC) Sending : \n"); - debug_hex_dump(DEBUG_INT, tosend, tolen); + debug_hex_dump(DEBUG_INT, (u_char *) tosend, tolen); err = send(skfd, tosend, tolen, 0); if (err < 0) @@ -194,7 +194,7 @@ *outsize = 0; } else { debug_printf(DEBUG_INT, "(IPC) Got : \n"); - debug_hex_dump(DEBUG_INT, outbuf, readStat); + debug_hex_dump(DEBUG_INT, (u_char *) outbuf, readStat); // Verify that the packet we got is valid. *outsize = readStat; @@ -355,7 +355,7 @@ debug_printf(DEBUG_NORMAL, "Error getting working interface " "dumping current packet: \n"); - debug_hex_dump(DEBUG_NORMAL, buffer, bufsize); + debug_hex_dump(DEBUG_NORMAL, (u_char *) buffer, bufsize); debug_printf(DEBUG_NORMAL, "Ignoring remaining parts of packet!\n"); bufptr = bufsize+1; @@ -419,7 +419,7 @@ { // We got a request for a new IPC client connection. debug_printf(DEBUG_INT, "Got a request to connect a new client.\n"); - newsock = accept(ipc_sock, (struct sockaddr *)&sa, &len); + newsock = accept(ipc_sock, (struct sockaddr *)&sa, (u_int *) &len); if (newsock <= 0) { debug_printf(DEBUG_NORMAL, "Got a request for a new IPC client " @@ -514,7 +514,7 @@ ipc_callout_request_password(intidx, &bufptr, (char *)&packet[0], 512, eapType, challenge); debug_printf(DEBUG_AUTHTYPES, "Sending : \n"); - debug_hex_dump(DEBUG_AUTHTYPES, packet, bufptr); + debug_hex_dump(DEBUG_AUTHTYPES, (u_char *) packet, bufptr); xsup_ipc_send_all((char *)&packet, bufptr); --- xsupplicant-1.2.1/src/eapol_key_type254.c.BAD 2005-09-03 09:05:02.000000000 -0500 +++ xsupplicant-1.2.1/src/eapol_key_type254.c 2005-09-03 09:21:09.000000000 -0500 @@ -192,12 +192,12 @@ } debug_printf(DEBUG_INT, "PMK : "); - debug_hex_printf(DEBUG_INT, intdata->statemachine->PMK, 32); - wpa_PRF(intdata->statemachine->PMK, 32, "Pairwise key expansion", 22, - (char *)&prfdata, 76, retval, 64); + debug_hex_printf(DEBUG_INT, (u_char *) intdata->statemachine->PMK, 32); + wpa_PRF((u_char *) intdata->statemachine->PMK, 32, (u_char *) "Pairwise key expansion", 22, + (u_char *)&prfdata, 76, (u_char *) retval, 64); debug_printf(DEBUG_INT, "PTK : "); - debug_hex_printf(DEBUG_INT, retval, 64); + debug_hex_printf(DEBUG_INT, (u_char *) retval, 64); return retval; } @@ -264,10 +264,10 @@ eapolver = snmp_get_dot1xSuppLastEapolFrameVersion(); eapol_build_header(EAPOL_KEY, (intdata->send_size-OFFSET_TO_EAPOL-4), - eapolver, intdata->sendframe); + eapolver, (char *) intdata->sendframe); memcpy(key, intdata->statemachine->PTK, 16); - mic_wpa_populate(intdata->sendframe, intdata->send_size+4, key, 16); + mic_wpa_populate((char *) intdata->sendframe, intdata->send_size+4, key, 16); cardif_sendframe(intdata); intdata->statemachine->eapolEap = FALSE; @@ -351,21 +351,21 @@ bzero(rc4_ek, 32); memcpy(rc4_ek, inkeydata->key_iv, 16); memcpy(&rc4_ek[16], &intdata->statemachine->PTK[16], 16); - rc4_skip(rc4_ek, 32, 256, keydata, value16); + rc4_skip((u_char *) rc4_ek, 32, 256, keydata, value16); wpa_common_swap_rx_tx_mic(keydata); - cardif_set_tkip_key(intdata, allfs, keyindex, FALSE, inkeydata->key_rsc, - 6, keydata, value16); + cardif_set_tkip_key(intdata, (char *) allfs, keyindex, FALSE, (char *) inkeydata->key_rsc, + 6, (char *) keydata, value16); break; case 2: // First, decrypt the GTK bzero(key, 16); - aes_unwrap(&intdata->statemachine->PTK[16], (value16-8)/8, keydata, - key); + aes_unwrap((u_char *) &intdata->statemachine->PTK[16], (value16-8)/8, keydata, + (u_char *) key); wpa_common_swap_rx_tx_mic(keydata); - cardif_set_ccmp_key(intdata, NULL, keyindex, FALSE, inkeydata->key_rsc, + cardif_set_ccmp_key(intdata, NULL, keyindex, FALSE, (char *) inkeydata->key_rsc, 6, key, (value16-8)); break; } @@ -391,13 +391,13 @@ eapolver = snmp_get_dot1xSuppLastEapolFrameVersion(); eapol_build_header(EAPOL_KEY, (intdata->send_size-OFFSET_TO_EAPOL-4), - eapolver, intdata->sendframe); + eapolver, (char *) intdata->sendframe); memcpy(key, intdata->statemachine->PTK, 16); - mic_wpa_populate(intdata->sendframe, intdata->send_size+4, key, 16); + mic_wpa_populate((char *) intdata->sendframe, intdata->send_size+4, key, 16); // Dump what we built. - eapol_key_type254_dump(intdata->sendframe); + eapol_key_type254_dump((char *) intdata->sendframe); if (network_data->methods->method_num == WPA_PSK) { @@ -504,13 +504,13 @@ eapolver = snmp_get_dot1xSuppLastEapolFrameVersion(); eapol_build_header(EAPOL_KEY, (intdata->send_size-OFFSET_TO_EAPOL-4), - eapolver, intdata->sendframe); + eapolver, (char *) intdata->sendframe); memcpy(key, intdata->statemachine->PTK, 16); - mic_wpa_populate(intdata->sendframe, intdata->send_size+4, key, 16); + mic_wpa_populate((char *) intdata->sendframe, intdata->send_size+4, key, 16); // Dump what we built. - eapol_key_type254_dump(intdata->sendframe); + eapol_key_type254_dump((char *) intdata->sendframe); } /******************************************************** @@ -586,20 +586,20 @@ eapolver = snmp_get_dot1xSuppLastEapolFrameVersion(); eapol_build_header(EAPOL_KEY, (intdata->send_size-OFFSET_TO_EAPOL-4), - eapolver, intdata->sendframe); + eapolver, (char *) intdata->sendframe); memcpy(key, intdata->statemachine->PTK, 16); - mic_wpa_populate(intdata->sendframe, intdata->send_size+4, key, 16); + mic_wpa_populate((char *) intdata->sendframe, intdata->send_size+4, key, 16); // Dump what we built. - eapol_key_type254_dump(intdata->sendframe); + eapol_key_type254_dump((char *) intdata->sendframe); // Get TK1 value16 = ntohs(inkeydata->key_length); memcpy(key, (char *)&intdata->statemachine->PTK[32], value16); debug_printf(DEBUG_INT, "TK1 : "); - debug_hex_printf(DEBUG_INT, key, value16); + debug_hex_printf(DEBUG_INT, (u_char *) key, value16); cardif_sendframe(intdata); intdata->statemachine->eapolEap = FALSE; @@ -612,14 +612,14 @@ case 1: // We need to swap the TX/RX MIC values since we are the supplicant. // (Thanks to Jouni Malinen for pointing this out!) - wpa_common_swap_rx_tx_mic(key); + wpa_common_swap_rx_tx_mic((u_char *) key); cardif_set_tkip_key(intdata, intdata->dest_mac, keyindex, TRUE, - inkeydata->key_rsc, 6, key, value16); + (char *) inkeydata->key_rsc, 6, key, value16); break; case 2: cardif_set_ccmp_key(intdata, intdata->dest_mac, keyindex, TRUE, - inkeydata->key_rsc, 6, key, value16); + (char *) inkeydata->key_rsc, 6, key, value16); break; } } @@ -646,7 +646,7 @@ if (keyflags & WPA_KEY_MIC_FLAG) { - if (mic_wpa_validate(intdata->recvframe, intdata->recv_size, + if (mic_wpa_validate((char *) intdata->recvframe, intdata->recv_size, intdata->statemachine->PTK, 16) == FALSE) { intdata->statemachine->MICVerified = TRUE; @@ -688,7 +688,7 @@ eapolver = snmp_get_dot1xSuppLastEapolFrameVersion(); eapol_build_header(EAPOL_KEY, (intdata->recv_size-OFFSET_TO_EAPOL-4), - eapolver, intdata->recvframe); + eapolver, (char *) intdata->recvframe); cardif_sendframe(intdata); intdata->statemachine->eapolEap = FALSE; } @@ -757,8 +757,8 @@ } // We have an ASCII password, so calculate it. - if (psk_wpa_pbkdf2(psk->key, intdata->cur_essid, - strlen(intdata->cur_essid), (char *)&tpmk) + if (psk_wpa_pbkdf2(psk->key, (u_char *) intdata->cur_essid, + strlen(intdata->cur_essid), (u_char *)&tpmk) == TRUE) { intdata->statemachine->PMK = (char *)malloc(32); @@ -798,7 +798,7 @@ } } - eapol_key_type254_dump(inframe); + eapol_key_type254_dump((char *) inframe); eapol_key_type254_determine_key(intdata); --- xsupplicant-1.2.1/src/config_grammar.y.BAD 2005-09-03 17:31:51.000000000 -0500 +++ xsupplicant-1.2.1/src/config_grammar.y 2005-09-03 17:34:56.000000000 -0500 @@ -829,8 +829,9 @@ } else { int tmp_dst_mac[CONFIG_MAC_LEN]; + int retval; SET_FLAG(tmp_network->flags, CONFIG_NET_DEST_MAC); - sscanf($3, "%2x:%2x:%2x:%2x:%2x:%2x", + retval = sscanf($3, "%2x:%2x:%2x:%2x:%2x:%2x", &tmp_dst_mac[0], &tmp_dst_mac[1], &tmp_dst_mac[2], @@ -1035,25 +1036,25 @@ set_current_static_wep(); parameter_debug("Static Key 1 : %s\n", $3); if (!tmp_static_wep->key[1]) - tmp_static_wep->key[1] = $3; + tmp_static_wep->key[1] = (u_char *) $3; } | TK_STATIC_KEY2 '=' TK_QUOTED_STR { set_current_static_wep(); parameter_debug("Static Key 2 : %s\n", $3); if (!tmp_static_wep->key[2]) - tmp_static_wep->key[2] = $3; + tmp_static_wep->key[2] = (u_char *) $3; } | TK_STATIC_KEY3 '=' TK_QUOTED_STR { set_current_static_wep(); parameter_debug("Static Key 3 : %s\n", $3); if (!tmp_static_wep->key[3]) - tmp_static_wep->key[3] = $3; + tmp_static_wep->key[3] = (u_char *) $3; } | TK_STATIC_KEY4 '=' TK_QUOTED_STR { set_current_static_wep(); parameter_debug("Static Key 4 : %s\n", $3); if (!tmp_static_wep->key[4]) - tmp_static_wep->key[4] = $3; + tmp_static_wep->key[4] = (u_char *) $3; } | TK_WEP_TX_KEY '=' TK_NUMBER { set_current_static_wep(); Index: sources =================================================================== RCS file: /cvs/extras/rpms/xsupplicant/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 19 Aug 2005 18:58:19 -0000 1.2 +++ sources 4 Sep 2005 13:17:45 -0000 1.3 @@ -1 +1,2 @@ e1eee37899b49ed238648699d0a01c5b xsupplicant-1.2.tar.gz +c44300f798a3317c06e501eb0dd98a23 xsupplicant-1.2.1.tar.gz Index: xsupplicant.spec =================================================================== RCS file: /cvs/extras/rpms/xsupplicant/devel/xsupplicant.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- xsupplicant.spec 19 Aug 2005 18:58:19 -0000 1.1 +++ xsupplicant.spec 4 Sep 2005 13:17:45 -0000 1.2 @@ -1,6 +1,6 @@ Name: xsupplicant Summary: Open Source Implementation of IEEE 802.1x -Version: 1.2 +Version: 1.2.1 Release: 1%{?dist} License: GPL Group: System Environment/Base @@ -8,6 +8,8 @@ Source0: http://download.sourceforge.net/open1x/xsupplicant-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: openssl-devel, bison, flex +Patch0: xsupplicant-1.2.1-docsfix.patch +Patch1: xsupplicant-1.2.1-gcc4-cleanups.patch %description This software allows a GNU/Linux or BSD workstation to authenticate with @@ -17,12 +19,17 @@ %prep %setup -q +%patch0 -p1 +%patch1 -p1 perl -pi.orig -e 's|/lib\b|/%{_lib}|g' configure* %build %configure make %{?_smp_mflags} +cd doc +./builddocs.sh +cd .. %install rm -rf $RPM_BUILD_ROOT @@ -35,7 +42,7 @@ %files %defattr(-,root,root,-) -%doc AUTHORS COPYING README doc/html/ doc/txt/ doc/README* etc/*.conf +%doc AUTHORS COPYING README doc/html/ doc/txt/ doc/pdf doc/README* etc/*.conf %config(noreplace) %{_sysconfdir}/xsupplicant.conf %{_bindir}/config-parser %{_bindir}/xsup_monitor @@ -44,6 +51,9 @@ %{_sbindir}/xsupplicant %changelog +* Sat Sep 3 2005 Tom "spot" Callaway 1.2.1-1 +- bump to 1.2.1 release + * Fri Aug 19 2005 Tom "spot" Callaway 1.2-1 - bump to 1.2 final From fedora-extras-commits at redhat.com Sun Sep 4 13:17:42 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sun, 4 Sep 2005 09:17:42 -0400 Subject: rpms/xsupplicant/FC-4 xsupplicant-1.2.1-docsfix.patch, NONE, 1.1 xsupplicant-1.2.1-gcc4-cleanups.patch, NONE, 1.1 sources, 1.2, 1.3 xsupplicant.spec, 1.1, 1.2 Message-ID: <200509041317.j84DHg73030637@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/xsupplicant/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30591/FC-4 Modified Files: sources xsupplicant.spec Added Files: xsupplicant-1.2.1-docsfix.patch xsupplicant-1.2.1-gcc4-cleanups.patch Log Message: Bump to 1.2.1, fix a LOT of signed/unsigned mistakes in the code. xsupplicant-1.2.1-docsfix.patch: --- NEW FILE xsupplicant-1.2.1-docsfix.patch --- --- xsupplicant-1.2.1/doc/builddocs.sh.BAD 2005-09-03 08:20:54.000000000 -0500 +++ xsupplicant-1.2.1/doc/builddocs.sh 2005-09-03 08:22:29.000000000 -0500 @@ -4,7 +4,7 @@ # best option is just to require users of this script to define # the variable on their own? not quite sure, I guess that's why # it's hard coded for now... -JADE_PUB=/usr/share/doc/openjade-1.3/pubtext +JADE_PUB=/usr/share/doc/openjade-*/pubtext SGML_CATALOG_FILES=/usr/sgml-tools/dtd/catalog:/etc/sgml/catalog:/usr/share/doc/openjade-1.3.2/catalog:/home/chris/t/docbook-dsssl-1.97/catalog mkdir -p html @@ -33,7 +33,7 @@ # create the txt docs echo -n "Building the TXT docs..." -lynx -dump -nolist html/Open1x-UserGuide.html > txt/Open1x-UserGuide.txt +links -dump html/Open1x-UserGuide.html > txt/Open1x-UserGuide.txt if [ $? -ne 0 ] then echo "Error! Build failed!" xsupplicant-1.2.1-gcc4-cleanups.patch: --- NEW FILE xsupplicant-1.2.1-gcc4-cleanups.patch --- --- xsupplicant-1.2.1/src/cardif/linux/cardif_hostap_driver.c.BAD 2005-09-03 17:50:21.000000000 -0500 +++ xsupplicant-1.2.1/src/cardif/linux/cardif_hostap_driver.c 2005-09-03 17:50:50.000000000 -0500 @@ -326,7 +326,7 @@ debug_printf(DEBUG_NORMAL, "alg=%s key_idx=%d set_tx=%d seq_len=%d key_len=%d\n", alg_name, key_idx, set_tx, seq_len, key_len); debug_printf(DEBUG_NORMAL, "KeyRSC = "); - debug_hex_printf(DEBUG_NORMAL, seq, seq_len); + debug_hex_printf(DEBUG_NORMAL, (u_char *) seq, seq_len); if (seq_len > 8) { @@ -350,7 +350,7 @@ memset(param->sta_addr, 0xff, ETH_ALEN); - strncpy(param->u.crypt.alg, alg_name, HOSTAP_CRYPT_ALG_NAME_LEN); + strncpy((char *) param->u.crypt.alg, alg_name, HOSTAP_CRYPT_ALG_NAME_LEN); param->u.crypt.flags = set_tx ? HOSTAP_CRYPT_FLAG_SET_TX_KEY : 0; param->u.crypt.idx = key_idx; memcpy(param->u.crypt.seq, seq, seq_len); --- xsupplicant-1.2.1/src/cardif/linux/cardif_linux_wext.c.BAD 2005-09-03 17:51:02.000000000 -0500 +++ xsupplicant-1.2.1/src/cardif/linux/cardif_linux_wext.c 2005-09-03 17:53:08.000000000 -0500 @@ -119,10 +119,10 @@ // We set the key index to 0x80, to force key 0 to be set to all 0s, // and to have key 0 be set as the default transmit key. - cardif_set_wep_key(thisint, (char *)&zerokey, keylen, 0x80); - cardif_set_wep_key(thisint, (char *)&zerokey, keylen, 0x01); - cardif_set_wep_key(thisint, (char *)&zerokey, keylen, 0x02); - cardif_set_wep_key(thisint, (char *)&zerokey, keylen, 0x03); + cardif_set_wep_key(thisint, (u_char *)&zerokey, keylen, 0x80); + cardif_set_wep_key(thisint, (u_char *)&zerokey, keylen, 0x01); + cardif_set_wep_key(thisint, (u_char *)&zerokey, keylen, 0x02); + cardif_set_wep_key(thisint, (u_char *)&zerokey, keylen, 0x03); } /************************************************************** @@ -947,10 +947,10 @@ if (config_ssid_get_ssid_abilities() & RSN_IE) { - cardif_linux_wext_get_wpa2_ie(intdata, wpaie, &len); + cardif_linux_wext_get_wpa2_ie(intdata, (char *) wpaie, &len); } else if (config_ssid_get_ssid_abilities() & WPA_IE) { - cardif_linux_wext_get_wpa_ie(intdata, wpaie, &len); + cardif_linux_wext_get_wpa_ie(intdata, (char *) wpaie, &len); } if (len > 0) @@ -965,11 +965,11 @@ intdata->flags |= DONTSCAN; cardif_linux_wext_set_ssid(intdata, newssid); - bssid = config_ssid_get_mac(); + bssid = (char *) config_ssid_get_mac(); if (bssid != NULL) { debug_printf(DEBUG_INT, "Dest. BSSID : "); - debug_hex_printf(DEBUG_INT, bssid, 6); + debug_hex_printf(DEBUG_INT, (u_char *) bssid, 6); } // cardif_linux_wext_set_bssid(intdata, bssid); --- xsupplicant-1.2.1/src/cardif/linux/cardif_ipw_driver.c.BAD 2005-09-03 17:54:57.000000000 -0500 +++ xsupplicant-1.2.1/src/cardif/linux/cardif_ipw_driver.c 2005-09-03 17:57:23.000000000 -0500 @@ -240,7 +240,7 @@ wpa2_gen_ie(intdata, iedata, ielen); debug_printf(DEBUG_INT, "Setting WPA2 IE : "); - debug_hex_printf(DEBUG_INT, iedata, *ielen); + debug_hex_printf(DEBUG_INT, (u_char *) iedata, *ielen); debug_printf(DEBUG_INT, "\n"); return XENONE; @@ -372,7 +372,7 @@ param = (struct ipw_param *) buf; param->cmd = IPW_CMD_SET_ENCRYPTION; memset(param->sta_addr, 0xff, 6); - strncpy(param->u.crypt.alg, alg_name, IPW_CRYPT_ALG_NAME_LEN); + strncpy((char *) param->u.crypt.alg, alg_name, IPW_CRYPT_ALG_NAME_LEN); param->u.crypt.set_tx = set_tx ? 1 : 0; param->u.crypt.idx = key_idx; memcpy(param->u.crypt.seq, seq, seq_len); @@ -422,7 +422,7 @@ { int ret; - ret = ipw_mlme(intdata->intName, intdata->source_mac, + ret = ipw_mlme(intdata->intName, (u8 *) intdata->source_mac, IPW_MLME_STA_DISASSOC, reason_code); if (ret <0) return ret; @@ -458,16 +458,16 @@ if (config_ssid_get_ssid_abilities() & RSN_IE) { - cardif_ipw_driver_get_wpa2_ie(intdata, wpaie, &len); + cardif_ipw_driver_get_wpa2_ie(intdata, (char *) wpaie, &len); } else if (config_ssid_get_ssid_abilities() & WPA_IE) { - cardif_ipw_driver_get_wpa_ie(intdata, wpaie, &len); + cardif_ipw_driver_get_wpa_ie(intdata, (char *) wpaie, &len); } // Length needs to be > 0 in order to indicate that we have an IE to set. if ((len < 255) && (len >= 0)) { - if (cardif_ipw_driver_set_wpa_ie(intdata->intName, wpaie, len) < 0) + if (cardif_ipw_driver_set_wpa_ie(intdata->intName, (char *) wpaie, len) < 0) { debug_printf(DEBUG_NORMAL, "Couldn't set WPA/RSN IE on device %s!\n", intdata->intName); --- xsupplicant-1.2.1/src/cardif/linux/cardif_linux_rtnetlink.c.BAD 2005-09-03 17:43:05.000000000 -0500 +++ xsupplicant-1.2.1/src/cardif/linux/cardif_linux_rtnetlink.c 2005-09-03 17:49:49.000000000 -0500 @@ -269,13 +269,13 @@ memcpy(&custom, &tptr[12], (iwe->len - 12)); debug_printf(DEBUG_INT, "(Custom) Value : %s\n", custom); - if (strncmp("wpa_ie=", custom, 7) == 0) + if (strncmp("wpa_ie=", (char *) custom, 7) == 0) { SET_FLAG(flags, WPA_IE); debug_printf(DEBUG_INT, "AP appears to support WPA!\n"); - temp = (char *)malloc((iwe->len - 12)/2); - process_hex(&custom[7], (iwe->len - 12-7), temp); - wpa_parse_ie(temp); + temp = (u_char *)malloc((iwe->len - 12)/2); + process_hex((char *) &custom[7], (iwe->len - 12-7), (char *) temp); + wpa_parse_ie((char *) temp); temp_wpa = temp; temp_wpa_len = ((iwe->len - 12)/2); @@ -285,13 +285,13 @@ temp = NULL; } - if (strncmp("rsn_ie=", custom, 7) == 0) + if (strncmp("rsn_ie=", (char *) custom, 7) == 0) { SET_FLAG(flags, RSN_IE); debug_printf(DEBUG_INT, "AP appears to support WPA2/802.11i!\n"); - temp = (char *)malloc((iwe->len - 12)/2); - process_hex(&custom[7], (iwe->len - 12-7), temp); - wpa2_parse_ie(temp); + temp = (u_char *)malloc((iwe->len - 12)/2); + process_hex((char *) &custom[7], (iwe->len - 12-7), (char *) temp); + wpa2_parse_ie((char *) temp); temp_rsn = temp; temp_rsn_len = ((iwe->len - 12)/2); @@ -381,10 +381,10 @@ "but the WPA_IE or RSN_IE flag(s) aren't set!?!\n"); } - if (strcmp(essid, intdata->cur_essid) == 0) + if (strcmp((char *) essid, intdata->cur_essid) == 0) { debug_printf(DEBUG_INT, "Adding this SSID data!\n"); - config_ssids_add(essid, flags, wpa_ie, wpa_ie_len, rsn_ie, + config_ssids_add((char *) essid, flags, wpa_ie, wpa_ie_len, rsn_ie, rsn_ie_len, freq, stale_mac); } @@ -440,10 +440,10 @@ } } - if (strcmp(essid, intdata->cur_essid) == 0) + if (strcmp((char *) essid, intdata->cur_essid) == 0) { debug_printf(DEBUG_INT, "Adding this SSID data!\n"); - config_ssids_add(essid, flags, wpa_ie, wpa_ie_len, rsn_ie, + config_ssids_add((char *) essid, flags, wpa_ie, wpa_ie_len, rsn_ie, rsn_ie_len, freq, mac); } @@ -490,8 +490,8 @@ // Then harvest the data. debug_printf(DEBUG_INT, "Reaping data. (Size : %d)\n", iwr.u.data.length); - cardif_linux_rtnetlink_reap(idata, (char *)buffer, - ((char *)buffer + iwr.u.data.length)); + cardif_linux_rtnetlink_reap(idata, (u_char *)buffer, + ((u_char *)buffer + iwr.u.data.length)); UNSET_FLAG(idata->flags, SCANNING); @@ -519,7 +519,7 @@ } remain = recvfrom(rtnl_sock, buf, sizeof(buf), MSG_DONTWAIT, - (struct sockaddr *)&rtnl_data, &rtnl_data_size); + (struct sockaddr *)&rtnl_data, (u_int *) &rtnl_data_size); if (remain >= 0) { // We need a pointer to the buffer to work with. @@ -927,7 +927,7 @@ case SIOCGIWAP: memcpy(mac, iwe->u.ap_addr.sa_data, 6); debug_printf(DEBUG_INT, "AP MAC : "); - debug_hex_printf(DEBUG_INT, mac, 6); + debug_hex_printf(DEBUG_INT, (u_char *) mac, 6); if (cardif_linux_rtnetlink_validate(idata, (u_char *)&mac) == 1) { // We have changed to associated mode. Populate the destination @@ -987,7 +987,7 @@ memcpy(buf, custom, iwe->u.data.length); buf[iwe->u.data.length] = '\0'; debug_printf(DEBUG_NORMAL, "Custom Data : \n"); - debug_hex_dump(DEBUG_NORMAL, buf, iwe->u.data.length); + debug_hex_dump(DEBUG_NORMAL, (u_char *) buf, iwe->u.data.length); cardif_linux_rtnetlink_check_custom(idata, buf); break; --- xsupplicant-1.2.1/src/cardif/linux/cardif_ndiswrapper_driver.c.BAD 2005-09-03 17:53:21.000000000 -0500 +++ xsupplicant-1.2.1/src/cardif/linux/cardif_ndiswrapper_driver.c 2005-09-03 17:54:27.000000000 -0500 @@ -202,11 +202,11 @@ wpa_key.addr = addr; wpa_key.key_index = key_idx; wpa_key.set_tx = set_tx; - wpa_key.seq = seq; + wpa_key.seq = (u_char *) seq; wpa_key.seq_len = seq_len; debug_printf(DEBUG_NORMAL, "SEQ : "); - debug_hex_printf(DEBUG_NORMAL, seq, seq_len); - wpa_key.key = key; + debug_hex_printf(DEBUG_NORMAL, (u_char *) seq, seq_len); + wpa_key.key = (u_char *) key; wpa_key.key_len = key_len; debug_printf(DEBUG_INT, "Setting key.. alg=%d idx=%d tx=%d seqlen=%d " @@ -304,11 +304,11 @@ bzero(&wpa_inf, sizeof(wpa_inf)); memcpy(buf, ssid, strlen(ssid)); - wpa_inf.bssid = (char *)config_ssid_get_mac(); - wpa_inf.ssid = (char *)&buf; + wpa_inf.bssid = (u_char *)config_ssid_get_mac(); + wpa_inf.ssid = (u_char *)&buf; wpa_inf.ssid_len = strlen(ssid); wpa_inf.freq = config_ssid_get_freq(); - wpa_inf.wpa_ie = (char *)&wpaie; + wpa_inf.wpa_ie = (u_char *)&wpaie; wpa_inf.wpa_ie_len = ielen; wpa_inf.pairwise_suite = network_data->wpa_pairwise_crypt; --- xsupplicant-1.2.1/src/cardif/linux/linux_core.c.BAD 2005-09-03 17:39:55.000000000 -0500 +++ xsupplicant-1.2.1/src/cardif/linux/linux_core.c 2005-09-03 17:42:28.000000000 -0500 @@ -116,11 +116,11 @@ { if (wepdata->key[keyidx] != NULL) { - klen = strlen(wepdata->key[keyidx]); + klen = strlen((char *) wepdata->key[keyidx]); if (((klen/2) == 5) || ((klen/2) == 13)) { // We have a valid length key. So, convert it, and set it. - process_hex(wepdata->key[keyidx], klen, key); + process_hex((char *) wepdata->key[keyidx], klen, key); // Calculate the proper key index. t = keyidx-1; @@ -130,9 +130,9 @@ debug_printf(DEBUG_INT, "Setting TX key! [%d]\n", wepdata->tx_key); t |= 0x80; - cardif_set_wep_key(intcur, key, (klen/2), t); + cardif_set_wep_key(intcur, (u_char *) key, (klen/2), t); } else { - cardif_set_wep_key(intcur, key, (klen/2), t); + cardif_set_wep_key(intcur, (u_char *) key, (klen/2), t); } } } --- xsupplicant-1.2.1/src/cardif/linux/cardif_linux.c.BAD 2005-09-03 17:37:20.000000000 -0500 +++ xsupplicant-1.2.1/src/cardif/linux/cardif_linux.c 2005-09-03 17:39:29.000000000 -0500 @@ -78,7 +78,7 @@ cardif_GetBSSID(intdata, curbssid); debug_printf(DEBUG_INT, "Current BSSID is "); - debug_hex_printf(DEBUG_INT, curbssid, 6); + debug_hex_printf(DEBUG_INT, (u_char *) curbssid, 6); memset(newmac, 0x00, 6); if (memcmp(newmac, curbssid, 6) == 0) @@ -463,7 +463,7 @@ { if (wireless == NULL) return -1; - return wireless->set_tkip_key(thisint, addr, keyidx, settx, seq, seqlen, + return wireless->set_tkip_key(thisint, (u_char *) addr, keyidx, settx, seq, seqlen, key, keylen); } @@ -478,7 +478,7 @@ { if (wireless == NULL) return -1; - return wireless->set_ccmp_key(thisint, addr, keyidx, settx, seq, seqlen, + return wireless->set_ccmp_key(thisint, (u_char *) addr, keyidx, settx, seq, seqlen, key, keylen); } @@ -746,7 +746,7 @@ { // Since we now know this frame is for us, record the address it // came from. - snmp_dot1xSuppLastEapolFrameSource((char *)&resultframe[6]); + snmp_dot1xSuppLastEapolFrameSource((u_char *)&resultframe[6]); resultsize = newsize; --- xsupplicant-1.2.1/src/psk.c.BAD 2005-09-03 09:24:53.000000000 -0500 +++ xsupplicant-1.2.1/src/psk.c 2005-09-03 09:25:15.000000000 -0500 @@ -50,7 +50,7 @@ // OpenSSL takes the parameters in a different order than what is // defined in F.8.2, so even though it looks wrong, this is correct. ;) HMAC(EVP_sha1(), password, strlen(password), digest, ssidlength+4, - digest1, &k); + digest1, (u_int *) &k); /* output = U1 */ memcpy(output, digest1, SHA_DIGEST_LENGTH); @@ -59,7 +59,7 @@ { /* Un = PRF(P, Un-1) */ HMAC(EVP_sha1(), password, strlen(password), digest1, SHA_DIGEST_LENGTH, - digest, &k); + digest, (u_int *) &k); memcpy(digest1, digest, k); /* output = output xor Un */ --- xsupplicant-1.2.1/src/mic.c.BAD 2005-09-03 09:24:01.000000000 -0500 +++ xsupplicant-1.2.1/src/mic.c 2005-09-03 09:24:43.000000000 -0500 @@ -44,14 +44,14 @@ { case 1: // Do an MD5 HMAC - HMAC(EVP_md5(), key, keylen, datain, insize, mic, &i); + HMAC(EVP_md5(), key, keylen, (u_char *) datain, insize, (u_char *) mic, (u_int *) &i); break; case 2: // Do an SHA1 HMAC // Since the HMAC will be 20 bytes, and we only need 16, we must use // a temporary variable. - HMAC(EVP_sha1(), key, keylen, datain, insize, (char *)&sha_hmac, &i); + HMAC(EVP_sha1(), key, keylen, (u_char *) datain, insize, (u_char *)&sha_hmac, (u_int *) &i); memcpy(mic, &sha_hmac, 16); break; } --- xsupplicant-1.2.1/src/config.h.BAD 2005-09-03 08:39:44.000000000 -0500 +++ xsupplicant-1.2.1/src/config.h 2005-09-03 08:39:53.000000000 -0500 @@ -341,6 +341,7 @@ char config_get_association(); char *config_get_logfile(); int config_get_ipc_gid(); +int config_get_stale_key_timeout(); char config_get_destination(); char *config_get_log_facility(); void config_set_forced_profile(char *); --- xsupplicant-1.2.1/src/eap.c.BAD 2005-09-03 08:34:21.000000000 -0500 +++ xsupplicant-1.2.1/src/eap.c 2005-09-03 08:38:27.000000000 -0500 @@ -191,9 +191,9 @@ switch (eap_request_auth(network_data->activemethod, network_data->methods, - &thisint->recvframe[OFFSET_TO_EAP], + (char *) &thisint->recvframe[OFFSET_TO_EAP], thisint->recv_size, - &thisint->sendframe[OFFSET_TO_EAP], &eapsize)) + (char *) &thisint->sendframe[OFFSET_TO_EAP], &eapsize)) { case XINNERSUCCESS: // We got a LEAP success, so we need to tell the state machine to @@ -231,7 +231,7 @@ if ((eapolver < 1) || (eapolver > MAX_EAPOL_VER)) eapolver = snmp_get_dot1xSuppLastEapolFrameVersion(); - eapol_build_header(EAP_PACKET, eapsize, eapolver, thisint->sendframe); + eapol_build_header(EAP_PACKET, eapsize, eapolver, (char *) thisint->sendframe); thisint->send_size = eapsize+OFFSET_TO_EAP; return XENONE; } @@ -284,7 +284,7 @@ eap_request_id(network_data->identity, eapdata->eap_identifier, - &thisint->sendframe[OFFSET_TO_EAP], &eapsize); + (char *) &thisint->sendframe[OFFSET_TO_EAP], &eapsize); eapolver = network_data->force_eapol_ver; @@ -295,7 +295,7 @@ if ((eapolver < 1) || (eapolver > MAX_EAPOL_VER)) eapolver = snmp_get_dot1xSuppLastEapolFrameVersion(); - eapol_build_header(EAP_PACKET, eapsize, eapolver, thisint->sendframe); + eapol_build_header(EAP_PACKET, eapsize, eapolver, (char *) thisint->sendframe); thisint->send_size = eapsize+OFFSET_TO_EAP; return XENONE; @@ -379,7 +379,7 @@ // We need to determine how long the string that we were returned is. // So, take the EAP length value, and subtract 5 to account for the EAP // header. - strncpy(&myval[0], &inframe[OFFSET_TO_DATA], (ntohs(myeap->eap_length)-5)); + strncpy(&myval[0], (char *) &inframe[OFFSET_TO_DATA], (ntohs(myeap->eap_length)-5)); debug_printf(DEBUG_NORMAL, "EAP Notification : %s\n", &myval[0]); bzero(thisint->recvframe, thisint->recv_size); @@ -814,8 +814,8 @@ if ((pwd_needed != 1) || (activemethod->tempPwd != NULL)) { switch ((*eaphandlers[eapmethod].eap_auth_handlers)(activemethod, - tosendframe, eapinsize, - &outframe[sizeof(struct eap_header)], + (u_char *) tosendframe, eapinsize, + (u_char *) &outframe[sizeof(struct eap_header)], eapsize)) { case XINNERSUCCESS: @@ -962,9 +962,9 @@ (*eaphandlers[eapmethod].eap_auth_get_keys)(thisint); - thisint->statemachine->PMK = thisint->keyingMaterial; + thisint->statemachine->PMK = (char *) thisint->keyingMaterial; debug_printf(DEBUG_INT, "PMK Keys (%d) :\n", thisint->keyingLength); - debug_hex_dump(DEBUG_INT, thisint->statemachine->PMK, thisint->keyingLength); + debug_hex_dump(DEBUG_INT, (u_char *) thisint->statemachine->PMK, thisint->keyingLength); debug_printf(DEBUG_INT, "WEP Keys (%d) :\n", thisint->keyingLength); debug_hex_dump(DEBUG_INT, thisint->keyingMaterial, thisint->keyingLength); --- xsupplicant-1.2.1/src/eapol_key_type2.c.BAD 2005-09-03 09:34:10.000000000 -0500 +++ xsupplicant-1.2.1/src/eapol_key_type2.c 2005-09-03 16:32:47.000000000 -0500 @@ -172,7 +172,7 @@ case 2: // XXX BROKEN! FIX! bzero(key, 16); - aes_unwrap(&intdata->statemachine->PTK[16], (keylen-8)/8, keypayload, + aes_unwrap((u_char *) &intdata->statemachine->PTK[16], (keylen-8)/8, keypayload, key); break; @@ -238,12 +238,12 @@ } debug_printf(DEBUG_INT, "PMK : "); - debug_hex_printf(DEBUG_INT, intdata->statemachine->PMK, 32); - wpa_PRF(intdata->statemachine->PMK, 32, "Pairwise key expansion", 22, - (char *)&prfdata, 76, retval, 64); + debug_hex_printf(DEBUG_INT, (u_char *) intdata->statemachine->PMK, 32); + wpa_PRF((u_char *) intdata->statemachine->PMK, 32, (u_char *) "Pairwise key expansion", 22, + (u_char *)&prfdata, 76, (u_char *) retval, 64); debug_printf(DEBUG_INT, "PTK : "); - debug_hex_printf(DEBUG_INT, retval, 64); + debug_hex_printf(DEBUG_INT, (u_char *) retval, 64); return retval; } @@ -310,10 +310,10 @@ eapolver = snmp_get_dot1xSuppLastEapolFrameVersion(); eapol_build_header(EAPOL_KEY, (intdata->send_size-OFFSET_TO_EAPOL-4), - eapolver, intdata->sendframe); + eapolver, (char *) intdata->sendframe); memcpy(key, intdata->statemachine->PTK, 16); - mic_wpa_populate(intdata->sendframe, intdata->send_size+4, key, 16); + mic_wpa_populate((char *) intdata->sendframe, intdata->send_size+4, key, 16); cardif_sendframe(intdata); intdata->statemachine->eapolEap = FALSE; @@ -394,7 +394,7 @@ bzero(rc4_ek, 32); memcpy(rc4_ek, inkeydata->key_iv, 16); memcpy(&rc4_ek[16], &intdata->statemachine->PTK[16], 16); - rc4_skip(rc4_ek, 32, 256, keydata, value16); + rc4_skip((u_char *) rc4_ek, 32, 256, keydata, value16); debug_printf(DEBUG_INT, "Decrypted data : (%d)\n", value16); debug_hex_dump(DEBUG_INT, keydata, value16); @@ -410,17 +410,17 @@ wpa_common_swap_rx_tx_mic(keydata); debug_printf(DEBUG_INT, "Setting GTK with index of %d\n", keyindex); - cardif_set_tkip_key(intdata, allfs, keyindex, FALSE, inkeydata->key_rsc, - 6, keydata, value16); + cardif_set_tkip_key(intdata, (char *) allfs, keyindex, FALSE, (char *) inkeydata->key_rsc, + 6, (char *) keydata, value16); break; case 2: // First, decrypt the GTK bzero(key, 16); - aes_unwrap(&intdata->statemachine->PTK[16], (value16-8)/8, keydata, - key); + aes_unwrap((u_char *) &intdata->statemachine->PTK[16], (value16-8)/8, keydata, + (u_char *) key); - cardif_set_ccmp_key(intdata, NULL, keyindex, FALSE, inkeydata->key_rsc, + cardif_set_ccmp_key(intdata, NULL, keyindex, FALSE, (char *) inkeydata->key_rsc, 6, key, (value16-8)); break; } @@ -446,13 +446,13 @@ eapolver = snmp_get_dot1xSuppLastEapolFrameVersion(); eapol_build_header(EAPOL_KEY, (intdata->send_size-OFFSET_TO_EAPOL-4), - eapolver, intdata->sendframe); + eapolver, (char *) intdata->sendframe); memcpy(key, intdata->statemachine->PTK, 16); - mic_wpa_populate(intdata->sendframe, intdata->send_size+4, key, 16); + mic_wpa_populate((char *) intdata->sendframe, intdata->send_size+4, key, 16); // Dump what we built. - eapol_key_type2_dump(intdata, intdata->sendframe); + eapol_key_type2_dump(intdata, (char *) intdata->sendframe); if (network_data->methods->method_num == WPA_PSK) { @@ -560,13 +560,13 @@ eapolver = snmp_get_dot1xSuppLastEapolFrameVersion(); eapol_build_header(EAPOL_KEY, (intdata->send_size-OFFSET_TO_EAPOL-4), - eapolver, intdata->sendframe); + eapolver, (char *) intdata->sendframe); memcpy(key, intdata->statemachine->PTK, 16); - mic_wpa_populate(intdata->sendframe, intdata->send_size+4, key, 16); + mic_wpa_populate((char *) intdata->sendframe, intdata->send_size+4, key, 16); // Dump what we built. - eapol_key_type2_dump(intdata, intdata->sendframe); + eapol_key_type2_dump(intdata, (char *) intdata->sendframe); } /******************************************************** @@ -596,7 +596,7 @@ memcpy(iedata, indata, len); debug_printf(DEBUG_INT, "Got an IE of : \n"); - debug_hex_dump(DEBUG_INT, iedata, len); + debug_hex_dump(DEBUG_INT, (u_char *) iedata, len); // XXX Todo : Verify the IE against the IE we have from the AP. @@ -869,20 +869,20 @@ eapolver = snmp_get_dot1xSuppLastEapolFrameVersion(); eapol_build_header(EAPOL_KEY, (intdata->send_size-OFFSET_TO_EAPOL-4), - eapolver, intdata->sendframe); + eapolver, (char *) intdata->sendframe); memcpy(key, intdata->statemachine->PTK, 16); - mic_wpa_populate(intdata->sendframe, intdata->send_size+4, key, 16); + mic_wpa_populate((char *) intdata->sendframe, intdata->send_size+4, key, 16); // Dump what we built. - eapol_key_type2_dump(intdata, intdata->sendframe); + eapol_key_type2_dump(intdata, (char *) intdata->sendframe); // Get TK1 value16 = ntohs(inkeydata->key_length); memcpy(key, (char *)&intdata->statemachine->PTK[32], value16); debug_printf(DEBUG_INT, "TK1 : "); - debug_hex_printf(DEBUG_INT, key, value16); + debug_hex_printf(DEBUG_INT, (u_char *) key, value16); cardif_sendframe(intdata); intdata->statemachine->eapolEap = FALSE; @@ -902,12 +902,12 @@ bzero(rc4_ek, 32); memcpy(rc4_ek, inkeydata->key_iv, 16); memcpy(&rc4_ek[16], &intdata->statemachine->PTK[16], 16); - rc4_skip(rc4_ek, 32, 256, keydata, keylen); + rc4_skip((u_char *) rc4_ek, 32, 256, keydata, keylen); break; case 2: aesval = (uint8_t *)malloc(keylen); - if (aes_unwrap(&intdata->statemachine->PTK[16], (keylen-8)/8, keydata, + if (aes_unwrap((u_char *) &intdata->statemachine->PTK[16], (keylen-8)/8, keydata, aesval)) { debug_printf(DEBUG_NORMAL, "Failed AES unwrap!\n"); @@ -943,13 +943,13 @@ { case 1: wpa_common_swap_rx_tx_mic(gtk); - cardif_set_tkip_key(intdata, allfs, keyindex, txkey, - inkeydata->key_rsc, RSC_LEN, gtk, value16); + cardif_set_tkip_key(intdata, (char*) allfs, keyindex, txkey, + (char *) inkeydata->key_rsc, RSC_LEN, (char *) gtk, value16); break; case 2: - cardif_set_ccmp_key(intdata, allfs, keyindex, txkey, - inkeydata->key_rsc, RSC_LEN, gtk, value16); + cardif_set_ccmp_key(intdata, (char *) allfs, keyindex, txkey, + (char *) inkeydata->key_rsc, RSC_LEN, (char *) gtk, value16); break; } @@ -973,15 +973,15 @@ case 1: // We need to swap the TX/RX MIC values since we are the supplicant. // (Thanks to Jouni Malinen for pointing this out!) - wpa_common_swap_rx_tx_mic(key); + wpa_common_swap_rx_tx_mic((u_char *) key); cardif_set_tkip_key(intdata, intdata->dest_mac, 0, TRUE, - inkeydata->key_rsc, RSC_LEN, key, value16); + (char *) inkeydata->key_rsc, RSC_LEN, key, value16); break; case 2: cardif_set_ccmp_key(intdata, intdata->dest_mac, 0, TRUE, - inkeydata->key_rsc, RSC_LEN, key, value16); + (char *) inkeydata->key_rsc, RSC_LEN, key, value16); break; } } @@ -1008,7 +1008,7 @@ if (keyflags & WPA2_KEY_MIC_FLAG) { - if (mic_wpa_validate(intdata->recvframe, intdata->recv_size, + if (mic_wpa_validate((char *) intdata->recvframe, intdata->recv_size, intdata->statemachine->PTK, 16) == FALSE) { intdata->statemachine->MICVerified = TRUE; @@ -1058,7 +1058,7 @@ eapolver = snmp_get_dot1xSuppLastEapolFrameVersion(); eapol_build_header(EAPOL_KEY, (intdata->recv_size-OFFSET_TO_EAPOL-4), - eapolver, intdata->recvframe); + eapolver, (char *) intdata->recvframe); cardif_sendframe(intdata); intdata->statemachine->eapolEap = FALSE; } @@ -1127,8 +1127,8 @@ } // We have an ASCII password, so calculate it. - if (psk_wpa_pbkdf2(psk->key, intdata->cur_essid, - strlen(intdata->cur_essid), (char *)&tpmk) + if (psk_wpa_pbkdf2(psk->key, (u_char *) intdata->cur_essid, + strlen(intdata->cur_essid), (u_char *)&tpmk) == TRUE) { intdata->statemachine->PMK = (char *)malloc(32); @@ -1168,7 +1168,7 @@ } } - eapol_key_type2_dump(intdata, inframe); + eapol_key_type2_dump(intdata, (char *) inframe); eapol_key_type2_determine_key(intdata); --- xsupplicant-1.2.1/src/eap_types/otp/eapotp.c.BAD 2005-09-03 17:26:09.000000000 -0500 +++ xsupplicant-1.2.1/src/eap_types/otp/eapotp.c 2005-09-03 17:26:47.000000000 -0500 @@ -123,7 +123,7 @@ /* debug_printf(DEBUG_NORMAL, "Response : "); gets(&resp); */ - strcpy(outframe, resp); + strcpy((char *) outframe, resp); *outsize = strlen(resp); return *outsize; --- xsupplicant-1.2.1/src/eap_types/tls/tls_funcs.c.BAD 2005-09-03 16:38:06.000000000 -0500 +++ xsupplicant-1.2.1/src/eap_types/tls/tls_funcs.c 2005-09-03 16:42:46.000000000 -0500 @@ -445,7 +445,7 @@ } debug_printf(DEBUG_AUTHTYPES, "Packet in (%d) :\n", insize); - debug_hex_dump(DEBUG_AUTHTYPES, inframe, insize); + debug_hex_dump(DEBUG_AUTHTYPES, (u_char *) inframe, insize); // First, make sure we don't have any errors. err = ERR_get_error(); @@ -563,7 +563,7 @@ if ((mytls_vars->resuming != 1) || (mytls_vars->quickResponse != TRUE)) { - if (((*dophase2)(thisint, tlsptr, (insize-tlsindex), outframe, + if (((*dophase2)(thisint, (u_char *) tlsptr, (insize-tlsindex), outframe, outsize)) != XENONE) { debug_printf(DEBUG_NORMAL, "Phase 2 failure!\n"); @@ -578,7 +578,7 @@ } } } else { - rtnVal = tls_funcs_parse(thisint, tlsptr, (insize-tlsindex), outframe, outsize, chunksize); + rtnVal = tls_funcs_parse(thisint, (u_char *) tlsptr, (insize-tlsindex), outframe, outsize, chunksize); if (rtnVal < 0) { debug_printf(DEBUG_NORMAL, "Couldn't parse TLS data.\n"); @@ -642,7 +642,7 @@ if ((mytls_vars->resuming != 1) || (mytls_vars->quickResponse != TRUE)) { - if ((*dophase2)(thisint, tlsptr, (insize-tlsindex), + if ((*dophase2)(thisint, (u_char *) tlsptr, (insize-tlsindex), outframe, outsize) != XENONE) { debug_printf(DEBUG_NORMAL, "Phase 2 Failure.\n"); @@ -1083,32 +1083,32 @@ /* P_MD5 */ hash = EVP_md5(); /* Initialize A_MD5 */ - HMAC(hash, S1, L_S1, P_seed, P_seed_len, A_MD5, &hashed_len); + HMAC(hash, S1, L_S1, P_seed, P_seed_len, A_MD5, (u_int *) &hashed_len); for (i = 0; i < MD5_iterations; i++) { HMAC_Init(&ctx, S1, L_S1, hash); HMAC_Update(&ctx, A_MD5, MD5_DIGEST_LENGTH); HMAC_Update(&ctx, P_seed, P_seed_len); - HMAC_Final(&ctx, P_MD5_buf + i*(MD5_DIGEST_LENGTH), &hashed_len); + HMAC_Final(&ctx, P_MD5_buf + i*(MD5_DIGEST_LENGTH), (u_int *) &hashed_len); HMAC_cleanup(&ctx); HMAC(hash, S1, L_S1, A_MD5, MD5_DIGEST_LENGTH, - A_MD5, &hashed_len); + A_MD5, (u_int *) &hashed_len); } /* do P_SHA1 */ hash = EVP_sha1(); /* Initialize A_SHA1 */ - HMAC(hash, S2, L_S2, P_seed, P_seed_len, A_SHA1, &hashed_len); + HMAC(hash, S2, L_S2, P_seed, P_seed_len, A_SHA1, (u_int *) &hashed_len); for (i = 0; i < SHA1_iterations; i++) { HMAC_Init(&ctx, S2, L_S2, hash); HMAC_Update(&ctx, A_SHA1, SHA_DIGEST_LENGTH); HMAC_Update(&ctx, P_seed, P_seed_len); - HMAC_Final(&ctx, P_SHA1_buf + i*(SHA_DIGEST_LENGTH), &hashed_len); + HMAC_Final(&ctx, P_SHA1_buf + i*(SHA_DIGEST_LENGTH), (u_int *) &hashed_len); HMAC_cleanup(&ctx); HMAC(hash, S2, L_S2, A_SHA1, SHA_DIGEST_LENGTH, - A_SHA1, &hashed_len); + A_SHA1, (u_int *) &hashed_len); } /* XOR Them for the answer */ for (i = 0; i < outlen; i++) { --- xsupplicant-1.2.1/src/eap_types/tls/tls_crypt.c.BAD 2005-09-03 16:58:16.000000000 -0500 +++ xsupplicant-1.2.1/src/eap_types/tls/tls_crypt.c 2005-09-03 16:58:35.000000000 -0500 @@ -72,7 +72,7 @@ memcpy(p, mytls_vars->ssl->s3->server_random, SSL3_RANDOM_SIZE); tls_funcs_PRF(SSL_get_session(mytls_vars->ssl)->master_key, SSL_get_session(mytls_vars->ssl)->master_key_length, - sesskey, sesskeylen, seed, + (u_char *) sesskey, sesskeylen, seed, SSL3_RANDOM_SIZE * 2, retblock, TLS_SESSION_KEY_SIZE); --- xsupplicant-1.2.1/src/eap_types/tls/eaptls.c.BAD 2005-09-03 16:33:36.000000000 -0500 +++ xsupplicant-1.2.1/src/eap_types/tls/eaptls.c 2005-09-03 16:36:48.000000000 -0500 @@ -192,7 +192,7 @@ // Make sure we have something to process... if (dataoffs == NULL) return XENONE; - retVal=tls_funcs_decode_packet(thisint, dataoffs, insize, outframe, outsize, + retVal=tls_funcs_decode_packet(thisint, (char *) dataoffs, insize, (char *) outframe, outsize, NULL, userdata->chunk_size); return retVal; @@ -222,7 +222,7 @@ free(thisint->keyingMaterial); } - thisint->keyingMaterial = tls_funcs_gen_keyblock(network_data->activemethod); + thisint->keyingMaterial = (u_char *) tls_funcs_gen_keyblock(network_data->activemethod); thisint->keyingLength = 32; if (thisint->keyingMaterial == NULL) return -1; --- xsupplicant-1.2.1/src/eap_types/peap/eappeap.c.BAD 2005-09-03 17:16:00.000000000 -0500 +++ xsupplicant-1.2.1/src/eap_types/peap/eappeap.c 2005-09-03 17:16:47.000000000 -0500 @@ -239,7 +239,7 @@ set_peap_version(p2d, peap_version); // Tell PEAP what version we want to use. dataoffs[0] = ((uint8_t)dataoffs[0] & 0xfc); // Mask out the version bits. - if (tls_funcs_decode_packet(thisint, dataoffs, insize, outframe, outsize, + if (tls_funcs_decode_packet(thisint, (char *) dataoffs, insize, (char *) outframe, outsize, (phase2_call)peap_do_phase2, userdata->chunk_size) != XENONE) { @@ -335,7 +335,7 @@ { free(thisint->keyingMaterial); } - thisint->keyingMaterial = tls_funcs_gen_keyblock(network_data->activemethod); + thisint->keyingMaterial = (u_char *) tls_funcs_gen_keyblock(network_data->activemethod); thisint->keyingLength = 32; if (thisint->keyingMaterial == NULL) return -1; --- xsupplicant-1.2.1/src/eap_types/peap/peap_phase2.c.BAD 2005-09-03 17:17:38.000000000 -0500 +++ xsupplicant-1.2.1/src/eap_types/peap/peap_phase2.c 2005-09-03 17:21:23.000000000 -0500 @@ -160,7 +160,7 @@ switch ((uint8_t)eapvalue) { case EAP_REQUEST: - eap_request_id(thisint->eapdata->identity, eapid, out, out_size); + eap_request_id(thisint->eapdata->identity, eapid, (char *) out, out_size); break; case EAP_SUCCESS: @@ -192,7 +192,7 @@ return; } eap_request_auth(thisint->activemethod, thisint->eapdata->eap_conf_data, - in, in_size, out, out_size); + (char *) in, in_size, (char *) out, out_size); break; } free(new_frame); @@ -249,7 +249,7 @@ if (eframe != 1) { - peap_pad_frame(in, in_size, padded_frame, &padded_size); + peap_pad_frame(in, in_size, (u_char *) padded_frame, &padded_size); } new_frame = (char *)malloc(1024); @@ -259,12 +259,12 @@ return; } - do_peap_version1(thisint, padded_frame, padded_size, new_frame, + do_peap_version1(thisint, (u_char *) padded_frame, padded_size, (u_char *) new_frame, &new_frame_size); free(padded_frame); if (eframe !=1) { - peap_unpad_frame(new_frame, new_frame_size, out, out_size); + peap_unpad_frame((u_char *) new_frame, new_frame_size, out, out_size); } else { memcpy(out, new_frame, new_frame_size); *out_size = new_frame_size; @@ -330,14 +330,14 @@ p2d->eapdata->identity = peapconf->identity; p2d->eapdata->ias_quirk = peapconf->ias_quirk; - decr_data = (char *)malloc(1550); + decr_data = (u_char *)malloc(1550); if (decr_data == NULL) { debug_printf(DEBUG_NORMAL, "Couldn't allocate memory for decryption buffer!\n"); return XEMALLOC; } - encr_data = (char *)malloc(1550); + encr_data = (u_char *)malloc(1550); if (encr_data == NULL) { debug_printf(DEBUG_NORMAL, "Couldn't allocate memory for encryption buffer!\n"); --- xsupplicant-1.2.1/src/eap_types/mschapv2/eapmschapv2.c.BAD 2005-09-03 17:09:07.000000000 -0500 +++ xsupplicant-1.2.1/src/eap_types/mschapv2/eapmschapv2.c 2005-09-03 17:15:29.000000000 -0500 @@ -153,13 +153,13 @@ myvars->AuthenticatorChallenge = NULL; } - myvars->AuthenticatorChallenge = (u_char *)malloc(16); + myvars->AuthenticatorChallenge = (char *)malloc(16); if (myvars->AuthenticatorChallenge == NULL) return XEMALLOC; memcpy(myvars->AuthenticatorChallenge, &challenge->Challenge, 16); debug_printf(DEBUG_AUTHTYPES, "Authenticator Challenge : "); - debug_hex_printf(DEBUG_AUTHTYPES, myvars->AuthenticatorChallenge, 16); + debug_hex_printf(DEBUG_AUTHTYPES, (u_char *) myvars->AuthenticatorChallenge, 16); if (myvars->PeerChallenge != NULL) { @@ -168,13 +168,13 @@ } // Ignore the RADIUS host, we probably don't care. - myvars->PeerChallenge = (u_char *)malloc(16); + myvars->PeerChallenge = (char *)malloc(16); if (myvars->PeerChallenge == NULL) return XEMALLOC; - RAND_bytes(myvars->PeerChallenge, 16); + RAND_bytes((u_char *) myvars->PeerChallenge, 16); debug_printf(DEBUG_AUTHTYPES, "Generated PeerChallenge : "); - debug_hex_printf(DEBUG_AUTHTYPES, myvars->PeerChallenge,16); + debug_hex_printf(DEBUG_AUTHTYPES, (u_char *) myvars->PeerChallenge,16); if (myvars->NtResponse != NULL) { @@ -182,14 +182,14 @@ myvars->NtResponse = NULL; } - myvars->NtResponse = (u_char *)malloc(24); + myvars->NtResponse = (char *)malloc(24); if (myvars->NtResponse == NULL) return XEMALLOC; GenerateNTResponse(myvars->AuthenticatorChallenge, myvars->PeerChallenge, username, userdata->password, myvars->NtResponse); debug_printf(DEBUG_AUTHTYPES, "myvars->NtResponse = "); - debug_hex_printf(DEBUG_AUTHTYPES, myvars->NtResponse, 24); + debug_hex_printf(DEBUG_AUTHTYPES, (u_char *) myvars->NtResponse, 24); response->OpCode = MS_CHAPV2_RESPONSE; response->MS_CHAPv2_ID = challenge->MS_CHAPv2_ID; @@ -219,7 +219,7 @@ CheckAuthenticatorResponse(userdata->password, myvars->NtResponse, myvars->PeerChallenge, myvars->AuthenticatorChallenge, - username, (u_char *)&recv[0], &respOk); + username, (char *)&recv[0], &respOk); if (respOk == 1) { @@ -227,15 +227,15 @@ outframe[0] = MS_CHAPV2_SUCCESS; // We were successful, so generate keying material. - NtPasswordHash(userdata->password, (u_char *)&NtHash); - HashNtPasswordHash((u_char *)&NtHash, (u_char *)&NtHashHash); - GetMasterKey((u_char *)&NtHashHash, myvars->NtResponse, (u_char *)&MasterKey); + NtPasswordHash(userdata->password, (char *)&NtHash); + HashNtPasswordHash((char *)&NtHash, (char *)&NtHashHash); + GetMasterKey((char *)&NtHashHash, myvars->NtResponse, (char *)&MasterKey); // Now, get the send key. - GetAsymetricStartKey((u_char *)&MasterKey, (u_char *)&mppeSend, 16, TRUE, FALSE); + GetAsymetricStartKey((char *)&MasterKey, (char *)&mppeSend, 16, TRUE, FALSE); // And the recv key. - GetAsymetricStartKey((u_char *)&MasterKey, (u_char *)&mppeRecv, 16, FALSE, FALSE); + GetAsymetricStartKey((char *)&MasterKey, (char *)&mppeRecv, 16, FALSE, FALSE); // Finally, populate our myvars->keyingMaterial. if (myvars->keyingMaterial != NULL) @@ -243,7 +243,7 @@ free(myvars->keyingMaterial); myvars->keyingMaterial = NULL; } - myvars->keyingMaterial = (u_char *)malloc(64); // 32 bytes each. + myvars->keyingMaterial = (char *)malloc(64); // 32 bytes each. if (myvars->keyingMaterial == NULL) return XEMALLOC; bzero(myvars->keyingMaterial, 64); @@ -294,7 +294,7 @@ free(thisint->keyingMaterial); } - thisint->keyingMaterial = (char *)malloc(64); + thisint->keyingMaterial = (u_char *)malloc(64); if (thisint->keyingMaterial == NULL) return -1; memcpy(thisint->keyingMaterial, myconf->keyingMaterial, 64); --- xsupplicant-1.2.1/src/eap_types/mschapv2/mschapv2.c.BAD 2005-09-03 17:01:58.000000000 -0500 +++ xsupplicant-1.2.1/src/eap_types/mschapv2/mschapv2.c 2005-09-03 17:04:49.000000000 -0500 @@ -46,7 +46,7 @@ EVP_DigestUpdate(&cntx, PeerChallenge, 16); EVP_DigestUpdate(&cntx, AuthenticatorChallenge, 16); EVP_DigestUpdate(&cntx, UserName, strlen(UserName)); - EVP_DigestFinal(&cntx, (char *)&Digest, &retLen); + EVP_DigestFinal(&cntx, (u_char *)&Digest, (u_int *) &retLen); memcpy(Challenge, Digest, 8); } @@ -96,7 +96,7 @@ EVP_DigestInit(&cntx, EVP_md4()); EVP_DigestUpdate(&cntx, uniPassword, len); - EVP_DigestFinal(&cntx, (char *)&retVal, (int *)&i); + EVP_DigestFinal(&cntx, (u_char *)&retVal, (u_int *)&i); memcpy(PasswordHash, &retVal, 16); free(uniPassword); } @@ -114,7 +114,7 @@ EVP_DigestInit(&cntx, EVP_md4()); EVP_DigestUpdate(&cntx, PasswordHash, 16); - EVP_DigestFinal(&cntx, PasswordHashHash, &i); + EVP_DigestFinal(&cntx, (u_char *) PasswordHashHash, (u_int *) &i); } // Shamelessly take from the hostap code written by Jouni Malinen @@ -231,7 +231,7 @@ EVP_DigestUpdate(&context, &PasswordHashHash, 16); EVP_DigestUpdate(&context, NTResponse, 24); EVP_DigestUpdate(&context, Magic1, 39); - EVP_DigestFinal(&context, (char *)&Digest, &Digest_len); + EVP_DigestFinal(&context, (u_char *)&Digest, (u_int *) &Digest_len); ChallengeHash(PeerChallenge, AuthenticatorChallenge, UserName, Challenge); @@ -239,7 +239,7 @@ EVP_DigestUpdate(&context, &Digest, 20); EVP_DigestUpdate(&context, &Challenge, 8); EVP_DigestUpdate(&context, Magic2, 41); - EVP_DigestFinal(&context, (char *)&Digest, &Digest_len); + EVP_DigestFinal(&context, (u_char *)&Digest, (u_int *) &Digest_len); memcpy(AuthenticatorResponse, &Digest, Digest_len); } @@ -287,12 +287,12 @@ return; } - des_encrypt(Challenge, PasswordHash, Response); - des_encrypt(Challenge, PasswordHash + 7, Response+8); + des_encrypt((uint8_t *) Challenge, (uint8_t *) PasswordHash, (uint8_t *) Response); + des_encrypt((uint8_t *) Challenge, (uint8_t *) PasswordHash + 7, (uint8_t *) Response+8); zpwd[0] = PasswordHash[14]; zpwd[1] = PasswordHash[15]; memset(zpwd + 2, 0, 5); - des_encrypt(Challenge, zpwd, Response+16); + des_encrypt((uint8_t *) Challenge, zpwd, (uint8_t *) Response+16); } void NtChallengeResponse(char *Challenge, char *Password, char *Response) @@ -323,18 +323,18 @@ ChallengeHash(PeerChallenge, AuthenticatorChallenge, UserName, (char *)&Challenge); debug_printf(DEBUG_AUTHTYPES, "PeerChallenge : "); - debug_hex_printf(DEBUG_AUTHTYPES, PeerChallenge, 8); + debug_hex_printf(DEBUG_AUTHTYPES, (u_char *) PeerChallenge, 8); debug_printf(DEBUG_AUTHTYPES, "AuthenticatorChallenge : "); - debug_hex_printf(DEBUG_AUTHTYPES, AuthenticatorChallenge, 8); + debug_hex_printf(DEBUG_AUTHTYPES, (u_char *) AuthenticatorChallenge, 8); debug_printf(DEBUG_AUTHTYPES, "Username : %s\n",UserName); debug_printf(DEBUG_AUTHTYPES, "Challenge : "); - debug_hex_printf(DEBUG_AUTHTYPES, Challenge, 8); + debug_hex_printf(DEBUG_AUTHTYPES, (u_char *) Challenge, 8); NtPasswordHash(Password, (char *)&PasswordHash); debug_printf(DEBUG_AUTHTYPES, "PasswordHash : "); - debug_hex_printf(DEBUG_AUTHTYPES, PasswordHash, 16); + debug_hex_printf(DEBUG_AUTHTYPES, (u_char *) PasswordHash, 16); ChallengeResponse(Challenge, (char *)&PasswordHash, Response); debug_printf(DEBUG_AUTHTYPES, "Response : "); - debug_hex_printf(DEBUG_AUTHTYPES, Response, 24); + debug_hex_printf(DEBUG_AUTHTYPES, (u_char *) Response, 24); } void GetMasterKey(char *PasswordHashHash, char *NTResponse, char *MasterKey) @@ -360,7 +360,7 @@ EVP_DigestUpdate(&cntx, PasswordHashHash, 16); EVP_DigestUpdate(&cntx, NTResponse, 24); EVP_DigestUpdate(&cntx, (char *)&Magic1, 27); - EVP_DigestFinal(&cntx, (char *)&Digest, &retLen); + EVP_DigestFinal(&cntx, (u_char *)&Digest, (u_int *) &retLen); memcpy(MasterKey, &Digest, 16); } @@ -386,7 +386,7 @@ EVP_DigestUpdate(&cntx, APR, 24); EVP_DigestUpdate(&cntx, PC, 8); EVP_DigestUpdate(&cntx, PR, 24); - EVP_DigestFinal(&cntx, (char *)&Digest, &retLen); + EVP_DigestFinal(&cntx, (u_char *)&Digest, (u_int *) &retLen); memcpy(MasterKey, &Digest, 16); @@ -461,7 +461,7 @@ EVP_DigestUpdate(&cntx, SHSpad1, 40); EVP_DigestUpdate(&cntx, (char *)&Magic, 84); EVP_DigestUpdate(&cntx, SHSpad2, 40); - EVP_DigestFinal(&cntx, (char *)&Digest, &retLen); + EVP_DigestFinal(&cntx, (u_char *)&Digest, (u_int *)&retLen); memcpy(SessionKey, &Digest, SessionKeyLength); } --- xsupplicant-1.2.1/src/eap_types/ttls/eapttls.c.BAD 2005-09-03 16:43:18.000000000 -0500 +++ xsupplicant-1.2.1/src/eap_types/ttls/eapttls.c 2005-09-03 16:44:20.000000000 -0500 @@ -215,7 +215,7 @@ // Make sure we have a valid packet to process. if (dataoffs == NULL) return XENONE; - result=tls_funcs_decode_packet(thisint, dataoffs, insize, outframe, outsize, + result=tls_funcs_decode_packet(thisint, (char *) dataoffs, insize, (char *) outframe, outsize, (phase2_call)ttls_do_phase2, userdata->chunk_size); if (result != 0) @@ -250,7 +250,7 @@ free(thisint->keyingMaterial); } - thisint->keyingMaterial = tls_funcs_gen_keyblock(network_data->activemethod); + thisint->keyingMaterial = (u_char *) tls_funcs_gen_keyblock(network_data->activemethod); thisint->keyingLength = 32; if (thisint->keyingMaterial == NULL) return -1; --- xsupplicant-1.2.1/src/eap_types/ttls/ttlsphase2.c.BAD 2005-09-03 16:45:26.000000000 -0500 +++ xsupplicant-1.2.1/src/eap_types/ttls/ttlsphase2.c 2005-09-03 16:57:41.000000000 -0500 @@ -184,7 +184,7 @@ username_size = strlen(username); // Send the Username AVP - build_avp(USER_NAME_AVP, 0, MANDITORY_FLAG, username, username_size, out_data, &avp_out_size); + build_avp(USER_NAME_AVP, 0, MANDITORY_FLAG, (uint8_t *) username, username_size, (uint8_t *) out_data, &avp_out_size); avp_offset = avp_out_size; @@ -200,7 +200,7 @@ id = challenge[16]; // Send the MS-CHAP AVP - build_avp(MS_CHAP_CHALLENGE, MS_VENDOR_ATTR, (MANDITORY_FLAG | VENDOR_FLAG), (char *)&mschap_challenge, 16, &out_data[avp_offset], &avp_out_size); + build_avp(MS_CHAP_CHALLENGE, MS_VENDOR_ATTR, (MANDITORY_FLAG | VENDOR_FLAG), (uint8_t *) &mschap_challenge, 16, (uint8_t *) &out_data[avp_offset], &avp_out_size); avp_offset+=avp_out_size; @@ -217,7 +217,7 @@ memcpy(&mschap_answer[2], &mschap_challenge, 16); memcpy(&mschap_answer[26], &mschap_result, 24); - build_avp(MS_CHAP2_RESPONSE, MS_VENDOR_ATTR, (MANDITORY_FLAG | VENDOR_FLAG), (char *)&mschap_answer, 50, &out_data[avp_offset], &avp_out_size); + build_avp(MS_CHAP2_RESPONSE, MS_VENDOR_ATTR, (MANDITORY_FLAG | VENDOR_FLAG), (uint8_t *) &mschap_answer, 50, (uint8_t *) &out_data[avp_offset], &avp_out_size); avp_offset+=avp_out_size; *out_size = avp_offset; } @@ -283,7 +283,7 @@ username_size = strlen(username); // Send the Username AVP - build_avp(USER_NAME_AVP, 0, MANDITORY_FLAG, username, username_size, out_data, &avp_out_size); + build_avp(USER_NAME_AVP, 0, MANDITORY_FLAG, (uint8_t *) username, username_size, (uint8_t *) out_data, &avp_out_size); avp_offset = avp_out_size; @@ -299,7 +299,7 @@ id = challenge[8]; // Send the MS-CHAP AVP - build_avp(MS_CHAP_CHALLENGE, MS_VENDOR_ATTR, (MANDITORY_FLAG | VENDOR_FLAG), (char *)&mschap_challenge, 8, &out_data[avp_offset], &avp_out_size); + build_avp(MS_CHAP_CHALLENGE, MS_VENDOR_ATTR, (MANDITORY_FLAG | VENDOR_FLAG), (uint8_t *) &mschap_challenge, 8, (uint8_t *) &out_data[avp_offset], &avp_out_size); avp_offset+=avp_out_size; @@ -313,7 +313,7 @@ mschap_answer[1] = 1; // Use NT Style Passwords. memcpy((char *)&mschap_answer[26], (char *)&mschap_result, 24); - build_avp(MS_CHAP_RESPONSE, MS_VENDOR_ATTR, (MANDITORY_FLAG | VENDOR_FLAG), (char *)&mschap_answer, 50, &out_data[avp_offset], &avp_out_size); + build_avp(MS_CHAP_RESPONSE, MS_VENDOR_ATTR, (MANDITORY_FLAG | VENDOR_FLAG), (uint8_t *) &mschap_answer, 50, (uint8_t *) &out_data[avp_offset], &avp_out_size); avp_offset+=avp_out_size; *out_size = avp_offset; @@ -386,12 +386,12 @@ username = phase2data->username; } username_size = strlen(username); - build_avp(USER_NAME_AVP, 0, MANDITORY_FLAG, username, username_size, out_data, &avp_out_size); + build_avp(USER_NAME_AVP, 0, MANDITORY_FLAG, (uint8_t *) username, username_size, (uint8_t *) out_data, &avp_out_size); avp_offset = avp_out_size; // Get the implicit challenge. - challenge = implicit_challenge(thisint); + challenge = (u_char *) implicit_challenge(thisint); if (challenge == NULL) { debug_printf(DEBUG_NORMAL, "Invalid implicit challenge in ttls_do_chap()!\n"); @@ -409,9 +409,9 @@ return; } - user_passwd = phase2data->password; + user_passwd = (u_char *) phase2data->password; - tohash = (char *)malloc(1+16+strlen(user_passwd)); + tohash = (u_char *)malloc(1+16+strlen((char *) user_passwd)); if (tohash == NULL) { debug_printf(DEBUG_NORMAL, "Error with malloc of \"tohash\" in ttls_do_chap().\n"); @@ -419,13 +419,13 @@ } tohash[0] = session_id; - memcpy(&tohash[1], user_passwd, strlen(user_passwd)); - memcpy(&tohash[1+strlen(user_passwd)], &chap_challenge, 16); - hashlen = 1+strlen(user_passwd)+16; + memcpy(&tohash[1], user_passwd, strlen((char *) user_passwd)); + memcpy(&tohash[1+strlen((char *) user_passwd)], &chap_challenge, 16); + hashlen = 1+strlen((char *) user_passwd)+16; EVP_DigestInit(ctx, EVP_md5()); EVP_DigestUpdate(ctx, tohash, hashlen); - EVP_DigestFinal(ctx, (char *)&chap_hash[1], (int *)&md5_length); + EVP_DigestFinal(ctx, (u_char *)&chap_hash[1], (u_int *)&md5_length); if (md5_length != 16) // We didn't get back a valid hash! { @@ -433,11 +433,11 @@ } chap_hash[0]=session_id; - build_avp(CHAP_PASSWORD_AVP, 0, MANDITORY_FLAG, chap_hash, 17, &out_data[avp_offset], &avp_out_size); + build_avp(CHAP_PASSWORD_AVP, 0, MANDITORY_FLAG, chap_hash, 17, (uint8_t *) &out_data[avp_offset], &avp_out_size); avp_offset += avp_out_size; - build_avp(CHAP_CHALLENGE_AVP, 0, MANDITORY_FLAG, (char *)&chap_challenge, 16, &out_data[avp_offset], &avp_out_size); + build_avp(CHAP_CHALLENGE_AVP, 0, MANDITORY_FLAG, (uint8_t *) &chap_challenge, 16, (uint8_t *) &out_data[avp_offset], &avp_out_size); if (tohash != NULL) { @@ -518,8 +518,8 @@ avp_offset = 0; - build_avp(USER_NAME_AVP, 0, MANDITORY_FLAG, username, - strlen(username), out_data, &avp_out_size); + build_avp(USER_NAME_AVP, 0, MANDITORY_FLAG, (uint8_t *) username, + strlen(username), (uint8_t *) out_data, &avp_out_size); avp_offset += avp_out_size; @@ -537,7 +537,7 @@ bzero(tempbuf, passwd_size); memcpy(tempbuf, phase2data->password, strlen(phase2data->password)); - build_avp(USER_PASSWORD_AVP, 0, MANDITORY_FLAG, tempbuf, passwd_size, &out_data[avp_offset], &avp_out_size); + build_avp(USER_PASSWORD_AVP, 0, MANDITORY_FLAG, (uint8_t *) tempbuf, passwd_size, (uint8_t *) &out_data[avp_offset], &avp_out_size); *out_size = avp_offset + avp_out_size; @@ -548,7 +548,7 @@ } debug_printf(DEBUG_AUTHTYPES, "Returning from do_pap :\n"); - debug_hex_dump(DEBUG_AUTHTYPES, out_data, *out_size); + debug_hex_dump(DEBUG_AUTHTYPES, (u_char *) out_data, *out_size); } // We don't do anything with the "in" stuff for now.. @@ -567,7 +567,7 @@ } debug_printf(DEBUG_AUTHTYPES, "Encrypted Inner (%d) : \n", in_size); - debug_hex_dump(DEBUG_AUTHTYPES, in, in_size); + debug_hex_dump(DEBUG_AUTHTYPES, (u_char *) in, in_size); userdata = (struct config_eap_ttls *)thisint->eap_conf_data; @@ -597,10 +597,10 @@ if ((in_size > 0) && (in[0] != 0x14)) { // We have something to decrypt! - tls_crypt_decrypt(thisint, in, in_size, decr_data, &decrsize); + tls_crypt_decrypt(thisint, (u_char *) in, in_size, (u_char *) decr_data, &decrsize); debug_printf(DEBUG_AUTHTYPES, "Decrypted Inner (%d) : \n", in_size); - debug_hex_dump(DEBUG_AUTHTYPES, decr_data, decrsize); + debug_hex_dump(DEBUG_AUTHTYPES, (u_char *) decr_data, decrsize); if (decr_data[0] == 0x00) { @@ -638,11 +638,11 @@ return XENONE; } - tls_crypt_encrypt_nolen(thisint, toencout, toencsize, out, out_size); + tls_crypt_encrypt_nolen(thisint, (u_char *) toencout, toencsize, (u_char *) out, out_size); free(toencout); debug_printf(DEBUG_AUTHTYPES, "Returning from (TTLS) do_phase2 : \n"); - debug_hex_dump(DEBUG_AUTHTYPES, out, *out_size); + debug_hex_dump(DEBUG_AUTHTYPES, (u_char *) out, *out_size); return XENONE; } --- xsupplicant-1.2.1/src/eap_types/leap/eapleap.c.BAD 2005-09-03 17:22:01.000000000 -0500 +++ xsupplicant-1.2.1/src/eap_types/leap/eapleap.c 2005-09-03 17:25:57.000000000 -0500 @@ -50,7 +50,7 @@ unicodePass[2 * i + 1] = 0; } /* Encrypt plain text password to a 16-byte MD4 hash */ - md4_calc(MD4Hash, unicodePass, passLen * 2); + md4_calc(MD4Hash, (u_char *) unicodePass, passLen * 2); } void leap_mschap(char * password, char * response) { @@ -64,7 +64,7 @@ ntPwdHash(MD4Hash, password); md4_calc(MD4HashHash, MD4Hash, 16); - ChallengeResponse(leapchallenges->apc, MD4HashHash, response); + ChallengeResponse((char *) leapchallenges->apc, (char *) MD4HashHash, response); } @@ -199,7 +199,7 @@ // LEAP shouldn't be used as an inner type, so we should be able to get // away with this. - data = dataoffs-5; + data = (char *) dataoffs-5; eapheader = (struct eap_header *)data; switch (eapheader->eap_code) { @@ -279,7 +279,7 @@ memset(chall_response, 0x0, 8); NtChallengeResponse((char *)leaprequest->randval, userdata->password, (char *)&chall_response); - GenerateNTResponse((char *)leapchallenges->pr, (char *)leapchallenges->pc, username, userdata->password, chall_response); + GenerateNTResponse((char *)leapchallenges->pr, (char *)leapchallenges->pc, username, userdata->password, (char *) chall_response); // store Access Point Challenge memcpy((uint8_t *)leapchallenges->apc, (char *)chall_response, 8); @@ -337,7 +337,7 @@ leapresponse = (struct leap_responses *)dataoffs; - challenge_response_got = (char *)malloc(leapresponse->count+1); + challenge_response_got = (u_char *)malloc(leapresponse->count+1); if (!challenge_response_got) { debug_printf(DEBUG_NORMAL, "(EAP-LEAP) challenge_response_got is NULL after malloc!\n"); } @@ -350,7 +350,7 @@ memset(challenge_response_expected, 0x0, 24); // Calculate the 24 bytes MS-CHAP Challenge Response - leap_mschap(userdata->password, challenge_response_expected); + leap_mschap(userdata->password, (char *) challenge_response_expected); if (memcmp(challenge_response_got, challenge_response_expected, 24) == 0) { debug_printf(DEBUG_AUTHTYPES, "(EAP-LEAP) AP ChallengeResponse got is valid.\n"); @@ -386,7 +386,7 @@ debug_printf(DEBUG_AUTHTYPES, "(EAP-LEAP) leapchallenges->apr : "); debug_hex_printf(DEBUG_AUTHTYPES, (uint8_t *)leapchallenges->apr, 24); - GetMasterLEAPKey((char *)MD4HashHash, leapchallenges->apc, leapchallenges->apr, leapchallenges->pc, leapchallenges->pr, (char *)&MasterKey); + GetMasterLEAPKey((char *)MD4HashHash, (char *) leapchallenges->apc, (char *) leapchallenges->apr, (char *) leapchallenges->pc, (char *) leapchallenges->pr, (char *)&MasterKey); debug_printf(DEBUG_AUTHTYPES, "MasterLEAPKey : "); debug_hex_printf(DEBUG_AUTHTYPES, (unsigned char *)&MasterKey, 16); @@ -444,7 +444,7 @@ mydata = (struct leap_data *)network_data->activemethod->eap_data; // Right now, we don't return anything from LEAP. - thisint->keyingMaterial = mydata->keyingMaterial; + thisint->keyingMaterial = (u_char *) mydata->keyingMaterial; thisint->keyingLength = 16; // We only use 16 bytes for this keying material! return 0; --- xsupplicant-1.2.1/src/wpa_common.c.BAD 2005-09-03 08:42:16.000000000 -0500 +++ xsupplicant-1.2.1/src/wpa_common.c 2005-09-03 08:42:30.000000000 -0500 @@ -201,7 +201,7 @@ // This is a little different than the reference implementation, // because OpenSSL takes parameters in a different order. HMAC(EVP_sha1(), key, key_len, input, total_len, &output[currentindex], - &k); + (u_int *) &k); currentindex += 20; input[total_len-1]++; } --- xsupplicant-1.2.1/src/eapol_key_type1.c.BAD 2005-09-03 08:40:11.000000000 -0500 +++ xsupplicant-1.2.1/src/eapol_key_type1.c 2005-09-03 08:41:54.000000000 -0500 @@ -107,7 +107,7 @@ if (calchmac == NULL) return XEMALLOC; HMAC(EVP_md5(), thisint->keyingMaterial+32, - thisint->keyingLength, framecpy, framesize, calchmac, &outlen); + thisint->keyingLength, (u_char *) framecpy, framesize, (u_char *) calchmac, (u_int *) &outlen); // Now, we need to compare the calculated HMAC to the one sent to us. keydata = (struct key_packet *)&inframe[4]; --- xsupplicant-1.2.1/src/eapol.c.BAD 2005-09-03 08:30:37.000000000 -0500 +++ xsupplicant-1.2.1/src/eapol.c 2005-09-03 08:30:45.000000000 -0500 @@ -122,7 +122,7 @@ // an EAP request that is valid. If we don't have any config informtion, // we should just bail here, and not return an error. - inframe = (u_char *)&workint->recvframe; + inframe = (char *)&workint->recvframe; temp = (struct eapol_header *)&inframe[OFFSET_PAST_MAC]; --- xsupplicant-1.2.1/src/statemachine.c.BAD 2005-09-03 08:32:13.000000000 -0500 +++ xsupplicant-1.2.1/src/statemachine.c 2005-09-03 08:33:13.000000000 -0500 @@ -619,7 +619,7 @@ } } - eapol_build_header(EAPOL_LOGOFF, 0, eapolver, thisint->sendframe); + eapol_build_header(EAPOL_LOGOFF, 0, eapolver, (char *) thisint->sendframe); thisint->send_size = OFFSET_TO_EAP; snmp_dot1xSuppEapolLogoffFramesTx(); @@ -664,7 +664,7 @@ } eapol_build_header(EAPOL_START, 0, network_data->force_eapol_ver, - thisint->sendframe); + (char *) thisint->sendframe); thisint->send_size = OFFSET_TO_EAP; snmp_dot1xSuppEapolStartFramesTx(); --- xsupplicant-1.2.1/src/config_ssid.c.BAD 2005-09-03 08:30:08.000000000 -0500 +++ xsupplicant-1.2.1/src/config_ssid.c 2005-09-03 08:30:24.000000000 -0500 @@ -151,7 +151,7 @@ if (wpa_ie != NULL) { - cur->wpa_ie = (char *)malloc(wpa_ie_len); + cur->wpa_ie = (unsigned char *)malloc(wpa_ie_len); if (cur->wpa_ie == NULL) { debug_printf(DEBUG_NORMAL, "Couldn't allocate memory for wpa_ie! " @@ -168,7 +168,7 @@ if (rsn_ie != NULL) { - cur->rsn_ie = (char *)malloc(rsn_ie_len); + cur->rsn_ie = (unsigned char *)malloc(rsn_ie_len); if (cur->rsn_ie == NULL) { debug_printf(DEBUG_NORMAL, "Couldn't allocate memory for rsn_ie! " --- xsupplicant-1.2.1/src/xsup_ipc.c.BAD 2005-09-03 17:27:32.000000000 -0500 +++ xsupplicant-1.2.1/src/xsup_ipc.c 2005-09-03 17:29:17.000000000 -0500 @@ -144,7 +144,7 @@ } debug_printf(DEBUG_INT, "(IPC) Sending : \n"); - debug_hex_dump(DEBUG_INT, tosend, tolen); + debug_hex_dump(DEBUG_INT, (u_char *) tosend, tolen); err = send(skfd, tosend, tolen, 0); if (err < 0) @@ -194,7 +194,7 @@ *outsize = 0; } else { debug_printf(DEBUG_INT, "(IPC) Got : \n"); - debug_hex_dump(DEBUG_INT, outbuf, readStat); + debug_hex_dump(DEBUG_INT, (u_char *) outbuf, readStat); // Verify that the packet we got is valid. *outsize = readStat; @@ -355,7 +355,7 @@ debug_printf(DEBUG_NORMAL, "Error getting working interface " "dumping current packet: \n"); - debug_hex_dump(DEBUG_NORMAL, buffer, bufsize); + debug_hex_dump(DEBUG_NORMAL, (u_char *) buffer, bufsize); debug_printf(DEBUG_NORMAL, "Ignoring remaining parts of packet!\n"); bufptr = bufsize+1; @@ -419,7 +419,7 @@ { // We got a request for a new IPC client connection. debug_printf(DEBUG_INT, "Got a request to connect a new client.\n"); - newsock = accept(ipc_sock, (struct sockaddr *)&sa, &len); + newsock = accept(ipc_sock, (struct sockaddr *)&sa, (u_int *) &len); if (newsock <= 0) { debug_printf(DEBUG_NORMAL, "Got a request for a new IPC client " @@ -514,7 +514,7 @@ ipc_callout_request_password(intidx, &bufptr, (char *)&packet[0], 512, eapType, challenge); debug_printf(DEBUG_AUTHTYPES, "Sending : \n"); - debug_hex_dump(DEBUG_AUTHTYPES, packet, bufptr); + debug_hex_dump(DEBUG_AUTHTYPES, (u_char *) packet, bufptr); xsup_ipc_send_all((char *)&packet, bufptr); --- xsupplicant-1.2.1/src/eapol_key_type254.c.BAD 2005-09-03 09:05:02.000000000 -0500 +++ xsupplicant-1.2.1/src/eapol_key_type254.c 2005-09-03 09:21:09.000000000 -0500 @@ -192,12 +192,12 @@ } debug_printf(DEBUG_INT, "PMK : "); - debug_hex_printf(DEBUG_INT, intdata->statemachine->PMK, 32); - wpa_PRF(intdata->statemachine->PMK, 32, "Pairwise key expansion", 22, - (char *)&prfdata, 76, retval, 64); + debug_hex_printf(DEBUG_INT, (u_char *) intdata->statemachine->PMK, 32); + wpa_PRF((u_char *) intdata->statemachine->PMK, 32, (u_char *) "Pairwise key expansion", 22, + (u_char *)&prfdata, 76, (u_char *) retval, 64); debug_printf(DEBUG_INT, "PTK : "); - debug_hex_printf(DEBUG_INT, retval, 64); + debug_hex_printf(DEBUG_INT, (u_char *) retval, 64); return retval; } @@ -264,10 +264,10 @@ eapolver = snmp_get_dot1xSuppLastEapolFrameVersion(); eapol_build_header(EAPOL_KEY, (intdata->send_size-OFFSET_TO_EAPOL-4), - eapolver, intdata->sendframe); + eapolver, (char *) intdata->sendframe); memcpy(key, intdata->statemachine->PTK, 16); - mic_wpa_populate(intdata->sendframe, intdata->send_size+4, key, 16); + mic_wpa_populate((char *) intdata->sendframe, intdata->send_size+4, key, 16); cardif_sendframe(intdata); intdata->statemachine->eapolEap = FALSE; @@ -351,21 +351,21 @@ bzero(rc4_ek, 32); memcpy(rc4_ek, inkeydata->key_iv, 16); memcpy(&rc4_ek[16], &intdata->statemachine->PTK[16], 16); - rc4_skip(rc4_ek, 32, 256, keydata, value16); + rc4_skip((u_char *) rc4_ek, 32, 256, keydata, value16); wpa_common_swap_rx_tx_mic(keydata); - cardif_set_tkip_key(intdata, allfs, keyindex, FALSE, inkeydata->key_rsc, - 6, keydata, value16); + cardif_set_tkip_key(intdata, (char *) allfs, keyindex, FALSE, (char *) inkeydata->key_rsc, + 6, (char *) keydata, value16); break; case 2: // First, decrypt the GTK bzero(key, 16); - aes_unwrap(&intdata->statemachine->PTK[16], (value16-8)/8, keydata, - key); + aes_unwrap((u_char *) &intdata->statemachine->PTK[16], (value16-8)/8, keydata, + (u_char *) key); wpa_common_swap_rx_tx_mic(keydata); - cardif_set_ccmp_key(intdata, NULL, keyindex, FALSE, inkeydata->key_rsc, + cardif_set_ccmp_key(intdata, NULL, keyindex, FALSE, (char *) inkeydata->key_rsc, 6, key, (value16-8)); break; } @@ -391,13 +391,13 @@ eapolver = snmp_get_dot1xSuppLastEapolFrameVersion(); eapol_build_header(EAPOL_KEY, (intdata->send_size-OFFSET_TO_EAPOL-4), - eapolver, intdata->sendframe); + eapolver, (char *) intdata->sendframe); memcpy(key, intdata->statemachine->PTK, 16); - mic_wpa_populate(intdata->sendframe, intdata->send_size+4, key, 16); + mic_wpa_populate((char *) intdata->sendframe, intdata->send_size+4, key, 16); // Dump what we built. - eapol_key_type254_dump(intdata->sendframe); + eapol_key_type254_dump((char *) intdata->sendframe); if (network_data->methods->method_num == WPA_PSK) { @@ -504,13 +504,13 @@ eapolver = snmp_get_dot1xSuppLastEapolFrameVersion(); eapol_build_header(EAPOL_KEY, (intdata->send_size-OFFSET_TO_EAPOL-4), - eapolver, intdata->sendframe); + eapolver, (char *) intdata->sendframe); memcpy(key, intdata->statemachine->PTK, 16); - mic_wpa_populate(intdata->sendframe, intdata->send_size+4, key, 16); + mic_wpa_populate((char *) intdata->sendframe, intdata->send_size+4, key, 16); // Dump what we built. - eapol_key_type254_dump(intdata->sendframe); + eapol_key_type254_dump((char *) intdata->sendframe); } /******************************************************** @@ -586,20 +586,20 @@ eapolver = snmp_get_dot1xSuppLastEapolFrameVersion(); eapol_build_header(EAPOL_KEY, (intdata->send_size-OFFSET_TO_EAPOL-4), - eapolver, intdata->sendframe); + eapolver, (char *) intdata->sendframe); memcpy(key, intdata->statemachine->PTK, 16); - mic_wpa_populate(intdata->sendframe, intdata->send_size+4, key, 16); + mic_wpa_populate((char *) intdata->sendframe, intdata->send_size+4, key, 16); // Dump what we built. - eapol_key_type254_dump(intdata->sendframe); + eapol_key_type254_dump((char *) intdata->sendframe); // Get TK1 value16 = ntohs(inkeydata->key_length); memcpy(key, (char *)&intdata->statemachine->PTK[32], value16); debug_printf(DEBUG_INT, "TK1 : "); - debug_hex_printf(DEBUG_INT, key, value16); + debug_hex_printf(DEBUG_INT, (u_char *) key, value16); cardif_sendframe(intdata); intdata->statemachine->eapolEap = FALSE; @@ -612,14 +612,14 @@ case 1: // We need to swap the TX/RX MIC values since we are the supplicant. // (Thanks to Jouni Malinen for pointing this out!) - wpa_common_swap_rx_tx_mic(key); + wpa_common_swap_rx_tx_mic((u_char *) key); cardif_set_tkip_key(intdata, intdata->dest_mac, keyindex, TRUE, - inkeydata->key_rsc, 6, key, value16); + (char *) inkeydata->key_rsc, 6, key, value16); break; case 2: cardif_set_ccmp_key(intdata, intdata->dest_mac, keyindex, TRUE, - inkeydata->key_rsc, 6, key, value16); + (char *) inkeydata->key_rsc, 6, key, value16); break; } } @@ -646,7 +646,7 @@ if (keyflags & WPA_KEY_MIC_FLAG) { - if (mic_wpa_validate(intdata->recvframe, intdata->recv_size, + if (mic_wpa_validate((char *) intdata->recvframe, intdata->recv_size, intdata->statemachine->PTK, 16) == FALSE) { intdata->statemachine->MICVerified = TRUE; @@ -688,7 +688,7 @@ eapolver = snmp_get_dot1xSuppLastEapolFrameVersion(); eapol_build_header(EAPOL_KEY, (intdata->recv_size-OFFSET_TO_EAPOL-4), - eapolver, intdata->recvframe); + eapolver, (char *) intdata->recvframe); cardif_sendframe(intdata); intdata->statemachine->eapolEap = FALSE; } @@ -757,8 +757,8 @@ } // We have an ASCII password, so calculate it. - if (psk_wpa_pbkdf2(psk->key, intdata->cur_essid, - strlen(intdata->cur_essid), (char *)&tpmk) + if (psk_wpa_pbkdf2(psk->key, (u_char *) intdata->cur_essid, + strlen(intdata->cur_essid), (u_char *)&tpmk) == TRUE) { intdata->statemachine->PMK = (char *)malloc(32); @@ -798,7 +798,7 @@ } } - eapol_key_type254_dump(inframe); + eapol_key_type254_dump((char *) inframe); eapol_key_type254_determine_key(intdata); --- xsupplicant-1.2.1/src/config_grammar.y.BAD 2005-09-03 17:31:51.000000000 -0500 +++ xsupplicant-1.2.1/src/config_grammar.y 2005-09-03 17:34:56.000000000 -0500 @@ -829,8 +829,9 @@ } else { int tmp_dst_mac[CONFIG_MAC_LEN]; + int retval; SET_FLAG(tmp_network->flags, CONFIG_NET_DEST_MAC); - sscanf($3, "%2x:%2x:%2x:%2x:%2x:%2x", + retval = sscanf($3, "%2x:%2x:%2x:%2x:%2x:%2x", &tmp_dst_mac[0], &tmp_dst_mac[1], &tmp_dst_mac[2], @@ -1035,25 +1036,25 @@ set_current_static_wep(); parameter_debug("Static Key 1 : %s\n", $3); if (!tmp_static_wep->key[1]) - tmp_static_wep->key[1] = $3; + tmp_static_wep->key[1] = (u_char *) $3; } | TK_STATIC_KEY2 '=' TK_QUOTED_STR { set_current_static_wep(); parameter_debug("Static Key 2 : %s\n", $3); if (!tmp_static_wep->key[2]) - tmp_static_wep->key[2] = $3; + tmp_static_wep->key[2] = (u_char *) $3; } | TK_STATIC_KEY3 '=' TK_QUOTED_STR { set_current_static_wep(); parameter_debug("Static Key 3 : %s\n", $3); if (!tmp_static_wep->key[3]) - tmp_static_wep->key[3] = $3; + tmp_static_wep->key[3] = (u_char *) $3; } | TK_STATIC_KEY4 '=' TK_QUOTED_STR { set_current_static_wep(); parameter_debug("Static Key 4 : %s\n", $3); if (!tmp_static_wep->key[4]) - tmp_static_wep->key[4] = $3; + tmp_static_wep->key[4] = (u_char *) $3; } | TK_WEP_TX_KEY '=' TK_NUMBER { set_current_static_wep(); Index: sources =================================================================== RCS file: /cvs/extras/rpms/xsupplicant/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 19 Aug 2005 18:58:19 -0000 1.2 +++ sources 4 Sep 2005 13:17:39 -0000 1.3 @@ -1 +1,2 @@ e1eee37899b49ed238648699d0a01c5b xsupplicant-1.2.tar.gz +c44300f798a3317c06e501eb0dd98a23 xsupplicant-1.2.1.tar.gz Index: xsupplicant.spec =================================================================== RCS file: /cvs/extras/rpms/xsupplicant/FC-4/xsupplicant.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- xsupplicant.spec 19 Aug 2005 18:58:19 -0000 1.1 +++ xsupplicant.spec 4 Sep 2005 13:17:39 -0000 1.2 @@ -1,6 +1,6 @@ Name: xsupplicant Summary: Open Source Implementation of IEEE 802.1x -Version: 1.2 +Version: 1.2.1 Release: 1%{?dist} License: GPL Group: System Environment/Base @@ -8,6 +8,8 @@ Source0: http://download.sourceforge.net/open1x/xsupplicant-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: openssl-devel, bison, flex +Patch0: xsupplicant-1.2.1-docsfix.patch +Patch1: xsupplicant-1.2.1-gcc4-cleanups.patch %description This software allows a GNU/Linux or BSD workstation to authenticate with @@ -17,12 +19,17 @@ %prep %setup -q +%patch0 -p1 +%patch1 -p1 perl -pi.orig -e 's|/lib\b|/%{_lib}|g' configure* %build %configure make %{?_smp_mflags} +cd doc +./builddocs.sh +cd .. %install rm -rf $RPM_BUILD_ROOT @@ -35,7 +42,7 @@ %files %defattr(-,root,root,-) -%doc AUTHORS COPYING README doc/html/ doc/txt/ doc/README* etc/*.conf +%doc AUTHORS COPYING README doc/html/ doc/txt/ doc/pdf doc/README* etc/*.conf %config(noreplace) %{_sysconfdir}/xsupplicant.conf %{_bindir}/config-parser %{_bindir}/xsup_monitor @@ -44,6 +51,9 @@ %{_sbindir}/xsupplicant %changelog +* Sat Sep 3 2005 Tom "spot" Callaway 1.2.1-1 +- bump to 1.2.1 release + * Fri Aug 19 2005 Tom "spot" Callaway 1.2-1 - bump to 1.2 final From fedora-extras-commits at redhat.com Sun Sep 4 13:17:41 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sun, 4 Sep 2005 09:17:41 -0400 Subject: rpms/xsupplicant/FC-3 xsupplicant-1.2.1-docsfix.patch, NONE, 1.1 xsupplicant-1.2.1-gcc4-cleanups.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 xsupplicant.spec, 1.1, 1.2 Message-ID: <200509041317.j84DHfPx030629@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/xsupplicant/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30591/FC-3 Modified Files: .cvsignore sources xsupplicant.spec Added Files: xsupplicant-1.2.1-docsfix.patch xsupplicant-1.2.1-gcc4-cleanups.patch Log Message: Bump to 1.2.1, fix a LOT of signed/unsigned mistakes in the code. xsupplicant-1.2.1-docsfix.patch: --- NEW FILE xsupplicant-1.2.1-docsfix.patch --- --- xsupplicant-1.2.1/doc/builddocs.sh.BAD 2005-09-03 08:20:54.000000000 -0500 +++ xsupplicant-1.2.1/doc/builddocs.sh 2005-09-03 08:22:29.000000000 -0500 @@ -4,7 +4,7 @@ # best option is just to require users of this script to define # the variable on their own? not quite sure, I guess that's why # it's hard coded for now... -JADE_PUB=/usr/share/doc/openjade-1.3/pubtext +JADE_PUB=/usr/share/doc/openjade-*/pubtext SGML_CATALOG_FILES=/usr/sgml-tools/dtd/catalog:/etc/sgml/catalog:/usr/share/doc/openjade-1.3.2/catalog:/home/chris/t/docbook-dsssl-1.97/catalog mkdir -p html @@ -33,7 +33,7 @@ # create the txt docs echo -n "Building the TXT docs..." -lynx -dump -nolist html/Open1x-UserGuide.html > txt/Open1x-UserGuide.txt +links -dump html/Open1x-UserGuide.html > txt/Open1x-UserGuide.txt if [ $? -ne 0 ] then echo "Error! Build failed!" xsupplicant-1.2.1-gcc4-cleanups.patch: --- NEW FILE xsupplicant-1.2.1-gcc4-cleanups.patch --- --- xsupplicant-1.2.1/src/cardif/linux/cardif_hostap_driver.c.BAD 2005-09-03 17:50:21.000000000 -0500 +++ xsupplicant-1.2.1/src/cardif/linux/cardif_hostap_driver.c 2005-09-03 17:50:50.000000000 -0500 @@ -326,7 +326,7 @@ debug_printf(DEBUG_NORMAL, "alg=%s key_idx=%d set_tx=%d seq_len=%d key_len=%d\n", alg_name, key_idx, set_tx, seq_len, key_len); debug_printf(DEBUG_NORMAL, "KeyRSC = "); - debug_hex_printf(DEBUG_NORMAL, seq, seq_len); + debug_hex_printf(DEBUG_NORMAL, (u_char *) seq, seq_len); if (seq_len > 8) { @@ -350,7 +350,7 @@ memset(param->sta_addr, 0xff, ETH_ALEN); - strncpy(param->u.crypt.alg, alg_name, HOSTAP_CRYPT_ALG_NAME_LEN); + strncpy((char *) param->u.crypt.alg, alg_name, HOSTAP_CRYPT_ALG_NAME_LEN); param->u.crypt.flags = set_tx ? HOSTAP_CRYPT_FLAG_SET_TX_KEY : 0; param->u.crypt.idx = key_idx; memcpy(param->u.crypt.seq, seq, seq_len); --- xsupplicant-1.2.1/src/cardif/linux/cardif_linux_wext.c.BAD 2005-09-03 17:51:02.000000000 -0500 +++ xsupplicant-1.2.1/src/cardif/linux/cardif_linux_wext.c 2005-09-03 17:53:08.000000000 -0500 @@ -119,10 +119,10 @@ // We set the key index to 0x80, to force key 0 to be set to all 0s, // and to have key 0 be set as the default transmit key. - cardif_set_wep_key(thisint, (char *)&zerokey, keylen, 0x80); - cardif_set_wep_key(thisint, (char *)&zerokey, keylen, 0x01); - cardif_set_wep_key(thisint, (char *)&zerokey, keylen, 0x02); - cardif_set_wep_key(thisint, (char *)&zerokey, keylen, 0x03); + cardif_set_wep_key(thisint, (u_char *)&zerokey, keylen, 0x80); + cardif_set_wep_key(thisint, (u_char *)&zerokey, keylen, 0x01); + cardif_set_wep_key(thisint, (u_char *)&zerokey, keylen, 0x02); + cardif_set_wep_key(thisint, (u_char *)&zerokey, keylen, 0x03); } /************************************************************** @@ -947,10 +947,10 @@ if (config_ssid_get_ssid_abilities() & RSN_IE) { - cardif_linux_wext_get_wpa2_ie(intdata, wpaie, &len); + cardif_linux_wext_get_wpa2_ie(intdata, (char *) wpaie, &len); } else if (config_ssid_get_ssid_abilities() & WPA_IE) { - cardif_linux_wext_get_wpa_ie(intdata, wpaie, &len); + cardif_linux_wext_get_wpa_ie(intdata, (char *) wpaie, &len); } if (len > 0) @@ -965,11 +965,11 @@ intdata->flags |= DONTSCAN; cardif_linux_wext_set_ssid(intdata, newssid); - bssid = config_ssid_get_mac(); + bssid = (char *) config_ssid_get_mac(); if (bssid != NULL) { debug_printf(DEBUG_INT, "Dest. BSSID : "); - debug_hex_printf(DEBUG_INT, bssid, 6); + debug_hex_printf(DEBUG_INT, (u_char *) bssid, 6); } // cardif_linux_wext_set_bssid(intdata, bssid); --- xsupplicant-1.2.1/src/cardif/linux/cardif_ipw_driver.c.BAD 2005-09-03 17:54:57.000000000 -0500 +++ xsupplicant-1.2.1/src/cardif/linux/cardif_ipw_driver.c 2005-09-03 17:57:23.000000000 -0500 @@ -240,7 +240,7 @@ wpa2_gen_ie(intdata, iedata, ielen); debug_printf(DEBUG_INT, "Setting WPA2 IE : "); - debug_hex_printf(DEBUG_INT, iedata, *ielen); + debug_hex_printf(DEBUG_INT, (u_char *) iedata, *ielen); debug_printf(DEBUG_INT, "\n"); return XENONE; @@ -372,7 +372,7 @@ param = (struct ipw_param *) buf; param->cmd = IPW_CMD_SET_ENCRYPTION; memset(param->sta_addr, 0xff, 6); - strncpy(param->u.crypt.alg, alg_name, IPW_CRYPT_ALG_NAME_LEN); + strncpy((char *) param->u.crypt.alg, alg_name, IPW_CRYPT_ALG_NAME_LEN); param->u.crypt.set_tx = set_tx ? 1 : 0; param->u.crypt.idx = key_idx; memcpy(param->u.crypt.seq, seq, seq_len); @@ -422,7 +422,7 @@ { int ret; - ret = ipw_mlme(intdata->intName, intdata->source_mac, + ret = ipw_mlme(intdata->intName, (u8 *) intdata->source_mac, IPW_MLME_STA_DISASSOC, reason_code); if (ret <0) return ret; @@ -458,16 +458,16 @@ if (config_ssid_get_ssid_abilities() & RSN_IE) { - cardif_ipw_driver_get_wpa2_ie(intdata, wpaie, &len); + cardif_ipw_driver_get_wpa2_ie(intdata, (char *) wpaie, &len); } else if (config_ssid_get_ssid_abilities() & WPA_IE) { - cardif_ipw_driver_get_wpa_ie(intdata, wpaie, &len); + cardif_ipw_driver_get_wpa_ie(intdata, (char *) wpaie, &len); } // Length needs to be > 0 in order to indicate that we have an IE to set. if ((len < 255) && (len >= 0)) { - if (cardif_ipw_driver_set_wpa_ie(intdata->intName, wpaie, len) < 0) + if (cardif_ipw_driver_set_wpa_ie(intdata->intName, (char *) wpaie, len) < 0) { debug_printf(DEBUG_NORMAL, "Couldn't set WPA/RSN IE on device %s!\n", intdata->intName); --- xsupplicant-1.2.1/src/cardif/linux/cardif_linux_rtnetlink.c.BAD 2005-09-03 17:43:05.000000000 -0500 +++ xsupplicant-1.2.1/src/cardif/linux/cardif_linux_rtnetlink.c 2005-09-03 17:49:49.000000000 -0500 @@ -269,13 +269,13 @@ memcpy(&custom, &tptr[12], (iwe->len - 12)); debug_printf(DEBUG_INT, "(Custom) Value : %s\n", custom); - if (strncmp("wpa_ie=", custom, 7) == 0) + if (strncmp("wpa_ie=", (char *) custom, 7) == 0) { SET_FLAG(flags, WPA_IE); debug_printf(DEBUG_INT, "AP appears to support WPA!\n"); - temp = (char *)malloc((iwe->len - 12)/2); - process_hex(&custom[7], (iwe->len - 12-7), temp); - wpa_parse_ie(temp); + temp = (u_char *)malloc((iwe->len - 12)/2); + process_hex((char *) &custom[7], (iwe->len - 12-7), (char *) temp); + wpa_parse_ie((char *) temp); temp_wpa = temp; temp_wpa_len = ((iwe->len - 12)/2); @@ -285,13 +285,13 @@ temp = NULL; } - if (strncmp("rsn_ie=", custom, 7) == 0) + if (strncmp("rsn_ie=", (char *) custom, 7) == 0) { SET_FLAG(flags, RSN_IE); debug_printf(DEBUG_INT, "AP appears to support WPA2/802.11i!\n"); - temp = (char *)malloc((iwe->len - 12)/2); - process_hex(&custom[7], (iwe->len - 12-7), temp); - wpa2_parse_ie(temp); + temp = (u_char *)malloc((iwe->len - 12)/2); + process_hex((char *) &custom[7], (iwe->len - 12-7), (char *) temp); + wpa2_parse_ie((char *) temp); temp_rsn = temp; temp_rsn_len = ((iwe->len - 12)/2); @@ -381,10 +381,10 @@ "but the WPA_IE or RSN_IE flag(s) aren't set!?!\n"); } - if (strcmp(essid, intdata->cur_essid) == 0) + if (strcmp((char *) essid, intdata->cur_essid) == 0) { debug_printf(DEBUG_INT, "Adding this SSID data!\n"); - config_ssids_add(essid, flags, wpa_ie, wpa_ie_len, rsn_ie, + config_ssids_add((char *) essid, flags, wpa_ie, wpa_ie_len, rsn_ie, rsn_ie_len, freq, stale_mac); } @@ -440,10 +440,10 @@ } } - if (strcmp(essid, intdata->cur_essid) == 0) + if (strcmp((char *) essid, intdata->cur_essid) == 0) { debug_printf(DEBUG_INT, "Adding this SSID data!\n"); - config_ssids_add(essid, flags, wpa_ie, wpa_ie_len, rsn_ie, + config_ssids_add((char *) essid, flags, wpa_ie, wpa_ie_len, rsn_ie, rsn_ie_len, freq, mac); } @@ -490,8 +490,8 @@ // Then harvest the data. debug_printf(DEBUG_INT, "Reaping data. (Size : %d)\n", iwr.u.data.length); - cardif_linux_rtnetlink_reap(idata, (char *)buffer, - ((char *)buffer + iwr.u.data.length)); + cardif_linux_rtnetlink_reap(idata, (u_char *)buffer, + ((u_char *)buffer + iwr.u.data.length)); UNSET_FLAG(idata->flags, SCANNING); @@ -519,7 +519,7 @@ } remain = recvfrom(rtnl_sock, buf, sizeof(buf), MSG_DONTWAIT, - (struct sockaddr *)&rtnl_data, &rtnl_data_size); + (struct sockaddr *)&rtnl_data, (u_int *) &rtnl_data_size); if (remain >= 0) { // We need a pointer to the buffer to work with. @@ -927,7 +927,7 @@ case SIOCGIWAP: memcpy(mac, iwe->u.ap_addr.sa_data, 6); debug_printf(DEBUG_INT, "AP MAC : "); - debug_hex_printf(DEBUG_INT, mac, 6); + debug_hex_printf(DEBUG_INT, (u_char *) mac, 6); if (cardif_linux_rtnetlink_validate(idata, (u_char *)&mac) == 1) { // We have changed to associated mode. Populate the destination @@ -987,7 +987,7 @@ memcpy(buf, custom, iwe->u.data.length); buf[iwe->u.data.length] = '\0'; debug_printf(DEBUG_NORMAL, "Custom Data : \n"); - debug_hex_dump(DEBUG_NORMAL, buf, iwe->u.data.length); + debug_hex_dump(DEBUG_NORMAL, (u_char *) buf, iwe->u.data.length); cardif_linux_rtnetlink_check_custom(idata, buf); break; --- xsupplicant-1.2.1/src/cardif/linux/cardif_ndiswrapper_driver.c.BAD 2005-09-03 17:53:21.000000000 -0500 +++ xsupplicant-1.2.1/src/cardif/linux/cardif_ndiswrapper_driver.c 2005-09-03 17:54:27.000000000 -0500 @@ -202,11 +202,11 @@ wpa_key.addr = addr; wpa_key.key_index = key_idx; wpa_key.set_tx = set_tx; - wpa_key.seq = seq; + wpa_key.seq = (u_char *) seq; wpa_key.seq_len = seq_len; debug_printf(DEBUG_NORMAL, "SEQ : "); - debug_hex_printf(DEBUG_NORMAL, seq, seq_len); - wpa_key.key = key; + debug_hex_printf(DEBUG_NORMAL, (u_char *) seq, seq_len); + wpa_key.key = (u_char *) key; wpa_key.key_len = key_len; debug_printf(DEBUG_INT, "Setting key.. alg=%d idx=%d tx=%d seqlen=%d " @@ -304,11 +304,11 @@ bzero(&wpa_inf, sizeof(wpa_inf)); memcpy(buf, ssid, strlen(ssid)); - wpa_inf.bssid = (char *)config_ssid_get_mac(); - wpa_inf.ssid = (char *)&buf; + wpa_inf.bssid = (u_char *)config_ssid_get_mac(); + wpa_inf.ssid = (u_char *)&buf; wpa_inf.ssid_len = strlen(ssid); wpa_inf.freq = config_ssid_get_freq(); - wpa_inf.wpa_ie = (char *)&wpaie; + wpa_inf.wpa_ie = (u_char *)&wpaie; wpa_inf.wpa_ie_len = ielen; wpa_inf.pairwise_suite = network_data->wpa_pairwise_crypt; --- xsupplicant-1.2.1/src/cardif/linux/linux_core.c.BAD 2005-09-03 17:39:55.000000000 -0500 +++ xsupplicant-1.2.1/src/cardif/linux/linux_core.c 2005-09-03 17:42:28.000000000 -0500 @@ -116,11 +116,11 @@ { if (wepdata->key[keyidx] != NULL) { - klen = strlen(wepdata->key[keyidx]); + klen = strlen((char *) wepdata->key[keyidx]); if (((klen/2) == 5) || ((klen/2) == 13)) { // We have a valid length key. So, convert it, and set it. - process_hex(wepdata->key[keyidx], klen, key); + process_hex((char *) wepdata->key[keyidx], klen, key); // Calculate the proper key index. t = keyidx-1; @@ -130,9 +130,9 @@ debug_printf(DEBUG_INT, "Setting TX key! [%d]\n", wepdata->tx_key); t |= 0x80; - cardif_set_wep_key(intcur, key, (klen/2), t); + cardif_set_wep_key(intcur, (u_char *) key, (klen/2), t); } else { - cardif_set_wep_key(intcur, key, (klen/2), t); + cardif_set_wep_key(intcur, (u_char *) key, (klen/2), t); } } } --- xsupplicant-1.2.1/src/cardif/linux/cardif_linux.c.BAD 2005-09-03 17:37:20.000000000 -0500 +++ xsupplicant-1.2.1/src/cardif/linux/cardif_linux.c 2005-09-03 17:39:29.000000000 -0500 @@ -78,7 +78,7 @@ cardif_GetBSSID(intdata, curbssid); debug_printf(DEBUG_INT, "Current BSSID is "); - debug_hex_printf(DEBUG_INT, curbssid, 6); + debug_hex_printf(DEBUG_INT, (u_char *) curbssid, 6); memset(newmac, 0x00, 6); if (memcmp(newmac, curbssid, 6) == 0) @@ -463,7 +463,7 @@ { if (wireless == NULL) return -1; - return wireless->set_tkip_key(thisint, addr, keyidx, settx, seq, seqlen, + return wireless->set_tkip_key(thisint, (u_char *) addr, keyidx, settx, seq, seqlen, key, keylen); } @@ -478,7 +478,7 @@ { if (wireless == NULL) return -1; - return wireless->set_ccmp_key(thisint, addr, keyidx, settx, seq, seqlen, + return wireless->set_ccmp_key(thisint, (u_char *) addr, keyidx, settx, seq, seqlen, key, keylen); } @@ -746,7 +746,7 @@ { // Since we now know this frame is for us, record the address it // came from. - snmp_dot1xSuppLastEapolFrameSource((char *)&resultframe[6]); + snmp_dot1xSuppLastEapolFrameSource((u_char *)&resultframe[6]); resultsize = newsize; --- xsupplicant-1.2.1/src/psk.c.BAD 2005-09-03 09:24:53.000000000 -0500 +++ xsupplicant-1.2.1/src/psk.c 2005-09-03 09:25:15.000000000 -0500 @@ -50,7 +50,7 @@ // OpenSSL takes the parameters in a different order than what is // defined in F.8.2, so even though it looks wrong, this is correct. ;) HMAC(EVP_sha1(), password, strlen(password), digest, ssidlength+4, - digest1, &k); + digest1, (u_int *) &k); /* output = U1 */ memcpy(output, digest1, SHA_DIGEST_LENGTH); @@ -59,7 +59,7 @@ { /* Un = PRF(P, Un-1) */ HMAC(EVP_sha1(), password, strlen(password), digest1, SHA_DIGEST_LENGTH, - digest, &k); + digest, (u_int *) &k); memcpy(digest1, digest, k); /* output = output xor Un */ --- xsupplicant-1.2.1/src/mic.c.BAD 2005-09-03 09:24:01.000000000 -0500 +++ xsupplicant-1.2.1/src/mic.c 2005-09-03 09:24:43.000000000 -0500 @@ -44,14 +44,14 @@ { case 1: // Do an MD5 HMAC - HMAC(EVP_md5(), key, keylen, datain, insize, mic, &i); + HMAC(EVP_md5(), key, keylen, (u_char *) datain, insize, (u_char *) mic, (u_int *) &i); break; case 2: // Do an SHA1 HMAC // Since the HMAC will be 20 bytes, and we only need 16, we must use // a temporary variable. - HMAC(EVP_sha1(), key, keylen, datain, insize, (char *)&sha_hmac, &i); + HMAC(EVP_sha1(), key, keylen, (u_char *) datain, insize, (u_char *)&sha_hmac, (u_int *) &i); memcpy(mic, &sha_hmac, 16); break; } --- xsupplicant-1.2.1/src/config.h.BAD 2005-09-03 08:39:44.000000000 -0500 +++ xsupplicant-1.2.1/src/config.h 2005-09-03 08:39:53.000000000 -0500 @@ -341,6 +341,7 @@ char config_get_association(); char *config_get_logfile(); int config_get_ipc_gid(); +int config_get_stale_key_timeout(); char config_get_destination(); char *config_get_log_facility(); void config_set_forced_profile(char *); --- xsupplicant-1.2.1/src/eap.c.BAD 2005-09-03 08:34:21.000000000 -0500 +++ xsupplicant-1.2.1/src/eap.c 2005-09-03 08:38:27.000000000 -0500 @@ -191,9 +191,9 @@ switch (eap_request_auth(network_data->activemethod, network_data->methods, - &thisint->recvframe[OFFSET_TO_EAP], + (char *) &thisint->recvframe[OFFSET_TO_EAP], thisint->recv_size, - &thisint->sendframe[OFFSET_TO_EAP], &eapsize)) + (char *) &thisint->sendframe[OFFSET_TO_EAP], &eapsize)) { case XINNERSUCCESS: // We got a LEAP success, so we need to tell the state machine to @@ -231,7 +231,7 @@ if ((eapolver < 1) || (eapolver > MAX_EAPOL_VER)) eapolver = snmp_get_dot1xSuppLastEapolFrameVersion(); - eapol_build_header(EAP_PACKET, eapsize, eapolver, thisint->sendframe); + eapol_build_header(EAP_PACKET, eapsize, eapolver, (char *) thisint->sendframe); thisint->send_size = eapsize+OFFSET_TO_EAP; return XENONE; } @@ -284,7 +284,7 @@ eap_request_id(network_data->identity, eapdata->eap_identifier, - &thisint->sendframe[OFFSET_TO_EAP], &eapsize); + (char *) &thisint->sendframe[OFFSET_TO_EAP], &eapsize); eapolver = network_data->force_eapol_ver; @@ -295,7 +295,7 @@ if ((eapolver < 1) || (eapolver > MAX_EAPOL_VER)) eapolver = snmp_get_dot1xSuppLastEapolFrameVersion(); - eapol_build_header(EAP_PACKET, eapsize, eapolver, thisint->sendframe); + eapol_build_header(EAP_PACKET, eapsize, eapolver, (char *) thisint->sendframe); thisint->send_size = eapsize+OFFSET_TO_EAP; return XENONE; @@ -379,7 +379,7 @@ // We need to determine how long the string that we were returned is. // So, take the EAP length value, and subtract 5 to account for the EAP // header. - strncpy(&myval[0], &inframe[OFFSET_TO_DATA], (ntohs(myeap->eap_length)-5)); + strncpy(&myval[0], (char *) &inframe[OFFSET_TO_DATA], (ntohs(myeap->eap_length)-5)); debug_printf(DEBUG_NORMAL, "EAP Notification : %s\n", &myval[0]); bzero(thisint->recvframe, thisint->recv_size); @@ -814,8 +814,8 @@ if ((pwd_needed != 1) || (activemethod->tempPwd != NULL)) { switch ((*eaphandlers[eapmethod].eap_auth_handlers)(activemethod, - tosendframe, eapinsize, - &outframe[sizeof(struct eap_header)], + (u_char *) tosendframe, eapinsize, + (u_char *) &outframe[sizeof(struct eap_header)], eapsize)) { case XINNERSUCCESS: @@ -962,9 +962,9 @@ (*eaphandlers[eapmethod].eap_auth_get_keys)(thisint); - thisint->statemachine->PMK = thisint->keyingMaterial; + thisint->statemachine->PMK = (char *) thisint->keyingMaterial; debug_printf(DEBUG_INT, "PMK Keys (%d) :\n", thisint->keyingLength); - debug_hex_dump(DEBUG_INT, thisint->statemachine->PMK, thisint->keyingLength); + debug_hex_dump(DEBUG_INT, (u_char *) thisint->statemachine->PMK, thisint->keyingLength); debug_printf(DEBUG_INT, "WEP Keys (%d) :\n", thisint->keyingLength); debug_hex_dump(DEBUG_INT, thisint->keyingMaterial, thisint->keyingLength); --- xsupplicant-1.2.1/src/eapol_key_type2.c.BAD 2005-09-03 09:34:10.000000000 -0500 +++ xsupplicant-1.2.1/src/eapol_key_type2.c 2005-09-03 16:32:47.000000000 -0500 @@ -172,7 +172,7 @@ case 2: // XXX BROKEN! FIX! bzero(key, 16); - aes_unwrap(&intdata->statemachine->PTK[16], (keylen-8)/8, keypayload, + aes_unwrap((u_char *) &intdata->statemachine->PTK[16], (keylen-8)/8, keypayload, key); break; @@ -238,12 +238,12 @@ } debug_printf(DEBUG_INT, "PMK : "); - debug_hex_printf(DEBUG_INT, intdata->statemachine->PMK, 32); - wpa_PRF(intdata->statemachine->PMK, 32, "Pairwise key expansion", 22, - (char *)&prfdata, 76, retval, 64); + debug_hex_printf(DEBUG_INT, (u_char *) intdata->statemachine->PMK, 32); + wpa_PRF((u_char *) intdata->statemachine->PMK, 32, (u_char *) "Pairwise key expansion", 22, + (u_char *)&prfdata, 76, (u_char *) retval, 64); debug_printf(DEBUG_INT, "PTK : "); - debug_hex_printf(DEBUG_INT, retval, 64); + debug_hex_printf(DEBUG_INT, (u_char *) retval, 64); return retval; } @@ -310,10 +310,10 @@ eapolver = snmp_get_dot1xSuppLastEapolFrameVersion(); eapol_build_header(EAPOL_KEY, (intdata->send_size-OFFSET_TO_EAPOL-4), - eapolver, intdata->sendframe); + eapolver, (char *) intdata->sendframe); memcpy(key, intdata->statemachine->PTK, 16); - mic_wpa_populate(intdata->sendframe, intdata->send_size+4, key, 16); + mic_wpa_populate((char *) intdata->sendframe, intdata->send_size+4, key, 16); cardif_sendframe(intdata); intdata->statemachine->eapolEap = FALSE; @@ -394,7 +394,7 @@ bzero(rc4_ek, 32); memcpy(rc4_ek, inkeydata->key_iv, 16); memcpy(&rc4_ek[16], &intdata->statemachine->PTK[16], 16); - rc4_skip(rc4_ek, 32, 256, keydata, value16); + rc4_skip((u_char *) rc4_ek, 32, 256, keydata, value16); debug_printf(DEBUG_INT, "Decrypted data : (%d)\n", value16); debug_hex_dump(DEBUG_INT, keydata, value16); @@ -410,17 +410,17 @@ wpa_common_swap_rx_tx_mic(keydata); debug_printf(DEBUG_INT, "Setting GTK with index of %d\n", keyindex); - cardif_set_tkip_key(intdata, allfs, keyindex, FALSE, inkeydata->key_rsc, - 6, keydata, value16); + cardif_set_tkip_key(intdata, (char *) allfs, keyindex, FALSE, (char *) inkeydata->key_rsc, + 6, (char *) keydata, value16); break; case 2: // First, decrypt the GTK bzero(key, 16); - aes_unwrap(&intdata->statemachine->PTK[16], (value16-8)/8, keydata, - key); + aes_unwrap((u_char *) &intdata->statemachine->PTK[16], (value16-8)/8, keydata, + (u_char *) key); - cardif_set_ccmp_key(intdata, NULL, keyindex, FALSE, inkeydata->key_rsc, + cardif_set_ccmp_key(intdata, NULL, keyindex, FALSE, (char *) inkeydata->key_rsc, 6, key, (value16-8)); break; } @@ -446,13 +446,13 @@ eapolver = snmp_get_dot1xSuppLastEapolFrameVersion(); eapol_build_header(EAPOL_KEY, (intdata->send_size-OFFSET_TO_EAPOL-4), - eapolver, intdata->sendframe); + eapolver, (char *) intdata->sendframe); memcpy(key, intdata->statemachine->PTK, 16); - mic_wpa_populate(intdata->sendframe, intdata->send_size+4, key, 16); + mic_wpa_populate((char *) intdata->sendframe, intdata->send_size+4, key, 16); // Dump what we built. - eapol_key_type2_dump(intdata, intdata->sendframe); + eapol_key_type2_dump(intdata, (char *) intdata->sendframe); if (network_data->methods->method_num == WPA_PSK) { @@ -560,13 +560,13 @@ eapolver = snmp_get_dot1xSuppLastEapolFrameVersion(); eapol_build_header(EAPOL_KEY, (intdata->send_size-OFFSET_TO_EAPOL-4), - eapolver, intdata->sendframe); + eapolver, (char *) intdata->sendframe); memcpy(key, intdata->statemachine->PTK, 16); - mic_wpa_populate(intdata->sendframe, intdata->send_size+4, key, 16); + mic_wpa_populate((char *) intdata->sendframe, intdata->send_size+4, key, 16); // Dump what we built. - eapol_key_type2_dump(intdata, intdata->sendframe); + eapol_key_type2_dump(intdata, (char *) intdata->sendframe); } /******************************************************** @@ -596,7 +596,7 @@ memcpy(iedata, indata, len); debug_printf(DEBUG_INT, "Got an IE of : \n"); - debug_hex_dump(DEBUG_INT, iedata, len); + debug_hex_dump(DEBUG_INT, (u_char *) iedata, len); // XXX Todo : Verify the IE against the IE we have from the AP. @@ -869,20 +869,20 @@ eapolver = snmp_get_dot1xSuppLastEapolFrameVersion(); eapol_build_header(EAPOL_KEY, (intdata->send_size-OFFSET_TO_EAPOL-4), - eapolver, intdata->sendframe); + eapolver, (char *) intdata->sendframe); memcpy(key, intdata->statemachine->PTK, 16); - mic_wpa_populate(intdata->sendframe, intdata->send_size+4, key, 16); + mic_wpa_populate((char *) intdata->sendframe, intdata->send_size+4, key, 16); // Dump what we built. - eapol_key_type2_dump(intdata, intdata->sendframe); + eapol_key_type2_dump(intdata, (char *) intdata->sendframe); // Get TK1 value16 = ntohs(inkeydata->key_length); memcpy(key, (char *)&intdata->statemachine->PTK[32], value16); debug_printf(DEBUG_INT, "TK1 : "); - debug_hex_printf(DEBUG_INT, key, value16); + debug_hex_printf(DEBUG_INT, (u_char *) key, value16); cardif_sendframe(intdata); intdata->statemachine->eapolEap = FALSE; @@ -902,12 +902,12 @@ bzero(rc4_ek, 32); memcpy(rc4_ek, inkeydata->key_iv, 16); memcpy(&rc4_ek[16], &intdata->statemachine->PTK[16], 16); - rc4_skip(rc4_ek, 32, 256, keydata, keylen); + rc4_skip((u_char *) rc4_ek, 32, 256, keydata, keylen); break; case 2: aesval = (uint8_t *)malloc(keylen); - if (aes_unwrap(&intdata->statemachine->PTK[16], (keylen-8)/8, keydata, + if (aes_unwrap((u_char *) &intdata->statemachine->PTK[16], (keylen-8)/8, keydata, aesval)) { debug_printf(DEBUG_NORMAL, "Failed AES unwrap!\n"); @@ -943,13 +943,13 @@ { case 1: wpa_common_swap_rx_tx_mic(gtk); - cardif_set_tkip_key(intdata, allfs, keyindex, txkey, - inkeydata->key_rsc, RSC_LEN, gtk, value16); + cardif_set_tkip_key(intdata, (char*) allfs, keyindex, txkey, + (char *) inkeydata->key_rsc, RSC_LEN, (char *) gtk, value16); break; case 2: - cardif_set_ccmp_key(intdata, allfs, keyindex, txkey, - inkeydata->key_rsc, RSC_LEN, gtk, value16); + cardif_set_ccmp_key(intdata, (char *) allfs, keyindex, txkey, + (char *) inkeydata->key_rsc, RSC_LEN, (char *) gtk, value16); break; } @@ -973,15 +973,15 @@ case 1: // We need to swap the TX/RX MIC values since we are the supplicant. // (Thanks to Jouni Malinen for pointing this out!) - wpa_common_swap_rx_tx_mic(key); + wpa_common_swap_rx_tx_mic((u_char *) key); cardif_set_tkip_key(intdata, intdata->dest_mac, 0, TRUE, - inkeydata->key_rsc, RSC_LEN, key, value16); + (char *) inkeydata->key_rsc, RSC_LEN, key, value16); break; case 2: cardif_set_ccmp_key(intdata, intdata->dest_mac, 0, TRUE, - inkeydata->key_rsc, RSC_LEN, key, value16); + (char *) inkeydata->key_rsc, RSC_LEN, key, value16); break; } } @@ -1008,7 +1008,7 @@ if (keyflags & WPA2_KEY_MIC_FLAG) { - if (mic_wpa_validate(intdata->recvframe, intdata->recv_size, + if (mic_wpa_validate((char *) intdata->recvframe, intdata->recv_size, intdata->statemachine->PTK, 16) == FALSE) { intdata->statemachine->MICVerified = TRUE; @@ -1058,7 +1058,7 @@ eapolver = snmp_get_dot1xSuppLastEapolFrameVersion(); eapol_build_header(EAPOL_KEY, (intdata->recv_size-OFFSET_TO_EAPOL-4), - eapolver, intdata->recvframe); + eapolver, (char *) intdata->recvframe); cardif_sendframe(intdata); intdata->statemachine->eapolEap = FALSE; } @@ -1127,8 +1127,8 @@ } // We have an ASCII password, so calculate it. - if (psk_wpa_pbkdf2(psk->key, intdata->cur_essid, - strlen(intdata->cur_essid), (char *)&tpmk) + if (psk_wpa_pbkdf2(psk->key, (u_char *) intdata->cur_essid, + strlen(intdata->cur_essid), (u_char *)&tpmk) == TRUE) { intdata->statemachine->PMK = (char *)malloc(32); @@ -1168,7 +1168,7 @@ } } - eapol_key_type2_dump(intdata, inframe); + eapol_key_type2_dump(intdata, (char *) inframe); eapol_key_type2_determine_key(intdata); --- xsupplicant-1.2.1/src/eap_types/otp/eapotp.c.BAD 2005-09-03 17:26:09.000000000 -0500 +++ xsupplicant-1.2.1/src/eap_types/otp/eapotp.c 2005-09-03 17:26:47.000000000 -0500 @@ -123,7 +123,7 @@ /* debug_printf(DEBUG_NORMAL, "Response : "); gets(&resp); */ - strcpy(outframe, resp); + strcpy((char *) outframe, resp); *outsize = strlen(resp); return *outsize; --- xsupplicant-1.2.1/src/eap_types/tls/tls_funcs.c.BAD 2005-09-03 16:38:06.000000000 -0500 +++ xsupplicant-1.2.1/src/eap_types/tls/tls_funcs.c 2005-09-03 16:42:46.000000000 -0500 @@ -445,7 +445,7 @@ } debug_printf(DEBUG_AUTHTYPES, "Packet in (%d) :\n", insize); - debug_hex_dump(DEBUG_AUTHTYPES, inframe, insize); + debug_hex_dump(DEBUG_AUTHTYPES, (u_char *) inframe, insize); // First, make sure we don't have any errors. err = ERR_get_error(); @@ -563,7 +563,7 @@ if ((mytls_vars->resuming != 1) || (mytls_vars->quickResponse != TRUE)) { - if (((*dophase2)(thisint, tlsptr, (insize-tlsindex), outframe, + if (((*dophase2)(thisint, (u_char *) tlsptr, (insize-tlsindex), outframe, outsize)) != XENONE) { debug_printf(DEBUG_NORMAL, "Phase 2 failure!\n"); @@ -578,7 +578,7 @@ } } } else { - rtnVal = tls_funcs_parse(thisint, tlsptr, (insize-tlsindex), outframe, outsize, chunksize); + rtnVal = tls_funcs_parse(thisint, (u_char *) tlsptr, (insize-tlsindex), outframe, outsize, chunksize); if (rtnVal < 0) { debug_printf(DEBUG_NORMAL, "Couldn't parse TLS data.\n"); @@ -642,7 +642,7 @@ if ((mytls_vars->resuming != 1) || (mytls_vars->quickResponse != TRUE)) { - if ((*dophase2)(thisint, tlsptr, (insize-tlsindex), + if ((*dophase2)(thisint, (u_char *) tlsptr, (insize-tlsindex), outframe, outsize) != XENONE) { debug_printf(DEBUG_NORMAL, "Phase 2 Failure.\n"); @@ -1083,32 +1083,32 @@ /* P_MD5 */ hash = EVP_md5(); /* Initialize A_MD5 */ - HMAC(hash, S1, L_S1, P_seed, P_seed_len, A_MD5, &hashed_len); + HMAC(hash, S1, L_S1, P_seed, P_seed_len, A_MD5, (u_int *) &hashed_len); for (i = 0; i < MD5_iterations; i++) { HMAC_Init(&ctx, S1, L_S1, hash); HMAC_Update(&ctx, A_MD5, MD5_DIGEST_LENGTH); HMAC_Update(&ctx, P_seed, P_seed_len); - HMAC_Final(&ctx, P_MD5_buf + i*(MD5_DIGEST_LENGTH), &hashed_len); + HMAC_Final(&ctx, P_MD5_buf + i*(MD5_DIGEST_LENGTH), (u_int *) &hashed_len); HMAC_cleanup(&ctx); HMAC(hash, S1, L_S1, A_MD5, MD5_DIGEST_LENGTH, - A_MD5, &hashed_len); + A_MD5, (u_int *) &hashed_len); } /* do P_SHA1 */ hash = EVP_sha1(); /* Initialize A_SHA1 */ - HMAC(hash, S2, L_S2, P_seed, P_seed_len, A_SHA1, &hashed_len); + HMAC(hash, S2, L_S2, P_seed, P_seed_len, A_SHA1, (u_int *) &hashed_len); for (i = 0; i < SHA1_iterations; i++) { HMAC_Init(&ctx, S2, L_S2, hash); HMAC_Update(&ctx, A_SHA1, SHA_DIGEST_LENGTH); HMAC_Update(&ctx, P_seed, P_seed_len); - HMAC_Final(&ctx, P_SHA1_buf + i*(SHA_DIGEST_LENGTH), &hashed_len); + HMAC_Final(&ctx, P_SHA1_buf + i*(SHA_DIGEST_LENGTH), (u_int *) &hashed_len); HMAC_cleanup(&ctx); HMAC(hash, S2, L_S2, A_SHA1, SHA_DIGEST_LENGTH, - A_SHA1, &hashed_len); + A_SHA1, (u_int *) &hashed_len); } /* XOR Them for the answer */ for (i = 0; i < outlen; i++) { --- xsupplicant-1.2.1/src/eap_types/tls/tls_crypt.c.BAD 2005-09-03 16:58:16.000000000 -0500 +++ xsupplicant-1.2.1/src/eap_types/tls/tls_crypt.c 2005-09-03 16:58:35.000000000 -0500 @@ -72,7 +72,7 @@ memcpy(p, mytls_vars->ssl->s3->server_random, SSL3_RANDOM_SIZE); tls_funcs_PRF(SSL_get_session(mytls_vars->ssl)->master_key, SSL_get_session(mytls_vars->ssl)->master_key_length, - sesskey, sesskeylen, seed, + (u_char *) sesskey, sesskeylen, seed, SSL3_RANDOM_SIZE * 2, retblock, TLS_SESSION_KEY_SIZE); --- xsupplicant-1.2.1/src/eap_types/tls/eaptls.c.BAD 2005-09-03 16:33:36.000000000 -0500 +++ xsupplicant-1.2.1/src/eap_types/tls/eaptls.c 2005-09-03 16:36:48.000000000 -0500 @@ -192,7 +192,7 @@ // Make sure we have something to process... if (dataoffs == NULL) return XENONE; - retVal=tls_funcs_decode_packet(thisint, dataoffs, insize, outframe, outsize, + retVal=tls_funcs_decode_packet(thisint, (char *) dataoffs, insize, (char *) outframe, outsize, NULL, userdata->chunk_size); return retVal; @@ -222,7 +222,7 @@ free(thisint->keyingMaterial); } - thisint->keyingMaterial = tls_funcs_gen_keyblock(network_data->activemethod); + thisint->keyingMaterial = (u_char *) tls_funcs_gen_keyblock(network_data->activemethod); thisint->keyingLength = 32; if (thisint->keyingMaterial == NULL) return -1; --- xsupplicant-1.2.1/src/eap_types/peap/eappeap.c.BAD 2005-09-03 17:16:00.000000000 -0500 +++ xsupplicant-1.2.1/src/eap_types/peap/eappeap.c 2005-09-03 17:16:47.000000000 -0500 @@ -239,7 +239,7 @@ set_peap_version(p2d, peap_version); // Tell PEAP what version we want to use. dataoffs[0] = ((uint8_t)dataoffs[0] & 0xfc); // Mask out the version bits. - if (tls_funcs_decode_packet(thisint, dataoffs, insize, outframe, outsize, + if (tls_funcs_decode_packet(thisint, (char *) dataoffs, insize, (char *) outframe, outsize, (phase2_call)peap_do_phase2, userdata->chunk_size) != XENONE) { @@ -335,7 +335,7 @@ { free(thisint->keyingMaterial); } - thisint->keyingMaterial = tls_funcs_gen_keyblock(network_data->activemethod); + thisint->keyingMaterial = (u_char *) tls_funcs_gen_keyblock(network_data->activemethod); thisint->keyingLength = 32; if (thisint->keyingMaterial == NULL) return -1; --- xsupplicant-1.2.1/src/eap_types/peap/peap_phase2.c.BAD 2005-09-03 17:17:38.000000000 -0500 +++ xsupplicant-1.2.1/src/eap_types/peap/peap_phase2.c 2005-09-03 17:21:23.000000000 -0500 @@ -160,7 +160,7 @@ switch ((uint8_t)eapvalue) { case EAP_REQUEST: - eap_request_id(thisint->eapdata->identity, eapid, out, out_size); + eap_request_id(thisint->eapdata->identity, eapid, (char *) out, out_size); break; case EAP_SUCCESS: @@ -192,7 +192,7 @@ return; } eap_request_auth(thisint->activemethod, thisint->eapdata->eap_conf_data, - in, in_size, out, out_size); + (char *) in, in_size, (char *) out, out_size); break; } free(new_frame); @@ -249,7 +249,7 @@ if (eframe != 1) { - peap_pad_frame(in, in_size, padded_frame, &padded_size); + peap_pad_frame(in, in_size, (u_char *) padded_frame, &padded_size); } new_frame = (char *)malloc(1024); @@ -259,12 +259,12 @@ return; } - do_peap_version1(thisint, padded_frame, padded_size, new_frame, + do_peap_version1(thisint, (u_char *) padded_frame, padded_size, (u_char *) new_frame, &new_frame_size); free(padded_frame); if (eframe !=1) { - peap_unpad_frame(new_frame, new_frame_size, out, out_size); + peap_unpad_frame((u_char *) new_frame, new_frame_size, out, out_size); } else { memcpy(out, new_frame, new_frame_size); *out_size = new_frame_size; @@ -330,14 +330,14 @@ p2d->eapdata->identity = peapconf->identity; p2d->eapdata->ias_quirk = peapconf->ias_quirk; - decr_data = (char *)malloc(1550); + decr_data = (u_char *)malloc(1550); if (decr_data == NULL) { debug_printf(DEBUG_NORMAL, "Couldn't allocate memory for decryption buffer!\n"); return XEMALLOC; } - encr_data = (char *)malloc(1550); + encr_data = (u_char *)malloc(1550); if (encr_data == NULL) { debug_printf(DEBUG_NORMAL, "Couldn't allocate memory for encryption buffer!\n"); --- xsupplicant-1.2.1/src/eap_types/mschapv2/eapmschapv2.c.BAD 2005-09-03 17:09:07.000000000 -0500 +++ xsupplicant-1.2.1/src/eap_types/mschapv2/eapmschapv2.c 2005-09-03 17:15:29.000000000 -0500 @@ -153,13 +153,13 @@ myvars->AuthenticatorChallenge = NULL; } - myvars->AuthenticatorChallenge = (u_char *)malloc(16); + myvars->AuthenticatorChallenge = (char *)malloc(16); if (myvars->AuthenticatorChallenge == NULL) return XEMALLOC; memcpy(myvars->AuthenticatorChallenge, &challenge->Challenge, 16); debug_printf(DEBUG_AUTHTYPES, "Authenticator Challenge : "); - debug_hex_printf(DEBUG_AUTHTYPES, myvars->AuthenticatorChallenge, 16); + debug_hex_printf(DEBUG_AUTHTYPES, (u_char *) myvars->AuthenticatorChallenge, 16); if (myvars->PeerChallenge != NULL) { @@ -168,13 +168,13 @@ } // Ignore the RADIUS host, we probably don't care. - myvars->PeerChallenge = (u_char *)malloc(16); + myvars->PeerChallenge = (char *)malloc(16); if (myvars->PeerChallenge == NULL) return XEMALLOC; - RAND_bytes(myvars->PeerChallenge, 16); + RAND_bytes((u_char *) myvars->PeerChallenge, 16); debug_printf(DEBUG_AUTHTYPES, "Generated PeerChallenge : "); - debug_hex_printf(DEBUG_AUTHTYPES, myvars->PeerChallenge,16); + debug_hex_printf(DEBUG_AUTHTYPES, (u_char *) myvars->PeerChallenge,16); if (myvars->NtResponse != NULL) { @@ -182,14 +182,14 @@ myvars->NtResponse = NULL; } - myvars->NtResponse = (u_char *)malloc(24); + myvars->NtResponse = (char *)malloc(24); if (myvars->NtResponse == NULL) return XEMALLOC; GenerateNTResponse(myvars->AuthenticatorChallenge, myvars->PeerChallenge, username, userdata->password, myvars->NtResponse); debug_printf(DEBUG_AUTHTYPES, "myvars->NtResponse = "); - debug_hex_printf(DEBUG_AUTHTYPES, myvars->NtResponse, 24); + debug_hex_printf(DEBUG_AUTHTYPES, (u_char *) myvars->NtResponse, 24); response->OpCode = MS_CHAPV2_RESPONSE; response->MS_CHAPv2_ID = challenge->MS_CHAPv2_ID; @@ -219,7 +219,7 @@ CheckAuthenticatorResponse(userdata->password, myvars->NtResponse, myvars->PeerChallenge, myvars->AuthenticatorChallenge, - username, (u_char *)&recv[0], &respOk); + username, (char *)&recv[0], &respOk); if (respOk == 1) { @@ -227,15 +227,15 @@ outframe[0] = MS_CHAPV2_SUCCESS; // We were successful, so generate keying material. - NtPasswordHash(userdata->password, (u_char *)&NtHash); - HashNtPasswordHash((u_char *)&NtHash, (u_char *)&NtHashHash); - GetMasterKey((u_char *)&NtHashHash, myvars->NtResponse, (u_char *)&MasterKey); + NtPasswordHash(userdata->password, (char *)&NtHash); + HashNtPasswordHash((char *)&NtHash, (char *)&NtHashHash); + GetMasterKey((char *)&NtHashHash, myvars->NtResponse, (char *)&MasterKey); // Now, get the send key. - GetAsymetricStartKey((u_char *)&MasterKey, (u_char *)&mppeSend, 16, TRUE, FALSE); + GetAsymetricStartKey((char *)&MasterKey, (char *)&mppeSend, 16, TRUE, FALSE); // And the recv key. - GetAsymetricStartKey((u_char *)&MasterKey, (u_char *)&mppeRecv, 16, FALSE, FALSE); + GetAsymetricStartKey((char *)&MasterKey, (char *)&mppeRecv, 16, FALSE, FALSE); // Finally, populate our myvars->keyingMaterial. if (myvars->keyingMaterial != NULL) @@ -243,7 +243,7 @@ free(myvars->keyingMaterial); myvars->keyingMaterial = NULL; } - myvars->keyingMaterial = (u_char *)malloc(64); // 32 bytes each. + myvars->keyingMaterial = (char *)malloc(64); // 32 bytes each. if (myvars->keyingMaterial == NULL) return XEMALLOC; bzero(myvars->keyingMaterial, 64); @@ -294,7 +294,7 @@ free(thisint->keyingMaterial); } - thisint->keyingMaterial = (char *)malloc(64); + thisint->keyingMaterial = (u_char *)malloc(64); if (thisint->keyingMaterial == NULL) return -1; memcpy(thisint->keyingMaterial, myconf->keyingMaterial, 64); --- xsupplicant-1.2.1/src/eap_types/mschapv2/mschapv2.c.BAD 2005-09-03 17:01:58.000000000 -0500 +++ xsupplicant-1.2.1/src/eap_types/mschapv2/mschapv2.c 2005-09-03 17:04:49.000000000 -0500 @@ -46,7 +46,7 @@ EVP_DigestUpdate(&cntx, PeerChallenge, 16); EVP_DigestUpdate(&cntx, AuthenticatorChallenge, 16); EVP_DigestUpdate(&cntx, UserName, strlen(UserName)); - EVP_DigestFinal(&cntx, (char *)&Digest, &retLen); + EVP_DigestFinal(&cntx, (u_char *)&Digest, (u_int *) &retLen); memcpy(Challenge, Digest, 8); } @@ -96,7 +96,7 @@ EVP_DigestInit(&cntx, EVP_md4()); EVP_DigestUpdate(&cntx, uniPassword, len); - EVP_DigestFinal(&cntx, (char *)&retVal, (int *)&i); + EVP_DigestFinal(&cntx, (u_char *)&retVal, (u_int *)&i); memcpy(PasswordHash, &retVal, 16); free(uniPassword); } @@ -114,7 +114,7 @@ EVP_DigestInit(&cntx, EVP_md4()); EVP_DigestUpdate(&cntx, PasswordHash, 16); - EVP_DigestFinal(&cntx, PasswordHashHash, &i); + EVP_DigestFinal(&cntx, (u_char *) PasswordHashHash, (u_int *) &i); } // Shamelessly take from the hostap code written by Jouni Malinen @@ -231,7 +231,7 @@ EVP_DigestUpdate(&context, &PasswordHashHash, 16); EVP_DigestUpdate(&context, NTResponse, 24); EVP_DigestUpdate(&context, Magic1, 39); - EVP_DigestFinal(&context, (char *)&Digest, &Digest_len); + EVP_DigestFinal(&context, (u_char *)&Digest, (u_int *) &Digest_len); ChallengeHash(PeerChallenge, AuthenticatorChallenge, UserName, Challenge); @@ -239,7 +239,7 @@ EVP_DigestUpdate(&context, &Digest, 20); EVP_DigestUpdate(&context, &Challenge, 8); EVP_DigestUpdate(&context, Magic2, 41); - EVP_DigestFinal(&context, (char *)&Digest, &Digest_len); + EVP_DigestFinal(&context, (u_char *)&Digest, (u_int *) &Digest_len); memcpy(AuthenticatorResponse, &Digest, Digest_len); } @@ -287,12 +287,12 @@ return; } - des_encrypt(Challenge, PasswordHash, Response); - des_encrypt(Challenge, PasswordHash + 7, Response+8); + des_encrypt((uint8_t *) Challenge, (uint8_t *) PasswordHash, (uint8_t *) Response); + des_encrypt((uint8_t *) Challenge, (uint8_t *) PasswordHash + 7, (uint8_t *) Response+8); zpwd[0] = PasswordHash[14]; zpwd[1] = PasswordHash[15]; memset(zpwd + 2, 0, 5); - des_encrypt(Challenge, zpwd, Response+16); + des_encrypt((uint8_t *) Challenge, zpwd, (uint8_t *) Response+16); } void NtChallengeResponse(char *Challenge, char *Password, char *Response) @@ -323,18 +323,18 @@ ChallengeHash(PeerChallenge, AuthenticatorChallenge, UserName, (char *)&Challenge); debug_printf(DEBUG_AUTHTYPES, "PeerChallenge : "); - debug_hex_printf(DEBUG_AUTHTYPES, PeerChallenge, 8); + debug_hex_printf(DEBUG_AUTHTYPES, (u_char *) PeerChallenge, 8); debug_printf(DEBUG_AUTHTYPES, "AuthenticatorChallenge : "); - debug_hex_printf(DEBUG_AUTHTYPES, AuthenticatorChallenge, 8); + debug_hex_printf(DEBUG_AUTHTYPES, (u_char *) AuthenticatorChallenge, 8); debug_printf(DEBUG_AUTHTYPES, "Username : %s\n",UserName); debug_printf(DEBUG_AUTHTYPES, "Challenge : "); - debug_hex_printf(DEBUG_AUTHTYPES, Challenge, 8); + debug_hex_printf(DEBUG_AUTHTYPES, (u_char *) Challenge, 8); NtPasswordHash(Password, (char *)&PasswordHash); debug_printf(DEBUG_AUTHTYPES, "PasswordHash : "); - debug_hex_printf(DEBUG_AUTHTYPES, PasswordHash, 16); + debug_hex_printf(DEBUG_AUTHTYPES, (u_char *) PasswordHash, 16); ChallengeResponse(Challenge, (char *)&PasswordHash, Response); debug_printf(DEBUG_AUTHTYPES, "Response : "); - debug_hex_printf(DEBUG_AUTHTYPES, Response, 24); + debug_hex_printf(DEBUG_AUTHTYPES, (u_char *) Response, 24); } void GetMasterKey(char *PasswordHashHash, char *NTResponse, char *MasterKey) @@ -360,7 +360,7 @@ EVP_DigestUpdate(&cntx, PasswordHashHash, 16); EVP_DigestUpdate(&cntx, NTResponse, 24); EVP_DigestUpdate(&cntx, (char *)&Magic1, 27); - EVP_DigestFinal(&cntx, (char *)&Digest, &retLen); + EVP_DigestFinal(&cntx, (u_char *)&Digest, (u_int *) &retLen); memcpy(MasterKey, &Digest, 16); } @@ -386,7 +386,7 @@ EVP_DigestUpdate(&cntx, APR, 24); EVP_DigestUpdate(&cntx, PC, 8); EVP_DigestUpdate(&cntx, PR, 24); - EVP_DigestFinal(&cntx, (char *)&Digest, &retLen); + EVP_DigestFinal(&cntx, (u_char *)&Digest, (u_int *) &retLen); memcpy(MasterKey, &Digest, 16); @@ -461,7 +461,7 @@ EVP_DigestUpdate(&cntx, SHSpad1, 40); EVP_DigestUpdate(&cntx, (char *)&Magic, 84); EVP_DigestUpdate(&cntx, SHSpad2, 40); - EVP_DigestFinal(&cntx, (char *)&Digest, &retLen); + EVP_DigestFinal(&cntx, (u_char *)&Digest, (u_int *)&retLen); memcpy(SessionKey, &Digest, SessionKeyLength); } --- xsupplicant-1.2.1/src/eap_types/ttls/eapttls.c.BAD 2005-09-03 16:43:18.000000000 -0500 +++ xsupplicant-1.2.1/src/eap_types/ttls/eapttls.c 2005-09-03 16:44:20.000000000 -0500 @@ -215,7 +215,7 @@ // Make sure we have a valid packet to process. if (dataoffs == NULL) return XENONE; - result=tls_funcs_decode_packet(thisint, dataoffs, insize, outframe, outsize, + result=tls_funcs_decode_packet(thisint, (char *) dataoffs, insize, (char *) outframe, outsize, (phase2_call)ttls_do_phase2, userdata->chunk_size); if (result != 0) @@ -250,7 +250,7 @@ free(thisint->keyingMaterial); } - thisint->keyingMaterial = tls_funcs_gen_keyblock(network_data->activemethod); + thisint->keyingMaterial = (u_char *) tls_funcs_gen_keyblock(network_data->activemethod); thisint->keyingLength = 32; if (thisint->keyingMaterial == NULL) return -1; --- xsupplicant-1.2.1/src/eap_types/ttls/ttlsphase2.c.BAD 2005-09-03 16:45:26.000000000 -0500 +++ xsupplicant-1.2.1/src/eap_types/ttls/ttlsphase2.c 2005-09-03 16:57:41.000000000 -0500 @@ -184,7 +184,7 @@ username_size = strlen(username); // Send the Username AVP - build_avp(USER_NAME_AVP, 0, MANDITORY_FLAG, username, username_size, out_data, &avp_out_size); + build_avp(USER_NAME_AVP, 0, MANDITORY_FLAG, (uint8_t *) username, username_size, (uint8_t *) out_data, &avp_out_size); avp_offset = avp_out_size; @@ -200,7 +200,7 @@ id = challenge[16]; // Send the MS-CHAP AVP - build_avp(MS_CHAP_CHALLENGE, MS_VENDOR_ATTR, (MANDITORY_FLAG | VENDOR_FLAG), (char *)&mschap_challenge, 16, &out_data[avp_offset], &avp_out_size); + build_avp(MS_CHAP_CHALLENGE, MS_VENDOR_ATTR, (MANDITORY_FLAG | VENDOR_FLAG), (uint8_t *) &mschap_challenge, 16, (uint8_t *) &out_data[avp_offset], &avp_out_size); avp_offset+=avp_out_size; @@ -217,7 +217,7 @@ memcpy(&mschap_answer[2], &mschap_challenge, 16); memcpy(&mschap_answer[26], &mschap_result, 24); - build_avp(MS_CHAP2_RESPONSE, MS_VENDOR_ATTR, (MANDITORY_FLAG | VENDOR_FLAG), (char *)&mschap_answer, 50, &out_data[avp_offset], &avp_out_size); + build_avp(MS_CHAP2_RESPONSE, MS_VENDOR_ATTR, (MANDITORY_FLAG | VENDOR_FLAG), (uint8_t *) &mschap_answer, 50, (uint8_t *) &out_data[avp_offset], &avp_out_size); avp_offset+=avp_out_size; *out_size = avp_offset; } @@ -283,7 +283,7 @@ username_size = strlen(username); // Send the Username AVP - build_avp(USER_NAME_AVP, 0, MANDITORY_FLAG, username, username_size, out_data, &avp_out_size); + build_avp(USER_NAME_AVP, 0, MANDITORY_FLAG, (uint8_t *) username, username_size, (uint8_t *) out_data, &avp_out_size); avp_offset = avp_out_size; @@ -299,7 +299,7 @@ id = challenge[8]; // Send the MS-CHAP AVP - build_avp(MS_CHAP_CHALLENGE, MS_VENDOR_ATTR, (MANDITORY_FLAG | VENDOR_FLAG), (char *)&mschap_challenge, 8, &out_data[avp_offset], &avp_out_size); + build_avp(MS_CHAP_CHALLENGE, MS_VENDOR_ATTR, (MANDITORY_FLAG | VENDOR_FLAG), (uint8_t *) &mschap_challenge, 8, (uint8_t *) &out_data[avp_offset], &avp_out_size); avp_offset+=avp_out_size; @@ -313,7 +313,7 @@ mschap_answer[1] = 1; // Use NT Style Passwords. memcpy((char *)&mschap_answer[26], (char *)&mschap_result, 24); - build_avp(MS_CHAP_RESPONSE, MS_VENDOR_ATTR, (MANDITORY_FLAG | VENDOR_FLAG), (char *)&mschap_answer, 50, &out_data[avp_offset], &avp_out_size); + build_avp(MS_CHAP_RESPONSE, MS_VENDOR_ATTR, (MANDITORY_FLAG | VENDOR_FLAG), (uint8_t *) &mschap_answer, 50, (uint8_t *) &out_data[avp_offset], &avp_out_size); avp_offset+=avp_out_size; *out_size = avp_offset; @@ -386,12 +386,12 @@ username = phase2data->username; } username_size = strlen(username); - build_avp(USER_NAME_AVP, 0, MANDITORY_FLAG, username, username_size, out_data, &avp_out_size); + build_avp(USER_NAME_AVP, 0, MANDITORY_FLAG, (uint8_t *) username, username_size, (uint8_t *) out_data, &avp_out_size); avp_offset = avp_out_size; // Get the implicit challenge. - challenge = implicit_challenge(thisint); + challenge = (u_char *) implicit_challenge(thisint); if (challenge == NULL) { debug_printf(DEBUG_NORMAL, "Invalid implicit challenge in ttls_do_chap()!\n"); @@ -409,9 +409,9 @@ return; } - user_passwd = phase2data->password; + user_passwd = (u_char *) phase2data->password; - tohash = (char *)malloc(1+16+strlen(user_passwd)); + tohash = (u_char *)malloc(1+16+strlen((char *) user_passwd)); if (tohash == NULL) { debug_printf(DEBUG_NORMAL, "Error with malloc of \"tohash\" in ttls_do_chap().\n"); @@ -419,13 +419,13 @@ } tohash[0] = session_id; - memcpy(&tohash[1], user_passwd, strlen(user_passwd)); - memcpy(&tohash[1+strlen(user_passwd)], &chap_challenge, 16); - hashlen = 1+strlen(user_passwd)+16; + memcpy(&tohash[1], user_passwd, strlen((char *) user_passwd)); + memcpy(&tohash[1+strlen((char *) user_passwd)], &chap_challenge, 16); + hashlen = 1+strlen((char *) user_passwd)+16; EVP_DigestInit(ctx, EVP_md5()); EVP_DigestUpdate(ctx, tohash, hashlen); - EVP_DigestFinal(ctx, (char *)&chap_hash[1], (int *)&md5_length); + EVP_DigestFinal(ctx, (u_char *)&chap_hash[1], (u_int *)&md5_length); if (md5_length != 16) // We didn't get back a valid hash! { @@ -433,11 +433,11 @@ } chap_hash[0]=session_id; - build_avp(CHAP_PASSWORD_AVP, 0, MANDITORY_FLAG, chap_hash, 17, &out_data[avp_offset], &avp_out_size); + build_avp(CHAP_PASSWORD_AVP, 0, MANDITORY_FLAG, chap_hash, 17, (uint8_t *) &out_data[avp_offset], &avp_out_size); avp_offset += avp_out_size; - build_avp(CHAP_CHALLENGE_AVP, 0, MANDITORY_FLAG, (char *)&chap_challenge, 16, &out_data[avp_offset], &avp_out_size); + build_avp(CHAP_CHALLENGE_AVP, 0, MANDITORY_FLAG, (uint8_t *) &chap_challenge, 16, (uint8_t *) &out_data[avp_offset], &avp_out_size); if (tohash != NULL) { @@ -518,8 +518,8 @@ avp_offset = 0; - build_avp(USER_NAME_AVP, 0, MANDITORY_FLAG, username, - strlen(username), out_data, &avp_out_size); + build_avp(USER_NAME_AVP, 0, MANDITORY_FLAG, (uint8_t *) username, + strlen(username), (uint8_t *) out_data, &avp_out_size); avp_offset += avp_out_size; @@ -537,7 +537,7 @@ bzero(tempbuf, passwd_size); memcpy(tempbuf, phase2data->password, strlen(phase2data->password)); - build_avp(USER_PASSWORD_AVP, 0, MANDITORY_FLAG, tempbuf, passwd_size, &out_data[avp_offset], &avp_out_size); + build_avp(USER_PASSWORD_AVP, 0, MANDITORY_FLAG, (uint8_t *) tempbuf, passwd_size, (uint8_t *) &out_data[avp_offset], &avp_out_size); *out_size = avp_offset + avp_out_size; @@ -548,7 +548,7 @@ } debug_printf(DEBUG_AUTHTYPES, "Returning from do_pap :\n"); - debug_hex_dump(DEBUG_AUTHTYPES, out_data, *out_size); + debug_hex_dump(DEBUG_AUTHTYPES, (u_char *) out_data, *out_size); } // We don't do anything with the "in" stuff for now.. @@ -567,7 +567,7 @@ } debug_printf(DEBUG_AUTHTYPES, "Encrypted Inner (%d) : \n", in_size); - debug_hex_dump(DEBUG_AUTHTYPES, in, in_size); + debug_hex_dump(DEBUG_AUTHTYPES, (u_char *) in, in_size); userdata = (struct config_eap_ttls *)thisint->eap_conf_data; @@ -597,10 +597,10 @@ if ((in_size > 0) && (in[0] != 0x14)) { // We have something to decrypt! - tls_crypt_decrypt(thisint, in, in_size, decr_data, &decrsize); + tls_crypt_decrypt(thisint, (u_char *) in, in_size, (u_char *) decr_data, &decrsize); debug_printf(DEBUG_AUTHTYPES, "Decrypted Inner (%d) : \n", in_size); - debug_hex_dump(DEBUG_AUTHTYPES, decr_data, decrsize); + debug_hex_dump(DEBUG_AUTHTYPES, (u_char *) decr_data, decrsize); if (decr_data[0] == 0x00) { @@ -638,11 +638,11 @@ return XENONE; } - tls_crypt_encrypt_nolen(thisint, toencout, toencsize, out, out_size); + tls_crypt_encrypt_nolen(thisint, (u_char *) toencout, toencsize, (u_char *) out, out_size); free(toencout); debug_printf(DEBUG_AUTHTYPES, "Returning from (TTLS) do_phase2 : \n"); - debug_hex_dump(DEBUG_AUTHTYPES, out, *out_size); + debug_hex_dump(DEBUG_AUTHTYPES, (u_char *) out, *out_size); return XENONE; } --- xsupplicant-1.2.1/src/eap_types/leap/eapleap.c.BAD 2005-09-03 17:22:01.000000000 -0500 +++ xsupplicant-1.2.1/src/eap_types/leap/eapleap.c 2005-09-03 17:25:57.000000000 -0500 @@ -50,7 +50,7 @@ unicodePass[2 * i + 1] = 0; } /* Encrypt plain text password to a 16-byte MD4 hash */ - md4_calc(MD4Hash, unicodePass, passLen * 2); + md4_calc(MD4Hash, (u_char *) unicodePass, passLen * 2); } void leap_mschap(char * password, char * response) { @@ -64,7 +64,7 @@ ntPwdHash(MD4Hash, password); md4_calc(MD4HashHash, MD4Hash, 16); - ChallengeResponse(leapchallenges->apc, MD4HashHash, response); + ChallengeResponse((char *) leapchallenges->apc, (char *) MD4HashHash, response); } @@ -199,7 +199,7 @@ // LEAP shouldn't be used as an inner type, so we should be able to get // away with this. - data = dataoffs-5; + data = (char *) dataoffs-5; eapheader = (struct eap_header *)data; switch (eapheader->eap_code) { @@ -279,7 +279,7 @@ memset(chall_response, 0x0, 8); NtChallengeResponse((char *)leaprequest->randval, userdata->password, (char *)&chall_response); - GenerateNTResponse((char *)leapchallenges->pr, (char *)leapchallenges->pc, username, userdata->password, chall_response); + GenerateNTResponse((char *)leapchallenges->pr, (char *)leapchallenges->pc, username, userdata->password, (char *) chall_response); // store Access Point Challenge memcpy((uint8_t *)leapchallenges->apc, (char *)chall_response, 8); @@ -337,7 +337,7 @@ leapresponse = (struct leap_responses *)dataoffs; - challenge_response_got = (char *)malloc(leapresponse->count+1); + challenge_response_got = (u_char *)malloc(leapresponse->count+1); if (!challenge_response_got) { debug_printf(DEBUG_NORMAL, "(EAP-LEAP) challenge_response_got is NULL after malloc!\n"); } @@ -350,7 +350,7 @@ memset(challenge_response_expected, 0x0, 24); // Calculate the 24 bytes MS-CHAP Challenge Response - leap_mschap(userdata->password, challenge_response_expected); + leap_mschap(userdata->password, (char *) challenge_response_expected); if (memcmp(challenge_response_got, challenge_response_expected, 24) == 0) { debug_printf(DEBUG_AUTHTYPES, "(EAP-LEAP) AP ChallengeResponse got is valid.\n"); @@ -386,7 +386,7 @@ debug_printf(DEBUG_AUTHTYPES, "(EAP-LEAP) leapchallenges->apr : "); debug_hex_printf(DEBUG_AUTHTYPES, (uint8_t *)leapchallenges->apr, 24); - GetMasterLEAPKey((char *)MD4HashHash, leapchallenges->apc, leapchallenges->apr, leapchallenges->pc, leapchallenges->pr, (char *)&MasterKey); + GetMasterLEAPKey((char *)MD4HashHash, (char *) leapchallenges->apc, (char *) leapchallenges->apr, (char *) leapchallenges->pc, (char *) leapchallenges->pr, (char *)&MasterKey); debug_printf(DEBUG_AUTHTYPES, "MasterLEAPKey : "); debug_hex_printf(DEBUG_AUTHTYPES, (unsigned char *)&MasterKey, 16); @@ -444,7 +444,7 @@ mydata = (struct leap_data *)network_data->activemethod->eap_data; // Right now, we don't return anything from LEAP. - thisint->keyingMaterial = mydata->keyingMaterial; + thisint->keyingMaterial = (u_char *) mydata->keyingMaterial; thisint->keyingLength = 16; // We only use 16 bytes for this keying material! return 0; --- xsupplicant-1.2.1/src/wpa_common.c.BAD 2005-09-03 08:42:16.000000000 -0500 +++ xsupplicant-1.2.1/src/wpa_common.c 2005-09-03 08:42:30.000000000 -0500 @@ -201,7 +201,7 @@ // This is a little different than the reference implementation, // because OpenSSL takes parameters in a different order. HMAC(EVP_sha1(), key, key_len, input, total_len, &output[currentindex], - &k); + (u_int *) &k); currentindex += 20; input[total_len-1]++; } --- xsupplicant-1.2.1/src/eapol_key_type1.c.BAD 2005-09-03 08:40:11.000000000 -0500 +++ xsupplicant-1.2.1/src/eapol_key_type1.c 2005-09-03 08:41:54.000000000 -0500 @@ -107,7 +107,7 @@ if (calchmac == NULL) return XEMALLOC; HMAC(EVP_md5(), thisint->keyingMaterial+32, - thisint->keyingLength, framecpy, framesize, calchmac, &outlen); + thisint->keyingLength, (u_char *) framecpy, framesize, (u_char *) calchmac, (u_int *) &outlen); // Now, we need to compare the calculated HMAC to the one sent to us. keydata = (struct key_packet *)&inframe[4]; --- xsupplicant-1.2.1/src/eapol.c.BAD 2005-09-03 08:30:37.000000000 -0500 +++ xsupplicant-1.2.1/src/eapol.c 2005-09-03 08:30:45.000000000 -0500 @@ -122,7 +122,7 @@ // an EAP request that is valid. If we don't have any config informtion, // we should just bail here, and not return an error. - inframe = (u_char *)&workint->recvframe; + inframe = (char *)&workint->recvframe; temp = (struct eapol_header *)&inframe[OFFSET_PAST_MAC]; --- xsupplicant-1.2.1/src/statemachine.c.BAD 2005-09-03 08:32:13.000000000 -0500 +++ xsupplicant-1.2.1/src/statemachine.c 2005-09-03 08:33:13.000000000 -0500 @@ -619,7 +619,7 @@ } } - eapol_build_header(EAPOL_LOGOFF, 0, eapolver, thisint->sendframe); + eapol_build_header(EAPOL_LOGOFF, 0, eapolver, (char *) thisint->sendframe); thisint->send_size = OFFSET_TO_EAP; snmp_dot1xSuppEapolLogoffFramesTx(); @@ -664,7 +664,7 @@ } eapol_build_header(EAPOL_START, 0, network_data->force_eapol_ver, - thisint->sendframe); + (char *) thisint->sendframe); thisint->send_size = OFFSET_TO_EAP; snmp_dot1xSuppEapolStartFramesTx(); --- xsupplicant-1.2.1/src/config_ssid.c.BAD 2005-09-03 08:30:08.000000000 -0500 +++ xsupplicant-1.2.1/src/config_ssid.c 2005-09-03 08:30:24.000000000 -0500 @@ -151,7 +151,7 @@ if (wpa_ie != NULL) { - cur->wpa_ie = (char *)malloc(wpa_ie_len); + cur->wpa_ie = (unsigned char *)malloc(wpa_ie_len); if (cur->wpa_ie == NULL) { debug_printf(DEBUG_NORMAL, "Couldn't allocate memory for wpa_ie! " @@ -168,7 +168,7 @@ if (rsn_ie != NULL) { - cur->rsn_ie = (char *)malloc(rsn_ie_len); + cur->rsn_ie = (unsigned char *)malloc(rsn_ie_len); if (cur->rsn_ie == NULL) { debug_printf(DEBUG_NORMAL, "Couldn't allocate memory for rsn_ie! " --- xsupplicant-1.2.1/src/xsup_ipc.c.BAD 2005-09-03 17:27:32.000000000 -0500 +++ xsupplicant-1.2.1/src/xsup_ipc.c 2005-09-03 17:29:17.000000000 -0500 @@ -144,7 +144,7 @@ } debug_printf(DEBUG_INT, "(IPC) Sending : \n"); - debug_hex_dump(DEBUG_INT, tosend, tolen); + debug_hex_dump(DEBUG_INT, (u_char *) tosend, tolen); err = send(skfd, tosend, tolen, 0); if (err < 0) @@ -194,7 +194,7 @@ *outsize = 0; } else { debug_printf(DEBUG_INT, "(IPC) Got : \n"); - debug_hex_dump(DEBUG_INT, outbuf, readStat); + debug_hex_dump(DEBUG_INT, (u_char *) outbuf, readStat); // Verify that the packet we got is valid. *outsize = readStat; @@ -355,7 +355,7 @@ debug_printf(DEBUG_NORMAL, "Error getting working interface " "dumping current packet: \n"); - debug_hex_dump(DEBUG_NORMAL, buffer, bufsize); + debug_hex_dump(DEBUG_NORMAL, (u_char *) buffer, bufsize); debug_printf(DEBUG_NORMAL, "Ignoring remaining parts of packet!\n"); bufptr = bufsize+1; @@ -419,7 +419,7 @@ { // We got a request for a new IPC client connection. debug_printf(DEBUG_INT, "Got a request to connect a new client.\n"); - newsock = accept(ipc_sock, (struct sockaddr *)&sa, &len); + newsock = accept(ipc_sock, (struct sockaddr *)&sa, (u_int *) &len); if (newsock <= 0) { debug_printf(DEBUG_NORMAL, "Got a request for a new IPC client " @@ -514,7 +514,7 @@ ipc_callout_request_password(intidx, &bufptr, (char *)&packet[0], 512, eapType, challenge); debug_printf(DEBUG_AUTHTYPES, "Sending : \n"); - debug_hex_dump(DEBUG_AUTHTYPES, packet, bufptr); + debug_hex_dump(DEBUG_AUTHTYPES, (u_char *) packet, bufptr); xsup_ipc_send_all((char *)&packet, bufptr); --- xsupplicant-1.2.1/src/eapol_key_type254.c.BAD 2005-09-03 09:05:02.000000000 -0500 +++ xsupplicant-1.2.1/src/eapol_key_type254.c 2005-09-03 09:21:09.000000000 -0500 @@ -192,12 +192,12 @@ } debug_printf(DEBUG_INT, "PMK : "); - debug_hex_printf(DEBUG_INT, intdata->statemachine->PMK, 32); - wpa_PRF(intdata->statemachine->PMK, 32, "Pairwise key expansion", 22, - (char *)&prfdata, 76, retval, 64); + debug_hex_printf(DEBUG_INT, (u_char *) intdata->statemachine->PMK, 32); + wpa_PRF((u_char *) intdata->statemachine->PMK, 32, (u_char *) "Pairwise key expansion", 22, + (u_char *)&prfdata, 76, (u_char *) retval, 64); debug_printf(DEBUG_INT, "PTK : "); - debug_hex_printf(DEBUG_INT, retval, 64); + debug_hex_printf(DEBUG_INT, (u_char *) retval, 64); return retval; } @@ -264,10 +264,10 @@ eapolver = snmp_get_dot1xSuppLastEapolFrameVersion(); eapol_build_header(EAPOL_KEY, (intdata->send_size-OFFSET_TO_EAPOL-4), - eapolver, intdata->sendframe); + eapolver, (char *) intdata->sendframe); memcpy(key, intdata->statemachine->PTK, 16); - mic_wpa_populate(intdata->sendframe, intdata->send_size+4, key, 16); + mic_wpa_populate((char *) intdata->sendframe, intdata->send_size+4, key, 16); cardif_sendframe(intdata); intdata->statemachine->eapolEap = FALSE; @@ -351,21 +351,21 @@ bzero(rc4_ek, 32); memcpy(rc4_ek, inkeydata->key_iv, 16); memcpy(&rc4_ek[16], &intdata->statemachine->PTK[16], 16); - rc4_skip(rc4_ek, 32, 256, keydata, value16); + rc4_skip((u_char *) rc4_ek, 32, 256, keydata, value16); wpa_common_swap_rx_tx_mic(keydata); - cardif_set_tkip_key(intdata, allfs, keyindex, FALSE, inkeydata->key_rsc, - 6, keydata, value16); + cardif_set_tkip_key(intdata, (char *) allfs, keyindex, FALSE, (char *) inkeydata->key_rsc, + 6, (char *) keydata, value16); break; case 2: // First, decrypt the GTK bzero(key, 16); - aes_unwrap(&intdata->statemachine->PTK[16], (value16-8)/8, keydata, - key); + aes_unwrap((u_char *) &intdata->statemachine->PTK[16], (value16-8)/8, keydata, + (u_char *) key); wpa_common_swap_rx_tx_mic(keydata); - cardif_set_ccmp_key(intdata, NULL, keyindex, FALSE, inkeydata->key_rsc, + cardif_set_ccmp_key(intdata, NULL, keyindex, FALSE, (char *) inkeydata->key_rsc, 6, key, (value16-8)); break; } @@ -391,13 +391,13 @@ eapolver = snmp_get_dot1xSuppLastEapolFrameVersion(); eapol_build_header(EAPOL_KEY, (intdata->send_size-OFFSET_TO_EAPOL-4), - eapolver, intdata->sendframe); + eapolver, (char *) intdata->sendframe); memcpy(key, intdata->statemachine->PTK, 16); - mic_wpa_populate(intdata->sendframe, intdata->send_size+4, key, 16); + mic_wpa_populate((char *) intdata->sendframe, intdata->send_size+4, key, 16); // Dump what we built. - eapol_key_type254_dump(intdata->sendframe); + eapol_key_type254_dump((char *) intdata->sendframe); if (network_data->methods->method_num == WPA_PSK) { @@ -504,13 +504,13 @@ eapolver = snmp_get_dot1xSuppLastEapolFrameVersion(); eapol_build_header(EAPOL_KEY, (intdata->send_size-OFFSET_TO_EAPOL-4), - eapolver, intdata->sendframe); + eapolver, (char *) intdata->sendframe); memcpy(key, intdata->statemachine->PTK, 16); - mic_wpa_populate(intdata->sendframe, intdata->send_size+4, key, 16); + mic_wpa_populate((char *) intdata->sendframe, intdata->send_size+4, key, 16); // Dump what we built. - eapol_key_type254_dump(intdata->sendframe); + eapol_key_type254_dump((char *) intdata->sendframe); } /******************************************************** @@ -586,20 +586,20 @@ eapolver = snmp_get_dot1xSuppLastEapolFrameVersion(); eapol_build_header(EAPOL_KEY, (intdata->send_size-OFFSET_TO_EAPOL-4), - eapolver, intdata->sendframe); + eapolver, (char *) intdata->sendframe); memcpy(key, intdata->statemachine->PTK, 16); - mic_wpa_populate(intdata->sendframe, intdata->send_size+4, key, 16); + mic_wpa_populate((char *) intdata->sendframe, intdata->send_size+4, key, 16); // Dump what we built. - eapol_key_type254_dump(intdata->sendframe); + eapol_key_type254_dump((char *) intdata->sendframe); // Get TK1 value16 = ntohs(inkeydata->key_length); memcpy(key, (char *)&intdata->statemachine->PTK[32], value16); debug_printf(DEBUG_INT, "TK1 : "); - debug_hex_printf(DEBUG_INT, key, value16); + debug_hex_printf(DEBUG_INT, (u_char *) key, value16); cardif_sendframe(intdata); intdata->statemachine->eapolEap = FALSE; @@ -612,14 +612,14 @@ case 1: // We need to swap the TX/RX MIC values since we are the supplicant. // (Thanks to Jouni Malinen for pointing this out!) - wpa_common_swap_rx_tx_mic(key); + wpa_common_swap_rx_tx_mic((u_char *) key); cardif_set_tkip_key(intdata, intdata->dest_mac, keyindex, TRUE, - inkeydata->key_rsc, 6, key, value16); + (char *) inkeydata->key_rsc, 6, key, value16); break; case 2: cardif_set_ccmp_key(intdata, intdata->dest_mac, keyindex, TRUE, - inkeydata->key_rsc, 6, key, value16); + (char *) inkeydata->key_rsc, 6, key, value16); break; } } @@ -646,7 +646,7 @@ if (keyflags & WPA_KEY_MIC_FLAG) { - if (mic_wpa_validate(intdata->recvframe, intdata->recv_size, + if (mic_wpa_validate((char *) intdata->recvframe, intdata->recv_size, intdata->statemachine->PTK, 16) == FALSE) { intdata->statemachine->MICVerified = TRUE; @@ -688,7 +688,7 @@ eapolver = snmp_get_dot1xSuppLastEapolFrameVersion(); eapol_build_header(EAPOL_KEY, (intdata->recv_size-OFFSET_TO_EAPOL-4), - eapolver, intdata->recvframe); + eapolver, (char *) intdata->recvframe); cardif_sendframe(intdata); intdata->statemachine->eapolEap = FALSE; } @@ -757,8 +757,8 @@ } // We have an ASCII password, so calculate it. - if (psk_wpa_pbkdf2(psk->key, intdata->cur_essid, - strlen(intdata->cur_essid), (char *)&tpmk) + if (psk_wpa_pbkdf2(psk->key, (u_char *) intdata->cur_essid, + strlen(intdata->cur_essid), (u_char *)&tpmk) == TRUE) { intdata->statemachine->PMK = (char *)malloc(32); @@ -798,7 +798,7 @@ } } - eapol_key_type254_dump(inframe); + eapol_key_type254_dump((char *) inframe); eapol_key_type254_determine_key(intdata); --- xsupplicant-1.2.1/src/config_grammar.y.BAD 2005-09-03 17:31:51.000000000 -0500 +++ xsupplicant-1.2.1/src/config_grammar.y 2005-09-03 17:34:56.000000000 -0500 @@ -829,8 +829,9 @@ } else { int tmp_dst_mac[CONFIG_MAC_LEN]; + int retval; SET_FLAG(tmp_network->flags, CONFIG_NET_DEST_MAC); - sscanf($3, "%2x:%2x:%2x:%2x:%2x:%2x", + retval = sscanf($3, "%2x:%2x:%2x:%2x:%2x:%2x", &tmp_dst_mac[0], &tmp_dst_mac[1], &tmp_dst_mac[2], @@ -1035,25 +1036,25 @@ set_current_static_wep(); parameter_debug("Static Key 1 : %s\n", $3); if (!tmp_static_wep->key[1]) - tmp_static_wep->key[1] = $3; + tmp_static_wep->key[1] = (u_char *) $3; } | TK_STATIC_KEY2 '=' TK_QUOTED_STR { set_current_static_wep(); parameter_debug("Static Key 2 : %s\n", $3); if (!tmp_static_wep->key[2]) - tmp_static_wep->key[2] = $3; + tmp_static_wep->key[2] = (u_char *) $3; } | TK_STATIC_KEY3 '=' TK_QUOTED_STR { set_current_static_wep(); parameter_debug("Static Key 3 : %s\n", $3); if (!tmp_static_wep->key[3]) - tmp_static_wep->key[3] = $3; + tmp_static_wep->key[3] = (u_char *) $3; } | TK_STATIC_KEY4 '=' TK_QUOTED_STR { set_current_static_wep(); parameter_debug("Static Key 4 : %s\n", $3); if (!tmp_static_wep->key[4]) - tmp_static_wep->key[4] = $3; + tmp_static_wep->key[4] = (u_char *) $3; } | TK_WEP_TX_KEY '=' TK_NUMBER { set_current_static_wep(); Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/xsupplicant/FC-3/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 19 Aug 2005 18:58:19 -0000 1.2 +++ .cvsignore 4 Sep 2005 13:17:38 -0000 1.3 @@ -1 +1,2 @@ xsupplicant-1.2.tar.gz +xsupplicant-1.2.1.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/xsupplicant/FC-3/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 19 Aug 2005 18:58:19 -0000 1.2 +++ sources 4 Sep 2005 13:17:38 -0000 1.3 @@ -1 +1,2 @@ e1eee37899b49ed238648699d0a01c5b xsupplicant-1.2.tar.gz +c44300f798a3317c06e501eb0dd98a23 xsupplicant-1.2.1.tar.gz Index: xsupplicant.spec =================================================================== RCS file: /cvs/extras/rpms/xsupplicant/FC-3/xsupplicant.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- xsupplicant.spec 19 Aug 2005 18:58:19 -0000 1.1 +++ xsupplicant.spec 4 Sep 2005 13:17:38 -0000 1.2 @@ -1,6 +1,6 @@ Name: xsupplicant Summary: Open Source Implementation of IEEE 802.1x -Version: 1.2 +Version: 1.2.1 Release: 1%{?dist} License: GPL Group: System Environment/Base @@ -8,6 +8,8 @@ Source0: http://download.sourceforge.net/open1x/xsupplicant-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: openssl-devel, bison, flex +Patch0: xsupplicant-1.2.1-docsfix.patch +Patch1: xsupplicant-1.2.1-gcc4-cleanups.patch %description This software allows a GNU/Linux or BSD workstation to authenticate with @@ -17,12 +19,17 @@ %prep %setup -q +%patch0 -p1 +%patch1 -p1 perl -pi.orig -e 's|/lib\b|/%{_lib}|g' configure* %build %configure make %{?_smp_mflags} +cd doc +./builddocs.sh +cd .. %install rm -rf $RPM_BUILD_ROOT @@ -35,7 +42,7 @@ %files %defattr(-,root,root,-) -%doc AUTHORS COPYING README doc/html/ doc/txt/ doc/README* etc/*.conf +%doc AUTHORS COPYING README doc/html/ doc/txt/ doc/pdf doc/README* etc/*.conf %config(noreplace) %{_sysconfdir}/xsupplicant.conf %{_bindir}/config-parser %{_bindir}/xsup_monitor @@ -44,6 +51,9 @@ %{_sbindir}/xsupplicant %changelog +* Sat Sep 3 2005 Tom "spot" Callaway 1.2.1-1 +- bump to 1.2.1 release + * Fri Aug 19 2005 Tom "spot" Callaway 1.2-1 - bump to 1.2 final From fedora-extras-commits at redhat.com Sun Sep 4 13:39:34 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sun, 4 Sep 2005 09:39:34 -0400 Subject: rpms/xsupplicant/FC-3 xsupplicant.spec,1.2,1.3 Message-ID: <200509041339.j84DdYdo030862@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/xsupplicant/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30817/FC-3 Modified Files: xsupplicant.spec Log Message: Missing BR. Index: xsupplicant.spec =================================================================== RCS file: /cvs/extras/rpms/xsupplicant/FC-3/xsupplicant.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- xsupplicant.spec 4 Sep 2005 13:17:38 -0000 1.2 +++ xsupplicant.spec 4 Sep 2005 13:39:32 -0000 1.3 @@ -1,13 +1,13 @@ Name: xsupplicant Summary: Open Source Implementation of IEEE 802.1x Version: 1.2.1 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: System Environment/Base URL: http://www.open1x.org/ Source0: http://download.sourceforge.net/open1x/xsupplicant-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: openssl-devel, bison, flex +BuildRequires: openssl-devel, bison, flex, openjade, elinks, jadetex Patch0: xsupplicant-1.2.1-docsfix.patch Patch1: xsupplicant-1.2.1-gcc4-cleanups.patch @@ -51,6 +51,9 @@ %{_sbindir}/xsupplicant %changelog +* Sun Sep 4 2005 Tom "spot" Callaway 1.2.1-2 +- the new doc generation tool has some new BR: openjade, elinks, jadetex + * Sat Sep 3 2005 Tom "spot" Callaway 1.2.1-1 - bump to 1.2.1 release From fedora-extras-commits at redhat.com Sun Sep 4 13:39:35 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sun, 4 Sep 2005 09:39:35 -0400 Subject: rpms/xsupplicant/FC-4 xsupplicant.spec,1.2,1.3 Message-ID: <200509041339.j84DdZTh030870@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/xsupplicant/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30817/FC-4 Modified Files: xsupplicant.spec Log Message: Missing BR. Index: xsupplicant.spec =================================================================== RCS file: /cvs/extras/rpms/xsupplicant/FC-4/xsupplicant.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- xsupplicant.spec 4 Sep 2005 13:17:39 -0000 1.2 +++ xsupplicant.spec 4 Sep 2005 13:39:33 -0000 1.3 @@ -1,13 +1,13 @@ Name: xsupplicant Summary: Open Source Implementation of IEEE 802.1x Version: 1.2.1 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: System Environment/Base URL: http://www.open1x.org/ Source0: http://download.sourceforge.net/open1x/xsupplicant-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: openssl-devel, bison, flex +BuildRequires: openssl-devel, bison, flex, openjade, elinks, jadetex Patch0: xsupplicant-1.2.1-docsfix.patch Patch1: xsupplicant-1.2.1-gcc4-cleanups.patch @@ -51,6 +51,9 @@ %{_sbindir}/xsupplicant %changelog +* Sun Sep 4 2005 Tom "spot" Callaway 1.2.1-2 +- the new doc generation tool has some new BR: openjade, elinks, jadetex + * Sat Sep 3 2005 Tom "spot" Callaway 1.2.1-1 - bump to 1.2.1 release From fedora-extras-commits at redhat.com Sun Sep 4 13:39:35 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sun, 4 Sep 2005 09:39:35 -0400 Subject: rpms/xsupplicant/devel xsupplicant.spec,1.2,1.3 Message-ID: <200509041339.j84DdZKg030876@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/xsupplicant/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30817/devel Modified Files: xsupplicant.spec Log Message: Missing BR. Index: xsupplicant.spec =================================================================== RCS file: /cvs/extras/rpms/xsupplicant/devel/xsupplicant.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- xsupplicant.spec 4 Sep 2005 13:17:45 -0000 1.2 +++ xsupplicant.spec 4 Sep 2005 13:39:33 -0000 1.3 @@ -1,13 +1,13 @@ Name: xsupplicant Summary: Open Source Implementation of IEEE 802.1x Version: 1.2.1 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: System Environment/Base URL: http://www.open1x.org/ Source0: http://download.sourceforge.net/open1x/xsupplicant-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: openssl-devel, bison, flex +BuildRequires: openssl-devel, bison, flex, openjade, elinks, jadetex Patch0: xsupplicant-1.2.1-docsfix.patch Patch1: xsupplicant-1.2.1-gcc4-cleanups.patch @@ -51,6 +51,9 @@ %{_sbindir}/xsupplicant %changelog +* Sun Sep 4 2005 Tom "spot" Callaway 1.2.1-2 +- the new doc generation tool has some new BR: openjade, elinks, jadetex + * Sat Sep 3 2005 Tom "spot" Callaway 1.2.1-1 - bump to 1.2.1 release From fedora-extras-commits at redhat.com Sun Sep 4 13:57:33 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sun, 4 Sep 2005 09:57:33 -0400 Subject: rpms/xsupplicant/devel xsupplicant.spec,1.3,1.4 Message-ID: <200509041357.j84DvX8F031137@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/xsupplicant/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31084/devel Modified Files: xsupplicant.spec Log Message: No really. More BR. Index: xsupplicant.spec =================================================================== RCS file: /cvs/extras/rpms/xsupplicant/devel/xsupplicant.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- xsupplicant.spec 4 Sep 2005 13:39:33 -0000 1.3 +++ xsupplicant.spec 4 Sep 2005 13:57:31 -0000 1.4 @@ -1,13 +1,14 @@ Name: xsupplicant Summary: Open Source Implementation of IEEE 802.1x Version: 1.2.1 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL Group: System Environment/Base URL: http://www.open1x.org/ Source0: http://download.sourceforge.net/open1x/xsupplicant-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: openssl-devel, bison, flex, openjade, elinks, jadetex +BuildRequires: docbook-dtds, docbook-style-dsssl Patch0: xsupplicant-1.2.1-docsfix.patch Patch1: xsupplicant-1.2.1-gcc4-cleanups.patch @@ -51,6 +52,9 @@ %{_sbindir}/xsupplicant %changelog +* Sun Sep 4 2005 Tom "spot" Callaway 1.2.1-3 +- BR: docbook-dtds, docbook-style-dsssl + * Sun Sep 4 2005 Tom "spot" Callaway 1.2.1-2 - the new doc generation tool has some new BR: openjade, elinks, jadetex From fedora-extras-commits at redhat.com Sun Sep 4 13:57:27 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sun, 4 Sep 2005 09:57:27 -0400 Subject: rpms/xsupplicant/FC-3 xsupplicant.spec,1.3,1.4 Message-ID: <200509041357.j84DvwnR031140@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/xsupplicant/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31084/FC-3 Modified Files: xsupplicant.spec Log Message: No really. More BR. Index: xsupplicant.spec =================================================================== RCS file: /cvs/extras/rpms/xsupplicant/FC-3/xsupplicant.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- xsupplicant.spec 4 Sep 2005 13:39:32 -0000 1.3 +++ xsupplicant.spec 4 Sep 2005 13:57:25 -0000 1.4 @@ -1,13 +1,14 @@ Name: xsupplicant Summary: Open Source Implementation of IEEE 802.1x Version: 1.2.1 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL Group: System Environment/Base URL: http://www.open1x.org/ Source0: http://download.sourceforge.net/open1x/xsupplicant-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: openssl-devel, bison, flex, openjade, elinks, jadetex +BuildRequires: docbook-dtds, docbook-style-dsssl Patch0: xsupplicant-1.2.1-docsfix.patch Patch1: xsupplicant-1.2.1-gcc4-cleanups.patch @@ -51,6 +52,9 @@ %{_sbindir}/xsupplicant %changelog +* Sun Sep 4 2005 Tom "spot" Callaway 1.2.1-3 +- BR: docbook-dtds, docbook-style-dsssl + * Sun Sep 4 2005 Tom "spot" Callaway 1.2.1-2 - the new doc generation tool has some new BR: openjade, elinks, jadetex From fedora-extras-commits at redhat.com Sun Sep 4 13:57:28 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sun, 4 Sep 2005 09:57:28 -0400 Subject: rpms/xsupplicant/FC-4 xsupplicant.spec,1.3,1.4 Message-ID: <200509041357.j84DvwNs031143@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/xsupplicant/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31084/FC-4 Modified Files: xsupplicant.spec Log Message: No really. More BR. Index: xsupplicant.spec =================================================================== RCS file: /cvs/extras/rpms/xsupplicant/FC-4/xsupplicant.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- xsupplicant.spec 4 Sep 2005 13:39:33 -0000 1.3 +++ xsupplicant.spec 4 Sep 2005 13:57:26 -0000 1.4 @@ -1,13 +1,14 @@ Name: xsupplicant Summary: Open Source Implementation of IEEE 802.1x Version: 1.2.1 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL Group: System Environment/Base URL: http://www.open1x.org/ Source0: http://download.sourceforge.net/open1x/xsupplicant-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: openssl-devel, bison, flex, openjade, elinks, jadetex +BuildRequires: docbook-dtds, docbook-style-dsssl Patch0: xsupplicant-1.2.1-docsfix.patch Patch1: xsupplicant-1.2.1-gcc4-cleanups.patch @@ -51,6 +52,9 @@ %{_sbindir}/xsupplicant %changelog +* Sun Sep 4 2005 Tom "spot" Callaway 1.2.1-3 +- BR: docbook-dtds, docbook-style-dsssl + * Sun Sep 4 2005 Tom "spot" Callaway 1.2.1-2 - the new doc generation tool has some new BR: openjade, elinks, jadetex From fedora-extras-commits at redhat.com Sun Sep 4 14:07:46 2005 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Sun, 4 Sep 2005 10:07:46 -0400 Subject: rpms/liferea/devel .cvsignore, 1.11, 1.12 liferea.spec, 1.17, 1.18 sources, 1.12, 1.13 Message-ID: <200509041407.j84E7knr032440@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/liferea/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32417 Modified Files: .cvsignore liferea.spec sources Log Message: * Sun Sep 4 2005 Brian Pepple - 0.9.7b-2 - Update to 0.9.7b. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/liferea/devel/.cvsignore,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- .cvsignore 30 Aug 2005 14:09:32 -0000 1.11 +++ .cvsignore 4 Sep 2005 14:07:29 -0000 1.12 @@ -1 +1 @@ -liferea-0.9.7a.tar.gz +liferea-0.9.7b.tar.gz Index: liferea.spec =================================================================== RCS file: /cvs/extras/rpms/liferea/devel/liferea.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- liferea.spec 30 Aug 2005 14:09:32 -0000 1.17 +++ liferea.spec 4 Sep 2005 14:07:29 -0000 1.18 @@ -1,7 +1,7 @@ %define with_dbus 1 Name: liferea -Version: 0.9.7a +Version: 0.9.7b Release: 2%{?dist} Summary: An RSS/RDF feed reader @@ -92,6 +92,9 @@ %changelog +* Sun Sep 4 2005 Brian Pepple - 0.9.7b-2 +- Update to 0.9.7b. + * Tue Aug 30 2005 Brian Pepple - 0.9.7a-2 - Update to 0.9.7a. Index: sources =================================================================== RCS file: /cvs/extras/rpms/liferea/devel/sources,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- sources 30 Aug 2005 14:09:32 -0000 1.12 +++ sources 4 Sep 2005 14:07:29 -0000 1.13 @@ -1 +1 @@ -303a4a0f678cf689510785dbd91726a6 liferea-0.9.7a.tar.gz +68c75c792c81808160434baca4e9165b liferea-0.9.7b.tar.gz From fedora-extras-commits at redhat.com Sun Sep 4 14:09:10 2005 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Sun, 4 Sep 2005 10:09:10 -0400 Subject: rpms/liferea/FC-4 .cvsignore, 1.11, 1.12 liferea.spec, 1.16, 1.17 sources, 1.12, 1.13 Message-ID: <200509041409.j84E9AZe032549@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/liferea/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32526 Modified Files: .cvsignore liferea.spec sources Log Message: * Sun Sep 4 2005 Brian Pepple - 0.9.7b-1 - Update to 0.9.7b. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/liferea/FC-4/.cvsignore,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- .cvsignore 30 Aug 2005 15:04:41 -0000 1.11 +++ .cvsignore 4 Sep 2005 14:09:08 -0000 1.12 @@ -1 +1 @@ -liferea-0.9.7a.tar.gz +liferea-0.9.7b.tar.gz Index: liferea.spec =================================================================== RCS file: /cvs/extras/rpms/liferea/FC-4/liferea.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- liferea.spec 30 Aug 2005 15:04:42 -0000 1.16 +++ liferea.spec 4 Sep 2005 14:09:08 -0000 1.17 @@ -1,7 +1,7 @@ %define with_dbus 1 Name: liferea -Version: 0.9.7a +Version: 0.9.7b Release: 1%{?dist} Summary: An RSS/RDF feed reader @@ -92,6 +92,9 @@ %changelog +* Sun Sep 4 2005 Brian Pepple - 0.9.7b-1 +- Update to 0.9.7b. + * Tue Aug 30 2005 Brian Pepple - 0.9.7a-1 - Update to 0.9.7a. Index: sources =================================================================== RCS file: /cvs/extras/rpms/liferea/FC-4/sources,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- sources 30 Aug 2005 15:04:42 -0000 1.12 +++ sources 4 Sep 2005 14:09:08 -0000 1.13 @@ -1 +1 @@ -303a4a0f678cf689510785dbd91726a6 liferea-0.9.7a.tar.gz +68c75c792c81808160434baca4e9165b liferea-0.9.7b.tar.gz From fedora-extras-commits at redhat.com Sun Sep 4 14:51:57 2005 From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields)) Date: Sun, 4 Sep 2005 10:51:57 -0400 Subject: web/html/docs/yum generated-index.php, 1.5, 1.6 index.php, 1.5, 1.6 ln-legalnotice.php, 1.5, 1.6 sn-acknowledgements.php, 1.5, 1.6 sn-managing-packages.php, 1.5, 1.6 sn-searching-packages.php, 1.5, 1.6 sn-software-management-concepts.php, 1.5, 1.6 sn-software-management-tools.php, 1.5, 1.6 sn-updating-your-system.php, 1.5, 1.6 sn-using-repositories.php, 1.5, 1.6 sn-yum-installing-frompackage.php, 1.5, 1.6 sn-yum-maintenance.php, 1.5, 1.6 sn-yum-proxy-server.php, 1.5, 1.6 Message-ID: <200509041451.j84EpvJg032730@cvs-int.fedora.redhat.com> Author: pfrields Update of /cvs/fedora/web/html/docs/yum In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32698 Modified Files: generated-index.php index.php ln-legalnotice.php sn-acknowledgements.php sn-managing-packages.php sn-searching-packages.php sn-software-management-concepts.php sn-software-management-tools.php sn-updating-your-system.php sn-using-repositories.php sn-yum-installing-frompackage.php sn-yum-maintenance.php sn-yum-proxy-server.php Log Message: Republish yum tutorial with new revision history chunking Index: index.php =================================================================== RCS file: /cvs/fedora/web/html/docs/yum/index.php,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- index.php 30 Aug 2005 21:54:38 -0000 1.5 +++ index.php 4 Sep 2005 14:51:55 -0000 1.6 @@ -7,32 +7,7 @@ ?> -
- ><%=builder['address']%>  (<%=num_building%>/<%=builder['num_slots']%>)
+ ><%=builder['address']%>  (<%=slots_text%>)
<%=arch_list%>
Managing Software with yum
   Next

Managing Software with yum

Stuart Ellis

Copyright © 2005 Stuart Ellis

Revision History
Revision 0.42005-06-01StuartEllis
-

- Initial import into CVS. -

-
Revision 0.52005-07-19StuartEllis
-

- Updated for Fedora Core 4. -

-
Revision 0.62005-07-25PaulWFrields
-

- Edited for style and usage; BETA publication. -

-
Revision 1.02005-08-13PaulWFrields
-

- Publish to official project page. -

-
Revision 1.0.12005-08-18StuartEllis
-

- Added information on installing without repository and - manually adding keys. -

-
Revision 1.0.22005-08-26StuartEllis
-

- Fix localinstall information. -

-
1. Introduction
1.1. Purpose
1.2. Audience
1.3. Using This Document
1.4. Additional Resources
2. Software Management Concepts
2.1. About Packages
2.2. About Repositories
2.3. About Dependencies
2.4. Understanding Package Names
3. Software Management Tools in Fedora Core
4. Managing Software with yum
4.1. Installing New Software with yum
4.2. Updating Software with yum
4.! 3. Removing Software with yum!
5. Searching for Packages with yum
5.1. Searching by Package Name and Attributes
5.2. Advanced Searches
5.3. Understanding Matches
6. Updating Your System with yum
6.1. Automatically Updating Your System
7. Using Other Software Repositories
7.1. Adding a Repository as a Package Source
7.2. Manually Authorizing Package Sources
7.3. Understanding Repository Compatibility
8. Maintaining yum
8.1. Disabling or Removing Package Sources
8.2. Clearing the yum Caches
9. Manually Installing Software
10. Using yum with a Proxy Server
11. Acknowledgements
Index

1. Introduction

1.1. Purpose

+

Managing Software with yum
   Next

Managing Software with yum

Stuart Ellis

Copyright © 2005 Stuart Ellis

1. Introduction
1.1. Purpose
1.2. Audience
1.3. Using This Document
1.4. Additional Resources
2. Software Management Concepts
2.1. About Packages
2.2. About Repositories
! 2.3. About Dependencies
2.4. Understanding Package Names
3. Software Management Tools in Fedora Core
4. Managing Software with yum
4.1. Installing New Software with yum
4.2. Updating Software with yum
4.3. Removing Software with yum
5. Searching for Pack! ages with yum
5.1. Searching by Package Name and Attributes
5.2. Advanced Searches
5.3. Understanding Matches
6. Updating Your System with yum
6.1. Automatically Updating Your System
7. Using Other Software Repositories
7.1. Adding a Repository as a Package Source
7.2. Manually Authorizing Package Sources
7.3. Understanding Repository Compatibility
8. Maintaining yum
8.1. Disabling or Removing Package Sources
8.2. Clearing the yum Caches
9. Manually Installing Software
10. Using yum with a Proxy Server
11. Acknowledgements
Index

1. Introduction

1.1. Purpose

This document presents basic concepts of software management on Fedora systems. It outlines the major functions of yum, the recommended software management tool @@ -76,7 +51,7 @@ root password. The example terminal commands use su -c to provide this facility. -

1.4. Additional Resources

+

1.4. Additional Resources

The yum utility has features and options not discussed in this document. Read the man pages for yum(8) and @@ -85,7 +60,7 @@ 

 man yum
 man yum.conf
-

+

Other useful yum resources on the Internet include:

Index: sn-managing-packages.php =================================================================== RCS file: /cvs/fedora/web/html/docs/yum/sn-managing-packages.php,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sn-managing-packages.php 30 Aug 2005 21:54:38 -0000 1.5 +++ sn-managing-packages.php 4 Sep 2005 14:51:55 -0000 1.6 @@ -7,7 +7,7 @@ ?> -
4. Managing Software with yum
Prev   Next

4. Managing Software with yum

+

4. Managing Software with yum
Prev   Next

4. Managing Software with yum

Use the yum utility to modify the software on your system in four ways:

@@ -100,7 +100,7 @@ /var/cache/yum/, and use them elsewhere if you wish. If you remove a package from the cache, you do not affect the copy of the software installed on your system. -

4.1. Installing New Software with yum

+

4.1. Installing New Software with yum

To install the package tsclient, enter the command: 

@@ -125,7 +125,7 @@
           Settings->Server Settings->Services, or use the
           chkconfig and service
           command-line utilities.
-

4.2. Updating Software with yum

+

4.2. Updating Software with yum

To update the tsclient package to the latest version, type: 

@@ -152,7 +152,7 @@
           To update all of the packages on your Fedora system, use the
           commands described in
           Section 6, “Updating Your System with yum”.
-

4.3. Removing Software with yum

+

4.3. Removing Software with yum

To remove software, yum examines your system for both the specified software, and any software which claims it as a dependency. The transaction to remove the software Index: sn-searching-packages.php =================================================================== RCS file: /cvs/fedora/web/html/docs/yum/sn-searching-packages.php,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sn-searching-packages.php 30 Aug 2005 21:54:38 -0000 1.5 +++ sn-searching-packages.php 4 Sep 2005 14:51:55 -0000 1.6 @@ -7,7 +7,7 @@ ?> -

5. Searching for Packages with yum
Prev   Next

5. Searching for Packages with yum

+

5. Searching for Packages with yum
Prev   Next

5. Searching for Packages with yum

Use the search features of yum to find software that is available from the configured repositories, or already installed on your system. Searches automatically include both Index: sn-software-management-concepts.php =================================================================== RCS file: /cvs/fedora/web/html/docs/yum/sn-software-management-concepts.php,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sn-software-management-concepts.php 30 Aug 2005 21:54:38 -0000 1.5 +++ sn-software-management-concepts.php 4 Sep 2005 14:51:55 -0000 1.6 @@ -7,7 +7,7 @@ ?> -

2. Software Management Concepts
Prev   Next

2. Software Management Concepts

2.1. About Packages

+

2. Software Management Concepts
Prev   Next

2. Software Management Concepts

2.1. About Packages

Fedora software and documentation is supplied in the form of files called RPM packages. Each package is a compressed archive containing product information, program @@ -24,7 +24,7 @@ share a common keyring that stores all of the public keys for approved package sources. The system administrator configures these approved package sources. -

2.2. About Repositories

+

2.2. About Repositories

A repository is a prepared directory or web site that contains software packages and index files. Software management utilities such as yum @@ -56,7 +56,7 @@ their Fedora compatible packages. To learn how to configure your Fedora system to use third-party repositories, read Section 7, “Using Other Software Repositories”. -

+

You may also use the package groups provided by the Fedora repositories to manage related packages as sets. Some third-party repositories add packages to these @@ -81,7 +81,7 @@ Section 9, “Manually Installing Software” for details of using yum to install software from a package file. -

2.3. About Dependencies

+

2.3. About Dependencies

Some of the files installed on a Fedora distribution are libraries which may provide functions to multiple applications. When an application requires a specific @@ -98,7 +98,7 @@ application has requirements that conflict with existing software, yum aborts without making any changes to your system. -

2.4. Understanding Package Names

+

2.4. Understanding Package Names

Each package file has a long name that indicates several key pieces of information. This is the full name of the tsclient package supplied with Fedora Core: Index: sn-software-management-tools.php =================================================================== RCS file: /cvs/fedora/web/html/docs/yum/sn-software-management-tools.php,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sn-software-management-tools.php 30 Aug 2005 21:54:38 -0000 1.5 +++ sn-software-management-tools.php 4 Sep 2005 14:51:55 -0000 1.6 @@ -7,7 +7,7 @@ ?> -

3. Software Management Tools in Fedora Core
Prev   Next

3. Software Management Tools in Fedora Core

+

3. Software Management Tools in Fedora Core
Prev   Next

3. Software Management Tools in Fedora Core

The yum utility is a complete software management system. Fedora Core also includes other several other applications that can supplement yum. Index: sn-updating-your-system.php =================================================================== RCS file: /cvs/fedora/web/html/docs/yum/sn-updating-your-system.php,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sn-updating-your-system.php 30 Aug 2005 21:54:38 -0000 1.5 +++ sn-updating-your-system.php 4 Sep 2005 14:51:55 -0000 1.6 @@ -7,7 +7,7 @@ ?> -

6. Updating Your System with yum
Prev   Next

6. Updating Your System with yum

+

6. Updating Your System with yum
Prev   Next

6. Updating Your System with yum

Use the update option to upgrade all of your Fedora system software to the latest version with one operation.

@@ -17,7 +17,7 @@

At the prompt, enter the root password. -

6.1. Automatically Updating Your System

+

6.1. Automatically Updating Your System

The yum package supplied with Fedora Core includes scripts to perform full system updates every day. To activate automatic daily updates, enter this command: Index: sn-using-repositories.php =================================================================== RCS file: /cvs/fedora/web/html/docs/yum/sn-using-repositories.php,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sn-using-repositories.php 30 Aug 2005 21:54:38 -0000 1.5 +++ sn-using-repositories.php 4 Sep 2005 14:51:55 -0000 1.6 @@ -7,7 +7,7 @@ ?> -

7. Using Other Software Repositories
Prev   Next

7. Using Other Software Repositories

+

7. Using Other Software Repositories
Prev   Next

7. Using Other Software Repositories

Fedora systems automatically use the Fedora Project repositories. These include Fedora Extras, the default source of packages for software that is not included with Fedora Core. @@ -24,7 +24,7 @@ packages for Fedora systems. For example, http://www.jpackage.org/ distributes popular Java software as packages. -

7.1. Adding a Repository as a Package Source

+

7.1. Adding a Repository as a Package Source

To add an extra repository, place a definition file in the /etc/yum.repos.d/ directory on your system. Package providers make the definition files for their @@ -57,7 +57,7 @@ configure up2date to use these channels. To do so, edit the /etc/sysconfig/rhn/sources file. -

7.2. Manually Authorizing Package Sources

+

7.2. Manually Authorizing Package Sources

To manually add a public key to your rpm keyring, use the import feature of the rpm utility. To import the file @@ -82,7 +82,7 @@ To add the Fedora public key to the rpm keyring on Fedora 3 systems, run the command su -c 'rpm --import /usr/share/rhn/RPM-GPG-KEY-fedora'. -

7.3. Understanding Repository Compatibility

+

7.3. Understanding Repository Compatibility

The Fedora Extras repository provides packages which are built to the same standards as Fedora Core packages. Third-party packages should be compatible with these Fedora Project packages, unless the provider Index: sn-yum-installing-frompackage.php =================================================================== RCS file: /cvs/fedora/web/html/docs/yum/sn-yum-installing-frompackage.php,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sn-yum-installing-frompackage.php 30 Aug 2005 21:54:38 -0000 1.5 +++ sn-yum-installing-frompackage.php 4 Sep 2005 14:51:55 -0000 1.6 @@ -7,7 +7,7 @@ ?> -

9. Manually Installing Software
Prev   Next

9. Manually Installing Software

+

9. Manually Installing Software
Prev   Next

9. Manually Installing Software

Use repositories and the standard yum commands to locate and install new software, unless the software package is not available from any repository. In these cases, use the Index: sn-yum-maintenance.php =================================================================== RCS file: /cvs/fedora/web/html/docs/yum/sn-yum-maintenance.php,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sn-yum-maintenance.php 30 Aug 2005 21:54:38 -0000 1.5 +++ sn-yum-maintenance.php 4 Sep 2005 14:51:55 -0000 1.6 @@ -14,7 +14,7 @@ definitions which you no longer require. You may also clear the files from the yum caches in order to recover disk space. -

8.1. Disabling or Removing Package Sources

+

8.1. Disabling or Removing Package Sources

Set enable=0 in a definition file to prevent yum from using that repository. The yum utility ignores any definition file with @@ -27,7 +27,7 @@

  • Delete the cache directory from /var/cache/yum/. -

    • 8.2. Clearing the yum Caches

    +

    8.2. Clearing the yum Caches

    By default, yum retains the packages and package data files that it downloads, so that they may be reused in future operations without being downloaded again. To purge Index: sn-yum-proxy-server.php =================================================================== RCS file: /cvs/fedora/web/html/docs/yum/sn-yum-proxy-server.php,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sn-yum-proxy-server.php 30 Aug 2005 21:54:38 -0000 1.5 +++ sn-yum-proxy-server.php 4 Sep 2005 14:51:55 -0000 1.6 @@ -7,7 +7,7 @@ ?> -

    10. Using yum with a Proxy Server
    Prev   Next

    10. Using yum with a Proxy Server

    +

    10. Using yum with a Proxy Server
    Prev   Next

    10. Using yum with a Proxy Server

    You may access repositories through standard web proxy servers. If your system accesses the Internet through a web proxy server, specify the proxy server details in From fedora-extras-commits at redhat.com Sun Sep 4 14:52:32 2005 From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields)) Date: Sun, 4 Sep 2005 10:52:32 -0400 Subject: web/html/docs/yum rv-revhistory.php,NONE,1.1 Message-ID: <200509041452.j84EqWAk000307@cvs-int.fedora.redhat.com> Author: pfrields Update of /cvs/fedora/web/html/docs/yum In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32757 Added Files: rv-revhistory.php Log Message: And add the revisionhistory chunk ***** Error reading new file: [Errno 2] No such file or directory: 'rv-revhistory.php' From fedora-extras-commits at redhat.com Sun Sep 4 17:52:10 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sun, 4 Sep 2005 13:52:10 -0400 Subject: rpms/xsupplicant/FC-3 sources, 1.3, 1.4 xsupplicant-1.2.1-docsfix.patch, 1.1, 1.2 Message-ID: <200509041752.j84Hqew8004453@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/xsupplicant/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4392/FC-3 Modified Files: sources xsupplicant-1.2.1-docsfix.patch Log Message: Ugly docbook requires unique patches for all branches... but this should get us building again. Index: sources =================================================================== RCS file: /cvs/extras/rpms/xsupplicant/FC-3/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 4 Sep 2005 13:17:38 -0000 1.3 +++ sources 4 Sep 2005 17:52:07 -0000 1.4 @@ -1,2 +1 @@ -e1eee37899b49ed238648699d0a01c5b xsupplicant-1.2.tar.gz c44300f798a3317c06e501eb0dd98a23 xsupplicant-1.2.1.tar.gz xsupplicant-1.2.1-docsfix.patch: Index: xsupplicant-1.2.1-docsfix.patch =================================================================== RCS file: /cvs/extras/rpms/xsupplicant/FC-3/xsupplicant-1.2.1-docsfix.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- xsupplicant-1.2.1-docsfix.patch 4 Sep 2005 13:17:38 -0000 1.1 +++ xsupplicant-1.2.1-docsfix.patch 4 Sep 2005 17:52:07 -0000 1.2 @@ -18,3 +18,13 @@ if [ $? -ne 0 ] then echo "Error! Build failed!" +--- xsupplicant-1.2.1/doc/xml-userguide/userguide.xml.BAD 2005-09-04 10:28:44.000000000 -0500 ++++ xsupplicant-1.2.1/doc/xml-userguide/userguide.xml 2005-09-04 10:28:53.000000000 -0500 +@@ -1,6 +1,6 @@ + + + From fedora-extras-commits at redhat.com Sun Sep 4 17:52:11 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sun, 4 Sep 2005 13:52:11 -0400 Subject: rpms/xsupplicant/FC-4 sources, 1.3, 1.4 xsupplicant-1.2.1-docsfix.patch, 1.1, 1.2 Message-ID: <200509041752.j84HqfMh004460@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/xsupplicant/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4392/FC-4 Modified Files: sources xsupplicant-1.2.1-docsfix.patch Log Message: Ugly docbook requires unique patches for all branches... but this should get us building again. Index: sources =================================================================== RCS file: /cvs/extras/rpms/xsupplicant/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 4 Sep 2005 13:17:39 -0000 1.3 +++ sources 4 Sep 2005 17:52:09 -0000 1.4 @@ -1,2 +1 @@ -e1eee37899b49ed238648699d0a01c5b xsupplicant-1.2.tar.gz c44300f798a3317c06e501eb0dd98a23 xsupplicant-1.2.1.tar.gz xsupplicant-1.2.1-docsfix.patch: Index: xsupplicant-1.2.1-docsfix.patch =================================================================== RCS file: /cvs/extras/rpms/xsupplicant/FC-4/xsupplicant-1.2.1-docsfix.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- xsupplicant-1.2.1-docsfix.patch 4 Sep 2005 13:17:39 -0000 1.1 +++ xsupplicant-1.2.1-docsfix.patch 4 Sep 2005 17:52:09 -0000 1.2 @@ -18,3 +18,13 @@ if [ $? -ne 0 ] then echo "Error! Build failed!" +--- xsupplicant-1.2.1/doc/xml-userguide/userguide.xml.BAD 2005-09-04 10:28:44.000000000 -0500 ++++ xsupplicant-1.2.1/doc/xml-userguide/userguide.xml 2005-09-04 10:28:53.000000000 -0500 +@@ -1,6 +1,6 @@ + + + From fedora-extras-commits at redhat.com Sun Sep 4 17:52:11 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sun, 4 Sep 2005 13:52:11 -0400 Subject: rpms/xsupplicant/devel sources, 1.3, 1.4 xsupplicant-1.2.1-docsfix.patch, 1.1, 1.2 xsupplicant.spec, 1.4, 1.5 Message-ID: <200509041752.j84HqgVI004468@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/xsupplicant/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4392/devel Modified Files: sources xsupplicant-1.2.1-docsfix.patch xsupplicant.spec Log Message: Ugly docbook requires unique patches for all branches... but this should get us building again. Index: sources =================================================================== RCS file: /cvs/extras/rpms/xsupplicant/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 4 Sep 2005 13:17:45 -0000 1.3 +++ sources 4 Sep 2005 17:52:09 -0000 1.4 @@ -1,2 +1 @@ -e1eee37899b49ed238648699d0a01c5b xsupplicant-1.2.tar.gz c44300f798a3317c06e501eb0dd98a23 xsupplicant-1.2.1.tar.gz xsupplicant-1.2.1-docsfix.patch: Index: xsupplicant-1.2.1-docsfix.patch =================================================================== RCS file: /cvs/extras/rpms/xsupplicant/devel/xsupplicant-1.2.1-docsfix.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- xsupplicant-1.2.1-docsfix.patch 4 Sep 2005 13:17:45 -0000 1.1 +++ xsupplicant-1.2.1-docsfix.patch 4 Sep 2005 17:52:09 -0000 1.2 @@ -18,3 +18,13 @@ if [ $? -ne 0 ] then echo "Error! Build failed!" +--- xsupplicant-1.2.1/doc/xml-userguide/userguide.xml.BAD 2005-09-04 10:28:44.000000000 -0500 ++++ xsupplicant-1.2.1/doc/xml-userguide/userguide.xml 2005-09-04 10:28:53.000000000 -0500 +@@ -1,6 +1,6 @@ + + + Index: xsupplicant.spec =================================================================== RCS file: /cvs/extras/rpms/xsupplicant/devel/xsupplicant.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- xsupplicant.spec 4 Sep 2005 13:57:31 -0000 1.4 +++ xsupplicant.spec 4 Sep 2005 17:52:09 -0000 1.5 @@ -54,6 +54,7 @@ %changelog * Sun Sep 4 2005 Tom "spot" Callaway 1.2.1-3 - BR: docbook-dtds, docbook-style-dsssl +- patch to use local docbookx.dtd * Sun Sep 4 2005 Tom "spot" Callaway 1.2.1-2 - the new doc generation tool has some new BR: openjade, elinks, jadetex From fedora-extras-commits at redhat.com Sun Sep 4 21:16:54 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sun, 4 Sep 2005 17:16:54 -0400 Subject: rpms/xsupplicant/FC-4 xsupplicant.spec,1.4,1.5 Message-ID: <200509042117.j84LHOoT010066@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/xsupplicant/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10027/FC-4 Modified Files: xsupplicant.spec Log Message: build for sparc. hahaha. just kidding. Index: xsupplicant.spec =================================================================== RCS file: /cvs/extras/rpms/xsupplicant/FC-4/xsupplicant.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- xsupplicant.spec 4 Sep 2005 13:57:26 -0000 1.4 +++ xsupplicant.spec 4 Sep 2005 21:16:52 -0000 1.5 @@ -54,6 +54,7 @@ %changelog * Sun Sep 4 2005 Tom "spot" Callaway 1.2.1-3 - BR: docbook-dtds, docbook-style-dsssl +- patch to use local docbookx.dtd * Sun Sep 4 2005 Tom "spot" Callaway 1.2.1-2 - the new doc generation tool has some new BR: openjade, elinks, jadetex From fedora-extras-commits at redhat.com Sun Sep 4 21:16:53 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sun, 4 Sep 2005 17:16:53 -0400 Subject: rpms/xsupplicant/FC-3 xsupplicant.spec,1.4,1.5 Message-ID: <200509042117.j84LHNVE010063@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/xsupplicant/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10027/FC-3 Modified Files: xsupplicant.spec Log Message: build for sparc. hahaha. just kidding. Index: xsupplicant.spec =================================================================== RCS file: /cvs/extras/rpms/xsupplicant/FC-3/xsupplicant.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- xsupplicant.spec 4 Sep 2005 13:57:25 -0000 1.4 +++ xsupplicant.spec 4 Sep 2005 21:16:51 -0000 1.5 @@ -54,6 +54,7 @@ %changelog * Sun Sep 4 2005 Tom "spot" Callaway 1.2.1-3 - BR: docbook-dtds, docbook-style-dsssl +- patch to use local docbookx.dtd * Sun Sep 4 2005 Tom "spot" Callaway 1.2.1-2 - the new doc generation tool has some new BR: openjade, elinks, jadetex From fedora-extras-commits at redhat.com Sun Sep 4 21:43:07 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sun, 4 Sep 2005 17:43:07 -0400 Subject: rpms/perl-Class-DBI-SQLite - New directory Message-ID: <200509042143.j84Lh7Tt010334@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Class-DBI-SQLite In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10314/perl-Class-DBI-SQLite Log Message: Directory /cvs/extras/rpms/perl-Class-DBI-SQLite added to the repository From fedora-extras-commits at redhat.com Sun Sep 4 21:43:08 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sun, 4 Sep 2005 17:43:08 -0400 Subject: rpms/perl-Class-DBI-SQLite/devel - New directory Message-ID: <200509042143.j84Lh87J010339@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Class-DBI-SQLite/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10314/perl-Class-DBI-SQLite/devel Log Message: Directory /cvs/extras/rpms/perl-Class-DBI-SQLite/devel added to the repository From fedora-extras-commits at redhat.com Sun Sep 4 21:43:23 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sun, 4 Sep 2005 17:43:23 -0400 Subject: rpms/perl-Class-DBI-SQLite Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200509042143.j84LhNmK010397@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Class-DBI-SQLite In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10359 Added Files: Makefile import.log Log Message: Setup of module perl-Class-DBI-SQLite --- NEW FILE Makefile --- # Top level Makefile for module perl-Class-DBI-SQLite all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Sun Sep 4 21:43:23 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sun, 4 Sep 2005 17:43:23 -0400 Subject: rpms/perl-Class-DBI-SQLite/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200509042143.j84LhNwu010402@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Class-DBI-SQLite/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10359/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-Class-DBI-SQLite --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Sun Sep 4 21:43:51 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sun, 4 Sep 2005 17:43:51 -0400 Subject: rpms/perl-Class-DBI-SQLite import.log,1.1,1.2 Message-ID: <200509042143.j84LhpPq010465@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Class-DBI-SQLite In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10430 Modified Files: import.log Log Message: auto-import perl-Class-DBI-SQLite-0.10-2 on branch devel from perl-Class-DBI-SQLite-0.10-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-Class-DBI-SQLite/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 4 Sep 2005 21:43:21 -0000 1.1 +++ import.log 4 Sep 2005 21:43:48 -0000 1.2 @@ -0,0 +1 @@ +perl-Class-DBI-SQLite-0_10-2:HEAD:perl-Class-DBI-SQLite-0.10-2.src.rpm:1125870218 From fedora-extras-commits at redhat.com Sun Sep 4 21:43:51 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sun, 4 Sep 2005 17:43:51 -0400 Subject: rpms/perl-Class-DBI-SQLite/devel perl-Class-DBI-SQLite.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200509042143.j84LhphK010472@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Class-DBI-SQLite/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10430/devel Modified Files: .cvsignore sources Added Files: perl-Class-DBI-SQLite.spec Log Message: auto-import perl-Class-DBI-SQLite-0.10-2 on branch devel from perl-Class-DBI-SQLite-0.10-2.src.rpm --- NEW FILE perl-Class-DBI-SQLite.spec --- Name: perl-Class-DBI-SQLite Version: 0.10 Release: 2%{?dist} Summary: Extension to Class::DBI for sqlite Group: Development/Libraries License: GPL or Artistic URL: http://search.cpan.org/dist/Class-DBI-SQLite/ Source0: http://search.cpan.org/CPAN/authors/id/M/MI/MIYAGAWA/Class-DBI-SQLite-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(Class::DBI), perl(DBD::SQLite) Requires: perl(DBD::SQLite) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description %{summary}. %prep %setup -q -n Class-DBI-SQLite-%{version} perldoc -t perlartistic > Artistic perldoc -t perlgpl > COPYING %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' chmod -R u+w $RPM_BUILD_ROOT/* %check make test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc Artistic COPYING Changes %{perl_vendorlib}/Class/DBI %{_mandir}/man3/*.3* %changelog * Sun Sep 4 2005 Tom "spot" Callaway 0.10-2 - add R: perl(DBD::SQLite) - remove R: perl(Class::DBI) * Thu Sep 1 2005 Tom "spot" Callaway 0.10-1 - bump to 0.10 * Thu Sep 1 2005 Paul Howarth 0.09-3 - remove redundant BR: perl - include license text - honor %%{?_smp_mflags} - include BR: perl(DBD::SQLite) * Fri Jul 8 2005 Tom "spot" Callaway 0.09-2 - cleanups * Wed Jul 6 2005 Tom "spot" Callaway 0.09-1 - Initial package for Fedora Extras Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Class-DBI-SQLite/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 4 Sep 2005 21:43:21 -0000 1.1 +++ .cvsignore 4 Sep 2005 21:43:49 -0000 1.2 @@ -0,0 +1 @@ +Class-DBI-SQLite-0.10.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Class-DBI-SQLite/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 4 Sep 2005 21:43:21 -0000 1.1 +++ sources 4 Sep 2005 21:43:49 -0000 1.2 @@ -0,0 +1 @@ +13ee636b0bfd08e0b9c6cf0e7429810a Class-DBI-SQLite-0.10.tar.gz From fedora-extras-commits at redhat.com Sun Sep 4 21:58:00 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sun, 4 Sep 2005 17:58:00 -0400 Subject: rpms/xsupplicant/devel xsupplicant-1.2.1-docsfix.patch, 1.2, 1.3 xsupplicant.spec, 1.5, 1.6 Message-ID: <200509042158.j84Lw0rH010580@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/xsupplicant/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10514/devel Modified Files: xsupplicant-1.2.1-docsfix.patch xsupplicant.spec Log Message: use lynx, not elinks xsupplicant-1.2.1-docsfix.patch: Index: xsupplicant-1.2.1-docsfix.patch =================================================================== RCS file: /cvs/extras/rpms/xsupplicant/devel/xsupplicant-1.2.1-docsfix.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- xsupplicant-1.2.1-docsfix.patch 4 Sep 2005 17:52:09 -0000 1.2 +++ xsupplicant-1.2.1-docsfix.patch 4 Sep 2005 21:57:58 -0000 1.3 @@ -9,15 +9,6 @@ SGML_CATALOG_FILES=/usr/sgml-tools/dtd/catalog:/etc/sgml/catalog:/usr/share/doc/openjade-1.3.2/catalog:/home/chris/t/docbook-dsssl-1.97/catalog mkdir -p html -@@ -33,7 +33,7 @@ - - # create the txt docs - echo -n "Building the TXT docs..." --lynx -dump -nolist html/Open1x-UserGuide.html > txt/Open1x-UserGuide.txt -+links -dump html/Open1x-UserGuide.html > txt/Open1x-UserGuide.txt - if [ $? -ne 0 ] - then - echo "Error! Build failed!" --- xsupplicant-1.2.1/doc/xml-userguide/userguide.xml.BAD 2005-09-04 10:28:44.000000000 -0500 +++ xsupplicant-1.2.1/doc/xml-userguide/userguide.xml 2005-09-04 10:28:53.000000000 -0500 @@ -1,6 +1,6 @@ Index: xsupplicant.spec =================================================================== RCS file: /cvs/extras/rpms/xsupplicant/devel/xsupplicant.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- xsupplicant.spec 4 Sep 2005 17:52:09 -0000 1.5 +++ xsupplicant.spec 4 Sep 2005 21:57:58 -0000 1.6 @@ -1,13 +1,13 @@ Name: xsupplicant Summary: Open Source Implementation of IEEE 802.1x Version: 1.2.1 -Release: 3%{?dist} +Release: 4%{?dist} License: GPL Group: System Environment/Base URL: http://www.open1x.org/ Source0: http://download.sourceforge.net/open1x/xsupplicant-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: openssl-devel, bison, flex, openjade, elinks, jadetex +BuildRequires: openssl-devel, bison, flex, openjade, lynx, jadetex BuildRequires: docbook-dtds, docbook-style-dsssl Patch0: xsupplicant-1.2.1-docsfix.patch Patch1: xsupplicant-1.2.1-gcc4-cleanups.patch @@ -52,6 +52,9 @@ %{_sbindir}/xsupplicant %changelog +* Sun Sep 4 2005 Tom "spot" Callaway 1.2.1-4 +- use lynx instead of elinks + * Sun Sep 4 2005 Tom "spot" Callaway 1.2.1-3 - BR: docbook-dtds, docbook-style-dsssl - patch to use local docbookx.dtd From fedora-extras-commits at redhat.com Sun Sep 4 21:57:54 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sun, 4 Sep 2005 17:57:54 -0400 Subject: rpms/xsupplicant/FC-3 xsupplicant-1.2.1-docsfix.patch, 1.2, 1.3 xsupplicant.spec, 1.5, 1.6 Message-ID: <200509042158.j84LwPXd010584@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/xsupplicant/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10514/FC-3 Modified Files: xsupplicant-1.2.1-docsfix.patch xsupplicant.spec Log Message: use lynx, not elinks xsupplicant-1.2.1-docsfix.patch: Index: xsupplicant-1.2.1-docsfix.patch =================================================================== RCS file: /cvs/extras/rpms/xsupplicant/FC-3/xsupplicant-1.2.1-docsfix.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- xsupplicant-1.2.1-docsfix.patch 4 Sep 2005 17:52:07 -0000 1.2 +++ xsupplicant-1.2.1-docsfix.patch 4 Sep 2005 21:57:52 -0000 1.3 @@ -9,15 +9,6 @@ SGML_CATALOG_FILES=/usr/sgml-tools/dtd/catalog:/etc/sgml/catalog:/usr/share/doc/openjade-1.3.2/catalog:/home/chris/t/docbook-dsssl-1.97/catalog mkdir -p html -@@ -33,7 +33,7 @@ - - # create the txt docs - echo -n "Building the TXT docs..." --lynx -dump -nolist html/Open1x-UserGuide.html > txt/Open1x-UserGuide.txt -+links -dump html/Open1x-UserGuide.html > txt/Open1x-UserGuide.txt - if [ $? -ne 0 ] - then - echo "Error! Build failed!" --- xsupplicant-1.2.1/doc/xml-userguide/userguide.xml.BAD 2005-09-04 10:28:44.000000000 -0500 +++ xsupplicant-1.2.1/doc/xml-userguide/userguide.xml 2005-09-04 10:28:53.000000000 -0500 @@ -1,6 +1,6 @@ Index: xsupplicant.spec =================================================================== RCS file: /cvs/extras/rpms/xsupplicant/FC-3/xsupplicant.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- xsupplicant.spec 4 Sep 2005 21:16:51 -0000 1.5 +++ xsupplicant.spec 4 Sep 2005 21:57:52 -0000 1.6 @@ -1,13 +1,13 @@ Name: xsupplicant Summary: Open Source Implementation of IEEE 802.1x Version: 1.2.1 -Release: 3%{?dist} +Release: 4%{?dist} License: GPL Group: System Environment/Base URL: http://www.open1x.org/ Source0: http://download.sourceforge.net/open1x/xsupplicant-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: openssl-devel, bison, flex, openjade, elinks, jadetex +BuildRequires: openssl-devel, bison, flex, openjade, lynx, jadetex BuildRequires: docbook-dtds, docbook-style-dsssl Patch0: xsupplicant-1.2.1-docsfix.patch Patch1: xsupplicant-1.2.1-gcc4-cleanups.patch @@ -52,6 +52,9 @@ %{_sbindir}/xsupplicant %changelog +* Sun Sep 4 2005 Tom "spot" Callaway 1.2.1-4 +- use lynx instead of elinks + * Sun Sep 4 2005 Tom "spot" Callaway 1.2.1-3 - BR: docbook-dtds, docbook-style-dsssl - patch to use local docbookx.dtd From fedora-extras-commits at redhat.com Sun Sep 4 21:57:55 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sun, 4 Sep 2005 17:57:55 -0400 Subject: rpms/xsupplicant/FC-4 xsupplicant-1.2.1-docsfix.patch, 1.2, 1.3 xsupplicant.spec, 1.5, 1.6 Message-ID: <200509042158.j84LwPe1010588@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/xsupplicant/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10514/FC-4 Modified Files: xsupplicant-1.2.1-docsfix.patch xsupplicant.spec Log Message: use lynx, not elinks xsupplicant-1.2.1-docsfix.patch: Index: xsupplicant-1.2.1-docsfix.patch =================================================================== RCS file: /cvs/extras/rpms/xsupplicant/FC-4/xsupplicant-1.2.1-docsfix.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- xsupplicant-1.2.1-docsfix.patch 4 Sep 2005 17:52:09 -0000 1.2 +++ xsupplicant-1.2.1-docsfix.patch 4 Sep 2005 21:57:53 -0000 1.3 @@ -9,15 +9,6 @@ SGML_CATALOG_FILES=/usr/sgml-tools/dtd/catalog:/etc/sgml/catalog:/usr/share/doc/openjade-1.3.2/catalog:/home/chris/t/docbook-dsssl-1.97/catalog mkdir -p html -@@ -33,7 +33,7 @@ - - # create the txt docs - echo -n "Building the TXT docs..." --lynx -dump -nolist html/Open1x-UserGuide.html > txt/Open1x-UserGuide.txt -+links -dump html/Open1x-UserGuide.html > txt/Open1x-UserGuide.txt - if [ $? -ne 0 ] - then - echo "Error! Build failed!" --- xsupplicant-1.2.1/doc/xml-userguide/userguide.xml.BAD 2005-09-04 10:28:44.000000000 -0500 +++ xsupplicant-1.2.1/doc/xml-userguide/userguide.xml 2005-09-04 10:28:53.000000000 -0500 @@ -1,6 +1,6 @@ Index: xsupplicant.spec =================================================================== RCS file: /cvs/extras/rpms/xsupplicant/FC-4/xsupplicant.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- xsupplicant.spec 4 Sep 2005 21:16:52 -0000 1.5 +++ xsupplicant.spec 4 Sep 2005 21:57:53 -0000 1.6 @@ -1,13 +1,13 @@ Name: xsupplicant Summary: Open Source Implementation of IEEE 802.1x Version: 1.2.1 -Release: 3%{?dist} +Release: 4%{?dist} License: GPL Group: System Environment/Base URL: http://www.open1x.org/ Source0: http://download.sourceforge.net/open1x/xsupplicant-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: openssl-devel, bison, flex, openjade, elinks, jadetex +BuildRequires: openssl-devel, bison, flex, openjade, lynx, jadetex BuildRequires: docbook-dtds, docbook-style-dsssl Patch0: xsupplicant-1.2.1-docsfix.patch Patch1: xsupplicant-1.2.1-gcc4-cleanups.patch @@ -52,6 +52,9 @@ %{_sbindir}/xsupplicant %changelog +* Sun Sep 4 2005 Tom "spot" Callaway 1.2.1-4 +- use lynx instead of elinks + * Sun Sep 4 2005 Tom "spot" Callaway 1.2.1-3 - BR: docbook-dtds, docbook-style-dsssl - patch to use local docbookx.dtd From fedora-extras-commits at redhat.com Sun Sep 4 21:59:48 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sun, 4 Sep 2005 17:59:48 -0400 Subject: owners owners.list,1.166,1.167 Message-ID: <200509042159.j84LxmWh010618@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10599 Modified Files: owners.list Log Message: perl-Class-DBI-SQLite Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.166 retrieving revision 1.167 diff -u -r1.166 -r1.167 --- owners.list 3 Sep 2005 23:48:52 -0000 1.166 +++ owners.list 4 Sep 2005 21:59:46 -0000 1.167 @@ -570,6 +570,7 @@ Fedora Extras|perl-Class-DBI|Simple Database Abstraction|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Class-DBI-Plugin|Abstract base class for Class::DBI plugins|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Class-DBI-Plugin-Type|Determine type information for columns|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-Class-DBI-SQLite|Extension to Class::DBI for sqlite|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Class-MethodMaker|Create generic methods for OO Perl|dgregor at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Class-ReturnValue|Class::ReturnValue Perl module|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Class-Trigger|Mixin to add / call inheritable triggers|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com From fedora-extras-commits at redhat.com Mon Sep 5 00:18:57 2005 From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma)) Date: Sun, 4 Sep 2005 20:18:57 -0400 Subject: rpms/grhino/devel grhino-configure-gettext.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 grhino.desktop, 1.1, 1.2 grhino.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200509050018.j850Iv04015132@cvs-int.fedora.redhat.com> Author: salimma Update of /cvs/extras/rpms/grhino/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15105 Modified Files: .cvsignore grhino.desktop grhino.spec sources Added Files: grhino-configure-gettext.patch Log Message: * Sun Sep 4 2005 Michel Salim - 0.15.0-3 - removed references to copyrighted name - packaged modified tarball to prevent trademark infringement - patched configure to fix gettext detection on x86_64 grhino-configure-gettext.patch: --- NEW FILE grhino-configure-gettext.patch --- --- grhino-0.15.0/configure.orig 2005-04-15 09:03:04.000000000 -0500 +++ grhino-0.15.0/configure 2005-09-04 18:39:11.000000000 -0500 @@ -6310,6 +6310,8 @@ echo "$as_me:$LINENO: checking for GNU gettext in libc" >&5 echo $ECHO_N "checking for GNU gettext in libc... $ECHO_C" >&6 +# Force detection of gettext, since the test fails on x86_64 for FC4+ +gt_cv_func_gnugettext1_libc=yes if test "${gt_cv_func_gnugettext1_libc+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/grhino/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 3 Sep 2005 23:40:58 -0000 1.2 +++ .cvsignore 5 Sep 2005 00:18:55 -0000 1.3 @@ -1 +1 @@ -grhino-0.15.0.tar.gz +grhino-0.15.0.tar.bz2 Index: grhino.desktop =================================================================== RCS file: /cvs/extras/rpms/grhino/devel/grhino.desktop,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- grhino.desktop 3 Sep 2005 23:40:58 -0000 1.1 +++ grhino.desktop 5 Sep 2005 00:18:55 -0000 1.2 @@ -1,8 +1,8 @@ [Desktop Entry] Encoding=UTF-8 Name=GRhino -GenericName=GNOME2 Othello/Reversi game -Comment=An Othello/Reversi game for GNOME 2 +GenericName=GTP-compliant Reversi game +Comment=Reversi game for GNOME, supporting the Go/Game Text Protocol Exec=grhino #Icon= Terminal=false Index: grhino.spec =================================================================== RCS file: /cvs/extras/rpms/grhino/devel/grhino.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- grhino.spec 3 Sep 2005 23:40:58 -0000 1.1 +++ grhino.spec 5 Sep 2005 00:18:55 -0000 1.2 @@ -1,14 +1,16 @@ Name: grhino Version: 0.15.0 -Release: 2%{?dist} -Summary: Othello/Reversi game +Release: 3%{?dist} +Summary: Reversi game for GNOME, supporting the Go/Game Text Protocol Group: Amusements/Games License: GPL URL: http://rhino.sourceforge.net/ -Source0: http://dl.sourceforge.net/rhino/grhino-%{version}.tar.gz +#Source0: http://dl.sourceforge.net/rhino/grhino-%{version}.tar.gz +Source0: grhino-%{version}.tar.bz2 Source1: %{name}.desktop Patch0: grhino-Makefile-in.patch +Patch1: grhino-configure-gettext.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils @@ -19,12 +21,12 @@ Requires(postun): scrollkeeper %description -GRhino, or Rhino its former name, is an Othello/Reversi game on Linux and other +GRhino, or Rhino its former name, is a Reversi game on Linux and other UNIX-like systems as long as GNOME 2 libraries are installed. It is currently under development and a new version is available occasionally. -What distinguish GRhino from most other Othello games is that GRhino will be -targeted for experienced Othello players. Strong AI is the main focus with some +What distinguish GRhino from most other Reversi games is that GRhino will be +targeted for experienced Reversi players. Strong AI is the main focus with some additional good, useful features (like an endgame solver) is planned. The ultimate target strength of the AI is that it should be able to beat the best human player at the highest difficulty level. Beating Logistello (the strongest @@ -33,12 +35,10 @@ GRhino supports the Go/Game Text Protocol (GTP), allowing it to be used as an engine for a GTP-compliant controller like Quarry. -Othello is a registered trademark of Tsukuda Original, licensed by Anjar Co., -copyright 1973, 1990 Pressman Toy Corporation. - %prep %setup -q %patch0 -p1 +%patch1 -p1 %build @@ -85,6 +85,11 @@ %changelog +* Sun Sep 4 2005 Michel Salim - 0.15.0-3 +- removed references to copyrighted name +- packaged modified tarball to prevent trademark infringement +- patched configure to fix gettext detection on x86_64 + * Fri Sep 2 2005 Michel Salim - 0.15.0-2 - changed BuildReq from libgnome-devel to libgnomeui-devel, which requires the former Index: sources =================================================================== RCS file: /cvs/extras/rpms/grhino/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 3 Sep 2005 23:40:58 -0000 1.2 +++ sources 5 Sep 2005 00:18:55 -0000 1.3 @@ -1 +1 @@ -9f510356c0cfafe32165a582d872655f grhino-0.15.0.tar.gz +924f8288d479b8a99fb4bacb2b9f291f grhino-0.15.0.tar.bz2 From fedora-extras-commits at redhat.com Mon Sep 5 00:29:08 2005 From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma)) Date: Sun, 4 Sep 2005 20:29:08 -0400 Subject: rpms/grhino/FC-4 .cvsignore, 1.2, 1.3 grhino.desktop, 1.1, 1.2 grhino.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200509050029.j850T8Kf015229@cvs-int.fedora.redhat.com> Author: salimma Update of /cvs/extras/rpms/grhino/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15204 Modified Files: .cvsignore grhino.desktop grhino.spec sources Log Message: * Sun Sep 4 2005 Michel Salim - 0.15.0-3 - removed references to copyrighted name - packaged modified tarball to prevent trademark infringement - patched configure to fix gettext detection on x86_64 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/grhino/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 3 Sep 2005 23:40:58 -0000 1.2 +++ .cvsignore 5 Sep 2005 00:29:06 -0000 1.3 @@ -1 +1 @@ -grhino-0.15.0.tar.gz +grhino-0.15.0.tar.bz2 Index: grhino.desktop =================================================================== RCS file: /cvs/extras/rpms/grhino/FC-4/grhino.desktop,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- grhino.desktop 3 Sep 2005 23:40:58 -0000 1.1 +++ grhino.desktop 5 Sep 2005 00:29:06 -0000 1.2 @@ -1,8 +1,8 @@ [Desktop Entry] Encoding=UTF-8 Name=GRhino -GenericName=GNOME2 Othello/Reversi game -Comment=An Othello/Reversi game for GNOME 2 +GenericName=GTP-compliant Reversi game +Comment=Reversi game for GNOME, supporting the Go/Game Text Protocol Exec=grhino #Icon= Terminal=false Index: grhino.spec =================================================================== RCS file: /cvs/extras/rpms/grhino/FC-4/grhino.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- grhino.spec 3 Sep 2005 23:40:58 -0000 1.1 +++ grhino.spec 5 Sep 2005 00:29:06 -0000 1.2 @@ -1,14 +1,16 @@ Name: grhino Version: 0.15.0 -Release: 2%{?dist} -Summary: Othello/Reversi game +Release: 3%{?dist} +Summary: Reversi game for GNOME, supporting the Go/Game Text Protocol Group: Amusements/Games License: GPL URL: http://rhino.sourceforge.net/ -Source0: http://dl.sourceforge.net/rhino/grhino-%{version}.tar.gz +#Source0: http://dl.sourceforge.net/rhino/grhino-%{version}.tar.gz +Source0: grhino-%{version}.tar.bz2 Source1: %{name}.desktop Patch0: grhino-Makefile-in.patch +Patch1: grhino-configure-gettext.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils @@ -19,12 +21,12 @@ Requires(postun): scrollkeeper %description -GRhino, or Rhino its former name, is an Othello/Reversi game on Linux and other +GRhino, or Rhino its former name, is a Reversi game on Linux and other UNIX-like systems as long as GNOME 2 libraries are installed. It is currently under development and a new version is available occasionally. -What distinguish GRhino from most other Othello games is that GRhino will be -targeted for experienced Othello players. Strong AI is the main focus with some +What distinguish GRhino from most other Reversi games is that GRhino will be +targeted for experienced Reversi players. Strong AI is the main focus with some additional good, useful features (like an endgame solver) is planned. The ultimate target strength of the AI is that it should be able to beat the best human player at the highest difficulty level. Beating Logistello (the strongest @@ -33,12 +35,10 @@ GRhino supports the Go/Game Text Protocol (GTP), allowing it to be used as an engine for a GTP-compliant controller like Quarry. -Othello is a registered trademark of Tsukuda Original, licensed by Anjar Co., -copyright 1973, 1990 Pressman Toy Corporation. - %prep %setup -q %patch0 -p1 +%patch1 -p1 %build @@ -85,6 +85,11 @@ %changelog +* Sun Sep 4 2005 Michel Salim - 0.15.0-3 +- removed references to copyrighted name +- packaged modified tarball to prevent trademark infringement +- patched configure to fix gettext detection on x86_64 + * Fri Sep 2 2005 Michel Salim - 0.15.0-2 - changed BuildReq from libgnome-devel to libgnomeui-devel, which requires the former Index: sources =================================================================== RCS file: /cvs/extras/rpms/grhino/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 3 Sep 2005 23:40:58 -0000 1.2 +++ sources 5 Sep 2005 00:29:06 -0000 1.3 @@ -1 +1 @@ -9f510356c0cfafe32165a582d872655f grhino-0.15.0.tar.gz +924f8288d479b8a99fb4bacb2b9f291f grhino-0.15.0.tar.bz2 From fedora-extras-commits at redhat.com Mon Sep 5 00:30:15 2005 From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma)) Date: Sun, 4 Sep 2005 20:30:15 -0400 Subject: rpms/grhino/FC-4 grhino-configure-gettext.patch,NONE,1.1 Message-ID: <200509050030.j850UFJc015289@cvs-int.fedora.redhat.com> Author: salimma Update of /cvs/extras/rpms/grhino/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15269 Added Files: grhino-configure-gettext.patch Log Message: Added left-out configure-gettext patch grhino-configure-gettext.patch: --- NEW FILE grhino-configure-gettext.patch --- --- grhino-0.15.0/configure.orig 2005-04-15 09:03:04.000000000 -0500 +++ grhino-0.15.0/configure 2005-09-04 18:39:11.000000000 -0500 @@ -6310,6 +6310,8 @@ echo "$as_me:$LINENO: checking for GNU gettext in libc" >&5 echo $ECHO_N "checking for GNU gettext in libc... $ECHO_C" >&6 +# Force detection of gettext, since the test fails on x86_64 for FC4+ +gt_cv_func_gnugettext1_libc=yes if test "${gt_cv_func_gnugettext1_libc+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else From fedora-extras-commits at redhat.com Mon Sep 5 00:37:54 2005 From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma)) Date: Sun, 4 Sep 2005 20:37:54 -0400 Subject: rpms/grhino/FC-3 grhino-cleanup.sh, NONE, 1.1 grhino-configure-gettext.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 grhino.desktop, 1.1, 1.2 grhino.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200509050037.j850bso1015429@cvs-int.fedora.redhat.com> Author: salimma Update of /cvs/extras/rpms/grhino/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15400 Modified Files: .cvsignore grhino.desktop grhino.spec sources Added Files: grhino-cleanup.sh grhino-configure-gettext.patch Log Message: * Sun Sep 4 2005 Michel Salim - 0.15.0-3 - removed references to copyrighted name - packaged modified tarball to prevent trademark infringement - patched configure to fix gettext detection on x86_64 --- NEW FILE grhino-cleanup.sh --- #!/bin/sh # Replaces occurences of trademarked names find . -name '*.po*' -print | while read i; do sed -i 's|An\ Othello\/Reversi|A\ Reversi|g' $i; done find . -name '*.cc' -print | while read i; do sed -i 's|An\ Othello\/Reversi|A\ Reversi|g' $i; done find . -name '*.xml' -print | while read i; do sed -i 's|an\ Othello\/Reversi|a\ Reversi|g' $i; sed -i 's|Othello\/Reversi|Reversi|g' $i; sed -i 's|Othello|Reversi|g' $i; done find . -name '*.omf*' -print | while read i; do sed -i 's|Othello\/Reversi|Reversi|g' $i; done grhino-configure-gettext.patch: --- NEW FILE grhino-configure-gettext.patch --- --- grhino-0.15.0/configure.orig 2005-04-15 09:03:04.000000000 -0500 +++ grhino-0.15.0/configure 2005-09-04 18:39:11.000000000 -0500 @@ -6310,6 +6310,8 @@ echo "$as_me:$LINENO: checking for GNU gettext in libc" >&5 echo $ECHO_N "checking for GNU gettext in libc... $ECHO_C" >&6 +# Force detection of gettext, since the test fails on x86_64 for FC4+ +gt_cv_func_gnugettext1_libc=yes if test "${gt_cv_func_gnugettext1_libc+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/grhino/FC-3/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 3 Sep 2005 23:40:58 -0000 1.2 +++ .cvsignore 5 Sep 2005 00:37:52 -0000 1.3 @@ -1 +1 @@ -grhino-0.15.0.tar.gz +grhino-0.15.0.tar.bz2 Index: grhino.desktop =================================================================== RCS file: /cvs/extras/rpms/grhino/FC-3/grhino.desktop,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- grhino.desktop 3 Sep 2005 23:40:58 -0000 1.1 +++ grhino.desktop 5 Sep 2005 00:37:52 -0000 1.2 @@ -1,8 +1,8 @@ [Desktop Entry] Encoding=UTF-8 Name=GRhino -GenericName=GNOME2 Othello/Reversi game -Comment=An Othello/Reversi game for GNOME 2 +GenericName=GTP-compliant Reversi game +Comment=Reversi game for GNOME, supporting the Go/Game Text Protocol Exec=grhino #Icon= Terminal=false Index: grhino.spec =================================================================== RCS file: /cvs/extras/rpms/grhino/FC-3/grhino.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- grhino.spec 3 Sep 2005 23:40:58 -0000 1.1 +++ grhino.spec 5 Sep 2005 00:37:52 -0000 1.2 @@ -1,14 +1,16 @@ Name: grhino Version: 0.15.0 -Release: 2%{?dist} -Summary: Othello/Reversi game +Release: 3%{?dist} +Summary: Reversi game for GNOME, supporting the Go/Game Text Protocol Group: Amusements/Games License: GPL URL: http://rhino.sourceforge.net/ -Source0: http://dl.sourceforge.net/rhino/grhino-%{version}.tar.gz +#Source0: http://dl.sourceforge.net/rhino/grhino-%{version}.tar.gz +Source0: grhino-%{version}.tar.bz2 Source1: %{name}.desktop Patch0: grhino-Makefile-in.patch +Patch1: grhino-configure-gettext.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils @@ -19,12 +21,12 @@ Requires(postun): scrollkeeper %description -GRhino, or Rhino its former name, is an Othello/Reversi game on Linux and other +GRhino, or Rhino its former name, is a Reversi game on Linux and other UNIX-like systems as long as GNOME 2 libraries are installed. It is currently under development and a new version is available occasionally. -What distinguish GRhino from most other Othello games is that GRhino will be -targeted for experienced Othello players. Strong AI is the main focus with some +What distinguish GRhino from most other Reversi games is that GRhino will be +targeted for experienced Reversi players. Strong AI is the main focus with some additional good, useful features (like an endgame solver) is planned. The ultimate target strength of the AI is that it should be able to beat the best human player at the highest difficulty level. Beating Logistello (the strongest @@ -33,12 +35,10 @@ GRhino supports the Go/Game Text Protocol (GTP), allowing it to be used as an engine for a GTP-compliant controller like Quarry. -Othello is a registered trademark of Tsukuda Original, licensed by Anjar Co., -copyright 1973, 1990 Pressman Toy Corporation. - %prep %setup -q %patch0 -p1 +%patch1 -p1 %build @@ -85,6 +85,11 @@ %changelog +* Sun Sep 4 2005 Michel Salim - 0.15.0-3 +- removed references to copyrighted name +- packaged modified tarball to prevent trademark infringement +- patched configure to fix gettext detection on x86_64 + * Fri Sep 2 2005 Michel Salim - 0.15.0-2 - changed BuildReq from libgnome-devel to libgnomeui-devel, which requires the former Index: sources =================================================================== RCS file: /cvs/extras/rpms/grhino/FC-3/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 3 Sep 2005 23:40:58 -0000 1.2 +++ sources 5 Sep 2005 00:37:52 -0000 1.3 @@ -1 +1 @@ -9f510356c0cfafe32165a582d872655f grhino-0.15.0.tar.gz +924f8288d479b8a99fb4bacb2b9f291f grhino-0.15.0.tar.bz2 From fedora-extras-commits at redhat.com Mon Sep 5 00:41:59 2005 From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma)) Date: Sun, 4 Sep 2005 20:41:59 -0400 Subject: rpms/grhino/FC-4 grhino-cleanup.sh,NONE,1.1 Message-ID: <200509050041.j850fxXM015533@cvs-int.fedora.redhat.com> Author: salimma Update of /cvs/extras/rpms/grhino/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15515 Added Files: grhino-cleanup.sh Log Message: Added missed-out cleanup script --- NEW FILE grhino-cleanup.sh --- #!/bin/sh # Replaces occurences of trademarked names find . -name '*.po*' -print | while read i; do sed -i 's|An\ Othello\/Reversi|A\ Reversi|g' $i; done find . -name '*.cc' -print | while read i; do sed -i 's|An\ Othello\/Reversi|A\ Reversi|g' $i; done find . -name '*.xml' -print | while read i; do sed -i 's|an\ Othello\/Reversi|a\ Reversi|g' $i; sed -i 's|Othello\/Reversi|Reversi|g' $i; sed -i 's|Othello|Reversi|g' $i; done find . -name '*.omf*' -print | while read i; do sed -i 's|Othello\/Reversi|Reversi|g' $i; done From fedora-extras-commits at redhat.com Mon Sep 5 01:32:09 2005 From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma)) Date: Sun, 4 Sep 2005 21:32:09 -0400 Subject: rpms/grhino/FC-4 grhino.spec,1.2,1.3 Message-ID: <200509050132.j851W9PI017190@cvs-int.fedora.redhat.com> Author: salimma Update of /cvs/extras/rpms/grhino/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17171 Modified Files: grhino.spec Log Message: * Sun Sep 4 2005 Michel Salim - 0.15.0-3.1 - subrevision bump to fix CVS tag mistake Index: grhino.spec =================================================================== RCS file: /cvs/extras/rpms/grhino/FC-4/grhino.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- grhino.spec 5 Sep 2005 00:29:06 -0000 1.2 +++ grhino.spec 5 Sep 2005 01:32:07 -0000 1.3 @@ -1,6 +1,6 @@ Name: grhino Version: 0.15.0 -Release: 3%{?dist} +Release: 3.1%{?dist} Summary: Reversi game for GNOME, supporting the Go/Game Text Protocol Group: Amusements/Games @@ -85,6 +85,9 @@ %changelog +* Sun Sep 4 2005 Michel Salim - 0.15.0-3.1 +- subrevision bump to fix CVS tag mistake + * Sun Sep 4 2005 Michel Salim - 0.15.0-3 - removed references to copyrighted name - packaged modified tarball to prevent trademark infringement From fedora-extras-commits at redhat.com Mon Sep 5 02:43:42 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sun, 4 Sep 2005 22:43:42 -0400 Subject: rpms/perl-CGI-Simple/devel perl-CGI-Simple.spec,1.1,1.2 Message-ID: <200509050243.j852hgPH018684@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-CGI-Simple/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18631/devel Modified Files: perl-CGI-Simple.spec Log Message: License texts, remove BR: perl Index: perl-CGI-Simple.spec =================================================================== RCS file: /cvs/extras/rpms/perl-CGI-Simple/devel/perl-CGI-Simple.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-CGI-Simple.spec 30 Jul 2005 03:09:34 -0000 1.1 +++ perl-CGI-Simple.spec 5 Sep 2005 02:43:40 -0000 1.2 @@ -1,6 +1,6 @@ Name: perl-CGI-Simple Version: 0.077 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Simple totally OO CGI interface that is CGI.pm compliant Group: Development/Libraries License: GPL or Artistic @@ -9,7 +9,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -BuildRequires: perl >= 1:5.6.1 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description @@ -18,6 +17,8 @@ %prep %setup -q -n Cgi-Simple-%{version} chmod -x Changes README cgi-simple_vs_cgi-pm.html Simple.pm Simple/*.pm +perldoc -t perlartistic > Artistic +perldoc -t perlgpl > COPYING %build %{__perl} Makefile.PL INSTALLDIRS=vendor @@ -38,12 +39,16 @@ %files %defattr(-,root,root,-) -%doc Changes README cgi-simple_vs_cgi-pm.html +%doc Artistic COPYING Changes README cgi-simple_vs_cgi-pm.html %{perl_vendorlib}/CGI %{_mandir}/man3/*.3* %changelog +* Sun Sep 4 2005 Tom "spot" Callaway 0.077-5 +- remove BR: perl +- add license texts + * Fri Jul 29 2005 Tom "spot" Callaway 0.077-4 - cleanup chmod -x From fedora-extras-commits at redhat.com Mon Sep 5 02:43:36 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sun, 4 Sep 2005 22:43:36 -0400 Subject: rpms/perl-CGI-Simple/FC-3 perl-CGI-Simple.spec,1.1,1.2 Message-ID: <200509050244.j852i7I4018687@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-CGI-Simple/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18631/FC-3 Modified Files: perl-CGI-Simple.spec Log Message: License texts, remove BR: perl Index: perl-CGI-Simple.spec =================================================================== RCS file: /cvs/extras/rpms/perl-CGI-Simple/FC-3/perl-CGI-Simple.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-CGI-Simple.spec 30 Jul 2005 03:09:34 -0000 1.1 +++ perl-CGI-Simple.spec 5 Sep 2005 02:43:34 -0000 1.2 @@ -1,6 +1,6 @@ Name: perl-CGI-Simple Version: 0.077 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Simple totally OO CGI interface that is CGI.pm compliant Group: Development/Libraries License: GPL or Artistic @@ -9,7 +9,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -BuildRequires: perl >= 1:5.6.1 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description @@ -18,6 +17,8 @@ %prep %setup -q -n Cgi-Simple-%{version} chmod -x Changes README cgi-simple_vs_cgi-pm.html Simple.pm Simple/*.pm +perldoc -t perlartistic > Artistic +perldoc -t perlgpl > COPYING %build %{__perl} Makefile.PL INSTALLDIRS=vendor @@ -38,12 +39,16 @@ %files %defattr(-,root,root,-) -%doc Changes README cgi-simple_vs_cgi-pm.html +%doc Artistic COPYING Changes README cgi-simple_vs_cgi-pm.html %{perl_vendorlib}/CGI %{_mandir}/man3/*.3* %changelog +* Sun Sep 4 2005 Tom "spot" Callaway 0.077-5 +- remove BR: perl +- add license texts + * Fri Jul 29 2005 Tom "spot" Callaway 0.077-4 - cleanup chmod -x From fedora-extras-commits at redhat.com Mon Sep 5 02:43:37 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sun, 4 Sep 2005 22:43:37 -0400 Subject: rpms/perl-CGI-Simple/FC-4 perl-CGI-Simple.spec,1.1,1.2 Message-ID: <200509050244.j852i7IW018690@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-CGI-Simple/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18631/FC-4 Modified Files: perl-CGI-Simple.spec Log Message: License texts, remove BR: perl Index: perl-CGI-Simple.spec =================================================================== RCS file: /cvs/extras/rpms/perl-CGI-Simple/FC-4/perl-CGI-Simple.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-CGI-Simple.spec 30 Jul 2005 03:09:34 -0000 1.1 +++ perl-CGI-Simple.spec 5 Sep 2005 02:43:35 -0000 1.2 @@ -1,6 +1,6 @@ Name: perl-CGI-Simple Version: 0.077 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Simple totally OO CGI interface that is CGI.pm compliant Group: Development/Libraries License: GPL or Artistic @@ -9,7 +9,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -BuildRequires: perl >= 1:5.6.1 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description @@ -18,6 +17,8 @@ %prep %setup -q -n Cgi-Simple-%{version} chmod -x Changes README cgi-simple_vs_cgi-pm.html Simple.pm Simple/*.pm +perldoc -t perlartistic > Artistic +perldoc -t perlgpl > COPYING %build %{__perl} Makefile.PL INSTALLDIRS=vendor @@ -38,12 +39,16 @@ %files %defattr(-,root,root,-) -%doc Changes README cgi-simple_vs_cgi-pm.html +%doc Artistic COPYING Changes README cgi-simple_vs_cgi-pm.html %{perl_vendorlib}/CGI %{_mandir}/man3/*.3* %changelog +* Sun Sep 4 2005 Tom "spot" Callaway 0.077-5 +- remove BR: perl +- add license texts + * Fri Jul 29 2005 Tom "spot" Callaway 0.077-4 - cleanup chmod -x From fedora-extras-commits at redhat.com Mon Sep 5 02:54:39 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sun, 4 Sep 2005 22:54:39 -0400 Subject: rpms/c-ares/FC-3 c-ares.spec,1.3,1.4 sources,1.2,1.3 Message-ID: <200509050254.j852sdp9018904@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/c-ares/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18852/FC-3 Modified Files: c-ares.spec sources Log Message: Add license, bump to 1.3.0 Index: c-ares.spec =================================================================== RCS file: /cvs/extras/rpms/c-ares/FC-3/c-ares.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- c-ares.spec 31 May 2005 14:45:24 -0000 1.3 +++ c-ares.spec 5 Sep 2005 02:54:37 -0000 1.4 @@ -1,11 +1,12 @@ Summary: A library that performs asynchronous DNS operations Name: c-ares -Version: 1.2.1 -Release: 4%{?dist} +Version: 1.3.0 +Release: 1%{?dist} License: MIT Group: System Environment/Libraries URL: http://daniel.haxx.se/projects/c-ares/ -Source0: http://daniel.haxx.se/projects/c-ares/c-ares-1.2.1.tar.gz +Source0: http://daniel.haxx.se/projects/c-ares/c-ares-%{version}.tar.gz +Source1: LICENSE BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description @@ -24,6 +25,7 @@ %prep %setup -q +cp %{SOURCE1} . %build %configure --enable-shared @@ -42,7 +44,7 @@ %files %defattr(-, root, root) -%doc README README.cares CHANGES NEWS +%doc README README.cares CHANGES NEWS LICENSE %{_libdir}/*.so.* %files devel @@ -54,6 +56,10 @@ %{_mandir}/man3/ares_* %changelog +* Sun Sep 4 2005 Tom "spot" Callaway 1.3.0-1 +- include LICENSE text +- bump to 1.3.0 + * Tue May 31 2005 Tom "spot" Callaway 1.2.1-4 - use dist tag to prevent EVR overlap Index: sources =================================================================== RCS file: /cvs/extras/rpms/c-ares/FC-3/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 22 Apr 2005 19:34:04 -0000 1.2 +++ sources 5 Sep 2005 02:54:37 -0000 1.3 @@ -1 +1 @@ -8269643c78a02a1745e24fb4e2367ab0 c-ares-1.2.1.tar.gz +badb4563a02d4188b478df31fa1b657d c-ares-1.3.0.tar.gz From fedora-extras-commits at redhat.com Mon Sep 5 02:54:40 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sun, 4 Sep 2005 22:54:40 -0400 Subject: rpms/c-ares/devel .cvsignore, 1.2, 1.3 c-ares.spec, 1.3, 1.4 sources, 1.2, 1.3 Message-ID: <200509050254.j852se5h018917@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/c-ares/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18852/devel Modified Files: .cvsignore c-ares.spec sources Log Message: Add license, bump to 1.3.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/c-ares/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 22 Apr 2005 19:34:04 -0000 1.2 +++ .cvsignore 5 Sep 2005 02:54:37 -0000 1.3 @@ -1 +1,2 @@ c-ares-1.2.1.tar.gz +c-ares-1.3.0.tar.gz Index: c-ares.spec =================================================================== RCS file: /cvs/extras/rpms/c-ares/devel/c-ares.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- c-ares.spec 31 May 2005 14:45:25 -0000 1.3 +++ c-ares.spec 5 Sep 2005 02:54:37 -0000 1.4 @@ -1,11 +1,12 @@ Summary: A library that performs asynchronous DNS operations Name: c-ares -Version: 1.2.1 -Release: 4%{?dist} +Version: 1.3.0 +Release: 1%{?dist} License: MIT Group: System Environment/Libraries URL: http://daniel.haxx.se/projects/c-ares/ -Source0: http://daniel.haxx.se/projects/c-ares/c-ares-1.2.1.tar.gz +Source0: http://daniel.haxx.se/projects/c-ares/c-ares-%{version}.tar.gz +Source1: LICENSE BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description @@ -24,6 +25,7 @@ %prep %setup -q +cp %{SOURCE1} . %build %configure --enable-shared @@ -42,7 +44,7 @@ %files %defattr(-, root, root) -%doc README README.cares CHANGES NEWS +%doc README README.cares CHANGES NEWS LICENSE %{_libdir}/*.so.* %files devel @@ -54,6 +56,10 @@ %{_mandir}/man3/ares_* %changelog +* Sun Sep 4 2005 Tom "spot" Callaway 1.3.0-1 +- include LICENSE text +- bump to 1.3.0 + * Tue May 31 2005 Tom "spot" Callaway 1.2.1-4 - use dist tag to prevent EVR overlap Index: sources =================================================================== RCS file: /cvs/extras/rpms/c-ares/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 22 Apr 2005 19:34:04 -0000 1.2 +++ sources 5 Sep 2005 02:54:37 -0000 1.3 @@ -1 +1 @@ -8269643c78a02a1745e24fb4e2367ab0 c-ares-1.2.1.tar.gz +badb4563a02d4188b478df31fa1b657d c-ares-1.3.0.tar.gz From fedora-extras-commits at redhat.com Mon Sep 5 02:54:39 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sun, 4 Sep 2005 22:54:39 -0400 Subject: rpms/c-ares/FC-4 c-ares.spec,1.3,1.4 sources,1.2,1.3 Message-ID: <200509050254.j852sd4l018911@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/c-ares/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18852/FC-4 Modified Files: c-ares.spec sources Log Message: Add license, bump to 1.3.0 Index: c-ares.spec =================================================================== RCS file: /cvs/extras/rpms/c-ares/FC-4/c-ares.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- c-ares.spec 31 May 2005 14:45:25 -0000 1.3 +++ c-ares.spec 5 Sep 2005 02:54:37 -0000 1.4 @@ -1,11 +1,12 @@ Summary: A library that performs asynchronous DNS operations Name: c-ares -Version: 1.2.1 -Release: 4%{?dist} +Version: 1.3.0 +Release: 1%{?dist} License: MIT Group: System Environment/Libraries URL: http://daniel.haxx.se/projects/c-ares/ -Source0: http://daniel.haxx.se/projects/c-ares/c-ares-1.2.1.tar.gz +Source0: http://daniel.haxx.se/projects/c-ares/c-ares-%{version}.tar.gz +Source1: LICENSE BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description @@ -24,6 +25,7 @@ %prep %setup -q +cp %{SOURCE1} . %build %configure --enable-shared @@ -42,7 +44,7 @@ %files %defattr(-, root, root) -%doc README README.cares CHANGES NEWS +%doc README README.cares CHANGES NEWS LICENSE %{_libdir}/*.so.* %files devel @@ -54,6 +56,10 @@ %{_mandir}/man3/ares_* %changelog +* Sun Sep 4 2005 Tom "spot" Callaway 1.3.0-1 +- include LICENSE text +- bump to 1.3.0 + * Tue May 31 2005 Tom "spot" Callaway 1.2.1-4 - use dist tag to prevent EVR overlap Index: sources =================================================================== RCS file: /cvs/extras/rpms/c-ares/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 22 Apr 2005 19:34:04 -0000 1.2 +++ sources 5 Sep 2005 02:54:37 -0000 1.3 @@ -1 +1 @@ -8269643c78a02a1745e24fb4e2367ab0 c-ares-1.2.1.tar.gz +badb4563a02d4188b478df31fa1b657d c-ares-1.3.0.tar.gz From fedora-extras-commits at redhat.com Mon Sep 5 02:55:36 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sun, 4 Sep 2005 22:55:36 -0400 Subject: rpms/c-ares/FC-3 LICENSE,NONE,1.1 Message-ID: <200509050255.j852ta2l018968@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/c-ares/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18941/FC-3 Added Files: LICENSE Log Message: license text --- NEW FILE LICENSE --- Copyright (C) 2004 by Daniel Stenberg et al Permission to use, copy, modify, and distribute this software and its documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all copies and that both that copyright notice and this permission notice appear in supporting documentation, and that the name of M.I.T. not be used in advertising or publicity pertaining to distribution of the software without specific, written prior permission. M.I.T. makes no representations about the suitability of this software for any purpose. It is provided "as is" without express or implied warranty. From fedora-extras-commits at redhat.com Mon Sep 5 02:55:42 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sun, 4 Sep 2005 22:55:42 -0400 Subject: rpms/c-ares/devel LICENSE,NONE,1.1 Message-ID: <200509050255.j852tgKi018999@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/c-ares/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18941/devel Added Files: LICENSE Log Message: license text --- NEW FILE LICENSE --- Copyright (C) 2004 by Daniel Stenberg et al Permission to use, copy, modify, and distribute this software and its documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all copies and that both that copyright notice and this permission notice appear in supporting documentation, and that the name of M.I.T. not be used in advertising or publicity pertaining to distribution of the software without specific, written prior permission. M.I.T. makes no representations about the suitability of this software for any purpose. It is provided "as is" without express or implied warranty. From fedora-extras-commits at redhat.com Mon Sep 5 02:55:37 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sun, 4 Sep 2005 22:55:37 -0400 Subject: rpms/c-ares/FC-4 LICENSE,NONE,1.1 Message-ID: <200509050255.j852tbTF018973@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/c-ares/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18941/FC-4 Added Files: LICENSE Log Message: license text --- NEW FILE LICENSE --- Copyright (C) 2004 by Daniel Stenberg et al Permission to use, copy, modify, and distribute this software and its documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all copies and that both that copyright notice and this permission notice appear in supporting documentation, and that the name of M.I.T. not be used in advertising or publicity pertaining to distribution of the software without specific, written prior permission. M.I.T. makes no representations about the suitability of this software for any purpose. It is provided "as is" without express or implied warranty. From fedora-extras-commits at redhat.com Mon Sep 5 03:04:07 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sun, 4 Sep 2005 23:04:07 -0400 Subject: rpms/dkms/FC-4 dkms.spec,1.2,1.3 sources,1.2,1.3 Message-ID: <200509050305.j853580T020481@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/dkms/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20416/FC-4 Modified Files: dkms.spec sources Log Message: Bump to 2.0.6, fix license text Index: dkms.spec =================================================================== RCS file: /cvs/extras/rpms/dkms/FC-4/dkms.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- dkms.spec 1 Apr 2005 14:11:56 -0000 1.2 +++ dkms.spec 5 Sep 2005 03:04:05 -0000 1.3 @@ -1,14 +1,14 @@ Summary: Dynamic Kernel Module Support Framework Name: dkms -Version: 2.0.5.2 -Release: 3 +Version: 2.0.6 +Release: 1%{?dist} License: GPL Group: System Environment/Base BuildArch: noarch Requires: sed gawk findutils modutils tar cpio gzip grep mktemp Requires: bash > 1.99 Provides: dkms-minimal -Source0: dkms-%version.tar.gz +Source0: http://linux.dell.com/dkms/dkms-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description @@ -84,6 +84,7 @@ %files %defattr(-,root,root) +%doc AUTHORS COPYING %attr(0755,root,root) /usr/sbin/dkms %attr(0755,root,root) /var/lib/dkms %attr(0755,root,root) /etc/init.d/dkms_autoinstaller @@ -100,6 +101,13 @@ %changelog +* Sun Sep 4 2005 Tom "spot" Callaway 2.0.6-1 +- bump to 2.0.6 +- include COPYING AUTHORS in %%doc + +* Tue May 31 2005 Tom "spot" Callaway 2.0.5.2-4 +- dist tag + * Fri Apr 1 2005 Michael Schwendt 2.0.5.2-3 - Include /etc/dkms directory. Index: sources =================================================================== RCS file: /cvs/extras/rpms/dkms/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 15 Mar 2005 15:48:34 -0000 1.2 +++ sources 5 Sep 2005 03:04:05 -0000 1.3 @@ -1 +1 @@ -0e3030c92d21613a726563f8b94788d1 dkms-2.0.5.2.tar.gz +51606322c10e746ae40a7ebbdeec333d dkms-2.0.6.tar.gz From fedora-extras-commits at redhat.com Mon Sep 5 03:04:04 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sun, 4 Sep 2005 23:04:04 -0400 Subject: rpms/dkms/FC-3 dkms.spec,1.2,1.3 sources,1.2,1.3 Message-ID: <200509050305.j85355hZ020476@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/dkms/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20416/FC-3 Modified Files: dkms.spec sources Log Message: Bump to 2.0.6, fix license text Index: dkms.spec =================================================================== RCS file: /cvs/extras/rpms/dkms/FC-3/dkms.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- dkms.spec 31 May 2005 15:22:12 -0000 1.2 +++ dkms.spec 5 Sep 2005 03:03:56 -0000 1.3 @@ -1,14 +1,14 @@ Summary: Dynamic Kernel Module Support Framework Name: dkms -Version: 2.0.5.2 -Release: 4%{?dist} +Version: 2.0.6 +Release: 1%{?dist} License: GPL Group: System Environment/Base BuildArch: noarch Requires: sed gawk findutils modutils tar cpio gzip grep mktemp Requires: bash > 1.99 Provides: dkms-minimal -Source0: dkms-%version.tar.gz +Source0: http://linux.dell.com/dkms/dkms-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description @@ -84,6 +84,7 @@ %files %defattr(-,root,root) +%doc AUTHORS COPYING %attr(0755,root,root) /usr/sbin/dkms %attr(0755,root,root) /var/lib/dkms %attr(0755,root,root) /etc/init.d/dkms_autoinstaller @@ -100,6 +101,10 @@ %changelog +* Sun Sep 4 2005 Tom "spot" Callaway 2.0.6-1 +- bump to 2.0.6 +- include COPYING AUTHORS in %%doc + * Tue May 31 2005 Tom "spot" Callaway 2.0.5.2-4 - dist tag Index: sources =================================================================== RCS file: /cvs/extras/rpms/dkms/FC-3/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 15 Mar 2005 15:48:34 -0000 1.2 +++ sources 5 Sep 2005 03:03:56 -0000 1.3 @@ -1 +1 @@ -0e3030c92d21613a726563f8b94788d1 dkms-2.0.5.2.tar.gz +51606322c10e746ae40a7ebbdeec333d dkms-2.0.6.tar.gz From fedora-extras-commits at redhat.com Mon Sep 5 03:04:36 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sun, 4 Sep 2005 23:04:36 -0400 Subject: rpms/dkms/devel .cvsignore, 1.2, 1.3 dkms.spec, 1.3, 1.4 sources, 1.2, 1.3 Message-ID: <200509050305.j85356KN020479@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/dkms/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20416/devel Modified Files: .cvsignore dkms.spec sources Log Message: Bump to 2.0.6, fix license text Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/dkms/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 15 Mar 2005 15:48:34 -0000 1.2 +++ .cvsignore 5 Sep 2005 03:04:33 -0000 1.3 @@ -1 +1,2 @@ dkms-2.0.5.2.tar.gz +dkms-2.0.6.tar.gz Index: dkms.spec =================================================================== RCS file: /cvs/extras/rpms/dkms/devel/dkms.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- dkms.spec 31 May 2005 15:22:12 -0000 1.3 +++ dkms.spec 5 Sep 2005 03:04:33 -0000 1.4 @@ -1,14 +1,14 @@ Summary: Dynamic Kernel Module Support Framework Name: dkms -Version: 2.0.5.2 -Release: 4%{?dist} +Version: 2.0.6 +Release: 1%{?dist} License: GPL Group: System Environment/Base BuildArch: noarch Requires: sed gawk findutils modutils tar cpio gzip grep mktemp Requires: bash > 1.99 Provides: dkms-minimal -Source0: dkms-%version.tar.gz +Source0: http://linux.dell.com/dkms/dkms-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description @@ -84,6 +84,7 @@ %files %defattr(-,root,root) +%doc AUTHORS COPYING %attr(0755,root,root) /usr/sbin/dkms %attr(0755,root,root) /var/lib/dkms %attr(0755,root,root) /etc/init.d/dkms_autoinstaller @@ -100,6 +101,10 @@ %changelog +* Sun Sep 4 2005 Tom "spot" Callaway 2.0.6-1 +- bump to 2.0.6 +- include COPYING AUTHORS in %%doc + * Tue May 31 2005 Tom "spot" Callaway 2.0.5.2-4 - dist tag Index: sources =================================================================== RCS file: /cvs/extras/rpms/dkms/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 15 Mar 2005 15:48:34 -0000 1.2 +++ sources 5 Sep 2005 03:04:33 -0000 1.3 @@ -1 +1 @@ -0e3030c92d21613a726563f8b94788d1 dkms-2.0.5.2.tar.gz +51606322c10e746ae40a7ebbdeec333d dkms-2.0.6.tar.gz From fedora-extras-commits at redhat.com Mon Sep 5 08:04:07 2005 From: fedora-extras-commits at redhat.com (Mark Cox (mjc)) Date: Mon, 5 Sep 2005 04:04:07 -0400 Subject: fedora-security/audit fc4,1.53,1.54 Message-ID: <200509050804.j8584b25027668@cvs-int.fedora.redhat.com> Author: mjc Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27649 Modified Files: fc4 Log Message: This weekends updates Index: fc4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc4,v retrieving revision 1.53 retrieving revision 1.54 diff -u -r1.53 -r1.54 --- fc4 29 Aug 2005 13:00:44 -0000 1.53 +++ fc4 5 Sep 2005 08:04:04 -0000 1.54 @@ -1,13 +1,15 @@ -Up to date CVE as of CVE email 20050825 -Up to date FC4 as of 20050825 +Up to date CVE as of CVE email 20050904 +Up to date FC4 as of 20050904 ** are items that need attention +2005-2728 ** httpd 2005-2693 backport (cvs) [since FEDORA-2005-790] 2005-2672 VULNERABLE (lm_sensors) bz#166673 2005-2666 ** openssh (hmm) 2005-2558 ignore (mysql) not an issue 2005-2499 backport (slocate) [since FEDORA-2005-770] +2005-2496 backport (ntp, fixed 4.2.0b) ...0a-20040617-ntpd_guid.patch 2005-2491 VULNERABLE (python pcre) 2005-2491 backport (pcre, fixed 6.2) [since FEDORA-2005-803] 2005-2491 ignore (httpd, pcre uses system pcre) @@ -290,6 +292,7 @@ 2005-0448 VULNERABLE (perl) 2005-0446 version (squid, fixed 2.5.STABLE9) 2005-0404 ignore (kde) won't fix http://bugs.kde.org/show_bug.cgi?id=96020 +2005-0403 version (kernel, not upstream) 2005-0402 version (firefox, fixed 1.0.2) 2005-0401 version (firefox, fixed 1.0.2) 2005-0401 version (mozilla, fixed 1.7.7) @@ -332,7 +335,7 @@ 2005-0205 version (kdenetwork, not 3.3 onwards) 2005-0204 version (kernel, didn't affect upstream) 2005-0202 backport (mailman, fixed 2.1.6) from srpm -2005-0201 version (dbus) +2005-0201 backport (dbus) [since FEDORA-2005-822] 2005-0194 version (squid, fixed 2.5.STABLE8) 2005-0180 version (kernel, fixed 2.6.11) 2005-0179 version (kernel, fixed 2.6.11) From fedora-extras-commits at redhat.com Mon Sep 5 15:12:35 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 5 Sep 2005 11:12:35 -0400 Subject: rpms/gambas/devel gambas-1.0.11-desktopfix.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 gambas.spec, 1.7, 1.8 sources, 1.4, 1.5 Message-ID: <200509051512.j85FCZvx005533@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/gambas/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5465/devel Modified Files: .cvsignore gambas.spec sources Added Files: gambas-1.0.11-desktopfix.patch Log Message: Bump to gambas 1.0.11, add desktop entry, icon. gambas-1.0.11-desktopfix.patch: --- NEW FILE gambas-1.0.11-desktopfix.patch --- --- gambas-1.0.11/debian/gambas.desktop.DESK 2004-09-22 06:10:47.000000000 -0500 +++ gambas-1.0.11/debian/gambas.desktop 2005-09-05 00:01:06.000000000 -0500 @@ -1,14 +1,12 @@ [Desktop Entry] Encoding=UTF-8 -Version=1.0 Exec=gambas -TryExec= Icon=/usr/share/pixmaps/gambas.png -X-GNOME-DocPath= Terminal=false Name=Gambas Name[es_ES]=Gambas -GenericName[es_ES]= +GenericName=Basic IDE +Comment=IDE based on a Basic interpreter Comment[es_ES]=Gambas casi es Visual Basic Type=Application Categories=GNOME;Application;Development; Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gambas/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 13 Jun 2005 16:43:05 -0000 1.2 +++ .cvsignore 5 Sep 2005 15:12:33 -0000 1.3 @@ -1 +1,2 @@ gambas-1.0.6.tar.bz2 +gambas-1.0.11.tar.bz2 Index: gambas.spec =================================================================== RCS file: /cvs/extras/rpms/gambas/devel/gambas.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- gambas.spec 29 Jul 2005 19:17:28 -0000 1.7 +++ gambas.spec 5 Sep 2005 15:12:33 -0000 1.8 @@ -1,7 +1,7 @@ Name: gambas Summary: IDE based on a basic interpreter with object extensions -Version: 1.0.9 -Release: 2%{?dist} +Version: 1.0.11 +Release: 1%{?dist} License: GPL Group: Development/Tools URL: http://gambas.sourceforge.net/ @@ -9,6 +9,9 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: kdelibs-devel, automake, autoconf, SDL-devel BuildRequires: mysql-devel, postgresql-devel, sqlite2-devel +BuildRequires: desktop-file-utils +Requires(post): desktop-file-utils +Requires(postun): desktop-file-utils # Code is not 64 bit clean. ExcludeArch: x86_64 # Code is not endian clean. @@ -16,6 +19,7 @@ Patch0: gambas-1.0.9-gcc4.patch Patch1: gambas-1.0.6-dont-make-links.patch Patch2: gambas-1.0.6-noopt.patch +Patch3: gambas-1.0.11-desktopfix.patch %description Gambas is a free development environment based on a Basic interpreter @@ -55,6 +59,7 @@ %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 %build # Gambas can't deal with -Wp,-D_FORTIFY_SOURCE=2 @@ -81,15 +86,29 @@ rm -rf $RPM_BUILD_ROOT export PATH=$RPM_BUILD_ROOT/usr/bin:$PATH make DESTDIR=$RPM_BUILD_ROOT install -rm -rf $RPM_BUILD_ROOT/%{_libdir}/gambas/*.la +rm -rf $RPM_BUILD_ROOT%{_libdir}/gambas/*.la +mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps +mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications +install -m0644 ./app/gambas/.icon/32.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/gambas.png install src/share/gambas.h $RPM_BUILD_ROOT/%{_includedir} +desktop-file-install --vendor fedora \ + --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ + --add-category X-Fedora \ + debian/gambas.desktop + %clean rm -rf $RPM_BUILD_ROOT -%post -p /sbin/ldconfig - -%postun -p /sbin/ldconfig +%post +/sbin/ldconfig +update-desktop-database %{_datadir}/applications &> /dev/null + +%postun +/sbin/ldconfig +if [ "$1" = "0" ]; then + update-desktop-database %{_datadir}/applications &> /dev/null +fi %files %defattr(-, root, root, 0755) @@ -103,6 +122,8 @@ %{_bindir}/gbi %{_bindir}/gbx %{_bindir}/gambas-database-manager +%{_datadir}/pixmaps/gambas.png +%{_datadir}/applications/*.desktop %files devel %defattr(-, root, root, 0755) @@ -121,6 +142,10 @@ %{_datadir}/gambas/examples %changelog +* Sun Sep 4 2005 Tom "spot" Callaway 1.0.11-1 +- bump to 1.0.11 +- add gambas.desktop, gambas.png + * Fri Jul 29 2005 Tom "spot" Callaway 1.0.9-2 - put in correct patch Index: sources =================================================================== RCS file: /cvs/extras/rpms/gambas/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 29 Jul 2005 19:06:54 -0000 1.4 +++ sources 5 Sep 2005 15:12:33 -0000 1.5 @@ -1,3 +1,4 @@ 608772c93233eea4e488ba3bd1c2ac83 gambas-1.0.6.tar.bz2 730b690c72689e26888698233fdef726 gambas-1.0.8.tar.bz2 888494096dfb4f497dcfed58179980fa gambas-1.0.9.tar.bz2 +819eab8e69f71a76248c2679b3af9946 gambas-1.0.11.tar.bz2 From fedora-extras-commits at redhat.com Mon Sep 5 15:12:29 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 5 Sep 2005 11:12:29 -0400 Subject: rpms/gambas/FC-3 gambas-1.0.11-desktopfix.patch, NONE, 1.1 gambas.spec, 1.7, 1.8 sources, 1.4, 1.5 Message-ID: <200509051512.j85FCxPr005537@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/gambas/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5465/FC-3 Modified Files: gambas.spec sources Added Files: gambas-1.0.11-desktopfix.patch Log Message: Bump to gambas 1.0.11, add desktop entry, icon. gambas-1.0.11-desktopfix.patch: --- NEW FILE gambas-1.0.11-desktopfix.patch --- --- gambas-1.0.11/debian/gambas.desktop.DESK 2004-09-22 06:10:47.000000000 -0500 +++ gambas-1.0.11/debian/gambas.desktop 2005-09-05 00:01:06.000000000 -0500 @@ -1,14 +1,12 @@ [Desktop Entry] Encoding=UTF-8 -Version=1.0 Exec=gambas -TryExec= Icon=/usr/share/pixmaps/gambas.png -X-GNOME-DocPath= Terminal=false Name=Gambas Name[es_ES]=Gambas -GenericName[es_ES]= +GenericName=Basic IDE +Comment=IDE based on a Basic interpreter Comment[es_ES]=Gambas casi es Visual Basic Type=Application Categories=GNOME;Application;Development; Index: gambas.spec =================================================================== RCS file: /cvs/extras/rpms/gambas/FC-3/gambas.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- gambas.spec 29 Jul 2005 19:17:23 -0000 1.7 +++ gambas.spec 5 Sep 2005 15:12:26 -0000 1.8 @@ -1,7 +1,7 @@ Name: gambas Summary: IDE based on a basic interpreter with object extensions -Version: 1.0.9 -Release: 2%{?dist} +Version: 1.0.11 +Release: 1%{?dist} License: GPL Group: Development/Tools URL: http://gambas.sourceforge.net/ @@ -9,6 +9,9 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: kdelibs-devel, automake, autoconf, SDL-devel BuildRequires: mysql-devel, postgresql-devel, sqlite2-devel +BuildRequires: desktop-file-utils +Requires(post): desktop-file-utils +Requires(postun): desktop-file-utils # Code is not 64 bit clean. ExcludeArch: x86_64 # Code is not endian clean. @@ -16,6 +19,7 @@ Patch0: gambas-1.0.9-gcc4.patch Patch1: gambas-1.0.6-dont-make-links.patch Patch2: gambas-1.0.6-noopt.patch +Patch3: gambas-1.0.11-desktopfix.patch %description Gambas is a free development environment based on a Basic interpreter @@ -55,6 +59,7 @@ %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 %build # Gambas can't deal with -Wp,-D_FORTIFY_SOURCE=2 @@ -81,15 +86,29 @@ rm -rf $RPM_BUILD_ROOT export PATH=$RPM_BUILD_ROOT/usr/bin:$PATH make DESTDIR=$RPM_BUILD_ROOT install -rm -rf $RPM_BUILD_ROOT/%{_libdir}/gambas/*.la +rm -rf $RPM_BUILD_ROOT%{_libdir}/gambas/*.la +mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps +mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications +install -m0644 ./app/gambas/.icon/32.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/gambas.png install src/share/gambas.h $RPM_BUILD_ROOT/%{_includedir} +desktop-file-install --vendor fedora \ + --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ + --add-category X-Fedora \ + debian/gambas.desktop + %clean rm -rf $RPM_BUILD_ROOT -%post -p /sbin/ldconfig - -%postun -p /sbin/ldconfig +%post +/sbin/ldconfig +update-desktop-database %{_datadir}/applications &> /dev/null + +%postun +/sbin/ldconfig +if [ "$1" = "0" ]; then + update-desktop-database %{_datadir}/applications &> /dev/null +fi %files %defattr(-, root, root, 0755) @@ -103,6 +122,8 @@ %{_bindir}/gbi %{_bindir}/gbx %{_bindir}/gambas-database-manager +%{_datadir}/pixmaps/gambas.png +%{_datadir}/applications/*.desktop %files devel %defattr(-, root, root, 0755) @@ -121,6 +142,10 @@ %{_datadir}/gambas/examples %changelog +* Sun Sep 4 2005 Tom "spot" Callaway 1.0.11-1 +- bump to 1.0.11 +- add gambas.desktop, gambas.png + * Fri Jul 29 2005 Tom "spot" Callaway 1.0.9-2 - put in correct patch Index: sources =================================================================== RCS file: /cvs/extras/rpms/gambas/FC-3/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 29 Jul 2005 19:06:53 -0000 1.4 +++ sources 5 Sep 2005 15:12:26 -0000 1.5 @@ -1,3 +1,4 @@ 608772c93233eea4e488ba3bd1c2ac83 gambas-1.0.6.tar.bz2 730b690c72689e26888698233fdef726 gambas-1.0.8.tar.bz2 888494096dfb4f497dcfed58179980fa gambas-1.0.9.tar.bz2 +819eab8e69f71a76248c2679b3af9946 gambas-1.0.11.tar.bz2 From fedora-extras-commits at redhat.com Mon Sep 5 15:12:30 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 5 Sep 2005 11:12:30 -0400 Subject: rpms/gambas/FC-4 gambas-1.0.11-desktopfix.patch, NONE, 1.1 gambas.spec, 1.7, 1.8 sources, 1.4, 1.5 Message-ID: <200509051513.j85FD0JD005541@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/gambas/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5465/FC-4 Modified Files: gambas.spec sources Added Files: gambas-1.0.11-desktopfix.patch Log Message: Bump to gambas 1.0.11, add desktop entry, icon. gambas-1.0.11-desktopfix.patch: --- NEW FILE gambas-1.0.11-desktopfix.patch --- --- gambas-1.0.11/debian/gambas.desktop.DESK 2004-09-22 06:10:47.000000000 -0500 +++ gambas-1.0.11/debian/gambas.desktop 2005-09-05 00:01:06.000000000 -0500 @@ -1,14 +1,12 @@ [Desktop Entry] Encoding=UTF-8 -Version=1.0 Exec=gambas -TryExec= Icon=/usr/share/pixmaps/gambas.png -X-GNOME-DocPath= Terminal=false Name=Gambas Name[es_ES]=Gambas -GenericName[es_ES]= +GenericName=Basic IDE +Comment=IDE based on a Basic interpreter Comment[es_ES]=Gambas casi es Visual Basic Type=Application Categories=GNOME;Application;Development; Index: gambas.spec =================================================================== RCS file: /cvs/extras/rpms/gambas/FC-4/gambas.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- gambas.spec 29 Jul 2005 19:17:23 -0000 1.7 +++ gambas.spec 5 Sep 2005 15:12:28 -0000 1.8 @@ -1,7 +1,7 @@ Name: gambas Summary: IDE based on a basic interpreter with object extensions -Version: 1.0.9 -Release: 2%{?dist} +Version: 1.0.11 +Release: 1%{?dist} License: GPL Group: Development/Tools URL: http://gambas.sourceforge.net/ @@ -9,6 +9,9 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: kdelibs-devel, automake, autoconf, SDL-devel BuildRequires: mysql-devel, postgresql-devel, sqlite2-devel +BuildRequires: desktop-file-utils +Requires(post): desktop-file-utils +Requires(postun): desktop-file-utils # Code is not 64 bit clean. ExcludeArch: x86_64 # Code is not endian clean. @@ -16,6 +19,7 @@ Patch0: gambas-1.0.9-gcc4.patch Patch1: gambas-1.0.6-dont-make-links.patch Patch2: gambas-1.0.6-noopt.patch +Patch3: gambas-1.0.11-desktopfix.patch %description Gambas is a free development environment based on a Basic interpreter @@ -55,6 +59,7 @@ %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 %build # Gambas can't deal with -Wp,-D_FORTIFY_SOURCE=2 @@ -81,15 +86,29 @@ rm -rf $RPM_BUILD_ROOT export PATH=$RPM_BUILD_ROOT/usr/bin:$PATH make DESTDIR=$RPM_BUILD_ROOT install -rm -rf $RPM_BUILD_ROOT/%{_libdir}/gambas/*.la +rm -rf $RPM_BUILD_ROOT%{_libdir}/gambas/*.la +mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps +mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications +install -m0644 ./app/gambas/.icon/32.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/gambas.png install src/share/gambas.h $RPM_BUILD_ROOT/%{_includedir} +desktop-file-install --vendor fedora \ + --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ + --add-category X-Fedora \ + debian/gambas.desktop + %clean rm -rf $RPM_BUILD_ROOT -%post -p /sbin/ldconfig - -%postun -p /sbin/ldconfig +%post +/sbin/ldconfig +update-desktop-database %{_datadir}/applications &> /dev/null + +%postun +/sbin/ldconfig +if [ "$1" = "0" ]; then + update-desktop-database %{_datadir}/applications &> /dev/null +fi %files %defattr(-, root, root, 0755) @@ -103,6 +122,8 @@ %{_bindir}/gbi %{_bindir}/gbx %{_bindir}/gambas-database-manager +%{_datadir}/pixmaps/gambas.png +%{_datadir}/applications/*.desktop %files devel %defattr(-, root, root, 0755) @@ -121,6 +142,10 @@ %{_datadir}/gambas/examples %changelog +* Sun Sep 4 2005 Tom "spot" Callaway 1.0.11-1 +- bump to 1.0.11 +- add gambas.desktop, gambas.png + * Fri Jul 29 2005 Tom "spot" Callaway 1.0.9-2 - put in correct patch Index: sources =================================================================== RCS file: /cvs/extras/rpms/gambas/FC-4/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 29 Jul 2005 19:06:53 -0000 1.4 +++ sources 5 Sep 2005 15:12:28 -0000 1.5 @@ -1,3 +1,4 @@ 608772c93233eea4e488ba3bd1c2ac83 gambas-1.0.6.tar.bz2 730b690c72689e26888698233fdef726 gambas-1.0.8.tar.bz2 888494096dfb4f497dcfed58179980fa gambas-1.0.9.tar.bz2 +819eab8e69f71a76248c2679b3af9946 gambas-1.0.11.tar.bz2 From fedora-extras-commits at redhat.com Mon Sep 5 16:38:18 2005 From: fedora-extras-commits at redhat.com (Tim Lauridsen (timlau)) Date: Mon, 5 Sep 2005 12:38:18 -0400 Subject: rpms/yumex/FC-4 .cvsignore, 1.6, 1.7 sources, 1.6, 1.7 yumex.spec, 1.6, 1.7 Message-ID: <200509051638.j85GcIsa007295@cvs-int.fedora.redhat.com> Author: timlau Update of /cvs/extras/rpms/yumex/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7272 Modified Files: .cvsignore sources yumex.spec Log Message: new release 0.42-05 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/yumex/FC-4/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 30 Aug 2005 13:33:15 -0000 1.6 +++ .cvsignore 5 Sep 2005 16:38:16 -0000 1.7 @@ -1 +1 @@ -yumex-0.42-4.tar.gz +yumex-0.42-5.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/yumex/FC-4/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 30 Aug 2005 13:33:15 -0000 1.6 +++ sources 5 Sep 2005 16:38:16 -0000 1.7 @@ -1 +1 @@ -01b20730d2f56c0a836c4d17951871d4 yumex-0.42-4.tar.gz +2f7bf8bb4504308c7cc291e26304288c yumex-0.42-5.tar.gz Index: yumex.spec =================================================================== RCS file: /cvs/extras/rpms/yumex/FC-4/yumex.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- yumex.spec 30 Aug 2005 13:33:15 -0000 1.6 +++ yumex.spec 5 Sep 2005 16:38:16 -0000 1.7 @@ -1,8 +1,8 @@ -%define build_v 4 +%define build_v 5 Name: yumex Version: 0.42 -Release: 4.0%{?dist} +Release: 5.0%{?dist} Summary: Yum Extender graphical package management tool Group: Applications/System @@ -67,6 +67,8 @@ %{_datadir}/applications/fedora-%{name}.desktop %changelog +* Sat Sep 3 2005 Tim Lauridsen - 0.42-5.0 +- Release 0.42-5.0 * Tue Aug 30 2005 Tim Lauridsen - 0.42-4.0 - Release 0.42-4.0 - Fixed delete repo on repos page. (Rightclick + Delete now working) From fedora-extras-commits at redhat.com Mon Sep 5 16:39:58 2005 From: fedora-extras-commits at redhat.com (Tim Lauridsen (timlau)) Date: Mon, 5 Sep 2005 12:39:58 -0400 Subject: rpms/yumex/devel sources,1.4,1.5 yumex.spec,1.4,1.5 Message-ID: <200509051639.j85GdwNq007332@cvs-int.fedora.redhat.com> Author: timlau Update of /cvs/extras/rpms/yumex/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7311 Modified Files: sources yumex.spec Log Message: new release 0.42-05 Index: sources =================================================================== RCS file: /cvs/extras/rpms/yumex/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 3 Sep 2005 05:12:47 -0000 1.4 +++ sources 5 Sep 2005 16:39:56 -0000 1.5 @@ -1 +1 @@ -01b20730d2f56c0a836c4d17951871d4 yumex-0.42-4.tar.gz +2f7bf8bb4504308c7cc291e26304288c yumex-0.42-5.tar.gz Index: yumex.spec =================================================================== RCS file: /cvs/extras/rpms/yumex/devel/yumex.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- yumex.spec 3 Sep 2005 05:12:47 -0000 1.4 +++ yumex.spec 5 Sep 2005 16:39:56 -0000 1.5 @@ -1,8 +1,8 @@ -%define build_v 4 +%define build_v 5 Name: yumex Version: 0.42 -Release: 4.0%{?dist} +Release: 5.0%{?dist} Summary: Yum Extender graphical package management tool Group: Applications/System @@ -67,6 +67,8 @@ %{_datadir}/applications/fedora-%{name}.desktop %changelog +* Sat Sep 3 2005 Tim Lauridsen - 0.42-5.0 +- Release 0.42-5.0 * Tue Aug 30 2005 Tim Lauridsen - 0.42-4.0 - Release 0.42-4.0 - Fixed delete repo on repos page. (Rightclick + Delete now working) From fedora-extras-commits at redhat.com Mon Sep 5 17:26:33 2005 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Mon, 5 Sep 2005 13:26:33 -0400 Subject: rpms/bluefish/devel bluefish.spec, 1.15, 1.16 sources, 1.6, 1.7 .cvsignore, 1.6, 1.7 Message-ID: <200509051726.j85HQXia008859@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/rpms/bluefish/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8834 Modified Files: bluefish.spec sources .cvsignore Log Message: update to 1.0.4 Index: bluefish.spec =================================================================== RCS file: /cvs/extras/rpms/bluefish/devel/bluefish.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- bluefish.spec 21 Aug 2005 12:50:31 -0000 1.15 +++ bluefish.spec 5 Sep 2005 17:26:31 -0000 1.16 @@ -1,5 +1,5 @@ Name: bluefish -Version: 1.0.3 +Version: 1.0.4 Release: 1%{?dist} Summary: GTK2 web development application for experienced users @@ -80,6 +80,9 @@ %changelog +* Mon Sep 5 2005 Paul Howarth - 1.0.4-1 +- update to 1.0.4 + * Sun Aug 21 2005 Paul Howarth - 1.0.3-1 - update to 1.0.3 Index: sources =================================================================== RCS file: /cvs/extras/rpms/bluefish/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 21 Aug 2005 12:50:31 -0000 1.6 +++ sources 5 Sep 2005 17:26:31 -0000 1.7 @@ -1 +1 @@ -f4cda1e21089155383930616ab673d69 bluefish-1.0.3.tar.bz2 +8d5c1b7315cdc935aa024954093d2b32 bluefish-1.0.4.tar.bz2 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/bluefish/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 21 Aug 2005 12:50:31 -0000 1.6 +++ .cvsignore 5 Sep 2005 17:26:31 -0000 1.7 @@ -1 +1 @@ -bluefish-1.0.3.tar.bz2 +bluefish-1.0.4.tar.bz2 From fedora-extras-commits at redhat.com Mon Sep 5 18:41:55 2005 From: fedora-extras-commits at redhat.com (Ed Hill (edhill)) Date: Mon, 5 Sep 2005 14:41:55 -0400 Subject: rpms/nco/FC-4 .cvsignore,1.2,1.3 nco.spec,1.2,1.3 sources,1.2,1.3 Message-ID: <200509051841.j85Ift6f010386@cvs-int.fedora.redhat.com> Author: edhill Update of /cvs/extras/rpms/nco/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10363 Modified Files: .cvsignore nco.spec sources Log Message: update for new upstream ver Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/nco/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 21 Jul 2005 05:43:23 -0000 1.2 +++ .cvsignore 5 Sep 2005 18:41:53 -0000 1.3 @@ -1 +1 @@ -nco-3.0.1.tar.gz +nco-3.0.2.tar.gz Index: nco.spec =================================================================== RCS file: /cvs/extras/rpms/nco/FC-4/nco.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- nco.spec 3 Aug 2005 14:32:20 -0000 1.2 +++ nco.spec 5 Sep 2005 18:41:53 -0000 1.3 @@ -1,6 +1,6 @@ Name: nco -Version: 3.0.1 -Release: 4%{?dist} +Version: 3.0.2 +Release: 1%{?dist} Summary: Suite of programs for manipulating NetCDF/HDF4 files Group: Applications/Engineering License: GPL @@ -10,9 +10,9 @@ # using the following recommended commands: # cvs -d:pserver:anonymous at cvs.sf.net:/cvsroot/nco login # cvs -z3 -d:pserver:anonymous at cvs.sf.net:/cvsroot/nco co \ -# -r nco-3_0_1 -d nco-3.0.1 nco -# tar -czf nco-3.0.1.tar.gz ./nco-3.0.1 -Source0: nco-3.0.1.tar.gz +# -r nco-3_0_2 -d nco-3.0.2 nco +# tar -czf nco-3.0.2.tar.gz ./nco-3.0.2 +Source0: nco-3.0.2.tar.gz Patch0: nco_install_C_headers.patch Patch1: nco-3.0.0-fixudunits.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -106,6 +106,9 @@ %changelog +* Mon Sep 5 2005 Ed Hill - 3.0.2-1 +- update to new upstream 3.0.2 + * Wed Aug 3 2005 Ed Hill - 3.0.1-4 - remove (hopefully only temporarily) opendap support Index: sources =================================================================== RCS file: /cvs/extras/rpms/nco/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 21 Jul 2005 05:43:23 -0000 1.2 +++ sources 5 Sep 2005 18:41:53 -0000 1.3 @@ -1 +1 @@ -72f76553c95bc2b2fdaddcd7cc876f67 nco-3.0.1.tar.gz +46ddd902c9fd86e5d655ddcc8ce647c7 nco-3.0.2.tar.gz From fedora-extras-commits at redhat.com Mon Sep 5 18:42:47 2005 From: fedora-extras-commits at redhat.com (Ed Hill (edhill)) Date: Mon, 5 Sep 2005 14:42:47 -0400 Subject: rpms/nco/devel .cvsignore,1.2,1.3 nco.spec,1.2,1.3 sources,1.2,1.3 Message-ID: <200509051842.j85Igl8D010423@cvs-int.fedora.redhat.com> Author: edhill Update of /cvs/extras/rpms/nco/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10400 Modified Files: .cvsignore nco.spec sources Log Message: update for new upstream ver Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/nco/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 21 Jul 2005 05:43:23 -0000 1.2 +++ .cvsignore 5 Sep 2005 18:42:45 -0000 1.3 @@ -1 +1 @@ -nco-3.0.1.tar.gz +nco-3.0.2.tar.gz Index: nco.spec =================================================================== RCS file: /cvs/extras/rpms/nco/devel/nco.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- nco.spec 3 Aug 2005 18:17:48 -0000 1.2 +++ nco.spec 5 Sep 2005 18:42:45 -0000 1.3 @@ -1,6 +1,6 @@ Name: nco -Version: 3.0.1 -Release: 4%{?dist} +Version: 3.0.2 +Release: 1%{?dist} Summary: Suite of programs for manipulating NetCDF/HDF4 files Group: Applications/Engineering License: GPL @@ -10,9 +10,9 @@ # using the following recommended commands: # cvs -d:pserver:anonymous at cvs.sf.net:/cvsroot/nco login # cvs -z3 -d:pserver:anonymous at cvs.sf.net:/cvsroot/nco co \ -# -r nco-3_0_1 -d nco-3.0.1 nco -# tar -czf nco-3.0.1.tar.gz ./nco-3.0.1 -Source0: nco-3.0.1.tar.gz +# -r nco-3_0_2 -d nco-3.0.2 nco +# tar -czf nco-3.0.2.tar.gz ./nco-3.0.2 +Source0: nco-3.0.2.tar.gz Patch0: nco_install_C_headers.patch Patch1: nco-3.0.0-fixudunits.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -106,6 +106,9 @@ %changelog +* Mon Sep 5 2005 Ed Hill - 3.0.2-1 +- update to new upstream 3.0.2 + * Wed Aug 3 2005 Ed Hill - 3.0.1-4 - remove (hopefully only temporarily) opendap support Index: sources =================================================================== RCS file: /cvs/extras/rpms/nco/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 21 Jul 2005 05:43:23 -0000 1.2 +++ sources 5 Sep 2005 18:42:45 -0000 1.3 @@ -1 +1 @@ -72f76553c95bc2b2fdaddcd7cc876f67 nco-3.0.1.tar.gz +46ddd902c9fd86e5d655ddcc8ce647c7 nco-3.0.2.tar.gz From fedora-extras-commits at redhat.com Mon Sep 5 22:37:35 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Mon, 5 Sep 2005 18:37:35 -0400 Subject: rpms/sylpheed/devel .cvsignore, 1.11, 1.12 sources, 1.11, 1.12 sylpheed.spec, 1.22, 1.23 Message-ID: <200509052237.j85MbZ8h016121@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/sylpheed/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16099 Modified Files: .cvsignore sources sylpheed.spec Log Message: * Mon Sep 5 2005 Michael Schwendt - 2.0.1-1 - Update to 2.0.1. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/sylpheed/devel/.cvsignore,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- .cvsignore 3 Aug 2005 12:55:06 -0000 1.11 +++ .cvsignore 5 Sep 2005 22:37:33 -0000 1.12 @@ -1 +1,2 @@ -sylpheed-2.0.0.tar.bz2 +sylpheed-2.0.1.tar.bz2 +sylpheed-2.0.1.tar.bz2.asc Index: sources =================================================================== RCS file: /cvs/extras/rpms/sylpheed/devel/sources,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- sources 3 Aug 2005 12:55:06 -0000 1.11 +++ sources 5 Sep 2005 22:37:33 -0000 1.12 @@ -1 +1,2 @@ -a7754f8820814089229b1ab5f0e4d855 sylpheed-2.0.0.tar.bz2 +7e8c8fdd427935349c4a57cf33fdf68a sylpheed-2.0.1.tar.bz2 +0128b7872416a7e3143568443edcb079 sylpheed-2.0.1.tar.bz2.asc Index: sylpheed.spec =================================================================== RCS file: /cvs/extras/rpms/sylpheed/devel/sylpheed.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- sylpheed.spec 16 Aug 2005 23:29:10 -0000 1.22 +++ sylpheed.spec 5 Sep 2005 22:37:33 -0000 1.23 @@ -4,8 +4,8 @@ Summary: GTK+ based, lightweight, and fast email client Name: sylpheed -Version: 2.0.0 -Release: 2 +Version: 2.0.1 +Release: 1 License: GPL URL: http://sylpheed.good-day.net/ Group: Applications/Internet @@ -81,6 +81,9 @@ %{_mandir}/man1 %changelog +* Mon Sep 5 2005 Michael Schwendt - 2.0.1-1 +- Update to 2.0.1. + * Wed Aug 17 2005 Michael Schwendt - 2.0.0-2 - rebuilt From fedora-extras-commits at redhat.com Tue Sep 6 00:14:36 2005 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Mon, 5 Sep 2005 20:14:36 -0400 Subject: rpms/perl-BerkeleyDB/devel perl-BerkeleyDB.spec,1.2,1.3 Message-ID: <200509060014.j860Eax0018986@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-BerkeleyDB/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18962 Modified Files: perl-BerkeleyDB.spec Log Message: - Spec cleanup - Include COPYING and Artistic Index: perl-BerkeleyDB.spec =================================================================== RCS file: /cvs/extras/rpms/perl-BerkeleyDB/devel/perl-BerkeleyDB.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-BerkeleyDB.spec 3 Aug 2005 19:06:03 -0000 1.2 +++ perl-BerkeleyDB.spec 6 Sep 2005 00:14:34 -0000 1.3 @@ -1,13 +1,11 @@ -%{!?perl_vendorarch: %define perl_vendorarch %(eval "`%{__perl} -V:installvendorarch`"; echo $installvendorarch)} - Name: perl-BerkeleyDB Version: 0.26 -Release: 3%{?dist} +Release: 4%{?dist} Summary: BerkeleyDB Perl module License: GPL or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/BerkeleyDB/ -Source0: http://www.cpan.org/modules/by-module/BerkeleyDB/BerkeleyDB-0.26.tar.gz +Source0: http://www.cpan.org/modules/by-module/BerkeleyDB/BerkeleyDB-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: db4-devel # For "make test". @@ -44,7 +42,10 @@ chmod -R u+rwX,go+rX,go-w $RPM_BUILD_ROOT/* -%check || : +perldoc -t perlgpl > COPYING +perldoc -t perlartistic > Artistic + +%check make test %clean @@ -52,13 +53,17 @@ %files %defattr(-,root,root,-) -%doc Changes README Todo +%doc Changes README Todo COPYING Artistic %{perl_vendorarch}/BerkeleyDB* %{perl_vendorarch}/auto/* %{_mandir}/man3/* %{_bindir}/* %changelog +* Mon Sep 05 2005 Steven Pritchard 0.26-4 +- Spec cleanup +- Include COPYING and Artistic + * Wed Aug 03 2005 Steven Pritchard 0.26-3 - Move OPTIMIZE to Makefile.PL instead of make From fedora-extras-commits at redhat.com Tue Sep 6 00:21:43 2005 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Mon, 5 Sep 2005 20:21:43 -0400 Subject: rpms/perl-Class-Container/devel perl-Class-Container.spec,1.2,1.3 Message-ID: <200509060021.j860Lhla019027@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Class-Container/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19008 Modified Files: perl-Class-Container.spec Log Message: - Remove explicit core module dependencies - Add COPYING and Artistic Index: perl-Class-Container.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Class-Container/devel/perl-Class-Container.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-Class-Container.spec 17 Aug 2005 22:46:27 -0000 1.2 +++ perl-Class-Container.spec 6 Sep 2005 00:21:40 -0000 1.3 @@ -1,17 +1,15 @@ Name: perl-Class-Container Version: 0.12 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Class::Container Perl module License: GPL or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Class-Container/ -Source0: http://www.cpan.org/modules/by-module/Class/Class-Container-0.12.tar.gz +Source0: http://www.cpan.org/modules/by-module/Class/Class-Container-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(Params::Validate) >= 0.23 -BuildRequires: perl(Scalar::Util) Requires: perl(Params::Validate) >= 0.23 -Requires: perl(Scalar::Util) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description @@ -53,6 +51,9 @@ chmod -R u+rwX,go+rX,go-w $RPM_BUILD_ROOT/* +perldoc -t perlgpl > COPYING +perldoc -t perlartistic > Artistic + %check make test @@ -61,11 +62,15 @@ %files %defattr(-,root,root,-) -%doc Changes README +%doc Changes README COPYING Artistic %{perl_vendorlib}/* %{_mandir}/man3/* %changelog +* Mon Sep 05 2005 Steven Pritchard 0.12-3 +- Remove explicit core module dependencies +- Add COPYING and Artistic + * Wed Aug 17 2005 Steven Pritchard 0.12-2 - Minor spec cleanup From fedora-extras-commits at redhat.com Tue Sep 6 00:27:39 2005 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Mon, 5 Sep 2005 20:27:39 -0400 Subject: rpms/perl-Convert-TNEF/devel perl-Convert-TNEF.spec,1.7,1.8 Message-ID: <200509060027.j860Rd8h019071@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Convert-TNEF/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19052 Modified Files: perl-Convert-TNEF.spec Log Message: - Spec cleanup (closer to FE perl spec template). - Include COPYING and Artistic. Index: perl-Convert-TNEF.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Convert-TNEF/devel/perl-Convert-TNEF.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- perl-Convert-TNEF.spec 6 Apr 2005 22:12:44 -0000 1.7 +++ perl-Convert-TNEF.spec 6 Sep 2005 00:27:37 -0000 1.8 @@ -1,14 +1,12 @@ -%{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)} - Summary: Perl module to read TNEF files Name: perl-Convert-TNEF Version: 0.17 -Release: 4 +Release: 5%{?dist} License: GPL or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Convert-TNEF/ -Source0: http://www.cpan.org/authors/id/D/DO/DOUGW/Convert-TNEF-0.17.tar.gz +Source0: http://www.cpan.org/authors/id/D/DO/DOUGW/Convert-TNEF-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot BuildArch: noarch @@ -39,8 +37,11 @@ find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' chmod -R u+w $RPM_BUILD_ROOT/* +perldoc -t perlgpl > COPYING +perldoc -t perlartistic > Artistic + -%check || : +%check make test @@ -50,12 +51,16 @@ %files %defattr(-,root,root,-) -%doc README +%doc README COPYING Artistic %{perl_vendorlib}/Convert %{_mandir}/man3/Convert::TNEF.3pm* %changelog +* Mon Sep 05 2005 Steven Pritchard 0.17-5 +- Spec cleanup (closer to FE perl spec template). +- Include COPYING and Artistic. + * Fri Apr 7 2005 Michael Schwendt - rebuilt From fedora-extras-commits at redhat.com Tue Sep 6 00:33:54 2005 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Mon, 5 Sep 2005 20:33:54 -0400 Subject: rpms/perl-Exception-Class/devel perl-Exception-Class.spec,1.2,1.3 Message-ID: <200509060033.j860XsKS019115@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Exception-Class/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19096 Modified Files: perl-Exception-Class.spec Log Message: - Remove explicit core module dependencies - Add COPYING and Artistic Index: perl-Exception-Class.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Exception-Class/devel/perl-Exception-Class.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-Exception-Class.spec 17 Aug 2005 23:00:40 -0000 1.2 +++ perl-Exception-Class.spec 6 Sep 2005 00:33:52 -0000 1.3 @@ -1,19 +1,15 @@ Name: perl-Exception-Class Version: 1.21 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Exception::Class Perl module License: GPL or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Exception-Class/ -Source0: http://www.cpan.org/modules/by-module/Exception/Exception-Class-1.21.tar.gz +Source0: http://www.cpan.org/modules/by-module/Exception/Exception-Class-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -BuildRequires: perl(Test::More) >= 0.46 -BuildRequires: perl(Scalar::Util) BuildRequires: perl(Devel::StackTrace) >= 1.1 BuildRequires: perl(Class::Data::Inheritable) >= 0.02 -Requires: perl(Test::More) >= 0.46 -Requires: perl(Scalar::Util) Requires: perl(Devel::StackTrace) >= 1.1 Requires: perl(Class::Data::Inheritable) >= 0.02 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) @@ -40,6 +36,9 @@ chmod -R u+rwX,go+rX,go-w $RPM_BUILD_ROOT/* +perldoc -t perlgpl > COPYING +perldoc -t perlartistic > Artistic + %check make test @@ -48,11 +47,15 @@ %files %defattr(-,root,root,-) -%doc Changes LICENSE README +%doc Changes LICENSE README COPYING Artistic %{perl_vendorlib}/* %{_mandir}/man3/* %changelog +* Mon Sep 05 2005 Steven Pritchard 1.21-3 +- Remove explicit core module dependencies +- Add COPYING and Artistic + * Wed Aug 17 2005 Steven Pritchard 1.21-2 - Minor spec cleanup From fedora-extras-commits at redhat.com Tue Sep 6 00:44:44 2005 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Mon, 5 Sep 2005 20:44:44 -0400 Subject: rpms/perl-IPC-ShareLite/devel perl-IPC-ShareLite.spec,1.7,1.8 Message-ID: <200509060044.j860iiwm019240@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-IPC-ShareLite/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19199 Modified Files: perl-IPC-ShareLite.spec Log Message: - Cleanup (closer to current spec template). - Include COPYING and Artistic. Index: perl-IPC-ShareLite.spec =================================================================== RCS file: /cvs/extras/rpms/perl-IPC-ShareLite/devel/perl-IPC-ShareLite.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- perl-IPC-ShareLite.spec 6 Jul 2005 05:58:41 -0000 1.7 +++ perl-IPC-ShareLite.spec 6 Sep 2005 00:44:41 -0000 1.8 @@ -1,61 +1,59 @@ -%{!?perl_vendorarch: %define perl_vendorarch %(eval "`%{__perl} -V:installvendorarch`"; echo $installvendorarch)} - Name: perl-IPC-ShareLite Version: 0.09 -Release: 5%{?dist} - +Release: 6%{?dist} Summary: Light-weight Perl interface to shared memory - Group: Development/Libraries License: GPL or Artistic URL: http://search.cpan.org/dist/IPC-ShareLite/ -Source0: http://www.cpan.org/authors/id/M/MA/MAURICE/IPC-ShareLite-0.09.tar.gz +Source0: http://www.cpan.org/authors/id/M/MA/MAURICE/IPC-ShareLite-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -BuildRequires: perl >= 1:5.6.1 -Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description IPC::ShareLite provides a simple interface to shared memory, allowing data to be efficiently communicated between processes. - %prep %setup -q -n IPC-ShareLite-%{version} - %build -CFLAGS="$RPM_OPT_FLAGS" %{__perl} Makefile.PL INSTALLDIRS=vendor < /dev/null +%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS" < /dev/null %{__perl} -pi -e 's/^\tLD_RUN_PATH=[^\s]+\s*/\t/' Makefile -make %{?_smp_mflags} 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 -a \( -name .packlist \ - -o \( -name '*.bs' -a -empty \) \) -exec rm -f {} ';' -find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' + +find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \; +find $RPM_BUILD_ROOT -type f -name '*.bs' -size 0 -exec rm -f {} \; +find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null \; + chmod -R u+w $RPM_BUILD_ROOT/* +perldoc -t perlgpl > COPYING +perldoc -t perlartistic > Artistic -%check || : +%check make test - %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) -%doc Changes README TODO +%doc Changes README TODO COPYING Artistic %{perl_vendorarch}/auto/IPC %{perl_vendorarch}/IPC %{_mandir}/man3/*.3* - %changelog +* Mon Sep 05 2005 Steven Pritchard 0.09-6 +- Cleanup (closer to current spec template). +- Include COPYING and Artistic. + * Fri Apr 7 2005 Michael Schwendt - rebuilt From fedora-extras-commits at redhat.com Tue Sep 6 00:49:54 2005 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Mon, 5 Sep 2005 20:49:54 -0400 Subject: rpms/perl-Mail-SPF-Query/devel perl-Mail-SPF-Query.spec,1.1,1.2 Message-ID: <200509060049.j860nsdt019572@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Mail-SPF-Query/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19553 Modified Files: perl-Mail-SPF-Query.spec Log Message: - Spec cleanup - Include COPYING and Artistic Index: perl-Mail-SPF-Query.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Mail-SPF-Query/devel/perl-Mail-SPF-Query.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-Mail-SPF-Query.spec 4 Aug 2005 15:59:58 -0000 1.1 +++ perl-Mail-SPF-Query.spec 6 Sep 2005 00:49:52 -0000 1.2 @@ -1,13 +1,11 @@ -%{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)} - Name: perl-Mail-SPF-Query Version: 1.997 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Mail::SPF::Query Perl module License: GPL or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Mail-SPF-Query/ -Source0: http://www.cpan.org/modules/by-module/Mail/Mail-SPF-Query-1.997.tar.gz +Source0: http://www.cpan.org/modules/by-module/Mail/Mail-SPF-Query-%{version}.tar.gz # From Paul Howarth Patch0: MSQ-fallback.patch Patch1: use-sys-hostname.patch @@ -45,11 +43,14 @@ chmod -R u+rwX,go+rX,go-w $RPM_BUILD_ROOT/* +perldoc -t perlgpl > COPYING +perldoc -t perlartistic > Artistic + # Don't include the spfd and spfquery scripts in _bindir. rm -f $RPM_BUILD_ROOT%{_bindir}/spfd $RPM_BUILD_ROOT%{_bindir}/spfquery # Does a lot of external DNS lookups. -%check || : +%check %{?_with_check:make test} %clean @@ -57,11 +58,15 @@ %files %defattr(-,root,root,-) -%doc Changes README sample spfd spfquery +%doc Changes README sample spfd spfquery COPYING Artistic %{perl_vendorlib}/* %{_mandir}/man3/* %changelog +* Mon Sep 05 2005 Steven Pritchard 1.997-5 +- Spec cleanup +- Include COPYING and Artistic + * Mon Aug 01 2005 Steven Pritchard 1.997-4 - Add some BuildRequires (suggested by Paul Howarth) From fedora-extras-commits at redhat.com Tue Sep 6 01:05:14 2005 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Mon, 5 Sep 2005 21:05:14 -0400 Subject: rpms/perl-Module-Build/devel perl-Module-Build.spec,1.12,1.13 Message-ID: <200509060106.j8616Ftu020858@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Module-Build/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20839 Modified Files: perl-Module-Build.spec Log Message: - Minor spec cleanup. - Add COPYING and Artistic. Index: perl-Module-Build.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Module-Build/devel/perl-Module-Build.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- perl-Module-Build.spec 6 Jul 2005 05:36:18 -0000 1.12 +++ perl-Module-Build.spec 6 Sep 2005 01:04:44 -0000 1.13 @@ -1,59 +1,61 @@ Name: perl-Module-Build Version: 0.2611 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Perl module for building and installing Perl modules - Group: Development/Libraries License: GPL or Artistic URL: http://search.cpan.org/dist/Module-Build/ Source0: http://www.cpan.org/authors/id/K/KW/KWILLIAMS/Module-Build-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - BuildArch: noarch BuildRequires: perl(ExtUtils::ParseXS), perl(YAML) >= 0.35, perl(YAML) < 0.49 Requires: perl(ExtUtils::ParseXS), perl(YAML) >= 0.35, perl(YAML) < 0.49 -Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description Perl module for building and installing Perl modules, a replacement to ExtUtils::MakeMaker. - %prep %setup -q -n Module-Build-%{version} - %build %{__perl} Build.PL installdirs=vendor ./Build - %install rm -rf $RPM_BUILD_ROOT + ./Build install destdir=$RPM_BUILD_ROOT create_packlist=0 -chmod -R u+w $RPM_BUILD_ROOT/* +find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null \; -%check || : -./Build test +chmod -R u+rwX,go+rX,go-w $RPM_BUILD_ROOT/* + +perldoc -t perlgpl > COPYING +perldoc -t perlartistic > Artistic +%check +./Build test %clean rm -rf $RPM_BUILD_ROOT - %files %defattr(-,root,root,-) -%doc Changes README +%doc Changes README COPYING Artistic %{_bindir}/config_data %{perl_vendorlib}/Module %{_mandir}/man1/config_data.1* %{_mandir}/man3/Module::Build*.3* - %changelog +* Mon Sep 05 2005 Steven Pritchard - 0.2611-2 +- Minor spec cleanup. +- Add COPYING and Artistic. + * Wed Jul 06 2005 Steven Pritchard - 0.2611-1 -- Update to 0.2611 +- Update to 0.2611. * Sat May 7 2005 Ville Skytt?? - 0.2610-3 - Rebuild. From fedora-extras-commits at redhat.com Tue Sep 6 01:22:10 2005 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Mon, 5 Sep 2005 21:22:10 -0400 Subject: rpms/perl-Net-CIDR-Lite/devel perl-Net-CIDR-Lite.spec,1.2,1.3 Message-ID: <200509060122.j861MA2Z020948@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Net-CIDR-Lite/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20929 Modified Files: perl-Net-CIDR-Lite.spec Log Message: - Minor spec cleanup - Add COPYING and Artistic Index: perl-Net-CIDR-Lite.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Net-CIDR-Lite/devel/perl-Net-CIDR-Lite.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-Net-CIDR-Lite.spec 1 Aug 2005 23:38:15 -0000 1.2 +++ perl-Net-CIDR-Lite.spec 6 Sep 2005 01:22:08 -0000 1.3 @@ -1,13 +1,11 @@ -%{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)} - Name: perl-Net-CIDR-Lite Version: 0.18 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Net::CIDR::Lite Perl module License: GPL or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Net-CIDR-Lite/ -Source0: http://www.cpan.org/modules/by-module/Net/Net-CIDR-Lite-0.18.tar.gz +Source0: http://www.cpan.org/modules/by-module/Net/Net-CIDR-Lite-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) @@ -23,7 +21,6 @@ %build %{__perl} Makefile.PL INSTALLDIRS=vendor -%{__perl} -pi -e 's/^\tLD_RUN_PATH=[^\s]+\s*/\t/' Makefile make %{?_smp_mflags} %install @@ -36,7 +33,10 @@ chmod -R u+rwX,go+rX,go-w $RPM_BUILD_ROOT/* -%check || : +perldoc -t perlgpl > COPYING +perldoc -t perlartistic > Artistic + +%check make test %clean @@ -44,11 +44,15 @@ %files %defattr(-,root,root,-) -%doc Changes README +%doc Changes README COPYING Artistic %{perl_vendorlib}/* %{_mandir}/man3/* %changelog +* Mon Sep 05 2005 Steven Pritchard 0.18-3 +- Minor spec cleanup +- Add COPYING and Artistic + * Mon Aug 01 2005 Steven Pritchard 0.18-2 - Add BR Test::Pod and Test::Pod::Coverage for make test From fedora-extras-commits at redhat.com Tue Sep 6 01:26:35 2005 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Mon, 5 Sep 2005 21:26:35 -0400 Subject: rpms/perl-Text-Autoformat/devel perl-Text-Autoformat.spec,1.5,1.6 Message-ID: <200509060126.j861QZXv020983@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Text-Autoformat/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20964 Modified Files: perl-Text-Autoformat.spec Log Message: - Minor spec cleanup. - Add Artistic. Index: perl-Text-Autoformat.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Text-Autoformat/devel/perl-Text-Autoformat.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- perl-Text-Autoformat.spec 20 Aug 2005 23:28:02 -0000 1.5 +++ perl-Text-Autoformat.spec 6 Sep 2005 01:26:32 -0000 1.6 @@ -1,8 +1,6 @@ -%{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)} - Name: perl-Text-Autoformat Version: 1.13 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Text::Autoformat Perl module License: Artistic Group: Development/Libraries @@ -48,7 +46,9 @@ chmod -R u+rwX,go+rX,go-w $RPM_BUILD_ROOT/* -%check || : +perldoc -t perlartistic > Artistic + +%check make test %clean @@ -56,11 +56,15 @@ %files %defattr(-,root,root,-) -%doc Changes README +%doc Changes README Artistic %{perl_vendorlib}/* %{_mandir}/man3/* %changelog +* Mon Sep 05 2005 Steven Pritchard 1.13-3 +- Minor spec cleanup. +- Add Artistic. + * Sat Aug 20 2005 Steven Pritchard 1.13-2 - Fix permissions (#166406). From fedora-extras-commits at redhat.com Tue Sep 6 01:36:42 2005 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Mon, 5 Sep 2005 21:36:42 -0400 Subject: rpms/perl-Text-Reform/devel perl-Text-Reform.spec,1.7,1.8 Message-ID: <200509060136.j861agBZ021013@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Text-Reform/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20994 Modified Files: perl-Text-Reform.spec Log Message: - Minor spec cleanup. - Add Artistic. Index: perl-Text-Reform.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Text-Reform/devel/perl-Text-Reform.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- perl-Text-Reform.spec 6 Jul 2005 05:59:38 -0000 1.7 +++ perl-Text-Reform.spec 6 Sep 2005 01:36:40 -0000 1.8 @@ -1,64 +1,62 @@ -%{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)} - Name: perl-Text-Reform Version: 1.11 -Release: 4%{?dist} - +Release: 5%{?dist} Summary: Manual text wrapping and reformatting - Group: Development/Libraries License: Artistic URL: http://search.cpan.org/dist/Text-Reform/ -Source0: http://www.cpan.org/authors/id/D/DC/DCONWAY/Text-Reform-1.11.tar.gz +Source0: http://www.cpan.org/authors/id/D/DC/DCONWAY/Text-Reform-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -BuildRequires: perl >= 1:5.6.1 Requires: perl(TeX::Hyphen) -Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description The module supplies a re-entrant, highly configurable replacement for the built-in Perl format() mechanism. - %prep %setup -q -n Text-Reform-%{version} -perl -pi -e 's,/usr/local/bin/perl,%{__perl},' *.pl +%{__perl} -pi -e 's,/usr/local/bin/perl,%{__perl},' *.pl chmod 644 Changes README lib/Text/*.pm demo*.pl - %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} - %install rm -rf $RPM_BUILD_ROOT + make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT + # demo scripts packaged as documentation files find $RPM_BUILD_ROOT -type f -name 'demo*.pl' -exec rm -f {} \; + find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \; find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null \; -chmod -R u+w $RPM_BUILD_ROOT/* +chmod -R u+rwX,go+rX,go-w $RPM_BUILD_ROOT/* -%check || : -make test +perldoc -t perlartistic > Artistic +%check +make test %clean rm -rf $RPM_BUILD_ROOT - %files %defattr(-,root,root,-) -%doc Changes README demo*.pl +%doc Changes README demo*.pl Artistic %{perl_vendorlib}/Text/ %{_mandir}/man3/*.3* - %changelog +* Mon Sep 05 2005 Steven Pritchard 0.11-5 +- Minor spec cleanup. +- Add Artistic. + * Fri Apr 7 2005 Michael Schwendt - rebuilt From fedora-extras-commits at redhat.com Tue Sep 6 01:47:06 2005 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Mon, 5 Sep 2005 21:47:06 -0400 Subject: rpms/perl-Unix-Syslog/devel perl-Unix-Syslog.spec,1.8,1.9 Message-ID: <200509060147.j861l6Ys021054@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Unix-Syslog/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21035 Modified Files: perl-Unix-Syslog.spec Log Message: - Spec cleanup. - Disable "make test" by default (spams console). Index: perl-Unix-Syslog.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Unix-Syslog/devel/perl-Unix-Syslog.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- perl-Unix-Syslog.spec 6 Apr 2005 22:13:09 -0000 1.8 +++ perl-Unix-Syslog.spec 6 Sep 2005 01:47:04 -0000 1.9 @@ -1,17 +1,14 @@ -%{!?perl_vendorarch: %define perl_vendorarch %(eval "`%{__perl} -V:installvendorarch`"; echo $installvendorarch)} - -Summary: Perl interface to the UNIX syslog(3) calls Name: perl-Unix-Syslog Version: 0.100 -Release: 5 - +Release: 6%{?dist} +Summary: Perl interface to the UNIX syslog(3) calls License: Artistic Group: System Environment/Libraries URL: http://search.cpan.org/dist/Unix-Syslog/ -Source0: http://www.cpan.org/authors/id/M/MH/MHARNISCH/Unix-Syslog-0.100.tar.gz +Source0: http://www.cpan.org/authors/id/M/MH/MHARNISCH/Unix-Syslog-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot -Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description This module provides an interface to the system logger syslogd(8) via @@ -19,35 +16,30 @@ libc-functions of your system, so that anyone being familiar with syslog.h should be able to use this module right away. - %prep %setup -q -n Unix-Syslog-%{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" +%{__perl} -pi -e 's/^\tLD_RUN_PATH=[^\s]+\s*/\t/' Makefile +make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT -make install \ - PERL_INSTALL_ROOT=$RPM_BUILD_ROOT \ - INSTALLARCHLIB=$RPM_BUILD_ROOT%{perl_archlib} -find $RPM_BUILD_ROOT -type f -a \( -name perllocal.pod -o -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/* +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 -type d -depth -exec rmdir {} 2>/dev/null \; -%check || : -make test +chmod -R u+rwX,go+rX,go-w $RPM_BUILD_ROOT/* +%check +%{?_with_check:make test} %clean rm -rf $RPM_BUILD_ROOT - %files %defattr(-,root,root,-) %doc Changes README Artistic @@ -55,8 +47,11 @@ %{perl_vendorarch}/Unix %{_mandir}/man3/Unix::Syslog.3pm* - %changelog +* Mon Sep 05 2005 Steven Pritchard 0.100-6 +- Spec cleanup. +- Disable "make test" by default (spams console). + * Fri Apr 7 2005 Michael Schwendt - rebuilt From fedora-extras-commits at redhat.com Tue Sep 6 10:49:04 2005 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Tue, 6 Sep 2005 06:49:04 -0400 Subject: rpms/squidGuard - New directory Message-ID: <200509061049.j86An4Q7002127@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/rpms/squidGuard In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2107/squidGuard Log Message: Directory /cvs/extras/rpms/squidGuard added to the repository From fedora-extras-commits at redhat.com Tue Sep 6 10:49:04 2005 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Tue, 6 Sep 2005 06:49:04 -0400 Subject: rpms/squidGuard/devel - New directory Message-ID: <200509061049.j86An4pA002132@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/rpms/squidGuard/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2107/squidGuard/devel Log Message: Directory /cvs/extras/rpms/squidGuard/devel added to the repository From fedora-extras-commits at redhat.com Tue Sep 6 10:49:24 2005 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Tue, 6 Sep 2005 06:49:24 -0400 Subject: rpms/squidGuard Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200509061049.j86AnOQY002188@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/rpms/squidGuard In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2152 Added Files: Makefile import.log Log Message: Setup of module squidGuard --- NEW FILE Makefile --- # Top level Makefile for module squidGuard all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Tue Sep 6 10:49:24 2005 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Tue, 6 Sep 2005 06:49:24 -0400 Subject: rpms/squidGuard/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200509061049.j86AnOFk002193@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/rpms/squidGuard/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2152/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module squidGuard --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Tue Sep 6 10:50:43 2005 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Tue, 6 Sep 2005 06:50:43 -0400 Subject: rpms/squidGuard import.log,1.1,1.2 Message-ID: <200509061050.j86AohEr002294@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/rpms/squidGuard In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2253 Modified Files: import.log Log Message: auto-import squidGuard-1.2.0-11 on branch devel from squidGuard-1.2.0-11.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/squidGuard/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 6 Sep 2005 10:49:22 -0000 1.1 +++ import.log 6 Sep 2005 10:50:41 -0000 1.2 @@ -0,0 +1 @@ +squidGuard-1_2_0-11:HEAD:squidGuard-1.2.0-11.src.rpm:1126003831 From fedora-extras-commits at redhat.com Tue Sep 6 10:50:43 2005 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Tue, 6 Sep 2005 06:50:43 -0400 Subject: rpms/squidGuard/devel squid-getlist.html, NONE, 1.1 squid-getlist.html.patch, NONE, 1.1 squidGuard-destdir.patch, NONE, 1.1 squidGuard-paths.patch, NONE, 1.1 squidGuard.logrotate, NONE, 1.1 squidGuard.spec, NONE, 1.1 squidguard-1.2.0-db4.patch, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200509061050.j86Aoh09002299@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/rpms/squidGuard/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2253/devel Modified Files: .cvsignore sources Added Files: squid-getlist.html squid-getlist.html.patch squidGuard-destdir.patch squidGuard-paths.patch squidGuard.logrotate squidGuard.spec squidguard-1.2.0-db4.patch Log Message: auto-import squidGuard-1.2.0-11 on branch devel from squidGuard-1.2.0-11.src.rpm --- NEW FILE squid-getlist.html --- Auto Squidguard Filter Update 

    #!/bin/bash
#-----------------------------------------------------------------
#
# -- Changed - 15 June 2003
# --    Change 
#       "squidguard -C domains" to 
#       "squidguard -C all"
#       old way wasn't doing anything useful
#
#Below is the script that I use. You need to edit the first part
#to tell where your squid and squidguard binaries are, and also
#where your squidguard #blacklists are. This has the recent change
#of address for the squidguard.org-supplied blacklists.
#You will need to obtain and install the utility "wget" for this
#script to work. It is available as an RPM for RedHat. WGet is used
#to get the files. You can #use scripted ftp instead, but it's much
#more of a pain and less reliable.
#-----------------------------------------------------------------
# --------------------------------------------------------------
# Script to Update squidguard Blacklists
# Rick at Matthews.net with mods by morris at maynidea.com
# Last updated 05/31/2003
#
# This script downloads blacklists from two sites, merges and
# de-dupes them, then makes local changes (+/-). It does this
# in all of the categories (except porn) using the standard
# squidguard .diff files. The porn directory is handled
# differently, in part because of the large volume of changes.
#
# The user maintains local changes to the porn category in the
# files < domains_diff.local> and . These files
# use the standard squidguard .diff file format:
# +domain_A.com
# -domain_B.com
#		       SquidGuard is a free CIPA Compliant filter
#                                
#                                current updater at PAISD.net 
#                               -Leif Johnson Feb. 4, 2004 leif at paisd.net
#			         Port Aransas H.S. Texas 78373
#
# setup as a cronjob to run on mobydick (squid server) once a week.
#
# --------------------------------------------------------------
# Set date format for naming files

DATE=`date +%Y-%m-%d`
YEAR=`date +%Y`
DATETIME=`date +"%a %d %h %Y %T %Z"`
UNIQUEDT=`date +"%Y%m%d%H%M%S"`
#UNIQUEDT="xxx"
WGOPTS=-nv
echo ${UNIQUEDT}

# Give location of squid and squidguard programs
SQUID=/usr/sbin/squid
SQUIDGUARD=/usr/local/bin/squidGuard
# --------------------------------------------------------------
# BLACKDIR should be set to equal the dbhome path declaration
# in your squidguard.conf file
BLACKDIR=/var/lib/squidguard/db
BLKDIRADLT=${BLACKDIR}/blacklists
PORN=${BLACKDIR}/blacklists/porn
ADULT=${BLACKDIR}/blacklists/adult
ADS=${BLACKDIR}/blacklists/ads

# --------------------------------------------------------------
# Create statistics file for porn directory
#
mkdir -p ${PORN}/stats
mkdir -p ${PORN}/archive
mkdir -p ${ADULT}/stats
mkdir -p ${ADULT}/archive

touch ${PORN}/stats/${UNIQUEDT}_stats
echo "Blacklist Line Counts for "${DATETIME} \
  >> ${PORN}/stats/${UNIQUEDT}_stats

# --------------------------------------------------------------
# Download the latest blacklist from the squidguard site
#
# Uses wget (http://wget.sunsite.dk/)
#
# Downloads the current blacklist tar.gz file into the
# ${BLACKDIR} directory (defined above) and will name the file
# uniquely with today's date: ${UNIQUEDT}_sg.tar.gz
#

wget ${WGOPTS} --output-document=${BLACKDIR}/${UNIQUEDT}_sg.tar.gz \
  http://ftp.teledanmark.no/pub/www/proxy/squidguard/contrib/blacklists.tar.gz

#
# Download the latest adult.tar.gz file from the
# Universit? Toulouse in France (Seems to be updated daily)
#
# see http://cri.univ-tlse1.fr/documentations/cache/squidguard_en.html
#
# Uses wget (http://wget.sunsite.dk/)
#
# Download the current adult.tar.gz file into the
# ${BLACKDIR} directory (defined above) and will name the file
# uniquely with today's date: ${UNIQUEDT}_fr.tar.gz
#
# If you are inside of a firewall you may need passive ftp.
# For passive ftp change the wget line below to read:
# wget --passive-ftp --output-document=${BLACKDIR}/${UNIQUEDT}_fr.tar.gz \
#

wget ${WGOPTS} --output-document=${BLACKDIR}/${UNIQUEDT}_fr.tar.gz \
  ftp://ftp.univ-tlse1.fr/pub/reseau/cache/squidguard_contrib/adult.tar.gz

# --------------------------------------------------------------
# Install the new squidguard blacklist
#
# Installs the blacklist under the ${BLACKDIR} directory:
#   ${BLACKDIR}/blacklists/ads
# ${BLACKDIR}/blacklists/aggressive
# ${BLACKDIR}/blacklists/audio-video
# ${BLACKDIR}/blacklists/drugs
# ${BLACKDIR}/blacklists/gambling
# ${BLACKDIR}/blacklists/hacking
# ${BLACKDIR}/blacklists/mail
# ${BLACKDIR}/blacklists/porn
# ${BLACKDIR}/blacklists/proxy
# ${BLACKDIR}/blacklists/violence
# ${BLACKDIR}/blacklists/warez
#

gunzip < ${BLACKDIR}/${UNIQUEDT}_sg.tar.gz | (cd ${BLACKDIR}; tar xvf -)

# --------------------------------------------------------------
# Remove the differential diff files that are supplied with the
# squidguard blacklists - they are simply clutter
#

rm -f ${PORN}/domains.*.diff
rm -f ${PORN}/urls.*.diff
rm -f ${ADS}/domains.*.diff
rm -f ${ADS}/urls.*.diff

# --------------------------------------------------------------
# Remove the comment lines from the ${PORN}/domains and
# ${PORN}/urls files so they can be sorted
#

grep -v -e '^#' ${PORN}/domains > ${PORN}/domains.temp
mv -f ${PORN}/domains.temp ${PORN}/domains

grep -v -e '^#' ${PORN}/urls > ${PORN}/urls.temp
mv -f ${PORN}/urls.temp ${PORN}/urls

# --------------------------------------------------------------
# Log item counts to porn statistics file
#

echo " " >> ${PORN}/stats/${UNIQUEDT}_stats
echo "Squidguard blacklist files as downloaded" \
  >> ${PORN}/stats/${UNIQUEDT}_stats
echo "----------------------------------------" \
  >> ${PORN}/stats/${UNIQUEDT}_stats

wc --lines ${PORN}/domains >> ${PORN}/stats/${UNIQUEDT}_stats
wc --lines ${PORN}/urls >> ${PORN}/stats/${UNIQUEDT}_stats

# --------------------------------------------------------------
# Install the new adult blacklist from Universit? Toulouse
#
# Installs the blacklist under the ${BLKDIRADLT} directory:
#   ${BLKDIRADLT}/adult
#
# Also cleans up any entries that begin with a dash (-)
#

# gunzip < ${BLACKDIR}/${UNIQUEDT}_fr.tar.gz | (cd ${BLACKDIR}; tar xvf -)
tar -C ${BLKDIRADLT} -xvzf ${BLACKDIR}/${UNIQUEDT}_fr.tar.gz
perl -pi -e "s#^\-##g" ${BLKDIRADLT}/adult/domains
perl -pi -e "s#^\-##g" ${BLKDIRADLT}/adult/urls

# --------------------------------------------------------------
# Save current files for subsequent processing
# Age older files
# The most recent files will always be domains.0 and urls.0
#

[ -f ${PORN}/archive/domains.-2 ] && mv -f ${PORN}/archive/domains.-2 ${PORN}/archive/domains.-3
[ -f ${PORN}/archive/urls.-2    ] && mv -f ${PORN}/archive/urls.-2 ${PORN}/archive/urls.-3
[ -f ${PORN}/archive/domains.-1 ] && mv -f ${PORN}/archive/domains.-1 ${PORN}/archive/domains.-2
[ -f ${PORN}/archive/urls.-1    ] && mv -f ${PORN}/archive/urls.-1 ${PORN}/archive/urls.-2
[ -f ${PORN}/archive/domains.0  ] && mv -f ${PORN}/archive/domains.0 ${PORN}/archive/domains.-1
[ -f ${PORN}/archive/urls.0     ] && mv -f ${PORN}/archive/urls.0 ${PORN}/archive/urls.-1
cp ${PORN}/domains ${PORN}/archive/domains.0
cp ${PORN}/urls ${PORN}/archive/urls.0

[ -f ${ADULT}/archive/domains.-2 ] && mv -f ${ADULT}/archive/domains.-2 ${ADULT}/archive/domains.-3
[ -f ${ADULT}/archive/urls.-2    ] && mv -f ${ADULT}/archive/urls.-2 ${ADULT}/archive/urls.-3
[ -f ${ADULT}/archive/domains.-1 ] && mv -f ${ADULT}/archive/domains.-1 ${ADULT}/archive/domains.-2
[ -f ${ADULT}/archive/urls.-1    ] && mv -f ${ADULT}/archive/urls.-1 ${ADULT}/archive/urls.-2
[ -f ${ADULT}/archive/domains.0  ] && mv -f ${ADULT}/archive/domains.0 ${ADULT}/archive/domains.-1
[ -f ${ADULT}/archive/urls.0     ] && mv -f ${ADULT}/archive/urls.0 ${ADULT}/archive/urls.-1
cp ${ADULT}/domains ${ADULT}/archive/domains.0
cp ${ADULT}/urls ${ADULT}/archive/urls.0

# --------------------------------------------------------------
# Log item counts to porn statistics file
#

echo " " >> ${PORN}/stats/${UNIQUEDT}_stats
echo "University Toulouse blacklist files as downloaded" \
  >> ${PORN}/stats/${UNIQUEDT}_stats
echo "-------------------------------------------------" \
  >> ${PORN}/stats/${UNIQUEDT}_stats

wc --lines ${ADULT}/domains >> ${PORN}/stats/${UNIQUEDT}_stats
wc --lines ${ADULT}/urls >> ${PORN}/stats/${UNIQUEDT}_stats

# --------------------------------------------------------------
# Sort and de-dupe the _diff.local files
#

cat ${PORN}/domains_diff.local | sort | uniq > ${PORN}/domains.temp
cat ${PORN}/urls_diff.local | sort | uniq > ${PORN}/urls.temp
mv -f ${PORN}/domains.temp ${PORN}/domains_diff.local
mv -f ${PORN}/urls.temp ${PORN}/urls_diff.local

# --------------------------------------------------------------
# Log item counts to porn statistics file
#

echo " " >> ${PORN}/stats/${UNIQUEDT}_stats
echo "Local _diff.local files" >> ${PORN}/stats/${UNIQUEDT}_stats
echo "-----------------------" >> ${PORN}/stats/${UNIQUEDT}_stats

wc --lines ${PORN}/domains_diff.local >> ${PORN}/stats/${UNIQUEDT}_stats
wc --lines ${PORN}/urls_diff.local >> ${PORN}/stats/${UNIQUEDT}_stats

# --------------------------------------------------------------
# Create to_add & to_delete files from the _diff.local files.
# The to_add files contain only the adds, and the to_delete files
# contain only the deletes.
# The _diff.local files are unchanged by this process.
#

grep -e '^+' ${PORN}/domains_diff.local > ${PORN}/domains.to_add
grep -e '^-' ${PORN}/domains_diff.local > ${PORN}/domains.to_delete
grep -e '^+' ${PORN}/urls_diff.local > ${PORN}/urls.to_add
grep -e '^-' ${PORN}/urls_diff.local > ${PORN}/urls.to_delete

# --------------------------------------------------------------
# Remove +/- from the to_add & to_delete files
#

perl -pi -e "s#^\+##g" ${PORN}/urls.to_add
perl -pi -e "s#^\-##g" ${PORN}/urls.to_delete
perl -pi -e "s#^\+##g" ${PORN}/domains.to_add
perl -pi -e "s#^\-##g" ${PORN}/domains.to_delete

# --------------------------------------------------------------
# Log item counts to porn statistics file
#

echo " " >> ${PORN}/stats/${UNIQUEDT}_stats
echo "Local to_add and to_delete files" >> ${PORN}/stats/${UNIQUEDT}_stats
echo "--------------------------------" >> ${PORN}/stats/${UNIQUEDT}_stats

wc --lines ${PORN}/domains.to_add >> ${PORN}/stats/${UNIQUEDT}_stats
wc --lines ${PORN}/domains.to_delete >> ${PORN}/stats/${UNIQUEDT}_stats
wc --lines ${PORN}/urls.to_add >> ${PORN}/stats/${UNIQUEDT}_stats
wc --lines ${PORN}/urls.to_delete >> ${PORN}/stats/${UNIQUEDT}_stats

# --------------------------------------------------------------
# Combine the adult, blacklist and to_add files
# Remove garbage and blanks
# Remove duplicate entries
#

cat ${PORN}/archive/domains.0 ${ADULT}/archive/domains.0 ${PORN}/domains.to_add \
  > ${PORN}/domains.merged.1
cat ${PORN}/domains.merged.1 | tr -d '\000-\011' > ${PORN}/domains.merged.2
cat ${PORN}/domains.merged.2 | tr -d '\013-\037' > ${PORN}/domains.merged.3
cat ${PORN}/domains.merged.3 | tr -d '\177-\377' > ${PORN}/domains.merged.4
sort -u ${PORN}/domains.merged.4 > ${PORN}/domains.merged

cat ${PORN}/archive/urls.0 ${ADULT}/archive/urls.0 ${PORN}/urls.to_add \
  > ${PORN}/urls.merged.1
cat ${PORN}/urls.merged.1 | tr -d '\000-\011' > ${PORN}/urls.merged.2
cat ${PORN}/urls.merged.2 | tr -d '\013-\037' > ${PORN}/urls.merged.3
cat ${PORN}/urls.merged.3 | tr -d '\177-\377' > ${PORN}/urls.merged.4
sort -u ${PORN}/urls.merged.4 > ${PORN}/urls.merged

# --------------------------------------------------------------
# Log item counts to porn statistics file
#

echo " " >> ${PORN}/stats/${UNIQUEDT}_stats
echo "Combined adult, blacklist and to_add files, deduped" \
  >> ${PORN}/stats/${UNIQUEDT}_stats
echo "---------------------------------------------------" \
  >> ${PORN}/stats/${UNIQUEDT}_stats

wc --lines ${PORN}/domains.merged >> ${PORN}/stats/${UNIQUEDT}_stats
wc --lines ${PORN}/urls.merged >> ${PORN}/stats/${UNIQUEDT}_stats

# --------------------------------------------------------------
# Remove entries that match the content of the to_delete files
#

grep -v -x -F --file=${PORN}/domains.to_delete \
  ${PORN}/domains.merged > ${PORN}/domains.adjusted
grep -v -x -F --file=${PORN}/urls.to_delete \
  ${PORN}/urls.merged > ${PORN}/urls.adjusted

# --------------------------------------------------------------
# Log item counts to porn statistics file
#

echo " " >> ${PORN}/stats/${UNIQUEDT}_stats
echo "After removing the contents of the to_delete files" \
  >> ${PORN}/stats/${UNIQUEDT}_stats
echo "--------------------------------------------------" \
  >> ${PORN}/stats/${UNIQUEDT}_stats

wc --lines ${PORN}/domains.adjusted >> ${PORN}/stats/${UNIQUEDT}_stats
wc --lines ${PORN}/urls.adjusted >> ${PORN}/stats/${UNIQUEDT}_stats

# --------------------------------------------------------------
# Install new text files
#

mv -f ${PORN}/domains.adjusted ${PORN}/domains
mv -f ${PORN}/urls.adjusted ${PORN}/urls

# --------------------------------------------------------------
# Log item counts to porn statistics file
#

echo " " >> ${PORN}/stats/${UNIQUEDT}_stats
echo "Final production files" \
  >> ${PORN}/stats/${UNIQUEDT}_stats
echo "----------------------" \
  >> ${PORN}/stats/${UNIQUEDT}_stats

wc --lines ${PORN}/domains >> ${PORN}/stats/${UNIQUEDT}_stats
wc --lines ${PORN}/urls >> ${PORN}/stats/${UNIQUEDT}_stats

# --------------------------------------------------------------
# Create new databases in all categories
#

${SQUIDGUARD} -C all

# --------------------------------------------------------------
# Update databases from your domains.diff and urls.diff files
# NOTE: The -u[pdate] command only looks for domains.diff and
# urls.diff. It does NOT use the incremental files that are
# included in the blacklist file.
# e.g. domains.20011230.diff, urls.20011230.diff
#

${SQUIDGUARD} -u

# --------------------------------------------------------------
# Change ownership of blacklist files
#

chown -R squid.squid ${BLACKDIR}/blacklists

# --------------------------------------------------------------
# Bounce squid and squidguard
#

${SQUID} -k reconfigure

# --------------------------------------------------------------
# Delete work files
#

rm -f ${PORN}/domains.merged
rm -f ${PORN}/domains.merged.*
rm -f ${PORN}/domains.to_add
rm -f ${PORN}/domains.to_delete

rm -f ${PORN}/urls.merged
rm -f ${PORN}/urls.merged.*
rm -f ${PORN}/urls.to_add
rm -f ${PORN}/urls.to_delete

# --------------------------------------------------------------
# Display stats file
#

cat ${PORN}/stats/${UNIQUEDT}_stats

# --------------------------------------------------------------
# Wait for everything to finish, then exit
#

sleep 5s
exit 0

squid-getlist.html.patch:

--- NEW FILE squid-getlist.html.patch ---
--- squid-getlist.html.1	2004-02-05 03:55:15.000000000 +0100
+++ squid-getlist.html	2005-09-05 17:47:18.000000000 +0200
@@ -1,8 +1,16 @@
-Auto Squidguard Filter Update
-
     #!/bin/bash
+
+ENABLED=0
+
+if [ $ENABLED == 0 ]; then exit 0; fi
+
 #-----------------------------------------------------------------
 #
+# -- Changed - 05 September 2005
+# --    Change by Oliver Falk 
+#       Modified paths to work with my RPM
+#       Added ENABLED=0/1 (0 means disabled; default)
+#
 # -- Changed - 15 June 2003
 # --    Change 
 #       "squidguard -C domains" to 
@@ -55,11 +63,11 @@
 
 # Give location of squid and squidguard programs
 SQUID=/usr/sbin/squid
-SQUIDGUARD=/usr/local/bin/squidGuard
+SQUIDGUARD=/usr/bin/squidGuard
 # --------------------------------------------------------------
 # BLACKDIR should be set to equal the dbhome path declaration
 # in your squidguard.conf file
-BLACKDIR=/var/lib/squidguard/db
+BLACKDIR=/var/lib/squidGuard
 BLKDIRADLT=${BLACKDIR}/blacklists
 PORN=${BLACKDIR}/blacklists/porn
 ADULT=${BLACKDIR}/blacklists/adult

squidGuard-destdir.patch:

--- NEW FILE squidGuard-destdir.patch ---
--- squidGuard-1.1.4/src/Makefile.in.destdir	Fri Oct 13 19:44:15 2000
+++ squidGuard-1.1.4/src/Makefile.in	Fri Oct 13 19:45:09 2000
@@ -97,8 +97,8 @@
 
 install.bin:: squidGuard
 	@echo making $@ in `basename \`pwd\``
-	@$(MKDIR) $(bindir) $(logdir) $(cfgdir)
-	$(INSTALL_PROGRAM) squidGuard $(bindir)/squidGuard
+	@$(MKDIR) $(DESTDIR)$(bindir) $(DESTDIR)$(logdir) $(DESTDIR)$(cfgdir)
+	$(INSTALL_PROGRAM) squidGuard $(DESTDIR)$(bindir)/squidGuard
 
 uninstall.bin::
 	@echo making $@ in `basename \`pwd\``

squidGuard-paths.patch:

--- NEW FILE squidGuard-paths.patch ---
--- squidGuard-1.1.4/samples/sample.conf.in	Mon May 10 18:37:13 1999
+++ squidGuard-1.1.4/samples/sample.conf.in.paths	Fri Oct 13 19:47:31 2000
@@ -2,8 +2,8 @@
 # CONFIG FILE FOR SQUIDGUARD
 #
 
-dbhome @prefix@/squidGuard/db
-logdir @prefix@/squidGuard/logs
+dbhome @sg_dbhome@
+logdir @sg_logdir@
 
 #
 # TIME RULES:


--- NEW FILE squidGuard.logrotate ---
/var/log/squid/squidGuard.log {
    weekly
    compress
    notifempty
    missingok
}


--- NEW FILE squidGuard.spec ---
# $Id: squidGuard.spec,v 1.10 2005/09/06 07:39:02 oliver Exp $

%define			_dbhomedir		%{_var}/lib/%{name}

%define			_dbrpmver		%(eval "rpm -q --queryformat \"%{VERSION}\" db4")

Name:			squidGuard
Version:		1.2.0
Release:		11
Summary:		Filter, redirector and access controller plugin for squid

Group:			System Environment/Daemons
License:		GPL

Source0:		http://ftp.teledanmark.no/pub/www/proxy/%{name}/%{name}-%{version}.tar.gz
Source1:		squidGuard.logrotate
Source2:		http://ftp.teledanmark.no/pub/www/proxy/%{name}/contrib/blacklists.tar.gz
Source3:		http://cuda.port-aransas.k12.tx.us/squid-getlist.html

Patch0:			squidGuard-destdir.patch
Patch1:			squidGuard-paths.patch
Patch2:			squidguard-1.2.0-db4.patch
Patch3:			squid-getlist.html.patch
URL:			http://www.squidguard.org/

BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:	db4-devel
Requires:		squid

%description
squidGuard can be used to 
- limit the web access for some users to a list of accepted/well known
  web servers and/or URLs only.
- block access to some listed or blacklisted web servers and/or URLs
  for some users.
- block access to URLs matching a list of regular expressions or words
  for some users.
- enforce the use of domainnames/prohibit the use of IP address in
  URLs.
- redirect blocked URLs to an "intelligent" CGI based info page.
- redirect unregistered user to a registration form.
- redirect popular downloads like Netscape, MSIE etc. to local copies.
- redirect banners to an empty GIF.
- have different access rules based on time of day, day of the week,
  date etc.
- have different rules for different user groups.
- and much more.. 

Neither squidGuard nor Squid can be used to
- filter/censor/edit text inside documents 
- filter/censor/edit embeded scripting languages like JavaScript or
  VBscript inside HTML

%prep
%setup -q
%{__cp} %{SOURCE3} .
%patch0 -p1 -b .destdir
%patch1 -p1 -b .paths
%if "%{_dbrpmver}" != "4.0.14"
%patch2 -p0 -b .db4
%endif
%patch3 -p0

%build
%configure \
	--with-sg-config=%{_sysconfdir}/squid/squidGuard.conf \
	--with-sg-logdir=%{_var}/log/squid \
	--with-sg-dbhome=%{_dbhomedir}
	
%{__make} %{?_smp_mflags} LIBS=-ldb

%install
%{__rm} -rf $RPM_BUILD_ROOT

%{__make} DESTDIR=$RPM_BUILD_ROOT install

%{__install} -p -D -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/squidGuard
%{__install} -p -D -m 0644 samples/sample.conf $RPM_BUILD_ROOT%{_sysconfdir}/squid/squidGuard.conf
%{__install} -p -D -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_dbhomedir}/blacklists.tar.gz

# Don't use SOURCE3, but use the allready patched one #165689, also install it with perm 755 not 750
%{__install} -p -D -m 0755 squid-getlist.html $RPM_BUILD_ROOT%{_sysconfdir}/cron.daily/squidGuard

pushd $RPM_BUILD_ROOT%{_dbhomedir}
tar xfz $RPM_BUILD_ROOT%{_dbhomedir}/blacklists.tar.gz
popd

sed -i "s,dest/adult/,blacklists/porn/,g" $RPM_BUILD_ROOT%{_sysconfdir}/squid/squidGuard.conf

%clean
%{__rm} -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root)
%doc samples/*.conf
%doc samples/*.cgi
%doc samples/dest/blacklists.tar.gz
%doc COPYING GPL
%doc doc/*.txt doc/*.html doc/*.gif
%{_bindir}/*
%config(noreplace) %{_sysconfdir}/squid/squidGuard.conf
%config(noreplace) %{_sysconfdir}/logrotate.d/squidGuard
%config(noreplace) %{_sysconfdir}/cron.daily/squidGuard
%{_dbhomedir}/

%changelog
* Tue Sep 06 2005 Oliver Falk 		- 1.2.0-11
- More bugs from Bug #165689
  Install cron script with perm 755
  Don't use SOURCE3 in install section, we need to use the patched one
  
* Mon Sep 05 2005 Oliver Falk 		- 1.2.0-10
- Include GPL in doc section

* Mon Sep 05 2005 Oliver Falk 		- 1.2.0-9
- More 'bugs' from Bug #165689
  Make changed on squid-getlist.html a patch, as sources should
  match upstream sources, so they are wget-able...

* Mon Sep 05 2005 Oliver Falk 		- 1.2.0-8
- Bug #165689

* Thu May 19 2005 Oliver Falk 		- 1.2.0-7
- Update blacklists
- Cleanup specfile

* Fri Apr 08 2005 Oliver Falk 		- 1.2.0-6
- Fix build on RH 8 with db 4.0.14, by not applying the db4 patch

* Mon Feb 21 2005 Oliver Falk  		- 1.2.0-5
- Specfile cleaning
- Make it build with db4 again, by adding the db4-patch

* Mon Apr 12 2002 Oliver Pitzeier 	- 1.2.0-4
- Tweaks

* Mon Apr 08 2002 Oliver Pitzeier  	- 1.2.0-3
- Rebuild

* Mon Apr 08 2002 Oliver Pitzeier  	- 1.2.0-2
- Updated the blacklists and put it into the right place
  I also descompress them
- Added a new "forbidden" script - the other ones are too
  old and don't work.  

* Fri Apr 05 2002 Oliver Pitzeier  	- 1.2.0-1
- Update to version 1.2.0

* Fri Jun  1 2001 Enrico Scholz 
- cleaned up for rhcontrib

* Fri Oct 13 2000 Enrico Scholz 
- initial build

squidguard-1.2.0-db4.patch:

--- NEW FILE squidguard-1.2.0-db4.patch ---
--- src/sgDb.c.orig	2004-03-09 03:45:59.000000000 +0100
+++ src/sgDb.c	2004-03-09 03:48:43.000000000 +0100
@@ -98,13 +98,13 @@
     if(createdb)
       flag = flag | DB_TRUNCATE;
     if ((ret = 
-	 Db->dbp->open(Db->dbp, dbfile, NULL, DB_BTREE, flag, 0664)) != 0) {
+	 Db->dbp->open(Db->dbp, NULL, dbfile, NULL, DB_BTREE, flag, 0664)) != 0) {
       (void) Db->dbp->close(Db->dbp, 0);
       sgLogFatalError("Error db_open: %s", strerror(ret));
     }
   } else {
     if ((ret = 
-	 Db->dbp->open(Db->dbp, dbfile, NULL, DB_BTREE, DB_CREATE, 0664)) != 0) {
+	 Db->dbp->open(Db->dbp, NULL, dbfile, NULL, DB_BTREE, DB_CREATE, 0664)) != 0) {
       sgLogFatalError("Error db_open: %s", strerror(ret));
     }
   }


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/squidGuard/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	6 Sep 2005 10:49:22 -0000	1.1
+++ .cvsignore	6 Sep 2005 10:50:41 -0000	1.2
@@ -0,0 +1,2 @@
+blacklists.tar.gz
+squidGuard-1.2.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/squidGuard/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	6 Sep 2005 10:49:22 -0000	1.1
+++ sources	6 Sep 2005 10:50:41 -0000	1.2
@@ -0,0 +1,2 @@
+63190e4c21688a4185cc3c0b62aae970  blacklists.tar.gz
+c6e2e9112fdbda0602656f94c1ce31fd  squidGuard-1.2.0.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep  6 10:53:51 2005
From: fedora-extras-commits at redhat.com (Oliver Falk (oliver))
Date: Tue,  6 Sep 2005 06:53:51 -0400
Subject: owners owners.list,1.167,1.168
Message-ID: <200509061053.j86ArpJx002434@cvs-int.fedora.redhat.com>

Author: oliver

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

Modified Files:
	owners.list 
Log Message:
* Add squidGuard


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.167
retrieving revision 1.168
diff -u -r1.167 -r1.168
--- owners.list	4 Sep 2005 21:59:46 -0000	1.167
+++ owners.list	6 Sep 2005 10:53:48 -0000	1.168
@@ -874,6 +874,7 @@
 Fedora Extras|splint|An implementation of the lint program|pnasrat at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|sqlite2|Embeddable SQL engine in a C library|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
 Fedora Extras|sqlite|An embeddable SQL engine in a C library|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
+Fedora Extras|squidGuard|Filter, redirector and access controller plugin for squid|oliver at linux-kernel.at|extras-qa at fedoraproject.org|
 Fedora Extras|starfighter|For bugs related to the starfighter component|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|stellarium|A photo-realistic nightsky renderer|Jochen at herr-schmitt.de|extras-qa at fedoraproject.org|
 Fedora Extras|stow|Manage the installation of software packages from source|gauret at free.fr|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Tue Sep  6 14:27:28 2005
From: fedora-extras-commits at redhat.com (Ed Hill (edhill))
Date: Tue,  6 Sep 2005 10:27:28 -0400
Subject: rpms/emacs-auctex/devel emacs-auctex.spec,1.2,1.3
Message-ID: <200509061427.j86ERS6T008228@cvs-int.fedora.redhat.com>

Author: edhill

Update of /cvs/extras/rpms/emacs-auctex/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8191/devel

Modified Files:
	emacs-auctex.spec 
Log Message:
bugzilla 167439



Index: emacs-auctex.spec
===================================================================
RCS file: /cvs/extras/rpms/emacs-auctex/devel/emacs-auctex.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- emacs-auctex.spec	9 Aug 2005 18:23:06 -0000	1.2
+++ emacs-auctex.spec	6 Sep 2005 14:27:26 -0000	1.3
@@ -4,7 +4,7 @@
 Summary: 	Enhanced TeX modes for Emacsen
 Name: 		emacs-auctex
 Version: 	11.55
-Release: 	4%{?dist}
+Release: 	5%{?dist}
 License: 	GPL
 Group: 		Applications/Editors
 URL: 		http://www.gnu.org/software/auctex/
@@ -14,7 +14,7 @@
 Obsoletes:      auctex
 Conflicts:      emacspeak < 18
 Provides:       auctex
-Requires:       emacs emacs-el
+Requires:       emacs emacs-common
 BuildRequires:  emacs tetex tetex-dvips texinfo
 
 %description 
@@ -81,6 +81,9 @@
 %{_datadir}/emacs/site-lisp/tex-site.el
 
 %changelog
+* Tue Sep  6 2005 Ed Hill  - 11.55-5
+- bugzilla 167439
+
 * Tue Aug  9 2005 Ed Hill  - 11.55-4
 - call it BuildArch
 



From fedora-extras-commits at redhat.com  Tue Sep  6 14:27:27 2005
From: fedora-extras-commits at redhat.com (Ed Hill (edhill))
Date: Tue,  6 Sep 2005 10:27:27 -0400
Subject: rpms/emacs-auctex/FC-4 emacs-auctex.spec,1.2,1.3
Message-ID: <200509061427.j86ERR9R008224@cvs-int.fedora.redhat.com>

Author: edhill

Update of /cvs/extras/rpms/emacs-auctex/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8191/FC-4

Modified Files:
	emacs-auctex.spec 
Log Message:
bugzilla 167439



Index: emacs-auctex.spec
===================================================================
RCS file: /cvs/extras/rpms/emacs-auctex/FC-4/emacs-auctex.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- emacs-auctex.spec	9 Aug 2005 18:23:06 -0000	1.2
+++ emacs-auctex.spec	6 Sep 2005 14:27:24 -0000	1.3
@@ -4,7 +4,7 @@
 Summary: 	Enhanced TeX modes for Emacsen
 Name: 		emacs-auctex
 Version: 	11.55
-Release: 	4%{?dist}
+Release: 	5%{?dist}
 License: 	GPL
 Group: 		Applications/Editors
 URL: 		http://www.gnu.org/software/auctex/
@@ -14,7 +14,7 @@
 Obsoletes:      auctex
 Conflicts:      emacspeak < 18
 Provides:       auctex
-Requires:       emacs emacs-el
+Requires:       emacs emacs-common
 BuildRequires:  emacs tetex tetex-dvips texinfo
 
 %description 
@@ -81,6 +81,9 @@
 %{_datadir}/emacs/site-lisp/tex-site.el
 
 %changelog
+* Tue Sep  6 2005 Ed Hill  - 11.55-5
+- bugzilla 167439
+
 * Tue Aug  9 2005 Ed Hill  - 11.55-4
 - call it BuildArch
 



From fedora-extras-commits at redhat.com  Tue Sep  6 14:33:51 2005
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Tue,  6 Sep 2005 10:33:51 -0400
Subject: rpms/erlang - New directory
Message-ID: <200509061433.j86EXpYQ008388@cvs-int.fedora.redhat.com>

Author: gemi

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

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




From fedora-extras-commits at redhat.com  Tue Sep  6 14:33:53 2005
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Tue,  6 Sep 2005 10:33:53 -0400
Subject: rpms/erlang/devel - New directory
Message-ID: <200509061433.j86EXrkP008407@cvs-int.fedora.redhat.com>

Author: gemi

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

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




From fedora-extras-commits at redhat.com  Tue Sep  6 14:34:15 2005
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Tue,  6 Sep 2005 10:34:15 -0400
Subject: rpms/erlang Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200509061434.j86EYFWY008452@cvs-int.fedora.redhat.com>

Author: gemi

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

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


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

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

common : CVS/Root
	@cvs checkout common

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

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


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Tue Sep  6 14:34:15 2005
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Tue,  6 Sep 2005 10:34:15 -0400
Subject: rpms/erlang/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200509061434.j86EYF4W008457@cvs-int.fedora.redhat.com>

Author: gemi

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

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


--- NEW FILE .cvsignore ---


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

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Tue Sep  6 14:38:21 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue,  6 Sep 2005 10:38:21 -0400
Subject: rpms/logjam/FC-3 logjam.spec,1.7,1.8 sources,1.4,1.5
Message-ID: <200509061438.j86EcLZI008593@cvs-int.fedora.redhat.com>

Author: spot

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

Modified Files:
	logjam.spec sources 
Log Message:

4.5.1



Index: logjam.spec
===================================================================
RCS file: /cvs/extras/rpms/logjam/FC-3/logjam.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- logjam.spec	11 Jul 2005 14:43:34 -0000	1.7
+++ logjam.spec	6 Sep 2005 14:38:19 -0000	1.8
@@ -1,17 +1,14 @@
 %define use_xmms 1
 
 Name:		logjam
-Version:	4.5
-Release:	0.1patch8%{?dist}
+Version:	4.5.1
+Release:	1%{?dist}
 Epoch:		1
 Summary:	GTK2 client for LiveJournal
 License:	GPL
 Group:		User Interface/Desktops
 URL:		http://logjam.danga.com/
-#This is where the final builds come from. 
-#Source0:	http://logjam.danga.com/download/logjam-%{version}.tar.bz2
-#This is an arch snapshot
-Source0:	logjam-%{version}-patch8.tar.bz2
+Source0:	http://logjam.danga.com/download/logjam-%{version}.tar.bz2
 Requires:	curl >= 7.9, gtkspell
 %if %{use_xmms}
 BuildRequires:	xmms-devel
@@ -22,7 +19,6 @@
 Obsoletes:	loserjabber, logjam-gnome
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Patch0:		logjam-4.4.1-offline-segfaultfix.patch
-Patch1:		logjam-4.4.1-rupo.patch
 Patch2:		logjam-4.4.1-backdated.patch
 Patch3:		logjam-4.4.1-cleanups.patch
 Patch4:		logjam-4.4.1-fedora-desktop.patch
@@ -44,9 +40,8 @@
 %endif
 
 %prep
-%setup -n %{name}-%{version}-patch8 -q
+%setup -q
 %patch0 -p1 -b .offline-segfaultfix
-%patch1 -p1 -b .rupo
 %patch2 -p1 -b .backdated
 %patch3 -p1 -b .cleanups
 %patch4 -p1 -b .desktop
@@ -57,10 +52,6 @@
 %if %{use_xmms}
 	--with-xmms
 %endif
-cp libtool protocol/liblivejournal
-cd gen
-./regen.sh
-cd ..
 make
 
 %install
@@ -91,6 +82,9 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Tue Sep  6 2005 Tom "spot" Callaway  1:4.5.1-1
+- bump to 4.5.1
+
 * Mon Jul 11 2005 Tom "spot" Callaway  4.5-0.1patch8
 - bump to patch8
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/logjam/FC-3/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	11 Jul 2005 14:46:17 -0000	1.4
+++ sources	6 Sep 2005 14:38:19 -0000	1.5
@@ -1,2 +1,3 @@
 f16f68a4a6b15fb5bb650614f3ff081c  logjam-4.4.1.tar.bz2
 0acb70ccb88d6334af22e56e4b521c6b  logjam-4.5-patch8.tar.bz2
+ccae70dc36644cd1529c581443484ebe  logjam-4.5.1.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep  6 14:38:22 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue,  6 Sep 2005 10:38:22 -0400
Subject: rpms/logjam/devel .cvsignore, 1.3, 1.4 logjam.spec, 1.16,
	1.17 sources, 1.4, 1.5
Message-ID: <200509061438.j86EcMHR008612@cvs-int.fedora.redhat.com>

Author: spot

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

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

4.5.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/logjam/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	11 Feb 2005 05:39:25 -0000	1.3
+++ .cvsignore	6 Sep 2005 14:38:20 -0000	1.4
@@ -1 +1,2 @@
 logjam-4.4.1.tar.bz2
+logjam-4.5.1.tar.bz2


Index: logjam.spec
===================================================================
RCS file: /cvs/extras/rpms/logjam/devel/logjam.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- logjam.spec	11 Jul 2005 14:43:40 -0000	1.16
+++ logjam.spec	6 Sep 2005 14:38:20 -0000	1.17
@@ -1,17 +1,14 @@
 %define use_xmms 1
 
 Name:		logjam
-Version:	4.5
-Release:	0.1patch8%{?dist}
+Version:	4.5.1
+Release:	1%{?dist}
 Epoch:		1
 Summary:	GTK2 client for LiveJournal
 License:	GPL
 Group:		User Interface/Desktops
 URL:		http://logjam.danga.com/
-#This is where the final builds come from. 
-#Source0:	http://logjam.danga.com/download/logjam-%{version}.tar.bz2
-#This is an arch snapshot
-Source0:	logjam-%{version}-patch8.tar.bz2
+Source0:	http://logjam.danga.com/download/logjam-%{version}.tar.bz2
 Requires:	curl >= 7.9, gtkspell
 %if %{use_xmms}
 BuildRequires:	xmms-devel
@@ -22,7 +19,6 @@
 Obsoletes:	loserjabber, logjam-gnome
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Patch0:		logjam-4.4.1-offline-segfaultfix.patch
-Patch1:		logjam-4.4.1-rupo.patch
 Patch2:		logjam-4.4.1-backdated.patch
 Patch3:		logjam-4.4.1-cleanups.patch
 Patch4:		logjam-4.4.1-fedora-desktop.patch
@@ -44,9 +40,8 @@
 %endif
 
 %prep
-%setup -n %{name}-%{version}-patch8 -q
+%setup -q
 %patch0 -p1 -b .offline-segfaultfix
-%patch1 -p1 -b .rupo
 %patch2 -p1 -b .backdated
 %patch3 -p1 -b .cleanups
 %patch4 -p1 -b .desktop
@@ -57,10 +52,6 @@
 %if %{use_xmms}
 	--with-xmms
 %endif
-cp libtool protocol/liblivejournal
-cd gen
-./regen.sh
-cd ..
 make
 
 %install
@@ -91,6 +82,9 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Tue Sep  6 2005 Tom "spot" Callaway  1:4.5.1-1
+- bump to 4.5.1
+
 * Mon Jul 11 2005 Tom "spot" Callaway  4.5-0.1patch8
 - bump to patch8
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/logjam/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	11 Jul 2005 14:46:23 -0000	1.4
+++ sources	6 Sep 2005 14:38:20 -0000	1.5
@@ -1,2 +1,3 @@
 f16f68a4a6b15fb5bb650614f3ff081c  logjam-4.4.1.tar.bz2
 0acb70ccb88d6334af22e56e4b521c6b  logjam-4.5-patch8.tar.bz2
+ccae70dc36644cd1529c581443484ebe  logjam-4.5.1.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep  6 14:38:22 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue,  6 Sep 2005 10:38:22 -0400
Subject: rpms/logjam/FC-4 logjam.spec,1.16,1.17 sources,1.4,1.5
Message-ID: <200509061438.j86EcMPY008606@cvs-int.fedora.redhat.com>

Author: spot

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

Modified Files:
	logjam.spec sources 
Log Message:

4.5.1



Index: logjam.spec
===================================================================
RCS file: /cvs/extras/rpms/logjam/FC-4/logjam.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- logjam.spec	11 Jul 2005 14:43:34 -0000	1.16
+++ logjam.spec	6 Sep 2005 14:38:19 -0000	1.17
@@ -1,17 +1,14 @@
 %define use_xmms 1
 
 Name:		logjam
-Version:	4.5
-Release:	0.1patch8%{?dist}
+Version:	4.5.1
+Release:	1%{?dist}
 Epoch:		1
 Summary:	GTK2 client for LiveJournal
 License:	GPL
 Group:		User Interface/Desktops
 URL:		http://logjam.danga.com/
-#This is where the final builds come from. 
-#Source0:	http://logjam.danga.com/download/logjam-%{version}.tar.bz2
-#This is an arch snapshot
-Source0:	logjam-%{version}-patch8.tar.bz2
+Source0:	http://logjam.danga.com/download/logjam-%{version}.tar.bz2
 Requires:	curl >= 7.9, gtkspell
 %if %{use_xmms}
 BuildRequires:	xmms-devel
@@ -22,7 +19,6 @@
 Obsoletes:	loserjabber, logjam-gnome
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Patch0:		logjam-4.4.1-offline-segfaultfix.patch
-Patch1:		logjam-4.4.1-rupo.patch
 Patch2:		logjam-4.4.1-backdated.patch
 Patch3:		logjam-4.4.1-cleanups.patch
 Patch4:		logjam-4.4.1-fedora-desktop.patch
@@ -44,9 +40,8 @@
 %endif
 
 %prep
-%setup -n %{name}-%{version}-patch8 -q
+%setup -q
 %patch0 -p1 -b .offline-segfaultfix
-%patch1 -p1 -b .rupo
 %patch2 -p1 -b .backdated
 %patch3 -p1 -b .cleanups
 %patch4 -p1 -b .desktop
@@ -57,10 +52,6 @@
 %if %{use_xmms}
 	--with-xmms
 %endif
-cp libtool protocol/liblivejournal
-cd gen
-./regen.sh
-cd ..
 make
 
 %install
@@ -91,6 +82,9 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Tue Sep  6 2005 Tom "spot" Callaway  1:4.5.1-1
+- bump to 4.5.1
+
 * Mon Jul 11 2005 Tom "spot" Callaway  4.5-0.1patch8
 - bump to patch8
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/logjam/FC-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	11 Jul 2005 14:46:18 -0000	1.4
+++ sources	6 Sep 2005 14:38:19 -0000	1.5
@@ -1,2 +1,3 @@
 f16f68a4a6b15fb5bb650614f3ff081c  logjam-4.4.1.tar.bz2
 0acb70ccb88d6334af22e56e4b521c6b  logjam-4.5-patch8.tar.bz2
+ccae70dc36644cd1529c581443484ebe  logjam-4.5.1.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep  6 15:14:38 2005
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Tue,  6 Sep 2005 11:14:38 -0400
Subject: rpms/erlang import.log,1.1,1.2
Message-ID: <200509061515.j86FF8vH010317@cvs-int.fedora.redhat.com>

Author: gemi

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

Modified Files:
	import.log 
Log Message:
auto-import erlang-R10B-6.3 on branch devel from erlang-R10B-6.3.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/erlang/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	6 Sep 2005 14:34:13 -0000	1.1
+++ import.log	6 Sep 2005 15:14:36 -0000	1.2
@@ -0,0 +1 @@
+erlang-R10B-6_3:HEAD:erlang-R10B-6.3.src.rpm:1126019665



From fedora-extras-commits at redhat.com  Tue Sep  6 15:14:38 2005
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Tue,  6 Sep 2005 11:14:38 -0400
Subject: rpms/erlang/devel erlang.spec, NONE, 1.1 otp-install.patch, NONE,
	1.1 otp-links.patch, NONE, 1.1 otp-rpath.patch, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200509061514.j86FEcZ5010304@cvs-int.fedora.redhat.com>

Author: gemi

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

Modified Files:
	.cvsignore sources 
Added Files:
	erlang.spec otp-install.patch otp-links.patch otp-rpath.patch 
Log Message:
auto-import erlang-R10B-6.3 on branch devel from erlang-R10B-6.3.src.rpm


--- NEW FILE erlang.spec ---
Name:           erlang
Version:        R10B
Release:        6.3
Summary:        General-purpose programming language and runtime environment

Group:          Development/Languages
License:        Erlang Public License
URL:            http://www.erlang.org
Source:         http://www.erlang.org/download/otp_src_R10B-6.tar.gz
Source1:	http://www.erlang.org/download/otp_doc_html_R10B-6.tar.gz
Source2:	http://www.erlang.org/download/otp_doc_man_R10B-6.tar.gz
Patch:		otp-links.patch
Patch1:		otp-install.patch
Patch2:		otp-rpath.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:	ncurses-devel, openssl-devel, flex, unixODBC-devel

%description 
Erlang is a general-purpose programming language and runtime
environment. Erlang has built-in support for concurrency, distribution
and fault tolerance. Erlang is used in several large telecommunication
systems from Ericsson.


%package doc
Summary:	Erlang documentation
Group:		Development/Languages

%description doc
Documentation for Erlang.


%prep
%setup -q -n otp_src_R10B-6
%patch -p1
%patch1 -p1
%patch2 -p1


%build
./configure --prefix=%{_prefix} --exec-prefix=%{_prefix} --bindir=%{_bindir} --libdir=%{_libdir}
chmod -R u+w .
make


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

# clean up
find $RPM_BUILD_ROOT%{_libdir}/erlang -perm 0775 | xargs chmod 755
find $RPM_BUILD_ROOT%{_libdir}/erlang -name Makefile | xargs chmod 644
find $RPM_BUILD_ROOT%{_libdir}/erlang -name \*.bat | xargs rm -f
find $RPM_BUILD_ROOT%{_libdir}/erlang -name index.txt.old | xargs rm -f

# doc
mkdir -p erlang_doc
tar -C erlang_doc -zxf %{SOURCE1}
tar -C $RPM_BUILD_ROOT/%{_libdir}/erlang -zxf %{SOURCE2}

# make links to binaries
mkdir -p $RPM_BUILD_ROOT/%{_bindir}
cd $RPM_BUILD_ROOT/%{_bindir}
for file in erl erlc 
do
  ln -sf ../%{_lib}/erlang/bin/$file .
done


%clean
rm -rf $RPM_BUILD_ROOT


%files 
%defattr(-,root,root)
%doc AUTHORS EPLICENCE README
%{_bindir}/*
%{_libdir}/erlang


%files doc
%defattr(-,root,root)
%doc erlang_doc/*


%post
%{_libdir}/erlang/Install -minimal %{_libdir}/erlang > /dev/null


%changelog
* Tue Sep  6 2005 Gerard Milmeister  - R10B-6.3
- Remove perl BuildRequires

* Tue Aug 30 2005 Gerard Milmeister  - R10B-6.2
- change /usr/lib to %%{_libdir}
- redirect output in %%post to /dev/null
- add unixODBC-devel to BuildRequires
- split doc off to erlang-doc package

* Sat Jun 25 2005 Gerard Milmeister  - R10B-6.1
- New Version R10B-6

* Sun Feb 13 2005 Gerard Milmeister  - R10B-3.1
- New Version R10B-3

* Mon Dec 27 2004 Gerard Milmeister  - 0:R10B-2-0.fdr.1
- New Version R10B-2

* Wed Oct  6 2004 Gerard Milmeister  - 0:R10B-0.fdr.1
- New Version R10B

* Thu Oct 16 2003 Gerard Milmeister  - 0:R9B-1.fdr.1
- First Fedora release

otp-install.patch:

--- NEW FILE otp-install.patch ---
--- otp_src_R9C-0/erts/etc/unix/Install.src.install	2003-10-17 12:52:14.000000000 +0200
+++ otp_src_R9C-0/erts/etc/unix/Install.src	2003-10-17 14:26:49.000000000 +0200
@@ -84,7 +84,7 @@
   /bin/rm -f epmd
 fi
 
-ln -s $ERL_ROOT/erts-%I_VSN%/bin/epmd epmd
+ln -s ../erts-%I_VSN%/bin/epmd epmd
 
 cp -p $ERL_ROOT/erts-%I_VSN%/bin/run_erl .
 cp -p $ERL_ROOT/erts-%I_VSN%/bin/to_erl .
@@ -145,16 +145,4 @@
 	(ranlib $library) > /dev/null 2>&1
     done
 fi
-
-
-#
-# Fixing the man pages
-#
-
-if [ -d $ERL_ROOT/man ]
-then
-    cd $ERL_ROOT
-    ./misc/format_man_pages $ERL_ROOT
-fi
-
-
+exit 0

otp-links.patch:

--- NEW FILE otp-links.patch ---
--- otp_src_R9C-0/Makefile.in.links	2003-10-17 12:49:41.000000000 +0200
+++ otp_src_R9C-0/Makefile.in	2003-10-17 12:50:07.000000000 +0200
@@ -505,14 +505,6 @@
 # Erlang base public files
 #
 install.bin:
-	rm -f $(BINDIR)/erl $(BINDIR)/erlc \
-	      $(BINDIR)/ecc $(BINDIR)/elink $(BINDIR)/ear $(BINDIR)/escript
-	${LN_S} $(ERLANG_BINDIR)/erl      $(BINDIR)/erl
-	${LN_S} $(ERLANG_BINDIR)/erlc     $(BINDIR)/erlc
-	${LN_S} $(ERLANG_BINDIR)/ecc      $(BINDIR)/ecc
-	${LN_S} $(ERLANG_BINDIR)/elink    $(BINDIR)/elink
-	${LN_S} $(ERLANG_BINDIR)/ear      $(BINDIR)/ear
-	${LN_S} $(ERLANG_BINDIR)/escript  $(BINDIR)/escript
 
 #
 # Directories needed before we can install

otp-rpath.patch:

--- NEW FILE otp-rpath.patch ---
--- otp_src_R10B-3/lib/crypto/c_src/Makefile.in.rpath	2005-02-13 15:22:29.208560819 +0100
+++ otp_src_R10B-3/lib/crypto/c_src/Makefile.in	2005-02-13 15:22:50.852106461 +0100
@@ -79,7 +79,7 @@
 ifeq ($(HOST_OS),)
 HOST_OS := $(shell $(ERL_TOP)/erts/autoconf/config.guess)
 endif
-LD_R_FLAG=@DED_LD_FLAG_RUNTIME_LIBRARY_PATH@
+LD_R_FLAG=
 ifeq ($(findstring @,$(LD_R_FLAG)),@)
 # Old erts configure used which hasn't replaced
 # @DED_LD_FLAG_RUNTIME_LIBRARY_PATH@; we try our best here instead...
--- otp_src_R10B-3/lib/crypto/priv/Makefile.rpath	2005-02-13 14:46:15.043814168 +0100
+++ otp_src_R10B-3/lib/crypto/priv/Makefile	2005-02-13 14:46:48.575467543 +0100
@@ -60,7 +60,7 @@
 # ----------------------------------------------------
 
 $(SO_DRIVER): $(OBJS)
-	$(SO_LD) $(SO_LDFLAGS) -L$(SO_SSL_LIBDIR) -Wl,-R$(SO_SSL_LIBDIR) \
+	$(SO_LD) $(SO_LDFLAGS) -L$(SO_SSL_LIBDIR) \
 	-o $@ $^ -lcrypto
 
 $(DLL_DRIVER): $(OBJS)
--- otp_src_R10B-3/lib/ssh/c_src/Makefile.in.rpath	2005-02-13 15:23:13.516486079 +0100
+++ otp_src_R10B-3/lib/ssh/c_src/Makefile.in	2005-02-13 15:23:25.130630385 +0100
@@ -75,7 +75,7 @@
 else
 DYN_DRIVER = $(LIBDIR)/ssh_crypto_drv.so
 endif
-LD_R_FLAG=@DED_LD_FLAG_RUNTIME_LIBRARY_PATH@
+LD_R_FLAG=
 ifeq ($(findstring @,$(LD_R_FLAG)),@)
 # Old erts configure used which hasn't replaced
 # @DED_LD_FLAG_RUNTIME_LIBRARY_PATH@; we try our best here instead...
--- otp_src_R10B-3/erts/configure.rpath	2005-02-13 14:44:11.498507144 +0100
+++ otp_src_R10B-3/erts/configure	2005-02-13 14:44:55.858437414 +0100
@@ -1231,7 +1231,7 @@
 CFLAGS="$CFLAGS $extra_flags"
 DEBUG_CFLAGS="-g $extra_flags"
 
-CFLAG_RUNTIME_LIBRARY_PATH="-Wl,-R"
+CFLAG_RUNTIME_LIBRARY_PATH=""
 case $host_os in
   darwin*)
 	CFLAG_RUNTIME_LIBRARY_PATH=


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/erlang/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	6 Sep 2005 14:34:13 -0000	1.1
+++ .cvsignore	6 Sep 2005 15:14:36 -0000	1.2
@@ -0,0 +1,3 @@
+otp_doc_html_R10B-6.tar.gz
+otp_doc_man_R10B-6.tar.gz
+otp_src_R10B-6.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/erlang/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	6 Sep 2005 14:34:13 -0000	1.1
+++ sources	6 Sep 2005 15:14:36 -0000	1.2
@@ -0,0 +1,3 @@
+9f50340fd1c25af5d5a6fcf9f14b2e49  otp_doc_html_R10B-6.tar.gz
+0243d2ff01fb2bac03115bcbe2284b20  otp_doc_man_R10B-6.tar.gz
+6463f70b40e2a6c3587e54653add8414  otp_src_R10B-6.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep  6 15:28:47 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Tue,  6 Sep 2005 11:28:47 -0400
Subject: rpms/abcde/FC-4 .cvsignore, 1.5, 1.6 abcde.spec, 1.6, 1.7 sources,
	1.5, 1.6
Message-ID: <200509061529.j86FTH1J010444@cvs-int.fedora.redhat.com>

Author: scop

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

Modified Files:
	.cvsignore abcde.spec sources 
Log Message:
* Mon Sep  5 2005 Ville Skytt??  - 2.3.4-1
- 2.3.4.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/abcde/FC-4/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	28 Aug 2005 20:03:06 -0000	1.5
+++ .cvsignore	6 Sep 2005 15:28:44 -0000	1.6
@@ -1 +1 @@
-abcde_2.3.3.orig.tar.gz
+abcde_2.3.4.orig.tar.gz


Index: abcde.spec
===================================================================
RCS file: /cvs/extras/rpms/abcde/FC-4/abcde.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- abcde.spec	28 Aug 2005 20:03:06 -0000	1.6
+++ abcde.spec	6 Sep 2005 15:28:44 -0000	1.7
@@ -1,5 +1,5 @@
 Name:           abcde
-Version:        2.3.3
+Version:        2.3.4
 Release:        1%{?dist}
 Summary:        A Better CD Encoder
 
@@ -53,6 +53,9 @@
 
 
 %changelog
+* Mon Sep  5 2005 Ville Skytt??  - 2.3.4-1
+- 2.3.4.
+
 * Fri Aug 26 2005 Ville Skytt??  - 2.3.3-1
 - 2.3.3.
 - Reformat specfile.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/abcde/FC-4/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	28 Aug 2005 20:03:06 -0000	1.5
+++ sources	6 Sep 2005 15:28:44 -0000	1.6
@@ -1 +1 @@
-94877d1e410ae420630b1048e82907d3  abcde_2.3.3.orig.tar.gz
+fc7e2364c8e25af34e5721ba9e2eda46  abcde_2.3.4.orig.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep  6 15:28:47 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Tue,  6 Sep 2005 11:28:47 -0400
Subject: rpms/abcde/devel .cvsignore, 1.5, 1.6 abcde.spec, 1.6, 1.7 sources,
	1.5, 1.6
Message-ID: <200509061529.j86FTHRd010449@cvs-int.fedora.redhat.com>

Author: scop

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

Modified Files:
	.cvsignore abcde.spec sources 
Log Message:
* Mon Sep  5 2005 Ville Skytt??  - 2.3.4-1
- 2.3.4.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/abcde/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	28 Aug 2005 20:03:09 -0000	1.5
+++ .cvsignore	6 Sep 2005 15:28:45 -0000	1.6
@@ -1 +1 @@
-abcde_2.3.3.orig.tar.gz
+abcde_2.3.4.orig.tar.gz


Index: abcde.spec
===================================================================
RCS file: /cvs/extras/rpms/abcde/devel/abcde.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- abcde.spec	28 Aug 2005 20:03:09 -0000	1.6
+++ abcde.spec	6 Sep 2005 15:28:45 -0000	1.7
@@ -1,5 +1,5 @@
 Name:           abcde
-Version:        2.3.3
+Version:        2.3.4
 Release:        1%{?dist}
 Summary:        A Better CD Encoder
 
@@ -53,6 +53,9 @@
 
 
 %changelog
+* Mon Sep  5 2005 Ville Skytt??  - 2.3.4-1
+- 2.3.4.
+
 * Fri Aug 26 2005 Ville Skytt??  - 2.3.3-1
 - 2.3.3.
 - Reformat specfile.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/abcde/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	28 Aug 2005 20:03:09 -0000	1.5
+++ sources	6 Sep 2005 15:28:45 -0000	1.6
@@ -1 +1 @@
-94877d1e410ae420630b1048e82907d3  abcde_2.3.3.orig.tar.gz
+fc7e2364c8e25af34e5721ba9e2eda46  abcde_2.3.4.orig.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep  6 15:36:16 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue,  6 Sep 2005 11:36:16 -0400
Subject: rpms/logjam/devel logjam.spec,1.17,1.18
Message-ID: <200509061536.j86FaGu5010553@cvs-int.fedora.redhat.com>

Author: spot

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

Modified Files:
	logjam.spec 
Log Message:

FC-3 branch missing a patch



Index: logjam.spec
===================================================================
RCS file: /cvs/extras/rpms/logjam/devel/logjam.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- logjam.spec	6 Sep 2005 14:38:20 -0000	1.17
+++ logjam.spec	6 Sep 2005 15:36:14 -0000	1.18
@@ -2,7 +2,7 @@
 
 Name:		logjam
 Version:	4.5.1
-Release:	1%{?dist}
+Release:	2%{?dist}
 Epoch:		1
 Summary:	GTK2 client for LiveJournal
 License:	GPL
@@ -82,6 +82,9 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Tue Sep  6 2005 Tom "spot" Callaway  1:4.5.1-2
+- fc3 branch missing a patch
+
 * Tue Sep  6 2005 Tom "spot" Callaway  1:4.5.1-1
 - bump to 4.5.1
 



From fedora-extras-commits at redhat.com  Tue Sep  6 15:36:10 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue,  6 Sep 2005 11:36:10 -0400
Subject: rpms/logjam/FC-3 logjam-4.4.1-cleanups.patch, NONE, 1.1 logjam.spec,
	1.8, 1.9
Message-ID: <200509061536.j86Fae3s010556@cvs-int.fedora.redhat.com>

Author: spot

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

Modified Files:
	logjam.spec 
Added Files:
	logjam-4.4.1-cleanups.patch 
Log Message:

FC-3 branch missing a patch


logjam-4.4.1-cleanups.patch:

--- NEW FILE logjam-4.4.1-cleanups.patch ---
--- logjam-4.4.1/src/tools.c.BAD	2005-03-13 17:17:31.000000000 -0600
+++ logjam-4.4.1/src/tools.c	2005-03-13 17:54:53.000000000 -0600
@@ -209,7 +209,7 @@
 
 	while (gtk_dialog_run(GTK_DIALOG(cmd_dlg)) == GTK_RESPONSE_OK) {
 		const gchar *command;
-		const gchar *encoding;
+		const gchar *encoding = 0;
 		GError *err = NULL;
 
 		command = gtk_entry_get_text(GTK_ENTRY(entry));
--- logjam-4.4.1/src/checkfriends-gtk.c.BAD	2005-03-13 17:50:06.000000000 -0600
+++ logjam-4.4.1/src/checkfriends-gtk.c	2005-03-13 17:51:41.000000000 -0600
@@ -255,8 +255,6 @@
 
 static void
 cf_float_destroy(CFFloat *cff) {
-	CFMgr *cfm = cff->cfmgr;
-
 	if (GTK_IS_WIDGET(cff->win))
 		gtk_widget_destroy(cff->win);
 
@@ -277,8 +275,6 @@
 #ifdef USE_DOCK
 static void
 cf_dock_destroy(CFFloat *cff) {
-	CFMgr *cfm = cff->cfmgr;
-
 	g_signal_handlers_disconnect_by_func(G_OBJECT(cff->win),
 			G_CALLBACK(cf_dock_destroyed_cb), NULL);
 	gtk_widget_destroy(GTK_WIDGET(cff->win));
@@ -290,7 +286,11 @@
 cf_dock_destroyed_cb(GtkWidget *widget, CFFloat *cff) {
 	app.docklet = NULL;
 }
-	
+
+/* 
+ * Not currently used.	
+ */
+/*
 static void
 cf_dock_setup(CFFloat *ind) {
 	GtkWidget *docklet = app.docklet;
@@ -303,6 +303,7 @@
 
 	ind->win = docklet;
 }
+*/
 #endif /* USE_DOCK */
 
 void cf_float_decorate_refresh(void) {
--- logjam-4.4.1/src/cmdline.c.BAD	2005-03-13 17:41:34.000000000 -0600
+++ logjam-4.4.1/src/cmdline.c	2005-03-13 17:46:22.000000000 -0600
@@ -664,7 +664,7 @@
 
 static void
 command_dispatch(Cmdline *cmdline, Command *commands, const char *help, int argc, gchar *argv[]) {
-	JamAccount *acc;
+	JamAccount *acc = NULL;
 	Command *command = NULL;
 	char *cmdname;
 	int i;
--- logjam-4.4.1/src/menu.c.BAD	2005-03-13 17:52:10.000000000 -0600
+++ logjam-4.4.1/src/menu.c	2005-03-13 17:52:16.000000000 -0600
@@ -440,7 +440,6 @@
 
 };
 	int itemcount = sizeof(menu_items) / sizeof(menu_items[0]);
-	int i;
 	JamView *view;
 
 	accelgroup = gtk_accel_group_new();


Index: logjam.spec
===================================================================
RCS file: /cvs/extras/rpms/logjam/FC-3/logjam.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- logjam.spec	6 Sep 2005 14:38:19 -0000	1.8
+++ logjam.spec	6 Sep 2005 15:36:08 -0000	1.9
@@ -2,7 +2,7 @@
 
 Name:		logjam
 Version:	4.5.1
-Release:	1%{?dist}
+Release:	2%{?dist}
 Epoch:		1
 Summary:	GTK2 client for LiveJournal
 License:	GPL
@@ -82,6 +82,9 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Tue Sep  6 2005 Tom "spot" Callaway  1:4.5.1-2
+- fc3 branch missing a patch
+
 * Tue Sep  6 2005 Tom "spot" Callaway  1:4.5.1-1
 - bump to 4.5.1
 



From fedora-extras-commits at redhat.com  Tue Sep  6 15:36:11 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue,  6 Sep 2005 11:36:11 -0400
Subject: rpms/logjam/FC-4 logjam.spec,1.17,1.18
Message-ID: <200509061536.j86FafCB010559@cvs-int.fedora.redhat.com>

Author: spot

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

Modified Files:
	logjam.spec 
Log Message:

FC-3 branch missing a patch



Index: logjam.spec
===================================================================
RCS file: /cvs/extras/rpms/logjam/FC-4/logjam.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- logjam.spec	6 Sep 2005 14:38:19 -0000	1.17
+++ logjam.spec	6 Sep 2005 15:36:08 -0000	1.18
@@ -2,7 +2,7 @@
 
 Name:		logjam
 Version:	4.5.1
-Release:	1%{?dist}
+Release:	2%{?dist}
 Epoch:		1
 Summary:	GTK2 client for LiveJournal
 License:	GPL
@@ -82,6 +82,9 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Tue Sep  6 2005 Tom "spot" Callaway  1:4.5.1-2
+- fc3 branch missing a patch
+
 * Tue Sep  6 2005 Tom "spot" Callaway  1:4.5.1-1
 - bump to 4.5.1
 



From fedora-extras-commits at redhat.com  Tue Sep  6 16:23:39 2005
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Tue,  6 Sep 2005 12:23:39 -0400
Subject: rpms/supertux/devel supertux.spec, 1.8, 1.9 supertux.desktop, 1.1,
	NONE
Message-ID: <200509061623.j86GNdac012210@cvs-int.fedora.redhat.com>

Author: steve

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

Modified Files:
	supertux.spec 
Removed Files:
	supertux.desktop 
Log Message:
Avoid second .desktop file (#167579)


Index: supertux.spec
===================================================================
RCS file: /cvs/extras/rpms/supertux/devel/supertux.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- supertux.spec	1 Sep 2005 20:29:45 -0000	1.8
+++ supertux.spec	6 Sep 2005 16:23:37 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           supertux
 Version:        0.1.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 
 Summary:        Jump'n run like game similar to Mario Bros
 
@@ -8,7 +8,6 @@
 License:        GPL
 URL:            http://supertux.berlios.de/
 Source0:        http://download.berlios.de/supertux/supertux-%{version}.tar.bz2
-Source1:        %{name}.desktop
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  SDL-devel >= 1.2.4, SDL_image-devel, SDL_mixer-devel
@@ -35,12 +34,11 @@
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
-mkdir -p $RPM_BUILD_ROOT/%{_datadir}/{pixmaps,applications}
-install -m 644 data/images/icon.xpm $RPM_BUILD_ROOT/%{_datadir}/pixmaps/supertux.xpm
+rm -f $RPM_BUILD_ROOT%{_datadir}/applications/supertux.desktop
 desktop-file-install \
 	--vendor fedora \
 	--add-category X-Fedora \
-	--dir $RPM_BUILD_ROOT/%{_datadir}/applications %{SOURCE1}
+	--dir $RPM_BUILD_ROOT%{_datadir}/applications supertux.desktop
 	
 
 %clean
@@ -56,6 +54,9 @@
 %{_datadir}/pixmaps/*
 
 %changelog
+* Tue Sep 06 2005 Steven Pritchard  0.1.3-2
+- Avoid second .desktop file (#167579)
+
 * Thu Sep 01 2005 Steven Pritchard  0.1.3-1
 - Update to 0.1.3
 


--- supertux.desktop DELETED ---



From fedora-extras-commits at redhat.com  Tue Sep  6 16:23:55 2005
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Tue,  6 Sep 2005 12:23:55 -0400
Subject: rpms/supertux/FC-4 supertux.spec,1.8,1.9 supertux.desktop,1.1,NONE
Message-ID: <200509061623.j86GNtl7012271@cvs-int.fedora.redhat.com>

Author: steve

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

Modified Files:
	supertux.spec 
Removed Files:
	supertux.desktop 
Log Message:
Avoid second .desktop file (#167579)


Index: supertux.spec
===================================================================
RCS file: /cvs/extras/rpms/supertux/FC-4/supertux.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- supertux.spec	1 Sep 2005 20:29:38 -0000	1.8
+++ supertux.spec	6 Sep 2005 16:23:53 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           supertux
 Version:        0.1.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 
 Summary:        Jump'n run like game similar to Mario Bros
 
@@ -8,7 +8,6 @@
 License:        GPL
 URL:            http://supertux.berlios.de/
 Source0:        http://download.berlios.de/supertux/supertux-%{version}.tar.bz2
-Source1:        %{name}.desktop
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  SDL-devel >= 1.2.4, SDL_image-devel, SDL_mixer-devel
@@ -35,12 +34,11 @@
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
-mkdir -p $RPM_BUILD_ROOT/%{_datadir}/{pixmaps,applications}
-install -m 644 data/images/icon.xpm $RPM_BUILD_ROOT/%{_datadir}/pixmaps/supertux.xpm
+rm -f $RPM_BUILD_ROOT%{_datadir}/applications/supertux.desktop
 desktop-file-install \
 	--vendor fedora \
 	--add-category X-Fedora \
-	--dir $RPM_BUILD_ROOT/%{_datadir}/applications %{SOURCE1}
+	--dir $RPM_BUILD_ROOT%{_datadir}/applications supertux.desktop
 	
 
 %clean
@@ -56,6 +54,9 @@
 %{_datadir}/pixmaps/*
 
 %changelog
+* Tue Sep 06 2005 Steven Pritchard  0.1.3-2
+- Avoid second .desktop file (#167579)
+
 * Thu Sep 01 2005 Steven Pritchard  0.1.3-1
 - Update to 0.1.3
 


--- supertux.desktop DELETED ---



From fedora-extras-commits at redhat.com  Tue Sep  6 16:24:15 2005
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Tue,  6 Sep 2005 12:24:15 -0400
Subject: rpms/supertux/FC-3 supertux.spec,1.5,1.6 supertux.desktop,1.1,NONE
Message-ID: <200509061624.j86GOFCf012335@cvs-int.fedora.redhat.com>

Author: steve

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

Modified Files:
	supertux.spec 
Removed Files:
	supertux.desktop 
Log Message:
Avoid second .desktop file (#167579)


Index: supertux.spec
===================================================================
RCS file: /cvs/extras/rpms/supertux/FC-3/supertux.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- supertux.spec	1 Sep 2005 20:29:31 -0000	1.5
+++ supertux.spec	6 Sep 2005 16:24:13 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           supertux
 Version:        0.1.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 
 Summary:        Jump'n run like game similar to Mario Bros
 
@@ -8,7 +8,6 @@
 License:        GPL
 URL:            http://supertux.berlios.de/
 Source0:        http://download.berlios.de/supertux/supertux-%{version}.tar.bz2
-Source1:        %{name}.desktop
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  SDL-devel >= 1.2.4, SDL_image-devel, SDL_mixer-devel
@@ -35,12 +34,11 @@
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
-mkdir -p $RPM_BUILD_ROOT/%{_datadir}/{pixmaps,applications}
-install -m 644 data/images/icon.xpm $RPM_BUILD_ROOT/%{_datadir}/pixmaps/supertux.xpm
+rm -f $RPM_BUILD_ROOT%{_datadir}/applications/supertux.desktop
 desktop-file-install \
 	--vendor fedora \
 	--add-category X-Fedora \
-	--dir $RPM_BUILD_ROOT/%{_datadir}/applications %{SOURCE1}
+	--dir $RPM_BUILD_ROOT%{_datadir}/applications supertux.desktop
 	
 
 %clean
@@ -56,6 +54,9 @@
 %{_datadir}/pixmaps/*
 
 %changelog
+* Tue Sep 06 2005 Steven Pritchard  0.1.3-2
+- Avoid second .desktop file (#167579)
+
 * Thu Sep 01 2005 Steven Pritchard  0.1.3-1
 - Update to 0.1.3
 


--- supertux.desktop DELETED ---



From fedora-extras-commits at redhat.com  Tue Sep  6 16:24:18 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue,  6 Sep 2005 12:24:18 -0400
Subject: rpms/logjam/FC-3 logjam-4.4.1-fedora-desktop.patch, NONE,
	1.1 logjam.spec, 1.9, 1.10
Message-ID: <200509061624.j86GOILX012389@cvs-int.fedora.redhat.com>

Author: spot

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

Modified Files:
	logjam.spec 
Added Files:
	logjam-4.4.1-fedora-desktop.patch 
Log Message:

one more time. :/


logjam-4.4.1-fedora-desktop.patch:

--- NEW FILE logjam-4.4.1-fedora-desktop.patch ---
--- logjam-4.4.1/data/logjam.desktop.in.BAD	2005-04-14 09:04:52.000000000 -0500
+++ logjam-4.4.1/data/logjam.desktop.in	2005-04-14 09:05:55.000000000 -0500
@@ -1,9 +1,9 @@
 [Desktop Entry]
 _Name=LogJam
-_Comment=Manage journal/weblog
-Exec=logjam
-Icon=logjam.png
+_Comment=LiveJournal Client
+Exec=/usr/bin/logjam
+Icon=/usr/share/pixmaps/logjam_goat.png
 Terminal=false
 Type=Application
-Categories=Application;Network;
+Categories=Application;Network;X-Fedora;
 StartupNotify=true


Index: logjam.spec
===================================================================
RCS file: /cvs/extras/rpms/logjam/FC-3/logjam.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- logjam.spec	6 Sep 2005 15:36:08 -0000	1.9
+++ logjam.spec	6 Sep 2005 16:24:16 -0000	1.10
@@ -2,7 +2,7 @@
 
 Name:		logjam
 Version:	4.5.1
-Release:	2%{?dist}
+Release:	3%{?dist}
 Epoch:		1
 Summary:	GTK2 client for LiveJournal
 License:	GPL
@@ -82,6 +82,9 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Tue Sep  6 2005 Tom "spot" Callaway  1:4.5.1-3
+- fc3 branch missing another patch
+
 * Tue Sep  6 2005 Tom "spot" Callaway  1:4.5.1-2
 - fc3 branch missing a patch
 



From fedora-extras-commits at redhat.com  Tue Sep  6 16:24:18 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue,  6 Sep 2005 12:24:18 -0400
Subject: rpms/logjam/FC-4 logjam.spec,1.18,1.19
Message-ID: <200509061624.j86GOIsM012395@cvs-int.fedora.redhat.com>

Author: spot

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

Modified Files:
	logjam.spec 
Log Message:

one more time. :/



Index: logjam.spec
===================================================================
RCS file: /cvs/extras/rpms/logjam/FC-4/logjam.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- logjam.spec	6 Sep 2005 15:36:08 -0000	1.18
+++ logjam.spec	6 Sep 2005 16:24:16 -0000	1.19
@@ -2,7 +2,7 @@
 
 Name:		logjam
 Version:	4.5.1
-Release:	2%{?dist}
+Release:	3%{?dist}
 Epoch:		1
 Summary:	GTK2 client for LiveJournal
 License:	GPL
@@ -82,6 +82,9 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Tue Sep  6 2005 Tom "spot" Callaway  1:4.5.1-3
+- fc3 branch missing another patch
+
 * Tue Sep  6 2005 Tom "spot" Callaway  1:4.5.1-2
 - fc3 branch missing a patch
 



From fedora-extras-commits at redhat.com  Tue Sep  6 16:24:19 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue,  6 Sep 2005 12:24:19 -0400
Subject: rpms/logjam/devel logjam.spec,1.18,1.19
Message-ID: <200509061624.j86GOJIA012401@cvs-int.fedora.redhat.com>

Author: spot

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

Modified Files:
	logjam.spec 
Log Message:

one more time. :/



Index: logjam.spec
===================================================================
RCS file: /cvs/extras/rpms/logjam/devel/logjam.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- logjam.spec	6 Sep 2005 15:36:14 -0000	1.18
+++ logjam.spec	6 Sep 2005 16:24:17 -0000	1.19
@@ -2,7 +2,7 @@
 
 Name:		logjam
 Version:	4.5.1
-Release:	2%{?dist}
+Release:	3%{?dist}
 Epoch:		1
 Summary:	GTK2 client for LiveJournal
 License:	GPL
@@ -82,6 +82,9 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Tue Sep  6 2005 Tom "spot" Callaway  1:4.5.1-3
+- fc3 branch missing another patch
+
 * Tue Sep  6 2005 Tom "spot" Callaway  1:4.5.1-2
 - fc3 branch missing a patch
 



From fedora-extras-commits at redhat.com  Tue Sep  6 17:49:04 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue,  6 Sep 2005 13:49:04 -0400
Subject: rpms/maxima - New directory
Message-ID: <200509061749.j86Hn59G014641@cvs-int.fedora.redhat.com>

Author: rdieter

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

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




From fedora-extras-commits at redhat.com  Tue Sep  6 17:49:15 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue,  6 Sep 2005 13:49:15 -0400
Subject: rpms/maxima Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200509061749.j86HnFw7014693@cvs-int.fedora.redhat.com>

Author: rdieter

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

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


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

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

common : CVS/Root
	@cvs checkout common

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

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


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Tue Sep  6 17:49:05 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue,  6 Sep 2005 13:49:05 -0400
Subject: rpms/maxima/devel - New directory
Message-ID: <200509061749.j86Hn5JD014646@cvs-int.fedora.redhat.com>

Author: rdieter

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

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




From fedora-extras-commits at redhat.com  Tue Sep  6 17:49:15 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue,  6 Sep 2005 13:49:15 -0400
Subject: rpms/maxima/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200509061749.j86HnGYt014698@cvs-int.fedora.redhat.com>

Author: rdieter

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

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


--- NEW FILE .cvsignore ---


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

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Tue Sep  6 17:51:54 2005
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Tue,  6 Sep 2005 13:51:54 -0400
Subject: rpms/perl-Algorithm-Diff - New directory
Message-ID: <200509061751.j86HpsHn014823@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Algorithm-Diff
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14799/perl-Algorithm-Diff

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




From fedora-extras-commits at redhat.com  Tue Sep  6 17:51:54 2005
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Tue,  6 Sep 2005 13:51:54 -0400
Subject: rpms/perl-Algorithm-Diff/devel - New directory
Message-ID: <200509061751.j86HpsAI014828@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Algorithm-Diff/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14799/perl-Algorithm-Diff/devel

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




From fedora-extras-commits at redhat.com  Tue Sep  6 17:52:18 2005
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Tue,  6 Sep 2005 13:52:18 -0400
Subject: rpms/perl-Algorithm-Diff Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200509061752.j86HqIlf014879@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Algorithm-Diff
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14844

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


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

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

common : CVS/Root
	@cvs checkout common

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

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


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Tue Sep  6 17:52:19 2005
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Tue,  6 Sep 2005 13:52:19 -0400
Subject: rpms/perl-Algorithm-Diff/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200509061752.j86HqJgB014884@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Algorithm-Diff/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14844/devel

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


--- NEW FILE .cvsignore ---


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

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Tue Sep  6 17:53:12 2005
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Tue,  6 Sep 2005 13:53:12 -0400
Subject: owners owners.list,1.168,1.169
Message-ID: <200509061753.j86HrCqX014987@cvs-int.fedora.redhat.com>

Author: steve

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

Modified Files:
	owners.list 
Log Message:
Add perl-Algorithm-Diff.


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.168
retrieving revision 1.169
diff -u -r1.168 -r1.169
--- owners.list	6 Sep 2005 10:53:48 -0000	1.168
+++ owners.list	6 Sep 2005 17:53:10 -0000	1.169
@@ -548,6 +548,7 @@
 Fedora Extras|pdfjam|Utilities for join, rotate and align PDFs|jpo at di.uminho.pt|extras-qa at fedoraproject.org|
 Fedora Extras|pdftk|The PDF Tool Kit|Jochen at herr-schmitt.de|extras-qa at fedoraproject.org|
 Fedora Extras|pdftohtml|A PDF to HTML converter|gauret at free.fr|extras-qa at fedoraproject.org|
+Fedora Extras|perl-Algorithm-Diff|Algorithm::Diff Perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Apache-LogRegex|Perl module for parsing a line from an Apache logfile into a hash|ghenry at suretecsystems.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-AppConfig|Perl module for reading configuration files|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Archive-Zip|Perl library for accessing Zip archives|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Tue Sep  6 17:53:00 2005
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Tue,  6 Sep 2005 13:53:00 -0400
Subject: rpms/perl-Algorithm-Diff import.log,1.1,1.2
Message-ID: <200509061753.j86HrV8C015027@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Algorithm-Diff
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14917

Modified Files:
	import.log 
Log Message:
auto-import perl-Algorithm-Diff-1.1901-1 on branch devel from perl-Algorithm-Diff-1.1901-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Algorithm-Diff/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	6 Sep 2005 17:52:16 -0000	1.1
+++ import.log	6 Sep 2005 17:52:58 -0000	1.2
@@ -0,0 +1 @@
+perl-Algorithm-Diff-1_1901-1:HEAD:perl-Algorithm-Diff-1.1901-1.src.rpm:1126029167



From fedora-extras-commits at redhat.com  Tue Sep  6 17:53:01 2005
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Tue,  6 Sep 2005 13:53:01 -0400
Subject: rpms/perl-Algorithm-Diff/devel perl-Algorithm-Diff.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200509061753.j86HrVxh015031@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Algorithm-Diff/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14917/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Algorithm-Diff.spec 
Log Message:
auto-import perl-Algorithm-Diff-1.1901-1 on branch devel from perl-Algorithm-Diff-1.1901-1.src.rpm


--- NEW FILE perl-Algorithm-Diff.spec ---
Name:           perl-Algorithm-Diff
Version:        1.1901
Release:        1%{?dist}
Summary:        Algorithm::Diff Perl module
License:        GPL or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Algorithm-Diff/
Source0:        http://www.cpan.org/modules/by-module/Algorithm/Algorithm-Diff-1.1901.zip
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
This is a module for computing the difference between two files, two
strings, or any other two lists of things.  It uses an intelligent
algorithm similar to (or identical to) the one used by the Unix "diff"
program.  It is guaranteed to find the *smallest possible* set of
differences.

%prep
%setup -q -n Algorithm-Diff-%{version}
chmod 644 *.pl

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT

make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT

find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null \;

chmod -R u+rwX,go+rX,go-w $RPM_BUILD_ROOT/*

rm -f $RPM_BUILD_ROOT%{perl_vendorlib}/Algorithm/*.pl

perldoc -t perlgpl > COPYING
perldoc -t perlartistic > Artistic

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes README COPYING Artistic *.pl
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Mon Sep 05 2005 Steven Pritchard  1.1901-1
- Updated to 1.1901.

* Sat Sep 03 2005 Steven Pritchard  1.15-2
- Move example files to %%doc.

* Sat Aug 27 2005 Steven Pritchard  1.15-1
- Specfile autogenerated.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Algorithm-Diff/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	6 Sep 2005 17:52:17 -0000	1.1
+++ .cvsignore	6 Sep 2005 17:52:59 -0000	1.2
@@ -0,0 +1 @@
+Algorithm-Diff-1.1901.zip


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Algorithm-Diff/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	6 Sep 2005 17:52:17 -0000	1.1
+++ sources	6 Sep 2005 17:52:59 -0000	1.2
@@ -0,0 +1 @@
+a4f8625182c00847098b05e18268bfb2  Algorithm-Diff-1.1901.zip



From fedora-extras-commits at redhat.com  Tue Sep  6 17:56:04 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue,  6 Sep 2005 13:56:04 -0400
Subject: rpms/maxima import.log,1.1,1.2
Message-ID: <200509061756.j86Hu4ov015122@cvs-int.fedora.redhat.com>

Author: rdieter

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

Modified Files:
	import.log 
Log Message:
auto-import maxima-5.9.1-4 on branch devel from maxima-5.9.1-4.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/maxima/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	6 Sep 2005 17:49:12 -0000	1.1
+++ import.log	6 Sep 2005 17:56:02 -0000	1.2
@@ -0,0 +1 @@
+maxima-5_9_1-4:HEAD:maxima-5.9.1-4.src.rpm:1126029350



From fedora-extras-commits at redhat.com  Tue Sep  6 17:56:05 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue,  6 Sep 2005 13:56:05 -0400
Subject: rpms/maxima/devel maxima-5.9.0-htmlview.patch, NONE,
	1.1 maxima-modes.el, NONE, 1.1 maxima.el-xemacs.patch, NONE,
	1.1 maxima.png, NONE, 1.1 maxima.spec, NONE,
	1.1 xmaxima.desktop, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <200509061756.j86Hu5PK015131@cvs-int.fedora.redhat.com>

Author: rdieter

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

Modified Files:
	.cvsignore sources 
Added Files:
	maxima-5.9.0-htmlview.patch maxima-modes.el 
	maxima.el-xemacs.patch maxima.png maxima.spec xmaxima.desktop 
Log Message:
auto-import maxima-5.9.1-4 on branch devel from maxima-5.9.1-4.src.rpm

maxima-5.9.0-htmlview.patch:

--- NEW FILE maxima-5.9.0-htmlview.patch ---
--- maxima-5.9.0/interfaces/xmaxima/Tkmaxima/Menu.tcl.htmlview	2003-02-06 21:13:54.000000000 -0600
+++ maxima-5.9.0/interfaces/xmaxima/Tkmaxima/Menu.tcl	2004-03-26 15:47:44.000000000 -0600
@@ -215,7 +215,7 @@
 	}
     } else {
 	# This is more difficult under Unix - KDE GNOME CDE etc...
-	lappend browse netscape
+	lappend browse htmlview 
     }
     $m add sep
     $m add command -underline 0 -label {Maxima Homepage} \


--- NEW FILE maxima-modes.el ---

(autoload 'emaxima-mode "emaxima" "EMaxima" t)
(add-hook 'emaxima-mode-hook 'emaxima-mark-file-as-emaxima)
(autoload 'maxima-mode "maxima" "Maxima mode" t)
(autoload 'maxima "maxima" "Maxima interaction" t)
;(autoload 'imaxima "imaxima" "Maxima interaction with graphical output" t)
(autoload 'dbl "dbl" "Make a debugger to run lisp, maxima and or gdb in" t)
(autoload 'gcl-mode "gcl" "Major mode for editing maxima code and interacting with debugger" t)
(setq auto-mode-alist (cons '("\\.ma?[cx]\\'" . maxima-mode) auto-mode-alist))
;(setq auto-mode-alist (cons '("\\.li?sp\\'" . gcl-mode) auto-mode-alist))

maxima.el-xemacs.patch:

--- NEW FILE maxima.el-xemacs.patch ---
--- maxima/interfaces/emacs/emaxima/maxima.el	2004-05-20 18:12:56.000000000 +0000
+++ maxima-new/interfaces/emacs/emaxima/maxima.el	2004-08-06 01:56:50.000000000 +0000
@@ -1628,6 +1628,9 @@
           (beginning-of-line)
 	  (while (re-search-forward 
                   (concat "(" maxima-inchar "[0-9]+).*\r") pmark t)
+	    (replace-match "" t t))
+          (beginning-of-line)
+	  (while (re-search-forward "\r" pmark t)
 	    (replace-match "" t t))))))
 
 (defun inferior-maxima-wait-for-output ()


--- NEW FILE maxima.spec ---

## Which runtimes to build/enable?
%define _with_clisp 1
%define _without_cmucl 1
%define _without_gcl 1
%define _without_sbcl 1

#define cvs cvs20050825
#define beta cvs

Summary: Maxima Symbolic Computation Program
Name: 	 maxima
Version: 5.9.1

Release: 4%{?dist} 
License: GPL
Group:	 Applications/Engineering 
URL: 	 http://maxima.sourceforge.net/
Source:  http://dl.sourceforge.net/sourceforge/maxima/maxima-%{version}%{?cvs}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Source1: maxima.png
Source2: xmaxima.desktop
Source6: maxima-modes.el

## Other maxima reference docs
Source10: http://starship.python.net/crew/mike/TixMaxima/macref.pdf
Source11: http://maxima.sourceforge.net/docs/maximabook/maximabook-19-Sept-2004.pdf

Patch1: maxima-5.9.0-htmlview.patch
# (mysterious?) xemacs patch
Patch2: maxima.el-xemacs.patch
# Fix build w/sbcl (5.9.1.1cvs only)
%{?cvs:Patch3: maxima-sbcl.patch}

# Inhibit automatic compressing of info files. Compressed info
# files break maxima's internal help.
%define __spec_install_post %{nil} 

BuildRequires: texinfo
BuildRequires: tetex-latex
BuildRequires: desktop-file-utils
# /usr/bin/wish
BuildRequires: tk
# cvs
%{?cvs:BuildRequires: autoconf automake}

Requires: %{name}-runtime = %{version}
Requires: gnuplot
Requires(post): /sbin/install-info
Requires(postun): /sbin/install-info

%description
Maxima is a full symbolic computation program.  It is full featured
doing symbolic manipulation of polynomials, matrices, rational
functions, integration, Todd-coxeter, graphing, bigfloats.  It has a
symbolic debugger source level debugger for maxima code.  Maxima is
based on the original Macsyma developed at MIT in the 1970's.

%package gui
Summary: Tcl/Tk GUI interface for %{name}
Group:	 Applications/Engineering 
Requires: %{name} = %{version}-%{release} 
Obsoletes: %{name}-xmaxima < %{version}-%{release}
Provides:  %{name}-xmaxima = %{version}-%{release}
Requires: tk
%description gui
Tcl/Tk GUI interface for %{name}

%package src 
Summary: %{name} lisp source code 
Group:   Applications/Engineering
Requires: %{name} = %{version}-%{release}
%description src 
%{name} lisp source code.

%if "%{?_with_clisp:1}" == "1"
%package runtime-clisp
Summary: Maxima compiled with clisp
Group:	 Applications/Engineering
BuildRequires: clisp
%define clisp_ver %{expand:%%(rpm -q --qf '%%{VERSION}' clisp )}
Requires: clisp >= %{clisp_ver}
Requires: %{name} = %{version}
Provides: %{name}-runtime = %{version}
%description runtime-clisp
Maxima compiled with Common Lisp (clisp) 
%endif

%if "%{?_with_cmucl:1}" == "1"
%package runtime-cmucl
Summary: Maxima compiled with CMUCL
Group:	 Applications/Engineering 
BuildRequires: cmucl 
#define cmucl_ver %{expand:%%(rpm -q --qf '%%{VERSION}' cmucl )}
#Requires: cmucl >= %{cmucl_ver}
Requires:  %{name} = %{version}
Obsoletes: %{name}-exec-cmucl 
Provides:  %{name}-runtime = %{version}
%description runtime-cmucl
Maxima compiled with CMU Common Lisp (cmucl) 
%endif

%if "%{?_with_gcl:1}" == "1"
%package runtime-gcl
Summary: Maxima compiled with GCL
Group:   Applications/Engineering
BuildRequires: gcl
Requires:  %{name} = %{version}
#Obsoletes: %{name}-exec-gcl 
Provides:  %{name}-runtime = %{version}
%description runtime-gcl
Maxima compiled with Gnu Common Lisp (gcl)
%endif

%if "%{?_with_sbcl:1}" == "1"
%package runtime-sbcl
Summary: Maxima compiled with SBCL 
Group:   Applications/Engineering
BuildRequires: sbcl 
%define sbcl_ver %{expand:%%(rpm -q --qf '%%{version}' sbcl )}
Requires: sbcl >= %{sbcl_ver}
Requires: %{name} = %{version}
#Obsoletes: %{name}-exec-sbcl
Provides: %{name}-runtime = %{version}
%description runtime-sbcl
Maxima compiled with Steel Bank Common Lisp (sbcl).
%endif


%prep
%setup -q  -n %{name}%{!?cvs:-%{version}%{?beta}}

# Extra docs
install -p -m644 %{SOURCE10} .

%patch1 -p1 -b .htmlview
%patch2 -p1 -b .xemacs
%{?cvs:%patch3 -p1 -b .sbcl}

sed -i -e 's:/usr/local/info:/usr/share/info:' \
  interfaces/emacs/emaxima/maxima.el
sed -i -e \
  's/(defcustom\s+maxima-info-index-file\s+)(\S+)/$1\"maxima.info-16\"/' \
  interfaces/emacs/emaxima/maxima.el

#if "%{?cvs:1}" == "1"
if [ ! -f configure ]; then
aclocal
automake --add-missing --copy
autoconf
fi

# remove CVS crud
find -name CVS -type d | xargs rm -r
#endif


%build
%configure \
  %{?_with_clisp: --enable-clisp }%{?_without_clisp:--disable-clisp } \
  %{?_with_cmucl: --enable-cmucl --with-cmucl-runtime=%{_libdir}/cmucl/bin/lisp }%{?_without_cmucl:--disable-cmucl } \
  %{?_with_gcl: --enable-gcl }%{?_without_gcl: --disable-gcl } \
  %{?_with_sbcl: --enable-sbcl }%{?_without_sbcl: --disable-sbcl }

# docs
pushd doc

 install -p -m644 %{SOURCE11} maximabook/maxima.pdf

 pushd info
  texi2dvi -p maxima.texi
 popd

 pushd intromax
  pdflatex intromax.ltx
 popd

popd

# everything else
make %{?_smp_mflags}


%check || :
make check


%install
rm -rf $RPM_BUILD_ROOT

make install%{!?debug_package:-strip} DESTDIR=$RPM_BUILD_ROOT

# app icon
install -p -D -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}.png

mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
desktop-file-install --vendor fedora \
  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
  --add-category "X-Fedora" \
  %{SOURCE2} 

## emaxima
# LaTeX style
install -d $RPM_BUILD_ROOT%{_datadir}/texmf/tex/latex/emaxima
cp -alf $RPM_BUILD_ROOT%{_datadir}/%{name}/%{version}%{?beta}/emacs/*.sty \
	$RPM_BUILD_ROOT%{_datadir}/texmf/tex/latex/emaxima/
# emacs
install -d $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/{maxima,site-start.d}
cp -alf $RPM_BUILD_ROOT%{_datadir}/%{name}/%{version}%{?beta}/emacs/*.el \
	$RPM_BUILD_ROOT%{_datadir}/%{name}/%{version}%{?beta}/emacs/*.lisp \
	$RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/maxima/
install -D -m644 -p %{SOURCE6} \
	$RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/site-start.d/maxima.el

# xemacs
install -d $RPM_BUILD_ROOT%{_datadir}/xemacs/site-packages/lisp/{maxima,site-start.d}
cp -alf $RPM_BUILD_ROOT%{_datadir}/%{name}/%{version}%{?beta}/emacs/*.el \
	$RPM_BUILD_ROOT%{_datadir}/%{name}/%{version}%{?beta}/emacs/*.lisp \
	$RPM_BUILD_ROOT%{_datadir}/xemacs/site-packages/lisp/maxima/
install -D -m644 -p %{SOURCE6} \
	$RPM_BUILD_ROOT%{_datadir}/xemacs/site-packages/lisp/site-start.d/maxima.el

## unwanted/unpackaged files
rm -f $RPM_BUILD_ROOT%{_infodir}/dir
# until we get/Require rlwrap from http://utopia.knoware.nl/~hlub/uck/rlwrap/
rm -f $RPM_BUILD_ROOT%{_bindir}/rmaxima
# docs
rm -rf $RPM_BUILD_ROOT%{_datadir}/maxima/%{version}%{?beta}/doc/{contributors,implementation,misc,maximabook,EMaximaIntro.ps}

# when --with gcl, this (sometimes) fails to get auto-created, so we'll help out
touch debugfiles.list


%post
/sbin/install-info %{_infodir}/maxima.info %{_infodir}/dir ||:
[ -x /usr/bin/texhash ] && /usr/bin/texhash 2> /dev/null ||:

%postun
if [ $1 -eq 0 ]; then
  /sbin/install-info --delete %{_infodir}/maxima.info %{_infodir}/dir ||:
  [ -x /usr/bin/texhash ] && /usr/bin/texhash 2> /dev/null ||:
fi


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root)
%doc AUTHORS ChangeLog COPYING INSTALL README README.lisps
%doc doc/misc/ doc/implementation/
%doc doc/intromax/intromax.pdf
%doc doc/maximabook/maxima.pdf
%doc macref.pdf
%doc %{_datadir}/maxima/%{version}%{?beta}/doc
%{_bindir}/maxima
%dir %{_datadir}/maxima
%dir %{_datadir}/maxima/%{version}%{?beta}
%{_datadir}/maxima/%{version}%{?beta}/[a-c,f-r,t-w,y-z,A-Z]*
%{_datadir}/maxima/%{version}%{?beta}/demo/
%{_datadir}/maxima/%{version}%{?beta}/share/
%dir %{_libdir}/maxima
%dir %{_libdir}/maxima/%{version}%{?beta}
%{_libexecdir}/maxima
%{_infodir}/*.info*
%{_mandir}/man1/maxima.*
# emaxima     
%{_datadir}/maxima/%{version}%{?beta}/emacs
%{_datadir}/emacs/site-lisp/*
%{_datadir}/xemacs/site-packages/lisp/*
%{_datadir}/texmf/tex/latex/emaxima/

%files src
%defattr(-,root,root)
%{_datadir}/maxima/%{version}%{?beta}/src/

%files gui
%defattr(-,root,root)
%{_bindir}/xmaxima
%{_datadir}/maxima/%{version}%{?beta}/xmaxima
%{_datadir}/applications/*.desktop
%{_datadir}/pixmaps/*.png

%if "%{?_with_clisp:1}" == "1"
%files runtime-clisp
%defattr(-,root,root)
%{_libdir}/maxima/%{version}%{?beta}/binary-clisp
%endif

%if "%{?_with_cmucl:1}" == "1"
%files runtime-cmucl
%defattr(-,root,root)
%{_libdir}/maxima/%{version}%{?beta}/binary-cmucl
%endif

%if "%{?_with_gcl:1}" == "1"
%files runtime-gcl
%defattr(-,root,root)
%{_libdir}/maxima/%{version}%{?beta}/binary-gcl
%endif

%if "%{?_with_sbcl:1}" == "1"
%files runtime-sbcl
%defattr(-,root,root)
%{_libdir}/maxima/%{version}%{?beta}/binary-sbcl
%endif


%changelog
* Tue Sep 06 2005 Rex Dieter  5.9.1-4
- workaround lack of debuginfo.list when building --with gcl

* Mon Aug 29 2005 Rex Dieter  5.9.1-3
- BR: tk (/usr/bin/wish)
- trim %%description
- drop maxima book generation (use pregenerated copy)
- drop emaxima subpkg bits
- -src: lisp source subpkg

* Fri Aug 26 2005 Rex Dieter  5.9.1-2
- re-instate %%debuginfo
- put 'make check' in %%check section

* Wed Aug 17 2005 Rex Dieter  5.9.1-1
- cleanup for Extras

* Fri Jan 28 2005 Rex Dieter  0:5.9.1-0.fdr.6
- -clisp,-cmucl,-sbcl: Req >= lisp version that was used to build it.

* Thu Sep 30 2004 Rex Dieter  0:5.9.1-0.fdr.5
- respin sbcl,clisp

* Wed Sep 29 2004 Rex Dieter  0:5.9.1-0.fdr.4
- fix %%post/%%postun to handle the now-uncompressed info files
- relax runtime Req/Prov to not include %%release (so we don't have
  to rebuild *every* runtime on every package iteration

* Tue Sep 28 2004 Rex Dieter  0:5.9.1-0.fdr.3
- use pregenerated maxima book and macref.pdf from
  http://maxima.sourceforge.net/docs.shtml

* Tue Sep 28 2004 Rex Dieter  0:5.9.1-0.fdr.2
- fix/cleanup build_book=1 option

* Mon Sep 27 2004 Rex Dieter  0:5.9.1-0.fdr.1
- 5.9.1 

* Fri Sep 17 2004 Rex Dieter  0:5.9.0.9-0.fdr.0.7.rc1
- 5.9.0.9rc1

* Wed Aug 18 2004 Rex Dieter  0:5.9.0.9-0.fdr.0.6.beta2
- updated sbcl patch

* Thu Aug 12 2004 Rex Dieter  0:5.9.0.9-0.fdr.0.5.beta2
- -emaxima: renamed emacs -> emaxima 
- -emaxima: cleanup/expand LaTeX,emacs,xemacs bits
- (optionally) build maxima book (pdf)

* Wed Aug 11 2004 Rex Dieter  0:5.9.0.9-0.fdr.0.4.beta2
- enable sbcl build, thanks to patch from
  http://www.math.utexas.edu/pipermail/maxima/2004/007802.html

* Tue Aug 10 2004 Rex Dieter  0:5.9.0.9-0.fdr.0.3.beta2
- fix conflict with gcl-2.6.4

* Fri Aug 06 2004 Rex Dieter  0:5.9.0.9-0.fdr.0.2.beta2
- (re)enable cmucl

* Wed Aug 04 2004 Rex Dieter  0:5.9.0.9-0.fdr.0.1.beta2
- 5.9.0.9beta2 
- allow sbcl, disabled for now
- nix -emacs subpkg (for now)

* Mon Jul 19 2004 Rex Dieter  0:5.9.0-0.fdr.7
- emacs subpkg
- drop cmucl support (cmucl doesn't build on fc2) 
- add desktop Categories: Education;Math;

* Fri Mar 26 2004 Rex Dieter  0:5.9.0-0.fdr.5
- patch xmaxima to use htmlview instead of netscape
- move %%datadir/maxima/5.9.0/xmaxima to -gui pkg

* Thu Mar 25 2004 Rex Dieter  0:5.9.0-0.fdr.4
- desktop-file now default (unless desktop_file=0)

* Thu Dec 18 2003 Rex Dieter  0:5.9.0-0.fdr.3
- make %%post safer
- cleanup --without (clisp|cmucl|gcl) usage.
- use desktop-file-install (on platforms that support it)
- Requires(post,postun): /sbin/install-info

* Wed Oct 01 2003 Rex Dieter  0:5.9.0-0.fdr.2
- runtime-gcl: remove Requires: gcl, not needed after all.
- enable runtime-clisp 
- enable runtime-cmucl 

* Wed Sep 24 2003 Rex Dieter  0:5.9.0-0.fdr.1
- applnk/icon

* Wed Sep 17 2003 Rex Dieter  0:5.9.0-0.fdr.0
- fedora'ize 


--- NEW FILE xmaxima.desktop ---
[Desktop Entry]
Name=xmaxima
Comment=Symbolic Computation Program
Exec=xmaxima
Icon=maxima.png
MimeType=
Type=Application
Categories=Application;Scientific;Education;Math;
Encoding=UTF-8


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/maxima/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	6 Sep 2005 17:49:13 -0000	1.1
+++ .cvsignore	6 Sep 2005 17:56:03 -0000	1.2
@@ -0,0 +1,3 @@
+macref.pdf
+maxima-5.9.1.tar.gz
+maximabook-19-Sept-2004.pdf


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/maxima/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	6 Sep 2005 17:49:13 -0000	1.1
+++ sources	6 Sep 2005 17:56:03 -0000	1.2
@@ -0,0 +1,3 @@
+c101a1ce604d31b02bbc2f37cced280d  macref.pdf
+659acfad1f61444cf5b38f6c28279d40  maxima-5.9.1.tar.gz
+9faa5a513de43b5e7384216a8783f620  maximabook-19-Sept-2004.pdf



From fedora-extras-commits at redhat.com  Tue Sep  6 17:59:22 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue,  6 Sep 2005 13:59:22 -0400
Subject: rpms/maxima/devel maxima.spec,1.1,1.2
Message-ID: <200509061759.j86HxM6a015541@cvs-int.fedora.redhat.com>

Author: rdieter

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

Modified Files:
	maxima.spec 
Log Message:
exclude ppc since clisp isn't available



Index: maxima.spec
===================================================================
RCS file: /cvs/extras/rpms/maxima/devel/maxima.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- maxima.spec	6 Sep 2005 17:56:03 -0000	1.1
+++ maxima.spec	6 Sep 2005 17:59:20 -0000	1.2
@@ -18,6 +18,7 @@
 URL: 	 http://maxima.sourceforge.net/
 Source:  http://dl.sourceforge.net/sourceforge/maxima/maxima-%{version}%{?cvs}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+ExcludeArch: ppc ppc64
 
 Source1: maxima.png
 Source2: xmaxima.desktop
@@ -311,6 +312,7 @@
 %changelog
 * Tue Sep 06 2005 Rex Dieter  5.9.1-4
 - workaround lack of debuginfo.list when building --with gcl
+- ExcludeArch: ppc ppc64
 
 * Mon Aug 29 2005 Rex Dieter  5.9.1-3
 - BR: tk (/usr/bin/wish)



From fedora-extras-commits at redhat.com  Tue Sep  6 18:03:33 2005
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Tue,  6 Sep 2005 14:03:33 -0400
Subject: rpms/erlang/FC-4 erlang.spec,1.1,1.2
Message-ID: <200509061804.j86I4Jlx016987@cvs-int.fedora.redhat.com>

Author: gemi

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

Modified Files:
	erlang.spec 
Log Message:
added dist tag


Index: erlang.spec
===================================================================
RCS file: /cvs/extras/rpms/erlang/FC-4/erlang.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- erlang.spec	6 Sep 2005 15:14:36 -0000	1.1
+++ erlang.spec	6 Sep 2005 18:03:30 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           erlang
 Version:        R10B
-Release:        6.3
+Release:        6.3%{?dist}
 Summary:        General-purpose programming language and runtime environment
 
 Group:          Development/Languages



From fedora-extras-commits at redhat.com  Tue Sep  6 18:04:21 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue,  6 Sep 2005 14:04:21 -0400
Subject: rpms/maxima/devel maxima.spec,1.2,1.3
Message-ID: <200509061804.j86I4qb3017045@cvs-int.fedora.redhat.com>

Author: rdieter

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

Modified Files:
	maxima.spec 
Log Message:
note clisp/ppc bugzilla entry



Index: maxima.spec
===================================================================
RCS file: /cvs/extras/rpms/maxima/devel/maxima.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- maxima.spec	6 Sep 2005 17:59:20 -0000	1.2
+++ maxima.spec	6 Sep 2005 18:04:19 -0000	1.3
@@ -312,7 +312,7 @@
 %changelog
 * Tue Sep 06 2005 Rex Dieter  5.9.1-4
 - workaround lack of debuginfo.list when building --with gcl
-- ExcludeArch: ppc ppc64
+- ExcludeArch: ppc ppc64 (bug #166347)
 
 * Mon Aug 29 2005 Rex Dieter  5.9.1-3
 - BR: tk (/usr/bin/wish)



From fedora-extras-commits at redhat.com  Tue Sep  6 18:09:46 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue,  6 Sep 2005 14:09:46 -0400
Subject: owners owners.list,1.169,1.170
Message-ID: <200509061809.j86I9kjF017154@cvs-int.fedora.redhat.com>

Author: rdieter

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

Modified Files:
	owners.list 
Log Message:
Add maxima entry



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.169
retrieving revision 1.170
diff -u -r1.169 -r1.170
--- owners.list	6 Sep 2005 17:53:10 -0000	1.169
+++ owners.list	6 Sep 2005 18:09:44 -0000	1.170
@@ -465,6 +465,7 @@
 Fedora Extras|manedit|GUI editor for creating man pages.|nos at utelsystems.com|extras-qa at fedoraproject.org|
 Fedora Extras|mantis|A web-based bugtracking system|enrico.scholz at informatik.tu-chemnitz.de|extras-qa at fedoraproject.org|
 Fedora Extras|mathml-fonts|Mathematical symbol fonts|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
+Fedora Extras|maxima|Symbolic Computation Program|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|meanwhile| Lotus Sametime Community Client library|jwboyer at jdub.homelinux.org|extras-qa at fedoraproject.org|
 Fedora Extras|meld|Visual diff and merge tool|compton at pcompton.com|extras-qa at fedoraproject.org|
 Fedora Extras|mercurial|A fast, lightweight distributed source control management system|katzj at redhat.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Tue Sep  6 18:30:16 2005
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Tue,  6 Sep 2005 14:30:16 -0400
Subject: rpms/erlang/FC-3 erlang.spec,1.1,1.2
Message-ID: <200509061830.j86IUGuU017268@cvs-int.fedora.redhat.com>

Author: gemi

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

Modified Files:
	erlang.spec 
Log Message:
added dist tag


Index: erlang.spec
===================================================================
RCS file: /cvs/extras/rpms/erlang/FC-3/erlang.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- erlang.spec	6 Sep 2005 15:14:36 -0000	1.1
+++ erlang.spec	6 Sep 2005 18:30:13 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           erlang
 Version:        R10B
-Release:        6.3
+Release:        6.3%{?dist}
 Summary:        General-purpose programming language and runtime environment
 
 Group:          Development/Languages



From fedora-extras-commits at redhat.com  Tue Sep  6 18:30:50 2005
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Tue,  6 Sep 2005 14:30:50 -0400
Subject: rpms/erlang/devel erlang.spec,1.1,1.2
Message-ID: <200509061830.j86IUolS017332@cvs-int.fedora.redhat.com>

Author: gemi

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

Modified Files:
	erlang.spec 
Log Message:
added dist tag


Index: erlang.spec
===================================================================
RCS file: /cvs/extras/rpms/erlang/devel/erlang.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- erlang.spec	6 Sep 2005 15:14:36 -0000	1.1
+++ erlang.spec	6 Sep 2005 18:30:48 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           erlang
 Version:        R10B
-Release:        6.3
+Release:        6.3%{?dist}
 Summary:        General-purpose programming language and runtime environment
 
 Group:          Development/Languages



From fedora-extras-commits at redhat.com  Tue Sep  6 18:55:09 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue,  6 Sep 2005 14:55:09 -0400
Subject: rpms/maxima/devel maxima.spec,1.3,1.4
Message-ID: <200509061855.j86It9p6017464@cvs-int.fedora.redhat.com>

Author: rdieter

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

Modified Files:
	maxima.spec 
Log Message:
remove redundant "Maxima" name from Summary



Index: maxima.spec
===================================================================
RCS file: /cvs/extras/rpms/maxima/devel/maxima.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- maxima.spec	6 Sep 2005 18:04:19 -0000	1.3
+++ maxima.spec	6 Sep 2005 18:55:07 -0000	1.4
@@ -8,7 +8,7 @@
 #define cvs cvs20050825
 #define beta cvs
 
-Summary: Maxima Symbolic Computation Program
+Summary: Symbolic Computation Program
 Name: 	 maxima
 Version: 5.9.1
 



From fedora-extras-commits at redhat.com  Tue Sep  6 20:04:20 2005
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Tue,  6 Sep 2005 16:04:20 -0400
Subject: rpms/erlang/devel otp-glibc24.patch,NONE,1.1 erlang.spec,1.2,1.3
Message-ID: <200509062004.j86K4sK7020932@cvs-int.fedora.redhat.com>

Author: gemi

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

Modified Files:
	erlang.spec 
Added Files:
	otp-glibc24.patch 
Log Message:
patch for glibc 2.4

otp-glibc24.patch:

--- NEW FILE otp-glibc24.patch ---
--- otp_src_R10B-6/erts/emulator/hipe/hipe_x86_signal.c.glibc24	2005-09-06 22:01:13.000000000 +0200
+++ otp_src_R10B-6/erts/emulator/hipe/hipe_x86_signal.c	2005-09-06 22:01:36.000000000 +0200
@@ -27,7 +27,7 @@
 #include 
 #include "hipe_signal.h"
 
-#if __GLIBC__ == 2 && __GLIBC_MINOR__ == 3
+#if __GLIBC__ == 2 && __GLIBC_MINOR__ == 4
 /* See comment below for glibc 2.2. */
 #define __USE_GNU		/* to un-hide RTLD_NEXT */
 #include 


Index: erlang.spec
===================================================================
RCS file: /cvs/extras/rpms/erlang/devel/erlang.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- erlang.spec	6 Sep 2005 18:30:48 -0000	1.2
+++ erlang.spec	6 Sep 2005 20:04:16 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           erlang
 Version:        R10B
-Release:        6.3%{?dist}
+Release:        6.4%{?dist}
 Summary:        General-purpose programming language and runtime environment
 
 Group:          Development/Languages
@@ -12,6 +12,7 @@
 Patch:		otp-links.patch
 Patch1:		otp-install.patch
 Patch2:		otp-rpath.patch
+Patch3:		otp-glibc24.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	ncurses-devel, openssl-devel, flex, unixODBC-devel
 
@@ -35,6 +36,7 @@
 %patch -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 
 %build
@@ -88,8 +90,9 @@
 
 
 %changelog
-* Tue Sep  6 2005 Gerard Milmeister  - R10B-6.3
+* Tue Sep  6 2005 Gerard Milmeister  - R10B-6.4
 - Remove perl BuildRequires
+- Add patch for glibc 2.4
 
 * Tue Aug 30 2005 Gerard Milmeister  - R10B-6.2
 - change /usr/lib to %%{_libdir}



From fedora-extras-commits at redhat.com  Tue Sep  6 20:33:53 2005
From: fedora-extras-commits at redhat.com (Linus Walleij (snirkel))
Date: Tue,  6 Sep 2005 16:33:53 -0400
Subject: rpms/libnjb/devel .cvsignore, 1.2, 1.3 libnjb.spec, 1.1, 1.2 sources,
	1.2, 1.3
Message-ID: <200509062033.j86KXrKN021131@cvs-int.fedora.redhat.com>

Author: snirkel

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

Modified Files:
	.cvsignore libnjb.spec sources 
Log Message:
New upstream release of libnjb, 2.2.2.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libnjb/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	11 Aug 2005 19:37:44 -0000	1.2
+++ .cvsignore	6 Sep 2005 20:33:51 -0000	1.3
@@ -1 +1 @@
-libnjb-2.2.1.tar.gz
+libnjb-2.2.2.tar.gz


Index: libnjb.spec
===================================================================
RCS file: /cvs/extras/rpms/libnjb/devel/libnjb.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libnjb.spec	11 Aug 2005 19:37:44 -0000	1.1
+++ libnjb.spec	6 Sep 2005 20:33:51 -0000	1.2
@@ -11,8 +11,8 @@
 #
 
 Name:		libnjb
-Version:	2.2.1
-Release:	7%{?dist}
+Version:	2.2.2
+Release:	1%{?dist}
 Summary:	A software library for talking to the Creative Nomad Jukeboxes and Dell DJs
 URL:		http://libnjb.sourceforge.net/
 
@@ -100,6 +100,8 @@
 
 
 %changelog
+* Tue Sep 6 2005 Linus Walleij  2.2.2-1
+- New upstream release.
 * Wed Aug 11 2005 Linus Walleij  2.2.1-7
 - Forgot one extraneous docdir, removing it.
 * Wed Aug 10 2005 Linus Walleij  2.2.1-6


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libnjb/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	11 Aug 2005 19:37:44 -0000	1.2
+++ sources	6 Sep 2005 20:33:51 -0000	1.3
@@ -1 +1 @@
-ae7974f5a802072f95742e1d59132152  libnjb-2.2.1.tar.gz
+5d17da61ea6a43fd3831789d1d518bc7  libnjb-2.2.2.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep  6 20:34:12 2005
From: fedora-extras-commits at redhat.com (Dawid Gajownik (gajownik))
Date: Tue,  6 Sep 2005 16:34:12 -0400
Subject: rpms/gajim/devel gajim-0.8.po.patch, 1.1,
	NONE gajim-0.8.x86_64.patch, 1.1, NONE
Message-ID: <200509062034.j86KYCl0021152@cvs-int.fedora.redhat.com>

Author: gajownik

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

Removed Files:
	gajim-0.8.po.patch gajim-0.8.x86_64.patch 
Log Message:
Remove obsoleted patches



--- gajim-0.8.po.patch DELETED ---


--- gajim-0.8.x86_64.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Sep  6 20:36:27 2005
From: fedora-extras-commits at redhat.com (Linus Walleij (snirkel))
Date: Tue,  6 Sep 2005 16:36:27 -0400
Subject: rpms/libnjb/FC-4 .cvsignore, 1.2, 1.3 libnjb.spec, 1.1, 1.2 sources,
	1.2, 1.3
Message-ID: <200509062036.j86KaRhx021239@cvs-int.fedora.redhat.com>

Author: snirkel

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

Modified Files:
	.cvsignore libnjb.spec sources 
Log Message:
New upstream release of libnjb: 2.2.2.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libnjb/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	11 Aug 2005 19:37:44 -0000	1.2
+++ .cvsignore	6 Sep 2005 20:36:25 -0000	1.3
@@ -1 +1 @@
-libnjb-2.2.1.tar.gz
+libnjb-2.2.2.tar.gz


Index: libnjb.spec
===================================================================
RCS file: /cvs/extras/rpms/libnjb/FC-4/libnjb.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libnjb.spec	11 Aug 2005 19:37:44 -0000	1.1
+++ libnjb.spec	6 Sep 2005 20:36:25 -0000	1.2
@@ -11,8 +11,8 @@
 #
 
 Name:		libnjb
-Version:	2.2.1
-Release:	7%{?dist}
+Version:	2.2.2
+Release:	1%{?dist}
 Summary:	A software library for talking to the Creative Nomad Jukeboxes and Dell DJs
 URL:		http://libnjb.sourceforge.net/
 
@@ -100,6 +100,8 @@
 
 
 %changelog
+* Tue Sep 6 2005 Linus Walleij  2.2.2-1
+- New upstream release.
 * Wed Aug 11 2005 Linus Walleij  2.2.1-7
 - Forgot one extraneous docdir, removing it.
 * Wed Aug 10 2005 Linus Walleij  2.2.1-6


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libnjb/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	11 Aug 2005 19:37:44 -0000	1.2
+++ sources	6 Sep 2005 20:36:25 -0000	1.3
@@ -1 +1 @@
-ae7974f5a802072f95742e1d59132152  libnjb-2.2.1.tar.gz
+5d17da61ea6a43fd3831789d1d518bc7  libnjb-2.2.2.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep  6 20:38:02 2005
From: fedora-extras-commits at redhat.com (Dawid Gajownik (gajownik))
Date: Tue,  6 Sep 2005 16:38:02 -0400
Subject: rpms/gajim import.log,1.4,1.5
Message-ID: <200509062038.j86KcWcF021374@cvs-int.fedora.redhat.com>

Author: gajownik

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

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


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/gajim/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- import.log	3 Sep 2005 10:16:53 -0000	1.4
+++ import.log	6 Sep 2005 20:38:00 -0000	1.5
@@ -1,3 +1,4 @@
 gajim-0_8-2:HEAD:gajim-0.8-2.src.rpm:1124889138
 gajim-0_8_1-1:HEAD:gajim-0.8.1-1.src.rpm:1125742592
 gajim-0_8_1-1:FC-4:gajim-0.8.1-1.src.rpm:1125742792
+gajim-0_8_2-1:HEAD:gajim-0.8.2-1.src.rpm:1126039272



From fedora-extras-commits at redhat.com  Tue Sep  6 20:38:37 2005
From: fedora-extras-commits at redhat.com (Linus Walleij (snirkel))
Date: Tue,  6 Sep 2005 16:38:37 -0400
Subject: rpms/libnjb/FC-3 .cvsignore, 1.2, 1.3 libnjb.spec, 1.1, 1.2 sources,
	1.2, 1.3
Message-ID: <200509062038.j86Kcb4R021402@cvs-int.fedora.redhat.com>

Author: snirkel

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

Modified Files:
	.cvsignore libnjb.spec sources 
Log Message:
New upstream release of libnjb: 2.2.2.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libnjb/FC-3/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	11 Aug 2005 19:37:44 -0000	1.2
+++ .cvsignore	6 Sep 2005 20:38:34 -0000	1.3
@@ -1 +1 @@
-libnjb-2.2.1.tar.gz
+libnjb-2.2.2.tar.gz


Index: libnjb.spec
===================================================================
RCS file: /cvs/extras/rpms/libnjb/FC-3/libnjb.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libnjb.spec	11 Aug 2005 19:37:44 -0000	1.1
+++ libnjb.spec	6 Sep 2005 20:38:34 -0000	1.2
@@ -11,8 +11,8 @@
 #
 
 Name:		libnjb
-Version:	2.2.1
-Release:	7%{?dist}
+Version:	2.2.2
+Release:	1%{?dist}
 Summary:	A software library for talking to the Creative Nomad Jukeboxes and Dell DJs
 URL:		http://libnjb.sourceforge.net/
 
@@ -100,6 +100,8 @@
 
 
 %changelog
+* Tue Sep 6 2005 Linus Walleij  2.2.2-1
+- New upstream release.
 * Wed Aug 11 2005 Linus Walleij  2.2.1-7
 - Forgot one extraneous docdir, removing it.
 * Wed Aug 10 2005 Linus Walleij  2.2.1-6


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libnjb/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	11 Aug 2005 19:37:44 -0000	1.2
+++ sources	6 Sep 2005 20:38:34 -0000	1.3
@@ -1 +1 @@
-ae7974f5a802072f95742e1d59132152  libnjb-2.2.1.tar.gz
+5d17da61ea6a43fd3831789d1d518bc7  libnjb-2.2.2.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep  6 20:38:02 2005
From: fedora-extras-commits at redhat.com (Dawid Gajownik (gajownik))
Date: Tue,  6 Sep 2005 16:38:02 -0400
Subject: rpms/gajim/devel .cvsignore, 1.3, 1.4 gajim.spec, 1.5, 1.6 sources,
	1.3, 1.4 gajim-0.8.1.remote.patch, 1.1,
	NONE gajim-0.8.cflags.patch, 1.1, NONE
Message-ID: <200509062038.j86KcXiJ021379@cvs-int.fedora.redhat.com>

Author: gajownik

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

Modified Files:
	.cvsignore gajim.spec sources 
Removed Files:
	gajim-0.8.1.remote.patch gajim-0.8.cflags.patch 
Log Message:
auto-import gajim-0.8.2-1 on branch devel from gajim-0.8.2-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gajim/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	3 Sep 2005 10:13:33 -0000	1.3
+++ .cvsignore	6 Sep 2005 20:38:00 -0000	1.4
@@ -1 +1 @@
-gajim-0.8.1.tar.bz2
+gajim-0.8.2.tar.bz2


Index: gajim.spec
===================================================================
RCS file: /cvs/extras/rpms/gajim/devel/gajim.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gajim.spec	3 Sep 2005 10:13:33 -0000	1.5
+++ gajim.spec	6 Sep 2005 20:38:00 -0000	1.6
@@ -2,7 +2,7 @@
 %define         use_internal_modules   0
 
 Name:           gajim
-Version:        0.8.1
+Version:        0.8.2
 Release:        1%{?dist}
 Summary:        Jabber client written in PyGTK
 
@@ -10,11 +10,7 @@
 License:        GPL
 URL:            http://gajim.org/
 Source0:        http://gajim.org/downloads/gajim-%{version}.tar.bz2
-Patch0:         gajim-0.8.cflags.patch
-Patch1:         gajim-0.8.po.patch
-Patch2:         gajim-0.8.1.remote.patch
-Patch3:         gajim-0.8.aplay.patch
-Patch4:         gajim-0.8.x86_64.patch
+Patch0:         gajim-0.8.aplay.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  desktop-file-utils
@@ -44,10 +40,6 @@
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
 
 
 %build
@@ -77,12 +69,6 @@
 	--delete-original \
 	%{buildroot}%{_datadir}/applications/gajim.desktop
 
-# These lines and gajim-0.8.1.remote.patch are a workaround 
-# for broken i18n module import
-mv %{buildroot}%{_datadir}/gajim/scripts/gajim-remote.py \
-	%{buildroot}%{_datadir}/gajim/src/gajim-remote.py
-rmdir %{buildroot}%{_datadir}/gajim/scripts
-
 
 %find_lang %{name}
 
@@ -98,11 +84,14 @@
 %{_libdir}/gajim/
 %{_datadir}/applications/*gajim.desktop
 %{_datadir}/gajim/
-%exclude %{_datadir}/gajim/src/systraywin32.py
 %{_datadir}/pixmaps/gajim*
 %{_mandir}/man1/gajim*
 
 %changelog
+* Tue Sep  6 2005 Dawid Gajownik  - 0.8.2-1
+- new version 0.8.2
+- remove patches .cflags, .po, .x86_64, .remote (pushed upstream)
+
 * Sat Sep  3 2005 Dawid Gajownik  - 0.8.1-1
 - Version 0.8.1
 - drop gajim-remote.py file (included in tarball)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gajim/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	3 Sep 2005 10:13:33 -0000	1.3
+++ sources	6 Sep 2005 20:38:00 -0000	1.4
@@ -1 +1 @@
-d4cbbd64078b9c93fdd1492c27dbcdab  gajim-0.8.1.tar.bz2
+14b00f8ed7d84d90793782db7df40ec1  gajim-0.8.2.tar.bz2


--- gajim-0.8.1.remote.patch DELETED ---


--- gajim-0.8.cflags.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Sep  6 20:40:54 2005
From: fedora-extras-commits at redhat.com (Dawid Gajownik (gajownik))
Date: Tue,  6 Sep 2005 16:40:54 -0400
Subject: rpms/gajim import.log,1.5,1.6
Message-ID: <200509062040.j86KesQ3021564@cvs-int.fedora.redhat.com>

Author: gajownik

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

Modified Files:
	import.log 
Log Message:
auto-import gajim-0.8.2-1 on branch FC-4 from gajim-0.8.2-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/gajim/import.log,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- import.log	6 Sep 2005 20:38:00 -0000	1.5
+++ import.log	6 Sep 2005 20:40:52 -0000	1.6
@@ -2,3 +2,4 @@
 gajim-0_8_1-1:HEAD:gajim-0.8.1-1.src.rpm:1125742592
 gajim-0_8_1-1:FC-4:gajim-0.8.1-1.src.rpm:1125742792
 gajim-0_8_2-1:HEAD:gajim-0.8.2-1.src.rpm:1126039272
+gajim-0_8_2-1:FC-4:gajim-0.8.2-1.src.rpm:1126039444



From fedora-extras-commits at redhat.com  Tue Sep  6 20:40:55 2005
From: fedora-extras-commits at redhat.com (Dawid Gajownik (gajownik))
Date: Tue,  6 Sep 2005 16:40:55 -0400
Subject: rpms/gajim/FC-4 .cvsignore, 1.3, 1.4 gajim.spec, 1.5, 1.6 sources,
	1.3, 1.4 gajim-0.8.1.remote.patch, 1.1,
	NONE gajim-0.8.cflags.patch, 1.1, NONE gajim-0.8.po.patch, 1.1,
	NONE gajim-0.8.x86_64.patch, 1.1, NONE
Message-ID: <200509062041.j86KetOD021572@cvs-int.fedora.redhat.com>

Author: gajownik

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

Modified Files:
	.cvsignore gajim.spec sources 
Removed Files:
	gajim-0.8.1.remote.patch gajim-0.8.cflags.patch 
	gajim-0.8.po.patch gajim-0.8.x86_64.patch 
Log Message:
auto-import gajim-0.8.2-1 on branch FC-4 from gajim-0.8.2-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gajim/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	3 Sep 2005 10:16:54 -0000	1.3
+++ .cvsignore	6 Sep 2005 20:40:53 -0000	1.4
@@ -1 +1 @@
-gajim-0.8.1.tar.bz2
+gajim-0.8.2.tar.bz2


Index: gajim.spec
===================================================================
RCS file: /cvs/extras/rpms/gajim/FC-4/gajim.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gajim.spec	3 Sep 2005 10:16:54 -0000	1.5
+++ gajim.spec	6 Sep 2005 20:40:53 -0000	1.6
@@ -2,7 +2,7 @@
 %define         use_internal_modules   0
 
 Name:           gajim
-Version:        0.8.1
+Version:        0.8.2
 Release:        1%{?dist}
 Summary:        Jabber client written in PyGTK
 
@@ -10,11 +10,7 @@
 License:        GPL
 URL:            http://gajim.org/
 Source0:        http://gajim.org/downloads/gajim-%{version}.tar.bz2
-Patch0:         gajim-0.8.cflags.patch
-Patch1:         gajim-0.8.po.patch
-Patch2:         gajim-0.8.1.remote.patch
-Patch3:         gajim-0.8.aplay.patch
-Patch4:         gajim-0.8.x86_64.patch
+Patch0:         gajim-0.8.aplay.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  desktop-file-utils
@@ -44,10 +40,6 @@
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
 
 
 %build
@@ -77,12 +69,6 @@
 	--delete-original \
 	%{buildroot}%{_datadir}/applications/gajim.desktop
 
-# These lines and gajim-0.8.1.remote.patch are a workaround 
-# for broken i18n module import
-mv %{buildroot}%{_datadir}/gajim/scripts/gajim-remote.py \
-	%{buildroot}%{_datadir}/gajim/src/gajim-remote.py
-rmdir %{buildroot}%{_datadir}/gajim/scripts
-
 
 %find_lang %{name}
 
@@ -98,11 +84,14 @@
 %{_libdir}/gajim/
 %{_datadir}/applications/*gajim.desktop
 %{_datadir}/gajim/
-%exclude %{_datadir}/gajim/src/systraywin32.py
 %{_datadir}/pixmaps/gajim*
 %{_mandir}/man1/gajim*
 
 %changelog
+* Tue Sep  6 2005 Dawid Gajownik  - 0.8.2-1
+- new version 0.8.2
+- remove patches .cflags, .po, .x86_64, .remote (pushed upstream)
+
 * Sat Sep  3 2005 Dawid Gajownik  - 0.8.1-1
 - Version 0.8.1
 - drop gajim-remote.py file (included in tarball)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gajim/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	3 Sep 2005 10:16:54 -0000	1.3
+++ sources	6 Sep 2005 20:40:53 -0000	1.4
@@ -1 +1 @@
-d4cbbd64078b9c93fdd1492c27dbcdab  gajim-0.8.1.tar.bz2
+14b00f8ed7d84d90793782db7df40ec1  gajim-0.8.2.tar.bz2


--- gajim-0.8.1.remote.patch DELETED ---


--- gajim-0.8.cflags.patch DELETED ---


--- gajim-0.8.po.patch DELETED ---


--- gajim-0.8.x86_64.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Sep  6 20:51:57 2005
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Tue,  6 Sep 2005 16:51:57 -0400
Subject: rpms/xlockmore/devel .cvsignore, 1.4, 1.5 sources, 1.4,
	1.5 xlockmore.spec, 1.6, 1.7 xlockmore.older-passwd.patch, 1.1, NONE
Message-ID: <200509062051.j86KpvVB021738@cvs-int.fedora.redhat.com>

Author: adrian

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

Modified Files:
	.cvsignore sources xlockmore.spec 
Removed Files:
	xlockmore.older-passwd.patch 
Log Message:
* Sun Aug 21 2005 Adrian Reber  - 5.19-1
- updated to 5.19
- upstream included a fix for (BZ #161740), but "GENTOO" needs
  to be defined during compilation



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xlockmore/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	17 Jun 2005 21:28:29 -0000	1.4
+++ .cvsignore	6 Sep 2005 20:51:55 -0000	1.5
@@ -1 +1 @@
-xlockmore-5.18.tar.bz2
+xlockmore-5.19.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xlockmore/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	17 Jun 2005 21:28:29 -0000	1.4
+++ sources	6 Sep 2005 20:51:55 -0000	1.5
@@ -1 +1 @@
-211673f6be51bdec96718b891bf9ebb9  xlockmore-5.18.tar.bz2
+c80ae7689bf8683033ec08b652e24d83  xlockmore-5.19.tar.bz2


Index: xlockmore.spec
===================================================================
RCS file: /cvs/extras/rpms/xlockmore/devel/xlockmore.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- xlockmore.spec	28 Jun 2005 06:34:23 -0000	1.6
+++ xlockmore.spec	6 Sep 2005 20:51:55 -0000	1.7
@@ -1,12 +1,11 @@
 Summary: Screen lock and screen saver
 Name: xlockmore
-Version: 5.18
-Release: 3%{?dist}
+Version: 5.19
+Release: 1%{?dist}
 License: BSD
 Group: Amusements/Graphics
 URL: http://www.tux.org/~bagleyd/xlockmore.html
-Source0: http://www.tux.org/~bagleyd/latest/xlockmore-5.18.tar.bz2
-Patch0: xlockmore.older-passwd.patch
+Source0: http://www.tux.org/~bagleyd/latest/xlockmore-5.19.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: pam-devel esound-devel
 BuildRequires: xorg-x11-Mesa-libGL xorg-x11-Mesa-libGLU
@@ -34,14 +33,13 @@
 
 %prep
 %setup -q
-%patch0 -p1
 
 %{__sed} -i -e "s,/lib,/%{_lib},g" configure
 
 %build
 %configure \
 	--with-crypt --enable-pam --enable-syslog --disable-setuid
-%{__make} %{?_smp_mflags}
+%{__make} %{?_smp_mflags} CFLAGS+=" -DGENTOO "
 
 %install
 %{__rm} -rf %{buildroot}
@@ -106,6 +104,11 @@
 %{_bindir}/xglock
 
 %changelog
+* Sun Aug 21 2005 Adrian Reber  - 5.19-1
+- updated to 5.19
+- upstream included a fix for (BZ #161740), but "GENTOO" needs
+  to be defined during compilation
+
 * Mon Jun 27 2005 Adrian Reber  - 5.18-3
 - included patch to make it work again with PAM (BZ #161740)
 


--- xlockmore.older-passwd.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Sep  6 21:15:20 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue,  6 Sep 2005 17:15:20 -0400
Subject: rpms/GiNaC Makefile,1.1,NONE import.log,1.2,NONE
Message-ID: <200509062115.j86LFKDo023280@cvs-int.fedora.redhat.com>

Author: spot

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

Removed Files:
	Makefile import.log 
Log Message:

Nuke GiNaC



--- Makefile DELETED ---


--- import.log DELETED ---



From fedora-extras-commits at redhat.com  Tue Sep  6 21:15:20 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue,  6 Sep 2005 17:15:20 -0400
Subject: rpms/GiNaC/FC-3 .cvsignore, 1.3, NONE GiNaC.spec, 1.12,
	NONE Makefile, 1.1, NONE branch, 1.1, NONE sources, 1.3, NONE
Message-ID: <200509062115.j86LFKpH023285@cvs-int.fedora.redhat.com>

Author: spot

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

Removed Files:
	.cvsignore GiNaC.spec Makefile branch sources 
Log Message:

Nuke GiNaC



--- .cvsignore DELETED ---


--- GiNaC.spec DELETED ---


--- Makefile DELETED ---


--- branch DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Tue Sep  6 21:15:26 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue,  6 Sep 2005 17:15:26 -0400
Subject: rpms/GiNaC/FC-4 .cvsignore, 1.3, NONE GiNaC.spec, 1.12,
	NONE Makefile, 1.1, NONE branch, 1.1, NONE sources, 1.3, NONE
Message-ID: <200509062115.j86LFQb4023326@cvs-int.fedora.redhat.com>

Author: spot

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

Removed Files:
	.cvsignore GiNaC.spec Makefile branch sources 
Log Message:

Nuke GiNaC



--- .cvsignore DELETED ---


--- GiNaC.spec DELETED ---


--- Makefile DELETED ---


--- branch DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Tue Sep  6 21:15:26 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue,  6 Sep 2005 17:15:26 -0400
Subject: rpms/GiNaC/devel .cvsignore, 1.3, NONE GiNaC.spec, 1.12,
	NONE Makefile, 1.1, NONE sources, 1.3, NONE
Message-ID: <200509062115.j86LFQYu023331@cvs-int.fedora.redhat.com>

Author: spot

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

Removed Files:
	.cvsignore GiNaC.spec Makefile sources 
Log Message:

Nuke GiNaC



--- .cvsignore DELETED ---


--- GiNaC.spec DELETED ---


--- Makefile DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Tue Sep  6 21:18:00 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue,  6 Sep 2005 17:18:00 -0400
Subject: rpms/tetex-beamer/FC-4 .cvsignore, 1.2, NONE Makefile, 1.1,
	NONE branch, 1.1, NONE sources, 1.2, NONE tetex-beamer.spec,
	1.3, NONE
Message-ID: <200509062118.j86LI0Vu023406@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/tetex-beamer/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23376/tetex-beamer/FC-4

Removed Files:
	.cvsignore Makefile branch sources tetex-beamer.spec 
Log Message:

Nuke tetex-beamer FC-4 and devel



--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- branch DELETED ---


--- sources DELETED ---


--- tetex-beamer.spec DELETED ---



From fedora-extras-commits at redhat.com  Tue Sep  6 21:18:00 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue,  6 Sep 2005 17:18:00 -0400
Subject: rpms/tetex-beamer/devel .cvsignore, 1.2, NONE Makefile, 1.1,
	NONE sources, 1.2, NONE tetex-beamer.spec, 1.3, NONE
Message-ID: <200509062118.j86LI0QL023411@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/tetex-beamer/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23376/tetex-beamer/devel

Removed Files:
	.cvsignore Makefile sources tetex-beamer.spec 
Log Message:

Nuke tetex-beamer FC-4 and devel



--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- sources DELETED ---


--- tetex-beamer.spec DELETED ---



From fedora-extras-commits at redhat.com  Tue Sep  6 21:19:48 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue,  6 Sep 2005 17:19:48 -0400
Subject: rpms/tetex-pgf/FC-4 .cvsignore, 1.2, NONE Makefile, 1.1, NONE branch,
	1.1, NONE sources, 1.2, NONE tetex-pgf.spec, 1.3, NONE
Message-ID: <200509062119.j86LJm14023461@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/tetex-pgf/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23437/tetex-pgf/FC-4

Removed Files:
	.cvsignore Makefile branch sources tetex-pgf.spec 
Log Message:

Nuke tetex-pgf FC-4 and devel



--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- branch DELETED ---


--- sources DELETED ---


--- tetex-pgf.spec DELETED ---



From fedora-extras-commits at redhat.com  Tue Sep  6 21:19:48 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue,  6 Sep 2005 17:19:48 -0400
Subject: rpms/tetex-pgf/devel .cvsignore, 1.2, NONE Makefile, 1.1,
	NONE sources, 1.2, NONE tetex-pgf.spec, 1.3, NONE
Message-ID: <200509062119.j86LJmwo023466@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/tetex-pgf/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23437/tetex-pgf/devel

Removed Files:
	.cvsignore Makefile sources tetex-pgf.spec 
Log Message:

Nuke tetex-pgf FC-4 and devel



--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- sources DELETED ---


--- tetex-pgf.spec DELETED ---



From fedora-extras-commits at redhat.com  Tue Sep  6 21:21:13 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue,  6 Sep 2005 17:21:13 -0400
Subject: rpms/tetex-xcolor/FC-4 .cvsignore, 1.3, NONE Makefile, 1.1,
	NONE branch, 1.1, NONE sources, 1.3, NONE tetex-xcolor.spec,
	1.4, NONE
Message-ID: <200509062121.j86LLDPO023516@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/tetex-xcolor/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23492/tetex-xcolor/FC-4

Removed Files:
	.cvsignore Makefile branch sources tetex-xcolor.spec 
Log Message:

tetex-xcolor nukeage FC-4 and devel, buuuuuddy.



--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- branch DELETED ---


--- sources DELETED ---


--- tetex-xcolor.spec DELETED ---



From fedora-extras-commits at redhat.com  Tue Sep  6 21:21:13 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue,  6 Sep 2005 17:21:13 -0400
Subject: rpms/tetex-xcolor/devel .cvsignore, 1.3, NONE Makefile, 1.1,
	NONE sources, 1.3, NONE tetex-xcolor.spec, 1.4, NONE
Message-ID: <200509062121.j86LLD3U023521@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/tetex-xcolor/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23492/tetex-xcolor/devel

Removed Files:
	.cvsignore Makefile sources tetex-xcolor.spec 
Log Message:

tetex-xcolor nukeage FC-4 and devel, buuuuuddy.



--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- sources DELETED ---


--- tetex-xcolor.spec DELETED ---



From fedora-extras-commits at redhat.com  Tue Sep  6 21:22:14 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue,  6 Sep 2005 17:22:14 -0400
Subject: rpms/sqlite/devel .cvsignore, 1.4, NONE Makefile, 1.2, NONE sources,
	1.5, NONE sqlite-3.1.2-doc.patch, 1.1, NONE sqlite.spec, 1.12, NONE
Message-ID: <200509062122.j86LMEHL023562@cvs-int.fedora.redhat.com>

Author: spot

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

Removed Files:
	.cvsignore Makefile sources sqlite-3.1.2-doc.patch sqlite.spec 
Log Message:

nuke sqlite devel branch



--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- sources DELETED ---


--- sqlite-3.1.2-doc.patch DELETED ---


--- sqlite.spec DELETED ---



From fedora-extras-commits at redhat.com  Tue Sep  6 21:23:21 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue,  6 Sep 2005 17:23:21 -0400
Subject: rpms/dd_rescue Makefile,1.1,NONE import.log,1.2,NONE
Message-ID: <200509062123.j86LNLaL023610@cvs-int.fedora.redhat.com>

Author: spot

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

Removed Files:
	Makefile import.log 
Log Message:

Nuke dd_rescue



--- Makefile DELETED ---


--- import.log DELETED ---



From fedora-extras-commits at redhat.com  Tue Sep  6 21:23:22 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue,  6 Sep 2005 17:23:22 -0400
Subject: rpms/dd_rescue/devel .cvsignore, 1.2, NONE Makefile, 1.1,
	NONE dd_rescue.1, 1.1, NONE dd_rescue.spec, 1.1, NONE sources,
	1.2, NONE
Message-ID: <200509062123.j86LNM3F023615@cvs-int.fedora.redhat.com>

Author: spot

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

Removed Files:
	.cvsignore Makefile dd_rescue.1 dd_rescue.spec sources 
Log Message:

Nuke dd_rescue



--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- dd_rescue.1 DELETED ---


--- dd_rescue.spec DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Tue Sep  6 21:24:59 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue,  6 Sep 2005 17:24:59 -0400
Subject: rpms/kernel-module-devel-2.6.8-1.521 Makefile, 1.1, NONE import.log,
	1.2, NONE
Message-ID: <200509062124.j86LOx8I023670@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/kernel-module-devel-2.6.8-1.521
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23643/kernel-module-devel-2.6.8-1.521

Removed Files:
	Makefile import.log 
Log Message:

Nuke kernel-module-devel-2.6.8-1.521



--- Makefile DELETED ---


--- import.log DELETED ---



From fedora-extras-commits at redhat.com  Tue Sep  6 21:25:05 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue,  6 Sep 2005 17:25:05 -0400
Subject: rpms/kernel-module-devel-2.6.8-1.521/FC-3 .cvsignore, 1.2,
	NONE Makefile, 1.2, NONE branch, 1.1,
	NONE kernel-module-devel.spec, 1.1, NONE sources, 1.2, NONE
Message-ID: <200509062125.j86LP5rO023706@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/kernel-module-devel-2.6.8-1.521/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23643/kernel-module-devel-2.6.8-1.521/FC-3

Removed Files:
	.cvsignore Makefile branch kernel-module-devel.spec sources 
Log Message:

Nuke kernel-module-devel-2.6.8-1.521



--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- branch DELETED ---


--- kernel-module-devel.spec DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Tue Sep  6 21:25:20 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue,  6 Sep 2005 17:25:20 -0400
Subject: rpms/kernel-module-devel-2.6.8-1.521/FC-4 .cvsignore, 1.2,
	NONE Makefile, 1.2, NONE branch, 1.1,
	NONE kernel-module-devel.spec, 1.2, NONE sources, 1.2, NONE
Message-ID: <200509062125.j86LPKCE023715@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/kernel-module-devel-2.6.8-1.521/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23643/kernel-module-devel-2.6.8-1.521/FC-4

Removed Files:
	.cvsignore Makefile branch kernel-module-devel.spec sources 
Log Message:

Nuke kernel-module-devel-2.6.8-1.521



--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- branch DELETED ---


--- kernel-module-devel.spec DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Tue Sep  6 21:25:00 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue,  6 Sep 2005 17:25:00 -0400
Subject: rpms/kernel-module-devel-2.6.8-1.521/FC-2 .cvsignore, 1.2,
	NONE Makefile, 1.2, NONE branch, 1.1,
	NONE kernel-module-devel.spec, 1.1, NONE sources, 1.2, NONE
Message-ID: <200509062125.j86LP09X023675@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/kernel-module-devel-2.6.8-1.521/FC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23643/kernel-module-devel-2.6.8-1.521/FC-2

Removed Files:
	.cvsignore Makefile branch kernel-module-devel.spec sources 
Log Message:

Nuke kernel-module-devel-2.6.8-1.521



--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- branch DELETED ---


--- kernel-module-devel.spec DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Tue Sep  6 21:25:20 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue,  6 Sep 2005 17:25:20 -0400
Subject: rpms/kernel-module-devel-2.6.8-1.521/devel .cvsignore, 1.2,
	NONE Makefile, 1.2, NONE kernel-module-devel.spec, 1.2,
	NONE sources, 1.2, NONE
Message-ID: <200509062125.j86LPKtM023714@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/kernel-module-devel-2.6.8-1.521/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23643/kernel-module-devel-2.6.8-1.521/devel

Removed Files:
	.cvsignore Makefile kernel-module-devel.spec sources 
Log Message:

Nuke kernel-module-devel-2.6.8-1.521



--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- kernel-module-devel.spec DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Tue Sep  6 21:38:42 2005
From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon))
Date: Tue,  6 Sep 2005 17:38:42 -0400
Subject: rpms/epiphany-extensions/devel .cvsignore, 1.4,
	1.5 epiphany-extensions.spec, 1.3, 1.4 sources, 1.4, 1.5
Message-ID: <200509062138.j86LcgA0023963@cvs-int.fedora.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/epiphany-extensions/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23940

Modified Files:
	.cvsignore epiphany-extensions.spec sources 
Log Message:
* Tue Sep  6 2005 Christopher Aillon  - 1.8.0-1
- Update to 1.8.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/epiphany-extensions/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	10 Aug 2005 17:39:58 -0000	1.4
+++ .cvsignore	6 Sep 2005 21:38:40 -0000	1.5
@@ -1,2 +1,3 @@
 epiphany-extensions-1.7.3.tar.bz2
 epiphany-extensions-1.7.4.tar.bz2
+epiphany-extensions-1.8.0.tar.bz2


Index: epiphany-extensions.spec
===================================================================
RCS file: /cvs/extras/rpms/epiphany-extensions/devel/epiphany-extensions.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- epiphany-extensions.spec	10 Aug 2005 17:39:58 -0000	1.3
+++ epiphany-extensions.spec	6 Sep 2005 21:38:40 -0000	1.4
@@ -1,8 +1,8 @@
-%define ephy_major 1.7
+%define ephy_major 1.8
 
 Summary: Extensions for Epiphany, the GNOME web browser.
 Name: epiphany-extensions
-Version: 1.7.4
+Version: 1.8.0
 Release: 1
 License: GPL
 Group: Applications/Internet
@@ -39,6 +39,9 @@
 %{_libdir}/epiphany
 
 %changelog
+* Tue Sep  6 2005 Christopher Aillon  - 1.8.0-1
+- Update to 1.8.0
+
 * Wed Aug 10 2005 Christopher Aillon  - 1.7.4-1
 - Update to 1.7.4
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/epiphany-extensions/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	10 Aug 2005 17:39:58 -0000	1.4
+++ sources	6 Sep 2005 21:38:40 -0000	1.5
@@ -1 +1 @@
-d175f0747254595d369aa75baa64a0a4  epiphany-extensions-1.7.4.tar.bz2
+312335e8f755995dc486d496f497175e  epiphany-extensions-1.8.0.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep  6 21:58:20 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue,  6 Sep 2005 17:58:20 -0400
Subject: rpms/logjam/FC-3 logjam.spec,1.10,1.11
Message-ID: <200509062158.j86LwKhf024680@cvs-int.fedora.redhat.com>

Author: spot

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

Modified Files:
	logjam.spec 
Log Message:

gnutls-devel as a BR:



Index: logjam.spec
===================================================================
RCS file: /cvs/extras/rpms/logjam/FC-3/logjam.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- logjam.spec	6 Sep 2005 16:24:16 -0000	1.10
+++ logjam.spec	6 Sep 2005 21:58:18 -0000	1.11
@@ -2,7 +2,7 @@
 
 Name:		logjam
 Version:	4.5.1
-Release:	3%{?dist}
+Release:	4%{?dist}
 Epoch:		1
 Summary:	GTK2 client for LiveJournal
 License:	GPL
@@ -15,7 +15,7 @@
 %endif
 BuildRequires:	curl-devel, gtk2-devel, gtkspell-devel, gtkhtml3-devel
 BuildRequires:	gettext, desktop-file-utils, aspell-devel, librsvg2-devel
-BuildRequires:	libsoup-devel
+BuildRequires:	libsoup-devel, gnutls-devel
 Obsoletes:	loserjabber, logjam-gnome
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Patch0:		logjam-4.4.1-offline-segfaultfix.patch
@@ -82,6 +82,9 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Tue Sep  6 2005 Tom "spot" Callaway  1:4.5.1-4
+- add BR: gnutls-devel
+
 * Tue Sep  6 2005 Tom "spot" Callaway  1:4.5.1-3
 - fc3 branch missing another patch
 



From fedora-extras-commits at redhat.com  Tue Sep  6 21:58:21 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue,  6 Sep 2005 17:58:21 -0400
Subject: rpms/logjam/devel logjam.spec,1.19,1.20
Message-ID: <200509062158.j86LwLnS024690@cvs-int.fedora.redhat.com>

Author: spot

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

Modified Files:
	logjam.spec 
Log Message:

gnutls-devel as a BR:



Index: logjam.spec
===================================================================
RCS file: /cvs/extras/rpms/logjam/devel/logjam.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- logjam.spec	6 Sep 2005 16:24:17 -0000	1.19
+++ logjam.spec	6 Sep 2005 21:58:19 -0000	1.20
@@ -2,7 +2,7 @@
 
 Name:		logjam
 Version:	4.5.1
-Release:	3%{?dist}
+Release:	4%{?dist}
 Epoch:		1
 Summary:	GTK2 client for LiveJournal
 License:	GPL
@@ -15,7 +15,7 @@
 %endif
 BuildRequires:	curl-devel, gtk2-devel, gtkspell-devel, gtkhtml3-devel
 BuildRequires:	gettext, desktop-file-utils, aspell-devel, librsvg2-devel
-BuildRequires:	libsoup-devel, sqlite-devel
+BuildRequires:	libsoup-devel, sqlite-devel, gnutls-devel
 Obsoletes:	loserjabber, logjam-gnome
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Patch0:		logjam-4.4.1-offline-segfaultfix.patch
@@ -82,6 +82,9 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Tue Sep  6 2005 Tom "spot" Callaway  1:4.5.1-4
+- add BR: gnutls-devel
+
 * Tue Sep  6 2005 Tom "spot" Callaway  1:4.5.1-3
 - fc3 branch missing another patch
 



From fedora-extras-commits at redhat.com  Tue Sep  6 21:58:21 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue,  6 Sep 2005 17:58:21 -0400
Subject: rpms/logjam/FC-4 logjam.spec,1.19,1.20
Message-ID: <200509062158.j86LwLdL024686@cvs-int.fedora.redhat.com>

Author: spot

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

Modified Files:
	logjam.spec 
Log Message:

gnutls-devel as a BR:



Index: logjam.spec
===================================================================
RCS file: /cvs/extras/rpms/logjam/FC-4/logjam.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- logjam.spec	6 Sep 2005 16:24:16 -0000	1.19
+++ logjam.spec	6 Sep 2005 21:58:19 -0000	1.20
@@ -2,7 +2,7 @@
 
 Name:		logjam
 Version:	4.5.1
-Release:	3%{?dist}
+Release:	4%{?dist}
 Epoch:		1
 Summary:	GTK2 client for LiveJournal
 License:	GPL
@@ -15,7 +15,7 @@
 %endif
 BuildRequires:	curl-devel, gtk2-devel, gtkspell-devel, gtkhtml3-devel
 BuildRequires:	gettext, desktop-file-utils, aspell-devel, librsvg2-devel
-BuildRequires:	libsoup-devel, sqlite-devel
+BuildRequires:	libsoup-devel, sqlite-devel, gnutls-devel
 Obsoletes:	loserjabber, logjam-gnome
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Patch0:		logjam-4.4.1-offline-segfaultfix.patch
@@ -82,6 +82,9 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Tue Sep  6 2005 Tom "spot" Callaway  1:4.5.1-4
+- add BR: gnutls-devel
+
 * Tue Sep  6 2005 Tom "spot" Callaway  1:4.5.1-3
 - fc3 branch missing another patch
 



From fedora-extras-commits at redhat.com  Tue Sep  6 22:02:57 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue,  6 Sep 2005 18:02:57 -0400
Subject: rpms/logjam/devel logjam.spec,1.20,1.21 sources,1.5,1.6
Message-ID: <200509062203.j86M3SCM026091@cvs-int.fedora.redhat.com>

Author: spot

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

Modified Files:
	logjam.spec sources 
Log Message:

libgcrypt-devel BR



Index: logjam.spec
===================================================================
RCS file: /cvs/extras/rpms/logjam/devel/logjam.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- logjam.spec	6 Sep 2005 21:58:19 -0000	1.20
+++ logjam.spec	6 Sep 2005 22:02:54 -0000	1.21
@@ -2,7 +2,7 @@
 
 Name:		logjam
 Version:	4.5.1
-Release:	4%{?dist}
+Release:	5%{?dist}
 Epoch:		1
 Summary:	GTK2 client for LiveJournal
 License:	GPL
@@ -15,7 +15,7 @@
 %endif
 BuildRequires:	curl-devel, gtk2-devel, gtkspell-devel, gtkhtml3-devel
 BuildRequires:	gettext, desktop-file-utils, aspell-devel, librsvg2-devel
-BuildRequires:	libsoup-devel, sqlite-devel, gnutls-devel
+BuildRequires:	libsoup-devel, sqlite-devel, gnutls-devel, libgcrypt-devel
 Obsoletes:	loserjabber, logjam-gnome
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Patch0:		logjam-4.4.1-offline-segfaultfix.patch
@@ -82,6 +82,9 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Tue Sep  6 2005 Tom "spot" Callaway  1:4.5.1-5
+- add BR: libgcrypt-devel
+
 * Tue Sep  6 2005 Tom "spot" Callaway  1:4.5.1-4
 - add BR: gnutls-devel
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/logjam/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	6 Sep 2005 14:38:20 -0000	1.5
+++ sources	6 Sep 2005 22:02:54 -0000	1.6
@@ -1,3 +1 @@
-f16f68a4a6b15fb5bb650614f3ff081c  logjam-4.4.1.tar.bz2
-0acb70ccb88d6334af22e56e4b521c6b  logjam-4.5-patch8.tar.bz2
 ccae70dc36644cd1529c581443484ebe  logjam-4.5.1.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep  6 22:02:26 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue,  6 Sep 2005 18:02:26 -0400
Subject: rpms/logjam/FC-3 logjam.spec,1.11,1.12 sources,1.5,1.6
Message-ID: <200509062203.j86M3QjY026089@cvs-int.fedora.redhat.com>

Author: spot

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

Modified Files:
	logjam.spec sources 
Log Message:

libgcrypt-devel BR



Index: logjam.spec
===================================================================
RCS file: /cvs/extras/rpms/logjam/FC-3/logjam.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- logjam.spec	6 Sep 2005 21:58:18 -0000	1.11
+++ logjam.spec	6 Sep 2005 22:02:24 -0000	1.12
@@ -2,7 +2,7 @@
 
 Name:		logjam
 Version:	4.5.1
-Release:	4%{?dist}
+Release:	5%{?dist}
 Epoch:		1
 Summary:	GTK2 client for LiveJournal
 License:	GPL
@@ -15,7 +15,7 @@
 %endif
 BuildRequires:	curl-devel, gtk2-devel, gtkspell-devel, gtkhtml3-devel
 BuildRequires:	gettext, desktop-file-utils, aspell-devel, librsvg2-devel
-BuildRequires:	libsoup-devel, gnutls-devel
+BuildRequires:	libsoup-devel, gnutls-devel, libgcrypt-devel
 Obsoletes:	loserjabber, logjam-gnome
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Patch0:		logjam-4.4.1-offline-segfaultfix.patch
@@ -82,6 +82,9 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Tue Sep  6 2005 Tom "spot" Callaway  1:4.5.1-5
+- add BR: libgcrypt-devel
+
 * Tue Sep  6 2005 Tom "spot" Callaway  1:4.5.1-4
 - add BR: gnutls-devel
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/logjam/FC-3/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	6 Sep 2005 14:38:19 -0000	1.5
+++ sources	6 Sep 2005 22:02:24 -0000	1.6
@@ -1,3 +1 @@
-f16f68a4a6b15fb5bb650614f3ff081c  logjam-4.4.1.tar.bz2
-0acb70ccb88d6334af22e56e4b521c6b  logjam-4.5-patch8.tar.bz2
 ccae70dc36644cd1529c581443484ebe  logjam-4.5.1.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep  6 22:02:28 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue,  6 Sep 2005 18:02:28 -0400
Subject: rpms/logjam/FC-4 logjam.spec,1.20,1.21 sources,1.5,1.6
Message-ID: <200509062203.j86M3SCa026093@cvs-int.fedora.redhat.com>

Author: spot

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

Modified Files:
	logjam.spec sources 
Log Message:

libgcrypt-devel BR



Index: logjam.spec
===================================================================
RCS file: /cvs/extras/rpms/logjam/FC-4/logjam.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- logjam.spec	6 Sep 2005 21:58:19 -0000	1.20
+++ logjam.spec	6 Sep 2005 22:02:26 -0000	1.21
@@ -2,7 +2,7 @@
 
 Name:		logjam
 Version:	4.5.1
-Release:	4%{?dist}
+Release:	5%{?dist}
 Epoch:		1
 Summary:	GTK2 client for LiveJournal
 License:	GPL
@@ -15,7 +15,7 @@
 %endif
 BuildRequires:	curl-devel, gtk2-devel, gtkspell-devel, gtkhtml3-devel
 BuildRequires:	gettext, desktop-file-utils, aspell-devel, librsvg2-devel
-BuildRequires:	libsoup-devel, sqlite-devel, gnutls-devel
+BuildRequires:	libsoup-devel, sqlite-devel, gnutls-devel, libgcrypt-devel
 Obsoletes:	loserjabber, logjam-gnome
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Patch0:		logjam-4.4.1-offline-segfaultfix.patch
@@ -82,6 +82,9 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Tue Sep  6 2005 Tom "spot" Callaway  1:4.5.1-5
+- add BR: libgcrypt-devel
+
 * Tue Sep  6 2005 Tom "spot" Callaway  1:4.5.1-4
 - add BR: gnutls-devel
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/logjam/FC-4/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	6 Sep 2005 14:38:19 -0000	1.5
+++ sources	6 Sep 2005 22:02:26 -0000	1.6
@@ -1,3 +1 @@
-f16f68a4a6b15fb5bb650614f3ff081c  logjam-4.4.1.tar.bz2
-0acb70ccb88d6334af22e56e4b521c6b  logjam-4.5-patch8.tar.bz2
 ccae70dc36644cd1529c581443484ebe  logjam-4.5.1.tar.bz2



From fedora-extras-commits at redhat.com  Wed Sep  7 01:40:39 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Tue,  6 Sep 2005 21:40:39 -0400
Subject: rpms/nautilus-search-tool - New directory
Message-ID: <200509070140.j871edIh030525@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/nautilus-search-tool
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30505/nautilus-search-tool

Log Message:
Directory /cvs/extras/rpms/nautilus-search-tool added to the repository




From fedora-extras-commits at redhat.com  Wed Sep  7 01:40:39 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Tue,  6 Sep 2005 21:40:39 -0400
Subject: rpms/nautilus-search-tool/devel - New directory
Message-ID: <200509070140.j871ednV030530@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/nautilus-search-tool/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30505/nautilus-search-tool/devel

Log Message:
Directory /cvs/extras/rpms/nautilus-search-tool/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Sep  7 01:40:55 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Tue,  6 Sep 2005 21:40:55 -0400
Subject: rpms/nautilus-search-tool Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200509070140.j871ett9030579@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/nautilus-search-tool
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30550

Added Files:
	Makefile import.log 
Log Message:
Setup of module nautilus-search-tool


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

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

common : CVS/Root
	@cvs checkout common

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

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


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Wed Sep  7 01:40:55 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Tue,  6 Sep 2005 21:40:55 -0400
Subject: rpms/nautilus-search-tool/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200509070141.j871etHj030584@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/nautilus-search-tool/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30550/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module nautilus-search-tool


--- NEW FILE .cvsignore ---


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

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Wed Sep  7 01:41:26 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Tue,  6 Sep 2005 21:41:26 -0400
Subject: rpms/nautilus-search-tool import.log,1.1,1.2
Message-ID: <200509070141.j871fQFp030653@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/nautilus-search-tool
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30618

Modified Files:
	import.log 
Log Message:
auto-import nautilus-search-tool-0.1-1 on branch devel from nautilus-search-tool-0.1-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/nautilus-search-tool/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	7 Sep 2005 01:40:53 -0000	1.1
+++ import.log	7 Sep 2005 01:41:24 -0000	1.2
@@ -0,0 +1 @@
+nautilus-search-tool-0_1-1:HEAD:nautilus-search-tool-0.1-1.src.rpm:1126057541



From fedora-extras-commits at redhat.com  Wed Sep  7 01:41:26 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Tue,  6 Sep 2005 21:41:26 -0400
Subject: rpms/nautilus-search-tool/devel nautilus-search-tool.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200509070141.j871fQgY030660@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/nautilus-search-tool/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30618/devel

Modified Files:
	.cvsignore sources 
Added Files:
	nautilus-search-tool.spec 
Log Message:
auto-import nautilus-search-tool-0.1-1 on branch devel from nautilus-search-tool-0.1-1.src.rpm


--- NEW FILE nautilus-search-tool.spec ---
Name:           nautilus-search-tool
Version:        0.1
Release:        1
Summary:        A Nautilus extension to put "Search for Files" on the context menu of folders

Group:          System Environment/Shells
License:        GPL
URL:            http://saettaz.altervista.org/software/nautilus_search_tool.html
Source0:        http://saettaz.altervista.org/software/nautilus_search_tool/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  gnome-desktop-devel >= 2.10.0 nautilus >= 2.10.0 eel2-devel >= 2.10.0

%description
This package adds an option to the context menu of folders in Nautilus to
search for files.

%prep
%setup -q

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

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

%clean
rm -rf $RPM_BUILD_ROOT

%files -f %{name}.lang
%doc AUTHORS COPYING
%defattr(-,root,root,-)
%{_libdir}/nautilus/extensions-1.0/*.so

%changelog
* Tue Sep  3 2005 Ignacio Vazquez-Abrams  0.1-1
- Initial RPM release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nautilus-search-tool/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	7 Sep 2005 01:40:53 -0000	1.1
+++ .cvsignore	7 Sep 2005 01:41:24 -0000	1.2
@@ -0,0 +1 @@
+nautilus-search-tool-0.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nautilus-search-tool/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	7 Sep 2005 01:40:53 -0000	1.1
+++ sources	7 Sep 2005 01:41:24 -0000	1.2
@@ -0,0 +1 @@
+7c0cfad01f4fb46302447d110bf4df1c  nautilus-search-tool-0.1.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep  7 02:39:42 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Tue,  6 Sep 2005 22:39:42 -0400
Subject: rpms/nautilus-search-tool/devel nautilus-search-tool.spec,1.1,1.2
Message-ID: <200509070239.j872dgsu032063@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/nautilus-search-tool/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32044

Modified Files:
	nautilus-search-tool.spec 
Log Message:
Add disttag


Index: nautilus-search-tool.spec
===================================================================
RCS file: /cvs/extras/rpms/nautilus-search-tool/devel/nautilus-search-tool.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nautilus-search-tool.spec	7 Sep 2005 01:41:24 -0000	1.1
+++ nautilus-search-tool.spec	7 Sep 2005 02:39:40 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           nautilus-search-tool
 Version:        0.1
-Release:        1
+Release:        1%{?dist}
 Summary:        A Nautilus extension to put "Search for Files" on the context menu of folders
 
 Group:          System Environment/Shells



From fedora-extras-commits at redhat.com  Wed Sep  7 02:42:10 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Tue,  6 Sep 2005 22:42:10 -0400
Subject: owners owners.list,1.170,1.171
Message-ID: <200509070242.j872gAkY032099@cvs-int.fedora.redhat.com>

Author: ivazquez

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

Modified Files:
	owners.list 
Log Message:
nautilus-search-tool


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.170
retrieving revision 1.171
diff -u -r1.170 -r1.171
--- owners.list	6 Sep 2005 18:09:44 -0000	1.170
+++ owners.list	7 Sep 2005 02:42:08 -0000	1.171
@@ -493,6 +493,7 @@
 Fedora Extras|naim|An ncurses-based console AIM, ICQ, IRC, and Lily client|lmacken at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|namazu|A full-text search engine|tagoh at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|nautilus-open-terminal|Nautilus extension for an open terminal shortcut|stickster at gmail.com|extras-qa at fedoraproject.org|
+Fedora Extras|nautilus-search-tool|A Nautilus extension to put "Search for Files" on the context menu of folders|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
 Fedora Extras|ncftp|Improved console FTP client|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|ncmpc|A curses client for the Music Player Daemon (MPD)|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|nco|Suite of programs for manipulating NetCDF/HDF4 files|ed at eh3.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Wed Sep  7 06:19:17 2005
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Wed,  7 Sep 2005 02:19:17 -0400
Subject: rpms/bluefish/FC-4 bluefish.spec, 1.14, 1.15 sources, 1.6,
	1.7 .cvsignore, 1.6, 1.7
Message-ID: <200509070619.j876JHkH006503@cvs-int.fedora.redhat.com>

Author: pghmcfc

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

Modified Files:
	bluefish.spec sources .cvsignore 
Log Message:
resync with devel



Index: bluefish.spec
===================================================================
RCS file: /cvs/extras/rpms/bluefish/FC-4/bluefish.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- bluefish.spec	21 Aug 2005 15:33:24 -0000	1.14
+++ bluefish.spec	7 Sep 2005 06:19:15 -0000	1.15
@@ -1,5 +1,5 @@
 Name:           bluefish
-Version:        1.0.3
+Version:        1.0.4
 Release:        1%{?dist}
 Summary:        GTK2 web development application for experienced users
 
@@ -80,6 +80,9 @@
 
 
 %changelog
+* Mon Sep  5 2005 Paul Howarth  - 1.0.4-1
+- update to 1.0.4
+
 * Sun Aug 21 2005 Paul Howarth  - 1.0.3-1
 - update to 1.0.3
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/bluefish/FC-4/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	21 Aug 2005 15:33:24 -0000	1.6
+++ sources	7 Sep 2005 06:19:15 -0000	1.7
@@ -1 +1 @@
-f4cda1e21089155383930616ab673d69  bluefish-1.0.3.tar.bz2
+8d5c1b7315cdc935aa024954093d2b32  bluefish-1.0.4.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/bluefish/FC-4/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	21 Aug 2005 15:33:24 -0000	1.6
+++ .cvsignore	7 Sep 2005 06:19:15 -0000	1.7
@@ -1 +1 @@
-bluefish-1.0.3.tar.bz2
+bluefish-1.0.4.tar.bz2



From fedora-extras-commits at redhat.com  Wed Sep  7 06:20:56 2005
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Wed,  7 Sep 2005 02:20:56 -0400
Subject: rpms/bluefish/FC-3 bluefish.spec, 1.11, 1.12 sources, 1.6,
	1.7 .cvsignore, 1.6, 1.7
Message-ID: <200509070620.j876Ku82006576@cvs-int.fedora.redhat.com>

Author: pghmcfc

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

Modified Files:
	bluefish.spec sources .cvsignore 
Log Message:
resync with devel



Index: bluefish.spec
===================================================================
RCS file: /cvs/extras/rpms/bluefish/FC-3/bluefish.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- bluefish.spec	21 Aug 2005 15:35:09 -0000	1.11
+++ bluefish.spec	7 Sep 2005 06:20:53 -0000	1.12
@@ -1,5 +1,5 @@
 Name:           bluefish
-Version:        1.0.3
+Version:        1.0.4
 Release:        1%{?dist}
 Summary:        GTK2 web development application for experienced users
 
@@ -80,6 +80,9 @@
 
 
 %changelog
+* Mon Sep  5 2005 Paul Howarth  - 1.0.4-1
+- update to 1.0.4
+
 * Sun Aug 21 2005 Paul Howarth  - 1.0.3-1
 - update to 1.0.3
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/bluefish/FC-3/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	21 Aug 2005 15:35:09 -0000	1.6
+++ sources	7 Sep 2005 06:20:53 -0000	1.7
@@ -1 +1 @@
-f4cda1e21089155383930616ab673d69  bluefish-1.0.3.tar.bz2
+8d5c1b7315cdc935aa024954093d2b32  bluefish-1.0.4.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/bluefish/FC-3/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	21 Aug 2005 15:35:09 -0000	1.6
+++ .cvsignore	7 Sep 2005 06:20:53 -0000	1.7
@@ -1 +1 @@
-bluefish-1.0.3.tar.bz2
+bluefish-1.0.4.tar.bz2



From fedora-extras-commits at redhat.com  Wed Sep  7 08:25:13 2005
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Wed,  7 Sep 2005 04:25:13 -0400
Subject: rpms/xlockmore/FC-3 .cvsignore, 1.3, 1.4 sources, 1.3,
	1.4 xlockmore.spec, 1.3, 1.4 xlockmore.older-passwd.patch, 1.1, NONE
Message-ID: <200509070825.j878PD1x010066@cvs-int.fedora.redhat.com>

Author: adrian

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

Modified Files:
	.cvsignore sources xlockmore.spec 
Removed Files:
	xlockmore.older-passwd.patch 
Log Message:
* Sun Aug 21 2005 Adrian Reber  - 5.19-1
- updated to 5.19
- upstream included a fix for (BZ #161740), but "GENTOO" needs
  to be defined during compilation



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xlockmore/FC-3/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	18 Jun 2005 20:59:31 -0000	1.3
+++ .cvsignore	7 Sep 2005 08:25:11 -0000	1.4
@@ -1 +1 @@
-xlockmore-5.18.tar.bz2
+xlockmore-5.19.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xlockmore/FC-3/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	18 Jun 2005 20:59:31 -0000	1.3
+++ sources	7 Sep 2005 08:25:11 -0000	1.4
@@ -1 +1 @@
-211673f6be51bdec96718b891bf9ebb9  xlockmore-5.18.tar.bz2
+c80ae7689bf8683033ec08b652e24d83  xlockmore-5.19.tar.bz2


Index: xlockmore.spec
===================================================================
RCS file: /cvs/extras/rpms/xlockmore/FC-3/xlockmore.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xlockmore.spec	28 Jun 2005 11:43:12 -0000	1.3
+++ xlockmore.spec	7 Sep 2005 08:25:11 -0000	1.4
@@ -1,12 +1,11 @@
 Summary: Screen lock and screen saver
 Name: xlockmore
-Version: 5.18
-Release: 3%{?dist}
+Version: 5.19
+Release: 1%{?dist}
 License: BSD
 Group: Amusements/Graphics
 URL: http://www.tux.org/~bagleyd/xlockmore.html
-Source0: http://www.tux.org/~bagleyd/latest/xlockmore-5.18.tar.bz2
-Patch0: xlockmore.older-passwd.patch
+Source0: http://www.tux.org/~bagleyd/latest/xlockmore-5.19.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: pam-devel esound-devel
 BuildRequires: xorg-x11-Mesa-libGL xorg-x11-Mesa-libGLU
@@ -34,14 +33,13 @@
 
 %prep
 %setup -q
-%patch0 -p1
 
 %{__sed} -i -e "s,/lib,/%{_lib},g" configure
 
 %build
 %configure \
 	--with-crypt --enable-pam --enable-syslog --disable-setuid
-%{__make} %{?_smp_mflags}
+%{__make} %{?_smp_mflags} CFLAGS+=" -DGENTOO "
 
 %install
 %{__rm} -rf %{buildroot}
@@ -106,6 +104,11 @@
 %{_bindir}/xglock
 
 %changelog
+* Sun Aug 21 2005 Adrian Reber  - 5.19-1
+- updated to 5.19
+- upstream included a fix for (BZ #161740), but "GENTOO" needs
+  to be defined during compilation
+
 * Mon Jun 27 2005 Adrian Reber  - 5.18-3
 - included patch to make it work again with PAM (BZ #161740)
 


--- xlockmore.older-passwd.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Sep  7 08:25:54 2005
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Wed,  7 Sep 2005 04:25:54 -0400
Subject: rpms/xlockmore/FC-4 .cvsignore, 1.4, 1.5 sources, 1.4,
	1.5 xlockmore.spec, 1.5, 1.6 xlockmore.older-passwd.patch, 1.1, NONE
Message-ID: <200509070825.j878PspV010138@cvs-int.fedora.redhat.com>

Author: adrian

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

Modified Files:
	.cvsignore sources xlockmore.spec 
Removed Files:
	xlockmore.older-passwd.patch 
Log Message:
* Sun Aug 21 2005 Adrian Reber  - 5.19-1
- updated to 5.19
- upstream included a fix for (BZ #161740), but "GENTOO" needs
  to be defined during compilation



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xlockmore/FC-4/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	18 Jun 2005 14:02:33 -0000	1.4
+++ .cvsignore	7 Sep 2005 08:25:51 -0000	1.5
@@ -1 +1 @@
-xlockmore-5.18.tar.bz2
+xlockmore-5.19.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xlockmore/FC-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	18 Jun 2005 14:02:33 -0000	1.4
+++ sources	7 Sep 2005 08:25:51 -0000	1.5
@@ -1 +1 @@
-211673f6be51bdec96718b891bf9ebb9  xlockmore-5.18.tar.bz2
+c80ae7689bf8683033ec08b652e24d83  xlockmore-5.19.tar.bz2


Index: xlockmore.spec
===================================================================
RCS file: /cvs/extras/rpms/xlockmore/FC-4/xlockmore.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- xlockmore.spec	28 Jun 2005 07:25:49 -0000	1.5
+++ xlockmore.spec	7 Sep 2005 08:25:51 -0000	1.6
@@ -1,12 +1,11 @@
 Summary: Screen lock and screen saver
 Name: xlockmore
-Version: 5.18
-Release: 3%{?dist}
+Version: 5.19
+Release: 1%{?dist}
 License: BSD
 Group: Amusements/Graphics
 URL: http://www.tux.org/~bagleyd/xlockmore.html
-Source0: http://www.tux.org/~bagleyd/latest/xlockmore-5.18.tar.bz2
-Patch0: xlockmore.older-passwd.patch
+Source0: http://www.tux.org/~bagleyd/latest/xlockmore-5.19.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: pam-devel esound-devel
 BuildRequires: xorg-x11-Mesa-libGL xorg-x11-Mesa-libGLU
@@ -34,14 +33,13 @@
 
 %prep
 %setup -q
-%patch0 -p1
 
 %{__sed} -i -e "s,/lib,/%{_lib},g" configure
 
 %build
 %configure \
 	--with-crypt --enable-pam --enable-syslog --disable-setuid
-%{__make} %{?_smp_mflags}
+%{__make} %{?_smp_mflags} CFLAGS+=" -DGENTOO "
 
 %install
 %{__rm} -rf %{buildroot}
@@ -106,6 +104,11 @@
 %{_bindir}/xglock
 
 %changelog
+* Sun Aug 21 2005 Adrian Reber  - 5.19-1
+- updated to 5.19
+- upstream included a fix for (BZ #161740), but "GENTOO" needs
+  to be defined during compilation
+
 * Mon Jun 27 2005 Adrian Reber  - 5.18-3
 - included patch to make it work again with PAM (BZ #161740)
 


--- xlockmore.older-passwd.patch DELETED ---



From rc040203 at freenet.de  Wed Sep  7 08:48:25 2005
From: rc040203 at freenet.de (Ralf Corsepius)
Date: Wed, 07 Sep 2005 10:48:25 +0200
Subject: rpms/xlockmore/FC-4 .cvsignore, 1.4, 1.5 sources, 1.4, 1.5
	xlockmore.spec, 1.5, 1.6 xlockmore.older-passwd.patch, 1.1, NONE
In-Reply-To: <200509070825.j878PspV010138@cvs-int.fedora.redhat.com>
References: <200509070825.j878PspV010138@cvs-int.fedora.redhat.com>
Message-ID: <1126082905.22372.161.camel@mccallum.corsepiu.local>

On Wed, 2005-09-07 at 04:25 -0400, Adrian Reber wrote:
> Author: adrian

> Index: xlockmore.spec

> @@ -34,14 +33,13 @@

> +%{__make} %{?_smp_mflags} CFLAGS+=" -DGENTOO "

Can you explain what CFLAGS+=".." is supposed to do?

It seems to be as if you are trying to append "-DGENTOO" to CFLAGS,
but ... that's not what make does with your command above.

Ralf




From fedora-extras-commits at redhat.com  Wed Sep  7 08:51:35 2005
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  7 Sep 2005 04:51:35 -0400
Subject: rpms/crack - New directory
Message-ID: <200509070851.j878pZle010280@cvs-int.fedora.redhat.com>

Author: c4chris

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

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




From fedora-extras-commits at redhat.com  Wed Sep  7 08:51:35 2005
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  7 Sep 2005 04:51:35 -0400
Subject: rpms/crack/devel - New directory
Message-ID: <200509070851.j878pZxW010285@cvs-int.fedora.redhat.com>

Author: c4chris

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

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




From fedora-extras-commits at redhat.com  Wed Sep  7 08:51:56 2005
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  7 Sep 2005 04:51:56 -0400
Subject: rpms/crack Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200509070851.j878puon010330@cvs-int.fedora.redhat.com>

Author: c4chris

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

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


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

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

common : CVS/Root
	@cvs checkout common

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

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


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Wed Sep  7 08:51:56 2005
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  7 Sep 2005 04:51:56 -0400
Subject: rpms/crack/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200509070852.j878puMs010335@cvs-int.fedora.redhat.com>

Author: c4chris

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

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


--- NEW FILE .cvsignore ---


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

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Wed Sep  7 08:52:57 2005
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  7 Sep 2005 04:52:57 -0400
Subject: rpms/crack import.log,1.1,1.2
Message-ID: <200509070853.j878rRRT010416@cvs-int.fedora.redhat.com>

Author: c4chris

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

Modified Files:
	import.log 
Log Message:
auto-import crack-5.0a-1 on branch devel from crack-5.0a-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/crack/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	7 Sep 2005 08:51:54 -0000	1.1
+++ import.log	7 Sep 2005 08:52:55 -0000	1.2
@@ -0,0 +1 @@
+crack-5_0a-1:HEAD:crack-5.0a-1.src.rpm:1126083167



From fedora-extras-commits at redhat.com  Wed Sep  7 08:52:58 2005
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  7 Sep 2005 04:52:58 -0400
Subject: rpms/crack/devel crack-chris.patch, NONE, 1.1 crack.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200509070852.j878qwfk010409@cvs-int.fedora.redhat.com>

Author: c4chris

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

Modified Files:
	.cvsignore sources 
Added Files:
	crack-chris.patch crack.spec 
Log Message:
auto-import crack-5.0a-1 on branch devel from crack-5.0a-1.src.rpm

crack-chris.patch:

--- NEW FILE crack-chris.patch ---
--- c50a/src/util/Makefile.chris	1996-12-16 09:27:35.000000000 +0100
+++ c50a/src/util/Makefile	2005-09-06 17:54:34.000000000 +0200
@@ -17,7 +17,7 @@
 EXE=    $(XDIR)/dawg \
 	$(XDIR)/dictfilt \
 	$(XDIR)/kickdict \
-	$(XDIR)/cracker
+	$(XDIR)/stdlib-cracker
 
 #------------------------------------------------------------------
 
@@ -69,7 +69,7 @@
 #------------------------------------------------------------------
 
 # don't you just love dependency graphs?
-$(XDIR)/dictfilt: dictfilt.c $(XLIB) $(XDIR)/cracker
+$(XDIR)/dictfilt: dictfilt.c $(XLIB) $(XDIR)/stdlib-cracker
 	$(CC) $(CFLAGS) -o $(XDIR)/dictfilt dictfilt.c elcid.o $(XLIB)
 
 #------------------------------------------------------------------
--- c50a/src/util/cracker.c.chris	1996-12-16 16:20:03.000000000 +0100
+++ c50a/src/util/cracker.c	2005-09-06 17:54:34.000000000 +0200
@@ -11,6 +11,7 @@
 
 #include "libcrack.h"
 #include "elcid.h"
+#include 
 
 #define CRACK_MEMSMALL          0x0001
 #define CRACK_DISKSMALL         0x0002
@@ -97,18 +98,23 @@
 
 /* ------------------------------------------------------------------ */
 
+#ifdef __GNUC__
 void
-Logger(key, fmt, a, b, c, d, e, f)
-char key;
-char *fmt;
-char *a, *b, *c, *d, *e, *f;
+Logger(char key, const char *fmt, ...)
+    __attribute__ ((format (printf, 2, 3)));
+#endif
+void
+Logger(char key, const char *fmt, ...)
 {
     long t;
+    va_list ap;
 
     time(&t);
 
     fprintf(stdout, "%c:%ld:", key, t);
-    fprintf(stdout, fmt, a, b, c, d, e, f);
+    va_start(ap, fmt);
+    vprintf(fmt, ap);
+    va_end(ap);
 
     fflush(stdout);
     fflush(stderr);		/* and why not ? */
--- c50a/Crack.chris	1996-12-21 02:09:41.000000000 +0100
+++ c50a/Crack	2005-09-06 18:05:42.000000000 +0200
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 ###
 # This program was written by and is copyright Alec Muffett 1991,
 # 1992, 1993, 1994, 1995, and 1996, and is provided as part of the
@@ -12,85 +12,11 @@
 # User-configurable junk for Crack
 ###
 
-# nice, generic path (RedHat Linux, Solaris1, Solaris2)
-CRACK_PATH=/usr/local/bin:/usr/ccs/bin:/usr/sbin:/sbin:/usr/bin:/bin:/usr/ucb:/usr/etc:$PATH
-
-# compiler options for crack 5.0
-#
-# -DUSE_BZERO        /* add this to C5FLAGS if you don't have memset() */
-# -DUSE_MALLOC_H
-# -DUSE_PWD_H
-# -DUSE_SIGNAL_H
-# -DUSE_STDLIB_H
-# -DUSE_STRINGS_H
-# -DUSE_STRING_H
-# -DUSE_SYS_TYPES_H
-# -DUSE_UNISTD_H
-# -DMAXWORDLEN=      /* ignore if you don't read the code */
-# -DNUMWORDS=        /* ignore if you don't read the code */
-# -DSTRINGSIZE=      /* ignore if you don't read the code */
-
-# this set tested on:
-# - solaris 2.5
-# - redhat linux 4.0
-# - digital unix v4.0
-
-C5FLAGS="-DUSE_STRING_H -DUSE_STDLIB_H -DUSE_SIGNAL_H -DUSE_SYS_TYPES_H -DUSE_UNISTD_H -DUSE_PWD_H"
-
-#
-# now pick your compiler
-#
-
-# vanilla unix cc
-CC=cc
-CFLAGS="-g -O $C5FLAGS"
-#LIBS=-lcrypt # uncomment only if necessary to use stdlib crypt(), eg: NetBSD MD5
-
-# gcc 2.7.2
-#CC=gcc
-#CFLAGS="-g -O2 -Wall $C5FLAGS"
-#LIBS=-lcrypt # uncomment only if necessary to use stdlib crypt(), eg: NetBSD MD5
-
-# digital unix v4.0, CFLAGS for ev4/ev5 chipsets (pick one)
-#CC=cc
-#CFLAGS="-O4 -fast -tune ev4 $C5FLAGS"
-#CFLAGS="-O4 -fast -tune ev5 $C5FLAGS"
-#LIBS=
-
-# Uncomment the next two lines if a) you are running Crack in
-# networking mode, and b) your environment's operating system will not
-# necessarily run binaries compiled on other revs of the same
-# operating system which have the same architecture and the same
-# *MAJOR* revision number.
-#
-# eg: if you have Foonix 2.0 boxes as well as Foonix 2.1 boxes; in
-# this example, the major revision number is "2".  If the Foonix 2.1
-# O/S will not run Foonix 2.0 binaries for some reason, or vice-versa,
-# then uncomment these lines.
-
-#STRICT_OSREV=yes
-#export STRICT_OSREV
-
-# Uncomment and/or modify on HP/UX or similar where the UCB "rsh"
-# command has been renamed.  See scripts/crack-rsh also
-#CRACK_RSH=remsh
-#CRACK_RCP=rcp
-
-###########################################################
-###########################################################
-#################### THAT'S ALL, FOLKS ####################
-#### NOW GO CONFIGURE YOUR CRYPT ALGORITHM, EG: LIBDES ####
-###########################################################
-###########################################################
-
 ###
 # security
 ###
 
 umask 077
-export CRACK_PATH                       # So it can be picked up later
-PATH=$CRACK_PATH                        # For temporary use...
-export PATH
 
 ###
 # Defaults
@@ -108,12 +34,9 @@
 # home base
 ###
 
-CRACK_HOME=`echo $0 | sed -e 's/Crack$//'`
+old_wd=`pwd`
 
-if [ "$CRACK_HOME" = "" ]
-then
-	CRACK_HOME=.
-fi
+CRACK_HOME=${CRACK_HOME:-"/var/lib/crack"}
 
 if cd $CRACK_HOME
 then
@@ -126,25 +49,6 @@
 export CRACK_HOME
 
 ###
-# sanity check
-###
-
-if [ ! -f "$CRACK_HOME/Crack" ]
-then
-	echo "Fatal Error: $CRACK_HOME: something weird going down" 1>&2
-	exit 1
-fi
-
-###
-# Hierarchy
-###
-
-for dir in run run/bin
-do
-	test -d $dir || mkdir $dir || exit 1
-done
-
-###
 # Flagwaving
 ###
 
@@ -158,8 +62,6 @@
 # Parse Arguments
 ###
 
-argbackup1="$*"
-
 while [ "x$1" != "x" ]
 do
 	case $1 in
@@ -275,50 +177,24 @@
 	exit 1
 fi
 
-###
-# Sanity test bindir - written in gruntscript for clarity.
-###
-
-bdname=`scripts/binstamp 2>/dev/null`
-
-if [ "x$bdname" = "x" ]
-then
-	echo "Crack: error: cannot continue as binstamp returned empty string" 1>&2
-	exit 0
-fi
-
-echo "Stamp: $bdname"
 echo ""
 
 
 if [ "x$1" != "x" ]
 then
-	if [ "$1" = "-fmt" ]            # use generic name
-	then
-		bindir=run/bin/$bdname
-	elif [ -d run/bin/$1 ]          # have been here before
-	then
-		bindir=run/bin/$1
-		shift
-	elif [ ! -f $1 ]                # use specified name
-	then
-		bindir=run/bin/$1
-		shift
-	else                            # use generic name
-		bindir=run/bin/$bdname
-	fi
+	bindir=bin
 else                                    # supporting "-makeonly"
 	if [ "$makeonlyflag" != "" ]
 	then
-		bindir=run/bin/$bdname
+		bindir=bin
 
 	elif [ "$makedictflag" != "" ]
 	then
-		bindir=run/bin/$bdname
+		bindir=bin
 
 	elif [ "$remoteflag" != "" ]
 	then
-		bindir=run/bin/$bdname
+		bindir=bin
 	else
 		echo $usage 1>&2
 		exit 1
@@ -333,21 +209,6 @@
 export PATH
 
 ###
-# Make the binaries
-###
-
-echo "Crack: making utilities in $bindir"
-
-if [ ! -d $bindir ] # small redundancy, big benefit
-then
-	mkdir $bindir || exit 1
-fi
-
-make clean || exit 1
-
-make ARGS="\"XDIR=../../$bindir\" \"XCFLAGS=$CFLAGS\" \"XCC=$CC\" \"XLIBS=$LIBS\"" utils || exit 1
-
-###
 # Make Only ?
 ###
 
@@ -439,7 +300,6 @@
 	fbmerge
 
 	echo "Crack: Merging password files..."
-	argbackup2="$*"
 
 	(
 		cat run/F-merged        # first the feedback
@@ -451,11 +311,17 @@
 				shift || exit 1
 				deffmt=$1
 
-			elif [ "$deffmt" = "spf" ]
-			then
-				cat $1 1>&3 # skip the sort
 			else
-				${deffmt}2spf $1
+			  theFile=$1
+			  if [ ! -r $theFile ]; then
+			    theFile="$old_wd/$theFile"
+			  fi
+			  if [ "$deffmt" = "spf" ]
+			  then
+			  	  cat $theFile 1>&3 # skip the sort
+			  else
+			  	  ${deffmt}2spf $theFile
+			  fi
 			fi
 
 			shift
--- c50a/Reporter.chris	1996-12-13 20:13:55.000000000 +0100
+++ c50a/Reporter	2005-09-06 17:54:34.000000000 +0200
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 ###
 # This program was written by and is copyright Alec Muffett 1991,
 # 1992, 1993, 1994, 1995, and 1996, and is provided as part of the
@@ -10,6 +10,9 @@
 # document which accompanies distributions of Crack v5.0 and upwards.
 ###
 
+CRACK_HOME=${CRACK_HOME:-"/var/lib/crack"}
+cd $CRACK_HOME
+
 tfile=run/T$$
 date=`date`
 


--- NEW FILE crack.spec ---
Summary:   Password cracker
Name:      crack
Version:   5.0a
Release:   1%{?dist}
License:   Artistic
Group:     Applications/System
Source:    ftp://ftp.cerias.purdue.edu/pub/tools/unix/pwdutils/crack/%{name}5.0.tar.gz
Patch:     %{name}-chris.patch
URL:       http://www.crypticide.com/users/alecm/security/c50-faq.html
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: words

%description
Crack is a password guessing program that is designed to quickly locate
insecurities in Unix (or other) password files by scanning the contents of a
password file, looking for users who have misguidedly chosen a weak login
password.

This package creates a group named "crack" and the Crack program puts all
its results in the /var/lib/crack/run directory, which belongs to that group.
Only users in the crack group can use this package.


%prep
%setup -q -n c50a
# Make sure we do not use libdes
rm -rf src/libdes
# select proper crypt routine and related checks
rm -f src/util/elcid.c
ln src/util/elcid.c,bsd src/util/elcid.c
mkdir run bin
# Try not to pollute bin namespace
sed -i -e 's/Reporter/CrackReporter/g' doc/gui.txt manual.html manual.txt
%patch -p1 -b .chris
sed -i 's|/usr/dict/|/usr/share/dict/|g' conf/dictgrps.conf


%build
C5FLAGS="-D_XOPEN_SOURCE -DUSE_STRING_H -DUSE_STDLIB_H -DUSE_SIGNAL_H -DUSE_SYS_TYPES_H -DUSE_UNISTD_H -DUSE_PWD_H"
make XDIR=../../bin XCC=gcc XCFLAGS="$RPM_OPT_FLAGS $C5FLAGS" XLIBS=-lcrypt utils
CRACK_HOME=. ./Crack -makedict


%install
rm -rf $RPM_BUILD_ROOT
rm -f bin/libc5.a bin/stdlib-cracker
mkdir -p $RPM_BUILD_ROOT/var/lib/crack
cp -a bin conf dict run scripts $RPM_BUILD_ROOT/var/lib/crack
install -D Crack $RPM_BUILD_ROOT%{_bindir}/Crack
install Reporter $RPM_BUILD_ROOT%{_bindir}/CrackReporter


%clean
rm -rf $RPM_BUILD_ROOT


%pre
if [ $1 -eq 1 ]; then
    groupadd -r crack >/dev/null 2>&1 || :
fi


%files
%defattr(-, root, root)
%doc LICENCE manual.* doc
%attr(00750, root, crack) %{_bindir}/*
%dir /var/lib/crack/
/var/lib/crack/bin/
/var/lib/crack/conf/
/var/lib/crack/dict/
/var/lib/crack/scripts/
%attr(02770, root, crack) %dir /var/lib/crack/run/
%attr(02770, root, crack) %dir /var/lib/crack/run/dict/
%attr(00640, root, crack) /var/lib/crack/run/dict/*
%attr(00640, root, crack) /var/lib/crack/run/dict/.dictmade


%changelog
* Tue Sep 06 2005 Tom "spot" Callaway  5.0a-1
- use words to make a richer dict 1

* Tue Sep 06 2005 Christian Iseli  5.0a-0
- Created spec file.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/crack/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	7 Sep 2005 08:51:54 -0000	1.1
+++ .cvsignore	7 Sep 2005 08:52:56 -0000	1.2
@@ -0,0 +1 @@
+crack5.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/crack/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	7 Sep 2005 08:51:54 -0000	1.1
+++ sources	7 Sep 2005 08:52:56 -0000	1.2
@@ -0,0 +1 @@
+6511dca525b7b921ea09eca855cc58f2  crack5.0.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep  7 08:58:41 2005
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  7 Sep 2005 04:58:41 -0400
Subject: owners owners.list,1.171,1.172
Message-ID: <200509070858.j878wfZW010528@cvs-int.fedora.redhat.com>

Author: c4chris

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

Modified Files:
	owners.list 
Log Message:
Add crack package


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.171
retrieving revision 1.172
diff -u -r1.171 -r1.172
--- owners.list	7 Sep 2005 02:42:08 -0000	1.171
+++ owners.list	7 Sep 2005 08:58:39 -0000	1.172
@@ -98,6 +98,7 @@
 Fedora Extras|cook|A file construction tool|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|cpan2rpm|Perl module packager|ghenry at suretecsystems.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|cproto|Generates function prototypes and variable declarations from C code|jnovy at redhat.com|extras-qa at fedoraproject.org|
+Fedora Extras|crack|Password cracker|Christian.Iseli at licr.org|extras-qa at fedoraproject.org|
 Fedora Extras|cryptplug|Cryptography plugin for mutt & kmail|dennis at dgilmore.net|extras-qa at fedoraproject.org|
 Fedora Extras|csmash|3D tabletennis game|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|ctrlproxy|IRC server with multiserver support|dwmw2 at infradead.org|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Wed Sep  7 09:18:17 2005
From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo))
Date: Wed,  7 Sep 2005 05:18:17 -0400
Subject: rpms/scim-tomoe - New directory
Message-ID: <200509070918.j879IHwU011928@cvs-int.fedora.redhat.com>

Author: ryo

Update of /cvs/extras/rpms/scim-tomoe
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11908/scim-tomoe

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




From fedora-extras-commits at redhat.com  Wed Sep  7 09:18:17 2005
From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo))
Date: Wed,  7 Sep 2005 05:18:17 -0400
Subject: rpms/scim-tomoe/devel - New directory
Message-ID: <200509070918.j879IH3t011933@cvs-int.fedora.redhat.com>

Author: ryo

Update of /cvs/extras/rpms/scim-tomoe/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11908/scim-tomoe/devel

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




From fedora-extras-commits at redhat.com  Wed Sep  7 09:20:16 2005
From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo))
Date: Wed,  7 Sep 2005 05:20:16 -0400
Subject: rpms/scim-tomoe Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200509070920.j879KGB9011989@cvs-int.fedora.redhat.com>

Author: ryo

Update of /cvs/extras/rpms/scim-tomoe
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11954

Added Files:
	Makefile import.log 
Log Message:
Setup of module scim-tomoe


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

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

common : CVS/Root
	@cvs checkout common

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

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


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Wed Sep  7 09:20:17 2005
From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo))
Date: Wed,  7 Sep 2005 05:20:17 -0400
Subject: rpms/scim-tomoe/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200509070920.j879KHWP011994@cvs-int.fedora.redhat.com>

Author: ryo

Update of /cvs/extras/rpms/scim-tomoe/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11954/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module scim-tomoe


--- NEW FILE .cvsignore ---


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

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Wed Sep  7 09:21:40 2005
From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo))
Date: Wed,  7 Sep 2005 05:21:40 -0400
Subject: rpms/scim-tomoe import.log,1.1,1.2
Message-ID: <200509070921.j879LeTM012057@cvs-int.fedora.redhat.com>

Author: ryo

Update of /cvs/extras/rpms/scim-tomoe
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12022

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


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/scim-tomoe/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	7 Sep 2005 09:20:14 -0000	1.1
+++ import.log	7 Sep 2005 09:21:37 -0000	1.2
@@ -0,0 +1 @@
+scim-tomoe-0_1_0-1:HEAD:scim-tomoe-0.1.0-1.src.rpm:1126084873



From fedora-extras-commits at redhat.com  Wed Sep  7 09:21:40 2005
From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo))
Date: Wed,  7 Sep 2005 05:21:40 -0400
Subject: rpms/scim-tomoe/devel scim-tomoe.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200509070921.j879LewV012064@cvs-int.fedora.redhat.com>

Author: ryo

Update of /cvs/extras/rpms/scim-tomoe/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12022/devel

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


--- NEW FILE scim-tomoe.spec ---
Name:           scim-tomoe
Version:        0.1.0
Release:        1%{?dist}
Summary:        Tomoe module for SCIM for Japanese handwritten input

Group:          System Environment/Libraries
License:        GPL
URL:            http://scim-imengine.sourceforge.jp/
Source0:        %{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  scim-devel, tomoe-devel

%description
Scim-tomoe allows Japanese handwritten input of characters using SCIM.


%prep
%setup -q


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


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

rm $RPM_BUILD_ROOT%{_libdir}/scim-1.0/*/*.la

%find_lang %{name}


%clean
rm -rf $RPM_BUILD_ROOT


%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog
%{_libdir}/scim-1.0
%{_datadir}/scim/icons/scim-tomoe.png


%changelog
* Wed Aug 31 2005 Ryo Dairiki  - 0.1-1
- update to 0.1

* Wed Aug 17 2005 Jens Petersen  - 0.0.0-0.20050817
- initial packaging of cvs snapshot


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/scim-tomoe/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	7 Sep 2005 09:20:14 -0000	1.1
+++ .cvsignore	7 Sep 2005 09:21:38 -0000	1.2
@@ -0,0 +1 @@
+scim-tomoe-0.1.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/scim-tomoe/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	7 Sep 2005 09:20:14 -0000	1.1
+++ sources	7 Sep 2005 09:21:38 -0000	1.2
@@ -0,0 +1 @@
+1c39c1e03069a4a6e15fcf5501cb981f  scim-tomoe-0.1.0.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep  7 09:26:38 2005
From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo))
Date: Wed,  7 Sep 2005 05:26:38 -0400
Subject: rpms/tomoe - New directory
Message-ID: <200509070926.j879QcMG012169@cvs-int.fedora.redhat.com>

Author: ryo

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

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




From fedora-extras-commits at redhat.com  Wed Sep  7 09:26:38 2005
From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo))
Date: Wed,  7 Sep 2005 05:26:38 -0400
Subject: rpms/tomoe/devel - New directory
Message-ID: <200509070926.j879Qcaf012174@cvs-int.fedora.redhat.com>

Author: ryo

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

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




From fedora-extras-commits at redhat.com  Wed Sep  7 09:27:43 2005
From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo))
Date: Wed,  7 Sep 2005 05:27:43 -0400
Subject: rpms/tomoe Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200509070927.j879Rha9012231@cvs-int.fedora.redhat.com>

Author: ryo

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

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


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

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

common : CVS/Root
	@cvs checkout common

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

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


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Wed Sep  7 09:27:43 2005
From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo))
Date: Wed,  7 Sep 2005 05:27:43 -0400
Subject: rpms/tomoe/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200509070927.j879RhfG012236@cvs-int.fedora.redhat.com>

Author: ryo

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

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


--- NEW FILE .cvsignore ---


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

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Wed Sep  7 09:28:48 2005
From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo))
Date: Wed,  7 Sep 2005 05:28:48 -0400
Subject: rpms/tomoe import.log,1.1,1.2
Message-ID: <200509070929.j879TIMZ012302@cvs-int.fedora.redhat.com>

Author: ryo

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

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


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/tomoe/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	7 Sep 2005 09:27:41 -0000	1.1
+++ import.log	7 Sep 2005 09:28:46 -0000	1.2
@@ -0,0 +1 @@
+tomoe-0_2_1-3:HEAD:tomoe-0.2.1-3.src.rpm:1126085306



From fedora-extras-commits at redhat.com  Wed Sep  7 09:28:49 2005
From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo))
Date: Wed,  7 Sep 2005 05:28:49 -0400
Subject: rpms/tomoe/devel tomoe.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <200509070929.j879TJBJ012306@cvs-int.fedora.redhat.com>

Author: ryo

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

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


--- NEW FILE tomoe.spec ---
Name:           tomoe
Version:        0.2.1
Release:        3%{?dist}
Summary:        Japanese handwritten input system

Group:          System Environment/Libraries
License:        LGPL
URL:            http://scim-imengine.sourceforge.jp/
Source0:        %{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description
A program which does Japanese handwriting recognition.


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

%description devel
The tomoe-devel package includes the header files for the tomoe package.
Install this package if you want to develop programs which use tomoe.


%prep
%setup -q


%build
%configure
make %{?_smp_mflags}


%install
%makeinstall

rm $RPM_BUILD_ROOT%{_libdir}/libtomoe.la

%clean
rm -rf $RPM_BUILD_ROOT


%post -p/sbin/ldconfig

%postun -p /sbin/ldconfig


%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog
%{_bindir}/tomoe*
%{_libdir}/libtomoe.so*
%dir %{_datadir}/tomoe
%{_datadir}/tomoe/*


%files devel
%defattr(-,root,root,-)
%dir %{_includedir}/tomoe
%{_includedir}/tomoe/*
%{_libdir}/pkgconfig/tomoe.pc


%changelog
* Sat Sep 3 2005 Warren Togami  - 0.2.1-3
- some spec cleanup

* Sat Sep 2 2005 Ryo Dairiki  - 0.2.1-2
- Sync with Jens's spec file

* Wed Aug 31 2005 Ryo Dairiki  - 0.2.1-1
- Initial packaging for Extras

* Fri Jul  1 2005 Ichiro Nakai 
- (0.2.0-1m)
- version 0.2.0
- add a package tomoe-devel
- add %%post and %%postun sections

* Wed Mar  2 2005 Ichiro Nakai 
- (0.1.1-1m)
- initial package for Momonga Linux
- import %%description from cooker


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tomoe/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	7 Sep 2005 09:27:41 -0000	1.1
+++ .cvsignore	7 Sep 2005 09:28:46 -0000	1.2
@@ -0,0 +1 @@
+tomoe-0.2.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tomoe/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	7 Sep 2005 09:27:41 -0000	1.1
+++ sources	7 Sep 2005 09:28:46 -0000	1.2
@@ -0,0 +1 @@
+95eca127a1d519ff4e836b3d00d7fa84  tomoe-0.2.1.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep  7 10:09:20 2005
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Wed,  7 Sep 2005 06:09:20 -0400
Subject: owners owners.list,1.172,1.173
Message-ID: <200509071009.j87A9oAF014474@cvs-int.fedora.redhat.com>

Author: gemi

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

Modified Files:
	owners.list 
Log Message:



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -r1.172 -r1.173
--- owners.list	7 Sep 2005 08:58:39 -0000	1.172
+++ owners.list	7 Sep 2005 10:09:17 -0000	1.173
@@ -149,6 +149,7 @@
 Fedora Extras|epiphany-extensions|Extensions for Epiphany, the GNOME web browser|caillon at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|epydoc|Edward Loper's Python API documentation generation tool|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|epylog|New logs analyzer and parser|icon at linux.duke.edu|extras-qa at fedoraproject.org|
+Fedora Extras|erlang|General-purpose programming language and runtime environment|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|esmtp|User configurable relay-only Mail Transfer Agent (MTA)|pertusus at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|exim-doc|Documentation for the exim mail transfer agent|dwmw2 at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|exim|The exim mail transfer agent|dwmw2 at redhat.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Wed Sep  7 10:15:40 2005
From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc))
Date: Wed,  7 Sep 2005 06:15:40 -0400
Subject: rpms/libtranslate - New directory
Message-ID: <200509071015.j87AFe2x014598@cvs-int.fedora.redhat.com>

Author: buc

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

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




From fedora-extras-commits at redhat.com  Wed Sep  7 10:15:41 2005
From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc))
Date: Wed,  7 Sep 2005 06:15:41 -0400
Subject: rpms/libtranslate/devel - New directory
Message-ID: <200509071015.j87AFfwH014603@cvs-int.fedora.redhat.com>

Author: buc

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

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




From fedora-extras-commits at redhat.com  Wed Sep  7 10:16:04 2005
From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc))
Date: Wed,  7 Sep 2005 06:16:04 -0400
Subject: rpms/libtranslate Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200509071016.j87AG4HR014658@cvs-int.fedora.redhat.com>

Author: buc

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

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


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

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

common : CVS/Root
	@cvs checkout common

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

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


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Wed Sep  7 10:16:05 2005
From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc))
Date: Wed,  7 Sep 2005 06:16:05 -0400
Subject: rpms/libtranslate/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200509071016.j87AG5Hu014663@cvs-int.fedora.redhat.com>

Author: buc

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

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


--- NEW FILE .cvsignore ---


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

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Wed Sep  7 10:16:59 2005
From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc))
Date: Wed,  7 Sep 2005 06:16:59 -0400
Subject: rpms/libtranslate import.log,1.1,1.2
Message-ID: <200509071016.j87AGx2o014748@cvs-int.fedora.redhat.com>

Author: buc

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

Modified Files:
	import.log 
Log Message:
auto-import libtranslate-0.99-4 on branch devel from libtranslate-0.99-4.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/libtranslate/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	7 Sep 2005 10:16:02 -0000	1.1
+++ import.log	7 Sep 2005 10:16:57 -0000	1.2
@@ -0,0 +1 @@
+libtranslate-0_99-4:HEAD:libtranslate-0.99-4.src.rpm:1126088208



From fedora-extras-commits at redhat.com  Wed Sep  7 10:16:59 2005
From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc))
Date: Wed,  7 Sep 2005 06:16:59 -0400
Subject: rpms/libtranslate/devel libtranslate-0.99-charsetparse.diff, NONE,
	1.1 libtranslate-0.99-condfix.diff, NONE,
	1.1 libtranslate-add_Promt_service.patch, NONE,
	1.1 libtranslate.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <200509071017.j87AGxjG014763@cvs-int.fedora.redhat.com>

Author: buc

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

Modified Files:
	.cvsignore sources 
Added Files:
	libtranslate-0.99-charsetparse.diff 
	libtranslate-0.99-condfix.diff 
	libtranslate-add_Promt_service.patch libtranslate.spec 
Log Message:
auto-import libtranslate-0.99-4 on branch devel from libtranslate-0.99-4.src.rpm

libtranslate-0.99-charsetparse.diff:

--- NEW FILE libtranslate-0.99-charsetparse.diff ---
--- src/modules/translate-generic-service.c.orig	Mon Apr 11 23:08:47 2005
+++ src/modules/translate-generic-service.c	Mon Apr 11 23:15:54 2005
@@ -484,7 +484,7 @@
 
   if (SOUP_STATUS_IS_SUCCESSFUL(message->status_code))
     {
-      const char *charset = NULL;
+      char *charset = NULL;
       
       if (flags & TRANSFER_CONVERT)
 	{
@@ -493,14 +493,31 @@
 	  content_type = translate_generic_service_get_header(message, &info, "Content-Type");
 	  if (content_type)
 	    {
-	      charset = translate_ascii_strcasestr(content_type, "charset=");
-	      if (charset)
-		charset += 8;
+	      const char *tmp;
+	      
+	      tmp = translate_ascii_strcasestr(content_type, "charset=");
+	      if (tmp)
+		{
+		  int len;
+
+		  tmp += 8;
+		  if (*tmp == '\'' || *tmp == '"')
+		    tmp++;
+
+		  len = strlen(tmp);
+		  if (len > 0 && (tmp[len - 1] == '\'' || tmp[len - 1] == '"'))
+		    len--;
+
+		  charset = g_strndup(tmp, len);
+		}
 	    }
 	}
 
       if (charset)
-	response = g_convert(message->response.body, message->response.length, "UTF-8", charset, NULL, NULL, err);
+	{
+	  response = g_convert(message->response.body, message->response.length, "UTF-8", charset, NULL, NULL, err);
+	  g_free(charset);
+	}
       else
 	{
 	  if ((flags & TRANSFER_CONVERT) && ! g_utf8_validate(message->response.body, message->response.length, NULL))

libtranslate-0.99-condfix.diff:

--- NEW FILE libtranslate-0.99-condfix.diff ---
--- src/translate-session.c.orig	Mon Apr 11 22:44:53 2005
+++ src/translate-session.c	Mon Apr 11 22:51:48 2005
@@ -703,7 +703,14 @@
 	  GError *tmp_err = NULL;
 
 	  g_mutex_lock(info->mutex);
-	  ret = info->err != NULL;
+	  if (info->err)
+	    {
+	      ret = TRUE;
+	      if (info->progress_cond)
+		g_cond_signal(info->progress_cond);
+	    }
+	  else
+	    ret = FALSE;
 	  g_mutex_unlock(info->mutex);
 
 	  if (ret)
@@ -728,6 +735,9 @@
 		  else
 		    g_propagate_error(&info->err, tmp_err);
 
+		  if (info->progress_cond)
+		    g_cond_signal(info->progress_cond);
+
 		  g_mutex_unlock(info->mutex);
 
 		  return;
@@ -759,6 +769,9 @@
 	info->err = g_error_new(TRANSLATE_SESSION_ERROR,
 				TRANSLATE_SESSION_ERROR_NO_SERVICE,
 				_("no service could translate chunk"));
+
+      if (info->progress_cond)
+	g_cond_signal(info->progress_cond);
     }
   
   g_mutex_unlock(info->mutex);

libtranslate-add_Promt_service.patch:

--- NEW FILE libtranslate-add_Promt_service.patch ---
--- data/services.xml.in.orig	2005-01-17 19:54:27.000000000 +0300
+++ data/services.xml.in	2005-07-29 18:39:09.000000000 +0400
@@ -244,4 +244,21 @@
       
     
   
+
+  
+    
+      
+      
+      
+      
+      
+      
+      
+      
+	
+	
+	
+      
+    
+  
 


--- NEW FILE libtranslate.spec ---
Name: libtranslate
Summary: Natural language translation library
Version: 0.99
Release: 4%{?dist}
License: BSD
Group: System Environment/Libraries
%define url	http://savannah.nongnu.org/download/libtranslate
Source: %{url}/libtranslate-%{version}.tar.gz
Patch1: %{url}/libtranslate-0.99-charsetparse.diff
Patch2: %{url}/libtranslate-0.99-condfix.diff
Patch10: libtranslate-add_Promt_service.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: pkgconfig >= 1:0.8, gettext
BuildRequires: glib2-devel, libsoup-devel >= 2.2, libxml2-devel
BuildRequires: gnutls-devel, libgcrypt-devel
Requires: libsoup >= 2.2
URL: http://www.nongnu.org/libtranslate

%description 
Libtranslate is a library for translating text and web pages
between natural languages. Its modular infrastructure allows
to implement new translation services separately from the core library.

Libtranslate is shipped with a generic module supporting
web-based translation services such as Babel Fish, Google Language Tools
and SYSTRAN. Moreover, the generic module allows to add new services
simply by adding a few lines to a XML file (see libtranslate(5)).

The libtranslate distribution includes a powerful command line interface
(see translate(1)). GNOME GUI can be found as separate "gnome-translate"
package at the same web source.

%package devel
Summary: Natural language translation library, static libs and headers
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
Requires: pkgconfig >= 1:0.8

%description devel
The static libraries and header files for %{name} library.

%prep
%setup -q -n %{name}-%{version}
%patch1 -p0
%patch2 -p0
%patch10 -p0

%build
%configure
make

pushd docs/man
iconv -f ISO8859-1 -t UTF8  translate.1.new && \
					mv -f translate.1.new translate.1
popd

%install
rm -rf $RPM_BUILD_ROOT

%makeinstall

pushd $RPM_BUILD_ROOT%{_mandir}/man5
mv -f services.xml.5 libtranslate.5
popd

rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
rm -f $RPM_BUILD_ROOT%{_libdir}/libtranslate/modules/*.{la,a}

%find_lang %{name}

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files -f %{name}.lang
%defattr(-, root, root)

%doc AUTHORS COPYING README
%{_libdir}/libtranslate.so.*
%{_libdir}/libtranslate/
%{_datadir}/libtranslate/
%{_bindir}/*
%{_mandir}/*/*

%files devel
%defattr(-, root, root)

%{_libdir}/libtranslate.so
%{_libdir}/*.a
%{_includedir}/libtranslate/
%{_datadir}/gtk-doc/html/*
%{_libdir}/pkgconfig/*

%changelog
* Wed Sep  7 2005 Dmitry Butskoy  - 0.99-4
- even more cleanups

* Fri Aug 19 2005 Dmitry Butskoy  - 0.99-3
- more cleanups

* Thu Aug 18 2005 Tom "spot" Callaway  - 0.99-2
- cleanups

* Mon Aug  8 2005 Dmitry Butskoy  - 0.99-1
- convert translate(1) manual to unicode (it contains non-ascii in examples)
- rename service.xml(5) manual to libtranslate(5)

* Fri Jul 29 2005 Dmitry Butskoy 
- Add Promt (www.online-translator.com) service.

* Fri Jul 22 2005 Dmitry Butskoy  
- Initial release.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libtranslate/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	7 Sep 2005 10:16:03 -0000	1.1
+++ .cvsignore	7 Sep 2005 10:16:57 -0000	1.2
@@ -0,0 +1 @@
+libtranslate-0.99.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libtranslate/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	7 Sep 2005 10:16:03 -0000	1.1
+++ sources	7 Sep 2005 10:16:57 -0000	1.2
@@ -0,0 +1 @@
+1fe75a6a6e8a0c6518890b5fa6984d42  libtranslate-0.99.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep  7 10:24:00 2005
From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc))
Date: Wed,  7 Sep 2005 06:24:00 -0400
Subject: owners owners.list,1.173,1.174
Message-ID: <200509071024.j87AO0b1014843@cvs-int.fedora.redhat.com>

Author: buc

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

Modified Files:
	owners.list 
Log Message:



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -r1.173 -r1.174
--- owners.list	7 Sep 2005 10:09:17 -0000	1.173
+++ owners.list	7 Sep 2005 10:23:58 -0000	1.174
@@ -433,6 +433,7 @@
 Fedora Extras|libtabe|Chinese lexicons library for xcin-2.5.3|llch at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|libtar|Tar file manipulation API|anvil at livna.org|extras-qa at fedoraproject.org|
 Fedora Extras|libtasn1|This is the ASN.1 library used in GNUTLS.|enrico.scholz at informatik.tu-chemnitz.de|extras-qa at fedoraproject.org|
+Fedora Extras|libtranslate|Natural language translation library|dmitry at butskoy.name|extras-qa at fedoraproject.org|
 Fedora Extras|libuninameslist|Library that provides Unicode names and annotations|otaylor at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|libvisual|An abstraction library for audio visualisation plugins|gauret at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|libvisual-plugins|Plugins for use with libvisual|mpeters at mac.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Wed Sep  7 11:35:42 2005
From: fedora-extras-commits at redhat.com (Linus Walleij (snirkel))
Date: Wed,  7 Sep 2005 07:35:42 -0400
Subject: rpms/gnomad2/FC-3 .cvsignore, 1.2, 1.3 gnomad2.spec, 1.2,
	1.3 sources, 1.2, 1.3
Message-ID: <200509071135.j87BZg61016367@cvs-int.fedora.redhat.com>

Author: snirkel

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

Modified Files:
	.cvsignore gnomad2.spec sources 
Log Message:
New upstream release.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnomad2/FC-3/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	25 Aug 2005 07:21:35 -0000	1.2
+++ .cvsignore	7 Sep 2005 11:35:39 -0000	1.3
@@ -1 +1 @@
-gnomad2-2.8.0.tar.gz
+gnomad2-2.8.1.tar.gz


Index: gnomad2.spec
===================================================================
RCS file: /cvs/extras/rpms/gnomad2/FC-3/gnomad2.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gnomad2.spec	25 Aug 2005 09:41:53 -0000	1.2
+++ gnomad2.spec	7 Sep 2005 11:35:39 -0000	1.3
@@ -9,8 +9,8 @@
 #
 
 Name:		gnomad2
-Version:    	2.8.0
-Release:	5%{?dist}
+Version:    	2.8.1
+Release:	1%{?dist}
 
 Summary:	A GNOME 2.0 client for the Creative Jukeboxes and Dell DJs
 License:	GPL
@@ -77,6 +77,8 @@
 %doc AUTHORS NEWS README COPYING ChangeLog
 
 %changelog
+* Wed Sep 7 2005 Linus Walleij  2.8.1-1
+- New upstream realease.
 * Wed Aug 17 2005 Linus Walleij  2.8.0-5
 - Fixes following remarks from matthias at rpmforge.net
 * Wed Aug 17 2005 Linus Walleij  2.8.0-4


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnomad2/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	25 Aug 2005 07:21:35 -0000	1.2
+++ sources	7 Sep 2005 11:35:39 -0000	1.3
@@ -1 +1 @@
-23872b7d3b9fc434b8152620e309de3a  gnomad2-2.8.0.tar.gz
+6bae2df9f094b06cd5d606a693eb3241  gnomad2-2.8.1.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep  7 11:36:41 2005
From: fedora-extras-commits at redhat.com (Linus Walleij (snirkel))
Date: Wed,  7 Sep 2005 07:36:41 -0400
Subject: rpms/gnomad2/FC-4 .cvsignore, 1.2, 1.3 gnomad2.spec, 1.2,
	1.3 sources, 1.2, 1.3
Message-ID: <200509071136.j87BafvH016435@cvs-int.fedora.redhat.com>

Author: snirkel

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

Modified Files:
	.cvsignore gnomad2.spec sources 
Log Message:
New upstream release.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnomad2/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	25 Aug 2005 07:21:35 -0000	1.2
+++ .cvsignore	7 Sep 2005 11:36:39 -0000	1.3
@@ -1 +1 @@
-gnomad2-2.8.0.tar.gz
+gnomad2-2.8.1.tar.gz


Index: gnomad2.spec
===================================================================
RCS file: /cvs/extras/rpms/gnomad2/FC-4/gnomad2.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gnomad2.spec	25 Aug 2005 09:41:53 -0000	1.2
+++ gnomad2.spec	7 Sep 2005 11:36:39 -0000	1.3
@@ -9,8 +9,8 @@
 #
 
 Name:		gnomad2
-Version:    	2.8.0
-Release:	5%{?dist}
+Version:    	2.8.1
+Release:	1%{?dist}
 
 Summary:	A GNOME 2.0 client for the Creative Jukeboxes and Dell DJs
 License:	GPL
@@ -77,6 +77,8 @@
 %doc AUTHORS NEWS README COPYING ChangeLog
 
 %changelog
+* Wed Sep 7 2005 Linus Walleij  2.8.1-1
+- New upstream realease.
 * Wed Aug 17 2005 Linus Walleij  2.8.0-5
 - Fixes following remarks from matthias at rpmforge.net
 * Wed Aug 17 2005 Linus Walleij  2.8.0-4


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnomad2/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	25 Aug 2005 07:21:35 -0000	1.2
+++ sources	7 Sep 2005 11:36:39 -0000	1.3
@@ -1 +1 @@
-23872b7d3b9fc434b8152620e309de3a  gnomad2-2.8.0.tar.gz
+6bae2df9f094b06cd5d606a693eb3241  gnomad2-2.8.1.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep  7 11:37:23 2005
From: fedora-extras-commits at redhat.com (Linus Walleij (snirkel))
Date: Wed,  7 Sep 2005 07:37:23 -0400
Subject: rpms/gnomad2/devel .cvsignore, 1.2, 1.3 gnomad2.spec, 1.2,
	1.3 sources, 1.2, 1.3
Message-ID: <200509071137.j87BbNdg016507@cvs-int.fedora.redhat.com>

Author: snirkel

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

Modified Files:
	.cvsignore gnomad2.spec sources 
Log Message:
New upstream release.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnomad2/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	25 Aug 2005 07:21:35 -0000	1.2
+++ .cvsignore	7 Sep 2005 11:37:21 -0000	1.3
@@ -1 +1 @@
-gnomad2-2.8.0.tar.gz
+gnomad2-2.8.1.tar.gz


Index: gnomad2.spec
===================================================================
RCS file: /cvs/extras/rpms/gnomad2/devel/gnomad2.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gnomad2.spec	25 Aug 2005 09:41:53 -0000	1.2
+++ gnomad2.spec	7 Sep 2005 11:37:21 -0000	1.3
@@ -9,8 +9,8 @@
 #
 
 Name:		gnomad2
-Version:    	2.8.0
-Release:	5%{?dist}
+Version:    	2.8.1
+Release:	1%{?dist}
 
 Summary:	A GNOME 2.0 client for the Creative Jukeboxes and Dell DJs
 License:	GPL
@@ -77,6 +77,8 @@
 %doc AUTHORS NEWS README COPYING ChangeLog
 
 %changelog
+* Wed Sep 7 2005 Linus Walleij  2.8.1-1
+- New upstream realease.
 * Wed Aug 17 2005 Linus Walleij  2.8.0-5
 - Fixes following remarks from matthias at rpmforge.net
 * Wed Aug 17 2005 Linus Walleij  2.8.0-4


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnomad2/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	25 Aug 2005 07:21:35 -0000	1.2
+++ sources	7 Sep 2005 11:37:21 -0000	1.3
@@ -1 +1 @@
-23872b7d3b9fc434b8152620e309de3a  gnomad2-2.8.0.tar.gz
+6bae2df9f094b06cd5d606a693eb3241  gnomad2-2.8.1.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep  7 12:47:13 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Wed,  7 Sep 2005 08:47:13 -0400
Subject: rpms/gc/FC-3 .cvsignore,1.4,1.5 gc.spec,1.6,1.7 sources,1.4,1.5
Message-ID: <200509071247.j87ClDi9018173@cvs-int.fedora.redhat.com>

Author: rdieter

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

Modified Files:
	.cvsignore gc.spec sources 
Log Message:
* Wed May 25 2005 Rex Dieter  6.5-1
- 6.5



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gc/FC-3/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	29 Jan 2005 16:28:30 -0000	1.4
+++ .cvsignore	7 Sep 2005 12:47:10 -0000	1.5
@@ -1 +1 @@
-gc6.4.tar.gz
+gc6.5.tar.gz


Index: gc.spec
===================================================================
RCS file: /cvs/extras/rpms/gc/FC-3/gc.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gc.spec	29 Jan 2005 16:28:30 -0000	1.6
+++ gc.spec	7 Sep 2005 12:47:10 -0000	1.7
@@ -2,19 +2,16 @@
 
 Summary: C++ Garbage Collector	
 Name:    gc	
-Epoch:	 0
-Version: 6.4
-# For Extras
-Release: 2 
-# For kde-redhat
-#Release: 0.2%{?dist_tag}.kde
-Group:	 System Environment/Libraries
+Version: 6.5
+
+Release: 1%{?dist}
+Group:   System Environment/Libraries
 License: BSD
 Url:     http://www.hpl.hp.com/personal/Hans_Boehm/gc/	
-Source:	 http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/gc6.4.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+Source:  http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/gc6.5.tar.gz 
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Patch1: gc6.4-opendl.patch
+Patch1: gc6.5-opendl.patch
 
 
 %description
@@ -22,11 +19,11 @@
 collecting replacement for C malloc or C++ new.
 
 %package devel
-Summary: Libraries and header files for gc development 
+Summary: Libraries and header files for %{name} development 
 Group:   Development/Libraries
-Requires: %{name} = %{epoch}:%{version}-%{release}
+Requires: %{name} = %{version}-%{release}
 %description devel
-Libraries and header files for gc development.
+Libraries and header files for %{name} development.
 
 
 %prep
@@ -47,6 +44,7 @@
 
 make %{?_smp_mflags}
 
+%check || :
 make check
 
 
@@ -63,10 +61,11 @@
 
 
 %clean
-rm -rf 	"$RPM_BUILD_ROOT"
+rm -rf $RPM_BUILD_ROOT
 
 
 %post   -p /sbin/ldconfig
+
 %postun -p /sbin/ldconfig
 
 
@@ -80,11 +79,16 @@
 %doc doc/*.html
 %{_includedir}/*
 %{_libdir}/lib*.so
-#{_libdir}/lib*.*a
 %{_mandir}/man?/*
 
 
 %changelog
+* Wed May 25 2005 Rex Dieter  6.5-1
+- 6.5
+
+* Fri Apr  7 2005 Michael Schwendt 
+- rebuilt
+
 * Wed Jan 26 2005 Rex Dieter  0:6.4-2
 - --enable-threads unconditionally
 - --enable-parallel-mark only on %%ix86 (#144681)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gc/FC-3/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	29 Jan 2005 16:28:30 -0000	1.4
+++ sources	7 Sep 2005 12:47:10 -0000	1.5
@@ -1 +1 @@
-ef03495e980b834a99c0e27eedaa546e  gc6.4.tar.gz
+00bf95cdcbedfa7321d14e0133b31cdb  gc6.5.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep  7 12:48:11 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Wed,  7 Sep 2005 08:48:11 -0400
Subject: rpms/gc/FC-4 gc6.5-opendl.patch, NONE, 1.1 .cvsignore, 1.4,
	1.5 gc.spec, 1.8, 1.9 sources, 1.4, 1.5 gc6.4-opendl.patch,
	1.1, NONE
Message-ID: <200509071248.j87CmBX0018235@cvs-int.fedora.redhat.com>

Author: rdieter

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

Modified Files:
	.cvsignore gc.spec sources 
Added Files:
	gc6.5-opendl.patch 
Removed Files:
	gc6.4-opendl.patch 
Log Message:
* Wed May 25 2005 Rex Dieter  6.5-1
- 6.5


gc6.5-opendl.patch:

--- NEW FILE gc6.5-opendl.patch ---
--- gc6.5/Makefile.in.opendl	2005-05-16 18:28:28.000000000 -0500
+++ gc6.5/Makefile.in	2005-05-25 10:27:00.341398988 -0500
@@ -336,7 +336,7 @@
 
 # Include THREADDLLIBS here to ensure that the correct versions of
 # linuxthread semaphore functions get linked:
-libgc_la_LIBADD = @addobjs@ $(THREADDLLIBS) $(UNWINDLIBS)
+libgc_la_LIBADD = @addobjs@ $(THREADDLLIBS) $(UNWINDLIBS) $(EXTRA_TEST_LIBS)
 libgc_la_DEPENDENCIES = @addobjs@
 libgc_la_LDFLAGS = -version-info 1:2:0
 EXTRA_libgc_la_SOURCES = alpha_mach_dep.S \
@@ -345,7 +345,7 @@
     sparc_sunos4_mach_dep.s ia64_save_regs_in_stack.s
 
 libgccpp_la_SOURCES = gc_cpp.cc
-libgccpp_la_LIBADD = $(THREADDLLIBS) $(UNWINDLIBS)
+libgccpp_la_LIBADD = $(THREADDLLIBS) $(UNWINDLIBS) $(EXTRA_TEST_LIBS)
 libgccpp_la_LDFLAGS = -version-info 1:2:0
 AM_CXXFLAGS = @GC_CFLAGS@
 AM_CFLAGS = @GC_CFLAGS@
@@ -354,9 +354,9 @@
 
 # gctest_OBJECTS = test.o
 gctest_SOURCES = tests/test.c
-gctest_LDADD = ./libgc.la $(THREADDLLIBS) $(UNWINDLIBS) $(EXTRA_TEST_LIBS)
+gctest_LDADD = ./libgc.la
 test_cpp_SOURCES = tests/test_cpp.cc
-test_cpp_LDADD = ./libgc.la ./libgccpp.la $(THREADDLLIBS) $(UNWINDLIBS) $(EXTRA_TEST_LIBS)
+test_cpp_LDADD = ./libgc.la ./libgccpp.la
 TESTS = gctest $(extra_checks)
 all_objs = @addobjs@ $(libgc_la_OBJECTS)
 LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) \
--- gc6.5/Makefile.am.opendl	2005-05-16 17:11:08.000000000 -0500
+++ gc6.5/Makefile.am	2005-05-25 10:25:35.953868785 -0500
@@ -55,7 +55,7 @@
 
 # Include THREADDLLIBS here to ensure that the correct versions of
 # linuxthread semaphore functions get linked:
-libgc_la_LIBADD = @addobjs@ $(THREADDLLIBS) $(UNWINDLIBS)
+libgc_la_LIBADD = @addobjs@ $(THREADDLLIBS) $(UNWINDLIBS) $(EXTRA_TEST_LIBS)
 libgc_la_DEPENDENCIES = @addobjs@
 libgc_la_LDFLAGS = -version-info 1:2:0
 
@@ -65,7 +65,7 @@
     sparc_sunos4_mach_dep.s ia64_save_regs_in_stack.s
 
 libgccpp_la_SOURCES = gc_cpp.cc
-libgccpp_la_LIBADD = $(THREADDLLIBS) $(UNWINDLIBS)
+libgccpp_la_LIBADD = $(THREADDLLIBS) $(UNWINDLIBS) $(EXTRA_TEST_LIBS)
 libgccpp_la_LDFLAGS = -version-info 1:2:0
 
 EXTRA_DIST += alpha_mach_dep.S mips_sgi_mach_dep.s sparc_mach_dep.S
@@ -91,9 +91,9 @@
 ##     are included in the distribution
 # gctest_OBJECTS = test.o
 gctest_SOURCES = tests/test.c
-gctest_LDADD = ./libgc.la $(THREADDLLIBS) $(UNWINDLIBS) $(EXTRA_TEST_LIBS)
+gctest_LDADD = ./libgc.la 
 test_cpp_SOURCES = tests/test_cpp.cc
-test_cpp_LDADD = ./libgc.la ./libgccpp.la $(THREADDLLIBS) $(UNWINDLIBS) $(EXTRA_TEST_LIBS)
+test_cpp_LDADD = ./libgc.la ./libgccpp.la 
 
 TESTS = gctest $(extra_checks)
 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gc/FC-4/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	29 Jan 2005 16:28:30 -0000	1.4
+++ .cvsignore	7 Sep 2005 12:48:08 -0000	1.5
@@ -1 +1 @@
-gc6.4.tar.gz
+gc6.5.tar.gz


Index: gc.spec
===================================================================
RCS file: /cvs/extras/rpms/gc/FC-4/gc.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- gc.spec	6 Apr 2005 22:11:37 -0000	1.8
+++ gc.spec	7 Sep 2005 12:48:08 -0000	1.9
@@ -1,32 +1,29 @@
 # $Id$
 
-Summary: C++ Garbage Collector
-Name:    gc
-Version: 6.4
-# For Extras
-Release: 3
+Summary: C++ Garbage Collector	
+Name:    gc	
+Version: 6.5
 
-# For kde-redhat
-#Release: 0.2%{?dist_tag}.kde
+Release: 1%{?dist}
 Group:   System Environment/Libraries
 License: BSD
-Url:     http://www.hpl.hp.com/personal/Hans_Boehm/gc/
-Source:  http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/gc6.4.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+Url:     http://www.hpl.hp.com/personal/Hans_Boehm/gc/	
+Source:  http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/gc6.5.tar.gz 
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Patch1: gc6.4-opendl.patch
+Patch1: gc6.5-opendl.patch
 
 
 %description
-The Boehm-Demers-Weiser conservative garbage collector can be used as a garbage
+The Boehm-Demers-Weiser conservative garbage collector can be used as a garbage 
 collecting replacement for C malloc or C++ new.
 
 %package devel
-Summary: Libraries and header files for gc development
+Summary: Libraries and header files for %{name} development 
 Group:   Development/Libraries
 Requires: %{name} = %{version}-%{release}
 %description devel
-Libraries and header files for gc development.
+Libraries and header files for %{name} development.
 
 
 %prep
@@ -47,6 +44,7 @@
 
 make %{?_smp_mflags}
 
+%check || :
 make check
 
 
@@ -55,7 +53,7 @@
 
 make install DESTDIR=$RPM_BUILD_ROOT
 
-install -p -D -m644 doc/gc.man $RPM_BUILD_ROOT%{_mandir}/man3/gc.3
+install -p -D -m644 doc/gc.man	$RPM_BUILD_ROOT%{_mandir}/man3/gc.3
 
 ## Unpackaged files
 rm -rf $RPM_BUILD_ROOT%{_datadir}/gc
@@ -63,14 +61,15 @@
 
 
 %clean
-rm -rf "$RPM_BUILD_ROOT"
+rm -rf $RPM_BUILD_ROOT
 
 
 %post   -p /sbin/ldconfig
+
 %postun -p /sbin/ldconfig
 
 
-%files
+%files 
 %defattr(-,root,root)
 %doc doc/README doc/README.changes doc/README.contributors
 %{_libdir}/lib*.so.*
@@ -80,11 +79,13 @@
 %doc doc/*.html
 %{_includedir}/*
 %{_libdir}/lib*.so
-#{_libdir}/lib*.*a
 %{_mandir}/man?/*
 
 
 %changelog
+* Wed May 25 2005 Rex Dieter  6.5-1
+- 6.5
+
 * Fri Apr  7 2005 Michael Schwendt 
 - rebuilt
 
@@ -117,16 +118,16 @@
 - OK, put manpage in man3.
 
 * Thu Oct 02 2003 Rex Dieter  0:6.2-0.fdr.2
-- drop manpage pending feedback from developer.
+- drop manpage pending feedback from developer. 
 
 * Tue Sep 30 2003 Rex Dieter  0:6.2-0.fdr.1
-- fix manpage location
+- fix manpage location 
 - remove .la file (it appears unnecessary after all, thanks to opendl patch)
 - remove cvs tag from description
 - touchup -devel desc/summary.
 - macro update to support Fedora Core
 
-* Thu Sep 11 2003 Rex Dieter  0:6.2-0.fdr.0
+* Thu Sep 11 2003 Rex Dieter  0:6.2-0.fdr.0 
 - 6.2 release.
 - update license (BSD)
 - Consider building with: --enable-parallel-mark


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gc/FC-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	29 Jan 2005 16:28:30 -0000	1.4
+++ sources	7 Sep 2005 12:48:08 -0000	1.5
@@ -1 +1 @@
-ef03495e980b834a99c0e27eedaa546e  gc6.4.tar.gz
+00bf95cdcbedfa7321d14e0133b31cdb  gc6.5.tar.gz


--- gc6.4-opendl.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Sep  7 12:48:22 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Wed,  7 Sep 2005 08:48:22 -0400
Subject: rpms/gc/FC-3 gc6.5-opendl.patch, NONE, 1.1 gc6.4-opendl.patch, 1.1,
	NONE
Message-ID: <200509071248.j87CmMiR018261@cvs-int.fedora.redhat.com>

Author: rdieter

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

Added Files:
	gc6.5-opendl.patch 
Removed Files:
	gc6.4-opendl.patch 
Log Message:
update opendl patch


gc6.5-opendl.patch:

--- NEW FILE gc6.5-opendl.patch ---
--- gc6.5/Makefile.in.opendl	2005-05-16 18:28:28.000000000 -0500
+++ gc6.5/Makefile.in	2005-05-25 10:27:00.341398988 -0500
@@ -336,7 +336,7 @@
 
 # Include THREADDLLIBS here to ensure that the correct versions of
 # linuxthread semaphore functions get linked:
-libgc_la_LIBADD = @addobjs@ $(THREADDLLIBS) $(UNWINDLIBS)
+libgc_la_LIBADD = @addobjs@ $(THREADDLLIBS) $(UNWINDLIBS) $(EXTRA_TEST_LIBS)
 libgc_la_DEPENDENCIES = @addobjs@
 libgc_la_LDFLAGS = -version-info 1:2:0
 EXTRA_libgc_la_SOURCES = alpha_mach_dep.S \
@@ -345,7 +345,7 @@
     sparc_sunos4_mach_dep.s ia64_save_regs_in_stack.s
 
 libgccpp_la_SOURCES = gc_cpp.cc
-libgccpp_la_LIBADD = $(THREADDLLIBS) $(UNWINDLIBS)
+libgccpp_la_LIBADD = $(THREADDLLIBS) $(UNWINDLIBS) $(EXTRA_TEST_LIBS)
 libgccpp_la_LDFLAGS = -version-info 1:2:0
 AM_CXXFLAGS = @GC_CFLAGS@
 AM_CFLAGS = @GC_CFLAGS@
@@ -354,9 +354,9 @@
 
 # gctest_OBJECTS = test.o
 gctest_SOURCES = tests/test.c
-gctest_LDADD = ./libgc.la $(THREADDLLIBS) $(UNWINDLIBS) $(EXTRA_TEST_LIBS)
+gctest_LDADD = ./libgc.la
 test_cpp_SOURCES = tests/test_cpp.cc
-test_cpp_LDADD = ./libgc.la ./libgccpp.la $(THREADDLLIBS) $(UNWINDLIBS) $(EXTRA_TEST_LIBS)
+test_cpp_LDADD = ./libgc.la ./libgccpp.la
 TESTS = gctest $(extra_checks)
 all_objs = @addobjs@ $(libgc_la_OBJECTS)
 LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) \
--- gc6.5/Makefile.am.opendl	2005-05-16 17:11:08.000000000 -0500
+++ gc6.5/Makefile.am	2005-05-25 10:25:35.953868785 -0500
@@ -55,7 +55,7 @@
 
 # Include THREADDLLIBS here to ensure that the correct versions of
 # linuxthread semaphore functions get linked:
-libgc_la_LIBADD = @addobjs@ $(THREADDLLIBS) $(UNWINDLIBS)
+libgc_la_LIBADD = @addobjs@ $(THREADDLLIBS) $(UNWINDLIBS) $(EXTRA_TEST_LIBS)
 libgc_la_DEPENDENCIES = @addobjs@
 libgc_la_LDFLAGS = -version-info 1:2:0
 
@@ -65,7 +65,7 @@
     sparc_sunos4_mach_dep.s ia64_save_regs_in_stack.s
 
 libgccpp_la_SOURCES = gc_cpp.cc
-libgccpp_la_LIBADD = $(THREADDLLIBS) $(UNWINDLIBS)
+libgccpp_la_LIBADD = $(THREADDLLIBS) $(UNWINDLIBS) $(EXTRA_TEST_LIBS)
 libgccpp_la_LDFLAGS = -version-info 1:2:0
 
 EXTRA_DIST += alpha_mach_dep.S mips_sgi_mach_dep.s sparc_mach_dep.S
@@ -91,9 +91,9 @@
 ##     are included in the distribution
 # gctest_OBJECTS = test.o
 gctest_SOURCES = tests/test.c
-gctest_LDADD = ./libgc.la $(THREADDLLIBS) $(UNWINDLIBS) $(EXTRA_TEST_LIBS)
+gctest_LDADD = ./libgc.la 
 test_cpp_SOURCES = tests/test_cpp.cc
-test_cpp_LDADD = ./libgc.la ./libgccpp.la $(THREADDLLIBS) $(UNWINDLIBS) $(EXTRA_TEST_LIBS)
+test_cpp_LDADD = ./libgc.la ./libgccpp.la 
 
 TESTS = gctest $(extra_checks)
 


--- gc6.4-opendl.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Sep  7 12:51:51 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Wed,  7 Sep 2005 08:51:51 -0400
Subject: rpms/libfac/FC-3 libfac.spec,1.4,1.5
Message-ID: <200509071252.j87CqL0i018417@cvs-int.fedora.redhat.com>

Author: rdieter

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

Modified Files:
	libfac.spec 
Log Message:
cleanup
add %{dist} tag



Index: libfac.spec
===================================================================
RCS file: /cvs/extras/rpms/libfac/FC-3/libfac.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- libfac.spec	4 Dec 2004 09:46:44 -0000	1.4
+++ libfac.spec	7 Sep 2005 12:51:49 -0000	1.5
@@ -1,18 +1,18 @@
 # $Id$
 
-Summary: An extension to Singular-factory
-Name:    libfac	
-Epoch:	 0
+Summary: Extension to Singular-factory
+Name:    libfac
 Version: 2.0.5
-Release: 1%{?dist_tag}
+Release: 3%{?dist}
+
 License: GPL
-Url:     http://www.mathematik.uni-kl.de/ftp/pub/Math/Singular/Libfac/	
+Url:     http://www.mathematik.uni-kl.de/ftp/pub/Math/Singular/Libfac/
 # http://www.mathematik.uni-kl.de/ftp/pub/Math/Singular/Libfac/libfac-2-0-5.tar,gz
-Source:	 libfac-2-0-5.tar.gz
-Group:   System Environment/Libraries	
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+Source:  libfac-2-0-5.tar.gz
+Group:   System Environment/Libraries
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires: factory-devel >= 0:2.0.5
+BuildRequires: factory-devel >= 2.0.5
 #BuildRequires: autoconf >= 2.53
 
 %description
@@ -24,14 +24,14 @@
 
 %package devel
 Summary: An extension to Singular-factory
-Obsoletes: %{name} < %{epoch}:%{version}-%{release}
-Provides:  %{name} = %{epoch}:%{version}-%{release}
+#Obsoletes: %{name} < %{version}-%{release}
+#Provides:  %{name} = %{version}-%{release}
 Group:   Development/Libraries
 %description devel
-Singular-libfac is an extension to Singular-factory which implements 
-factorization of polynomials over finite fields and algorithms for 
+Singular-libfac is an extension to Singular-factory which implements
+factorization of polynomials over finite fields and algorithms for
 manipulation of polynomial ideals via the characteristic set methods
-(e.g., calculating the characteristic set and the irreducible 
+(e.g., calculating the characteristic set and the irreducible
 characteristic series).
 
 
@@ -43,9 +43,9 @@
 
 
 %build
-%configure --with-NOSTREAMIO 
+%configure --with-NOSTREAMIO
 
-make %{?_smp_mflags} 
+make %{?_smp_mflags}
 
 
 %install
@@ -65,14 +65,19 @@
 %files devel
 %defattr(-,root,root)
 %doc 00README ChangeLog COPYING
-#{_libdir}/lib*.so
-%{_libdir}/lib*.*a
+%{_libdir}/lib*.a
 %{_includedir}/*
 
 
 %changelog
+* Sun May 22 2005 Jeremy Katz  - 2.0.5-3
+- rebuild on all arches
+
+* Fri Apr  7 2005 Michael Schwendt 
+- rebuilt
+
 * Fri Oct 1 2004 Rex Dieter  0:2.0.5-1
-- 2.0.5 
+- 2.0.5
 
 * Mon Nov 17 2003 Rex Dieter  0:2.0.4-0.fdr.3.b
 - update macros



From fedora-extras-commits at redhat.com  Wed Sep  7 12:51:51 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Wed,  7 Sep 2005 08:51:51 -0400
Subject: rpms/libfac/FC-4 libfac.spec,1.8,1.9
Message-ID: <200509071252.j87CqMMR018420@cvs-int.fedora.redhat.com>

Author: rdieter

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

Modified Files:
	libfac.spec 
Log Message:
cleanup
add %{dist} tag



Index: libfac.spec
===================================================================
RCS file: /cvs/extras/rpms/libfac/FC-4/libfac.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- libfac.spec	23 May 2005 00:00:21 -0000	1.8
+++ libfac.spec	7 Sep 2005 12:51:49 -0000	1.9
@@ -3,14 +3,14 @@
 Summary: Extension to Singular-factory
 Name:    libfac
 Version: 2.0.5
-Release: 3%{?dist_tag}
+Release: 3%{?dist}
 
 License: GPL
 Url:     http://www.mathematik.uni-kl.de/ftp/pub/Math/Singular/Libfac/
 # http://www.mathematik.uni-kl.de/ftp/pub/Math/Singular/Libfac/libfac-2-0-5.tar,gz
 Source:  libfac-2-0-5.tar.gz
 Group:   System Environment/Libraries
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: factory-devel >= 2.0.5
 #BuildRequires: autoconf >= 2.53
@@ -24,8 +24,8 @@
 
 %package devel
 Summary: An extension to Singular-factory
-Obsoletes: %{name} < %{version}-%{release}
-Provides:  %{name} = %{version}-%{release}
+#Obsoletes: %{name} < %{version}-%{release}
+#Provides:  %{name} = %{version}-%{release}
 Group:   Development/Libraries
 %description devel
 Singular-libfac is an extension to Singular-factory which implements
@@ -65,8 +65,7 @@
 %files devel
 %defattr(-,root,root)
 %doc 00README ChangeLog COPYING
-#{_libdir}/lib*.so
-%{_libdir}/lib*.*a
+%{_libdir}/lib*.a
 %{_includedir}/*
 
 



From fedora-extras-commits at redhat.com  Wed Sep  7 13:09:32 2005
From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields))
Date: Wed,  7 Sep 2005 09:09:32 -0400
Subject: web/html/docs/jargon-buster/stylesheet-images - New directory
Message-ID: <200509071309.j87D9W1p019779@cvs-int.fedora.redhat.com>

Author: pfrields

Update of /cvs/fedora/web/html/docs/jargon-buster/stylesheet-images
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19765/stylesheet-images

Log Message:
Directory /cvs/fedora/web/html/docs/jargon-buster/stylesheet-images added to the repository




From fedora-extras-commits at redhat.com  Wed Sep  7 13:10:44 2005
From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields))
Date: Wed,  7 Sep 2005 09:10:44 -0400
Subject: web/html/docs/jargon-buster fedora.css, NONE, 1.1 rv-revhistory.php,
	NONE, 1.1 fedora-glossary.php, 1.1.1.1, 1.2 index.php, 1.1.1.1,
	1.2 ln-legalnotice.php, 1.1.1.1, 1.2
Message-ID: <200509071310.j87DAiJV019852@cvs-int.fedora.redhat.com>

Author: pfrields

Update of /cvs/fedora/web/html/docs/jargon-buster
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19796

Modified Files:
	fedora-glossary.php index.php ln-legalnotice.php 
Added Files:
	fedora.css rv-revhistory.php 
Log Message:
New jargon-buster build, updated to 1.9.3


--- NEW FILE fedora.css ---
/*

CSS for Red Hat Linux Project docs from the Documentation Project

Written by Tammy Fox and Garrett LeSage

Copyright 2003 Tammy Fox, Garrett LeSage, and Red Hat, Inc.

License: GPL

*/

li p {
	display: inline;
}

div.table table {
	width: 95%;
	background-color: #DCDCDC; 
	color: #000000;
	border-spacing: 0;
}

div.table table th {
	border: 1px solid #A9A9A9;	
	background-color: #A9A9A9;
	color: #000000;
}

div.table table td {
	border: 1px solid #A9A9A9; 
	background-color: #DCDCDC;
	color: #000000;
	padding: 0.5em;
	margin-bottom: 0.5em;
	margin-top: 2px; 

}

div.note table, div.tip table, div.important table, div.caution table, div.warning table {
	width: 95%;
	border: 2px solid #D0D0B0;
	background-color: #FAF9E0;
	color: #000000;
	/* padding inside table area */
	padding: 0.5em;
	margin-bottom: 0.5em;
	margin-top: 0.5em;
}

.qandaset table {
	border-collapse: collapse;
}
.qandaset {
}
.qandaset tr.question {
}
.qandaset tr.question td {
	font-weight: bold;
	padding: 1em 1em 0;
}
.qandaset tr.answer td {
	padding: 0.25em 1em 1.5em;
}
.qandaset tr.question td, .qandaset tr.answer td {
}

hr {
        border: 0;
        border-bottom: 1px solid #ccc;
}

h1, h2, h3, h4 {
        font-family: luxi sans,sans-serif;
	color: #22437f;
	font-weight: bold;
}
h1 {
        font-size: 1.75em;
}
      
h2 {
        font-size: 1.25em;
}

h3 {
        font-size: 1.1em;
}

a:link {
        color: #900;
}
a:visited {
        color: #48468f;
}
a:hover {
        color: #f20;
}

code.screen, pre.screen {
	font-family: monospace;
	font-size: 1em;
	display: block;
	padding: 10px;
	border: 1px solid #bbb;
	background-color: #eee;
	color: #000;
	overflow: auto;
	border-radius: 2.5px;
	-moz-border-radius: 2.5px;
	margin: 0.5em 2em;
}

div.example {
	padding: 10px;
        border: 1px solid #bbb;
	margin: 0.5em 2em;
}

.procedure ol li {
        margin-bottom: 0.5em;
}
.procedure ol li li {
	/* prevent inheritance */
	margin-bottom: 0em;
}

.itemizedlist ul li {
	margin-bottom: 0.5em;
}
.itemizedlist ul li li {
	/* prevent inheritance */
	margin-bottom: 0em;
}


***** Error reading new file: [Errno 2] No such file or directory: 'rv-revhistory.php'

Index: fedora-glossary.php
===================================================================
RCS file: /cvs/fedora/web/html/docs/jargon-buster/fedora-glossary.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- fedora-glossary.php	30 Mar 2005 17:47:23 -0000	1.1.1.1
+++ fedora-glossary.php	7 Sep 2005 13:10:42 -0000	1.2
@@ -7,255 +7,539 @@
 
 ?>
 
-
    Glossary
    Prev???
    Glossary
    Jargon Buster
    alsa
    The Advanced Linux Sound Architecture (ALSA) provides audio and MIDI
-  functionality to the Linux operating system.  Refer to alsa-project.org
    Anaconda
    Anaconda is the installation program for Red Hat
-    distributions. During installation, the system's hardware is
-    identified and configured, and the appropriate file systems for
-    the system's architecture are created. Finally, it allows the user
-    to install the operating system software on the
-    system. Optionally, it can upgrade existing Red Hat
-    installations. Anaconda can run in a fully interactive mode (text
-    or graphical), or in a kickstart mode, which is allows the
-    installation to be scripted for unattended operation. Refer to Red Hat 
    apt-get
     Refer to freshrpms.net. APT (Advanced
- Package Tool) is a dependency tool, well known to Debian users since
- it is used by default with their dpkg packages. But apt has been
- ported to work with RPM packages too, by Conectiva, who has now used
- it for some time in their GNU/Linux distribution. The good news is
- that apt for RPM may be used with any other RPM-based
- distribution. All you need is the tool compiled for your version of
- RPM and at least a repository where RPM packages and their apt
- metadata can be downloaded from.  
    ATrpms 
    This is a 3rd party RPM repository for Red Hat Linux
-  distributions. The original focus laid upon software used in natural
-  sciences, especially in the field of high energy physics, e.g. tools
-  for numerical programming or such for scientific publications. But
-  since then this repository has included many non-scientific software
-  titles, like system tools or multimedia packages, resulting in a far
-  more generic repository. Refer to atrpms.physik.fu-berlin.de
    BitTorrent
    An alternative to a simple FTP or HTTP download. Utilizes multiple
-  channels to download. Refer to BitTorrent website
-  
    
-   Duke.edu 
-   This is the tracker for Fedora Core 1 'Yarrow' release. 
-
    Bluecurve™
    An easy-to-navigate interface with intuitively organized
-  menus. Bluecurve has been upgraded in Red Hat Linux 9 and now extends to more areas of
-  the operating system, including the menu and layout of the desktop.
    Bugzilla
    This is the Red Hat bug-tracking system, our database for
-recording bugs in Red Hat products. For more information about the Bugzilla bug tracking system, please refer to the main Bugzilla home page. 
    Core 1
    The Yarrow version of Fedora. Sometimes abbreviated to FC 1 or fc1,
-  Fedora Core 1. 
    See Also Red Hat Linux Names.
    Core 2
    The Tettnang version of Fedora. Sometimes abbreviated to FC 2
-	    or fc2, Fedora Core 2.
    See Also Red Hat Linux Names.
    cron
    A daemon to execute scheduled commands, for example to check
-  email each day at noon.  Cron searches /var/spool/cron for crontab
-  files which are named after accounts in /etc/passwd; 
    CUPS
    The Common UNIX Printing System ("CUPS") is a cross-platform
- printing solution for all UNIX environments. It is based on the
- "Internet Printing Protocol" and provides complete printing services
- to most PostScript and raster printers.Home page. 
    desktop switcher
    The switchdesk-gnome package provides a GNOME look and feel for the
-Desktop Switcher program provided in the switchdesk package.
-
    eth0
    (Normally) the first ethernet port on your system 
    ethtool
    Ethtool is a Linux net driver diagnostic and tuning tool for
- the Linux 2.4.x (or later) series of kernels. It obtains information
- and diagnostics related to media, link status, driver version, PCI
- (or other) bus location, and more.  
    FAQ
    Frequently Asked Questions, for Fedora see fedora.redhat.com
    FDL
    GNU Free Documentation License (FDL), see gnu.org
    FHS - File System Hierarchy Standard
    A collaborative document that defines the names and locations
-  of many files and directories on a Linux system. Worth getting to
-  know if you want to know what should go where.
- Refer to Red Hat
    FreshRPMS
    A source of RPMs.  Matthias Saou, the host,  says: In late 2000, I
-  started building quite a few RPM packages for my own needs, that
-  couldn't easily be found elsewhere, or at least not so well suited
-  for Red Hat Linux. A few months later, the website on which these
-  packages were hosted changed its name to become what people know
-  today. A long time has passed and I still maintain all the packages
-  I used to, and more of course! A whole community of users, testers
-  and contributors has grown around the website and its packages,
-  which is something I really didn't expect but really enjoy. Refer to
-  freshrpms.net
-
    See Also RPM.
    fsck
     fsck is a command line tool used to check and optionally repair Linux file systems.
    fsh
    Remote command execution via a cryptographically strong method such as
-lsh or ssh is often painfully slow, especially if either of the
-involved computers is slow. The biggest problem is that the client and
-the server perform a lot of complex calculations during connection
-establishment.
    fsh uses lsh or ssh to establish a secure tunnel to the remote
-system. This takes as long as a normal connection establishment, but
-once the tunnel is established, fsh can reuse it to start new sessions
-on the remote system almost instantaneously. You get the security of
-ssh and the speed of rsh.
-
    gimp
    The GIMP is the GNU Image Manipulation Program. It is a freely
-  distributed piece of software suitable for such tasks as photo
-  retouching, image composition and image authoring. Refer to gimp.org 
    glibc
    The GNU C library is used as the C library in the GNU system
-  and most newer systems with the Linux kernel. Refer to gnu.org
    GNOME
    The GNOME Project is an effort to create a complete, free and
-  easy-to-use desktop environment for users, as well as a powerful
-  application development framework for software developers.  Refer to
-Home page  
    GPG
    GnuPG is a complete and free replacement for PGP. Because it
-  does not use the patented IDEA algorithm, it can be used without any
-  restrictions. GnuPG is a RFC2440 (OpenPGP) compliant
-  application. Refer to gnupg.org. You may also see
-  RPM-GPG-KEY referenced, which relates to the keys used for checking
-  packages. E.g. see rpmfind 
    GPL & non-GPL  http://www.fsf.org/licenses/gpl-faq.htm
    Gnu General Public Licence. Refer to fsf.org
    GRUB
    GNU GRand Unified Boot loader or GRUB is a program which
- enables the user to select which installed operating system or kernel
- to load at system boot time. It also allows the user to pass
- arguments to the kernel. Refer to Red Hat
    i386
    i386.  The entire x86 line of computers and processors, from
- the Intel 386 forward all the way to Intel Pentium 4 and Athlon
- chips. All those are compatible with i386 instruction sets, the
- "lowest common denominator". Often used as shorthand for the
- distribution set of files meant for this line of computers or
- processors.
- 
    IRC
     IRC (Internet Relay Chat) channel. IRC is a real-time,
-  text-based form of communication. With it, you can have
-  conversations with multiple people in an open channel or chat with
-  someone privately one-on-one.
-
    ISO
    As an acronym, ISO = International Standards Organization. More
-  usefully, an abbreviation for the format of the downloadable version
-  of the CD images, since the ISO defined the CD format.
     ISO standard ISO 9660:1988 entitled "Information processing -- 
-Volume and file structure of CD-ROM for information interchange" does 
-define the order of bits on a CD-ROM and so an image of an ISO 
-9660:1988 compliant media is called an ISO.
-
-For details see iso.org
    KDE
    KDE is a desktop environment for UNIX workstations. KDE seeks to fill
-  the need for an easy to use desktop for Unix workstations, similar to the
-  desktop environments found under Mac OS or Microsoft? Windows?. Refer to the Home page for more
-  information.
    kernel
    The heart of Linux. The main code derived from Linus's
-    original software.
    kickstart
    Many system administrators would prefer to use an automated
-  installation method to install Red Hat Linux on their machines. To
-  answer this need, Red Hat created the kickstart installation
-  method. Using kickstart, a system administrator can create a single
-  file containing the answers to all the questions that would normally
-  be asked during a typical Red Hat Linux installation.  Refer to Red Hat
-  
    Kudzu
    kudzu is the hardware autodetection & configuration tool, originally
-introduced in Red Hat Linux 6.1. It detects changes in the system's
-hardware configuration, and gives the option of configuring
-added or removed devices. It's set up by default to run at
-each boot. fedora.redhat.com
-for more.
- 
    LDAP
    Lightweight Directory Access Protocol
    lilo
    LILO (LInux LOader) is a basic system program which boots your
- Linux system.  LILO loads the Linux kernel from a floppy or a hard
- drive, boots the kernel and passes control of the system to the
- kernel.  LILO can also boot other operating systems.
    LSB
     Linux standard base.  The goal of the LSB is to develop and
- promote a set of standards that will increase compatability among
- Linux distributions linuxbase.org 
    lspci
    lspci is a utility for displaying information about all PCI
-  buses in the system and all devices connected to them.
-
    Mandrake
    Another Linux distribution 
    md5sum
    md5sum computes a 128-bit checksum (or fingerprint or
- message-digest) for each specified file. Refer to gnu.org
- for Linux man pages. Why is it useful? Having downloaded Fedora,
- you'll mostly see a related file MD5SUM which holds some rather
- strange numbers. Run md5sum against the downloaded file or image, and
- you'll see a match if you are lucky, or if you don't get the match,
- you can be assured that the download is somehow faulty, and you need
- to download again, before you burn the CD. 
    For windows, activestate.com 
    Memtest86
    Memory testing may be performed prior to installing Fedora
-Core by entering  memtest86 at the boot: prompt. This causes the Memtest86 standalone memory testing software to run. Memtest86 memory testing continues until the Esc key is pressed.
    Mount point
     Mounting a CD is the equivalent of telling the Operating
-    System that you want to use it.  In Linux the only file system
-    that is automatically mounted is the root file system which is
-    automatically mounted on the root directory. Other file systems
-    (eg. your floppy drive, cd rom drive, windows partitions, and any
-    linux partitions other than root) can be mounted and unmounted as
-    required. In the case of drives used with portable media (such as
-    floppy drives, cd rom drives, and zip drives) it is necessary to
-    unmount the drive before being able to remove the media from the
-    drive.
-
    Mozilla
    Mozilla is an open-source web browser, designed for standards
-  compliance, performance and portability. Refer to Mozilla.org
    Nautilus
    The graphical desktop includes a file manager called Nautilus
-  that gives you a graphical display of your system and personal
-  files. Nautilus is designed to be much more than a visual listing of
-  files, however. It allows you to configure your desktop, configure
-  your Red Hat Linux system, browse your photo collection, access your
-  network resources, and more all from one integrated interface. In
-  essence, Nautilus becomes a shell for your entire desktop
-  experience. redhat
    package
    An alternate name for an RPM. Usually a number of files which
-  together form an application or other usable software
-  entity. Normally meant for installation by a package manager
    See Also RPM, redhat-config-packages.
    pine
    Pine — a Program for Internet News & Email — is a tool
-  for reading, sending, and managing electronic messages (email). Refer to
-  washington.edu 
    Psyche
    The name given to Red Hat Linux 8 
    See Also Red Hat Linux Names.
    Rawhide
    The bleeding edge, Rawhide is where the next version of
- packages are developed and tested. It is usually sort of stable, but
- on any given day any given package MIGHT be badly broken where the
- programmers are trying to add something or change something. Do not
- use on production machines, use at your own risk, etc. 
    Red Hat Linux Names
    Tettnang, Yarrow, Shrike, Psyche, et al.  Names are given to individual
- versions of Red Hat Linux and Fedora Core for reference and easy memory. People often
- forget whether they are using RHL 8.0 (Psyche), RHL 9 (Shrike), or Fedora Core
- 1 (Yarrow), but the names are harder to forget. Note that other operating
- systems do the same thing, including other Linux distros and Microsoft (various
- versions of Windows have been named Chicago, Cairo, etc.).
- 
    RHEL
    Red Hat Enterprise Linux is the premiere operating system for
-  open source computing. It's sold by annual subscription, runs on
-  seven system architectures, is certified by top enterprise software
-  and hardware vendors, and backed by a Red Hat Network subscription
-  and up to 24x7 support with one-hour response. Refer to Red Hat  for
-  more. 
-
-
-
    redhat-config-packages
    redhat-config-packages is the package manager for Red Hat Linux and Fedora Core.
-It supports installation of packages from CD or other sources 
    Red Hat End User Licence Agreement (RHEULA)
    Each of Red Hat software products is covered by an End User License Agreement. Refer to  Red Hat
    rhgb 
    Red Hat Graphical Boot. 
    Fedora Core 1 now uses a graphical interface while booting. The
-graphical boot screen will appear once the kernel has
-loaded. Graphical booting is controlled by the GRAPHICAL line in the
-/etc/sysconfig/init file; set it to "no" to permanently disable
-graphical booting. In addition, the parameter rhgb must be appended to
-your bootloader command line.
    Systems that have been upgraded to Fedora Core 1 will not be
-configured to include the graphical boot feature. You must install the
-rhgb package, and add the rhgb boot-time parameter to your bootloader
-configuration.
-
    RHN
    Red Hat Network
    RHN Applet
    This applet, although called the rhn-applet really has nothing
- to do with RHN in Fedora.  It is really just the convenient mechanism
- for GUI access to up2date. 
    RPM
    Red Hat Package Manager, or nowadays,  RPM Package
-  Manager. 
    
-  The standard way to build and distribute any application for Red Hat Linux, Fedora Core,
-  and other Linux distributions that now use the same format. This
-  includes Mandrake and possibly others of which I might be
-  unaware. RPM is also the name for the application and command with
-  which you install, upgrade, query, or remove an RPM package, and you
-  often refer to a package as "the Apache RPM" meaning the RPM file
-  for that application. Can also check dependencies between installed
-  and new packages.
-
    Rsync
    rsync is an open source utility that provides fast incremental
-  file transfer. Refer to samba.anu.edu
    SELinux
    
-nsa.gov, from which,
-Security-Enhanced Linux. This version of Linux has a strong, flexible mandatory access control architecture incorporated into the major subsystems of the kernel.
-
-  
    Severn
    The beta version of Fedora, closed off early November 2003, severn was the beta version 0.95 
    Shrike
    The name given to Red Hat Linux 9 
    See Also Red Hat Linux Names.
    Sodipodi
    Sodipodi is general vector illustrating application for
-  Linux/Unix and Windows. It uses W3C SVG as native file and in-memory
-  image format and can do many neat things. Refer to Sourceforge
    SRPMs
    Source RPM, contains the source code for the package 
-in case you want to read it or modify it. You do not need any SRPMS to 
-install or use the software.
- 
    See Also RPM.
    Tettnang
    
-	    "Tettnang" is the second release (version 2) of Fedora Core.
-	  
    See Also Red Hat Linux Names, Core 2.
    Up2date
    up2date is a complete system for managing and updating RPM
- packages on Red Hat Linux and Fedora Core system. It has both command line and gui
- modes. Refer to Red Hat
- site for more detail.
    VMware
    A commercial product, VMware?
- Workstation is virtual machine software for the desktop. Optimized for the
- power user, VMware Workstation runs multiple operating systems, including
- Microsoft Windows, Linux, and Novell?
- NetWare?, simultaneously on a single
- PC in fully networked, portable virtual machines.  VMware Workstation works by
- enabling multiple operating systems and their applications to run concurrently
- on a single physical machine. These operating systems and applications are
- isolated in secure virtual machines that co-exist on a single piece of
- hardware. The VMware virtualization layer maps the physical hardware resources
- to the virtual machine's resources, so each virtual machine has its own CPU,
- memory, disks, I/O devices, etc. Virtual machines are the full equivalent of a
- standard x86 machine. Refer to its home
- page  for more information.
    VNC
    VNC stands for Virtual Network Computing. It is remote control
-  software which allows you to view and interact with one computer
-  (the "server") using a simple program (the "viewer") on another
-  computer anywhere on the Internet. Refer to realvnc.com 
    XFS
    XFS is a journalling filesystem developed by SGI and used in
-  SGI's IRIX operating system. It is now also available under GPL for
-  linux. It is extremely scalable, using btrees extensively to support
-  large and/or sparse files, and extremely large directories. The
-  journalling capability means no more waiting for fsck's or worrying
-  about meta-data corruption. Refer to oss.sgi.com
-  
    Ximian
    Provides a modified version of GNOME, which can be installed on a Linux
-  distributions. Warning: After installing Ximian GNOME, it must be uninstalled
-  before upgrading Red Hat Linux or Fedora Core. Refer to the Release
-  Notes for details.
    
-  Ximian had its genesis in the GNOME project and offers a complete
-  Linux desktop environment and productivity application suite. Refer to
-  the home page.
-  The company was founded by some of the GNOME developers as a
-  commercial entity related to GNOME. This led to the development of
-  Evolution and improvement in GNOME. Bought by Novell Aug 2003
-
-
    X Window System
    Possibly a misnomer, though often used to describe the GUI (Window like
-   ) user interface for Linux. Refer to ntlug.org for the
-   rationale.
    Yarrow
    
-    "Severn" was a beta version of Fedora and "yarrow" is the first
-    release version 1, November 6, 2003
-  
    Also, yarrow - ubiquitous strong-scented mat-forming Eurasian
-herb of wasteland, hedgerow or pasture having narrow serrate leaves
-and small usually white florets; widely naturalized in North
-America. Yarrow is also, like Severn, a river in the UK.
-
    See Also Red Hat Linux Names, Core 1.
    Yum
    Yum is an automatic updater and package installer/remover for
- RPM systems. It automatically computes dependencies and figures out
- what actions should occur to install packages. Refer to Duke University
    Prev?Up?
    Fedora Jargon Buster?Home?
    
+
    Glossary
    Prev   
    Glossary
    Jargon Buster
    ALSA
    
+            The Advanced Linux Sound Architecture (ALSA) provides audio
+	    and MIDI functionality to the Linux operating system. Refer
+	    to http://www.alsa-project.org/ for more
+	    information.
+          
    Anaconda
    
+            Anaconda is the installation
+	    program for Fedora Core. During installation,
+	    Anaconda identifies and
+	    configures the system's hardware, and creates appropriate
+	    file systems. Anaconda also
+	    allows the user to install the operating system software on
+	    the system. Optionally, it upgrades existing Red Hat Linux or Fedora
+	    installations. Anaconda runs in a
+	    fully interactive text or graphical mode, or in a
+	    kickstart mode, which allows the
+	    owner or administrator to automate installation for
+	    unattended operation. Refer to http://fedora.redhat.com/projects/anaconda-installer/ 
+	    for more information.
+          
    apt
    
+	    The apt (Advanced Package Tool) utility
+	    is a dependency tool developed for use with Debian Linux
+	    dpkg packages.  The
+	    apt-rpm utility extends
+	    apt for use with RPM packages.  Since
+	    apt has specific problems with
+	    multilib, however, it is not
+	    recommended for use with Fedora systems.  Use yum instead.
+          
    ATrpms
    
+            ATrpms a third party RPM repository for Fedora
+	    distributions. The original focus for ATrpms was software
+	    used in natural sciences, especially in the field of high
+	    energy physics.  The repository included tools for use in
+	    numerical programming and scientific publications. But since
+	    then this repository has included many non-scientific
+	    software titles, like system tools or multimedia packages,
+	    resulting in a far more generic repository. Refer to http://atrpms.physik.fu-berlin.de/ for more
+	    information.
+          
    BitTorrent
    
+            BitTorrent is a peer-to-peer
+            file sharing which downloads from multiple channels at
+            once.  Refer to http://bitconjurer.org/BitTorrent/ for more
+            information.
+          
    
+            Use BitTorrent to download Fedora Core
+            by downloading and opening a torrent file.  The official
+            Fedora Core torrent tracker is located at http://torrent.dulug.duke.edu/.  Download a torrent
+            file there to begin downloading a release of Fedora Core.
+          
    Bluecurve
    
+            Bluecurve™ is a theme which unifies
+            the look and feel of the Fedora desktop.  Bluecurve was
+            introduced in Red Hat Linux 9 and was used as the default for Fedora Core
+            through release 3.  Bluecurve was replaced in Fedora Core 4 by
+            Clearlooks.  Bluecurve included
+            icons and settings for the menu and layout of the desktop.
+          
    Bugzilla
    
+            Bugzilla is an online database for recording flaws, or
+            bugs, in Fedora software,
+            documentation, and other projects.  Bugzilla also tracks bugs in
+            Red Hat software.  When you encounter a problem with Fedora, you
+            can help the community fix the problem by making a record in
+            Bugzilla.  This procedure is called "entering a bug."  For more
+            information about Bugzilla, refer to http://bugzilla.redhat.com/.
+          
    Clearlooks
    
+	    Clearlooks is the default theme for a GNOME desktop
+	    environment in Fedora Core 4.  The Clearlooks design is based on
+	    the original Bluecurve.
+	  
    Core
    
+	    Core is a numbered release of a subset of Fedora software,
+	    and is usually called "Fedora Core."  Core packages are maintained
+	    mainly by employees of Red Hat, and are made up of free and
+	    open source software produced by the Linux community.
+	  
    
+	    Although the software in Fedora Core is updated regularly, the
+	    original release of Fedora Core does not change.  For this reason,
+	    when users discuss the state of their Fedora system software,
+	    they might refer to "Fedora Core plus updates."  When you request
+	    help from the community, this terminology is the most
+	    accurate.  However, many users simply call the updated
+	    system "Fedora Core."
+          
    CPU
    
+	    The Central Processing Unit, or CPU, is
+	    the "brain" of a computer.  The rest of the computer is
+	    organized around the CPU, so people often refer to computer
+	    systems by the type of processor inside.  Examples of CPUs
+	    include Pentium-4, Athlon64, and PowerPC.
+	  
    cron
    
+            The cron system executes automatic jobs
+	    on behalf of the system or an individual user on a schedule.
+	    An example of a system cron job might
+	    include running yum nightly to update
+	    the system.
+          
    CUPS
    
+            The Common UNIX Printing System, or CUPS,
+	    is a cross-platform printing solution for all UNIX-type
+	    environments, including Linux and Macintosh OS X.  It is
+	    based on the Internet Printing Protocol and provides
+	    complete printing services to most printers.  CUPS drivers
+	    are available at http://www.cups.org/windows/
+	    which allow Windows systems to use printers shared from
+	    Linux systems.  Refer to http://www.cups.org/
+	    for more information about CUPS.
+          
    Desktop Switcher
    
+            The Desktop Switcher tool allows
+	    a user to convert the Fedora desktop between GNOME and KDE.  To
+	    run the Desktop Switcher tool
+	    from the Main Menu, select
+	    Desktop->Preferences->More
+	    Preferences->Desktop
+	    Switcher.  If you do not see this
+	    item in your menu, you may not have the
+	    switchdesk-gui package installed. Refer
+	    to http://fedora.redhat.com/docs/ to learn how to use yum to install software packages.
+	  
    eth0
    
+	    The eth0 name represents the first
+	    discovered Ethernet interface in a
+	    Fedora system.  If your Fedora system has more than one such
+	    interface, the others will be numbered
+	    eth1,
+	    eth2, and so on.
+	  
    Ethernet
    
+            Ethernet is the most common type of network technology for
+            small computer networks.
+          
    ethtool
    
+            The ethtool utility is a Linux network
+            driver diagnostic and tuning tool for a Linux 2.4 or later
+            kernel.  The
+            ethtool utility obtains information and
+            diagnostics related to media, link status, driver version,
+            bus location, and more.
+          
    ext3
    
+	    The ext3 file system is a method of
+	    organizing data on storage devices.  It is based on the
+	    older but still vital ext2 Linux
+	    file system.  Most users do not need to understand file
+	    system internals because Linux translates this system into
+	    understandable concepts such as files and folders.  Refer to
+	    http://e2fsprogs.sourceforge.net/, however,
+	    for more information on ext2 and
+	    ext3.
+	  
    FAQ
    
+            A FAQ is a list of Frequently Asked
+            Questions.  Refer to http://fedora.redhat.com/about/faq/ for a FAQ about
+            the Fedora Project.  Refer to http://fedorafaq.org/ for a FAQ about using Fedora.
+          
    FDL
    
+            The GNU Free Documentation License (FDL)
+	    is a means of ensuring freedom for program documentation.
+	    The Fedora Documentation Project uses the FDL for its official documentation.  In
+	    fact, this document is licensed through the FDL.  As is the
+	    case with all freedoms, the FDL carries both rights and
+	    responsibilities.  You have the right to modify and
+	    redistribute FDL materials, or create other works based on
+	    them.  You then have the responsibility of licensing any
+	    such material under the FDL as well.  In this fashion the
+	    FDL guarantees that documentation cannot be made less free
+	    by a recipient.
+          
    FHS
    
+            The File Hierarchy Standard, or FHS, is a
+            collaborative document that defines the names and locations
+            of many files and directories on a Linux system.  The FHS
+            also sets standards for the types of files that should
+            inhabit specific system directories.  Refer to http://www.pathname.com/fhs/ for more information
+            about the FHS.
+          
    FreshRPMS
    
+            A third-party repository of RPM
+            software packages.  FreshRPMS is soon to be subsumed into
+            the larger RPMForge repository.  Refer to http://www.freshrpms.net/ for more information.
+          
    fsck
    
+            The fsck utility is a command line tool
+	    used to check and repair file systems.  It is normally used
+	    with Linux file systems such as ext3, but also has the ability to make
+	    repairs on some Windows file systems.
+          
    fsh
    
+            Remote command execution via a cryptographically strong
+	    method such as lsh or
+	    ssh is often slow, especially if either
+	    of the involved computers is slow.  The process is slow
+	    because the client and the server must perform a series of
+	    complex calculations during connection establishment.
+          
    
+            The fsh utility uses
+	    lsh or ssh to
+	    establish a secure tunnel to the remote system. This process
+	    takes as long as a normal connection establishment.  Once
+	    the tunnel is established, however, fsh
+	    reuses it to start new sessions on the remote system almost
+	    instantaneously.  With this process, fsh
+	    combines the security of ssh and the speed of rsh.
+          
    GIMP
    
+            The GIMP is the GNU Image Manipulation Program. The GIMP is
+	    graphics software suitable for such tasks as photo
+	    retouching, image composition and image authoring. The GIMP
+	    will read and write graphics files in a variety of formats,
+	    including JPG, PNG, BMP, GIF.  It will also import some
+	    proprietary image formats from other graphics programs.
+	    Refer to http://www.gimp.org/ for more
+	    information about the GIMP.
+          
    glibc
    
+            The GNU C library, or glibc, is
+            used as the C library in Fedora.  Most software programs for
+            your Fedora system rely on glibc for
+            basic common functions.  Refer to http://www.gnu.org/software/libc/libc.html for more
+            information about glibc.
+          
    GNOME
    
+            GNOME is the short name for the GNOME
+	    Desktop, a product of the GNOME Project.  GNOME is a
+	    complete, free and easy-to-use desktop environment for
+	    UNIX-like operating systems such as Fedora.  It is also a
+	    powerful application development framework for software
+	    developers.  GNOME provides a complete set of human
+	    interface guidelines, which means that GNOME strives to have
+	    a consistent look and feel for all its applications.  Read
+	    more about GNOME at http://www.gnome.org/.
+          
    GNU
    
+	    GNU is an acronym that stands for "GNU's
+	    Not UNIX," and is pronounced "guh-NOO."  GNU was originally
+	    intended to be a complete UNIX-like operating system.  It
+	    has become a broader term describing free software licensed
+	    under the GPL.  Because the kernel and much of the other software in a
+	    Linux system are licensed under the GPL, many people call that system
+	    GNU/Linux.
+	  
    GnuPG (GPG)
    
+            GnuPG, the GNU Privacy Guard, is a complete and free
+            replacement for PGP, Pretty Good Privacy.  GnuPG software
+            allows you to digitally sign or encrypt data using public
+            key encryption methods.  GnuPG is OpenPGP compliant, so data
+            signed or encrypted by GnuPG can be exchanged with almost
+            any computer user.  Refer to http://www.gnupg.org/ for more information about
+            GPG.
+          
    GPL
    
+            The GNU General Public Licence, or GPL,
+            is a software license designed to preserve users' rights to
+            share and modify software.  The GPL does this by restricting
+            anyone from denying you those rights.  Use of software is
+            usually subject to the terms under which it is licensed.
+            Many software licenses restrict you from copying, sharing,
+            or even examining the software they cover.  The terms of the
+            GPL, however, allow you very broad rights to share, modify,
+            and redistribute software.  In return the GPL requires you
+            to give others those rights if you share the results.  The
+            GPL encourages software programmers to learn and contribute
+            to each other's work.  Refer to http://www.fsf.org/licenses/licenses/gpl.html for
+            more information about the GPL.  For a FAQ about the GPL, refer to http://www.fsf.org/licensing/licenses/gpl-faq.html.
+          
    GRUB
    
+            The GNU GRand Unified Boot Loader,
+	    or GRUB, is a program which enables the
+	    user to select an operating system or kernel to boot. It
+	    also allows the user to pass arguments to the kernel. Refer
+	    to http://www.gnu.org/software/grub/ for more
+	    information about GRUB.
+          
    i386
    
+            The entire set of computer processors that are compatible
+            with the Intel x86 platform, including Intel Pentium and
+            Celeron, AMD Athlon and Duron, and VIA C3 CPUs, are commonly referred to as
+            i386.  The
+            i386 term is often used as
+            shorthand for the distribution set of files meant for this
+            line of computers or processors.
+          
    IM
    
+	    Instant messaging, or IM, is a real-time,
+	    text-based form of communication.  You can use IM to have
+	    conversations with individuals or groups.  America Online, an
+	    Internet service provider, popularized IM in the 1990's, but
+	    many other providers such as Yahoo and Google offer similar
+	    services.  Fedora has programs such as
+	    gaim that allow you to use IM to
+	    communicate with other Internet users.
+	  
    Inkscape
    
+	    Inkscape is a vector graphics illustration program.  It uses
+	    SVG as the default file format.  For more information about
+	    Inkscape, refer to http://www.inkscape.org/.
+	  
    See Also Sodipodi.
    IRC
    
+            Internet Relay Chat, or IRC, is a
+            real-time, text-based form of communication.  You can use
+            IRC to have conversations with individuals or groups.  IRC
+            is very similar to IM, and offers
+            many of the same capabilities, but predates IM by many
+            years.
+          
    ISO
    
+            ISO is an acronym that stands for
+            International Standards Organization.  It is also used as an
+            abbreviation for the ISO-9660 format of a standard data
+            CD-ROM.  Fedora offers installation CDs for Fedora Core as
+            downloadable files on the Internet, in the form of CD image
+            files sometimes called ISO files.  These files can be burned
+            directly to CD media using a CD-Recordable drive, and the
+            resulting CD will contain all the files on the original Fedora Core
+            media.
+          
    KDE
    
+            KDE is a free and open desktop environment for UNIX-like
+            operating systems such as Fedora.  KDE also offers a complete
+            development framework for writing graphical applications, as
+            well as an office application suite.  Refer to http://www.kde.org/whatiskde/ for more information
+            about KDE.
+          
    kernel
    
+            A kernel is the core of an operating system, responsible for
+            managing memory and conducting hardware operations.  The
+            Linux kernel used in Fedora is free and open source software,
+            originally written by Linux Torvalds.  Many computer
+            scientists and programmers from around the world now
+            contribute to its development.
+          
    kickstart
    
+            Many system administrators prefer to use an automated
+	    installation method to install Fedora on their machines. With
+	    kickstart, a system administrator can create a single file
+	    containing answers to all the questions asked during a Fedora
+	    installation.  Refer to http://fedoraproject.org/wiki/Anaconda for more
+	    information about kickstart.
+          
    kudzu
    
+            The kudzu utility usually runs at boot
+	    time. The kudzu utility detects changes
+	    in the system's hardware configuration, and configures the
+	    devices for use with Fedora software.  Refer to http://fedora.redhat.com/projects/additional-projects/kudzu/
+	    for more information about kudzu.
+          
    LDAP
    
+            The Lightweight Directory Access Protocol, or
+            LDAP, is a standard for hierarchically
+            organizing and accessing collections of information.  This
+            information may be practically anything, but LDAP is most
+            often used to collect information about organizations,
+            including personnel and resource information.  Fedora
+            includes support for OpenLDAP, which is a free and open
+            source implementation of LDAP.  For more information about
+            OpenLDAP, refer to http://www.openldap.org/.
+          
    LILO
    
+            The LInux LOader, or LILO, is a basic
+            system program which boots your Linux system. LILO loads the
+            Linux kernel from a floppy or a hard drive, boots the kernel
+            and passes control of the system to the kernel. LILO can
+            also boot other operating systems.  LILO has been superseded
+            by GRUB in Fedora.
+          
    LSB
    
+            The Linux Standard Base, or LSB, is a
+            project that develops and promotes a set of standards to
+            increase compatibility among Linux distributions.  For more
+            information about LSB, refer to http://www.linuxbase.org/.
+          
    lspci
    
+            The lspci utility displays information
+            about all PCI buses in the system and all devices connected
+            to them.  It is frequently used to diagnose problems with
+            hardware recognition or driver compatibility.
+          
    md5sum
    
+            The md5sum utility computes a 128-bit
+            message digest hash value for any specified files.  A hash
+            value is a "fingerprint" for a given file, created by a
+            computation that makes it very unlikely that any two files
+            will create the same hash value.
+	  
    
+            Download mirrors for Fedora Core ISO image
+            files also include a related MD5SUMS file which contains the
+            hash values for the ISO files.  Run
+            md5sum against the downloaded files to
+            verify the hash value.  If a file's hash value does not
+            match, you should not use that file to burn a CD.  Try
+            downloading the file again.
+          
    
+	    To download an MD5 hash program for Windows operating
+	    systems, refer to http://unxutils.sourceforge.net/.
+          
    memtest86
    
+            The Fedora Core Installation CD 1 includes a memory testing utility
+            called memtest86.  To perform memory
+            testing before you install Fedora Core, or to diagnose a RAM
+            problem, enter memtest86 at the
+            boot: prompt. The tests continue until you
+            press the Esc key.
+          
    mirror
    
+	    A mirror is a complete copy of an online resource.  System
+	    administrators of computers connected to the Internet often
+	    create and provide mirrors for public use.  If a resource
+	    has one or more mirrors, many more users can access its
+	    content without overloading the original resource.
+	  
    mount
    
+            To use a disk device such as a CD, USB drive, or floppy
+            diskette, you must first mount it.  Fedora
+            uses a single unified file system for all attached devices.
+            Windows systems, on the other hand, use a "drive letter" for
+            each disk device, such as A: or
+            C:.  When you
+            mount a disk device, its file system
+            becomes part of the unified file system on Fedora.  The
+            device is mounted on a mount point,
+            which is a directory that points to that device, such as
+            /media/floppy.  You must also unmount
+            the file system before you eject or remove the disk, to
+            insure all file information is safely written to the device.
+          
    
+	    Since these functions are often handled through
+	    user-friendly helpers, you may perform all mounting,
+	    unmounting, and file browsing through the graphical desktop
+	    interface.  For instance, if you use the GNOME Desktop, the Nautilus file management utility makes it
+	    easy to perform these tasks.
+	  
    Mozilla
    
+            The Mozilla Project produces several user applications such
+            as the Firefox web browser and the Thunderbird email client.
+            These programs are designed for standards compliance,
+            performance and portability. For more information about
+            Mozilla software, refer to http://www.mozilla.org/.
+          
    Nautilus
    
+            The GNOME desktop environment
+	    includes a file manager called Nautilus which provides a
+	    graphical display of your system and personal files.
+	    Nautilus also allows you to configure your desktop and
+	    Fedora, browse your photo collection, access your network
+	    resources, and more, all from an integrated interface. In
+	    essence, Nautilus becomes a shell for your entire desktop
+	    experience.  Insert link to Nautilus
+	    resource here.
+          
    package
    
+            Users often refer to a RPM file as a
+            package.
+	  
    See Also RPM.
    Pine
    
+            Pine, short for a Program for Internet
+            News and Email, is a tool for reading, sending, and managing
+            electronic messages. Refer to http://www.washington.edu/pine/ for more information
+            about Pine.
+          
    Rawhide
    
+            Rawhide is a package repository which contains the latest
+	    development versions of packages which will eventually be
+	    included in Fedora.  These latest versions are sometimes
+	    called "bleeding edge" package, since they often
+	    include new and untested technology.  You should consider
+	    the Rawhide repository "unstable," since any Rawhide package
+	    might be badly broken if the
+	    programmers are trying to add, change, or test features.  If
+	    you want to develop programs for Fedora, you may want to
+	    install a system from Rawhide.  If you only want to use a
+	    stable Fedora system, you should use the standard Fedora Core
+	    distribution instead.
+          
    RHEL
    
+            Red Hat Enterprise Linux, or Red Hat Enterprise Linux, is
+            the premiere operating system for open source computing.
+            Red Hat Enterprise Linux runs on many system architectures, is certified by
+            top enterprise software and hardware vendors, and is backed
+            by a Red Hat Network subscription and up to 24x7 support with one-hour
+            response.  Refer to http://www.redhat.com/software/rhel/ for more
+            information about Red Hat Enterprise Linux.
+          
    redhat-config-packages
    
+            The redhat-config-packages
+            utility is a package installation for new Fedora Core systems which
+            have no software updates installed yet.  Since most
+            administrators and users update their system software
+            regularly, redhat-config-packages
+            is not often used.  Users should instead use the yum utility to install new software.
+          
    rhgb
    
+            Red Hat Graphical Boot, or
+            rhgb, is an
+            optional component of the boot process.  The
+            rhgb application produces a boot
+            screen with a progress bar and fewer technical messages.
+            The rhgb application allows you
+            to click a link to see the technical boot messages if
+            desired.  Systems that have been upgraded from Red Hat Linux to Fedora Core
+            are not configured to include
+            rhgb.
+          
    RHN Applet
    
+            The rhn-applet utility was
+            originally designed for use with Red Hat Enterprise Linux and Red Hat Network.
+            It provides a notification and user interface for system
+            updates using up2date.  It allows
+            the user to retrieve and install system updates, but this
+            usage is no longer recommended.  Users should use yum for system updates instead.
+          
    RPM
    
+            RPM stands for RPM Package Manager.  RPM
+            is a robust database system for maintaining software on
+            Fedora systems.  Software packaged for Fedora is distributed
+            in special package files called RPM files, or RPMs.  System
+            owners use the rpm utility to query the
+            RPM database for information about installed software.
+            Although some administrators use rpm to
+            install, update, and remove software, it is recommended that
+            you use yum for these purposes.
+          
    rsync
    
+            The rsync provides fast incremental file
+            transfers.  Administrators frequently use
+            rsync to create a mirror of an online resource.  Refer to
+            http://samba.anu.edu.au/rsync/ for more
+            information about rsync.
+          
    SELinux
    
+	    SELinux is a set of extensions to the Linux kernel that provide extremely strong
+            security.  SELinux is based on role definitions, and allows
+            very granular control over access to system resources based
+            on those roles.  These security measures limit the risk
+            associated with computer intrusions by unauthorized persons.
+            For more information about SELinux, refer to http://www.nsa.gov/selinux/ and http://fedora.redhat.com/docs/selinux-faq.
+          
    Sodipodi
    
+            Sodipodi is a vector graphics illustration application. It
+            uses W3C SVG as its default format. Refer to http://sourceforge.net/projects/sodipodi/ for more
+            information.
+          
    See Also Inkscape.
    SRPM
    
+            A source RPM, or
+            SRPM, contains the source code for a
+            RPM package.  If you want to read or
+            modify a program's source, use its SRPM. You do not need any
+            SRPMs to install or use software.
+          
    See Also RPM.
    up2date
    
+            The up2date application is a
+            complete system for managing and updating software on Red Hat Enterprise Linux
+            and Fedora systems. It has both command line and gui
+            modes. The up2date application is
+            no longer recommended for software management, since it has
+            been superseded by yum.  Refer to http://fedora.redhat.com/docs/yum/ for more
+            information on managing software on your Fedora system.
+          
    vino
    
+	    The vino utility is a variant of VNC used in Fedora Core 4 and beyond.
+	  
    VNC
    
+            VNC stands for Virtual Network
+            Computing. It is remote control software which allows you to
+            view and interact with another computer over the network.
+            Refer to http://www.realvnc.com/ for more
+            information about VNC.
+          
    XFS
    
+            XFS is a journalling filesystem developed by SGI and used in
+            SGI's IRIX operating system. It is also available for Fedora
+            systems.. It is extremely scalable and has a journalling
+            capability to protect against corruption. Refer to http://oss.sgi.com/projects/xfs/faq.html#whatisxfs
+            for more information about XFS.
+          
    X Window System
    
+            The X Window System, or simply "X," is the underlying
+            technology for GNOME, KDE, and other graphical environments
+            used in Fedora.  X is a network-based system for displaying
+            and communicating graphical input and output.  It is very
+            flexible and is suitable for a wide variety of
+            configurations such as remote desktops and thin-client
+            applications.
+          
    yum
    
+            The Yellow Dog Updater, or yum, is a
+            complete software management utility for RPM-based systems
+            such as Fedora. It automatically determines software
+            requirements, or dependencies, and
+            uses this data to install, update, or remove packages.
+            Refer to http://linux.duke.edu/projects/yum/ for more
+            information about yum.
+          
    Prev   
    Fedora Jargon Buster Home 
    
 
 
 
-
    Fedora Jargon Buster
    ???Next
    Fedora Jargon Buster
    Revision History
    Revision 1.07 Nov 2003DaveP
    Initial Release
     
    Revision 1.18 Nov 2003DaveP
    
-	
    More added from Fedora list.
     
-	
    Revision 1.210 Nov 2003DaveP
    
-	  
    More added from Fedora list.
     
-	
    Revision 1.310 Nov 2003DaveP
    
-	  
    More added from various places (e.g. DV).
     
-	
    Revision 1.410 Nov 2003DaveP
    
-	  
    Added LegalNotice and std ents.
     
-	
    Revision 1.511 Nov 2003DaveP
    
-	  
    More additions from list.
     
-	
    Revision 1.611 Nov 2003DaveP
    
-	  
    More additions from list and A-Z toc. Needs art.xsl
     
-	
    Revision 1.719 Dec 2003DaveP
    
-	  
    Update
     
-	
    Revision 1.830 Jan 2004TammyFox
    
-	  
    Modified to build in fedora-docs module, Red Hat is 2 words,
-	  other edits and corrections
     
-	
    Revision 1.97 Mar 2004DaveP,TammyFox
    
-	  
    Added request for input statement, added KDE and VMware terms
-	  (DaveP); added trademark tags around relevant words in new entries and
-	  modified para on contributing (TammyFox)
    
-	
    Revision 1.930 Sept 2004PaulWFrields,TammyFox
    
-	  
    Added Tettnang.
    
-	
    Glossary
    
-  This document attempts to clarify some of the terms used on various
-  lists, Red Hat pages, and IRC, when talking about Linux, Red Hat Linux
-  versions, releases, etc. Many thanks to the people on the fedora-list
-  at Red Hat for their input.
-
    If you would like a word added to this document, please email the mailing list
-. A list to the subscription page is
-available on the project
-home page. If you find a problem with these terms, file a 
-Bugzilla
-report against the fedora-docs component. There is also a bug reporting link on
-the project page as
-well.
    ???Next
    ???Glossary
    
+
    Fedora Jargon Buster
       Next
    Fedora Jargon Buster
    Dave Pawson
    Tammy Fox
    Paul W. Frields
    Copyright © 2003, 2004, 2005 Dave Pawson, Pa!
 ul W. Frields, Red Hat, Inc.
    Glossary
    
+    This document clarifies some of the terms used on various lists, web
+    pages, and IRC, when talking about Fedora. Many thanks to the people
+    on the fedora-list and at Red Hat for their input.
+  
    [Tip]Reporting Document Errors
    
+    To report an error or omission in this document, file a bug report in Bugzilla
+    at http://bugzilla.redhat.com/.  When you file your bug, select "Fedora Documentation" as the
+    Product, and select the title of this document as
+    the Component.  The version of this document is
+    jargon-buster-1.9.3 (2005-09-07).
+  
    
+    The maintainers of this document will automatically receive your bug report.
+    On behalf of the entire Fedora community, thank you for helping us make
+    improvements.
+  
       Next
       Glossary
    
 
 
    
     Garrett LeSage created the admonition graphics (note, tip, important,
-    caution, and warning). They may be freely redistributed with documentation
+    caution, and warning).
+    Tommy Reynolds  created the callout graphics.
+    They all may be freely redistributed with documentation
     produced for the Fedora Project.
     
    
-    jargon-buster-1.9 (2004-09-30)
+    jargon-buster-1.9.3 (2005-09-07)
   
    
     Red Hat, Red Hat Network, the Red Hat "Shadow Man" logo, RPM, Maximum RPM, the RPM logo, Linux
     Library, PowerTools, Linux Undercover, RHmember, RHmember More, Rough Cuts,



From fedora-extras-commits at redhat.com  Wed Sep  7 13:10:45 2005
From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields))
Date: Wed,  7 Sep 2005 09:10:45 -0400
Subject: web/html/docs/jargon-buster/stylesheet-images 1.png, NONE,
	1.1 10.png, NONE, 1.1 11.png, NONE, 1.1 12.png, NONE,
	1.1 13.png, NONE, 1.1 14.png, NONE, 1.1 15.png, NONE,
	1.1 2.png, NONE, 1.1 3.png, NONE, 1.1 4.png, NONE, 1.1 5.png,
	NONE, 1.1 6.png, NONE, 1.1 7.png, NONE, 1.1 8.png, NONE,
	1.1 9.png, NONE, 1.1 caution.png, NONE, 1.1 important.png,
	NONE, 1.1 note.png, NONE, 1.1 tip.png, NONE, 1.1 warning.png,
	NONE, 1.1
Message-ID: <200509071310.j87DAjj4019859@cvs-int.fedora.redhat.com>

Author: pfrields

Update of /cvs/fedora/web/html/docs/jargon-buster/stylesheet-images
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19796/stylesheet-images

Added Files:
	1.png 10.png 11.png 12.png 13.png 14.png 15.png 2.png 3.png 
	4.png 5.png 6.png 7.png 8.png 9.png caution.png important.png 
	note.png tip.png warning.png 
Log Message:
New jargon-buster build, updated to 1.9.3



From fedora-extras-commits at redhat.com  Wed Sep  7 13:17:41 2005
From: fedora-extras-commits at redhat.com (Mark Cox (mjc))
Date: Wed,  7 Sep 2005 09:17:41 -0400
Subject: fedora-security/audit fc4,1.54,1.55
Message-ID: <200509071317.j87DHfqJ019912@cvs-int.fedora.redhat.com>

Author: mjc

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19887

Modified Files:
	fc4 
Log Message:
Deal with some of the issues over the last couple of days, note that
where a new CVE name comes in which is for an old issue (in this case
an issue fixed in the kernel in 2.6.12) we still list which FEDORA
release fixed it, even though the FEDORA errata came out prior to the
CVE name being issued.



Index: fc4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc4,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- fc4	5 Sep 2005 08:04:04 -0000	1.54
+++ fc4	7 Sep 2005 13:17:38 -0000	1.55
@@ -1,15 +1,24 @@
-Up to date CVE as of CVE email 20050904
-Up to date FC4 as of 20050904
+Up to date CVE as of CVE email 20050906
+Up to date FC4 as of 20050906
 
 ** are items that need attention
 
-2005-2728 ** httpd
+2005-2802 version (kernel, fixed 2.6.12) [since FEDORA-2005-510]
+2005-2801 version (kernel, fixed 2.6.11)
+2005-2800 VULNERABLE (kernel)
+2005-2798 VULNERABLE (openssh, fixed 4.2) #167446
+2005-2797 VULNERABLE (openssh, fixed 4.2) #167443
+2005-2796 backport (squid, fixed after 2.5.STABLE10) [since FEDORA-2005-851]
+2005-2794 backport (squid, fixed after 2.5.STABLE10) [since FEDORA-2005-851]
+2005-2728 VULNERABLE (httpd, fixed 2.0.55-dev) #167104
+2005-2700 VULNERABLE (httpd, fixed 2.0.55-dev) #167196
 2005-2693 backport (cvs) [since FEDORA-2005-790]
 2005-2672 VULNERABLE (lm_sensors) bz#166673
 2005-2666 ** openssh (hmm)
 2005-2558 ignore (mysql) not an issue
 2005-2499 backport (slocate) [since FEDORA-2005-770]
 2005-2496 backport (ntp, fixed 4.2.0b) ...0a-20040617-ntpd_guid.patch
+2005-2494 VULNERABLE (kdebase, fixed after 3.4.2) #166997
 2005-2491 VULNERABLE (python pcre)
 2005-2491 backport (pcre, fixed 6.2) [since FEDORA-2005-803]
 2005-2491 ignore (httpd, pcre uses system pcre)



From fedora-extras-commits at redhat.com  Wed Sep  7 13:29:09 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Wed,  7 Sep 2005 09:29:09 -0400
Subject: rpms/gsview/FC-3 gsview.spec,1.6,1.7
Message-ID: <200509071329.j87DTdWT019983@cvs-int.fedora.redhat.com>

Author: rdieter

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

Modified Files:
	gsview.spec 
Log Message:
fix bugzilla reference



Index: gsview.spec
===================================================================
RCS file: /cvs/extras/rpms/gsview/FC-3/gsview.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gsview.spec	5 Aug 2005 17:15:43 -0000	1.6
+++ gsview.spec	7 Sep 2005 13:29:07 -0000	1.7
@@ -31,7 +31,7 @@
 # default to libgs.so.@@SOMAJOR@@ instead of libgs.so
 Patch2: gsview-4.6-libgs.patch
 # attempt to allow/use ghostscript-8.15 reported value of 81500.
-# http://bugs.redhat.com/159912
+# http://bugzilla.redhat.com/159912
 Patch3: gsview-4.7-dllversion.patch
 # Change Paper default A4 -> Letter
 Patch4: gsview-4.7-letterpaper.patch



From fedora-extras-commits at redhat.com  Wed Sep  7 13:29:09 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Wed,  7 Sep 2005 09:29:09 -0400
Subject: rpms/gsview/FC-4 gsview.spec,1.9,1.10
Message-ID: <200509071329.j87DTdQ7019986@cvs-int.fedora.redhat.com>

Author: rdieter

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

Modified Files:
	gsview.spec 
Log Message:
fix bugzilla reference



Index: gsview.spec
===================================================================
RCS file: /cvs/extras/rpms/gsview/FC-4/gsview.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- gsview.spec	5 Aug 2005 17:14:18 -0000	1.9
+++ gsview.spec	7 Sep 2005 13:29:07 -0000	1.10
@@ -31,7 +31,7 @@
 # default to libgs.so.@@SOMAJOR@@ instead of libgs.so
 Patch2: gsview-4.6-libgs.patch
 # attempt to allow/use ghostscript-8.15 reported value of 81500.
-# http://bugs.redhat.com/159912
+# http://bugzilla.redhat.com/159912
 Patch3: gsview-4.7-dllversion.patch
 # Change Paper default A4 -> Letter
 Patch4: gsview-4.7-letterpaper.patch



From fedora-extras-commits at redhat.com  Wed Sep  7 14:13:32 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Wed,  7 Sep 2005 10:13:32 -0400
Subject: rpms/d4x/devel .cvsignore, 1.4, 1.5 d4x.spec, 1.7, 1.8 sources, 1.4,
	1.5 d4x-2.5.0-fixes.patch, 1.1,
	NONE d4x-2.5.0-ifwithnoexpression.patch, 1.1, NONE
Message-ID: <200509071413.j87EDWMv021441@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	.cvsignore d4x.spec sources 
Removed Files:
	d4x-2.5.0-fixes.patch d4x-2.5.0-ifwithnoexpression.patch 
Log Message:
Update to 2.5.4.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/d4x/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	9 Nov 2004 02:45:16 -0000	1.4
+++ .cvsignore	7 Sep 2005 14:13:30 -0000	1.5
@@ -1 +1 @@
-d4x-2.5.0final.tar.gz
+d4x-2.5.4.tar.bz2


Index: d4x.spec
===================================================================
RCS file: /cvs/extras/rpms/d4x/devel/d4x.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- d4x.spec	3 May 2005 11:38:05 -0000	1.7
+++ d4x.spec	7 Sep 2005 14:13:30 -0000	1.8
@@ -1,22 +1,17 @@
-# $Id$
-# Authority: matthias
-
 #define pre            rc4
-%define final          final
+#define final          final
 
 Summary: Downloader for X that supports resuming and many other features
 Name: d4x
-Version: 2.5.0
-Release: 5%{?pre:.%{pre}}
+Version: 2.5.4
+Release: 1%{?pre:.%{pre}}%{?dist}
 Group: Applications/Internet
 License: Artistic
 URL: http://www.krasu.ru/soft/chuchelo/
-Source: http://www.krasu.ru/soft/chuchelo/files/d4x-%{version}%{?pre}%{?final}.tar.gz
-Patch0: d4x-2.5.0-ifwithnoexpression.patch
-Patch1: d4x-2.5.0-fixes.patch
+Source: http://www.krasu.ru/soft/chuchelo/files/d4x-%{version}%{?pre}%{?final}.tar.bz2
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: gtk2-devel, glib2-devel >= 2.4.0, gcc-c++, libstdc++-devel
-BuildRequires: libao-devel, esound-devel, desktop-file-utils
+BuildRequires: libao-devel, esound-devel, desktop-file-utils, openssl-devel
 
 %description
 This program lets you download files from the internet using either the ftp
@@ -29,8 +24,6 @@
 
 %prep
 %setup -n %{name}-%{version}%{?pre}%{?final}
-%patch0 -p1
-%patch1 -p1
 
 %build
 %configure
@@ -51,6 +44,10 @@
   --add-category Network \
   share/nt.desktop
 
+# Rename the man page to match the binary name
+%{__mv} %{buildroot}%{_mandir}/man1/nt.1 \
+        %{buildroot}%{_mandir}/man1/d4x.1
+
 
 %clean
 %{__rm} -rf %{buildroot}
@@ -60,14 +57,23 @@
 %defattr(-, root, root, 0755)
 %doc AUTHORS ChangeLog* COPYING NEWS PLANS README TODO
 %doc DOC/FAQ* DOC/THANKS DOC/TROUBLES
+%{_bindir}/d4x
 %{_bindir}/nt
 %{_datadir}/applications/fedora-nt.desktop
 %{_datadir}/d4x/
 %{_datadir}/pixmaps/nt.png
-%{_mandir}/man1/nt.1*
+%{_mandir}/man1/d4x.1*
 
 
 %changelog
+* Wed Sep  7 2005 Matthias Saou  2.5.4-1
+- Update to 2.5.4.
+
+* Fri Sep  2 2005 Matthias Saou  2.5.3-1
+- Update to 2.5.3.
+- Use bz2 source instead of gz.
+- Rename man page from nt to d4x.
+
 * Tue May  3 2005 Matthias Saou  2.5.0-5
 - Added gcc4 patch from Debian.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/d4x/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	9 Nov 2004 02:45:16 -0000	1.4
+++ sources	7 Sep 2005 14:13:30 -0000	1.5
@@ -1 +1 @@
-c2b2f5571c2028dd845563e69a1d55c3  d4x-2.5.0final.tar.gz
+c797a933a8de1503b069b6d2499da727  d4x-2.5.4.tar.bz2


--- d4x-2.5.0-fixes.patch DELETED ---


--- d4x-2.5.0-ifwithnoexpression.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Sep  7 14:14:07 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Wed,  7 Sep 2005 10:14:07 -0400
Subject: rpms/factory/FC-3 factory.spec,1.6,1.7
Message-ID: <200509071414.j87EE78r021542@cvs-int.fedora.redhat.com>

Author: rdieter

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

Modified Files:
	factory.spec 
Log Message:
cleanup, sync branches



Index: factory.spec
===================================================================
RCS file: /cvs/extras/rpms/factory/FC-3/factory.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- factory.spec	4 Dec 2004 09:54:42 -0000	1.6
+++ factory.spec	7 Sep 2005 14:14:05 -0000	1.7
@@ -1,19 +1,20 @@
 # $Id$
 
-Summary: A C++ class library for multivariate polynomial data	
-Name:    factory	
-Epoch:	 0
+Summary: C++ class library for multivariate polynomial data
+Name:    factory
 Version: 2.0.5
-Release: 3%{?dist_tag}
-License: GPL	
-Url:   	 http://www.mathematik.uni-kl.de/ftp/pub/Math/Factory
-Source:	 http://www.mathematik.uni-kl.de/ftp/pub/Math/Factory/factory-2-0-5.tar.gz
-Group:   System Environment/Libraries	
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+Release: 6
+
+License: GPL
+URL:     http://www.mathematik.uni-kl.de/ftp/pub/Math/Factory
+Source:  http://www.mathematik.uni-kl.de/ftp/pub/Math/Factory/factory-2-0-5.tar.gz
+Group:   System Environment/Libraries
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Patch1: factory-2.0.5-gcc34.patch
+Patch2: factory-64bit.patch
 
-BuildRequires:	gmp-devel
+BuildRequires: gmp-devel
 
 %description
 Factory is a C++ class library that implements a recursive representation
@@ -21,11 +22,9 @@
 
 
 %package devel
-Summary: %{summary}
+Summary: C++ class library for multivariate polynomial data 
 Group:   Development/Libraries
 Requires: gmp-devel
-Obsoletes: %{name} < %{epoch}:%{version}-%{release}
-Provides:  %{name} = %{epoch}:%{version}-%{release}
 %description devel
 Factory is a C++ class library that implements a recursive representation
 of multivariate polynomial data.
@@ -35,46 +34,48 @@
 %setup -q -n %{name}
 
 %patch1 -p1 -b .gcc34
+%patch2 -p1 -b .64bit
 
 
 %build
 # Macaulay2's build instructions say to use --disable-streamio
-# *not* using --disable-streamio requires patching for gcc3 anyway.
+# *not* using --disable-streamio requires patching for gcc3+ anyway.
 %configure --disable-streamio
 
 # smp broken?
-make 
+make
 
 
 %install
-rm -rf "$RPM_BUILD_ROOT"
+rm -rf $RPM_BUILD_ROOT
 
 # make install DESTDIR fails
 %makeinstall
 
 
 %clean
-rm -rf "$RPM_BUILD_ROOT"
-
+rm -rf $RPM_BUILD_ROOT
 
-# We're waiting on a shared-lib configuration
-%if 0
-%files
-%doc README NEWS ChangeLog
-%{_libdir}/lib*.so.*
-%endif
 
 %files devel
 %defattr(-,root,root)
-%doc README NEWS ChangeLog
-#{_libdir}/lib*.so
-%{_libdir}/lib*.*a
+%doc ChangeLog COPYING NEWS README NEWS
+%{_libdir}/lib*.a
 %{_includedir}/*
 
 
 %changelog
+* Thu May 26 2005 Jeremy Katz  - 2.0.5-6
+- fix build on 64bit arches
+
+* Sun May 22 2005 Jeremy Katz  - 2.0.5-5
+- rebuild on all arches
+
+* Fri Apr  7 2005 Michael Schwendt 
+- rebuilt
+
 * Wed Oct 06 2004 Rex Dieter  0:2.0.5-3
-- (2nd try at) gcc34 patch 
+- (2nd try at) gcc34 patch
 
 * Wed Oct 06 2004 Rex Dieter  0:2.0.5-0.fdr.2
 - gcc34 patch



From fedora-extras-commits at redhat.com  Wed Sep  7 14:14:08 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Wed,  7 Sep 2005 10:14:08 -0400
Subject: rpms/factory/FC-4 factory.spec,1.10,1.11
Message-ID: <200509071414.j87EE8Jv021548@cvs-int.fedora.redhat.com>

Author: rdieter

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

Modified Files:
	factory.spec 
Log Message:
cleanup, sync branches



Index: factory.spec
===================================================================
RCS file: /cvs/extras/rpms/factory/FC-4/factory.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- factory.spec	26 May 2005 14:36:37 -0000	1.10
+++ factory.spec	7 Sep 2005 14:14:06 -0000	1.11
@@ -9,7 +9,7 @@
 URL:     http://www.mathematik.uni-kl.de/ftp/pub/Math/Factory
 Source:  http://www.mathematik.uni-kl.de/ftp/pub/Math/Factory/factory-2-0-5.tar.gz
 Group:   System Environment/Libraries
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Patch1: factory-2.0.5-gcc34.patch
 Patch2: factory-64bit.patch
@@ -22,11 +22,9 @@
 
 
 %package devel
-Summary: %{summary}
+Summary: C++ class library for multivariate polynomial data 
 Group:   Development/Libraries
 Requires: gmp-devel
-Obsoletes: %{name} < %{version}-%{release}
-Provides:  %{name} = %{version}-%{release}
 %description devel
 Factory is a C++ class library that implements a recursive representation
 of multivariate polynomial data.
@@ -41,7 +39,7 @@
 
 %build
 # Macaulay2's build instructions say to use --disable-streamio
-# *not* using --disable-streamio requires patching for gcc3 anyway.
+# *not* using --disable-streamio requires patching for gcc3+ anyway.
 %configure --disable-streamio
 
 # smp broken?
@@ -49,28 +47,20 @@
 
 
 %install
-rm -rf "$RPM_BUILD_ROOT"
+rm -rf $RPM_BUILD_ROOT
 
 # make install DESTDIR fails
 %makeinstall
 
 
 %clean
-rm -rf "$RPM_BUILD_ROOT"
+rm -rf $RPM_BUILD_ROOT
 
 
-# We're waiting on a shared-lib configuration
-%if 0
-%files
-%doc README NEWS ChangeLog
-%{_libdir}/lib*.so.*
-%endif
-
 %files devel
 %defattr(-,root,root)
-%doc README NEWS ChangeLog
-#{_libdir}/lib*.so
-%{_libdir}/lib*.*a
+%doc ChangeLog COPYING NEWS README NEWS
+%{_libdir}/lib*.a
 %{_includedir}/*
 
 



From fedora-extras-commits at redhat.com  Wed Sep  7 14:14:08 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Wed,  7 Sep 2005 10:14:08 -0400
Subject: rpms/factory/devel factory.spec, 1.11,
	1.12 factory-2.0.5-gcc34.patch, 1.1, NONE
Message-ID: <200509071414.j87EE8cp021552@cvs-int.fedora.redhat.com>

Author: rdieter

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

Modified Files:
	factory.spec 
Removed Files:
	factory-2.0.5-gcc34.patch 
Log Message:
cleanup, sync branches



Index: factory.spec
===================================================================
RCS file: /cvs/extras/rpms/factory/devel/factory.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- factory.spec	8 Aug 2005 15:53:08 -0000	1.11
+++ factory.spec	7 Sep 2005 14:14:06 -0000	1.12
@@ -22,11 +22,9 @@
 
 
 %package devel
-Summary: %{summary}
+Summary: C++ class library for multivariate polynomial data 
 Group:   Development/Libraries
 Requires: gmp-devel
-#Obsoletes: %{name} < %{version}-%{release}
-#Provides:  %{name} = %{version}-%{release}
 %description devel
 Factory is a C++ class library that implements a recursive representation
 of multivariate polynomial data.
@@ -61,7 +59,7 @@
 
 %files devel
 %defattr(-,root,root)
-%doc README NEWS ChangeLog
+%doc ChangeLog COPYING NEWS README NEWS
 %{_libdir}/lib*.a
 %{_includedir}/*
 


--- factory-2.0.5-gcc34.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Sep  7 14:15:00 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Wed,  7 Sep 2005 10:15:00 -0400
Subject: rpms/factory/devel factory-2.0.5-gcc29.patch, NONE,
	1.1 factory-2.0.5-gcc34.patch, 1.2, 1.3
Message-ID: <200509071415.j87EF0oT021592@cvs-int.fedora.redhat.com>

Author: rdieter

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

Added Files:
	factory-2.0.5-gcc29.patch factory-2.0.5-gcc34.patch 
Log Message:
re-add accidentally removed patches


factory-2.0.5-gcc29.patch:

--- NEW FILE factory-2.0.5-gcc29.patch ---
--- factory/memutil.c.gcc29	2004-02-12 06:50:23.000000000 -0600
+++ factory/memutil.c	2004-10-17 21:54:48.000000000 -0500
@@ -87,13 +87,13 @@
 }
 
 void* reallocBlock ( void* block, size_t oldsize, size_t newsize )
-{
+{ void* dummy;
 #if 1
   char* dum = (char*)block - 4;
   int size = *((int*)dum);
   if (newsize <= size) return block;
 #endif
-  void* dummy = getBlock( newsize );
+  dummy = getBlock( newsize );
   memcpy( dummy, block, newsize < oldsize ? newsize : oldsize );
   freeBlock( block, oldsize );
   return dummy;

factory-2.0.5-gcc34.patch:

Index: factory-2.0.5-gcc34.patch
===================================================================
RCS file: factory-2.0.5-gcc34.patch
diff -N factory-2.0.5-gcc34.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ factory-2.0.5-gcc34.patch	7 Sep 2005 14:14:58 -0000	1.3
@@ -0,0 +1,22 @@
+diff -Nur factory-orig/fac_cantzass.cc factory/fac_cantzass.cc
+--- factory-orig/fac_cantzass.cc	2003-02-14 16:53:27.000000000 +0100
++++ factory/fac_cantzass.cc	2004-10-06 22:17:06.453105368 +0200
+@@ -83,10 +83,14 @@
+             G = distinctDegreeFactorFFGF( i.getItem().factor(), q );
+         for ( j = G; j.hasItem(); ++j ) {
+             if ( numext > 0 ) {
+-                if ( numext == 1 )
+-                    HH = CantorZassenhausFactorExt( j.getItem().factor(), j.getItem().exp(), &qq, AlgExtRandomF( alpha ) );
+-                else
+-                    HH = CantorZassenhausFactorExt( j.getItem().factor(), j.getItem().exp(), &qq, AlgExtRandomF( alpha, beta ) );
++	      if ( numext == 1 ) {
++		    AlgExtRandomF tmpalpha( alpha );
++                    HH = CantorZassenhausFactorExt( j.getItem().factor(), j.getItem().exp(), &qq, tmpalpha );
++	      }
++	      else {
++		    AlgExtRandomF tmpalphabeta( alpha, beta );
++                    HH = CantorZassenhausFactorExt( j.getItem().factor(), j.getItem().exp(), &qq, tmpalphabeta );
++	      }
+             }
+             else  if ( galoisfield )
+                 HH = CantorZassenhausFactorFFGF( j.getItem().factor(), j.getItem().exp(), q, GFRandom() );



From fedora-extras-commits at redhat.com  Wed Sep  7 14:58:32 2005
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Wed,  7 Sep 2005 10:58:32 -0400
Subject: extras-buildsys/utils distro-rebuild.py,NONE,1.1
Message-ID: <200509071458.j87EwWqN022311@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys/utils
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22275/utils

Added Files:
	distro-rebuild.py 
Log Message:
2005-09-07  Dan Williams  

    * utils/distro-rebuild.py
		- Script that takes a directory of SRPMs, finds the
			newest ones, adds a ".1" to their Release, then
			queues them up using plague




--- NEW FILE distro-rebuild.py ---
#!/usr/bin/python
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
# GNU Library General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#
# Copyright 2005 Dan Williams  and Red Hat, Inc.


import os, sys
import rpmUtils
import commands
import shutil
import string

class RebuildException(Exception): pass
class EnqueueException(Exception): pass


def first_is_newer(evr1, evr2):
    rc = rpmUtils.miscutils.compareEVR(evr1, evr2)
    if rc == 0:
        # same
        return True
    elif rc > 0:
        return True
    elif rc < 0:
        return False

def find_newest_srpms(path):
    """ Build up a list of the most recent SRPMs in a directory """
    srpm_dict = {}
    for root, dirs, files in os.walk(path):
        for f in files:
            # match the files to what list they should be in
            if not f.endswith('.src.rpm'):
                continue

            fullfile = os.path.join(root, f)
            ts = rpmUtils.transaction.initReadOnlyTransaction()
            hdr = rpmUtils.miscutils.hdrFromPackage(ts, fullfile)
            name = hdr['name']
            ver_dict = { 'name': name, 'evr': (hdr['epoch'], hdr['version'], hdr['release']), 'file': fullfile }
            if not srpm_dict.has_key(name):
                srpm_dict[name] = ver_dict
            else:
                if first_is_newer(ver_dict['evr'], srpm_dict[name]['evr']):
                    srpm_dict[name] = ver_dict
            del hdr
            del ts

    files_dict = {}
    for name in srpm_dict.keys():
        files_dict[name] = srpm_dict[name]['file']
    del srpm_dict
    return files_dict

def rebuild_srpm(name, f):
    # Create a temp dir
    temp_dir = os.path.join("/tmp", "rebuild", name)
    if not os.path.exists(temp_dir):
        os.makedirs(temp_dir)

    # install the srpm in the temp dir
    src_root = os.path.join(temp_dir, "usr", "src", "redhat")
    if not os.path.exists(src_root):
        os.makedirs(src_root)
    cmd = "/bin/rpm -ihv --root %s %s" % (temp_dir, f)
    (s, o) = commands.getstatusoutput(cmd)
    if s != 0:
        raise RebuildError("Could not install srpm %s: %s" % (f, o))

    # find the specfile
    spec_dir = os.path.join(src_root, "SPECS")
    files = os.listdir(spec_dir)
    specfile = None
    for spec in files:
        if spec.endswith(".spec"):
            specfile = os.path.join(spec_dir, spec)
            break
    if not specfile:
        raise RebuildError("Could not locate specfile in %s." % spec_dir)

    src = open(specfile)
    specfile_new = specfile+".new"
    dst = open(specfile_new, "w")
    found = False
    for line in src:
        if line.startswith("Release:"):
            line = string.strip(line) + ".1\n"
            found = True
        dst.write(line)
    dst.close()
    src.close()

    if not found:
        raise RebuildError("Couldn't find Release line in specfile %s." % specfile)

    os.rename(specfile_new, specfile)

    # rebuild the srpm
    cmd = '/usr/bin/rpmbuild -bs --define "_sourcedir %s/usr/src/redhat/SOURCES" ' \
            ' --define "_srcrpmdir %s" %s' % (temp_dir, temp_dir, specfile)
    (s, o) = commands.getstatusoutput(cmd)
    if s != 0:
        raise RebuildException("Could not rebuild srpm %s: %s" % (f, o))

    new_srpm = None
    for line in o.split("\n"):
        if line.startswith("Wrote:"):
            line.replace("\n", "")
            (garbage, path) = line.split(':')
            new_srpm = path.strip()
            break
    if not new_srpm:
        raise RebuildException("Could not find rebuilt SRPM for %s." % specfile)

    # return the file's path
    return (new_srpm, temp_dir)


def enqueue_new_srpm(rebuilt_srpm, target):
    cmd = "/usr/bin/plague-client build %s %s" % (rebuilt_srpm, target)
    (s, o) = commands.getstatusoutput(cmd)
    if s != 0:
        raise EnqueueException("Enqueue command '%s' failed: '\n%s'" % (cmd, o))


def usage(program):
    print "%s  " % program
    print ""


if __name__ == '__main__':
    if len(sys.argv) < 3:
        usage(sys.argv[0])
        sys.exit(1)

    search_dir = os.path.abspath(sys.argv[1])
    if not os.path.exists(search_dir) or not os.access(search_dir, os.R_OK):
        print "Could not access %s" % search_dir
        sys.exit(1)

    target = sys.argv[2]

    # Build up a list of all SRPMs in the specified directory
    files = find_newest_srpms(search_dir)

    # Rebuild and enqueue the packages
    for name in files.keys():
        f = files[name]
        try:
            (rebuilt_srpm, temp_dir_path) = rebuild_srpm(name, f)
        except RebuildException, e:
            shutil.rmtree(temp_dir_path, ignore_errors=True)
            print "RE: %s (%s)" % (f, e)
            continue

        try:
            enqueue_new_srpm(rebuilt_srpm, target)
        except EnqueueException, e:
            shutil.rmtree(temp_dir_path, ignore_errors=True)
            print "EE: %s (%s)" % (rebuilt_srpm, e)
            continue

        shutil.rmtree(temp_dir_path, ignore_errors=True)
        print "OK: %s" % rebuilt_srpm

    sys.exit(0)




From fedora-extras-commits at redhat.com  Wed Sep  7 14:58:31 2005
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Wed,  7 Sep 2005 10:58:31 -0400
Subject: extras-buildsys ChangeLog,1.115,1.116
Message-ID: <200509071459.j87Ex2Fp022356@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22275

Modified Files:
	ChangeLog 
Log Message:
2005-09-07  Dan Williams  

    * utils/distro-rebuild.py
		- Script that takes a directory of SRPMs, finds the
			newest ones, adds a ".1" to their Release, then
			queues them up using plague




Index: ChangeLog
===================================================================
RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -r1.115 -r1.116
--- ChangeLog	1 Sep 2005 20:36:12 -0000	1.115
+++ ChangeLog	7 Sep 2005 14:58:29 -0000	1.116
@@ -1,3 +1,10 @@
+2005-09-07  Dan Williams  
+
+    * utils/distro-rebuild.py
+		- Script that takes a directory of SRPMs, finds the
+			newest ones, adds a ".1" to their Release, then
+			queues them up using plague
+
 2005-09-01  Dan Williams 
 
     * client/client.py



From fedora-extras-commits at redhat.com  Wed Sep  7 15:28:29 2005
From: fedora-extras-commits at redhat.com (Jeff Gilchrist (jeffg))
Date: Wed,  7 Sep 2005 11:28:29 -0400
Subject: rpms/pbzip2 - New directory
Message-ID: <200509071528.j87FSTwe023903@cvs-int.fedora.redhat.com>

Author: jeffg

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

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




From fedora-extras-commits at redhat.com  Wed Sep  7 15:28:30 2005
From: fedora-extras-commits at redhat.com (Jeff Gilchrist (jeffg))
Date: Wed,  7 Sep 2005 11:28:30 -0400
Subject: rpms/pbzip2/devel - New directory
Message-ID: <200509071528.j87FSUGK023908@cvs-int.fedora.redhat.com>

Author: jeffg

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

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




From fedora-extras-commits at redhat.com  Wed Sep  7 15:28:43 2005
From: fedora-extras-commits at redhat.com (Jeff Gilchrist (jeffg))
Date: Wed,  7 Sep 2005 11:28:43 -0400
Subject: rpms/pbzip2 Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200509071528.j87FShPf023963@cvs-int.fedora.redhat.com>

Author: jeffg

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

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


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

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

common : CVS/Root
	@cvs checkout common

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

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


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Wed Sep  7 15:28:43 2005
From: fedora-extras-commits at redhat.com (Jeff Gilchrist (jeffg))
Date: Wed,  7 Sep 2005 11:28:43 -0400
Subject: rpms/pbzip2/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200509071528.j87FShco023968@cvs-int.fedora.redhat.com>

Author: jeffg

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

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


--- NEW FILE .cvsignore ---


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

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Wed Sep  7 15:29:00 2005
From: fedora-extras-commits at redhat.com (Jeff Gilchrist (jeffg))
Date: Wed,  7 Sep 2005 11:29:00 -0400
Subject: rpms/pbzip2 import.log,1.1,1.2
Message-ID: <200509071529.j87FTUZ8024034@cvs-int.fedora.redhat.com>

Author: jeffg

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

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


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/pbzip2/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	7 Sep 2005 15:28:41 -0000	1.1
+++ import.log	7 Sep 2005 15:28:58 -0000	1.2
@@ -0,0 +1 @@
+pbzip2-0_9_4-2:HEAD:pbzip2-0.9.4-2.src.rpm:1126106956



From fedora-extras-commits at redhat.com  Wed Sep  7 15:29:00 2005
From: fedora-extras-commits at redhat.com (Jeff Gilchrist (jeffg))
Date: Wed,  7 Sep 2005 11:29:00 -0400
Subject: rpms/pbzip2/devel pbzip2.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200509071529.j87FTVGL024038@cvs-int.fedora.redhat.com>

Author: jeffg

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

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


--- NEW FILE pbzip2.spec ---
Name:		pbzip2
Version:	0.9.4
Release:	2%{?dist}
Summary:	Parallel implementation of bzip2
URL:		http://www.compression.ca/pbzip2/
License:	BSD
Group:		Applications/File
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:	bzip2-devel
Source0:	http://www.compression.ca/pbzip2/%{name}-%{version}.tar.gz

%description
PBZIP2 is a parallel implementation of the bzip2 block-sorting file
compressor that uses pthreads and achieves near-linear speedup on SMP
machines.  The output of this version is fully compatible with bzip2
v1.0.2 (ie: anything compressed with pbzip2 can be decompressed with
bzip2).


%prep
%setup -q


%build
make


%install
rm -rf %{buildroot}
install -D -m755 %{name} %{buildroot}%{_bindir}/%{name}
install -D -m644 %{name}.1 %{buildroot}%{_mandir}/man1/%{name}.1


%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root)
%doc AUTHORS ChangeLog COPYING README
%{_bindir}/%{name}
%{_mandir}/man1/*


%changelog
* Wed Aug 31 2005 Jeff Gilchrist  - 0.9.4-2
- Release 0.9.4-2

* Tue Aug 30 2005 Jeff Gilchrist  - 0.9.4-1
- Updated RPM spec with suggestions from Oliver Falk

* Fri Jul 29 2005 Bryan Stillwell  - 0.9.3-1
- Release 0.9.3
- Removed non-packaging changelog info
- Added dist macro to release field
- Clean buildroot at the beginning of the install section
- Modified buildroot tag to match with Fedora PackagingGuidelines
- Shortened Requires and BuildRequires list
- Changed description to match with the Debian package

* Sat Mar 12 2005 Jeff Gilchrist  - 0.9.2-1
- Release 0.9.2

* Sat Jan 29 2005 Jeff Gilchrist  - 0.9.1-1
- Release 0.9.1

* Sun Jan 24 2005 Jeff Gilchrist  - 0.9-1
- Release 0.9

* Sun Jan 9 2005 Jeff Gilchrist  - 0.8.3-1
- Release 0.8.3

* Mon Nov 30 2004 Jeff Gilchrist  - 0.8.2-1
- Release 0.8.2

* Sat Nov 27 2004 Jeff Gilchrist  - 0.8.1-1
- Release 0.8.1

* Thu Oct 28 2004 Bryan Stillwell  - 0.8-1
- Initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pbzip2/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	7 Sep 2005 15:28:41 -0000	1.1
+++ .cvsignore	7 Sep 2005 15:28:58 -0000	1.2
@@ -0,0 +1 @@
+pbzip2-0.9.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pbzip2/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	7 Sep 2005 15:28:41 -0000	1.1
+++ sources	7 Sep 2005 15:28:58 -0000	1.2
@@ -0,0 +1 @@
+54d4125b788f5fe7990917256326f844  pbzip2-0.9.4.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep  7 15:34:48 2005
From: fedora-extras-commits at redhat.com (Jeff Gilchrist (jeffg))
Date: Wed,  7 Sep 2005 11:34:48 -0400
Subject: owners owners.list,1.174,1.175
Message-ID: <200509071534.j87FYm9p024114@cvs-int.fedora.redhat.com>

Author: jeffg

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

Modified Files:
	owners.list 
Log Message:
Updated file to add new pbzip2 package



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.174
retrieving revision 1.175
diff -u -r1.174 -r1.175
--- owners.list	7 Sep 2005 10:23:58 -0000	1.174
+++ owners.list	7 Sep 2005 15:34:46 -0000	1.175
@@ -548,6 +548,7 @@
 Fedora Extras|pam_ssh|PAM module for use with SSH keys and ssh-agent|pertusus at free.fr|extras-qa at fedoraproject.org|dmitry at butskoy.name
 Fedora Extras|pan|A GNOME/GTK+ news reader for X|mpeters at mac.com|extras-qa at fedoraproject.org|
 Fedora Extras|parchive|Parity archive command line client|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|pbzip2|Parallel implementation of the bzip2 block-sorting file compressor|jeff.gilchrist at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|pcsc-lite|PC/SC Lite smart card framework and applications|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|pcsc-perl|Perl interface to the PC/SC smart card library|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|pdfjam|Utilities for join, rotate and align PDFs|jpo at di.uminho.pt|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Wed Sep  7 17:58:04 2005
From: fedora-extras-commits at redhat.com (Paul P Komkoff Jr (stingray))
Date: Wed,  7 Sep 2005 13:58:04 -0400
Subject: rpms/flow-tools - New directory
Message-ID: <200509071758.j87Hw4uc027560@cvs-int.fedora.redhat.com>

Author: stingray

Update of /cvs/extras/rpms/flow-tools
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27536/flow-tools

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




From fedora-extras-commits at redhat.com  Wed Sep  7 17:58:05 2005
From: fedora-extras-commits at redhat.com (Paul P Komkoff Jr (stingray))
Date: Wed,  7 Sep 2005 13:58:05 -0400
Subject: rpms/flow-tools/devel - New directory
Message-ID: <200509071758.j87Hw5IF027565@cvs-int.fedora.redhat.com>

Author: stingray

Update of /cvs/extras/rpms/flow-tools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27536/flow-tools/devel

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




From fedora-extras-commits at redhat.com  Wed Sep  7 17:58:49 2005
From: fedora-extras-commits at redhat.com (Paul P Komkoff Jr (stingray))
Date: Wed,  7 Sep 2005 13:58:49 -0400
Subject: rpms/flow-tools Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200509071758.j87Hwnhs027616@cvs-int.fedora.redhat.com>

Author: stingray

Update of /cvs/extras/rpms/flow-tools
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27581

Added Files:
	Makefile import.log 
Log Message:
Setup of module flow-tools


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

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

common : CVS/Root
	@cvs checkout common

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

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


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Wed Sep  7 17:58:49 2005
From: fedora-extras-commits at redhat.com (Paul P Komkoff Jr (stingray))
Date: Wed,  7 Sep 2005 13:58:49 -0400
Subject: rpms/flow-tools/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200509071758.j87HwnV0027621@cvs-int.fedora.redhat.com>

Author: stingray

Update of /cvs/extras/rpms/flow-tools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27581/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module flow-tools


--- NEW FILE .cvsignore ---


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

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Wed Sep  7 18:07:48 2005
From: fedora-extras-commits at redhat.com (Paul P Komkoff Jr (stingray))
Date: Wed,  7 Sep 2005 14:07:48 -0400
Subject: rpms/flow-tools/devel flow-tools-0.68a.patch, NONE,
	1.1 flow-tools.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <200509071807.j87I7mDk028973@cvs-int.fedora.redhat.com>

Author: stingray

Update of /cvs/extras/rpms/flow-tools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28931/devel

Modified Files:
	.cvsignore sources 
Added Files:
	flow-tools-0.68a.patch flow-tools.spec 
Log Message:
auto-import flow-tools-0.68-2 on branch devel from flow-tools-0.68-2.src.rpm

flow-tools-0.68a.patch:

--- NEW FILE flow-tools-0.68a.patch ---
diff -urN flow-tools-0.68/bin/flow-log2rrd flow-tools-0.68.new/bin/flow-log2rrd
--- flow-tools-0.68/bin/flow-log2rrd	2005-05-10 20:53:16.000000000 +0400
+++ flow-tools-0.68.new/bin/flow-log2rrd	2005-08-31 12:24:51.000000000 +0400
@@ -1,4 +1,4 @@
-#!/usr/local/bin/python
+#!/bin/env python
 
 import getopt
 import os
diff -urN flow-tools-0.68/bin/flow-rpt2rrd flow-tools-0.68.new/bin/flow-rpt2rrd
--- flow-tools-0.68/bin/flow-rpt2rrd	2005-05-11 04:11:29.000000000 +0400
+++ flow-tools-0.68.new/bin/flow-rpt2rrd	2005-08-31 12:24:28.000000000 +0400
@@ -1,4 +1,4 @@
-#!/usr/local/bin/python
+#!/bin/env python
 
 import getopt
 import os
diff -urN flow-tools-0.68/bin/flow-rptfmt flow-tools-0.68.new/bin/flow-rptfmt
--- flow-tools-0.68/bin/flow-rptfmt	2005-05-11 16:38:37.000000000 +0400
+++ flow-tools-0.68.new/bin/flow-rptfmt	2005-08-31 12:24:28.000000000 +0400
@@ -1,4 +1,4 @@
-#!/usr/local/bin/python
+#!/bin/env python
 
 import sys
 import string
diff -urN flow-tools-0.68/configs/Makefile.am flow-tools-0.68.new/configs/Makefile.am
--- flow-tools-0.68/configs/Makefile.am	2003-11-25 10:01:37.000000000 +0300
+++ flow-tools-0.68.new/configs/Makefile.am	2005-08-31 12:24:28.000000000 +0400
@@ -1,6 +1,6 @@
-ftsymdir=$(localstatedir)/sym
+ftsymdir=$(sysconfdir)/sym
 ftsym_DATA = ip-prot.sym ip-type.sym tcp-port.sym asn.sym tag.sym
 
-ftcfgdir=$(localstatedir)/cfg
+ftcfgdir=$(sysconfdir)/cfg
 ftcfg_DATA = map.cfg tag.cfg filter.cfg stat.cfg mask.cfg xlate.cfg
 
diff -urN flow-tools-0.68/configure.in flow-tools-0.68.new/configure.in
--- flow-tools-0.68/configure.in	2005-05-11 18:15:48.000000000 +0400
+++ flow-tools-0.68.new/configure.in	2005-08-31 12:24:28.000000000 +0400
@@ -1,31 +1,32 @@
 dnl Process this file with autoconf to produce a configure script.
-AC_INIT(lib/bit1024.c)
+AC_INIT(flow-tools, 0.68)
 
-AC_PREFIX_DEFAULT(/usr/local/netflow)
+AC_PREFIX_DEFAULT(/usr/local/flow-tools)
 
-AM_INIT_AUTOMAKE(flow-tools, 0.68)
-AM_CONFIG_HEADER(lib/ftconfig.h:lib/ftconfig.h.in) 
+AM_INIT_AUTOMAKE
+AM_CONFIG_HEADER(lib/ftconfig.h) 
 
-CFLAGS="-g -Wall"
+dnl CFLAGS="-g -Wall"
 
 dnl Checks for programs.
+AC_PROG_LIBTOOL
 AC_PROG_CC
 AC_PROG_INSTALL
 AC_PROG_MAKE_SET
 AC_PROG_YACC
 YACC="$YACC -d"
-AC_PROG_RANLIB
 AM_PROG_LEX
 
 AC_SUBST(YLIB)
 AC_SUBST(MYSQLLIB)
 AC_SUBST(MYSQLCFLAGS)
-AC_SUBST(MYSQLINCLUDE)
+AC_SUBST(MYSQLLDFLAGS)
 AC_SUBST(PGSQLLIB)
 AC_SUBST(PGSQLCFLAGS)
-AC_SUBST(PGSQLINCLUDE)
+AC_SUBST(PGSQLLDFLAGS)
 AC_SUBST(CRYPTOLIB)
 AC_SUBST(OPENSSLINCLUDE)
+AC_SUBST(OPENSSLLDFLAGS)
 
 dnl extra argument: --with-mysql
 WITH_MYSQL=
@@ -66,37 +67,51 @@
 dnl Checks for libraries.
 
 if test "x$WHERE_MYSQL" != "x"; then
-  LIBS="-L$WHERE_MYSQL/lib/mysql"
+  old_LIBS="$LIBS"
+  old_LDFLAGS="$LDFLAGS"
+  LDFLAGS="$LDFLAGS -L$WHERE_MYSQL/lib/mysql"
   AC_CHECK_LIB(mysqlclient, my_init,
     [
-      MYSQLCFLAGS="-L$WHERE_MYSQL/lib/mysql -I$WHERE_MYSQL/include/mysql"
+      MYSQLCFLAGS="-I$WHERE_MYSQL/include/mysql"
+      MYSQLLDFLAGS="-L$WHERE_MYSQL/lib/mysql"
       MYSQLLIB="-lmysqlclient"
       AC_DEFINE(HAVE_MYSQL)
     ]
   )
+  LIBS="$old_LIBS"
+  LDFLAGS="$old_LDFLAGS"
 fi
 
 if test "x$WHERE_OPENSSL" != "x"; then
-  LIBS="-L$WHERE_OPENSSL/lib"
+  old_LIBS="$LIBS"
+  old_LDFLAGS="$LDFLAGS"
+  LDFLAGS="$LDFLAGS -L$WHERE_OPENSSL/lib"
   AC_CHECK_LIB(crypto, EVP_EncryptUpdate,
     [
-      OPENSSLCFLAGS="-L$WHERE_OPENSSL/lib -I$WHERE_OPENSSL/include"
+      OPENSSLCFLAGS="-I$WHERE_OPENSSL/include"
+      OPENSSLLDFLAGS="-L$WHERE_OPENSSL/lib"
       CRYPTOLIB="-lcrypto"
       AC_DEFINE(HAVE_OPENSSL)
     ]
   )
+  LIBS="$old_LIBS"
+  LDFLAGS="$old_LDFLAGS"
 fi
 
-
 if test "x$WHERE_PGSQL" != "x"; then
-  LIBS="-L$WHERE_PGSQL/lib/pgsql"
+  old_LIBS="$LIBS"
+  old_LDFLAGS="$LDFLAGS"
+  LDFLAGS="-L$WHERE_PGSQL/lib/pgsql"
   AC_CHECK_LIB(pq, PQsetdbLogin,
     [
-      PGSQLCFLAGS="-L$WHERE_PGSQL/lib -I$WHERE_PGSQL/include/pgsql"
+      PGSQLCFLAGS="-I$WHERE_PGSQL/include/pgsql"
+      PGSQLLDFLAGS="-L$WHERE_PGSQL/lib"
       PGSQLLIB="-lpq"
       AC_DEFINE(HAVE_PGSQL)
     ]
   )
+  LIBS="$old_LIBS"
+  LDFLAGS="$old_LDFLAGS"
 fi
 
 AC_CHECK_LIB(y, main,YLIB="$YLIB -ly",)
diff -urN flow-tools-0.68/lib/ftchash.c flow-tools-0.68.new/lib/ftchash.c
--- flow-tools-0.68/lib/ftchash.c	2003-08-12 22:04:25.000000000 +0400
+++ flow-tools-0.68.new/lib/ftchash.c	2005-08-31 12:24:35.000000000 +0400
@@ -326,7 +326,7 @@
       (char*)ftch->traverse_chunk->base+ftch->traverse_chunk->next) {
 
       ret = ftch->traverse_rec;
-      (char*)ftch->traverse_rec += ftch->d_size;
+      ftch->traverse_rec = vpadd(ftch->traverse_rec, ftch->d_size);
       return ret;
 
     } else {
diff -urN flow-tools-0.68/lib/ftfile.c flow-tools-0.68.new/lib/ftfile.c
--- flow-tools-0.68/lib/ftfile.c	2003-02-13 05:38:42.000000000 +0300
+++ flow-tools-0.68.new/lib/ftfile.c	2005-08-31 12:24:35.000000000 +0400
@@ -53,7 +53,7 @@
 
 int load_dir(char *prefix, struct ftfile_entries *fte, int flags, int *depth);
 
-extern int debug;
+#define debug 0
 
 /*
  * function: ftfile_entry_new
diff -urN flow-tools-0.68/lib/ftio.c flow-tools-0.68.new/lib/ftio.c
--- flow-tools-0.68/lib/ftio.c	2003-02-24 03:51:47.000000000 +0300
+++ flow-tools-0.68.new/lib/ftio.c	2005-08-31 12:24:35.000000000 +0400
@@ -2267,7 +2267,7 @@
         break;
 
       nleft -= nread;
-      (char*)ptr += nread;
+      ptr = vpadd(ptr, nread);
   }
   return (nbytes - nleft);
 } /* readn */
@@ -2292,7 +2292,7 @@
       return(nwritten); /* error */
 
     nleft -= nwritten;
-    (char*)ptr += nwritten;
+    ptr =  vpadd(ptr,nwritten);
   }
   return(nbytes - nleft);
 } /* writen */
diff -urN flow-tools-0.68/lib/ftlib.h flow-tools-0.68.new/lib/ftlib.h
--- flow-tools-0.68/lib/ftlib.h	2005-05-10 19:51:33.000000000 +0400
+++ flow-tools-0.68.new/lib/ftlib.h	2005-08-31 12:24:35.000000000 +0400
@@ -152,7 +152,6 @@
 #define FT_PDU_V8_12_MAXFLOWS 44  /* max records in V8 DST_PREFIX_TOS packet */
 #define FT_PDU_V8_13_MAXFLOWS 35  /* max records in V8 PREFIX_TOS packet */
 #define FT_PDU_V8_14_MAXFLOWS 35  /* max records in V8 PREFIX_PORT_TOS packet */
-
 #define FT_PDU_V8_1_VERSION    2  /* version of AS packet */
 #define FT_PDU_V8_2_VERSION    2  /* version of PROTO PORT packet */
 #define FT_PDU_V8_3_VERSION    2  /* version of SRC PREFIX packet */
@@ -3029,6 +3028,8 @@
 #define IN_CLASSD_SSM(i) (((u_int32_t)(i) & 0xff000000) == 0xe8000000)
 #endif /* IN_CLASSD_SSM */
 
+void *vpadd(const void* v, const int change);
+
 /* MACHINE DEPENDANT */
 #define fmt_uint fmt_uint32
 
diff -urN flow-tools-0.68/lib/ftpaths.h.in flow-tools-0.68.new/lib/ftpaths.h.in
--- flow-tools-0.68/lib/ftpaths.h.in	2003-11-11 19:49:14.000000000 +0300
+++ flow-tools-0.68.new/lib/ftpaths.h.in	2005-08-31 12:24:28.000000000 +0400
@@ -29,17 +29,17 @@
 #ifndef FTPATHS_H
 #define FTPATHS_H
 
-#define FT_PATH_CFG_MAP             "@localstatedir@/cfg/map.cfg"
-#define FT_PATH_CFG_TAG             "@localstatedir@/cfg/tag.cfg"
-#define FT_PATH_CFG_FILTER          "@localstatedir@/cfg/filter.cfg"
-#define FT_PATH_CFG_STAT            "@localstatedir@/cfg/stat.cfg"
-#define FT_PATH_CFG_MASK            "@localstatedir@/cfg/mask.cfg"
-#define FT_PATH_CFG_XLATE           "@localstatedir@/cfg/xlate.cfg"
+#define FT_PATH_CFG_MAP             "@sysconfdir@/cfg/map.cfg"
+#define FT_PATH_CFG_TAG             "@sysconfdir@/cfg/tag.cfg"
+#define FT_PATH_CFG_FILTER          "@sysconfdir@/cfg/filter.cfg"
+#define FT_PATH_CFG_STAT            "@sysconfdir@/cfg/stat.cfg"
+#define FT_PATH_CFG_MASK            "@sysconfdir@/cfg/mask.cfg"
+#define FT_PATH_CFG_XLATE           "@sysconfdir@/cfg/xlate.cfg"
 
-#define FT_PATH_SYM_IP_PROT         "@localstatedir@/sym/ip-prot.sym"
-#define FT_PATH_SYM_IP_TYPE         "@localstatedir@/sym/ip-type.sym"
-#define FT_PATH_SYM_TCP_PORT        "@localstatedir@/sym/tcp-port.sym"
-#define FT_PATH_SYM_ASN             "@localstatedir@/sym/asn.sym"
-#define FT_PATH_SYM_TAG             "@localstatedir@/sym/tag.sym"
+#define FT_PATH_SYM_IP_PROT         "@sysconfdir@/sym/ip-prot.sym"
+#define FT_PATH_SYM_IP_TYPE         "@sysconfdir@/sym/ip-type.sym"
+#define FT_PATH_SYM_TCP_PORT        "@sysconfdir@/sym/tcp-port.sym"
+#define FT_PATH_SYM_ASN             "@sysconfdir@/sym/asn.sym"
+#define FT_PATH_SYM_TAG             "@sysconfdir@/sym/tag.sym"
 
 #endif /* FTPATHS_H */
diff -urN flow-tools-0.68/lib/fttlv.c flow-tools-0.68.new/lib/fttlv.c
--- flow-tools-0.68/lib/fttlv.c	2003-02-13 05:38:43.000000000 +0300
+++ flow-tools-0.68.new/lib/fttlv.c	2005-08-31 12:24:35.000000000 +0400
@@ -68,10 +68,10 @@
   }
 
   bcopy(&t, buf, 2);
-  (char*)buf+= 2;
+  buf = vpadd(buf, 2);
 
   bcopy(&len, buf, 2);
-  (char*)buf+= 2;
+  buf = vpadd(buf, 2);
 
   bcopy(&v, buf, 4);
 
@@ -107,10 +107,10 @@
   }
 
   bcopy(&t, buf, 2);
-  (char*)buf+= 2;
+  buf = vpadd(buf, 2);
 
   bcopy(&len, buf, 2);
-  (char*)buf+= 2;
+  buf = vpadd(buf, 2);
 
   bcopy(&v, buf, 2);
 
@@ -145,10 +145,10 @@
   }
 
   bcopy(&t, buf, 2);
-  (char*)buf+= 2;
+  buf = vpadd(buf, 2);
 
   bcopy(&len, buf, 2);
-  (char*)buf+= 2;
+  buf = vpadd(buf, 2);
 
   bcopy(&v, buf, 1);
 
@@ -183,10 +183,10 @@
   }
 
   bcopy(&t, buf, 2);
-  (char*)buf+= 2;
+  buf = vpadd(buf, 2);
 
   bcopy(&len, buf, 2);
-  (char*)buf+= 2;
+  buf = vpadd(buf, 2);
 
   bcopy(v, buf, len);
 
@@ -230,16 +230,16 @@
     return -1;
 
   bcopy(&t, buf, 2);
-  (char*)buf+= 2;
+  buf = vpadd(buf, 2);
 
   bcopy(&len, buf, 2);
-  (char*)buf+= 2;
+  buf = vpadd(buf, 2);
 
   bcopy(&ip, buf, 4);
-  (char*)buf += 4;
+  buf = vpadd(buf, 4);
 
   bcopy(&ifIndex, buf, 2);
-  (char*)buf += 2;
+  buf = vpadd(buf, 2);
 
   bcopy(name, buf, n);
 
@@ -287,19 +287,19 @@
   }
 
   bcopy(&t, buf, 2);
-  (char*)buf+= 2;
+  buf = vpadd(buf, 2);
 
   bcopy(&len, buf, 2);
-  (char*)buf+= 2;
+  buf = vpadd(buf, 2);
 
   bcopy(&ip, buf, 4);
-  (char*)buf += 4;
+  buf = vpadd(buf, 4);
 
   bcopy(&entries, buf, 2);
-  (char*)buf += 2;
+  buf = vpadd(buf, 2);
 
   bcopy(ifIndex_list, buf, esize);
-  (char*)buf += esize;
+  buf = vpadd(buf, esize);
 
   bcopy(name, buf, n);
 
diff -urN flow-tools-0.68/lib/Makefile.am flow-tools-0.68.new/lib/Makefile.am
--- flow-tools-0.68/lib/Makefile.am	2005-05-05 20:00:57.000000000 +0400
+++ flow-tools-0.68.new/lib/Makefile.am	2005-08-31 12:24:35.000000000 +0400
@@ -2,17 +2,17 @@
 
 #AM_CFLAGS=-g -Wall -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wredundant-decls -Wnested-externs
 #AM_CFLAGS=-O2
-AM_CFLAGS=-g -Wall
+#AM_CFLAGS=-g -Wall
 
-DEFS=-I. -I$(srcdir)/lib
+#DEFS=-I. -I$(srcdir)/lib
 
 include_HEADERS = ftlib.h ftqueue.h radix.h ftpaths.h ftconfig.h
-lib_LIBRARIES = libft.a
+lib_LTLIBRARIES = libft.la
 
-libft_a_SOURCES = ftio.c ftswap.c ftencode.c ftdecode.c ftprof.c bit1024.c \
+libft_la_SOURCES = ftio.c ftswap.c ftencode.c ftdecode.c ftprof.c bit1024.c \
  fmt.c support.c ftfile.c fttlv.c ftmap.c ftrec.c fterr.c \
  ftchash.c ftsym.c radix.c fttag.c ftfil.c ftstat.c getdate.c ftxfield.c\
  ftmask.c ftvar.c ftxlate.c
 
-libft_a_LIBADD = @LIBOBJS@ 
+libft_la_LIBADD = $(LTLIBOBJS) $(CRYPTOLIB)
 
diff -urN flow-tools-0.68/lib/support.c flow-tools-0.68.new/lib/support.c
--- flow-tools-0.68/lib/support.c	2003-02-13 05:38:43.000000000 +0300
+++ flow-tools-0.68.new/lib/support.c	2005-08-31 12:24:35.000000000 +0400
@@ -736,3 +736,8 @@
   return sum;
 } /* udp_cksum */
 
+// void pointer add
+
+void * vpadd(const void *v, const int change) {
+  return (void *) (((char*) v) + change);
+}
diff -urN flow-tools-0.68/src/Makefile.am flow-tools-0.68.new/src/Makefile.am
--- flow-tools-0.68/src/Makefile.am	2005-05-06 07:43:41.000000000 +0400
+++ flow-tools-0.68.new/src/Makefile.am	2005-08-31 12:24:28.000000000 +0400
@@ -7,7 +7,7 @@
 
 #AM_CFLAGS=-g -Wall -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wredundant-decls -Wnested-externs
 #AM_CFLAGS=-O2
-AM_CFLAGS=-g -Wall
+#AM_CFLAGS=-g -Wall
 
 bin_PROGRAMS = flow-capture flow-cat flow-stat flow-print flow-dscan \
         flow-send flow-receive flow-gen flow-expire \
@@ -101,9 +101,9 @@
 flow_filter_DEPENDENCIES = ftbuild.h
 
 flow_export_SOURCES = flow-export.c
-flow_export_LDFLAGS = -L../lib
-flow_export_CFLAGS = @MYSQLCFLAGS@ @PGSQLCFLAGS@
-flow_export_LDADD =  -lft @MYSQLLIB@ @PGSQLLIB@
+flow_export_LDFLAGS = -L../lib $(MYSQLLDFLAGS) $(PGSQLLDFLAGS)
+flow_export_CFLAGS = $(MYSQLCFLAGS) $(PGSQLCFLAGS)
+flow_export_LDADD =  -lft $(MYSQLLIB) $(PGSQLLIB)
 flow_export_DEPENDENCIES = ftbuild.h
 
 flow_header_SOURCES = flow-header.c
@@ -117,8 +117,8 @@
 flow_split_DEPENDENCIES = ftbuild.h
 
 flow_xlate_SOURCES = flow-xlate.c
-flow_xlate_LDFLAGS = -L../lib
-flow_xlate_LDADD =  -lft @CRYPTOLIB@
+flow_xlate_LDFLAGS = -L../lib $(CRYPTOLDFLAGS)
+flow_xlate_LDADD =  -lft $(CRYPTOLIB)
 flow_xlate_DEPENDENCIES = ftbuild.h
 
 flow_tag_SOURCES = flow-tag.c


--- NEW FILE flow-tools.spec ---
Version: 0.68
Name: flow-tools
Summary: Tool set for working with NetFlow data
Release: 2%{?dist}
Group: Applications/System
License: BSD 
URL: http://www.splintered.net/sw/flow-tools/
Source0: ftp://ftp.eng.oar.net/pub/flow-tools/flow-tools-%{version}.tar.gz
Patch0: flow-tools-0.68a.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: openssl-devel mysql-devel postgresql-devel autoconf

%description
Flow-tools is library and a collection of programs used to collect, 
send, process, and generate reports from NetFlow data. The tools can be 
used together on a single server or distributed to multiple servers for 
large deployments. The flow-toools library provides an API for development 
of custom applications for NetFlow export versions 1,5,6 and the 14 currently 
defined version 8 subversions. A Perl and Python interface have been 
contributed and are included in the distribution.

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

%description devel
Flow-tools is library and a collection of programs used to collect,
send, process, and generate reports from NetFlow data. The tools can be
used together on a single server or distributed to multiple servers for
large deployments. The flow-toools library provides an API for development
of custom applications for NetFlow export versions 1,5,6 and the 14 currently
defined version 8 subversions. A Perl and Python interface have been
contributed and are included in the distribution.

This package contains header files required to build applications that use
libft.

%prep
%setup -q
%patch -p1

%build
autoreconf -f -i -s
%configure --localstatedir=%{_localstatedir}/ft --sysconfdir=%{_sysconfdir}/flow-tools --enable-static=no --with-mysql --with-pgsql --with-openssl
make RPM_OPT_FLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
%makeinstall localstatedir=$RPM_BUILD_ROOT%{_localstatedir}/ft sysconfdir=$RPM_BUILD_ROOT%{_sysconfdir}/flow-tools
find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/ft

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files 
%defattr(-,root,root)
%doc README TODO COPYING SECURITY ChangeLog docs/*.html
%{_mandir}/man1/*
%{_bindir}/*
%{_libdir}/*.so.*
%dir %{_sysconfdir}/flow-tools/
%dir %{_sysconfdir}/flow-tools/cfg/
%dir %{_sysconfdir}/flow-tools/sym/
%config(noreplace) %{_sysconfdir}/flow-tools/cfg/*
%config(noreplace) %{_sysconfdir}/flow-tools/sym/*
%{_localstatedir}/ft/

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

%changelog
* Tue Sep  6 2005 Tom "spot" Callaway  0.68-2
- simplify %%files
- use more macros
- change Group to Application/System
- own/create %{_localstatedir}/ft/
- add BR: autoconf
- don't need generic INSTALL
- mark config files as such
- own all directories we create
- run ldconfig on post/postun

* Tue Sep  6 2005 Paul P Komkoff Jr  0.68-1
- Submit to fedora-extras
- Change volatile data location to /var/ft and nonvolatile
  to /etc/flow-tools (FHS)
- Make libft shared library
- Split to plain/devel

* Fri Jan  7 2004 William Emmanuel S. Yu 
- updated RPM file for version 0.67

* Tue Aug  8 2003 William Emmanuel S. Yu 
- fixed SQL bug
- update flow-export documentation

* Tue Apr 29 2003 William Emmanuel S. Yu 
- add support for checking null symbols filename

* Fri Apr  4 2003 William Emmanuel S. Yu 
- updated RPM file for version 0.66

* Fri Apr  4 2003 William Emmanuel S. Yu 
- updated RPM file for version 0.65
- included PostgreSQL support patch

* Mon Feb  3 2003 Larry Fahnoe 
- added makefile patches to use RPM_OPT_FLAGS
- added manpages and html files to spec file

* Tue Dec 17 2002 William Emmanuel S. Yu 
- added tagging and ip-port patches

* Thu Dec 12 2002 William Emmanuel S. Yu 
- updated RPM file for version 0.63

* Wed Oct 16 2002 William Emmanuel S. Yu 
- initial creation of RPM file for version 0.62


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/flow-tools/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	7 Sep 2005 17:58:47 -0000	1.1
+++ .cvsignore	7 Sep 2005 18:07:46 -0000	1.2
@@ -0,0 +1 @@
+flow-tools-0.68.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/flow-tools/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	7 Sep 2005 17:58:47 -0000	1.1
+++ sources	7 Sep 2005 18:07:46 -0000	1.2
@@ -0,0 +1 @@
+c9e0a8b53c79611b6bffcb9d510a5a38  flow-tools-0.68.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep  7 18:07:44 2005
From: fedora-extras-commits at redhat.com (Paul P Komkoff Jr (stingray))
Date: Wed,  7 Sep 2005 14:07:44 -0400
Subject: rpms/flow-tools import.log,1.1,1.2
Message-ID: <200509071808.j87I8FQU028978@cvs-int.fedora.redhat.com>

Author: stingray

Update of /cvs/extras/rpms/flow-tools
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28931

Modified Files:
	import.log 
Log Message:
auto-import flow-tools-0.68-2 on branch devel from flow-tools-0.68-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/flow-tools/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	7 Sep 2005 17:58:47 -0000	1.1
+++ import.log	7 Sep 2005 18:07:40 -0000	1.2
@@ -0,0 +1 @@
+flow-tools-0_68-2:HEAD:flow-tools-0.68-2.src.rpm:1126116346



From fedora-extras-commits at redhat.com  Wed Sep  7 18:19:44 2005
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Wed,  7 Sep 2005 14:19:44 -0400
Subject: rpms/yap/FC-4 .cvsignore,1.2,1.3 sources,1.2,1.3 yap.spec,1.8,1.9
Message-ID: <200509071819.j87IJiIe029090@cvs-int.fedora.redhat.com>

Author: gemi

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

Modified Files:
	.cvsignore sources yap.spec 
Log Message:
new version 5.0.0


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/yap/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	12 Feb 2005 00:25:45 -0000	1.2
+++ .cvsignore	7 Sep 2005 18:19:42 -0000	1.3
@@ -1 +1 @@
-Yap-4.5.5.tar.gz
+Yap-5.0.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/yap/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	12 Feb 2005 00:25:46 -0000	1.2
+++ sources	7 Sep 2005 18:19:42 -0000	1.3
@@ -1 +1 @@
-661e289f4bdac0e6cfc7e59d4421c2a8  Yap-4.5.5.tar.gz
+6afe0d720aa91a1191d4fbb8201062ed  Yap-5.0.0.tar.gz


Index: yap.spec
===================================================================
RCS file: /cvs/extras/rpms/yap/FC-4/yap.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- yap.spec	18 Jun 2005 19:04:09 -0000	1.8
+++ yap.spec	7 Sep 2005 18:19:42 -0000	1.9
@@ -1,17 +1,16 @@
 Name:		yap
-Version:	4.5.5
-Release:	6%{?dist}
+Version:	5.0.0
+Release:	1%{?dist}
 
 Summary:	High-performance Prolog Compiler
 
 Group:		Development/Languages
 License:	Artistic/LGPL
-Source:		http://download.sourceforge.net/yap/Yap-4.5.5.tar.gz
-Patch0:		Yap-fix.patch
+Source:		http://www.ncc.up.pt/~vsc/Yap/Yap-5.0/Yap-5.0.0.tar.gz
 Patch1:		Yap-noni386.patch
 URL: 		http://www.ncc.up.pt/~vsc/Yap
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:	readline-devel, gmp-devel
+BuildRequires:	readline-devel, gmp-devel, texinfo
 Requires(post):	  /sbin/install-info
 Requires(postun): /sbin/install-info
 
@@ -24,7 +23,6 @@
 
 %prep
 %setup -q -n Yap-%{version}
-%patch0 -p1
 %patch1 -p1
 
 %build
@@ -33,6 +31,7 @@
 	--enable-max-performance \
 	--enable-depth-limit
 make %{?_smp_mflags}
+(cd docs; make info)
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -61,6 +60,10 @@
 %doc changes*
 %doc docs/*.html
 %doc docs/yap.pdf
+%doc LGPL/pillow/doc/pillow_doc_html/*
+%doc LGPL/pillow/doc/article.ps.gz
+%doc --parent Logtalk/manuals
+%doc --parent Logtalk/examples
 %{_bindir}/yap
 %{_datadir}/Yap
 %{_includedir}/Yap
@@ -69,6 +72,9 @@
 %{_infodir}/*
 
 %changelog
+* Wed Sep  7 2005 Gerard Milmeister  - 5.0.0-1
+- New Version 5.0.0
+
 * Sat Jun 18 2005 Gerard Milmeister  - 4.5.5-5
 - Use %{_prefix}/lib for x86_64
 



From fedora-extras-commits at redhat.com  Wed Sep  7 18:21:31 2005
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Wed,  7 Sep 2005 14:21:31 -0400
Subject: rpms/yap/FC-3 sources,1.2,1.3 yap.spec,1.2,1.3
Message-ID: <200509071821.j87ILVmp029160@cvs-int.fedora.redhat.com>

Author: gemi

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

Modified Files:
	sources yap.spec 
Log Message:
new version 5.0.0


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/yap/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	12 Feb 2005 00:25:46 -0000	1.2
+++ sources	7 Sep 2005 18:21:29 -0000	1.3
@@ -1 +1 @@
-661e289f4bdac0e6cfc7e59d4421c2a8  Yap-4.5.5.tar.gz
+6afe0d720aa91a1191d4fbb8201062ed  Yap-5.0.0.tar.gz


Index: yap.spec
===================================================================
RCS file: /cvs/extras/rpms/yap/FC-3/yap.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- yap.spec	23 Feb 2005 03:27:57 -0000	1.2
+++ yap.spec	7 Sep 2005 18:21:29 -0000	1.3
@@ -1,16 +1,16 @@
-### Package needs review + approval.
 Name:		yap
-Version:	4.5.5
-Release:	1
-Epoch:		0
+Version:	5.0.0
+Release:	1%{?dist}
+
 Summary:	High-performance Prolog Compiler
 
 Group:		Development/Languages
 License:	Artistic/LGPL
-Source:		http://download.sourceforge.net/yap/Yap-4.5.5.tar.gz
+Source:		http://www.ncc.up.pt/~vsc/Yap/Yap-5.0/Yap-5.0.0.tar.gz
+Patch1:		Yap-noni386.patch
 URL: 		http://www.ncc.up.pt/~vsc/Yap
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:	readline-devel, gmp-devel
+BuildRequires:	readline-devel, gmp-devel, texinfo
 Requires(post):	  /sbin/install-info
 Requires(postun): /sbin/install-info
 
@@ -23,6 +23,7 @@
 
 %prep
 %setup -q -n Yap-%{version}
+%patch1 -p1
 
 %build
 %configure \
@@ -30,6 +31,7 @@
 	--enable-max-performance \
 	--enable-depth-limit
 make %{?_smp_mflags}
+(cd docs; make info)
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -43,7 +45,7 @@
 /sbin/install-info %{_infodir}/pillow_doc.info --section "Programming Languages" %{_infodir}/dir 2>/dev/null || :
 
 %postun
-if [ $1 = 0 ]; then
+if [ $1 -eq 0 ]; then
   /sbin/install-info --delete %{_infodir}/yap.info %{_infodir}/dir 2>/dev/null || :
   /sbin/install-info --delete %{_infodir}/pillow_doc.info %{_infodir}/dir 2>/dev/null || :
 fi
@@ -58,14 +60,33 @@
 %doc changes*
 %doc docs/*.html
 %doc docs/yap.pdf
+%doc LGPL/pillow/doc/pillow_doc_html/*
+%doc LGPL/pillow/doc/article.ps.gz
+%doc --parent Logtalk/manuals
+%doc --parent Logtalk/examples
 %{_bindir}/yap
 %{_datadir}/Yap
 %{_includedir}/Yap
-%{_libdir}/libYap.a
-%{_libdir}/Yap
+%{_prefix}/lib/libYap.a
+%{_prefix}/lib/Yap
 %{_infodir}/*
 
 %changelog
+* Wed Sep  7 2005 Gerard Milmeister  - 5.0.0-1
+- New Version 5.0.0
+
+* Sat Jun 18 2005 Gerard Milmeister  - 4.5.5-5
+- Use %{_prefix}/lib for x86_64
+
+* Sat Jun 18 2005 Gerard Milmeister  - 4.5.5-4
+- Fix for non-i386 compilers
+
+* Sat Jun 18 2005 Gerard Milmeister  - 4.5.5-3
+- Compiler fix for FC4
+
+* Fri Apr  7 2005 Michael Schwendt 
+- rebuilt
+
 * Sat Feb 12 2005 Gerard Milmeister  - 0:4.5.5-1
 - New Version 4.5.5
 



From fedora-extras-commits at redhat.com  Wed Sep  7 18:22:53 2005
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Wed,  7 Sep 2005 14:22:53 -0400
Subject: rpms/yap/devel sources,1.2,1.3 yap.spec,1.5,1.6
Message-ID: <200509071822.j87IMr8E029225@cvs-int.fedora.redhat.com>

Author: gemi

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

Modified Files:
	sources yap.spec 
Log Message:
new version 5.0.0


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/yap/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	12 Feb 2005 00:25:46 -0000	1.2
+++ sources	7 Sep 2005 18:22:51 -0000	1.3
@@ -1 +1 @@
-661e289f4bdac0e6cfc7e59d4421c2a8  Yap-4.5.5.tar.gz
+6afe0d720aa91a1191d4fbb8201062ed  Yap-5.0.0.tar.gz


Index: yap.spec
===================================================================
RCS file: /cvs/extras/rpms/yap/devel/yap.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- yap.spec	18 Jun 2005 12:23:21 -0000	1.5
+++ yap.spec	7 Sep 2005 18:22:51 -0000	1.6
@@ -1,16 +1,16 @@
 Name:		yap
-Version:	4.5.5
-Release:	3%{?dist}
+Version:	5.0.0
+Release:	1%{?dist}
 
 Summary:	High-performance Prolog Compiler
 
 Group:		Development/Languages
 License:	Artistic/LGPL
-Source:		http://download.sourceforge.net/yap/Yap-4.5.5.tar.gz
-Patch0:		Yap-fix.patch
+Source:		http://www.ncc.up.pt/~vsc/Yap/Yap-5.0/Yap-5.0.0.tar.gz
+Patch1:		Yap-noni386.patch
 URL: 		http://www.ncc.up.pt/~vsc/Yap
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:	readline-devel, gmp-devel
+BuildRequires:	readline-devel, gmp-devel, texinfo
 Requires(post):	  /sbin/install-info
 Requires(postun): /sbin/install-info
 
@@ -23,7 +23,7 @@
 
 %prep
 %setup -q -n Yap-%{version}
-%patch0 -p1
+%patch1 -p1
 
 %build
 %configure \
@@ -31,6 +31,7 @@
 	--enable-max-performance \
 	--enable-depth-limit
 make %{?_smp_mflags}
+(cd docs; make info)
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -59,14 +60,27 @@
 %doc changes*
 %doc docs/*.html
 %doc docs/yap.pdf
+%doc LGPL/pillow/doc/pillow_doc_html/*
+%doc LGPL/pillow/doc/article.ps.gz
+%doc --parent Logtalk/manuals
+%doc --parent Logtalk/examples
 %{_bindir}/yap
 %{_datadir}/Yap
 %{_includedir}/Yap
-%{_libdir}/libYap.a
-%{_libdir}/Yap
+%{_prefix}/lib/libYap.a
+%{_prefix}/lib/Yap
 %{_infodir}/*
 
 %changelog
+* Wed Sep  7 2005 Gerard Milmeister  - 5.0.0-1
+- New Version 5.0.0
+
+* Sat Jun 18 2005 Gerard Milmeister  - 4.5.5-5
+- Use %{_prefix}/lib for x86_64
+
+* Sat Jun 18 2005 Gerard Milmeister  - 4.5.5-4
+- Fix for non-i386 compilers
+
 * Sat Jun 18 2005 Gerard Milmeister  - 4.5.5-3
 - Compiler fix for FC4
 



From fedora-extras-commits at redhat.com  Wed Sep  7 18:29:35 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Wed,  7 Sep 2005 14:29:35 -0400
Subject: rpms/perl-Class-DBI-mysql - New directory
Message-ID: <200509071829.j87ITZIC029340@cvs-int.fedora.redhat.com>

Author: spot

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

Log Message:
Directory /cvs/extras/rpms/perl-Class-DBI-mysql added to the repository




From fedora-extras-commits at redhat.com  Wed Sep  7 18:29:36 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Wed,  7 Sep 2005 14:29:36 -0400
Subject: rpms/perl-Class-DBI-mysql/devel - New directory
Message-ID: <200509071829.j87ITadj029345@cvs-int.fedora.redhat.com>

Author: spot

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

Log Message:
Directory /cvs/extras/rpms/perl-Class-DBI-mysql/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Sep  7 18:29:51 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Wed,  7 Sep 2005 14:29:51 -0400
Subject: rpms/perl-Class-DBI-mysql Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200509071829.j87ITpdj029400@cvs-int.fedora.redhat.com>

Author: spot

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

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-Class-DBI-mysql


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

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

common : CVS/Root
	@cvs checkout common

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

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


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Wed Sep  7 18:29:52 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Wed,  7 Sep 2005 14:29:52 -0400
Subject: rpms/perl-Class-DBI-mysql/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200509071829.j87ITqWQ029405@cvs-int.fedora.redhat.com>

Author: spot

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

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Class-DBI-mysql


--- NEW FILE .cvsignore ---


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

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Wed Sep  7 18:30:10 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Wed,  7 Sep 2005 14:30:10 -0400
Subject: rpms/perl-Class-DBI-mysql import.log,1.1,1.2
Message-ID: <200509071830.j87IUAdo029476@cvs-int.fedora.redhat.com>

Author: spot

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

Modified Files:
	import.log 
Log Message:
auto-import perl-Class-DBI-mysql-0.23-3 on branch devel from perl-Class-DBI-mysql-0.23-3.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-mysql/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	7 Sep 2005 18:29:49 -0000	1.1
+++ import.log	7 Sep 2005 18:30:08 -0000	1.2
@@ -0,0 +1 @@
+perl-Class-DBI-mysql-0_23-3:HEAD:perl-Class-DBI-mysql-0.23-3.src.rpm:1126117800



From fedora-extras-commits at redhat.com  Wed Sep  7 18:30:10 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Wed,  7 Sep 2005 14:30:10 -0400
Subject: rpms/perl-Class-DBI-mysql/devel perl-Class-DBI-mysql.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200509071830.j87IUAB9029483@cvs-int.fedora.redhat.com>

Author: spot

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

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Class-DBI-mysql.spec 
Log Message:
auto-import perl-Class-DBI-mysql-0.23-3 on branch devel from perl-Class-DBI-mysql-0.23-3.src.rpm


--- NEW FILE perl-Class-DBI-mysql.spec ---
Name:           perl-Class-DBI-mysql
Version:        0.23
Release:        3%{?dist}
Summary:        Extensions to Class::DBI for MySQL
Group:          Development/Libraries
License:        GPL or Artistic
URL:            http://search.cpan.org/dist/Class-DBI-mysql/
Source0:        http://search.cpan.org/CPAN/authors/id/T/TM/TMTM/Class-DBI-mysql-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:	perl(Class::DBI), perl(DBD::mysql)
Requires:  perl(Class::DBI), perl(DBD::mysql), perl(Time::Piece::MySQL)
Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
%{summary}.

%prep
%setup -q -n Class-DBI-mysql-%{version}
perldoc -t perlartistic > Artistic
perldoc -t perlgpl > COPYING

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

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

%check
# Needs a running mysql server.
#make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Artistic COPYING Changes
%{perl_vendorlib}/Class/DBI
%{_mandir}/man3/*.3*


%changelog
* Fri Sep  2 2005 Paul Howarth  0.23-3
- remove redundant BR: perl
- honor %%{_smp_mflags}
- include license text
- add perl(DBD::mysql) and perl(Time::Piece::MySQL) deps

* Fri Jul  8 2005 Tom "spot" Callaway  0.23-2
- cleanups

* Wed Jul  6 2005 Tom "spot" Callaway  0.23-1
- Initial package for Fedora Extras


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-mysql/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	7 Sep 2005 18:29:49 -0000	1.1
+++ .cvsignore	7 Sep 2005 18:30:08 -0000	1.2
@@ -0,0 +1 @@
+Class-DBI-mysql-0.23.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-mysql/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	7 Sep 2005 18:29:49 -0000	1.1
+++ sources	7 Sep 2005 18:30:08 -0000	1.2
@@ -0,0 +1 @@
+6e7c969b87643af08e46053bd538308c  Class-DBI-mysql-0.23.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep  7 18:34:03 2005
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Wed,  7 Sep 2005 14:34:03 -0400
Subject: rpms/yap/FC-3 Yap-noni386.patch,NONE,1.1
Message-ID: <200509071834.j87IY3V3029562@cvs-int.fedora.redhat.com>

Author: gemi

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

Added Files:
	Yap-noni386.patch 
Log Message:


Yap-noni386.patch:

--- NEW FILE Yap-noni386.patch ---
--- Yap-4.5.5/H/absmi.h.noni386	2005-06-18 15:52:24.000000000 +0200
+++ Yap-4.5.5/H/absmi.h	2005-06-18 15:52:34.000000000 +0200
@@ -282,7 +282,7 @@
 
 #define CACHE_A1()	(SREG = (CELL *)ARG1)
 
-#define CACHED_A1()	((CELL)SREG)
+#define CACHED_A1()	SREG
 
 #endif /* S_IN_MEM */
 



From fedora-extras-commits at redhat.com  Wed Sep  7 18:34:47 2005
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Wed,  7 Sep 2005 14:34:47 -0400
Subject: rpms/yap/FC-3 yap.spec,1.3,1.4
Message-ID: <200509071834.j87IYlDZ029587@cvs-int.fedora.redhat.com>

Author: gemi

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

Modified Files:
	yap.spec 
Log Message:



Index: yap.spec
===================================================================
RCS file: /cvs/extras/rpms/yap/FC-3/yap.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- yap.spec	7 Sep 2005 18:21:29 -0000	1.3
+++ yap.spec	7 Sep 2005 18:34:45 -0000	1.4
@@ -1,13 +1,12 @@
 Name:		yap
 Version:	5.0.0
-Release:	1%{?dist}
+Release:	2%{?dist}
 
 Summary:	High-performance Prolog Compiler
 
 Group:		Development/Languages
 License:	Artistic/LGPL
 Source:		http://www.ncc.up.pt/~vsc/Yap/Yap-5.0/Yap-5.0.0.tar.gz
-Patch1:		Yap-noni386.patch
 URL: 		http://www.ncc.up.pt/~vsc/Yap
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	readline-devel, gmp-devel, texinfo
@@ -23,7 +22,6 @@
 
 %prep
 %setup -q -n Yap-%{version}
-%patch1 -p1
 
 %build
 %configure \



From fedora-extras-commits at redhat.com  Wed Sep  7 18:36:14 2005
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Wed,  7 Sep 2005 14:36:14 -0400
Subject: rpms/yap/devel Yap-noni386.patch,NONE,1.1 yap.spec,1.6,1.7
Message-ID: <200509071836.j87IaEDU029658@cvs-int.fedora.redhat.com>

Author: gemi

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

Modified Files:
	yap.spec 
Added Files:
	Yap-noni386.patch 
Log Message:


Yap-noni386.patch:

--- NEW FILE Yap-noni386.patch ---
--- Yap-4.5.5/H/absmi.h.noni386	2005-06-18 15:52:24.000000000 +0200
+++ Yap-4.5.5/H/absmi.h	2005-06-18 15:52:34.000000000 +0200
@@ -282,7 +282,7 @@
 
 #define CACHE_A1()	(SREG = (CELL *)ARG1)
 
-#define CACHED_A1()	((CELL)SREG)
+#define CACHED_A1()	SREG
 
 #endif /* S_IN_MEM */
 


Index: yap.spec
===================================================================
RCS file: /cvs/extras/rpms/yap/devel/yap.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- yap.spec	7 Sep 2005 18:22:51 -0000	1.6
+++ yap.spec	7 Sep 2005 18:36:12 -0000	1.7
@@ -1,6 +1,6 @@
 Name:		yap
 Version:	5.0.0
-Release:	1%{?dist}
+Release:	2%{?dist}
 
 Summary:	High-performance Prolog Compiler
 



From fedora-extras-commits at redhat.com  Wed Sep  7 18:45:56 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Wed,  7 Sep 2005 14:45:56 -0400
Subject: owners owners.list,1.175,1.176
Message-ID: <200509071845.j87Ijuhf029946@cvs-int.fedora.redhat.com>

Author: spot

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

Modified Files:
	owners.list 
Log Message:

perl-Class-DBI-mysql



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.175
retrieving revision 1.176
diff -u -r1.175 -r1.176
--- owners.list	7 Sep 2005 15:34:46 -0000	1.175
+++ owners.list	7 Sep 2005 18:45:54 -0000	1.176
@@ -575,6 +575,7 @@
 Fedora Extras|perl-Class-Container|Perl module for building frameworks of classes|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Class-Data-Inheritable|Inheritable, overridable class data|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Class-DBI|Simple Database Abstraction|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Class-DBI-mysql|Extensions to Class::DBI for MySQL|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Class-DBI-Plugin|Abstract base class for Class::DBI plugins|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Class-DBI-Plugin-Type|Determine type information for columns|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Class-DBI-SQLite|Extension to Class::DBI for sqlite|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Wed Sep  7 18:53:27 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Wed,  7 Sep 2005 14:53:27 -0400
Subject: rpms/perl-Class-DBI-Plugin-RetrieveAll - New directory
Message-ID: <200509071853.j87IrRiJ030196@cvs-int.fedora.redhat.com>

Author: spot

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

Log Message:
Directory /cvs/extras/rpms/perl-Class-DBI-Plugin-RetrieveAll added to the repository




From fedora-extras-commits at redhat.com  Wed Sep  7 18:53:28 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Wed,  7 Sep 2005 14:53:28 -0400
Subject: rpms/perl-Class-DBI-Plugin-RetrieveAll/devel - New directory
Message-ID: <200509071853.j87IrSiO030201@cvs-int.fedora.redhat.com>

Author: spot

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

Log Message:
Directory /cvs/extras/rpms/perl-Class-DBI-Plugin-RetrieveAll/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Sep  7 18:53:41 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Wed,  7 Sep 2005 14:53:41 -0400
Subject: rpms/perl-Class-DBI-Plugin-RetrieveAll Makefile, NONE,
	1.1 import.log, NONE, 1.1
Message-ID: <200509071853.j87IrftA030256@cvs-int.fedora.redhat.com>

Author: spot

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

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-Class-DBI-Plugin-RetrieveAll


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Class-DBI-Plugin-RetrieveAll
all : CVS/Root common-update
	@cvs update

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

common : CVS/Root
	@cvs checkout common

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

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


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Wed Sep  7 18:53:42 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Wed,  7 Sep 2005 14:53:42 -0400
Subject: rpms/perl-Class-DBI-Plugin-RetrieveAll/devel .cvsignore, NONE,
	1.1 Makefile, NONE, 1.1 sources, NONE, 1.1
Message-ID: <200509071853.j87Irgcn030261@cvs-int.fedora.redhat.com>

Author: spot

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

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Class-DBI-Plugin-RetrieveAll


--- NEW FILE .cvsignore ---


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

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Wed Sep  7 18:54:00 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Wed,  7 Sep 2005 14:54:00 -0400
Subject: rpms/perl-Class-DBI-Plugin-RetrieveAll import.log,1.1,1.2
Message-ID: <200509071854.j87IsUO7030328@cvs-int.fedora.redhat.com>

Author: spot

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

Modified Files:
	import.log 
Log Message:
auto-import perl-Class-DBI-Plugin-RetrieveAll-1.01-3 on branch devel from perl-Class-DBI-Plugin-RetrieveAll-1.01-3.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-Plugin-RetrieveAll/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	7 Sep 2005 18:53:39 -0000	1.1
+++ import.log	7 Sep 2005 18:53:58 -0000	1.2
@@ -0,0 +1 @@
+perl-Class-DBI-Plugin-RetrieveAll-1_01-3:HEAD:perl-Class-DBI-Plugin-RetrieveAll-1.01-3.src.rpm:1126119231



From fedora-extras-commits at redhat.com  Wed Sep  7 18:54:00 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Wed,  7 Sep 2005 14:54:00 -0400
Subject: rpms/perl-Class-DBI-Plugin-RetrieveAll/devel
	perl-Class-DBI-Plugin-RetrieveAll.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200509071854.j87IsUNR030332@cvs-int.fedora.redhat.com>

Author: spot

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

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Class-DBI-Plugin-RetrieveAll.spec 
Log Message:
auto-import perl-Class-DBI-Plugin-RetrieveAll-1.01-3 on branch devel from perl-Class-DBI-Plugin-RetrieveAll-1.01-3.src.rpm


--- NEW FILE perl-Class-DBI-Plugin-RetrieveAll.spec ---
Name:           perl-Class-DBI-Plugin-RetrieveAll
Version:        1.01
Release:        3%{?dist}
Summary:        More complex retrieve_all() for Class::DBI
Group:          Development/Libraries
License:        GPL or Artistic
URL:            http://search.cpan.org/dist/Class-DBI-Plugin-RetrieveAll
Source0:        http://search.cpan.org/CPAN/authors/id/T/TM/TMTM/Class-DBI-Plugin-RetrieveAll-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:	perl(Class::DBI::Plugin), perl(DBD::SQLite)
Requires:  perl(Class::DBI::Plugin)
Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
%{summary}.

%prep
%setup -q -n Class-DBI-Plugin-RetrieveAll-%{version}
perldoc -t perlartistic > Artistic
perldoc -t perlgpl > COPYING

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

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

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Artistic COPYING Changes
%{perl_vendorlib}/Class/DBI/Plugin/
%{_mandir}/man3/*.3*


%changelog
* Wed Aug 31 2005 Paul Howarth  1.01-3
- remove redundant BR: perl
- use %%{?_smp_mflags} with make in %%build
- include license text
- add BR: for perl(DBD::SQLite) for %%check

* Fri Jul  8 2005 Tom "spot" Callaway  1.01-2
- cleanups

* Wed Jul  6 2005 Tom "spot" Callaway  1.01-1
- Initial package for Fedora Extras


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-Plugin-RetrieveAll/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	7 Sep 2005 18:53:40 -0000	1.1
+++ .cvsignore	7 Sep 2005 18:53:58 -0000	1.2
@@ -0,0 +1 @@
+Class-DBI-Plugin-RetrieveAll-1.01.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-Plugin-RetrieveAll/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	7 Sep 2005 18:53:40 -0000	1.1
+++ sources	7 Sep 2005 18:53:58 -0000	1.2
@@ -0,0 +1 @@
+27dd0db083dd0127a2704bf55c29b8a8  Class-DBI-Plugin-RetrieveAll-1.01.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep  7 18:56:40 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Wed,  7 Sep 2005 14:56:40 -0400
Subject: owners owners.list,1.176,1.177
Message-ID: <200509071856.j87IueNq030534@cvs-int.fedora.redhat.com>

Author: spot

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

Modified Files:
	owners.list 
Log Message:

perl-Class-DBI-Plugin-RetrieveAll|More complex retrieve_all() for Class::DBI



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.176
retrieving revision 1.177
diff -u -r1.176 -r1.177
--- owners.list	7 Sep 2005 18:45:54 -0000	1.176
+++ owners.list	7 Sep 2005 18:56:37 -0000	1.177
@@ -577,6 +577,7 @@
 Fedora Extras|perl-Class-DBI|Simple Database Abstraction|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Class-DBI-mysql|Extensions to Class::DBI for MySQL|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Class-DBI-Plugin|Abstract base class for Class::DBI plugins|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Class-DBI-Plugin-RetrieveAll|More complex retrieve_all() for Class::DBI|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Class-DBI-Plugin-Type|Determine type information for columns|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Class-DBI-SQLite|Extension to Class::DBI for sqlite|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Class-MethodMaker|Create generic methods for OO Perl|dgregor at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Wed Sep  7 21:05:03 2005
From: fedora-extras-commits at redhat.com (Mark Cox (mjc))
Date: Wed,  7 Sep 2005 17:05:03 -0400
Subject: fedora-security/audit fc4,1.55,1.56
Message-ID: <200509072106.j87L6WrP002350@cvs-int.fedora.redhat.com>

Author: mjc

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2325

Modified Files:
	fc4 
Log Message:
Update now httpd is pushed



Index: fc4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc4,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- fc4	7 Sep 2005 13:17:38 -0000	1.55
+++ fc4	7 Sep 2005 21:04:59 -0000	1.56
@@ -3,6 +3,7 @@
 
 ** are items that need attention
 
+2005-2811 version (net-snmp, not upstream gentoo only)
 2005-2802 version (kernel, fixed 2.6.12) [since FEDORA-2005-510]
 2005-2801 version (kernel, fixed 2.6.11)
 2005-2800 VULNERABLE (kernel)
@@ -10,8 +11,8 @@
 2005-2797 VULNERABLE (openssh, fixed 4.2) #167443
 2005-2796 backport (squid, fixed after 2.5.STABLE10) [since FEDORA-2005-851]
 2005-2794 backport (squid, fixed after 2.5.STABLE10) [since FEDORA-2005-851]
-2005-2728 VULNERABLE (httpd, fixed 2.0.55-dev) #167104
-2005-2700 VULNERABLE (httpd, fixed 2.0.55-dev) #167196
+2005-2728 backport (httpd, fixed 2.0.55-dev) [since FEDORA-2005-849]
+2005-2700 backport (httpd, fixed 2.0.55-dev) [since FEDORA-2005-849]
 2005-2693 backport (cvs) [since FEDORA-2005-790]
 2005-2672 VULNERABLE (lm_sensors) bz#166673
 2005-2666 ** openssh (hmm)



From fedora-extras-commits at redhat.com  Wed Sep  7 21:49:34 2005
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Wed,  7 Sep 2005 17:49:34 -0400
Subject: rpms/perl-Class-Singleton - New directory
Message-ID: <200509072149.j87LnYiY002506@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Class-Singleton
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2482/perl-Class-Singleton

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




From fedora-extras-commits at redhat.com  Wed Sep  7 21:49:35 2005
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Wed,  7 Sep 2005 17:49:35 -0400
Subject: rpms/perl-Class-Singleton/devel - New directory
Message-ID: <200509072149.j87LnZx6002511@cvs-int.fedora.redhat.com>

Author: steve

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

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




From fedora-extras-commits at redhat.com  Wed Sep  7 21:50:00 2005
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Wed,  7 Sep 2005 17:50:00 -0400
Subject: rpms/perl-Class-Singleton Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200509072150.j87Lo0t5002556@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Class-Singleton
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2527

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


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


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Wed Sep  7 21:50:00 2005
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Wed,  7 Sep 2005 17:50:00 -0400
Subject: rpms/perl-Class-Singleton/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200509072150.j87Lo0pQ002561@cvs-int.fedora.redhat.com>

Author: steve

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

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


--- NEW FILE .cvsignore ---


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

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Wed Sep  7 21:50:47 2005
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Wed,  7 Sep 2005 17:50:47 -0400
Subject: rpms/perl-Class-Singleton import.log,1.1,1.2
Message-ID: <200509072151.j87LpHq6002633@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Class-Singleton
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2595

Modified Files:
	import.log 
Log Message:
auto-import perl-Class-Singleton-1.03-1 on branch devel from perl-Class-Singleton-1.03-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-Singleton/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	7 Sep 2005 21:49:57 -0000	1.1
+++ import.log	7 Sep 2005 21:50:45 -0000	1.2
@@ -0,0 +1 @@
+perl-Class-Singleton-1_03-1:HEAD:perl-Class-Singleton-1.03-1.src.rpm:1126129830



From fedora-extras-commits at redhat.com  Wed Sep  7 21:50:48 2005
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Wed,  7 Sep 2005 17:50:48 -0400
Subject: rpms/perl-Class-Singleton/devel perl-Class-Singleton.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200509072151.j87LpIAc002637@cvs-int.fedora.redhat.com>

Author: steve

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

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Class-Singleton.spec 
Log Message:
auto-import perl-Class-Singleton-1.03-1 on branch devel from perl-Class-Singleton-1.03-1.src.rpm


--- NEW FILE perl-Class-Singleton.spec ---
Name:           perl-Class-Singleton
Version:        1.03
Release:        1%{?dist}
Summary:        Class::Singleton Perl module
License:        Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Class-Singleton/
Source0:        http://www.cpan.org/modules/by-module/Class/Class-Singleton-1.03.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
This is the Class::Singleton module. A Singleton describes an object
class that can have only one instance in any system. An example of a
Singleton might be a print spooler or system registry. This module
implements a Singleton class from which other classes can be derived.
By itself, the Class::Singleton module does very little other than
manage the instantiation of a single object. In deriving a class from
Class::Singleton, your module will inherit the Singleton instantiation
method and can implement whatever specific functionality is required.

%prep
%setup -q -n Class-Singleton-%{version}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT

make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT

find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null \;

chmod -R u+rwX,go+rX,go-w $RPM_BUILD_ROOT/*

perldoc -t perlartistic > Artistic

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes README Artistic
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Wed Aug 31 2005 Steven Pritchard  1.03-1
- Specfile autogenerated.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-Singleton/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	7 Sep 2005 21:49:58 -0000	1.1
+++ .cvsignore	7 Sep 2005 21:50:45 -0000	1.2
@@ -0,0 +1 @@
+Class-Singleton-1.03.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-Singleton/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	7 Sep 2005 21:49:58 -0000	1.1
+++ sources	7 Sep 2005 21:50:45 -0000	1.2
@@ -0,0 +1 @@
+80202a57411cb3e939fec327a87564bf  Class-Singleton-1.03.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep  7 23:12:42 2005
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Wed,  7 Sep 2005 19:12:42 -0400
Subject: rpms/gramps/devel .cvsignore, 1.10, 1.11 gramps.spec, 1.11,
	1.12 sources, 1.10, 1.11
Message-ID: <200509072312.j87NCg28005434@cvs-int.fedora.redhat.com>

Author: bpepple

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

Modified Files:
	.cvsignore gramps.spec sources 
Log Message:
* Wed Sep  7 2005 Brian Pepple  - 2.0.8-2
- Update to 2.0.8.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gramps/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	15 Aug 2005 19:33:02 -0000	1.10
+++ .cvsignore	7 Sep 2005 23:12:40 -0000	1.11
@@ -1 +1 @@
-gramps-2.0.6.tar.gz
+gramps-2.0.8.tar.gz


Index: gramps.spec
===================================================================
RCS file: /cvs/extras/rpms/gramps/devel/gramps.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- gramps.spec	17 Aug 2005 13:13:33 -0000	1.11
+++ gramps.spec	7 Sep 2005 23:12:40 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           gramps
-Version:        2.0.6
-Release:        3%{?dist}
+Version:        2.0.8
+Release:        2%{?dist}
 Summary:        Genealogical Research and Analysis Management Programming System
 
 Group:          Applications/Productivity
@@ -112,6 +112,9 @@
 
 
 %changelog
+* Wed Sep  7 2005 Brian Pepple  - 2.0.8-2
+- Update to 2.0.8.
+
 * Wed Aug 17 2005 Brian Pepple  - 2.0.6-3
 - Specify ver for python-reportlab.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gramps/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	15 Aug 2005 19:33:02 -0000	1.10
+++ sources	7 Sep 2005 23:12:40 -0000	1.11
@@ -1 +1 @@
-1df757d3a5269767e705857034068805  gramps-2.0.6.tar.gz
+84f2659b292b5e2abc92a8d56148495b  gramps-2.0.8.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep  7 23:13:46 2005
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Wed,  7 Sep 2005 19:13:46 -0400
Subject: rpms/gramps/FC-4 .cvsignore, 1.10, 1.11 gramps.spec, 1.11,
	1.12 sources, 1.10, 1.11
Message-ID: <200509072313.j87NDkCH005512@cvs-int.fedora.redhat.com>

Author: bpepple

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

Modified Files:
	.cvsignore gramps.spec sources 
Log Message:
* Wed Sep  7 2005 Brian Pepple  - 2.0.8-1
- Update to 2.0.8.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gramps/FC-4/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	15 Aug 2005 19:34:31 -0000	1.10
+++ .cvsignore	7 Sep 2005 23:13:44 -0000	1.11
@@ -1 +1 @@
-gramps-2.0.6.tar.gz
+gramps-2.0.8.tar.gz


Index: gramps.spec
===================================================================
RCS file: /cvs/extras/rpms/gramps/FC-4/gramps.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- gramps.spec	17 Aug 2005 13:11:15 -0000	1.11
+++ gramps.spec	7 Sep 2005 23:13:44 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           gramps
-Version:        2.0.6
-Release:        2%{?dist}
+Version:        2.0.8
+Release:        1%{?dist}
 Summary:        Genealogical Research and Analysis Management Programming System
 
 Group:          Applications/Productivity
@@ -112,6 +112,9 @@
 
 
 %changelog
+* Wed Sep  7 2005 Brian Pepple  - 2.0.8-1
+- Update to 2.0.8.
+
 * Wed Aug 17 2005 Brian Pepple  - 2.0.6-2
 - Specify ver for python-reportlab.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gramps/FC-4/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	15 Aug 2005 19:34:31 -0000	1.10
+++ sources	7 Sep 2005 23:13:44 -0000	1.11
@@ -1 +1 @@
-1df757d3a5269767e705857034068805  gramps-2.0.6.tar.gz
+84f2659b292b5e2abc92a8d56148495b  gramps-2.0.8.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep  8 05:14:31 2005
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Thu,  8 Sep 2005 01:14:31 -0400
Subject: rpms/nethack/devel nethack-3.4.3-x11.patch, NONE, 1.1 nethack.spec,
	1.2, 1.3
Message-ID: <200509080514.j885EV7x013866@cvs-int.fedora.redhat.com>

Author: lmacken

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

Modified Files:
	nethack.spec 
Added Files:
	nethack-3.4.3-x11.patch 
Log Message:
- Enable x11 support (Bug #167523)


nethack-3.4.3-x11.patch:

--- NEW FILE nethack-3.4.3-x11.patch ---
--- sys/unix/Makefile.top.orig	2005-06-24 21:11:44.000000000 -0400
+++ sys/unix/Makefile.top	2005-06-24 21:12:06.000000000 -0400
@@ -40,9 +40,8 @@
 SHELLDIR = $(PREFIX)/games
 
 # per discussion in Install.X11 and Install.Qt
-VARDATND = 
 # VARDATND = x11tiles NetHack.ad pet_mark.xbm
-# VARDATND = x11tiles NetHack.ad pet_mark.xbm rip.xpm
+VARDATND = x11tiles NetHack.ad pet_mark.xbm rip.xpm
 # for Atari/Gem
 # VARDATND = nh16.img title.img GEM_RSC.RSC rip.img
 # for BeOS
--- include/config.h.orig	2005-06-24 21:12:38.000000000 -0400
+++ include/config.h	2005-06-24 21:13:36.000000000 -0400
@@ -43,7 +43,7 @@
  * Some combinations make no sense.  See the installation document.
  */
 #define TTY_GRAPHICS	/* good old tty based graphics */
-/* #define X11_GRAPHICS */	/* X11 interface */
+#define X11_GRAPHICS	/* X11 interface */
 /* #define QT_GRAPHICS */	/* Qt interface */
 /* #define GNOME_GRAPHICS */	/* Gnome interface */
 /* #define MSWIN_GRAPHICS */	/* Windows NT, CE, Graphics */
@@ -126,7 +126,7 @@
  * would allow:
  *  xpmtoppm x11tiles_big.xpm
  */
-/* # define USE_XPM */		/* Disable if you do not have the XPM library */
+# define USE_XPM		/* Disable if you do not have the XPM library */
 # ifdef USE_XPM
 #  define GRAPHIC_TOMBSTONE	/* Use graphical tombstone (rip.xpm) */
 # endif
--- sys/unix/Makefile.src.orig	2005-06-24 21:14:49.000000000 -0400
+++ sys/unix/Makefile.src	2005-06-24 21:15:32.000000000 -0400
@@ -214,8 +214,8 @@
 
 #
 #
-WINSRC = $(WINTTYSRC)
-WINOBJ = $(WINTTYOBJ)
+WINSRC = $(WINTTYSRC) $(WINX11SRC)
+WINOBJ = $(WINTTYOBJ) $(WINX11OBJ)
 
 # on some systems the termcap library is in -ltermcap or -lcurses
 # on 386 Xenix, the -ltermlib tputs() seems not to work; use -lcurses instead
@@ -235,7 +235,7 @@
 #
 # libraries for X11
 # If USE_XPM is defined in config.h, you will also need -lXpm here.
-WINX11LIB = -lXaw -lXmu -lXext -lXt -lX11
+WINX11LIB = -lXaw -lXmu -lXext -lXt -lX11 -lXpm
 # WINX11LIB = -lXaw -lXmu -lXt -lX11
 # WINX11LIB = -lXaw -lXmu -lXext -lXt -lXpm -lX11 -lm
 # WINX11LIB = -lXaw -lXmu -lXpm -lXext -lXt -lX11 -lSM -lICE -lm # BSD/OS 2.0
@@ -255,7 +255,7 @@
 # libraries for BeOS 
 WINBELIB = -lbe
 
-WINLIB = $(WINTTYLIB)
+WINLIB = $(WINTTYLIB) $(WINX11LIB)
 
 # any other strange libraries your system needs (for Sysunix only -- the more
 # specialized targets should already be right)


Index: nethack.spec
===================================================================
RCS file: /cvs/extras/rpms/nethack/devel/nethack.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- nethack.spec	16 Aug 2005 17:08:58 -0000	1.2
+++ nethack.spec	8 Sep 2005 05:14:29 -0000	1.3
@@ -3,7 +3,7 @@
 
 Name:           nethack
 Version:        3.4.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A rogue-like single player dungeon exploration game
 
 Group:          Amusements/Games
@@ -13,9 +13,13 @@
 Source1:        %{name}.desktop
 Patch0:         %{name}-%{version}-makefile.patch
 Patch1:         %{name}-%{version}-config.patch
+Patch2:         %{name}-%{version}-x11.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  ncurses-devel, bison, flex, desktop-file-utils
+BuildRequires:  ncurses-devel
+BuildRequires:  bison, flex, desktop-file-utils
+BuildRequires:  xorg-x11-devel, xorg-x11-font-utils
+
 Obsoletes:      nethack-falconseye <= 1.9.4-6.a
 
 
@@ -39,6 +43,7 @@
 %setup -q
 %patch0 -b .makefile
 %patch1 -b .config
+%patch2 -b .x11
 (source sys/unix/setup.sh)
 
 # Set our paths
@@ -81,6 +86,17 @@
         --add-category Game \
         %{SOURCE1}
 
+# Install the fonts for the X11 interface
+cd win/X11
+bdftopcf -o nh10.pcf nh10.bdf
+bdftopcf -o ibm.pcf ibm.bdf
+install -D ibm.pcf $RPM_BUILD_ROOT%{nhgamedir}/fonts/ibm.pcf
+install -D nh10.pcf $RPM_BUILD_ROOT%{nhgamedir}/fonts/nh10.pcf
+mkfontdir $RPM_BUILD_ROOT%{nhgamedir}/fonts
+
+%{__sed} -i -e 's:^!\(NetHack.tile_file.*\):\1:' \
+        $RPM_BUILD_ROOT%{nhgamedir}/NetHack.ad
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -96,6 +112,11 @@
 %{nhgamedir}/nhdat
 %{_bindir}/nethack
 %{_bindir}/nethack-recover
+%{nhgamedir}/NetHack.ad
+%{nhgamedir}/pet_mark.xbm
+%{nhgamedir}/rip.xpm
+%{nhgamedir}/x11tiles
+%{nhgamedir}/fonts/*
 %defattr(0664,root,games)
 %config(noreplace) %{nhdatadir}/record
 %config(noreplace) %{nhdatadir}/perm
@@ -106,5 +127,8 @@
 
 
 %changelog
+* Tue Sep 06 2005 Luke Macken  3.4.3-2
+- Enable x11 support
+
 * Sun Jul 10 2005 Luke Macken  3.4.3-1
 - Initial package for Fedora Extras



From fedora-extras-commits at redhat.com  Thu Sep  8 05:50:35 2005
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Thu,  8 Sep 2005 01:50:35 -0400
Subject: rpms/nethack/devel nethack.spec,1.3,1.4
Message-ID: <200509080550.j885oZ8E014033@cvs-int.fedora.redhat.com>

Author: lmacken

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

Modified Files:
	nethack.spec 
Log Message:
- Few minor changes thanks to Ville Skytt??



Index: nethack.spec
===================================================================
RCS file: /cvs/extras/rpms/nethack/devel/nethack.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- nethack.spec	8 Sep 2005 05:14:29 -0000	1.3
+++ nethack.spec	8 Sep 2005 05:50:33 -0000	1.4
@@ -90,8 +90,8 @@
 cd win/X11
 bdftopcf -o nh10.pcf nh10.bdf
 bdftopcf -o ibm.pcf ibm.bdf
-install -D ibm.pcf $RPM_BUILD_ROOT%{nhgamedir}/fonts/ibm.pcf
-install -D nh10.pcf $RPM_BUILD_ROOT%{nhgamedir}/fonts/nh10.pcf
+install -D -p -m 644 ibm.pcf $RPM_BUILD_ROOT%{nhgamedir}/fonts/ibm.pcf
+install -D -p -m 644 nh10.pcf $RPM_BUILD_ROOT%{nhgamedir}/fonts/nh10.pcf
 mkfontdir $RPM_BUILD_ROOT%{nhgamedir}/fonts
 
 %{__sed} -i -e 's:^!\(NetHack.tile_file.*\):\1:' \
@@ -116,7 +116,7 @@
 %{nhgamedir}/pet_mark.xbm
 %{nhgamedir}/rip.xpm
 %{nhgamedir}/x11tiles
-%{nhgamedir}/fonts/*
+%{nhgamedir}/fonts/
 %defattr(0664,root,games)
 %config(noreplace) %{nhdatadir}/record
 %config(noreplace) %{nhdatadir}/perm



From fedora-extras-commits at redhat.com  Thu Sep  8 06:08:20 2005
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Thu,  8 Sep 2005 02:08:20 -0400
Subject: rpms/nethack/devel nethack-3.4.3-makefile.patch,1.2,1.3
Message-ID: <200509080608.j8868Kce015387@cvs-int.fedora.redhat.com>

Author: lmacken

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

Modified Files:
	nethack-3.4.3-makefile.patch 
Log Message:
- Add /usr/X11R6/lib64 to LFLAGS to [hopefully] fix compilation errors on x86_64


nethack-3.4.3-makefile.patch:

Index: nethack-3.4.3-makefile.patch
===================================================================
RCS file: /cvs/extras/rpms/nethack/devel/nethack-3.4.3-makefile.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- nethack-3.4.3-makefile.patch	16 Aug 2005 17:08:58 -0000	1.2
+++ nethack-3.4.3-makefile.patch	8 Sep 2005 06:08:18 -0000	1.3
@@ -7,7 +7,7 @@
 -# CFLAGS = -O2 -fomit-frame-pointer -I../include
 -# LFLAGS = -L/usr/X11R6/lib
 +CFLAGS = $(RPM_OPT_FLAGS) -I../include
-+LFLAGS = -L/usr/X11R6/lib
++LFLAGS = -L/usr/X11R6/lib -L/usr/X11R6/lib64
  #   OR compile backwards compatible a.out format
  # CFLAGS = -O2 -b i486-linuxaout -fomit-frame-pointer -I../include
  # LFLAGS = -b i486-linuxaout -L/usr/X11R6/lib



From fedora-extras-commits at redhat.com  Thu Sep  8 06:21:37 2005
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Thu,  8 Sep 2005 02:21:37 -0400
Subject: rpms/nethack/devel nethack-3.4.3-makefile.patch, 1.3,
	1.4 nethack.spec, 1.4, 1.5
Message-ID: <200509080621.j886LbOQ015486@cvs-int.fedora.redhat.com>

Author: lmacken

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

Modified Files:
	nethack-3.4.3-makefile.patch nethack.spec 
Log Message:
- Regress hardcoding of lib64 path in makefile, and add correct path using %{_lib} during %prep


nethack-3.4.3-makefile.patch:

Index: nethack-3.4.3-makefile.patch
===================================================================
RCS file: /cvs/extras/rpms/nethack/devel/nethack-3.4.3-makefile.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- nethack-3.4.3-makefile.patch	8 Sep 2005 06:08:18 -0000	1.3
+++ nethack-3.4.3-makefile.patch	8 Sep 2005 06:21:35 -0000	1.4
@@ -7,7 +7,7 @@
 -# CFLAGS = -O2 -fomit-frame-pointer -I../include
 -# LFLAGS = -L/usr/X11R6/lib
 +CFLAGS = $(RPM_OPT_FLAGS) -I../include
-+LFLAGS = -L/usr/X11R6/lib -L/usr/X11R6/lib64
++LFLAGS = -L/usr/X11R6/lib
  #   OR compile backwards compatible a.out format
  # CFLAGS = -O2 -b i486-linuxaout -fomit-frame-pointer -I../include
  # LFLAGS = -b i486-linuxaout -L/usr/X11R6/lib


Index: nethack.spec
===================================================================
RCS file: /cvs/extras/rpms/nethack/devel/nethack.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- nethack.spec	8 Sep 2005 05:50:33 -0000	1.4
+++ nethack.spec	8 Sep 2005 06:21:35 -0000	1.5
@@ -54,6 +54,10 @@
 %{__sed} -i -e "s:/usr/games/lib/nethackdir:%{nhgamedir}:" \
         doc/nethack.6 doc/nethack.txt doc/recover.6 doc/recover.txt
 
+# Point the linker in the right direction
+%{__sed} -i -e "s:-L/usr/X11R6/lib:-L/usr/X11R6/%{_lib}:" \
+        src/Makefile util/Makefile
+
 
 %build
 make all



From fedora-extras-commits at redhat.com  Thu Sep  8 06:37:04 2005
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Thu,  8 Sep 2005 02:37:04 -0400
Subject: rpms/nethack/devel nethack.spec,1.5,1.6
Message-ID: <200509080637.j886b45N015601@cvs-int.fedora.redhat.com>

Author: lmacken

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

Modified Files:
	nethack.spec 
Log Message:
- Rev bump



Index: nethack.spec
===================================================================
RCS file: /cvs/extras/rpms/nethack/devel/nethack.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- nethack.spec	8 Sep 2005 06:21:35 -0000	1.5
+++ nethack.spec	8 Sep 2005 06:37:02 -0000	1.6
@@ -3,7 +3,7 @@
 
 Name:           nethack
 Version:        3.4.3
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A rogue-like single player dungeon exploration game
 
 Group:          Amusements/Games
@@ -131,6 +131,9 @@
 
 
 %changelog
+* Thu Sep 08 2005 Luke Macken  3.4.3-3
+- Point linker in the right direction using %{_lib} to fix x86_64 build issues
+
 * Tue Sep 06 2005 Luke Macken  3.4.3-2
 - Enable x11 support
 



From fedora-extras-commits at redhat.com  Thu Sep  8 08:39:54 2005
From: fedora-extras-commits at redhat.com (Paul P Komkoff Jr (stingray))
Date: Thu,  8 Sep 2005 04:39:54 -0400
Subject: owners owners.list,1.177,1.178
Message-ID: <200509080839.j888dsfk018954@cvs-int.fedora.redhat.com>

Author: stingray

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

Modified Files:
	owners.list 
Log Message:
Add flow-tools: Tool set for working with NetFlow data



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.177
retrieving revision 1.178
diff -u -r1.177 -r1.178
--- owners.list	7 Sep 2005 18:56:37 -0000	1.177
+++ owners.list	8 Sep 2005 08:39:51 -0000	1.178
@@ -170,6 +170,7 @@
 Fedora Extras|firestarter|The Firestarter firewall tool for GNOME|compton at pcompton.com|extras-qa at fedoraproject.org|
 Fedora Extras|fish|A friendly interactive shell|liljencrantz at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|flim|Emacs library for handling email messages|petersen at redhat.com|extras-qa at fedoraproject.org|
+Fedora Extras|flow-tools|Tool set for working with NetFlow data|i at stingr.net|extras-qa at fedoraproject.org|
 Fedora Extras|fltk|A C++ user interface toolkit for X11, Win32, and MacOS X|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
 Fedora Extras|flumotion|flumotion - the Fluendo Streaming Server|thomas at apestaart.org|extras-qa at fedoraproject.org|
 Fedora Extras|fluxbox|Fluxbox is a windowmanager that is based on Blackbox|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Thu Sep  8 12:51:16 2005
From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten))
Date: Thu,  8 Sep 2005 08:51:16 -0400
Subject: devel/x3270 x3270.spec,1.7,1.8
Message-ID: <200509081251.j88CpGMW025183@cvs-int.fedora.redhat.com>

Author: karsten

Update of /cvs/extras/devel/x3270
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25164

Modified Files:
	x3270.spec 
Log Message:
> - add missing buildrequires so that x3270 will be built with SSL support
>   (#159527)



Index: x3270.spec
===================================================================
RCS file: /cvs/extras/devel/x3270/x3270.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- x3270.spec	20 Jul 2005 12:09:12 -0000	1.7
+++ x3270.spec	8 Sep 2005 12:51:14 -0000	1.8
@@ -5,7 +5,7 @@
 Summary: An X Window System based IBM 3278/3279 terminal emulator
 Name: x3270
 Version: 3.3.4
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: MIT
 Group: Applications/Internet
 URL: http://www.geocities.com/SiliconValley/Peaks/7814
@@ -20,7 +20,7 @@
 Patch4: x3270-3.3-syntax.patch
 Patch5: x3270-3.3-encoding.patch
 Prereq:  %{_prefix}/X11R6/bin/mkfontdir
-BuildPreReq: ncurses-devel readline-devel glibc-devel
+BuildPreReq: ncurses-devel readline-devel glibc-devel openssl-devel
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 %if %{desktop_file}
 Requires: /usr/bin/desktop-file-install
@@ -197,6 +197,10 @@
 %{_mandir}/man1/c3270*
 
 %changelog
+* Thu Sep 08 2005 Karsten Hopp  3.3.4-5
+- add missing buildrequires so that x3270 will be built with SSL support
+  (#159527)
+
 * Wed Jul 20 2005 Karsten Hopp  3.3.4-4
 - buildrequires xorg-x11-font-utils (#160737)
 - add disttag



From fedora-extras-commits at redhat.com  Thu Sep  8 15:08:40 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Thu,  8 Sep 2005 11:08:40 -0400
Subject: rpms/perl-Class-DBI-Pager/devel - New directory
Message-ID: <200509081508.j88F8eJI029620@cvs-int.fedora.redhat.com>

Author: spot

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

Log Message:
Directory /cvs/extras/rpms/perl-Class-DBI-Pager/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Sep  8 15:08:37 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Thu,  8 Sep 2005 11:08:37 -0400
Subject: rpms/perl-Class-DBI-Pager - New directory
Message-ID: <200509081508.j88F8bL7029601@cvs-int.fedora.redhat.com>

Author: spot

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

Log Message:
Directory /cvs/extras/rpms/perl-Class-DBI-Pager added to the repository




From fedora-extras-commits at redhat.com  Thu Sep  8 15:09:04 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Thu,  8 Sep 2005 11:09:04 -0400
Subject: rpms/perl-Class-DBI-Pager Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200509081509.j88F94eH029681@cvs-int.fedora.redhat.com>

Author: spot

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

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-Class-DBI-Pager


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

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

common : CVS/Root
	@cvs checkout common

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

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


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Thu Sep  8 15:09:04 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Thu,  8 Sep 2005 11:09:04 -0400
Subject: rpms/perl-Class-DBI-Pager/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200509081509.j88F94kn029686@cvs-int.fedora.redhat.com>

Author: spot

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

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Class-DBI-Pager


--- NEW FILE .cvsignore ---


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

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Thu Sep  8 15:09:30 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Thu,  8 Sep 2005 11:09:30 -0400
Subject: rpms/perl-Class-DBI-Pager import.log,1.1,1.2
Message-ID: <200509081510.j88FA02V029752@cvs-int.fedora.redhat.com>

Author: spot

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

Modified Files:
	import.log 
Log Message:
auto-import perl-Class-DBI-Pager-0.06-3 on branch devel from perl-Class-DBI-Pager-0.06-3.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-Pager/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	8 Sep 2005 15:09:02 -0000	1.1
+++ import.log	8 Sep 2005 15:09:28 -0000	1.2
@@ -0,0 +1 @@
+perl-Class-DBI-Pager-0_06-3:HEAD:perl-Class-DBI-Pager-0.06-3.src.rpm:1126192162



From fedora-extras-commits at redhat.com  Thu Sep  8 15:09:30 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Thu,  8 Sep 2005 11:09:30 -0400
Subject: rpms/perl-Class-DBI-Pager/devel perl-Class-DBI-Pager.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200509081510.j88FA1JT029756@cvs-int.fedora.redhat.com>

Author: spot

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

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Class-DBI-Pager.spec 
Log Message:
auto-import perl-Class-DBI-Pager-0.06-3 on branch devel from perl-Class-DBI-Pager-0.06-3.src.rpm


--- NEW FILE perl-Class-DBI-Pager.spec ---
Name:           perl-Class-DBI-Pager
Version:        0.06
Release:        3%{?dist}
Summary:        Pager utility for Class::DBI
Group:          Development/Libraries
License:        GPL or Artistic
URL:            http://search.cpan.org/dist/Class-DBI-Pager
Source0:        http://search.cpan.org/CPAN/authors/id/M/MI/MIYAGAWA/Class-DBI-Pager-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:	perl(Class::DBI), perl(Data::Page), perl(Exporter::Lite), perl(DBD::SQLite)
Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
%{summary}.

%prep
%setup -q -n Class-DBI-Pager-%{version}
perldoc -t perlartistic > Artistic
perldoc -t perlgpl > COPYING

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

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

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Artistic COPYING Changes
%{perl_vendorlib}/Class/DBI
%{_mandir}/man3/*.3*


%changelog
* Mon Sep  5 2005 Paul Howarth  0.06-3
- remove redundant BR: perl
- add BR: perl(Data::Page), perl(Exporter::Lite), perl(DBD::SQLite)
- honor %%{_smp_mflags}
- include license text
- remove explicit perl(Class::DBI) dep - it's autodetected

* Fri Jul  8 2005 Tom "spot" Callaway  0.06-2
- cleanups

* Wed Jul  6 2005 Tom "spot" Callaway  0.06-1
- Initial package for Fedora Extras


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-Pager/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	8 Sep 2005 15:09:02 -0000	1.1
+++ .cvsignore	8 Sep 2005 15:09:28 -0000	1.2
@@ -0,0 +1 @@
+Class-DBI-Pager-0.06.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-Pager/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	8 Sep 2005 15:09:02 -0000	1.1
+++ sources	8 Sep 2005 15:09:28 -0000	1.2
@@ -0,0 +1 @@
+358429211e6264779d37834ecf728ac1  Class-DBI-Pager-0.06.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep  8 15:14:48 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Thu,  8 Sep 2005 11:14:48 -0400
Subject: rpms/perl-Class-DBI-AbstractSearch - New directory
Message-ID: <200509081514.j88FEmfn030068@cvs-int.fedora.redhat.com>

Author: spot

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

Log Message:
Directory /cvs/extras/rpms/perl-Class-DBI-AbstractSearch added to the repository




From fedora-extras-commits at redhat.com  Thu Sep  8 15:14:49 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Thu,  8 Sep 2005 11:14:49 -0400
Subject: rpms/perl-Class-DBI-AbstractSearch/devel - New directory
Message-ID: <200509081514.j88FEneA030073@cvs-int.fedora.redhat.com>

Author: spot

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

Log Message:
Directory /cvs/extras/rpms/perl-Class-DBI-AbstractSearch/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Sep  8 15:14:59 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Thu,  8 Sep 2005 11:14:59 -0400
Subject: rpms/perl-Class-DBI-AbstractSearch Makefile, NONE, 1.1 import.log,
	NONE, 1.1
Message-ID: <200509081514.j88FExpr030124@cvs-int.fedora.redhat.com>

Author: spot

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

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-Class-DBI-AbstractSearch


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

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

common : CVS/Root
	@cvs checkout common

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

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


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Thu Sep  8 15:15:00 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Thu,  8 Sep 2005 11:15:00 -0400
Subject: rpms/perl-Class-DBI-AbstractSearch/devel .cvsignore, NONE,
	1.1 Makefile, NONE, 1.1 sources, NONE, 1.1
Message-ID: <200509081515.j88FF06S030129@cvs-int.fedora.redhat.com>

Author: spot

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

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Class-DBI-AbstractSearch


--- NEW FILE .cvsignore ---


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

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Thu Sep  8 15:15:24 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Thu,  8 Sep 2005 11:15:24 -0400
Subject: rpms/perl-Class-DBI-AbstractSearch import.log,1.1,1.2
Message-ID: <200509081515.j88FFO9J030194@cvs-int.fedora.redhat.com>

Author: spot

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

Modified Files:
	import.log 
Log Message:
auto-import perl-Class-DBI-AbstractSearch-0.05-3 on branch devel from perl-Class-DBI-AbstractSearch-0.05-3.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-AbstractSearch/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	8 Sep 2005 15:14:57 -0000	1.1
+++ import.log	8 Sep 2005 15:15:22 -0000	1.2
@@ -0,0 +1 @@
+perl-Class-DBI-AbstractSearch-0_05-3:HEAD:perl-Class-DBI-AbstractSearch-0.05-3.src.rpm:1126192517



From fedora-extras-commits at redhat.com  Thu Sep  8 15:15:25 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Thu,  8 Sep 2005 11:15:25 -0400
Subject: rpms/perl-Class-DBI-AbstractSearch/devel
	perl-Class-DBI-AbstractSearch.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200509081515.j88FFPAr030201@cvs-int.fedora.redhat.com>

Author: spot

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

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Class-DBI-AbstractSearch.spec 
Log Message:
auto-import perl-Class-DBI-AbstractSearch-0.05-3 on branch devel from perl-Class-DBI-AbstractSearch-0.05-3.src.rpm


--- NEW FILE perl-Class-DBI-AbstractSearch.spec ---
Name:           perl-Class-DBI-AbstractSearch
Version:        0.05
Release:        3%{?dist}
Summary:        Abstract Class::DBI's SQL with SQL::Abstract
Group:          Development/Libraries
License:        GPL or Artistic
URL:            http://search.cpan.org/dist/Class-DBI-AbstractSearch
Source0:        http://search.cpan.org/CPAN/authors/id/M/MI/MIYAGAWA/Class-DBI-AbstractSearch-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:	perl(Class::DBI), perl(DBD::SQLite), perl(SQL::Abstract)
Requires:  perl(Class::DBI)
Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
%{summary}.

%prep
%setup -q -n Class-DBI-AbstractSearch-%{version}
perldoc -t perlartistic > Artistic
perldoc -t perlgpl > COPYING

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

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

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Artistic COPYING Changes
%{perl_vendorlib}/Class/DBI
%{_mandir}/man3/*.3*


%changelog
* Tue Sep  6 2005 Paul Howarth  0.05-3
- remove redundant BR: perl
- honor %%{?_smp_mflags}
- include license text
- add BR: perl(DBD::SQLite) for better test coverage

* Fri Jul  8 2005 Tom "spot" Callaway  0.05-2
- cleanups

* Wed Jul  6 2005 Tom "spot" Callaway  0.05-1
- Initial package for Fedora Extras


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-AbstractSearch/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	8 Sep 2005 15:14:58 -0000	1.1
+++ .cvsignore	8 Sep 2005 15:15:23 -0000	1.2
@@ -0,0 +1 @@
+Class-DBI-AbstractSearch-0.05.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-AbstractSearch/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	8 Sep 2005 15:14:58 -0000	1.1
+++ sources	8 Sep 2005 15:15:23 -0000	1.2
@@ -0,0 +1 @@
+34e35114a22f1281f86c57a4ae54c62e  Class-DBI-AbstractSearch-0.05.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep  8 15:18:51 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Thu,  8 Sep 2005 11:18:51 -0400
Subject: rpms/perl-Class-DBI-FromCGI - New directory
Message-ID: <200509081518.j88FIpDJ030453@cvs-int.fedora.redhat.com>

Author: spot

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

Log Message:
Directory /cvs/extras/rpms/perl-Class-DBI-FromCGI added to the repository




From fedora-extras-commits at redhat.com  Thu Sep  8 15:18:52 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Thu,  8 Sep 2005 11:18:52 -0400
Subject: rpms/perl-Class-DBI-FromCGI/devel - New directory
Message-ID: <200509081518.j88FIqRI030458@cvs-int.fedora.redhat.com>

Author: spot

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

Log Message:
Directory /cvs/extras/rpms/perl-Class-DBI-FromCGI/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Sep  8 15:19:06 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Thu,  8 Sep 2005 11:19:06 -0400
Subject: rpms/perl-Class-DBI-FromCGI Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200509081519.j88FJ6oD030509@cvs-int.fedora.redhat.com>

Author: spot

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

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-Class-DBI-FromCGI


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

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

common : CVS/Root
	@cvs checkout common

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

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


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Thu Sep  8 15:19:07 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Thu,  8 Sep 2005 11:19:07 -0400
Subject: rpms/perl-Class-DBI-FromCGI/devel .cvsignore, NONE, 1.1 Makefile,
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <200509081519.j88FJ7AL030514@cvs-int.fedora.redhat.com>

Author: spot

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

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Class-DBI-FromCGI


--- NEW FILE .cvsignore ---


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

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Thu Sep  8 15:19:29 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Thu,  8 Sep 2005 11:19:29 -0400
Subject: rpms/perl-Class-DBI-FromCGI import.log,1.1,1.2
Message-ID: <200509081519.j88FJx4x030583@cvs-int.fedora.redhat.com>

Author: spot

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

Modified Files:
	import.log 
Log Message:
auto-import perl-Class-DBI-FromCGI-0.94-3 on branch devel from perl-Class-DBI-FromCGI-0.94-3.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-FromCGI/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	8 Sep 2005 15:19:04 -0000	1.1
+++ import.log	8 Sep 2005 15:19:27 -0000	1.2
@@ -0,0 +1 @@
+perl-Class-DBI-FromCGI-0_94-3:HEAD:perl-Class-DBI-FromCGI-0.94-3.src.rpm:1126192762



From fedora-extras-commits at redhat.com  Thu Sep  8 15:19:29 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Thu,  8 Sep 2005 11:19:29 -0400
Subject: rpms/perl-Class-DBI-FromCGI/devel perl-Class-DBI-FromCGI.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200509081519.j88FJx3x030587@cvs-int.fedora.redhat.com>

Author: spot

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

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Class-DBI-FromCGI.spec 
Log Message:
auto-import perl-Class-DBI-FromCGI-0.94-3 on branch devel from perl-Class-DBI-FromCGI-0.94-3.src.rpm


--- NEW FILE perl-Class-DBI-FromCGI.spec ---
Name:           perl-Class-DBI-FromCGI
Version:        0.94
Release:        3%{?dist}
Summary:        Update Class::DBI data using CGI::Untaint
Group:          Development/Libraries
License:        GPL or Artistic
URL:            http://search.cpan.org/dist/Class-DBI-FromCGI
Source0:        http://search.cpan.org/CPAN/authors/id/T/TM/TMTM/Class-DBI-FromCGI-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:	perl(Class::DBI), perl(CGI::Untaint), perl(DBD::SQLite)
Requires:  perl(Class::DBI), perl(CGI::Untaint)
Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
%{summary}.

%prep
%setup -q -n Class-DBI-FromCGI-%{version}
perldoc -t perlartistic > Artistic
perldoc -t perlgpl > COPYING

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

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

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Artistic COPYING Changes
%{perl_vendorlib}/Class/DBI
%{_mandir}/man3/*.3*


%changelog
* Wed Sep  7 2005 Paul Howarth  - 0.94-3
- remove redundant BR: perl
- honor %%{_smp_mflags}
- include license text
- add BR: perl(DBD::SQLite) for better test cover

* Fri Jul  8 2005 Tom "spot" Callaway  0.94-2
- cleanups

* Wed Jul  6 2005 Tom "spot" Callaway  0.94-1
- Initial package for Fedora Extras


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-FromCGI/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	8 Sep 2005 15:19:05 -0000	1.1
+++ .cvsignore	8 Sep 2005 15:19:27 -0000	1.2
@@ -0,0 +1 @@
+Class-DBI-FromCGI-0.94.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-FromCGI/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	8 Sep 2005 15:19:05 -0000	1.1
+++ sources	8 Sep 2005 15:19:27 -0000	1.2
@@ -0,0 +1 @@
+126040b7e83218197786de2c6699100f  Class-DBI-FromCGI-0.94.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep  8 15:21:46 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Thu,  8 Sep 2005 11:21:46 -0400
Subject: rpms/perl-Class-DBI-AsForm - New directory
Message-ID: <200509081521.j88FLkhD030837@cvs-int.fedora.redhat.com>

Author: spot

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

Log Message:
Directory /cvs/extras/rpms/perl-Class-DBI-AsForm added to the repository




From fedora-extras-commits at redhat.com  Thu Sep  8 15:21:47 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Thu,  8 Sep 2005 11:21:47 -0400
Subject: rpms/perl-Class-DBI-AsForm/devel - New directory
Message-ID: <200509081521.j88FLllE030842@cvs-int.fedora.redhat.com>

Author: spot

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

Log Message:
Directory /cvs/extras/rpms/perl-Class-DBI-AsForm/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Sep  8 15:22:02 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Thu,  8 Sep 2005 11:22:02 -0400
Subject: rpms/perl-Class-DBI-AsForm Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200509081522.j88FM2xF030894@cvs-int.fedora.redhat.com>

Author: spot

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

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-Class-DBI-AsForm


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

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

common : CVS/Root
	@cvs checkout common

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

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


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Thu Sep  8 15:22:03 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Thu,  8 Sep 2005 11:22:03 -0400
Subject: rpms/perl-Class-DBI-AsForm/devel .cvsignore, NONE, 1.1 Makefile,
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <200509081522.j88FM3XE030900@cvs-int.fedora.redhat.com>

Author: spot

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

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Class-DBI-AsForm


--- NEW FILE .cvsignore ---


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

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Thu Sep  8 15:22:26 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Thu,  8 Sep 2005 11:22:26 -0400
Subject: rpms/perl-Class-DBI-AsForm import.log,1.1,1.2
Message-ID: <200509081522.j88FMQhj030969@cvs-int.fedora.redhat.com>

Author: spot

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

Modified Files:
	import.log 
Log Message:
auto-import perl-Class-DBI-AsForm-2.41-3 on branch devel from perl-Class-DBI-AsForm-2.41-3.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-AsForm/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	8 Sep 2005 15:22:00 -0000	1.1
+++ import.log	8 Sep 2005 15:22:24 -0000	1.2
@@ -0,0 +1 @@
+perl-Class-DBI-AsForm-2_41-3:HEAD:perl-Class-DBI-AsForm-2.41-3.src.rpm:1126192939



From fedora-extras-commits at redhat.com  Thu Sep  8 15:22:26 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Thu,  8 Sep 2005 11:22:26 -0400
Subject: rpms/perl-Class-DBI-AsForm/devel perl-Class-DBI-AsForm.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200509081522.j88FMQRt030976@cvs-int.fedora.redhat.com>

Author: spot

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

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Class-DBI-AsForm.spec 
Log Message:
auto-import perl-Class-DBI-AsForm-2.41-3 on branch devel from perl-Class-DBI-AsForm-2.41-3.src.rpm


--- NEW FILE perl-Class-DBI-AsForm.spec ---
Name:           perl-Class-DBI-AsForm
Version:        2.41
Release:        3%{?dist}
Summary:        Produce HTML form elements for database columns
Group:          Development/Libraries
License:        GPL or Artistic
URL:            http://search.cpan.org/dist/Class-DBI-AsForm
Source0:        http://search.cpan.org/CPAN/authors/id/T/TM/TMTM/Class-DBI-AsForm-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:	perl(Class::DBI), perl(HTML::Element), perl(Class::DBI::Plugin::Type)
BuildRequires:  perl(DBD::SQLite2)
Requires:  perl(Class::DBI)
Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
%{summary}.

%prep
%setup -q -n Class-DBI-AsForm-%{version}
perldoc -t perlartistic > Artistic
perldoc -t perlgpl > COPYING
 

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

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

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Artistic COPYING Changes
%{perl_vendorlib}/Class/DBI
%{_mandir}/man3/*.3*


%changelog
* Wed Sep  7 2005 Tom "spot" Callaway  2.41-3
- remove redundant BR: perl
- honor %%{_smp_mflags}
- include license text

* Fri Jul  8 2005 Tom "spot" Callaway  2.41-2
- cleanups

* Wed Jul  6 2005 Tom "spot" Callaway  2.41-1
- Initial package for Fedora Extras


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-AsForm/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	8 Sep 2005 15:22:01 -0000	1.1
+++ .cvsignore	8 Sep 2005 15:22:24 -0000	1.2
@@ -0,0 +1 @@
+Class-DBI-AsForm-2.41.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-AsForm/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	8 Sep 2005 15:22:01 -0000	1.1
+++ sources	8 Sep 2005 15:22:24 -0000	1.2
@@ -0,0 +1 @@
+123ef74dd79a632b881189334cfa6827  Class-DBI-AsForm-2.41.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep  8 15:27:06 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Thu,  8 Sep 2005 11:27:06 -0400
Subject: owners owners.list,1.178,1.179
Message-ID: <200509081527.j88FR6kV031199@cvs-int.fedora.redhat.com>

Author: spot

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

Modified Files:
	owners.list 
Log Message:

perl-Class-DBI-Pager, perl-Class-DBI-AsForm, perl-Class-DBI-AbstractSearch, perl-Class-DBI-FromCGI



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.178
retrieving revision 1.179
diff -u -r1.178 -r1.179
--- owners.list	8 Sep 2005 08:39:51 -0000	1.178
+++ owners.list	8 Sep 2005 15:27:04 -0000	1.179
@@ -576,7 +576,11 @@
 Fedora Extras|perl-Class-Container|Perl module for building frameworks of classes|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Class-Data-Inheritable|Inheritable, overridable class data|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Class-DBI|Simple Database Abstraction|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Class-DBI-AbstractSearch|Abstract Class::DBI's SQL with SQL::Abstract|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Class-DBI-AsForm|Produce HTML form elements for database columns|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Class-DBI-FromCGI|Update Class::DBI data using CGI::Untaint|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Class-DBI-mysql|Extensions to Class::DBI for MySQL|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Class-DBI-Pager|Pager utility for Class::DBI|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Class-DBI-Plugin|Abstract base class for Class::DBI plugins|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Class-DBI-Plugin-RetrieveAll|More complex retrieve_all() for Class::DBI|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Class-DBI-Plugin-Type|Determine type information for columns|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Thu Sep  8 16:29:31 2005
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Thu,  8 Sep 2005 12:29:31 -0400
Subject: rpms/perl-Class-Singleton/devel perl-Class-Singleton.spec,1.1,1.2
Message-ID: <200509081629.j88GTVV6000566@cvs-int.fedora.redhat.com>

Author: steve

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

Modified Files:
	perl-Class-Singleton.spec 
Log Message:
Fix permissions on Singleton.pm.


Index: perl-Class-Singleton.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-Singleton/devel/perl-Class-Singleton.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Class-Singleton.spec	7 Sep 2005 21:50:45 -0000	1.1
+++ perl-Class-Singleton.spec	8 Sep 2005 16:29:29 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-Class-Singleton
 Version:        1.03
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Class::Singleton Perl module
 License:        Artistic
 Group:          Development/Libraries
@@ -22,6 +22,7 @@
 
 %prep
 %setup -q -n Class-Singleton-%{version}
+chmod a-x Singleton.pm
 
 %build
 %{__perl} Makefile.PL INSTALLDIRS=vendor
@@ -52,5 +53,8 @@
 %{_mandir}/man3/*
 
 %changelog
+* Thu Sep 08 2005 Steven Pritchard  1.03-2
+- Fix permissions on Singleton.pm.
+
 * Wed Aug 31 2005 Steven Pritchard  1.03-1
 - Specfile autogenerated.



From fedora-extras-commits at redhat.com  Thu Sep  8 16:36:50 2005
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Thu,  8 Sep 2005 12:36:50 -0400
Subject: owners owners.list,1.179,1.180
Message-ID: <200509081636.j88GaoXK000656@cvs-int.fedora.redhat.com>

Author: steve

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

Modified Files:
	owners.list 
Log Message:
Add perl-Class-Singleton.


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.179
retrieving revision 1.180
diff -u -r1.179 -r1.180
--- owners.list	8 Sep 2005 15:27:04 -0000	1.179
+++ owners.list	8 Sep 2005 16:36:48 -0000	1.180
@@ -587,6 +587,7 @@
 Fedora Extras|perl-Class-DBI-SQLite|Extension to Class::DBI for sqlite|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Class-MethodMaker|Create generic methods for OO Perl|dgregor at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Class-ReturnValue|Class::ReturnValue Perl module|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Class-Singleton|Class::Singleton Perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Class-Trigger|Mixin to add / call inheritable triggers|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Class-Whitehole|Base class to treat unhandled method calls as errors|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Config-General|Generic configuration module for Perl|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Thu Sep  8 17:20:32 2005
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Thu,  8 Sep 2005 13:20:32 -0400
Subject: rpms/nethack/devel nethack.spec,1.6,1.7
Message-ID: <200509081720.j88HKWgZ002231@cvs-int.fedora.redhat.com>

Author: lmacken

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

Modified Files:
	nethack.spec 
Log Message:
- don't expand macros in the changelog



Index: nethack.spec
===================================================================
RCS file: /cvs/extras/rpms/nethack/devel/nethack.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- nethack.spec	8 Sep 2005 06:37:02 -0000	1.6
+++ nethack.spec	8 Sep 2005 17:20:30 -0000	1.7
@@ -132,7 +132,7 @@
 
 %changelog
 * Thu Sep 08 2005 Luke Macken  3.4.3-3
-- Point linker in the right direction using %{_lib} to fix x86_64 build issues
+- Point linker in the right direction using %%{_lib} to fix x86_64 build issues
 
 * Tue Sep 06 2005 Luke Macken  3.4.3-2
 - Enable x11 support



From fedora-extras-commits at redhat.com  Thu Sep  8 18:29:36 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Thu,  8 Sep 2005 14:29:36 -0400
Subject: rpms/perl-Class-DBI-Pg - New directory
Message-ID: <200509081829.j88ITaac003692@cvs-int.fedora.redhat.com>

Author: spot

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

Log Message:
Directory /cvs/extras/rpms/perl-Class-DBI-Pg added to the repository




From fedora-extras-commits at redhat.com  Thu Sep  8 18:29:36 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Thu,  8 Sep 2005 14:29:36 -0400
Subject: rpms/perl-Class-DBI-Pg/devel - New directory
Message-ID: <200509081829.j88ITafp003697@cvs-int.fedora.redhat.com>

Author: spot

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

Log Message:
Directory /cvs/extras/rpms/perl-Class-DBI-Pg/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Sep  8 18:29:51 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Thu,  8 Sep 2005 14:29:51 -0400
Subject: rpms/perl-Class-DBI-Pg Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200509081829.j88ITp1h003746@cvs-int.fedora.redhat.com>

Author: spot

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

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-Class-DBI-Pg


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

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

common : CVS/Root
	@cvs checkout common

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

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


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Thu Sep  8 18:29:52 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Thu,  8 Sep 2005 14:29:52 -0400
Subject: rpms/perl-Class-DBI-Pg/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200509081829.j88ITqHP003751@cvs-int.fedora.redhat.com>

Author: spot

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

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Class-DBI-Pg


--- NEW FILE .cvsignore ---


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

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Thu Sep  8 18:30:14 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Thu,  8 Sep 2005 14:30:14 -0400
Subject: rpms/perl-Class-DBI-Pg import.log,1.1,1.2
Message-ID: <200509081830.j88IUEHw003820@cvs-int.fedora.redhat.com>

Author: spot

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

Modified Files:
	import.log 
Log Message:
auto-import perl-Class-DBI-Pg-0.06-3 on branch devel from perl-Class-DBI-Pg-0.06-3.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-Pg/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	8 Sep 2005 18:29:49 -0000	1.1
+++ import.log	8 Sep 2005 18:30:12 -0000	1.2
@@ -0,0 +1 @@
+perl-Class-DBI-Pg-0_06-3:HEAD:perl-Class-DBI-Pg-0.06-3.src.rpm:1126204207



From fedora-extras-commits at redhat.com  Thu Sep  8 18:30:14 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Thu,  8 Sep 2005 14:30:14 -0400
Subject: rpms/perl-Class-DBI-Pg/devel perl-Class-DBI-Pg.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200509081830.j88IUEKs003827@cvs-int.fedora.redhat.com>

Author: spot

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

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Class-DBI-Pg.spec 
Log Message:
auto-import perl-Class-DBI-Pg-0.06-3 on branch devel from perl-Class-DBI-Pg-0.06-3.src.rpm


--- NEW FILE perl-Class-DBI-Pg.spec ---
Name:           perl-Class-DBI-Pg
Version:        0.06
Release:        3%{?dist}
Summary:        Class::DBI extension for PostgreSQL
Group:          Development/Libraries
License:        GPL or Artistic
URL:            http://search.cpan.org/dist/Class-DBI-Pg/
Source0:        http://search.cpan.org/CPAN/authors/id/S/SR/SRI/Class-DBI-Pg-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:	perl(Class::DBI), perl-DBD-Pg
Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
Requires:  perl-DBD-Pg

%description
%{summary}.

%prep
%setup -q -n Class-DBI-Pg-%{version}
perldoc -t perlartistic > Artistic
perldoc -t perlgpl > COPYING

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

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

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Artistic COPYING Changes
%{perl_vendorlib}/Class/DBI
%{_mandir}/man3/*.3*


%changelog
* Fri Sep  2 2005 Paul Howarth  0.06-3
- remove redundant BR: perl
- honor %%{_smp_mflags}
- include license text
- add perl-DBD-Pg dep

* Fri Jul  8 2005 Tom "spot" Callaway  0.06-2
- cleanups

* Wed Jul  6 2005 Tom "spot" Callaway  0.06-1
- Initial package for Fedora Extras


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-Pg/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	8 Sep 2005 18:29:50 -0000	1.1
+++ .cvsignore	8 Sep 2005 18:30:12 -0000	1.2
@@ -0,0 +1 @@
+Class-DBI-Pg-0.06.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-Pg/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	8 Sep 2005 18:29:50 -0000	1.1
+++ sources	8 Sep 2005 18:30:12 -0000	1.2
@@ -0,0 +1 @@
+c68f3de33841ecb4c8a577fb63d4ff1e  Class-DBI-Pg-0.06.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep  8 18:36:15 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Thu,  8 Sep 2005 14:36:15 -0400
Subject: owners owners.list,1.180,1.181
Message-ID: <200509081836.j88IaFjs004047@cvs-int.fedora.redhat.com>

Author: spot

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

Modified Files:
	owners.list 
Log Message:

perl-Class-DBI-Pg



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.180
retrieving revision 1.181
diff -u -r1.180 -r1.181
--- owners.list	8 Sep 2005 16:36:48 -0000	1.180
+++ owners.list	8 Sep 2005 18:36:13 -0000	1.181
@@ -581,6 +581,7 @@
 Fedora Extras|perl-Class-DBI-FromCGI|Update Class::DBI data using CGI::Untaint|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Class-DBI-mysql|Extensions to Class::DBI for MySQL|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Class-DBI-Pager|Pager utility for Class::DBI|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Class-DBI-Pg|Class::DBI extension for PostgreSQL|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Class-DBI-Plugin|Abstract base class for Class::DBI plugins|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Class-DBI-Plugin-RetrieveAll|More complex retrieve_all() for Class::DBI|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Class-DBI-Plugin-Type|Determine type information for columns|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Thu Sep  8 21:05:43 2005
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Thu,  8 Sep 2005 17:05:43 -0400
Subject: extras-buildsys/server ArchJob.py, 1.10, 1.10.2.1 PackageJob.py,
	1.21.2.3, 1.21.2.4
Message-ID: <200509082105.j88L5hwU008288@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys/server
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8252/server

Modified Files:
      Tag: STABLE_0_3
	ArchJob.py PackageJob.py 
Log Message:
2005-09-08  Dan Williams  

    * server/PackageJob.py
      server/ArchJob.py
        - Fail job if downloads from builder fail




Index: ArchJob.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/ArchJob.py,v
retrieving revision 1.10
retrieving revision 1.10.2.1
diff -u -r1.10 -r1.10.2.1
--- ArchJob.py	8 Aug 2005 02:54:16 -0000	1.10
+++ ArchJob.py	8 Sep 2005 21:05:22 -0000	1.10.2.1
@@ -50,6 +50,7 @@
         self.arch = arch
         self._builder_gone = False
         self.downloads = {}
+        self._download_failed = False
         self.starttime = time.time()
         self.endtime = 0
         self._die = False
@@ -65,6 +66,9 @@
             return True
         return False
 
+    def download_failed(self):
+        return self._download_failed
+
     def builder_prepping(self):
         if self.builder_status == 'prepping':
             return True
@@ -127,7 +131,7 @@
             files = self._server.files(self.jobid)
         except socket.error, e:
             if not CommonErrors.canIgnoreSocketError(e):
-                print "%s (%s/%s): [ %s ] Unknown error when signalling repo unlocked: '%s'" % (self.par_job.uid,
+                print "%s (%s/%s): [ %s ] Unknown error when getting file list: '%s'" % (self.par_job.uid,
                             self.par_job.package, self.arch, self.bci.address(), e)
         except xmlrpclib.ProtocolError, e:
             pass
@@ -170,6 +174,7 @@
             #   2: error
             #   3: done
             undownloaded = False
+            failed = False
             for url in self.downloads.keys():
                 dl_status = self.downloads[url]
                 if dl_status == 0:
@@ -193,6 +198,7 @@
                     break
                 elif dl_status == 2:
                     # error
+                    failed = True
                     continue
                 elif dl_status == 3:
                     # this one is done
@@ -202,6 +208,8 @@
             if not undownloaded:
                 self._print_downloaded_files()
                 self.endtime = time.time()
+                if failed:
+                    self._download_failed = True
                 self._set_status('done')
                 self.par_job.wake()
 


Index: PackageJob.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/PackageJob.py,v
retrieving revision 1.21.2.3
retrieving revision 1.21.2.4
diff -u -r1.21.2.3 -r1.21.2.4
--- PackageJob.py	31 Aug 2005 01:23:46 -0000	1.21.2.3
+++ PackageJob.py	8 Sep 2005 21:05:22 -0000	1.21.2.4
@@ -536,7 +536,12 @@
                 continue
             if job.get_status() is 'done':
                 if job.builder_failed():
-                    msg = "Job failed on arch %s\n" % (job.arch)
+                    msg = "Job failed on arch %s\n" % job.arch
+                    self._archjobs_lock.release()
+                    raise BuildError(msg, job.arch)
+                elif job.download_failed():
+                    msg = "Job failed on arch %s: couldn't download result files from builder '%s'.\n " \
+                            "Please contact the build system administrator." % (job.arch, builder.address())
                     self._archjobs_lock.release()
                     raise BuildError(msg, job.arch)
                 else:



From fedora-extras-commits at redhat.com  Thu Sep  8 21:05:19 2005
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Thu,  8 Sep 2005 17:05:19 -0400
Subject: extras-buildsys ChangeLog,1.97.2.14,1.97.2.15
Message-ID: <200509082106.j88L68Qk008293@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8252

Modified Files:
      Tag: STABLE_0_3
	ChangeLog 
Log Message:
2005-09-08  Dan Williams  

    * server/PackageJob.py
      server/ArchJob.py
        - Fail job if downloads from builder fail




Index: ChangeLog
===================================================================
RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v
retrieving revision 1.97.2.14
retrieving revision 1.97.2.15
diff -u -r1.97.2.14 -r1.97.2.15
--- ChangeLog	31 Aug 2005 18:28:58 -0000	1.97.2.14
+++ ChangeLog	8 Sep 2005 21:05:16 -0000	1.97.2.15
@@ -1,3 +1,9 @@
+2005-09-08  Dan Williams  
+
+    * server/PackageJob.py
+      server/ArchJob.py
+        - Fail job if downloads from builder fail
+
 2005-08-31  Dan Williams 
 
     * builder/builder.py



From fedora-extras-commits at redhat.com  Thu Sep  8 21:09:08 2005
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Thu,  8 Sep 2005 17:09:08 -0400
Subject: extras-buildsys/utils distro-rebuild.py,1.1,1.2
Message-ID: <200509082109.j88L98jk008357@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys/utils
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8338/utils

Modified Files:
	distro-rebuild.py 
Log Message:
Use nodeps when installing srpm


Index: distro-rebuild.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/distro-rebuild.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- distro-rebuild.py	7 Sep 2005 14:58:30 -0000	1.1
+++ distro-rebuild.py	8 Sep 2005 21:09:05 -0000	1.2
@@ -109,7 +109,7 @@
     os.rename(specfile_new, specfile)
 
     # rebuild the srpm
-    cmd = '/usr/bin/rpmbuild -bs --define "_sourcedir %s/usr/src/redhat/SOURCES" ' \
+    cmd = '/usr/bin/rpmbuild -bs --nodeps --define "_sourcedir %s/usr/src/redhat/SOURCES" ' \
             ' --define "_srcrpmdir %s" %s' % (temp_dir, temp_dir, specfile)
     (s, o) = commands.getstatusoutput(cmd)
     if s != 0:



From fedora-extras-commits at redhat.com  Thu Sep  8 21:10:27 2005
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Thu,  8 Sep 2005 17:10:27 -0400
Subject: extras-buildsys ChangeLog,1.116,1.117
Message-ID: <200509082110.j88LARUU008399@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8365

Modified Files:
	ChangeLog 
Log Message:
2005-09-08  Dan Williams  

    * server/PackageJob.py
      server/ArchJob.py
        - Fail job if downloads from builder fail




Index: ChangeLog
===================================================================
RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -r1.116 -r1.117
--- ChangeLog	7 Sep 2005 14:58:29 -0000	1.116
+++ ChangeLog	8 Sep 2005 21:10:25 -0000	1.117
@@ -1,3 +1,9 @@
+2005-09-08  Dan Williams  
+
+    * server/PackageJob.py
+      server/ArchJob.py
+        - Fail job if downloads from builder fail
+
 2005-09-07  Dan Williams  
 
     * utils/distro-rebuild.py



From fedora-extras-commits at redhat.com  Thu Sep  8 21:10:27 2005
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Thu,  8 Sep 2005 17:10:27 -0400
Subject: extras-buildsys/server PackageJob.py, 1.28, 1.29 ArchJob.py, 1.14,
	1.15
Message-ID: <200509082110.j88LARNG008406@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys/server
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8365/server

Modified Files:
	PackageJob.py ArchJob.py 
Log Message:
2005-09-08  Dan Williams  

    * server/PackageJob.py
      server/ArchJob.py
        - Fail job if downloads from builder fail




Index: PackageJob.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/PackageJob.py,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- PackageJob.py	31 Aug 2005 01:56:43 -0000	1.28
+++ PackageJob.py	8 Sep 2005 21:10:25 -0000	1.29
@@ -544,7 +544,7 @@
             if job.get_status() is 'done':
                 completed_jobs = completed_jobs + 1
 
-                if job.builder_failed():
+                if job.builder_failed() or job.download_failed():
                     failed_jobs = failed_jobs + 1
 
                     # Normal jobs will just stop when a single archjob fails, but
@@ -554,7 +554,12 @@
                     if not job.failure_noticed():
                         job.set_failure_noticed()
                         jobarch = job.arch()
-                        msg = "Job failed on arch %s\n" % (jobarch)
+                        msg = "Job failed."
+                        if job.builder_failed():
+                            msg = "Job failed on arch %s\n" % jobarch
+                        elif job.download_failed():
+                            msg = "Job failed on arch %s: couldn't download result files from builder '%s'.\n " \
+                            "Please contact the build system administrator." % (jobarch, builder.address())
                         self._archjobs_lock.release()
                         raise BuildError(msg, jobarch)
 


Index: ArchJob.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/ArchJob.py,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- ArchJob.py	29 Aug 2005 17:48:19 -0000	1.14
+++ ArchJob.py	8 Sep 2005 21:10:25 -0000	1.15
@@ -38,6 +38,7 @@
         self.status = 'running'
         self.builder_status = ''
         self._failure_noticed = False
+        self._download_failed = False
         self._target_dict = target_dict
         self._builder_gone = False
         self.downloads = {}
@@ -68,6 +69,9 @@
             return True
         return False
 
+    def download_failed(self):
+        return self._download_failed
+
     def builder_prepping(self):
         if self.builder_status == 'prepping':
             return True
@@ -132,7 +136,7 @@
             files = self._server.files(self.jobid)
         except socket.error, e:
             if not CommonErrors.canIgnoreSocketError(e):
-                print "%s (%s/%s): [ %s ] Unknown error when signalling repo unlocked: '%s'" % (self.par_job.uid,
+                print "%s (%s/%s): [ %s ] Unknown error when getting file list: '%s'" % (self.par_job.uid,
                             self.par_job.package, self._target_dict['arch'], self.bci.address(), e)
         except xmlrpclib.ProtocolError, e:
             pass
@@ -175,6 +179,7 @@
             #   2: error
             #   3: done
             undownloaded = False
+            failed = False
             for url in self.downloads.keys():
                 dl_status = self.downloads[url]
                 if dl_status == 0:
@@ -198,6 +203,7 @@
                     break
                 elif dl_status == 2:
                     # error
+                    failed = True
                     continue
                 elif dl_status == 3:
                     # this one is done
@@ -207,6 +213,8 @@
             if not undownloaded:
                 self._print_downloaded_files()
                 self.endtime = time.time()
+                if failed:
+                    self._download_failed = True
                 self._set_status('done')
                 self.par_job.wake()
 



From fedora-extras-commits at redhat.com  Thu Sep  8 21:38:56 2005
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Thu,  8 Sep 2005 17:38:56 -0400
Subject: rpms/plone/FC-4 .cvsignore, 1.5, 1.6 plone.spec, 1.9, 1.10 sources,
	1.5, 1.6
Message-ID: <200509082138.j88Lcur5008525@cvs-int.fedora.redhat.com>

Author: abompard

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

Modified Files:
	.cvsignore plone.spec sources 
Log Message:
- version 2.1 final


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/plone/FC-4/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	11 Aug 2005 09:20:10 -0000	1.5
+++ .cvsignore	8 Sep 2005 21:38:54 -0000	1.6
@@ -1 +1 @@
-Plone-2.1-rc2.tar.gz
+Plone-2.1.tar.gz


Index: plone.spec
===================================================================
RCS file: /cvs/extras/rpms/plone/FC-4/plone.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- plone.spec	11 Aug 2005 09:26:43 -0000	1.9
+++ plone.spec	8 Sep 2005 21:38:54 -0000	1.10
@@ -6,13 +6,12 @@
 
 Name:           plone
 Version:        2.1
-Release:        0.5.rc2%{?dist}
+Release:        1%{?dist}
 Summary:        User friendly and powerful open source Content Management System
 License:        GPL
 Group:          System Environment/Daemons
 URL:            http://www.plone.org/
-#Source0:        http://dl.sf.net/plone/Plone-%{version}.tar.gz
-Source0:        http://dl.sf.net/plone/Plone-2.1-rc2.tar.gz
+Source0:        http://dl.sf.net/plone/Plone-2.1.tar.gz
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -26,7 +25,7 @@
 products.
 
 %prep
-%setup -q -n Plone-%{version}-rc2
+%setup -q -n Plone-%{version}
 # Clean up sources
 find . -type d -name CVS | xargs rm -rf
 find . -type f -name .cvsignore | xargs rm -rf
@@ -55,6 +54,9 @@
 
 
 %changelog
+* Thu Sep 08 2005 Aurelien Bompard  2.1-1
+- version 2.1 final
+
 * Thu Aug 11 2005 Aurelien Bompard 
 - rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/plone/FC-4/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	11 Aug 2005 09:20:10 -0000	1.5
+++ sources	8 Sep 2005 21:38:54 -0000	1.6
@@ -1 +1 @@
-3d5866c3301269b282a7ee375605326a  Plone-2.1-rc2.tar.gz
+a72efb9aace662ac8f81f3f66ad7c44c  Plone-2.1.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep  8 21:38:55 2005
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Thu,  8 Sep 2005 17:38:55 -0400
Subject: rpms/plone/FC-3 .cvsignore, 1.3, 1.4 plone.spec, 1.3, 1.4 sources,
	1.3, 1.4
Message-ID: <200509082138.j88LctI4008517@cvs-int.fedora.redhat.com>

Author: abompard

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

Modified Files:
	.cvsignore plone.spec sources 
Log Message:
- version 2.1 final


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/plone/FC-3/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	15 Jun 2005 13:25:23 -0000	1.3
+++ .cvsignore	8 Sep 2005 21:38:53 -0000	1.4
@@ -1 +1 @@
-Plone-2.1-alpha2.tar.gz
+Plone-2.1.tar.gz


Index: plone.spec
===================================================================
RCS file: /cvs/extras/rpms/plone/FC-3/plone.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- plone.spec	15 Jun 2005 13:25:23 -0000	1.3
+++ plone.spec	8 Sep 2005 21:38:53 -0000	1.4
@@ -6,21 +6,17 @@
 
 Name:           plone
 Version:        2.1
-Release:        0.1.alpha2%{?dist}
-
+Release:        1%{?dist}
 Summary:        User friendly and powerful open source Content Management System
-
 License:        GPL
 Group:          System Environment/Daemons
 URL:            http://www.plone.org/
-#Source0:        http://dl.sf.net/plone/Plone-%{version}.tar.gz
-Source0:        http://dl.sf.net/plone/Plone-2.1-alpha2.tar.gz
+Source0:        http://dl.sf.net/plone/Plone-2.1.tar.gz
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArch:      noarch
 
 Requires:       zope >= %{zope_minver}
-Requires:       python >= %{python_minver}
+Requires:       python >= %{python_minver}, python-imaging
 
 %description
 Plone is a user friendly and powerful content management system based on Zope.
@@ -29,15 +25,12 @@
 products.
 
 %prep
-%setup -q -n Plone-%{version}-alpha2
-# Avoid conflicts
-mv README.txt Plone-README.txt
-mv CONTENTS.txt Plone-CONTENTS.txt
+%setup -q -n Plone-%{version}
 # Clean up sources
 find . -type d -name CVS | xargs rm -rf
 find . -type f -name .cvsignore | xargs rm -rf
+find . -type d -name .svn | xargs rm -rf
 find . -type f -name "*~" | xargs rm -rf
-rm -f Archetypes/content_driver/.DocBook.py.swp
 
 
 %install
@@ -46,6 +39,8 @@
 mkdir -p $RPM_BUILD_ROOT%{software_home}/Products
 cp -pr * $RPM_BUILD_ROOT%{software_home}/Products
 rm -rf $RPM_BUILD_ROOT%{software_home}/Products/BTreeFolder2
+rm -f $RPM_BUILD_ROOT%{software_home}/Products/README.txt
+rm -f $RPM_BUILD_ROOT%{software_home}/Products/CONTENTS.txt
 
 
 %clean
@@ -54,10 +49,25 @@
 
 %files
 %defattr(644,root,root,755)
+%doc README.txt CONTENTS.txt
 %{software_home}/Products/*
 
 
 %changelog
+* Thu Sep 08 2005 Aurelien Bompard  2.1-1
+- version 2.1 final
+
+* Thu Aug 11 2005 Aurelien Bompard 
+- rebuild
+
+* Thu Aug 11 2005 Aurelien Bompard  2.1-0.3.rc2
+- update to rc2
+- drop buildarch: noarch since _libdir depends on arch (on x86_64)
+- put readmes in %%doc
+
+* Mon Aug 01 2005 Aurelien Bompard  2.1-0.2.rc1
+- update to rc1
+
 * Wed Jun 15 2005 Aurelien Bompard  2.1-0.1.alpha2
 - update to 2.1 alpha2 to work with python >= 2.4 and zope >= 2.8
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/plone/FC-3/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	15 Jun 2005 13:25:23 -0000	1.3
+++ sources	8 Sep 2005 21:38:53 -0000	1.4
@@ -1 +1 @@
-8d9b162f3f848ccd133c04e393042f01  Plone-2.1-alpha2.tar.gz
+a72efb9aace662ac8f81f3f66ad7c44c  Plone-2.1.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep  8 21:38:56 2005
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Thu,  8 Sep 2005 17:38:56 -0400
Subject: rpms/plone/devel .cvsignore, 1.5, 1.6 plone.spec, 1.9, 1.10 sources,
	1.5, 1.6
Message-ID: <200509082138.j88LcupP008533@cvs-int.fedora.redhat.com>

Author: abompard

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

Modified Files:
	.cvsignore plone.spec sources 
Log Message:
- version 2.1 final


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/plone/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	11 Aug 2005 09:20:10 -0000	1.5
+++ .cvsignore	8 Sep 2005 21:38:54 -0000	1.6
@@ -1 +1 @@
-Plone-2.1-rc2.tar.gz
+Plone-2.1.tar.gz


Index: plone.spec
===================================================================
RCS file: /cvs/extras/rpms/plone/devel/plone.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- plone.spec	11 Aug 2005 09:26:44 -0000	1.9
+++ plone.spec	8 Sep 2005 21:38:54 -0000	1.10
@@ -6,13 +6,12 @@
 
 Name:           plone
 Version:        2.1
-Release:        0.5.rc2%{?dist}
+Release:        1%{?dist}
 Summary:        User friendly and powerful open source Content Management System
 License:        GPL
 Group:          System Environment/Daemons
 URL:            http://www.plone.org/
-#Source0:        http://dl.sf.net/plone/Plone-%{version}.tar.gz
-Source0:        http://dl.sf.net/plone/Plone-2.1-rc2.tar.gz
+Source0:        http://dl.sf.net/plone/Plone-2.1.tar.gz
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -26,7 +25,7 @@
 products.
 
 %prep
-%setup -q -n Plone-%{version}-rc2
+%setup -q -n Plone-%{version}
 # Clean up sources
 find . -type d -name CVS | xargs rm -rf
 find . -type f -name .cvsignore | xargs rm -rf
@@ -55,6 +54,9 @@
 
 
 %changelog
+* Thu Sep 08 2005 Aurelien Bompard  2.1-1
+- version 2.1 final
+
 * Thu Aug 11 2005 Aurelien Bompard 
 - rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/plone/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	11 Aug 2005 09:20:10 -0000	1.5
+++ sources	8 Sep 2005 21:38:54 -0000	1.6
@@ -1 +1 @@
-3d5866c3301269b282a7ee375605326a  Plone-2.1-rc2.tar.gz
+a72efb9aace662ac8f81f3f66ad7c44c  Plone-2.1.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep  8 23:11:32 2005
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Thu,  8 Sep 2005 19:11:32 -0400
Subject: rpms/python-durus/devel .cvsignore, 1.3, 1.4 python-durus.spec, 1.5,
	1.6 sources, 1.3, 1.4
Message-ID: <200509082311.j88NBWvn011615@cvs-int.fedora.redhat.com>

Author: shahms

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

Modified Files:
	.cvsignore python-durus.spec sources 
Log Message:
Update to new upstream version 2.1.  Skipped the 2.0 update as there
were no code changes, just a minor license change.




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-durus/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	13 Apr 2005 18:59:38 -0000	1.3
+++ .cvsignore	8 Sep 2005 23:11:30 -0000	1.4
@@ -1 +1 @@
-Durus-1.5.tar.gz
+Durus-3.0.tar.gz


Index: python-durus.spec
===================================================================
RCS file: /cvs/extras/rpms/python-durus/devel/python-durus.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- python-durus.spec	22 Apr 2005 15:48:52 -0000	1.5
+++ python-durus.spec	8 Sep 2005 23:11:30 -0000	1.6
@@ -3,8 +3,8 @@
 %define srcname Durus
 
 Name:           python-durus
-Version:        1.5
-Release:        2
+Version:        3.0
+Release:        1%{?dist}
 Summary:        A Python Object Database
 
 Group:          Development/Libraries
@@ -53,6 +53,10 @@
 %{_bindir}/durus
 
 %changelog
+* Thu Sep 08 2005 Shahms E. King  3.0-1
+- Update to upstream 3.0 (2.0 was only a license change, no code)
+- Add dist tag
+
 * Fri Apr 22 2005 Shahms E. King  1.5-2
 - Increment Release to fix EVR problem
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-durus/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	13 Apr 2005 18:59:38 -0000	1.3
+++ sources	8 Sep 2005 23:11:30 -0000	1.4
@@ -1 +1 @@
-c7bf836616cff8e5b8e7b01db3665e11  Durus-1.5.tar.gz
+de1830c7f7f7e63b0c8783ee1c806c91  Durus-3.0.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep  8 23:11:26 2005
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Thu,  8 Sep 2005 19:11:26 -0400
Subject: rpms/python-durus/FC-3 .cvsignore, 1.3, 1.4 python-durus.spec, 1.2,
	1.3 sources, 1.3, 1.4
Message-ID: <200509082311.j88NBvTm011620@cvs-int.fedora.redhat.com>

Author: shahms

Update of /cvs/extras/rpms/python-durus/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11554/FC-3

Modified Files:
	.cvsignore python-durus.spec sources 
Log Message:
Update to new upstream version 2.1.  Skipped the 2.0 update as there
were no code changes, just a minor license change.




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-durus/FC-3/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	13 Apr 2005 18:57:41 -0000	1.3
+++ .cvsignore	8 Sep 2005 23:11:24 -0000	1.4
@@ -1 +1 @@
-Durus-1.5.tar.gz
+Durus-3.0.tar.gz


Index: python-durus.spec
===================================================================
RCS file: /cvs/extras/rpms/python-durus/FC-3/python-durus.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- python-durus.spec	13 Apr 2005 18:57:41 -0000	1.2
+++ python-durus.spec	8 Sep 2005 23:11:24 -0000	1.3
@@ -3,14 +3,14 @@
 %define srcname Durus
 
 Name:           python-durus
-Version:        1.5
-Release:        1
+Version:        3.0
+Release:        1%{?dist}
 Summary:        A Python Object Database
 
 Group:          Development/Libraries
 License:        CNRI
 URL:            http://www.mems-exchange.org/software/durus/
-Source0:        http://www.mems-exchange.org/software/files/durus/Durus-1.5.tar.gz
+Source0:        http://www.mems-exchange.org/software/files/durus/Durus-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python-devel
@@ -53,9 +53,19 @@
 %{_bindir}/durus
 
 %changelog
-* Fri Mar 25 2005 Shahms E. King  1.5-1
+* Thu Sep 08 2005 Shahms E. King  3.0-1
+- Update to upstream 3.0 (2.0 was only a license change, no code)
+- Add dist tag
+
+* Fri Apr 22 2005 Shahms E. King  1.5-2
+- Increment Release to fix EVR problem
+
+* Wed Apr 13 2005 Shahms E. King  1.5-1
 - New upstream version
 - Remove unnecessary python_sitelib define
 
+* Fri Apr  7 2005 Michael Schwendt 
+- rebuilt
+
 * Tue Mar 01 2005 Shahms E. King  1.4-1
 - Initial Release


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-durus/FC-3/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	13 Apr 2005 18:57:41 -0000	1.3
+++ sources	8 Sep 2005 23:11:24 -0000	1.4
@@ -1 +1 @@
-c7bf836616cff8e5b8e7b01db3665e11  Durus-1.5.tar.gz
+de1830c7f7f7e63b0c8783ee1c806c91  Durus-3.0.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep  8 23:11:27 2005
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Thu,  8 Sep 2005 19:11:27 -0400
Subject: rpms/python-durus/FC-4 .cvsignore, 1.3, 1.4 python-durus.spec, 1.5,
	1.6 sources, 1.3, 1.4
Message-ID: <200509082311.j88NBvV6011625@cvs-int.fedora.redhat.com>

Author: shahms

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

Modified Files:
	.cvsignore python-durus.spec sources 
Log Message:
Update to new upstream version 2.1.  Skipped the 2.0 update as there
were no code changes, just a minor license change.




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-durus/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	13 Apr 2005 18:59:38 -0000	1.3
+++ .cvsignore	8 Sep 2005 23:11:25 -0000	1.4
@@ -1 +1 @@
-Durus-1.5.tar.gz
+Durus-3.0.tar.gz


Index: python-durus.spec
===================================================================
RCS file: /cvs/extras/rpms/python-durus/FC-4/python-durus.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- python-durus.spec	22 Apr 2005 15:48:52 -0000	1.5
+++ python-durus.spec	8 Sep 2005 23:11:25 -0000	1.6
@@ -3,8 +3,8 @@
 %define srcname Durus
 
 Name:           python-durus
-Version:        1.5
-Release:        2
+Version:        3.0
+Release:        1%{?dist}
 Summary:        A Python Object Database
 
 Group:          Development/Libraries
@@ -53,6 +53,10 @@
 %{_bindir}/durus
 
 %changelog
+* Thu Sep 08 2005 Shahms E. King  3.0-1
+- Update to upstream 3.0 (2.0 was only a license change, no code)
+- Add dist tag
+
 * Fri Apr 22 2005 Shahms E. King  1.5-2
 - Increment Release to fix EVR problem
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-durus/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	13 Apr 2005 18:59:38 -0000	1.3
+++ sources	8 Sep 2005 23:11:25 -0000	1.4
@@ -1 +1 @@
-c7bf836616cff8e5b8e7b01db3665e11  Durus-1.5.tar.gz
+de1830c7f7f7e63b0c8783ee1c806c91  Durus-3.0.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep  8 23:14:12 2005
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Thu,  8 Sep 2005 19:14:12 -0400
Subject: rpms/python-quixote/FC-4 .cvsignore, 1.3, 1.4 python-quixote.spec,
	1.4, 1.5 sources, 1.3, 1.4
Message-ID: <200509082314.j88NEhRw011697@cvs-int.fedora.redhat.com>

Author: shahms

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

Modified Files:
	.cvsignore python-quixote.spec sources 
Log Message:
Update to new upstream version 2.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-quixote/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	13 Apr 2005 20:09:53 -0000	1.3
+++ .cvsignore	8 Sep 2005 23:14:10 -0000	1.4
@@ -1 +1 @@
-Quixote-2.0.tar.gz
+Quixote-2.1.tar.gz


Index: python-quixote.spec
===================================================================
RCS file: /cvs/extras/rpms/python-quixote/FC-4/python-quixote.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- python-quixote.spec	13 Apr 2005 20:09:53 -0000	1.4
+++ python-quixote.spec	8 Sep 2005 23:14:10 -0000	1.5
@@ -3,8 +3,8 @@
 %define srcname Quixote
 
 Name:           python-quixote
-Version:        2.0
-Release:        1
+Version:        2.1
+Release:        1%{?dist}
 Summary:        A highly Pythonic Web application framework
 
 Group:          Development/Libraries
@@ -70,6 +70,10 @@
 %ghost %{python_sitearch}/quixote/html/*.pyo
 
 %changelog
+* Thu Sep 08 2005 Shahms E. King  2.1-1
+- update to new upstream 2.1
+- add dist tag
+
 * Wed Apr 13 2005 Shahms E. King  2.0-1
 - update to Quixote 2.0
 - removed unused python_sitelib


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-quixote/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	13 Apr 2005 20:09:53 -0000	1.3
+++ sources	8 Sep 2005 23:14:10 -0000	1.4
@@ -1 +1 @@
-2c22a99db4ebe1e876a51d800e417f6f  Quixote-2.0.tar.gz
+21134661449e3b2e26139a0acc4d3b52  Quixote-2.1.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep  8 23:14:13 2005
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Thu,  8 Sep 2005 19:14:13 -0400
Subject: rpms/python-quixote/devel .cvsignore, 1.3, 1.4 python-quixote.spec,
	1.4, 1.5 sources, 1.3, 1.4
Message-ID: <200509082314.j88NEhX4011702@cvs-int.fedora.redhat.com>

Author: shahms

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

Modified Files:
	.cvsignore python-quixote.spec sources 
Log Message:
Update to new upstream version 2.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-quixote/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	13 Apr 2005 20:09:53 -0000	1.3
+++ .cvsignore	8 Sep 2005 23:14:11 -0000	1.4
@@ -1 +1 @@
-Quixote-2.0.tar.gz
+Quixote-2.1.tar.gz


Index: python-quixote.spec
===================================================================
RCS file: /cvs/extras/rpms/python-quixote/devel/python-quixote.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- python-quixote.spec	13 Apr 2005 20:09:53 -0000	1.4
+++ python-quixote.spec	8 Sep 2005 23:14:11 -0000	1.5
@@ -3,8 +3,8 @@
 %define srcname Quixote
 
 Name:           python-quixote
-Version:        2.0
-Release:        1
+Version:        2.1
+Release:        1%{?dist}
 Summary:        A highly Pythonic Web application framework
 
 Group:          Development/Libraries
@@ -70,6 +70,10 @@
 %ghost %{python_sitearch}/quixote/html/*.pyo
 
 %changelog
+* Thu Sep 08 2005 Shahms E. King  2.1-1
+- update to new upstream 2.1
+- add dist tag
+
 * Wed Apr 13 2005 Shahms E. King  2.0-1
 - update to Quixote 2.0
 - removed unused python_sitelib


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-quixote/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	13 Apr 2005 20:09:53 -0000	1.3
+++ sources	8 Sep 2005 23:14:11 -0000	1.4
@@ -1 +1 @@
-2c22a99db4ebe1e876a51d800e417f6f  Quixote-2.0.tar.gz
+21134661449e3b2e26139a0acc4d3b52  Quixote-2.1.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep  8 23:20:55 2005
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Thu,  8 Sep 2005 19:20:55 -0400
Subject: rpms/python-psycopg/FC-3 .cvsignore, 1.2, 1.3 python-psycopg.spec,
	1.3, 1.4 sources, 1.2, 1.3
Message-ID: <200509082320.j88NKtXD011904@cvs-int.fedora.redhat.com>

Author: shahms

Update of /cvs/extras/rpms/python-psycopg/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11850/FC-3

Modified Files:
	.cvsignore python-psycopg.spec sources 
Log Message:
Update to new upstream version 1.1.19



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-psycopg/FC-3/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	15 Mar 2005 20:52:06 -0000	1.2
+++ .cvsignore	8 Sep 2005 23:20:53 -0000	1.3
@@ -1 +1 @@
-psycopg-1.1.18.tar.gz
+psycopg-1.1.19.tar.gz


Index: python-psycopg.spec
===================================================================
RCS file: /cvs/extras/rpms/python-psycopg/FC-3/python-psycopg.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- python-psycopg.spec	12 May 2005 14:51:01 -0000	1.3
+++ python-psycopg.spec	8 Sep 2005 23:20:53 -0000	1.4
@@ -3,15 +3,15 @@
 %define srcname psycopg
 
 Name:           python-psycopg
-Version:        1.1.18
-Release:        4%{?dist}
+Version:        1.1.19
+Release:        1%{?dist}
 
 Summary:        PostgreSQL database adapter for Python
 
 Group:          Development/Libraries
 License:        GPL
 URL:            http://www.initd.org/software/initd/psycopg
-Source0:        http://initd.org/pub/software/psycopg/psycopg-1.1.18.tar.gz
+Source0:        http://initd.org/pub/software/psycopg/%{srcname}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python-devel postgresql-devel mx
@@ -54,6 +54,9 @@
 %{python_sitearch}/*.so
 
 %changelog
+* Thu Sep 08 2005 Shahms E. King  1.1.19-1
+- update to new upstream version
+
 * Thu May 12 2005 Shahms E. King  1.1.18-4
 - rebuilt, added disttag
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-psycopg/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	15 Mar 2005 20:52:06 -0000	1.2
+++ sources	8 Sep 2005 23:20:53 -0000	1.3
@@ -1 +1 @@
-8e5cd2925a25a5aa80cd83418d6a5f09  psycopg-1.1.18.tar.gz
+7b811c624f49a4b9d31936d3b101fa7a  psycopg-1.1.19.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep  8 23:20:56 2005
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Thu,  8 Sep 2005 19:20:56 -0400
Subject: rpms/python-psycopg/FC-4 .cvsignore, 1.2, 1.3 python-psycopg.spec,
	1.4, 1.5 sources, 1.2, 1.3
Message-ID: <200509082320.j88NKukr011913@cvs-int.fedora.redhat.com>

Author: shahms

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

Modified Files:
	.cvsignore python-psycopg.spec sources 
Log Message:
Update to new upstream version 1.1.19



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-psycopg/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	15 Mar 2005 20:52:06 -0000	1.2
+++ .cvsignore	8 Sep 2005 23:20:54 -0000	1.3
@@ -1 +1 @@
-psycopg-1.1.18.tar.gz
+psycopg-1.1.19.tar.gz


Index: python-psycopg.spec
===================================================================
RCS file: /cvs/extras/rpms/python-psycopg/FC-4/python-psycopg.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- python-psycopg.spec	12 May 2005 14:50:24 -0000	1.4
+++ python-psycopg.spec	8 Sep 2005 23:20:54 -0000	1.5
@@ -3,15 +3,15 @@
 %define srcname psycopg
 
 Name:           python-psycopg
-Version:        1.1.18
-Release:        4%{?dist}
+Version:        1.1.19
+Release:        1%{?dist}
 
 Summary:        PostgreSQL database adapter for Python
 
 Group:          Development/Libraries
 License:        GPL
 URL:            http://www.initd.org/software/initd/psycopg
-Source0:        http://initd.org/pub/software/psycopg/psycopg-1.1.18.tar.gz
+Source0:        http://initd.org/pub/software/psycopg/%{srcname}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python-devel postgresql-devel mx
@@ -54,6 +54,9 @@
 %{python_sitearch}/*.so
 
 %changelog
+* Thu Sep 08 2005 Shahms E. King  1.1.19-1
+- update to new upstream version
+
 * Thu May 12 2005 Shahms E. King  1.1.18-4
 - rebuilt, added disttag
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-psycopg/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	15 Mar 2005 20:52:06 -0000	1.2
+++ sources	8 Sep 2005 23:20:54 -0000	1.3
@@ -1 +1 @@
-8e5cd2925a25a5aa80cd83418d6a5f09  psycopg-1.1.18.tar.gz
+7b811c624f49a4b9d31936d3b101fa7a  psycopg-1.1.19.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep  8 23:20:56 2005
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Thu,  8 Sep 2005 19:20:56 -0400
Subject: rpms/python-psycopg/devel .cvsignore, 1.2, 1.3 python-psycopg.spec,
	1.4, 1.5 sources, 1.2, 1.3
Message-ID: <200509082320.j88NKula011921@cvs-int.fedora.redhat.com>

Author: shahms

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

Modified Files:
	.cvsignore python-psycopg.spec sources 
Log Message:
Update to new upstream version 1.1.19



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-psycopg/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	15 Mar 2005 20:52:06 -0000	1.2
+++ .cvsignore	8 Sep 2005 23:20:54 -0000	1.3
@@ -1 +1 @@
-psycopg-1.1.18.tar.gz
+psycopg-1.1.19.tar.gz


Index: python-psycopg.spec
===================================================================
RCS file: /cvs/extras/rpms/python-psycopg/devel/python-psycopg.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- python-psycopg.spec	12 May 2005 14:50:24 -0000	1.4
+++ python-psycopg.spec	8 Sep 2005 23:20:54 -0000	1.5
@@ -3,15 +3,15 @@
 %define srcname psycopg
 
 Name:           python-psycopg
-Version:        1.1.18
-Release:        4%{?dist}
+Version:        1.1.19
+Release:        1%{?dist}
 
 Summary:        PostgreSQL database adapter for Python
 
 Group:          Development/Libraries
 License:        GPL
 URL:            http://www.initd.org/software/initd/psycopg
-Source0:        http://initd.org/pub/software/psycopg/psycopg-1.1.18.tar.gz
+Source0:        http://initd.org/pub/software/psycopg/%{srcname}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python-devel postgresql-devel mx
@@ -54,6 +54,9 @@
 %{python_sitearch}/*.so
 
 %changelog
+* Thu Sep 08 2005 Shahms E. King  1.1.19-1
+- update to new upstream version
+
 * Thu May 12 2005 Shahms E. King  1.1.18-4
 - rebuilt, added disttag
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-psycopg/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	15 Mar 2005 20:52:06 -0000	1.2
+++ sources	8 Sep 2005 23:20:54 -0000	1.3
@@ -1 +1 @@
-8e5cd2925a25a5aa80cd83418d6a5f09  psycopg-1.1.18.tar.gz
+7b811c624f49a4b9d31936d3b101fa7a  psycopg-1.1.19.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep  9 00:13:35 2005
From: fedora-extras-commits at redhat.com (Joshua W. Boyer (jwboyer))
Date: Thu,  8 Sep 2005 20:13:35 -0400
Subject: rpms/gquilt/FC-3 .cvsignore, 1.4, 1.5 gquilt-pygtk-2.4-compat.patch,
	1.1, 1.2 gquilt.spec, 1.4, 1.5 sources, 1.4, 1.5
Message-ID: <200509090013.j890DZLg013616@cvs-int.fedora.redhat.com>

Author: jwboyer

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

Modified Files:
	.cvsignore gquilt-pygtk-2.4-compat.patch gquilt.spec sources 
Log Message:
Update to gquilt-0.14


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gquilt/FC-3/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	28 Aug 2005 17:43:35 -0000	1.4
+++ .cvsignore	9 Sep 2005 00:13:33 -0000	1.5
@@ -1 +1 @@
-gquilt-0.13.tar.gz
+gquilt-0.14.tar.gz

gquilt-pygtk-2.4-compat.patch:

Index: gquilt-pygtk-2.4-compat.patch
===================================================================
RCS file: /cvs/extras/rpms/gquilt/FC-3/gquilt-pygtk-2.4-compat.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gquilt-pygtk-2.4-compat.patch	30 Aug 2005 03:19:13 -0000	1.1
+++ gquilt-pygtk-2.4-compat.patch	9 Sep 2005 00:13:33 -0000	1.2
@@ -1,8 +1,8 @@
-Index: gquilt-0.13/gquilt.py
+Index: gquilt-0.14/gquilt.py
 ===================================================================
---- gquilt-0.13.orig/gquilt.py
-+++ gquilt-0.13/gquilt.py
-@@ -340,8 +340,8 @@ class gquilt(gtk.Window):
+--- gquilt-0.14.orig/gquilt.py
++++ gquilt-0.14/gquilt.py
+@@ -367,8 +367,8 @@ class gquilt(gtk.Window):
          self.playground_files.set_size_request(240, 320)
          self.playground_files.view.get_selection().set_mode(gtk.SELECTION_MULTIPLE)
          self.playground_files.append_selection_menu_item("_Add", "Add a the selected files to the top patch", gtk.STOCK_ADD, self._add_playground_selection_to_patch)
@@ -13,7 +13,7 @@
          self.playground_files.append_menu_item("_New", "Add a new file to the top patch", gtk.STOCK_NEW, self._add_new_file_to_patch)
          return self.playground_files
      def _create_patch_file_tree(self):
-@@ -352,7 +352,7 @@ class gquilt(gtk.Window):
+@@ -379,7 +379,7 @@ class gquilt(gtk.Window):
          self.patch_files.append_menu_item("_Diff", "Display diff for selected files", gquilt_icons.diff, self._display_diff)
          self.patch_files.append_conditional_menu_item("_Meld", "Display diff for selected files using \"meld\"", gquilt_icons.meld, self._display_diff_with_meld, self._unique_selection_and_meld)
          self.patch_files.append_menu_item("_New", "Add a new file to the top patch", gtk.STOCK_NEW, self._add_new_file_to_patch)
@@ -22,7 +22,7 @@
          self.patch_files.append_selection_menu_item("_Remove", "Remove the selected files from the top patch", gtk.STOCK_REMOVE, self._remove_files_from_patch)
          self.patch_files.append_selection_menu_item("_Delete", "Delete the selected files from the playground", gtk.STOCK_DELETE, self._delete_selected_files)
          return self.patch_files
-@@ -360,8 +360,8 @@ class gquilt(gtk.Window):
+@@ -387,8 +387,8 @@ class gquilt(gtk.Window):
          self.patches = gquilt_patch_list()
          self.patches.set_tooltips(self.tooltips)
          self.patches.set_size_request(240, 320)
@@ -33,10 +33,10 @@
          self.patches.append_unique_selection_menu_item("D_iff", "Displa the diff for the selected patch", gquilt_icons.diff, self._display_patch_diff)
          self.patches.append_unique_selection_menu_item("Re_name", "Rename the selected patch", None, self._rename_patch)
          self.patches.append_unique_selection_menu_item("_Delete", "Delete the selected patch from the series", gtk.STOCK_DELETE, self._delete_patch)
-Index: gquilt-0.13/gquilt_gtk.py
+Index: gquilt-0.14/gquilt_gtk.py
 ===================================================================
---- gquilt-0.13.orig/gquilt_gtk.py
-+++ gquilt-0.13/gquilt_gtk.py
+--- gquilt-0.14.orig/gquilt_gtk.py
++++ gquilt-0.14/gquilt_gtk.py
 @@ -402,11 +402,11 @@ class dir_file_tree(file_tree):
          dirs, files = self._dir_contents(dir)
          dirs.sort()


Index: gquilt.spec
===================================================================
RCS file: /cvs/extras/rpms/gquilt/FC-3/gquilt.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gquilt.spec	30 Aug 2005 03:19:13 -0000	1.4
+++ gquilt.spec	9 Sep 2005 00:13:33 -0000	1.5
@@ -1,6 +1,6 @@
 Name:		gquilt
-Version:	0.13
-Release:	2%{?dist}
+Version:	0.14
+Release:	1%{?dist}
 License:	GPL
 Group:		Development/Tools
 Summary:	PyGTK GUI wrapper for quilt
@@ -53,6 +53,9 @@
 rm -rf "$RPM_BUILD_ROOT"
 
 %changelog
+* Thu Sep 8 2005 Josh Boyer  0.14-1
+- Update to latest release
+
 * Sun Aug 29 2005 Josh Boyer  0.13-2
 - Fix gtk 2.4 problems
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gquilt/FC-3/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	28 Aug 2005 17:43:35 -0000	1.4
+++ sources	9 Sep 2005 00:13:33 -0000	1.5
@@ -1 +1 @@
-d69cbca85d12c299b189e531c65be1e4  gquilt-0.13.tar.gz
+3d4d853033f7b4b470ea8e3bc55737c8  gquilt-0.14.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep  9 00:13:36 2005
From: fedora-extras-commits at redhat.com (Joshua W. Boyer (jwboyer))
Date: Thu,  8 Sep 2005 20:13:36 -0400
Subject: rpms/gquilt/devel .cvsignore, 1.4, 1.5 gquilt.spec, 1.3, 1.4 sources,
	1.4, 1.5
Message-ID: <200509090013.j890DaAE013633@cvs-int.fedora.redhat.com>

Author: jwboyer

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

Modified Files:
	.cvsignore gquilt.spec sources 
Log Message:
Update to gquilt-0.14


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gquilt/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	28 Aug 2005 17:39:13 -0000	1.4
+++ .cvsignore	9 Sep 2005 00:13:34 -0000	1.5
@@ -1 +1 @@
-gquilt-0.13.tar.gz
+gquilt-0.14.tar.gz


Index: gquilt.spec
===================================================================
RCS file: /cvs/extras/rpms/gquilt/devel/gquilt.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gquilt.spec	28 Aug 2005 17:39:13 -0000	1.3
+++ gquilt.spec	9 Sep 2005 00:13:34 -0000	1.4
@@ -1,5 +1,5 @@
 Name:		gquilt
-Version:	0.13
+Version:	0.14
 Release:	1%{?dist}
 License:	GPL
 Group:		Development/Tools
@@ -51,6 +51,9 @@
 rm -rf "$RPM_BUILD_ROOT"
 
 %changelog
+* Thu Sep 8 2005 Josh Boyer  0.14-1
+- Update to latest release
+
 * Sun Aug 28 2005 Josh Boyer  0.13-1
 - Update to latest release
 - Remove COPYING file (included upstream)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gquilt/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	28 Aug 2005 17:39:13 -0000	1.4
+++ sources	9 Sep 2005 00:13:34 -0000	1.5
@@ -1 +1 @@
-d69cbca85d12c299b189e531c65be1e4  gquilt-0.13.tar.gz
+3d4d853033f7b4b470ea8e3bc55737c8  gquilt-0.14.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep  9 00:13:36 2005
From: fedora-extras-commits at redhat.com (Joshua W. Boyer (jwboyer))
Date: Thu,  8 Sep 2005 20:13:36 -0400
Subject: rpms/gquilt/FC-4 .cvsignore, 1.4, 1.5 gquilt.spec, 1.3, 1.4 sources,
	1.4, 1.5
Message-ID: <200509090013.j890Da3m013625@cvs-int.fedora.redhat.com>

Author: jwboyer

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

Modified Files:
	.cvsignore gquilt.spec sources 
Log Message:
Update to gquilt-0.14


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gquilt/FC-4/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	28 Aug 2005 17:42:38 -0000	1.4
+++ .cvsignore	9 Sep 2005 00:13:34 -0000	1.5
@@ -1 +1 @@
-gquilt-0.13.tar.gz
+gquilt-0.14.tar.gz


Index: gquilt.spec
===================================================================
RCS file: /cvs/extras/rpms/gquilt/FC-4/gquilt.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gquilt.spec	28 Aug 2005 17:42:38 -0000	1.3
+++ gquilt.spec	9 Sep 2005 00:13:34 -0000	1.4
@@ -1,5 +1,5 @@
 Name:		gquilt
-Version:	0.13
+Version:	0.14
 Release:	1%{?dist}
 License:	GPL
 Group:		Development/Tools
@@ -51,6 +51,9 @@
 rm -rf "$RPM_BUILD_ROOT"
 
 %changelog
+* Thu Sep 8 2005 Josh Boyer  0.14-1
+- Update to latest release
+
 * Sun Aug 28 2005 Josh Boyer  0.13-1
 - Update to latest release
 - Remove COPYING file (included upstream)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gquilt/FC-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	28 Aug 2005 17:42:38 -0000	1.4
+++ sources	9 Sep 2005 00:13:34 -0000	1.5
@@ -1 +1 @@
-d69cbca85d12c299b189e531c65be1e4  gquilt-0.13.tar.gz
+3d4d853033f7b4b470ea8e3bc55737c8  gquilt-0.14.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep  9 04:09:58 2005
From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon))
Date: Fri,  9 Sep 2005 00:09:58 -0400
Subject: rpms/libxml++/FC-4 .cvsignore, 1.3, 1.4 libxml++.spec, 1.9,
	1.10 sources, 1.3, 1.4
Message-ID: <200509090409.j8949w7a019417@cvs-int.fedora.redhat.com>

Author: icon

Update of /cvs/extras/rpms/libxml++/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19394

Modified Files:
	.cvsignore libxml++.spec sources 
Log Message:
Version 2.12.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libxml++/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	21 Jul 2005 18:02:23 -0000	1.3
+++ .cvsignore	9 Sep 2005 04:09:56 -0000	1.4
@@ -1 +1 @@
-libxml++-2.10.0.tar.bz2
+libxml++-2.12.0.tar.bz2


Index: libxml++.spec
===================================================================
RCS file: /cvs/extras/rpms/libxml++/FC-4/libxml++.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- libxml++.spec	21 Jul 2005 18:02:23 -0000	1.9
+++ libxml++.spec	9 Sep 2005 04:09:56 -0000	1.10
@@ -1,12 +1,12 @@
 Name:           libxml++
-Version:        2.10.0
+Version:        2.12.0
 Release:        1%{?dist}
 Summary:        C++ wrapper for the libxml2 XML parser library
 
 Group:          System Environment/Libraries
 License:        LGPL
 URL:            http://libxmlplusplus.sourceforge.net/
-Source:         http://ftp.gnome.org/pub/GNOME/sources/libxml++/2.10/libxml++-%{version}.tar.bz2
+Source:         http://ftp.gnome.org/pub/GNOME/sources/libxml++/%{version}/libxml++-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libxml2-devel >= 2.6.1, doxygen, glibmm24-devel >= 2.4.0
@@ -32,14 +32,13 @@
 
 
 %build
-%configure
+%configure --disable-static
 make %{?_smp_mflags}
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
 %makeinstall
-find $RPM_BUILD_ROOT -name "*.la" -o -name '*.a' | xargs rm -f {}
 # Modify temporary working directories for files section.
 rm -rf _reference _examples _manual
 mkdir -m 755 _reference _examples _manual
@@ -78,6 +77,10 @@
 
 
 %changelog
+* Thu Sep 08 2005 Konstantin Ryabitsev  - 2.12.0-1
+- Version 2.12.0
+- Use --disable-static for configure and don't hunt static libs.
+
 * Thu Jul 21 2005 Konstantin Ryabitsev  - 2.10.0-1
 - Version 2.10.0
 - Rearrange and conform to new FE standards


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libxml++/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	21 Jul 2005 18:02:24 -0000	1.3
+++ sources	9 Sep 2005 04:09:56 -0000	1.4
@@ -1 +1 @@
-1494b12a2cf5e337d7717af4557a7711  libxml++-2.10.0.tar.bz2
+062653883d0ce38a3c7b4ec85b2bfe4b  libxml++-2.12.0.tar.bz2



From fedora-extras-commits at redhat.com  Fri Sep  9 04:21:54 2005
From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon))
Date: Fri,  9 Sep 2005 00:21:54 -0400
Subject: rpms/libxml++/FC-4 libxml++.spec,1.10,1.11
Message-ID: <200509090421.j894LsZY019448@cvs-int.fedora.redhat.com>

Author: icon

Update of /cvs/extras/rpms/libxml++/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19429

Modified Files:
	libxml++.spec 
Log Message:
Apparently --disable-static can't be trusted to always work. :(



Index: libxml++.spec
===================================================================
RCS file: /cvs/extras/rpms/libxml++/FC-4/libxml++.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- libxml++.spec	9 Sep 2005 04:09:56 -0000	1.10
+++ libxml++.spec	9 Sep 2005 04:21:52 -0000	1.11
@@ -39,6 +39,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 %makeinstall
+find $RPM_BUILD_ROOT -name "*.la" -o -name '*.a' | xargs rm -f {}
 # Modify temporary working directories for files section.
 rm -rf _reference _examples _manual
 mkdir -m 755 _reference _examples _manual
@@ -79,7 +80,7 @@
 %changelog
 * Thu Sep 08 2005 Konstantin Ryabitsev  - 2.12.0-1
 - Version 2.12.0
-- Use --disable-static for configure and don't hunt static libs.
+- Use --disable-static for configure.
 
 * Thu Jul 21 2005 Konstantin Ryabitsev  - 2.10.0-1
 - Version 2.10.0



From fedora-extras-commits at redhat.com  Fri Sep  9 04:26:52 2005
From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon))
Date: Fri,  9 Sep 2005 00:26:52 -0400
Subject: rpms/libxml++/devel .cvsignore, 1.3, 1.4 libxml++.spec, 1.9,
	1.10 sources, 1.3, 1.4
Message-ID: <200509090426.j894QqFm019540@cvs-int.fedora.redhat.com>

Author: icon

Update of /cvs/extras/rpms/libxml++/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19517

Modified Files:
	.cvsignore libxml++.spec sources 
Log Message:
Version 2.12.0.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libxml++/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	21 Jul 2005 18:06:12 -0000	1.3
+++ .cvsignore	9 Sep 2005 04:26:50 -0000	1.4
@@ -1 +1 @@
-libxml++-2.10.0.tar.bz2
+libxml++-2.12.0.tar.bz2


Index: libxml++.spec
===================================================================
RCS file: /cvs/extras/rpms/libxml++/devel/libxml++.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- libxml++.spec	21 Jul 2005 18:06:12 -0000	1.9
+++ libxml++.spec	9 Sep 2005 04:26:50 -0000	1.10
@@ -1,12 +1,12 @@
 Name:           libxml++
-Version:        2.10.0
+Version:        2.12.0
 Release:        1%{?dist}
 Summary:        C++ wrapper for the libxml2 XML parser library
 
 Group:          System Environment/Libraries
 License:        LGPL
 URL:            http://libxmlplusplus.sourceforge.net/
-Source:         http://ftp.gnome.org/pub/GNOME/sources/libxml++/2.10/libxml++-%{version}.tar.bz2
+Source:         http://ftp.gnome.org/pub/GNOME/sources/libxml++/%{version}/libxml++-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libxml2-devel >= 2.6.1, doxygen, glibmm24-devel >= 2.4.0
@@ -32,7 +32,7 @@
 
 
 %build
-%configure
+%configure --disable-static
 make %{?_smp_mflags}
 
 
@@ -78,6 +78,10 @@
 
 
 %changelog
+* Thu Sep 08 2005 Konstantin Ryabitsev  - 2.12.0-1
+- Version 2.12.0
+- Use --disable-static for configure.
+
 * Thu Jul 21 2005 Konstantin Ryabitsev  - 2.10.0-1
 - Version 2.10.0
 - Rearrange and conform to new FE standards


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libxml++/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	21 Jul 2005 18:06:20 -0000	1.3
+++ sources	9 Sep 2005 04:26:50 -0000	1.4
@@ -1 +1 @@
-1494b12a2cf5e337d7717af4557a7711  libxml++-2.10.0.tar.bz2
+062653883d0ce38a3c7b4ec85b2bfe4b  libxml++-2.12.0.tar.bz2



From fedora-extras-commits at redhat.com  Fri Sep  9 05:47:25 2005
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Fri,  9 Sep 2005 01:47:25 -0400
Subject: rpms/scim/FC-4 scim-add-restart.patch, NONE,
	1.1 scim-gtk-langs-167090.patch, NONE, 1.1 scim.spec, 1.20, 1.21
Message-ID: <200509090547.j895lPwf020961@cvs-int.fedora.redhat.com>

Author: petersen

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

Modified Files:
	scim.spec 
Added Files:
	scim-add-restart.patch scim-gtk-langs-167090.patch 
Log Message:
- improve scim-restart script to take account of the config module in use
  (Liu Cougar)
- add scim-restart script to make it easier to restart scim after updating
  IMEs with scim-add-restart.patch
- add scim-gtk-langs-167090.patch to set gtk immodule language list empty
  for now so that rhgb doesn't load scim (Warren Togami, #167088)



scim-add-restart.patch:

--- NEW FILE scim-add-restart.patch ---
--- scim-1.4.2/src/scim-restart.in.1-restart	2005-09-02 12:05:35.000000000 +0900
+++ scim-1.4.2/src/scim-restart.in	2005-08-25 22:52:29.000000000 +0900
@@ -0,1 +1,6 @@
+#!/bin/sh
+
+COMMAND="@SCIM_LIBEXECDIR@/scim-launcher -d -c `scim-config-agent -c global -g "/DefaultConfigModule"` -e all -f socket --no-stay"
+
+pkill -f "${COMMAND}" && ${COMMAND}
--- scim-1.4.2/src/Makefile.am.1-restart	2005-07-10 22:32:23.000000000 +0900
+++ scim-1.4.2/src/Makefile.am	2005-09-02 11:42:57.000000000 +0900
@@ -141,6 +141,7 @@
 
 
 bin_PROGRAMS		= scim scim-config-agent
+bin_SCRIPTS		= scim-restart
 
 scim_SOURCES	 	= scim.cpp 
 scim_LDADD		= libscim-1.0.la
--- scim-1.4.2/configure.ac.1-restart	2005-08-16 15:56:59.000000000 +0900
+++ scim-1.4.2/configure.ac	2005-09-02 11:42:57.000000000 +0900
@@ -516,6 +516,7 @@
 		 intl/Makefile
 		 po/Makefile.in
 		 src/Makefile
+		 src/scim-restart
 		 src/scim_types.h
 		 utils/Makefile
 		 data/Makefile

scim-gtk-langs-167090.patch:

--- NEW FILE scim-gtk-langs-167090.patch ---
--- scim-1.4.2/extras/gtk2_immodule/imscim.cpp~	2005-01-10 17:15:07.000000000 +0900
+++ scim-1.4.2/extras/gtk2_immodule/imscim.cpp	2005-09-01 15:21:08.000000000 +0900
@@ -33,7 +33,7 @@
   "SCIM Input Method",		/* Human readable name */
   "scim",			/* Translation domain */
   SCIM_LOCALEDIR,		/* Dir for bindtextdomain (not strictly needed for "gtk+") */
-  "*"				/* Languages for which this module is the default */
+  ""				/* Languages for which this module is the default */
 };
 
 static const GtkIMContextInfo *info_list[] = {


Index: scim.spec
===================================================================
RCS file: /cvs/extras/rpms/scim/FC-4/scim.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- scim.spec	22 Aug 2005 05:32:55 -0000	1.20
+++ scim.spec	9 Sep 2005 05:47:23 -0000	1.21
@@ -1,7 +1,7 @@
 Name:      scim
 Version:   1.4.2
 # must be less than the release number of scim in Core
-Release:   0%{?dist}
+Release:   1%{?dist}
 Summary:   Smart Common Input Method platform
 
 License:   LGPL
@@ -13,6 +13,10 @@
 
 PreReq:    %{_bindir}/update-gtk-immodules
 BuildRequires: gtk2-devel, desktop-file-utils
+# for autoreconf
+Buildrequires: gettext-devel
+Patch1:    scim-add-restart.patch
+Patch2:    scim-gtk-langs-167090.patch
 
 %description
 SCIM is a user friendly and full featured input method user interface and
@@ -40,6 +44,10 @@
 
 %prep
 %setup -q
+%patch1 -p1 -b .1-restart
+%patch2 -p1 -b .2-langs
+# patch1 touches configure.ac and src/Makefile.am
+autoreconf
 
 
 %build
@@ -130,6 +138,16 @@
 
 
 %changelog
+* Fri Sep  9 2005 Jens Petersen  - 1.4.2-1
+- improve scim-restart script to take account of the config module in use
+  (Liu Cougar)
+
+* Fri Sep  2 2005 Jens Petersen 
+- add scim-restart script to make it easier to restart scim after updating
+  IMEs with scim-add-restart.patch
+- add scim-gtk-langs-167090.patch to set gtk immodule language list empty
+  for now so that rhgb doesn't load scim (Warren Togami, #167088)
+
 * Mon Aug 22 2005 Jens Petersen  - 1.4.2-0
 - update to 1.4.2 release
 - source scim-qtimm script if present from scim xinput script



From fedora-extras-commits at redhat.com  Fri Sep  9 06:27:05 2005
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Fri,  9 Sep 2005 02:27:05 -0400
Subject: rpms/scim/FC-4 scim-add-restart.patch, 1.1, 1.2 update-xinput-scim,
	1.3, NONE
Message-ID: <200509090627.j896R5jY022389@cvs-int.fedora.redhat.com>

Author: petersen

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

Modified Files:
	scim-add-restart.patch 
Removed Files:
	update-xinput-scim 
Log Message:
fix scim-restart patch


scim-add-restart.patch:

Index: scim-add-restart.patch
===================================================================
RCS file: /cvs/extras/rpms/scim/FC-4/scim-add-restart.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- scim-add-restart.patch	9 Sep 2005 05:47:23 -0000	1.1
+++ scim-add-restart.patch	9 Sep 2005 06:27:03 -0000	1.2
@@ -1,6 +1,6 @@
 --- scim-1.4.2/src/scim-restart.in.1-restart	2005-09-02 12:05:35.000000000 +0900
 +++ scim-1.4.2/src/scim-restart.in	2005-08-25 22:52:29.000000000 +0900
-@@ -0,1 +1,6 @@
+@@ -0,0 +1,5 @@
 +#!/bin/sh
 +
 +COMMAND="@SCIM_LIBEXECDIR@/scim-launcher -d -c `scim-config-agent -c global -g "/DefaultConfigModule"` -e all -f socket --no-stay"


--- update-xinput-scim DELETED ---



From fedora-extras-commits at redhat.com  Fri Sep  9 06:39:56 2005
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Fri,  9 Sep 2005 02:39:56 -0400
Subject: rpms/scim/FC-3 scim-add-restart.patch, NONE,
	1.1 scim-gtk-langs-167090.patch, NONE, 1.1 scim.spec, 1.14,
	1.15 update-xinput-scim, 1.1, NONE
Message-ID: <200509090639.j896duPY022485@cvs-int.fedora.redhat.com>

Author: petersen

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

Modified Files:
	scim.spec 
Added Files:
	scim-add-restart.patch scim-gtk-langs-167090.patch 
Removed Files:
	update-xinput-scim 
Log Message:
- improve scim-restart script to take account of the config module in use
  (Liu Cougar)
- add scim-restart script to make it easier to restart scim after updating
  IMEs with scim-add-restart.patch
- add scim-gtk-langs-167090.patch to set gtk immodule language list empty
  for now so that rhgb doesn't load scim (Warren Togami, #167088)



scim-add-restart.patch:

--- NEW FILE scim-add-restart.patch ---
--- scim-1.4.2/src/scim-restart.in.1-restart	2005-09-02 12:05:35.000000000 +0900
+++ scim-1.4.2/src/scim-restart.in	2005-08-25 22:52:29.000000000 +0900
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+COMMAND="@SCIM_LIBEXECDIR@/scim-launcher -d -c `scim-config-agent -c global -g "/DefaultConfigModule"` -e all -f socket --no-stay"
+
+pkill -f "${COMMAND}" && ${COMMAND}
--- scim-1.4.2/src/Makefile.am.1-restart	2005-07-10 22:32:23.000000000 +0900
+++ scim-1.4.2/src/Makefile.am	2005-09-02 11:42:57.000000000 +0900
@@ -141,6 +141,7 @@
 
 
 bin_PROGRAMS		= scim scim-config-agent
+bin_SCRIPTS		= scim-restart
 
 scim_SOURCES	 	= scim.cpp 
 scim_LDADD		= libscim-1.0.la
--- scim-1.4.2/configure.ac.1-restart	2005-08-16 15:56:59.000000000 +0900
+++ scim-1.4.2/configure.ac	2005-09-02 11:42:57.000000000 +0900
@@ -516,6 +516,7 @@
 		 intl/Makefile
 		 po/Makefile.in
 		 src/Makefile
+		 src/scim-restart
 		 src/scim_types.h
 		 utils/Makefile
 		 data/Makefile

scim-gtk-langs-167090.patch:

--- NEW FILE scim-gtk-langs-167090.patch ---
--- scim-1.4.2/extras/gtk2_immodule/imscim.cpp~	2005-01-10 17:15:07.000000000 +0900
+++ scim-1.4.2/extras/gtk2_immodule/imscim.cpp	2005-09-01 15:21:08.000000000 +0900
@@ -33,7 +33,7 @@
   "SCIM Input Method",		/* Human readable name */
   "scim",			/* Translation domain */
   SCIM_LOCALEDIR,		/* Dir for bindtextdomain (not strictly needed for "gtk+") */
-  "*"				/* Languages for which this module is the default */
+  ""				/* Languages for which this module is the default */
 };
 
 static const GtkIMContextInfo *info_list[] = {


Index: scim.spec
===================================================================
RCS file: /cvs/extras/rpms/scim/FC-3/scim.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- scim.spec	26 Aug 2005 08:07:03 -0000	1.14
+++ scim.spec	9 Sep 2005 06:39:54 -0000	1.15
@@ -1,7 +1,7 @@
 Name:      scim
 Version:   1.4.2
 # must be less than the release number of scim in Core
-Release:   0%{?dist}.1
+Release:   1%{?dist}
 Summary:   Smart Common Input Method platform
 
 License:   LGPL
@@ -13,6 +13,10 @@
 
 PreReq:    %{_bindir}/update-gtk-immodules
 BuildRequires: gtk2-devel, desktop-file-utils
+# for autoreconf
+Buildrequires: gettext-devel
+Patch1:    scim-add-restart.patch
+Patch2:    scim-gtk-langs-167090.patch
 
 %description
 SCIM is a user friendly and full featured input method user interface and
@@ -40,11 +44,14 @@
 
 %prep
 %setup -q
+%patch1 -p1 -b .1-restart
+%patch2 -p1 -b .2-langs
+# patch1 touches configure.ac and src/Makefile.am
+autoreconf
 
 
 %build
-%configure --disable-static \
- 	--enable-ld-version-script
+%configure --disable-static --enable-ld-version-script
 make %{?_smp_mflags}
 
 
@@ -130,6 +137,16 @@
 
 
 %changelog
+* Fri Sep  9 2005 Jens Petersen  - 1.4.2-1
+- improve scim-restart script to take account of the config module in use
+  (Liu Cougar)
+
+* Fri Sep  2 2005 Jens Petersen 
+- add scim-restart script to make it easier to restart scim after updating
+  IMEs with scim-add-restart.patch
+- add scim-gtk-langs-167090.patch to set gtk immodule language list empty
+  for now so that rhgb doesn't load scim (Warren Togami, #167088)
+
 * Thu Aug 25 2005 Warren Togami 
 - --enable-ld-version-script
 


--- update-xinput-scim DELETED ---



From fedora-extras-commits at redhat.com  Fri Sep  9 08:07:40 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri,  9 Sep 2005 04:07:40 -0400
Subject: rpms/fluxbox/FC-3 Xclients.fluxbox,1.2,1.3 fluxbox.spec,1.9,1.10
Message-ID: <200509090808.j8988CWj025658@cvs-int.fedora.redhat.com>

Author: awjb

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

Modified Files:
	Xclients.fluxbox fluxbox.spec 
Log Message:
- fix #167601



Index: Xclients.fluxbox
===================================================================
RCS file: /cvs/extras/rpms/fluxbox/FC-3/Xclients.fluxbox,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Xclients.fluxbox	8 Nov 2004 04:19:32 -0000	1.2
+++ Xclients.fluxbox	9 Sep 2005 08:07:38 -0000	1.3
@@ -1,3 +1,3 @@
 #!/bin/bash
 
-exec /usr/X11R6/bin/fluxbox
+exec /usr/bin/fluxbox


Index: fluxbox.spec
===================================================================
RCS file: /cvs/extras/rpms/fluxbox/FC-3/fluxbox.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- fluxbox.spec	16 Jun 2005 06:29:33 -0000	1.9
+++ fluxbox.spec	9 Sep 2005 08:07:38 -0000	1.10
@@ -1,21 +1,23 @@
-Name:       fluxbox
-Version:    0.9.13
-Release:    3%{?dist}
-Summary:    Fluxbox is a windowmanager that is based on Blackbox.
-
-Group:      User Interface/Desktops 
-License:    MIT
-URL:        http://fluxbox.sourceforge.net
-Source0:    http://download.sourceforge.net/fluxbox/fluxbox-0.9.13.tar.bz2 
-Source1:    Xclients.%{name}
-Source2:    FluxBox
-Source3:    fluxbox.desktop
-Source4:    artwiz-aleczapka.tar.bz2
+Name:           fluxbox
+Version:        0.9.13
+Release:        4%{?dist}
+
+Summary:	Window Manager based on Blackbox
+
+Group:          User Interface/Desktops
+License:        MIT
+URL:            http://fluxbox.sourceforge.net
+
+Source0:        http://download.sourceforge.net/fluxbox/fluxbox-0.9.13.tar.bz2
+Source1:        Xclients.%{name}
+Source2:        FluxBox
+Source3:        fluxbox.desktop
+Source4:        artwiz-aleczapka.tar.bz2
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-buildroot
 BuildRequires:	xorg-x11-devel
-Buildrequires:  zlib-devel
-Requires(post): chkfontpath
+Buildrequires:	zlib-devel
+Requires(post):   chkfontpath
 Requires(postun): chkfontpath
 
 
@@ -33,10 +35,7 @@
 %setup -q
 
 %build
-
-%configure      --bindir=%{_prefix}/X11R6/bin \
-                --mandir=%{_prefix}/X11R6/man \
-                --enable-xft \
+%configure      --enable-xft \
                 --enable-gnome \
                 --enable-kde \
                 --enable-xinerama \
@@ -47,8 +46,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%makeinstall     bindir=$RPM_BUILD_ROOT/%{_prefix}/X11R6/bin \
-                 mandir=$RPM_BUILD_ROOT/%{_prefix}/X11R6/man
+%makeinstall
 
 # make gdm users happy
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/apps/switchdesk/
@@ -62,32 +60,32 @@
 install -m 0755 %SOURCE3 $RPM_BUILD_ROOT%{_sysconfdir}/X11/dm/Sessions/
 
 # artwiz fonts
-mkdir -p $RPM_BUILD_ROOT%{_prefix}/X11R6/lib/X11/fonts/
-tar xjf %SOURCE4 -C $RPM_BUILD_ROOT%{_prefix}/X11R6/lib/X11/fonts/
+mkdir -p $RPM_BUILD_ROOT%{_libdir}/X11/fonts/
+tar xjf %SOURCE4 -C $RPM_BUILD_ROOT%{_libdir}/X11/fonts/
 
 %post
 # New menu-system
-%{_prefix}/X11R6/bin/fluxbox-generate_menu \
-	-kg -in -ds \
+%{_bindir}/fluxbox-generate_menu \
+	-kg -in -ds\
 	-p %{_usr} \
 	-o %{_datadir}/fluxbox/menu \
 	-m Fluxbox-0.9.13 2>&1 > /dev/null
 
 
 #artwiz fontz
-cd %{_prefix}/X11R6/lib/X11/fonts/artwiz-aleczapka
+cd %{_libdir}/X11/fonts/artwiz-aleczapka
 fc-cache -f ./
-%{_sbindir}/chkfontpath -q -a %{_prefix}/X11R6/lib/X11/fonts/artwiz-aleczapka:unscaled
+%{_sbindir}/chkfontpath -q -a %{_libdir}/X11/fonts/artwiz-aleczapka:unscaled
 
-tmp=`fgrep "
    %{_prefix}/X11R6/lib/X11/fonts/artwiz-aleczapka" %{_sysconfdir}/fonts/local.conf`
+tmp=`fgrep "%{_libdir}/X11/fonts/artwiz-aleczapka" %{_sysconfdir}/fonts/local.conf`
 if [ -z "$tmp" ];
-	then sed -i "s,,%{_prefix}/X11R6/lib/X11/fonts/artwiz-aleczapka\n," %{_sysconfdir}/fonts/local.conf 
+	then sed -i "s,,%{_libdir}/X11/fonts/artwiz-aleczapka\n," %{_sysconfdir}/fonts/local.conf
 fi
 
 %postun
 if [ "$1" -eq "0" ]; then # complete removal, not upgrade
-	%{_sbindir}/chkfontpath -q -r %{_prefix}/X11R6/lib/X11/fonts/artwiz-aleczapka;
-	sed -i "\%%{_prefix}/X11R6/lib/X11/fonts/artwiz-aleczapka%d" %{_sysconfdir}/fonts/local.conf
+	%{_sbindir}/chkfontpath -q -r %{_libdir}/X11/fonts/artwiz-aleczapka;
+	sed -i "\%%{_libdir}/X11/fonts/artwiz-aleczapka%d" %{_sysconfdir}/fonts/local.conf
 fi
 
 
@@ -97,28 +95,38 @@
 %files
 %defattr(-,root,root,755)
 %doc AUTHORS COPYING ChangeLog INSTALL NEWS README TODO
-%{_prefix}/X11R6/bin/*
-%{_prefix}/X11R6/man/man1/*
+%{_bindir}/*
+%{_mandir}/man1/*
 %{_datadir}/%{name}
 %{_datadir}/apps/switchdesk/Xclients.fluxbox
 
 %{_sysconfdir}/X11/gdm/Sessions/FluxBox
 %{_sysconfdir}/X11/dm/Sessions/fluxbox.desktop
 
-%{_prefix}/X11R6/lib/X11/fonts/artwiz-aleczapka
+%{_libdir}/X11/fonts/artwiz-aleczapka
 
 %changelog
+* Tue Sep 06 2005 Andreas Bierfert 
+0.9.13-4
+- remove X11R6 path stuff #167601
+
 * Thu Jun 16 2005 Andreas Bierfert 
-0.9.13-3.fc3
-- fix #160614 
+0.9.13-3.fc4
+- fix #160614
 
 * Wed Jun 08 2005 Andreas Bierfert 
-0.9.13-2.fc3
+0.9.13-2.fc4
 - fix generate menu bug and revisit switches
 
 * Tue May 31 2005 Andreas Bierfert 
 - upgrade to 0.9.13
 
+* Wed Apr 13 2005 Michael Schwendt  - 0.9.9-4
+- Fix build for GCC 4.
+
+* Fri Apr  7 2005 Michael Schwendt 
+- rebuilt
+
 * Sat Nov 13 2004 Michael Schwendt  - 0.9.9-2
 - Fix build for GCC 3.4.
 



From fedora-extras-commits at redhat.com  Fri Sep  9 08:07:58 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri,  9 Sep 2005 04:07:58 -0400
Subject: rpms/fluxbox/devel Xclients.fluxbox,1.2,1.3 fluxbox.spec,1.11,1.12
Message-ID: <200509090808.j8988UCk025670@cvs-int.fedora.redhat.com>

Author: awjb

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

Modified Files:
	Xclients.fluxbox fluxbox.spec 
Log Message:
- fix #167601



Index: Xclients.fluxbox
===================================================================
RCS file: /cvs/extras/rpms/fluxbox/devel/Xclients.fluxbox,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Xclients.fluxbox	8 Nov 2004 04:19:32 -0000	1.2
+++ Xclients.fluxbox	9 Sep 2005 08:07:56 -0000	1.3
@@ -1,3 +1,3 @@
 #!/bin/bash
 
-exec /usr/X11R6/bin/fluxbox
+exec /usr/bin/fluxbox


Index: fluxbox.spec
===================================================================
RCS file: /cvs/extras/rpms/fluxbox/devel/fluxbox.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- fluxbox.spec	21 Jun 2005 05:32:04 -0000	1.11
+++ fluxbox.spec	9 Sep 2005 08:07:56 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           fluxbox
 Version:        0.9.13
-Release:        3%{?dist}
+Release:        4%{?dist}
 
 Summary:	Window Manager based on Blackbox
 
@@ -35,10 +35,7 @@
 %setup -q
 
 %build
-
-%configure      --bindir=%{_prefix}/X11R6/bin \
-                --mandir=%{_prefix}/X11R6/man \
-                --enable-xft \
+%configure      --enable-xft \
                 --enable-gnome \
                 --enable-kde \
                 --enable-xinerama \
@@ -49,8 +46,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%makeinstall     bindir=$RPM_BUILD_ROOT/%{_prefix}/X11R6/bin \
-                 mandir=$RPM_BUILD_ROOT/%{_prefix}/X11R6/man
+%makeinstall
 
 # make gdm users happy
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/apps/switchdesk/
@@ -64,12 +60,12 @@
 install -m 0755 %SOURCE3 $RPM_BUILD_ROOT%{_sysconfdir}/X11/dm/Sessions/
 
 # artwiz fonts
-mkdir -p $RPM_BUILD_ROOT%{_prefix}/X11R6/lib/X11/fonts/
-tar xjf %SOURCE4 -C $RPM_BUILD_ROOT%{_prefix}/X11R6/lib/X11/fonts/
+mkdir -p $RPM_BUILD_ROOT%{_libdir}/X11/fonts/
+tar xjf %SOURCE4 -C $RPM_BUILD_ROOT%{_libdir}/X11/fonts/
 
 %post
 # New menu-system
-%{_prefix}/X11R6/bin/fluxbox-generate_menu \
+%{_bindir}/fluxbox-generate_menu \
 	-kg -in -ds\
 	-p %{_usr} \
 	-o %{_datadir}/fluxbox/menu \
@@ -77,19 +73,19 @@
 
 
 #artwiz fontz
-cd %{_prefix}/X11R6/lib/X11/fonts/artwiz-aleczapka
+cd %{_libdir}/X11/fonts/artwiz-aleczapka
 fc-cache -f ./
-%{_sbindir}/chkfontpath -q -a %{_prefix}/X11R6/lib/X11/fonts/artwiz-aleczapka:unscaled
+%{_sbindir}/chkfontpath -q -a %{_libdir}/X11/fonts/artwiz-aleczapka:unscaled
 
-tmp=`fgrep "%{_prefix}/X11R6/lib/X11/fonts/artwiz-aleczapka" %{_sysconfdir}/fonts/local.conf`
+tmp=`fgrep "%{_libdir}/X11/fonts/artwiz-aleczapka" %{_sysconfdir}/fonts/local.conf`
 if [ -z "$tmp" ];
-	then sed -i "s,,%{_prefix}/X11R6/lib/X11/fonts/artwiz-aleczapka\n," %{_sysconfdir}/fonts/local.conf
+	then sed -i "s,,%{_libdir}/X11/fonts/artwiz-aleczapka\n," %{_sysconfdir}/fonts/local.conf
 fi
 
 %postun
 if [ "$1" -eq "0" ]; then # complete removal, not upgrade
-	%{_sbindir}/chkfontpath -q -r %{_prefix}/X11R6/lib/X11/fonts/artwiz-aleczapka;
-	sed -i "\%%{_prefix}/X11R6/lib/X11/fonts/artwiz-aleczapka%d" %{_sysconfdir}/fonts/local.conf
+	%{_sbindir}/chkfontpath -q -r %{_libdir}/X11/fonts/artwiz-aleczapka;
+	sed -i "\%%{_libdir}/X11/fonts/artwiz-aleczapka%d" %{_sysconfdir}/fonts/local.conf
 fi
 
 
@@ -99,23 +95,27 @@
 %files
 %defattr(-,root,root,755)
 %doc AUTHORS COPYING ChangeLog INSTALL NEWS README TODO
-%{_prefix}/X11R6/bin/*
-%{_prefix}/X11R6/man/man1/*
+%{_bindir}/*
+%{_mandir}/man1/*
 %{_datadir}/%{name}
 %{_datadir}/apps/switchdesk/Xclients.fluxbox
 
 %{_sysconfdir}/X11/gdm/Sessions/FluxBox
 %{_sysconfdir}/X11/dm/Sessions/fluxbox.desktop
 
-%{_prefix}/X11R6/lib/X11/fonts/artwiz-aleczapka
+%{_libdir}/X11/fonts/artwiz-aleczapka
 
 %changelog
-* Tue Jun 21 2005 Andreas Bierfert 
-0.9.13-3.fc5
+* Tue Sep 06 2005 Andreas Bierfert 
+0.9.13-4
+- remove X11R6 path stuff #167601
+
+* Thu Jun 16 2005 Andreas Bierfert 
+0.9.13-3.fc4
 - fix #160614
 
 * Wed Jun 08 2005 Andreas Bierfert 
-0.9.13-2.fc5
+0.9.13-2.fc4
 - fix generate menu bug and revisit switches
 
 * Tue May 31 2005 Andreas Bierfert 



From fedora-extras-commits at redhat.com  Fri Sep  9 08:07:56 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri,  9 Sep 2005 04:07:56 -0400
Subject: rpms/fluxbox/FC-4 Xclients.fluxbox,1.2,1.3 fluxbox.spec,1.13,1.14
Message-ID: <200509090808.j8988Q0k025668@cvs-int.fedora.redhat.com>

Author: awjb

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

Modified Files:
	Xclients.fluxbox fluxbox.spec 
Log Message:
- fix #167601



Index: Xclients.fluxbox
===================================================================
RCS file: /cvs/extras/rpms/fluxbox/FC-4/Xclients.fluxbox,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Xclients.fluxbox	8 Nov 2004 04:19:32 -0000	1.2
+++ Xclients.fluxbox	9 Sep 2005 08:07:40 -0000	1.3
@@ -1,3 +1,3 @@
 #!/bin/bash
 
-exec /usr/X11R6/bin/fluxbox
+exec /usr/bin/fluxbox


Index: fluxbox.spec
===================================================================
RCS file: /cvs/extras/rpms/fluxbox/FC-4/fluxbox.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- fluxbox.spec	16 Jun 2005 06:29:10 -0000	1.13
+++ fluxbox.spec	9 Sep 2005 08:07:40 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           fluxbox
 Version:        0.9.13
-Release:        3%{?dist}
+Release:        4%{?dist}
 
 Summary:	Window Manager based on Blackbox
 
@@ -35,10 +35,7 @@
 %setup -q
 
 %build
-
-%configure      --bindir=%{_prefix}/X11R6/bin \
-                --mandir=%{_prefix}/X11R6/man \
-                --enable-xft \
+%configure      --enable-xft \
                 --enable-gnome \
                 --enable-kde \
                 --enable-xinerama \
@@ -49,8 +46,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%makeinstall     bindir=$RPM_BUILD_ROOT/%{_prefix}/X11R6/bin \
-                 mandir=$RPM_BUILD_ROOT/%{_prefix}/X11R6/man
+%makeinstall
 
 # make gdm users happy
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/apps/switchdesk/
@@ -64,12 +60,12 @@
 install -m 0755 %SOURCE3 $RPM_BUILD_ROOT%{_sysconfdir}/X11/dm/Sessions/
 
 # artwiz fonts
-mkdir -p $RPM_BUILD_ROOT%{_prefix}/X11R6/lib/X11/fonts/
-tar xjf %SOURCE4 -C $RPM_BUILD_ROOT%{_prefix}/X11R6/lib/X11/fonts/
+mkdir -p $RPM_BUILD_ROOT%{_libdir}/X11/fonts/
+tar xjf %SOURCE4 -C $RPM_BUILD_ROOT%{_libdir}/X11/fonts/
 
 %post
 # New menu-system
-%{_prefix}/X11R6/bin/fluxbox-generate_menu \
+%{_bindir}/fluxbox-generate_menu \
 	-kg -in -ds\
 	-p %{_usr} \
 	-o %{_datadir}/fluxbox/menu \
@@ -77,19 +73,19 @@
 
 
 #artwiz fontz
-cd %{_prefix}/X11R6/lib/X11/fonts/artwiz-aleczapka
+cd %{_libdir}/X11/fonts/artwiz-aleczapka
 fc-cache -f ./
-%{_sbindir}/chkfontpath -q -a %{_prefix}/X11R6/lib/X11/fonts/artwiz-aleczapka:unscaled
+%{_sbindir}/chkfontpath -q -a %{_libdir}/X11/fonts/artwiz-aleczapka:unscaled
 
-tmp=`fgrep "%{_prefix}/X11R6/lib/X11/fonts/artwiz-aleczapka" %{_sysconfdir}/fonts/local.conf`
+tmp=`fgrep "%{_libdir}/X11/fonts/artwiz-aleczapka" %{_sysconfdir}/fonts/local.conf`
 if [ -z "$tmp" ];
-	then sed -i "s,,%{_prefix}/X11R6/lib/X11/fonts/artwiz-aleczapka\n," %{_sysconfdir}/fonts/local.conf
+	then sed -i "s,,%{_libdir}/X11/fonts/artwiz-aleczapka\n," %{_sysconfdir}/fonts/local.conf
 fi
 
 %postun
 if [ "$1" -eq "0" ]; then # complete removal, not upgrade
-	%{_sbindir}/chkfontpath -q -r %{_prefix}/X11R6/lib/X11/fonts/artwiz-aleczapka;
-	sed -i "\%%{_prefix}/X11R6/lib/X11/fonts/artwiz-aleczapka%d" %{_sysconfdir}/fonts/local.conf
+	%{_sbindir}/chkfontpath -q -r %{_libdir}/X11/fonts/artwiz-aleczapka;
+	sed -i "\%%{_libdir}/X11/fonts/artwiz-aleczapka%d" %{_sysconfdir}/fonts/local.conf
 fi
 
 
@@ -99,17 +95,21 @@
 %files
 %defattr(-,root,root,755)
 %doc AUTHORS COPYING ChangeLog INSTALL NEWS README TODO
-%{_prefix}/X11R6/bin/*
-%{_prefix}/X11R6/man/man1/*
+%{_bindir}/*
+%{_mandir}/man1/*
 %{_datadir}/%{name}
 %{_datadir}/apps/switchdesk/Xclients.fluxbox
 
 %{_sysconfdir}/X11/gdm/Sessions/FluxBox
 %{_sysconfdir}/X11/dm/Sessions/fluxbox.desktop
 
-%{_prefix}/X11R6/lib/X11/fonts/artwiz-aleczapka
+%{_libdir}/X11/fonts/artwiz-aleczapka
 
 %changelog
+* Tue Sep 06 2005 Andreas Bierfert 
+0.9.13-4
+- remove X11R6 path stuff #167601
+
 * Thu Jun 16 2005 Andreas Bierfert 
 0.9.13-3.fc4
 - fix #160614



From fedora-extras-commits at redhat.com  Fri Sep  9 08:26:46 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri,  9 Sep 2005 04:26:46 -0400
Subject: rpms/sylpheed-claws/FC-4 .cvsignore, 1.8, 1.9 sources, 1.9,
	1.10 sylpheed-claws.spec, 1.21, 1.22
Message-ID: <200509090826.j898Qkvb026176@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/sylpheed-claws/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26137/FC-4

Modified Files:
	.cvsignore sources sylpheed-claws.spec 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws/FC-4/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	31 Jul 2005 10:15:10 -0000	1.8
+++ .cvsignore	9 Sep 2005 08:26:44 -0000	1.9
@@ -1 +1 @@
-sylpheed-claws-1.9.13.tar.bz2
+sylpheed-claws-1.9.14.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws/FC-4/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	31 Jul 2005 10:15:10 -0000	1.9
+++ sources	9 Sep 2005 08:26:44 -0000	1.10
@@ -1 +1 @@
-afd3b82ca210520f0ad241b77c5e673a  sylpheed-claws-1.9.13.tar.bz2
+f61666e1b829daf116996136e7728ac8  sylpheed-claws-1.9.14.tar.bz2


Index: sylpheed-claws.spec
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws/FC-4/sylpheed-claws.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sylpheed-claws.spec	15 Aug 2005 10:26:56 -0000	1.21
+++ sylpheed-claws.spec	9 Sep 2005 08:26:44 -0000	1.22
@@ -1,13 +1,13 @@
 %define         openssl_pc  %(if test -z `rpm -ql openssl-devel | grep pkgconfig` ; then echo 0; else echo 1; fi )
 
 Name:           sylpheed-claws
-Version:        1.9.13
-Release:        4%{?dist}
+Version:        1.9.14
+Release:        1%{?dist}
 Summary:        The bleeding edge branch of Sylpheed
 Group:          Applications/Internet
 License:        GPL
 URL:            http://claws.sylpheed.org
-Source0:        http://dl.sf.net/sylpheed-claws/sylpheed-claws-1.9.13.tar.bz2
+Source0:        http://dl.sf.net/sylpheed-claws/sylpheed-claws-1.9.14.tar.bz2
 Source1:        sylpheed-claws.desktop
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires:  flex, bison
@@ -113,6 +113,10 @@
 %{_libdir}/sylpheed-claws/plugins/*deps
 
 %changelog
+* Fri Sep 09 2005 Andreas Bierfert 
+1.9.14-1
+- version upgrade
+
 * Mon Aug 15 2005 Andreas Bierfert 
 1.9.13-4
 - fix files



From fedora-extras-commits at redhat.com  Fri Sep  9 08:26:46 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri,  9 Sep 2005 04:26:46 -0400
Subject: rpms/sylpheed-claws/devel .cvsignore, 1.8, 1.9 sources, 1.9,
	1.10 sylpheed-claws.spec, 1.22, 1.23
Message-ID: <200509090826.j898Qk5b026184@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/sylpheed-claws/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26137/devel

Modified Files:
	.cvsignore sources sylpheed-claws.spec 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	31 Jul 2005 10:16:28 -0000	1.8
+++ .cvsignore	9 Sep 2005 08:26:44 -0000	1.9
@@ -1 +1 @@
-sylpheed-claws-1.9.13.tar.bz2
+sylpheed-claws-1.9.14.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	31 Jul 2005 10:16:28 -0000	1.9
+++ sources	9 Sep 2005 08:26:44 -0000	1.10
@@ -1 +1 @@
-afd3b82ca210520f0ad241b77c5e673a  sylpheed-claws-1.9.13.tar.bz2
+f61666e1b829daf116996136e7728ac8  sylpheed-claws-1.9.14.tar.bz2


Index: sylpheed-claws.spec
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws/devel/sylpheed-claws.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- sylpheed-claws.spec	20 Aug 2005 12:11:29 -0000	1.22
+++ sylpheed-claws.spec	9 Sep 2005 08:26:44 -0000	1.23
@@ -1,13 +1,13 @@
 %define         openssl_pc  %(if test -z `rpm -ql openssl-devel | grep pkgconfig` ; then echo 0; else echo 1; fi )
 
 Name:           sylpheed-claws
-Version:        1.9.13
-Release:        5%{?dist}
+Version:        1.9.14
+Release:        1%{?dist}
 Summary:        The bleeding edge branch of Sylpheed
 Group:          Applications/Internet
 License:        GPL
 URL:            http://claws.sylpheed.org
-Source0:        http://dl.sf.net/sylpheed-claws/sylpheed-claws-1.9.13.tar.bz2
+Source0:        http://dl.sf.net/sylpheed-claws/sylpheed-claws-1.9.14.tar.bz2
 Source1:        sylpheed-claws.desktop
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires:  flex, bison
@@ -113,9 +113,9 @@
 %{_libdir}/sylpheed-claws/plugins/*deps
 
 %changelog
-* Sat Aug 20 2005 Andreas Bierfert 
-1.9.14-5
-- bump release for rebuild
+* Fri Sep 09 2005 Andreas Bierfert 
+1.9.14-1
+- version upgrade
 
 * Mon Aug 15 2005 Andreas Bierfert 
 1.9.13-4



From fedora-extras-commits at redhat.com  Fri Sep  9 09:33:11 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri,  9 Sep 2005 05:33:11 -0400
Subject: rpms/perl-Glib/devel .cvsignore, 1.5, 1.6 perl-Glib.spec, 1.9,
	1.10 sources, 1.5, 1.6
Message-ID: <200509090933.j899XBR4027762@cvs-int.fedora.redhat.com>

Author: jpo

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

Modified Files:
	.cvsignore perl-Glib.spec sources 
Log Message:
Update to 1.100.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Glib/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	27 Jun 2005 16:17:42 -0000	1.5
+++ .cvsignore	9 Sep 2005 09:33:09 -0000	1.6
@@ -1 +1 @@
-Glib-1.082.tar.gz
+Glib-1.100.tar.gz


Index: perl-Glib.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Glib/devel/perl-Glib.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- perl-Glib.spec	27 Jun 2005 16:17:42 -0000	1.9
+++ perl-Glib.spec	9 Sep 2005 09:33:09 -0000	1.10
@@ -1,12 +1,12 @@
 Name:           perl-Glib
-Version:        1.082
+Version:        1.100
 Release:        1%{?dist}
 Summary:        Perl interface to GLib
 
 Group:          Development/Libraries
 License:        LGPL
 URL:            http://search.cpan.org/dist/Glib/
-Source0:        http://www.cpan.org/authors/id/T/TS/TSCH/Glib-1.082.tar.gz
+Source0:        http://www.cpan.org/authors/id/T/TS/TSCH/Glib-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  perl >= 2:5.8.0
@@ -28,7 +28,6 @@
 
 %build
 CFLAGS="$RPM_OPT_FLAGS" %{__perl} Makefile.PL INSTALLDIRS=vendor
-%{__perl} -pi -e 's/^\tLD_RUN_PATH=[^\s]+\s*/\t/' Makefile
 make %{?_smp_mflags} OPTIMIZE="$RPM_OPT_FLAGS"
 
 
@@ -41,7 +40,7 @@
 chmod -R u+w $RPM_BUILD_ROOT/*
 
 
-%check || :
+%check
 make test
 
 
@@ -58,6 +57,9 @@
 
 
 %changelog
+* Thu Sep  8 2005 Jose Pedro Oliveira  - 1.100-1
+- Update to 1.100.
+
 * Mon Jun 27 2005 Jose Pedro Oliveira  - 1.082-1
 - Update to 1.082.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Glib/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	27 Jun 2005 16:17:42 -0000	1.5
+++ sources	9 Sep 2005 09:33:09 -0000	1.6
@@ -1 +1 @@
-6f3c675acf177763f51394b7e087d507  Glib-1.082.tar.gz
+6ceb3f19dcc30ac96e4ff3dc82346d74  Glib-1.100.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep  9 09:35:52 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri,  9 Sep 2005 05:35:52 -0400
Subject: rpms/perl-Gtk2/devel .cvsignore, 1.6, 1.7 perl-Gtk2.spec, 1.10,
	1.11 sources, 1.6, 1.7
Message-ID: <200509090935.j899ZqSi027841@cvs-int.fedora.redhat.com>

Author: jpo

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

Modified Files:
	.cvsignore perl-Gtk2.spec sources 
Log Message:
Update to 1.100.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Gtk2/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	29 Jul 2005 19:27:35 -0000	1.6
+++ .cvsignore	9 Sep 2005 09:35:50 -0000	1.7
@@ -1 +1 @@
-Gtk2-1.083.tar.gz
+Gtk2-1.100.tar.gz


Index: perl-Gtk2.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Gtk2/devel/perl-Gtk2.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- perl-Gtk2.spec	29 Jul 2005 19:27:35 -0000	1.10
+++ perl-Gtk2.spec	9 Sep 2005 09:35:50 -0000	1.11
@@ -1,5 +1,5 @@
 Name:           perl-Gtk2
-Version:        1.083
+Version:        1.100
 Release:        1%{?dist}
 Summary:        Perl interface to the 2.x series of the Gimp Toolkit library
 
@@ -10,9 +10,9 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  perl >= 2:5.8.0
-BuildRequires:  gtk2-devel, perl-Glib >= 1.082
+BuildRequires:  gtk2-devel, perl-Glib >= 1.100
 BuildRequires:  perl(ExtUtils::Depends), perl(ExtUtils::PkgConfig)
-Requires:       perl-Glib >= 1.082
+Requires:       perl-Glib >= 1.100
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
@@ -40,7 +40,7 @@
 chmod -R u+w $RPM_BUILD_ROOT/*
 
 
-%check || :
+%check
 # Testing requires X
 %{?_with_tests:make test}
 
@@ -59,6 +59,9 @@
 
 
 %changelog
+* Thu Sep  8 2005 Jose Pedro Oliveira  - 1.100-1
+- Update to 1.100.
+
 * Fri Jul 29 2005 Jose Pedro Oliveira  - 1.083-1
 - Update to 1.083.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Gtk2/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	29 Jul 2005 19:27:35 -0000	1.6
+++ sources	9 Sep 2005 09:35:50 -0000	1.7
@@ -1 +1 @@
-4ccec16a8a87bbf0b058c92ac44d60ae  Gtk2-1.083.tar.gz
+498eb71cedb0fc619654cebf43a41f8e  Gtk2-1.100.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep  9 10:35:41 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri,  9 Sep 2005 06:35:41 -0400
Subject: rpms/perl-XML-Simple/FC-3 .cvsignore, 1.3, 1.4 perl-XML-Simple.spec,
	1.4, 1.5 sources, 1.3, 1.4
Message-ID: <200509091036.j89AaBEB029438@cvs-int.fedora.redhat.com>

Author: jpo

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

Modified Files:
	.cvsignore perl-XML-Simple.spec sources 
Log Message:
Update to 2.14.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-XML-Simple/FC-3/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	4 Dec 2004 13:23:25 -0000	1.3
+++ .cvsignore	9 Sep 2005 10:35:39 -0000	1.4
@@ -1 +1 @@
-XML-Simple-2.13.tar.gz
+XML-Simple-2.14.tar.gz


Index: perl-XML-Simple.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-XML-Simple/FC-3/perl-XML-Simple.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-XML-Simple.spec	4 Dec 2004 13:23:25 -0000	1.4
+++ perl-XML-Simple.spec	9 Sep 2005 10:35:39 -0000	1.5
@@ -1,21 +1,18 @@
-%{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)}
-
 Name:           perl-XML-Simple
-Version:        2.13
-Release:        1
-Epoch:          0
+Version:        2.14
+Release:        1%{?dist}
 Summary:        Easy API to maintain XML in Perl
 
 Group:          Development/Libraries
 License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/XML-Simple/
-Source0:      http://www.cpan.org/authors/id/G/GR/GRANTM/XML-Simple-2.13.tar.gz
+Source0:        http://www.cpan.org/authors/id/G/GR/GRANTM/XML-Simple-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
 BuildRequires:  perl >= 1:5.6.1
-BuildRequires:  perl(XML::SAX), perl(XML::NamespaceSupport), perl(XML::Parser)
-BuildRequires:  perl(Tie::IxHash), perl(Storable)
+BuildRequires:  perl(Tie::IxHash), perl(XML::NamespaceSupport)
+BuildRequires:  perl(XML::Parser), perl(XML::SAX)
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 # XML-SAX-ExpatXS up to 0.98 has known namespace bugs, and will cause the
 # tests to fail if it is installed as the default SAX parser.
@@ -44,7 +41,7 @@
 chmod -R u+w $RPM_BUILD_ROOT/*
 
 
-%check || :
+%check
 make test
 
 
@@ -54,12 +51,20 @@
 
 %files
 %defattr(-,root,root,-)
+# For license text(s), see the perl package.
 %doc Changes README
-%{perl_vendorlib}/XML
+%{perl_vendorlib}/XML/
 %{_mandir}/man3/*.3*
 
 
 %changelog
+* Fri Sep  9 2005 Jose Pedro Oliveira  - 2.14-1
+- Update to 2.14.
+- Added the dist tag.
+
+* Fri Apr  7 2005 Michael Schwendt  - 2.13-2
+- rebuilt
+
 * Sat Nov 27 2004 Jose Pedro Oliveira  - 0:2.13-1
 - Update to 2.13.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-XML-Simple/FC-3/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	4 Dec 2004 13:23:25 -0000	1.3
+++ sources	9 Sep 2005 10:35:39 -0000	1.4
@@ -1 +1 @@
-3891139e5e2e2134e596aa1404e866df  XML-Simple-2.13.tar.gz
+f321058271815de28d214c8efb9091f9  XML-Simple-2.14.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep  9 10:35:42 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri,  9 Sep 2005 06:35:42 -0400
Subject: rpms/perl-XML-Simple/devel .cvsignore, 1.3, 1.4 perl-XML-Simple.spec,
	1.6, 1.7 sources, 1.3, 1.4
Message-ID: <200509091036.j89AaCOQ029446@cvs-int.fedora.redhat.com>

Author: jpo

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

Modified Files:
	.cvsignore perl-XML-Simple.spec sources 
Log Message:
Update to 2.14.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-XML-Simple/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	4 Dec 2004 13:23:25 -0000	1.3
+++ .cvsignore	9 Sep 2005 10:35:40 -0000	1.4
@@ -1 +1 @@
-XML-Simple-2.13.tar.gz
+XML-Simple-2.14.tar.gz


Index: perl-XML-Simple.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-XML-Simple/devel/perl-XML-Simple.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- perl-XML-Simple.spec	6 Apr 2005 22:13:29 -0000	1.6
+++ perl-XML-Simple.spec	9 Sep 2005 10:35:40 -0000	1.7
@@ -1,21 +1,18 @@
-%{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)}
-
 Name:           perl-XML-Simple
-Version:        2.13
-Release:        2
-
+Version:        2.14
+Release:        1%{?dist}
 Summary:        Easy API to maintain XML in Perl
 
 Group:          Development/Libraries
 License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/XML-Simple/
-Source0:      http://www.cpan.org/authors/id/G/GR/GRANTM/XML-Simple-2.13.tar.gz
+Source0:        http://www.cpan.org/authors/id/G/GR/GRANTM/XML-Simple-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
 BuildRequires:  perl >= 1:5.6.1
-BuildRequires:  perl(XML::SAX), perl(XML::NamespaceSupport), perl(XML::Parser)
-BuildRequires:  perl(Tie::IxHash), perl(Storable)
+BuildRequires:  perl(Tie::IxHash), perl(XML::NamespaceSupport)
+BuildRequires:  perl(XML::Parser), perl(XML::SAX)
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 # XML-SAX-ExpatXS up to 0.98 has known namespace bugs, and will cause the
 # tests to fail if it is installed as the default SAX parser.
@@ -44,7 +41,7 @@
 chmod -R u+w $RPM_BUILD_ROOT/*
 
 
-%check || :
+%check
 make test
 
 
@@ -54,13 +51,18 @@
 
 %files
 %defattr(-,root,root,-)
+# For license text(s), see the perl package.
 %doc Changes README
-%{perl_vendorlib}/XML
+%{perl_vendorlib}/XML/
 %{_mandir}/man3/*.3*
 
 
 %changelog
-* Fri Apr  7 2005 Michael Schwendt 
+* Fri Sep  9 2005 Jose Pedro Oliveira  - 2.14-1
+- Update to 2.14.
+- Added the dist tag.
+
+* Fri Apr  7 2005 Michael Schwendt  - 2.13-2
 - rebuilt
 
 * Sat Nov 27 2004 Jose Pedro Oliveira  - 0:2.13-1


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-XML-Simple/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	4 Dec 2004 13:23:25 -0000	1.3
+++ sources	9 Sep 2005 10:35:40 -0000	1.4
@@ -1 +1 @@
-3891139e5e2e2134e596aa1404e866df  XML-Simple-2.13.tar.gz
+f321058271815de28d214c8efb9091f9  XML-Simple-2.14.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep  9 10:35:41 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri,  9 Sep 2005 06:35:41 -0400
Subject: rpms/perl-XML-Simple/FC-4 .cvsignore, 1.3, 1.4 perl-XML-Simple.spec,
	1.6, 1.7 sources, 1.3, 1.4
Message-ID: <200509091036.j89AaCd4029443@cvs-int.fedora.redhat.com>

Author: jpo

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

Modified Files:
	.cvsignore perl-XML-Simple.spec sources 
Log Message:
Update to 2.14.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-XML-Simple/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	4 Dec 2004 13:23:25 -0000	1.3
+++ .cvsignore	9 Sep 2005 10:35:39 -0000	1.4
@@ -1 +1 @@
-XML-Simple-2.13.tar.gz
+XML-Simple-2.14.tar.gz


Index: perl-XML-Simple.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-XML-Simple/FC-4/perl-XML-Simple.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- perl-XML-Simple.spec	6 Apr 2005 22:13:29 -0000	1.6
+++ perl-XML-Simple.spec	9 Sep 2005 10:35:39 -0000	1.7
@@ -1,21 +1,18 @@
-%{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)}
-
 Name:           perl-XML-Simple
-Version:        2.13
-Release:        2
-
+Version:        2.14
+Release:        1%{?dist}
 Summary:        Easy API to maintain XML in Perl
 
 Group:          Development/Libraries
 License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/XML-Simple/
-Source0:      http://www.cpan.org/authors/id/G/GR/GRANTM/XML-Simple-2.13.tar.gz
+Source0:        http://www.cpan.org/authors/id/G/GR/GRANTM/XML-Simple-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
 BuildRequires:  perl >= 1:5.6.1
-BuildRequires:  perl(XML::SAX), perl(XML::NamespaceSupport), perl(XML::Parser)
-BuildRequires:  perl(Tie::IxHash), perl(Storable)
+BuildRequires:  perl(Tie::IxHash), perl(XML::NamespaceSupport)
+BuildRequires:  perl(XML::Parser), perl(XML::SAX)
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 # XML-SAX-ExpatXS up to 0.98 has known namespace bugs, and will cause the
 # tests to fail if it is installed as the default SAX parser.
@@ -44,7 +41,7 @@
 chmod -R u+w $RPM_BUILD_ROOT/*
 
 
-%check || :
+%check
 make test
 
 
@@ -54,13 +51,18 @@
 
 %files
 %defattr(-,root,root,-)
+# For license text(s), see the perl package.
 %doc Changes README
-%{perl_vendorlib}/XML
+%{perl_vendorlib}/XML/
 %{_mandir}/man3/*.3*
 
 
 %changelog
-* Fri Apr  7 2005 Michael Schwendt 
+* Fri Sep  9 2005 Jose Pedro Oliveira  - 2.14-1
+- Update to 2.14.
+- Added the dist tag.
+
+* Fri Apr  7 2005 Michael Schwendt  - 2.13-2
 - rebuilt
 
 * Sat Nov 27 2004 Jose Pedro Oliveira  - 0:2.13-1


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-XML-Simple/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	4 Dec 2004 13:23:25 -0000	1.3
+++ sources	9 Sep 2005 10:35:39 -0000	1.4
@@ -1 +1 @@
-3891139e5e2e2134e596aa1404e866df  XML-Simple-2.13.tar.gz
+f321058271815de28d214c8efb9091f9  XML-Simple-2.14.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep  9 10:55:23 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri,  9 Sep 2005 06:55:23 -0400
Subject: rpms/perl-Hook-LexWrap/devel perl-Hook-LexWrap.spec,1.1,1.2
Message-ID: <200509091055.j89AtNJn029614@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Hook-LexWrap/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29595

Modified Files:
	perl-Hook-LexWrap.spec 
Log Message:
Comment about license files location.


Index: perl-Hook-LexWrap.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Hook-LexWrap/devel/perl-Hook-LexWrap.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Hook-LexWrap.spec	2 Sep 2005 22:50:32 -0000	1.1
+++ perl-Hook-LexWrap.spec	9 Sep 2005 10:55:21 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-Hook-LexWrap
 Version:        0.20
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Lexically scoped subroutine wrappers
 
 Group:          Development/Libraries
@@ -10,7 +10,6 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
-BuildRequires:  perl
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
@@ -48,11 +47,15 @@
 
 %files
 %defattr(-,root,root,-)
+# For license text(s), see the perl package.
 %doc Changes README
 %{perl_vendorlib}/Hook/
 %{_mandir}/man3/*.3*
 
 
 %changelog
+* Fri Sep  9 2005 Jose Pedro Oliveira  - 0.20-2
+- Comment about license files location.
+
 * Fri Aug 26 2005 Jose Pedro Oliveira  - 0.20-1
 - First build.



From fedora-extras-commits at redhat.com  Fri Sep  9 10:57:44 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri,  9 Sep 2005 06:57:44 -0400
Subject: rpms/perl-Locale-Maketext-Fuzzy/devel
	perl-Locale-Maketext-Fuzzy.spec, 1.1, 1.2
Message-ID: <200509091057.j89Avi4r029649@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Locale-Maketext-Fuzzy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29630

Modified Files:
	perl-Locale-Maketext-Fuzzy.spec 
Log Message:
Comment about license files location.


Index: perl-Locale-Maketext-Fuzzy.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Locale-Maketext-Fuzzy/devel/perl-Locale-Maketext-Fuzzy.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Locale-Maketext-Fuzzy.spec	2 Sep 2005 22:46:24 -0000	1.1
+++ perl-Locale-Maketext-Fuzzy.spec	9 Sep 2005 10:57:41 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-Locale-Maketext-Fuzzy
 Version:        0.02
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Maketext from already interpolated strings
 
 Group:          Development/Libraries
@@ -48,12 +48,16 @@
 
 %files
 %defattr(-,root,root,-)
+# For license text(s), see the perl package.
 %doc Changes README
 %{perl_vendorlib}/Locale/
 %{_mandir}/man3/*.3*
 
 
 %changelog
+* Fri Sep  9 2005 Jose Pedro Oliveira  - 0.02-2
+- Comment about license files location.
+
 * Thu Aug 11 2005 Jose Pedro Oliveira  - 0.02-1
 - Update to Fedora Extras template.
 



From fedora-extras-commits at redhat.com  Fri Sep  9 11:26:15 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Fri,  9 Sep 2005 07:26:15 -0400
Subject: rpms/prozilla/FC-3 prozilla.spec,1.8,1.9
Message-ID: <200509091126.j89BQF8r031598@cvs-int.fedora.redhat.com>

Author: corsepiu

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

Modified Files:
	prozilla.spec 
Log Message:
%%{_bindir}/proz.


Index: prozilla.spec
===================================================================
RCS file: /cvs/extras/rpms/prozilla/FC-3/prozilla.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- prozilla.spec	26 Aug 2005 02:35:56 -0000	1.8
+++ prozilla.spec	9 Sep 2005 11:26:13 -0000	1.9
@@ -45,10 +45,13 @@
 %doc ANNOUNCE AUTHORS ChangeLog COPYING CREDITS FAQ NEWS README TODO
 %config(noreplace) %verify(not size mtime md5) /etc/prozilla.conf
 %config(noreplace) %verify(not size mtime md5) /etc/prozilla.conf-sample
-%{_prefix}/bin/proz
+%{_bindir}/proz
 %{_mandir}/man1/proz*
 
 %changelog
+* Fri Sep 09 2005 Ralf Corsepius 
+- %%{_bindir}/proz.
+
 * Thu Aug 25 2005 Warren Togami  - 0:1.3.7.4-1
 - 1.3.7.4 Security (#166789)
 



From fedora-extras-commits at redhat.com  Fri Sep  9 11:26:09 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Fri,  9 Sep 2005 07:26:09 -0400
Subject: rpms/prozilla/devel prozilla.spec,1.10,1.11
Message-ID: <200509091126.j89BQetx031603@cvs-int.fedora.redhat.com>

Author: corsepiu

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

Modified Files:
	prozilla.spec 
Log Message:
%%{_bindir}/proz.


Index: prozilla.spec
===================================================================
RCS file: /cvs/extras/rpms/prozilla/devel/prozilla.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- prozilla.spec	26 Aug 2005 02:33:34 -0000	1.10
+++ prozilla.spec	9 Sep 2005 11:26:07 -0000	1.11
@@ -45,10 +45,13 @@
 %doc ANNOUNCE AUTHORS ChangeLog COPYING CREDITS FAQ NEWS README TODO
 %config(noreplace) %verify(not size mtime md5) /etc/prozilla.conf
 %config(noreplace) %verify(not size mtime md5) /etc/prozilla.conf-sample
-%{_prefix}/bin/proz
+%{_bindir}/proz
 %{_mandir}/man1/proz*
 
 %changelog
+* Fri Sep 09 2005 Ralf Corsepius 
+- %%{_bindir}/proz.
+
 * Thu Aug 25 2005 Warren Togami  - 0:1.3.7.4-1
 - 1.3.7.4 Security (#166789)
 



From fedora-extras-commits at redhat.com  Fri Sep  9 11:26:10 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Fri,  9 Sep 2005 07:26:10 -0400
Subject: rpms/prozilla/FC-4 prozilla.spec,1.10,1.11
Message-ID: <200509091126.j89BQeZB031606@cvs-int.fedora.redhat.com>

Author: corsepiu

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

Modified Files:
	prozilla.spec 
Log Message:
%%{_bindir}/proz.


Index: prozilla.spec
===================================================================
RCS file: /cvs/extras/rpms/prozilla/FC-4/prozilla.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- prozilla.spec	26 Aug 2005 02:34:40 -0000	1.10
+++ prozilla.spec	9 Sep 2005 11:26:08 -0000	1.11
@@ -45,10 +45,13 @@
 %doc ANNOUNCE AUTHORS ChangeLog COPYING CREDITS FAQ NEWS README TODO
 %config(noreplace) %verify(not size mtime md5) /etc/prozilla.conf
 %config(noreplace) %verify(not size mtime md5) /etc/prozilla.conf-sample
-%{_prefix}/bin/proz
+%{_bindir}/proz
 %{_mandir}/man1/proz*
 
 %changelog
+* Fri Sep 09 2005 Ralf Corsepius 
+- %%{_bindir}/proz.
+
 * Thu Aug 25 2005 Warren Togami  - 0:1.3.7.4-1
 - 1.3.7.4 Security (#166789)
 



From fedora-extras-commits at redhat.com  Fri Sep  9 12:16:12 2005
From: fedora-extras-commits at redhat.com (Oliver Falk (oliver))
Date: Fri,  9 Sep 2005 08:16:12 -0400
Subject: rpms/squidGuard/devel squidGuard-perlwarning.patch, NONE,
	1.1 squidGuard-sed.patch, NONE, 1.1 squidGuard.conf, NONE,
	1.1 squidGuard.fc, NONE, 1.1 squidGuard.te, NONE,
	1.1 squidguard, NONE, 1.1 transparent-proxying, NONE,
	1.1 update_squidguard_blacklists, NONE, 1.1 squidGuard.spec,
	1.1, 1.2
Message-ID: <200509091216.j89CGCt5000531@cvs-int.fedora.redhat.com>

Author: oliver

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

Modified Files:
	squidGuard.spec 
Added Files:
	squidGuard-perlwarning.patch squidGuard-sed.patch 
	squidGuard.conf squidGuard.fc squidGuard.te squidguard 
	transparent-proxying update_squidguard_blacklists 
Log Message:

* Fri Sep 09 2005 Oliver Falk       - 1.2.0-12
- Make it K12LTSP compatible, so a possible upgrade doesn't break
  anything/much...
  - Add SELinux stuff
  - Move dbdir to /var/squidGuard/blacklists, instead of /var/lib/squidGuard
  - Added update script and template config from/for K12
  - Add perlwarnings and sed patch
  - Install cgis in /var/www/cgi-bin
  - Added initrd stuff
- Remove questionable -ldb from make
- Remove questionable db version check



squidGuard-perlwarning.patch:

--- NEW FILE squidGuard-perlwarning.patch ---
--- ./squidGuard-1.2.0/samples/squidGuard.cgi.in.orig   2003-04-12 14:58:38.000000000 -0700
+++ ./squidGuard-1.2.0/samples/squidGuard.cgi.in    2003-04-12 14:58:59.000000000 -0700
@@ -1,4 +1,4 @@
-#! @PERL@ -w
+#! @PERL@ 
 #
 # Explain to the user that the URL is blocked and by which rule set
 #

squidGuard-sed.patch:

--- NEW FILE squidGuard-sed.patch ---
diff -Naur squidGuard-1.2.0/src/sgDiv.c squidGuard-1.2.0-patch/src/sgDiv.c
--- squidGuard-1.2.0/src/sgDiv.c	Tue May 15 05:01:37 2001
+++ squidGuard-1.2.0-patch/src/sgDiv.c	Tue Aug  6 14:39:55 2002
@@ -500,13 +500,13 @@
 #endif
 {
   struct sgRegExp *re;
-  regmatch_t pm;
+  regmatch_t pm[10];
   static char newstring[MAX_BUF];
   char *result = NULL, *p;
   int substlen;
   *newstring='\0';
   for(re = regexp; re != NULL; re = re->next){
-    if (regexec (re->compiled, pattern, 1, &pm, 0) != 0){
+    if (regexec (re->compiled, pattern, sizeof(pm) / sizeof(pm[0]), pm, 0) != 0){
       result = NULL;
     } else {
       substlen = strlen(re->substitute);
@@ -516,14 +516,65 @@
 	*newstring = '\0';
       p = newstring;
       do {
-	if((p - newstring)+ pm.rm_so  >= MAX_BUF)
+	if((p - newstring)+ pm[0].rm_so  >= MAX_BUF)
 	  break;
-	p = strncat(newstring,pattern,pm.rm_so);
-	if((p - newstring)+ substlen  >= MAX_BUF)
-	  break;
-	p = strcat(newstring,re->substitute);	
-	pattern = pattern + pm.rm_eo;
-      } while(regexec (re->compiled, pattern, 1, &pm, REG_NOTBOL)== 0 &&
+      p = strncat(newstring,pattern,pm[0].rm_so);
+      {
+          char *p_cur;
+          char *p_next;
+
+          for (p_next = p_cur = re->substitute;
+              p_next < (re->substitute + substlen);
+              p_next++)
+          {
+              if (*p_next == '\\')
+              {
+                  if (p_cur < p_next)
+                  {
+                      if (((p - newstring) + (p_next - p_cur)) >= MAX_BUF)
+                          goto err;
+                      p = strncat(newstring, p_cur, p_next - p_cur);
+                  }
+                  p_next++;
+                  if (p_next < (re->substitute + substlen)
+                      && '0' <= *p_next && *p_next <= '9')
+                  {
+                      int i = *p_next - '0';
+                      if ((p - newstring) + (pm[i].rm_eo - pm[i].rm_so) >= MAX_BUF)
+                          goto err;
+                      p = strncat(newstring, pattern + pm[i].rm_so, pm[i].rm_eo - pm[i].rm_so);
+                  }
+                  else
+                  {
+                      if ((p - newstring + 1) >= MAX_BUF)
+                          goto err;
+                      p = strncat(newstring, p_next, 1);
+                  }
+                  p_cur = p_next + 1;
+              }
+              else if (*p_next == '&')
+              {
+                  if (p_cur < p_next)
+                  {
+                      if (((p - newstring) + (p_next - p_cur)) >= MAX_BUF)
+                          goto err;
+                      p = strncat(newstring, p_cur, p_next - p_cur);
+                  }
+                  if (((p - newstring) + (pm[0].rm_eo - pm[0].rm_so)) >= MAX_BUF)
+                      goto err;
+                  p = strncat(newstring, pattern + pm[0].rm_so, pm[0].rm_eo - pm[0].rm_so);
+                  p_cur = p_next + 1;
+              }
+          }
+          if (p_cur < p_next)
+          {
+              if (((p - newstring) + (p_next - p_cur)) >= MAX_BUF)
+                  goto err;
+              p = strncat(newstring, p_cur, p_next - p_cur);
+          }
+      }
+      pattern = pattern + pm[0].rm_eo;
+     } while(regexec (re->compiled, pattern, sizeof(pm) / sizeof(pm[0]), pm, REG_NOTBOL)== 0 &&
 	      re->global);
       if((p - newstring)+ strlen(pattern)  <= MAX_BUF)
 	p = strcat(newstring,pattern);
@@ -531,6 +582,7 @@
       break;
     }
   }
+err:
   return result;
 }


--- NEW FILE squidGuard.conf ---
#
# CONFIG FILE FOR SQUIDGUARD
#
# See http://www.squidguard.org/config/ for more examples
#

dbhome /var/squidGuard/blacklists
logdir /var/log/squidGuard

dest ads {
    log        ads
    domainlist    ads/domains
    urllist        ads/urls
}

dest audio-video {
    log        audio-video
    domainlist    audio-video/domains
    urllist        audio-video/urls
}

dest aggressive {
    log        aggressive
    domainlist    aggressive/domains
    urllist        aggressive/urls
}

dest drugs {
    log        drugs
    domainlist    drugs/domains
    urllist        drugs/urls
}

dest gambling{
    log        gambling
    domainlist    gambling/domains
    urllist        gambling/urls
}

dest hacking {
    log        hacking
    domainlist    hacking/domains
    urllist        hacking/urls
}

dest mail {
    log        mail
    domainlist    mail/domains
    urllist        mail/urls
}

dest porn{
    log        porn
    domainlist    porn/domains
    urllist        porn/urls
}

dest proxy{
    log        proxy
    domainlist    proxy/domains
    urllist        proxy/urls
}

dest violence{
    log        violence
    domainlist    violence/domains
    urllist        violence/urls
}

dest warez{
    log        warez
    domainlist    warez/domains
    urllist        warez/urls
}

dest local-ok{
    domainlist      local-ok/domains
    urllist         local-ok/urls
}

dest local-block{
    log             local-block
    domainlist      local-block/domains
    urllist         local-block/urls
}

rewrite google {
    s@(google.com/search.*q=.*)@\1\&safe=active at i
    s@(google.com/images.*q=.*)@\1\&safe=active at i
    s@(google.com/groups.*q=.*)@\1\&safe=active at i
    s@(google.com/news.*q=.*)@\1\&safe=active at i
    # log google
}

acl {
    default {
	# for google to be in "safe mode"
	rewrite google

	# the default categories are conservative, please add any additional
	# categories listed above or simply comment out this line and uncomment
	# out the line below it.
        pass local-ok !local-block !gambling !porn !warez all
#        pass local-ok !local-block !aggressive !drugs !gambling !hacking !porn !proxy !violence !warez all

        redirect     302:http://SERVERNAME/cgi-bin/squidGuard.cgi?clientaddr=%a&clientname=%n&clientident=%i&srcclass=%s&targetgroup=%t&url=%u
        # redirect     302:http://SERVERNAME/cgi-bin/squidGuard-simple.cgi?clientaddr=%a&clientname=%n&clientident=%i&srcclass=%s&targetclass=%t&url=%u
    }
}


--- NEW FILE squidGuard.fc ---
# squid

/usr/sbin/squidGuard   --        system_u:object_r:squid_exec_t
/var/log/squidGuard(/.*)?        system_u:object_r:squid_log_t
/var/squidGuard/blacklists(/.*)? system_u:object_r:squid_cache_t


--- NEW FILE squidGuard.te ---
allow squid_t usr_t:lnk_file read;


--- NEW FILE squidguard ---
#!/bin/bash
# squid-filtering	This shell script takes care of starting and stopping
#		Squid Internet Object Cache and squidGuard web filter
#
# chkconfig: - 91 25
# description: SquidGuard - web filtering system for the Squid proxy server. \
#	Squid - Internet Object Cache. Internet object caching is \
# 	a way to store requested Internet objects (i.e., data available \
# 	via the HTTP, FTP, and gopher protocols) on a system closer to the \
#	requesting site than to the source. Web browsers can then use the \
#	local Squid cache as a proxy HTTP server, reducing access time as \
#	well as bandwidth consumption.
# pidfile: /var/run/squid.pid
# config: /etc/squid/squid-squidGuard.conf

PATH=/usr/bin:/sbin:/bin:/usr/sbin
export PATH

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

# Source networking configuration.
. /etc/sysconfig/network

# Check that networking is up.
[ ${NETWORKING} = "no" ] && exit 0

# check if the squid-squidGuard.conf file is present
[ -f /etc/squid/squid-squidGuard.conf ] || exit 0

if [ -f /etc/sysconfig/squid ]; then
  . /etc/sysconfig/squid
fi

# don't raise an error if the config file is incomplete 
# set defaults instead:
SQUID_OPTS=${SQUID_OPTS:-"-D"}
SQUID_PIDFILE_TIMEOUT=${SQUID_PIDFILE_TIMEOUT:-20}
SQUID_SHUTDOWN_TIMEOUT=${SQUID_SHUTDOWN_TIMEOUT:-100}

# determine the name of the squid binary
[ -f /usr/sbin/squid ] && SQUID=squid
[ -z "$SQUID" ] && exit 0

prog="$SQUID"

# determine which one is the cache_swap directory
CACHE_SWAP=`sed -e 's/#.*//g' /etc/squid/squid-squidGuard.conf | \
	grep cache_dir |  awk '{ print $3 }'`
[ -z "$CACHE_SWAP" ] && CACHE_SWAP=/var/spool/squid

RETVAL=0

start() {
    for adir in $CACHE_SWAP; do
        if [ ! -d $adir/00 ]; then 
	     echo -n "init_cache_dir $adir... "
	     $SQUID -f /etc/squid/squid-squidGuard.conf -z -F -D 2>/dev/null
	fi
    done
    echo -n $"Starting $prog: "
    $SQUID $SQUID_OPTS -f /etc/squid/squid-squidGuard.conf 2> /dev/null
    RETVAL=$?
    if [ $RETVAL -eq 0 ]; then 
       timeout=0;
       while : ; do
          [ ! -f /var/run/squid.pid ] || break
	  if [ $timeout -ge $SQUID_PIDFILE_TIMEOUT ]; then
	     RETVAL=1
	     break
	  fi
	  sleep 1 && echo -n "."
	  timeout=$((timeout+1))
       done
    fi
    [ $RETVAL -eq 0 ] && touch /var/lock/subsys/$SQUID
    [ $RETVAL -eq 0 ] && echo_success
    [ $RETVAL -ne 0 ] && echo_failure
    echo
    return $RETVAL
}

stop() {
    echo -n  $"Stopping $prog: "
    $SQUID -k check -f /etc/squid/squid-squidGuard.conf >/dev/null 2>&1
    RETVAL=$?
    if [ $RETVAL -eq 0 ] ; then
        $SQUID -k shutdown -f /etc/squid/squid-squidGuard.conf &
    	rm -f /var/lock/subsys/$SQUID
	timeout=0
 	while : ; do
		[ -f /var/run/squid.pid ] || break
		if [ $timeout -ge $SQUID_SHUTDOWN_TIMEOUT ]; then
		    echo
		    return 1
		fi
		sleep 2 && echo -n "." 
		timeout=$((timeout+2))
    	done
	echo_success
	echo 
    else
    	echo_failure
	echo
    fi
    return $RETVAL
}    

reload() {
    $SQUID $SQUID_OPTS -k reconfigure -f /etc/squid/squid-squidGuard.conf
}

restart() {
    stop
    start
}    

condrestart() {
    [ -e /var/lock/subsys/squid ] && restart || :
}

rhstatus() { 
    status $SQUID
    $SQUID -k check -f /etc/squid/squid-squidGuard.conf
}

probe() {
    return 0
}    

case "$1" in
start)
    start
    ;;

stop)
    stop
    ;;

reload)
    reload
    ;;

restart)
    restart
    ;;

condrestart)
    condrestart
    ;;

status)
    rhstatus
    ;;

probe)
    exit 0
    ;;

*)
    echo $"Usage: $0 {start|stop|status|reload|restart|condrestart}"
    exit 1
esac

exit $?


--- NEW FILE transparent-proxying ---
#!/bin/bash
# transparent_proxying  This shell script takes care of starting and stopping
#               transparent proxying
#
# chkconfig: - 91 24
# description: transparent proxying: this will force all web traffic to be \
#	redirected to the squid proxy server. It will only work if squid \
#	is running
# pidfile: /var/run/squid.pid
	
# Source function library.
. /etc/init.d/functions

start() {
	echo -n "Starting transparent proxying: "
	if [ -f /var/run/squid.pid ]
	then
		# Turn on IP forwarding
		echo 1 > /proc/sys/net/ipv4/ip_forward

		# Turn on transparent proxy redirect
		/sbin/iptables -t nat -A PREROUTING -p tcp --dport 80 -j REDIRECT --to-port 3128
       		echo_success
	else
		echo -n "Squid is not running! "
       		echo_failure
	fi
	echo
	return 0
}	
stop() {
	echo -n "Stopping transparent proxying: "
	echo 0 > /proc/sys/net/ipv4/ip_forward
	# Turn off transparent proxy redirect
	/sbin/iptables -t nat -D PREROUTING -p tcp --dport 80 -j REDIRECT --to-port 3128
  	echo_success
	echo
	return 0
}	
status() {
	if [ "`/sbin/iptables -L -n -t nat | grep '80 redir ports 3128'`" ]
	then
		echo "Transparent proxying is active"
		return 0
	else
		echo "Transparent proxying is inactive"
		return 0
	fi
}	


restart() {
	    stop
	    start
}

case "$1" in
  start)
  	start
	;;
  status)
  	status
	;;
  stop)
  	stop
	;;
  restart|reload)
  	restart
	;;
  *)
	echo "*** Usage: {start|stop|restart}"
	exit 1
esac

exit $?


--- NEW FILE update_squidguard_blacklists ---
#!/bin/sh

TARGET=/var/squidGuard/blacklists

cd $TARGET || exit

# only run if squidGuard is active!
[ "`ps auxw | grep squid[G]uard`" ] || exit

rsync -az squidguard.mesd.k12.or.us::filtering $TARGET

for DIR in `ls $TARGET`
do
        if [ -f $DIR/domains.include ]
        then
                TMP=$RANDOM
                cat $DIR/domains $DIR/domains.include | sort | uniq > $DIR/domains.$TMP
                mv -f $DIR/domains.$TMP $DIR/domains
        fi
        if [ -f $DIR/urls.include ]
        then
                TMP=$RANDOM
                cat $DIR/urls $DIR/urls.include | sort | uniq > $DIR/urls.$TMP
                mv -f $DIR/urls.$TMP $DIR/urls
        fi
done

/usr/sbin/squidGuard -c /etc/squid/squidGuard.conf  -C all
# /usr/sbin/squidGuard -c /etc/squid/squidGuard.conf  -u

chown -R squid.squid $TARGET
chown -R squid.squid /var/log/squidGuard/

sleep 5s

/usr/bin/killall -HUP squid



Index: squidGuard.spec
===================================================================
RCS file: /cvs/extras/rpms/squidGuard/devel/squidGuard.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- squidGuard.spec	6 Sep 2005 10:50:41 -0000	1.1
+++ squidGuard.spec	9 Sep 2005 12:16:10 -0000	1.2
@@ -1,12 +1,11 @@
 # $Id$
 
-%define			_dbhomedir		%{_var}/lib/%{name}
-
-%define			_dbrpmver		%(eval "rpm -q --queryformat \"%{VERSION}\" db4")
+%define			_dbhomedir		%{_var}/%{name}/blacklists
+%define			_cgibin			/var/www/cgi-bin
 
 Name:			squidGuard
 Version:		1.2.0
-Release:		11
+Release:		12%{?dist}
 Summary:		Filter, redirector and access controller plugin for squid
 
 Group:			System Environment/Daemons
@@ -17,15 +16,30 @@
 Source2:		http://ftp.teledanmark.no/pub/www/proxy/%{name}/contrib/blacklists.tar.gz
 Source3:		http://cuda.port-aransas.k12.tx.us/squid-getlist.html
 
+# K12LTSP stuff
+Source100:		squidGuard.conf
+Source101:		update_squidguard_blacklists
+Source102:		squidguard
+Source103:		transparent-proxying
+
+# SELinux (taken from K12LTSP package)
+Source200:		squidGuard.te
+Source201:		squidGuard.fc
+
 Patch0:			squidGuard-destdir.patch
 Patch1:			squidGuard-paths.patch
 Patch2:			squidguard-1.2.0-db4.patch
 Patch3:			squid-getlist.html.patch
+Patch4:			squidGuard-perlwarning.patch
+Patch5:			squidGuard-sed.patch
+
 URL:			http://www.squidguard.org/
 
 BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	db4-devel
 Requires:		squid
+Requires(post):	%{_bindir}/chcon
+Requires(post):	/sbin/chkconfig
 
 %description
 squidGuard can be used to 
@@ -56,10 +70,13 @@
 %{__cp} %{SOURCE3} .
 %patch0 -p1 -b .destdir
 %patch1 -p1 -b .paths
-%if "%{_dbrpmver}" != "4.0.14"
 %patch2 -p0 -b .db4
-%endif
 %patch3 -p0
+%patch4 -p2
+%patch5 -p1
+
+%{__cp} %{SOURCE100} ./squidGuard.conf.k12ltsp.template
+%{__cp} %{SOURCE101} ./update_squidguard_blacklists.k12ltsp.sh
 
 %build
 %configure \
@@ -67,7 +84,11 @@
 	--with-sg-logdir=%{_var}/log/squid \
 	--with-sg-dbhome=%{_dbhomedir}
 	
-%{__make} %{?_smp_mflags} LIBS=-ldb
+%{__make} %{?_smp_mflags}
+
+pushd contrib
+%{__make} %{?_smp_mflags}
+popd
 
 %install
 %{__rm} -rf $RPM_BUILD_ROOT
@@ -78,9 +99,21 @@
 %{__install} -p -D -m 0644 samples/sample.conf $RPM_BUILD_ROOT%{_sysconfdir}/squid/squidGuard.conf
 %{__install} -p -D -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_dbhomedir}/blacklists.tar.gz
 
-# Don't use SOURCE3, but use the allready patched one #165689, also install it with perm 755 not 750
+# Don't use SOURCE3, but use the allready patched one #165689
 %{__install} -p -D -m 0755 squid-getlist.html $RPM_BUILD_ROOT%{_sysconfdir}/cron.daily/squidGuard
 
+%{__install} -p -D %{SOURCE200} $RPM_BUILD_ROOT%{_sysconfdir}/selinux/targeted/src/policy/domains/program/squidGuard.te
+%{__install} -p -D %{SOURCE201} $RPM_BUILD_ROOT%{_sysconfdir}/selinux/targeted/src/policy/file_contexts/program/squidGuard.fc
+
+%{__install} -p -d $RPM_BUILD_ROOT%{_cgibin}
+%{__install} samples/squid*cgi $RPM_BUILD_ROOT%{_cgibin}
+
+%{__install} contrib/hostbyname/hostbyname $RPM_BUILD_ROOT%{_bindir}
+%{__install} contrib/sgclean/sgclean $RPM_BUILD_ROOT%{_bindir}
+
+%{__install} -p -D -m 0755 %{SOURCE102} $RPM_BUILD_ROOT%{_initrddir}/squidGuard
+%{__install} -p -D -m 0755 %{SOURCE103} $RPM_BUILD_ROOT%{_initrddir}/transparent-proxying
+
 pushd $RPM_BUILD_ROOT%{_dbhomedir}
 tar xfz $RPM_BUILD_ROOT%{_dbhomedir}/blacklists.tar.gz
 popd
@@ -90,20 +123,71 @@
 %clean
 %{__rm} -rf $RPM_BUILD_ROOT
 
+%post
+# fix SELinux bits
+%{_bindir}/chcon -R system_u:object_r:squid_cache_t /var/squidGuard >/dev/null 2>&1
+%{_bindir}/chcon -R system_u:object_r:squid_log_t /var/log/squidGuard >/dev/null 2>&1
+
+# do we need a new config file?
+if [ -s %{_sysconfdir}/squid/squidGuard.conf ]; then
+	CONFFILE="%{_sysconfdir}/squid/squidGuard.conf.rpmnew"
+    echo "/etc/squid/squidGuard.conf created as /etc/squid/squidGuard.conf.rpmnew"
+else
+	CONFFILE="/etc/squid/squidGuard.conf"
+fi
+cat %{_docdir}/%{name}-%{version}/squidGuard.conf.k12ltsp.template | \
+	sed s/SERVERNAME/$HOSTNAME/g > $CONFFILE
+
+/sbin/chkconfig --add squidGuard
+/sbin/chkconfig --add transparent-proxying
+
+# reload SELinux policies
+echo "Loading new SELinux policy"
+pushd %{_sysconfdir}/selinux/targeted/src/policy/
+%{__make} load &> /dev/null
+popd
+
+#### End of %post
+
+%preun
+if [ $1 = 0 ] ; then
+    service squidGuard stop >/dev/null 2>&1
+    /sbin/chkconfig --del squidGuard
+	/sbin/chkconfig --del transparent-proxying
+fi
+
 %files
 %defattr(-,root,root)
 %doc samples/*.conf
 %doc samples/*.cgi
 %doc samples/dest/blacklists.tar.gz
-%doc COPYING GPL
+%doc COPYING GPL 
 %doc doc/*.txt doc/*.html doc/*.gif
+%doc squidGuard.conf.k12ltsp.template
 %{_bindir}/*
 %config(noreplace) %{_sysconfdir}/squid/squidGuard.conf
 %config(noreplace) %{_sysconfdir}/logrotate.d/squidGuard
 %config(noreplace) %{_sysconfdir}/cron.daily/squidGuard
 %{_dbhomedir}/
+%{_sysconfdir}/selinux/targeted/src/policy/domains/program/squidGuard.te
+%{_sysconfdir}/selinux/targeted/src/policy/file_contexts/program/squidGuard.fc
+%attr(07550,root,root) %{_cgibin}/*.cgi
+%{_initrddir}/squidGuard
+%{_initrddir}/transparent-proxying
 
 %changelog
+* Fri Sep 09 2005 Oliver Falk 		- 1.2.0-12
+- Make it K12LTSP compatible, so a possible upgrade doesn't break
+  anything/much...
+  - Add SELinux stuff
+  - Move dbdir to /var/squidGuard/blacklists, instead of /var/lib/squidGuard
+  - Added update script and template config from/for K12
+  - Add perlwarnings and sed patch
+  - Install cgis in /var/www/cgi-bin
+  - Added initrd stuff
+- Remove questionable -ldb from make
+- Remove questionable db version check
+
 * Tue Sep 06 2005 Oliver Falk 		- 1.2.0-11
 - More bugs from Bug #165689
   Install cron script with perm 755



From fedora-extras-commits at redhat.com  Fri Sep  9 12:26:05 2005
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Fri,  9 Sep 2005 08:26:05 -0400
Subject: rpms/cppunit - New directory
Message-ID: <200509091226.j89CQ518000623@cvs-int.fedora.redhat.com>

Author: pertusus

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

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




From fedora-extras-commits at redhat.com  Fri Sep  9 12:26:06 2005
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Fri,  9 Sep 2005 08:26:06 -0400
Subject: rpms/cppunit/devel - New directory
Message-ID: <200509091226.j89CQ6IM000628@cvs-int.fedora.redhat.com>

Author: pertusus

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

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




From fedora-extras-commits at redhat.com  Fri Sep  9 12:38:43 2005
From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo))
Date: Fri,  9 Sep 2005 08:38:43 -0400
Subject: owners owners.list,1.181,1.182
Message-ID: <200509091238.j89CchvQ000696@cvs-int.fedora.redhat.com>

Author: ryo

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

Modified Files:
	owners.list 
Log Message:
add tomoe and scim-tomoe



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.181
retrieving revision 1.182
diff -u -r1.181 -r1.182
--- owners.list	8 Sep 2005 18:36:13 -0000	1.181
+++ owners.list	9 Sep 2005 12:38:41 -0000	1.182
@@ -857,6 +857,7 @@
 Fedora Extras|scim-pinyin|Chinese input method for SCIM|ryo-dairiki at mbm.nifty.com|extras-qa at fedoraproject.org|petersen at redhat.com
 Fedora Extras|scim-qtimm|SCIM Qt Input Method module|petersen at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|scim-tables|SCIM Generic Table IMEngine and its data files|ryo-dairiki at mbm.nifty.com|extras-qa at fedoraproject.org|
+Fedora Extras|scim-tomoe|Tomoe module for SCIM for Japanese handwritten input|ryo-dairiki at mbm.nifty.com|extras-qa at fedoraproject.org|
 Fedora Extras|scmxx|Exchange data with Siemens mobile phones|andreas at bawue.net|extras-qa at fedoraproject.org|
 Fedora Extras|scons|An Open Source software construction tool|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|scorched3d|A game based loosely on the classic DOS game Scorched Earth|pmatilai at laiskiainen.org|extras-qa at fedoraproject.org|
@@ -939,6 +940,7 @@
 Fedora Extras|tkcvs|TkCVS and TkDiff|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|tktable|Table/matrix widget extension to Tcl/Tk|jfontain at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|tla|The Low-Budget arch Revision Control System|shahms at shahms.com|extras-qa at fedoraproject.org|
+Fedora Extras|tomoe|Japanese handwritten input system|ryo-dairiki at mbm.nifty.com|extras-qa at fedoraproject.org|
 Fedora Extras|torcs|An OpenGL 3d racing game|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|torcs-data|The Open Racing Car Simulator data files|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|tpb|IBM ThinkPad button support utility|ville.skytta at iki.fi|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Fri Sep  9 12:39:13 2005
From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo))
Date: Fri,  9 Sep 2005 08:39:13 -0400
Subject: rpms/tomoe/FC-3 tomoe.spec,1.1,1.2
Message-ID: <200509091239.j89CdD8R000722@cvs-int.fedora.redhat.com>

Author: ryo

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

Modified Files:
	tomoe.spec 
Log Message:



Index: tomoe.spec
===================================================================
RCS file: /cvs/extras/rpms/tomoe/FC-3/tomoe.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tomoe.spec	7 Sep 2005 09:28:46 -0000	1.1
+++ tomoe.spec	9 Sep 2005 12:39:11 -0000	1.2
@@ -41,7 +41,7 @@
 rm -rf $RPM_BUILD_ROOT
 
 
-%post -p/sbin/ldconfig
+%post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
 



From fedora-extras-commits at redhat.com  Fri Sep  9 12:39:31 2005
From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo))
Date: Fri,  9 Sep 2005 08:39:31 -0400
Subject: rpms/tomoe/FC-4 tomoe.spec,1.1,1.2
Message-ID: <200509091239.j89CdVDk000761@cvs-int.fedora.redhat.com>

Author: ryo

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

Modified Files:
	tomoe.spec 
Log Message:



Index: tomoe.spec
===================================================================
RCS file: /cvs/extras/rpms/tomoe/FC-4/tomoe.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tomoe.spec	7 Sep 2005 09:28:46 -0000	1.1
+++ tomoe.spec	9 Sep 2005 12:39:29 -0000	1.2
@@ -41,7 +41,7 @@
 rm -rf $RPM_BUILD_ROOT
 
 
-%post -p/sbin/ldconfig
+%post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
 



From fedora-extras-commits at redhat.com  Fri Sep  9 12:39:32 2005
From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo))
Date: Fri,  9 Sep 2005 08:39:32 -0400
Subject: rpms/tomoe/devel tomoe.spec,1.1,1.2
Message-ID: <200509091239.j89CdW89000767@cvs-int.fedora.redhat.com>

Author: ryo

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

Modified Files:
	tomoe.spec 
Log Message:



Index: tomoe.spec
===================================================================
RCS file: /cvs/extras/rpms/tomoe/devel/tomoe.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tomoe.spec	7 Sep 2005 09:28:46 -0000	1.1
+++ tomoe.spec	9 Sep 2005 12:39:30 -0000	1.2
@@ -41,7 +41,7 @@
 rm -rf $RPM_BUILD_ROOT
 
 
-%post -p/sbin/ldconfig
+%post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
 



From fedora-extras-commits at redhat.com  Fri Sep  9 12:49:24 2005
From: fedora-extras-commits at redhat.com (Jeff Carlson (jcarlson))
Date: Fri,  9 Sep 2005 08:49:24 -0400
Subject: rpms/up-imapproxy - New directory
Message-ID: <200509091249.j89CnOXr000956@cvs-int.fedora.redhat.com>

Author: jcarlson

Update of /cvs/extras/rpms/up-imapproxy
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv936/up-imapproxy

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




From fedora-extras-commits at redhat.com  Fri Sep  9 12:49:24 2005
From: fedora-extras-commits at redhat.com (Jeff Carlson (jcarlson))
Date: Fri,  9 Sep 2005 08:49:24 -0400
Subject: rpms/up-imapproxy/devel - New directory
Message-ID: <200509091249.j89CnOBx000961@cvs-int.fedora.redhat.com>

Author: jcarlson

Update of /cvs/extras/rpms/up-imapproxy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv936/up-imapproxy/devel

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




From fedora-extras-commits at redhat.com  Fri Sep  9 12:49:42 2005
From: fedora-extras-commits at redhat.com (Jeff Carlson (jcarlson))
Date: Fri,  9 Sep 2005 08:49:42 -0400
Subject: rpms/up-imapproxy Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200509091249.j89CngCL000998@cvs-int.fedora.redhat.com>

Author: jcarlson

Update of /cvs/extras/rpms/up-imapproxy
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv984

Added Files:
	Makefile import.log 
Log Message:
Setup of module up-imapproxy


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

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

common : CVS/Root
	@cvs checkout common

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

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


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Fri Sep  9 12:49:44 2005
From: fedora-extras-commits at redhat.com (Jeff Carlson (jcarlson))
Date: Fri,  9 Sep 2005 08:49:44 -0400
Subject: rpms/up-imapproxy/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200509091249.j89CnioF001011@cvs-int.fedora.redhat.com>

Author: jcarlson

Update of /cvs/extras/rpms/up-imapproxy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv984/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module up-imapproxy


--- NEW FILE .cvsignore ---


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

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Fri Sep  9 12:50:24 2005
From: fedora-extras-commits at redhat.com (Jeff Carlson (jcarlson))
Date: Fri,  9 Sep 2005 08:50:24 -0400
Subject: rpms/up-imapproxy/devel imapproxy.init, NONE, 1.1 up-imapproxy.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200509091250.j89CoOl4001091@cvs-int.fedora.redhat.com>

Author: jcarlson

Update of /cvs/extras/rpms/up-imapproxy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1058/devel

Modified Files:
	.cvsignore sources 
Added Files:
	imapproxy.init up-imapproxy.spec 
Log Message:
auto-import up-imapproxy-1.2.3-6 on branch devel from up-imapproxy-1.2.3-6.src.rpm


--- NEW FILE imapproxy.init ---
#!/bin/bash
#
# up-imapproxy: Starts the University of Pittsburgh IMAP Proxy
#
# chkconfig: - 75 25
# description: imapproxy was written to compensate for webmail clients that \
#              are unable to maintain persistent connections to an IMAP \
#              server. Most webmail clients need to log in to an IMAP server \
#              for nearly every single transaction. This behaviour can cause \
#              tragic performance problems on the IMAP server. imapproxy \
#              tries to deal with this problem by leaving server connections \
#              open for a short time after a webmail client logs out. When \
#              the webmail client connects again, imapproxy will determine if \
#              there's a cached connection available and reuse it if possible.
# processname: in.imapproxyd
# config: /etc/imapproxy.conf

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

. /etc/sysconfig/network

# Check that networking is configured.
[ ${NETWORKING} = "no" ] && exit 0

start() {
	echo -n $"Starting imapproxyd: "
	daemon /usr/sbin/in.imapproxyd
	RETVAL=$?
	echo
	touch $lockfile
	return $RETVAL
}

stop() {
	echo -n $"Shutting down imapproxyd: "
	killproc /usr/sbin/in.imapproxyd
	RETVAL=$?
	if [ $RETVAL -eq 0 ] ; then
	    rm -f $lockfile
	fi
	echo
	return $RETVAL
}

restart() {
	stop
	start
}

RETVAL=0
lockfile=/var/lock/subsys/imapproxy

# See how we were called.
case "$1" in
  start)
	start
	;;
  stop)
	stop
	;;
  status)
	status in.imapproxyd
	;;
  restart|reload)
	restart
	;;
  condrestart)
        [ -f /var/lock/subsys/in.imapproxyd ] && restart || :
	;;
  *)
	echo $"Usage: $0 {start|stop|status|restart|condrestart}"
	exit 1
esac

exit $?


--- NEW FILE up-imapproxy.spec ---
Summary: University of Pittsburgh IMAP Proxy
Name: up-imapproxy
Version: 1.2.3
Release: 6%{?dist}
License: GPL
Group: System Environment/Daemons
URL: http://www.imapproxy.org
Source0: http://www.imapproxy.org/downloads/up-imapproxy-%{version}.tar.gz
Source1: imapproxy.init
# Source1 can be downloaded from
# https://bugzilla.redhat.com/bugzilla/attachment.cgi?id=118632
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires(post): /sbin/chkconfig
Requires(preun): /sbin/chkconfig, /sbin/service
Requires(postun): /sbin/service
BuildRequires: openssl-devel tcp_wrappers ncurses-devel

%description
imapproxy was written to compensate for webmail clients that are
unable to maintain persistent connections to an IMAP server. Most
webmail clients need to log in to an IMAP server for nearly every
single transaction. This behaviour can cause tragic performance
problems on the IMAP server. imapproxy tries to deal with this problem
by leaving server connections open for a short time after a webmail
client logs out. When the webmail client connects again, imapproxy
will determine if there's a cached connection available and reuse it
if possible.

%prep
%setup -q

%build
%configure
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
# The install-* Makefile targets don't support DESTDIR syntax, so work around.
install -D -m 0644 -p scripts/imapproxy.conf \
	$RPM_BUILD_ROOT%{_sysconfdir}/imapproxy.conf
install -D -m 0755 -p %{SOURCE1} \
	$RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/imapproxy
install -d -m 0755 $RPM_BUILD_ROOT%{_sbindir}
install -m 0755 bin/* $RPM_BUILD_ROOT%{_sbindir}
install -d -m 0755 $RPM_BUILD_ROOT%{_localstatedir}/run
touch $RPM_BUILD_ROOT%{_localstatedir}/run/pimpstats

%clean
rm -rf $RPM_BUILD_ROOT

%post
if [ $1 == 1 ] ; then
    /sbin/chkconfig --add imapproxy &> /dev/null || :
fi

%preun
if [ $1 == 0 ] ; then
    /sbin/service imapproxy stop &> /dev/null || :
    /sbin/chkconfig --del imapproxy || :
fi

%postun
/sbin/service imapproxy condrestart &> /dev/null || :

%files
%defattr(-,root,root,-)
%doc COPYING ChangeLog README README.debian README.known_issues README.ssl
%config(noreplace) %{_sysconfdir}/imapproxy.conf
%ghost %{_localstatedir}/run/pimpstats
     %{_sysconfdir}/rc.d/init.d/*
     %{_sbindir}/*

%changelog
* Fri Sep  9 2005 Jeff Carlson  - 1.2.3-6
- Another change to the init script.

* Sat Sep  3 2005 Jeff Carlson  - 1.2.3-5
- Preserve certain timestamps.

* Thu Sep  1 2005 Jeff Carlson  - 1.2.3-4
- Fix rpmlint complaints.
- Paul also provided a replacement init script.
- Fixed some redundant BuildReqs.
- Tuned Requires, install, and files.
- Many thanks to Paul Howarth.

* Wed Aug 31 2005 Jeff Carlson  - 1.2.3-3
- Added BuildRequires.

* Fri Aug 12 2005 Jeff Carlson  - 1.2.3-2
- Multiple fixups recommended by spot.

* Mon Jul 18 2005 Jeff Carlson  - 1.2.3-1
- Initial build.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/up-imapproxy/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	9 Sep 2005 12:49:42 -0000	1.1
+++ .cvsignore	9 Sep 2005 12:50:22 -0000	1.2
@@ -0,0 +1 @@
+up-imapproxy-1.2.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/up-imapproxy/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Sep 2005 12:49:42 -0000	1.1
+++ sources	9 Sep 2005 12:50:22 -0000	1.2
@@ -0,0 +1 @@
+ad4dafd1417903feb1e09ec569ff1ad5  up-imapproxy-1.2.3.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep  9 12:50:23 2005
From: fedora-extras-commits at redhat.com (Jeff Carlson (jcarlson))
Date: Fri,  9 Sep 2005 08:50:23 -0400
Subject: rpms/up-imapproxy import.log,1.1,1.2
Message-ID: <200509091250.j89CorqZ001098@cvs-int.fedora.redhat.com>

Author: jcarlson

Update of /cvs/extras/rpms/up-imapproxy
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1058

Modified Files:
	import.log 
Log Message:
auto-import up-imapproxy-1.2.3-6 on branch devel from up-imapproxy-1.2.3-6.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/up-imapproxy/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	9 Sep 2005 12:49:40 -0000	1.1
+++ import.log	9 Sep 2005 12:50:21 -0000	1.2
@@ -0,0 +1 @@
+up-imapproxy-1_2_3-6:HEAD:up-imapproxy-1.2.3-6.src.rpm:1126270218



From fedora-extras-commits at redhat.com  Fri Sep  9 12:53:04 2005
From: fedora-extras-commits at redhat.com (Jeff Carlson (jcarlson))
Date: Fri,  9 Sep 2005 08:53:04 -0400
Subject: owners owners.list,1.182,1.183
Message-ID: <200509091253.j89Cr47T001153@cvs-int.fedora.redhat.com>

Author: jcarlson

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

Modified Files:
	owners.list 
Log Message:
Added up-imapproxy.



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.182
retrieving revision 1.183
diff -u -r1.182 -r1.183
--- owners.list	9 Sep 2005 12:38:41 -0000	1.182
+++ owners.list	9 Sep 2005 12:53:02 -0000	1.183
@@ -960,6 +960,7 @@
 Fedora Extras|umfpack|Routines for solving unsymmetric sparse linear systems|qspencer at ieee.org|extras-qa at fedoraproject.org|
 Fedora Extras|unison|File synchronization tool|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|unrtf|RTF to other formats converter|gauret at free.fr|extras-qa at fedoraproject.org|
+Fedora Extras|up-imapproxy|University of Pittsburgh IMAP Proxy|jeff at ultimateevil.org|extras-qa at fedoraproject.org|
 Fedora Extras|upx|The Ultimate Packer for eXecutables|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|uqm-content|Base content files for The Ur-Quan Masters|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|uqm|The Ur-Quan Masters|ville.skytta at iki.fi|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Fri Sep  9 14:16:17 2005
From: fedora-extras-commits at redhat.com (Jeff Carlson (jcarlson))
Date: Fri,  9 Sep 2005 10:16:17 -0400
Subject: rpms/up-imapproxy/devel up-imapproxy.spec,1.1,1.2
Message-ID: <200509091416.j89EGHNA003977@cvs-int.fedora.redhat.com>

Author: jcarlson

Update of /cvs/extras/rpms/up-imapproxy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3958

Modified Files:
	up-imapproxy.spec 
Log Message:
* Fri Sep  9 2005 Jeff Carlson  - 1.2.4-1
- Bump to current upstream release.
- Upstream includes a new doc (copyright), included.




Index: up-imapproxy.spec
===================================================================
RCS file: /cvs/extras/rpms/up-imapproxy/devel/up-imapproxy.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- up-imapproxy.spec	9 Sep 2005 12:50:22 -0000	1.1
+++ up-imapproxy.spec	9 Sep 2005 14:16:15 -0000	1.2
@@ -1,7 +1,7 @@
 Summary: University of Pittsburgh IMAP Proxy
 Name: up-imapproxy
-Version: 1.2.3
-Release: 6%{?dist}
+Version: 1.2.4
+Release: 1%{?dist}
 License: GPL
 Group: System Environment/Daemons
 URL: http://www.imapproxy.org
@@ -65,12 +65,17 @@
 %files
 %defattr(-,root,root,-)
 %doc COPYING ChangeLog README README.debian README.known_issues README.ssl
+%doc copyright
 %config(noreplace) %{_sysconfdir}/imapproxy.conf
 %ghost %{_localstatedir}/run/pimpstats
-     %{_sysconfdir}/rc.d/init.d/*
-     %{_sbindir}/*
+%{_sysconfdir}/rc.d/init.d/*
+%{_sbindir}/*
 
 %changelog
+* Fri Sep  9 2005 Jeff Carlson  - 1.2.4-1
+- Bump to current upstream release.
+- Upstream includes a new doc (copyright), included.
+
 * Fri Sep  9 2005 Jeff Carlson  - 1.2.3-6
 - Another change to the init script.
 



From fedora-extras-commits at redhat.com  Fri Sep  9 15:10:19 2005
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Fri,  9 Sep 2005 11:10:19 -0400
Subject: extras-buildsys/server DBManager.py, NONE, 1.1 BuildMaster.py, 1.34,
	1.35 BuilderManager.py, 1.15, 1.16 Config.py, 1.5,
	1.6 Makefile, 1.9, 1.10 UserInterface.py, 1.54, 1.55 main.py,
	1.13, 1.14
Message-ID: <200509091510.j89FAJww005450@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys/server
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5408/server

Modified Files:
	BuildMaster.py BuilderManager.py Config.py Makefile 
	UserInterface.py main.py 
Added Files:
	DBManager.py 
Log Message:
2005-09-09  Dan Williams  

    * Add support for PostgreSQL as the database backend.
        Databases are now abstracted and support for others,
        like MySQL, need to be added to server/DBManager.py.
        Should be really easy though.

    NOTE: sqlite support might be broken right now due to
        SQL statement quoting changes




--- NEW FILE DBManager.py ---
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
# GNU Library General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
# copyright 2005 Duke University
#
# Copyright 2005 Dan Williams  and Red Hat, Inc.

import os, sys
import types
import exceptions
from plague import BaseConfig
import Config


class ResultSet:
    """ Partially taken from sqlite's python DB-API module """

    def __init__(self, result, desc):
        self.__dict__['_dbresult'] = result
        self.__dict__['_desc'] = desc
        self.__dict__['_xlatekey'] = {}

        # set up key translation of field name -> index
        for _i in range(len(desc)):
            self.__dict__['_xlatekey'][desc[_i][0].upper()] = _i

    def __getattr__(self, key):
        key = key.upper()
        if self.__dict__['_xlatekey'].has_key(key):
            return self.__dict__['_dbresult'][self.__dict__['_xlatekey'][key]]
        raise AttributeError, key

    def __len__(self):
        return len(self.__dict__['_dbresult'])

    def __getitem__(self, key):
        if isinstance(key, types.StringType):
            key = self.__dict__['_xlatekey'][key.upper()]
        return self.__dict__['_dbresult'][key]

    def __contains__(self, key):
        return self.__dict__['_xlatekey'].has_key(key.upper())

    def __repr__(self):
        return repr(self.__dict__['_dbresult'])

    def __str__(self):
        return str(self.__dict__['_dbresult'])

    def __cmp__(self, other):
        return cmp(self.__dict__['_dbresult'], other)

    def description(self):
        return self.__dict__['_desc']

    def keys(self):
        _k = []
        for _i in self.__dict__['_desc']:
            _k.append(_i[0])
        return _k

    def values(self):
        return self.__dict__['_dbresult']

    def items(self):
        _items = []
        for i in range(len(self.__dict__['_dbresult'])):
            _items.append((self.__dict__['_desc'][i][0], self.__dict__['_dbresult'][i]))
        return _items

    def has_key(self, key):
        return self.__dict__['_xlatekey'].has_key(key.upper())


class BaseDBEngineClass:
    def __init__(self, cfg):
        self._cfg = cfg
        self._dbcx = self._connect()

    def cursor(self):
        return self._dbcx.cursor()

    def commit(self):
        self._dbcx.commit()

    def get_uid_field_type(self):
        raise Exception("Need to implement this function for derived classes.")

    def get_uid_field_for_insert(self):
        raise Exception("Need to implement this function for derived classes.")

    def get_uid_value_for_insert(self):
        raise Exception("Need to implement this function for derived classes.")

    def fetchall(self, cursor):
        raise Exception("Need to implement this function for derived classes.")

    def fetchone(self, cursor):
        raise Exception("Need to implement this function for derived classes.")

class sqliteEngineClass(BaseDBEngineClass):

    """ sqlite will autoincrement the primary key on insert when you
        specify the field and a value of NULL """

    def get_uid_field_type(self):
        return "INTEGER PRIMARY KEY"

    def get_uid_field_for_insert(self):
        return "uid,"

    def get_uid_value_for_insert(self):
        return "NULL,"

    def fetchall(self, cursor):
        """ sqlite returns the items in a dict-like class already """
        return cursor.fetchall()

    def fetchone(self, cursor):
        """ sqlite returns the items in a dict-like class already """
        return cursor.fetchone()

    def _connect(self):
        try:
            dbloc = self._cfg.get_str("sqlite Engine", "database")
        except BaseConfig.ConfigError, e:
            print "Error: bad sqlite config options.  '%s'" % e
            os._exit(1)

        try:
            tm = self._cfg.get_int("sqlite Engine", "timeout")
        except BaseConfig.ConfigError, e:
            tm = 3

        try:
            dbcx = sqlite.connect(dbloc, encoding="utf-8", timeout=tm)
        except StandardError, e:
            print "Error: %s" % e
            os._exit(1)
        return dbcx


class pgdbEngineClass(BaseDBEngineClass):

    """ postgres will autoincrement SERIAL fields on insert automatically,
        you don't need to specify its value in INSERT statements """

    def get_uid_field_type(self):
        return "SERIAL PRIMARY KEY"

    def get_uid_field_for_insert(self):
        return ""

    def get_uid_value_for_insert(self):
        return ""

    def fetchall(self, cursor):
        """ We need to convert the returned data to a ResultSet object so
            we can access it as a dict 
        """
        rows = cursor.fetchall()
        return [ResultSet(row, cursor.description) for row in rows]

    def fetchone(self, cursor):
        """ We need to convert the returned data to a ResultSet object so
            we can access it as a dict 
        """
        row = cursor.fetchone()
        if not row:
            return None
        return ResultSet(row, cursor.description)

    def _connect(self):
        try:
            host = self._cfg.get_str("pgdb Engine", "host")
            database = self._cfg.get_str("pgdb Engine", "database")
            user = self._cfg.get_str("pgdb Engine", "user")
            password = self._cfg.get_str("pgdb Engine", "password")
        except BaseConfig.ConfigError, e:
            print "Error: bad pgdb config options.  '%s'" % e
            os._exit(1)

        try:
            dbcx = pgdb.connect(host=host, database=database, user=user, password=password)
        except StandardError, e:
            print "Error: %s" % e
            os._exit(1)

        return dbcx




db_engines = {
    'sqlite':   sqliteEngineClass,
    'pgdb':    pgdbEngineClass
}

# Import our database engines, if any engine
# isn't present, remove its class entry from
# the db engine dict
try:
    import sqlite
except ImportError, e:
    db_engines['sqlite'] = None

try:
    import pgdb
except ImportError, e:
    db_engines['pgdb'] = None



class DBManager:
    def __init__(self, cfg):
        self._cfg = cfg
        try:
            engine = self._cfg.get_str("Database", "engine")
            self._db_engine_class = db_engines[engine]
        except KeyError:
            print "Error: unrecognized database engine '%s'.  Must be " \
                    "one of: %s" % (engine, db_engines.keys())
            os._exit(1)

        if not self._db_engine_class:
            print "Error: database engine '%s' could not be loaded.  " \
                    "Perhaps you need the python module for it?" % engine
            os._exit(1)

        print "Using database engine %s." % engine

        # Make sure our database structure is what we want
        dbcx = self.dbcx()
        if not dbcx:
            os._exit(1)
        self._ensure_tables(dbcx)
        del dbcx

    def dbcx(self):
        try:
            dbcx = self._db_engine_class(self._cfg)
        except StandardError, e:
            dbcx = None
            print "DB Error: %s" % e

        return dbcx

    def _ensure_tables(self, dbcx):
        """ Create database tables if they don't exist """

        curs = dbcx.cursor()
        try:
            curs.execute('SELECT * FROM jobs LIMIT 4')
        except Exception, e:
            # If table wasn't created, try to create it
            try:
                uid_type = dbcx.get_uid_field_type()
                dbcx.commit()
                curs.execute('CREATE TABLE jobs ('  \
                    'uid %s, '                      \
                    'username VARCHAR(20), '        \
                    'package VARCHAR(50), '         \
                    'source VARCHAR(255), '         \
                    'target_distro VARCHAR(20), '   \
                    'target_target VARCHAR(20), '   \
                    'target_repo VARCHAR(20), '     \
                    'buildreq VARCHAR(75), '        \
                    'starttime BIGINT, '            \
                    'endtime BIGINT, '              \
                    'status VARCHAR(15), '          \
                    'result VARCHAR(15), '          \
                    'epoch VARCHAR(4), '            \
                    'version VARCHAR(25), '         \
                    'release VARCHAR(25), '         \
                    'archlist VARCHAR(75), '        \
                    'result_msg TEXT'               \
                    ')' % uid_type)
                dbcx.commit()
            except StandardError, e:
                print "Could not access the job database.  Reason: '%s'.  Exiting..." % e
                os._exit(1)

        # Create the archjobs table
        try:
            curs.execute('SELECT * FROM archjobs LIMIT 4')
        except Exception, e:
            # If table wasn't created, try to create it
            try:
                dbcx.commit()
                curs.execute('CREATE TABLE archjobs ('  \
                    'jobid VARCHAR(40) PRIMARY KEY, '   \
                    'parent_uid INTEGER, '              \
                    'starttime BIGINT, '                \
                    'endtime BIGINT, '                  \
                    'arch VARCHAR(15), '                \
                    'builder_addr VARCHAR(100), '       \
                    'status VARCHAR(15), '              \
                    'builder_status VARCHAR(15)'        \
                    ')')
                dbcx.commit()
            except StandardError, e:
                print "Could not access the job database.  Reason: '%s'.  Exiting..." % e
                os._exit(1)



Index: BuildMaster.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/BuildMaster.py,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- BuildMaster.py	29 Aug 2005 17:48:19 -0000	1.34
+++ BuildMaster.py	9 Sep 2005 15:10:17 -0000	1.35
@@ -18,7 +18,7 @@
 
 import time
 import PackageJob
-import sqlite
+import DBManager
 import threading
 import os
 import Repo
@@ -26,85 +26,13 @@
 import Config
 
 
-# Load in the config
-CONFIG_LOCATION = "/etc/plague/server/"
-
-
-def ensure_job_db_tables(dbcx):
-    """ Central routine to create the database table structure """
-
-    curs = dbcx.cursor()
-    try:
-        curs.execute('SELECT * FROM jobs')
-        dbcx.commit()
-    except Exception, e:
-        # If DB wasn't created, try to create it
-        try:
-            curs.execute('CREATE TABLE jobs ('  \
-                'uid INTEGER PRIMARY KEY, '     \
-                'username VARCHAR(20), '        \
-                'package VARCHAR(50), '         \
-                'source VARCHAR(255), '         \
-                'target_distro VARCHAR(20), '   \
-                'target_target VARCHAR(20), '   \
-                'target_repo VARCHAR(20), '     \
-                'buildreq VARCHAR(75), '        \
-                'starttime BIGINT, '            \
-                'endtime BIGINT, '              \
-                'status VARCHAR(15), '          \
-                'result VARCHAR(15), '          \
-                'epoch VARCHAR(4), '            \
-                'version VARCHAR(25), '         \
-                'release VARCHAR(25), '         \
-                'archlist VARCHAR(75), '        \
-                'result_msg TEXT'               \
-                ')')
-        except sqlite.OperationalError, e:
-            print "Could not access the job database.  Reason: '%s'.  Exiting..." % e
-            os._exit(1)
-        except sqlite.DatabaseError, e:
-            s = "%s" % e
-            if s != "table jobs already exists":
-                print "Could not access the job database.  Reason: '%s'.  Exiting..." % e
-                os._exit(1)
-        else:
-            dbcx.commit()
-
-    # Create the archjobs table
-    try:
-        curs.execute('SELECT * FROM archjobs')
-        dbcx.commit()
-    except Exception, e:
-        # If DB wasn't created, try to create it
-        try:
-            curs.execute('CREATE TABLE archjobs ('  \
-                'jobid VARCHAR(40) PRIMARY KEY, '   \
-                'parent_uid INTEGER, '              \
-                'starttime BIGINT, '                \
-                'endtime BIGINT, '                  \
-                'arch VARCHAR(15), '                \
-                'builder_addr VARCHAR(100), '       \
-                'status VARCHAR(15), '              \
-                'builder_status VARCHAR(15)'        \
-                ')')
-        except sqlite.OperationalError, e:
-            print "Could not access the job database.  Reason: '%s'.  Exiting..." % e
-            os._exit(1)
-        except sqlite.DatabaseError, e:
-            s = "%s" % e
-            if s != "table archjobs already exists":
-                print "Could not access the job database.  Reason: '%s'.  Exiting..." % e
-                os._exit(1)
-        else:
-            dbcx.commit()
-
-
 class BuildMaster(threading.Thread):
 
     MAX_CHECKOUT_JOBS = 5
 
-    def __init__(self, builder_manager, cfg):
+    def __init__(self, builder_manager, db_manager, cfg):
         self.builder_manager = builder_manager
+        self._db_manager = db_manager
         self.hostname = cfg.get_str("General", "hostname")
         self.should_stop = False
         self._paused = False
@@ -136,22 +64,16 @@
         self._building_jobs = {}
         self._building_jobs_lock = threading.Lock()
 
-        try:
-            self.dbcx = sqlite.connect(CONFIG_LOCATION + "jobdb", encoding="utf-8", timeout=3)
-        except sqlite.DatabaseError, e:
-            print "Error: sqlite could not open the job database.  Reason: %s" % e
-            os._exit(1)
-        self.curs = self.dbcx.cursor()
-        ensure_job_db_tables(self.dbcx)
+        self._dbcx = self._db_manager.dbcx()
+        self._cursor = self._dbcx.cursor()
 
         self._requeue_interrupted_jobs()
         threading.Thread.__init__(self)
 
     def _requeue_interrupted_jobs(self):
         """ Restart interrupted jobs from our db. """
-        self.curs.execute('SELECT uid FROM jobs WHERE (status!="needsign" AND status!="failed" AND status!="finished") ORDER BY uid')
-        self.dbcx.commit()
-        uids = self.curs.fetchall()
+        self._cursor.execute("SELECT uid FROM jobs WHERE (status!='needsign' AND status!='failed' AND status!='finished') ORDER BY uid")
+        uids = self._dbcx.fetchall(self._cursor)
 
         if len(uids) == 0:
             return
@@ -178,9 +100,8 @@
         if len(uids) == 0:
             return
 
-        self.curs.execute('SELECT * FROM jobs WHERE %s ORDER BY uid' % uids)
-        self.dbcx.commit()
-        jobs = self.curs.fetchall()
+        self._cursor.execute('SELECT * FROM jobs WHERE %s ORDER BY uid' % uids)
+        jobs = self._dbcx.fetchall(self._cursor)
 
         if len(jobs) == 0:
             return
@@ -188,13 +109,13 @@
         for row in jobs:
             uid = row['uid']
             # Kill any archjobs that are left around
-            self.curs.execute('DELETE FROM archjobs WHERE parent_uid=%d' % uid)
-            self.dbcx.commit()
+            self._cursor.execute('DELETE FROM archjobs WHERE parent_uid=%d' % uid)
+            self._dbcx.commit()
 
             # Clear out old time/result information
-            self.curs.execute('UPDATE jobs SET starttime=%d, endtime=0, ' \
-                              'result_msg="" WHERE uid=%d' % (time.time(), uid))
-            self.dbcx.commit()
+            self._cursor.execute("UPDATE jobs SET starttime=%d, endtime=0, " \
+                              "result_msg='' WHERE uid=%d" % (time.time(), uid))
+            self._dbcx.commit()
 
             # Now requeue the job
             target_str = Config.make_target_string(row['target_distro'],
@@ -299,10 +220,10 @@
 
             # Update job end time
             try:
-                self.curs.execute('UPDATE jobs SET endtime=%d WHERE uid=%d' % (job.endtime, uid))
-            except sqlite.OperationalError, e:
+                self._cursor.execute('UPDATE jobs SET endtime=%d WHERE uid=%d' % (job.endtime, uid))
+            except StandardError, e:
                 print "DB Error: could not access jobs database. Reason: '%s'" % e
-            self.dbcx.commit()
+            self._dbcx.commit()
 
             print "%s (%s): Job finished." % (uid, job.package)
 
@@ -314,45 +235,42 @@
         self._done_queue_lock.release()
 
     def _write_job_status_to_db(self, uid, attrdict):
-        sql = 'status="%s"' % attrdict['status']
+        sql = "status='%s'" % attrdict['status']
         if attrdict.has_key('epoch') and attrdict.has_key('version') and attrdict.has_key('release'):
-            sql = sql + ', epoch="%s", version="%s", release="%s"' % (attrdict['epoch'],
+            sql = sql + ", epoch='%s', version='%s', release='%s'" % (attrdict['epoch'],
                     attrdict['version'], attrdict['release'])
         if attrdict.has_key('result_msg'):
             import urllib
-            sql = sql + ', result_msg="%s"' % (urllib.quote(attrdict['result_msg']))
+            sql = sql + ", result_msg='%s'" % (urllib.quote(attrdict['result_msg']))
         if attrdict.has_key('result'):
-            sql = sql + ', result="%s"' % attrdict['result']
+            sql = sql + ", result='%s'" % attrdict['result']
 
         sql = 'UPDATE jobs SET ' + sql + ' WHERE uid=%d' % uid
         try:
-            self.curs.execute(sql)
-        except sqlite.OperationalError, e:
+            self._cursor.execute(sql)
+        except StandardError, e:
             print "DB Error: could not access jobs database. Reason: '%s'" % e
-
-        self.dbcx.commit()
+        self._dbcx.commit()
 
     def _write_archjob_status_to_db(self, uid, attrdict):
-        self.curs.execute('SELECT parent_uid FROM archjobs WHERE jobid="%s"' % uid)
-        self.dbcx.commit()
-        if len(self.curs.fetchall()) == 0:
+        self._cursor.execute("SELECT parent_uid FROM archjobs WHERE jobid='%s'" % uid)
+        if len(self._dbcx.fetchall(self._cursor)) == 0:
             try:
-                self.curs.execute('INSERT INTO archjobs (jobid, parent_uid, starttime, '    \
-                    'endtime, arch, builder_addr, status, builder_status) '   \
-                    'VALUES ("%s", %d, %d, %d, "%s", "%s", "%s", "%s")' % (uid, attrdict['parent_uid'], \
+                self._cursor.execute("INSERT INTO archjobs (jobid, parent_uid, starttime, "    \
+                    "endtime, arch, builder_addr, status, builder_status) "   \
+                    "VALUES ('%s', %d, %d, %d, '%s', '%s', '%s', '%s')" % (uid, attrdict['parent_uid'], \
                     attrdict['starttime'], attrdict['endtime'], attrdict['arch'],                       \
                     attrdict['builder_addr'], attrdict['status'], attrdict['builder_status']))
-            except sqlite.OperationalError, e:
+            except StandardError, e:
                 print "DB Error: could not access jobs database. Reason: '%s'" % e
         else:            
             try:
-                self.curs.execute('UPDATE archjobs SET status="%s", builder_status="%s", endtime=%d ' \
-                    'WHERE jobid="%s" AND parent_uid=%d' % (attrdict['status'], 
+                self._cursor.execute("UPDATE archjobs SET status='%s', builder_status='%s', endtime=%d " \
+                    "WHERE jobid='%s' AND parent_uid=%d" % (attrdict['status'], 
                     attrdict['builder_status'], attrdict['endtime'], uid, attrdict['parent_uid']))
-            except sqlite.OperationalError, e:
+            except StandardError, e:
                 print "DB Error: could not access jobs database. Reason: '%s'" % e
-
-        self.dbcx.commit()
+        self._dbcx.commit()
 
     def _save_job_status(self):
         # Write new job status to the database
@@ -373,27 +291,28 @@
     def _start_new_jobs(self):
         self._new_queue_lock.acquire()
 
+        uid_field = self._dbcx.get_uid_field_for_insert()
+        uid_value = self._dbcx.get_uid_value_for_insert()
         for item in self._new_queue:
-            self.curs.execute('INSERT INTO jobs (uid, username, package,' \
-                    ' source, target_distro, target_target, target_repo, buildreq,' \
-                    ' starttime, endtime, status, result)' \
-                    ' VALUES (NULL, "%s", "%s", "%s", "%s", "%s", "%s", "%s", %d, 0, "%s", "")' \
-                    % (item['email'], item['package'], item['source'], item['target_distro'], \
+            self._cursor.execute("INSERT INTO jobs (%s username, package," \
+                    " source, target_distro, target_target, target_repo, buildreq," \
+                    " starttime, endtime, status, result)" \
+                    " VALUES (%s '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, 0, '%s', '')" \
+                    % (uid_field, uid_value, item['email'], item['package'], item['source'], item['target_distro'], \
                     item['target_target'], item['target_repo'], item['buildreq'], \
                     item['time'], 'initialize'))
-            self.dbcx.commit()
+            self._dbcx.commit()
 
             # Find the UID
-            self.curs.execute('SELECT uid FROM jobs WHERE username="%s" AND' \
-                    ' package="%s" AND source="%s" AND target_distro="%s" AND' \
-                    ' target_target="%s" AND target_repo = "%s" AND' \
-                    ' buildreq="%s" AND starttime=%d AND status="initialize"' \
+            self._cursor.execute("SELECT uid FROM jobs WHERE username='%s' AND" \
+                    " package='%s' AND source='%s' AND target_distro='%s' AND" \
+                    " target_target='%s' AND target_repo = '%s' AND" \
+                    " buildreq='%s' AND starttime=%d AND status='initialize'" \
                     % (item['email'], item['package'], item['source'], \
                     item['target_distro'], item['target_target'], item['target_repo'], \
                     item['buildreq'], item['time']))
-            self.dbcx.commit()
 
-            data = self.curs.fetchall()
+            data = self._dbcx.fetchall(self._cursor)
             # If two of the same job are submitted close together, we need
             # to make sure we pick the last result to get the correct one
             row = data[len(data) - 1]


Index: BuilderManager.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/BuilderManager.py,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- BuilderManager.py	31 Aug 2005 19:55:30 -0000	1.15
+++ BuilderManager.py	9 Sep 2005 15:10:17 -0000	1.16
@@ -153,7 +153,6 @@
 
             # Use the builder with the most free build slots
             builder_list.sort(key=self._builder_sort_func, reverse=True)
-            print builder_list
             for builder in builder_list:
                 try:
                     job = builder.start_job(parent, req['target_dict'], req['srpm_url'])


Index: Config.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/Config.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Config.py	31 Aug 2005 14:13:03 -0000	1.5
+++ Config.py	9 Sep 2005 15:10:17 -0000	1.6
@@ -125,6 +125,20 @@
         self.set_option("UI", "guest_allowed", "yes")
         self.set_option("UI", "log_url", "http://www.foo.com/logs/")
 
+        self.add_section("Database")
+        self.set_option("Database", "engine", "sqlite")
+
+        self.add_section("sqlite Engine")
+        self.set_option("sqlite Engine", "database", "/etc/plague/server/jobdb")
+        self.set_option("sqlite Engine", "timeout", "3")
+
+        self.add_section("pgdb Engine")
+        self.set_option("pgdb Engine", "host", "localhost")
+        self.set_option("pgdb Engine", "database", "plague")
+        self.set_option("pgdb Engine", "user", "plague")
+        self.set_option("pgdb Engine", "password", "")
+
+
         self.save()
 
 


Index: Makefile
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/Makefile,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Makefile	25 Aug 2005 18:15:14 -0000	1.9
+++ Makefile	9 Sep 2005 15:10:17 -0000	1.10
@@ -15,6 +15,7 @@
 	Builder.py \
 	BuildMaster.py \
 	Config.py \
+	DBManager.py \
 	EmailUtils.py \
 	PackageJob.py \
 	Repo.py \


Index: UserInterface.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/UserInterface.py,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- UserInterface.py	1 Sep 2005 20:36:12 -0000	1.54
+++ UserInterface.py	9 Sep 2005 15:10:17 -0000	1.55
@@ -15,7 +15,6 @@
 # Copyright 2005 Dan Williams  and Red Hat, Inc.
 
 
-import sqlite
 import EmailUtils
 import time
 import sys
@@ -25,22 +24,14 @@
 import BuildMaster
 import PackageJob
 import Config
+import DBManager
 from plague import AuthedXMLRPCServer
 
 
-CONFIG_LOCATION = "/etc/plague/server/"
-
 # API version #, just increment each time an incompatible API change is made
 XMLRPC_API_VERSION = 100
 
 
-def get_dbcx():
-    dbcx = None
-    dbcx = sqlite.connect(CONFIG_LOCATION + "jobdb", encoding="utf-8", timeout=3)
-    curs = dbcx.cursor()
-    return (dbcx, curs)
-
-
 def validate_email(email):
     safe_list = ['@', '_', '-', '.', '+']
     for c in email:
@@ -101,9 +92,10 @@
     Base UserInterface class. NO AUTHENTICATION.  Subclass this to provide some.
     """
 
-    def __init__(self, builder_manager, build_master, cfg):
+    def __init__(self, builder_manager, build_master, db_manager, cfg):
         self._builder_manager = builder_manager
         self._bm = build_master
+        self._db_manager = db_manager
         self._cfg = cfg
 
     def email_result(self, to, source, resultstring):
@@ -185,25 +177,28 @@
         if not uid:
             return (-1, "Error: Invalid job UID.")
 
-        sql = 'SELECT uid, username, status, result FROM jobs WHERE uid=%d' % uid
+        sql = "SELECT uid, username, status, result FROM jobs WHERE uid=%d" % uid
 
         # Run the query for the job
         try:
-            dbcx, curs = get_dbcx()
-        except sqlite.DatabaseError, e:
-            return (-1, "Unable to access job database.")
+            dbcx = self._db_manager.dbcx()
+            curs = dbcx.cursor()
+        except StandardError, e:
+            return (-1, "Unable to access job database: '%s'" % e)
         curs.execute(sql)
-        job = curs.fetchone()
+        job = dbcx.fetchone(curs)
+        result = None
         if not job:
-            return (-1, "Error: Invalid job UID.")
-
-        # Ensure the job failed or was killed
-        if job['result'] != 'failed' and job['result'] != 'killed':
-            return (-1, "Error: Job %d must be either 'failed' or 'killed' to requeue." % uid)
+            result = (-1, "Error: Invalid job UID.")
+        elif job['result'] != 'failed' and job['result'] != 'killed':
+            result = (-1, "Error: Job %d must be either 'failed' or 'killed' to requeue." % uid)
+        else:
+            self._bm.requeue_job(uid)
+            resutl = (0, "Success: Job %d has been requeued." % uid)
 
-        self._bm.requeue_job(uid)
-        return (0, "Success: Job %d has been requeued." % uid)
-        
+        del cursor
+        del dbcx
+        return result        
 
     def _kill_job(self, email, job, jobid):
         if not job:
@@ -216,13 +211,13 @@
     def list_jobs(self, args_dict):
         """ Query job information and return it to the user """
 
-        sql = 'SELECT uid, username, package, source, target_distro, target_target, ' \
-                    'target_repo, starttime, endtime, status, result FROM jobs WHERE '
+        sql = "SELECT uid, username, package, source, target_distro, target_target, " \
+                    "target_repo, starttime, endtime, status, result FROM jobs WHERE "
         sql_args = []
 
         if args_dict.has_key('email') and args_dict['email']:
             if validate_email(args_dict['email']):
-                sql_args.append('username LIKE "%%%s%%"' % args_dict['email'])
+                sql_args.append("username LIKE '%%%s%%'" % args_dict['email'])
             else:
                 return (-1, "Error: Invalid email address.", [])
 
@@ -235,16 +230,16 @@
                 if not PackageJob.is_package_job_stage_valid(status):
                     return (-1, "Error: Invalid job status.", [])
                 if len(status_sql) > 0:
-                    status_sql = status_sql + ' OR status="%s"' % status
+                    status_sql = status_sql + " OR status='%s'" % status
                 else:
-                    status_sql = 'status="%s"' % status
+                    status_sql = "status='%s'" % status
             status_sql = '(' + status_sql + ')'
             sql_args.append(status_sql)
 
         if args_dict.has_key('result') and args_dict['result']:
             result = args_dict['result']
             if PackageJob.is_package_job_result_valid(result):
-                sql_args.append('result="%s"' % result)
+                sql_args.append("result='%s'" % result)
             else:
                 return (-1, "Error: Invalid job result.", [])
 
@@ -271,9 +266,9 @@
             if not target_cfg:
                 return (-1, "Error: Invalid target.", [])
 
-            sql_args.append('target_distro="%s"' % target_cfg.distro())
-            sql_args.append('target_target="%s"' % target_cfg.target())
-            sql_args.append('target_repo="%s"' % target_cfg.repo())
+            sql_args.append("target_distro='%s'" % target_cfg.distro())
+            sql_args.append("target_target='%s'" % target_cfg.target())
+            sql_args.append("target_repo='%s'" % target_cfg.repo())
 
         if not len(sql_args):
             return (-1, "Error: Invalid query.", [])
@@ -320,11 +315,12 @@
 
         # Run the query for the job
         try:
-            dbcx, curs = get_dbcx()
-        except sqlite.DatabaseError, e:
-            return (-1, "Unable to access job database.", [])
+            dbcx = self._db_manager.dbcx()
+            curs = dbcx.cursor()
+        except StandardError, e:
+            return (-1, "Unable to access job database: '%s'" % e, [])
         curs.execute(sql)
-        data = curs.fetchall()
+        data = dbcx.fetchall(curs)
         jobs = []
         for row in data:
             jobrec = {}
@@ -355,7 +351,7 @@
             sql = "SELECT jobid, parent_uid, starttime, endtime, arch, builder_addr, "  \
                     "status, builder_status FROM archjobs WHERE " + uids
             curs.execute(sql)
-            data = curs.fetchall()
+            data = dbcx.fetchall(curs)
             for row in data:
                 ajrec = {}
                 ajrec['jobid'] = row['jobid']
@@ -372,7 +368,6 @@
 
         del curs
         del dbcx
-
         return (0, "Success.", jobs)
 
 
@@ -389,12 +384,15 @@
 
         # Run the query for the job
         try:
-            dbcx, curs = get_dbcx()
-        except sqlite.DatabaseError, e:
-            return (-1, "Unable to access job database.", {})
+            dbcx = self._db_manager.dbcx()
+            curs = dbcx.cursor()
+        except StandardError, e:
+            return (-1, "Unable to access job database: '%s'" % e, {})
         curs.execute(sql)
-        job = curs.fetchone()
+        job = dbcx.fetchone(curs)
         if not job:
+            del curs
+            del dbcx
             return (-1, "Error: Invalid job UID.", {})
         jobrec = {}
         jobrec['uid'] = job['uid']
@@ -426,7 +424,7 @@
         sql = "SELECT jobid, parent_uid, starttime, endtime, arch, builder_addr, "    \
                 "status, builder_status FROM archjobs WHERE parent_uid=%d " % uid
         curs.execute(sql)
-        data = curs.fetchall()
+        data = dbcx.fetchall(curs)
         for row in data:
             ajrec = {}
             ajrec['jobid'] = row['jobid']
@@ -439,10 +437,10 @@
             ajrec['builder_status'] = row['builder_status']
             jobrec['archjobs'].append(ajrec)
 
+        ret_job = copy.deepcopy(jobrec)
+
         del curs
         del dbcx
-
-        ret_job = copy.deepcopy(jobrec)
         return (0, "Success.", ret_job)
 
 
@@ -489,14 +487,18 @@
                 uids = uids + " OR uid=%d" % uid
 
         if len(uids):
-            sql = 'UPDATE jobs SET status="finished" WHERE %s' % uids
+            sql = "UPDATE jobs SET status='finished' WHERE %s" % uids
 
             try:
-                dbcx, curs = get_dbcx()
-            except sqlite.DatabaseError, e:
-                return (-1, "Unable to access job database.")
+                dbcx = self._db_manager.dbcx()
+                curs = dbcx.cursor()
+            except StandardError, e:
+                return (-1, "Unable to access job database: '%s'" % e)
             curs.execute(sql)
             dbcx.commit()
+            del curs
+            del dbcx
+
         return (0, "Success.")
 
     def srpm_upload_dir(self, target_alias):
@@ -536,20 +538,25 @@
 
         # Run the query for the job
         try:
-            dbcx, curs = get_dbcx()
-        except sqlite.DatabaseError, e:
-            return (-1, "Unable to access job database.")
+            dbcx = self._db_manager.dbcx()
+            curs = dbcx.cursor()
+        except StandardError, e:
+            return (-1, "Unable to access job database: '%s'" % e)
+
         curs.execute(sql)
-        job = curs.fetchone()
-        if not job:
-            return (-1, "Error: Invalid job UID.")
+        job = dbcx.fetchone(curs)
 
-        # Ensure matching usernames
-        if job['username'] != user.email and not user.job_admin:
-            return (-1, "Error: You are not the original submitter for Job %d." % uid)
-            
-        return UserInterface.requeue(self, uid)
+        result = None
+        if not job:
+            result = (-1, "Error: Invalid job UID.")
+        elif job['username'] != user.email and not user.job_admin:
+            result = (-1, "Error: You are not the original submitter for Job %d." % uid)
+        else:
+            result = UserInterface.requeue(self, uid)
 
+        del curs
+        del dbcx
+        return result
 
     def kill_job(self, email, jobid):
         user = AuthedXMLRPCServer.get_authinfo()
@@ -620,31 +627,44 @@
         sql = 'SELECT uid, username, status FROM jobs WHERE %s' % uids
 
         try:
-            dbcx, curs = get_dbcx()
-        except sqlite.DatabaseError, e:
-            return (-1, "Unable to access job database.")
+            dbcx = self._db_manager.dbcx()
+            curs = dbcx.cursor()
+        except StandardError, e:
+            return (-1, "Unable to access job database: '%s'" % e)
+
         curs.execute(sql)
-        data = curs.fetchall()
+        data = dbcx.fetchall(curs)
 
         # Ensure that the user can actually finish the jobs they requested
         final_uid_list = []
+        error = None
         for row in data:
             uid = row['uid']
             username = row['username']
             status = row['status']
 
             if status != 'needsign' and status != 'failed':
-                return (-1, "Error: Job %d must be either 'needsign' or 'failed' to finish it." % uid)
+                error = (-1, "Error: Job %d must be either 'needsign' or 'failed' to finish it." % uid)
+                break
 
             # Marking 'needsign' jobs as finished requires admin privs
             if status == 'needsign' and not user.job_admin:
-                return (-1, "Insufficient privileges to finish job %d." % uid)
+                error = (-1, "Insufficient privileges to finish job %d." % uid)
+                break
+
             # 'failed' jobs can only be finished by the job owner or a job_admin user
             if status == 'failed' and user != user.email and not user.job_admin:
-                return (-1, "Insufficient privileges to finish job %d." % uid)
+                error = (-1, "Insufficient privileges to finish job %d." % uid)
+                break
 
             final_uid_list.append(uid)
 
+        del curs
+        del dbcx
+
+        if error:
+            return error
+
         return UserInterface.finish(self, final_uid_list)
 
     def srpm_upload_dir(self, target_alias):


Index: main.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/main.py,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- main.py	25 Aug 2005 18:15:14 -0000	1.13
+++ main.py	9 Sep 2005 15:10:17 -0000	1.14
@@ -30,6 +30,7 @@
 import User
 import BuildMaster
 import BuilderManager
+import DBManager
 import Config
 from UserInterface import UserInterfaceSSLAuth
 from UserInterface import UserInterfaceNoAuth
@@ -95,11 +96,13 @@
         print "You need at least one target to do anything useful."
         sys.exit(3)
 
+    dbm = DBManager.DBManager(cfg)
+
     builder_manager = BuilderManager.BuilderManager(cfg)
 
     # Create the BuildMaster thread
     hostname = cfg.get_str("General", "hostname")
-    bm = BuildMaster.BuildMaster(builder_manager, cfg)
+    bm = BuildMaster.BuildMaster(builder_manager, dbm, cfg)
     bm.start()
 
     # Create the BuildMaster XMLRPC server
@@ -111,10 +114,10 @@
             ui_certs['key_and_cert'] = cfg.get_str("SSL", "server_key_and_cert")
             ui_certs['ca_cert'] = cfg.get_str("SSL", "ca_cert")
             ui_certs['peer_ca_cert'] = cfg.get_str("UI", "client_ca_cert")
-            ui = UserInterfaceSSLAuth(builder_manager, bm, cfg)
+            ui = UserInterfaceSSLAuth(builder_manager, bm, dbm, cfg)
             bm_server = AuthenticatedSSLXMLRPCServer((hostname, port), ui_certs, cfg)
         else:
-            ui = UserInterfaceNoAuth(builder_manager, bm, cfg)
+            ui = UserInterfaceNoAuth(builder_manager, bm, dbm, cfg)
             bm_server = AuthedXMLRPCServer.AuthedXMLRPCServer((hostname, port))
     except socket.error, e:
         if e[0] == 98:      # Address already in use



From fedora-extras-commits at redhat.com  Fri Sep  9 15:10:10 2005
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Fri,  9 Sep 2005 11:10:10 -0400
Subject: extras-buildsys ChangeLog,1.117,1.118
Message-ID: <200509091510.j89FAilQ005459@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5408

Modified Files:
	ChangeLog 
Log Message:
2005-09-09  Dan Williams  

    * Add support for PostgreSQL as the database backend.
        Databases are now abstracted and support for others,
        like MySQL, need to be added to server/DBManager.py.
        Should be really easy though.

    NOTE: sqlite support might be broken right now due to
        SQL statement quoting changes




Index: ChangeLog
===================================================================
RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -r1.117 -r1.118
--- ChangeLog	8 Sep 2005 21:10:25 -0000	1.117
+++ ChangeLog	9 Sep 2005 15:10:04 -0000	1.118
@@ -1,3 +1,13 @@
+2005-09-09  Dan Williams  
+
+    * Add support for PostgreSQL as the database backend.
+        Databases are now abstracted and support for others,
+        like MySQL, need to be added to server/DBManager.py.
+        Should be really easy though.
+
+    NOTE: sqlite support might be broken right now due to
+        SQL statement quoting changes
+
 2005-09-08  Dan Williams  
 
     * server/PackageJob.py



From fedora-extras-commits at redhat.com  Fri Sep  9 15:47:37 2005
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Fri,  9 Sep 2005 11:47:37 -0400
Subject: extras-buildsys ChangeLog,1.97.2.15,1.97.2.16
Message-ID: <200509091547.j89FlbDB005626@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5597

Modified Files:
      Tag: STABLE_0_3
	ChangeLog 
Log Message:
2005-09-09  Dan Williams  

    * server/UserInterface.py
        - Allow '+' in CVS tags




Index: ChangeLog
===================================================================
RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v
retrieving revision 1.97.2.15
retrieving revision 1.97.2.16
diff -u -r1.97.2.15 -r1.97.2.16
--- ChangeLog	8 Sep 2005 21:05:16 -0000	1.97.2.15
+++ ChangeLog	9 Sep 2005 15:47:35 -0000	1.97.2.16
@@ -1,3 +1,8 @@
+2005-09-09  Dan Williams  
+
+    * server/UserInterface.py
+        - Allow '+' in CVS tags
+
 2005-09-08  Dan Williams  
 
     * server/PackageJob.py



From fedora-extras-commits at redhat.com  Fri Sep  9 15:47:38 2005
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Fri,  9 Sep 2005 11:47:38 -0400
Subject: extras-buildsys/server UserInterface.py,1.44.2.3,1.44.2.4
Message-ID: <200509091547.j89Flceh005632@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys/server
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5597/server

Modified Files:
      Tag: STABLE_0_3
	UserInterface.py 
Log Message:
2005-09-09  Dan Williams  

    * server/UserInterface.py
        - Allow '+' in CVS tags




Index: UserInterface.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/UserInterface.py,v
retrieving revision 1.44.2.3
retrieving revision 1.44.2.4
diff -u -r1.44.2.3 -r1.44.2.4
--- UserInterface.py	24 Aug 2005 19:16:39 -0000	1.44.2.3
+++ UserInterface.py	9 Sep 2005 15:47:36 -0000	1.44.2.4
@@ -69,7 +69,7 @@
     return True
 
 def validate_cvs_tag(tag):
-    safe_list = ['-', '_', '.', ':', '~', '[', ']']
+    safe_list = ['-', '_', '.', ':', '~', '[', ']', '+']
     for c in tag:
         if not (c in safe_list) and not c.isalnum():
             return False



From fedora-extras-commits at redhat.com  Fri Sep  9 15:48:26 2005
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Fri,  9 Sep 2005 11:48:26 -0400
Subject: extras-buildsys ChangeLog,1.97.2.16,1.97.2.17
Message-ID: <200509091548.j89FmQwC005672@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5643

Modified Files:
      Tag: STABLE_0_3
	ChangeLog 
Log Message:
2005-09-09  Dan Williams  

    * builder/builder.py
        - Fix hostname handling to allow binding to all addresses
            _and_ returning correct URL to server




Index: ChangeLog
===================================================================
RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v
retrieving revision 1.97.2.16
retrieving revision 1.97.2.17
diff -u -r1.97.2.16 -r1.97.2.17
--- ChangeLog	9 Sep 2005 15:47:35 -0000	1.97.2.16
+++ ChangeLog	9 Sep 2005 15:48:24 -0000	1.97.2.17
@@ -1,5 +1,11 @@
 2005-09-09  Dan Williams  
 
+    * builder/builder.py
+        - Fix hostname handling to allow binding to all addresses
+            _and_ returning correct URL to server
+
+2005-09-09  Dan Williams  
+
     * server/UserInterface.py
         - Allow '+' in CVS tags
 



From fedora-extras-commits at redhat.com  Fri Sep  9 15:48:26 2005
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Fri,  9 Sep 2005 11:48:26 -0400
Subject: extras-buildsys/builder builder.py,1.31.2.3,1.31.2.4
Message-ID: <200509091548.j89FmQh2005678@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys/builder
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5643/builder

Modified Files:
      Tag: STABLE_0_3
	builder.py 
Log Message:
2005-09-09  Dan Williams  

    * builder/builder.py
        - Fix hostname handling to allow binding to all addresses
            _and_ returning correct URL to server




Index: builder.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/builder/builder.py,v
retrieving revision 1.31.2.3
retrieving revision 1.31.2.4
diff -u -r1.31.2.3 -r1.31.2.4
--- builder.py	31 Aug 2005 18:28:59 -0000	1.31.2.3
+++ builder.py	9 Sep 2005 15:48:24 -0000	1.31.2.4
@@ -40,6 +40,14 @@
 from optparse import OptionParser
 
 
+def get_hostname(bind_all):
+    cfg_hostname = config_opts['hostname']
+    if cfg_hostname and len(cfg_hostname):
+        return cfg_hostname
+    elif bind_all:
+        return ''
+    return socket.gethostname()
+
 certs = {}
 
 def get_url_for_file(file_path):
@@ -54,7 +62,7 @@
         method = "https://"
     else:
         method = "http://"
-    full_url = method + config_opts['hostname'] + ":" + port + "/" + file_part
+    full_url = method + get_hostname(False) + ":" + port + "/" + file_part
     return urllib.quote(full_url)
 
 
@@ -773,8 +781,9 @@
 
     # Start up the HTTP server thread which the build server
     # pulls completed RPMs from
+    bind_hostname = get_hostname(True)
     port = config_opts['fileserver_port']
-    http_server = HTTPServer.PlgHTTPServerManager((config_opts['hostname'], port), work_dir, certs)
+    http_server = HTTPServer.PlgHTTPServerManager((bind_hostname, port), work_dir, certs)
     http_server.start()
 
     # Stop running as root
@@ -786,16 +795,16 @@
             pass
         os._exit(1)
 
-    print "Binding to address '%s' with arches: [%s]" % (config_opts['hostname'], string.join(config_opts['arches']))
+    print "Binding to address '%s' with arches: [%s]" % (bind_hostname, string.join(config_opts['arches']))
     xmlrpc_port = config_opts['xmlrpc_port']
     try:
         if config_opts['ssl_buildserver']:
-            xmlserver = AuthedXMLRPCServer.AuthedSSLXMLRPCServer((config_opts['hostname'], xmlrpc_port), None, certs)
+            xmlserver = AuthedXMLRPCServer.AuthedSSLXMLRPCServer((bind_hostname, xmlrpc_port), None, certs)
         else:
-            xmlserver = AuthedXMLRPCServer.AuthedXMLRPCServer((config_opts['hostname'], xmlrpc_port), None)
+            xmlserver = AuthedXMLRPCServer.AuthedXMLRPCServer((bind_hostname, xmlrpc_port), None)
     except socket.error, e:
         if e[0] == 98:
-            print "Error: couldn't bind to address '%s:%s'.  Is the builder already running?" % (config_opts['hostname'], xmlrpc_port)
+            print "Error: couldn't bind to address '%s:%s'.  Is the builder already running?" % (bind_hostname, xmlrpc_port)
             os._exit(1)
 
     bcs = XMLRPCBuilderServer(target_arch_dict)



From fedora-extras-commits at redhat.com  Fri Sep  9 15:50:00 2005
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Fri,  9 Sep 2005 11:50:00 -0400
Subject: extras-buildsys ChangeLog,1.118,1.119
Message-ID: <200509091550.j89FoVEl005725@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5689

Modified Files:
	ChangeLog 
Log Message:
2005-09-09  Dan Williams  

    * server/UserInterface.py
        - Allow '+' in CVS tags




Index: ChangeLog
===================================================================
RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -r1.118 -r1.119
--- ChangeLog	9 Sep 2005 15:10:04 -0000	1.118
+++ ChangeLog	9 Sep 2005 15:49:58 -0000	1.119
@@ -1,5 +1,10 @@
 2005-09-09  Dan Williams  
 
+    * server/UserInterface.py
+        - Allow '+' in CVS tags
+
+2005-09-09  Dan Williams  
+
     * Add support for PostgreSQL as the database backend.
         Databases are now abstracted and support for others,
         like MySQL, need to be added to server/DBManager.py.



From fedora-extras-commits at redhat.com  Fri Sep  9 15:50:01 2005
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Fri,  9 Sep 2005 11:50:01 -0400
Subject: extras-buildsys/server UserInterface.py,1.55,1.56
Message-ID: <200509091550.j89FoVeX005728@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys/server
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5689/server

Modified Files:
	UserInterface.py 
Log Message:
2005-09-09  Dan Williams  

    * server/UserInterface.py
        - Allow '+' in CVS tags




Index: UserInterface.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/UserInterface.py,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- UserInterface.py	9 Sep 2005 15:10:17 -0000	1.55
+++ UserInterface.py	9 Sep 2005 15:49:59 -0000	1.56
@@ -59,7 +59,7 @@
     return True
 
 def validate_cvs_tag(tag):
-    safe_list = ['-', '_', '.', ':', '~', '[', ']']
+    safe_list = ['-', '_', '.', ':', '~', '[', ']', '+']
     for c in tag:
         if not (c in safe_list) and not c.isalnum():
             return False



From fedora-extras-commits at redhat.com  Fri Sep  9 19:23:41 2005
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Fri,  9 Sep 2005 15:23:41 -0400
Subject: rpms/gcl/FC-4 gcl-pers.patch, NONE, 1.1 .cvsignore, 1.2,
	1.3 gcl.spec, 1.12, 1.13 sources, 1.2, 1.3
Message-ID: <200509091923.j89JNfCq011308@cvs-int.fedora.redhat.com>

Author: gemi

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

Modified Files:
	.cvsignore gcl.spec sources 
Added Files:
	gcl-pers.patch 
Log Message:
new version 2.6.7

gcl-pers.patch:

--- NEW FILE gcl-pers.patch ---
--- gcl-2.6.7/o/main.c.pers	2005-09-09 20:36:46.000000000 +0200
+++ gcl-2.6.7/o/main.c	2005-09-09 21:07:51.000000000 +0200
@@ -117,11 +117,9 @@
 #endif
 #endif
 
-#ifdef NEED_NONRANDOM_SBRK
 #include 
-#include 
+#include 
 #include 
-#endif
 
 int
 main(int argc, char **argv, char **envp) {
@@ -131,14 +129,25 @@
 #endif
 #endif
 
-#ifdef NEED_NONRANDOM_SBRK
-#if SIZEOF_LONG == 4
-	if (!syscall(SYS_personality,PER_LINUX32))
-#else
-        if (!syscall(SYS_personality,PER_LINUX))
-#endif
-	  execvp(argv[0],argv);
-#endif
+	long pers = personality(-1);
+	/* 0x40000 aka. ADDR_NO_RANDOMIZE */
+	if (!(pers & 0x40000)) {
+	  if (personality(pers | 0x40000) != -1) {
+	    /* Use /proc/self/exe instead of trying to figure out the
+	     * executable path from PATH and argv[0], since that's reliable.
+	     */
+	    char buf[PATH_MAX+1];
+	    int rc = readlink("/proc/self/exe", buf, PATH_MAX);
+	    if ( rc > 0 ) {
+	      buf[rc]=0;
+	      execve(buf, argv, envp);
+	    }
+	  }
+	  /* Either changing the personality or execve() failed. Either
+	   * way we might as well continue, and hope that the random
+	   * memory maps are ok this time around.
+	   */
+	}
 
 #if defined(DARWIN)
     extern void init_darwin_zone_compat ();
--- gcl-2.6.7/configure.pers	2005-09-09 20:51:26.000000000 +0200
+++ gcl-2.6.7/configure	2005-09-09 21:06:56.000000000 +0200
@@ -3887,17 +3887,18 @@
 #line 3888 "configure"
 #include "confdefs.h"
 #include 
-			    #include 
+			    #include 
 	         	    #include 
 			    #include 
 			    int main(int argc,char * argv[]) {
 				FILE *f;
-				#if SIZEOF_LONG == 4
-				if (!syscall(SYS_personality,PER_LINUX32))
-				#else
-				if (!syscall(SYS_personality,PER_LINUX))
-				#endif
-					execvp(argv[0],argv);
+                                long pers = personality(-1);
+                                if (!(pers & 0x40000)) {
+                                  if (personality(pers | 0x40000) != -1) {
+                                    execvp(argv[0],argv);
+                                   }
+                                }
+
 				if (!(f=fopen("conftest1","w")))
 					return -1;
 				fprintf(f,"%u",sbrk(0));
@@ -3927,17 +3928,17 @@
 #line 3928 "configure"
 #include "confdefs.h"
 #include 
-			    #include 
+			    #include 
 			    #include 
 			    #include 
 			    int main(int argc,char * argv[]) {
 				FILE *f;
-				#if SIZEOF_LONG == 4
-				if (!syscall(SYS_personality,PER_LINUX32))
-				#else
-				if (!syscall(SYS_personality,PER_LINUX))
-				#endif
-					execvp(argv[0],argv);
+                                long pers = personality(-1);
+                                if (!(pers & 0x40000)) {
+                                  if (personality(pers | 0x40000) != -1) {
+                                    execvp(argv[0],argv);
+                                   }
+                                }
 				if (!(f=fopen("conftest1","w")))
 					return -1;
 				fprintf(f,"%u",sbrk(0));
@@ -3989,25 +3990,22 @@
 #include "confdefs.h"
 #include 
             #include 
-	    #ifdef NEED_NONRANDOM_SBRK
 		   #include 
-		   #include 
+		   #include 
 		   #include 
-	   #endif
 int
 main(int argc,char * argv[])
 {
   char *b;
   FILE *fp;
 
-#ifdef NEED_NONRANDOM_SBRK
-#if SIZEOF_LONG == 4
-if (!syscall(SYS_personality,PER_LINUX32))
-#else
-if (!syscall(SYS_personality,PER_LINUX))
-#endif
-     execvp(argv[0],argv);
-#endif  
+  long pers = personality(-1);
+  if (!(pers & 0x40000)) {
+    if (personality(pers | 0x40000) != -1) {
+      execvp(argv[0],argv);
+    }
+  }
+
   b = (void *) malloc(1000);
   fp = fopen("conftest1","w");
 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gcl/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	7 Apr 2005 16:50:14 -0000	1.2
+++ .cvsignore	9 Sep 2005 19:23:39 -0000	1.3
@@ -1 +1 @@
-gcl-2.6.6.tar.gz
+gcl-2.6.7.tar.gz


Index: gcl.spec
===================================================================
RCS file: /cvs/extras/rpms/gcl/FC-4/gcl.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- gcl.spec	16 May 2005 12:12:25 -0000	1.12
+++ gcl.spec	9 Sep 2005 19:23:39 -0000	1.13
@@ -1,12 +1,13 @@
 Name:           gcl
-Version:        2.6.6
-Release:        3
+Version:        2.6.7
+Release:        1%{?dist}
 Summary:        GNU Common Lisp
 
 Group:          Development/Languages
 License:        GPL, LGPL
 URL:            http://www.gnu.org/software/gcl
-Source:         ftp://ftp.gnu.org/pub/gnu/gcl/gcl-2.6.6.tar.gz
+Source:         ftp://ftp.gnu.org/pub/gnu/gcl/gcl-2.6.7.tar.gz
+Patch0:		gcl-pers.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  readline-devel, tk-devel, tcl-devel, gmp-devel
 BuildRequires:	tetex, texinfo
@@ -23,6 +24,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 
 %build
@@ -54,6 +56,7 @@
 (autoload 'run "gcl" "Run GCL." t)
 (autoload 'gcl-mode "gcl" "GCL mode." t)
 EOF
+find $RPM_BUILD_ROOT%{_libdir}/gcl* -name '*.l*sp' | xargs chmod 0644
 
 
 %clean
@@ -87,6 +90,9 @@
 
 
 %changelog
+* Fri Sep  9 2005 Gerard Milmeister  - 2.6.7-1
+- New Version 2.6.7
+
 * Sun Apr 17 2005 Gerard Milmeister  - 2.6.6-2
 - Added buildreq tetex and texinfo
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gcl/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	7 Apr 2005 16:50:14 -0000	1.2
+++ sources	9 Sep 2005 19:23:39 -0000	1.3
@@ -1 +1 @@
-45d67331b29cafc3e9b1eacb488044ec  gcl-2.6.6.tar.gz
+c0f42e1f391162e5ac90912a70e8ecc3  gcl-2.6.7.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep  9 19:29:13 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri,  9 Sep 2005 15:29:13 -0400
Subject: rpms/gc/devel .cvsignore,1.5,1.6 gc.spec,1.10,1.11 sources,1.5,1.6
Message-ID: <200509091929.j89JTDMn011391@cvs-int.fedora.redhat.com>

Author: rdieter

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

Modified Files:
	.cvsignore gc.spec sources 
Log Message:
* Fri Sep 09 2005 Rex Dieter  6.6-1
- 6.6



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gc/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	8 Aug 2005 15:42:01 -0000	1.5
+++ .cvsignore	9 Sep 2005 19:29:11 -0000	1.6
@@ -1 +1 @@
-gc6.5.tar.gz
+gc6.6.tar.gz


Index: gc.spec
===================================================================
RCS file: /cvs/extras/rpms/gc/devel/gc.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- gc.spec	8 Aug 2005 16:48:56 -0000	1.10
+++ gc.spec	9 Sep 2005 19:29:11 -0000	1.11
@@ -2,13 +2,13 @@
 
 Summary: C++ Garbage Collector	
 Name:    gc	
-Version: 6.5
+Version: 6.6
 
 Release: 1%{?dist}
 Group:   System Environment/Libraries
 License: BSD
 Url:     http://www.hpl.hp.com/personal/Hans_Boehm/gc/	
-Source:  http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/gc6.5.tar.gz 
+Source:  http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/gc6.6.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Patch1: gc6.5-opendl.patch
@@ -83,6 +83,9 @@
 
 
 %changelog
+* Fri Sep 09 2005 Rex Dieter  6.6-1
+- 6.6
+
 * Wed May 25 2005 Rex Dieter  6.5-1
 - 6.5
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gc/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	8 Aug 2005 15:42:01 -0000	1.5
+++ sources	9 Sep 2005 19:29:11 -0000	1.6
@@ -1 +1 @@
-00bf95cdcbedfa7321d14e0133b31cdb  gc6.5.tar.gz
+c7c301e8fab8ce152c908b05bc8d452c  gc6.6.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep  9 19:42:11 2005
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Fri,  9 Sep 2005 15:42:11 -0400
Subject: rpms/gcl/FC-4 gcl.spec,1.13,1.14
Message-ID: <200509091942.j89JgB7d011470@cvs-int.fedora.redhat.com>

Author: gemi

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

Modified Files:
	gcl.spec 
Log Message:
%{_prefix}/lib instead of %{_libdir} for x86_64


Index: gcl.spec
===================================================================
RCS file: /cvs/extras/rpms/gcl/FC-4/gcl.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- gcl.spec	9 Sep 2005 19:23:39 -0000	1.13
+++ gcl.spec	9 Sep 2005 19:42:09 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           gcl
 Version:        2.6.7
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        GNU Common Lisp
 
 Group:          Development/Languages
@@ -41,7 +41,7 @@
 rm -f $RPM_BUILD_ROOT%{_infodir}/dir
 rm -rf $RPM_BUILD_ROOT%{_datadir}/doc
 rm -rf $RPM_BUILD_ROOT%{_datadir}/emacs
-rm -rf $RPM_BUILD_ROOT%{_libdir}/gcl-*/info
+rm -rf $RPM_BUILD_ROOT%{_prefix}/lib/gcl-*/info
 mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
 cp -f man/man1/* $RPM_BUILD_ROOT%{_mandir}/man1
 mkdir -p html
@@ -56,7 +56,7 @@
 (autoload 'run "gcl" "Run GCL." t)
 (autoload 'gcl-mode "gcl" "GCL mode." t)
 EOF
-find $RPM_BUILD_ROOT%{_libdir}/gcl* -name '*.l*sp' | xargs chmod 0644
+find $RPM_BUILD_ROOT%{_prefix}/lib/gcl* -name '*.l*sp' | xargs chmod 0644
 
 
 %clean
@@ -80,7 +80,7 @@
 %files
 %defattr(-,root,root,-)
 %{_bindir}/*
-%{_libdir}/gcl*
+%{_prefix}/lib/gcl*
 %{_infodir}/*
 %{_mandir}/man*/*
 %{_datadir}/emacs/site-lisp/gcl



From fedora-extras-commits at redhat.com  Fri Sep  9 19:45:06 2005
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Fri,  9 Sep 2005 15:45:06 -0400
Subject: rpms/gcl/devel gcl-pers.patch, NONE, 1.1 gcl.spec, 1.12,
	1.13 sources, 1.2, 1.3
Message-ID: <200509091945.j89Jj6XC011545@cvs-int.fedora.redhat.com>

Author: gemi

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

Modified Files:
	gcl.spec sources 
Added Files:
	gcl-pers.patch 
Log Message:
new version 2.6.7

gcl-pers.patch:

--- NEW FILE gcl-pers.patch ---
--- gcl-2.6.7/o/main.c.pers	2005-09-09 20:36:46.000000000 +0200
+++ gcl-2.6.7/o/main.c	2005-09-09 21:07:51.000000000 +0200
@@ -117,11 +117,9 @@
 #endif
 #endif
 
-#ifdef NEED_NONRANDOM_SBRK
 #include 
-#include 
+#include 
 #include 
-#endif
 
 int
 main(int argc, char **argv, char **envp) {
@@ -131,14 +129,25 @@
 #endif
 #endif
 
-#ifdef NEED_NONRANDOM_SBRK
-#if SIZEOF_LONG == 4
-	if (!syscall(SYS_personality,PER_LINUX32))
-#else
-        if (!syscall(SYS_personality,PER_LINUX))
-#endif
-	  execvp(argv[0],argv);
-#endif
+	long pers = personality(-1);
+	/* 0x40000 aka. ADDR_NO_RANDOMIZE */
+	if (!(pers & 0x40000)) {
+	  if (personality(pers | 0x40000) != -1) {
+	    /* Use /proc/self/exe instead of trying to figure out the
+	     * executable path from PATH and argv[0], since that's reliable.
+	     */
+	    char buf[PATH_MAX+1];
+	    int rc = readlink("/proc/self/exe", buf, PATH_MAX);
+	    if ( rc > 0 ) {
+	      buf[rc]=0;
+	      execve(buf, argv, envp);
+	    }
+	  }
+	  /* Either changing the personality or execve() failed. Either
+	   * way we might as well continue, and hope that the random
+	   * memory maps are ok this time around.
+	   */
+	}
 
 #if defined(DARWIN)
     extern void init_darwin_zone_compat ();
--- gcl-2.6.7/configure.pers	2005-09-09 20:51:26.000000000 +0200
+++ gcl-2.6.7/configure	2005-09-09 21:06:56.000000000 +0200
@@ -3887,17 +3887,18 @@
 #line 3888 "configure"
 #include "confdefs.h"
 #include 
-			    #include 
+			    #include 
 	         	    #include 
 			    #include 
 			    int main(int argc,char * argv[]) {
 				FILE *f;
-				#if SIZEOF_LONG == 4
-				if (!syscall(SYS_personality,PER_LINUX32))
-				#else
-				if (!syscall(SYS_personality,PER_LINUX))
-				#endif
-					execvp(argv[0],argv);
+                                long pers = personality(-1);
+                                if (!(pers & 0x40000)) {
+                                  if (personality(pers | 0x40000) != -1) {
+                                    execvp(argv[0],argv);
+                                   }
+                                }
+
 				if (!(f=fopen("conftest1","w")))
 					return -1;
 				fprintf(f,"%u",sbrk(0));
@@ -3927,17 +3928,17 @@
 #line 3928 "configure"
 #include "confdefs.h"
 #include 
-			    #include 
+			    #include 
 			    #include 
 			    #include 
 			    int main(int argc,char * argv[]) {
 				FILE *f;
-				#if SIZEOF_LONG == 4
-				if (!syscall(SYS_personality,PER_LINUX32))
-				#else
-				if (!syscall(SYS_personality,PER_LINUX))
-				#endif
-					execvp(argv[0],argv);
+                                long pers = personality(-1);
+                                if (!(pers & 0x40000)) {
+                                  if (personality(pers | 0x40000) != -1) {
+                                    execvp(argv[0],argv);
+                                   }
+                                }
 				if (!(f=fopen("conftest1","w")))
 					return -1;
 				fprintf(f,"%u",sbrk(0));
@@ -3989,25 +3990,22 @@
 #include "confdefs.h"
 #include 
             #include 
-	    #ifdef NEED_NONRANDOM_SBRK
 		   #include 
-		   #include 
+		   #include 
 		   #include 
-	   #endif
 int
 main(int argc,char * argv[])
 {
   char *b;
   FILE *fp;
 
-#ifdef NEED_NONRANDOM_SBRK
-#if SIZEOF_LONG == 4
-if (!syscall(SYS_personality,PER_LINUX32))
-#else
-if (!syscall(SYS_personality,PER_LINUX))
-#endif
-     execvp(argv[0],argv);
-#endif  
+  long pers = personality(-1);
+  if (!(pers & 0x40000)) {
+    if (personality(pers | 0x40000) != -1) {
+      execvp(argv[0],argv);
+    }
+  }
+
   b = (void *) malloc(1000);
   fp = fopen("conftest1","w");
 


Index: gcl.spec
===================================================================
RCS file: /cvs/extras/rpms/gcl/devel/gcl.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- gcl.spec	16 May 2005 12:12:25 -0000	1.12
+++ gcl.spec	9 Sep 2005 19:45:04 -0000	1.13
@@ -1,12 +1,13 @@
 Name:           gcl
-Version:        2.6.6
-Release:        3
+Version:        2.6.7
+Release:        2%{?dist}
 Summary:        GNU Common Lisp
 
 Group:          Development/Languages
 License:        GPL, LGPL
 URL:            http://www.gnu.org/software/gcl
-Source:         ftp://ftp.gnu.org/pub/gnu/gcl/gcl-2.6.6.tar.gz
+Source:         ftp://ftp.gnu.org/pub/gnu/gcl/gcl-2.6.7.tar.gz
+Patch0:		gcl-pers.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  readline-devel, tk-devel, tcl-devel, gmp-devel
 BuildRequires:	tetex, texinfo
@@ -23,6 +24,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 
 %build
@@ -39,7 +41,7 @@
 rm -f $RPM_BUILD_ROOT%{_infodir}/dir
 rm -rf $RPM_BUILD_ROOT%{_datadir}/doc
 rm -rf $RPM_BUILD_ROOT%{_datadir}/emacs
-rm -rf $RPM_BUILD_ROOT%{_libdir}/gcl-*/info
+rm -rf $RPM_BUILD_ROOT%{_prefix}/lib/gcl-*/info
 mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
 cp -f man/man1/* $RPM_BUILD_ROOT%{_mandir}/man1
 mkdir -p html
@@ -54,6 +56,7 @@
 (autoload 'run "gcl" "Run GCL." t)
 (autoload 'gcl-mode "gcl" "GCL mode." t)
 EOF
+find $RPM_BUILD_ROOT%{_prefix}/lib/gcl* -name '*.l*sp' | xargs chmod 0644
 
 
 %clean
@@ -77,7 +80,7 @@
 %files
 %defattr(-,root,root,-)
 %{_bindir}/*
-%{_libdir}/gcl*
+%{_prefix}/lib/gcl*
 %{_infodir}/*
 %{_mandir}/man*/*
 %{_datadir}/emacs/site-lisp/gcl
@@ -87,6 +90,9 @@
 
 
 %changelog
+* Fri Sep  9 2005 Gerard Milmeister  - 2.6.7-1
+- New Version 2.6.7
+
 * Sun Apr 17 2005 Gerard Milmeister  - 2.6.6-2
 - Added buildreq tetex and texinfo
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gcl/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	7 Apr 2005 16:50:14 -0000	1.2
+++ sources	9 Sep 2005 19:45:04 -0000	1.3
@@ -1 +1 @@
-45d67331b29cafc3e9b1eacb488044ec  gcl-2.6.6.tar.gz
+c0f42e1f391162e5ac90912a70e8ecc3  gcl-2.6.7.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep  9 20:15:05 2005
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Fri,  9 Sep 2005 16:15:05 -0400
Subject: rpms/gcl/FC-4 gcl.spec,1.14,1.15
Message-ID: <200509092015.j89KF5WF012922@cvs-int.fedora.redhat.com>

Author: gemi

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

Modified Files:
	gcl.spec 
Log Message:



Index: gcl.spec
===================================================================
RCS file: /cvs/extras/rpms/gcl/FC-4/gcl.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- gcl.spec	9 Sep 2005 19:42:09 -0000	1.14
+++ gcl.spec	9 Sep 2005 20:15:03 -0000	1.15
@@ -1,6 +1,6 @@
 Name:           gcl
 Version:        2.6.7
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        GNU Common Lisp
 
 Group:          Development/Languages
@@ -24,7 +24,9 @@
 
 %prep
 %setup -q
+%ifarch i386 x86_64
 %patch0 -p1
+%endif
 
 
 %build



From fedora-extras-commits at redhat.com  Fri Sep  9 20:34:19 2005
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Fri,  9 Sep 2005 16:34:19 -0400
Subject: rpms/gcl/FC-4 gcl.spec,1.15,1.16
Message-ID: <200509092034.j89KYJeC013100@cvs-int.fedora.redhat.com>

Author: gemi

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

Modified Files:
	gcl.spec 
Log Message:



Index: gcl.spec
===================================================================
RCS file: /cvs/extras/rpms/gcl/FC-4/gcl.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- gcl.spec	9 Sep 2005 20:15:03 -0000	1.15
+++ gcl.spec	9 Sep 2005 20:34:17 -0000	1.16
@@ -1,6 +1,6 @@
 Name:           gcl
 Version:        2.6.7
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        GNU Common Lisp
 
 Group:          Development/Languages
@@ -13,6 +13,7 @@
 BuildRequires:	tetex, texinfo
 Requires(post): /sbin/install-info
 Requires(postun): /sbin/install-info
+ExcludeArch:	ppc ppc64
 
 
 %description
@@ -24,9 +25,7 @@
 
 %prep
 %setup -q
-%ifarch i386 x86_64
 %patch0 -p1
-%endif
 
 
 %build



From fedora-extras-commits at redhat.com  Fri Sep  9 20:38:57 2005
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Fri,  9 Sep 2005 16:38:57 -0400
Subject: rpms/gcl/devel gcl.spec,1.13,1.14
Message-ID: <200509092038.j89KcvPj013186@cvs-int.fedora.redhat.com>

Author: gemi

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

Modified Files:
	gcl.spec 
Log Message:



Index: gcl.spec
===================================================================
RCS file: /cvs/extras/rpms/gcl/devel/gcl.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- gcl.spec	9 Sep 2005 19:45:04 -0000	1.13
+++ gcl.spec	9 Sep 2005 20:38:55 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           gcl
 Version:        2.6.7
-Release:        2%{?dist}
+Release:        4%{?dist}
 Summary:        GNU Common Lisp
 
 Group:          Development/Languages
@@ -13,6 +13,7 @@
 BuildRequires:	tetex, texinfo
 Requires(post): /sbin/install-info
 Requires(postun): /sbin/install-info
+ExcludeArch:	ppc ppc64
 
 
 %description



From fedora-extras-commits at redhat.com  Fri Sep  9 21:12:23 2005
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Fri,  9 Sep 2005 17:12:23 -0400
Subject: rpms/gcl/FC-3 gcl-pers.patch,NONE,1.1 gcl.spec,1.2,1.3
Message-ID: <200509092112.j89LCNMG014643@cvs-int.fedora.redhat.com>

Author: gemi

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

Modified Files:
	gcl.spec 
Added Files:
	gcl-pers.patch 
Log Message:
new version 2.6.7

gcl-pers.patch:

--- NEW FILE gcl-pers.patch ---
--- gcl-2.6.7/o/main.c.pers	2005-09-09 20:36:46.000000000 +0200
+++ gcl-2.6.7/o/main.c	2005-09-09 21:07:51.000000000 +0200
@@ -117,11 +117,9 @@
 #endif
 #endif
 
-#ifdef NEED_NONRANDOM_SBRK
 #include 
-#include 
+#include 
 #include 
-#endif
 
 int
 main(int argc, char **argv, char **envp) {
@@ -131,14 +129,25 @@
 #endif
 #endif
 
-#ifdef NEED_NONRANDOM_SBRK
-#if SIZEOF_LONG == 4
-	if (!syscall(SYS_personality,PER_LINUX32))
-#else
-        if (!syscall(SYS_personality,PER_LINUX))
-#endif
-	  execvp(argv[0],argv);
-#endif
+	long pers = personality(-1);
+	/* 0x40000 aka. ADDR_NO_RANDOMIZE */
+	if (!(pers & 0x40000)) {
+	  if (personality(pers | 0x40000) != -1) {
+	    /* Use /proc/self/exe instead of trying to figure out the
+	     * executable path from PATH and argv[0], since that's reliable.
+	     */
+	    char buf[PATH_MAX+1];
+	    int rc = readlink("/proc/self/exe", buf, PATH_MAX);
+	    if ( rc > 0 ) {
+	      buf[rc]=0;
+	      execve(buf, argv, envp);
+	    }
+	  }
+	  /* Either changing the personality or execve() failed. Either
+	   * way we might as well continue, and hope that the random
+	   * memory maps are ok this time around.
+	   */
+	}
 
 #if defined(DARWIN)
     extern void init_darwin_zone_compat ();
--- gcl-2.6.7/configure.pers	2005-09-09 20:51:26.000000000 +0200
+++ gcl-2.6.7/configure	2005-09-09 21:06:56.000000000 +0200
@@ -3887,17 +3887,18 @@
 #line 3888 "configure"
 #include "confdefs.h"
 #include 
-			    #include 
+			    #include 
 	         	    #include 
 			    #include 
 			    int main(int argc,char * argv[]) {
 				FILE *f;
-				#if SIZEOF_LONG == 4
-				if (!syscall(SYS_personality,PER_LINUX32))
-				#else
-				if (!syscall(SYS_personality,PER_LINUX))
-				#endif
-					execvp(argv[0],argv);
+                                long pers = personality(-1);
+                                if (!(pers & 0x40000)) {
+                                  if (personality(pers | 0x40000) != -1) {
+                                    execvp(argv[0],argv);
+                                   }
+                                }
+
 				if (!(f=fopen("conftest1","w")))
 					return -1;
 				fprintf(f,"%u",sbrk(0));
@@ -3927,17 +3928,17 @@
 #line 3928 "configure"
 #include "confdefs.h"
 #include 
-			    #include 
+			    #include 
 			    #include 
 			    #include 
 			    int main(int argc,char * argv[]) {
 				FILE *f;
-				#if SIZEOF_LONG == 4
-				if (!syscall(SYS_personality,PER_LINUX32))
-				#else
-				if (!syscall(SYS_personality,PER_LINUX))
-				#endif
-					execvp(argv[0],argv);
+                                long pers = personality(-1);
+                                if (!(pers & 0x40000)) {
+                                  if (personality(pers | 0x40000) != -1) {
+                                    execvp(argv[0],argv);
+                                   }
+                                }
 				if (!(f=fopen("conftest1","w")))
 					return -1;
 				fprintf(f,"%u",sbrk(0));
@@ -3989,25 +3990,22 @@
 #include "confdefs.h"
 #include 
             #include 
-	    #ifdef NEED_NONRANDOM_SBRK
 		   #include 
-		   #include 
+		   #include 
 		   #include 
-	   #endif
 int
 main(int argc,char * argv[])
 {
   char *b;
   FILE *fp;
 
-#ifdef NEED_NONRANDOM_SBRK
-#if SIZEOF_LONG == 4
-if (!syscall(SYS_personality,PER_LINUX32))
-#else
-if (!syscall(SYS_personality,PER_LINUX))
-#endif
-     execvp(argv[0],argv);
-#endif  
+  long pers = personality(-1);
+  if (!(pers & 0x40000)) {
+    if (personality(pers | 0x40000) != -1) {
+      execvp(argv[0],argv);
+    }
+  }
+
   b = (void *) malloc(1000);
   fp = fopen("conftest1","w");
 


Index: gcl.spec
===================================================================
RCS file: /cvs/extras/rpms/gcl/FC-3/gcl.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gcl.spec	16 Apr 2005 23:58:05 -0000	1.2
+++ gcl.spec	9 Sep 2005 21:12:21 -0000	1.3
@@ -1,17 +1,19 @@
 Name:           gcl
-Version:        2.6.6
-Release:        2
+Version:        2.6.7
+Release:        4%{?dist}
 Summary:        GNU Common Lisp
 
 Group:          Development/Languages
 License:        GPL, LGPL
 URL:            http://www.gnu.org/software/gcl
-Source:         ftp://ftp.gnu.org/pub/gnu/gcl/gcl-2.6.6.tar.gz
+Source:         ftp://ftp.gnu.org/pub/gnu/gcl/gcl-2.6.7.tar.gz
+Patch0:		gcl-pers.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  readline-devel, tk-devel, tcl-devel, gmp-devel
 BuildRequires:	tetex, texinfo
 Requires(post): /sbin/install-info
 Requires(postun): /sbin/install-info
+ExcludeArch:	ppc ppc64
 
 
 %description
@@ -23,6 +25,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 
 %build
@@ -39,7 +42,7 @@
 rm -f $RPM_BUILD_ROOT%{_infodir}/dir
 rm -rf $RPM_BUILD_ROOT%{_datadir}/doc
 rm -rf $RPM_BUILD_ROOT%{_datadir}/emacs
-rm -rf $RPM_BUILD_ROOT%{_libdir}/gcl-*/info
+rm -rf $RPM_BUILD_ROOT%{_prefix}/lib/gcl-*/info
 mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
 cp -f man/man1/* $RPM_BUILD_ROOT%{_mandir}/man1
 mkdir -p html
@@ -54,6 +57,7 @@
 (autoload 'run "gcl" "Run GCL." t)
 (autoload 'gcl-mode "gcl" "GCL mode." t)
 EOF
+find $RPM_BUILD_ROOT%{_prefix}/lib/gcl* -name '*.l*sp' | xargs chmod 0644
 
 
 %clean
@@ -77,7 +81,7 @@
 %files
 %defattr(-,root,root,-)
 %{_bindir}/*
-%{_libdir}/gcl*
+%{_prefix}/lib/gcl*
 %{_infodir}/*
 %{_mandir}/man*/*
 %{_datadir}/emacs/site-lisp/gcl
@@ -87,6 +91,9 @@
 
 
 %changelog
+* Fri Sep  9 2005 Gerard Milmeister  - 2.6.7-1
+- New Version 2.6.7
+
 * Sun Apr 17 2005 Gerard Milmeister  - 2.6.6-2
 - Added buildreq tetex and texinfo
 
@@ -95,4 +102,3 @@
 
 * Fri Feb 18 2005 Gerard Milmeister  - 0:2.6.5-1
 - First Fedora release
-



From fedora-extras-commits at redhat.com  Fri Sep  9 21:16:08 2005
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Fri,  9 Sep 2005 17:16:08 -0400
Subject: rpms/gcl/FC-3 gcl.spec,1.3,1.4 sources,1.2,1.3
Message-ID: <200509092116.j89LG8Si014856@cvs-int.fedora.redhat.com>

Author: gemi

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

Modified Files:
	gcl.spec sources 
Log Message:



Index: gcl.spec
===================================================================
RCS file: /cvs/extras/rpms/gcl/FC-3/gcl.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gcl.spec	9 Sep 2005 21:12:21 -0000	1.3
+++ gcl.spec	9 Sep 2005 21:16:06 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           gcl
 Version:        2.6.7
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        GNU Common Lisp
 
 Group:          Development/Languages


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gcl/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	7 Apr 2005 16:50:14 -0000	1.2
+++ sources	9 Sep 2005 21:16:06 -0000	1.3
@@ -1 +1 @@
-45d67331b29cafc3e9b1eacb488044ec  gcl-2.6.6.tar.gz
+c0f42e1f391162e5ac90912a70e8ecc3  gcl-2.6.7.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep  9 22:36:55 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri,  9 Sep 2005 18:36:55 -0400
Subject: rpms/jam - New directory
Message-ID: <200509092236.j89MatDI016406@cvs-int.fedora.redhat.com>

Author: spot

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

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




From fedora-extras-commits at redhat.com  Fri Sep  9 22:36:55 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri,  9 Sep 2005 18:36:55 -0400
Subject: rpms/jam/devel - New directory
Message-ID: <200509092237.j89MatLt016411@cvs-int.fedora.redhat.com>

Author: spot

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

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




From fedora-extras-commits at redhat.com  Fri Sep  9 22:37:13 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri,  9 Sep 2005 18:37:13 -0400
Subject: rpms/jam Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200509092237.j89MbDxV016466@cvs-int.fedora.redhat.com>

Author: spot

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

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


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

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

common : CVS/Root
	@cvs checkout common

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

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


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Fri Sep  9 22:37:14 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri,  9 Sep 2005 18:37:14 -0400
Subject: rpms/jam/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200509092237.j89MbEfl016471@cvs-int.fedora.redhat.com>

Author: spot

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

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


--- NEW FILE .cvsignore ---


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

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Fri Sep  9 22:37:56 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri,  9 Sep 2005 18:37:56 -0400
Subject: rpms/jam import.log,1.1,1.2
Message-ID: <200509092238.j89McQ0a016739@cvs-int.fedora.redhat.com>

Author: spot

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

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


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/jam/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	9 Sep 2005 22:37:11 -0000	1.1
+++ import.log	9 Sep 2005 22:37:54 -0000	1.2
@@ -0,0 +1 @@
+jam-2_5-2:HEAD:jam-2.5-2.src.rpm:1126305468



From fedora-extras-commits at redhat.com  Fri Sep  9 22:37:56 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri,  9 Sep 2005 18:37:56 -0400
Subject: rpms/jam/devel jam.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1,
	1.2
Message-ID: <200509092238.j89McRwa016743@cvs-int.fedora.redhat.com>

Author: spot

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

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


--- NEW FILE jam.spec ---
Name:		jam
Version:	2.5
Release:	2%{?dist}
License:	Distributable
Group:		Development/Tools
Summary:	Program construction tool, similar to make
URL:		http://public.perforce.com/public/jam/index.html
Source0:	ftp://ftp.perforce.com/pub/jam/%{name}-%{version}.tar
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:	bison

%description
Jam is a program construction tool, like make. Jam recursively builds target 
files from source files, using dependency information and updating actions 
expressed in the Jambase file, which is written in jam's own interpreted 
language. The default Jambase is compiled into jam and provides a boilerplate 
for common use, relying on a user-provide file "Jamfile" to enumerate actual 
targets and sources. 

%prep
%setup -q

%build
make CFLAGS="$RPM_OPT_FLAGS" CCFLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT/%{_bindir}
install -m0755 bin.linux*/jam $RPM_BUILD_ROOT/%{_bindir}
install -m0755 bin.linux*/mkjambase $RPM_BUILD_ROOT/%{_bindir}

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,0755)
%doc README RELNOTES *.html
%{_bindir}/jam
%{_bindir}/mkjambase

%changelog
* Fri Sep  9 2005 Tom "spot" Callaway  2.5-2
- use smp_mflags
- use name and version in source field

* Fri Aug 19 2005 Tom "spot" Callaway  2.5-1
- initial package for Fedora Extras


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jam/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	9 Sep 2005 22:37:12 -0000	1.1
+++ .cvsignore	9 Sep 2005 22:37:54 -0000	1.2
@@ -0,0 +1 @@
+jam-2.5.tar


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jam/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Sep 2005 22:37:12 -0000	1.1
+++ sources	9 Sep 2005 22:37:54 -0000	1.2
@@ -0,0 +1 @@
+c7eb7719d8523c0f819116479492d367  jam-2.5.tar



From fedora-extras-commits at redhat.com  Fri Sep  9 22:38:33 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri,  9 Sep 2005 18:38:33 -0400
Subject: owners owners.list,1.183,1.184
Message-ID: <200509092238.j89McX6j016790@cvs-int.fedora.redhat.com>

Author: spot

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

Modified Files:
	owners.list 
Log Message:

jam



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.183
retrieving revision 1.184
diff -u -r1.183 -r1.184
--- owners.list	9 Sep 2005 12:53:02 -0000	1.183
+++ owners.list	9 Sep 2005 22:38:31 -0000	1.184
@@ -335,6 +335,7 @@
 Fedora Extras|irssi|Modular text mode IRC client with Perl scripting|anvil at livna.org|extras-qa at fedoraproject.org|
 Fedora Extras|istanbul|Desktop Session Recorder|jspaleta at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|jabberd|OpenSource server implementation of the Jabber protocols|adrian at lisas.de|extras-qa at fedoraproject.org|
+Fedora Extras|jam|Program construction tool, similar to make|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|jasper|Implementation of the JPEG-2000 standard, Part 1|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|jed|A fast, compact editor based on the S-Lang screen library.|notting at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|jhead|Tool for displaying EXIF data embedded in JPEG images|adrian at lisas.de|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sat Sep 10 01:27:00 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri,  9 Sep 2005 21:27:00 -0400
Subject: owners owners.list,1.184,1.185
Message-ID: <200509100127.j8A1R0uL021963@cvs-int.fedora.redhat.com>

Author: jpo

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

Modified Files:
	owners.list 
Log Message:
New packages: perl-Locale-Maketext-Fuzzy and perl-Hook-LexWrap



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.184
retrieving revision 1.185
diff -u -r1.184 -r1.185
--- owners.list	9 Sep 2005 22:38:31 -0000	1.184
+++ owners.list	10 Sep 2005 01:26:58 -0000	1.185
@@ -603,7 +603,7 @@
 Fedora Extras|perl-Crypt-CBC|Encrypt Data with Cipher Block Chaining Mode|andreas at bawue.net|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Data-Page|Help when paging through sets of results|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Date-Simple|Simple date object for perl|paul at city-fan.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
-Fedora Extras|perl-DBD-SQLite|Self Contained RDBMS in a DBI Driver|jpo at di.uminho.pt|extras-qa at fedoraproject.org|
+Fedora Extras|perl-DBD-SQLite|Self Contained RDBMS in a DBI Driver|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-DBD-SQLite2|Self Contained RDBMS in a DBI Driver (sqlite 2.x)|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-DBIx-ContextualFetch|Add contextual fetches to DBI|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Devel-Cycle|Find memory cycles in objects|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
@@ -631,6 +631,7 @@
 Fedora Extras|perl-Graph|A Perl module for dealing with graphs, the abstract data structures|thm at duke.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Gtk2|Perl interface to the 2.x series of the Gimp Toolkit library|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Heap|A collection of routines for managing a heap data structure|thm at duke.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Hook-LexWrap|Lexically scoped subroutine wrappers|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-HTML-Format|HTML formatter modules|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-HTML-Scrubber|Library for scrubbing/sanitizing html|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-HTML-Template|Perl module to use HTML Templates|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
@@ -657,6 +658,7 @@
 Fedora Extras|perl-libintl|Internationalization library for Perl, compatible with gettext|matthias at rpmforge.net|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Lingua-EN-Inflect|Convert singular to plural, select "a" or "an"|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Lingua-EN-Inflect-Number|Force number of words to singular or plural|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Locale-Maketext-Fuzzy|Maketext from already interpolated strings|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Locale-gettext|Interface to gettext family of functions|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Mail-Alias|For bugs related to the perl-Mail-Alias component|oliver at linux-kernel.at|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Mail-Sendmail|Simple platform independent mailer for Perl|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Sat Sep 10 02:13:48 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Fri,  9 Sep 2005 22:13:48 -0400
Subject: rpms/perl-File-Slurp - New directory
Message-ID: <200509100213.j8A2Dmcs023589@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-File-Slurp
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23565/perl-File-Slurp

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




From fedora-extras-commits at redhat.com  Sat Sep 10 02:13:48 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Fri,  9 Sep 2005 22:13:48 -0400
Subject: rpms/perl-File-Slurp/devel - New directory
Message-ID: <200509100213.j8A2Dmn3023594@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-File-Slurp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23565/perl-File-Slurp/devel

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




From fedora-extras-commits at redhat.com  Sat Sep 10 02:14:24 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Fri,  9 Sep 2005 22:14:24 -0400
Subject: rpms/perl-File-Slurp Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200509100214.j8A2EOvT023645@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-File-Slurp
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23610

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


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

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

common : CVS/Root
	@cvs checkout common

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

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


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Sat Sep 10 02:14:24 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Fri,  9 Sep 2005 22:14:24 -0400
Subject: rpms/perl-File-Slurp/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200509100214.j8A2EO9h023650@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-File-Slurp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23610/devel

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


--- NEW FILE .cvsignore ---


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

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Sat Sep 10 02:15:29 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Fri,  9 Sep 2005 22:15:29 -0400
Subject: rpms/perl-File-Slurp import.log,1.1,1.2
Message-ID: <200509100215.j8A2FU1c023715@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-File-Slurp
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23680

Modified Files:
	import.log 
Log Message:
auto-import perl-File-Slurp-9999.09-1 on branch devel from perl-File-Slurp-9999.09-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-File-Slurp/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	10 Sep 2005 02:14:22 -0000	1.1
+++ import.log	10 Sep 2005 02:15:27 -0000	1.2
@@ -0,0 +1 @@
+perl-File-Slurp-9999_09-1:HEAD:perl-File-Slurp-9999.09-1.src.rpm:1126318513



From fedora-extras-commits at redhat.com  Sat Sep 10 02:15:30 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Fri,  9 Sep 2005 22:15:30 -0400
Subject: rpms/perl-File-Slurp/devel perl-File-Slurp.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200509100215.j8A2FUS6023722@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-File-Slurp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23680/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-File-Slurp.spec 
Log Message:
auto-import perl-File-Slurp-9999.09-1 on branch devel from perl-File-Slurp-9999.09-1.src.rpm


--- NEW FILE perl-File-Slurp.spec ---
Name: 		perl-File-Slurp
Version: 	9999.09
Release: 	1%{?dist}
Summary: 	Efficient Reading/Writing of Complete Files
License: 	GPL or Artistic
Group: 		Development/Libraries
URL: 		http://search.cpan.org/dist/File-Slurp/
Source0: 	http://www.cpan.org/modules/by-module/File/File-Slurp-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
BuildArch: noarch

%description
This module provides subs that allow you to read or write entire files with
one simple call. They are designed to be simple to use, have flexible ways
to pass in or get the file contents and to be very efficient. There is also
a sub to read in all the files in a directory other than . and ..

These slurp/spew subs work for files, pipes and sockets, and stdio, 
pseudo-files, and DATA.

%prep
%setup -q -n File-Slurp-%{version}
chmod 0644 lib/File/Slurp.pm

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

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

%clean
rm -rf $RPM_BUILD_ROOT

%check
make test

%files
%defattr(-,root,root,-)
%doc Changes README
%{perl_vendorlib}/File
%{_mandir}/man3/*

%changelog
* Thu Sep 01 2005 Ralf Corsepius  - 9999.09-1
- FE submission.

* Tue Jun 28 2005 Ralf Corsepius  - 9999.09-0.pm.1
- Initial packman version.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-File-Slurp/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	10 Sep 2005 02:14:22 -0000	1.1
+++ .cvsignore	10 Sep 2005 02:15:28 -0000	1.2
@@ -0,0 +1 @@
+File-Slurp-9999.09.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-File-Slurp/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	10 Sep 2005 02:14:22 -0000	1.1
+++ sources	10 Sep 2005 02:15:28 -0000	1.2
@@ -0,0 +1 @@
+b2bd4e917b6fafe03145f3977ba8bd7a  File-Slurp-9999.09.tar.gz



From fedora-extras-commits at redhat.com  Sat Sep 10 02:19:52 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Fri,  9 Sep 2005 22:19:52 -0400
Subject: rpms/perl-File-Slurp/devel perl-File-Slurp.spec,1.1,1.2
Message-ID: <200509100219.j8A2Jq5S023806@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-File-Slurp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23787

Modified Files:
	perl-File-Slurp.spec 
Log Message:
Cleanup.


Index: perl-File-Slurp.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-File-Slurp/devel/perl-File-Slurp.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-File-Slurp.spec	10 Sep 2005 02:15:28 -0000	1.1
+++ perl-File-Slurp.spec	10 Sep 2005 02:19:50 -0000	1.2
@@ -1,6 +1,6 @@
 Name: 		perl-File-Slurp
 Version: 	9999.09
-Release: 	1%{?dist}
+Release: 	2%{?dist}
 Summary: 	Efficient Reading/Writing of Complete Files
 License: 	GPL or Artistic
 Group: 		Development/Libraries
@@ -22,7 +22,8 @@
 
 %prep
 %setup -q -n File-Slurp-%{version}
-chmod 0644 lib/File/Slurp.pm
+chmod 0644 lib/File/Slurp.pm extras/slurp_bench.pl
+%{__perl} -pi -e 's|^#!/usr/local/bin/perl\b|#!%{__perl}|' extras/slurp_bench.pl
 
 %build
 %{__perl} Makefile.PL INSTALLDIRS=vendor
@@ -43,13 +44,14 @@
 
 %files
 %defattr(-,root,root,-)
-%doc Changes README
+# For license text(s), see the perl package.
+%doc Changes README extras/
 %{perl_vendorlib}/File
 %{_mandir}/man3/*
 
 %changelog
+* Sat Sep 10 2005 Ralf Corsepius  - 9999.09-2
+- Apply JPO's patch (PR #167282).
+
 * Thu Sep 01 2005 Ralf Corsepius  - 9999.09-1
 - FE submission.
-
-* Tue Jun 28 2005 Ralf Corsepius  - 9999.09-0.pm.1
-- Initial packman version.



From fedora-extras-commits at redhat.com  Sat Sep 10 02:20:09 2005
From: fedora-extras-commits at redhat.com (Jeff Carlson (jcarlson))
Date: Fri,  9 Sep 2005 22:20:09 -0400
Subject: rpms/up-imapproxy/devel .cvsignore,1.2,1.3 sources,1.2,1.3
Message-ID: <200509100220.j8A2K9ku023865@cvs-int.fedora.redhat.com>

Author: jcarlson

Update of /cvs/extras/rpms/up-imapproxy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23783/devel

Modified Files:
	.cvsignore sources 
Log Message:
Uploaded new source for 1.2.4.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/up-imapproxy/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	9 Sep 2005 12:50:22 -0000	1.2
+++ .cvsignore	10 Sep 2005 02:20:07 -0000	1.3
@@ -1 +1 @@
-up-imapproxy-1.2.3.tar.gz
+up-imapproxy-1.2.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/up-imapproxy/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	9 Sep 2005 12:50:22 -0000	1.2
+++ sources	10 Sep 2005 02:20:07 -0000	1.3
@@ -1 +1 @@
-ad4dafd1417903feb1e09ec569ff1ad5  up-imapproxy-1.2.3.tar.gz
+ad68dd2258255ac6ef87165f518390e9  up-imapproxy-1.2.4.tar.gz



From fedora-extras-commits at redhat.com  Sat Sep 10 02:20:04 2005
From: fedora-extras-commits at redhat.com (Jeff Carlson (jcarlson))
Date: Fri,  9 Sep 2005 22:20:04 -0400
Subject: rpms/up-imapproxy/FC-3 .cvsignore,1.2,1.3 sources,1.2,1.3
Message-ID: <200509100220.j8A2KYgq023869@cvs-int.fedora.redhat.com>

Author: jcarlson

Update of /cvs/extras/rpms/up-imapproxy/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23783/FC-3

Modified Files:
	.cvsignore sources 
Log Message:
Uploaded new source for 1.2.4.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/up-imapproxy/FC-3/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	9 Sep 2005 12:50:22 -0000	1.2
+++ .cvsignore	10 Sep 2005 02:20:02 -0000	1.3
@@ -1 +1 @@
-up-imapproxy-1.2.3.tar.gz
+up-imapproxy-1.2.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/up-imapproxy/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	9 Sep 2005 12:50:22 -0000	1.2
+++ sources	10 Sep 2005 02:20:02 -0000	1.3
@@ -1 +1 @@
-ad4dafd1417903feb1e09ec569ff1ad5  up-imapproxy-1.2.3.tar.gz
+ad68dd2258255ac6ef87165f518390e9  up-imapproxy-1.2.4.tar.gz



From fedora-extras-commits at redhat.com  Sat Sep 10 02:20:04 2005
From: fedora-extras-commits at redhat.com (Jeff Carlson (jcarlson))
Date: Fri,  9 Sep 2005 22:20:04 -0400
Subject: rpms/up-imapproxy/FC-4 .cvsignore,1.2,1.3 sources,1.2,1.3
Message-ID: <200509100220.j8A2KYSk023873@cvs-int.fedora.redhat.com>

Author: jcarlson

Update of /cvs/extras/rpms/up-imapproxy/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23783/FC-4

Modified Files:
	.cvsignore sources 
Log Message:
Uploaded new source for 1.2.4.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/up-imapproxy/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	9 Sep 2005 12:50:22 -0000	1.2
+++ .cvsignore	10 Sep 2005 02:20:02 -0000	1.3
@@ -1 +1 @@
-up-imapproxy-1.2.3.tar.gz
+up-imapproxy-1.2.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/up-imapproxy/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	9 Sep 2005 12:50:22 -0000	1.2
+++ sources	10 Sep 2005 02:20:02 -0000	1.3
@@ -1 +1 @@
-ad4dafd1417903feb1e09ec569ff1ad5  up-imapproxy-1.2.3.tar.gz
+ad68dd2258255ac6ef87165f518390e9  up-imapproxy-1.2.4.tar.gz



From fedora-extras-commits at redhat.com  Sat Sep 10 02:27:18 2005
From: fedora-extras-commits at redhat.com (Jeff Carlson (jcarlson))
Date: Fri,  9 Sep 2005 22:27:18 -0400
Subject: rpms/up-imapproxy/devel up-imapproxy.spec,1.2,1.3
Message-ID: <200509100227.j8A2RI93024057@cvs-int.fedora.redhat.com>

Author: jcarlson

Update of /cvs/extras/rpms/up-imapproxy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24004/devel

Modified Files:
	up-imapproxy.spec 
Log Message:
No-op release bump to get a new buildsys tag.



Index: up-imapproxy.spec
===================================================================
RCS file: /cvs/extras/rpms/up-imapproxy/devel/up-imapproxy.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- up-imapproxy.spec	9 Sep 2005 14:16:15 -0000	1.2
+++ up-imapproxy.spec	10 Sep 2005 02:27:15 -0000	1.3
@@ -1,7 +1,7 @@
 Summary: University of Pittsburgh IMAP Proxy
 Name: up-imapproxy
 Version: 1.2.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Group: System Environment/Daemons
 URL: http://www.imapproxy.org
@@ -72,6 +72,9 @@
 %{_sbindir}/*
 
 %changelog
+* Fri Sep  9 2005 Jeff Carlson  - 1.2.4-2
+- No-op release bump to get a new buildsys tag.
+
 * Fri Sep  9 2005 Jeff Carlson  - 1.2.4-1
 - Bump to current upstream release.
 - Upstream includes a new doc (copyright), included.



From fedora-extras-commits at redhat.com  Sat Sep 10 02:27:12 2005
From: fedora-extras-commits at redhat.com (Jeff Carlson (jcarlson))
Date: Fri,  9 Sep 2005 22:27:12 -0400
Subject: rpms/up-imapproxy/FC-3 up-imapproxy.spec,1.2,1.3
Message-ID: <200509100227.j8A2Rgvt024068@cvs-int.fedora.redhat.com>

Author: jcarlson

Update of /cvs/extras/rpms/up-imapproxy/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24004/FC-3

Modified Files:
	up-imapproxy.spec 
Log Message:
No-op release bump to get a new buildsys tag.



Index: up-imapproxy.spec
===================================================================
RCS file: /cvs/extras/rpms/up-imapproxy/FC-3/up-imapproxy.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- up-imapproxy.spec	9 Sep 2005 14:16:15 -0000	1.2
+++ up-imapproxy.spec	10 Sep 2005 02:27:10 -0000	1.3
@@ -1,7 +1,7 @@
 Summary: University of Pittsburgh IMAP Proxy
 Name: up-imapproxy
 Version: 1.2.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Group: System Environment/Daemons
 URL: http://www.imapproxy.org
@@ -72,6 +72,9 @@
 %{_sbindir}/*
 
 %changelog
+* Fri Sep  9 2005 Jeff Carlson  - 1.2.4-2
+- No-op release bump to get a new buildsys tag.
+
 * Fri Sep  9 2005 Jeff Carlson  - 1.2.4-1
 - Bump to current upstream release.
 - Upstream includes a new doc (copyright), included.



From fedora-extras-commits at redhat.com  Sat Sep 10 02:27:12 2005
From: fedora-extras-commits at redhat.com (Jeff Carlson (jcarlson))
Date: Fri,  9 Sep 2005 22:27:12 -0400
Subject: rpms/up-imapproxy/FC-4 up-imapproxy.spec,1.2,1.3
Message-ID: <200509100227.j8A2RgKx024069@cvs-int.fedora.redhat.com>

Author: jcarlson

Update of /cvs/extras/rpms/up-imapproxy/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24004/FC-4

Modified Files:
	up-imapproxy.spec 
Log Message:
No-op release bump to get a new buildsys tag.



Index: up-imapproxy.spec
===================================================================
RCS file: /cvs/extras/rpms/up-imapproxy/FC-4/up-imapproxy.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- up-imapproxy.spec	9 Sep 2005 14:16:15 -0000	1.2
+++ up-imapproxy.spec	10 Sep 2005 02:27:10 -0000	1.3
@@ -1,7 +1,7 @@
 Summary: University of Pittsburgh IMAP Proxy
 Name: up-imapproxy
 Version: 1.2.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Group: System Environment/Daemons
 URL: http://www.imapproxy.org
@@ -72,6 +72,9 @@
 %{_sbindir}/*
 
 %changelog
+* Fri Sep  9 2005 Jeff Carlson  - 1.2.4-2
+- No-op release bump to get a new buildsys tag.
+
 * Fri Sep  9 2005 Jeff Carlson  - 1.2.4-1
 - Bump to current upstream release.
 - Upstream includes a new doc (copyright), included.



From fedora-extras-commits at redhat.com  Sat Sep 10 02:30:05 2005
From: fedora-extras-commits at redhat.com (Jeff Carlson (jcarlson))
Date: Fri,  9 Sep 2005 22:30:05 -0400
Subject: rpms/up-imapproxy/devel up-imapproxy.spec,1.3,1.4
Message-ID: <200509100230.j8A2UZKw024224@cvs-int.fedora.redhat.com>

Author: jcarlson

Update of /cvs/extras/rpms/up-imapproxy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24167/devel

Modified Files:
	up-imapproxy.spec 
Log Message:
Same as 1.2.4-2.



Index: up-imapproxy.spec
===================================================================
RCS file: /cvs/extras/rpms/up-imapproxy/devel/up-imapproxy.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- up-imapproxy.spec	10 Sep 2005 02:27:15 -0000	1.3
+++ up-imapproxy.spec	10 Sep 2005 02:30:03 -0000	1.4
@@ -1,7 +1,7 @@
 Summary: University of Pittsburgh IMAP Proxy
 Name: up-imapproxy
 Version: 1.2.4
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPL
 Group: System Environment/Daemons
 URL: http://www.imapproxy.org
@@ -72,6 +72,9 @@
 %{_sbindir}/*
 
 %changelog
+* Fri Sep  9 2005 Jeff Carlson  - 1.2.4-3
+- Same as -2.
+
 * Fri Sep  9 2005 Jeff Carlson  - 1.2.4-2
 - No-op release bump to get a new buildsys tag.
 



From fedora-extras-commits at redhat.com  Sat Sep 10 02:30:04 2005
From: fedora-extras-commits at redhat.com (Jeff Carlson (jcarlson))
Date: Fri,  9 Sep 2005 22:30:04 -0400
Subject: rpms/up-imapproxy/FC-3 up-imapproxy.spec,1.3,1.4
Message-ID: <200509100230.j8A2UYWP024220@cvs-int.fedora.redhat.com>

Author: jcarlson

Update of /cvs/extras/rpms/up-imapproxy/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24167/FC-3

Modified Files:
	up-imapproxy.spec 
Log Message:
Same as 1.2.4-2.



Index: up-imapproxy.spec
===================================================================
RCS file: /cvs/extras/rpms/up-imapproxy/FC-3/up-imapproxy.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- up-imapproxy.spec	10 Sep 2005 02:27:10 -0000	1.3
+++ up-imapproxy.spec	10 Sep 2005 02:30:02 -0000	1.4
@@ -1,7 +1,7 @@
 Summary: University of Pittsburgh IMAP Proxy
 Name: up-imapproxy
 Version: 1.2.4
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPL
 Group: System Environment/Daemons
 URL: http://www.imapproxy.org
@@ -72,6 +72,9 @@
 %{_sbindir}/*
 
 %changelog
+* Fri Sep  9 2005 Jeff Carlson  - 1.2.4-3
+- Same as -2.
+
 * Fri Sep  9 2005 Jeff Carlson  - 1.2.4-2
 - No-op release bump to get a new buildsys tag.
 



From fedora-extras-commits at redhat.com  Sat Sep 10 02:30:04 2005
From: fedora-extras-commits at redhat.com (Jeff Carlson (jcarlson))
Date: Fri,  9 Sep 2005 22:30:04 -0400
Subject: rpms/up-imapproxy/FC-4 up-imapproxy.spec,1.3,1.4
Message-ID: <200509100230.j8A2UZqC024223@cvs-int.fedora.redhat.com>

Author: jcarlson

Update of /cvs/extras/rpms/up-imapproxy/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24167/FC-4

Modified Files:
	up-imapproxy.spec 
Log Message:
Same as 1.2.4-2.



Index: up-imapproxy.spec
===================================================================
RCS file: /cvs/extras/rpms/up-imapproxy/FC-4/up-imapproxy.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- up-imapproxy.spec	10 Sep 2005 02:27:10 -0000	1.3
+++ up-imapproxy.spec	10 Sep 2005 02:30:02 -0000	1.4
@@ -1,7 +1,7 @@
 Summary: University of Pittsburgh IMAP Proxy
 Name: up-imapproxy
 Version: 1.2.4
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPL
 Group: System Environment/Daemons
 URL: http://www.imapproxy.org
@@ -72,6 +72,9 @@
 %{_sbindir}/*
 
 %changelog
+* Fri Sep  9 2005 Jeff Carlson  - 1.2.4-3
+- Same as -2.
+
 * Fri Sep  9 2005 Jeff Carlson  - 1.2.4-2
 - No-op release bump to get a new buildsys tag.
 



From fedora-extras-commits at redhat.com  Sat Sep 10 02:40:37 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Fri,  9 Sep 2005 22:40:37 -0400
Subject: owners owners.list,1.185,1.186
Message-ID: <200509100240.j8A2ebML024384@cvs-int.fedora.redhat.com>

Author: corsepiu

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

Modified Files:
	owners.list 
Log Message:
Add perl-File-Slurp


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.185
retrieving revision 1.186
diff -u -r1.185 -r1.186
--- owners.list	10 Sep 2005 01:26:58 -0000	1.185
+++ owners.list	10 Sep 2005 02:40:35 -0000	1.186
@@ -619,6 +619,7 @@
 Fedora Extras|perl-ExtUtils-XSBuilder| Modules that parse C header files and create XS glue code|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-File-BOM|Utilities for reading Byte Order Marks|mpeters at mac.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-File-Find-Rule|Perl module implementing an alternative interface to File::Find|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-File-Slurp|Efficient Reading/Writing of Complete Files|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-File-Tail|Perl extension for reading from continously updated files|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Font-AFM|Perl interface to Adobe Font Metrics files|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-FreezeThaw|Convert Perl structures to strings and back|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Sat Sep 10 08:22:36 2005
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Sat, 10 Sep 2005 04:22:36 -0400
Subject: rpms/amarok/FC-4 amarok-1.3.1-alsa-gst.patch, NONE, 1.1 .cvsignore,
	1.10, 1.11 amarok-1.3-engines-cfg.patch, 1.1, 1.2 amarok.spec,
	1.26, 1.27 sources, 1.10, 1.11
Message-ID: <200509100823.j8A8N7we000713@cvs-int.fedora.redhat.com>

Author: abompard

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

Modified Files:
	.cvsignore amarok-1.3-engines-cfg.patch amarok.spec sources 
Added Files:
	amarok-1.3.1-alsa-gst.patch 
Log Message:
- version 1.3.1
- add patch from upstream to fix alsasink in gstreamer
- default to autoaudiosink for gstreamer



amarok-1.3.1-alsa-gst.patch:

--- NEW FILE amarok-1.3.1-alsa-gst.patch ---
--- ./amarok/src/engine/gst/gstengine.cpp.alsa-gst	2005-09-04 22:47:19.000000000 +0200
+++ ./amarok/src/engine/gst/gstengine.cpp	2005-09-09 19:32:11.000000000 +0200
@@ -806,7 +806,6 @@
 
                     if ( g_strrstr ( factory->details.klass, classname ) ) {
                         name = g_strdup ( GST_OBJECT_NAME ( factory ) );
-                        if ( name != "alsasink" )
                         results << name;
                     }
                 }
@@ -830,7 +829,7 @@
 
     destroyPipeline();
 
-    if ( GstConfig::soundOutput().isEmpty() || GstConfig::soundOutput() == "alsasink" ) {
+    if ( GstConfig::soundOutput().isEmpty() ) {
         QTimer::singleShot( 0, this, SLOT( errorNoOutput() ) );
         return false;
     }
@@ -853,7 +852,6 @@
     }
 
     m_gst_audiobin = gst_bin_new( "audiobin" );
-    gst_bin_add( GST_BIN( m_gst_audiobin ), m_gst_audiosink );
 
     /* setting device property for AudioSink*/
     if ( GstConfig::useCustomSoundDevice() && !GstConfig::soundDevice().isEmpty() )
@@ -872,6 +870,7 @@
     gst_element_link_many( m_gst_audioconvert, m_gst_equalizer, m_gst_identity,
                            m_gst_volume, m_gst_audioscale, m_gst_audiosink, NULL );
 
+    gst_bin_add( GST_BIN( m_gst_audiobin ), m_gst_audiosink );
     gst_element_set_state( m_gst_audiobin, GST_STATE_PAUSED );
 
     m_pipelineFilled = true;


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/amarok/FC-4/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	22 Aug 2005 13:35:51 -0000	1.10
+++ .cvsignore	10 Sep 2005 08:22:34 -0000	1.11
@@ -1 +1 @@
-amarok-1.3.tar.bz2
+amarok-1.3.1.tar.bz2

amarok-1.3-engines-cfg.patch:

Index: amarok-1.3-engines-cfg.patch
===================================================================
RCS file: /cvs/extras/rpms/amarok/FC-4/amarok-1.3-engines-cfg.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- amarok-1.3-engines-cfg.patch	22 Aug 2005 13:35:51 -0000	1.1
+++ amarok-1.3-engines-cfg.patch	10 Sep 2005 08:22:34 -0000	1.2
@@ -6,7 +6,7 @@
              
              Select the sound output plugin ("sink"). Their availability depends on the system configuration.
 -            osssink
-+            alsasink
++            autoaudiosink
          
          
              


Index: amarok.spec
===================================================================
RCS file: /cvs/extras/rpms/amarok/FC-4/amarok.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- amarok.spec	23 Aug 2005 22:33:18 -0000	1.26
+++ amarok.spec	10 Sep 2005 08:22:34 -0000	1.27
@@ -6,17 +6,18 @@
 
 Name:       amarok
 Summary:    Media player for KDE
-Version:    1.3
-Release:    6%{?dist}
+Version:    1.3.1
+Release:    2%{?dist}
 
 Group: 	    Applications/Multimedia
 License:    GPL
 Url:        http://amarok.kde.org
-Source0:    http://dl.sf.net/amarok/amarok-1.3.tar.bz2
+Source0:    http://dl.sf.net/amarok/amarok-1.3.1.tar.bz2
 Patch0:     amarok-1.2.4-gcc4bl.patch
 #Patch1:     amarok-1.2.4-forward-decl.patch
 Patch2:     amarok-1.3-engines-cfg.patch
 Patch3:     amarok-1.3-endian.patch
+Patch4:     amarok-1.3.1-alsa-gst.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  kdemultimedia-devel >= 6:3.2
@@ -101,10 +102,11 @@
 #%patch1 -p1 -b .forward-decl
 %patch2 -p1 -b .engines-cfg
 %patch3 -p1 -b .endian
+%patch4 -p1 -b .alsa-gst
 
 
 %build
-unset QTDIR && . /etc/profile.d/qt.sh
+unset QTDIR && . %{_sysconfdir}/profile.d/qt.sh
 # work around an improper ${kdelibsuff}
 export QTLIB=${QTDIR}/lib QTINC=${QTDIR}/include
 %configure \
@@ -152,18 +154,18 @@
 %post
 /sbin/ldconfig
 # update icon themes if necessary
-if [ -x /usr/bin/gtk-update-icon-cache ]; then
-    /usr/bin/gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+    %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg || :
     # needed because amarok 1.2 puts icon in hicolor
     # and the RPM did not update the cache on uninstall
-    /usr/bin/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor
+    %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 fi
 
 %postun
 /sbin/ldconfig
 # update icon themes if necessary
-if [ -x /usr/bin/gtk-update-icon-cache ]; then
-    /usr/bin/gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+    %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg || :
 fi
 
 
@@ -231,6 +233,13 @@
 
 
 %changelog
+* Sat Sep 10 2005 Aurelien Bompard  1.3.1-2
+- add patch from upstream to fix alsasink in gstreamer
+- default to autoaudiosink for gstreamer
+
+* Mon Sep 05 2005 Aurelien Bompard  1.3.1-1
+- version 1.3.1
+
 * Tue Aug 23 2005 Aurelien Bompard  1.3-6
 - add version to obsoletes
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/amarok/FC-4/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	22 Aug 2005 13:35:51 -0000	1.10
+++ sources	10 Sep 2005 08:22:34 -0000	1.11
@@ -1 +1 @@
-2dd100584795fb20c621fdbc96cbee1e  amarok-1.3.tar.bz2
+31f504e5fe985bbdb3c99f0e72d08fa1  amarok-1.3.1.tar.bz2



From fedora-extras-commits at redhat.com  Sat Sep 10 08:22:37 2005
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Sat, 10 Sep 2005 04:22:37 -0400
Subject: rpms/amarok/devel amarok-1.3.1-alsa-gst.patch, NONE, 1.1 .cvsignore,
	1.10, 1.11 amarok-1.3-engines-cfg.patch, 1.1, 1.2 amarok.spec,
	1.23, 1.24 sources, 1.10, 1.11
Message-ID: <200509100823.j8A8N7S5000722@cvs-int.fedora.redhat.com>

Author: abompard

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

Modified Files:
	.cvsignore amarok-1.3-engines-cfg.patch amarok.spec sources 
Added Files:
	amarok-1.3.1-alsa-gst.patch 
Log Message:
- version 1.3.1
- add patch from upstream to fix alsasink in gstreamer
- default to autoaudiosink for gstreamer



amarok-1.3.1-alsa-gst.patch:

--- NEW FILE amarok-1.3.1-alsa-gst.patch ---
--- ./amarok/src/engine/gst/gstengine.cpp.alsa-gst	2005-09-04 22:47:19.000000000 +0200
+++ ./amarok/src/engine/gst/gstengine.cpp	2005-09-09 19:32:11.000000000 +0200
@@ -806,7 +806,6 @@
 
                     if ( g_strrstr ( factory->details.klass, classname ) ) {
                         name = g_strdup ( GST_OBJECT_NAME ( factory ) );
-                        if ( name != "alsasink" )
                         results << name;
                     }
                 }
@@ -830,7 +829,7 @@
 
     destroyPipeline();
 
-    if ( GstConfig::soundOutput().isEmpty() || GstConfig::soundOutput() == "alsasink" ) {
+    if ( GstConfig::soundOutput().isEmpty() ) {
         QTimer::singleShot( 0, this, SLOT( errorNoOutput() ) );
         return false;
     }
@@ -853,7 +852,6 @@
     }
 
     m_gst_audiobin = gst_bin_new( "audiobin" );
-    gst_bin_add( GST_BIN( m_gst_audiobin ), m_gst_audiosink );
 
     /* setting device property for AudioSink*/
     if ( GstConfig::useCustomSoundDevice() && !GstConfig::soundDevice().isEmpty() )
@@ -872,6 +870,7 @@
     gst_element_link_many( m_gst_audioconvert, m_gst_equalizer, m_gst_identity,
                            m_gst_volume, m_gst_audioscale, m_gst_audiosink, NULL );
 
+    gst_bin_add( GST_BIN( m_gst_audiobin ), m_gst_audiosink );
     gst_element_set_state( m_gst_audiobin, GST_STATE_PAUSED );
 
     m_pipelineFilled = true;


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/amarok/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	22 Aug 2005 13:35:52 -0000	1.10
+++ .cvsignore	10 Sep 2005 08:22:35 -0000	1.11
@@ -1 +1 @@
-amarok-1.3.tar.bz2
+amarok-1.3.1.tar.bz2

amarok-1.3-engines-cfg.patch:

Index: amarok-1.3-engines-cfg.patch
===================================================================
RCS file: /cvs/extras/rpms/amarok/devel/amarok-1.3-engines-cfg.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- amarok-1.3-engines-cfg.patch	22 Aug 2005 13:35:52 -0000	1.1
+++ amarok-1.3-engines-cfg.patch	10 Sep 2005 08:22:35 -0000	1.2
@@ -6,7 +6,7 @@
              
              Select the sound output plugin ("sink"). Their availability depends on the system configuration.
 -            osssink
-+            alsasink
++            autoaudiosink
          
          
              


Index: amarok.spec
===================================================================
RCS file: /cvs/extras/rpms/amarok/devel/amarok.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- amarok.spec	26 Aug 2005 13:08:01 -0000	1.23
+++ amarok.spec	10 Sep 2005 08:22:35 -0000	1.24
@@ -6,17 +6,18 @@
 
 Name:       amarok
 Summary:    Media player for KDE
-Version:    1.3
-Release:    6%{?dist}
+Version:    1.3.1
+Release:    2%{?dist}
 
 Group: 	    Applications/Multimedia
 License:    GPL
 Url:        http://amarok.kde.org
-Source0:    http://dl.sf.net/amarok/amarok-1.3.tar.bz2
+Source0:    http://dl.sf.net/amarok/amarok-1.3.1.tar.bz2
 Patch0:     amarok-1.2.4-gcc4bl.patch
 #Patch1:     amarok-1.2.4-forward-decl.patch
 Patch2:     amarok-1.3-engines-cfg.patch
 Patch3:     amarok-1.3-endian.patch
+Patch4:     amarok-1.3.1-alsa-gst.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  kdemultimedia-devel >= 6:3.2
@@ -101,10 +102,11 @@
 #%patch1 -p1 -b .forward-decl
 %patch2 -p1 -b .engines-cfg
 %patch3 -p1 -b .endian
+%patch4 -p1 -b .alsa-gst
 
 
 %build
-unset QTDIR && . /etc/profile.d/qt.sh
+unset QTDIR && . %{_sysconfdir}/profile.d/qt.sh
 # work around an improper ${kdelibsuff}
 export QTLIB=${QTDIR}/lib QTINC=${QTDIR}/include
 %configure \
@@ -231,6 +233,13 @@
 
 
 %changelog
+* Sat Sep 10 2005 Aurelien Bompard  1.3.1-2
+- add patch from upstream to fix alsasink in gstreamer
+- default to autoaudiosink for gstreamer
+
+* Mon Sep 05 2005 Aurelien Bompard  1.3.1-1
+- version 1.3.1
+
 * Tue Aug 23 2005 Aurelien Bompard  1.3-6
 - add version to obsoletes
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/amarok/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	22 Aug 2005 13:35:52 -0000	1.10
+++ sources	10 Sep 2005 08:22:35 -0000	1.11
@@ -1 +1 @@
-2dd100584795fb20c621fdbc96cbee1e  amarok-1.3.tar.bz2
+31f504e5fe985bbdb3c99f0e72d08fa1  amarok-1.3.1.tar.bz2



From fedora-extras-commits at redhat.com  Sat Sep 10 09:29:52 2005
From: fedora-extras-commits at redhat.com (Marc Maurer (uwog))
Date: Sat, 10 Sep 2005 05:29:52 -0400
Subject: rpms/abiword/devel .cvsignore, 1.8, 1.9 abiword.spec, 1.17,
	1.18 sources, 1.8, 1.9 abiword-2.3.4-pangographics.patch, 1.2, NONE
Message-ID: <200509100929.j8A9Tq2D002257@cvs-int.fedora.redhat.com>

Author: uwog

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

Modified Files:
	.cvsignore abiword.spec sources 
Removed Files:
	abiword-2.3.4-pangographics.patch 
Log Message:
2.3.6 release




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/abiword/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	21 Aug 2005 12:40:16 -0000	1.8
+++ .cvsignore	10 Sep 2005 09:29:50 -0000	1.9
@@ -1 +1 @@
-abiword-2.3.5.tar.bz2
+abiword-2.3.6.tar.bz2


Index: abiword.spec
===================================================================
RCS file: /cvs/extras/rpms/abiword/devel/abiword.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- abiword.spec	2 Sep 2005 22:30:21 -0000	1.17
+++ abiword.spec	10 Sep 2005 09:29:50 -0000	1.18
@@ -2,8 +2,8 @@
 
 Summary: The AbiWord word processor
 Name: abiword
-Version: 2.3.5
-Release: 3
+Version: 2.3.6
+Release: 1
 Epoch: 1
 Group: Applications/Editors
 License: GPL
@@ -42,7 +42,6 @@
 
 Patch0: abiword-2.0.9-windowshelppaths.patch
 Patch1: abiword-2.2.6-desktop.patch
-Patch2: abiword-2.3.4-pangographics.patch
 
 %description
 AbiWord is a cross-platform Open Source word processor. The goal is to make
@@ -52,7 +51,6 @@
 %setup -q 
 %patch0 -p1 -b .windowshelppaths
 %patch1 -p1 -b .desktop
-%patch2 -p1 -b .pangographics
 
 %build
 cd abi
@@ -133,6 +131,10 @@
 %{_datadir}/icons/*png
 
 %changelog
+* Sat Sep 10 2005 Marc Maurer  - 1:2.3.6-1
+- Update to 2.3.6
+- Drop the pango patch
+
 * Sat Sep 3 2005 Marc Maurer  - 1:2.3.5-3
 - Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/abiword/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	21 Aug 2005 12:40:16 -0000	1.8
+++ sources	10 Sep 2005 09:29:50 -0000	1.9
@@ -1 +1 @@
-2b2f2b5f5379b6dd7fe4145b3f7a28d4  abiword-2.3.5.tar.bz2
+8a1fc6a2a9cec61ed15231d2fa1b3110  abiword-2.3.6.tar.bz2


--- abiword-2.3.4-pangographics.patch DELETED ---



From fedora-extras-commits at redhat.com  Sat Sep 10 09:33:18 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Sat, 10 Sep 2005 05:33:18 -0400
Subject: rpms/cvsutils - New directory
Message-ID: <200509100933.j8A9XIJK002359@cvs-int.fedora.redhat.com>

Author: corsepiu

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

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




From fedora-extras-commits at redhat.com  Sat Sep 10 09:33:19 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Sat, 10 Sep 2005 05:33:19 -0400
Subject: rpms/cvsutils/devel - New directory
Message-ID: <200509100933.j8A9XJgC002364@cvs-int.fedora.redhat.com>

Author: corsepiu

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

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




From fedora-extras-commits at redhat.com  Sat Sep 10 09:33:50 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Sat, 10 Sep 2005 05:33:50 -0400
Subject: rpms/cvsutils Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200509100933.j8A9Xoxd002413@cvs-int.fedora.redhat.com>

Author: corsepiu

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

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


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

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

common : CVS/Root
	@cvs checkout common

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

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


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Sat Sep 10 09:33:50 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Sat, 10 Sep 2005 05:33:50 -0400
Subject: rpms/cvsutils/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200509100933.j8A9Xo10002418@cvs-int.fedora.redhat.com>

Author: corsepiu

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

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


--- NEW FILE .cvsignore ---


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

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Sat Sep 10 09:35:12 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Sat, 10 Sep 2005 05:35:12 -0400
Subject: rpms/cvsutils import.log,1.1,1.2
Message-ID: <200509100935.j8A9Zg9q002491@cvs-int.fedora.redhat.com>

Author: corsepiu

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

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


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/cvsutils/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	10 Sep 2005 09:33:48 -0000	1.1
+++ import.log	10 Sep 2005 09:35:10 -0000	1.2
@@ -0,0 +1 @@
+cvsutils-0_2_3-2:HEAD:cvsutils-0.2.3-2.src.rpm:1126344896



From fedora-extras-commits at redhat.com  Sat Sep 10 09:35:12 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Sat, 10 Sep 2005 05:35:12 -0400
Subject: rpms/cvsutils/devel cvsutils.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200509100935.j8A9ZgIN002495@cvs-int.fedora.redhat.com>

Author: corsepiu

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

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


--- NEW FILE cvsutils.spec ---
Summary: 	CVS Utilities
Name: 		cvsutils
Version: 	0.2.3
Release: 	2%{?dist}
License: 	GPL
Group: 		Development/Tools
URL: 		http://www.red-bean.com/cvsutils
Source: 	http://www.red-bean.com/cvsutils/cvsutils-%{version}.tar.gz
Requires: 	cvs
BuildArch: 	noarch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description
CVS Utilities is a collection of tools to facilitate working with
Concurrent Versions System (CVS).

%prep
%setup -q

%build
%configure
make %{?_smp_mflags}

%install
rm -rf ${RPM_BUILD_ROOT}
make install DESTDIR="${RPM_BUILD_ROOT}"

for f in ${RPM_BUILD_ROOT}%{_bindir}/*; do
  echo ".so man1/cvsutils.1" > \
          ${RPM_BUILD_ROOT}%{_mandir}/man1/$(basename $f).1 
done

%clean
rm -rf ${RPM_BUILD_ROOT}

%files
%defattr(-,root,root)
%doc NEWS README COPYING
%{_bindir}/*
%{_mandir}/man1/*

%changelog
* Mon Sep 10 2005 Ralf Cors??pius  - 0.2.3-2
- Cleanup.

* Mon Sep 05 2005 Ralf Cors??pius  - 0.2.3-1
- FE submission preps.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cvsutils/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	10 Sep 2005 09:33:48 -0000	1.1
+++ .cvsignore	10 Sep 2005 09:35:10 -0000	1.2
@@ -0,0 +1 @@
+cvsutils-0.2.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cvsutils/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	10 Sep 2005 09:33:48 -0000	1.1
+++ sources	10 Sep 2005 09:35:10 -0000	1.2
@@ -0,0 +1 @@
+709a3e298c654c22b41ca06d9fc4df76  cvsutils-0.2.3.tar.gz



From fedora-extras-commits at redhat.com  Sat Sep 10 09:39:24 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Sat, 10 Sep 2005 05:39:24 -0400
Subject: rpms/cvsutils/devel cvsutils.spec,1.1,1.2
Message-ID: <200509100939.j8A9dOmH002557@cvs-int.fedora.redhat.com>

Author: corsepiu

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

Modified Files:
	cvsutils.spec 
Log Message:
Add AUTHORS, TODO


Index: cvsutils.spec
===================================================================
RCS file: /cvs/extras/rpms/cvsutils/devel/cvsutils.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cvsutils.spec	10 Sep 2005 09:35:10 -0000	1.1
+++ cvsutils.spec	10 Sep 2005 09:39:22 -0000	1.2
@@ -1,7 +1,7 @@
 Summary: 	CVS Utilities
 Name: 		cvsutils
 Version: 	0.2.3
-Release: 	2%{?dist}
+Release: 	3%{?dist}
 License: 	GPL
 Group: 		Development/Tools
 URL: 		http://www.red-bean.com/cvsutils
@@ -35,11 +35,14 @@
 
 %files
 %defattr(-,root,root)
-%doc NEWS README COPYING
+%doc NEWS README COPYING AUTHORS TODO
 %{_bindir}/*
 %{_mandir}/man1/*
 
 %changelog
+* Mon Sep 10 2005 Ralf Cors??pius  - 0.2.3-3
+- Add AUTHORS, TODO.
+
 * Mon Sep 10 2005 Ralf Cors??pius  - 0.2.3-2
 - Cleanup.
 



From fedora-extras-commits at redhat.com  Sat Sep 10 10:28:59 2005
From: fedora-extras-commits at redhat.com (Duncan Ferguson (duncs))
Date: Sat, 10 Sep 2005 06:28:59 -0400
Subject: rpms/perl-X11-Protocol - New directory
Message-ID: <200509101028.j8AASxRX005912@cvs-int.fedora.redhat.com>

Author: duncs

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

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




From fedora-extras-commits at redhat.com  Sat Sep 10 10:28:59 2005
From: fedora-extras-commits at redhat.com (Duncan Ferguson (duncs))
Date: Sat, 10 Sep 2005 06:28:59 -0400
Subject: rpms/perl-X11-Protocol/devel - New directory
Message-ID: <200509101028.j8AASxFU005917@cvs-int.fedora.redhat.com>

Author: duncs

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

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




From fedora-extras-commits at redhat.com  Sat Sep 10 10:29:12 2005
From: fedora-extras-commits at redhat.com (Duncan Ferguson (duncs))
Date: Sat, 10 Sep 2005 06:29:12 -0400
Subject: rpms/perl-X11-Protocol Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200509101029.j8AATCBQ005962@cvs-int.fedora.redhat.com>

Author: duncs

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

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


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

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

common : CVS/Root
	@cvs checkout common

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

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


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Sat Sep 10 10:29:12 2005
From: fedora-extras-commits at redhat.com (Duncan Ferguson (duncs))
Date: Sat, 10 Sep 2005 06:29:12 -0400
Subject: rpms/perl-X11-Protocol/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200509101029.j8AATCwB005965@cvs-int.fedora.redhat.com>

Author: duncs

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

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


--- NEW FILE .cvsignore ---


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

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Sat Sep 10 10:29:53 2005
From: fedora-extras-commits at redhat.com (Duncan Ferguson (duncs))
Date: Sat, 10 Sep 2005 06:29:53 -0400
Subject: rpms/perl-X11-Protocol import.log,1.1,1.2
Message-ID: <200509101030.j8AAUNIv006039@cvs-int.fedora.redhat.com>

Author: duncs

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

Modified Files:
	import.log 
Log Message:
auto-import perl-X11-Protocol-0.54-2 on branch devel from perl-X11-Protocol-0.54-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-X11-Protocol/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	10 Sep 2005 10:29:10 -0000	1.1
+++ import.log	10 Sep 2005 10:29:50 -0000	1.2
@@ -0,0 +1 @@
+perl-X11-Protocol-0_54-2:HEAD:perl-X11-Protocol-0.54-2.src.rpm:1126348188



From fedora-extras-commits at redhat.com  Sat Sep 10 10:29:53 2005
From: fedora-extras-commits at redhat.com (Duncan Ferguson (duncs))
Date: Sat, 10 Sep 2005 06:29:53 -0400
Subject: rpms/perl-X11-Protocol/devel perl-X11-Protocol.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200509101030.j8AAUNq4006043@cvs-int.fedora.redhat.com>

Author: duncs

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

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


--- NEW FILE perl-X11-Protocol.spec ---
Name:           perl-X11-Protocol
Version:        0.54
Release:        2%{?dist}
Summary:        X11-Protocol - Raw interface to X Window System servers

Group:          Development/Libraries
License:        GPL or Artistic
URL:            http://search.cpan.org/dist/X11-Protocol/
Source0:        http://search.cpan.org/CPAN/authors/id/S/SM/SMCCAM/X11-Protocol-0.54.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:	noarch
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
X11::Protocol is a client-side interface to the X11 Protocol (see X(1) for
information about X11), allowing perl programs to display windows and
graphics on X11 servers.

A full description of the protocol is beyond the scope of this documentation;
for complete information, see the I,
available as Postscript or *roff source from C, or
I of O'Reilly & Associates's series of
books about X (ISBN 1-56592-083-X, C), which contains
most of the same information.

%prep
%setup -q -n X11-Protocol-%{version}

# Testing requires X - use "rpmbuild --with X"
%{!?_with_X:\
%{__perl} -pi -e 'print "print \"Remaining tests require X\n\"; exit 0;"
			if /Insert your test code below/;' test.pl \
}

perldoc -t perlartistic > Artistic
perldoc -t perlgpl > COPYING

# Remove shebangs from module code
find . -name '*.pm' -exec sed -i -e '/^#!\/usr\/bin\/perl$/d' {} ';'


%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}


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


%check
make test


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc README Changes Todo eg COPYING Artistic
%{perl_vendorlib}/X11/
%{_mandir}/man3/*.3*


%changelog
* Fri Aug 26 2005 Paul Howarth  0.54-2
- remove redundant BR: perl
- remove compiler optimization flags, redundant for noarch package
- require "rpmbuild --with X" to run tests requiring X
- include examples as %%doc
- include license text

* Thu Aug 18 2005 Duncan Ferguson  0.54-1
- Initial build


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-X11-Protocol/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	10 Sep 2005 10:29:10 -0000	1.1
+++ .cvsignore	10 Sep 2005 10:29:51 -0000	1.2
@@ -0,0 +1 @@
+X11-Protocol-0.54.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-X11-Protocol/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	10 Sep 2005 10:29:10 -0000	1.1
+++ sources	10 Sep 2005 10:29:51 -0000	1.2
@@ -0,0 +1 @@
+b2ad4dc41755f2b08f9cd2899636346c  X11-Protocol-0.54.tar.gz



From fedora-extras-commits at redhat.com  Sat Sep 10 10:36:08 2005
From: fedora-extras-commits at redhat.com (Duncan Ferguson (duncs))
Date: Sat, 10 Sep 2005 06:36:08 -0400
Subject: owners owners.list,1.186,1.187
Message-ID: <200509101036.j8AAa8uJ006127@cvs-int.fedora.redhat.com>

Author: duncs

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

Modified Files:
	owners.list 
Log Message:
perl-X11-Protocol added



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.186
retrieving revision 1.187
diff -u -r1.186 -r1.187
--- owners.list	10 Sep 2005 02:40:35 -0000	1.186
+++ owners.list	10 Sep 2005 10:36:06 -0000	1.187
@@ -1049,3 +1049,4 @@
 Fedora Extras|zoo|File archiving utility with compression|Nicolas.Mailhot at laPoste.net|extras-qa at fedoraproject.org|
 Fedora Extras|zope|Application server in Python|gauret at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|zziplib|Lightweight library to easily extract data from zip files|matthias at rpmforge.net|extras-qa at fedoraproject.org|
+Fedora Extras|perl-X11-Protocol|Perl interface to X11|duncan_j_ferguson at yahoo.co.uk|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sat Sep 10 11:20:28 2005
From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2))
Date: Sat, 10 Sep 2005 07:20:28 -0400
Subject: rpms/clamav/devel clamav.spec,1.27,1.28
Message-ID: <200509101120.j8ABKSWL007643@cvs-int.fedora.redhat.com>

Author: dwmw2

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

Modified Files:
	clamav.spec 
Log Message:
add clamav-exim subpackage


Index: clamav.spec
===================================================================
RCS file: /cvs/extras/rpms/clamav/devel/clamav.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- clamav.spec	29 Jul 2005 16:29:09 -0000	1.27
+++ clamav.spec	10 Sep 2005 11:20:26 -0000	1.28
@@ -14,6 +14,9 @@
 %global milterlog	%_var/log/clamd.milter
 %global milteruser	clamilt
 %global milterstatedir	%_var/run/clamav-milter
+%global clameximlog	%_var/log/clamd.exim
+%global clameximuser	clamexim
+%global clameximstatedir %_var/run/clamd.exim
 %global pkgdatadir	%_datadir/%name
 
 
@@ -22,7 +25,7 @@
 Summary:	End-user tools for the Clam Antivirus scanner
 Name:		clamav
 Version:	0.86.2
-Release:	%release_func 4
+Release:	%release_func 5
 
 License:	GPL
 Group:		Applications/File
@@ -107,6 +110,21 @@
 Requires(pre):		fedora-usermgmt >= 0.7
 Requires(postun):	fedora-usermgmt >= 0.7
 
+%package exim
+Summary:	Exim d??mon configuration for the Clam Antivirus scanner
+Group:		System Environment/Daemons
+## For now, use this as a placeholder. Later, generate separate -sysv
+## and -minit subpackages
+Requires:	init(clamav-exim)
+Provides:	init(clamav-exim)
+Requires(pre):		exim
+Requires(pre):		%_initrddir
+Requires(postun):	%_initrddir initscripts
+Requires(post):		chkconfig coreutils
+Requires(preun):	chkconfig initscripts
+Requires(pre):		fedora-usermgmt >= 0.7
+Requires(postun):	fedora-usermgmt >= 0.7
+
 
 %description
 Clam AntiVirus is an anti-virus toolkit for UNIX. The main purpose of this
@@ -159,6 +177,22 @@
 
 THIS PACKAGE IS TO BE CONSIDERED AS EXPERIMENTAL!
 
+%description exim
+This package contains files which are needed to run the clamav d??mon for use
+by the Exim MTA. It can be activated by adding
+
+   av_scanner = clamd:%clameximstatedir/clamd.sock 
+
+to your exim.conf, and using the 'malware' condition in the data ACL, 
+as follows:
+
+   deny message = This message contains malware ($malware_name)
+      demime = *
+      malware = *
+
+For further details of Exim content scanning, see chapter 40 of the Exim 
+specification: http://www.exim.org/exim-html-4.50/doc/html/spec_40.html
+
 ## ------------------------------------------------------------
 
 %prep
@@ -226,6 +260,7 @@
 	${RPM_BUILD_ROOT}%{_sysconfdir}/{clamd.d,cron.d,logrotate.d,sysconfig} \
 	${RPM_BUILD_ROOT}%{_var}/log \
 	${RPM_BUILD_ROOT}%milterstatedir \
+	${RPM_BUILD_ROOT}%clameximstatedir \
 	${RPM_BUILD_ROOT}%pkgdatadir/template \
 	${RPM_BUILD_ROOT}%{_initrddir}
 
@@ -268,15 +303,34 @@
    $RPM_BUILD_ROOT%pkgdatadir/freshclam-sleep
 
 
-%if 0%{!?_without_milter:1}
-#### The milter stuff
+#### The Exim stuff
 
 function subst() {
-	sed -e 's!!milter!g;s!!%milteruser!g;'"$3" "$1" >"$RPM_BUILD_ROOT$2"
+	sed -e "s!!$3!g;s!!$4!g;""$5" "$1" >"$RPM_BUILD_ROOT$2"
 }
 
+subst etc/clamd.conf %_sysconfdir/clamd.d/exim.conf exim %clameximuser \
+	's!^##*\(\(LogFile\|LocalSocket\|PidFile\|User\)\s\|\(StreamSaveToDisk\|ScanMail\|LogTime\|ScanArchive\)$\)!\1!;s!^Example!#Example!;'
 
-subst etc/clamd.conf /etc/clamd.d/milter.conf \
+
+subst %{SOURCE7} %_initrddir/clamd.exim exim %clameximuser ''
+chmod 0755 $RPM_BUILD_ROOT%_initrddir/clamd.exim
+subst %{SOURCE3} %_sysconfdir/logrotate.d/clamd.exim exim %clameximuser ''
+
+cat <$RPM_BUILD_ROOT%_sysconfdir/sysconfig/clamd.exim
+CLAMD_CONFIG='%_sysconfdir/clamd.d/exim.conf'
+CLAMD_SOCKET=%clameximstatedir/clamd.sock
+EOF
+
+mkdir -p $RPM_BUILD_ROOT/%clameximstatedir
+ln -sf clamd $RPM_BUILD_ROOT%_sbindir/clamd.exim
+
+touch $RPM_BUILD_ROOT%clameximstatedir/clamd.sock $RPM_BUILD_ROOT%clameximlog
+
+%if 0%{!?_without_milter:1}
+#### The milter stuff
+
+subst etc/clamd.conf /etc/clamd.d/milter.conf milter %milteruser \
 	's!^##*\(\(LogFile\|LocalSocket\|PidFile\|User\)\s\|\(StreamSaveToDisk\|ScanMail\)$\)!\1!;'
 
 
@@ -337,6 +391,26 @@
 test "$1" != 0 || /usr/sbin/fedora-groupdel %{milteruser} &>/dev/null || :
 test "$1"  = 0 || %{_initrddir}/clamav-milter condrestart >/dev/null || :
 
+%pre exim
+/usr/sbin/fedora-useradd  5 -r -s /sbin/nologin -d %clameximstatedir -M \
+                            -c 'Clamav Exim User' -g exim %clameximuser &>/dev/null || :
+
+%post exim
+/sbin/chkconfig --add clamd.exim
+test -e %clameximlog || {
+	touch %clameximlog
+	chmod 0620             %clameximlog
+	chown root:exim %clameximlog
+}
+
+%preun exim
+test "$1" != 0 || %{_initrddir}/clamd.exim stop &>/dev/null || :
+test "$1" != 0 || /sbin/chkconfig --del clamd.exim
+
+%postun exim
+test "$1" != 0 || /usr/sbin/fedora-userdel  %{clameximuser} &>/dev/null || :
+test "$1"  = 0 || %{_initrddir}/clamd.exim condrestart >/dev/null || :
+
 
 %post   lib -p /sbin/ldconfig
 %postun lib -p /sbin/ldconfig
@@ -414,6 +488,19 @@
 
 ## -----------------------
 
+%files exim
+%defattr(-,root,root,-)
+%_sbindir/clamd.exim
+%config %{_initrddir}/clamd.exim
+%config(noreplace) %verify(not mtime) %{_sysconfdir}/clamd.d/exim.conf
+%config(noreplace) %verify(not mtime) %{_sysconfdir}/sysconfig/clamd.exim
+%config(noreplace) %verify(not mtime) %{_sysconfdir}/logrotate.d/clamd.exim
+%attr(0750,%clameximuser,exim) %dir %clameximstatedir
+%ghost %clameximstatedir/*
+%ghost %attr(0620,root,exim) %verify(not size md5 mtime) %clameximlog
+
+## -----------------------
+
 %files milter
 %defattr(-,root,root,-)
 %doc clamav-milter/INSTALL
@@ -428,6 +515,9 @@
 %endif	# _without_milter
 
 %changelog
+* 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



From fedora-extras-commits at redhat.com  Sat Sep 10 11:20:34 2005
From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2))
Date: Sat, 10 Sep 2005 07:20:34 -0400
Subject: rpms/clamav/FC-4 clamav.spec,1.26,1.27
Message-ID: <200509101120.j8ABKYig007665@cvs-int.fedora.redhat.com>

Author: dwmw2

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

Modified Files:
	clamav.spec 
Log Message:
add clamav-exim subpackage


Index: clamav.spec
===================================================================
RCS file: /cvs/extras/rpms/clamav/FC-4/clamav.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- clamav.spec	29 Jul 2005 16:37:45 -0000	1.26
+++ clamav.spec	10 Sep 2005 11:20:32 -0000	1.27
@@ -14,6 +14,9 @@
 %global milterlog	%_var/log/clamd.milter
 %global milteruser	clamilt
 %global milterstatedir	%_var/run/clamav-milter
+%global clameximlog	%_var/log/clamd.exim
+%global clameximuser	clamexim
+%global clameximstatedir %_var/run/clamd.exim
 %global pkgdatadir	%_datadir/%name
 
 
@@ -22,7 +25,7 @@
 Summary:	End-user tools for the Clam Antivirus scanner
 Name:		clamav
 Version:	0.86.2
-Release:	%release_func 4
+Release:	%release_func 5
 
 License:	GPL
 Group:		Applications/File
@@ -107,6 +110,21 @@
 Requires(pre):		fedora-usermgmt >= 0.7
 Requires(postun):	fedora-usermgmt >= 0.7
 
+%package exim
+Summary:	Exim d??mon configuration for the Clam Antivirus scanner
+Group:		System Environment/Daemons
+## For now, use this as a placeholder. Later, generate separate -sysv
+## and -minit subpackages
+Requires:	init(clamav-exim)
+Provides:	init(clamav-exim)
+Requires(pre):		exim
+Requires(pre):		%_initrddir
+Requires(postun):	%_initrddir initscripts
+Requires(post):		chkconfig coreutils
+Requires(preun):	chkconfig initscripts
+Requires(pre):		fedora-usermgmt >= 0.7
+Requires(postun):	fedora-usermgmt >= 0.7
+
 
 %description
 Clam AntiVirus is an anti-virus toolkit for UNIX. The main purpose of this
@@ -159,6 +177,22 @@
 
 THIS PACKAGE IS TO BE CONSIDERED AS EXPERIMENTAL!
 
+%description exim
+This package contains files which are needed to run the clamav d??mon for use
+by the Exim MTA. It can be activated by adding
+
+   av_scanner = clamd:%clameximstatedir/clamd.sock 
+
+to your exim.conf, and using the 'malware' condition in the data ACL, 
+as follows:
+
+   deny message = This message contains malware ($malware_name)
+      demime = *
+      malware = *
+
+For further details of Exim content scanning, see chapter 40 of the Exim 
+specification: http://www.exim.org/exim-html-4.50/doc/html/spec_40.html
+
 ## ------------------------------------------------------------
 
 %prep
@@ -226,6 +260,7 @@
 	${RPM_BUILD_ROOT}%{_sysconfdir}/{clamd.d,cron.d,logrotate.d,sysconfig} \
 	${RPM_BUILD_ROOT}%{_var}/log \
 	${RPM_BUILD_ROOT}%milterstatedir \
+	${RPM_BUILD_ROOT}%clameximstatedir \
 	${RPM_BUILD_ROOT}%pkgdatadir/template \
 	${RPM_BUILD_ROOT}%{_initrddir}
 
@@ -268,15 +303,34 @@
    $RPM_BUILD_ROOT%pkgdatadir/freshclam-sleep
 
 
-%if 0%{!?_without_milter:1}
-#### The milter stuff
+#### The Exim stuff
 
 function subst() {
-	sed -e 's!!milter!g;s!!%milteruser!g;'"$3" "$1" >"$RPM_BUILD_ROOT$2"
+	sed -e "s!!$3!g;s!!$4!g;""$5" "$1" >"$RPM_BUILD_ROOT$2"
 }
 
+subst etc/clamd.conf %_sysconfdir/clamd.d/exim.conf exim %clameximuser \
+	's!^##*\(\(LogFile\|LocalSocket\|PidFile\|User\)\s\|\(StreamSaveToDisk\|ScanMail\|LogTime\|ScanArchive\)$\)!\1!;s!^Example!#Example!;'
 
-subst etc/clamd.conf /etc/clamd.d/milter.conf \
+
+subst %{SOURCE7} %_initrddir/clamd.exim exim %clameximuser ''
+chmod 0755 $RPM_BUILD_ROOT%_initrddir/clamd.exim
+subst %{SOURCE3} %_sysconfdir/logrotate.d/clamd.exim exim %clameximuser ''
+
+cat <$RPM_BUILD_ROOT%_sysconfdir/sysconfig/clamd.exim
+CLAMD_CONFIG='%_sysconfdir/clamd.d/exim.conf'
+CLAMD_SOCKET=%clameximstatedir/clamd.sock
+EOF
+
+mkdir -p $RPM_BUILD_ROOT/%clameximstatedir
+ln -sf clamd $RPM_BUILD_ROOT%_sbindir/clamd.exim
+
+touch $RPM_BUILD_ROOT%clameximstatedir/clamd.sock $RPM_BUILD_ROOT%clameximlog
+
+%if 0%{!?_without_milter:1}
+#### The milter stuff
+
+subst etc/clamd.conf /etc/clamd.d/milter.conf milter %milteruser \
 	's!^##*\(\(LogFile\|LocalSocket\|PidFile\|User\)\s\|\(StreamSaveToDisk\|ScanMail\)$\)!\1!;'
 
 
@@ -337,6 +391,26 @@
 test "$1" != 0 || /usr/sbin/fedora-groupdel %{milteruser} &>/dev/null || :
 test "$1"  = 0 || %{_initrddir}/clamav-milter condrestart >/dev/null || :
 
+%pre exim
+/usr/sbin/fedora-useradd  5 -r -s /sbin/nologin -d %clameximstatedir -M \
+                            -c 'Clamav Exim User' -g exim %clameximuser &>/dev/null || :
+
+%post exim
+/sbin/chkconfig --add clamd.exim
+test -e %clameximlog || {
+	touch %clameximlog
+	chmod 0620             %clameximlog
+	chown root:exim %clameximlog
+}
+
+%preun exim
+test "$1" != 0 || %{_initrddir}/clamd.exim stop &>/dev/null || :
+test "$1" != 0 || /sbin/chkconfig --del clamd.exim
+
+%postun exim
+test "$1" != 0 || /usr/sbin/fedora-userdel  %{clameximuser} &>/dev/null || :
+test "$1"  = 0 || %{_initrddir}/clamd.exim condrestart >/dev/null || :
+
 
 %post   lib -p /sbin/ldconfig
 %postun lib -p /sbin/ldconfig
@@ -414,6 +488,19 @@
 
 ## -----------------------
 
+%files exim
+%defattr(-,root,root,-)
+%_sbindir/clamd.exim
+%config %{_initrddir}/clamd.exim
+%config(noreplace) %verify(not mtime) %{_sysconfdir}/clamd.d/exim.conf
+%config(noreplace) %verify(not mtime) %{_sysconfdir}/sysconfig/clamd.exim
+%config(noreplace) %verify(not mtime) %{_sysconfdir}/logrotate.d/clamd.exim
+%attr(0750,%clameximuser,exim) %dir %clameximstatedir
+%ghost %clameximstatedir/*
+%ghost %attr(0620,root,exim) %verify(not size md5 mtime) %clameximlog
+
+## -----------------------
+
 %files milter
 %defattr(-,root,root,-)
 %doc clamav-milter/INSTALL
@@ -428,6 +515,9 @@
 %endif	# _without_milter
 
 %changelog
+* 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



From fedora-extras-commits at redhat.com  Sat Sep 10 11:20:53 2005
From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2))
Date: Sat, 10 Sep 2005 07:20:53 -0400
Subject: common tobuild,1.2213,1.2214
Message-ID: <200509101120.j8ABKrsB007715@cvs-int.fedora.redhat.com>

Author: dwmw2

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7696

Modified Files:
	tobuild 
Log Message:
request build of rpms/clamav/FC-4 clamav-0_86_2-5_fc4 for fc4


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.2213
retrieving revision 1.2214
diff -u -r1.2213 -r1.2214
--- tobuild	29 Aug 2005 10:10:28 -0000	1.2213
+++ tobuild	10 Sep 2005 11:20:51 -0000	1.2214
@@ -37,3 +37,4 @@
 joost	rpms/fpc/FC-3	fpc-2_0_0-1	fc3
 gemi	rpms/clisp/FC-3	clisp-2_34-5_fc3	fc3
 katzj	rpms/perl-Class-Trigger/devel	perl-Class-Trigger-0_09-3_fc5	devel
+dwmw2	rpms/clamav/FC-4	clamav-0_86_2-5_fc4	fc4



From fedora-extras-commits at redhat.com  Sat Sep 10 13:20:43 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sat, 10 Sep 2005 09:20:43 -0400
Subject: owners owners.list,1.187,1.188
Message-ID: <200509101320.j8ADKhtX010782@cvs-int.fedora.redhat.com>

Author: scop

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

Modified Files:
	owners.list 
Log Message:
+keychain, fix sorting


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.187
retrieving revision 1.188
diff -u -r1.187 -r1.188
--- owners.list	10 Sep 2005 10:36:06 -0000	1.187
+++ owners.list	10 Sep 2005 13:20:40 -0000	1.188
@@ -351,6 +351,7 @@
 Fedora Extras|kannel|WAP and SMS gateway|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|kasumi|Anthy dictionary management tool|tagoh at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|kernel-module-thinkpad|IBM ThinkPad support kernel modules|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
+Fedora Extras|keychain|Agent manager for OpenSSH, ssh.com, Sun SSH, and GnuPG|ad+rh-bugzilla at uni-x.org|extras-qa at fedoraproject.org|
 Fedora Extras|kickpim|KDE kicker applet to access addressbook|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|kid3|Efficient ID3 tagger|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|kile|LaTeX source editor and TeX shell|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
@@ -743,6 +744,7 @@
 Fedora Extras|perl-Unix-Syslog|Perl interface to the UNIX syslog(3) calls|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Want|Perl module implementing a generalisation of wantarray|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-WWW-Mechanize|Automates web page form & link interaction|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-X11-Protocol|Perl interface to X11|duncan_j_ferguson at yahoo.co.uk|extras-qa at fedoraproject.org|
 Fedora Extras|perl-XML-LibXSLT|Perl module for interfacing to GNOME's libxslt|shishz at hotpop.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-XML-RSS|Perl module for managing RDF Site Summary (RSS) files|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-XML-Simple|Easy API to maintain XML in Perl|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
@@ -1049,4 +1051,3 @@
 Fedora Extras|zoo|File archiving utility with compression|Nicolas.Mailhot at laPoste.net|extras-qa at fedoraproject.org|
 Fedora Extras|zope|Application server in Python|gauret at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|zziplib|Lightweight library to easily extract data from zip files|matthias at rpmforge.net|extras-qa at fedoraproject.org|
-Fedora Extras|perl-X11-Protocol|Perl interface to X11|duncan_j_ferguson at yahoo.co.uk|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sat Sep 10 15:57:02 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sat, 10 Sep 2005 11:57:02 -0400
Subject: rpms/keychain/FC-3 keychain.spec,1.2,1.3
Message-ID: <200509101557.j8AFv2wX013987@cvs-int.fedora.redhat.com>

Author: scop

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

Modified Files:
	keychain.spec 
Log Message:
Add disttag.


Index: keychain.spec
===================================================================
RCS file: /cvs/extras/rpms/keychain/FC-3/keychain.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- keychain.spec	16 Aug 2005 20:55:11 -0000	1.2
+++ keychain.spec	10 Sep 2005 15:57:00 -0000	1.3
@@ -1,7 +1,7 @@
 Name:		keychain
 Summary:	Agent manager for OpenSSH, ssh.com, Sun SSH, and GnuPG
 Version:	2.5.5
-Release:	2
+Release:	2%{?dist}
 License:	GPL
 Group:		Applications/Internet
 URL:		http://www.gentoo.org/proj/en/keychain/



From fedora-extras-commits at redhat.com  Sat Sep 10 15:57:02 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sat, 10 Sep 2005 11:57:02 -0400
Subject: rpms/keychain/FC-4 keychain.spec,1.2,1.3
Message-ID: <200509101557.j8AFv20I013993@cvs-int.fedora.redhat.com>

Author: scop

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

Modified Files:
	keychain.spec 
Log Message:
Add disttag.


Index: keychain.spec
===================================================================
RCS file: /cvs/extras/rpms/keychain/FC-4/keychain.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- keychain.spec	16 Aug 2005 20:55:11 -0000	1.2
+++ keychain.spec	10 Sep 2005 15:57:00 -0000	1.3
@@ -1,7 +1,7 @@
 Name:		keychain
 Summary:	Agent manager for OpenSSH, ssh.com, Sun SSH, and GnuPG
 Version:	2.5.5
-Release:	2
+Release:	2%{?dist}
 License:	GPL
 Group:		Applications/Internet
 URL:		http://www.gentoo.org/proj/en/keychain/



From fedora-extras-commits at redhat.com  Sat Sep 10 15:57:03 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sat, 10 Sep 2005 11:57:03 -0400
Subject: rpms/keychain/devel keychain.spec,1.2,1.3
Message-ID: <200509101557.j8AFv3ch013999@cvs-int.fedora.redhat.com>

Author: scop

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

Modified Files:
	keychain.spec 
Log Message:
Add disttag.


Index: keychain.spec
===================================================================
RCS file: /cvs/extras/rpms/keychain/devel/keychain.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- keychain.spec	16 Aug 2005 20:55:11 -0000	1.2
+++ keychain.spec	10 Sep 2005 15:57:01 -0000	1.3
@@ -1,7 +1,7 @@
 Name:		keychain
 Summary:	Agent manager for OpenSSH, ssh.com, Sun SSH, and GnuPG
 Version:	2.5.5
-Release:	2
+Release:	2%{?dist}
 License:	GPL
 Group:		Applications/Internet
 URL:		http://www.gentoo.org/proj/en/keychain/



From fedora-extras-commits at redhat.com  Sat Sep 10 19:26:31 2005
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Sat, 10 Sep 2005 15:26:31 -0400
Subject: rpms/lablgtk/FC-4 lablgtk.spec,1.9,1.10
Message-ID: <200509101926.j8AJQVaT019577@cvs-int.fedora.redhat.com>

Author: gemi

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

Modified Files:
	lablgtk.spec 
Log Message:
include META file


Index: lablgtk.spec
===================================================================
RCS file: /cvs/extras/rpms/lablgtk/FC-4/lablgtk.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- lablgtk.spec	26 May 2005 18:38:34 -0000	1.9
+++ lablgtk.spec	10 Sep 2005 19:26:29 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           lablgtk
 Version:        2.4.0
-Release: 5
+Release:	6%{?dist}
 
 Summary:        Objective Caml interface to gtk+
 
@@ -8,7 +8,7 @@
 License:        LGPL
 URL:            http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/lablgtk.html
 Source:         http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/dist/lablgtk-2.4.0.tar.gz
-Patch0: lablgtk-gcc4.patch
+Patch0:		lablgtk-gcc4.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:       ocaml >= 3.08
 %{?_with_gl:Requires: lablgl >= 1.00}
@@ -33,6 +33,8 @@
 %prep
 %setup -q
 %patch0 -p1 -b .gcc4
+# version information in META file is wrong
+perl -pi -e 's|version="1.3.1"|version="2.4.0"|' META
 
 %build
 %configure %{?_with_gl: --with-gl} %{!?_with_gl: --without-gl} --enable-debug
@@ -41,9 +43,16 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT%{_bindir} $RPM_BUILD_ROOT%{_libdir} $RPM_BUILD_ROOT%{_libdir}/ocaml/lablgtk2 $RPM_BUILD_ROOT%{_libdir}/ocaml/stublibs
-make install BINDIR=$RPM_BUILD_ROOT%{_bindir} LIBDIR=$RPM_BUILD_ROOT%{_libdir} INSTALLDIR=$RPM_BUILD_ROOT%{_libdir}/ocaml/lablgtk2 DLLDIR=$RPM_BUILD_ROOT%{_libdir}/ocaml/stublibs
-
+mkdir -p $RPM_BUILD_ROOT%{_bindir} \
+      $RPM_BUILD_ROOT%{_libdir} \
+      $RPM_BUILD_ROOT%{_libdir}/ocaml/lablgtk2 \
+      $RPM_BUILD_ROOT%{_libdir}/ocaml/stublibs
+make install \
+     BINDIR=$RPM_BUILD_ROOT%{_bindir} \
+     LIBDIR=$RPM_BUILD_ROOT%{_libdir} \
+     INSTALLDIR=$RPM_BUILD_ROOT%{_libdir}/ocaml/lablgtk2 \
+     DLLDIR=$RPM_BUILD_ROOT%{_libdir}/ocaml/stublibs
+cp META $RPM_BUILD_ROOT%{_libdir}/ocaml/lablgtk2
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -61,6 +70,9 @@
 %doc examples
 
 %changelog
+* Sat Sep 10 2005 Gerard Milmeister  - 2.4.0-6
+- include META file
+
 * Sun May 22 2005 Toshio Kuratomi  - 2.4.0-5
 - Removed gnome-1.x BuildRequires
 - Removed BuildRequires not explicitly mentioned in the configure script



From fedora-extras-commits at redhat.com  Sat Sep 10 19:27:25 2005
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Sat, 10 Sep 2005 15:27:25 -0400
Subject: rpms/lablgtk/devel lablgtk.spec,1.9,1.10
Message-ID: <200509101927.j8AJRPUQ019636@cvs-int.fedora.redhat.com>

Author: gemi

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

Modified Files:
	lablgtk.spec 
Log Message:
include META file


Index: lablgtk.spec
===================================================================
RCS file: /cvs/extras/rpms/lablgtk/devel/lablgtk.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- lablgtk.spec	26 May 2005 18:38:34 -0000	1.9
+++ lablgtk.spec	10 Sep 2005 19:27:23 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           lablgtk
 Version:        2.4.0
-Release: 5
+Release:	6%{?dist}
 
 Summary:        Objective Caml interface to gtk+
 
@@ -8,7 +8,7 @@
 License:        LGPL
 URL:            http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/lablgtk.html
 Source:         http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/dist/lablgtk-2.4.0.tar.gz
-Patch0: lablgtk-gcc4.patch
+Patch0:		lablgtk-gcc4.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:       ocaml >= 3.08
 %{?_with_gl:Requires: lablgl >= 1.00}
@@ -33,6 +33,8 @@
 %prep
 %setup -q
 %patch0 -p1 -b .gcc4
+# version information in META file is wrong
+perl -pi -e 's|version="1.3.1"|version="2.4.0"|' META
 
 %build
 %configure %{?_with_gl: --with-gl} %{!?_with_gl: --without-gl} --enable-debug
@@ -41,9 +43,16 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT%{_bindir} $RPM_BUILD_ROOT%{_libdir} $RPM_BUILD_ROOT%{_libdir}/ocaml/lablgtk2 $RPM_BUILD_ROOT%{_libdir}/ocaml/stublibs
-make install BINDIR=$RPM_BUILD_ROOT%{_bindir} LIBDIR=$RPM_BUILD_ROOT%{_libdir} INSTALLDIR=$RPM_BUILD_ROOT%{_libdir}/ocaml/lablgtk2 DLLDIR=$RPM_BUILD_ROOT%{_libdir}/ocaml/stublibs
-
+mkdir -p $RPM_BUILD_ROOT%{_bindir} \
+      $RPM_BUILD_ROOT%{_libdir} \
+      $RPM_BUILD_ROOT%{_libdir}/ocaml/lablgtk2 \
+      $RPM_BUILD_ROOT%{_libdir}/ocaml/stublibs
+make install \
+     BINDIR=$RPM_BUILD_ROOT%{_bindir} \
+     LIBDIR=$RPM_BUILD_ROOT%{_libdir} \
+     INSTALLDIR=$RPM_BUILD_ROOT%{_libdir}/ocaml/lablgtk2 \
+     DLLDIR=$RPM_BUILD_ROOT%{_libdir}/ocaml/stublibs
+cp META $RPM_BUILD_ROOT%{_libdir}/ocaml/lablgtk2
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -61,6 +70,9 @@
 %doc examples
 
 %changelog
+* Sat Sep 10 2005 Gerard Milmeister  - 2.4.0-6
+- include META file
+
 * Sun May 22 2005 Toshio Kuratomi  - 2.4.0-5
 - Removed gnome-1.x BuildRequires
 - Removed BuildRequires not explicitly mentioned in the configure script



From fedora-extras-commits at redhat.com  Sat Sep 10 19:28:06 2005
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Sat, 10 Sep 2005 15:28:06 -0400
Subject: rpms/lablgtk/FC-3 lablgtk.spec,1.5,1.6
Message-ID: <200509101928.j8AJS6md019695@cvs-int.fedora.redhat.com>

Author: gemi

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

Modified Files:
	lablgtk.spec 
Log Message:
include META file


Index: lablgtk.spec
===================================================================
RCS file: /cvs/extras/rpms/lablgtk/FC-3/lablgtk.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- lablgtk.spec	12 Feb 2005 11:03:42 -0000	1.5
+++ lablgtk.spec	10 Sep 2005 19:28:04 -0000	1.6
@@ -1,21 +1,24 @@
 Name:           lablgtk
 Version:        2.4.0
-Release:        2
-Epoch:          0
-Summary:        An Objective Caml interface to gtk+
+Release:	6%{?dist}
+
+Summary:        Objective Caml interface to gtk+
 
 Group:          System Environment/Libraries
 License:        LGPL
 URL:            http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/lablgtk.html
 Source:         http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/dist/lablgtk-2.4.0.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires:       ocaml >= 0:3.08
-%{?_with_gl:Requires: lablgl >= 0:1.00}
-BuildRequires:  ocaml >= 0:3.08, camlp4 >= 0:3.08
-%{?_with_gl:BuildRequires: lablgl >= 0:1.00, gtkglarea2-devel}
-BuildRequires:  gtk2-devel, libglade-devel, gdk-pixbuf-devel
-BuildRequires:	librsvg2-devel, libcroco-devel
-BuildRequires:  libbonobo-devel, bonobo-activation-devel, GConf2-devel
+Requires:       ocaml >= 3.08
+%{?_with_gl:Requires: lablgl >= 1.00}
+BuildRequires:  ocaml >= 3.08, camlp4 >= 3.08
+# lablgtk can generate quite extensive documentation.
+# Probably should enable this and create a subpackage for it.
+#BuildRequires:  ocaml-ocamldoc
+%{?_with_gl:BuildRequires: lablgl >= 1.00, gtkglarea2-devel}
+BuildRequires:  gtk2-devel
+BuildRequires:  libglade2-devel
+BuildRequires:  librsvg2-devel
 BuildRequires:  libgnomeui-devel, libgnomecanvas-devel, gnome-panel-devel
 
 %description
@@ -28,6 +31,8 @@
 
 %prep
 %setup -q
+# version information in META file is wrong
+perl -pi -e 's|version="1.3.1"|version="2.4.0"|' META
 
 %build
 %configure %{?_with_gl: --with-gl} %{!?_with_gl: --without-gl} --enable-debug
@@ -36,9 +41,16 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT%{_bindir} $RPM_BUILD_ROOT%{_libdir} $RPM_BUILD_ROOT%{_libdir}/ocaml/lablgtk2 $RPM_BUILD_ROOT%{_libdir}/ocaml/stublibs
-make install BINDIR=$RPM_BUILD_ROOT%{_bindir} LIBDIR=$RPM_BUILD_ROOT%{_libdir} INSTALLDIR=$RPM_BUILD_ROOT%{_libdir}/ocaml/lablgtk2 DLLDIR=$RPM_BUILD_ROOT%{_libdir}/ocaml/stublibs
-
+mkdir -p $RPM_BUILD_ROOT%{_bindir} \
+      $RPM_BUILD_ROOT%{_libdir} \
+      $RPM_BUILD_ROOT%{_libdir}/ocaml/lablgtk2 \
+      $RPM_BUILD_ROOT%{_libdir}/ocaml/stublibs
+make install \
+     BINDIR=$RPM_BUILD_ROOT%{_bindir} \
+     LIBDIR=$RPM_BUILD_ROOT%{_libdir} \
+     INSTALLDIR=$RPM_BUILD_ROOT%{_libdir}/ocaml/lablgtk2 \
+     DLLDIR=$RPM_BUILD_ROOT%{_libdir}/ocaml/stublibs
+cp META $RPM_BUILD_ROOT%{_libdir}/ocaml/lablgtk2
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -56,6 +68,9 @@
 %doc examples
 
 %changelog
+* Sat Sep 10 2005 Gerard Milmeister  - 2.4.0-6
+- include META file
+
 * Sat Feb 12 2005 Gerard Milmeister  - 0:2.4.0-2
 - Remove %{_smp_mflags} as it breaks the build
 



From fedora-extras-commits at redhat.com  Sun Sep 11 02:45:57 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Sat, 10 Sep 2005 22:45:57 -0400
Subject: owners owners.list,1.188,1.189
Message-ID: <200509110245.j8B2jvJD029598@cvs-int.fedora.redhat.com>

Author: corsepiu

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

Modified Files:
	owners.list 
Log Message:
Add cvsutils


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.188
retrieving revision 1.189
diff -u -r1.188 -r1.189
--- owners.list	10 Sep 2005 13:20:40 -0000	1.188
+++ owners.list	11 Sep 2005 02:45:54 -0000	1.189
@@ -107,6 +107,7 @@
 Fedora Extras|cvsplot|Cvsplot collects statistics from CVS controlled files|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|cvsps|Patchset tool for CVS|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|cvsup|CVS-Optimized General-Purpose Network File Distribution System client|adrian at lisas.de|extras-qa at fedoraproject.org|
+Fedora Extras|cvsutils|CVS Utilities|rc040203 at freenet.de|extras-qa at fedoraproject.org|
 Fedora Extras|cvsweb|Web interface for CVS repositories|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|cyrus-imapd|A high-performance mail server with IMAP, POP3, NNTP and SIEVE support|jdennis at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|d4x|Downloader for X that supports resuming and many other features|matthias at rpmforge.net|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sun Sep 11 03:29:35 2005
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Sat, 10 Sep 2005 23:29:35 -0400
Subject: extras-buildsys ChangeLog,1.119,1.120
Message-ID: <200509110329.j8B3Tanp030966@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30933

Modified Files:
	ChangeLog 
Log Message:
2005-09-10  Dan Williams  

    * server/BuilderManager.py
        - Fix python < 2.4 issues with sequence sort() call




Index: ChangeLog
===================================================================
RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -r1.119 -r1.120
--- ChangeLog	9 Sep 2005 15:49:58 -0000	1.119
+++ ChangeLog	11 Sep 2005 03:29:33 -0000	1.120
@@ -1,3 +1,8 @@
+2005-09-10  Dan Williams  
+
+    * server/BuilderManager.py
+        - Fix python < 2.4 issues with sequence sort() call
+
 2005-09-09  Dan Williams  
 
     * server/UserInterface.py



From fedora-extras-commits at redhat.com  Sun Sep 11 03:29:36 2005
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Sat, 10 Sep 2005 23:29:36 -0400
Subject: extras-buildsys/server BuilderManager.py,1.16,1.17
Message-ID: <200509110329.j8B3Taso030972@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys/server
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30933/server

Modified Files:
	BuilderManager.py 
Log Message:
2005-09-10  Dan Williams  

    * server/BuilderManager.py
        - Fix python < 2.4 issues with sequence sort() call




Index: BuilderManager.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/BuilderManager.py,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- BuilderManager.py	9 Sep 2005 15:10:17 -0000	1.16
+++ BuilderManager.py	11 Sep 2005 03:29:34 -0000	1.17
@@ -127,6 +127,15 @@
     def _builder_sort_func(self, builder):
         return builder.free_slots()
 
+    def _builder_cmp_func(self, builder1, builder2):
+        if builder1.free_slots() > builder2.free_slots():
+            return 1
+        elif builder1.free_slots() == builder2.free_slots():
+            return 0
+        elif builder1.free_slots() < builder2.free_slots():
+            return -1
+        return 1
+
     def process(self, paused):
         self._have_work = False
 
@@ -152,7 +161,12 @@
                     print "Appending builder %s" % builder.address()
 
             # Use the builder with the most free build slots
-            builder_list.sort(key=self._builder_sort_func, reverse=True)
+            if sys.version_info[:3] >= (2, 4, 0):
+                builder_list.sort(key=self._builder_sort_func, reverse=True)
+            else:
+                builder_list.sort(self._builder_cmp_func)
+                builder_list.reverse()
+
             for builder in builder_list:
                 try:
                     job = builder.start_job(parent, req['target_dict'], req['srpm_url'])



From fedora-extras-commits at redhat.com  Sun Sep 11 03:34:01 2005
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Sat, 10 Sep 2005 23:34:01 -0400
Subject: extras-buildsys ChangeLog,1.120,1.121
Message-ID: <200509110334.j8B3YVnY031020@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30984

Modified Files:
	ChangeLog 
Log Message:
2005-09-10  Dan Williams  

    * utils/distro-rebuild.py
        - Don't delete the rebuilt SRPM until after everything
            has been queued




Index: ChangeLog
===================================================================
RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -r1.120 -r1.121
--- ChangeLog	11 Sep 2005 03:29:33 -0000	1.120
+++ ChangeLog	11 Sep 2005 03:33:58 -0000	1.121
@@ -1,5 +1,11 @@
 2005-09-10  Dan Williams  
 
+    * utils/distro-rebuild.py
+        - Don't delete the rebuilt SRPM until after everything
+            has been queued
+
+2005-09-10  Dan Williams  
+
     * server/BuilderManager.py
         - Fix python < 2.4 issues with sequence sort() call
 



From fedora-extras-commits at redhat.com  Sun Sep 11 03:34:01 2005
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Sat, 10 Sep 2005 23:34:01 -0400
Subject: extras-buildsys/utils distro-rebuild.py,1.2,1.3
Message-ID: <200509110334.j8B3YVh0031023@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys/utils
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30984/utils

Modified Files:
	distro-rebuild.py 
Log Message:
2005-09-10  Dan Williams  

    * utils/distro-rebuild.py
        - Don't delete the rebuilt SRPM until after everything
            has been queued




Index: distro-rebuild.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/distro-rebuild.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- distro-rebuild.py	8 Sep 2005 21:09:05 -0000	1.2
+++ distro-rebuild.py	11 Sep 2005 03:33:59 -0000	1.3
@@ -18,6 +18,7 @@
 
 
 import os, sys
+import time
 import rpmUtils
 import commands
 import shutil
@@ -156,6 +157,8 @@
     # Build up a list of all SRPMs in the specified directory
     files = find_newest_srpms(search_dir)
 
+    temp_dirs = []
+    
     # Rebuild and enqueue the packages
     for name in files.keys():
         f = files[name]
@@ -173,8 +176,14 @@
             print "EE: %s (%s)" % (rebuilt_srpm, e)
             continue
 
-        shutil.rmtree(temp_dir_path, ignore_errors=True)
+        temp_dirs.append(temp_dir_path)
         print "OK: %s" % rebuilt_srpm
 
+    print "Sleeping before cleanup..."
+    time.sleep(30)
+    for path in temp_dirs:
+        shutil.rmtree(path, ignore_errors=True)
+
+    print "All done."
     sys.exit(0)
 



From fedora-extras-commits at redhat.com  Sun Sep 11 04:00:14 2005
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Sun, 11 Sep 2005 00:00:14 -0400
Subject: extras-buildsys/utils distro-rebuild.py,1.3,1.4
Message-ID: <200509110400.j8B40EpE031064@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys/utils
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31045

Modified Files:
	distro-rebuild.py 
Log Message:
RebuildError -> RebuildException


Index: distro-rebuild.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/distro-rebuild.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- distro-rebuild.py	11 Sep 2005 03:33:59 -0000	1.3
+++ distro-rebuild.py	11 Sep 2005 04:00:12 -0000	1.4
@@ -79,7 +79,7 @@
     cmd = "/bin/rpm -ihv --root %s %s" % (temp_dir, f)
     (s, o) = commands.getstatusoutput(cmd)
     if s != 0:
-        raise RebuildError("Could not install srpm %s: %s" % (f, o))
+        raise RebuildException("Could not install srpm %s: %s" % (f, o))
 
     # find the specfile
     spec_dir = os.path.join(src_root, "SPECS")
@@ -90,7 +90,7 @@
             specfile = os.path.join(spec_dir, spec)
             break
     if not specfile:
-        raise RebuildError("Could not locate specfile in %s." % spec_dir)
+        raise RebuildException("Could not locate specfile in %s." % spec_dir)
 
     src = open(specfile)
     specfile_new = specfile+".new"
@@ -105,7 +105,7 @@
     src.close()
 
     if not found:
-        raise RebuildError("Couldn't find Release line in specfile %s." % specfile)
+        raise RebuildException("Couldn't find Release line in specfile %s." % specfile)
 
     os.rename(specfile_new, specfile)
 



From fedora-extras-commits at redhat.com  Sun Sep 11 10:10:04 2005
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Sun, 11 Sep 2005 06:10:04 -0400
Subject: rpms/ocaml/FC-4 .cvsignore, 1.4, 1.5 ocaml.spec, 1.16, 1.17 sources,
	1.4, 1.5
Message-ID: <200509111010.j8BAA4S5012167@cvs-int.fedora.redhat.com>

Author: gemi

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

Modified Files:
	.cvsignore ocaml.spec sources 
Log Message:
new version 3.08.4


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ocaml/FC-4/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	26 Mar 2005 18:22:49 -0000	1.4
+++ .cvsignore	11 Sep 2005 10:10:01 -0000	1.5
@@ -1,4 +1,4 @@
-ocaml-3.08.3.tar.bz2
+ocaml-3.08.4.tar.bz2
 ocaml-3.08-refman.html.tar.gz
 ocaml-3.08-refman.info.tar.gz
 ocaml-3.08-refman.ps.gz


Index: ocaml.spec
===================================================================
RCS file: /cvs/extras/rpms/ocaml/FC-4/ocaml.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- ocaml.spec	25 May 2005 14:00:12 -0000	1.16
+++ ocaml.spec	11 Sep 2005 10:10:01 -0000	1.17
@@ -1,19 +1,18 @@
 Name:		ocaml
-Version:	3.08.3
-Release: 5
+Version:	3.08.4
+Release: 	1%{?dist}
 
 Summary:	Objective Caml compiler and programming environment
 
 Group:		Development/Languages
 License:	QPL/LGPL
 URL:		http://www.ocaml.org
-Source0:	http://caml.inria.fr/distrib/ocaml-3.08/ocaml-3.08.3.tar.bz2
+Source0:	http://caml.inria.fr/distrib/ocaml-3.08/ocaml-3.08.4.tar.bz2
 Source1:	http://caml.inria.fr/distrib/ocaml-3.08/ocaml-3.08-refman.html.tar.gz
 Source2:	http://caml.inria.fr/distrib/ocaml-3.08/ocaml-3.08-refman.ps.gz
 Source3:	http://caml.inria.fr/distrib/ocaml-3.08/ocaml-3.08-refman.info.tar.gz
 Patch0:		ocaml-rpath.patch
 Patch1:		ocaml-user-cflags.patch
-Patch2:		ocaml-num-gcc4.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	ncurses-devel, gdbm-devel, xorg-x11-devel
 BuildRequires:	tcl-devel, tk-devel
@@ -79,7 +78,6 @@
 %setup -q -T -D -a 3
 %patch0 -p1
 %patch1 -p1 -b .cflags
-%patch2 -p1 -b .x86_32
 
 cp %{SOURCE2} refman.ps.gz
 
@@ -181,6 +179,9 @@
 %doc emacs/README
 
 %changelog
+* Sun Sep 11 2005 Gerard Milmeister  - 3.08.4-1
+- New Version 3.08.4
+
 * Wed May 25 2005 Toshio Kuratomi  - 3.08.3-5
 - Bump and re-release as last build failed due to rawhide syncing.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ocaml/FC-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	26 Mar 2005 18:22:49 -0000	1.4
+++ sources	11 Sep 2005 10:10:01 -0000	1.5
@@ -1,4 +1,4 @@
-8277bb1537051fe5151dc31c350d64cd  ocaml-3.08.3.tar.bz2
+96b8edeb6190d9f15c086c7decd277a9  ocaml-3.08.4.tar.bz2
 0daee5643db6960682c1a7d84467885f  ocaml-3.08-refman.html.tar.gz
 49b68ec07ccd7ce45eb6bd3f3fdee140  ocaml-3.08-refman.info.tar.gz
 35a5d4318456c0982e72ee3f33364bf5  ocaml-3.08-refman.ps.gz



From fedora-extras-commits at redhat.com  Sun Sep 11 10:11:24 2005
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Sun, 11 Sep 2005 06:11:24 -0400
Subject: rpms/ocaml/devel ocaml.spec,1.16,1.17 sources,1.4,1.5
Message-ID: <200509111011.j8BABOoQ012234@cvs-int.fedora.redhat.com>

Author: gemi

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

Modified Files:
	ocaml.spec sources 
Log Message:
new version 3.08.4


Index: ocaml.spec
===================================================================
RCS file: /cvs/extras/rpms/ocaml/devel/ocaml.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- ocaml.spec	25 May 2005 14:00:12 -0000	1.16
+++ ocaml.spec	11 Sep 2005 10:11:22 -0000	1.17
@@ -1,19 +1,18 @@
 Name:		ocaml
-Version:	3.08.3
-Release: 5
+Version:	3.08.4
+Release: 	1%{?dist}
 
 Summary:	Objective Caml compiler and programming environment
 
 Group:		Development/Languages
 License:	QPL/LGPL
 URL:		http://www.ocaml.org
-Source0:	http://caml.inria.fr/distrib/ocaml-3.08/ocaml-3.08.3.tar.bz2
+Source0:	http://caml.inria.fr/distrib/ocaml-3.08/ocaml-3.08.4.tar.bz2
 Source1:	http://caml.inria.fr/distrib/ocaml-3.08/ocaml-3.08-refman.html.tar.gz
 Source2:	http://caml.inria.fr/distrib/ocaml-3.08/ocaml-3.08-refman.ps.gz
 Source3:	http://caml.inria.fr/distrib/ocaml-3.08/ocaml-3.08-refman.info.tar.gz
 Patch0:		ocaml-rpath.patch
 Patch1:		ocaml-user-cflags.patch
-Patch2:		ocaml-num-gcc4.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	ncurses-devel, gdbm-devel, xorg-x11-devel
 BuildRequires:	tcl-devel, tk-devel
@@ -79,7 +78,6 @@
 %setup -q -T -D -a 3
 %patch0 -p1
 %patch1 -p1 -b .cflags
-%patch2 -p1 -b .x86_32
 
 cp %{SOURCE2} refman.ps.gz
 
@@ -181,6 +179,9 @@
 %doc emacs/README
 
 %changelog
+* Sun Sep 11 2005 Gerard Milmeister  - 3.08.4-1
+- New Version 3.08.4
+
 * Wed May 25 2005 Toshio Kuratomi  - 3.08.3-5
 - Bump and re-release as last build failed due to rawhide syncing.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ocaml/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	26 Mar 2005 18:22:49 -0000	1.4
+++ sources	11 Sep 2005 10:11:22 -0000	1.5
@@ -1,4 +1,4 @@
-8277bb1537051fe5151dc31c350d64cd  ocaml-3.08.3.tar.bz2
+96b8edeb6190d9f15c086c7decd277a9  ocaml-3.08.4.tar.bz2
 0daee5643db6960682c1a7d84467885f  ocaml-3.08-refman.html.tar.gz
 49b68ec07ccd7ce45eb6bd3f3fdee140  ocaml-3.08-refman.info.tar.gz
 35a5d4318456c0982e72ee3f33364bf5  ocaml-3.08-refman.ps.gz



From fedora-extras-commits at redhat.com  Sun Sep 11 10:13:16 2005
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Sun, 11 Sep 2005 06:13:16 -0400
Subject: rpms/ocaml/FC-3 ocaml.spec,1.10,1.11 sources,1.4,1.5
Message-ID: <200509111013.j8BADG6i012299@cvs-int.fedora.redhat.com>

Author: gemi

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

Modified Files:
	ocaml.spec sources 
Log Message:
new version 3.08.4


Index: ocaml.spec
===================================================================
RCS file: /cvs/extras/rpms/ocaml/FC-3/ocaml.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ocaml.spec	26 Mar 2005 19:28:02 -0000	1.10
+++ ocaml.spec	11 Sep 2005 10:13:14 -0000	1.11
@@ -1,16 +1,18 @@
 Name:		ocaml
-Version:	3.08.3
-Release:	1
+Version:	3.08.4
+Release: 	1%{?dist}
+
 Summary:	Objective Caml compiler and programming environment
 
 Group:		Development/Languages
 License:	QPL/LGPL
 URL:		http://www.ocaml.org
-Source0:	http://caml.inria.fr/distrib/ocaml-3.08/ocaml-3.08.3.tar.bz2
+Source0:	http://caml.inria.fr/distrib/ocaml-3.08/ocaml-3.08.4.tar.bz2
 Source1:	http://caml.inria.fr/distrib/ocaml-3.08/ocaml-3.08-refman.html.tar.gz
 Source2:	http://caml.inria.fr/distrib/ocaml-3.08/ocaml-3.08-refman.ps.gz
 Source3:	http://caml.inria.fr/distrib/ocaml-3.08/ocaml-3.08-refman.info.tar.gz
-Patch:		ocaml-rpath.patch
+Patch0:		ocaml-rpath.patch
+Patch1:		ocaml-user-cflags.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	ncurses-devel, gdbm-devel, xorg-x11-devel
 BuildRequires:	tcl-devel, tk-devel
@@ -74,12 +76,13 @@
 %setup -q -T -b 0
 %setup -q -T -D -a 1
 %setup -q -T -D -a 3
-%patch -p1
+%patch0 -p1
+%patch1 -p1 -b .cflags
+
 cp %{SOURCE2} refman.ps.gz
 
 %build
-./configure \
-    -ccoption "gcc $RPM_OPT_FLAGS" \
+CFLAGS="$RPM_OPT_FLAGS" ./configure \
     -bindir %{_bindir} \
     -libdir %{_libdir}/ocaml \
     -x11lib %{_prefix}/X11R6/%{_lib} \
@@ -176,6 +179,9 @@
 %doc emacs/README
 
 %changelog
+* Sun Sep 11 2005 Gerard Milmeister  - 3.08.4-1
+- New Version 3.08.4
+
 * Sat Mar 26 2005 Gerard Milmeister  - 3.08.3-1
 - New Version 3.08.3
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ocaml/FC-3/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	26 Mar 2005 19:28:02 -0000	1.4
+++ sources	11 Sep 2005 10:13:14 -0000	1.5
@@ -1,4 +1,4 @@
-8277bb1537051fe5151dc31c350d64cd  ocaml-3.08.3.tar.bz2
+96b8edeb6190d9f15c086c7decd277a9  ocaml-3.08.4.tar.bz2
 0daee5643db6960682c1a7d84467885f  ocaml-3.08-refman.html.tar.gz
 49b68ec07ccd7ce45eb6bd3f3fdee140  ocaml-3.08-refman.info.tar.gz
 35a5d4318456c0982e72ee3f33364bf5  ocaml-3.08-refman.ps.gz



From fedora-extras-commits at redhat.com  Sun Sep 11 10:18:28 2005
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Sun, 11 Sep 2005 06:18:28 -0400
Subject: rpms/ocaml/FC-3 ocaml-user-cflags.patch, NONE, 1.1 ocaml.spec, 1.11,
	1.12
Message-ID: <200509111018.j8BAISfF012410@cvs-int.fedora.redhat.com>

Author: gemi

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

Modified Files:
	ocaml.spec 
Added Files:
	ocaml-user-cflags.patch 
Log Message:


ocaml-user-cflags.patch:

--- NEW FILE ocaml-user-cflags.patch ---
--- ocaml-3.08.3/configure.opt	2005-05-08 19:00:34.000000000 -0400
+++ ocaml-3.08.3/configure	2005-05-08 19:54:50.000000000 -0400
@@ -1455,6 +1455,10 @@
     nativecccompopts="$nativecccompopts -fomit-frame-pointer";;
 esac
 
+# Allow user defined C Compiler flags
+bytecccompopts="$bytecccompopts $CFLAGS"
+nativecccompopts="$nativecccompopts $CFLAGS"
+
 # Finish generated files
 
 cclibs="$cclibs $mathlib"


Index: ocaml.spec
===================================================================
RCS file: /cvs/extras/rpms/ocaml/FC-3/ocaml.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ocaml.spec	11 Sep 2005 10:13:14 -0000	1.11
+++ ocaml.spec	11 Sep 2005 10:18:26 -0000	1.12
@@ -1,6 +1,6 @@
 Name:		ocaml
 Version:	3.08.4
-Release: 	1%{?dist}
+Release: 	2%{?dist}
 
 Summary:	Objective Caml compiler and programming environment
 



From fedora-extras-commits at redhat.com  Sun Sep 11 11:34:20 2005
From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters))
Date: Sun, 11 Sep 2005 07:34:20 -0400
Subject: rpms/pan import.log,1.3,1.4
Message-ID: <200509111134.j8BBYKTK013927@cvs-int.fedora.redhat.com>

Author: mpeters

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

Modified Files:
	import.log 
Log Message:
auto-import pan-0.14.2.91-3.1 on branch FC-4 from pan-0.14.2.91-3.1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/pan/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	21 Jun 2005 19:44:17 -0000	1.3
+++ import.log	11 Sep 2005 11:34:18 -0000	1.4
@@ -1,2 +1,3 @@
 pan-0_14_2-8:HEAD:pan-0.14.2-8.src.rpm:1119378939
 pan-0_14_2_91-2:HEAD:pan-0.14.2.91-2.src.rpm:1119383013
+pan-0_14_2_91-3_1:FC-4:pan-0.14.2.91-3.1.src.rpm:1126438396



From fedora-extras-commits at redhat.com  Sun Sep 11 11:34:21 2005
From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters))
Date: Sun, 11 Sep 2005 07:34:21 -0400
Subject: rpms/pan/FC-4 pan-0.14.2.91-linewrap.patch, NONE, 1.1 pan.spec, 1.3,
	1.4
Message-ID: <200509111134.j8BBYLxi013935@cvs-int.fedora.redhat.com>

Author: mpeters

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

Modified Files:
	pan.spec 
Added Files:
	pan-0.14.2.91-linewrap.patch 
Log Message:
auto-import pan-0.14.2.91-3.1 on branch FC-4 from pan-0.14.2.91-3.1.src.rpm

pan-0.14.2.91-linewrap.patch:

--- NEW FILE pan-0.14.2.91-linewrap.patch ---
--- patch-text-massager.c::wrap begins here ---
--- pan/base/text-massager.c.orig	Mon Jan 26 00:51:26 2004
+++ pan/base/text-massager.c	Mon Jan 26 00:55:48 2004
@@ -250,23 +250,29 @@
 	char * pch;
 	char * line_start;
 	char * end;
+	int    pos;
 
 	/* walk through the entire string */
 	linefeed_here = NULL;
-	for (line_start=pch=str->str, end=line_start+str->len; pch!=end; )
+	for (pos = 0, line_start=pch=str->str, end=line_start+str->len; pch=column && linefeed_here!=NULL)
+		if (pos>=column && linefeed_here!=NULL)
 		{
 			*linefeed_here = '\n';
 			pch = line_start = linefeed_here + 1;
 			linefeed_here = NULL;
+			pos = 0;
+		}
+		else 
+		{
+			pch = g_utf8_next_char (pch);
+			++ pos;
 		}
-		else ++pch;
 	}
 }
 
--- patch-text-massager.c::wrap ends here ---


Index: pan.spec
===================================================================
RCS file: /cvs/extras/rpms/pan/FC-4/pan.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- pan.spec	22 Jun 2005 05:18:14 -0000	1.3
+++ pan.spec	11 Sep 2005 11:34:19 -0000	1.4
@@ -1,7 +1,7 @@
 Summary: A GNOME/GTK+ news reader for X
 Name: pan
 Version: 0.14.2.91
-Release: 2.1%{?dist}
+Release: 3.1%{?dist}
 Epoch: 1
 License: GPL
 Group: Applications/Internet
@@ -15,6 +15,7 @@
 #Patch9: pan-0.14.2-gmime-crash-120007.patch
 #Patch10: pan-desktop-rh-119909.patch
 Patch11: pan-0.14.2.91-gcc4-2.patch
+Patch12: pan-0.14.2.91-linewrap.patch
 URL: http://pan.rebelbase.com/
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libxml2-devel >= 2.4.22
@@ -46,6 +47,8 @@
 # add rh defs to upstream desktop file
 #%patch10 -p1 -b .rh
 %patch11 -p1 -b .gcc4
+%patch12 -p0 -b .linewrap
+
 echo "StartupNotify=true" >> pan.desktop.in
 
 
@@ -80,6 +83,9 @@
 %{_datadir}/applications/fedora-pan.desktop
 
 %changelog
+* Sun Sep 11 2005 Michael A. Peters  - 1:0.14.2.91-3.1
+- added patch12 to fix bug 165626
+
 * Tue Jun 21 2005 Michael A. Peters  - 1:0.14.2.91-2.1
 - added gettext BuildRequires
 



From fedora-extras-commits at redhat.com  Sun Sep 11 11:38:18 2005
From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters))
Date: Sun, 11 Sep 2005 07:38:18 -0400
Subject: rpms/pan/devel pan.spec,1.3,1.4
Message-ID: <200509111138.j8BBcIeQ013995@cvs-int.fedora.redhat.com>

Author: mpeters

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

Modified Files:
	pan.spec 
Log Message:
sync with FC-4 fix



Index: pan.spec
===================================================================
RCS file: /cvs/extras/rpms/pan/devel/pan.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- pan.spec	22 Jun 2005 05:18:14 -0000	1.3
+++ pan.spec	11 Sep 2005 11:38:16 -0000	1.4
@@ -1,7 +1,7 @@
 Summary: A GNOME/GTK+ news reader for X
 Name: pan
 Version: 0.14.2.91
-Release: 2.1%{?dist}
+Release: 3.1%{?dist}
 Epoch: 1
 License: GPL
 Group: Applications/Internet
@@ -15,6 +15,7 @@
 #Patch9: pan-0.14.2-gmime-crash-120007.patch
 #Patch10: pan-desktop-rh-119909.patch
 Patch11: pan-0.14.2.91-gcc4-2.patch
+Patch12: pan-0.14.2.91-linewrap.patch
 URL: http://pan.rebelbase.com/
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libxml2-devel >= 2.4.22
@@ -46,6 +47,8 @@
 # add rh defs to upstream desktop file
 #%patch10 -p1 -b .rh
 %patch11 -p1 -b .gcc4
+%patch12 -p0 -b .linewrap
+
 echo "StartupNotify=true" >> pan.desktop.in
 
 
@@ -80,6 +83,9 @@
 %{_datadir}/applications/fedora-pan.desktop
 
 %changelog
+* Sun Sep 11 2005 Michael A. Peters  - 1:0.14.2.91-3.1
+- added patch12 to fix bug 165626
+
 * Tue Jun 21 2005 Michael A. Peters  - 1:0.14.2.91-2.1
 - added gettext BuildRequires
 



From fedora-extras-commits at redhat.com  Sun Sep 11 14:19:26 2005
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sun, 11 Sep 2005 10:19:26 -0400
Subject: rpms .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 import.log, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200509111419.j8BEJQEO018661@cvs-int.fedora.redhat.com>

Author: pertusus

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

Added Files:
	.cvsignore Makefile import.log sources 
Log Message:
Setup of module cppunit


--- NEW FILE .cvsignore ---


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

--- NEW FILE import.log ---


--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Sun Sep 11 14:25:40 2005
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sun, 11 Sep 2005 10:25:40 -0400
Subject: rpms Makefile,1.1,NONE import.log,1.1,NONE sources,1.1,NONE
Message-ID: <200509111425.j8BEPevO018736@cvs-int.fedora.redhat.com>

Author: pertusus

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

Removed Files:
	Makefile import.log sources 
Log Message:
Files imported in this directory by mistake



--- Makefile DELETED ---


--- import.log DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Sun Sep 11 14:28:11 2005
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sun, 11 Sep 2005 10:28:11 -0400
Subject: rpms/cppunit Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200509111428.j8BESBG3018812@cvs-int.fedora.redhat.com>

Author: pertusus

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

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


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

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

common : CVS/Root
	@cvs checkout common

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

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


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Sun Sep 11 14:28:12 2005
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sun, 11 Sep 2005 10:28:12 -0400
Subject: rpms/cppunit/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200509111428.j8BESCQ2018817@cvs-int.fedora.redhat.com>

Author: pertusus

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

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


--- NEW FILE .cvsignore ---


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

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Sun Sep 11 14:30:05 2005
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sun, 11 Sep 2005 10:30:05 -0400
Subject: rpms/cppunit import.log,1.1,1.2
Message-ID: <200509111430.j8BEUZeH018903@cvs-int.fedora.redhat.com>

Author: pertusus

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

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


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/cppunit/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	11 Sep 2005 14:28:09 -0000	1.1
+++ import.log	11 Sep 2005 14:30:03 -0000	1.2
@@ -0,0 +1 @@
+cppunit-1_11_0-2:HEAD:cppunit-1.11.0-2.src.rpm:1126448772



From fedora-extras-commits at redhat.com  Sun Sep 11 14:30:06 2005
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sun, 11 Sep 2005 10:30:06 -0400
Subject: rpms/cppunit/devel cppunit.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200509111430.j8BEUa4d018907@cvs-int.fedora.redhat.com>

Author: pertusus

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

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


--- NEW FILE cppunit.spec ---
Name: cppunit
Version: 1.11.0
Release: 2

Summary: C++ unit testing framework
License: LGPL
Group: Development/Libraries
Url: http://cppunit.sourceforge.net/
Source: http://dl.sourceforge.net/sourceforge/cppunit/cppunit-%{version}.tar.gz

BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: doxygen, graphviz

%description
CppUnit is the C++ port of the famous JUnit framework for unit testing.
Test output is in XML for automatic testing and GUI based for supervised tests.

%package devel
Summary: Libraries and headers for cppunit development
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}

%description devel
This package contains the libraries and headers necessary for developing
programs that use cppunit.

%package doc
Summary: HTML formatted API documention for cppunit
Group: Documentation
Requires: %{name} = %{version}-%{release}

%description doc
The cppunit-doc package contains HTML formatted API documention generated by
the popular doxygen documentation generation tool.

%prep
%setup -q

%build
%configure --enable-doxygen
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la
# remove double of doc
rm -rf $RPM_BUILD_ROOT/%{_datadir}/cppunit

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%{_bindir}/DllPlugInTester
%{_mandir}/man1/*
%{_datadir}/aclocal/*
%{_libdir}/libcppunit*.so.*
%doc AUTHORS COPYING NEWS README THANKS ChangeLog TODO BUGS doc/FAQ

%files devel
%defattr(-,root,root,-)
%{_bindir}/cppunit-config
%{_includedir}/cppunit
%{_libdir}/libcppunit.a
%{_libdir}/libcppunit.so

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

%changelog
* Mon Aug 15 2005 Tom "spot" Callaway  1.11.0-2
- various cleanups

* Mon Jul  4 2005 Patrice Dumas  1.11.0-1
- update using the fedora template 
 
* Sat Apr 14 2001 Bastiaan Bakker 
- Initial release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cppunit/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	11 Sep 2005 14:28:10 -0000	1.1
+++ .cvsignore	11 Sep 2005 14:30:04 -0000	1.2
@@ -0,0 +1 @@
+cppunit-1.11.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cppunit/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	11 Sep 2005 14:28:10 -0000	1.1
+++ sources	11 Sep 2005 14:30:04 -0000	1.2
@@ -0,0 +1 @@
+7b256f622158d3c932b3c5025ef5e2ed  cppunit-1.11.0.tar.gz



From fedora-extras-commits at redhat.com  Sun Sep 11 16:31:22 2005
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Sun, 11 Sep 2005 12:31:22 -0400
Subject: rpms/zope/FC-4 .cvsignore, 1.7, 1.8 sources, 1.7, 1.8 zope.init.in,
	1.2, 1.3 zope.spec, 1.13, 1.14
Message-ID: <200509111631.j8BGVMYH024324@cvs-int.fedora.redhat.com>

Author: abompard

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

Modified Files:
	.cvsignore sources zope.init.in zope.spec 
Log Message:
- version 2.8.1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/zope/FC-4/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	11 Jun 2005 20:50:47 -0000	1.7
+++ .cvsignore	11 Sep 2005 16:31:20 -0000	1.8
@@ -1 +1 @@
-Zope-2.8.0-final.tar.gz
+Zope-2.8.1-final.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/zope/FC-4/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	11 Jun 2005 20:50:47 -0000	1.7
+++ sources	11 Sep 2005 16:31:20 -0000	1.8
@@ -1 +1 @@
-f734fa4c55f36b5038f36be9a6d4e61e  Zope-2.8.0-final.tar.gz
+0ec441a35175bb8d8c557b7d3c63f6f6  Zope-2.8.1-final.tgz


Index: zope.init.in
===================================================================
RCS file: /cvs/extras/rpms/zope/FC-4/zope.init.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- zope.init.in	12 Mar 2005 08:45:13 -0000	1.2
+++ zope.init.in	11 Sep 2005 16:31:20 -0000	1.3
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Startup script for Zope
 #
-# chkconfig: 345 80 20
+# chkconfig: - 80 20
 # description: Zope, a web application server
 #
 # config: $instance/etc/zope.conf


Index: zope.spec
===================================================================
RCS file: /cvs/extras/rpms/zope/FC-4/zope.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- zope.spec	12 Jun 2005 14:44:02 -0000	1.13
+++ zope.spec	11 Sep 2005 16:31:20 -0000	1.14
@@ -1,4 +1,4 @@
-%define python_minver 2.3.3
+%define python_minver 2.4
 
 %define zope_user      zope
 %define zope_group     %{zope_user}
@@ -12,12 +12,12 @@
 
 Name:    zope
 Summary: Web application server for flexible content management applications
-Version: 2.8.0
-Release: 2%{?dist}
+Version: 2.8.1
+Release: 1%{?dist}
 License: ZPL
 Group: 	 System Environment/Daemons
 URL:     http://www.zope.org/
-Source0: http://zope.org/Products/Zope/2.8.0/Zope-2.8.0-final.tar.gz
+Source0: http://zope.org/Products/Zope/2.8.1/Zope-2.8.1-final.tgz
 #Source10: http://www.zope.org/Products/Zope/Hotfix-2005-04-05/Hotfix-20050405/Hotfix_20050405.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -177,6 +177,9 @@
 
 
 %changelog
+* Sat Sep 10 2005 Aurelien Bompard  2.8.1-1
+- version 2.8.1
+
 * Sun Jun 12 2005 Aurelien Bompard  2.8.0-2
 - rebuild
 



From fedora-extras-commits at redhat.com  Sun Sep 11 16:31:23 2005
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Sun, 11 Sep 2005 12:31:23 -0400
Subject: rpms/zope/devel .cvsignore, 1.7, 1.8 sources, 1.7, 1.8 zope.init.in,
	1.2, 1.3 zope.spec, 1.13, 1.14
Message-ID: <200509111631.j8BGVNHa024338@cvs-int.fedora.redhat.com>

Author: abompard

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

Modified Files:
	.cvsignore sources zope.init.in zope.spec 
Log Message:
- version 2.8.1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/zope/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	11 Jun 2005 20:50:52 -0000	1.7
+++ .cvsignore	11 Sep 2005 16:31:21 -0000	1.8
@@ -1 +1 @@
-Zope-2.8.0-final.tar.gz
+Zope-2.8.1-final.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/zope/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	11 Jun 2005 20:50:52 -0000	1.7
+++ sources	11 Sep 2005 16:31:21 -0000	1.8
@@ -1 +1 @@
-f734fa4c55f36b5038f36be9a6d4e61e  Zope-2.8.0-final.tar.gz
+0ec441a35175bb8d8c557b7d3c63f6f6  Zope-2.8.1-final.tgz


Index: zope.init.in
===================================================================
RCS file: /cvs/extras/rpms/zope/devel/zope.init.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- zope.init.in	12 Mar 2005 08:45:13 -0000	1.2
+++ zope.init.in	11 Sep 2005 16:31:21 -0000	1.3
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Startup script for Zope
 #
-# chkconfig: 345 80 20
+# chkconfig: - 80 20
 # description: Zope, a web application server
 #
 # config: $instance/etc/zope.conf


Index: zope.spec
===================================================================
RCS file: /cvs/extras/rpms/zope/devel/zope.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- zope.spec	12 Jun 2005 15:33:34 -0000	1.13
+++ zope.spec	11 Sep 2005 16:31:21 -0000	1.14
@@ -1,4 +1,4 @@
-%define python_minver 2.3.3
+%define python_minver 2.4
 
 %define zope_user      zope
 %define zope_group     %{zope_user}
@@ -12,12 +12,12 @@
 
 Name:    zope
 Summary: Web application server for flexible content management applications
-Version: 2.8.0
-Release: 2%{?dist}
+Version: 2.8.1
+Release: 1%{?dist}
 License: ZPL
 Group: 	 System Environment/Daemons
 URL:     http://www.zope.org/
-Source0: http://zope.org/Products/Zope/2.8.0/Zope-2.8.0-final.tar.gz
+Source0: http://zope.org/Products/Zope/2.8.1/Zope-2.8.1-final.tgz
 #Source10: http://www.zope.org/Products/Zope/Hotfix-2005-04-05/Hotfix-20050405/Hotfix_20050405.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -177,6 +177,9 @@
 
 
 %changelog
+* Sat Sep 10 2005 Aurelien Bompard  2.8.1-1
+- version 2.8.1
+
 * Sun Jun 12 2005 Aurelien Bompard  2.8.0-2
 - rebuild
 



From fedora-extras-commits at redhat.com  Sun Sep 11 16:31:48 2005
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sun, 11 Sep 2005 12:31:48 -0400
Subject: rpms/cppunit/devel cppunit.spec,1.1,1.2
Message-ID: <200509111631.j8BGVmWm024367@cvs-int.fedora.redhat.com>

Author: pertusus

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

Modified Files:
	cppunit.spec 
Log Message:
Add dist tag



Index: cppunit.spec
===================================================================
RCS file: /cvs/extras/rpms/cppunit/devel/cppunit.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cppunit.spec	11 Sep 2005 14:30:04 -0000	1.1
+++ cppunit.spec	11 Sep 2005 16:31:46 -0000	1.2
@@ -1,6 +1,6 @@
 Name: cppunit
 Version: 1.11.0
-Release: 2
+Release: 2%{?dist}
 
 Summary: C++ unit testing framework
 License: LGPL



From fedora-extras-commits at redhat.com  Sun Sep 11 20:35:37 2005
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Sun, 11 Sep 2005 16:35:37 -0400
Subject: rpms/kawa - New directory
Message-ID: <200509112035.j8BKZbQq030411@cvs-int.fedora.redhat.com>

Author: green

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

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




From fedora-extras-commits at redhat.com  Sun Sep 11 20:35:37 2005
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Sun, 11 Sep 2005 16:35:37 -0400
Subject: rpms/kawa/devel - New directory
Message-ID: <200509112035.j8BKZbN9030416@cvs-int.fedora.redhat.com>

Author: green

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

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




From fedora-extras-commits at redhat.com  Sun Sep 11 20:36:08 2005
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Sun, 11 Sep 2005 16:36:08 -0400
Subject: rpms/kawa/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200509112036.j8BKa8fe030466@cvs-int.fedora.redhat.com>

Author: green

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

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


--- NEW FILE .cvsignore ---


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

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Sun Sep 11 20:36:08 2005
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Sun, 11 Sep 2005 16:36:08 -0400
Subject: rpms/kawa Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200509112036.j8BKa8KT030461@cvs-int.fedora.redhat.com>

Author: green

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

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


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

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

common : CVS/Root
	@cvs checkout common

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

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


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Sun Sep 11 20:37:40 2005
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Sun, 11 Sep 2005 16:37:40 -0400
Subject: rpms/kawa import.log,1.1,1.2
Message-ID: <200509112038.j8BKcALm030538@cvs-int.fedora.redhat.com>

Author: green

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

Modified Files:
	import.log 
Log Message:
auto-import kawa-1.8.beta-5 on branch devel from kawa-1.8.beta-5.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/kawa/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	11 Sep 2005 20:36:05 -0000	1.1
+++ import.log	11 Sep 2005 20:37:38 -0000	1.2
@@ -0,0 +1 @@
+kawa-1_8_beta-5:HEAD:kawa-1.8.beta-5.src.rpm:1126471049



From fedora-extras-commits at redhat.com  Sun Sep 11 20:37:40 2005
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Sun, 11 Sep 2005 16:37:40 -0400
Subject: rpms/kawa/devel kawa.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <200509112038.j8BKcBaY030542@cvs-int.fedora.redhat.com>

Author: green

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

Modified Files:
	.cvsignore sources 
Added Files:
	kawa.spec 
Log Message:
auto-import kawa-1.8.beta-5 on branch devel from kawa-1.8.beta-5.src.rpm


--- NEW FILE kawa.spec ---
Summary: Kawa scheme implementation
Name: kawa

Version: 1.8.beta
%define nversion 1.8beta

Release: 5%{?dist}
License: GPL
Group: Development/Languages
URL: http://www.gnu.org/software/kawa/
Source0: %{name}-%{nversion}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{nversion}-%{release}-root
BuildPrereq: gcc-java >= 3.3.0
Requires: libgcj >= 3.3.0
BuildRequires:    texinfo
BuildRequires:    readline-devel
BuildRequires:    ant >= 1.6
BuildRequires:    servletapi5
Requires:         servletapi5
BuildRequires:    java-gcj-compat-devel >= 1.0.31
Requires(post):   java-gcj-compat >= 1.0.31
Requires(postun): java-gcj-compat >= 1.0.31

%description
Kawa is an implementation of the Scheme programming language.
It is implemented in Java, and compiles Scheme into Java byte-codes.

%package        javadoc
Summary:        Javadoc for %{name}
Group:          Development/Documentation
#BuildRequires:  java-javadoc

%description    javadoc
%{summary}.

%prep
%setup -q -n %{name}-%{nversion}

%build
./configure --prefix=%{_prefix} --mandir=%{_mandir} --infodir=%{_infodir} --enable-kawa-frontend
export CLASSPATH=$(build-classpath servletapi5)
ant

# Override the Makefile for generating kawa.1, since it should be
# unformatted man page source.
cp doc/kawa.man doc/kawa.1

%install
rm -rf $RPM_BUILD_ROOT
make install install-javadoc-html JAVA=/usr/bin/java DESTDIR=$RPM_BUILD_ROOT JAVADOC_DIR=$RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
rm -f $RPM_BUILD_ROOT/usr/share/info/dir
ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
aot-compile-rpm

%clean
rm -rf $RPM_BUILD_ROOT

%post
/sbin/install-info %{_infodir}/kawa.info.gz %{_infodir}/dir
%{_bindir}/rebuild-gcj-db

%postun
if [ $1 = 0 ]; then
  /sbin/install-info --delete %{_infodir}/kawa.info.gz %{_infodir}/dir
fi
%{_bindir}/rebuild-gcj-db

%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING INSTALL NEWS README TODO
%{_bindir}/*
%{_datadir}/java/*
%{_libdir}/gcj/*
%{_mandir}/man1/kawa.1*
%{_infodir}/kawa*

%files javadoc
%defattr(644,root,root,755)
%doc %{_javadocdir}/%{name}-%{version}
%doc %{_javadocdir}/%{name}

%changelog
* Sun Sep 11 2005 Anthony Green  - 1.8beta-5
- Remove Requires for realine.  This is handled automagically.
- Remove ldconfig.

* Sun Sep 11 2005 Anthony Green  - 1.8beta-4
- Install unformatted man page source.
- Remove BuildRequires groff.
- Force kawa binary to use /usr/bin/java.
- Add javadoc package.
- Happy birthday, spec file!

* Sat Sep 10 2005 Anthony Green  - 1.8beta-3
- Add BuildRequires for groff and readline-devel.
- Add Requires for readline.
- Configure with --enable-kawa-frontend.

* Sat Sep 10 2005 Anthony Green  - 1.8beta-2
- Add BuildRequires for ant, texinfo and servletapi5.
- Add Requires for servletapi5.
- Add servletapi5.jar to classpath.

* Wed Sep  7 2005 Anthony Green  - 1.8beta-1
- Updgrade to 1.8beta

* Sat Sep  7 2005 Anthony Green  - 1.7-2
- Build for Fedora Extras.

* Sat Sep 11 2004 Anthony Green  - 1.7-1
- Initial build.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kawa/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	11 Sep 2005 20:36:06 -0000	1.1
+++ .cvsignore	11 Sep 2005 20:37:38 -0000	1.2
@@ -0,0 +1 @@
+kawa-1.8beta.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kawa/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	11 Sep 2005 20:36:06 -0000	1.1
+++ sources	11 Sep 2005 20:37:38 -0000	1.2
@@ -0,0 +1 @@
+c7fbacc3297adab1858f7f4beb6ab7ca  kawa-1.8beta.tar.gz



From fedora-extras-commits at redhat.com  Sun Sep 11 20:45:14 2005
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Sun, 11 Sep 2005 16:45:14 -0400
Subject: owners owners.list,1.189,1.190
Message-ID: <200509112045.j8BKjEMn030663@cvs-int.fedora.redhat.com>

Author: green

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

Modified Files:
	owners.list 
Log Message:
Add entry for kawa.



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.189
retrieving revision 1.190
diff -u -r1.189 -r1.190
--- owners.list	11 Sep 2005 02:45:54 -0000	1.189
+++ owners.list	11 Sep 2005 20:45:12 -0000	1.190
@@ -351,6 +351,7 @@
 Fedora Extras|kakasi|A Japanese character set conversion filter|tagoh at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|kannel|WAP and SMS gateway|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|kasumi|Anthy dictionary management tool|tagoh at redhat.com|extras-qa at fedoraproject.org|
+Fedora Extras|kawa|Kawa scheme implementation|green at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|kernel-module-thinkpad|IBM ThinkPad support kernel modules|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|keychain|Agent manager for OpenSSH, ssh.com, Sun SSH, and GnuPG|ad+rh-bugzilla at uni-x.org|extras-qa at fedoraproject.org|
 Fedora Extras|kickpim|KDE kicker applet to access addressbook|rdieter at math.unl.edu|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Mon Sep 12 00:11:24 2005
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Sun, 11 Sep 2005 20:11:24 -0400
Subject: rpms/lablgl/FC-4 lablgl.spec,1.9,1.10
Message-ID: <200509120011.j8C0BOmY003801@cvs-int.fedora.redhat.com>

Author: gemi

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

Modified Files:
	lablgl.spec 
Log Message:



Index: lablgl.spec
===================================================================
RCS file: /cvs/extras/rpms/lablgl/FC-4/lablgl.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- lablgl.spec	26 May 2005 18:54:23 -0000	1.9
+++ lablgl.spec	12 Sep 2005 00:11:22 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           lablgl
 Version:        1.01
-Release: 6
+Release:	7%{?dist}
 
 Summary:        LablGL is an OpenGL interface for Objective Caml
 
@@ -10,9 +10,9 @@
 Source:         http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/dist/lablgl-1.01.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  XFree86-devel, freeglut-devel 
-BuildRequires:	ocaml = 3.08.3, labltk = 3.08.3, camlp4 = 3.08.3
+BuildRequires:	ocaml >= 3.08, labltk >= 3.08, camlp4 >= 3.08
 BuildRequires:	tcl-devel, tk-devel
-Requires:       ocaml = 3.08.3, labltk = 3.08.3
+Requires:       ocaml >= 3.08.3, labltk >= 3.08
 
 %description
 LablGL is is an Objective Caml interface to OpenGL. Support is
@@ -65,6 +65,9 @@
 %{_libdir}/ocaml/stublibs/*.so
 
 %changelog
+* Sun Sep 11 2005 Gerard Milmeister  - 1.01-7
+- Rebuild with new ocaml
+
 * Thu May 26 2005 Toshio Kuratomi  - 1.01-6
 - Bump and rebuild with new ocaml.
   



From fedora-extras-commits at redhat.com  Mon Sep 12 00:12:48 2005
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Sun, 11 Sep 2005 20:12:48 -0400
Subject: rpms/lablgl/FC-3 lablgl.spec,1.5,1.6
Message-ID: <200509120012.j8C0CmQP003864@cvs-int.fedora.redhat.com>

Author: gemi

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

Modified Files:
	lablgl.spec 
Log Message:



Index: lablgl.spec
===================================================================
RCS file: /cvs/extras/rpms/lablgl/FC-3/lablgl.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- lablgl.spec	1 Apr 2005 17:04:38 -0000	1.5
+++ lablgl.spec	12 Sep 2005 00:12:46 -0000	1.6
@@ -1,6 +1,7 @@
 Name:           lablgl
 Version:        1.01
-Release:        3
+Release:	7%{?dist}
+
 Summary:        LablGL is an OpenGL interface for Objective Caml
 
 Group:          System Environment/Libraries
@@ -9,9 +10,9 @@
 Source:         http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/dist/lablgl-1.01.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  XFree86-devel, freeglut-devel 
-BuildRequires:	ocaml = 3.08.3, labltk = 3.08.3, camlp4 = 3.08.3
+BuildRequires:	ocaml >= 3.08, labltk >= 3.08, camlp4 >= 3.08
 BuildRequires:	tcl-devel, tk-devel
-Requires:       ocaml = 3.08.3, labltk = 3.08.3
+Requires:       ocaml >= 3.08.3, labltk >= 3.08
 
 %description
 LablGL is is an Objective Caml interface to OpenGL. Support is
@@ -64,6 +65,9 @@
 %{_libdir}/ocaml/stublibs/*.so
 
 %changelog
+* Sun Sep 11 2005 Gerard Milmeister  - 1.01-7
+- Rebuild with new ocaml
+
 * Fri Apr  1 2005 Gerard Milmeister  - 1.01-3
 - Rebuild for ocaml 3.08.3
 



From fedora-extras-commits at redhat.com  Mon Sep 12 00:13:42 2005
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Sun, 11 Sep 2005 20:13:42 -0400
Subject: rpms/lablgl/devel lablgl.spec,1.9,1.10
Message-ID: <200509120013.j8C0Dgm0003927@cvs-int.fedora.redhat.com>

Author: gemi

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

Modified Files:
	lablgl.spec 
Log Message:



Index: lablgl.spec
===================================================================
RCS file: /cvs/extras/rpms/lablgl/devel/lablgl.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- lablgl.spec	26 May 2005 18:54:23 -0000	1.9
+++ lablgl.spec	12 Sep 2005 00:13:40 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           lablgl
 Version:        1.01
-Release: 6
+Release:	7%{?dist}
 
 Summary:        LablGL is an OpenGL interface for Objective Caml
 
@@ -10,9 +10,9 @@
 Source:         http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/dist/lablgl-1.01.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  XFree86-devel, freeglut-devel 
-BuildRequires:	ocaml = 3.08.3, labltk = 3.08.3, camlp4 = 3.08.3
+BuildRequires:	ocaml >= 3.08, labltk >= 3.08, camlp4 >= 3.08
 BuildRequires:	tcl-devel, tk-devel
-Requires:       ocaml = 3.08.3, labltk = 3.08.3
+Requires:       ocaml >= 3.08.3, labltk >= 3.08
 
 %description
 LablGL is is an Objective Caml interface to OpenGL. Support is
@@ -65,6 +65,9 @@
 %{_libdir}/ocaml/stublibs/*.so
 
 %changelog
+* Sun Sep 11 2005 Gerard Milmeister  - 1.01-7
+- Rebuild with new ocaml
+
 * Thu May 26 2005 Toshio Kuratomi  - 1.01-6
 - Bump and rebuild with new ocaml.
   



From fedora-extras-commits at redhat.com  Mon Sep 12 06:26:22 2005
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Mon, 12 Sep 2005 02:26:22 -0400
Subject: rpms/svgalib/FC-4 svgalib.spec,1.5,1.6
Message-ID: <200509120626.j8C6QMB9012245@cvs-int.fedora.redhat.com>

Author: jwrdegoede

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

Modified Files:
	svgalib.spec 
Log Message:
No complaints about version in devel so release for FC4, never been in FC4 before so set release to 1.


Index: svgalib.spec
===================================================================
RCS file: /cvs/extras/rpms/svgalib/FC-4/svgalib.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- svgalib.spec	16 Aug 2005 11:55:30 -0000	1.5
+++ svgalib.spec	12 Sep 2005 06:26:20 -0000	1.6
@@ -1,6 +1,6 @@
 Name:		svgalib
 Version:	1.9.21
-Release:	5
+Release:	1
 Exclusivearch:	%{ix86} x86_64
 Summary:	Low-level fullscreen SVGA graphics library
 
@@ -129,6 +129,10 @@
 %{_mandir}/man3/*
 
 %changelog
+* Mon Sep 12 2005 Hans de Goede  1.9.21-1
+- No complaints about version in devel so release for FC4, never
+  been in FC4 before so set release to 1 .
+
 * Tue Aug 16 2005 Hans de Goede  1.9.21-5
 - Merge with upstream, drop merged patches, fix dark vga modes on radeon.
 



From fedora-extras-commits at redhat.com  Mon Sep 12 07:02:55 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Mon, 12 Sep 2005 03:02:55 -0400
Subject: rpms/openct/FC-4 .cvsignore, 1.3, 1.4 openct.spec, 1.5, 1.6 sources,
	1.3, 1.4
Message-ID: <200509120703.j8C73hak013623@cvs-int.fedora.redhat.com>

Author: scop

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

Modified Files:
	.cvsignore openct.spec sources 
Log Message:
* Sun Sep 11 2005 Ville Skytt??  - 0.6.6-1
- 0.6.6.
- Improve description.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/openct/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	17 May 2005 18:53:41 -0000	1.3
+++ .cvsignore	12 Sep 2005 07:02:32 -0000	1.4
@@ -1 +1 @@
-openct-0.6.5.tar.gz
+openct-0.6.6.tar.gz


Index: openct.spec
===================================================================
RCS file: /cvs/extras/rpms/openct/FC-4/openct.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- openct.spec	17 May 2005 18:53:41 -0000	1.5
+++ openct.spec	12 Sep 2005 07:02:53 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           openct
-Version:        0.6.5
-Release:        2
+Version:        0.6.6
+Release:        1%{?dist}
 Summary:        Middleware framework for smart card terminals
 
 Group:          System Environment/Libraries
@@ -12,23 +12,28 @@
 Source3:        %{name}-reader.conf
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  pcsc-lite-devel libusb-devel sed
+BuildRequires:  pcsc-lite-devel
+BuildRequires:  libusb-devel
+BuildRequires:  libtool-ltdl-devel
+BuildRequires:  sed
 Requires:       hotplug
-Requires(post): /sbin/chkconfig /sbin/ldconfig
+Requires(post): /sbin/chkconfig
+Requires(post): /sbin/ldconfig
 Requires(preun): /sbin/chkconfig
 Requires(postun): /sbin/ldconfig
 
 %description
-OpenCT is a middleware framework for smart card terminals.  It
-provides a library with rich set of functions for driver writers,
-protocol drivers for T=0 and T=1, serial and USB functionality,
-including USB hotplugging.  See openct.html in the included
-documentation for configuration notes.
+OpenCT implements drivers for several smart card readers.  It comes as
+driver in ifdhandler format for PC/SC-Lite, as CT-API driver, or as a
+small and lean middleware, so applications can use it with minimal
+overhead.  OpenCT also has a primitive mechanism to export smart card
+readers to remote machines via TCP/IP.
 
 %package        devel
 Summary:        OpenCT development files
 Group:          Development/Libraries
-Requires:       %{name} = %{version}-%{release}, pkgconfig
+Requires:       %{name} = %{version}-%{release}
+Requires:       pkgconfig
 
 %description    devel
 %{summary}.
@@ -61,17 +66,22 @@
 rm -rf $RPM_BUILD_ROOT
 install -dm 755 $RPM_BUILD_ROOT%{_sysconfdir}/hotplug/usb
 make install DESTDIR=$RPM_BUILD_ROOT
+
 ln -sf %{_libdir}/openct-ifd.so \
   $RPM_BUILD_ROOT%{_libdir}/pcsc/drivers/openct-ifd.bundle/Contents/*/
+
 install -pm 644 etc/openct.conf $RPM_BUILD_ROOT%{_sysconfdir}/openct.conf
 install -Dpm 755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/openct
 install -Dpm 644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/openct
 install -Dpm 644 %{name}-reader.conf \
   $RPM_BUILD_ROOT%{_sysconfdir}/reader.conf.d/%{name}.conf
+
 install -dm 755 $RPM_BUILD_ROOT%{_localstatedir}/run/openct
 touch $RPM_BUILD_ROOT%{_localstatedir}/run/openct/status
 chmod 644 $RPM_BUILD_ROOT%{_localstatedir}/run/openct/status
 
+rm -f $RPM_BUILD_ROOT%{_libdir}/{*.la,{libopenctapi,openct-ifd}.a}
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -114,7 +124,6 @@
 %{_sbindir}/ifdproxy
 %{_sbindir}/openct-control
 %{_libdir}/libopenct.so.*
-%{_libdir}/libifd.so.*
 %{_libdir}/libopenctapi.so
 %dir %{_localstatedir}/run/openct/
 %ghost %{_localstatedir}/run/openct/status
@@ -122,25 +131,24 @@
 
 %files devel
 %defattr(-,root,root,-)
+%doc doc/api/*
 %{_includedir}/openct/
 %{_libdir}/pkgconfig/libopenct.pc
 %{_libdir}/libopenct.a
 %{_libdir}/libopenct.so
-%{_libdir}/libifd.a
-%{_libdir}/libifd.so
-%exclude %{_libdir}/libopenctapi.a
-%exclude %{_libdir}/lib*.la
 
 %files -n pcsc-lite-%{name}
 %defattr(-,root,root,-)
 %config(noreplace) %{_sysconfdir}/reader.conf.d/%{name}.conf
 %{_libdir}/openct-ifd.so
 %{_libdir}/pcsc/drivers/openct-ifd.bundle/
-%exclude %{_libdir}/openct-ifd.a
-%exclude %{_libdir}/openct-ifd.la
 
 
 %changelog
+* Sun Sep 11 2005 Ville Skytt??  - 0.6.6-1
+- 0.6.6.
+- Improve description.
+
 * Tue May 17 2005 Ville Skytt??  - 0.6.5-2
 - 0.6.5.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/openct/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	17 May 2005 18:53:41 -0000	1.3
+++ sources	12 Sep 2005 07:02:53 -0000	1.4
@@ -1 +1 @@
-86bafd61788139f28671872da287fa0a  openct-0.6.5.tar.gz
+a9de3bef8e5e2827b8d72a2a50d0bc66  openct-0.6.6.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 12 07:06:39 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Mon, 12 Sep 2005 03:06:39 -0400
Subject: rpms/openct/devel .cvsignore, 1.3, 1.4 openct.spec, 1.5, 1.6 sources,
	1.3, 1.4
Message-ID: <200509120707.j8C77A4I013681@cvs-int.fedora.redhat.com>

Author: scop

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

Modified Files:
	.cvsignore openct.spec sources 
Log Message:
* Sun Sep 11 2005 Ville Skytt??  - 0.6.6-2
- 0.6.6.
- Improve description.
- Don't ship static libs.

TODO: probably needs adjusting to new udev/hotplug in devel, patches welcome.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/openct/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	17 May 2005 18:53:41 -0000	1.3
+++ .cvsignore	12 Sep 2005 07:06:13 -0000	1.4
@@ -1 +1 @@
-openct-0.6.5.tar.gz
+openct-0.6.6.tar.gz


Index: openct.spec
===================================================================
RCS file: /cvs/extras/rpms/openct/devel/openct.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- openct.spec	17 May 2005 18:53:41 -0000	1.5
+++ openct.spec	12 Sep 2005 07:06:13 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           openct
-Version:        0.6.5
-Release:        2
+Version:        0.6.6
+Release:        2%{?dist}
 Summary:        Middleware framework for smart card terminals
 
 Group:          System Environment/Libraries
@@ -12,23 +12,28 @@
 Source3:        %{name}-reader.conf
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  pcsc-lite-devel libusb-devel sed
+BuildRequires:  pcsc-lite-devel
+BuildRequires:  libusb-devel
+BuildRequires:  libtool-ltdl-devel
+BuildRequires:  sed
 Requires:       hotplug
-Requires(post): /sbin/chkconfig /sbin/ldconfig
+Requires(post): /sbin/chkconfig
+Requires(post): /sbin/ldconfig
 Requires(preun): /sbin/chkconfig
 Requires(postun): /sbin/ldconfig
 
 %description
-OpenCT is a middleware framework for smart card terminals.  It
-provides a library with rich set of functions for driver writers,
-protocol drivers for T=0 and T=1, serial and USB functionality,
-including USB hotplugging.  See openct.html in the included
-documentation for configuration notes.
+OpenCT implements drivers for several smart card readers.  It comes as
+driver in ifdhandler format for PC/SC-Lite, as CT-API driver, or as a
+small and lean middleware, so applications can use it with minimal
+overhead.  OpenCT also has a primitive mechanism to export smart card
+readers to remote machines via TCP/IP.
 
 %package        devel
 Summary:        OpenCT development files
 Group:          Development/Libraries
-Requires:       %{name} = %{version}-%{release}, pkgconfig
+Requires:       %{name} = %{version}-%{release}
+Requires:       pkgconfig
 
 %description    devel
 %{summary}.
@@ -53,6 +58,7 @@
 %build
 %configure \
   --disable-dependency-tracking \
+  --disable-static \
   --with-bundle-dir=%{_libdir}/pcsc/drivers
 make %{?_smp_mflags}
 
@@ -61,17 +67,22 @@
 rm -rf $RPM_BUILD_ROOT
 install -dm 755 $RPM_BUILD_ROOT%{_sysconfdir}/hotplug/usb
 make install DESTDIR=$RPM_BUILD_ROOT
+
 ln -sf %{_libdir}/openct-ifd.so \
   $RPM_BUILD_ROOT%{_libdir}/pcsc/drivers/openct-ifd.bundle/Contents/*/
+
 install -pm 644 etc/openct.conf $RPM_BUILD_ROOT%{_sysconfdir}/openct.conf
 install -Dpm 755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/openct
 install -Dpm 644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/openct
 install -Dpm 644 %{name}-reader.conf \
   $RPM_BUILD_ROOT%{_sysconfdir}/reader.conf.d/%{name}.conf
+
 install -dm 755 $RPM_BUILD_ROOT%{_localstatedir}/run/openct
 touch $RPM_BUILD_ROOT%{_localstatedir}/run/openct/status
 chmod 644 $RPM_BUILD_ROOT%{_localstatedir}/run/openct/status
 
+rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -114,7 +125,6 @@
 %{_sbindir}/ifdproxy
 %{_sbindir}/openct-control
 %{_libdir}/libopenct.so.*
-%{_libdir}/libifd.so.*
 %{_libdir}/libopenctapi.so
 %dir %{_localstatedir}/run/openct/
 %ghost %{_localstatedir}/run/openct/status
@@ -122,25 +132,24 @@
 
 %files devel
 %defattr(-,root,root,-)
+%doc doc/api/*
 %{_includedir}/openct/
 %{_libdir}/pkgconfig/libopenct.pc
-%{_libdir}/libopenct.a
 %{_libdir}/libopenct.so
-%{_libdir}/libifd.a
-%{_libdir}/libifd.so
-%exclude %{_libdir}/libopenctapi.a
-%exclude %{_libdir}/lib*.la
 
 %files -n pcsc-lite-%{name}
 %defattr(-,root,root,-)
 %config(noreplace) %{_sysconfdir}/reader.conf.d/%{name}.conf
 %{_libdir}/openct-ifd.so
 %{_libdir}/pcsc/drivers/openct-ifd.bundle/
-%exclude %{_libdir}/openct-ifd.a
-%exclude %{_libdir}/openct-ifd.la
 
 
 %changelog
+* Sun Sep 11 2005 Ville Skytt??  - 0.6.6-2
+- 0.6.6.
+- Improve description.
+- Don't ship static libs.
+
 * Tue May 17 2005 Ville Skytt??  - 0.6.5-2
 - 0.6.5.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/openct/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	17 May 2005 18:53:41 -0000	1.3
+++ sources	12 Sep 2005 07:06:13 -0000	1.4
@@ -1 +1 @@
-86bafd61788139f28671872da287fa0a  openct-0.6.5.tar.gz
+a9de3bef8e5e2827b8d72a2a50d0bc66  openct-0.6.6.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 12 09:26:44 2005
From: fedora-extras-commits at redhat.com (Marc Maurer (uwog))
Date: Mon, 12 Sep 2005 05:26:44 -0400
Subject: rpms/gtkmathview/devel gtkmathview.spec,1.1,1.2
Message-ID: <200509120926.j8C9QieO017178@cvs-int.fedora.redhat.com>

Author: uwog

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

Modified Files:
	gtkmathview.spec 
Log Message:
update to 0.7.4




Index: gtkmathview.spec
===================================================================
RCS file: /cvs/extras/rpms/gtkmathview/devel/gtkmathview.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gtkmathview.spec	30 Aug 2005 22:10:42 -0000	1.1
+++ gtkmathview.spec	12 Sep 2005 09:26:42 -0000	1.2
@@ -1,7 +1,7 @@
 Summary: A MathML rendering library
 Name: gtkmathview
-Version: 0.7.3
-Release: 5
+Version: 0.7.4
+Release: 1
 Group: System Environment/Libraries
 License: GPL
 Source: http://helm.cs.unibo.it/mml-widget/sources/gtkmathview-%{version}.tar.gz
@@ -75,6 +75,9 @@
 rm -r $RPM_BUILD_ROOT
 
 %changelog
+* Mon Sep 12 2005 Marc Maurer  - 0.7.4-1
+- Update to 0.7.4
+
 * Tue Aug 30 2005 Marc Maurer  - 0.7.3-5
 - Drop more unneeded Requires
 



From fedora-extras-commits at redhat.com  Mon Sep 12 09:27:39 2005
From: fedora-extras-commits at redhat.com (Marc Maurer (uwog))
Date: Mon, 12 Sep 2005 05:27:39 -0400
Subject: rpms/gtkmathview/devel .cvsignore,1.2,1.3 sources,1.2,1.3
Message-ID: <200509120927.j8C9Rdws017212@cvs-int.fedora.redhat.com>

Author: uwog

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

Modified Files:
	.cvsignore sources 
Log Message:
Update to 0.7.4




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gtkmathview/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	30 Aug 2005 22:10:42 -0000	1.2
+++ .cvsignore	12 Sep 2005 09:27:37 -0000	1.3
@@ -1 +1 @@
-gtkmathview-0.7.3.tar.gz
+gtkmathview-0.7.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gtkmathview/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	30 Aug 2005 22:10:42 -0000	1.2
+++ sources	12 Sep 2005 09:27:37 -0000	1.3
@@ -1 +1 @@
-23c2af18dae0f2b7af109fc3a47b44d8  gtkmathview-0.7.3.tar.gz
+3309357cfc4d09854da046773f14d919  gtkmathview-0.7.4.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 12 11:37:08 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Mon, 12 Sep 2005 07:37:08 -0400
Subject: rpms/perl-Log-Dispatch - New directory
Message-ID: <200509121137.j8CBb8F6021523@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Log-Dispatch
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21503/perl-Log-Dispatch

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




From fedora-extras-commits at redhat.com  Mon Sep 12 11:37:08 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Mon, 12 Sep 2005 07:37:08 -0400
Subject: rpms/perl-Log-Dispatch/devel - New directory
Message-ID: <200509121137.j8CBb81O021528@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Log-Dispatch/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21503/perl-Log-Dispatch/devel

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




From fedora-extras-commits at redhat.com  Mon Sep 12 11:37:30 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Mon, 12 Sep 2005 07:37:30 -0400
Subject: rpms/perl-Log-Dispatch Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200509121137.j8CBbUdC021583@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Log-Dispatch
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21548

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


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

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

common : CVS/Root
	@cvs checkout common

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

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


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Mon Sep 12 11:37:30 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Mon, 12 Sep 2005 07:37:30 -0400
Subject: rpms/perl-Log-Dispatch/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200509121137.j8CBbUFo021588@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Log-Dispatch/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21548/devel

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


--- NEW FILE .cvsignore ---


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

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Mon Sep 12 11:38:18 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Mon, 12 Sep 2005 07:38:18 -0400
Subject: rpms/perl-Log-Dispatch import.log,1.1,1.2
Message-ID: <200509121138.j8CBcINc021663@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Log-Dispatch
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21626

Modified Files:
	import.log 
Log Message:
auto-import perl-Log-Dispatch-2.11-1 on branch devel from perl-Log-Dispatch-2.11-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Log-Dispatch/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	12 Sep 2005 11:37:28 -0000	1.1
+++ import.log	12 Sep 2005 11:38:16 -0000	1.2
@@ -0,0 +1 @@
+perl-Log-Dispatch-2_11-1:HEAD:perl-Log-Dispatch-2.11-1.src.rpm:1126525077



From fedora-extras-commits at redhat.com  Mon Sep 12 11:38:19 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Mon, 12 Sep 2005 07:38:19 -0400
Subject: rpms/perl-Log-Dispatch/devel
	Log-Dispatch-2.11-enable-mail-tests.patch, NONE,
	1.1 Log-Dispatch-2.11-mod_perl2.patch, NONE,
	1.1 perl-Log-Dispatch.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200509121138.j8CBcJZU021674@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Log-Dispatch/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21626/devel

Modified Files:
	.cvsignore sources 
Added Files:
	Log-Dispatch-2.11-enable-mail-tests.patch 
	Log-Dispatch-2.11-mod_perl2.patch perl-Log-Dispatch.spec 
Log Message:
auto-import perl-Log-Dispatch-2.11-1 on branch devel from perl-Log-Dispatch-2.11-1.src.rpm

Log-Dispatch-2.11-enable-mail-tests.patch:

--- NEW FILE Log-Dispatch-2.11-enable-mail-tests.patch ---
diff -ruN Log-Dispatch-2.11-orig/t/01-basic.t Log-Dispatch-2.11/t/01-basic.t
--- Log-Dispatch-2.11-orig/t/01-basic.t	2005-07-27 15:47:09.000000000 +0100
+++ Log-Dispatch-2.11/t/01-basic.t	2005-09-10 22:37:37.000000000 +0100
@@ -27,6 +27,14 @@
                     syslog_file   => '/var/log/messages',
                   );
 }
+else
+{
+    # Fedora Extras: mail tests coverage
+
+    %TestConfig = ( email_address => 'root at localhost.localdomain',
+                    syslog_file   => '/var/log/messages',
+                  );
+}
 
 use Log::Dispatch::File;
 use Log::Dispatch::Handle;

Log-Dispatch-2.11-mod_perl2.patch:

--- NEW FILE Log-Dispatch-2.11-mod_perl2.patch ---
diff -ruN Log-Dispatch-2.11-orig/lib/Log/Dispatch/ApacheLog.pm Log-Dispatch-2.11/lib/Log/Dispatch/ApacheLog.pm
--- Log-Dispatch-2.11-orig/lib/Log/Dispatch/ApacheLog.pm	2005-07-27 15:47:09.000000000 +0100
+++ Log-Dispatch-2.11/lib/Log/Dispatch/ApacheLog.pm	2005-09-11 15:47:07.000000000 +0100
@@ -9,7 +9,7 @@
 use Params::Validate qw(validate);
 Params::Validate::validation_options( allow_extra => 1 );
 
-use Apache::Log;
+use Apache2::Log;
 
 use vars qw[ $VERSION ];
 
diff -ruN Log-Dispatch-2.11-orig/t/01-basic.t Log-Dispatch-2.11/t/01-basic.t
--- Log-Dispatch-2.11-orig/t/01-basic.t	2005-07-27 15:47:09.000000000 +0100
+++ Log-Dispatch-2.11/t/01-basic.t	2005-09-11 15:47:54.000000000 +0100
@@ -34,7 +34,7 @@
 
 use IO::File;
 
-if ( eval { require mod_perl } )
+if ( eval { require mod_perl2 } )
 {
     require Log::Dispatch::ApacheLog;
 }


--- NEW FILE perl-Log-Dispatch.spec ---
# Build switch:
#   --with mailtests         Enable mail tests

# set mod_perl2 to
#   1  for enabling mod_perl >= 2.0.0RC5 support
#   0  for enabling mod_perl < 2.0.0RC5 support

%define mod_perl2      1
%define mailtests      0

%{?_with_mailtests:%define mailtests 1}


Name:           perl-Log-Dispatch
Version:        2.11
Release:        1%{?dist}
Summary:        Dispatches messages to one or more outputs

Group:          Development/Libraries
License:        GPL or Artistic
URL:            http://search.cpan.org/dist/Log-Dispatch/
Source0:        http://www.cpan.org/authors/id/D/DR/DROLSKY/Log-Dispatch-%{version}.tar.gz
Patch0:         Log-Dispatch-2.11-mod_perl2.patch
Patch1:         Log-Dispatch-2.11-enable-mail-tests.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  perl(Module::Build)
BuildRequires:  perl(Params::Validate)
%if %{mailtests}
BuildRequires:  perl(Mail::Send), perl(Mail::Sender)
BuildRequires:  perl(Mail::Sendmail), perl(MIME::Lite)
%endif
BuildRequires:  perl(File::Find::Rule), perl(Test::Pod)
BuildRequires:  mod_perl
Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
Log::Dispatch is a suite of OO modules for logging messages to
multiple outputs, each of which can have a minimum and maximum log
level.  It is designed to be easily subclassed, both for creating a
new dispatcher object and particularly for creating new outputs.


%prep
%setup -q -n Log-Dispatch-%{version}
%if %{mod_perl2}
%patch0 -p1
%endif
%if %{mailtests}
%patch1 -p1
%endif


%build
%{__perl} Build.PL installdirs=vendor
./Build


%install
rm -rf $RPM_BUILD_ROOT
./Build install destdir=$RPM_BUILD_ROOT create_packlist=0
chmod -R u+w $RPM_BUILD_ROOT/*


%check
./Build test


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc Changes LICENSE README
%{perl_vendorlib}/Log/
%{_mandir}/man3/*.3*


%changelog
* Fri Sep 09 2005 Jose Pedro Oliveira  - 2.11-1
- First build.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Log-Dispatch/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	12 Sep 2005 11:37:28 -0000	1.1
+++ .cvsignore	12 Sep 2005 11:38:16 -0000	1.2
@@ -0,0 +1 @@
+Log-Dispatch-2.11.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Log-Dispatch/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	12 Sep 2005 11:37:28 -0000	1.1
+++ sources	12 Sep 2005 11:38:16 -0000	1.2
@@ -0,0 +1 @@
+85b9478df97e2e00b5d54befd6944001  Log-Dispatch-2.11.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 12 12:11:05 2005
From: fedora-extras-commits at redhat.com (Mark Cox (mjc))
Date: Mon, 12 Sep 2005 08:11:05 -0400
Subject: fedora-security/audit fc4,1.56,1.57
Message-ID: <200509121211.j8CCB5dm023079@cvs-int.fedora.redhat.com>

Author: mjc

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23058

Modified Files:
	fc4 
Log Message:
Catch up with fc4 stuff after the busy Friday



Index: fc4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc4,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- fc4	7 Sep 2005 21:04:59 -0000	1.56
+++ fc4	12 Sep 2005 12:11:02 -0000	1.57
@@ -1,8 +1,13 @@
-Up to date CVE as of CVE email 20050906
-Up to date FC4 as of 20050906
+Up to date CVE as of CVE email 20050911
+Up to date FC4 as of 20050911
 
 ** are items that need attention
 
+2005-2873 ** kernel
+2005-2872 ** kernel
+2005-2871 backport (firefox) [since FEDORA-2005-871]
+2005-2871 backport (mozilla) [since FEDORA-2005-873]
+2005-2871 VULNERABLE (thunderbird) (moderate only)
 2005-2811 version (net-snmp, not upstream gentoo only)
 2005-2802 version (kernel, fixed 2.6.12) [since FEDORA-2005-510]
 2005-2801 version (kernel, fixed 2.6.11)
@@ -290,7 +295,7 @@
 2005-0524 version (php, fixed 5.0.4)
 2005-0504 version (kernel, doesn't build in 2.6)
 2005-0490 version (curl, fixed 7.13.1)
-2005-0488 VULNERABLE (telnet) bz#159299
+2005-0488 backport (telnet) since ga
 2005-0488 backport (krb5) [since FEDORA-2005-553]
 2005-0473 version (gaim, fixed 1.1.3)
 2005-0472 version (gaim, fixed 1.1.3)



From fedora-extras-commits at redhat.com  Mon Sep 12 12:29:33 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon, 12 Sep 2005 08:29:33 -0400
Subject: rpms/maxima/FC-3 maxima.spec,1.4,1.5
Message-ID: <200509121229.j8CCTXhg023175@cvs-int.fedora.redhat.com>

Author: rdieter

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

Modified Files:
	maxima.spec 
Log Message:
* Fri Sep 09 2005 Rex Dieter  5.9.1-5
- add more Obsoletes: maxima-exec- for cleaner upgrade from customized,
  rebuilt upstream rpms.
- (re)disable debuginfo.  No point in having empty -debuginfo pkgs.
- a few cleanups getting ready for 5.9.1.1cvs/5.9.2rc



Index: maxima.spec
===================================================================
RCS file: /cvs/extras/rpms/maxima/FC-3/maxima.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- maxima.spec	6 Sep 2005 18:55:07 -0000	1.4
+++ maxima.spec	12 Sep 2005 12:29:31 -0000	1.5
@@ -5,14 +5,14 @@
 %define _without_gcl 1
 %define _without_sbcl 1
 
-#define cvs cvs20050825
+#define cvs .20050908
 #define beta cvs
 
 Summary: Symbolic Computation Program
 Name: 	 maxima
-Version: 5.9.1
+Version: 5.9.1%{?beta}
 
-Release: 4%{?dist} 
+Release: 5%{?dist} 
 License: GPL
 Group:	 Applications/Engineering 
 URL: 	 http://maxima.sourceforge.net/
@@ -31,12 +31,12 @@
 Patch1: maxima-5.9.0-htmlview.patch
 # (mysterious?) xemacs patch
 Patch2: maxima.el-xemacs.patch
-# Fix build w/sbcl (5.9.1.1cvs only)
-%{?cvs:Patch3: maxima-sbcl.patch}
 
 # Inhibit automatic compressing of info files. Compressed info
 # files break maxima's internal help.
 %define __spec_install_post %{nil} 
+# debuginfo is empty/blank, disable
+%define debug_package   %{nil}
 
 BuildRequires: texinfo
 BuildRequires: tetex-latex
@@ -83,6 +83,7 @@
 %define clisp_ver %{expand:%%(rpm -q --qf '%%{VERSION}' clisp )}
 Requires: clisp >= %{clisp_ver}
 Requires: %{name} = %{version}
+Obsoletes: maxima-exec-lisp
 Provides: %{name}-runtime = %{version}
 %description runtime-clisp
 Maxima compiled with Common Lisp (clisp) 
@@ -96,7 +97,7 @@
 #define cmucl_ver %{expand:%%(rpm -q --qf '%%{VERSION}' cmucl )}
 #Requires: cmucl >= %{cmucl_ver}
 Requires:  %{name} = %{version}
-Obsoletes: %{name}-exec-cmucl 
+Obsoletes: maxima-exec-cmucl 
 Provides:  %{name}-runtime = %{version}
 %description runtime-cmucl
 Maxima compiled with CMU Common Lisp (cmucl) 
@@ -108,7 +109,7 @@
 Group:   Applications/Engineering
 BuildRequires: gcl
 Requires:  %{name} = %{version}
-#Obsoletes: %{name}-exec-gcl 
+Obsoletes: maxima-exec-gcl 
 Provides:  %{name}-runtime = %{version}
 %description runtime-gcl
 Maxima compiled with Gnu Common Lisp (gcl)
@@ -122,7 +123,7 @@
 %define sbcl_ver %{expand:%%(rpm -q --qf '%%{version}' sbcl )}
 Requires: sbcl >= %{sbcl_ver}
 Requires: %{name} = %{version}
-#Obsoletes: %{name}-exec-sbcl
+#Obsoletes: maxima-exec-sbcl
 Provides: %{name}-runtime = %{version}
 %description runtime-sbcl
 Maxima compiled with Steel Bank Common Lisp (sbcl).
@@ -130,14 +131,13 @@
 
 
 %prep
-%setup -q  -n %{name}%{!?cvs:-%{version}%{?beta}}
+%setup -q  -n %{name}%{!?cvs:-%{version}}
 
 # Extra docs
 install -p -m644 %{SOURCE10} .
 
 %patch1 -p1 -b .htmlview
 %patch2 -p1 -b .xemacs
-%{?cvs:%patch3 -p1 -b .sbcl}
 
 sed -i -e 's:/usr/local/info:/usr/share/info:' \
   interfaces/emacs/emaxima/maxima.el
@@ -204,20 +204,20 @@
 ## emaxima
 # LaTeX style
 install -d $RPM_BUILD_ROOT%{_datadir}/texmf/tex/latex/emaxima
-cp -alf $RPM_BUILD_ROOT%{_datadir}/%{name}/%{version}%{?beta}/emacs/*.sty \
+cp -alf $RPM_BUILD_ROOT%{_datadir}/%{name}/%{version}/emacs/*.sty \
 	$RPM_BUILD_ROOT%{_datadir}/texmf/tex/latex/emaxima/
 # emacs
 install -d $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/{maxima,site-start.d}
-cp -alf $RPM_BUILD_ROOT%{_datadir}/%{name}/%{version}%{?beta}/emacs/*.el \
-	$RPM_BUILD_ROOT%{_datadir}/%{name}/%{version}%{?beta}/emacs/*.lisp \
+cp -alf $RPM_BUILD_ROOT%{_datadir}/%{name}/%{version}/emacs/*.el \
+	$RPM_BUILD_ROOT%{_datadir}/%{name}/%{version}/emacs/*.lisp \
 	$RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/maxima/
 install -D -m644 -p %{SOURCE6} \
 	$RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/site-start.d/maxima.el
 
 # xemacs
 install -d $RPM_BUILD_ROOT%{_datadir}/xemacs/site-packages/lisp/{maxima,site-start.d}
-cp -alf $RPM_BUILD_ROOT%{_datadir}/%{name}/%{version}%{?beta}/emacs/*.el \
-	$RPM_BUILD_ROOT%{_datadir}/%{name}/%{version}%{?beta}/emacs/*.lisp \
+cp -alf $RPM_BUILD_ROOT%{_datadir}/%{name}/%{version}/emacs/*.el \
+	$RPM_BUILD_ROOT%{_datadir}/%{name}/%{version}/emacs/*.lisp \
 	$RPM_BUILD_ROOT%{_datadir}/xemacs/site-packages/lisp/maxima/
 install -D -m644 -p %{SOURCE6} \
 	$RPM_BUILD_ROOT%{_datadir}/xemacs/site-packages/lisp/site-start.d/maxima.el
@@ -227,7 +227,7 @@
 # until we get/Require rlwrap from http://utopia.knoware.nl/~hlub/uck/rlwrap/
 rm -f $RPM_BUILD_ROOT%{_bindir}/rmaxima
 # docs
-rm -rf $RPM_BUILD_ROOT%{_datadir}/maxima/%{version}%{?beta}/doc/{contributors,implementation,misc,maximabook,EMaximaIntro.ps}
+rm -rf $RPM_BUILD_ROOT%{_datadir}/maxima/%{version}/doc/{contributors,implementation,misc,maximabook,EMaximaIntro.ps}
 
 # when --with gcl, this (sometimes) fails to get auto-created, so we'll help out
 touch debugfiles.list
@@ -255,61 +255,67 @@
 %doc doc/intromax/intromax.pdf
 %doc doc/maximabook/maxima.pdf
 %doc macref.pdf
-%doc %{_datadir}/maxima/%{version}%{?beta}/doc
+%doc %{_datadir}/maxima/%{version}/doc
 %{_bindir}/maxima
 %dir %{_datadir}/maxima
-%dir %{_datadir}/maxima/%{version}%{?beta}
-%{_datadir}/maxima/%{version}%{?beta}/[a-c,f-r,t-w,y-z,A-Z]*
-%{_datadir}/maxima/%{version}%{?beta}/demo/
-%{_datadir}/maxima/%{version}%{?beta}/share/
+%dir %{_datadir}/maxima/%{version}
+%{_datadir}/maxima/%{version}/[a-c,f-r,t-w,y-z,A-Z]*
+%{_datadir}/maxima/%{version}/demo/
+%{_datadir}/maxima/%{version}/share/
 %dir %{_libdir}/maxima
-%dir %{_libdir}/maxima/%{version}%{?beta}
+%dir %{_libdir}/maxima/%{version}
 %{_libexecdir}/maxima
 %{_infodir}/*.info*
 %{_mandir}/man1/maxima.*
 # emaxima     
-%{_datadir}/maxima/%{version}%{?beta}/emacs
+%{_datadir}/maxima/%{version}/emacs
 %{_datadir}/emacs/site-lisp/*
 %{_datadir}/xemacs/site-packages/lisp/*
 %{_datadir}/texmf/tex/latex/emaxima/
 
 %files src
 %defattr(-,root,root)
-%{_datadir}/maxima/%{version}%{?beta}/src/
+%{_datadir}/maxima/%{version}/src/
 
 %files gui
 %defattr(-,root,root)
 %{_bindir}/xmaxima
-%{_datadir}/maxima/%{version}%{?beta}/xmaxima
+%{_datadir}/maxima/%{version}/xmaxima
 %{_datadir}/applications/*.desktop
 %{_datadir}/pixmaps/*.png
 
 %if "%{?_with_clisp:1}" == "1"
 %files runtime-clisp
 %defattr(-,root,root)
-%{_libdir}/maxima/%{version}%{?beta}/binary-clisp
+%{_libdir}/maxima/%{version}/binary-clisp
 %endif
 
 %if "%{?_with_cmucl:1}" == "1"
 %files runtime-cmucl
 %defattr(-,root,root)
-%{_libdir}/maxima/%{version}%{?beta}/binary-cmucl
+%{_libdir}/maxima/%{version}/binary-cmucl
 %endif
 
 %if "%{?_with_gcl:1}" == "1"
 %files runtime-gcl
 %defattr(-,root,root)
-%{_libdir}/maxima/%{version}%{?beta}/binary-gcl
+%{_libdir}/maxima/%{version}/binary-gcl
 %endif
 
 %if "%{?_with_sbcl:1}" == "1"
 %files runtime-sbcl
 %defattr(-,root,root)
-%{_libdir}/maxima/%{version}%{?beta}/binary-sbcl
+%{_libdir}/maxima/%{version}/binary-sbcl
 %endif
 
 
 %changelog
+* Fri Sep 09 2005 Rex Dieter  5.9.1-5
+- add more Obsoletes: maxima-exec- for cleaner upgrade from customized,
+  rebuilt upstream rpms.
+- (re)disable debuginfo.  No point in having empty -debuginfo pkgs.
+- a few cleanups getting ready for 5.9.1.1cvs/5.9.2rc
+
 * Tue Sep 06 2005 Rex Dieter  5.9.1-4
 - workaround lack of debuginfo.list when building --with gcl
 - ExcludeArch: ppc ppc64 (bug #166347)



From fedora-extras-commits at redhat.com  Mon Sep 12 12:29:34 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon, 12 Sep 2005 08:29:34 -0400
Subject: rpms/maxima/devel maxima.spec,1.4,1.5
Message-ID: <200509121229.j8CCTYnH023187@cvs-int.fedora.redhat.com>

Author: rdieter

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

Modified Files:
	maxima.spec 
Log Message:
* Fri Sep 09 2005 Rex Dieter  5.9.1-5
- add more Obsoletes: maxima-exec- for cleaner upgrade from customized,
  rebuilt upstream rpms.
- (re)disable debuginfo.  No point in having empty -debuginfo pkgs.
- a few cleanups getting ready for 5.9.1.1cvs/5.9.2rc



Index: maxima.spec
===================================================================
RCS file: /cvs/extras/rpms/maxima/devel/maxima.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- maxima.spec	6 Sep 2005 18:55:07 -0000	1.4
+++ maxima.spec	12 Sep 2005 12:29:32 -0000	1.5
@@ -5,14 +5,14 @@
 %define _without_gcl 1
 %define _without_sbcl 1
 
-#define cvs cvs20050825
+#define cvs .20050908
 #define beta cvs
 
 Summary: Symbolic Computation Program
 Name: 	 maxima
-Version: 5.9.1
+Version: 5.9.1%{?beta}
 
-Release: 4%{?dist} 
+Release: 5%{?dist} 
 License: GPL
 Group:	 Applications/Engineering 
 URL: 	 http://maxima.sourceforge.net/
@@ -31,12 +31,12 @@
 Patch1: maxima-5.9.0-htmlview.patch
 # (mysterious?) xemacs patch
 Patch2: maxima.el-xemacs.patch
-# Fix build w/sbcl (5.9.1.1cvs only)
-%{?cvs:Patch3: maxima-sbcl.patch}
 
 # Inhibit automatic compressing of info files. Compressed info
 # files break maxima's internal help.
 %define __spec_install_post %{nil} 
+# debuginfo is empty/blank, disable
+%define debug_package   %{nil}
 
 BuildRequires: texinfo
 BuildRequires: tetex-latex
@@ -83,6 +83,7 @@
 %define clisp_ver %{expand:%%(rpm -q --qf '%%{VERSION}' clisp )}
 Requires: clisp >= %{clisp_ver}
 Requires: %{name} = %{version}
+Obsoletes: maxima-exec-lisp
 Provides: %{name}-runtime = %{version}
 %description runtime-clisp
 Maxima compiled with Common Lisp (clisp) 
@@ -96,7 +97,7 @@
 #define cmucl_ver %{expand:%%(rpm -q --qf '%%{VERSION}' cmucl )}
 #Requires: cmucl >= %{cmucl_ver}
 Requires:  %{name} = %{version}
-Obsoletes: %{name}-exec-cmucl 
+Obsoletes: maxima-exec-cmucl 
 Provides:  %{name}-runtime = %{version}
 %description runtime-cmucl
 Maxima compiled with CMU Common Lisp (cmucl) 
@@ -108,7 +109,7 @@
 Group:   Applications/Engineering
 BuildRequires: gcl
 Requires:  %{name} = %{version}
-#Obsoletes: %{name}-exec-gcl 
+Obsoletes: maxima-exec-gcl 
 Provides:  %{name}-runtime = %{version}
 %description runtime-gcl
 Maxima compiled with Gnu Common Lisp (gcl)
@@ -122,7 +123,7 @@
 %define sbcl_ver %{expand:%%(rpm -q --qf '%%{version}' sbcl )}
 Requires: sbcl >= %{sbcl_ver}
 Requires: %{name} = %{version}
-#Obsoletes: %{name}-exec-sbcl
+#Obsoletes: maxima-exec-sbcl
 Provides: %{name}-runtime = %{version}
 %description runtime-sbcl
 Maxima compiled with Steel Bank Common Lisp (sbcl).
@@ -130,14 +131,13 @@
 
 
 %prep
-%setup -q  -n %{name}%{!?cvs:-%{version}%{?beta}}
+%setup -q  -n %{name}%{!?cvs:-%{version}}
 
 # Extra docs
 install -p -m644 %{SOURCE10} .
 
 %patch1 -p1 -b .htmlview
 %patch2 -p1 -b .xemacs
-%{?cvs:%patch3 -p1 -b .sbcl}
 
 sed -i -e 's:/usr/local/info:/usr/share/info:' \
   interfaces/emacs/emaxima/maxima.el
@@ -204,20 +204,20 @@
 ## emaxima
 # LaTeX style
 install -d $RPM_BUILD_ROOT%{_datadir}/texmf/tex/latex/emaxima
-cp -alf $RPM_BUILD_ROOT%{_datadir}/%{name}/%{version}%{?beta}/emacs/*.sty \
+cp -alf $RPM_BUILD_ROOT%{_datadir}/%{name}/%{version}/emacs/*.sty \
 	$RPM_BUILD_ROOT%{_datadir}/texmf/tex/latex/emaxima/
 # emacs
 install -d $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/{maxima,site-start.d}
-cp -alf $RPM_BUILD_ROOT%{_datadir}/%{name}/%{version}%{?beta}/emacs/*.el \
-	$RPM_BUILD_ROOT%{_datadir}/%{name}/%{version}%{?beta}/emacs/*.lisp \
+cp -alf $RPM_BUILD_ROOT%{_datadir}/%{name}/%{version}/emacs/*.el \
+	$RPM_BUILD_ROOT%{_datadir}/%{name}/%{version}/emacs/*.lisp \
 	$RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/maxima/
 install -D -m644 -p %{SOURCE6} \
 	$RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/site-start.d/maxima.el
 
 # xemacs
 install -d $RPM_BUILD_ROOT%{_datadir}/xemacs/site-packages/lisp/{maxima,site-start.d}
-cp -alf $RPM_BUILD_ROOT%{_datadir}/%{name}/%{version}%{?beta}/emacs/*.el \
-	$RPM_BUILD_ROOT%{_datadir}/%{name}/%{version}%{?beta}/emacs/*.lisp \
+cp -alf $RPM_BUILD_ROOT%{_datadir}/%{name}/%{version}/emacs/*.el \
+	$RPM_BUILD_ROOT%{_datadir}/%{name}/%{version}/emacs/*.lisp \
 	$RPM_BUILD_ROOT%{_datadir}/xemacs/site-packages/lisp/maxima/
 install -D -m644 -p %{SOURCE6} \
 	$RPM_BUILD_ROOT%{_datadir}/xemacs/site-packages/lisp/site-start.d/maxima.el
@@ -227,7 +227,7 @@
 # until we get/Require rlwrap from http://utopia.knoware.nl/~hlub/uck/rlwrap/
 rm -f $RPM_BUILD_ROOT%{_bindir}/rmaxima
 # docs
-rm -rf $RPM_BUILD_ROOT%{_datadir}/maxima/%{version}%{?beta}/doc/{contributors,implementation,misc,maximabook,EMaximaIntro.ps}
+rm -rf $RPM_BUILD_ROOT%{_datadir}/maxima/%{version}/doc/{contributors,implementation,misc,maximabook,EMaximaIntro.ps}
 
 # when --with gcl, this (sometimes) fails to get auto-created, so we'll help out
 touch debugfiles.list
@@ -255,61 +255,67 @@
 %doc doc/intromax/intromax.pdf
 %doc doc/maximabook/maxima.pdf
 %doc macref.pdf
-%doc %{_datadir}/maxima/%{version}%{?beta}/doc
+%doc %{_datadir}/maxima/%{version}/doc
 %{_bindir}/maxima
 %dir %{_datadir}/maxima
-%dir %{_datadir}/maxima/%{version}%{?beta}
-%{_datadir}/maxima/%{version}%{?beta}/[a-c,f-r,t-w,y-z,A-Z]*
-%{_datadir}/maxima/%{version}%{?beta}/demo/
-%{_datadir}/maxima/%{version}%{?beta}/share/
+%dir %{_datadir}/maxima/%{version}
+%{_datadir}/maxima/%{version}/[a-c,f-r,t-w,y-z,A-Z]*
+%{_datadir}/maxima/%{version}/demo/
+%{_datadir}/maxima/%{version}/share/
 %dir %{_libdir}/maxima
-%dir %{_libdir}/maxima/%{version}%{?beta}
+%dir %{_libdir}/maxima/%{version}
 %{_libexecdir}/maxima
 %{_infodir}/*.info*
 %{_mandir}/man1/maxima.*
 # emaxima     
-%{_datadir}/maxima/%{version}%{?beta}/emacs
+%{_datadir}/maxima/%{version}/emacs
 %{_datadir}/emacs/site-lisp/*
 %{_datadir}/xemacs/site-packages/lisp/*
 %{_datadir}/texmf/tex/latex/emaxima/
 
 %files src
 %defattr(-,root,root)
-%{_datadir}/maxima/%{version}%{?beta}/src/
+%{_datadir}/maxima/%{version}/src/
 
 %files gui
 %defattr(-,root,root)
 %{_bindir}/xmaxima
-%{_datadir}/maxima/%{version}%{?beta}/xmaxima
+%{_datadir}/maxima/%{version}/xmaxima
 %{_datadir}/applications/*.desktop
 %{_datadir}/pixmaps/*.png
 
 %if "%{?_with_clisp:1}" == "1"
 %files runtime-clisp
 %defattr(-,root,root)
-%{_libdir}/maxima/%{version}%{?beta}/binary-clisp
+%{_libdir}/maxima/%{version}/binary-clisp
 %endif
 
 %if "%{?_with_cmucl:1}" == "1"
 %files runtime-cmucl
 %defattr(-,root,root)
-%{_libdir}/maxima/%{version}%{?beta}/binary-cmucl
+%{_libdir}/maxima/%{version}/binary-cmucl
 %endif
 
 %if "%{?_with_gcl:1}" == "1"
 %files runtime-gcl
 %defattr(-,root,root)
-%{_libdir}/maxima/%{version}%{?beta}/binary-gcl
+%{_libdir}/maxima/%{version}/binary-gcl
 %endif
 
 %if "%{?_with_sbcl:1}" == "1"
 %files runtime-sbcl
 %defattr(-,root,root)
-%{_libdir}/maxima/%{version}%{?beta}/binary-sbcl
+%{_libdir}/maxima/%{version}/binary-sbcl
 %endif
 
 
 %changelog
+* Fri Sep 09 2005 Rex Dieter  5.9.1-5
+- add more Obsoletes: maxima-exec- for cleaner upgrade from customized,
+  rebuilt upstream rpms.
+- (re)disable debuginfo.  No point in having empty -debuginfo pkgs.
+- a few cleanups getting ready for 5.9.1.1cvs/5.9.2rc
+
 * Tue Sep 06 2005 Rex Dieter  5.9.1-4
 - workaround lack of debuginfo.list when building --with gcl
 - ExcludeArch: ppc ppc64 (bug #166347)



From fedora-extras-commits at redhat.com  Mon Sep 12 12:29:34 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon, 12 Sep 2005 08:29:34 -0400
Subject: rpms/maxima/FC-4 maxima.spec,1.4,1.5
Message-ID: <200509121229.j8CCTYRc023181@cvs-int.fedora.redhat.com>

Author: rdieter

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

Modified Files:
	maxima.spec 
Log Message:
* Fri Sep 09 2005 Rex Dieter  5.9.1-5
- add more Obsoletes: maxima-exec- for cleaner upgrade from customized,
  rebuilt upstream rpms.
- (re)disable debuginfo.  No point in having empty -debuginfo pkgs.
- a few cleanups getting ready for 5.9.1.1cvs/5.9.2rc



Index: maxima.spec
===================================================================
RCS file: /cvs/extras/rpms/maxima/FC-4/maxima.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- maxima.spec	6 Sep 2005 18:55:07 -0000	1.4
+++ maxima.spec	12 Sep 2005 12:29:32 -0000	1.5
@@ -5,14 +5,14 @@
 %define _without_gcl 1
 %define _without_sbcl 1
 
-#define cvs cvs20050825
+#define cvs .20050908
 #define beta cvs
 
 Summary: Symbolic Computation Program
 Name: 	 maxima
-Version: 5.9.1
+Version: 5.9.1%{?beta}
 
-Release: 4%{?dist} 
+Release: 5%{?dist} 
 License: GPL
 Group:	 Applications/Engineering 
 URL: 	 http://maxima.sourceforge.net/
@@ -31,12 +31,12 @@
 Patch1: maxima-5.9.0-htmlview.patch
 # (mysterious?) xemacs patch
 Patch2: maxima.el-xemacs.patch
-# Fix build w/sbcl (5.9.1.1cvs only)
-%{?cvs:Patch3: maxima-sbcl.patch}
 
 # Inhibit automatic compressing of info files. Compressed info
 # files break maxima's internal help.
 %define __spec_install_post %{nil} 
+# debuginfo is empty/blank, disable
+%define debug_package   %{nil}
 
 BuildRequires: texinfo
 BuildRequires: tetex-latex
@@ -83,6 +83,7 @@
 %define clisp_ver %{expand:%%(rpm -q --qf '%%{VERSION}' clisp )}
 Requires: clisp >= %{clisp_ver}
 Requires: %{name} = %{version}
+Obsoletes: maxima-exec-lisp
 Provides: %{name}-runtime = %{version}
 %description runtime-clisp
 Maxima compiled with Common Lisp (clisp) 
@@ -96,7 +97,7 @@
 #define cmucl_ver %{expand:%%(rpm -q --qf '%%{VERSION}' cmucl )}
 #Requires: cmucl >= %{cmucl_ver}
 Requires:  %{name} = %{version}
-Obsoletes: %{name}-exec-cmucl 
+Obsoletes: maxima-exec-cmucl 
 Provides:  %{name}-runtime = %{version}
 %description runtime-cmucl
 Maxima compiled with CMU Common Lisp (cmucl) 
@@ -108,7 +109,7 @@
 Group:   Applications/Engineering
 BuildRequires: gcl
 Requires:  %{name} = %{version}
-#Obsoletes: %{name}-exec-gcl 
+Obsoletes: maxima-exec-gcl 
 Provides:  %{name}-runtime = %{version}
 %description runtime-gcl
 Maxima compiled with Gnu Common Lisp (gcl)
@@ -122,7 +123,7 @@
 %define sbcl_ver %{expand:%%(rpm -q --qf '%%{version}' sbcl )}
 Requires: sbcl >= %{sbcl_ver}
 Requires: %{name} = %{version}
-#Obsoletes: %{name}-exec-sbcl
+#Obsoletes: maxima-exec-sbcl
 Provides: %{name}-runtime = %{version}
 %description runtime-sbcl
 Maxima compiled with Steel Bank Common Lisp (sbcl).
@@ -130,14 +131,13 @@
 
 
 %prep
-%setup -q  -n %{name}%{!?cvs:-%{version}%{?beta}}
+%setup -q  -n %{name}%{!?cvs:-%{version}}
 
 # Extra docs
 install -p -m644 %{SOURCE10} .
 
 %patch1 -p1 -b .htmlview
 %patch2 -p1 -b .xemacs
-%{?cvs:%patch3 -p1 -b .sbcl}
 
 sed -i -e 's:/usr/local/info:/usr/share/info:' \
   interfaces/emacs/emaxima/maxima.el
@@ -204,20 +204,20 @@
 ## emaxima
 # LaTeX style
 install -d $RPM_BUILD_ROOT%{_datadir}/texmf/tex/latex/emaxima
-cp -alf $RPM_BUILD_ROOT%{_datadir}/%{name}/%{version}%{?beta}/emacs/*.sty \
+cp -alf $RPM_BUILD_ROOT%{_datadir}/%{name}/%{version}/emacs/*.sty \
 	$RPM_BUILD_ROOT%{_datadir}/texmf/tex/latex/emaxima/
 # emacs
 install -d $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/{maxima,site-start.d}
-cp -alf $RPM_BUILD_ROOT%{_datadir}/%{name}/%{version}%{?beta}/emacs/*.el \
-	$RPM_BUILD_ROOT%{_datadir}/%{name}/%{version}%{?beta}/emacs/*.lisp \
+cp -alf $RPM_BUILD_ROOT%{_datadir}/%{name}/%{version}/emacs/*.el \
+	$RPM_BUILD_ROOT%{_datadir}/%{name}/%{version}/emacs/*.lisp \
 	$RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/maxima/
 install -D -m644 -p %{SOURCE6} \
 	$RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/site-start.d/maxima.el
 
 # xemacs
 install -d $RPM_BUILD_ROOT%{_datadir}/xemacs/site-packages/lisp/{maxima,site-start.d}
-cp -alf $RPM_BUILD_ROOT%{_datadir}/%{name}/%{version}%{?beta}/emacs/*.el \
-	$RPM_BUILD_ROOT%{_datadir}/%{name}/%{version}%{?beta}/emacs/*.lisp \
+cp -alf $RPM_BUILD_ROOT%{_datadir}/%{name}/%{version}/emacs/*.el \
+	$RPM_BUILD_ROOT%{_datadir}/%{name}/%{version}/emacs/*.lisp \
 	$RPM_BUILD_ROOT%{_datadir}/xemacs/site-packages/lisp/maxima/
 install -D -m644 -p %{SOURCE6} \
 	$RPM_BUILD_ROOT%{_datadir}/xemacs/site-packages/lisp/site-start.d/maxima.el
@@ -227,7 +227,7 @@
 # until we get/Require rlwrap from http://utopia.knoware.nl/~hlub/uck/rlwrap/
 rm -f $RPM_BUILD_ROOT%{_bindir}/rmaxima
 # docs
-rm -rf $RPM_BUILD_ROOT%{_datadir}/maxima/%{version}%{?beta}/doc/{contributors,implementation,misc,maximabook,EMaximaIntro.ps}
+rm -rf $RPM_BUILD_ROOT%{_datadir}/maxima/%{version}/doc/{contributors,implementation,misc,maximabook,EMaximaIntro.ps}
 
 # when --with gcl, this (sometimes) fails to get auto-created, so we'll help out
 touch debugfiles.list
@@ -255,61 +255,67 @@
 %doc doc/intromax/intromax.pdf
 %doc doc/maximabook/maxima.pdf
 %doc macref.pdf
-%doc %{_datadir}/maxima/%{version}%{?beta}/doc
+%doc %{_datadir}/maxima/%{version}/doc
 %{_bindir}/maxima
 %dir %{_datadir}/maxima
-%dir %{_datadir}/maxima/%{version}%{?beta}
-%{_datadir}/maxima/%{version}%{?beta}/[a-c,f-r,t-w,y-z,A-Z]*
-%{_datadir}/maxima/%{version}%{?beta}/demo/
-%{_datadir}/maxima/%{version}%{?beta}/share/
+%dir %{_datadir}/maxima/%{version}
+%{_datadir}/maxima/%{version}/[a-c,f-r,t-w,y-z,A-Z]*
+%{_datadir}/maxima/%{version}/demo/
+%{_datadir}/maxima/%{version}/share/
 %dir %{_libdir}/maxima
-%dir %{_libdir}/maxima/%{version}%{?beta}
+%dir %{_libdir}/maxima/%{version}
 %{_libexecdir}/maxima
 %{_infodir}/*.info*
 %{_mandir}/man1/maxima.*
 # emaxima     
-%{_datadir}/maxima/%{version}%{?beta}/emacs
+%{_datadir}/maxima/%{version}/emacs
 %{_datadir}/emacs/site-lisp/*
 %{_datadir}/xemacs/site-packages/lisp/*
 %{_datadir}/texmf/tex/latex/emaxima/
 
 %files src
 %defattr(-,root,root)
-%{_datadir}/maxima/%{version}%{?beta}/src/
+%{_datadir}/maxima/%{version}/src/
 
 %files gui
 %defattr(-,root,root)
 %{_bindir}/xmaxima
-%{_datadir}/maxima/%{version}%{?beta}/xmaxima
+%{_datadir}/maxima/%{version}/xmaxima
 %{_datadir}/applications/*.desktop
 %{_datadir}/pixmaps/*.png
 
 %if "%{?_with_clisp:1}" == "1"
 %files runtime-clisp
 %defattr(-,root,root)
-%{_libdir}/maxima/%{version}%{?beta}/binary-clisp
+%{_libdir}/maxima/%{version}/binary-clisp
 %endif
 
 %if "%{?_with_cmucl:1}" == "1"
 %files runtime-cmucl
 %defattr(-,root,root)
-%{_libdir}/maxima/%{version}%{?beta}/binary-cmucl
+%{_libdir}/maxima/%{version}/binary-cmucl
 %endif
 
 %if "%{?_with_gcl:1}" == "1"
 %files runtime-gcl
 %defattr(-,root,root)
-%{_libdir}/maxima/%{version}%{?beta}/binary-gcl
+%{_libdir}/maxima/%{version}/binary-gcl
 %endif
 
 %if "%{?_with_sbcl:1}" == "1"
 %files runtime-sbcl
 %defattr(-,root,root)
-%{_libdir}/maxima/%{version}%{?beta}/binary-sbcl
+%{_libdir}/maxima/%{version}/binary-sbcl
 %endif
 
 
 %changelog
+* Fri Sep 09 2005 Rex Dieter  5.9.1-5
+- add more Obsoletes: maxima-exec- for cleaner upgrade from customized,
+  rebuilt upstream rpms.
+- (re)disable debuginfo.  No point in having empty -debuginfo pkgs.
+- a few cleanups getting ready for 5.9.1.1cvs/5.9.2rc
+
 * Tue Sep 06 2005 Rex Dieter  5.9.1-4
 - workaround lack of debuginfo.list when building --with gcl
 - ExcludeArch: ppc ppc64 (bug #166347)



From fedora-extras-commits at redhat.com  Mon Sep 12 12:35:07 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon, 12 Sep 2005 08:35:07 -0400
Subject: rpms/sbcl - New directory
Message-ID: <200509121235.j8CCZ7f2023399@cvs-int.fedora.redhat.com>

Author: rdieter

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

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




From fedora-extras-commits at redhat.com  Mon Sep 12 12:35:07 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon, 12 Sep 2005 08:35:07 -0400
Subject: rpms/sbcl/devel - New directory
Message-ID: <200509121235.j8CCZ70g023404@cvs-int.fedora.redhat.com>

Author: rdieter

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

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




From fedora-extras-commits at redhat.com  Mon Sep 12 12:35:20 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon, 12 Sep 2005 08:35:20 -0400
Subject: rpms/sbcl Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200509121235.j8CCZKeL023459@cvs-int.fedora.redhat.com>

Author: rdieter

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

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


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

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

common : CVS/Root
	@cvs checkout common

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

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


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Mon Sep 12 12:35:20 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon, 12 Sep 2005 08:35:20 -0400
Subject: rpms/sbcl/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200509121235.j8CCZKvg023464@cvs-int.fedora.redhat.com>

Author: rdieter

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

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


--- NEW FILE .cvsignore ---


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

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Mon Sep 12 12:36:46 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon, 12 Sep 2005 08:36:46 -0400
Subject: rpms/sbcl import.log,1.1,1.2
Message-ID: <200509121237.j8CCbGSu023569@cvs-int.fedora.redhat.com>

Author: rdieter

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

Modified Files:
	import.log 
Log Message:
auto-import sbcl-0.9.4-4 on branch devel from sbcl-0.9.4-4.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/sbcl/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	12 Sep 2005 12:35:18 -0000	1.1
+++ import.log	12 Sep 2005 12:36:44 -0000	1.2
@@ -0,0 +1 @@
+sbcl-0_9_4-4:HEAD:sbcl-0.9.4-4.src.rpm:1126528604



From fedora-extras-commits at redhat.com  Mon Sep 12 12:36:47 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon, 12 Sep 2005 08:36:47 -0400
Subject: rpms/sbcl/devel sbcl-0.8.18-default-sbcl-home.patch, NONE,
	1.1 sbcl-0.9.4-ADDR_NO_RANDOMIZE.patch, NONE,
	1.1 sbcl-0.9.4-optflags.patch, NONE, 1.1 sbcl.sh, NONE,
	1.1 sbcl.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200509121236.j8CCaloO023558@cvs-int.fedora.redhat.com>

Author: rdieter

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

Modified Files:
	.cvsignore sources 
Added Files:
	sbcl-0.8.18-default-sbcl-home.patch 
	sbcl-0.9.4-ADDR_NO_RANDOMIZE.patch sbcl-0.9.4-optflags.patch 
	sbcl.sh sbcl.spec 
Log Message:
auto-import sbcl-0.9.4-4 on branch devel from sbcl-0.9.4-4.src.rpm

sbcl-0.8.18-default-sbcl-home.patch:

--- NEW FILE sbcl-0.8.18-default-sbcl-home.patch ---
Index: make-target-1.sh
===================================================================
RCS file: /cvsroot/sbcl/sbcl/make-target-1.sh,v
retrieving revision 1.12
diff -u -r1.12 make-target-1.sh
--- make-target-1.sh	10 Sep 2004 15:36:17 -0000	1.12
+++ make-target-1.sh	3 Jan 2005 06:44:55 -0000
@@ -15,6 +15,29 @@
 
 echo //entering make-target-1.sh
 
+# Allow the definition of INSTALL_ROOT and/or SBCL_HOME to correctly
+# set the hard-coded SBCL_HOME macro in src/runtime/runtime.c
+
+DEFAULT_SBCL_HOME=${DEFAULT_SBCL_HOME:-/usr/local/lib/sbcl/}
+
+# Strip off any trailing / on the name; we'll add this later but don't
+# need two
+DEFAULT_SBCL_HOME=${DEFAULT_SBCL_HOME%/}
+
+export DEFAULT_SBCL_HOME
+
+file=src/runtime/sbcl-home.h
+echo "/* This is a machine-generated file.            */" > $file
+echo "/* Please do not edit it by hand.               */" >> $file
+echo "/* Change the default SBCL_HOME by setting the  */" >> $file
+echo "/* DEFAULT_SBCL_HOME environment variable prior */" >> $file
+echo "/* to building. See make-target-1.sh for more   */" >> $file
+echo "/* information.                                 */" >> $file
+echo "#ifndef SBCL_HOME" >> $file
+echo "#define SBCL_HOME \"$DEFAULT_SBCL_HOME/\"" >> $file
+echo "#endif" >> $file
+
+
 # Build the runtime system and symbol table (.nm) file.
 #
 # (This C build has to come after the first genesis in order to get
Index: src/runtime/runtime.c
===================================================================
RCS file: /cvsroot/sbcl/sbcl/src/runtime/runtime.c,v
retrieving revision 1.43
diff -u -r1.43 runtime.c
--- src/runtime/runtime.c	29 Oct 2004 09:00:39 -0000	1.43
+++ src/runtime/runtime.c	3 Jan 2005 06:47:51 -0000
@@ -61,9 +61,7 @@
 #include "interr.h"
 #endif
 
-#ifndef SBCL_HOME
-#define SBCL_HOME "/usr/local/lib/sbcl/"
-#endif
+#include "sbcl-home.h"
 
 
 /* SIGINT handler that invokes the monitor (for when Lisp isn't up to it) */

sbcl-0.9.4-ADDR_NO_RANDOMIZE.patch:

--- NEW FILE sbcl-0.9.4-ADDR_NO_RANDOMIZE.patch ---
--- sbcl-0.9.4/src/runtime/os.h.ADDR_NO_RANDOMIZE	2005-07-14 10:41:20.000000000 -0500
+++ sbcl-0.9.4/src/runtime/os.h	2005-08-30 12:16:42.781282788 -0500
@@ -50,7 +50,7 @@
 
 /* Do anything we need to do when starting up the runtime environment
  * in this OS. */
-extern void os_init(void);
+extern void os_init(char *argv[], char *envp[]);
 
 /* Install any OS-dependent low-level signal handlers which are needed
  * by the runtime environment. E.g. the signals raised by a violation
--- sbcl-0.9.4/src/runtime/linux-os.c.ADDR_NO_RANDOMIZE	2005-08-12 14:08:19.000000000 -0500
+++ sbcl-0.9.4/src/runtime/linux-os.c	2005-08-30 12:17:31.208291595 -0500
@@ -44,6 +44,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include "validate.h"
 #include "thread.h"
@@ -92,7 +93,7 @@
 int linux_no_threads_p = 0;
 
 void
-os_init(void)
+os_init(char *argv[], char *envp[])
 {
     /* Conduct various version checks: do we have enough mmap(), is
      * this a sparc running 2.2, can we do threads? */
@@ -117,7 +118,7 @@
         FSHOW((stderr,"linux kernel %d.%d predates 2.4;\n enabling workarounds for SPARC kernel bugs in signal handling.\n", major_version,minor_version));
         linux_sparc_siginfo_bug = 1;
 #endif
-    }
+    }   
 #ifdef LISP_FEATURE_SB_THREAD
     futex_wait(futex,-1);
     if(errno==ENOSYS)  linux_no_threads_p = 1;
@@ -125,6 +126,36 @@
         fprintf(stderr,"Linux with NPTL support (e.g. kernel 2.6 or newer) required for \nthread-enabled SBCL.  Disabling thread support.\n\n");
 #endif
     os_vm_page_size = getpagesize();
+   
+    /* KLUDGE: Disable memory randomization on new Linux kernels
+     * by setting a personality flag and re-executing. (We need
+     * to re-execute, since the memory maps that can conflict with
+     * the SBCL spaces have already been done at this point).
+     */
+#if defined(LISP_FEATURE_X86)
+    if ((major_version == 2) && (minor_version >= 6) || (major_version >= 3)) {
+       long pers = personality(-1);
+       /* 0x40000 aka. ADDR_NO_RANDOMIZE */
+       if (!(pers & 0x40000)) {
+	 if (personality(pers | 0x40000) != -1) {
+	     /* Use /proc/self/exe instead of trying to figure out the
+	      * executable path from PATH and argv[0], since that's reliable.
+	      */
+	     char buf[PATH_MAX+1];
+	     int rc = readlink("/proc/self/exe", buf, PATH_MAX);
+             if ( rc > 0 ) {
+	       buf[rc]=0;
+	       execve(buf, argv, envp);
+	     }
+	  }
+	  /* Either changing the personality or execve() failed. Either
+	   * way we might as well continue, and hope that the random
+	   * memory maps are ok this time around.
+	   */
+	  fprintf(stderr, "WARNING: Couldn't re-execute SBCL with the proper personality flags (maybe /proc isn't mounted?). Trying to continue anyway.\n");
+       }
+    }     
+#endif   
 }
 
 
--- sbcl-0.9.4/src/runtime/osf1-os.c.ADDR_NO_RANDOMIZE	2005-07-14 10:41:20.000000000 -0500
+++ sbcl-0.9.4/src/runtime/osf1-os.c	2005-08-30 12:16:42.783282706 -0500
@@ -51,7 +51,8 @@
 
 
 
-void os_init(void)
+void
+os_init(char *argv[], char *envp[])
 {
     os_vm_page_size = getpagesize();
 }
--- sbcl-0.9.4/src/runtime/bsd-os.c.ADDR_NO_RANDOMIZE	2005-07-14 10:41:11.000000000 -0500
+++ sbcl-0.9.4/src/runtime/bsd-os.c	2005-08-30 12:16:42.784282665 -0500
@@ -51,7 +51,8 @@
 static void netbsd_init();
 #endif /* __NetBSD__ */
 
-void os_init(void)
+void
+os_init(char *argv[], char *envp[])
 {
     os_vm_page_size = getpagesize();
 
--- sbcl-0.9.4/src/runtime/runtime.c.ADDR_NO_RANDOMIZE	2005-08-30 12:16:42.778282911 -0500
+++ sbcl-0.9.4/src/runtime/runtime.c	2005-08-30 12:16:42.785282623 -0500
@@ -194,7 +194,7 @@
     /* KLUDGE: os_vm_page_size is set by os_init(), and on some
      * systems (e.g. Alpha) arch_init() needs need os_vm_page_size, so
      * it must follow os_init(). -- WHN 2000-01-26 */
-    os_init();
+    os_init(argv, envp);
     arch_init();
     gc_init();
     validate();
--- sbcl-0.9.4/src/runtime/sunos-os.c.ADDR_NO_RANDOMIZE	2005-08-19 07:15:16.000000000 -0500
+++ sbcl-0.9.4/src/runtime/sunos-os.c	2005-08-30 12:16:42.786282582 -0500
@@ -53,7 +53,8 @@
 int KLUDGE_MAYBE_MAP_ANON = 0x0;
 int kludge_mmap_fd = -1; /* default for MAP_ANON */
 
-void os_init(void)
+void
+os_init(char *argv[], char *envp[])
 {
     struct utsname name;
     int major_version;

sbcl-0.9.4-optflags.patch:

--- NEW FILE sbcl-0.9.4-optflags.patch ---
--- sbcl-0.9.4/src/runtime/GNUmakefile.optflags	2005-08-19 07:15:15.000000000 -0500
+++ sbcl-0.9.4/src/runtime/GNUmakefile	2005-08-30 10:24:17.010651427 -0500
@@ -22,7 +22,8 @@
 DEPEND_FLAGS = -MM
 GREP = grep
 
-CFLAGS = -g -Wall -O3
+#CFLAGS = -g -Wall -O3
+CFLAGS = $(RPM_OPT_FLAGS)
 ASFLAGS = $(CFLAGS)
 CPPFLAGS = -I.
 


--- NEW FILE sbcl.sh ---
#!/bin/sh

if [ -z "$SBCL_HOME" ] ; then
SBCL_HOME=/usr/lib/sbcl
export SBCL_HOME
fi

if [ -z "$SBCL_SETARCH" ] ; then
BCL_SETARCH="setarch i386 -R"
fi

exec ${SBCL_SETARCH} ${SBCL_HOME}/sbcl ${1+"$@"}


--- NEW FILE sbcl.spec ---
# $Id: sbcl.spec,v 1.8 2003/11/12 16:47:44 rexdieter Exp $

## Default to using a local bootstrap, 
## define one of the following to override 
## (non sbcl bootstraps untested)
#define bootstrap sbcl
#define bootstrap cmucl
#define bootstrap clisp

%if "%{?fedora}" >= "3"
BuildRequires:setarch
Requires:setarch
%define setarch setarch %{_target_cpu}
%endif

#  Could test for setarch >= 1.7 instead
%if "%{?fedora}" >= "4"
%define setarch setarch %{_target_cpu} -R
%endif

Name: 	 sbcl
Summary: Steel Bank Common Lisp
Version: 0.9.4
Release: 4%{?dist}

License: BSD/MIT
Group: 	 Development/Languages
URL:	 http://sbcl.sourceforge.net/
Source0:  http://dl.sourceforge.net/sourceforge/sbcl/sbcl-%{version}-source.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
#ExclusiveArch: %{ix86} x86_64

Source1: sbcl.sh

%if "%{?bootstrap}" == "%{nil}"
# local Bootstrap binaries
Source10: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-%{version}-x86-linux-binary.tar.bz2
%ifarch %{ix86}
%define bootstrap_src -a 10 
%endif
Source11: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-%{version}-x86-64-linux-binary.tar.bz2
%ifarch %{x86_64}
%define bootstrap_src -a 11 
%endif
# Latest powerpc-linux bootstrap (untested)
Source12: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.8.15-powerpc-linux-binary.tar.bz2
%ifarch ppc 
%define bootstrap_src -a 12
%endif

%endif

Patch1: sbcl-0.8.18-default-sbcl-home.patch
# See http://sourceforge.net/mailarchive/message.php?msg_id=12787069
Patch2: sbcl-0.9.4-ADDR_NO_RANDOMIZE.patch
Patch3: sbcl-0.9.4-optflags.patch

%{?bootstrap:BuildRequires: %{?bootstrap}}

Requires(post): /sbin/install-info
Requires(preun): /sbin/install-info
# doc generation
BuildRequires: ghostscript
BuildRequires: texinfo

%description
Steel Bank Common Lisp (SBCL) is a Open Source development environment
for Common Lisp. It includes an integrated native compiler,
interpreter, and debugger.


%prep
%setup -q %{?bootstrap_src} 

#sed -i -e "s|/usr/local/lib/sbcl/|%{_libdir}/sbcl/|" src/runtime/runtime.c
#or patch to use SBCL_HOME env var
%patch1 -p0 -b .default-sbcl-home
%patch2 -p1 -b .ADDR_NO_RANDOMIZE
%patch3 -p1 -b .optflags

# http://article.gmane.org/gmane.lisp.steel-bank.general/340
# enable threads (was only for >= 2.6, but code has checks to disable for <= 2.4)
## FIXME(?): per section 2.2 of INSTALL, should create/use customize-target-features.lisp
## to customize features -- Rex
#define kernel_ver %(uname -r | cut -d- -f1 | cut -d. -f-2 )
#if "%{?kernel_ver}" >= "2.6"
%ifarch %{ix86} %{x86_64}
sed -i -e "s|; :sb-thread|:sb-thread|" base-target-features.lisp-expr
%endif
#endif

%if "%{?bootstrap}" == "%{nil}"
mkdir sbcl-bootstrap
pushd sbcl-%{version}-*-linux
chmod +x install.sh
INSTALL_ROOT=`pwd`/../sbcl-bootstrap ./install.sh
popd
%endif


%build
export DEFAULT_SBCL_HOME=%{_libdir}/sbcl

%if "%{?bootstrap}" == "%{nil}"
export SBCL_HOME=`pwd`/sbcl-bootstrap/lib/sbcl
export PATH=`pwd`/sbcl-bootstrap/bin:${PATH}
%endif

%{?setarch} ./make.sh %{?bootstrap}

# docs
make -C doc/manual html info


%check || :
%if "%{?_with_check:1}" == "1"
pushd tests 
%{?setarch} sh ./run-tests.sh 
popd
%endif


%install
rm -rf $RPM_BUILD_ROOT

mkdir -p $RPM_BUILD_ROOT{%{_bindir},%{_libdir},%{_mandir}}
export INSTALL_ROOT=$RPM_BUILD_ROOT%{_prefix}
unset SBCL_HOME ||:
%{?setarch} sh ./install.sh

# app-wrapper for using setarch
%if 0
%if "%{?setarch}" != "%{nil}"
mv $RPM_BUILD_ROOT%{_bindir}/sbcl $RPM_BUILD_ROOT%{_libdir}/sbcl/sbcl
install -p -m755 %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/sbcl
sed -i -e "s|^SBCL_SETARCH=.*|SBCL_SETARCH=\"%{setarch}\"|" $RPM_BUILD_ROOT%{_bindir}/sbcl
%endif
%endif

## Unpackaged files
rm -rf $RPM_BUILD_ROOT%{_docdir}/sbcl
rm -f  $RPM_BUILD_ROOT%{_infodir}/dir

# CVS crud
find $RPM_BUILD_ROOT -name CVS -type d | xargs rm -rf
find $RPM_BUILD_ROOT -name '.cvsignore' | xargs rm -f
# from make check
find $RPM_BUILD_ROOT -name 'test-passed' | xargs rm -f
# 
find $RPM_BUILD_ROOT -name '*.c' | xargs chmod 644 


%post
/sbin/install-info %{_infodir}/sbcl.info %{_infodir}/dir ||:
/sbin/install-info %{_infodir}/asdf.info %{_infodir}/dir ||:


%postun
if [ $1 -eq 0 ]; then
  /sbin/install-info --delete %{_infodir}/sbcl.info %{_infodir}/dir ||:
  /sbin/install-info --delete %{_infodir}/asdf.info %{_infodir}/dir ||:
fi


%files
%defattr(-,root,root)
%doc BUGS COPYING README CREDITS NEWS TLA TODO
%doc SUPPORT STYLE PRINCIPLES
%doc doc/manual/sbcl
%doc doc/manual/asdf
%{_bindir}/*
%{_libdir}/sbcl/
%{_mandir}/man?/*
%{_infodir}/*


%clean
rm -rf $RPM_BUILD_ROOT


%changelog
* Tue Aug 30 2005 Rex Dieter  0.9.4-4
- safer NO_ADDR_RANDOMIZE patch
- use %%{?setarch} in %%check too

* Tue Aug 30 2005 Rex Dieter  0.9.4-3
- patch to avoid need to use setarch/app-wrapper
- fix app-wrapper (quote SBCL_SETARCH)
- include ppc bootstrap (oldish 0.8.15, untested)

* Mon Aug 29 2005 Rex Dieter  0.9.4-2
- rm -f /usr/share/info/dir
- fix perms on packaged .c files
- include all bootstrap binaries
- Requires(post,preun): /sbin/install-info
- sbcl.sh app-wrapper (when using setarch)

* Sat Aug 27 2005 Rex Dieter  0.9.4-1
- 0.9.4

* Fri Aug 26 2005 Rex Dieter  0.9.3-2
- fc3: setarch %%{target_cpu}
- fc4: setarch %%{target_cpu} -R

* Thu Aug 25 2005 Rex Dieter 
- run tests
- allow for sbcl_local, sbcl, clisp bootstrap

* Wed Aug 17 2005 Gerard Milmeister  - 0.9.3-1
- New Version 0.9.3

* Wed Jun 29 2005 Gerard Milmeister  - 0.9.2-1
- New Version 0.9.2

* Thu Jun 16 2005 Gerard Milmeister  - 0.9.1-1
- New Version 0.9.1

* Thu Apr 28 2005 Gerard Milmeister  - 0.9.0-1
- New Version 0.9.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sbcl/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	12 Sep 2005 12:35:18 -0000	1.1
+++ .cvsignore	12 Sep 2005 12:36:44 -0000	1.2
@@ -0,0 +1,4 @@
+sbcl-0.8.15-powerpc-linux-binary.tar.bz2
+sbcl-0.9.4-source.tar.bz2
+sbcl-0.9.4-x86-64-linux-binary.tar.bz2
+sbcl-0.9.4-x86-linux-binary.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sbcl/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	12 Sep 2005 12:35:18 -0000	1.1
+++ sources	12 Sep 2005 12:36:44 -0000	1.2
@@ -0,0 +1,4 @@
+3a72d0785ce0a8e02f9af632c2a4f217  sbcl-0.8.15-powerpc-linux-binary.tar.bz2
+a0420dc6236efece72c1c80ee15873c9  sbcl-0.9.4-source.tar.bz2
+67ec41e624a3f2ad7f6f3cde1bd001d3  sbcl-0.9.4-x86-64-linux-binary.tar.bz2
+947d1cde2c1c80416b5f9fb4e4c81383  sbcl-0.9.4-x86-linux-binary.tar.bz2



From fedora-extras-commits at redhat.com  Mon Sep 12 12:39:40 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon, 12 Sep 2005 08:39:40 -0400
Subject: rpms/sbcl/devel sbcl.sh,1.1,1.2
Message-ID: <200509121239.j8CCdeid023631@cvs-int.fedora.redhat.com>

Author: rdieter

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

Modified Files:
	sbcl.sh 
Log Message:
BCL_SETARCH -> SBCL_SETARCH (typo)
support global /etc/sysconfig/sbcl config



Index: sbcl.sh
===================================================================
RCS file: /cvs/extras/rpms/sbcl/devel/sbcl.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sbcl.sh	12 Sep 2005 12:36:44 -0000	1.1
+++ sbcl.sh	12 Sep 2005 12:39:38 -0000	1.2
@@ -1,12 +1,17 @@
 #!/bin/sh
 
+# Source global config, if it exists
+if [ -f /etc/sysconfig/sbcl ]; then
+  source /etc/sysconfig/sbcl
+fi
+
 if [ -z "$SBCL_HOME" ] ; then
 SBCL_HOME=/usr/lib/sbcl
 export SBCL_HOME
 fi
 
 if [ -z "$SBCL_SETARCH" ] ; then
-BCL_SETARCH="setarch i386 -R"
+SBCL_SETARCH="setarch i386 -R"
 fi
 
 exec ${SBCL_SETARCH} ${SBCL_HOME}/sbcl ${1+"$@"}



From fedora-extras-commits at redhat.com  Mon Sep 12 14:22:14 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 12 Sep 2005 10:22:14 -0400
Subject: rpms/check - New directory
Message-ID: <200509121422.j8CEMEID026536@cvs-int.fedora.redhat.com>

Author: spot

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

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




From fedora-extras-commits at redhat.com  Mon Sep 12 14:22:15 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 12 Sep 2005 10:22:15 -0400
Subject: rpms/check/devel - New directory
Message-ID: <200509121422.j8CEMF5B026541@cvs-int.fedora.redhat.com>

Author: spot

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

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




From fedora-extras-commits at redhat.com  Mon Sep 12 14:22:39 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 12 Sep 2005 10:22:39 -0400
Subject: rpms/check Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200509121422.j8CEMdqg026596@cvs-int.fedora.redhat.com>

Author: spot

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

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


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

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

common : CVS/Root
	@cvs checkout common

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

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


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Mon Sep 12 14:22:40 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 12 Sep 2005 10:22:40 -0400
Subject: rpms/check/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200509121422.j8CEMefT026601@cvs-int.fedora.redhat.com>

Author: spot

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

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


--- NEW FILE .cvsignore ---


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

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Mon Sep 12 14:23:08 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 12 Sep 2005 10:23:08 -0400
Subject: rpms/check import.log,1.1,1.2
Message-ID: <200509121423.j8CEN8hW026676@cvs-int.fedora.redhat.com>

Author: spot

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

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


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/check/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	12 Sep 2005 14:22:37 -0000	1.1
+++ import.log	12 Sep 2005 14:23:06 -0000	1.2
@@ -0,0 +1 @@
+check-0_9_3-1:HEAD:check-0.9.3-1.src.rpm:1126534980



From fedora-extras-commits at redhat.com  Mon Sep 12 14:23:09 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 12 Sep 2005 10:23:09 -0400
Subject: rpms/check/devel check-0.9.2-fPIC.patch, NONE,
	1.1 check-0.9.2-shared.patch, NONE, 1.1 check.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200509121423.j8CEN9UD026687@cvs-int.fedora.redhat.com>

Author: spot

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

Modified Files:
	.cvsignore sources 
Added Files:
	check-0.9.2-fPIC.patch check-0.9.2-shared.patch check.spec 
Log Message:
auto-import check-0.9.3-1 on branch devel from check-0.9.3-1.src.rpm

check-0.9.2-fPIC.patch:

--- NEW FILE check-0.9.2-fPIC.patch ---
--- check-0.9.2/configure.BAD	2005-08-14 16:01:27.000000000 -0500
+++ check-0.9.2/configure	2005-08-14 16:01:41.000000000 -0500
@@ -1181,7 +1181,7 @@
 fi
 
 if test -n "$GCC"; then
-   CFLAGS="$CFLAGS -Wall -Wstrict-prototypes -Wmissing-prototypes -Wwrite-strings"
+   CFLAGS="$CFLAGS -Wall -Wstrict-prototypes -Wmissing-prototypes -Wwrite-strings -fPIC"
 fi
 # Extract the first word of "docbook2html", so it can be a program name with args.
 set dummy docbook2html; ac_word=$2

check-0.9.2-shared.patch:

--- NEW FILE check-0.9.2-shared.patch ---
--- check-0.9.2/src/Makefile.in.BAD	2005-08-14 15:53:24.000000000 -0500
+++ check-0.9.2/src/Makefile.in	2005-08-14 15:52:45.000000000 -0500
@@ -74,7 +74,10 @@
 VERSION = @VERSION@
 have_docbook2html = @have_docbook2html@
 
-lib_LIBRARIES = libcheck.a
+lib_LIBRARIES_static = libcheck.a
+lib_LIBRARIES_shared = libcheck.so.0.0.0
+
+lib_LIBRARIES = $(lib_LIBRARIES_static) $(lib_LIBRARIES_shared)
 
 include_HEADERS = check.h
 
@@ -144,7 +147,7 @@
 	  else :; fi; \
 	done
 	@$(POST_INSTALL)
-	@list='$(lib_LIBRARIES)'; for p in $$list; do \
+	@list='$(lib_LIBRARIES_static)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    echo " $(RANLIB) $(DESTDIR)$(libdir)/$$p"; \
 	    $(RANLIB) $(DESTDIR)$(libdir)/$$p; \
@@ -181,6 +184,10 @@
 	$(AR) cru libcheck.a $(libcheck_a_OBJECTS) $(libcheck_a_LIBADD)
 	$(RANLIB) libcheck.a
 
+libcheck.so.0.0.0: $(libcheck_a_OBJECTS) $(libcheck_a_DEPENDENCIES)
+	-rm -f libcheck.so.0.0.0
+	$(COMPILE) -shared -Wl,-soname,libcheck.so.0 -o $@ $?
+
 install-includeHEADERS: $(include_HEADERS)
 	@$(NORMAL_INSTALL)
 	$(mkinstalldirs) $(DESTDIR)$(includedir)


--- NEW FILE check.spec ---
Name:		check
Version:	0.9.3
Release:	1%{?dist}
Summary:	A unit test framework for C
Source0:	http://download.sourceforge.net/check/%{name}-%{version}.tar.gz
Group:		Development/Tools
License:	LGPL
URL:		http://check.sourceforge.net/
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:	docbook-utils
Patch0:		check-0.9.2-shared.patch
Patch1:		check-0.9.2-fPIC.patch

%description
Check is a unit test framework for C. It features a simple interface for 
defining unit tests, putting little in the way of the developer. Tests 
are run in a separate address space, so Check can catch both assertion 
failures and code errors that cause segmentation faults or other signals. 
The output from unit tests can be used within source code editors and IDEs.

%package devel
Summary:	Libraries and headers for developing programs with check
Group:		Development/Libraries
Requires:	%{name} = %{version}-%{release}

%description devel
%{summary}.

%prep
%setup -q
%patch0 -p1
%patch1 -p1

%build
%configure
make

%install
rm -rf $RPM_BUILD_ROOT
make DESTDIR=$RPM_BUILD_ROOT install
cd $RPM_BUILD_ROOT/%{_libdir}
chmod +x libcheck.so.0.0.0
ln -s libcheck.so.0.0.0 libcheck.so.0
ln -s libcheck.so.0.0.0 libcheck.so

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%{_libdir}/libcheck.so.*
%{_datadir}/doc/%{name}-%{version}
%{_datadir}/aclocal/check.m4

%files devel
%defattr(-,root,root,-)
%{_includedir}/check.h
%{_libdir}/libcheck.a
%{_libdir}/libcheck.so

%changelog
* Sun Aug 14 2005 Tom "spot" Callaway  0.9.2-1
- initial package for Fedora Extras


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/check/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	12 Sep 2005 14:22:38 -0000	1.1
+++ .cvsignore	12 Sep 2005 14:23:07 -0000	1.2
@@ -0,0 +1 @@
+check-0.9.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/check/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	12 Sep 2005 14:22:38 -0000	1.1
+++ sources	12 Sep 2005 14:23:07 -0000	1.2
@@ -0,0 +1 @@
+6e5870f7c9c5414572158d8005e91d68  check-0.9.3.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 12 14:26:21 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 12 Sep 2005 10:26:21 -0400
Subject: owners owners.list,1.190,1.191
Message-ID: <200509121426.j8CEQL6n026949@cvs-int.fedora.redhat.com>

Author: spot

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

Modified Files:
	owners.list 
Log Message:

check



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.190
retrieving revision 1.191
diff -u -r1.190 -r1.191
--- owners.list	11 Sep 2005 20:45:12 -0000	1.190
+++ owners.list	12 Sep 2005 14:26:19 -0000	1.191
@@ -80,6 +80,7 @@
 Fedora Extras|cfengine|GNU cfengine - a systems administration tool for networks|sheltren at cs.ucsb.edu|extras-qa at fedoraproject.org|
 Fedora Extras|cfs|An userspace crypto-filesystem|enrico.scholz at informatik.tu-chemnitz.de|extras-qa at fedoraproject.org|
 Fedora Extras|cgoban|X board for playing go|compton at pcompton.com|extras-qa at fedoraproject.org|
+Fedora Extras|check|A unit test framework for C|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|chkrootkit|A tool to locally check for signs of a rootkit|bugs.michael at gmx.net|extras-qa at fedoraproject.org|
 Fedora Extras|cksfv|Utility to manipulate SFV files|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|clamav|End-user tools for the Clam Antivirus scanner|enrico.scholz at informatik.tu-chemnitz.de|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Mon Sep 12 14:40:54 2005
From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo))
Date: Mon, 12 Sep 2005 10:40:54 -0400
Subject: rpms/scim-skk - New directory
Message-ID: <200509121440.j8CEes2d027293@cvs-int.fedora.redhat.com>

Author: ryo

Update of /cvs/extras/rpms/scim-skk
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27269/scim-skk

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




From fedora-extras-commits at redhat.com  Mon Sep 12 14:40:54 2005
From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo))
Date: Mon, 12 Sep 2005 10:40:54 -0400
Subject: rpms/scim-skk/devel - New directory
Message-ID: <200509121440.j8CEes97027298@cvs-int.fedora.redhat.com>

Author: ryo

Update of /cvs/extras/rpms/scim-skk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27269/scim-skk/devel

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




From fedora-extras-commits at redhat.com  Mon Sep 12 14:41:20 2005
From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo))
Date: Mon, 12 Sep 2005 10:41:20 -0400
Subject: rpms/scim-skk Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200509121441.j8CEfKIY027343@cvs-int.fedora.redhat.com>

Author: ryo

Update of /cvs/extras/rpms/scim-skk
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27314

Added Files:
	Makefile import.log 
Log Message:
Setup of module scim-skk


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

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

common : CVS/Root
	@cvs checkout common

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

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


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Mon Sep 12 14:41:21 2005
From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo))
Date: Mon, 12 Sep 2005 10:41:21 -0400
Subject: rpms/scim-skk/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200509121441.j8CEfL0b027348@cvs-int.fedora.redhat.com>

Author: ryo

Update of /cvs/extras/rpms/scim-skk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27314/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module scim-skk


--- NEW FILE .cvsignore ---


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

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Mon Sep 12 14:42:08 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 12 Sep 2005 10:42:08 -0400
Subject: owners owners.list,1.191,1.192
Message-ID: <200509121442.j8CEg8Rw027396@cvs-int.fedora.redhat.com>

Author: spot

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

Modified Files:
	owners.list 
Log Message:

perl-Apache-Session-Wrapper|A simple wrapper around Apache::Session



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.191
retrieving revision 1.192
diff -u -r1.191 -r1.192
--- owners.list	12 Sep 2005 14:26:19 -0000	1.191
+++ owners.list	12 Sep 2005 14:42:06 -0000	1.192
@@ -562,6 +562,7 @@
 Fedora Extras|pdftohtml|A PDF to HTML converter|gauret at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|perl-Algorithm-Diff|Algorithm::Diff Perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Apache-LogRegex|Perl module for parsing a line from an Apache logfile into a hash|ghenry at suretecsystems.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Apache-Session-Wrapper|A simple wrapper around Apache::Session|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-AppConfig|Perl module for reading configuration files|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Archive-Zip|Perl library for accessing Zip archives|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Array-Compare|Perl extension for comparing arrays|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Mon Sep 12 14:42:36 2005
From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo))
Date: Mon, 12 Sep 2005 10:42:36 -0400
Subject: rpms/scim-skk import.log,1.1,1.2
Message-ID: <200509121443.j8CEh7Do027455@cvs-int.fedora.redhat.com>

Author: ryo

Update of /cvs/extras/rpms/scim-skk
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27412

Modified Files:
	import.log 
Log Message:
auto-import scim-skk-0.3.0-2 on branch devel from scim-skk-0.3.0-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/scim-skk/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	12 Sep 2005 14:41:18 -0000	1.1
+++ import.log	12 Sep 2005 14:42:34 -0000	1.2
@@ -0,0 +1 @@
+scim-skk-0_3_0-2:HEAD:scim-skk-0.3.0-2.src.rpm:1126536144



From fedora-extras-commits at redhat.com  Mon Sep 12 14:42:36 2005
From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo))
Date: Mon, 12 Sep 2005 10:42:36 -0400
Subject: rpms/scim-skk/devel no-dictionary.diff, NONE, 1.1 scim-skk.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200509121443.j8CEh7m3027456@cvs-int.fedora.redhat.com>

Author: ryo

Update of /cvs/extras/rpms/scim-skk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27412/devel

Modified Files:
	.cvsignore sources 
Added Files:
	no-dictionary.diff scim-skk.spec 
Log Message:
auto-import scim-skk-0.3.0-2 on branch devel from scim-skk-0.3.0-2.src.rpm

no-dictionary.diff:

--- NEW FILE no-dictionary.diff ---
--- src/scim_skk_dictionary-old.cpp	2005-08-27 11:05:52.000000000 +0900
+++ src/scim_skk_dictionary.cpp	2005-08-27 11:07:38.000000000 +0900
@@ -233,6 +233,10 @@
 
     converter.convert(key_s, key);
 
+	if(indice.size() == 0) {
+		return;
+	}
+	
     ub = indice.size();
     lb = 0;
 


--- NEW FILE scim-skk.spec ---
Name:		scim-skk
Version:	0.3.0
Release:	2%{?dist}
Summary:	SCIM IMEngine module for skk

Group:		System Environment/Libraries
License:	GPL
URL:            http://scim-imengine.sourceforge.jp/
Source0:        http://sourceforge.jp/projects/scim-imengine/files/%{name}-%{version}.tar.gz
Patch0:         no-dictionary.diff
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:       skkdic
BuildRequires:  scim-devel

%description
Scim-skk is a SCIM IMEngine module for skk to support Japanese input.


%prep
%setup -q
%patch0 -p0


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


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

rm $RPM_BUILD_ROOT%{_libdir}/scim-1.0/{IMEngine,SetupUI}/*.la

%find_lang %{name}


%clean
rm -rf $RPM_BUILD_ROOT


%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING NEWS README ChangeLog
%{_libdir}/scim-1.0/IMEngine/skk.so
%{_libdir}/scim-1.0/SetupUI/skk-imengine-setup.so
%{_datadir}/scim/icons/scim-skk.png


%changelog
* Tue Sep  6 2005 Ryo Dairiki  - 0.3.0-2
- initial packaging for Fedora Extras
- cleanup specfile (Jens Petersen)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/scim-skk/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	12 Sep 2005 14:41:19 -0000	1.1
+++ .cvsignore	12 Sep 2005 14:42:34 -0000	1.2
@@ -0,0 +1 @@
+scim-skk-0.3.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/scim-skk/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	12 Sep 2005 14:41:19 -0000	1.1
+++ sources	12 Sep 2005 14:42:34 -0000	1.2
@@ -0,0 +1 @@
+8ff1eebd49f62a5d19d21513d884402c  scim-skk-0.3.0.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 12 14:43:59 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 12 Sep 2005 10:43:59 -0400
Subject: rpms/perl-Apache-Session-Wrapper - New directory
Message-ID: <200509121443.j8CEhx37027559@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Apache-Session-Wrapper
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27535/perl-Apache-Session-Wrapper

Log Message:
Directory /cvs/extras/rpms/perl-Apache-Session-Wrapper added to the repository




From fedora-extras-commits at redhat.com  Mon Sep 12 14:43:59 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 12 Sep 2005 10:43:59 -0400
Subject: rpms/perl-Apache-Session-Wrapper/devel - New directory
Message-ID: <200509121444.j8CEhxSI027564@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Apache-Session-Wrapper/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27535/perl-Apache-Session-Wrapper/devel

Log Message:
Directory /cvs/extras/rpms/perl-Apache-Session-Wrapper/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Sep 12 14:44:15 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 12 Sep 2005 10:44:15 -0400
Subject: rpms/perl-Apache-Session-Wrapper Makefile, NONE, 1.1 import.log,
	NONE, 1.1
Message-ID: <200509121444.j8CEiFn2027616@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Apache-Session-Wrapper
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27584

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-Apache-Session-Wrapper


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

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

common : CVS/Root
	@cvs checkout common

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

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


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Mon Sep 12 14:44:15 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 12 Sep 2005 10:44:15 -0400
Subject: rpms/perl-Apache-Session-Wrapper/devel .cvsignore, NONE,
	1.1 Makefile, NONE, 1.1 sources, NONE, 1.1
Message-ID: <200509121444.j8CEiFu9027621@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Apache-Session-Wrapper/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27584/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Apache-Session-Wrapper


--- NEW FILE .cvsignore ---


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

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Mon Sep 12 14:44:41 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 12 Sep 2005 10:44:41 -0400
Subject: rpms/perl-Apache-Session-Wrapper import.log,1.1,1.2
Message-ID: <200509121444.j8CEifkk027690@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Apache-Session-Wrapper
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27655

Modified Files:
	import.log 
Log Message:
auto-import perl-Apache-Session-Wrapper-0.25-2 on branch devel from perl-Apache-Session-Wrapper-0.25-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Apache-Session-Wrapper/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	12 Sep 2005 14:44:13 -0000	1.1
+++ import.log	12 Sep 2005 14:44:39 -0000	1.2
@@ -0,0 +1 @@
+perl-Apache-Session-Wrapper-0_25-2:HEAD:perl-Apache-Session-Wrapper-0.25-2.src.rpm:1126536272



From fedora-extras-commits at redhat.com  Mon Sep 12 14:44:42 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 12 Sep 2005 10:44:42 -0400
Subject: rpms/perl-Apache-Session-Wrapper/devel
	perl-Apache-Session-Wrapper.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200509121444.j8CEigLS027697@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Apache-Session-Wrapper/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27655/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Apache-Session-Wrapper.spec 
Log Message:
auto-import perl-Apache-Session-Wrapper-0.25-2 on branch devel from perl-Apache-Session-Wrapper-0.25-2.src.rpm


--- NEW FILE perl-Apache-Session-Wrapper.spec ---
Name:           perl-Apache-Session-Wrapper
Version:        0.25
Release:        2%{?dist}
Summary:        A simple wrapper around Apache::Session
Group:          Development/Libraries
License:        GPL or Artistic
URL:            http://search.cpan.org/dist/Apache-Session-Wrapper
Source0:        http://search.cpan.org/CPAN/authors/id/D/DR/DROLSKY/Apache-Session-Wrapper-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:	perl(Apache2::Cookie), perl(Apache::Session), perl(Class::Container), perl(Exception::Class)
BuildRequires:	perl(Params::Validate), perl(Module::Build), perl(Test::Pod)
Requires:	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
Requires:	perl(Class::Container)

%description
%{summary}.

%prep
%setup -q -n Apache-Session-Wrapper-%{version}

%build
%{__perl} Build.PL installdirs=vendor
./Build

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

%check
./Build test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes LICENSE
%{perl_vendorlib}/Apache/Session/
%{_mandir}/man3/*.3*


%changelog
* Mon Sep 12 2005 Paul Howarth  0.25-2
- Use Module::Build
- Add dep perl(Class::Container)
- Add BR: perl(Test::Pod) for better test coverage


* Wed Sep  7 2005 Tom "spot" Callaway  0.25-1
- Initial package for Fedora Extras


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Apache-Session-Wrapper/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	12 Sep 2005 14:44:13 -0000	1.1
+++ .cvsignore	12 Sep 2005 14:44:40 -0000	1.2
@@ -0,0 +1 @@
+Apache-Session-Wrapper-0.25.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Apache-Session-Wrapper/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	12 Sep 2005 14:44:13 -0000	1.1
+++ sources	12 Sep 2005 14:44:40 -0000	1.2
@@ -0,0 +1 @@
+fb9b36ff0bef82c537a0f05edd846832  Apache-Session-Wrapper-0.25.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 12 15:00:02 2005
From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc))
Date: Mon, 12 Sep 2005 11:00:02 -0400
Subject: rpms/gnome-translate - New directory
Message-ID: <200509121500.j8CF02ew028169@cvs-int.fedora.redhat.com>

Author: buc

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

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




From fedora-extras-commits at redhat.com  Mon Sep 12 15:00:02 2005
From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc))
Date: Mon, 12 Sep 2005 11:00:02 -0400
Subject: rpms/gnome-translate/devel - New directory
Message-ID: <200509121500.j8CF02e3028174@cvs-int.fedora.redhat.com>

Author: buc

Update of /cvs/extras/rpms/gnome-translate/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28145/gnome-translate/devel

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




From fedora-extras-commits at redhat.com  Mon Sep 12 15:00:20 2005
From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc))
Date: Mon, 12 Sep 2005 11:00:20 -0400
Subject: rpms/gnome-translate Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200509121500.j8CF0Kxb028227@cvs-int.fedora.redhat.com>

Author: buc

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

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


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

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

common : CVS/Root
	@cvs checkout common

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

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


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Mon Sep 12 15:00:20 2005
From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc))
Date: Mon, 12 Sep 2005 11:00:20 -0400
Subject: rpms/gnome-translate/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200509121500.j8CF0Kp4028232@cvs-int.fedora.redhat.com>

Author: buc

Update of /cvs/extras/rpms/gnome-translate/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28191/devel

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


--- NEW FILE .cvsignore ---


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

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Mon Sep 12 15:01:02 2005
From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc))
Date: Mon, 12 Sep 2005 11:01:02 -0400
Subject: rpms/gnome-translate import.log,1.1,1.2
Message-ID: <200509121501.j8CF1Weh029579@cvs-int.fedora.redhat.com>

Author: buc

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

Modified Files:
	import.log 
Log Message:
auto-import gnome-translate-0.99-3 on branch devel from gnome-translate-0.99-3.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/gnome-translate/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	12 Sep 2005 15:00:17 -0000	1.1
+++ import.log	12 Sep 2005 15:01:00 -0000	1.2
@@ -0,0 +1 @@
+gnome-translate-0_99-3:HEAD:gnome-translate-0.99-3.src.rpm:1126537250



From fedora-extras-commits at redhat.com  Mon Sep 12 15:01:02 2005
From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc))
Date: Mon, 12 Sep 2005 11:01:02 -0400
Subject: rpms/gnome-translate/devel gnome-translate.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200509121501.j8CF121l029374@cvs-int.fedora.redhat.com>

Author: buc

Update of /cvs/extras/rpms/gnome-translate/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28266/devel

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


--- NEW FILE gnome-translate.spec ---
Name: gnome-translate
Summary: GNOME interface to libtranslate -- Natural language translator
Version: 0.99
Release: 3%{?dist}
Group: User Interface/Desktops
License: GPL 
URL: http://www.nongnu.org/libtranslate/gnome-translate
Source: http://savannah.nongnu.org/download/libtranslate/gnome-translate-%{version}.tar.gz

BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires: gtk2 >= 2.4.0, GConf2 >= 2.4.0, eel2 >= 2.6.0, pango >= 1.2.0
BuildRequires: gtk2-devel >= 2.4.0, GConf2-devel >= 2.4.0
BuildRequires: eel2-devel >= 2.6.0, libtranslate-devel, aspell-devel

BuildRequires: desktop-file-utils >= 0.2.90
BuildRequires: startup-notification-devel >= 0.5
BuildRequires: scrollkeeper gettext

# For intltool:
BuildRequires: perl-XML-Parser >= 2.31-16

Requires(pre): GConf2
Requires(post): GConf2, scrollkeeper
Requires(preun): GConf2
Requires(postun): scrollkeeper


%description
GNOME Translate is a GNOME interface to libtranslate library.
It can translate a text or web page between several natural languages,
and it can automatically detect the source language as you type.


%prep
%setup -q


%build

%configure
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT

export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
make install DESTDIR=$RPM_BUILD_ROOT
unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL

desktop-file-install --vendor fedora --delete-original      \
  --dir $RPM_BUILD_ROOT%{_datadir}/applications             \
  --add-only-show-in GNOME                                  \
  --add-category X-Fedora                                   \
  $RPM_BUILD_ROOT%{_datadir}/applications/*

%find_lang %{name}


%clean
rm -rf $RPM_BUILD_ROOT


%pre
if [ "$1" -gt 1 ]; then
    export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
    gconftool-2 --makefile-uninstall-rule \
      %{_sysconfdir}/gconf/schemas/%{name}.schemas >/dev/null || :
    killall -HUP gconfd-2 || :
fi


%post
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null || :
killall -HUP gconfd-2 || :

touch --no-create %{_datadir}/icons/hicolor || :
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi

scrollkeeper-update -q -o %{_datadir}/omf/%{name} || :


%preun
if [ "$1" -eq 0 ]; then
    export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
    gconftool-2 --makefile-uninstall-rule \
      %{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null || :
    killall -HUP gconfd-2 || :
fi


%postun
touch --no-create %{_datadir}/icons/hicolor || :
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi

scrollkeeper-update -q || :


%files -f %{name}.lang
%defattr(-,root,root,-)

%doc AUTHORS COPYING README

%{_bindir}/*
%{_datadir}/%{name}
%{_datadir}/pixmaps/*
%{_datadir}/icons/hicolor/*/apps/*
%{_datadir}/gnome/help/%{name}
%{_datadir}/omf/%{name}
%{_datadir}/applications/*
%{_sysconfdir}/gconf/schemas/%{name}.schemas

%changelog
* Mon Sep 12 2005 Dmitry Butskoy  - 0.99-3
- more spec file cleanups
- accepted for Fedora Extra
  (review by Aurelien Bompard )

* Sat Sep 10 2005 Dmitry Butskoy  - 0.99-2
- clenups (#165960)

* Fri Aug 19 2005 Dmitry Butskoy  - 0.99-1
- Initial release.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-translate/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	12 Sep 2005 15:00:18 -0000	1.1
+++ .cvsignore	12 Sep 2005 15:01:00 -0000	1.2
@@ -0,0 +1 @@
+gnome-translate-0.99.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-translate/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	12 Sep 2005 15:00:18 -0000	1.1
+++ sources	12 Sep 2005 15:01:00 -0000	1.2
@@ -0,0 +1 @@
+359f1bb7edc818034b08ca6c1bd254d0  gnome-translate-0.99.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 12 15:09:01 2005
From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc))
Date: Mon, 12 Sep 2005 11:09:01 -0400
Subject: owners owners.list,1.192,1.193
Message-ID: <200509121509.j8CF9Vha029668@cvs-int.fedora.redhat.com>

Author: buc

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

Modified Files:
	owners.list 
Log Message:



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.192
retrieving revision 1.193
diff -u -r1.192 -r1.193
--- owners.list	12 Sep 2005 14:42:06 -0000	1.192
+++ owners.list	12 Sep 2005 15:08:54 -0000	1.193
@@ -255,6 +255,7 @@
 Fedora Extras|gnome-theme-clearlooks|An attractive GTK+ 2 engine with a focus on usability|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
 Fedora Extras|gnome-theme-clearlooks-bigpack|Additional Clearlooks color schemes|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
 Fedora Extras|gnome-themes-extras|Collection of metathemes for the GNOME desktop environment|compton at pcompton.com|extras-qa at fedoraproject.org|
+Fedora Extras|gnome-translate|GNOME interface to libtranslate -- Natural language translator|dmitry at butskoy.name|extras-qa at fedoraproject.org|
 Fedora Extras|gnome-vfsmm26|C++ wrapper for gnome-vfs|denisleroy at yahoo.com|extras-qa at fedoraproject.org|
 Fedora Extras|gnotime|Tracks and reports time spent|toshio at tiki-lounge.com|extras-qa at fedoraproject.org|
 Fedora Extras|gnuchess|The GNU chess program|kaboom at oobleck.net|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Mon Sep 12 15:11:50 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Mon, 12 Sep 2005 11:11:50 -0400
Subject: rpms/perl-Mail-Sender - New directory
Message-ID: <200509121511.j8CFBoVG029766@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Mail-Sender
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29746/perl-Mail-Sender

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




From fedora-extras-commits at redhat.com  Mon Sep 12 15:11:50 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Mon, 12 Sep 2005 11:11:50 -0400
Subject: rpms/perl-Mail-Sender/devel - New directory
Message-ID: <200509121511.j8CFBoG4029771@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Mail-Sender/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29746/perl-Mail-Sender/devel

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




From fedora-extras-commits at redhat.com  Mon Sep 12 15:12:12 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Mon, 12 Sep 2005 11:12:12 -0400
Subject: rpms/perl-Mail-Sender Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200509121512.j8CFCCam029826@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Mail-Sender
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29791

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


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

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

common : CVS/Root
	@cvs checkout common

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

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


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Mon Sep 12 15:12:13 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Mon, 12 Sep 2005 11:12:13 -0400
Subject: rpms/perl-Mail-Sender/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200509121512.j8CFCDHN029831@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Mail-Sender/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29791/devel

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


--- NEW FILE .cvsignore ---


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

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Mon Sep 12 15:12:42 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Mon, 12 Sep 2005 11:12:42 -0400
Subject: rpms/perl-Mail-Sender import.log,1.1,1.2
Message-ID: <200509121512.j8CFCghi029894@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Mail-Sender
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29859

Modified Files:
	import.log 
Log Message:
auto-import perl-Mail-Sender-0.8.10-2 on branch devel from perl-Mail-Sender-0.8.10-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Mail-Sender/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	12 Sep 2005 15:12:10 -0000	1.1
+++ import.log	12 Sep 2005 15:12:40 -0000	1.2
@@ -0,0 +1 @@
+perl-Mail-Sender-0_8_10-2:HEAD:perl-Mail-Sender-0.8.10-2.src.rpm:1126537952



From fedora-extras-commits at redhat.com  Mon Sep 12 15:12:42 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Mon, 12 Sep 2005 11:12:42 -0400
Subject: rpms/perl-Mail-Sender/devel perl-Mail-Sender.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200509121512.j8CFCgDU029901@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Mail-Sender/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29859/devel

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


--- NEW FILE perl-Mail-Sender.spec ---
Name:           perl-Mail-Sender
Version:        0.8.10
Release:        2%{?dist}
Summary:        Module for sending mails with attachments through an SMTP server

Group:          Development/Libraries
License:        Distributable
URL:            http://search.cpan.org/dist/Mail-Sender/
Source0:        http://www.cpan.org/authors/id/J/JE/JENDA/Mail-Sender-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
%{summary}.


%prep
%setup -q -n Mail-Sender-%{version}
%{__perl} -pi -e 's/\r\n/\n/' README


%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags} < /dev/null


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

# Remove the Win32 module in order to avoid requiring perl(Win32API::Registry)
find $RPM_BUILD_ROOT -type f -name Win32.pm -exec rm -f {} ';'


%check
make test


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
# License: perl + spam exception.
# See the main POD page for the copyright information.
# For the Artistic and GPL license text(s), see the perl package.
%doc Changes README
%{perl_vendorlib}/Mail/
%{_mandir}/man3/*.3*


%changelog
* Mon Sep 12 2005 Jose Pedro Oliveira  - 0.8.10-2
- License clarification.

* Sat Sep 10 2005 Jose Pedro Oliveira  - 0.8.10-1
- First build.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Mail-Sender/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	12 Sep 2005 15:12:11 -0000	1.1
+++ .cvsignore	12 Sep 2005 15:12:40 -0000	1.2
@@ -0,0 +1 @@
+Mail-Sender-0.8.10.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Mail-Sender/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	12 Sep 2005 15:12:11 -0000	1.1
+++ sources	12 Sep 2005 15:12:40 -0000	1.2
@@ -0,0 +1 @@
+4dac1115bacca2ed0b8403c3874975da  Mail-Sender-0.8.10.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 12 15:19:37 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Mon, 12 Sep 2005 11:19:37 -0400
Subject: owners owners.list,1.193,1.194
Message-ID: <200509121519.j8CFJbC7029976@cvs-int.fedora.redhat.com>

Author: jpo

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

Modified Files:
	owners.list 
Log Message:
New packages: perl-Log-Dispatch and perl-Mail-Sender


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.193
retrieving revision 1.194
diff -u -r1.193 -r1.194
--- owners.list	12 Sep 2005 15:08:54 -0000	1.193
+++ owners.list	12 Sep 2005 15:19:35 -0000	1.194
@@ -667,7 +667,9 @@
 Fedora Extras|perl-Lingua-EN-Inflect-Number|Force number of words to singular or plural|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Locale-Maketext-Fuzzy|Maketext from already interpolated strings|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Locale-gettext|Interface to gettext family of functions|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Log-Dispatch|Dispatches messages to one or more outputs|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Mail-Alias|For bugs related to the perl-Mail-Alias component|oliver at linux-kernel.at|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Mail-Sender|Module for sending mails with attachments through an SMTP server|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Mail-Sendmail|Simple platform independent mailer for Perl|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Mail-SPF-Query|Mail::SPF::Query determines the legitimacy of an SMTP client IP|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-MailTools|MailTools module for Perl|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
@@ -936,7 +938,7 @@
 Fedora Extras|tetex-font-kerkis|The Kerkis type 1 fonts for LaTeX|paskalis at di.uoa.gr|extras-qa at fedoraproject.org|
 Fedora Extras|tetex-font-tipa|The TIPA fonts for LaTeX|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|tetex-lgrind|Source-code pretty-printer for LaTeX|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
-Fedora Extras|tetex-perltex| Define LaTeX macros in terms of Perl code|jpo at di.uminho.pt|extras-qa at fedoraproject.org|
+Fedora Extras|tetex-perltex|Define LaTeX macros in terms of Perl code|jpo at di.uminho.pt|extras-qa at fedoraproject.org|
 Fedora Extras|tetex-pgf|Create PostScript and PDF graphics in TeX|jpo at di.uminho.pt|extras-qa at fedoraproject.org|
 Fedora Extras|tetex-prosper|LaTeX class for writing transparencies|mpeters at mac.com|extras-qa at fedoraproject.org|
 Fedora Extras|tetex-unicode|Unicode support for LaTeX|gauret at free.fr|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Mon Sep 12 15:37:22 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Mon, 12 Sep 2005 11:37:22 -0400
Subject: rpms/perl-Log-Dispatch/FC-3 perl-Log-Dispatch.spec,1.1,1.2
Message-ID: <200509121537.j8CFbMAn030785@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Log-Dispatch/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30766

Modified Files:
	perl-Log-Dispatch.spec 
Log Message:
Hardcoding value for FC-3


Index: perl-Log-Dispatch.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Log-Dispatch/FC-3/perl-Log-Dispatch.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Log-Dispatch.spec	12 Sep 2005 11:38:16 -0000	1.1
+++ perl-Log-Dispatch.spec	12 Sep 2005 15:37:20 -0000	1.2
@@ -5,7 +5,7 @@
 #   1  for enabling mod_perl >= 2.0.0RC5 support
 #   0  for enabling mod_perl < 2.0.0RC5 support
 
-%define mod_perl2      1
+%define mod_perl2      0
 %define mailtests      0
 
 %{?_with_mailtests:%define mailtests 1}



From fedora-extras-commits at redhat.com  Mon Sep 12 16:38:44 2005
From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj))
Date: Mon, 12 Sep 2005 12:38:44 -0400
Subject: web/html/download/mirrors fedora-extras-4,1.1,1.2
Message-ID: <200509121638.j8CGciSC032487@cvs-int.fedora.redhat.com>

Author: katzj

Update of /cvs/fedora/web/html/download/mirrors
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32468

Modified Files:
	fedora-extras-4 
Log Message:
updated list of mirrors for FE4 from Aurelian Bompard



Index: fedora-extras-4
===================================================================
RCS file: /cvs/fedora/web/html/download/mirrors/fedora-extras-4,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fedora-extras-4	7 Jun 2005 16:23:45 -0000	1.1
+++ fedora-extras-4	12 Sep 2005 16:38:42 -0000	1.2
@@ -1 +1,16 @@
 http://download.fedora.redhat.com/pub/fedora/linux/extras/4/$ARCH/
+http://mirrors.kernel.org/fedora/extras/4/$ARCH/
+http://fedora.cat.pdx.edu/linux/extras/4/$ARCH/
+http://fedora.gtlib.cc.gatech.edu/pub/fedora.redhat/linux/extras/4/$ARCH/
+http://fr2.rpmfind.net/linux/fedora/extras/4/$ARCH/
+http://fr.rpmfind.net/linux/fedora/extras/4/$ARCH/
+http://ftp.chg.ru/pub/Linux/fedora/linux/extras/4/$ARCH/
+http://ftp.kddilabs.jp/Linux/packages/fedora/extras/4/$ARCH/
+http://ftp.lug.ro/fedora/linux/extras/4/$ARCH/
+http://ftp-stud.fht-esslingen.de/pub/Mirrors/fedora.redhat.com/linux/extras/4/$ARCH/
+http://ftp.uni-bayreuth.de/linux/fedora/linux/extras/4/$ARCH/
+http://gd.tuwien.ac.at/opsys/linux/fedora/extras/4/$ARCH/
+http://mirror.hiwaay.net/redhat/fedora/linux/extras/4/$ARCH/
+http://mirror.switch.ch/ftp/mirror/fedora/linux/extras/4/$ARCH/
+http://mirror.web-ster.com/fedora/extras/4/$ARCH/
+http://www.mirrorservice.org/sites/download.fedora.redhat.com/pub/fedora/linux/extras/4/$ARCH/



From fedora-extras-commits at redhat.com  Mon Sep 12 17:48:54 2005
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Mon, 12 Sep 2005 13:48:54 -0400
Subject: rpms/nethack/FC-3 nethack-3.4.3-x11.patch, NONE, 1.1 nethack.spec,
	1.2, 1.3
Message-ID: <200509121749.j8CHnOSV001647@cvs-int.fedora.redhat.com>

Author: lmacken

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

Modified Files:
	nethack.spec 
Added Files:
	nethack-3.4.3-x11.patch 
Log Message:
- Build with x11 support (Bug #167523)


nethack-3.4.3-x11.patch:

--- NEW FILE nethack-3.4.3-x11.patch ---
--- sys/unix/Makefile.top.orig	2005-06-24 21:11:44.000000000 -0400
+++ sys/unix/Makefile.top	2005-06-24 21:12:06.000000000 -0400
@@ -40,9 +40,8 @@
 SHELLDIR = $(PREFIX)/games
 
 # per discussion in Install.X11 and Install.Qt
-VARDATND = 
 # VARDATND = x11tiles NetHack.ad pet_mark.xbm
-# VARDATND = x11tiles NetHack.ad pet_mark.xbm rip.xpm
+VARDATND = x11tiles NetHack.ad pet_mark.xbm rip.xpm
 # for Atari/Gem
 # VARDATND = nh16.img title.img GEM_RSC.RSC rip.img
 # for BeOS
--- include/config.h.orig	2005-06-24 21:12:38.000000000 -0400
+++ include/config.h	2005-06-24 21:13:36.000000000 -0400
@@ -43,7 +43,7 @@
  * Some combinations make no sense.  See the installation document.
  */
 #define TTY_GRAPHICS	/* good old tty based graphics */
-/* #define X11_GRAPHICS */	/* X11 interface */
+#define X11_GRAPHICS	/* X11 interface */
 /* #define QT_GRAPHICS */	/* Qt interface */
 /* #define GNOME_GRAPHICS */	/* Gnome interface */
 /* #define MSWIN_GRAPHICS */	/* Windows NT, CE, Graphics */
@@ -126,7 +126,7 @@
  * would allow:
  *  xpmtoppm x11tiles_big.xpm
  */
-/* # define USE_XPM */		/* Disable if you do not have the XPM library */
+# define USE_XPM		/* Disable if you do not have the XPM library */
 # ifdef USE_XPM
 #  define GRAPHIC_TOMBSTONE	/* Use graphical tombstone (rip.xpm) */
 # endif
--- sys/unix/Makefile.src.orig	2005-06-24 21:14:49.000000000 -0400
+++ sys/unix/Makefile.src	2005-06-24 21:15:32.000000000 -0400
@@ -214,8 +214,8 @@
 
 #
 #
-WINSRC = $(WINTTYSRC)
-WINOBJ = $(WINTTYOBJ)
+WINSRC = $(WINTTYSRC) $(WINX11SRC)
+WINOBJ = $(WINTTYOBJ) $(WINX11OBJ)
 
 # on some systems the termcap library is in -ltermcap or -lcurses
 # on 386 Xenix, the -ltermlib tputs() seems not to work; use -lcurses instead
@@ -235,7 +235,7 @@
 #
 # libraries for X11
 # If USE_XPM is defined in config.h, you will also need -lXpm here.
-WINX11LIB = -lXaw -lXmu -lXext -lXt -lX11
+WINX11LIB = -lXaw -lXmu -lXext -lXt -lX11 -lXpm
 # WINX11LIB = -lXaw -lXmu -lXt -lX11
 # WINX11LIB = -lXaw -lXmu -lXext -lXt -lXpm -lX11 -lm
 # WINX11LIB = -lXaw -lXmu -lXpm -lXext -lXt -lX11 -lSM -lICE -lm # BSD/OS 2.0
@@ -255,7 +255,7 @@
 # libraries for BeOS 
 WINBELIB = -lbe
 
-WINLIB = $(WINTTYLIB)
+WINLIB = $(WINTTYLIB) $(WINX11LIB)
 
 # any other strange libraries your system needs (for Sysunix only -- the more
 # specialized targets should already be right)


Index: nethack.spec
===================================================================
RCS file: /cvs/extras/rpms/nethack/FC-3/nethack.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- nethack.spec	16 Aug 2005 17:08:58 -0000	1.2
+++ nethack.spec	12 Sep 2005 17:48:52 -0000	1.3
@@ -3,7 +3,7 @@
 
 Name:           nethack
 Version:        3.4.3
-Release:        1%{?dist}
+Release:        3%{?dist}
 Summary:        A rogue-like single player dungeon exploration game
 
 Group:          Amusements/Games
@@ -13,9 +13,13 @@
 Source1:        %{name}.desktop
 Patch0:         %{name}-%{version}-makefile.patch
 Patch1:         %{name}-%{version}-config.patch
+Patch2:         %{name}-%{version}-x11.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  ncurses-devel, bison, flex, desktop-file-utils
+BuildRequires:  ncurses-devel
+BuildRequires:  bison, flex, desktop-file-utils
+BuildRequires:  xorg-x11-devel, xorg-x11-font-utils
+
 Obsoletes:      nethack-falconseye <= 1.9.4-6.a
 
 
@@ -39,6 +43,7 @@
 %setup -q
 %patch0 -b .makefile
 %patch1 -b .config
+%patch2 -b .x11
 (source sys/unix/setup.sh)
 
 # Set our paths
@@ -49,6 +54,10 @@
 %{__sed} -i -e "s:/usr/games/lib/nethackdir:%{nhgamedir}:" \
         doc/nethack.6 doc/nethack.txt doc/recover.6 doc/recover.txt
 
+# Point the linker in the right direction
+%{__sed} -i -e "s:-L/usr/X11R6/lib:-L/usr/X11R6/%{_lib}:" \
+        src/Makefile util/Makefile
+
 
 %build
 make all
@@ -81,6 +90,17 @@
         --add-category Game \
         %{SOURCE1}
 
+# Install the fonts for the X11 interface
+cd win/X11
+bdftopcf -o nh10.pcf nh10.bdf
+bdftopcf -o ibm.pcf ibm.bdf
+install -D -p -m 644 ibm.pcf $RPM_BUILD_ROOT%{nhgamedir}/fonts/ibm.pcf
+install -D -p -m 644 nh10.pcf $RPM_BUILD_ROOT%{nhgamedir}/fonts/nh10.pcf
+mkfontdir $RPM_BUILD_ROOT%{nhgamedir}/fonts
+
+%{__sed} -i -e 's:^!\(NetHack.tile_file.*\):\1:' \
+        $RPM_BUILD_ROOT%{nhgamedir}/NetHack.ad
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -96,6 +116,11 @@
 %{nhgamedir}/nhdat
 %{_bindir}/nethack
 %{_bindir}/nethack-recover
+%{nhgamedir}/NetHack.ad
+%{nhgamedir}/pet_mark.xbm
+%{nhgamedir}/rip.xpm
+%{nhgamedir}/x11tiles
+%{nhgamedir}/fonts/
 %defattr(0664,root,games)
 %config(noreplace) %{nhdatadir}/record
 %config(noreplace) %{nhdatadir}/perm
@@ -106,5 +131,11 @@
 
 
 %changelog
+* Thu Sep 08 2005 Luke Macken  3.4.3-3
+- Point linker in the right direction using %%{_lib} to fix x86_64 build issues
+
+* Tue Sep 06 2005 Luke Macken  3.4.3-2
+- Enable x11 support
+
 * Sun Jul 10 2005 Luke Macken  3.4.3-1
 - Initial package for Fedora Extras



From fedora-extras-commits at redhat.com  Mon Sep 12 17:48:54 2005
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Mon, 12 Sep 2005 13:48:54 -0400
Subject: rpms/nethack/FC-4 nethack-3.4.3-x11.patch, NONE, 1.1 nethack.spec,
	1.2, 1.3
Message-ID: <200509121749.j8CHnPfR001650@cvs-int.fedora.redhat.com>

Author: lmacken

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

Modified Files:
	nethack.spec 
Added Files:
	nethack-3.4.3-x11.patch 
Log Message:
- Build with x11 support (Bug #167523)


nethack-3.4.3-x11.patch:

--- NEW FILE nethack-3.4.3-x11.patch ---
--- sys/unix/Makefile.top.orig	2005-06-24 21:11:44.000000000 -0400
+++ sys/unix/Makefile.top	2005-06-24 21:12:06.000000000 -0400
@@ -40,9 +40,8 @@
 SHELLDIR = $(PREFIX)/games
 
 # per discussion in Install.X11 and Install.Qt
-VARDATND = 
 # VARDATND = x11tiles NetHack.ad pet_mark.xbm
-# VARDATND = x11tiles NetHack.ad pet_mark.xbm rip.xpm
+VARDATND = x11tiles NetHack.ad pet_mark.xbm rip.xpm
 # for Atari/Gem
 # VARDATND = nh16.img title.img GEM_RSC.RSC rip.img
 # for BeOS
--- include/config.h.orig	2005-06-24 21:12:38.000000000 -0400
+++ include/config.h	2005-06-24 21:13:36.000000000 -0400
@@ -43,7 +43,7 @@
  * Some combinations make no sense.  See the installation document.
  */
 #define TTY_GRAPHICS	/* good old tty based graphics */
-/* #define X11_GRAPHICS */	/* X11 interface */
+#define X11_GRAPHICS	/* X11 interface */
 /* #define QT_GRAPHICS */	/* Qt interface */
 /* #define GNOME_GRAPHICS */	/* Gnome interface */
 /* #define MSWIN_GRAPHICS */	/* Windows NT, CE, Graphics */
@@ -126,7 +126,7 @@
  * would allow:
  *  xpmtoppm x11tiles_big.xpm
  */
-/* # define USE_XPM */		/* Disable if you do not have the XPM library */
+# define USE_XPM		/* Disable if you do not have the XPM library */
 # ifdef USE_XPM
 #  define GRAPHIC_TOMBSTONE	/* Use graphical tombstone (rip.xpm) */
 # endif
--- sys/unix/Makefile.src.orig	2005-06-24 21:14:49.000000000 -0400
+++ sys/unix/Makefile.src	2005-06-24 21:15:32.000000000 -0400
@@ -214,8 +214,8 @@
 
 #
 #
-WINSRC = $(WINTTYSRC)
-WINOBJ = $(WINTTYOBJ)
+WINSRC = $(WINTTYSRC) $(WINX11SRC)
+WINOBJ = $(WINTTYOBJ) $(WINX11OBJ)
 
 # on some systems the termcap library is in -ltermcap or -lcurses
 # on 386 Xenix, the -ltermlib tputs() seems not to work; use -lcurses instead
@@ -235,7 +235,7 @@
 #
 # libraries for X11
 # If USE_XPM is defined in config.h, you will also need -lXpm here.
-WINX11LIB = -lXaw -lXmu -lXext -lXt -lX11
+WINX11LIB = -lXaw -lXmu -lXext -lXt -lX11 -lXpm
 # WINX11LIB = -lXaw -lXmu -lXt -lX11
 # WINX11LIB = -lXaw -lXmu -lXext -lXt -lXpm -lX11 -lm
 # WINX11LIB = -lXaw -lXmu -lXpm -lXext -lXt -lX11 -lSM -lICE -lm # BSD/OS 2.0
@@ -255,7 +255,7 @@
 # libraries for BeOS 
 WINBELIB = -lbe
 
-WINLIB = $(WINTTYLIB)
+WINLIB = $(WINTTYLIB) $(WINX11LIB)
 
 # any other strange libraries your system needs (for Sysunix only -- the more
 # specialized targets should already be right)


Index: nethack.spec
===================================================================
RCS file: /cvs/extras/rpms/nethack/FC-4/nethack.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- nethack.spec	16 Aug 2005 17:08:58 -0000	1.2
+++ nethack.spec	12 Sep 2005 17:48:52 -0000	1.3
@@ -3,7 +3,7 @@
 
 Name:           nethack
 Version:        3.4.3
-Release:        1%{?dist}
+Release:        3%{?dist}
 Summary:        A rogue-like single player dungeon exploration game
 
 Group:          Amusements/Games
@@ -13,9 +13,13 @@
 Source1:        %{name}.desktop
 Patch0:         %{name}-%{version}-makefile.patch
 Patch1:         %{name}-%{version}-config.patch
+Patch2:         %{name}-%{version}-x11.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  ncurses-devel, bison, flex, desktop-file-utils
+BuildRequires:  ncurses-devel
+BuildRequires:  bison, flex, desktop-file-utils
+BuildRequires:  xorg-x11-devel, xorg-x11-font-utils
+
 Obsoletes:      nethack-falconseye <= 1.9.4-6.a
 
 
@@ -39,6 +43,7 @@
 %setup -q
 %patch0 -b .makefile
 %patch1 -b .config
+%patch2 -b .x11
 (source sys/unix/setup.sh)
 
 # Set our paths
@@ -49,6 +54,10 @@
 %{__sed} -i -e "s:/usr/games/lib/nethackdir:%{nhgamedir}:" \
         doc/nethack.6 doc/nethack.txt doc/recover.6 doc/recover.txt
 
+# Point the linker in the right direction
+%{__sed} -i -e "s:-L/usr/X11R6/lib:-L/usr/X11R6/%{_lib}:" \
+        src/Makefile util/Makefile
+
 
 %build
 make all
@@ -81,6 +90,17 @@
         --add-category Game \
         %{SOURCE1}
 
+# Install the fonts for the X11 interface
+cd win/X11
+bdftopcf -o nh10.pcf nh10.bdf
+bdftopcf -o ibm.pcf ibm.bdf
+install -D -p -m 644 ibm.pcf $RPM_BUILD_ROOT%{nhgamedir}/fonts/ibm.pcf
+install -D -p -m 644 nh10.pcf $RPM_BUILD_ROOT%{nhgamedir}/fonts/nh10.pcf
+mkfontdir $RPM_BUILD_ROOT%{nhgamedir}/fonts
+
+%{__sed} -i -e 's:^!\(NetHack.tile_file.*\):\1:' \
+        $RPM_BUILD_ROOT%{nhgamedir}/NetHack.ad
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -96,6 +116,11 @@
 %{nhgamedir}/nhdat
 %{_bindir}/nethack
 %{_bindir}/nethack-recover
+%{nhgamedir}/NetHack.ad
+%{nhgamedir}/pet_mark.xbm
+%{nhgamedir}/rip.xpm
+%{nhgamedir}/x11tiles
+%{nhgamedir}/fonts/
 %defattr(0664,root,games)
 %config(noreplace) %{nhdatadir}/record
 %config(noreplace) %{nhdatadir}/perm
@@ -106,5 +131,11 @@
 
 
 %changelog
+* Thu Sep 08 2005 Luke Macken  3.4.3-3
+- Point linker in the right direction using %%{_lib} to fix x86_64 build issues
+
+* Tue Sep 06 2005 Luke Macken  3.4.3-2
+- Enable x11 support
+
 * Sun Jul 10 2005 Luke Macken  3.4.3-1
 - Initial package for Fedora Extras



From fedora-extras-commits at redhat.com  Mon Sep 12 17:54:38 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon, 12 Sep 2005 13:54:38 -0400
Subject: rpms/sbcl/devel sbcl.spec,1.1,1.2
Message-ID: <200509121754.j8CHscrZ001756@cvs-int.fedora.redhat.com>

Author: rdieter

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

Modified Files:
	sbcl.spec 
Log Message:
* Mon Sep 12 2005 Rex Dieter  0.9.4-5
- diagnose bootstrap snafu on buildsystem 



Index: sbcl.spec
===================================================================
RCS file: /cvs/extras/rpms/sbcl/devel/sbcl.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sbcl.spec	12 Sep 2005 12:36:44 -0000	1.1
+++ sbcl.spec	12 Sep 2005 17:54:36 -0000	1.2
@@ -21,7 +21,7 @@
 Name: 	 sbcl
 Summary: Steel Bank Common Lisp
 Version: 0.9.4
-Release: 4%{?dist}
+Release: 5%{?dist}
 
 License: BSD/MIT
 Group: 	 Development/Languages
@@ -47,7 +47,6 @@
 %ifarch ppc 
 %define bootstrap_src -a 12
 %endif
-
 %endif
 
 Patch1: sbcl-0.8.18-default-sbcl-home.patch
@@ -70,7 +69,7 @@
 
 
 %prep
-%setup -q %{?bootstrap_src} 
+%setup %{?bootstrap_src} 
 
 #sed -i -e "s|/usr/local/lib/sbcl/|%{_libdir}/sbcl/|" src/runtime/runtime.c
 #or patch to use SBCL_HOME env var
@@ -91,12 +90,16 @@
 
 %if "%{?bootstrap}" == "%{nil}"
 mkdir sbcl-bootstrap
-pushd sbcl-%{version}-*-linux
+pushd sbcl-*-linux
 chmod +x install.sh
 INSTALL_ROOT=`pwd`/../sbcl-bootstrap ./install.sh
 popd
 %endif
 
+# CVS crud 
+find . -name CVS -type d | xargs rm -rf
+find . -name '.cvsignore' | xargs rm -f
+
 
 %build
 export DEFAULT_SBCL_HOME=%{_libdir}/sbcl
@@ -140,10 +143,9 @@
 ## Unpackaged files
 rm -rf $RPM_BUILD_ROOT%{_docdir}/sbcl
 rm -f  $RPM_BUILD_ROOT%{_infodir}/dir
-
-# CVS crud
-find $RPM_BUILD_ROOT -name CVS -type d | xargs rm -rf
-find $RPM_BUILD_ROOT -name '.cvsignore' | xargs rm -f
+# CVS crud 
+#find $RPM_BUILD_ROOT -name CVS -type d | xargs rm -rf
+#find $RPM_BUILD_ROOT -name '.cvsignore' | xargs rm -f
 # from make check
 find $RPM_BUILD_ROOT -name 'test-passed' | xargs rm -f
 # 
@@ -179,6 +181,9 @@
 
 
 %changelog
+* Mon Sep 12 2005 Rex Dieter  0.9.4-5
+- diagnose bootstrap snafu on buildsystem 
+
 * Tue Aug 30 2005 Rex Dieter  0.9.4-4
 - safer NO_ADDR_RANDOMIZE patch
 - use %%{?setarch} in %%check too



From fedora-extras-commits at redhat.com  Mon Sep 12 18:11:42 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon, 12 Sep 2005 14:11:42 -0400
Subject: rpms/sbcl/devel sbcl.spec,1.2,1.3
Message-ID: <200509121811.j8CIBgrM003155@cvs-int.fedora.redhat.com>

Author: rdieter

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

Modified Files:
	sbcl.spec 
Log Message:
rename bootstrap -> sbcl_bootstrap



Index: sbcl.spec
===================================================================
RCS file: /cvs/extras/rpms/sbcl/devel/sbcl.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sbcl.spec	12 Sep 2005 17:54:36 -0000	1.2
+++ sbcl.spec	12 Sep 2005 18:11:40 -0000	1.3
@@ -3,9 +3,9 @@
 ## Default to using a local bootstrap, 
 ## define one of the following to override 
 ## (non sbcl bootstraps untested)
-#define bootstrap sbcl
-#define bootstrap cmucl
-#define bootstrap clisp
+#define sbcl_bootstrap sbcl
+#define sbcl_bootstrap cmucl
+#define sbcl_bootstrap clisp
 
 %if "%{?fedora}" >= "3"
 BuildRequires:setarch
@@ -21,7 +21,7 @@
 Name: 	 sbcl
 Summary: Steel Bank Common Lisp
 Version: 0.9.4
-Release: 5%{?dist}
+Release: 6%{?dist}
 
 License: BSD/MIT
 Group: 	 Development/Languages
@@ -32,20 +32,20 @@
 
 Source1: sbcl.sh
 
-%if "%{?bootstrap}" == "%{nil}"
+%if "%{?sbcl_bootstrap}" == "%{nil}"
 # local Bootstrap binaries
 Source10: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-%{version}-x86-linux-binary.tar.bz2
 %ifarch %{ix86}
-%define bootstrap_src -a 10 
+%define sbcl_bootstrap_src -a 10 
 %endif
 Source11: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-%{version}-x86-64-linux-binary.tar.bz2
 %ifarch %{x86_64}
-%define bootstrap_src -a 11 
+%define sbcl_bootstrap_src -a 11 
 %endif
 # Latest powerpc-linux bootstrap (untested)
 Source12: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.8.15-powerpc-linux-binary.tar.bz2
 %ifarch ppc 
-%define bootstrap_src -a 12
+%define sbcl_bootstrap_src -a 12
 %endif
 %endif
 
@@ -54,7 +54,7 @@
 Patch2: sbcl-0.9.4-ADDR_NO_RANDOMIZE.patch
 Patch3: sbcl-0.9.4-optflags.patch
 
-%{?bootstrap:BuildRequires: %{?bootstrap}}
+%{?sbcl_bootstrap:BuildRequires: %{?sbcl_bootstrap}}
 
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
@@ -69,7 +69,7 @@
 
 
 %prep
-%setup %{?bootstrap_src} 
+%setup %{?sbcl_bootstrap_src} 
 
 #sed -i -e "s|/usr/local/lib/sbcl/|%{_libdir}/sbcl/|" src/runtime/runtime.c
 #or patch to use SBCL_HOME env var
@@ -88,7 +88,7 @@
 %endif
 #endif
 
-%if "%{?bootstrap}" == "%{nil}"
+%if "%{?sbcl_bootstrap}" == "%{nil}"
 mkdir sbcl-bootstrap
 pushd sbcl-*-linux
 chmod +x install.sh
@@ -104,7 +104,7 @@
 %build
 export DEFAULT_SBCL_HOME=%{_libdir}/sbcl
 
-%if "%{?bootstrap}" == "%{nil}"
+%if "%{?sbcl_bootstrap}" == "%{nil}"
 export SBCL_HOME=`pwd`/sbcl-bootstrap/lib/sbcl
 export PATH=`pwd`/sbcl-bootstrap/bin:${PATH}
 %endif
@@ -181,7 +181,7 @@
 
 
 %changelog
-* Mon Sep 12 2005 Rex Dieter  0.9.4-5
+* Mon Sep 12 2005 Rex Dieter  0.9.4-6
 - diagnose bootstrap snafu on buildsystem 
 
 * Tue Aug 30 2005 Rex Dieter  0.9.4-4



From fedora-extras-commits at redhat.com  Mon Sep 12 18:20:21 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 12 Sep 2005 14:20:21 -0400
Subject: rpms/dkms/devel dkms.spec,1.4,1.5
Message-ID: <200509121820.j8CIKLqj003303@cvs-int.fedora.redhat.com>

Author: spot

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

Modified Files:
	dkms.spec 
Log Message:

Resolve Bugzilla 162308



Index: dkms.spec
===================================================================
RCS file: /cvs/extras/rpms/dkms/devel/dkms.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- dkms.spec	5 Sep 2005 03:04:33 -0000	1.4
+++ dkms.spec	12 Sep 2005 18:20:19 -0000	1.5
@@ -1,7 +1,7 @@
 Summary: Dynamic Kernel Module Support Framework
 Name: dkms
 Version: 2.0.6
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Group: System Environment/Base
 BuildArch: noarch
@@ -10,6 +10,7 @@
 Provides: dkms-minimal
 Source0: http://linux.dell.com/dkms/dkms-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Requires: kernel-devel
 
 %description
 This package contains the framework for the Dynamic
@@ -101,6 +102,9 @@
 
 
 %changelog
+* Mon Sep 12 2005 Tom "spot" Callaway  2.0.6-2
+- requires kernel-devel
+
 * Sun Sep  4 2005 Tom "spot" Callaway  2.0.6-1
 - bump to 2.0.6
 - include COPYING AUTHORS in %%doc



From fedora-extras-commits at redhat.com  Mon Sep 12 18:20:16 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 12 Sep 2005 14:20:16 -0400
Subject: rpms/dkms/FC-3 dkms.spec,1.3,1.4
Message-ID: <200509121820.j8CIKksc003306@cvs-int.fedora.redhat.com>

Author: spot

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

Modified Files:
	dkms.spec 
Log Message:

Resolve Bugzilla 162308



Index: dkms.spec
===================================================================
RCS file: /cvs/extras/rpms/dkms/FC-3/dkms.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- dkms.spec	5 Sep 2005 03:03:56 -0000	1.3
+++ dkms.spec	12 Sep 2005 18:20:13 -0000	1.4
@@ -1,7 +1,7 @@
 Summary: Dynamic Kernel Module Support Framework
 Name: dkms
 Version: 2.0.6
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Group: System Environment/Base
 BuildArch: noarch
@@ -10,6 +10,7 @@
 Provides: dkms-minimal
 Source0: http://linux.dell.com/dkms/dkms-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Requires: kernel-devel
 
 %description
 This package contains the framework for the Dynamic
@@ -101,6 +102,9 @@
 
 
 %changelog
+* Mon Sep 12 2005 Tom "spot" Callaway  2.0.6-2
+- requires kernel-devel
+
 * Sun Sep  4 2005 Tom "spot" Callaway  2.0.6-1
 - bump to 2.0.6
 - include COPYING AUTHORS in %%doc



From fedora-extras-commits at redhat.com  Mon Sep 12 18:20:16 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 12 Sep 2005 14:20:16 -0400
Subject: rpms/dkms/FC-4 dkms.spec,1.3,1.4
Message-ID: <200509121820.j8CIKkbl003309@cvs-int.fedora.redhat.com>

Author: spot

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

Modified Files:
	dkms.spec 
Log Message:

Resolve Bugzilla 162308



Index: dkms.spec
===================================================================
RCS file: /cvs/extras/rpms/dkms/FC-4/dkms.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- dkms.spec	5 Sep 2005 03:04:05 -0000	1.3
+++ dkms.spec	12 Sep 2005 18:20:14 -0000	1.4
@@ -1,7 +1,7 @@
 Summary: Dynamic Kernel Module Support Framework
 Name: dkms
 Version: 2.0.6
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Group: System Environment/Base
 BuildArch: noarch
@@ -10,6 +10,7 @@
 Provides: dkms-minimal
 Source0: http://linux.dell.com/dkms/dkms-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Requires: kernel-devel
 
 %description
 This package contains the framework for the Dynamic
@@ -101,6 +102,9 @@
 
 
 %changelog
+* Mon Sep 12 2005 Tom "spot" Callaway  2.0.6-2
+- requires kernel-devel
+
 * Sun Sep  4 2005 Tom "spot" Callaway  2.0.6-1
 - bump to 2.0.6
 - include COPYING AUTHORS in %%doc



From fedora-extras-commits at redhat.com  Mon Sep 12 18:27:45 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon, 12 Sep 2005 14:27:45 -0400
Subject: rpms/sbcl/devel sbcl.spec,1.3,1.4
Message-ID: <200509121827.j8CIRjTJ003473@cvs-int.fedora.redhat.com>

Author: rdieter

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

Modified Files:
	sbcl.spec 
Log Message:
* Mon Sep 12 2005 Rex Dieter  0.9.4-7
- %{x86_64} -> x86_64



Index: sbcl.spec
===================================================================
RCS file: /cvs/extras/rpms/sbcl/devel/sbcl.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sbcl.spec	12 Sep 2005 18:11:40 -0000	1.3
+++ sbcl.spec	12 Sep 2005 18:27:43 -0000	1.4
@@ -21,7 +21,7 @@
 Name: 	 sbcl
 Summary: Steel Bank Common Lisp
 Version: 0.9.4
-Release: 6%{?dist}
+Release: 7%{?dist}
 
 License: BSD/MIT
 Group: 	 Development/Languages
@@ -39,7 +39,7 @@
 %define sbcl_bootstrap_src -a 10 
 %endif
 Source11: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-%{version}-x86-64-linux-binary.tar.bz2
-%ifarch %{x86_64}
+%ifarch x86_64
 %define sbcl_bootstrap_src -a 11 
 %endif
 # Latest powerpc-linux bootstrap (untested)
@@ -83,7 +83,7 @@
 ## to customize features -- Rex
 #define kernel_ver %(uname -r | cut -d- -f1 | cut -d. -f-2 )
 #if "%{?kernel_ver}" >= "2.6"
-%ifarch %{ix86} %{x86_64}
+%ifarch %{ix86} x86_64
 sed -i -e "s|; :sb-thread|:sb-thread|" base-target-features.lisp-expr
 %endif
 #endif
@@ -181,8 +181,8 @@
 
 
 %changelog
-* Mon Sep 12 2005 Rex Dieter  0.9.4-6
-- diagnose bootstrap snafu on buildsystem 
+* Mon Sep 12 2005 Rex Dieter  0.9.4-7
+- %{x86_64} -> x86_64
 
 * Tue Aug 30 2005 Rex Dieter  0.9.4-4
 - safer NO_ADDR_RANDOMIZE patch



From fedora-extras-commits at redhat.com  Mon Sep 12 18:45:14 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon, 12 Sep 2005 14:45:14 -0400
Subject: rpms/gc/FC-4 .cvsignore,1.5,1.6 gc.spec,1.9,1.10 sources,1.5,1.6
Message-ID: <200509121845.j8CIjiSI003704@cvs-int.fedora.redhat.com>

Author: rdieter

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

Modified Files:
	.cvsignore gc.spec sources 
Log Message:
* Fri Sep 09 2005 Rex Dieter  6.6-1
- 6.6



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gc/FC-4/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	7 Sep 2005 12:48:08 -0000	1.5
+++ .cvsignore	12 Sep 2005 18:45:12 -0000	1.6
@@ -1 +1 @@
-gc6.5.tar.gz
+gc6.6.tar.gz


Index: gc.spec
===================================================================
RCS file: /cvs/extras/rpms/gc/FC-4/gc.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- gc.spec	7 Sep 2005 12:48:08 -0000	1.9
+++ gc.spec	12 Sep 2005 18:45:12 -0000	1.10
@@ -2,13 +2,13 @@
 
 Summary: C++ Garbage Collector	
 Name:    gc	
-Version: 6.5
+Version: 6.6
 
 Release: 1%{?dist}
 Group:   System Environment/Libraries
 License: BSD
 Url:     http://www.hpl.hp.com/personal/Hans_Boehm/gc/	
-Source:  http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/gc6.5.tar.gz 
+Source:  http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/gc6.6.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Patch1: gc6.5-opendl.patch
@@ -83,6 +83,9 @@
 
 
 %changelog
+* Fri Sep 09 2005 Rex Dieter  6.6-1
+- 6.6
+
 * Wed May 25 2005 Rex Dieter  6.5-1
 - 6.5
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gc/FC-4/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	7 Sep 2005 12:48:08 -0000	1.5
+++ sources	12 Sep 2005 18:45:12 -0000	1.6
@@ -1 +1 @@
-00bf95cdcbedfa7321d14e0133b31cdb  gc6.5.tar.gz
+c7c301e8fab8ce152c908b05bc8d452c  gc6.6.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 12 18:45:14 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon, 12 Sep 2005 14:45:14 -0400
Subject: rpms/gc/FC-3 .cvsignore,1.5,1.6 gc.spec,1.7,1.8 sources,1.5,1.6
Message-ID: <200509121845.j8CIjitg003699@cvs-int.fedora.redhat.com>

Author: rdieter

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

Modified Files:
	.cvsignore gc.spec sources 
Log Message:
* Fri Sep 09 2005 Rex Dieter  6.6-1
- 6.6



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gc/FC-3/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	7 Sep 2005 12:47:10 -0000	1.5
+++ .cvsignore	12 Sep 2005 18:45:11 -0000	1.6
@@ -1 +1 @@
-gc6.5.tar.gz
+gc6.6.tar.gz


Index: gc.spec
===================================================================
RCS file: /cvs/extras/rpms/gc/FC-3/gc.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- gc.spec	7 Sep 2005 12:47:10 -0000	1.7
+++ gc.spec	12 Sep 2005 18:45:11 -0000	1.8
@@ -2,13 +2,13 @@
 
 Summary: C++ Garbage Collector	
 Name:    gc	
-Version: 6.5
+Version: 6.6
 
 Release: 1%{?dist}
 Group:   System Environment/Libraries
 License: BSD
 Url:     http://www.hpl.hp.com/personal/Hans_Boehm/gc/	
-Source:  http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/gc6.5.tar.gz 
+Source:  http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/gc6.6.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Patch1: gc6.5-opendl.patch
@@ -83,6 +83,9 @@
 
 
 %changelog
+* Fri Sep 09 2005 Rex Dieter  6.6-1
+- 6.6
+
 * Wed May 25 2005 Rex Dieter  6.5-1
 - 6.5
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gc/FC-3/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	7 Sep 2005 12:47:10 -0000	1.5
+++ sources	12 Sep 2005 18:45:12 -0000	1.6
@@ -1 +1 @@
-00bf95cdcbedfa7321d14e0133b31cdb  gc6.5.tar.gz
+c7c301e8fab8ce152c908b05bc8d452c  gc6.6.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 12 18:49:19 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Mon, 12 Sep 2005 14:49:19 -0400
Subject: rpms/perl-Log-Dispatch/devel perl-Log-Dispatch.spec,1.1,1.2
Message-ID: <200509121849.j8CInJun003747@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Log-Dispatch/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3725

Modified Files:
	perl-Log-Dispatch.spec 
Log Message:
Better mod_perl handling.


Index: perl-Log-Dispatch.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Log-Dispatch/devel/perl-Log-Dispatch.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Log-Dispatch.spec	12 Sep 2005 11:38:16 -0000	1.1
+++ perl-Log-Dispatch.spec	12 Sep 2005 18:49:17 -0000	1.2
@@ -1,11 +1,6 @@
 # Build switch:
 #   --with mailtests         Enable mail tests
 
-# set mod_perl2 to
-#   1  for enabling mod_perl >= 2.0.0RC5 support
-#   0  for enabling mod_perl < 2.0.0RC5 support
-
-%define mod_perl2      1
 %define mailtests      0
 
 %{?_with_mailtests:%define mailtests 1}
@@ -13,7 +8,7 @@
 
 Name:           perl-Log-Dispatch
 Version:        2.11
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Dispatches messages to one or more outputs
 
 Group:          Development/Libraries
@@ -44,9 +39,9 @@
 
 %prep
 %setup -q -n Log-Dispatch-%{version}
-%if %{mod_perl2}
+if %{__perl} -e 'use Apache2::Log' ; then
 %patch0 -p1
-%endif
+fi
 %if %{mailtests}
 %patch1 -p1
 %endif
@@ -79,5 +74,8 @@
 
 
 %changelog
+* Mon Sep 12 2005 Jose Pedro Oliveira  - 2.11-2
+- Better mod_perl handling.
+
 * Fri Sep 09 2005 Jose Pedro Oliveira  - 2.11-1
 - First build.



From fedora-extras-commits at redhat.com  Mon Sep 12 18:58:25 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Mon, 12 Sep 2005 14:58:25 -0400
Subject: rpms/perl-Log-Dispatch/FC-3 perl-Log-Dispatch.spec,1.2,1.3
Message-ID: <200509121858.j8CIwtEu003881@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Log-Dispatch/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3844/FC-3

Modified Files:
	perl-Log-Dispatch.spec 
Log Message:
Sync with devel


Index: perl-Log-Dispatch.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Log-Dispatch/FC-3/perl-Log-Dispatch.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Log-Dispatch.spec	12 Sep 2005 15:37:20 -0000	1.2
+++ perl-Log-Dispatch.spec	12 Sep 2005 18:58:23 -0000	1.3
@@ -1,11 +1,6 @@
 # Build switch:
 #   --with mailtests         Enable mail tests
 
-# set mod_perl2 to
-#   1  for enabling mod_perl >= 2.0.0RC5 support
-#   0  for enabling mod_perl < 2.0.0RC5 support
-
-%define mod_perl2      0
 %define mailtests      0
 
 %{?_with_mailtests:%define mailtests 1}
@@ -13,7 +8,7 @@
 
 Name:           perl-Log-Dispatch
 Version:        2.11
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Dispatches messages to one or more outputs
 
 Group:          Development/Libraries
@@ -44,9 +39,9 @@
 
 %prep
 %setup -q -n Log-Dispatch-%{version}
-%if %{mod_perl2}
+if %{__perl} -e 'use Apache2::Log' ; then
 %patch0 -p1
-%endif
+fi
 %if %{mailtests}
 %patch1 -p1
 %endif
@@ -79,5 +74,8 @@
 
 
 %changelog
+* Mon Sep 12 2005 Jose Pedro Oliveira  - 2.11-2
+- Better mod_perl handling.
+
 * Fri Sep 09 2005 Jose Pedro Oliveira  - 2.11-1
 - First build.



From fedora-extras-commits at redhat.com  Mon Sep 12 18:58:25 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Mon, 12 Sep 2005 14:58:25 -0400
Subject: rpms/perl-Log-Dispatch/FC-4 perl-Log-Dispatch.spec,1.1,1.2
Message-ID: <200509121859.j8CIwt2l003886@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Log-Dispatch/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3844/FC-4

Modified Files:
	perl-Log-Dispatch.spec 
Log Message:
Sync with devel


Index: perl-Log-Dispatch.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Log-Dispatch/FC-4/perl-Log-Dispatch.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Log-Dispatch.spec	12 Sep 2005 11:38:16 -0000	1.1
+++ perl-Log-Dispatch.spec	12 Sep 2005 18:58:23 -0000	1.2
@@ -1,11 +1,6 @@
 # Build switch:
 #   --with mailtests         Enable mail tests
 
-# set mod_perl2 to
-#   1  for enabling mod_perl >= 2.0.0RC5 support
-#   0  for enabling mod_perl < 2.0.0RC5 support
-
-%define mod_perl2      1
 %define mailtests      0
 
 %{?_with_mailtests:%define mailtests 1}
@@ -13,7 +8,7 @@
 
 Name:           perl-Log-Dispatch
 Version:        2.11
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Dispatches messages to one or more outputs
 
 Group:          Development/Libraries
@@ -44,9 +39,9 @@
 
 %prep
 %setup -q -n Log-Dispatch-%{version}
-%if %{mod_perl2}
+if %{__perl} -e 'use Apache2::Log' ; then
 %patch0 -p1
-%endif
+fi
 %if %{mailtests}
 %patch1 -p1
 %endif
@@ -79,5 +74,8 @@
 
 
 %changelog
+* Mon Sep 12 2005 Jose Pedro Oliveira  - 2.11-2
+- Better mod_perl handling.
+
 * Fri Sep 09 2005 Jose Pedro Oliveira  - 2.11-1
 - First build.



From fedora-extras-commits at redhat.com  Mon Sep 12 19:16:53 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon, 12 Sep 2005 15:16:53 -0400
Subject: rpms/sbcl/devel sbcl.spec,1.4,1.5
Message-ID: <200509121916.j8CJGrvY005370@cvs-int.fedora.redhat.com>

Author: rdieter

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

Modified Files:
	sbcl.spec 
Log Message:
* Mon Sep 13 2005 Rex Dieter  0.9.4-8
- use/define LIB_DIR instead of hard-coded INSTALL_ROOT/lib



Index: sbcl.spec
===================================================================
RCS file: /cvs/extras/rpms/sbcl/devel/sbcl.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sbcl.spec	12 Sep 2005 18:27:43 -0000	1.4
+++ sbcl.spec	12 Sep 2005 19:16:51 -0000	1.5
@@ -21,7 +21,7 @@
 Name: 	 sbcl
 Summary: Steel Bank Common Lisp
 Version: 0.9.4
-Release: 7%{?dist}
+Release: 8%{?dist}
 
 License: BSD/MIT
 Group: 	 Development/Languages
@@ -53,6 +53,7 @@
 # See http://sourceforge.net/mailarchive/message.php?msg_id=12787069
 Patch2: sbcl-0.9.4-ADDR_NO_RANDOMIZE.patch
 Patch3: sbcl-0.9.4-optflags.patch
+Patch4: sbcl-0.9.4-LIB_DIR.patch
 
 %{?sbcl_bootstrap:BuildRequires: %{?sbcl_bootstrap}}
 
@@ -76,6 +77,7 @@
 %patch1 -p0 -b .default-sbcl-home
 %patch2 -p1 -b .ADDR_NO_RANDOMIZE
 %patch3 -p1 -b .optflags
+%patch4 -p1 -b .LIB_DIR
 
 # http://article.gmane.org/gmane.lisp.steel-bank.general/340
 # enable threads (was only for >= 2.6, but code has checks to disable for <= 2.4)
@@ -99,6 +101,8 @@
 # CVS crud 
 find . -name CVS -type d | xargs rm -rf
 find . -name '.cvsignore' | xargs rm -f
+# fix permissions (some have eXecute bit set)
+find . -name '*.c' | xargs chmod 644
 
 
 %build
@@ -116,19 +120,20 @@
 
 
 %check || :
-%if "%{?_with_check:1}" == "1"
+#if "%{?_with_check:1}" == "1"
 pushd tests 
 %{?setarch} sh ./run-tests.sh 
 popd
-%endif
+#endif
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
 mkdir -p $RPM_BUILD_ROOT{%{_bindir},%{_libdir},%{_mandir}}
-export INSTALL_ROOT=$RPM_BUILD_ROOT%{_prefix}
 unset SBCL_HOME ||:
+export INSTALL_ROOT=$RPM_BUILD_ROOT%{_prefix}
+export LIB_DIR=$RPM_BUILD_ROOT%{_libdir}
 %{?setarch} sh ./install.sh
 
 # app-wrapper for using setarch
@@ -143,13 +148,8 @@
 ## Unpackaged files
 rm -rf $RPM_BUILD_ROOT%{_docdir}/sbcl
 rm -f  $RPM_BUILD_ROOT%{_infodir}/dir
-# CVS crud 
-#find $RPM_BUILD_ROOT -name CVS -type d | xargs rm -rf
-#find $RPM_BUILD_ROOT -name '.cvsignore' | xargs rm -f
 # from make check
 find $RPM_BUILD_ROOT -name 'test-passed' | xargs rm -f
-# 
-find $RPM_BUILD_ROOT -name '*.c' | xargs chmod 644 
 
 
 %post
@@ -181,6 +181,9 @@
 
 
 %changelog
+* Mon Sep 13 2005 Rex Dieter  0.9.4-8
+- use/define LIB_DIR instead of hard-coded INSTALL_ROOT/lib
+
 * Mon Sep 12 2005 Rex Dieter  0.9.4-7
 - %{x86_64} -> x86_64
 



From fedora-extras-commits at redhat.com  Mon Sep 12 19:18:20 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon, 12 Sep 2005 15:18:20 -0400
Subject: rpms/sbcl/devel sbcl-0.9.4-LIB_DIR.patch, NONE, 1.1 sbcl.spec, 1.5,
	1.6
Message-ID: <200509121918.j8CJIK9k005447@cvs-int.fedora.redhat.com>

Author: rdieter

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

Modified Files:
	sbcl.spec 
Added Files:
	sbcl-0.9.4-LIB_DIR.patch 
Log Message:
forgot LIB_DIR patch


sbcl-0.9.4-LIB_DIR.patch:

--- NEW FILE sbcl-0.9.4-LIB_DIR.patch ---
--- sbcl-0.9.4/install.sh.lib64	2005-05-28 04:00:34.000000000 -0500
+++ sbcl-0.9.4/install.sh	2005-09-12 14:00:27.310267719 -0500
@@ -13,10 +13,11 @@
 MAN_DIR=${MAN_DIR-$INSTALL_ROOT/share/man}
 INFO_DIR=${INFO_DIR-$INSTALL_ROOT/share/info}
 DOC_DIR=${DOC_DIR-$INSTALL_ROOT/share/doc/sbcl}
+LIB_DIR=${LIB_DIR-$INSTALL_ROOT/lib}}
 
 # Does the environment look sane?
 SBCL_SOURCE=`pwd`
-if [ -n "$SBCL_HOME" -a "$INSTALL_ROOT/lib/sbcl" != "$SBCL_HOME" ];then
+if [ -n "$SBCL_HOME" -a "$LIB_DIR/sbcl" != "$SBCL_HOME" ];then
    echo SBCL_HOME environment variable is set, and conflicts with INSTALL_ROOT.
    echo Aborting installation.  Unset one or reset the other, then try again
    echo INSTALL_ROOT="$INSTALL_ROOT"
@@ -37,10 +38,10 @@
     exit 1
 fi
 
-SBCL_HOME=$INSTALL_ROOT/lib/sbcl
+SBCL_HOME=$LIB_DIR/sbcl
 export SBCL_HOME INSTALL_ROOT
 ensure_dirs $BUILD_ROOT$INSTALL_ROOT $BUILD_ROOT$INSTALL_ROOT/bin \
-    $BUILD_ROOT$INSTALL_ROOT/lib  \
+    $BUILD_ROOT$LIB_DIR  \
     $BUILD_ROOT$MAN_DIR $BUILD_ROOT$MAN_DIR/man1 \
     $BUILD_ROOT$INFO_DIR $BUILD_ROOT$DOC_DIR \
     $BUILD_ROOT$DOC_DIR/html \
@@ -76,7 +77,7 @@
 echo
 echo "SBCL has been installed:"
 echo " binary $BUILD_ROOT$INSTALL_ROOT/bin/sbcl"
-echo " core and contribs in $BUILD_ROOT$INSTALL_ROOT/lib/sbcl/"
+echo " core and contribs in $BUILD_ROOT$LIB_DIR"
 
 # Installing manual & misc bits of documentation
 #


Index: sbcl.spec
===================================================================
RCS file: /cvs/extras/rpms/sbcl/devel/sbcl.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sbcl.spec	12 Sep 2005 19:16:51 -0000	1.5
+++ sbcl.spec	12 Sep 2005 19:18:18 -0000	1.6
@@ -21,7 +21,7 @@
 Name: 	 sbcl
 Summary: Steel Bank Common Lisp
 Version: 0.9.4
-Release: 8%{?dist}
+Release: 9%{?dist}
 
 License: BSD/MIT
 Group: 	 Development/Languages
@@ -181,7 +181,7 @@
 
 
 %changelog
-* Mon Sep 13 2005 Rex Dieter  0.9.4-8
+* Mon Sep 13 2005 Rex Dieter  0.9.4-9
 - use/define LIB_DIR instead of hard-coded INSTALL_ROOT/lib
 
 * Mon Sep 12 2005 Rex Dieter  0.9.4-7



From fedora-extras-commits at redhat.com  Mon Sep 12 19:58:58 2005
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Mon, 12 Sep 2005 15:58:58 -0400
Subject: rpms/libnet/devel .cvsignore, 1.3, 1.4 Makefile, 1.3, 1.4 sources,
	1.3, 1.4
Message-ID: <200509121958.j8CJww4P005647@cvs-int.fedora.redhat.com>

Author: pertusus

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

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup devel branch for libnet



Index: .cvsignore
===================================================================
RCS file: .cvsignore
diff -N .cvsignore


Index: Makefile
===================================================================
RCS file: Makefile
diff -N Makefile
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ Makefile	12 Sep 2005 19:58:55 -0000	1.4
@@ -0,0 +1,21 @@
+# Makefile for source rpm: cppunit
+# $Id$
+NAME := libnet
+SPECFILE = $(firstword $(wildcard *.spec))
+
+define find-makefile-common
+for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
+endef
+
+MAKEFILE_COMMON := $(shell $(find-makefile-common))
+
+ifeq ($(MAKEFILE_COMMON),)
+# attept a checkout
+define checkout-makefile-common
+test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
+endef
+
+MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
+endif
+
+include $(MAKEFILE_COMMON)


Index: sources
===================================================================
RCS file: sources
diff -N sources



From fedora-extras-commits at redhat.com  Mon Sep 12 20:00:00 2005
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Mon, 12 Sep 2005 16:00:00 -0400
Subject: rpms/libnet import.log,1.3,1.4
Message-ID: <200509122000.j8CK00Gu005722@cvs-int.fedora.redhat.com>

Author: pertusus

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

Modified Files:
	import.log 
Log Message:
auto-import libnet-1.1.2.1-5 on branch devel from libnet-1.1.2.1-5.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/libnet/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	8 Nov 2004 04:45:40 -0000	1.3
+++ import.log	12 Sep 2005 19:59:58 -0000	1.4
@@ -1,2 +1,3 @@
 libnet-1_0_2a-0_fdr_1_rh80:HEAD:libnet-1.0.2a-0.fdr.1.rh80.src.rpm:1099889134
 libnet-1_0_2a_rh90-0_fdr_1:HEAD:libnet-1.0.2a.rh90-0.fdr.1.src.rpm:1099889140
+libnet-1_1_2_1-5:HEAD:libnet-1.1.2.1-5.src.rpm:1126554961



From fedora-extras-commits at redhat.com  Mon Sep 12 20:00:00 2005
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Mon, 12 Sep 2005 16:00:00 -0400
Subject: rpms/libnet/devel libnet.spec, 1.3, 1.4 .cvsignore, 1.4, 1.5 sources,
	1.4, 1.5
Message-ID: <200509122000.j8CK0096005729@cvs-int.fedora.redhat.com>

Author: pertusus

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

Modified Files:
	.cvsignore sources 
Added Files:
	libnet.spec 
Log Message:
auto-import libnet-1.1.2.1-5 on branch devel from libnet-1.1.2.1-5.src.rpm


Index: libnet.spec
===================================================================
RCS file: libnet.spec
diff -N libnet.spec
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ libnet.spec	12 Sep 2005 19:59:58 -0000	1.4
@@ -0,0 +1,96 @@
+Summary:        C library for portable packet creation and injection
+Name:           libnet
+Version:        1.1.2.1
+Release:        5
+License:        BSD
+Group:          System Environment/Libraries
+URL:            http://www.packetfactory.net/libnet/
+Source0:        http://www.packetfactory.net/libnet/dist/libnet-%{version}.tar.gz
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+%description
+Libnet is an API to help with the construction and handling of network packets.
+It provides a portable framework for low-level network packet writing and
+handling (use libnet in conjunction with libpcap and you can write some really
+cool stuff).  Libnet includes packet creation at the IP layer and at the link
+layer as well as a host of supplementary and complementary functionality.
+Libnet is very handy with which to write network tools and network test code.
+See the manpage and sample test code for more detailed information.
+
+%package devel
+Summary:        Development files for libnet
+Group:          Development/Libraries
+Provides:       %{name} = %{version}-%{release}
+
+%description devel
+Libnet is an API to help with the construction and handling of network packets.
+It provides a portable framework for low-level network packet writing and
+handling (use libnet in conjunction with libpcap and you can write some really
+cool stuff).  Libnet includes packet creation at the IP layer and at the link
+layer as well as a host of supplementary and complementary functionality.
+Libnet is very handy with which to write network tools and network test code.
+See the manpage and sample test code for more detailed information.
+
+
+%prep
+%setup -q -n libnet
+sed -i -e 's/\r$//' doc/CHANGELOG doc/CONTRIB
+find . -depth -type d -name CVS -exec rm -rf {} ';'
+rm -rf sample/win32
+rm -f sample/.\#* sample/.*.swp
+
+%build
+%configure
+make %{?_smp_mflags}
+
+%install
+rm -rf %{buildroot}
+make DESTDIR=%{buildroot} install
+
+install -D --mode=0755 libnet-config %{buildroot}%{_bindir}/libnet-config
+
+install -d --mode=0755 %{buildroot}%{_mandir}/man3
+install -D --mode=0644 doc/man/man3/libnet*.3 %{buildroot}%{_mandir}/man3/
+
+make -C sample clean
+
+%clean
+rm -rf %{buildroot}
+
+%files devel
+%defattr(-,root,root,-)
+%doc README VERSION
+%doc doc/BUGS doc/CHANGELOG doc/CONTRIB doc/COPYING doc/DESIGN_NOTES
+%doc doc/MIGRATION doc/PACKET_BUILDING doc/PORTED doc/RAWSOCKET_NON_SEQUITUR
+%doc doc/TODO doc/html/ sample/
+
+%{_bindir}/libnet-config
+%{_includedir}/libnet/
+%{_includedir}/libnet.h
+%{_libdir}/libnet.a
+%{_mandir}/man3/libnet*
+
+%changelog
+* Tue Aug 30 2005 Paul Howarth  1.1.2.1-5
+- spec file cleanup
+
+* Fri Aug 26 2005 Patrice Dumas  1.1.2.1-4
+- use pushd and popd (from Oliver Falk) 
+
+* Mon Aug 22 2005 Patrice Dumas  1.1.2.1-3
+- Correct dos end of lines
+- add in devel: Provides: %{name} = %{version}-%{release} 
+
+* Fri Aug 12 2005 Patrice Dumas  1.1.2.1-2
+- put everything in a devel subpackage
+- add smpflags
+- clean in sample
+
+* Fri Aug 12 2005 Patrice Dumas  1.1.2.1-1
+- rebuild changing only name
+
+* Wed Jun 02 2004 Marcin Garski  1.1.2.1-2.fc2
+- Rebuild for Fedora Core 2
+
+* Sat May 08 2004 Marcin Garski  1.1.2.1-1
+- Initial specfile


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libnet/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	12 Sep 2005 19:58:55 -0000	1.4
+++ .cvsignore	12 Sep 2005 19:59:58 -0000	1.5
@@ -0,0 +1 @@
+libnet-1.1.2.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libnet/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	12 Sep 2005 19:58:55 -0000	1.4
+++ sources	12 Sep 2005 19:59:58 -0000	1.5
@@ -0,0 +1 @@
+be845c41170d72c7db524f3411b50256  libnet-1.1.2.1.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 12 20:07:15 2005
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Mon, 12 Sep 2005 16:07:15 -0400
Subject: rpms/libnet/devel libnet.spec,1.4,1.5
Message-ID: <200509122007.j8CK7m32007146@cvs-int.fedora.redhat.com>

Author: pertusus

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

Modified Files:
	libnet.spec 
Log Message:
Add dist tag and bump release (made the mistake of make tag before commit)



Index: libnet.spec
===================================================================
RCS file: /cvs/extras/rpms/libnet/devel/libnet.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- libnet.spec	12 Sep 2005 19:59:58 -0000	1.4
+++ libnet.spec	12 Sep 2005 20:07:13 -0000	1.5
@@ -1,7 +1,7 @@
 Summary:        C library for portable packet creation and injection
 Name:           libnet
 Version:        1.1.2.1
-Release:        5
+Release:        6%{?dist}
 License:        BSD
 Group:          System Environment/Libraries
 URL:            http://www.packetfactory.net/libnet/
@@ -71,6 +71,9 @@
 %{_mandir}/man3/libnet*
 
 %changelog
+* Mon Sep 12 2005 Patrice Dumas  1.1.2.1-6
+- bump release and add dist tag
+
 * Tue Aug 30 2005 Paul Howarth  1.1.2.1-5
 - spec file cleanup
 



From fedora-extras-commits at redhat.com  Mon Sep 12 20:17:00 2005
From: fedora-extras-commits at redhat.com (Elliot Lee (sopwith))
Date: Mon, 12 Sep 2005 16:17:00 -0400
Subject: CVSROOT avail,1.11,1.12
Message-ID: <200509122017.j8CKH0pd007263@cvs-int.fedora.redhat.com>

Author: sopwith

Update of /cvs/fedora/CVSROOT
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7244

Modified Files:
	avail 
Log Message:
Add cfeist


Index: avail
===================================================================
RCS file: /cvs/fedora/CVSROOT/avail,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- avail	17 Aug 2005 13:57:35 -0000	1.11
+++ avail	12 Sep 2005 20:16:57 -0000	1.12
@@ -42,6 +42,7 @@
 avail | riel | web/html/projects/virtualisation
 avail | ezannoni | web/html/projects/systemtap
 avail | harald | web/html/docs/udev
+avail | cfeist | web/html/projects/cluster
 
 unavail | | fedora-security
 avail | mjc,bressers,jorton,notting,sopwith,katzj | fedora-security



From fedora-extras-commits at redhat.com  Mon Sep 12 20:17:10 2005
From: fedora-extras-commits at redhat.com (Elliot Lee (sopwith))
Date: Mon, 12 Sep 2005 16:17:10 -0400
Subject: web/html/projects/cluster - New directory
Message-ID: <200509122017.j8CKHAqR007283@cvs-int.fedora.redhat.com>

Author: sopwith

Update of /cvs/fedora/web/html/projects/cluster
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7269/cluster

Log Message:
Directory /cvs/fedora/web/html/projects/cluster added to the repository




From fedora-extras-commits at redhat.com  Mon Sep 12 20:27:51 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Mon, 12 Sep 2005 16:27:51 -0400
Subject: rpms/gputils/devel man-fr.diff, NONE, 1.1 .cvsignore, 1.2,
	1.3 gputils.spec, 1.5, 1.6 sources, 1.2, 1.3
Message-ID: <200509122027.j8CKRpoM007603@cvs-int.fedora.redhat.com>

Author: jpo

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

Modified Files:
	.cvsignore gputils.spec sources 
Added Files:
	man-fr.diff 
Log Message:
Update by proxy (Alain Portal)

man-fr.diff:

--- NEW FILE man-fr.diff ---
Index: gputils/man/fr/gpasm.1
===================================================================
RCS file: /cvsroot/gputils/gputils/man/fr/gpasm.1,v
retrieving revision 1.5
diff -u -r1.5 gpasm.1
--- gputils/man/fr/gpasm.1	15 Jun 2005 01:12:32 -0000	1.5
+++ gputils/man/fr/gpasm.1	12 Sep 2005 07:36:03 -0000
@@ -117,7 +117,7 @@
 .PP
 Ce document est une traduction r??alis??e par Alain Portal
  le 14 octobre 2004 et r??vis??e
-le 24 mai 2005.
+le 9 juin 2005.
 .PP
 L'??quipe de traduction a fait le maximum pour r??aliser une adaptation
 fran??aise de qualit??. La version anglaise la plus ?? jour de ce document est
Index: gputils/man/fr/gpdasm.1
===================================================================
RCS file: /cvsroot/gputils/gputils/man/fr/gpdasm.1,v
retrieving revision 1.5
diff -u -r1.5 gpdasm.1
--- gputils/man/fr/gpdasm.1	15 Jun 2005 01:12:32 -0000	1.5
+++ gputils/man/fr/gpdasm.1	12 Sep 2005 07:36:03 -0000
@@ -60,7 +60,7 @@
 .PP
 Ce document est une traduction r??alis??e par Alain Portal
  le 14 octobre 2004 et r??vis??e
-le 24 mai 2005.
+le 9 juin 2005.
 .PP
 L'??quipe de traduction a fait le maximum pour r??aliser une adaptation
 fran??aise de qualit??. La version anglaise la plus ?? jour de ce document est
Index: gputils/man/fr/gplib.1
===================================================================
RCS file: /cvsroot/gputils/gputils/man/fr/gplib.1,v
retrieving revision 1.5
diff -u -r1.5 gplib.1
--- gputils/man/fr/gplib.1	15 Jun 2005 01:12:32 -0000	1.5
+++ gputils/man/fr/gplib.1	12 Sep 2005 07:36:03 -0000
@@ -62,7 +62,7 @@
 .PP
 Ce document est une traduction r??alis??e par Alain Portal
  le 14 octobre 2004 et r??vis??e
-le 24 mai 2005.
+le 9 juin 2005.
 .PP
 L'??quipe de traduction a fait le maximum pour r??aliser une adaptation
 fran??aise de qualit??. La version anglaise la plus ?? jour de ce document est
Index: gputils/man/fr/gplink.1
===================================================================
RCS file: /cvsroot/gputils/gputils/man/fr/gplink.1,v
retrieving revision 1.5
diff -u -r1.5 gplink.1
--- gputils/man/fr/gplink.1	15 Jun 2005 01:12:32 -0000	1.5
+++ gputils/man/fr/gplink.1	12 Sep 2005 07:36:03 -0000
@@ -75,7 +75,7 @@
 .PP
 Ce document est une traduction r??alis??e par Alain Portal
  le 14 octobre 2004 et r??vis??e
-le 24 mai 2005.
+le 9 juin 2005.
 .PP
 L'??quipe de traduction a fait le maximum pour r??aliser une adaptation
 fran??aise de qualit??. La version anglaise la plus ?? jour de ce document est
Index: gputils/man/fr/gpstrip.1
===================================================================
RCS file: /cvsroot/gputils/gputils/man/fr/gpstrip.1,v
retrieving revision 1.2
diff -u -r1.2 gpstrip.1
--- gputils/man/fr/gpstrip.1	15 Jun 2005 01:12:32 -0000	1.2
+++ gputils/man/fr/gpstrip.1	12 Sep 2005 07:36:03 -0000
@@ -63,7 +63,9 @@
 .SH TRADUCTION
 .PP
 Ce document est une traduction r??alis??e par Alain Portal
- le 24 mai 2005.
+ le 24 mai 2005 et r??vis??e
+le 9 juin 2005.
+
 .PP
 L'??quipe de traduction a fait le maximum pour r??aliser une adaptation
 fran??aise de qualit??. La version anglaise la plus ?? jour de ce document est
Index: gputils/man/fr/gputils.1
===================================================================
RCS file: /cvsroot/gputils/gputils/man/fr/gputils.1,v
retrieving revision 1.4
diff -u -r1.4 gputils.1
--- gputils/man/fr/gputils.1	27 May 2005 03:14:36 -0000	1.4
+++ gputils/man/fr/gputils.1	12 Sep 2005 07:36:03 -0000
@@ -19,7 +19,7 @@
 .PP
 Ce document est une traduction r??alis??e par Alain Portal
  le 14 octobre 2004 et r??vis??e
-le 24 mai 2005.
+le 9 juin 2005.
 .PP
 L'??quipe de traduction a fait le maximum pour r??aliser une adaptation
 fran??aise de qualit??. La version anglaise la plus ?? jour de ce document est
Index: gputils/man/fr/gpvc.1
===================================================================
RCS file: /cvsroot/gputils/gputils/man/fr/gpvc.1,v
retrieving revision 1.5
diff -u -r1.5 gpvc.1
--- gputils/man/fr/gpvc.1	15 Jun 2005 01:12:32 -0000	1.5
+++ gputils/man/fr/gpvc.1	12 Sep 2005 07:36:03 -0000
@@ -56,7 +56,7 @@
 .PP
 Ce document est une traduction r??alis??e par Alain Portal
  le 14 octobre 2004 et r??vis??e
-le 24 mai 2005.
+le 9 juin 2005.
 .PP
 L'??quipe de traduction a fait le maximum pour r??aliser une adaptation
 fran??aise de qualit??. La version anglaise la plus ?? jour de ce document est
Index: gputils/man/fr/gpvo.1
===================================================================
RCS file: /cvsroot/gputils/gputils/man/fr/gpvo.1,v
retrieving revision 1.5
diff -u -r1.5 gpvo.1
--- gputils/man/fr/gpvo.1	15 Jun 2005 01:12:32 -0000	1.5
+++ gputils/man/fr/gpvo.1	12 Sep 2005 07:36:03 -0000
@@ -63,7 +63,7 @@
 .PP
 Ce document est une traduction r??alis??e par Alain Portal
  le 14 octobre 2004 et r??vis??e
-le 24 mai 2005.
+le 9 juin 2005.
 .PP
 L'??quipe de traduction a fait le maximum pour r??aliser une adaptation
 fran??aise de qualit??. La version anglaise la plus ?? jour de ce document est


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gputils/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 04:30:22 -0000	1.2
+++ .cvsignore	12 Sep 2005 20:27:49 -0000	1.3
@@ -1 +1 @@
-gputils-0.12.4.tar.gz
+gputils-0.13.3.tar.gz


Index: gputils.spec
===================================================================
RCS file: /cvs/extras/rpms/gputils/devel/gputils.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gputils.spec	6 Apr 2005 22:11:39 -0000	1.5
+++ gputils.spec	12 Sep 2005 20:27:49 -0000	1.6
@@ -1,13 +1,13 @@
 Name:		gputils
-Version:	0.12.4
-Release:	3
-
+Version:	0.13.3
+Release:	1%{?dist}
 Summary:	Development utilities for Microchip (TM) PIC (TM) microcontrollers
 
 Group:		Development/Languages
 License:	GPL
 URL:		http://gputils.sourceforge.net
-Source:		http://prdownloads.sourceforge.net/gputils/gputils-0.12.4.tar.gz
+Source:		http://prdownloads.sourceforge.net/gputils/gputils-%{version}.tar.gz
+Patch:		man-fr.diff
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -20,30 +20,42 @@
 an up-to-date list of what gputils can do.
 
 %prep
-%setup
+%setup -q
+%patch -p1
 
 %build
 %configure
 make %{?_smp_mflags}
 
 %install
-make DESTDIR=$RPM_BUILD_ROOT install
+rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT
 
 %clean
 rm -rf $RPM_BUILD_ROOT
-rm -rf $RPM_BUILD_DIR/%{name}
 
 %files
-%defattr(-, root, root)
+%defattr(-,root,root,-)
+%doc AUTHORS ChangeLog COPYING README TODO
+%doc doc/%{name}.pdf doc/%{name}.ps
 %{_bindir}/*
-%{_mandir}/man1/*
 %{_datadir}/%{name}/
-%doc AUTHORS ChangeLog COPYING NEWS README TODO
-%doc doc/%{name}.pdf doc/%{name}.ps
+%{_mandir}/man1/*
+%{_mandir}/fr/man1/*
 
 %changelog
-* Fri Apr  7 2005 Michael Schwendt 
-- rebuilt
+* Mon Sep 12 2005 Alain Portal  0.13.3-1
+  - New version
+  - Patch to update french man pages
+
+* Mon May 23 2005 Alain Portal  0.13.2-1
+  - New version
+
+* Thu Jan 6 2005 Alain Portal  0:0.13.0-0.fdr.2
+  - Patch to update french man pages
+
+* Tue Jan 4 2005 Alain Portal  0:0.13.0-0.fdr.1
+  - New version
 
 * Thu Oct 7 2004 Alain Portal  0:0.12.4-0.fdr.2
   - Use Licence instead of copyright


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gputils/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 04:30:22 -0000	1.2
+++ sources	12 Sep 2005 20:27:49 -0000	1.3
@@ -1 +1 @@
-3ed60ae402009cec21c6dc8132302172  gputils-0.12.4.tar.gz
+9703abd149565d6f5e926dda15eef8c2  gputils-0.13.3.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 12 20:29:00 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon, 12 Sep 2005 16:29:00 -0400
Subject: rpms/gc/FC-4 gc.spec,1.10,1.11
Message-ID: <200509122029.j8CKT0jb007673@cvs-int.fedora.redhat.com>

Author: rdieter

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

Modified Files:
	gc.spec 
Log Message:
* Mon Sep 12 2005 Rex Dieter  6.6-2
- drop opendl patch (doesn't appear to be needed anymore)



Index: gc.spec
===================================================================
RCS file: /cvs/extras/rpms/gc/FC-4/gc.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- gc.spec	12 Sep 2005 18:45:12 -0000	1.10
+++ gc.spec	12 Sep 2005 20:28:58 -0000	1.11
@@ -4,7 +4,7 @@
 Name:    gc	
 Version: 6.6
 
-Release: 1%{?dist}
+Release: 2%{?dist}
 Group:   System Environment/Libraries
 License: BSD
 Url:     http://www.hpl.hp.com/personal/Hans_Boehm/gc/	
@@ -29,7 +29,7 @@
 %prep
 %setup -n %{name}%{version}
 
-%patch1 -p1 -b .opendl
+#patch1 -p1 -b .opendl
 
 
 %build
@@ -83,7 +83,10 @@
 
 
 %changelog
-* Fri Sep 09 2005 Rex Dieter  6.6-1
+* Mon Sep 12 2005 Rex Dieter  6.6-2
+- drop opendl patch (doesn't appear to be needed anymore)
+
+* Fri Sep 09 2005 Rex Dieter  6.6-1
 - 6.6
 
 * Wed May 25 2005 Rex Dieter  6.5-1



From fedora-extras-commits at redhat.com  Mon Sep 12 20:36:20 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon, 12 Sep 2005 16:36:20 -0400
Subject: rpms/sbcl/devel sbcl.spec,1.6,1.7
Message-ID: <200509122036.j8CKaKl1007769@cvs-int.fedora.redhat.com>

Author: rdieter

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

Modified Files:
	sbcl.spec 
Log Message:
ExclusiveArch: %{ix86} (for now)



Index: sbcl.spec
===================================================================
RCS file: /cvs/extras/rpms/sbcl/devel/sbcl.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sbcl.spec	12 Sep 2005 19:18:18 -0000	1.6
+++ sbcl.spec	12 Sep 2005 20:36:18 -0000	1.7
@@ -21,14 +21,14 @@
 Name: 	 sbcl
 Summary: Steel Bank Common Lisp
 Version: 0.9.4
-Release: 9%{?dist}
+Release: 10%{?dist}
 
 License: BSD/MIT
 Group: 	 Development/Languages
 URL:	 http://sbcl.sourceforge.net/
 Source0:  http://dl.sourceforge.net/sourceforge/sbcl/sbcl-%{version}-source.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-#ExclusiveArch: %{ix86} x86_64
+ExclusiveArch: %{ix86}
 
 Source1: sbcl.sh
 
@@ -181,8 +181,9 @@
 
 
 %changelog
-* Mon Sep 13 2005 Rex Dieter  0.9.4-9
+* Mon Sep 13 2005 Rex Dieter  0.9.4-10
 - use/define LIB_DIR instead of hard-coded INSTALL_ROOT/lib
+- ExclusiveArch: %{ix86} (for now)
 
 * Mon Sep 12 2005 Rex Dieter  0.9.4-7
 - %{x86_64} -> x86_64



From fedora-extras-commits at redhat.com  Mon Sep 12 20:41:23 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Mon, 12 Sep 2005 16:41:23 -0400
Subject: rpms/gputils/FC-3 man-fr.diff, NONE, 1.1 .cvsignore, 1.2,
	1.3 gputils.spec, 1.3, 1.4 sources, 1.2, 1.3
Message-ID: <200509122041.j8CKfNl2007870@cvs-int.fedora.redhat.com>

Author: jpo

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

Modified Files:
	.cvsignore gputils.spec sources 
Added Files:
	man-fr.diff 
Log Message:
Sync with devel

man-fr.diff:

--- NEW FILE man-fr.diff ---
Index: gputils/man/fr/gpasm.1
===================================================================
RCS file: /cvsroot/gputils/gputils/man/fr/gpasm.1,v
retrieving revision 1.5
diff -u -r1.5 gpasm.1
--- gputils/man/fr/gpasm.1	15 Jun 2005 01:12:32 -0000	1.5
+++ gputils/man/fr/gpasm.1	12 Sep 2005 07:36:03 -0000
@@ -117,7 +117,7 @@
 .PP
 Ce document est une traduction r??alis??e par Alain Portal
  le 14 octobre 2004 et r??vis??e
-le 24 mai 2005.
+le 9 juin 2005.
 .PP
 L'??quipe de traduction a fait le maximum pour r??aliser une adaptation
 fran??aise de qualit??. La version anglaise la plus ?? jour de ce document est
Index: gputils/man/fr/gpdasm.1
===================================================================
RCS file: /cvsroot/gputils/gputils/man/fr/gpdasm.1,v
retrieving revision 1.5
diff -u -r1.5 gpdasm.1
--- gputils/man/fr/gpdasm.1	15 Jun 2005 01:12:32 -0000	1.5
+++ gputils/man/fr/gpdasm.1	12 Sep 2005 07:36:03 -0000
@@ -60,7 +60,7 @@
 .PP
 Ce document est une traduction r??alis??e par Alain Portal
  le 14 octobre 2004 et r??vis??e
-le 24 mai 2005.
+le 9 juin 2005.
 .PP
 L'??quipe de traduction a fait le maximum pour r??aliser une adaptation
 fran??aise de qualit??. La version anglaise la plus ?? jour de ce document est
Index: gputils/man/fr/gplib.1
===================================================================
RCS file: /cvsroot/gputils/gputils/man/fr/gplib.1,v
retrieving revision 1.5
diff -u -r1.5 gplib.1
--- gputils/man/fr/gplib.1	15 Jun 2005 01:12:32 -0000	1.5
+++ gputils/man/fr/gplib.1	12 Sep 2005 07:36:03 -0000
@@ -62,7 +62,7 @@
 .PP
 Ce document est une traduction r??alis??e par Alain Portal
  le 14 octobre 2004 et r??vis??e
-le 24 mai 2005.
+le 9 juin 2005.
 .PP
 L'??quipe de traduction a fait le maximum pour r??aliser une adaptation
 fran??aise de qualit??. La version anglaise la plus ?? jour de ce document est
Index: gputils/man/fr/gplink.1
===================================================================
RCS file: /cvsroot/gputils/gputils/man/fr/gplink.1,v
retrieving revision 1.5
diff -u -r1.5 gplink.1
--- gputils/man/fr/gplink.1	15 Jun 2005 01:12:32 -0000	1.5
+++ gputils/man/fr/gplink.1	12 Sep 2005 07:36:03 -0000
@@ -75,7 +75,7 @@
 .PP
 Ce document est une traduction r??alis??e par Alain Portal
  le 14 octobre 2004 et r??vis??e
-le 24 mai 2005.
+le 9 juin 2005.
 .PP
 L'??quipe de traduction a fait le maximum pour r??aliser une adaptation
 fran??aise de qualit??. La version anglaise la plus ?? jour de ce document est
Index: gputils/man/fr/gpstrip.1
===================================================================
RCS file: /cvsroot/gputils/gputils/man/fr/gpstrip.1,v
retrieving revision 1.2
diff -u -r1.2 gpstrip.1
--- gputils/man/fr/gpstrip.1	15 Jun 2005 01:12:32 -0000	1.2
+++ gputils/man/fr/gpstrip.1	12 Sep 2005 07:36:03 -0000
@@ -63,7 +63,9 @@
 .SH TRADUCTION
 .PP
 Ce document est une traduction r??alis??e par Alain Portal
- le 24 mai 2005.
+ le 24 mai 2005 et r??vis??e
+le 9 juin 2005.
+
 .PP
 L'??quipe de traduction a fait le maximum pour r??aliser une adaptation
 fran??aise de qualit??. La version anglaise la plus ?? jour de ce document est
Index: gputils/man/fr/gputils.1
===================================================================
RCS file: /cvsroot/gputils/gputils/man/fr/gputils.1,v
retrieving revision 1.4
diff -u -r1.4 gputils.1
--- gputils/man/fr/gputils.1	27 May 2005 03:14:36 -0000	1.4
+++ gputils/man/fr/gputils.1	12 Sep 2005 07:36:03 -0000
@@ -19,7 +19,7 @@
 .PP
 Ce document est une traduction r??alis??e par Alain Portal
  le 14 octobre 2004 et r??vis??e
-le 24 mai 2005.
+le 9 juin 2005.
 .PP
 L'??quipe de traduction a fait le maximum pour r??aliser une adaptation
 fran??aise de qualit??. La version anglaise la plus ?? jour de ce document est
Index: gputils/man/fr/gpvc.1
===================================================================
RCS file: /cvsroot/gputils/gputils/man/fr/gpvc.1,v
retrieving revision 1.5
diff -u -r1.5 gpvc.1
--- gputils/man/fr/gpvc.1	15 Jun 2005 01:12:32 -0000	1.5
+++ gputils/man/fr/gpvc.1	12 Sep 2005 07:36:03 -0000
@@ -56,7 +56,7 @@
 .PP
 Ce document est une traduction r??alis??e par Alain Portal
  le 14 octobre 2004 et r??vis??e
-le 24 mai 2005.
+le 9 juin 2005.
 .PP
 L'??quipe de traduction a fait le maximum pour r??aliser une adaptation
 fran??aise de qualit??. La version anglaise la plus ?? jour de ce document est
Index: gputils/man/fr/gpvo.1
===================================================================
RCS file: /cvsroot/gputils/gputils/man/fr/gpvo.1,v
retrieving revision 1.5
diff -u -r1.5 gpvo.1
--- gputils/man/fr/gpvo.1	15 Jun 2005 01:12:32 -0000	1.5
+++ gputils/man/fr/gpvo.1	12 Sep 2005 07:36:03 -0000
@@ -63,7 +63,7 @@
 .PP
 Ce document est une traduction r??alis??e par Alain Portal
  le 14 octobre 2004 et r??vis??e
-le 24 mai 2005.
+le 9 juin 2005.
 .PP
 L'??quipe de traduction a fait le maximum pour r??aliser une adaptation
 fran??aise de qualit??. La version anglaise la plus ?? jour de ce document est


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gputils/FC-3/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 04:30:22 -0000	1.2
+++ .cvsignore	12 Sep 2005 20:41:21 -0000	1.3
@@ -1 +1 @@
-gputils-0.12.4.tar.gz
+gputils-0.13.3.tar.gz


Index: gputils.spec
===================================================================
RCS file: /cvs/extras/rpms/gputils/FC-3/gputils.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gputils.spec	10 Dec 2004 22:03:03 -0000	1.3
+++ gputils.spec	12 Sep 2005 20:41:21 -0000	1.4
@@ -1,52 +1,68 @@
 Name:		gputils
-Version:	0.12.4
-Release:	2
-Epoch:		0
+Version:	0.13.3
+Release:	1%{?dist}
 Summary:	Development utilities for Microchip (TM) PIC (TM) microcontrollers
 
 Group:		Development/Languages
 License:	GPL
 URL:		http://gputils.sourceforge.net
-Source:		http://prdownloads.sourceforge.net/gputils/gputils-0.12.4.tar.gz
-BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Source:		http://prdownloads.sourceforge.net/gputils/gputils-%{version}.tar.gz
+Patch:		man-fr.diff
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
-This is a collection of development tools for Microchip (TM) PIC (TM) 
+This is a collection of development tools for Microchip (TM) PIC (TM)
 microcontrollers.
 
 This is ALPHA software: there may be serious bugs in it, and it's
 nowhere near complete.  gputils currently only implements a subset of
-the features available with Microchip's tools.  See the documentation for 
+the features available with Microchip's tools.  See the documentation for
 an up-to-date list of what gputils can do.
 
 %prep
-%setup
+%setup -q
+%patch -p1
 
 %build
 %configure
 make %{?_smp_mflags}
 
 %install
-make DESTDIR=$RPM_BUILD_ROOT install
+rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT
 
 %clean
 rm -rf $RPM_BUILD_ROOT
-rm -rf $RPM_BUILD_DIR/%{name}
 
 %files
-%defattr(-, root, root)
+%defattr(-,root,root,-)
+%doc AUTHORS ChangeLog COPYING README TODO
+%doc doc/%{name}.pdf doc/%{name}.ps
 %{_bindir}/*
-%{_mandir}/man1/*
 %{_datadir}/%{name}/
-%doc AUTHORS ChangeLog COPYING NEWS README TODO
-%doc doc/%{name}.pdf doc/%{name}.ps
+%{_mandir}/man1/*
+%{_mandir}/fr/man1/*
 
 %changelog
+* Mon Sep 12 2005 Alain Portal  0.13.3-1
+  - New version
+  - Patch to update french man pages
+
+* Mon May 23 2005 Alain Portal  0.13.2-1
+  - New version
+
+* Thu Jan 6 2005 Alain Portal  0:0.13.0-0.fdr.2
+  - Patch to update french man pages
+
+* Tue Jan 4 2005 Alain Portal  0:0.13.0-0.fdr.1
+  - New version
+
 * Thu Oct 7 2004 Alain Portal  0:0.12.4-0.fdr.2
   - Use Licence instead of copyright
   - Use full name and release in Source URL instead of macro
   - Package should own full directory /usr/share/gputils
   - Remove usefulness generic file INSTALL
   - Remove doc source file gputils.lyx
+
 * Wed Oct 6 2004 Alain Portal  0:0.12.4-0.fdr.1
   - Initial Fedora RPM


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gputils/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 04:30:22 -0000	1.2
+++ sources	12 Sep 2005 20:41:21 -0000	1.3
@@ -1 +1 @@
-3ed60ae402009cec21c6dc8132302172  gputils-0.12.4.tar.gz
+9703abd149565d6f5e926dda15eef8c2  gputils-0.13.3.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 12 20:41:24 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Mon, 12 Sep 2005 16:41:24 -0400
Subject: rpms/gputils/FC-4 man-fr.diff, NONE, 1.1 .cvsignore, 1.2,
	1.3 gputils.spec, 1.5, 1.6 sources, 1.2, 1.3
Message-ID: <200509122041.j8CKfOK7007880@cvs-int.fedora.redhat.com>

Author: jpo

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

Modified Files:
	.cvsignore gputils.spec sources 
Added Files:
	man-fr.diff 
Log Message:
Sync with devel

man-fr.diff:

--- NEW FILE man-fr.diff ---
Index: gputils/man/fr/gpasm.1
===================================================================
RCS file: /cvsroot/gputils/gputils/man/fr/gpasm.1,v
retrieving revision 1.5
diff -u -r1.5 gpasm.1
--- gputils/man/fr/gpasm.1	15 Jun 2005 01:12:32 -0000	1.5
+++ gputils/man/fr/gpasm.1	12 Sep 2005 07:36:03 -0000
@@ -117,7 +117,7 @@
 .PP
 Ce document est une traduction r??alis??e par Alain Portal
  le 14 octobre 2004 et r??vis??e
-le 24 mai 2005.
+le 9 juin 2005.
 .PP
 L'??quipe de traduction a fait le maximum pour r??aliser une adaptation
 fran??aise de qualit??. La version anglaise la plus ?? jour de ce document est
Index: gputils/man/fr/gpdasm.1
===================================================================
RCS file: /cvsroot/gputils/gputils/man/fr/gpdasm.1,v
retrieving revision 1.5
diff -u -r1.5 gpdasm.1
--- gputils/man/fr/gpdasm.1	15 Jun 2005 01:12:32 -0000	1.5
+++ gputils/man/fr/gpdasm.1	12 Sep 2005 07:36:03 -0000
@@ -60,7 +60,7 @@
 .PP
 Ce document est une traduction r??alis??e par Alain Portal
  le 14 octobre 2004 et r??vis??e
-le 24 mai 2005.
+le 9 juin 2005.
 .PP
 L'??quipe de traduction a fait le maximum pour r??aliser une adaptation
 fran??aise de qualit??. La version anglaise la plus ?? jour de ce document est
Index: gputils/man/fr/gplib.1
===================================================================
RCS file: /cvsroot/gputils/gputils/man/fr/gplib.1,v
retrieving revision 1.5
diff -u -r1.5 gplib.1
--- gputils/man/fr/gplib.1	15 Jun 2005 01:12:32 -0000	1.5
+++ gputils/man/fr/gplib.1	12 Sep 2005 07:36:03 -0000
@@ -62,7 +62,7 @@
 .PP
 Ce document est une traduction r??alis??e par Alain Portal
  le 14 octobre 2004 et r??vis??e
-le 24 mai 2005.
+le 9 juin 2005.
 .PP
 L'??quipe de traduction a fait le maximum pour r??aliser une adaptation
 fran??aise de qualit??. La version anglaise la plus ?? jour de ce document est
Index: gputils/man/fr/gplink.1
===================================================================
RCS file: /cvsroot/gputils/gputils/man/fr/gplink.1,v
retrieving revision 1.5
diff -u -r1.5 gplink.1
--- gputils/man/fr/gplink.1	15 Jun 2005 01:12:32 -0000	1.5
+++ gputils/man/fr/gplink.1	12 Sep 2005 07:36:03 -0000
@@ -75,7 +75,7 @@
 .PP
 Ce document est une traduction r??alis??e par Alain Portal
  le 14 octobre 2004 et r??vis??e
-le 24 mai 2005.
+le 9 juin 2005.
 .PP
 L'??quipe de traduction a fait le maximum pour r??aliser une adaptation
 fran??aise de qualit??. La version anglaise la plus ?? jour de ce document est
Index: gputils/man/fr/gpstrip.1
===================================================================
RCS file: /cvsroot/gputils/gputils/man/fr/gpstrip.1,v
retrieving revision 1.2
diff -u -r1.2 gpstrip.1
--- gputils/man/fr/gpstrip.1	15 Jun 2005 01:12:32 -0000	1.2
+++ gputils/man/fr/gpstrip.1	12 Sep 2005 07:36:03 -0000
@@ -63,7 +63,9 @@
 .SH TRADUCTION
 .PP
 Ce document est une traduction r??alis??e par Alain Portal
- le 24 mai 2005.
+ le 24 mai 2005 et r??vis??e
+le 9 juin 2005.
+
 .PP
 L'??quipe de traduction a fait le maximum pour r??aliser une adaptation
 fran??aise de qualit??. La version anglaise la plus ?? jour de ce document est
Index: gputils/man/fr/gputils.1
===================================================================
RCS file: /cvsroot/gputils/gputils/man/fr/gputils.1,v
retrieving revision 1.4
diff -u -r1.4 gputils.1
--- gputils/man/fr/gputils.1	27 May 2005 03:14:36 -0000	1.4
+++ gputils/man/fr/gputils.1	12 Sep 2005 07:36:03 -0000
@@ -19,7 +19,7 @@
 .PP
 Ce document est une traduction r??alis??e par Alain Portal
  le 14 octobre 2004 et r??vis??e
-le 24 mai 2005.
+le 9 juin 2005.
 .PP
 L'??quipe de traduction a fait le maximum pour r??aliser une adaptation
 fran??aise de qualit??. La version anglaise la plus ?? jour de ce document est
Index: gputils/man/fr/gpvc.1
===================================================================
RCS file: /cvsroot/gputils/gputils/man/fr/gpvc.1,v
retrieving revision 1.5
diff -u -r1.5 gpvc.1
--- gputils/man/fr/gpvc.1	15 Jun 2005 01:12:32 -0000	1.5
+++ gputils/man/fr/gpvc.1	12 Sep 2005 07:36:03 -0000
@@ -56,7 +56,7 @@
 .PP
 Ce document est une traduction r??alis??e par Alain Portal
  le 14 octobre 2004 et r??vis??e
-le 24 mai 2005.
+le 9 juin 2005.
 .PP
 L'??quipe de traduction a fait le maximum pour r??aliser une adaptation
 fran??aise de qualit??. La version anglaise la plus ?? jour de ce document est
Index: gputils/man/fr/gpvo.1
===================================================================
RCS file: /cvsroot/gputils/gputils/man/fr/gpvo.1,v
retrieving revision 1.5
diff -u -r1.5 gpvo.1
--- gputils/man/fr/gpvo.1	15 Jun 2005 01:12:32 -0000	1.5
+++ gputils/man/fr/gpvo.1	12 Sep 2005 07:36:03 -0000
@@ -63,7 +63,7 @@
 .PP
 Ce document est une traduction r??alis??e par Alain Portal
  le 14 octobre 2004 et r??vis??e
-le 24 mai 2005.
+le 9 juin 2005.
 .PP
 L'??quipe de traduction a fait le maximum pour r??aliser une adaptation
 fran??aise de qualit??. La version anglaise la plus ?? jour de ce document est


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gputils/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 04:30:22 -0000	1.2
+++ .cvsignore	12 Sep 2005 20:41:22 -0000	1.3
@@ -1 +1 @@
-gputils-0.12.4.tar.gz
+gputils-0.13.3.tar.gz


Index: gputils.spec
===================================================================
RCS file: /cvs/extras/rpms/gputils/FC-4/gputils.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gputils.spec	6 Apr 2005 22:11:39 -0000	1.5
+++ gputils.spec	12 Sep 2005 20:41:22 -0000	1.6
@@ -1,13 +1,13 @@
 Name:		gputils
-Version:	0.12.4
-Release:	3
-
+Version:	0.13.3
+Release:	1%{?dist}
 Summary:	Development utilities for Microchip (TM) PIC (TM) microcontrollers
 
 Group:		Development/Languages
 License:	GPL
 URL:		http://gputils.sourceforge.net
-Source:		http://prdownloads.sourceforge.net/gputils/gputils-0.12.4.tar.gz
+Source:		http://prdownloads.sourceforge.net/gputils/gputils-%{version}.tar.gz
+Patch:		man-fr.diff
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -20,30 +20,42 @@
 an up-to-date list of what gputils can do.
 
 %prep
-%setup
+%setup -q
+%patch -p1
 
 %build
 %configure
 make %{?_smp_mflags}
 
 %install
-make DESTDIR=$RPM_BUILD_ROOT install
+rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT
 
 %clean
 rm -rf $RPM_BUILD_ROOT
-rm -rf $RPM_BUILD_DIR/%{name}
 
 %files
-%defattr(-, root, root)
+%defattr(-,root,root,-)
+%doc AUTHORS ChangeLog COPYING README TODO
+%doc doc/%{name}.pdf doc/%{name}.ps
 %{_bindir}/*
-%{_mandir}/man1/*
 %{_datadir}/%{name}/
-%doc AUTHORS ChangeLog COPYING NEWS README TODO
-%doc doc/%{name}.pdf doc/%{name}.ps
+%{_mandir}/man1/*
+%{_mandir}/fr/man1/*
 
 %changelog
-* Fri Apr  7 2005 Michael Schwendt 
-- rebuilt
+* Mon Sep 12 2005 Alain Portal  0.13.3-1
+  - New version
+  - Patch to update french man pages
+
+* Mon May 23 2005 Alain Portal  0.13.2-1
+  - New version
+
+* Thu Jan 6 2005 Alain Portal  0:0.13.0-0.fdr.2
+  - Patch to update french man pages
+
+* Tue Jan 4 2005 Alain Portal  0:0.13.0-0.fdr.1
+  - New version
 
 * Thu Oct 7 2004 Alain Portal  0:0.12.4-0.fdr.2
   - Use Licence instead of copyright


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gputils/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 04:30:22 -0000	1.2
+++ sources	12 Sep 2005 20:41:22 -0000	1.3
@@ -1 +1 @@
-3ed60ae402009cec21c6dc8132302172  gputils-0.12.4.tar.gz
+9703abd149565d6f5e926dda15eef8c2  gputils-0.13.3.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 12 21:03:45 2005
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Mon, 12 Sep 2005 17:03:45 -0400
Subject: rpms/libnet/FC-4 Makefile, 1.3, 1.4 libnet.spec, 1.3, 1.4 sources,
	1.3, 1.4
Message-ID: <200509122104.j8CL4GMt009286@cvs-int.fedora.redhat.com>

Author: pertusus

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

Added Files:
	Makefile libnet.spec sources 
Log Message:
Initial files import



Index: Makefile
===================================================================
RCS file: Makefile
diff -N Makefile
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ Makefile	12 Sep 2005 21:03:43 -0000	1.4
@@ -0,0 +1,21 @@
+# Makefile for source rpm: cppunit
+# $Id$
+NAME := libnet
+SPECFILE = $(firstword $(wildcard *.spec))
+
+define find-makefile-common
+for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
+endef
+
+MAKEFILE_COMMON := $(shell $(find-makefile-common))
+
+ifeq ($(MAKEFILE_COMMON),)
+# attept a checkout
+define checkout-makefile-common
+test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
+endef
+
+MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
+endif
+
+include $(MAKEFILE_COMMON)


Index: libnet.spec
===================================================================
RCS file: libnet.spec
diff -N libnet.spec
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ libnet.spec	12 Sep 2005 21:03:43 -0000	1.4
@@ -0,0 +1,99 @@
+Summary:        C library for portable packet creation and injection
+Name:           libnet
+Version:        1.1.2.1
+Release:        6%{?dist}
+License:        BSD
+Group:          System Environment/Libraries
+URL:            http://www.packetfactory.net/libnet/
+Source0:        http://www.packetfactory.net/libnet/dist/libnet-%{version}.tar.gz
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+%description
+Libnet is an API to help with the construction and handling of network packets.
+It provides a portable framework for low-level network packet writing and
+handling (use libnet in conjunction with libpcap and you can write some really
+cool stuff).  Libnet includes packet creation at the IP layer and at the link
+layer as well as a host of supplementary and complementary functionality.
+Libnet is very handy with which to write network tools and network test code.
+See the manpage and sample test code for more detailed information.
+
+%package devel
+Summary:        Development files for libnet
+Group:          Development/Libraries
+Provides:       %{name} = %{version}-%{release}
+
+%description devel
+Libnet is an API to help with the construction and handling of network packets.
+It provides a portable framework for low-level network packet writing and
+handling (use libnet in conjunction with libpcap and you can write some really
+cool stuff).  Libnet includes packet creation at the IP layer and at the link
+layer as well as a host of supplementary and complementary functionality.
+Libnet is very handy with which to write network tools and network test code.
+See the manpage and sample test code for more detailed information.
+
+
+%prep
+%setup -q -n libnet
+sed -i -e 's/\r$//' doc/CHANGELOG doc/CONTRIB
+find . -depth -type d -name CVS -exec rm -rf {} ';'
+rm -rf sample/win32
+rm -f sample/.\#* sample/.*.swp
+
+%build
+%configure
+make %{?_smp_mflags}
+
+%install
+rm -rf %{buildroot}
+make DESTDIR=%{buildroot} install
+
+install -D --mode=0755 libnet-config %{buildroot}%{_bindir}/libnet-config
+
+install -d --mode=0755 %{buildroot}%{_mandir}/man3
+install -D --mode=0644 doc/man/man3/libnet*.3 %{buildroot}%{_mandir}/man3/
+
+make -C sample clean
+
+%clean
+rm -rf %{buildroot}
+
+%files devel
+%defattr(-,root,root,-)
+%doc README VERSION
+%doc doc/BUGS doc/CHANGELOG doc/CONTRIB doc/COPYING doc/DESIGN_NOTES
+%doc doc/MIGRATION doc/PACKET_BUILDING doc/PORTED doc/RAWSOCKET_NON_SEQUITUR
+%doc doc/TODO doc/html/ sample/
+
+%{_bindir}/libnet-config
+%{_includedir}/libnet/
+%{_includedir}/libnet.h
+%{_libdir}/libnet.a
+%{_mandir}/man3/libnet*
+
+%changelog
+* Mon Sep 12 2005 Patrice Dumas  1.1.2.1-6
+- bump release and add dist tag
+
+* Tue Aug 30 2005 Paul Howarth  1.1.2.1-5
+- spec file cleanup
+
+* Fri Aug 26 2005 Patrice Dumas  1.1.2.1-4
+- use pushd and popd (from Oliver Falk) 
+
+* Mon Aug 22 2005 Patrice Dumas  1.1.2.1-3
+- Correct dos end of lines
+- add in devel: Provides: %{name} = %{version}-%{release} 
+
+* Fri Aug 12 2005 Patrice Dumas  1.1.2.1-2
+- put everything in a devel subpackage
+- add smpflags
+- clean in sample
+
+* Fri Aug 12 2005 Patrice Dumas  1.1.2.1-1
+- rebuild changing only name
+
+* Wed Jun 02 2004 Marcin Garski  1.1.2.1-2.fc2
+- Rebuild for Fedora Core 2
+
+* Sat May 08 2004 Marcin Garski  1.1.2.1-1
+- Initial specfile


Index: sources
===================================================================
RCS file: sources
diff -N sources
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ sources	12 Sep 2005 21:03:43 -0000	1.4
@@ -0,0 +1 @@
+be845c41170d72c7db524f3411b50256  libnet-1.1.2.1.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 12 21:14:08 2005
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Mon, 12 Sep 2005 17:14:08 -0400
Subject: rpms/libnet/FC-4 .cvsignore,1.3,1.4
Message-ID: <200509122114.j8CLE83d009437@cvs-int.fedora.redhat.com>

Author: pertusus

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

Added Files:
	.cvsignore 
Log Message:
Add .cvsignore for FC-4/libnet



Index: .cvsignore
===================================================================
RCS file: .cvsignore
diff -N .cvsignore
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ .cvsignore	12 Sep 2005 21:14:06 -0000	1.4
@@ -0,0 +1 @@
+libnet-1.1.2.1.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 12 21:14:50 2005
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Mon, 12 Sep 2005 17:14:50 -0400
Subject: rpms/libnet/FC-3 .cvsignore, 1.3, 1.4 Makefile, 1.3, 1.4 libnet.spec,
	1.3, 1.4 sources, 1.3, 1.4
Message-ID: <200509122114.j8CLEoaA009473@cvs-int.fedora.redhat.com>

Author: pertusus

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

Added Files:
	.cvsignore Makefile libnet.spec sources 
Log Message:
Add libnet files for FC-3 branch



Index: .cvsignore
===================================================================
RCS file: .cvsignore
diff -N .cvsignore
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ .cvsignore	12 Sep 2005 21:14:48 -0000	1.4
@@ -0,0 +1 @@
+libnet-1.1.2.1.tar.gz


Index: Makefile
===================================================================
RCS file: Makefile
diff -N Makefile
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ Makefile	12 Sep 2005 21:14:48 -0000	1.4
@@ -0,0 +1,21 @@
+# Makefile for source rpm: cppunit
+# $Id$
+NAME := libnet
+SPECFILE = $(firstword $(wildcard *.spec))
+
+define find-makefile-common
+for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
+endef
+
+MAKEFILE_COMMON := $(shell $(find-makefile-common))
+
+ifeq ($(MAKEFILE_COMMON),)
+# attept a checkout
+define checkout-makefile-common
+test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
+endef
+
+MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
+endif
+
+include $(MAKEFILE_COMMON)


Index: libnet.spec
===================================================================
RCS file: libnet.spec
diff -N libnet.spec
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ libnet.spec	12 Sep 2005 21:14:48 -0000	1.4
@@ -0,0 +1,99 @@
+Summary:        C library for portable packet creation and injection
+Name:           libnet
+Version:        1.1.2.1
+Release:        6%{?dist}
+License:        BSD
+Group:          System Environment/Libraries
+URL:            http://www.packetfactory.net/libnet/
+Source0:        http://www.packetfactory.net/libnet/dist/libnet-%{version}.tar.gz
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+%description
+Libnet is an API to help with the construction and handling of network packets.
+It provides a portable framework for low-level network packet writing and
+handling (use libnet in conjunction with libpcap and you can write some really
+cool stuff).  Libnet includes packet creation at the IP layer and at the link
+layer as well as a host of supplementary and complementary functionality.
+Libnet is very handy with which to write network tools and network test code.
+See the manpage and sample test code for more detailed information.
+
+%package devel
+Summary:        Development files for libnet
+Group:          Development/Libraries
+Provides:       %{name} = %{version}-%{release}
+
+%description devel
+Libnet is an API to help with the construction and handling of network packets.
+It provides a portable framework for low-level network packet writing and
+handling (use libnet in conjunction with libpcap and you can write some really
+cool stuff).  Libnet includes packet creation at the IP layer and at the link
+layer as well as a host of supplementary and complementary functionality.
+Libnet is very handy with which to write network tools and network test code.
+See the manpage and sample test code for more detailed information.
+
+
+%prep
+%setup -q -n libnet
+sed -i -e 's/\r$//' doc/CHANGELOG doc/CONTRIB
+find . -depth -type d -name CVS -exec rm -rf {} ';'
+rm -rf sample/win32
+rm -f sample/.\#* sample/.*.swp
+
+%build
+%configure
+make %{?_smp_mflags}
+
+%install
+rm -rf %{buildroot}
+make DESTDIR=%{buildroot} install
+
+install -D --mode=0755 libnet-config %{buildroot}%{_bindir}/libnet-config
+
+install -d --mode=0755 %{buildroot}%{_mandir}/man3
+install -D --mode=0644 doc/man/man3/libnet*.3 %{buildroot}%{_mandir}/man3/
+
+make -C sample clean
+
+%clean
+rm -rf %{buildroot}
+
+%files devel
+%defattr(-,root,root,-)
+%doc README VERSION
+%doc doc/BUGS doc/CHANGELOG doc/CONTRIB doc/COPYING doc/DESIGN_NOTES
+%doc doc/MIGRATION doc/PACKET_BUILDING doc/PORTED doc/RAWSOCKET_NON_SEQUITUR
+%doc doc/TODO doc/html/ sample/
+
+%{_bindir}/libnet-config
+%{_includedir}/libnet/
+%{_includedir}/libnet.h
+%{_libdir}/libnet.a
+%{_mandir}/man3/libnet*
+
+%changelog
+* Mon Sep 12 2005 Patrice Dumas  1.1.2.1-6
+- bump release and add dist tag
+
+* Tue Aug 30 2005 Paul Howarth  1.1.2.1-5
+- spec file cleanup
+
+* Fri Aug 26 2005 Patrice Dumas  1.1.2.1-4
+- use pushd and popd (from Oliver Falk) 
+
+* Mon Aug 22 2005 Patrice Dumas  1.1.2.1-3
+- Correct dos end of lines
+- add in devel: Provides: %{name} = %{version}-%{release} 
+
+* Fri Aug 12 2005 Patrice Dumas  1.1.2.1-2
+- put everything in a devel subpackage
+- add smpflags
+- clean in sample
+
+* Fri Aug 12 2005 Patrice Dumas  1.1.2.1-1
+- rebuild changing only name
+
+* Wed Jun 02 2004 Marcin Garski  1.1.2.1-2.fc2
+- Rebuild for Fedora Core 2
+
+* Sat May 08 2004 Marcin Garski  1.1.2.1-1
+- Initial specfile


Index: sources
===================================================================
RCS file: sources
diff -N sources
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ sources	12 Sep 2005 21:14:48 -0000	1.4
@@ -0,0 +1 @@
+be845c41170d72c7db524f3411b50256  libnet-1.1.2.1.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 12 21:17:37 2005
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Mon, 12 Sep 2005 17:17:37 -0400
Subject: rpms/pl/devel pl.spec,1.16,1.17
Message-ID: <200509122117.j8CLHbRk009543@cvs-int.fedora.redhat.com>

Author: gemi

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

Modified Files:
	pl.spec 
Log Message:



Index: pl.spec
===================================================================
RCS file: /cvs/extras/rpms/pl/devel/pl.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- pl.spec	22 Jun 2005 19:48:03 -0000	1.16
+++ pl.spec	12 Sep 2005 21:17:35 -0000	1.17
@@ -1,6 +1,6 @@
 Name:		pl
 Version:	5.4.7
-Release:	1%{?dist}
+Release:	2%{?dist}
 
 Summary:	SWI-Prolog - Edinburgh compatible Prolog compiler
 
@@ -19,7 +19,7 @@
 BuildRequires:  unixODBC-devel
 
 # x86_64 excluded due to build failure: https://bugzilla.redhat.com/149038
-ExcludeArch: x86_64
+#ExcludeArch: x86_64
 
 %description
 ISO/Edinburgh-style Prolog compiler including modules, autoload,



From fedora-extras-commits at redhat.com  Mon Sep 12 21:27:14 2005
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Mon, 12 Sep 2005 17:27:14 -0400
Subject: owners owners.list,1.194,1.195
Message-ID: <200509122127.j8CLREW2009631@cvs-int.fedora.redhat.com>

Author: pertusus

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

Modified Files:
	owners.list 
Log Message:
Add libnet



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.194
retrieving revision 1.195
diff -u -r1.194 -r1.195
--- owners.list	12 Sep 2005 15:19:35 -0000	1.194
+++ owners.list	12 Sep 2005 21:27:12 -0000	1.195
@@ -417,6 +417,7 @@
 Fedora Extras|libmatroska|An open Audio/Video container format|anvil at livna.org|extras-qa at fedoraproject.org|
 Fedora Extras|libmodplug|Modplug mod music file format library|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|libnet10|High-level API (toolkit) allowing the application programmer to construct and inject network packets|compton at pcompton.com|extras-qa at fedoraproject.org|
+Fedora Extras|libnet|C library for portable packet creation and injection|pertusus at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|libnjb|Library for managing digital audio players|triad at df.lth.se|extras-qa at fedoraproject.org|
 Fedora Extras|liboggz|Simple programming interface for Ogg files and streams|thomas at apestaart.org|extras-qa at fedoraproject.org|
 Fedora Extras|liboil|Library of Optimized Inner Loops, CPU optimized functions|matthias at rpmforge.net|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Tue Sep 13 02:17:09 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Mon, 12 Sep 2005 22:17:09 -0400
Subject: rpms/perl-prefork - New directory
Message-ID: <200509130217.j8D2H9Ex016982@cvs-int.fedora.redhat.com>

Author: corsepiu

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

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




From fedora-extras-commits at redhat.com  Tue Sep 13 02:17:09 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Mon, 12 Sep 2005 22:17:09 -0400
Subject: rpms/perl-prefork/devel - New directory
Message-ID: <200509130217.j8D2H9iG016987@cvs-int.fedora.redhat.com>

Author: corsepiu

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

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




From fedora-extras-commits at redhat.com  Tue Sep 13 02:17:45 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Mon, 12 Sep 2005 22:17:45 -0400
Subject: rpms/perl-prefork Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200509130217.j8D2HjxU017021@cvs-int.fedora.redhat.com>

Author: corsepiu

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

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


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

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

common : CVS/Root
	@cvs checkout common

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

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


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Tue Sep 13 02:17:54 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Mon, 12 Sep 2005 22:17:54 -0400
Subject: rpms/perl-prefork/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200509130217.j8D2HskW017036@cvs-int.fedora.redhat.com>

Author: corsepiu

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

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


--- NEW FILE .cvsignore ---


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

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Tue Sep 13 02:20:51 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Mon, 12 Sep 2005 22:20:51 -0400
Subject: rpms/perl-prefork/devel perl-prefork.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200509130221.j8D2LPPN017144@cvs-int.fedora.redhat.com>

Author: corsepiu

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

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


--- NEW FILE perl-prefork.spec ---
Name: 		perl-prefork
Version: 	1.00
Release: 	1%{?dist}
Summary: 	Optimized module loading for forking or non-forking processes
License: 	GPL or Artistic
Group: 		Development/Libraries
URL: 		http://search.cpan.org/dist/prefork/
Source0: 	http://search.cpan.org/CPAN/authors/id/A/AD/ADAMK/prefork-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
BuildArch: noarch

BuildRequires: perl(Test::More) >= 0.47
BuildRequires: perl(File::Spec) >= 0.80
BuildRequires: perl(Scalar::Util) >= 1.10

# Required by tests
BuildRequires: perl(Test::Pod) >= 1.00

%description
Optimized module loading for forking or non-forking processes

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

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

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

%clean
rm -rf $RPM_BUILD_ROOT

%check
make test

%files
%defattr(-,root,root,-)
%doc Changes README LICENSE
%{perl_vendorlib}/prefork*
%{_mandir}/man3/*

%changelog
* Sat Sep 10 2005 Ralf Corsepius  - 1.00-1
- FE submission.

* Sat Sep 10 2005 Ralf Corsepius  - 1.00-0.pm.1
- Update to 1.00.

* Tue Jun 28 2005 Ralf Corsepius  - 0.04-0.pm.1
- Initial packman version.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-prefork/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	13 Sep 2005 02:17:49 -0000	1.1
+++ .cvsignore	13 Sep 2005 02:20:49 -0000	1.2
@@ -0,0 +1 @@
+prefork-1.00.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-prefork/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	13 Sep 2005 02:17:49 -0000	1.1
+++ sources	13 Sep 2005 02:20:49 -0000	1.2
@@ -0,0 +1 @@
+41e19e56aca6ae7f36bcbfe420a0eb4c  prefork-1.00.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep 13 02:20:29 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Mon, 12 Sep 2005 22:20:29 -0400
Subject: rpms/perl-prefork import.log,1.1,1.2
Message-ID: <200509130221.j8D2LgAv017150@cvs-int.fedora.redhat.com>

Author: corsepiu

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

Modified Files:
	import.log 
Log Message:
auto-import perl-prefork-1.00-1 on branch devel from perl-prefork-1.00-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-prefork/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	13 Sep 2005 02:17:43 -0000	1.1
+++ import.log	13 Sep 2005 02:20:26 -0000	1.2
@@ -0,0 +1 @@
+perl-prefork-1_00-1:HEAD:perl-prefork-1.00-1.src.rpm:1126577940



From fedora-extras-commits at redhat.com  Tue Sep 13 02:26:33 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Mon, 12 Sep 2005 22:26:33 -0400
Subject: rpms/perl-prefork/devel perl-prefork.spec,1.1,1.2
Message-ID: <200509130226.j8D2QXEG017221@cvs-int.fedora.redhat.com>

Author: corsepiu

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

Modified Files:
	perl-prefork.spec 
Log Message:
Spec file cleanup.


Index: perl-prefork.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-prefork/devel/perl-prefork.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-prefork.spec	13 Sep 2005 02:20:49 -0000	1.1
+++ perl-prefork.spec	13 Sep 2005 02:26:31 -0000	1.2
@@ -1,6 +1,6 @@
 Name: 		perl-prefork
 Version: 	1.00
-Release: 	1%{?dist}
+Release: 	2%{?dist}
 Summary: 	Optimized module loading for forking or non-forking processes
 License: 	GPL or Artistic
 Group: 		Development/Libraries
@@ -21,6 +21,10 @@
 %description
 Optimized module loading for forking or non-forking processes
 
+prefork.pm is intended to serve as a central and optional marshalling
+point for state detection (are we running in compile-time or run-time
+mode) and to act as a relatively light-weight module loader.
+
 %prep
 %setup -q -n prefork-%{version}
 
@@ -48,6 +52,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Tue Sep 13 2005 Ralf Corsepius  - 1.00-2
+- Spec file cleanup.
+
 * Sat Sep 10 2005 Ralf Corsepius  - 1.00-1
 - FE submission.
 



From fedora-extras-commits at redhat.com  Tue Sep 13 03:12:12 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Mon, 12 Sep 2005 23:12:12 -0400
Subject: owners owners.list,1.195,1.196
Message-ID: <200509130312.j8D3CCx5018634@cvs-int.fedora.redhat.com>

Author: corsepiu

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

Modified Files:
	owners.list 
Log Message:
Add perl-prefork


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.195
retrieving revision 1.196
diff -u -r1.195 -r1.196
--- owners.list	12 Sep 2005 21:27:12 -0000	1.195
+++ owners.list	13 Sep 2005 03:12:10 -0000	1.196
@@ -695,6 +695,7 @@
 Fedora Extras|perl-PAR-Dist|Toolkit for creating and manipulating Perl PAR distributions|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Params-Validate|Params-Validate Perl module|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-pmtools|A suite of small programs to help manage Perl modules|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-prefork|Optimized module loading for forking or non-forking processes|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Pod-Coverage|Checks if the documentation of a module is comprehensive|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Pod-Escapes|Perl module for resolving POD escape sequences|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Pod-POM|Object-oriented interface to Perl POD documents|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Tue Sep 13 07:31:20 2005
From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl))
Date: Tue, 13 Sep 2005 03:31:20 -0400
Subject: rpms/baobab - New directory
Message-ID: <200509130731.j8D7VKei024645@cvs-int.fedora.redhat.com>

Author: thl

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

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




From fedora-extras-commits at redhat.com  Tue Sep 13 07:31:20 2005
From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl))
Date: Tue, 13 Sep 2005 03:31:20 -0400
Subject: rpms/baobab/devel - New directory
Message-ID: <200509130731.j8D7VKng024650@cvs-int.fedora.redhat.com>

Author: thl

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

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




From fedora-extras-commits at redhat.com  Tue Sep 13 07:32:10 2005
From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl))
Date: Tue, 13 Sep 2005 03:32:10 -0400
Subject: rpms/baobab Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200509130732.j8D7WAiL024705@cvs-int.fedora.redhat.com>

Author: thl

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

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


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

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

common : CVS/Root
	@cvs checkout common

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

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


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Tue Sep 13 07:32:11 2005
From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl))
Date: Tue, 13 Sep 2005 03:32:11 -0400
Subject: rpms/baobab/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200509130732.j8D7WBDH024710@cvs-int.fedora.redhat.com>

Author: thl

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

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


--- NEW FILE .cvsignore ---


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

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Tue Sep 13 07:33:24 2005
From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl))
Date: Tue, 13 Sep 2005 03:33:24 -0400
Subject: rpms/baobab import.log,1.1,1.2
Message-ID: <200509130733.j8D7XtKu024776@cvs-int.fedora.redhat.com>

Author: thl

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

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


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/baobab/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	13 Sep 2005 07:32:08 -0000	1.1
+++ import.log	13 Sep 2005 07:33:22 -0000	1.2
@@ -0,0 +1 @@
+baobab-1_1_0-2:HEAD:baobab-1.1.0-2.src.rpm:1126596946



From fedora-extras-commits at redhat.com  Tue Sep 13 07:33:25 2005
From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl))
Date: Tue, 13 Sep 2005 03:33:25 -0400
Subject: rpms/baobab/devel baobab.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200509130734.j8D7XtMW024780@cvs-int.fedora.redhat.com>

Author: thl

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

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


--- NEW FILE baobab.spec ---
Name:           baobab
Version:        1.1.0
Release:        2
Summary:        Graphical tool to analyse directory trees 

Group:          Applications/System
License:        GPL
URL:            http://www.marzocca.net/linux/baobab.html
Source0:        http://www.marzocca.net/linux/downloads/baobab-1.1.0.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  gtk2-devel >= 2.6
BuildRequires:  libgnomeui-devel
BuildRequires:  gnome-vfs2-devel
BuildRequires:  GConf2-devel
BuildRequires:  libgtop2-devel >= 2.10
BuildRequires:	desktop-file-utils
BuildRequires:	gettext

%description
Baobab is able to scan either specific directories or the whole filesystem, 
in order to give the user a graphical tree representation including 
each directory size or percentage in the branch.


%prep
%setup -q


%build
%configure
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
%find_lang %{name}
desktop-file-install --vendor fedora \
  --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \
  --add-category X-Fedora \
  --delete-original \
  $RPM_BUILD_ROOT%{_datadir}/applications/baobab.desktop


%clean
rm -rf $RPM_BUILD_ROOT


%files -f %{name}.lang
%defattr(-,root,root,-)
%doc COPYING INSTALL README AUTHORS
%{_bindir}/%{name}
%{_datadir}/applications/*-%{name}.desktop
%{_datadir}/%{name}/
%{_mandir}/man1/%{name}.1.gz


%changelog
* Sat Sep 10 2005 Thorsten Leemhuis  - 1.1.0-2
- Remove pre and post-run of update-desktop-database

* Thu Sep 08 2005 Thorsten Leemhuis  - 1.1.0-1
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/baobab/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	13 Sep 2005 07:32:09 -0000	1.1
+++ .cvsignore	13 Sep 2005 07:33:23 -0000	1.2
@@ -0,0 +1 @@
+baobab-1.1.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/baobab/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	13 Sep 2005 07:32:09 -0000	1.1
+++ sources	13 Sep 2005 07:33:23 -0000	1.2
@@ -0,0 +1 @@
+7387ab6621beaba07daaa02c85cbe1a0  baobab-1.1.0.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep 13 08:59:45 2005
From: fedora-extras-commits at redhat.com (Mark Cox (mjc))
Date: Tue, 13 Sep 2005 04:59:45 -0400
Subject: fedora-security/audit fc4,1.57,1.58
Message-ID: <200509130859.j8D8xjUu027323@cvs-int.fedora.redhat.com>

Author: mjc

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27304

Modified Files:
	fc4 
Log Message:
Catchup on yesterday



Index: fc4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc4,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- fc4	12 Sep 2005 12:11:02 -0000	1.57
+++ fc4	13 Sep 2005 08:59:42 -0000	1.58
@@ -12,8 +12,8 @@
 2005-2802 version (kernel, fixed 2.6.12) [since FEDORA-2005-510]
 2005-2801 version (kernel, fixed 2.6.11)
 2005-2800 VULNERABLE (kernel)
-2005-2798 VULNERABLE (openssh, fixed 4.2) #167446
-2005-2797 VULNERABLE (openssh, fixed 4.2) #167443
+2005-2798 version (openssh, fixed 4.2) [since FEDORA-2005-860]
+2005-2797 version (openssh, fixed 4.2) [since FEDORA-2005-860]
 2005-2796 backport (squid, fixed after 2.5.STABLE10) [since FEDORA-2005-851]
 2005-2794 backport (squid, fixed after 2.5.STABLE10) [since FEDORA-2005-851]
 2005-2728 backport (httpd, fixed 2.0.55-dev) [since FEDORA-2005-849]



From fedora-extras-commits at redhat.com  Tue Sep 13 09:01:55 2005
From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl))
Date: Tue, 13 Sep 2005 05:01:55 -0400
Subject: owners owners.list,1.196,1.197
Message-ID: <200509130902.j8D92QjD028633@cvs-int.fedora.redhat.com>

Author: thl

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

Modified Files:
	owners.list 
Log Message:
add baobab


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.196
retrieving revision 1.197
diff -u -r1.196 -r1.197
--- owners.list	13 Sep 2005 03:12:10 -0000	1.196
+++ owners.list	13 Sep 2005 09:01:53 -0000	1.197
@@ -42,6 +42,7 @@
 Fedora Extras|awstats|Advanced Web Statistics|gauret at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|balsa|Balsa Mail Client|pawsa at theochem.kth.se|extras-qa at fedoraproject.org|
 Fedora Extras|banner|Prints a short string to the console in very large letters|oliver at linux-kernel.at|extras-qa at fedoraproject.org|
+Fedora Extras|baobab|Graphical tool to analyse directory trees|fedora at leemhuis.info|extras-qa at fedoraproject.org|
 Fedora Extras|barcode|Generates barcodes from text strings|andreas at bawue.net|extras-qa at fedoraproject.org|
 Fedora Extras|bash-completion|Programmable completion for Bash|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|bazaar|A distributed revision control system|shahms at shahms.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Tue Sep 13 10:48:31 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Tue, 13 Sep 2005 06:48:31 -0400
Subject: rpms/unshield - New directory
Message-ID: <200509131048.j8DAmV12030147@cvs-int.fedora.redhat.com>

Author: awjb

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

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




From fedora-extras-commits at redhat.com  Tue Sep 13 10:48:31 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Tue, 13 Sep 2005 06:48:31 -0400
Subject: rpms/unshield/devel - New directory
Message-ID: <200509131048.j8DAmV1G030152@cvs-int.fedora.redhat.com>

Author: awjb

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

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




From fedora-extras-commits at redhat.com  Tue Sep 13 10:48:52 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Tue, 13 Sep 2005 06:48:52 -0400
Subject: rpms/unshield Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200509131048.j8DAmqGf030201@cvs-int.fedora.redhat.com>

Author: awjb

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

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


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

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

common : CVS/Root
	@cvs checkout common

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

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


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Tue Sep 13 10:48:52 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Tue, 13 Sep 2005 06:48:52 -0400
Subject: rpms/unshield/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200509131048.j8DAmqRN030206@cvs-int.fedora.redhat.com>

Author: awjb

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

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


--- NEW FILE .cvsignore ---


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

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Tue Sep 13 10:49:31 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Tue, 13 Sep 2005 06:49:31 -0400
Subject: rpms/unshield import.log,1.1,1.2
Message-ID: <200509131050.j8DAo1dT030283@cvs-int.fedora.redhat.com>

Author: awjb

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

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


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/unshield/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	13 Sep 2005 10:48:50 -0000	1.1
+++ import.log	13 Sep 2005 10:49:29 -0000	1.2
@@ -0,0 +1 @@
+unshield-0_5-1:HEAD:unshield-0.5-1.src.rpm:1126608560



From fedora-extras-commits at redhat.com  Tue Sep 13 10:49:31 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Tue, 13 Sep 2005 06:49:31 -0400
Subject: rpms/unshield/devel unshield.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200509131050.j8DAo2kQ030287@cvs-int.fedora.redhat.com>

Author: awjb

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

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


--- NEW FILE unshield.spec ---
Name:           unshield
Version:        0.5
Release:        1
Summary:        Install InstallShield applications on a Pocket PC

Group:          Applications/Communications
License:        MIT
URL:            http://synce.sourceforge.net/
Source0:        http://dl.sf.net/synce/unshield-0.5.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  zlib-devel

%description
To install a Pocket PC application remotely, an installable
Microsoft Cabinet File is copied to the /Windows/AppMgr/Install
directory on the PDA and then the wceload.exe is executed to
perform the actual install. That is a very simple procedure.

Unfortunately, many applications for Pocket PC are distributed as
InstallShield installers for Microsoft Windows, and not as
individual Microsoft Cabinet Files. That is very impractical for
users of other operating systems, such as Linux or FreeBSD.

%package devel
Group:          Development/Libraries
Summary:        Files needed for software development with %{name}
Requires:       %{name} = %{version}

%description devel
The %{name}-devel package contains the files needed for development with
%{name}

%prep
%setup -q


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


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

rm -f $RPM_BUILD_ROOT%{_libdir}/libunshield.la

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%doc README LICENSE
%{_bindir}/unshield
%{_libdir}/libunshield.so.*

%files devel
%defattr(-,root,root,-)
%{_libdir}/libunshield.so
%{_includedir}/libunshield.h
%{_datadir}/aclocal/unshield.m4

%changelog
* Tue Aug 23 2005 Andreas Bierfert 
0.5-1
- Initial Release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/unshield/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	13 Sep 2005 10:48:50 -0000	1.1
+++ .cvsignore	13 Sep 2005 10:49:29 -0000	1.2
@@ -0,0 +1 @@
+unshield-0.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/unshield/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	13 Sep 2005 10:48:50 -0000	1.1
+++ sources	13 Sep 2005 10:49:29 -0000	1.2
@@ -0,0 +1 @@
+ff6bb0fbe962bc00e230592c910b90ce  unshield-0.5.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep 13 10:59:09 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Tue, 13 Sep 2005 06:59:09 -0400
Subject: rpms/unshield/devel unshield.spec,1.1,1.2
Message-ID: <200509131059.j8DAx98w030429@cvs-int.fedora.redhat.com>

Author: awjb

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

Modified Files:
	unshield.spec 
Log Message:
- add dist
- change devel Require from V to V-R



Index: unshield.spec
===================================================================
RCS file: /cvs/extras/rpms/unshield/devel/unshield.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- unshield.spec	13 Sep 2005 10:49:29 -0000	1.1
+++ unshield.spec	13 Sep 2005 10:59:06 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           unshield
 Version:        0.5
-Release:        1
+Release:        2%{?dist}
 Summary:        Install InstallShield applications on a Pocket PC
 
 Group:          Applications/Communications
@@ -25,7 +25,7 @@
 %package devel
 Group:          Development/Libraries
 Summary:        Files needed for software development with %{name}
-Requires:       %{name} = %{version}
+Requires:       %{name} = %{version}-%{release}
 
 %description devel
 The %{name}-devel package contains the files needed for development with
@@ -66,6 +66,11 @@
 %{_datadir}/aclocal/unshield.m4
 
 %changelog
+* Tue Sep 13 2005 Andreas Bierfert 
+0.5-2
+- add dist
+- change devel Require from V to V-R
+
 * Tue Aug 23 2005 Andreas Bierfert 
 0.5-1
 - Initial Release



From fedora-extras-commits at redhat.com  Tue Sep 13 11:46:53 2005
From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc))
Date: Tue, 13 Sep 2005 07:46:53 -0400
Subject: rpms/gnome-translate/devel gnome-translate-0.99-configure.patch,
	NONE, 1.1 gnome-translate.spec, 1.1, 1.2
Message-ID: <200509131146.j8DBkrSb031956@cvs-int.fedora.redhat.com>

Author: buc

Update of /cvs/extras/rpms/gnome-translate/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31934

Modified Files:
	gnome-translate.spec 
Added Files:
	gnome-translate-0.99-configure.patch 
Log Message:


gnome-translate-0.99-configure.patch:

--- NEW FILE gnome-translate-0.99-configure.patch ---
diff -Nrbu gnome-translate-0.99/configure gnome-translate-0.99-OK/configure
--- gnome-translate-0.99/configure	2005-01-28 16:10:15.000000000 +0300
+++ gnome-translate-0.99-OK/configure	2005-09-13 15:43:23.000000000 +0400
@@ -6897,7 +6897,7 @@
         echo "$as_me:$LINENO: checking for gthread-2.0 gconf-2.0 >= 2.4.0 libgnomeui-2.0 gnome-vfs-2.0 libglade-2.0 eel-2.0 >= 2.6.0 libxml-2.0" >&5
 echo $ECHO_N "checking for gthread-2.0 gconf-2.0 >= 2.4.0 libgnomeui-2.0 gnome-vfs-2.0 libglade-2.0 eel-2.0 >= 2.6.0 libxml-2.0... $ECHO_C" >&6
 
-        if $PKG_CONFIG --exists "gthread-2.0 gconf-2.0 >= 2.4.0 libgnomeui-2.0 gnome-vfs-2.0 libglade-2.0 eel-2.0 >= 2.6.0 libxml-2.0" ; then
+        if $PKG_CONFIG --exists --print-errors "gthread-2.0 gconf-2.0 >= 2.4.0 libgnomeui-2.0 gnome-vfs-2.0 libglade-2.0 eel-2.0 >= 2.6.0 libxml-2.0" ; then
             echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6
             succeeded=yes


Index: gnome-translate.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-translate/devel/gnome-translate.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gnome-translate.spec	12 Sep 2005 15:01:00 -0000	1.1
+++ gnome-translate.spec	13 Sep 2005 11:46:51 -0000	1.2
@@ -6,6 +6,7 @@
 License: GPL 
 URL: http://www.nongnu.org/libtranslate/gnome-translate
 Source: http://savannah.nongnu.org/download/libtranslate/gnome-translate-%{version}.tar.gz
+Patch1: gnome-translate-0.99-configure.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -34,6 +35,7 @@
 
 %prep
 %setup -q
+%patch1 -p1
 
 
 %build
@@ -117,6 +119,9 @@
 %{_sysconfdir}/gconf/schemas/%{name}.schemas
 
 %changelog
+* Tue Sep 13 2005 Dmitry Butskoy 
+- add configure patch to build under upcoming FC5
+
 * Mon Sep 12 2005 Dmitry Butskoy  - 0.99-3
 - more spec file cleanups
 - accepted for Fedora Extra



From fedora-extras-commits at redhat.com  Tue Sep 13 11:57:50 2005
From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc))
Date: Tue, 13 Sep 2005 07:57:50 -0400
Subject: rpms/gnome-translate/devel gnome-translate.spec,1.2,1.3
Message-ID: <200509131157.j8DBvofC031996@cvs-int.fedora.redhat.com>

Author: buc

Update of /cvs/extras/rpms/gnome-translate/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31977

Modified Files:
	gnome-translate.spec 
Log Message:



Index: gnome-translate.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-translate/devel/gnome-translate.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gnome-translate.spec	13 Sep 2005 11:46:51 -0000	1.2
+++ gnome-translate.spec	13 Sep 2005 11:57:48 -0000	1.3
@@ -1,7 +1,7 @@
 Name: gnome-translate
 Summary: GNOME interface to libtranslate -- Natural language translator
 Version: 0.99
-Release: 3%{?dist}
+Release: 3.1%{?dist}
 Group: User Interface/Desktops
 License: GPL 
 URL: http://www.nongnu.org/libtranslate/gnome-translate
@@ -119,7 +119,7 @@
 %{_sysconfdir}/gconf/schemas/%{name}.schemas
 
 %changelog
-* Tue Sep 13 2005 Dmitry Butskoy 
+* Tue Sep 13 2005 Dmitry Butskoy  - 0.99-3.1
 - add configure patch to build under upcoming FC5
 
 * Mon Sep 12 2005 Dmitry Butskoy  - 0.99-3



From fedora-extras-commits at redhat.com  Tue Sep 13 12:20:08 2005
From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc))
Date: Tue, 13 Sep 2005 08:20:08 -0400
Subject: rpms/gnome-translate/devel gnome-translate.spec, 1.3,
	1.4 gnome-translate-0.99-configure.patch, 1.1, NONE
Message-ID: <200509131220.j8DCK8Yu000959@cvs-int.fedora.redhat.com>

Author: buc

Update of /cvs/extras/rpms/gnome-translate/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv940

Modified Files:
	gnome-translate.spec 
Removed Files:
	gnome-translate-0.99-configure.patch 
Log Message:



Index: gnome-translate.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-translate/devel/gnome-translate.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gnome-translate.spec	13 Sep 2005 11:57:48 -0000	1.3
+++ gnome-translate.spec	13 Sep 2005 12:20:05 -0000	1.4
@@ -1,18 +1,20 @@
 Name: gnome-translate
 Summary: GNOME interface to libtranslate -- Natural language translator
 Version: 0.99
-Release: 3.1%{?dist}
+Release: 4%{?dist}
 Group: User Interface/Desktops
 License: GPL 
 URL: http://www.nongnu.org/libtranslate/gnome-translate
 Source: http://savannah.nongnu.org/download/libtranslate/gnome-translate-%{version}.tar.gz
-Patch1: gnome-translate-0.99-configure.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires: gtk2 >= 2.4.0, GConf2 >= 2.4.0, eel2 >= 2.6.0, pango >= 1.2.0
 BuildRequires: gtk2-devel >= 2.4.0, GConf2-devel >= 2.4.0
 BuildRequires: eel2-devel >= 2.6.0, libtranslate-devel, aspell-devel
+%if "%{?dist}" == ".fc5"
+BuildRequires: gnome-keyring-devel
+%endif
 
 BuildRequires: desktop-file-utils >= 0.2.90
 BuildRequires: startup-notification-devel >= 0.5
@@ -35,7 +37,6 @@
 
 %prep
 %setup -q
-%patch1 -p1
 
 
 %build
@@ -119,8 +120,9 @@
 %{_sysconfdir}/gconf/schemas/%{name}.schemas
 
 %changelog
-* Tue Sep 13 2005 Dmitry Butskoy  - 0.99-3.1
-- add configure patch to build under upcoming FC5
+* Tue Sep 13 2005 Dmitry Butskoy  - 0.99-4
+- Hack: add an extra dependency -- gnome-keyring-devel,
+  due to missing one in current rawhide's libgnomeui-devel
 
 * Mon Sep 12 2005 Dmitry Butskoy  - 0.99-3
 - more spec file cleanups


--- gnome-translate-0.99-configure.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Sep 13 12:37:24 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 13 Sep 2005 08:37:24 -0400
Subject: rpms/gc/FC-3 gc.spec,1.8,1.9
Message-ID: <200509131237.j8DCbO7G001068@cvs-int.fedora.redhat.com>

Author: rdieter

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

Modified Files:
	gc.spec 
Log Message:
* Mon Sep 12 2005 Rex Dieter  6.6-2
- drop opendl patch (doesn't appear to be needed anymore)



Index: gc.spec
===================================================================
RCS file: /cvs/extras/rpms/gc/FC-3/gc.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- gc.spec	12 Sep 2005 18:45:11 -0000	1.8
+++ gc.spec	13 Sep 2005 12:37:22 -0000	1.9
@@ -4,7 +4,7 @@
 Name:    gc	
 Version: 6.6
 
-Release: 1%{?dist}
+Release: 2%{?dist}
 Group:   System Environment/Libraries
 License: BSD
 Url:     http://www.hpl.hp.com/personal/Hans_Boehm/gc/	
@@ -29,7 +29,7 @@
 %prep
 %setup -n %{name}%{version}
 
-%patch1 -p1 -b .opendl
+#patch1 -p1 -b .opendl
 
 
 %build
@@ -83,7 +83,10 @@
 
 
 %changelog
-* Fri Sep 09 2005 Rex Dieter  6.6-1
+* Mon Sep 12 2005 Rex Dieter  6.6-2
+- drop opendl patch (doesn't appear to be needed anymore)
+
+* Fri Sep 09 2005 Rex Dieter  6.6-1
 - 6.6
 
 * Wed May 25 2005 Rex Dieter  6.5-1



From fedora-extras-commits at redhat.com  Tue Sep 13 12:37:25 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 13 Sep 2005 08:37:25 -0400
Subject: rpms/gc/devel gc.spec,1.11,1.12
Message-ID: <200509131237.j8DCbPX4001074@cvs-int.fedora.redhat.com>

Author: rdieter

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

Modified Files:
	gc.spec 
Log Message:
* Mon Sep 12 2005 Rex Dieter  6.6-2
- drop opendl patch (doesn't appear to be needed anymore)



Index: gc.spec
===================================================================
RCS file: /cvs/extras/rpms/gc/devel/gc.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- gc.spec	9 Sep 2005 19:29:11 -0000	1.11
+++ gc.spec	13 Sep 2005 12:37:23 -0000	1.12
@@ -4,7 +4,7 @@
 Name:    gc	
 Version: 6.6
 
-Release: 1%{?dist}
+Release: 2%{?dist}
 Group:   System Environment/Libraries
 License: BSD
 Url:     http://www.hpl.hp.com/personal/Hans_Boehm/gc/	
@@ -29,7 +29,7 @@
 %prep
 %setup -n %{name}%{version}
 
-%patch1 -p1 -b .opendl
+#patch1 -p1 -b .opendl
 
 
 %build
@@ -83,7 +83,10 @@
 
 
 %changelog
-* Fri Sep 09 2005 Rex Dieter  6.6-1
+* Mon Sep 12 2005 Rex Dieter  6.6-2
+- drop opendl patch (doesn't appear to be needed anymore)
+
+* Fri Sep 09 2005 Rex Dieter  6.6-1
 - 6.6
 
 * Wed May 25 2005 Rex Dieter  6.5-1



From fedora-extras-commits at redhat.com  Tue Sep 13 13:56:42 2005
From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl))
Date: Tue, 13 Sep 2005 09:56:42 -0400
Subject: rpms/baobab/FC-4 baobab.spec,1.1,1.2
Message-ID: <200509131356.j8DDugJh003396@cvs-int.fedora.redhat.com>

Author: thl

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

Modified Files:
	baobab.spec 
Log Message:
Add dist again an remove INSTALL from doc


Index: baobab.spec
===================================================================
RCS file: /cvs/extras/rpms/baobab/FC-4/baobab.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- baobab.spec	13 Sep 2005 07:33:23 -0000	1.1
+++ baobab.spec	13 Sep 2005 13:56:40 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           baobab
 Version:        1.1.0
-Release:        2
+Release:        3%{?dist}
 Summary:        Graphical tool to analyse directory trees 
 
 Group:          Applications/System
@@ -49,7 +49,7 @@
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc COPYING INSTALL README AUTHORS
+%doc COPYING README AUTHORS
 %{_bindir}/%{name}
 %{_datadir}/applications/*-%{name}.desktop
 %{_datadir}/%{name}/
@@ -57,6 +57,9 @@
 
 
 %changelog
+* Sat Sep 10 2005 Thorsten Leemhuis  - 1.1.0-3
+- Don't ship INSTALL in doc as suggested by adrianr in #167940
+
 * Sat Sep 10 2005 Thorsten Leemhuis  - 1.1.0-2
 - Remove pre and post-run of update-desktop-database
 



From fedora-extras-commits at redhat.com  Tue Sep 13 13:56:43 2005
From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl))
Date: Tue, 13 Sep 2005 09:56:43 -0400
Subject: rpms/baobab/devel baobab.spec,1.1,1.2
Message-ID: <200509131356.j8DDuhHr003402@cvs-int.fedora.redhat.com>

Author: thl

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

Modified Files:
	baobab.spec 
Log Message:
Add dist again an remove INSTALL from doc


Index: baobab.spec
===================================================================
RCS file: /cvs/extras/rpms/baobab/devel/baobab.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- baobab.spec	13 Sep 2005 07:33:23 -0000	1.1
+++ baobab.spec	13 Sep 2005 13:56:41 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           baobab
 Version:        1.1.0
-Release:        2
+Release:        3%{?dist}
 Summary:        Graphical tool to analyse directory trees 
 
 Group:          Applications/System
@@ -49,7 +49,7 @@
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc COPYING INSTALL README AUTHORS
+%doc COPYING README AUTHORS
 %{_bindir}/%{name}
 %{_datadir}/applications/*-%{name}.desktop
 %{_datadir}/%{name}/
@@ -57,6 +57,9 @@
 
 
 %changelog
+* Sat Sep 10 2005 Thorsten Leemhuis  - 1.1.0-3
+- Don't ship INSTALL in doc as suggested by adrianr in #167940
+
 * Sat Sep 10 2005 Thorsten Leemhuis  - 1.1.0-2
 - Remove pre and post-run of update-desktop-database
 



From fedora-extras-commits at redhat.com  Tue Sep 13 14:14:19 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue, 13 Sep 2005 10:14:19 -0400
Subject: rpms/dkms/FC-3 dkms.spec,1.4,1.5
Message-ID: <200509131414.j8DEEJVC004924@cvs-int.fedora.redhat.com>

Author: spot

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

Modified Files:
	dkms.spec 
Log Message:

FC-3 has no kernel-devel



Index: dkms.spec
===================================================================
RCS file: /cvs/extras/rpms/dkms/FC-3/dkms.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- dkms.spec	12 Sep 2005 18:20:13 -0000	1.4
+++ dkms.spec	13 Sep 2005 14:14:17 -0000	1.5
@@ -1,7 +1,7 @@
 Summary: Dynamic Kernel Module Support Framework
 Name: dkms
 Version: 2.0.6
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPL
 Group: System Environment/Base
 BuildArch: noarch
@@ -10,7 +10,6 @@
 Provides: dkms-minimal
 Source0: http://linux.dell.com/dkms/dkms-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires: kernel-devel
 
 %description
 This package contains the framework for the Dynamic
@@ -102,6 +101,9 @@
 
 
 %changelog
+* Tue Sep 13 2005 Tom "spot" Callaway  2.0.6-3
+- no kernel-devel for FC-3
+
 * Mon Sep 12 2005 Tom "spot" Callaway  2.0.6-2
 - requires kernel-devel
 



From fedora-extras-commits at redhat.com  Tue Sep 13 14:14:20 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue, 13 Sep 2005 10:14:20 -0400
Subject: rpms/dkms/FC-4 dkms.spec,1.4,1.5
Message-ID: <200509131414.j8DEEKt0004930@cvs-int.fedora.redhat.com>

Author: spot

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

Modified Files:
	dkms.spec 
Log Message:

FC-3 has no kernel-devel



Index: dkms.spec
===================================================================
RCS file: /cvs/extras/rpms/dkms/FC-4/dkms.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- dkms.spec	12 Sep 2005 18:20:14 -0000	1.4
+++ dkms.spec	13 Sep 2005 14:14:17 -0000	1.5
@@ -1,7 +1,7 @@
 Summary: Dynamic Kernel Module Support Framework
 Name: dkms
 Version: 2.0.6
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPL
 Group: System Environment/Base
 BuildArch: noarch
@@ -102,6 +102,9 @@
 
 
 %changelog
+* Tue Sep 13 2005 Tom "spot" Callaway  2.0.6-3
+- no kernel-devel for FC-3
+
 * Mon Sep 12 2005 Tom "spot" Callaway  2.0.6-2
 - requires kernel-devel
 



From fedora-extras-commits at redhat.com  Tue Sep 13 14:14:20 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue, 13 Sep 2005 10:14:20 -0400
Subject: rpms/dkms/devel dkms.spec,1.5,1.6
Message-ID: <200509131414.j8DEEKOD004934@cvs-int.fedora.redhat.com>

Author: spot

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

Modified Files:
	dkms.spec 
Log Message:

FC-3 has no kernel-devel



Index: dkms.spec
===================================================================
RCS file: /cvs/extras/rpms/dkms/devel/dkms.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- dkms.spec	12 Sep 2005 18:20:19 -0000	1.5
+++ dkms.spec	13 Sep 2005 14:14:18 -0000	1.6
@@ -1,7 +1,7 @@
 Summary: Dynamic Kernel Module Support Framework
 Name: dkms
 Version: 2.0.6
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPL
 Group: System Environment/Base
 BuildArch: noarch
@@ -102,6 +102,9 @@
 
 
 %changelog
+* Tue Sep 13 2005 Tom "spot" Callaway  2.0.6-3
+- no kernel-devel for FC-3
+
 * Mon Sep 12 2005 Tom "spot" Callaway  2.0.6-2
 - requires kernel-devel
 



From fedora-extras-commits at redhat.com  Tue Sep 13 14:22:55 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue, 13 Sep 2005 10:22:55 -0400
Subject: rpms/perl-GnuPG-Interface - New directory
Message-ID: <200509131422.j8DEMtuD005143@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-GnuPG-Interface
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5123/perl-GnuPG-Interface

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




From fedora-extras-commits at redhat.com  Tue Sep 13 14:22:55 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue, 13 Sep 2005 10:22:55 -0400
Subject: rpms/perl-GnuPG-Interface/devel - New directory
Message-ID: <200509131423.j8DEMtkK005148@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-GnuPG-Interface/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5123/perl-GnuPG-Interface/devel

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




From fedora-extras-commits at redhat.com  Tue Sep 13 14:23:09 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue, 13 Sep 2005 10:23:09 -0400
Subject: rpms/perl-GnuPG-Interface Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200509131423.j8DEN9sB005197@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-GnuPG-Interface
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5168

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


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

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

common : CVS/Root
	@cvs checkout common

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

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


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Tue Sep 13 14:23:09 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue, 13 Sep 2005 10:23:09 -0400
Subject: rpms/perl-GnuPG-Interface/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200509131423.j8DEN9vJ005202@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-GnuPG-Interface/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5168/devel

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


--- NEW FILE .cvsignore ---


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

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Tue Sep 13 14:23:32 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue, 13 Sep 2005 10:23:32 -0400
Subject: rpms/perl-GnuPG-Interface import.log,1.1,1.2
Message-ID: <200509131424.j8DEO2WF005293@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-GnuPG-Interface
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5249

Modified Files:
	import.log 
Log Message:
auto-import perl-GnuPG-Interface-0.33-3 on branch devel from perl-GnuPG-Interface-0.33-3.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-GnuPG-Interface/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	13 Sep 2005 14:23:07 -0000	1.1
+++ import.log	13 Sep 2005 14:23:30 -0000	1.2
@@ -0,0 +1 @@
+perl-GnuPG-Interface-0_33-3:HEAD:perl-GnuPG-Interface-0.33-3.src.rpm:1126621407



From fedora-extras-commits at redhat.com  Tue Sep 13 14:23:33 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue, 13 Sep 2005 10:23:33 -0400
Subject: rpms/perl-GnuPG-Interface/devel
	GnuPG-Interface-0.33.tru-record-type.txt, NONE,
	1.1 perl-GnuPG-Interface.spec, NONE,
	1.1 secret-key-output-1.patch, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200509131424.j8DEO37r005297@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-GnuPG-Interface/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5249/devel

Modified Files:
	.cvsignore sources 
Added Files:
	GnuPG-Interface-0.33.tru-record-type.txt 
	perl-GnuPG-Interface.spec secret-key-output-1.patch 
Log Message:
auto-import perl-GnuPG-Interface-0.33-3 on branch devel from perl-GnuPG-Interface-0.33-3.src.rpm


--- NEW FILE GnuPG-Interface-0.33.tru-record-type.txt ---
--- lib/GnuPG/Interface.pm.orig	2004-12-05 11:09:00.000000000 +0100
+++ lib/GnuPG/Interface.pm	2004-12-05 11:09:46.000000000 +0100
@@ -543,7 +543,7 @@
 	    
 	    $current_key->push_subkeys( $current_signed_item );
 	}
-	else
+	elsif ( $record_type ne 'tru' )
 	{
 	    warn "unknown record type $record_type"; 
 	}


--- NEW FILE perl-GnuPG-Interface.spec ---
Name:           perl-GnuPG-Interface
Version:        0.33
Release:        3%{?dist}
Summary:        Perl interface to GnuPG
Group:          Development/Libraries
License:        GPL or Artistic
URL:            http://search.cpan.org/dist/GnuPG-Interface
Source0:        http://search.cpan.org/CPAN/authors/id/F/FT/FTOBIN/GnuPG-Interface-%{version}.tar.gz
Patch0:		GnuPG-Interface-0.33.tru-record-type.txt
Patch1:		secret-key-output-1.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  gpg, perl(Class::MethodMaker)
Requires:  gpg, perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))



%description
%{summary}.

%prep
%setup -q -n GnuPG-Interface-%{version}
perldoc -t perlgpl > GPL
perldoc -t perlartistic > Artistic

%patch0 -p0
%patch1 -p1

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

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

%check
chmod 0700 test
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc ChangeLog README NEWS THANKS COPYING GPL Artistic
%{perl_vendorlib}/GnuPG
%{perl_vendorlib}/auto/GnuPG
%{_mandir}/man3/*.3*


%changelog
* Sun Sep 11 2005 Matt Domsch  0.33-3
- use perldoc -t and %_smp_mflags

* Sun Aug 28 2005 Matt Domsch  0.33-2
- add Requires: gpg, always apply secret-key-output-1.patch, as it works on
  both gpg 1.4 and gpg2.

* Thu Aug 25 2005 Matt Domsch  0.33-1
- specfile changes per Paul Howarth's comments
- added GnuPG-Interface-0.33.tru-record-type.txt patch,
  borrowed from Mail-GPG-1.0.1

* Wed Aug 24 2005 Matt Domsch  0.33-0
- Initial package for Fedora Extras

secret-key-output-1.patch:

--- NEW FILE secret-key-output-1.patch ---
Binary files GnuPG-Interface-0.33/test/pubring.gpg and GnuPG-Interface-0.33-new/test/pubring.gpg differ
diff -urNp --exclude '*.orig' --exclude='*~' GnuPG-Interface-0.33/test/secret-keys/1.0.test GnuPG-Interface-0.33-new/test/secret-keys/1.0.test
--- GnuPG-Interface-0.33/test/secret-keys/1.0.test	2000-06-18 02:37:02.000000000 -0500
+++ GnuPG-Interface-0.33-new/test/secret-keys/1.0.test	2005-08-24 12:53:14.000000000 -0500
@@ -1,6 +1,7 @@
 test/secring.gpg
 ----------------
-sec  1024D/F950DA9C 2000-02-06 GnuPG test key (for testing purposes only)
-uid                            Foo Bar (1)
-ssb   768g/2E854A6B 2000-02-06
+sec   1024D/F950DA9C 2000-02-06 [expires: 2006-02-05]
+uid                  GnuPG test key (for testing purposes only)
+uid                  Foo Bar (1)
+ssb    768g/2E854A6B 2000-02-06
 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-GnuPG-Interface/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	13 Sep 2005 14:23:07 -0000	1.1
+++ .cvsignore	13 Sep 2005 14:23:31 -0000	1.2
@@ -0,0 +1 @@
+GnuPG-Interface-0.33.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-GnuPG-Interface/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	13 Sep 2005 14:23:07 -0000	1.1
+++ sources	13 Sep 2005 14:23:31 -0000	1.2
@@ -0,0 +1 @@
+7349795ec874c2af78eec7f274d96bc8  GnuPG-Interface-0.33.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep 13 14:26:34 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue, 13 Sep 2005 10:26:34 -0400
Subject: owners owners.list,1.197,1.198
Message-ID: <200509131426.j8DEQYxA005364@cvs-int.fedora.redhat.com>

Author: spot

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

Modified Files:
	owners.list 
Log Message:

perl-GnuPG-Interface: Perl interface to GnuPG (I'm just holding this for Matt Domsch until his paperwork is done) 



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.197
retrieving revision 1.198
diff -u -r1.197 -r1.198
--- owners.list	13 Sep 2005 09:01:53 -0000	1.197
+++ owners.list	13 Sep 2005 14:26:32 -0000	1.198
@@ -637,6 +637,7 @@
 Fedora Extras|perl-GD-SVG|GD SVG enables SVG output from scripts written using GD|thm at duke.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-GDTextUtil|Text utilities for use with GD|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Glib|Perl interface to GLib|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-GnuPG-Interface|Perl interface to GnuPG|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Graph|A Perl module for dealing with graphs, the abstract data structures|thm at duke.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Gtk2|Perl interface to the 2.x series of the Gimp Toolkit library|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Heap|A collection of routines for managing a heap data structure|thm at duke.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Tue Sep 13 14:34:07 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Tue, 13 Sep 2005 10:34:07 -0400
Subject: rpms/lighttpd/devel favicon.ico, NONE, 1.1 light_button.png, NONE,
	1.1 light_logo.png, NONE, 1.1 lighttpd-1.4.3-stat_cache.patch,
	NONE, 1.1 index.html, 1.1, 1.2 lighttpd.spec, 1.13,
	1.14 lighttpd.png, 1.1, NONE
Message-ID: <200509131434.j8DEY7As005737@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	index.html lighttpd.spec 
Added Files:
	favicon.ico light_button.png light_logo.png 
	lighttpd-1.4.3-stat_cache.patch 
Removed Files:
	lighttpd.png 
Log Message:
Add stat_cache patch to fix memleak and cosmetic changes for the default page.



--- NEW FILE favicon.ico ---

wOQ<0r
Tc!??;;;;A????????????????H_"?r;???s^
E?????0?U??;;???8?6????s;u?9q????X=?????sNt/,([???;??wPV?n????????	?h;;????B??N????L?E????????????ab???Z??N?s?K???????????????a?????vr??s|??~?????????p????W?t??Kyd?)?}????}R?pU??C&????zE?	?????QR????Z?D?;*E?g????G????g?!j\W?s?????????atx???q?????=n?)?AuU????G=???J ?o'???}???ao?????}???????X???????
lighttpd-1.4.3-stat_cache.patch:

--- NEW FILE lighttpd-1.4.3-stat_cache.patch ---
diff -Naupr lighttpd-1.4.3.orig/src/stat_cache.c lighttpd-1.4.3/src/stat_cache.c
--- lighttpd-1.4.3.orig/src/stat_cache.c	2005-08-29 12:39:34.000000000 +0200
+++ lighttpd-1.4.3/src/stat_cache.c	2005-09-13 13:55:03.000000000 +0200
@@ -215,13 +215,15 @@ static int stat_cache_attr_get(buffer *b
 }
 #endif
 
-static int hashme(buffer *str) {
-	int hash = 0;
+static uint32_t hashme(buffer *str) {
+	uint32_t hash = 0;
 	const char *s;
 	for (s = str->ptr; *s; s++) {
 		hash = hash * 53 + *s;
 	}
 
+	hash &= ~(1 << 31); /* strip the highest bit */
+
 	return hash;
 }
 


Index: index.html
===================================================================
RCS file: /cvs/extras/rpms/lighttpd/devel/index.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- index.html	23 Feb 2005 00:12:23 -0000	1.1
+++ index.html	13 Sep 2005 14:33:57 -0000	1.2
@@ -1,27 +1,28 @@
-
+
 
 
 
 
 
   Powered by lighttpd
+  
+  
   
 
-
-
-
    lighttpd - Lightning fast, light system requirements
    
+
 
 
    
-Powered by lighttpd
+LIGHTTPD - fly light.
 
    
 
 
    
-Powered by Fedora
+Powered by Fedora
    
+Powered by Lighttpd
 
    
 
 


Index: lighttpd.spec
===================================================================
RCS file: /cvs/extras/rpms/lighttpd/devel/lighttpd.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- lighttpd.spec	2 Sep 2005 10:45:33 -0000	1.13
+++ lighttpd.spec	13 Sep 2005 14:33:57 -0000	1.14
@@ -3,7 +3,7 @@
 Summary: Lightning fast webserver with light system requirements
 Name: lighttpd
 Version: 1.4.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: BSD
 Group: System Environment/Daemons
 URL: http://www.lighttpd.net/
@@ -11,9 +11,12 @@
 Source1: lighttpd.logrotate
 Source2: php.d-lighttpd.ini
 Source10: index.html
-Source11: lighttpd.png
+Source11: http://www.lighttpd.net/favicon.ico
 Source12: powered_by_fedora.png
+Source13: http://www.lighttpd.net/light_button.png
+Source14: http://www.lighttpd.net/light_logo.png
 Patch0: lighttpd-1.3.10-defaultconf.patch
+Patch1: lighttpd-1.4.3-stat_cache.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires(pre): /usr/sbin/useradd
 Requires(post): /sbin/chkconfig
@@ -64,6 +67,7 @@
 %prep
 %setup
 %patch0 -p1 -b .defaultconf
+%patch1 -p1 -b .stat_cache
 
 
 %build
@@ -103,7 +107,8 @@
 
 # Install our own default web page and images
 %{__mkdir_p} %{buildroot}%{webroot}
-%{__install} -p -m 0644 %{SOURCE10} %{SOURCE11} %{SOURCE12} \
+%{__install} -p -m 0644 %{SOURCE10} %{SOURCE11} %{SOURCE12} %{SOURCE13} \
+    %{SOURCE14} \
     %{buildroot}%{webroot}/
 
 # Install empty log directory to include
@@ -168,6 +173,13 @@
 
 
 %changelog
+* Tue Sep 13 2005 Matthias Saou  1.4.3-2
+- Include lighttpd-1.4.3-stat_cache.patch to fix memleak.
+
+* Fri Sep  2 2005 Matthias Saou  1.4.3-1.1
+- Rearrange the included index.html to include the new logo, button and
+  favicon from lighttpd.net.
+
 * Fri Sep  2 2005 Matthias Saou  1.4.3-1
 - Update to 1.4.3.
 - No longer override libdir at make install stage, use DESTDIR instead, as



From fedora-extras-commits at redhat.com  Tue Sep 13 14:49:51 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue, 13 Sep 2005 10:49:51 -0400
Subject: rpms/perl-GnuPG-Interface/devel perl-GnuPG-Interface.spec,1.1,1.2
Message-ID: <200509131449.j8DEnp6a005924@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-GnuPG-Interface/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5866/devel

Modified Files:
	perl-GnuPG-Interface.spec 
Log Message:

don't use patch1 for FC-3



Index: perl-GnuPG-Interface.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-GnuPG-Interface/devel/perl-GnuPG-Interface.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-GnuPG-Interface.spec	13 Sep 2005 14:23:31 -0000	1.1
+++ perl-GnuPG-Interface.spec	13 Sep 2005 14:49:49 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-GnuPG-Interface
 Version:        0.33
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Perl interface to GnuPG
 Group:          Development/Libraries
 License:        GPL or Artistic
@@ -53,6 +53,9 @@
 
 
 %changelog
+* Tue Sep 13 2005 Tom "spot" Callaway  0.33-4
+- FC-3 doesn't use the patch1
+
 * Sun Sep 11 2005 Matt Domsch  0.33-3
 - use perldoc -t and %_smp_mflags
 



From fedora-extras-commits at redhat.com  Tue Sep 13 14:49:45 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue, 13 Sep 2005 10:49:45 -0400
Subject: rpms/perl-GnuPG-Interface/FC-3 perl-GnuPG-Interface.spec,1.1,1.2
Message-ID: <200509131450.j8DEoFhJ005927@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-GnuPG-Interface/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5866/FC-3

Modified Files:
	perl-GnuPG-Interface.spec 
Log Message:

don't use patch1 for FC-3



Index: perl-GnuPG-Interface.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-GnuPG-Interface/FC-3/perl-GnuPG-Interface.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-GnuPG-Interface.spec	13 Sep 2005 14:23:31 -0000	1.1
+++ perl-GnuPG-Interface.spec	13 Sep 2005 14:49:43 -0000	1.2
@@ -1,13 +1,12 @@
 Name:           perl-GnuPG-Interface
 Version:        0.33
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Perl interface to GnuPG
 Group:          Development/Libraries
 License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/GnuPG-Interface
 Source0:        http://search.cpan.org/CPAN/authors/id/F/FT/FTOBIN/GnuPG-Interface-%{version}.tar.gz
 Patch0:		GnuPG-Interface-0.33.tru-record-type.txt
-Patch1:		secret-key-output-1.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  gpg, perl(Class::MethodMaker)
@@ -24,7 +23,6 @@
 perldoc -t perlartistic > Artistic
 
 %patch0 -p0
-%patch1 -p1
 
 %build
 %{__perl} Makefile.PL INSTALLDIRS=vendor
@@ -53,6 +51,9 @@
 
 
 %changelog
+* Tue Sep 13 2005 Tom "spot" Callaway  0.33-4
+- FC-3 doesn't use the patch1
+
 * Sun Sep 11 2005 Matt Domsch  0.33-3
 - use perldoc -t and %_smp_mflags
 



From fedora-extras-commits at redhat.com  Tue Sep 13 14:49:45 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue, 13 Sep 2005 10:49:45 -0400
Subject: rpms/perl-GnuPG-Interface/FC-4 perl-GnuPG-Interface.spec,1.1,1.2
Message-ID: <200509131450.j8DEoG0D005930@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-GnuPG-Interface/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5866/FC-4

Modified Files:
	perl-GnuPG-Interface.spec 
Log Message:

don't use patch1 for FC-3



Index: perl-GnuPG-Interface.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-GnuPG-Interface/FC-4/perl-GnuPG-Interface.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-GnuPG-Interface.spec	13 Sep 2005 14:23:31 -0000	1.1
+++ perl-GnuPG-Interface.spec	13 Sep 2005 14:49:43 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-GnuPG-Interface
 Version:        0.33
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Perl interface to GnuPG
 Group:          Development/Libraries
 License:        GPL or Artistic
@@ -53,6 +53,9 @@
 
 
 %changelog
+* Tue Sep 13 2005 Tom "spot" Callaway  0.33-4
+- FC-3 doesn't use the patch1
+
 * Sun Sep 11 2005 Matt Domsch  0.33-3
 - use perldoc -t and %_smp_mflags
 



From fedora-extras-commits at redhat.com  Tue Sep 13 14:55:43 2005
From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl))
Date: Tue, 13 Sep 2005 10:55:43 -0400
Subject: rpms/icu/FC-4 .cvsignore,1.3,1.4 icu.spec,1.3,1.4 sources,1.3,1.4
Message-ID: <200509131455.j8DEthlJ006079@cvs-int.fedora.redhat.com>

Author: thl

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

Modified Files:
	.cvsignore icu.spec sources 
Log Message:
Update to 3.4 and build with GCC4


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/icu/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	15 May 2005 18:08:49 -0000	1.3
+++ .cvsignore	13 Sep 2005 14:55:41 -0000	1.4
@@ -1,2 +1 @@
-icu-3.2.tgz
-icu-3.2-patch.tgz
+icu-3.4.tgz


Index: icu.spec
===================================================================
RCS file: /cvs/extras/rpms/icu/FC-4/icu.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- icu.spec	15 May 2005 18:08:49 -0000	1.3
+++ icu.spec	13 Sep 2005 14:55:41 -0000	1.4
@@ -1,21 +1,15 @@
-%define gcc32 1
-
 Name:           icu
-Version:        3.2
-Release:        3
+Version:        3.4
+Release:        3.1
 Summary:        International Components for Unicode
 
 Group:          Applications/Text
 License:        X License
 URL:            http://www.ibm.com/software/globalization/icu/
 Source0:        ftp://ftp.software.ibm.com/software/globalization/icu/%{version}/%{name}-%{version}.tgz
-Source1:        ftp://ftp.software.ibm.com/software/globalization/icu/3.2/icu-3.2-patch.tgz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  doxygen graphviz
-%if %{gcc32}
-BuildRequires:  compat-gcc-32-c++
-%endif
+BuildRequires:  doxygen
 
 %description
 The International Components for Unicode (ICU) libraries provide
@@ -53,18 +47,11 @@
 
 
 %prep
-%setup -q -n %{name} -a 1
-%{__patch} -p0 < icu-3.2-patch
-find . -name CVS -o -name .cvsignore | xargs -r rm -rf
-%{__perl} -pi -e 's/^(HAVE_DOT\b.*=).*$/$1 YES/' source/Doxyfile.in
-
+%setup -q -n %{name}
 
 %build
 cd source
-%if %{gcc32}
-%{expand: %%define optflags %(echo %{optflags} | sed -e s/-mtune=/-mcpu=/)}
-export CC=gcc32 CXX=g++32
-%endif
+export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
 %configure --enable-static --with-data-packaging=library --disable-samples
 make # %{?_smp_mflags} # -j(X>1) may "break" man pages as of 3.2, b.f.u #2357
 make doc
@@ -134,6 +121,21 @@
 
 
 %changelog
+* Tue Sep 13 2005 Thorsten Leemhuis  - 3.4-3.1
+- build with gcc 4 by using -fno-strict-aliasing
+
+* Wed Aug 31 2005 Thorsten Leemhuis  - 3.4-3
+- Use dist
+- gcc32 does not understand -fstack-protector and 
+  --param=ssp-buffer-size=4
+
+* Tue Aug  2 2005 Ville Skytt??  - 3.4-2
+- 3.4.
+
+* Sun Jul 31 2005 Ville Skytt??  - 3.4-0.2.d02
+- 3.4-d02.
+- Don't ship static libraries.
+
 * Wed Apr 27 2005 Ville Skytt??  - 3.2-3
 - Apply upstream case mapping mutex lock removal patch.
 - Build with gcc 3.2 as a temporary workaround for #152495.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/icu/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	15 May 2005 18:08:49 -0000	1.3
+++ sources	13 Sep 2005 14:55:41 -0000	1.4
@@ -1,2 +1 @@
-55a85d2365338ece483d275119fd990c  icu-3.2.tgz
-304f6cb1659967c7fbdeebca4f9c0e39  icu-3.2-patch.tgz
+b19f3b9eec1c44fba86b07f287801084  icu-3.4.tgz



From fedora-extras-commits at redhat.com  Tue Sep 13 15:09:12 2005
From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl))
Date: Tue, 13 Sep 2005 11:09:12 -0400
Subject: rpms/mail-notification/FC-4 mail-notification.spec,1.8,1.9
Message-ID: <200509131509.j8DF9CUU007538@cvs-int.fedora.redhat.com>

Author: thl

Update of /cvs/extras/rpms/mail-notification/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7516

Modified Files:
	mail-notification.spec 
Log Message:
rebuild for new icu


Index: mail-notification.spec
===================================================================
RCS file: /cvs/extras/rpms/mail-notification/FC-4/mail-notification.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- mail-notification.spec	16 Aug 2005 06:05:42 -0000	1.8
+++ mail-notification.spec	13 Sep 2005 15:09:09 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           mail-notification
 Version:        2.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Status icon that informs you if you have new mail
 
 Group:          Applications/Internet
@@ -113,6 +113,9 @@
 
 
 %changelog
+* Tue Sep 13 2005 Thorsten Leemhuis  - 2.0-2
+- rebuild for new icu
+
 * Wed Aug 10 2005 Thorsten Leemhuis  - 2.0-1
 - Update to 2.0 -- build without evolution support for now (seems it
   needs the whole evo-source)



From fedora-extras-commits at redhat.com  Tue Sep 13 15:27:28 2005
From: fedora-extras-commits at redhat.com (Robert Theisen (trobert))
Date: Tue, 13 Sep 2005 11:27:28 -0400
Subject: web/html/download mirrors.php,1.26,1.27
Message-ID: <200509131527.j8DFRSwG007829@cvs-int.fedora.redhat.com>

Author: trobert

Update of /cvs/fedora/web/html/download
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7803

Modified Files:
	mirrors.php 
Log Message:
Added new mirror http://mirror.hosting-concepts.com/pub/os/linux/fedora/



Index: mirrors.php
===================================================================
RCS file: /cvs/fedora/web/html/download/mirrors.php,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- mirrors.php	18 Jul 2005 17:31:53 -0000	1.26
+++ mirrors.php	13 Sep 2005 15:27:26 -0000	1.27
@@ -328,6 +328,7 @@
 	    
  • rsync://ftp.surfnet.nl/fedora
    • 
 	    
  • ftp://ftp.easynet.nl/mirror/fedora/
    • 
 	    
  • ftp://ftp.eu.uu.net/pub/linux/fedora/
    • 
+	    
  • http://mirror.hosting-concepts.com/pub/os/linux/fedora/
    • 
 	
 	
 	
  • Norway



From fedora-extras-commits at redhat.com  Tue Sep 13 15:27:32 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Tue, 13 Sep 2005 11:27:32 -0400
Subject: rpms/perl-Class-Inspector - New directory
Message-ID: <200509131527.j8DFRWoe007851@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Class-Inspector
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7825/perl-Class-Inspector

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




From fedora-extras-commits at redhat.com  Tue Sep 13 15:27:32 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Tue, 13 Sep 2005 11:27:32 -0400
Subject: rpms/perl-Class-Inspector/devel - New directory
Message-ID: <200509131527.j8DFRWoW007856@cvs-int.fedora.redhat.com>

Author: corsepiu

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

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




From fedora-extras-commits at redhat.com  Tue Sep 13 15:28:07 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Tue, 13 Sep 2005 11:28:07 -0400
Subject: rpms/perl-Class-Inspector Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200509131528.j8DFS7Co007910@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Class-Inspector
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7881

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


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

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

common : CVS/Root
	@cvs checkout common

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

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


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Tue Sep 13 15:28:07 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Tue, 13 Sep 2005 11:28:07 -0400
Subject: rpms/perl-Class-Inspector/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200509131528.j8DFS7sr007913@cvs-int.fedora.redhat.com>

Author: corsepiu

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

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


--- NEW FILE .cvsignore ---


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

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Tue Sep 13 15:29:12 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Tue, 13 Sep 2005 11:29:12 -0400
Subject: rpms/perl-Class-Inspector import.log,1.1,1.2
Message-ID: <200509131529.j8DFTC38007988@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Class-Inspector
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7953

Modified Files:
	import.log 
Log Message:
auto-import perl-Class-Inspector-1.12-1 on branch devel from perl-Class-Inspector-1.12-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-Inspector/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	13 Sep 2005 15:28:05 -0000	1.1
+++ import.log	13 Sep 2005 15:29:10 -0000	1.2
@@ -0,0 +1 @@
+perl-Class-Inspector-1_12-1:HEAD:perl-Class-Inspector-1.12-1.src.rpm:1126625334



From fedora-extras-commits at redhat.com  Tue Sep 13 15:29:12 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Tue, 13 Sep 2005 11:29:12 -0400
Subject: rpms/perl-Class-Inspector/devel perl-Class-Inspector.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200509131529.j8DFTCPJ007995@cvs-int.fedora.redhat.com>

Author: corsepiu

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

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Class-Inspector.spec 
Log Message:
auto-import perl-Class-Inspector-1.12-1 on branch devel from perl-Class-Inspector-1.12-1.src.rpm


--- NEW FILE perl-Class-Inspector.spec ---
Name: 		perl-Class-Inspector
Version: 	1.12
Release: 	1%{?dist}
Summary: 	Get information about a class and it's structur
License: 	GPL or Artistic
Group: 		Development/Libraries
URL: 		http://search.cpan.org/dist/Class-Inspector/
Source0: 	http://search.cpan.org/CPAN/authors/id/A/AD/ADAMK/Class-Inspector-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
BuildArch: noarch

# For better test coverage
BuildRequires: perl(Test::Pod) >= 1.00

%description
Class::Inspector allows you to get information about a loaded class.
Most or all of this information can be found in other ways, but they aren't
always very friendly, and usually involve a relatively high level of Perl
wizardry, or strange and unusual looking code. Class::Inspector attempts to
provide an easier, more friendly interface to this information.

%prep
%setup -q -n Class-Inspector-%{version}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

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

%clean
rm -rf $RPM_BUILD_ROOT

%check
make test

%files
%defattr(-,root,root,-)
%doc Changes LICENSE
%{perl_vendorlib}/Class
%{_mandir}/man3/*

%changelog
* Tue Sep 13 2005 Ralf Corsepius  - 1.12-1
- FE submission.

* Tue Sep 13 2005 Ralf Corsepius  - 1.12-0
- Upstream update.

* Wed Jun 22 2005 Ralf Corsepius  - 1.08-0.pm.0
- Initial packman version.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-Inspector/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	13 Sep 2005 15:28:05 -0000	1.1
+++ .cvsignore	13 Sep 2005 15:29:10 -0000	1.2
@@ -0,0 +1 @@
+Class-Inspector-1.12.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-Inspector/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	13 Sep 2005 15:28:05 -0000	1.1
+++ sources	13 Sep 2005 15:29:10 -0000	1.2
@@ -0,0 +1 @@
+c49feb019c32a720d64c887b05022a4b  Class-Inspector-1.12.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep 13 15:31:10 2005
From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer))
Date: Tue, 13 Sep 2005 11:31:10 -0400
Subject: rpms/glpk/devel glpk.spec,1.2,1.3
Message-ID: <200509131531.j8DFVAhU008056@cvs-int.fedora.redhat.com>

Author: qspencer

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

Modified Files:
	glpk.spec 
Log Message:
Remove dependency on base package that (currently) doesn't exist.



Index: glpk.spec
===================================================================
RCS file: /cvs/extras/rpms/glpk/devel/glpk.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- glpk.spec	9 Aug 2005 17:52:21 -0000	1.2
+++ glpk.spec	13 Sep 2005 15:31:07 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           glpk
 Version:        4.8
-Release:        2
+Release:        3
 Summary:        GNU Linear Programming Kit
 
 Group:          System Environment/Libraries
@@ -31,6 +31,7 @@
 %package devel
 Summary:        Development headers and files for GLPK
 Group:          Development/Libraries
+#Requires:       %{name} = %{version}-%{release}
 
 %description devel
 The glpk-devel package contains libraries and headers for developing
@@ -40,7 +41,7 @@
 %package utils
 Summary:        GLPK-related utilities and examples
 Group:          Development/Libraries
-Requires:       %{name} = %{version}-%{release}
+#Requires:       %{name} = %{version}-%{release}
 
 %description utils
 The glpk-utils package contains the standalone solver programs glpksol
@@ -85,6 +86,10 @@
 %{_bindir}/*
 
 %changelog
+* Tue Aug 09 2005 Quentin Spencer  4.8-3
+- Remove utils dependency on base package, since it doesn't exist until
+  shared libraries are enabled.
+
 * Tue Aug 09 2005 Quentin Spencer  4.8-2
 - Add -fPIC to compile flags.
 



From fedora-extras-commits at redhat.com  Tue Sep 13 15:32:58 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Tue, 13 Sep 2005 11:32:58 -0400
Subject: rpms/perl-Class-Inspector/devel perl-Class-Inspector.spec,1.1,1.2
Message-ID: <200509131532.j8DFWwRb008138@cvs-int.fedora.redhat.com>

Author: corsepiu

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

Modified Files:
	perl-Class-Inspector.spec 
Log Message:
Spec file cleanup


Index: perl-Class-Inspector.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-Inspector/devel/perl-Class-Inspector.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Class-Inspector.spec	13 Sep 2005 15:29:10 -0000	1.1
+++ perl-Class-Inspector.spec	13 Sep 2005 15:32:56 -0000	1.2
@@ -1,7 +1,7 @@
 Name: 		perl-Class-Inspector
 Version: 	1.12
-Release: 	1%{?dist}
-Summary: 	Get information about a class and it's structur
+Release: 	2%{?dist}
+Summary: 	Get information about a class and it's structure
 License: 	GPL or Artistic
 Group: 		Development/Libraries
 URL: 		http://search.cpan.org/dist/Class-Inspector/
@@ -43,16 +43,14 @@
 
 %files
 %defattr(-,root,root,-)
-%doc Changes LICENSE
+%doc Changes LICENSE README
 %{perl_vendorlib}/Class
 %{_mandir}/man3/*
 
 %changelog
+* Tue Sep 13 2005 Ralf Corsepius  - 1.12-2
+- Fix typo in %%summary.
+- Spec file cleanup.
+
 * Tue Sep 13 2005 Ralf Corsepius  - 1.12-1
 - FE submission.
-
-* Tue Sep 13 2005 Ralf Corsepius  - 1.12-0
-- Upstream update.
-
-* Wed Jun 22 2005 Ralf Corsepius  - 1.08-0.pm.0
-- Initial packman version.



From fedora-extras-commits at redhat.com  Tue Sep 13 15:34:27 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Tue, 13 Sep 2005 11:34:27 -0400
Subject: rpms/hddtemp/devel hddtemp.db,1.6,1.7 hddtemp.spec,1.12,1.13
Message-ID: <200509131535.j8DFYvjX008222@cvs-int.fedora.redhat.com>

Author: scop

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

Modified Files:
	hddtemp.db hddtemp.spec 
Log Message:
* Sun Sep 11 2005 Ville Skytt??  - 0.3-0.6.beta13
- Update drive database to 2005-09-11.



Index: hddtemp.db
===================================================================
RCS file: /cvs/extras/rpms/hddtemp/devel/hddtemp.db,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- hddtemp.db	12 Jun 2005 19:40:33 -0000	1.6
+++ hddtemp.db	13 Sep 2005 15:34:25 -0000	1.7
@@ -17,7 +17,6 @@
 # FUJITSU FUJITSU MPG3409AH EF 40.0GB
 # HITACHI HITACHI_DK23CA-10 9.8GB
 # HITACHI HITACHI_DK23CA-15 14.7GB
-# HITACHI HITACHI_DK23CA-30 29.3GB
 # SAMSUNG SAMSUNG SV3012H 29.4GB
 # SEAGATE ST310210A 10.0GB
 # SEAGATE ST310211A 9.8GB
@@ -45,6 +44,7 @@
 ########################################
 # "ExcelStor Technology CT215"    ??? ? "ExcelStor CT215"
 "ExcelStor Technology J3.0" 194 C "ExcelStor Technology 3xy (xy GB)"
+"ExcelStor Technology J6.0" 194 C "ExcelStor Technology 6xy (xy GB)"
 
 
 ########################################
@@ -76,8 +76,11 @@
 ########################################
 ############# Hitachi drives
 ########################################
+"HITACHI_DK13FA-40B"		194  C  "Hitachi DK13FA-40B"
 "HITACHI_DK228A-65"		0    C  "Hitachi DK228A-65"
+"HITACHI_DK23CA-15"		194  C  "Hitachi DK23CA-15"
 "HITACHI_DK23CA-20"		194  C  "Hitachi DK23CA-20"
+"HITACHI_DK23CA-30"		194  C  "Hitachi DK23CA-30"
 "HITACHI_DK23CA-30B"		194  C  "Hitachi DK23CA-30B"
 "HITACHI_DK23CA-75"		194  C  "Hitachi DK23CA-75"
 "HITACHI_DK23DA-[234]0"		194  C  "Hitachi DK23DA series"
@@ -94,11 +97,13 @@
 
 "HDS728080PLAT20"               194  C  "Hitachi Deskstar 7K80 80GB"
 
-"HDS722525VLSA80"		194  C  "Hitachi Deskstar 7K250 250GB, 7200RPM, 8MB, Serial-ATA"
+"HDS722525VLSA80"		194  C  "Hitachi Deskstar 7K250 250GB, 7200RPM, 8MB, SATA"
 
-"HDT722525DLAT80"               194  C  "Hitachi Deskstar T7K250 250GB, 7200RPM, 8MB, Parallel-ATA"
+"HDT722525DLAT80"               194  C  "Hitachi Deskstar T7K250 250GB, 7200RPM, 8MB, PATA"
+"HDT722516DLA380 V43O"		194  C  "Hitachi T7K250 SATA"
 
 "HTE726060M9AT00"               194  C  "Hitachi Travelstar 60GB (7200RPM)"
+"HTS424030M9AT00"               194  C  "Hitachi Travelstar 30GB (4200RPM)"
 "HTS424040M9AT00"               194  C  "Hitachi Travelstar 4K40 40GB 2MB cache (4200RPM)"
 "HTS541040G9AT00"		194  C  "Hitachi Travelstar 40GB (5400RPM)"
 "HTS541080G9AT00"		194  C  "Hitachi Travelstar 80GB (5400RPM)"
@@ -109,7 +114,6 @@
 "HTS548080M9AT00"		194  C  "Hitachi Travelstar 80GB (5400RPM)"
 "HTS726060M9AT00"		194  C  "Hitachi Travelstar 60GB"
 
-
 ########################################
 ############# IBM drives
 ########################################
@@ -134,7 +138,7 @@
 "IBM-DTLA-30[57]0[123467][05]"  194  C  "IBM Deskstar 40GV & 75GXP series"
 "IC25N0[1234]0ATCS04-0"		194  C  "IBM Travelstar 40GN serie"
 "IC25N0[24]0ATC[SX]05-0"	194  C  "IBM Travelstar 40GNX serie"
-"IC25N0(15|20|30)ATDA04-0"	194  C  "IBM Travelstar 30GN serie"
+"IC25N0(10|15|20|30)ATDA04-0"	194  C  "IBM Travelstar 30GN serie"
 "IC25N0[23468]0ATMR04*"		194  C  "Hitachi Travelstar 80GN"
 "IC25T048ATDA05-0"              194  C  "IBM Travelstar 48GH serie"
 "IC25T060ATC[SX]05-0"		194  C  "IBM Travelstar 60GH serie"
@@ -143,7 +147,6 @@
 "IC35L[01][23689]0AVV207*"	194  C  "IBM Deskstar 180GXP serie"
 
 
-
 ########################################
 ############# Maxtor drives
 ########################################
@@ -165,12 +168,15 @@
 "Maxtor 6B(08|12|16|20|25|30)0[RSPM]0"			194  C  "Maxtor DiamondMax Plus 10"
 "Maxtor 6E0[234]0L0"					194  C  "Maxtor DiamondMax Plus 8"
 "MAXTOR 6L0[2468]0[LJ][1234]"				194  C  "Maxtor DiamondMax Plus D740X family"
+"Maxtor 6L250R0"					194  C  "Maxtor DiamondMax 10 250GB 16MB buffer 7200rpm"
 "Maxtor 6Y(06|08|12|16|20|25)0[LPM]0"			194  C  "Maxtor DiamondMax Plus 9" 
 "Maxtor 7L300R0"					194  C  "Maxtor 7L300R0 MaxLine+III 300GB 7200rpm"
 "Maxtor 7Y250[PM]0"					194  C	"Maxtor MaXLine Plus II 250GB 7200RPM"
 "Maxtor 94098U8"			 		11   C  "Maxtor DiamondMax 40 94098U8"
 
 
+
+
 ########################################
 ############# Quantum drives
 ########################################
@@ -187,10 +193,12 @@
 ########################################
 # somenone reported a problem with the SP8004H which reports a temperature
 # 10?C below the ambient temperature
+"SAMSUNG HA(200|250)JC"					194  C  "Samsung SpinPoint V120CE series"
 "SAMSUNG MP0(302|402|603|804)H"				194  C  "Samsung SpinPoint M40 2.5inch"
 "SAMSUNG SW0434A"					0    C  "Samsung SW0434A"
 "SAMSUNG SP(2001|4002|6003|8004|40A2)H"			194  C  "Samsung SpinPoint P40 serie"
 "SAMSUNG SP(0612|0802|1203|1604|0812|1213|1614)N"	194  C  "Samsung SpinPoint P80 serie"
+#"SAMSUNG SP2014N"					194  C	"Samsung SpinPoint 200GB, 7200RPM, 8MB cache"
 "SAMSUNG SP(0612|0802|1203|1604|0812|1213|1614)C"	194  C  "Samsung SpinPoint P80 series - SATA"
 "SAMSUNG SP0411N"					194  C  "Samsung SpinPoint PL40 serie"
 "SAMSUNG SP(0812|1213|1614)C"				194  C  "Samsung Spinpoint 160G SATA"
@@ -201,6 +209,7 @@
 #"SAMSUNG SV1204H"					194  C  "Samsung 120G"
 "SAMSUNG SV(0401|0802|1203|1604)N"			194  C  "Samsung SpinPoint V80 serie"
 "SAMSUNG SV4012H"					194  C  "Samsung 40GB, 5400RPM, 2MB cache"
+"SAMSUNG SP(2014|2514)N"				194  C	"Samsung SpinPoint P120 series (7200RPM, 8MB cache)"
 
 
 ########################################
@@ -237,6 +246,7 @@
 "ST360020A"				194  C  "Seagate U Series 60020"
 "ST360021A"				194  C  "Seagate Barracuda IV ST360021A"
 "ST380011A"				194  C  "Seagate Barracuda 7200.7 80GB"
+"ST380012A"                             194  C  "Seagate ST380012A 80GB"
 "ST380013A"				194  C  "Seagate Barracuda 7200.7 80GB" 
 "ST380013AS"				194  C  "Seagate Barracuda 7200.7 80GB (Serial ATA)"
 "ST380020A"				194  C  "Seagate U Series 80020 (80Gb, Ultra ATA/100, 5400 rpm)"
@@ -252,6 +262,7 @@
 "ST3160021A"				194  C  "Seagate Barracuda 7200.7 - ST3160021A"
 "ST3160023(A|AS)"			194  C  "Seagate Barracuda V ST3160023A and AS (160Gb, ATA100 and Serial ATA)"
 "ST3200822A"                            194  C  "Seagate Barracuda 7200.7 Plus 200GB"
+"ST3200826A"                            194  C  "Seagate Barracuda 7200.8 200Gb"
 "ST3250823A"				194  C  "Seagate Barracuda 7200.8 250GB"
 "ST3250823A"                            194  C  "Seagate Barracuda 7200.7 Plus 250GB"
 "ST3300831A"				194  C  "Seagate 300GB ST3300831A"
@@ -261,7 +272,6 @@
 "ST960821A"                             194  C  "Seagate ST960821A"
 "ST960822A"                             194  C  "Seagate Momentus 5400.2 60GB"
 
-
 ########################################
 ############# TOSHIBA Laptops
 ########################################
@@ -273,6 +283,7 @@
 "TOSHIBA MK3021GAS"			194  C  "Toshiba MK3021GAS"
 "TOSHIBA MK3025GAS"                     194  C  "Toshiba MK3025GAS" 
 #"TOSHIBA MK4019GAX"			222  C  "Toshiba MK4019GAX"
+"TOSHIBA MK4021GAS"			194  C  "Toshiba MK4021GAS"
 "TOSHIBA MK4025GAS"			194  C  "Toshiba MK4025GAS 40 Go"
 "TOSHIBA MK6021GAS"			194  C	"Toshiba MK6021GAS"
 "TOSHIBA MK6022GAX"			194  C	"Toshiba MK6022GAX"
@@ -287,6 +298,10 @@
 ########################################
 # WDC AC310100B and WDC AC2850F are reported not working
 # no more informations were given
+"WDC AC22000L"						  0 C "Western Digital Caviar AC22000"
+"WDC AC420400D"                 			231 C "Western Digital Caviar AC420400D"
+"WDC AC418000D"						231 C "Western Digital AC418000D"
+
 "WDC WD100EB-00BHF0"            			  0 C "Western Digital 100EB-00BHF0"
 "WDC WD200BB-00AUA1"            			  0 C "Western Digital Caviar WD200BB"
 #"WDC WD200BB-60DGA0"					  0 C "Western Digital Caviar WD200BB"
@@ -299,9 +314,12 @@
 "WDC WD400BB-75FJA1"					194 C "Western Digital Caviar WD400BB"
 "WDC WD400EB-00CPF0"					  0 C "Western Digital 400EB-00CPF0"
 "WDC WD400JB-00(JJ|FM|FS)A0"				194 C "Western Digital Caviar 40GB Special Edition 8MB" 
+"WDC WD400JB-00JJC0"					194 C "Western Digital 400JB-00JJC0 40GB"
 "WDC WD600BB-32BSA0"					  0 C "Western Digital 600BB-32BSA0"
 "WDC WD600JB-00ETA0"					194 C "Western Digital 600JB-00ETA0"
 "WDC WD600LB-00DNA0"            			194 C "Western Digital 60GB"
+"WDC WD740GD-00FL21.0"					194 C "Western Digital SATA Raptor"
+"WDC WD740GD-(00FLC0|75FLA1)"				194 C "Western Digital SATA Raptor 74GB 8MB"
 "WDC WD800BB-00CAA1"					  0 C "Western Digital WD800BB-00CAA1"
 "WDC WD800BB-(00|22)DKA0"				194 C "Western Digital WD800BB 80 Go"
 "WDC WD800BB-32CCB0"					194 C "Western Digital 800BB-32CCB0"
@@ -316,20 +334,19 @@
 "WDC WD800LB-(00|55)DNA0"				194 C "Western Digital Caviar WD800LB 80 Go ATA-100"
 "WDC WD1200BB-00(FTA|GUA)0"				194 C "Western Digital Caviar EIDE 2MB Cache"
 "WDC WD1200JB-00(EV|FU|GV)A0"   			194 C "Western Digital Caviar 120GB Special Edition 8MB" 
+"WDC WD1200JB-22GVA0"                                   194 C "Western Digital Caviar 120GB"
 "WDC WD1200JD-00GBB0"           			194 C "Western Digital WD1200JD"
 "WDC WD1200LB-55EDA0"					194 C "Western Digital WD1220LB"
 "WDC WD1600BB-00DWA0"					194 C "Western Digital Caviar WD1600BB"
-"WDC WD1600JB-00(EV|FU|GV)A0"   			194 C "Western Digital Caviar 160GB Special Edition 8MB"
+"WDC WD1600JB-(00EV|00FU|00GV|75GV)A0"   		194 C "Western Digital Caviar 160GB Special Edition 8MB"
 "WDC WD2000JB-(00EV|34EV|00FU|00GV|55GV|98GV)A0"	194 C "Western Digital Caviar 200GB Special Edition 8MB"
 "WDC WD2500JB-(00FU|32FU|00GV|55GV)A0"			194 C "Western Digital Caviar 250GB Special Edition 8MB"
+"WDC WD2500JB-00GVC0"					194 C "Western Digital 250GB"
+"WDC WD2500JD-00GBB0"					194 C "Western Digital SATA Caviar 250GB Special Edition 8MB"
 "WDC WD2500PB-98FBA0"					194 C "Western Digital Caviar 250GB Special Edition 8MB"
-"WDC AC420400D"                 			231 C "Western Digital Caviar AC420400D"
-"WDC AC418000D"						231 C "Western Digital AC418000D"
 "WDC WD135BA"						231 C "Western Digital WD135BA"
 
+
 # not sure for next
 # "WDC WD1200JB-00CRA1"		9   C "Western Digital 1200JB-00CRA1"
 # "WDC WD273BA"			9   C "Western Digital WD273BA"
-
-# SATA drive with libata passthru
-"WDC WD740GD-00FL21.0"				194 C "Western Digital SATA Raptor"


Index: hddtemp.spec
===================================================================
RCS file: /cvs/extras/rpms/hddtemp/devel/hddtemp.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- hddtemp.spec	12 Jun 2005 19:40:33 -0000	1.12
+++ hddtemp.spec	13 Sep 2005 15:34:25 -0000	1.13
@@ -2,7 +2,7 @@
 
 Name:           hddtemp
 Version:        0.3
-Release:        0.5.%{beta}
+Release:        0.6.%{beta}%{?dist}
 Summary:        Hard disk temperature tool
 
 Group:          Applications/System
@@ -16,8 +16,10 @@
 Source5:        %{name}.consoleapp
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  %{__perl}, gettext
-Requires:       /sbin/chkconfig, usermode
+BuildRequires:  %{__perl}
+BuildRequires:  gettext
+Requires:       /sbin/chkconfig
+Requires:       %{_bindir}/consolehelper
 
 %description
 hddtemp is a tool that gives you the temperature of your hard drive by
@@ -94,6 +96,9 @@
 
 
 %changelog
+* Sun Sep 11 2005 Ville Skytt??  - 0.3-0.6.beta13
+- Update drive database to 2005-09-11.
+
 * Thu Jun  9 2005 Ville Skytt??  - 0.3-0.5.beta13
 - Update drive database to 2005-06-08.
 



From fedora-extras-commits at redhat.com  Tue Sep 13 15:34:27 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Tue, 13 Sep 2005 11:34:27 -0400
Subject: rpms/hddtemp/FC-4 hddtemp.db,1.6,1.7 hddtemp.spec,1.12,1.13
Message-ID: <200509131534.j8DFYvMO008220@cvs-int.fedora.redhat.com>

Author: scop

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

Modified Files:
	hddtemp.db hddtemp.spec 
Log Message:
* Sun Sep 11 2005 Ville Skytt??  - 0.3-0.6.beta13
- Update drive database to 2005-09-11.



Index: hddtemp.db
===================================================================
RCS file: /cvs/extras/rpms/hddtemp/FC-4/hddtemp.db,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- hddtemp.db	12 Jun 2005 19:40:32 -0000	1.6
+++ hddtemp.db	13 Sep 2005 15:34:24 -0000	1.7
@@ -17,7 +17,6 @@
 # FUJITSU FUJITSU MPG3409AH EF 40.0GB
 # HITACHI HITACHI_DK23CA-10 9.8GB
 # HITACHI HITACHI_DK23CA-15 14.7GB
-# HITACHI HITACHI_DK23CA-30 29.3GB
 # SAMSUNG SAMSUNG SV3012H 29.4GB
 # SEAGATE ST310210A 10.0GB
 # SEAGATE ST310211A 9.8GB
@@ -45,6 +44,7 @@
 ########################################
 # "ExcelStor Technology CT215"    ??? ? "ExcelStor CT215"
 "ExcelStor Technology J3.0" 194 C "ExcelStor Technology 3xy (xy GB)"
+"ExcelStor Technology J6.0" 194 C "ExcelStor Technology 6xy (xy GB)"
 
 
 ########################################
@@ -76,8 +76,11 @@
 ########################################
 ############# Hitachi drives
 ########################################
+"HITACHI_DK13FA-40B"		194  C  "Hitachi DK13FA-40B"
 "HITACHI_DK228A-65"		0    C  "Hitachi DK228A-65"
+"HITACHI_DK23CA-15"		194  C  "Hitachi DK23CA-15"
 "HITACHI_DK23CA-20"		194  C  "Hitachi DK23CA-20"
+"HITACHI_DK23CA-30"		194  C  "Hitachi DK23CA-30"
 "HITACHI_DK23CA-30B"		194  C  "Hitachi DK23CA-30B"
 "HITACHI_DK23CA-75"		194  C  "Hitachi DK23CA-75"
 "HITACHI_DK23DA-[234]0"		194  C  "Hitachi DK23DA series"
@@ -94,11 +97,13 @@
 
 "HDS728080PLAT20"               194  C  "Hitachi Deskstar 7K80 80GB"
 
-"HDS722525VLSA80"		194  C  "Hitachi Deskstar 7K250 250GB, 7200RPM, 8MB, Serial-ATA"
+"HDS722525VLSA80"		194  C  "Hitachi Deskstar 7K250 250GB, 7200RPM, 8MB, SATA"
 
-"HDT722525DLAT80"               194  C  "Hitachi Deskstar T7K250 250GB, 7200RPM, 8MB, Parallel-ATA"
+"HDT722525DLAT80"               194  C  "Hitachi Deskstar T7K250 250GB, 7200RPM, 8MB, PATA"
+"HDT722516DLA380 V43O"		194  C  "Hitachi T7K250 SATA"
 
 "HTE726060M9AT00"               194  C  "Hitachi Travelstar 60GB (7200RPM)"
+"HTS424030M9AT00"               194  C  "Hitachi Travelstar 30GB (4200RPM)"
 "HTS424040M9AT00"               194  C  "Hitachi Travelstar 4K40 40GB 2MB cache (4200RPM)"
 "HTS541040G9AT00"		194  C  "Hitachi Travelstar 40GB (5400RPM)"
 "HTS541080G9AT00"		194  C  "Hitachi Travelstar 80GB (5400RPM)"
@@ -109,7 +114,6 @@
 "HTS548080M9AT00"		194  C  "Hitachi Travelstar 80GB (5400RPM)"
 "HTS726060M9AT00"		194  C  "Hitachi Travelstar 60GB"
 
-
 ########################################
 ############# IBM drives
 ########################################
@@ -134,7 +138,7 @@
 "IBM-DTLA-30[57]0[123467][05]"  194  C  "IBM Deskstar 40GV & 75GXP series"
 "IC25N0[1234]0ATCS04-0"		194  C  "IBM Travelstar 40GN serie"
 "IC25N0[24]0ATC[SX]05-0"	194  C  "IBM Travelstar 40GNX serie"
-"IC25N0(15|20|30)ATDA04-0"	194  C  "IBM Travelstar 30GN serie"
+"IC25N0(10|15|20|30)ATDA04-0"	194  C  "IBM Travelstar 30GN serie"
 "IC25N0[23468]0ATMR04*"		194  C  "Hitachi Travelstar 80GN"
 "IC25T048ATDA05-0"              194  C  "IBM Travelstar 48GH serie"
 "IC25T060ATC[SX]05-0"		194  C  "IBM Travelstar 60GH serie"
@@ -143,7 +147,6 @@
 "IC35L[01][23689]0AVV207*"	194  C  "IBM Deskstar 180GXP serie"
 
 
-
 ########################################
 ############# Maxtor drives
 ########################################
@@ -165,12 +168,15 @@
 "Maxtor 6B(08|12|16|20|25|30)0[RSPM]0"			194  C  "Maxtor DiamondMax Plus 10"
 "Maxtor 6E0[234]0L0"					194  C  "Maxtor DiamondMax Plus 8"
 "MAXTOR 6L0[2468]0[LJ][1234]"				194  C  "Maxtor DiamondMax Plus D740X family"
+"Maxtor 6L250R0"					194  C  "Maxtor DiamondMax 10 250GB 16MB buffer 7200rpm"
 "Maxtor 6Y(06|08|12|16|20|25)0[LPM]0"			194  C  "Maxtor DiamondMax Plus 9" 
 "Maxtor 7L300R0"					194  C  "Maxtor 7L300R0 MaxLine+III 300GB 7200rpm"
 "Maxtor 7Y250[PM]0"					194  C	"Maxtor MaXLine Plus II 250GB 7200RPM"
 "Maxtor 94098U8"			 		11   C  "Maxtor DiamondMax 40 94098U8"
 
 
+
+
 ########################################
 ############# Quantum drives
 ########################################
@@ -187,10 +193,12 @@
 ########################################
 # somenone reported a problem with the SP8004H which reports a temperature
 # 10?C below the ambient temperature
+"SAMSUNG HA(200|250)JC"					194  C  "Samsung SpinPoint V120CE series"
 "SAMSUNG MP0(302|402|603|804)H"				194  C  "Samsung SpinPoint M40 2.5inch"
 "SAMSUNG SW0434A"					0    C  "Samsung SW0434A"
 "SAMSUNG SP(2001|4002|6003|8004|40A2)H"			194  C  "Samsung SpinPoint P40 serie"
 "SAMSUNG SP(0612|0802|1203|1604|0812|1213|1614)N"	194  C  "Samsung SpinPoint P80 serie"
+#"SAMSUNG SP2014N"					194  C	"Samsung SpinPoint 200GB, 7200RPM, 8MB cache"
 "SAMSUNG SP(0612|0802|1203|1604|0812|1213|1614)C"	194  C  "Samsung SpinPoint P80 series - SATA"
 "SAMSUNG SP0411N"					194  C  "Samsung SpinPoint PL40 serie"
 "SAMSUNG SP(0812|1213|1614)C"				194  C  "Samsung Spinpoint 160G SATA"
@@ -201,6 +209,7 @@
 #"SAMSUNG SV1204H"					194  C  "Samsung 120G"
 "SAMSUNG SV(0401|0802|1203|1604)N"			194  C  "Samsung SpinPoint V80 serie"
 "SAMSUNG SV4012H"					194  C  "Samsung 40GB, 5400RPM, 2MB cache"
+"SAMSUNG SP(2014|2514)N"				194  C	"Samsung SpinPoint P120 series (7200RPM, 8MB cache)"
 
 
 ########################################
@@ -237,6 +246,7 @@
 "ST360020A"				194  C  "Seagate U Series 60020"
 "ST360021A"				194  C  "Seagate Barracuda IV ST360021A"
 "ST380011A"				194  C  "Seagate Barracuda 7200.7 80GB"
+"ST380012A"                             194  C  "Seagate ST380012A 80GB"
 "ST380013A"				194  C  "Seagate Barracuda 7200.7 80GB" 
 "ST380013AS"				194  C  "Seagate Barracuda 7200.7 80GB (Serial ATA)"
 "ST380020A"				194  C  "Seagate U Series 80020 (80Gb, Ultra ATA/100, 5400 rpm)"
@@ -252,6 +262,7 @@
 "ST3160021A"				194  C  "Seagate Barracuda 7200.7 - ST3160021A"
 "ST3160023(A|AS)"			194  C  "Seagate Barracuda V ST3160023A and AS (160Gb, ATA100 and Serial ATA)"
 "ST3200822A"                            194  C  "Seagate Barracuda 7200.7 Plus 200GB"
+"ST3200826A"                            194  C  "Seagate Barracuda 7200.8 200Gb"
 "ST3250823A"				194  C  "Seagate Barracuda 7200.8 250GB"
 "ST3250823A"                            194  C  "Seagate Barracuda 7200.7 Plus 250GB"
 "ST3300831A"				194  C  "Seagate 300GB ST3300831A"
@@ -261,7 +272,6 @@
 "ST960821A"                             194  C  "Seagate ST960821A"
 "ST960822A"                             194  C  "Seagate Momentus 5400.2 60GB"
 
-
 ########################################
 ############# TOSHIBA Laptops
 ########################################
@@ -273,6 +283,7 @@
 "TOSHIBA MK3021GAS"			194  C  "Toshiba MK3021GAS"
 "TOSHIBA MK3025GAS"                     194  C  "Toshiba MK3025GAS" 
 #"TOSHIBA MK4019GAX"			222  C  "Toshiba MK4019GAX"
+"TOSHIBA MK4021GAS"			194  C  "Toshiba MK4021GAS"
 "TOSHIBA MK4025GAS"			194  C  "Toshiba MK4025GAS 40 Go"
 "TOSHIBA MK6021GAS"			194  C	"Toshiba MK6021GAS"
 "TOSHIBA MK6022GAX"			194  C	"Toshiba MK6022GAX"
@@ -287,6 +298,10 @@
 ########################################
 # WDC AC310100B and WDC AC2850F are reported not working
 # no more informations were given
+"WDC AC22000L"						  0 C "Western Digital Caviar AC22000"
+"WDC AC420400D"                 			231 C "Western Digital Caviar AC420400D"
+"WDC AC418000D"						231 C "Western Digital AC418000D"
+
 "WDC WD100EB-00BHF0"            			  0 C "Western Digital 100EB-00BHF0"
 "WDC WD200BB-00AUA1"            			  0 C "Western Digital Caviar WD200BB"
 #"WDC WD200BB-60DGA0"					  0 C "Western Digital Caviar WD200BB"
@@ -299,9 +314,12 @@
 "WDC WD400BB-75FJA1"					194 C "Western Digital Caviar WD400BB"
 "WDC WD400EB-00CPF0"					  0 C "Western Digital 400EB-00CPF0"
 "WDC WD400JB-00(JJ|FM|FS)A0"				194 C "Western Digital Caviar 40GB Special Edition 8MB" 
+"WDC WD400JB-00JJC0"					194 C "Western Digital 400JB-00JJC0 40GB"
 "WDC WD600BB-32BSA0"					  0 C "Western Digital 600BB-32BSA0"
 "WDC WD600JB-00ETA0"					194 C "Western Digital 600JB-00ETA0"
 "WDC WD600LB-00DNA0"            			194 C "Western Digital 60GB"
+"WDC WD740GD-00FL21.0"					194 C "Western Digital SATA Raptor"
+"WDC WD740GD-(00FLC0|75FLA1)"				194 C "Western Digital SATA Raptor 74GB 8MB"
 "WDC WD800BB-00CAA1"					  0 C "Western Digital WD800BB-00CAA1"
 "WDC WD800BB-(00|22)DKA0"				194 C "Western Digital WD800BB 80 Go"
 "WDC WD800BB-32CCB0"					194 C "Western Digital 800BB-32CCB0"
@@ -316,20 +334,19 @@
 "WDC WD800LB-(00|55)DNA0"				194 C "Western Digital Caviar WD800LB 80 Go ATA-100"
 "WDC WD1200BB-00(FTA|GUA)0"				194 C "Western Digital Caviar EIDE 2MB Cache"
 "WDC WD1200JB-00(EV|FU|GV)A0"   			194 C "Western Digital Caviar 120GB Special Edition 8MB" 
+"WDC WD1200JB-22GVA0"                                   194 C "Western Digital Caviar 120GB"
 "WDC WD1200JD-00GBB0"           			194 C "Western Digital WD1200JD"
 "WDC WD1200LB-55EDA0"					194 C "Western Digital WD1220LB"
 "WDC WD1600BB-00DWA0"					194 C "Western Digital Caviar WD1600BB"
-"WDC WD1600JB-00(EV|FU|GV)A0"   			194 C "Western Digital Caviar 160GB Special Edition 8MB"
+"WDC WD1600JB-(00EV|00FU|00GV|75GV)A0"   		194 C "Western Digital Caviar 160GB Special Edition 8MB"
 "WDC WD2000JB-(00EV|34EV|00FU|00GV|55GV|98GV)A0"	194 C "Western Digital Caviar 200GB Special Edition 8MB"
 "WDC WD2500JB-(00FU|32FU|00GV|55GV)A0"			194 C "Western Digital Caviar 250GB Special Edition 8MB"
+"WDC WD2500JB-00GVC0"					194 C "Western Digital 250GB"
+"WDC WD2500JD-00GBB0"					194 C "Western Digital SATA Caviar 250GB Special Edition 8MB"
 "WDC WD2500PB-98FBA0"					194 C "Western Digital Caviar 250GB Special Edition 8MB"
-"WDC AC420400D"                 			231 C "Western Digital Caviar AC420400D"
-"WDC AC418000D"						231 C "Western Digital AC418000D"
 "WDC WD135BA"						231 C "Western Digital WD135BA"
 
+
 # not sure for next
 # "WDC WD1200JB-00CRA1"		9   C "Western Digital 1200JB-00CRA1"
 # "WDC WD273BA"			9   C "Western Digital WD273BA"
-
-# SATA drive with libata passthru
-"WDC WD740GD-00FL21.0"				194 C "Western Digital SATA Raptor"


Index: hddtemp.spec
===================================================================
RCS file: /cvs/extras/rpms/hddtemp/FC-4/hddtemp.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- hddtemp.spec	12 Jun 2005 19:40:32 -0000	1.12
+++ hddtemp.spec	13 Sep 2005 15:34:24 -0000	1.13
@@ -2,7 +2,7 @@
 
 Name:           hddtemp
 Version:        0.3
-Release:        0.4.%{beta}.1
+Release:        0.6.%{beta}%{?dist}
 Summary:        Hard disk temperature tool
 
 Group:          Applications/System
@@ -16,8 +16,10 @@
 Source5:        %{name}.consoleapp
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  %{__perl}, gettext
-Requires:       /sbin/chkconfig, usermode
+BuildRequires:  %{__perl}
+BuildRequires:  gettext
+Requires:       /sbin/chkconfig
+Requires:       %{_bindir}/consolehelper
 
 %description
 hddtemp is a tool that gives you the temperature of your hard drive by
@@ -94,7 +96,10 @@
 
 
 %changelog
-* Thu Jun  9 2005 Ville Skytt??  - 0.3-0.4.beta13.1
+* Sun Sep 11 2005 Ville Skytt??  - 0.3-0.6.beta13
+- Update drive database to 2005-09-11.
+
+* Thu Jun  9 2005 Ville Skytt??  - 0.3-0.5.beta13
 - Update drive database to 2005-06-08.
 
 * Sat May 28 2005 Ville Skytt??  - 0.3-0.4.beta13



From fedora-extras-commits at redhat.com  Tue Sep 13 15:55:59 2005
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Tue, 13 Sep 2005 11:55:59 -0400
Subject: extras-buildsys/utils distro-rebuild.py,1.4,1.5
Message-ID: <200509131555.j8DFtxn6008520@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys/utils
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8501

Modified Files:
	distro-rebuild.py 
Log Message:
Alphabetize packages for enqueue


Index: distro-rebuild.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/distro-rebuild.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- distro-rebuild.py	11 Sep 2005 04:00:12 -0000	1.4
+++ distro-rebuild.py	13 Sep 2005 15:55:56 -0000	1.5
@@ -160,7 +160,9 @@
     temp_dirs = []
     
     # Rebuild and enqueue the packages
-    for name in files.keys():
+    names = files.keys()
+    names.sort()
+    for name in names:
         f = files[name]
         try:
             (rebuilt_srpm, temp_dir_path) = rebuild_srpm(name, f)



From fedora-extras-commits at redhat.com  Tue Sep 13 16:17:38 2005
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Tue, 13 Sep 2005 12:17:38 -0400
Subject: rpms/perl-Apache-Session - New directory
Message-ID: <200509131617.j8DGHcTq010029@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Apache-Session
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10009/perl-Apache-Session

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




From fedora-extras-commits at redhat.com  Tue Sep 13 16:17:38 2005
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Tue, 13 Sep 2005 12:17:38 -0400
Subject: rpms/perl-Apache-Session/devel - New directory
Message-ID: <200509131617.j8DGHcoT010034@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Apache-Session/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10009/perl-Apache-Session/devel

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




From fedora-extras-commits at redhat.com  Tue Sep 13 16:18:00 2005
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Tue, 13 Sep 2005 12:18:00 -0400
Subject: rpms/perl-Apache-Session Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200509131618.j8DGI0wF010089@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Apache-Session
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10054

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


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

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

common : CVS/Root
	@cvs checkout common

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

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


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Tue Sep 13 16:18:01 2005
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Tue, 13 Sep 2005 12:18:01 -0400
Subject: rpms/perl-Apache-Session/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200509131618.j8DGI1jB010094@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Apache-Session/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10054/devel

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


--- NEW FILE .cvsignore ---


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

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Tue Sep 13 16:18:45 2005
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Tue, 13 Sep 2005 12:18:45 -0400
Subject: rpms/perl-Apache-Session import.log,1.1,1.2
Message-ID: <200509131619.j8DGJFwB010168@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Apache-Session
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10127

Modified Files:
	import.log 
Log Message:
auto-import perl-Apache-Session-1.6-2 on branch devel from perl-Apache-Session-1.6-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Apache-Session/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	13 Sep 2005 16:17:58 -0000	1.1
+++ import.log	13 Sep 2005 16:18:42 -0000	1.2
@@ -0,0 +1 @@
+perl-Apache-Session-1_6-2:HEAD:perl-Apache-Session-1.6-2.src.rpm:1126628314



From fedora-extras-commits at redhat.com  Tue Sep 13 16:18:45 2005
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Tue, 13 Sep 2005 12:18:45 -0400
Subject: rpms/perl-Apache-Session/devel Apache-Session-mp2.patch, NONE,
	1.1 perl-Apache-Session.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200509131619.j8DGJFuB010172@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Apache-Session/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10127/devel

Modified Files:
	.cvsignore sources 
Added Files:
	Apache-Session-mp2.patch perl-Apache-Session.spec 
Log Message:
auto-import perl-Apache-Session-1.6-2 on branch devel from perl-Apache-Session-1.6-2.src.rpm

Apache-Session-mp2.patch:

--- NEW FILE Apache-Session-mp2.patch ---
 - make Session::Generate::ModUsertrack work with MP2.

--- ./Session/Generate/ModUsertrack.pm	2001-10-11 10:43:32.000000000 -0700
+++ ./Session/Generate/ModUsertrack.pm.mp2	2005-09-07 16:01:11.798128185 -0700
@@ -15,8 +15,14 @@
 
     if (!exists $cookies{$name} && MOD_PERL) {
 	# no cookies, try to steal from notes
-	require Apache;
-	my $r = Apache->request;
+	my $r;
+	if ( $ENV{MOD_PERL_API_VERION} == 2 ) {
+	    require Apache2::RequestUtil;
+	    $r = Apache2::RequestUtil->request;
+	} else {
+	    require Apache;
+	    $r = Apache->request;
+	}
 	%cookies = CGI::Cookie->parse($r->notes('cookie'));
     }
 


--- NEW FILE perl-Apache-Session.spec ---
Name:           perl-Apache-Session
Version:        1.6
Release:        2%{?dist}
Summary:        Apache::Session Perl module
License:        Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Apache-Session/
Source0:        http://www.cpan.org/modules/by-module/Apache/Apache-Session-1.6.tar.gz
# https://bugzilla.redhat.com/bugzilla/attachment.cgi?id=118577, from Chris Grau
Patch0:         Apache-Session-mp2.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(DBI)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
These modules provide persistent storage for arbitrary data, in arbitrary
backing stores.  The details of interacting with the backing store are
abstracted to make all backing stores behave alike.  The programmer simply
interacts with a tied hash.

%prep
%setup -q -n Apache-Session-%{version}
%patch0 -p0

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT

make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT

find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null \;

chmod -R u+rwX,go+rX,go-w $RPM_BUILD_ROOT/*

perldoc -t perlartistic > Artistic

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc CHANGES README TODO Artistic
%{perl_vendorlib}/Apache
%{_mandir}/man3/Apache*

%changelog
* Thu Sep 08 2005 Steven Pritchard  1.6-2
- Add patch for mod_perl2 compatibility from Chris Grau (#167753, comment #3).
- Re-enable "make test".

* Wed Aug 31 2005 Steven Pritchard  1.6-1
- Specfile autogenerated.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Apache-Session/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	13 Sep 2005 16:17:58 -0000	1.1
+++ .cvsignore	13 Sep 2005 16:18:43 -0000	1.2
@@ -0,0 +1 @@
+Apache-Session-1.6.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Apache-Session/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	13 Sep 2005 16:17:58 -0000	1.1
+++ sources	13 Sep 2005 16:18:43 -0000	1.2
@@ -0,0 +1 @@
+3a373102e3ba49f93a76994c6599e1ff  Apache-Session-1.6.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep 13 16:20:44 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Tue, 13 Sep 2005 12:20:44 -0400
Subject: rpms/perl-Class-Inspector/FC-3 perl-Class-Inspector.spec,1.2,1.3
Message-ID: <200509131620.j8DGKiHd010282@cvs-int.fedora.redhat.com>

Author: corsepiu

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

Modified Files:
	perl-Class-Inspector.spec 
Log Message:
Fix another typo in %%summary.


Index: perl-Class-Inspector.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-Inspector/FC-3/perl-Class-Inspector.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Class-Inspector.spec	13 Sep 2005 15:32:56 -0000	1.2
+++ perl-Class-Inspector.spec	13 Sep 2005 16:20:42 -0000	1.3
@@ -1,7 +1,7 @@
 Name: 		perl-Class-Inspector
 Version: 	1.12
 Release: 	2%{?dist}
-Summary: 	Get information about a class and it's structure
+Summary: 	Get information about a class and its structure
 License: 	GPL or Artistic
 Group: 		Development/Libraries
 URL: 		http://search.cpan.org/dist/Class-Inspector/
@@ -48,6 +48,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Tue Sep 13 2005 Ralf Corsepius 
+- Fix another typo in %%summary.
+
 * Tue Sep 13 2005 Ralf Corsepius  - 1.12-2
 - Fix typo in %%summary.
 - Spec file cleanup.



From fedora-extras-commits at redhat.com  Tue Sep 13 16:20:45 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Tue, 13 Sep 2005 12:20:45 -0400
Subject: rpms/perl-Class-Inspector/FC-4 perl-Class-Inspector.spec,1.2,1.3
Message-ID: <200509131620.j8DGKjS3010288@cvs-int.fedora.redhat.com>

Author: corsepiu

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

Modified Files:
	perl-Class-Inspector.spec 
Log Message:
Fix another typo in %%summary.


Index: perl-Class-Inspector.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-Inspector/FC-4/perl-Class-Inspector.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Class-Inspector.spec	13 Sep 2005 15:32:56 -0000	1.2
+++ perl-Class-Inspector.spec	13 Sep 2005 16:20:43 -0000	1.3
@@ -1,7 +1,7 @@
 Name: 		perl-Class-Inspector
 Version: 	1.12
 Release: 	2%{?dist}
-Summary: 	Get information about a class and it's structure
+Summary: 	Get information about a class and its structure
 License: 	GPL or Artistic
 Group: 		Development/Libraries
 URL: 		http://search.cpan.org/dist/Class-Inspector/
@@ -48,6 +48,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Tue Sep 13 2005 Ralf Corsepius 
+- Fix another typo in %%summary.
+
 * Tue Sep 13 2005 Ralf Corsepius  - 1.12-2
 - Fix typo in %%summary.
 - Spec file cleanup.



From fedora-extras-commits at redhat.com  Tue Sep 13 16:20:45 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Tue, 13 Sep 2005 12:20:45 -0400
Subject: rpms/perl-Class-Inspector/devel perl-Class-Inspector.spec,1.2,1.3
Message-ID: <200509131620.j8DGKjUJ010297@cvs-int.fedora.redhat.com>

Author: corsepiu

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

Modified Files:
	perl-Class-Inspector.spec 
Log Message:
Fix another typo in %%summary.


Index: perl-Class-Inspector.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-Inspector/devel/perl-Class-Inspector.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Class-Inspector.spec	13 Sep 2005 15:32:56 -0000	1.2
+++ perl-Class-Inspector.spec	13 Sep 2005 16:20:43 -0000	1.3
@@ -1,7 +1,7 @@
 Name: 		perl-Class-Inspector
 Version: 	1.12
 Release: 	2%{?dist}
-Summary: 	Get information about a class and it's structure
+Summary: 	Get information about a class and its structure
 License: 	GPL or Artistic
 Group: 		Development/Libraries
 URL: 		http://search.cpan.org/dist/Class-Inspector/
@@ -48,6 +48,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Tue Sep 13 2005 Ralf Corsepius 
+- Fix another typo in %%summary.
+
 * Tue Sep 13 2005 Ralf Corsepius  - 1.12-2
 - Fix typo in %%summary.
 - Spec file cleanup.



From fedora-extras-commits at redhat.com  Tue Sep 13 16:20:45 2005
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Tue, 13 Sep 2005 12:20:45 -0400
Subject: owners owners.list,1.198,1.199
Message-ID: <200509131621.j8DGLFc9010311@cvs-int.fedora.redhat.com>

Author: steve

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

Modified Files:
	owners.list 
Log Message:
Adding perl-Apache-Session.


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.198
retrieving revision 1.199
diff -u -r1.198 -r1.199
--- owners.list	13 Sep 2005 14:26:32 -0000	1.198
+++ owners.list	13 Sep 2005 16:20:43 -0000	1.199
@@ -565,6 +565,7 @@
 Fedora Extras|pdftohtml|A PDF to HTML converter|gauret at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|perl-Algorithm-Diff|Algorithm::Diff Perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Apache-LogRegex|Perl module for parsing a line from an Apache logfile into a hash|ghenry at suretecsystems.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Apache-Session|Apache::Session Perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Apache-Session-Wrapper|A simple wrapper around Apache::Session|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-AppConfig|Perl module for reading configuration files|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Archive-Zip|Perl library for accessing Zip archives|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Tue Sep 13 16:23:48 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Tue, 13 Sep 2005 12:23:48 -0400
Subject: owners owners.list,1.199,1.200
Message-ID: <200509131623.j8DGNmvL010377@cvs-int.fedora.redhat.com>

Author: corsepiu

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

Modified Files:
	owners.list 
Log Message:
Add perl-Class-Inspector


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.199
retrieving revision 1.200
diff -u -r1.199 -r1.200
--- owners.list	13 Sep 2005 16:20:43 -0000	1.199
+++ owners.list	13 Sep 2005 16:23:45 -0000	1.200
@@ -596,6 +596,7 @@
 Fedora Extras|perl-Class-DBI-Plugin-RetrieveAll|More complex retrieve_all() for Class::DBI|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Class-DBI-Plugin-Type|Determine type information for columns|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Class-DBI-SQLite|Extension to Class::DBI for sqlite|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Class-Inspector|Get information about a class and its structure|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Class-MethodMaker|Create generic methods for OO Perl|dgregor at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Class-ReturnValue|Class::ReturnValue Perl module|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Class-Singleton|Class::Singleton Perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Tue Sep 13 16:42:52 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Tue, 13 Sep 2005 12:42:52 -0400
Subject: rpms/perl-File-Remove - New directory
Message-ID: <200509131642.j8DGgqLU010716@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-File-Remove
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10696/perl-File-Remove

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




From fedora-extras-commits at redhat.com  Tue Sep 13 16:42:52 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Tue, 13 Sep 2005 12:42:52 -0400
Subject: rpms/perl-File-Remove/devel - New directory
Message-ID: <200509131642.j8DGgqC2010721@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-File-Remove/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10696/perl-File-Remove/devel

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




From fedora-extras-commits at redhat.com  Tue Sep 13 16:43:23 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Tue, 13 Sep 2005 12:43:23 -0400
Subject: rpms/perl-File-Remove Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200509131643.j8DGhNC1010776@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-File-Remove
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10741

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


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

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

common : CVS/Root
	@cvs checkout common

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

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


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Tue Sep 13 16:43:24 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Tue, 13 Sep 2005 12:43:24 -0400
Subject: rpms/perl-File-Remove/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200509131643.j8DGhOLg010781@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-File-Remove/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10741/devel

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


--- NEW FILE .cvsignore ---


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

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Tue Sep 13 16:44:08 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Tue, 13 Sep 2005 12:44:08 -0400
Subject: rpms/perl-File-Remove import.log,1.1,1.2
Message-ID: <200509131644.j8DGi8PT010849@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-File-Remove
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10809

Modified Files:
	import.log 
Log Message:
auto-import perl-File-Remove-0.30-1 on branch devel from perl-File-Remove-0.30-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-File-Remove/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	13 Sep 2005 16:43:21 -0000	1.1
+++ import.log	13 Sep 2005 16:44:06 -0000	1.2
@@ -0,0 +1 @@
+perl-File-Remove-0_30-1:HEAD:perl-File-Remove-0.30-1.src.rpm:1126629832



From fedora-extras-commits at redhat.com  Tue Sep 13 16:44:08 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Tue, 13 Sep 2005 12:44:08 -0400
Subject: rpms/perl-File-Remove/devel perl-File-Remove.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200509131644.j8DGi8Di010856@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-File-Remove/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10809/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-File-Remove.spec 
Log Message:
auto-import perl-File-Remove-0.30-1 on branch devel from perl-File-Remove-0.30-1.src.rpm


--- NEW FILE perl-File-Remove.spec ---
Name: 		perl-File-Remove
Version:	0.30
Release:	1%{?dist}
Summary:	Remove files and directories
License:	GPL or Artistic
Group:		Development/Libraries
URL: 		http://search.cpan.org/dist/File-Remove/
Source0: 	http://search.cpan.org/CPAN/authors/id/R/RS/RSOD/File-Remove-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:  	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
BuildArch: 	noarch

%description
Remove files and directories

%prep
%setup -q -n File-Remove-%{version}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

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

%clean
rm -rf $RPM_BUILD_ROOT

%check
make test

%files
%defattr(-,root,root,-)
# For license text(s), see the perl package.
%doc Changes README
%{perl_vendorlib}/File
%{_mandir}/man3/*

%changelog
* Tue Sep 13 2005 Ralf Corsepius  - 0.30-1
- FE submission.

* Fri Sep 02 2005 Ralf Corsepius  - 0.30-0
- FE submission preps.

* Tue Jun 28 2005 Ralf Corsepius  - 0.29-0.pm.1
- Initial packman version.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-File-Remove/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	13 Sep 2005 16:43:22 -0000	1.1
+++ .cvsignore	13 Sep 2005 16:44:06 -0000	1.2
@@ -0,0 +1 @@
+File-Remove-0.30.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-File-Remove/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	13 Sep 2005 16:43:22 -0000	1.1
+++ sources	13 Sep 2005 16:44:06 -0000	1.2
@@ -0,0 +1 @@
+3973fd86f5d82a52255bde3c1fd63486  File-Remove-0.30.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep 13 16:47:54 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Tue, 13 Sep 2005 12:47:54 -0400
Subject: rpms/perl-File-Remove/devel perl-File-Remove.spec,1.1,1.2
Message-ID: <200509131647.j8DGlsbj010936@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-File-Remove/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10917

Modified Files:
	perl-File-Remove.spec 
Log Message:
spec file cleanup


Index: perl-File-Remove.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-File-Remove/devel/perl-File-Remove.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-File-Remove.spec	13 Sep 2005 16:44:06 -0000	1.1
+++ perl-File-Remove.spec	13 Sep 2005 16:47:52 -0000	1.2
@@ -1,7 +1,7 @@
 Name: 		perl-File-Remove
 Version:	0.30
-Release:	1%{?dist}
-Summary:	Remove files and directories
+Release:	2%{?dist}
+Summary:	Convenience module for removing files and directories
 License:	GPL or Artistic
 Group:		Development/Libraries
 URL: 		http://search.cpan.org/dist/File-Remove/
@@ -12,7 +12,7 @@
 BuildArch: 	noarch
 
 %description
-Remove files and directories
+%{summary}
 
 %prep
 %setup -q -n File-Remove-%{version}
@@ -42,11 +42,8 @@
 %{_mandir}/man3/*
 
 %changelog
-* Tue Sep 13 2005 Ralf Corsepius  - 0.30-1
-- FE submission.
-
-* Fri Sep 02 2005 Ralf Corsepius  - 0.30-0
-- FE submission preps.
+* Tue Sep 13 2005 Ralf Corsepius  - 0.30-2
+- Change %%summary according to Ville's preference.
 
-* Tue Jun 28 2005 Ralf Corsepius  - 0.29-0.pm.1
-- Initial packman version.
+* Tue Sep 13 2005 Ralf Corsepius  - 0.30-1
+- FE submission.



From fedora-extras-commits at redhat.com  Tue Sep 13 16:50:46 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 13 Sep 2005 12:50:46 -0400
Subject: rpms/sbcl/devel sbcl-0.9.4-ADDR_NO_RANDOMIZE-argv0.patch, NONE,
	1.1 sbcl-0.9.4-ADDR_NO_RANDOMIZE-proc.patch, NONE,
	1.1 sbcl.sysconfig, NONE, 1.1 sbcl-0.9.4-LIB_DIR.patch, 1.1,
	1.2 sbcl.sh, 1.2, 1.3 sbcl.spec, 1.7,
	1.8 sbcl-0.9.4-ADDR_NO_RANDOMIZE.patch, 1.1, NONE
Message-ID: <200509131650.j8DGokKw011016@cvs-int.fedora.redhat.com>

Author: rdieter

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

Modified Files:
	sbcl-0.9.4-LIB_DIR.patch sbcl.sh sbcl.spec 
Added Files:
	sbcl-0.9.4-ADDR_NO_RANDOMIZE-argv0.patch 
	sbcl-0.9.4-ADDR_NO_RANDOMIZE-proc.patch sbcl.sysconfig 
Removed Files:
	sbcl-0.9.4-ADDR_NO_RANDOMIZE.patch 
Log Message:
* Tue Sep 13 2005 Rex Dieter  0.9.4-11
- fix botched NO_ADDR_RANDOMIZE patch
- fix botched LIB_DIR patch


sbcl-0.9.4-ADDR_NO_RANDOMIZE-argv0.patch:

--- NEW FILE sbcl-0.9.4-ADDR_NO_RANDOMIZE-argv0.patch ---
--- sbcl-0.9.4/src/runtime/os.h.ADDR_NO_RANDOMIZE	2005-07-14 10:41:20.000000000 -0500
+++ sbcl-0.9.4/src/runtime/os.h	2005-09-13 11:23:31.319884384 -0500
@@ -50,7 +50,7 @@
 
 /* Do anything we need to do when starting up the runtime environment
  * in this OS. */
-extern void os_init(void);
+extern void os_init(char *argv[], char *envp[]);
 
 /* Install any OS-dependent low-level signal handlers which are needed
  * by the runtime environment. E.g. the signals raised by a violation
--- sbcl-0.9.4/src/runtime/linux-os.c.ADDR_NO_RANDOMIZE	2005-08-12 14:08:19.000000000 -0500
+++ sbcl-0.9.4/src/runtime/linux-os.c	2005-09-13 11:26:47.110833967 -0500
@@ -44,6 +44,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include "validate.h"
 #include "thread.h"
@@ -92,7 +93,7 @@
 int linux_no_threads_p = 0;
 
 void
-os_init(void)
+os_init(char *argv[], char *envp[])
 {
     /* Conduct various version checks: do we have enough mmap(), is
      * this a sparc running 2.2, can we do threads? */
@@ -117,7 +118,7 @@
         FSHOW((stderr,"linux kernel %d.%d predates 2.4;\n enabling workarounds for SPARC kernel bugs in signal handling.\n", major_version,minor_version));
         linux_sparc_siginfo_bug = 1;
 #endif
-    }
+    }   
 #ifdef LISP_FEATURE_SB_THREAD
     futex_wait(futex,-1);
     if(errno==ENOSYS)  linux_no_threads_p = 1;
@@ -125,6 +126,28 @@
         fprintf(stderr,"Linux with NPTL support (e.g. kernel 2.6 or newer) required for \nthread-enabled SBCL.  Disabling thread support.\n\n");
 #endif
     os_vm_page_size = getpagesize();
+   
+    /* KLUDGE: Disable memory randomization on new Linux kernels
+     * by setting a personality flag and re-executing. (We need
+     * to re-execute, since the memory maps that can conflict with
+     * the SBCL spaces have already been done at this point).
+     */
+#if defined(LISP_FEATURE_X86)
+    if ((major_version == 2) && (minor_version >= 6) || (major_version >= 3)) {
+       long pers = personality(-1);
+       /* 0x40000 aka. ADDR_NO_RANDOMIZE */
+       if (!(pers & 0x40000)) {
+	 if (personality(pers | 0x40000) != -1) {
+	   execve(argv[0], argv, envp);
+	 }
+	 /* Either changing the personality or execve() failed. Either
+	  * way we might as well continue, and hope that the random
+	  * memory maps are ok this time around.
+	  */
+	 fprintf(stderr, "WARNING: Couldn't re-execute SBCL with the proper personality flags.  Trying to continue anyway.\n");
+       }
+    }     
+#endif   
 }
 
 
--- sbcl-0.9.4/src/runtime/osf1-os.c.ADDR_NO_RANDOMIZE	2005-07-14 10:41:20.000000000 -0500
+++ sbcl-0.9.4/src/runtime/osf1-os.c	2005-09-13 11:23:31.321884302 -0500
@@ -51,7 +51,8 @@
 
 
 
-void os_init(void)
+void
+os_init(char *argv[], char *envp[])
 {
     os_vm_page_size = getpagesize();
 }
--- sbcl-0.9.4/src/runtime/bsd-os.c.ADDR_NO_RANDOMIZE	2005-07-14 10:41:11.000000000 -0500
+++ sbcl-0.9.4/src/runtime/bsd-os.c	2005-09-13 11:23:31.322884261 -0500
@@ -51,7 +51,8 @@
 static void netbsd_init();
 #endif /* __NetBSD__ */
 
-void os_init(void)
+void
+os_init(char *argv[], char *envp[])
 {
     os_vm_page_size = getpagesize();
 
--- sbcl-0.9.4/src/runtime/runtime.c.ADDR_NO_RANDOMIZE	2005-09-13 11:23:31.315884548 -0500
+++ sbcl-0.9.4/src/runtime/runtime.c	2005-09-13 11:23:31.323884220 -0500
@@ -194,7 +194,7 @@
     /* KLUDGE: os_vm_page_size is set by os_init(), and on some
      * systems (e.g. Alpha) arch_init() needs need os_vm_page_size, so
      * it must follow os_init(). -- WHN 2000-01-26 */
-    os_init();
+    os_init(argv, envp);
     arch_init();
     gc_init();
     validate();
--- sbcl-0.9.4/src/runtime/sunos-os.c.ADDR_NO_RANDOMIZE	2005-08-19 07:15:16.000000000 -0500
+++ sbcl-0.9.4/src/runtime/sunos-os.c	2005-09-13 11:23:31.324884178 -0500
@@ -53,7 +53,8 @@
 int KLUDGE_MAYBE_MAP_ANON = 0x0;
 int kludge_mmap_fd = -1; /* default for MAP_ANON */
 
-void os_init(void)
+void
+os_init(char *argv[], char *envp[])
 {
     struct utsname name;
     int major_version;

sbcl-0.9.4-ADDR_NO_RANDOMIZE-proc.patch:

--- NEW FILE sbcl-0.9.4-ADDR_NO_RANDOMIZE-proc.patch ---
--- sbcl-0.9.4/src/runtime/os.h.ADDR_NO_RANDOMIZE	2005-07-14 10:41:20.000000000 -0500
+++ sbcl-0.9.4/src/runtime/os.h	2005-08-30 12:16:42.781282788 -0500
@@ -50,7 +50,7 @@
 
 /* Do anything we need to do when starting up the runtime environment
  * in this OS. */
-extern void os_init(void);
+extern void os_init(char *argv[], char *envp[]);
 
 /* Install any OS-dependent low-level signal handlers which are needed
  * by the runtime environment. E.g. the signals raised by a violation
--- sbcl-0.9.4/src/runtime/linux-os.c.ADDR_NO_RANDOMIZE	2005-08-12 14:08:19.000000000 -0500
+++ sbcl-0.9.4/src/runtime/linux-os.c	2005-08-30 12:17:31.208291595 -0500
@@ -44,6 +44,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include "validate.h"
 #include "thread.h"
@@ -92,7 +93,7 @@
 int linux_no_threads_p = 0;
 
 void
-os_init(void)
+os_init(char *argv[], char *envp[])
 {
     /* Conduct various version checks: do we have enough mmap(), is
      * this a sparc running 2.2, can we do threads? */
@@ -117,7 +118,7 @@
         FSHOW((stderr,"linux kernel %d.%d predates 2.4;\n enabling workarounds for SPARC kernel bugs in signal handling.\n", major_version,minor_version));
         linux_sparc_siginfo_bug = 1;
 #endif
-    }
+    }   
 #ifdef LISP_FEATURE_SB_THREAD
     futex_wait(futex,-1);
     if(errno==ENOSYS)  linux_no_threads_p = 1;
@@ -125,6 +126,36 @@
         fprintf(stderr,"Linux with NPTL support (e.g. kernel 2.6 or newer) required for \nthread-enabled SBCL.  Disabling thread support.\n\n");
 #endif
     os_vm_page_size = getpagesize();
+   
+    /* KLUDGE: Disable memory randomization on new Linux kernels
+     * by setting a personality flag and re-executing. (We need
+     * to re-execute, since the memory maps that can conflict with
+     * the SBCL spaces have already been done at this point).
+     */
+#if defined(LISP_FEATURE_X86)
+    if ((major_version == 2) && (minor_version >= 6) || (major_version >= 3)) {
+       long pers = personality(-1);
+       /* 0x40000 aka. ADDR_NO_RANDOMIZE */
+       if (!(pers & 0x40000)) {
+	 if (personality(pers | 0x40000) != -1) {
+	     /* Use /proc/self/exe instead of trying to figure out the
+	      * executable path from PATH and argv[0], since that's reliable.
+	      */
+	     char buf[PATH_MAX+1];
+	     int rc = readlink("/proc/self/exe", buf, PATH_MAX);
+             if ( rc > 0 ) {
+	       buf[rc]=0;
+	       execve(buf, argv, envp);
+	     }
+	  }
+	  /* Either changing the personality or execve() failed. Either
+	   * way we might as well continue, and hope that the random
+	   * memory maps are ok this time around.
+	   */
+	  fprintf(stderr, "WARNING: Couldn't re-execute SBCL with the proper personality flags (maybe /proc isn't mounted?). Trying to continue anyway.\n");
+       }
+    }     
+#endif   
 }
 
 
--- sbcl-0.9.4/src/runtime/osf1-os.c.ADDR_NO_RANDOMIZE	2005-07-14 10:41:20.000000000 -0500
+++ sbcl-0.9.4/src/runtime/osf1-os.c	2005-08-30 12:16:42.783282706 -0500
@@ -51,7 +51,8 @@
 
 
 
-void os_init(void)
+void
+os_init(char *argv[], char *envp[])
 {
     os_vm_page_size = getpagesize();
 }
--- sbcl-0.9.4/src/runtime/bsd-os.c.ADDR_NO_RANDOMIZE	2005-07-14 10:41:11.000000000 -0500
+++ sbcl-0.9.4/src/runtime/bsd-os.c	2005-08-30 12:16:42.784282665 -0500
@@ -51,7 +51,8 @@
 static void netbsd_init();
 #endif /* __NetBSD__ */
 
-void os_init(void)
+void
+os_init(char *argv[], char *envp[])
 {
     os_vm_page_size = getpagesize();
 
--- sbcl-0.9.4/src/runtime/runtime.c.ADDR_NO_RANDOMIZE	2005-08-30 12:16:42.778282911 -0500
+++ sbcl-0.9.4/src/runtime/runtime.c	2005-08-30 12:16:42.785282623 -0500
@@ -194,7 +194,7 @@
     /* KLUDGE: os_vm_page_size is set by os_init(), and on some
      * systems (e.g. Alpha) arch_init() needs need os_vm_page_size, so
      * it must follow os_init(). -- WHN 2000-01-26 */
-    os_init();
+    os_init(argv, envp);
     arch_init();
     gc_init();
     validate();
--- sbcl-0.9.4/src/runtime/sunos-os.c.ADDR_NO_RANDOMIZE	2005-08-19 07:15:16.000000000 -0500
+++ sbcl-0.9.4/src/runtime/sunos-os.c	2005-08-30 12:16:42.786282582 -0500
@@ -53,7 +53,8 @@
 int KLUDGE_MAYBE_MAP_ANON = 0x0;
 int kludge_mmap_fd = -1; /* default for MAP_ANON */
 
-void os_init(void)
+void
+os_init(char *argv[], char *envp[])
 {
     struct utsname name;
     int major_version;


--- NEW FILE sbcl.sysconfig ---
# /etc/sysconfig/sbcl

SBCL_HOME=/usr/lib/sbcl

sbcl-0.9.4-LIB_DIR.patch:

Index: sbcl-0.9.4-LIB_DIR.patch
===================================================================
RCS file: /cvs/extras/rpms/sbcl/devel/sbcl-0.9.4-LIB_DIR.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sbcl-0.9.4-LIB_DIR.patch	12 Sep 2005 19:18:17 -0000	1.1
+++ sbcl-0.9.4-LIB_DIR.patch	13 Sep 2005 16:50:44 -0000	1.2
@@ -4,7 +4,7 @@
  MAN_DIR=${MAN_DIR-$INSTALL_ROOT/share/man}
  INFO_DIR=${INFO_DIR-$INSTALL_ROOT/share/info}
  DOC_DIR=${DOC_DIR-$INSTALL_ROOT/share/doc/sbcl}
-+LIB_DIR=${LIB_DIR-$INSTALL_ROOT/lib}}
++LIB_DIR=${LIB_DIR-$INSTALL_ROOT/lib}
  
  # Does the environment look sane?
  SBCL_SOURCE=`pwd`


Index: sbcl.sh
===================================================================
RCS file: /cvs/extras/rpms/sbcl/devel/sbcl.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sbcl.sh	12 Sep 2005 12:39:38 -0000	1.2
+++ sbcl.sh	13 Sep 2005 16:50:44 -0000	1.3
@@ -5,13 +5,4 @@
   source /etc/sysconfig/sbcl
 fi
 
-if [ -z "$SBCL_HOME" ] ; then
-SBCL_HOME=/usr/lib/sbcl
-export SBCL_HOME
-fi
-
-if [ -z "$SBCL_SETARCH" ] ; then
-SBCL_SETARCH="setarch i386 -R"
-fi
-
-exec ${SBCL_SETARCH} ${SBCL_HOME}/sbcl ${1+"$@"}
+exec ${SBCL_HOME}/sbcl ${1+"$@"}


Index: sbcl.spec
===================================================================
RCS file: /cvs/extras/rpms/sbcl/devel/sbcl.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sbcl.spec	12 Sep 2005 20:36:18 -0000	1.7
+++ sbcl.spec	13 Sep 2005 16:50:44 -0000	1.8
@@ -13,24 +13,31 @@
 %define setarch setarch %{_target_cpu}
 %endif
 
-#  Could test for setarch >= 1.7 instead
 %if "%{?fedora}" >= "4"
 %define setarch setarch %{_target_cpu} -R
 %endif
 
+%if "%{?rhel}" >= "4"
+BuildRequires:setarch
+Requires:setarch
+%define setarch setarch %{_target_cpu}
+%endif
+
 Name: 	 sbcl
 Summary: Steel Bank Common Lisp
 Version: 0.9.4
-Release: 10%{?dist}
+Release: 11%{?dist}
 
 License: BSD/MIT
 Group: 	 Development/Languages
 URL:	 http://sbcl.sourceforge.net/
 Source0:  http://dl.sourceforge.net/sourceforge/sbcl/sbcl-%{version}-source.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-ExclusiveArch: %{ix86}
 
+# App-wrapper
 Source1: sbcl.sh
+# /etc/sysconfig/sbcl
+Source2: sbcl.sysconfig
 
 %if "%{?sbcl_bootstrap}" == "%{nil}"
 # local Bootstrap binaries
@@ -51,7 +58,10 @@
 
 Patch1: sbcl-0.8.18-default-sbcl-home.patch
 # See http://sourceforge.net/mailarchive/message.php?msg_id=12787069
-Patch2: sbcl-0.9.4-ADDR_NO_RANDOMIZE.patch
+# use /proc/self/exe
+#Patch2: sbcl-0.9.4-ADDR_NO_RANDOMIZE-proc.patch
+# use argv[0]
+Patch2: sbcl-0.9.4-ADDR_NO_RANDOMIZE-argv0.patch
 Patch3: sbcl-0.9.4-optflags.patch
 Patch4: sbcl-0.9.4-LIB_DIR.patch
 
@@ -70,12 +80,12 @@
 
 
 %prep
-%setup %{?sbcl_bootstrap_src} 
+%setup -q %{?sbcl_bootstrap_src} 
 
 #sed -i -e "s|/usr/local/lib/sbcl/|%{_libdir}/sbcl/|" src/runtime/runtime.c
 #or patch to use SBCL_HOME env var
 %patch1 -p0 -b .default-sbcl-home
-%patch2 -p1 -b .ADDR_NO_RANDOMIZE
+%{?setarch:%patch2 -p1 -b .ADDR_NO_RANDOMIZE}
 %patch3 -p1 -b .optflags
 %patch4 -p1 -b .LIB_DIR
 
@@ -120,11 +130,11 @@
 
 
 %check || :
-#if "%{?_with_check:1}" == "1"
 pushd tests 
-%{?setarch} sh ./run-tests.sh 
+# still need setarch if using ADDR_NO_RANDOMIZE-proc patch, since /proc isn't available on buildsystem/mock.
+#{?setarch} sh ./run-tests.sh 
+sh ./run-tests.sh
 popd
-#endif
 
 
 %install
@@ -134,15 +144,15 @@
 unset SBCL_HOME ||:
 export INSTALL_ROOT=$RPM_BUILD_ROOT%{_prefix}
 export LIB_DIR=$RPM_BUILD_ROOT%{_libdir}
-%{?setarch} sh ./install.sh
+# (may) still need setarch if using ADDR_NO_RANDOMIZE-proc patch
+sh ./install.sh
 
-# app-wrapper for using setarch
+# app-wrapper 
 %if 0
-%if "%{?setarch}" != "%{nil}"
 mv $RPM_BUILD_ROOT%{_bindir}/sbcl $RPM_BUILD_ROOT%{_libdir}/sbcl/sbcl
-install -p -m755 %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/sbcl
-sed -i -e "s|^SBCL_SETARCH=.*|SBCL_SETARCH=\"%{setarch}\"|" $RPM_BUILD_ROOT%{_bindir}/sbcl
-%endif
+install -p -m755 -D %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/sbcl
+install -p -m644 -D %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/sbcl
+#{?setarch:echo "SBCL_SETARCH=\"%{setarch}\"|" >> $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/sbcl 
 %endif
 
 ## Unpackaged files
@@ -181,7 +191,11 @@
 
 
 %changelog
-* Mon Sep 13 2005 Rex Dieter  0.9.4-10
+* Tue Sep 13 2005 Rex Dieter  0.9.4-11
+- fix botched NO_ADDR_RANDOMIZE patch
+- fix botched LIB_DIR patch
+
+* Mon Sep 12 2005 Rex Dieter  0.9.4-10
 - use/define LIB_DIR instead of hard-coded INSTALL_ROOT/lib
 - ExclusiveArch: %{ix86} (for now)
 


--- sbcl-0.9.4-ADDR_NO_RANDOMIZE.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Sep 13 16:54:35 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 13 Sep 2005 12:54:35 -0400
Subject: owners owners.list,1.200,1.201
Message-ID: <200509131654.j8DGsZJt011113@cvs-int.fedora.redhat.com>

Author: rdieter

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

Modified Files:
	owners.list 
Log Message:



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.200
retrieving revision 1.201
diff -u -r1.200 -r1.201
--- owners.list	13 Sep 2005 16:23:45 -0000	1.200
+++ owners.list	13 Sep 2005 16:54:33 -0000	1.201
@@ -867,6 +867,7 @@
 Fedora Extras|rzip|A large-file compression program|i at stingr.net|extras-qa at fedoraproject.org|
 Fedora Extras|s3switch|Manage the output device on S3 Savage chips|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|sabayon|Tool to maintain user profiles in a GNOME desktop|markmc at redhat.com|extras-qa at fedoraproject.org|
+Fedora Extras|sbcl|Steel Bank Common Lisp|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|scalapack|A subset of LAPACK routines redesigned for distributed memory MIMD parallel computers|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|scanssh|Fast SSH server and open proxy scanner|oliver at linux-kernel.at|extras-qa at fedoraproject.org|
 Fedora Extras|scim|Smart Common Input Method|petersen at redhat.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Tue Sep 13 17:04:28 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 13 Sep 2005 13:04:28 -0400
Subject: rpms/sbcl/devel sbcl.spec,1.8,1.9
Message-ID: <200509131705.j8DH5G7D012589@cvs-int.fedora.redhat.com>

Author: rdieter

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

Modified Files:
	sbcl.spec 
Log Message:
* Tue Sep 13 2005 Rex Dieter  0.9.4-12
- omit ppc (for now, broken buildsystem)



Index: sbcl.spec
===================================================================
RCS file: /cvs/extras/rpms/sbcl/devel/sbcl.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sbcl.spec	13 Sep 2005 16:50:44 -0000	1.8
+++ sbcl.spec	13 Sep 2005 17:04:26 -0000	1.9
@@ -26,13 +26,14 @@
 Name: 	 sbcl
 Summary: Steel Bank Common Lisp
 Version: 0.9.4
-Release: 11%{?dist}
+Release: 12%{?dist}
 
 License: BSD/MIT
 Group: 	 Development/Languages
 URL:	 http://sbcl.sourceforge.net/
 Source0:  http://dl.sourceforge.net/sourceforge/sbcl/sbcl-%{version}-source.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+ExclusiveArch: %{ix86} x86_64
 
 # App-wrapper
 Source1: sbcl.sh
@@ -191,6 +192,9 @@
 
 
 %changelog
+* Tue Sep 13 2005 Rex Dieter  0.9.4-12
+- omit ppc (for now, broken buildsystem)
+
 * Tue Sep 13 2005 Rex Dieter  0.9.4-11
 - fix botched NO_ADDR_RANDOMIZE patch
 - fix botched LIB_DIR patch



From fedora-extras-commits at redhat.com  Tue Sep 13 18:27:04 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Tue, 13 Sep 2005 14:27:04 -0400
Subject: rpms/perl-SNMP_Session - New directory
Message-ID: <200509131827.j8DIR4eD014702@cvs-int.fedora.redhat.com>

Author: jpo

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

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




From fedora-extras-commits at redhat.com  Tue Sep 13 18:27:04 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Tue, 13 Sep 2005 14:27:04 -0400
Subject: rpms/perl-SNMP_Session/devel - New directory
Message-ID: <200509131827.j8DIR4QX014707@cvs-int.fedora.redhat.com>

Author: jpo

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

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




From fedora-extras-commits at redhat.com  Tue Sep 13 18:27:26 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Tue, 13 Sep 2005 14:27:26 -0400
Subject: rpms/perl-SNMP_Session Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200509131827.j8DIRQ6w014766@cvs-int.fedora.redhat.com>

Author: jpo

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

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


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

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

common : CVS/Root
	@cvs checkout common

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

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


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Tue Sep 13 18:27:26 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Tue, 13 Sep 2005 14:27:26 -0400
Subject: rpms/perl-SNMP_Session/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200509131827.j8DIRQbC014771@cvs-int.fedora.redhat.com>

Author: jpo

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

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


--- NEW FILE .cvsignore ---


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

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Tue Sep 13 18:28:01 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Tue, 13 Sep 2005 14:28:01 -0400
Subject: rpms/perl-SNMP_Session import.log,1.1,1.2
Message-ID: <200509131828.j8DIS1u6014834@cvs-int.fedora.redhat.com>

Author: jpo

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

Modified Files:
	import.log 
Log Message:
auto-import perl-SNMP_Session-1.07-1 on branch devel from perl-SNMP_Session-1.07-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-SNMP_Session/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	13 Sep 2005 18:27:24 -0000	1.1
+++ import.log	13 Sep 2005 18:27:58 -0000	1.2
@@ -0,0 +1 @@
+perl-SNMP_Session-1_07-1:HEAD:perl-SNMP_Session-1.07-1.src.rpm:1126636070



From fedora-extras-commits at redhat.com  Tue Sep 13 18:28:01 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Tue, 13 Sep 2005 14:28:01 -0400
Subject: rpms/perl-SNMP_Session/devel perl-SNMP_Session.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200509131828.j8DIS1O8014841@cvs-int.fedora.redhat.com>

Author: jpo

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

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


--- NEW FILE perl-SNMP_Session.spec ---
Name:           perl-SNMP_Session
Version:        1.07
Release:        1%{?dist}
Summary:        SNMP support for Perl 5

Group:          Development/Libraries
License:        Artistic
URL:            http://www.switch.ch/misc/leinen/snmp/perl/
Source0:        http://www.switch.ch/misc/leinen/snmp/perl/dist/SNMP_Session-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  perl
Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
Pure Perl SNMP v1 and SNMP v2 support for Perl 5.

The SNMP operations currently supported are "get", "get-next", "get-bulk"
and "set", as well as trap generation and reception. 


%prep
%setup -q -n SNMP_Session-%{version}
%{__perl} -pi -e 's{^#!/usr/local/bin/perl\b}{#!%{__perl}}' test/*
chmod 644 test/*


%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}


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


%check
make test


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc Artistic README README.SNMP_util index.html test/
%{perl_vendorlib}/*


%changelog
* Wed Aug 10 2005 Jose Pedro Oliveira  - 1.07-1
- Update to Fedora Extras template.

* Wed Nov 24 2004 Jose Pedro Oliveira  - 0:1.07-0.fdr.1
- Update to 1.07.

* Sun Oct  3 2004 Jose Pedro Oliveira  - 0:1.06-0.fdr.1
- Update to 1.06.

* Wed Aug 25 2004 Jose Pedro Oliveira  - 0:1.05-0.fdr.2
- The homepage changed placed in 2004-08-23.
- The author repackaged the files using the same tar.gz version (1.05).

* Wed Jul 21 2004 Jose Pedro Oliveira  - 0:1.05-0.fdr.1
- Update to 1.05.

* Tue May 18 2004 Jose Pedro Oliveira  - 0:1.03-0.fdr.1
- First build.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-SNMP_Session/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	13 Sep 2005 18:27:24 -0000	1.1
+++ .cvsignore	13 Sep 2005 18:27:59 -0000	1.2
@@ -0,0 +1 @@
+SNMP_Session-1.07.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-SNMP_Session/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	13 Sep 2005 18:27:24 -0000	1.1
+++ sources	13 Sep 2005 18:27:59 -0000	1.2
@@ -0,0 +1 @@
+496725e254c98cf1863703c4184f783e  SNMP_Session-1.07.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep 13 18:32:08 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Tue, 13 Sep 2005 14:32:08 -0400
Subject: rpms/perl-SNMP_Session/devel perl-SNMP_Session.spec,1.1,1.2
Message-ID: <200509131832.j8DIW8TF014920@cvs-int.fedora.redhat.com>

Author: jpo

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

Modified Files:
	perl-SNMP_Session.spec 
Log Message:
Removed superfluous perl BR.


Index: perl-SNMP_Session.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-SNMP_Session/devel/perl-SNMP_Session.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-SNMP_Session.spec	13 Sep 2005 18:27:59 -0000	1.1
+++ perl-SNMP_Session.spec	13 Sep 2005 18:32:06 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-SNMP_Session
 Version:        1.07
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        SNMP support for Perl 5
 
 Group:          Development/Libraries
@@ -10,7 +10,6 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
-BuildRequires:  perl
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
@@ -54,6 +53,9 @@
 
 
 %changelog
+* Tue Sep 13 2005 Jose Pedro Oliveira  - 1.07-2
+- Removed superfluous perl BR.
+
 * Wed Aug 10 2005 Jose Pedro Oliveira  - 1.07-1
 - Update to Fedora Extras template.
 



From fedora-extras-commits at redhat.com  Tue Sep 13 18:39:00 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Tue, 13 Sep 2005 14:39:00 -0400
Subject: owners owners.list,1.201,1.202
Message-ID: <200509131839.j8DId0ST015017@cvs-int.fedora.redhat.com>

Author: jpo

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

Modified Files:
	owners.list 
Log Message:
New package: perl-SNMP_Session


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.201
retrieving revision 1.202
diff -u -r1.201 -r1.202
--- owners.list	13 Sep 2005 16:54:33 -0000	1.201
+++ owners.list	13 Sep 2005 18:38:58 -0000	1.202
@@ -707,6 +707,7 @@
 Fedora Extras|perl-Razor-Agent|Use a Razor catalogue server to filter spam messages|wtogami at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Regexp-Common|Regexp::Common Perl module|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Set-IntSpan|Perl module for managing sets of integers|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-SNMP_Session|SNMP support for Perl 5|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-SOAP-Lite|Provides the Simple Object Access Protocol (SOAP)|thm at duke.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Sort-Versions|Perl module for sorting of revision-like numbers|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Spreadsheet-WriteExcel|Write formatted text and numbers to a cross-platform Excel binary file|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Tue Sep 13 18:43:03 2005
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Tue, 13 Sep 2005 14:43:03 -0400
Subject: extras-buildsys ChangeLog,1.121,1.122
Message-ID: <200509131843.j8DIh3hO015070@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15037

Modified Files:
	ChangeLog 
Log Message:
2005-09-13  Dan Williams  

    * builder/builder.py
        - Try to tighten up child process handling to not
            leave defunct mock processes around




Index: ChangeLog
===================================================================
RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -r1.121 -r1.122
--- ChangeLog	11 Sep 2005 03:33:58 -0000	1.121
+++ ChangeLog	13 Sep 2005 18:43:00 -0000	1.122
@@ -1,3 +1,9 @@
+2005-09-13  Dan Williams  
+
+    * builder/builder.py
+        - Try to tighten up child process handling to not
+            leave defunct mock processes around
+
 2005-09-10  Dan Williams  
 
     * utils/distro-rebuild.py



From fedora-extras-commits at redhat.com  Tue Sep 13 18:43:03 2005
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Tue, 13 Sep 2005 14:43:03 -0400
Subject: extras-buildsys/builder builder.py,1.41,1.42
Message-ID: <200509131843.j8DIh3c9015076@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys/builder
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15037/builder

Modified Files:
	builder.py 
Log Message:
2005-09-13  Dan Williams  

    * builder/builder.py
        - Try to tighten up child process handling to not
            leave defunct mock processes around




Index: builder.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/builder/builder.py,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- builder.py	1 Sep 2005 19:54:49 -0000	1.41
+++ builder.py	13 Sep 2005 18:43:01 -0000	1.42
@@ -82,6 +82,7 @@
         self.buildarch = buildarch
         self._starttime = time.time()
         self._endtime = 0
+        self._mockstarttime = 0
         self._uniqid = uniqid
         self._status = 'init'
         self._die = False
@@ -136,28 +137,34 @@
     def endtime(self):
         return self._endtime
 
-    def die(self, sig=15):
+    def die(self):
         if self.is_done_status() or self._done_status == 'killed':
             return True
         self._die = True
         return True
 
     def _handle_death(self):
-        self._log("Killing build process...\n")
         self._die = False
+        self._done_status = 'killed'
+        self._log("Killing build process...\n")
+
         # Don't try to kill a running cleanup process
         if self._status != 'cleanup' and self._childpid:
             try:
-                os.kill(self._childpid, 15)
+                os.kill(self._childpid, 9)
             except OSError, e:
                 self._log("Couldn't kill process %d: %s\n" % (self._childpid, e))
-
-        self._log("Killed.\n");
-        self._done_status = 'killed'
-
-        # Don't start cleanup over top of an existing cleanup process
-        if self._status != 'cleanup':
+            else:
+                # Ensure child process is reaped
+                self._log("Waiting for mock process %d to exit...\n" % self._childpid)
+                try:
+                    (pid, status) = os.waitpid(self._childpid, 0)
+                except OSError, e:
+                    pass
+                self._log("Mock process %d exited.\n" % self._childpid)
+            self._childpid = 0
             self._start_cleanup()
+        self._log("Killed.\n");
 
     def _log(self, string):
         if string and self._log_fd:
@@ -169,14 +176,6 @@
                 sys.stdout.write(s + string)
                 sys.stdout.flush()
 
-    def _start_srpm_download(self):
-        self._status = 'downloading'
-        self._log("Starting download of %s.\n" % self._srpm_url)
-        target_dir = os.path.dirname(self._srpm_path)
-        dl_thread = FileDownloader.FileDownloader(self.dl_callback, self._srpm_url, self._srpm_url,
-                        target_dir, ['.src.rpm'], certs)
-        dl_thread.start()
-
     def dl_callback(self, dl_status, cb_data):
         url = cb_data
         if dl_status == 'done':
@@ -230,45 +229,9 @@
 
         self._mock_log = os.path.join(self._result_dir, "mock-output.log")
         self._childpid = ExecUtils.exec_with_redirect(cmd, args, None, self._mock_log, self._mock_log)
+        self._mockstarttime = time.time()
         self._status = 'prepping'
 
-        # Poll a bit to wait for mock to write out the status file if
-        # its not there yet.
-        start_time = time.time()
-        mockstatusfile = os.path.join(self._state_dir, 'status')
-        while not os.path.exists(mockstatusfile):
-            try:
-                time.sleep(0.5)
-            except KeyboardInterrupt:
-                pass
-
-            # if mock exited with an error report that error and not
-            # the missing status file.
-            (aux_pid, status) = os.waitpid(self._childpid, os.WNOHANG)
-            status = os.WEXITSTATUS(status)
-            if aux_pid:
-                # If mock exits anywhere here, something is wrong no matter
-                # what it's exit status
-                self._childpid = 0
-                self._copy_mock_output_to_log()
-                self._status = 'failed'
-                break
-
-            # Kill mock after 15s if it didn't dump the status file
-            if time.time() - start_time > 15:
-                self._copy_mock_output_to_log()
-                self._log("Timed out waiting for the mock status file!  %s\n" % mockstatusfile)
-                try:
-                    self._log("Killing mock...\n")
-                    os.kill(self._childpid, 15)
-                except OSError, e:
-                    self._log("Couldn't kill mock process %d: %s\n" % (self._childpid, e))
-                else:
-                    self._log("Killed.\n")
-
-                self._status = 'failed'
-                break
-
     def _start_cleanup(self):
         self._log("Cleaning up the buildroot...\n")
 
@@ -288,7 +251,6 @@
 
         self._log("   %s\n" % string.join(args))
         self._childpid = ExecUtils.exec_with_redirect(cmd, args, None, None, None)
-
         self._status = 'cleanup'
 
     def _mock_is_prepping(self):
@@ -377,8 +339,7 @@
         if self._status == 'done':
             self._log("Job completed successfully.\n")
         elif self._status == 'failed':
-            if self._childpid:
-                self._log("Job failed due to mock errors!  Please see output in root.log and build.log\n")
+            self._log("Job failed due to mock errors!  Please see output in root.log and build.log\n")
         elif self._status == 'killed':
             self._log("Job failed because it was killed.\n")
 
@@ -387,7 +348,12 @@
             self._log_fd = None
 
     def _status_init(self):
-        self._start_srpm_download()
+        self._log("Starting download of %s.\n" % self._srpm_url)
+        self._status = 'downloading'
+        target_dir = os.path.dirname(self._srpm_path)
+        dl_thread = FileDownloader.FileDownloader(self.dl_callback, self._srpm_url, self._srpm_url,
+                        target_dir, ['.src.rpm'], certs)
+        dl_thread.start()
 
     def _status_downloading(self):
         pass
@@ -403,27 +369,44 @@
                 self._log("Waiting for repository to unlock before starting the build...\n")
                 self._repo_locked_msg = True
 
-    def _status_prepping(self):
-        if not self._mock_config and self._mock_is_prepping():
-            self._mock_config = self._read_mock_config()
-        if not self._mock_using_repo():
-            self._status = 'building'
-
-    def _status_building(self):
+    def _watch_mock(self, good_exit, bad_exit):
         (aux_pid, status) = os.waitpid(self._childpid, os.WNOHANG)
         status = os.WEXITSTATUS(status)
         if aux_pid:
             self._childpid = 0
             if status == 0:
-                self._done_status = 'done'
+                self._done_status = good_exit
             elif status > 0:
-                self._done_status = 'failed'
+                self._done_status = bad_exit
 
+            self._copy_mock_output_to_log()
             self._start_cleanup()
 
+    def _status_prepping(self):
+        self._watch_mock('failed', 'failed')
+
+        # We need to make sure that mock has dumped the status file withing a certain
+        # amount of time, otherwise we can't tell what it's doing
+        mockstatusfile = os.path.join(self._state_dir, 'status')
+        if not os.path.exists(mockstatusfile):
+            # something is wrong if mock takes more than 15s to write the status file
+            if time.time() > self._mockstarttime + 15:
+                self._mockstarttime = 0
+                self._log("Timed out waiting for the mock status file!  %s\n" % mockstatusfile)
+                self.die()
+        else:
+            if not self._mock_config and self._mock_is_prepping():
+                self._mock_config = self._read_mock_config()
+            if not self._mock_using_repo():
+                self._status = 'building'
+
+    def _status_building(self):
+        self._watch_mock('done', 'failed')
+
     def _status_cleanup(self):
         (aux_pid, status) = os.waitpid(self._childpid, os.WNOHANG)
         if aux_pid:
+            self._childpid = 0
             # Mock exited
             self._status = self._done_status
             if self._mock_config:
@@ -461,6 +444,8 @@
             time.sleep(3)
 
         self._endtime = time.time()
+        if self._childpid:
+            self._log("ERROR: childpid was !NULL  (%d)" % self._childpid)
         self._controller.notify_job_done(self)
 
     def _find_files(self):
@@ -790,8 +775,6 @@
 
 
 if __name__ == '__main__':
-#    state={'opts': True, 'host': None, 'archs': [],
-#      'daemon': False, 'pidfile': None, 'logfile': None}
 
     usage = "Usage: %s  [-p ] [-l ] [-d] -c " % sys.argv[0]
     parser = OptionParser(usage=usage)



From fedora-extras-commits at redhat.com  Tue Sep 13 19:03:06 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 13 Sep 2005 15:03:06 -0400
Subject: rpms/sbcl/devel sbcl.spec,1.9,1.10
Message-ID: <200509131903.j8DJ3cP4016571@cvs-int.fedora.redhat.com>

Author: rdieter

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

Modified Files:
	sbcl.spec 
Log Message:
* Tue Sep 13 2005 Rex Dieter  0.9.4-13
- don't enable sb-thread



Index: sbcl.spec
===================================================================
RCS file: /cvs/extras/rpms/sbcl/devel/sbcl.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sbcl.spec	13 Sep 2005 17:04:26 -0000	1.9
+++ sbcl.spec	13 Sep 2005 19:03:04 -0000	1.10
@@ -26,7 +26,7 @@
 Name: 	 sbcl
 Summary: Steel Bank Common Lisp
 Version: 0.9.4
-Release: 12%{?dist}
+Release: 13%{?dist}
 
 License: BSD/MIT
 Group: 	 Development/Languages
@@ -97,7 +97,7 @@
 #define kernel_ver %(uname -r | cut -d- -f1 | cut -d. -f-2 )
 #if "%{?kernel_ver}" >= "2.6"
 %ifarch %{ix86} x86_64
-sed -i -e "s|; :sb-thread|:sb-thread|" base-target-features.lisp-expr
+#sed -i -e "s|; :sb-thread|:sb-thread|" base-target-features.lisp-expr
 %endif
 #endif
 
@@ -192,6 +192,9 @@
 
 
 %changelog
+* Tue Sep 13 2005 Rex Dieter  0.9.4-13
+- don't enable sb-thread
+
 * Tue Sep 13 2005 Rex Dieter  0.9.4-12
 - omit ppc (for now, broken buildsystem)
 



From fedora-extras-commits at redhat.com  Tue Sep 13 20:46:34 2005
From: fedora-extras-commits at redhat.com (Robert Theisen (trobert))
Date: Tue, 13 Sep 2005 16:46:34 -0400
Subject: web/html/download mirrors.php,1.27,1.28
Message-ID: <200509132047.j8DKl4ac018301@cvs-int.fedora.redhat.com>

Author: trobert

Update of /cvs/fedora/web/html/download
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18282

Modified Files:
	mirrors.php 
Log Message:
Added new site ftp://ftp.fu-berlin.de/linux/fedora/core/



Index: mirrors.php
===================================================================
RCS file: /cvs/fedora/web/html/download/mirrors.php,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- mirrors.php	13 Sep 2005 15:27:26 -0000	1.27
+++ mirrors.php	13 Sep 2005 20:46:32 -0000	1.28
@@ -273,6 +273,7 @@
 	    
  • http://ftp.uni-koeln.de/mirrors/fedora/linux/core/
    • 
 	    
  • ftp://ftp.uni-koeln.de/mirrors/fedora/linux/core/
    • 
 	    
  • http://download.atrpms.net/mirrors/fedoracore/
    • 
+	    
  • ftp://ftp.fu-berlin.de/linux/fedora/core/
    • 
 	
 	
 	
  • Greece



From fedora-extras-commits at redhat.com  Tue Sep 13 22:56:18 2005
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Tue, 13 Sep 2005 18:56:18 -0400
Subject: rpms/perl-Apache-Session/FC-3 perl-Apache-Session.spec, 1.1,
	1.2 Apache-Session-mp2.patch, 1.1, NONE
Message-ID: <200509132256.j8DMuIir023840@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Apache-Session/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23821

Modified Files:
	perl-Apache-Session.spec 
Removed Files:
	Apache-Session-mp2.patch 
Log Message:
Backport to FC3.


Index: perl-Apache-Session.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Apache-Session/FC-3/perl-Apache-Session.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Apache-Session.spec	13 Sep 2005 16:18:43 -0000	1.1
+++ perl-Apache-Session.spec	13 Sep 2005 22:56:15 -0000	1.2
@@ -1,13 +1,11 @@
 Name:           perl-Apache-Session
 Version:        1.6
-Release:        2%{?dist}
+Release:        1
 Summary:        Apache::Session Perl module
 License:        Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/Apache-Session/
 Source0:        http://www.cpan.org/modules/by-module/Apache/Apache-Session-1.6.tar.gz
-# https://bugzilla.redhat.com/bugzilla/attachment.cgi?id=118577, from Chris Grau
-Patch0:         Apache-Session-mp2.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  perl(DBI)
@@ -21,7 +19,6 @@
 
 %prep
 %setup -q -n Apache-Session-%{version}
-%patch0 -p0
 
 %build
 %{__perl} Makefile.PL INSTALLDIRS=vendor
@@ -52,9 +49,5 @@
 %{_mandir}/man3/Apache*
 
 %changelog
-* Thu Sep 08 2005 Steven Pritchard  1.6-2
-- Add patch for mod_perl2 compatibility from Chris Grau (#167753, comment #3).
-- Re-enable "make test".
-
-* Wed Aug 31 2005 Steven Pritchard  1.6-1
-- Specfile autogenerated.
+* Tue Sep 13 2005 Steven Pritchard  1.6-1
+- Backport to FC3.


--- Apache-Session-mp2.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Sep 14 18:34:00 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Wed, 14 Sep 2005 14:34:00 -0400
Subject: owners owners.list,1.206,1.207
Message-ID: <200509141834.j8EIY0It023501@cvs-int.fedora.redhat.com>

Author: spot

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

Modified Files:
	owners.list 
Log Message:

perl-Class-DBI-Loader and perl-Class-DBI-Loader-Relationship



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.206
retrieving revision 1.207
diff -u -r1.206 -r1.207
--- owners.list	14 Sep 2005 12:48:42 -0000	1.206
+++ owners.list	14 Sep 2005 18:33:58 -0000	1.207
@@ -590,6 +590,8 @@
 Fedora Extras|perl-Class-DBI-AsForm|Produce HTML form elements for database columns|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Class-DBI-FromCGI|Update Class::DBI data using CGI::Untaint|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Class-DBI-mysql|Extensions to Class::DBI for MySQL|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Class-DBI-Loader|Dynamic definition of Class::DBI sub classes|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Class-DBI-Loader-Relationship|Easier relationship specification in CDBI::L|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Class-DBI-Pager|Pager utility for Class::DBI|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Class-DBI-Pg|Class::DBI extension for PostgreSQL|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Class-DBI-Plugin|Abstract base class for Class::DBI plugins|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Wed Sep 14 02:48:09 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Tue, 13 Sep 2005 22:48:09 -0400
Subject: owners owners.list,1.202,1.203
Message-ID: <200509140248.j8E2m9cH030228@cvs-int.fedora.redhat.com>

Author: corsepiu

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

Modified Files:
	owners.list 
Log Message:
Add perl-File-Remove


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.202
retrieving revision 1.203
diff -u -r1.202 -r1.203
--- owners.list	13 Sep 2005 18:38:58 -0000	1.202
+++ owners.list	14 Sep 2005 02:48:07 -0000	1.203
@@ -629,6 +629,7 @@
 Fedora Extras|perl-ExtUtils-XSBuilder| Modules that parse C header files and create XS glue code|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-File-BOM|Utilities for reading Byte Order Marks|mpeters at mac.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-File-Find-Rule|Perl module implementing an alternative interface to File::Find|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-File-Remove|Convenience module for removing files and directories|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-File-Slurp|Efficient Reading/Writing of Complete Files|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-File-Tail|Perl extension for reading from continously updated files|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Font-AFM|Perl interface to Adobe Font Metrics files|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Wed Sep 14 19:32:25 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Wed, 14 Sep 2005 15:32:25 -0400
Subject: rpms/lapack/FC-4 lapack.spec,1.2,1.3
Message-ID: <200509141932.j8EJWPlu025500@cvs-int.fedora.redhat.com>

Author: spot

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

Modified Files:
	lapack.spec 
Log Message:

typo.



Index: lapack.spec
===================================================================
RCS file: /cvs/extras/rpms/lapack/FC-4/lapack.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- lapack.spec	14 Sep 2005 19:31:04 -0000	1.2
+++ lapack.spec	14 Sep 2005 19:32:23 -0000	1.3
@@ -53,7 +53,7 @@
 Group: Development/Libraries
 Requires: blas = %{version}-%{release}
 
-%description blas-devel
+%description -n blas-devel
 BLAS development libraries for applications that link statically.
 
 %prep



From fedora-extras-commits at redhat.com  Wed Sep 14 19:31:07 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Wed, 14 Sep 2005 15:31:07 -0400
Subject: rpms/lapack/devel lapack.spec,1.1,1.2
Message-ID: <200509141931.j8EJVbHs025461@cvs-int.fedora.redhat.com>

Author: spot

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

Modified Files:
	lapack.spec 
Log Message:

make -devel packages for lapack/blas, special _pic static lib for ATLAS



Index: lapack.spec
===================================================================
RCS file: /cvs/extras/rpms/lapack/devel/lapack.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- lapack.spec	15 Apr 2005 02:04:38 -0000	1.1
+++ lapack.spec	14 Sep 2005 19:31:05 -0000	1.2
@@ -1,7 +1,7 @@
 Summary: The LAPACK libraries for numerical linear algebra.
 Name: lapack
 Version: 3.0
-Release: 29
+Release: 30%{?dist}
 License: Freely distributable
 Group: Development/Libraries
 URL: http://www.netlib.org/lapack/
@@ -30,6 +30,14 @@
 real and complex matrices in both single and double precision. LAPACK
 is coded in Fortran77 and built with gcc.
 
+%package devel
+Summary: LAPACK development libraries
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+
+%description devel
+LAPACK development libraries for applications that link statically.
+
 %package -n blas
 Summary: The BLAS (Basic Linear Algebra Subprograms) library.
 Group: Development/Libraries
@@ -40,6 +48,14 @@
 provides a number of basic algorithms for numerical algebra. Man
 pages for blas are available in the blas-man package.
 
+%package -n blas-devel
+Summary: LAPACK development libraries
+Group: Development/Libraries
+Requires: blas = %{version}-%{release}
+
+%description blas-devel
+BLAS development libraries for applications that link statically.
+
 %prep
 %setup -q -n LAPACK
 %setup -q -D -T -a 1 -n LAPACK
@@ -75,6 +91,11 @@
 FFLAGS="$RPM_OPT_SIZE_FLAGS -fPIC" make dlamch.o slamch.o dgeev.o
 FFLAGS="$RPM_OPT_FLAGS -fPIC" make shared
 cp liblapack.so.3.0.3 ..
+make clean
+FFLAGS="$RPM_OPT_SIZE_FLAGS -fPIC" make dlamch.o slamch.o dgeev.o
+FFLAGS="$RPM_OPT_FLAGS -fPIC" make static
+cp liblapack.a ../liblapack_pic.a
+
 cd ..
 cp %{SOURCE4} lapackqref.ps
 cp %{SOURCE5} blasqr.ps
@@ -120,14 +141,29 @@
 %files -f lapackmans
 %defattr(-,root,root)
 %doc README lapackqref.ps
-%{_libdir}/liblapack.*
+%{_libdir}/liblapack.so.*
+
+%files devel
+%defattr(-,root,root,-)
+%{_libdir}/liblapack.so
+%{_libdir}/liblapack*.a
 
 %files -n blas -f blasmans
 %defattr(-,root,root)
 %doc blasqr.ps
-%{_libdir}/libblas.*
+%{_libdir}/libblas.so.*
+
+%files -n blas-devel
+%defattr(-,root,root,-)
+%{_libdir}/libblas.so
+%{_libdir}/libblas*.a
 
 %changelog
+* Wed Sep 14 2005 Tom "spot" Callaway  3.0-30
+- make -devel packages
+- make liblapack_pic.a package
+- use dist tag
+
 * Thu Apr 14 2005 Tom "spot" Callaway  3.0-29
 - package moves to Fedora Extras, gcc4
 



From fedora-extras-commits at redhat.com  Wed Sep 14 19:31:07 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Wed, 14 Sep 2005 15:31:07 -0400
Subject: rpms/lapack/FC-4 lapack.spec,1.1,1.2
Message-ID: <200509141931.j8EJVbnB025458@cvs-int.fedora.redhat.com>

Author: spot

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

Modified Files:
	lapack.spec 
Log Message:

make -devel packages for lapack/blas, special _pic static lib for ATLAS



Index: lapack.spec
===================================================================
RCS file: /cvs/extras/rpms/lapack/FC-4/lapack.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- lapack.spec	15 Apr 2005 02:04:38 -0000	1.1
+++ lapack.spec	14 Sep 2005 19:31:04 -0000	1.2
@@ -1,7 +1,7 @@
 Summary: The LAPACK libraries for numerical linear algebra.
 Name: lapack
 Version: 3.0
-Release: 29
+Release: 30%{?dist}
 License: Freely distributable
 Group: Development/Libraries
 URL: http://www.netlib.org/lapack/
@@ -30,6 +30,14 @@
 real and complex matrices in both single and double precision. LAPACK
 is coded in Fortran77 and built with gcc.
 
+%package devel
+Summary: LAPACK development libraries
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+
+%description devel
+LAPACK development libraries for applications that link statically.
+
 %package -n blas
 Summary: The BLAS (Basic Linear Algebra Subprograms) library.
 Group: Development/Libraries
@@ -40,6 +48,14 @@
 provides a number of basic algorithms for numerical algebra. Man
 pages for blas are available in the blas-man package.
 
+%package -n blas-devel
+Summary: LAPACK development libraries
+Group: Development/Libraries
+Requires: blas = %{version}-%{release}
+
+%description blas-devel
+BLAS development libraries for applications that link statically.
+
 %prep
 %setup -q -n LAPACK
 %setup -q -D -T -a 1 -n LAPACK
@@ -75,6 +91,11 @@
 FFLAGS="$RPM_OPT_SIZE_FLAGS -fPIC" make dlamch.o slamch.o dgeev.o
 FFLAGS="$RPM_OPT_FLAGS -fPIC" make shared
 cp liblapack.so.3.0.3 ..
+make clean
+FFLAGS="$RPM_OPT_SIZE_FLAGS -fPIC" make dlamch.o slamch.o dgeev.o
+FFLAGS="$RPM_OPT_FLAGS -fPIC" make static
+cp liblapack.a ../liblapack_pic.a
+
 cd ..
 cp %{SOURCE4} lapackqref.ps
 cp %{SOURCE5} blasqr.ps
@@ -120,14 +141,29 @@
 %files -f lapackmans
 %defattr(-,root,root)
 %doc README lapackqref.ps
-%{_libdir}/liblapack.*
+%{_libdir}/liblapack.so.*
+
+%files devel
+%defattr(-,root,root,-)
+%{_libdir}/liblapack.so
+%{_libdir}/liblapack*.a
 
 %files -n blas -f blasmans
 %defattr(-,root,root)
 %doc blasqr.ps
-%{_libdir}/libblas.*
+%{_libdir}/libblas.so.*
+
+%files -n blas-devel
+%defattr(-,root,root,-)
+%{_libdir}/libblas.so
+%{_libdir}/libblas*.a
 
 %changelog
+* Wed Sep 14 2005 Tom "spot" Callaway  3.0-30
+- make -devel packages
+- make liblapack_pic.a package
+- use dist tag
+
 * Thu Apr 14 2005 Tom "spot" Callaway  3.0-29
 - package moves to Fedora Extras, gcc4
 



From fedora-extras-commits at redhat.com  Wed Sep 14 19:32:26 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Wed, 14 Sep 2005 15:32:26 -0400
Subject: rpms/lapack/devel lapack.spec,1.2,1.3
Message-ID: <200509141932.j8EJWQBk025506@cvs-int.fedora.redhat.com>

Author: spot

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

Modified Files:
	lapack.spec 
Log Message:

typo.



Index: lapack.spec
===================================================================
RCS file: /cvs/extras/rpms/lapack/devel/lapack.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- lapack.spec	14 Sep 2005 19:31:05 -0000	1.2
+++ lapack.spec	14 Sep 2005 19:32:24 -0000	1.3
@@ -53,7 +53,7 @@
 Group: Development/Libraries
 Requires: blas = %{version}-%{release}
 
-%description blas-devel
+%description -n blas-devel
 BLAS development libraries for applications that link statically.
 
 %prep



From fedora-extras-commits at redhat.com  Wed Sep 14 18:49:11 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 14 Sep 2005 14:49:11 -0400
Subject: rpms/libol/devel libol.spec,1.10,1.11
Message-ID: <200509141849.j8EInf5K023982@cvs-int.fedora.redhat.com>

Author: jpo

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

Modified Files:
	libol.spec 
Log Message:
- Added the dist tag.
- Excluded the .la file.



Index: libol.spec
===================================================================
RCS file: /cvs/extras/rpms/libol/devel/libol.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- libol.spec	6 May 2005 23:59:30 -0000	1.10
+++ libol.spec	14 Sep 2005 18:49:09 -0000	1.11
@@ -6,13 +6,13 @@
 
 Name:           libol
 Version:        0.3.16
-Release:        1.fc4
+Release:        2%{?dist}
 Summary:        Support library for syslog-ng
 
 Group:          Development/Libraries
 License:        GPL
 Url:            http://www.balabit.com/products/syslog-ng/
-Source:         http://www.balabit.com/downloads/syslog-ng/libol/0.3/libol-0.3.16.tar.gz
+Source:         http://www.balabit.com/downloads/syslog-ng/libol/0.3/libol-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 %if %{with_scheme_preprocessor}
 BuildRequires:  scsh
@@ -65,16 +65,20 @@
 %endif
 %{_bindir}/libol-config
 %{_libdir}/libol.a
-%{_libdir}/libol.la
+%exclude %{_libdir}/libol.la
 %{_libdir}/libol.so
 %{_includedir}/libol
 
 
 %changelog
-* Tue May 03 2005 Jose Pedro Oliveira  - 0.3.16-1.fc4
+* Wed Sep 14 2005 Jose Pedro Oliveira  - 0.3.16-2
+- Added the dist tag.
+- Excluded the .la file.
+
+* Tue May 03 2005 Jose Pedro Oliveira  - 0.3.16-1
 - Update to 0.3.16.
 
-* Fri Apr  7 2005 Michael Schwendt 
+* Fri Apr  7 2005 Michael Schwendt  - 0.3.15-2
 - rebuilt
 
 * Tue Mar 01 2005 Ville Skytt??  - 0:0.3.15-2



From fedora-extras-commits at redhat.com  Wed Sep 14 18:25:37 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Wed, 14 Sep 2005 14:25:37 -0400
Subject: rpms/perl-Class-DBI-Loader/devel - New directory
Message-ID: <200509141825.j8EIPb2a022853@cvs-int.fedora.redhat.com>

Author: spot

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

Log Message:
Directory /cvs/extras/rpms/perl-Class-DBI-Loader/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Sep 14 18:21:22 2005
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Wed, 14 Sep 2005 14:21:22 -0400
Subject: extras-buildsys/server Config.py,1.6,1.7 PackageJob.py,1.30,1.31
Message-ID: <200509141821.j8EILqvm022771@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys/server
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22728/server

Modified Files:
	Config.py PackageJob.py 
Log Message:
2005-09-14  Dan Williams  

    * server/PackageJob.py
      server/Config.py
        - Rename "scratch" targets to "testing" targets to make their
            purpose clearer
        - Don't delete packages from the repodir if their target
            is a testing target




Index: Config.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/Config.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Config.py	9 Sep 2005 15:10:17 -0000	1.6
+++ Config.py	14 Sep 2005 18:21:20 -0000	1.7
@@ -202,7 +202,7 @@
         self.set_option("General", "distro", "fedora")
         self.set_option("General", "target", "development")
         self.set_option("General", "repo", "core")
-        self.set_option("General", "scratch", "no")
+        self.set_option("General", "testing", "no")
         self.set_option("General", "repo_script", "")
 
         self.add_section("Arches")


Index: PackageJob.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/PackageJob.py,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- PackageJob.py	14 Sep 2005 11:50:29 -0000	1.30
+++ PackageJob.py	14 Sep 2005 18:21:20 -0000	1.31
@@ -526,9 +526,9 @@
             msg = "%s\n-------------------------------------------------\n\n%s\n" % (msg, logtail)
             self.email_result(self.username, resultstring=msg, subject=subj)
 
-            # Only non-scratch targets kill remaining jobs and file the entire
+            # Only non-testing targets kill remaining jobs and file the entire
             # build when one archjob fails
-            if self._target_cfg.get_bool("General", "scratch") == False:
+            if self._target_cfg.get_bool("General", "testing") == False:
                 # Kill remaining jobs on other arches
                 self._kill_all_archjobs()
                 self._stage_failed(e.msg)
@@ -548,8 +548,8 @@
                     failed_jobs = failed_jobs + 1
 
                     # Normal jobs will just stop when a single archjob fails, but
-                    # scratch targets don't kill the build when one fails.  However,
-                    # even for scratch targets, we still want to notify the user if
+                    # testing targets don't kill the build when one fails.  However,
+                    # even for testing targets, we still want to notify the user if
                     # a particular arch fails.
                     if not job.failure_noticed():
                         job.set_failure_noticed()
@@ -566,8 +566,8 @@
         self._archjobs_lock.release()
 
         if completed_jobs == len(self.archjobs):
-            # Scratch targets don't contribute packages to the repo
-            if self._target_cfg.get_bool("General", "scratch") == True:
+            # Testing targets don't contribute packages to the repo
+            if self._target_cfg.get_bool("General", "testing") == True:
                 if failed_jobs > 0:
                     self._stage_failed("Job failed on one or more architectures.")
                 else:
@@ -592,6 +592,12 @@
         if not self.result_dir or not self.srpm_http_path:
             return
 
+        # If its a testing target, we keep the RPMs around since they don't
+        # get copied to the repository, they only live in the repodir
+        testing_target = self._target_cfg.get_bool("General", "testing")
+        if self.result == 'success' and testing_target == True:
+            return
+
         srpm_file = os.path.join(self.result_dir, os.path.basename(self.srpm_http_path))
 
         # Delete any RPMs in the arch dirs



From fedora-extras-commits at redhat.com  Wed Sep 14 18:29:51 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Wed, 14 Sep 2005 14:29:51 -0400
Subject: rpms/perl-Class-DBI-Loader-Relationship/devel - New directory
Message-ID: <200509141829.j8EITp66023307@cvs-int.fedora.redhat.com>

Author: spot

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

Log Message:
Directory /cvs/extras/rpms/perl-Class-DBI-Loader-Relationship/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Sep 14 18:30:10 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Wed, 14 Sep 2005 14:30:10 -0400
Subject: rpms/perl-Class-DBI-Loader-Relationship/devel .cvsignore, NONE,
	1.1 Makefile, NONE, 1.1 sources, NONE, 1.1
Message-ID: <200509141830.j8EIUADP023361@cvs-int.fedora.redhat.com>

Author: spot

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

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Class-DBI-Loader-Relationship


--- NEW FILE .cvsignore ---


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

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Wed Sep 14 18:26:16 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Wed, 14 Sep 2005 14:26:16 -0400
Subject: rpms/perl-Class-DBI-Loader import.log,1.1,1.2
Message-ID: <200509141826.j8EIQG8h022993@cvs-int.fedora.redhat.com>

Author: spot

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

Modified Files:
	import.log 
Log Message:
auto-import perl-Class-DBI-Loader-0.22-4 on branch devel from perl-Class-DBI-Loader-0.22-4.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-Loader/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	14 Sep 2005 18:25:48 -0000	1.1
+++ import.log	14 Sep 2005 18:26:14 -0000	1.2
@@ -0,0 +1 @@
+perl-Class-DBI-Loader-0_22-4:HEAD:perl-Class-DBI-Loader-0.22-4.src.rpm:1126722368



From fedora-extras-commits at redhat.com  Wed Sep 14 18:29:50 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Wed, 14 Sep 2005 14:29:50 -0400
Subject: rpms/perl-Class-DBI-Loader-Relationship - New directory
Message-ID: <200509141829.j8EIToNY023302@cvs-int.fedora.redhat.com>

Author: spot

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

Log Message:
Directory /cvs/extras/rpms/perl-Class-DBI-Loader-Relationship added to the repository




From fedora-extras-commits at redhat.com  Wed Sep 14 18:25:36 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Wed, 14 Sep 2005 14:25:36 -0400
Subject: rpms/perl-Class-DBI-Loader - New directory
Message-ID: <200509141825.j8EIPav1022848@cvs-int.fedora.redhat.com>

Author: spot

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

Log Message:
Directory /cvs/extras/rpms/perl-Class-DBI-Loader added to the repository




From fedora-extras-commits at redhat.com  Wed Sep 14 18:21:22 2005
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Wed, 14 Sep 2005 14:21:22 -0400
Subject: extras-buildsys ChangeLog,1.123,1.124
Message-ID: <200509141821.j8EILq4j022767@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22728

Modified Files:
	ChangeLog 
Log Message:
2005-09-14  Dan Williams  

    * server/PackageJob.py
      server/Config.py
        - Rename "scratch" targets to "testing" targets to make their
            purpose clearer
        - Don't delete packages from the repodir if their target
            is a testing target




Index: ChangeLog
===================================================================
RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -r1.123 -r1.124
--- ChangeLog	14 Sep 2005 16:53:29 -0000	1.123
+++ ChangeLog	14 Sep 2005 18:21:20 -0000	1.124
@@ -1,5 +1,14 @@
 2005-09-14  Dan Williams  
 
+    * server/PackageJob.py
+      server/Config.py
+        - Rename "scratch" targets to "testing" targets to make their
+            purpose clearer
+        - Don't delete packages from the repodir if their target
+            is a testing target
+
+2005-09-14  Dan Williams  
+
     * utils/distro-rebuild.py
         - Optionally add a changelog entry to rebuilt specfile
 



From fedora-extras-commits at redhat.com  Wed Sep 14 18:30:36 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Wed, 14 Sep 2005 14:30:36 -0400
Subject: rpms/perl-Class-DBI-Loader-Relationship import.log,1.1,1.2
Message-ID: <200509141831.j8EIV6Aw023434@cvs-int.fedora.redhat.com>

Author: spot

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

Modified Files:
	import.log 
Log Message:
auto-import perl-Class-DBI-Loader-Relationship-1.2-4 on branch devel from perl-Class-DBI-Loader-Relationship-1.2-4.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-Loader-Relationship/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	14 Sep 2005 18:30:07 -0000	1.1
+++ import.log	14 Sep 2005 18:30:34 -0000	1.2
@@ -0,0 +1 @@
+perl-Class-DBI-Loader-Relationship-1_2-4:HEAD:perl-Class-DBI-Loader-Relationship-1.2-4.src.rpm:1126722626



From fedora-extras-commits at redhat.com  Wed Sep 14 18:49:10 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 14 Sep 2005 14:49:10 -0400
Subject: rpms/libol/FC-4 libol.spec,1.10,1.11
Message-ID: <200509141849.j8EInfUr023979@cvs-int.fedora.redhat.com>

Author: jpo

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

Modified Files:
	libol.spec 
Log Message:
- Added the dist tag.
- Excluded the .la file.



Index: libol.spec
===================================================================
RCS file: /cvs/extras/rpms/libol/FC-4/libol.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- libol.spec	6 May 2005 23:59:30 -0000	1.10
+++ libol.spec	14 Sep 2005 18:49:08 -0000	1.11
@@ -6,13 +6,13 @@
 
 Name:           libol
 Version:        0.3.16
-Release:        1.fc4
+Release:        2%{?dist}
 Summary:        Support library for syslog-ng
 
 Group:          Development/Libraries
 License:        GPL
 Url:            http://www.balabit.com/products/syslog-ng/
-Source:         http://www.balabit.com/downloads/syslog-ng/libol/0.3/libol-0.3.16.tar.gz
+Source:         http://www.balabit.com/downloads/syslog-ng/libol/0.3/libol-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 %if %{with_scheme_preprocessor}
 BuildRequires:  scsh
@@ -65,16 +65,20 @@
 %endif
 %{_bindir}/libol-config
 %{_libdir}/libol.a
-%{_libdir}/libol.la
+%exclude %{_libdir}/libol.la
 %{_libdir}/libol.so
 %{_includedir}/libol
 
 
 %changelog
-* Tue May 03 2005 Jose Pedro Oliveira  - 0.3.16-1.fc4
+* Wed Sep 14 2005 Jose Pedro Oliveira  - 0.3.16-2
+- Added the dist tag.
+- Excluded the .la file.
+
+* Tue May 03 2005 Jose Pedro Oliveira  - 0.3.16-1
 - Update to 0.3.16.
 
-* Fri Apr  7 2005 Michael Schwendt 
+* Fri Apr  7 2005 Michael Schwendt  - 0.3.15-2
 - rebuilt
 
 * Tue Mar 01 2005 Ville Skytt??  - 0:0.3.15-2



From fedora-extras-commits at redhat.com  Wed Sep 14 18:30:36 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Wed, 14 Sep 2005 14:30:36 -0400
Subject: rpms/perl-Class-DBI-Loader-Relationship/devel
	perl-Class-DBI-Loader-Relationship.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200509141831.j8EIV7Jc023438@cvs-int.fedora.redhat.com>

Author: spot

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

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Class-DBI-Loader-Relationship.spec 
Log Message:
auto-import perl-Class-DBI-Loader-Relationship-1.2-4 on branch devel from perl-Class-DBI-Loader-Relationship-1.2-4.src.rpm


--- NEW FILE perl-Class-DBI-Loader-Relationship.spec ---
Name:           perl-Class-DBI-Loader-Relationship
Version:        1.2
Release:        4%{?dist}
Summary:        Easier relationship specification in CDBI::L
Group:          Development/Libraries
License:        Distributable
URL:            http://search.cpan.org/dist/Class-DBI-Loader-Relationship/
Source0:        http://search.cpan.org/CPAN/authors/id/S/SI/SIMON/Class-DBI-Loader-Relationship-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:	perl(Class::DBI::Loader), perl(Lingua::EN::Inflect::Number)
Requires:  perl(Class::DBI::Loader), perl(Lingua::EN::Inflect::Number)
Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
%{summary}.

%prep
%setup -q -n Class-DBI-Loader-Relationship-%{version}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

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

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes
%{perl_vendorlib}/Class/DBI/Loader
%{_mandir}/man3/*.3*


%changelog
* Wed Sep 14 2005 Tom "spot" Callaway  1.2-4
- set license to Distributable

* Wed Sep  7 2005 Tom "spot" Callaway  1.2-3
- remove redundant BR: perl
- honor %%{_smp_mflags}
- include license text

* Fri Jul  8 2005 Tom "spot" Callaway  1.2-2
- cleanups

* Wed Jul  6 2005 Tom "spot" Callaway  1.2-1
- Initial package for Fedora Extras


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-Loader-Relationship/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	14 Sep 2005 18:30:08 -0000	1.1
+++ .cvsignore	14 Sep 2005 18:30:34 -0000	1.2
@@ -0,0 +1 @@
+Class-DBI-Loader-Relationship-1.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-Loader-Relationship/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	14 Sep 2005 18:30:08 -0000	1.1
+++ sources	14 Sep 2005 18:30:34 -0000	1.2
@@ -0,0 +1 @@
+d5a3262146ee4c63a46a5c87205c5619  Class-DBI-Loader-Relationship-1.2.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep 14 17:55:23 2005
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Wed, 14 Sep 2005 13:55:23 -0400
Subject: rpms/python-myghty/devel python-myghty.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200509141755.j8EHtrUq021256@cvs-int.fedora.redhat.com>

Author: lmacken

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

Modified Files:
	.cvsignore sources 
Added Files:
	python-myghty.spec 
Log Message:
auto-import python-myghty-0.98c-1 on branch devel from python-myghty-0.98c-1.src.rpm


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

Name:           python-myghty
Version:        0.98c
Release:        1
Summary:        A Python-based templating system derived from HTML::Mason

Group:          Development/Libraries
License:        LGPL
URL:            http://www.myghty.org
Source0:        http://dl.sf.net/Myghty/Myghty-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

BuildRequires:  python

%description
Myghty is a Python based web and templating framework originally based on
HTML::Mason, the enterprise-level framework used by Amazon.com, del.icio.us
and Salon.com, among many others. Myghty fully implements Mason's templating
language, component-based architecture, and caching system, and goes beyond,
adding new paradigms such the Module Components controller paradigm, full
Python whitespace syntax, threading support, WSGI support, session support,
and much more.

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


%build
%{__python} setup.py build


%install
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
(cd doc ; %{__python} genhtml.py)
find ./doc ./examples -type f -perm +001 | xargs chmod -x


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc doc/html/* examples LICENSE
%{python_sitelib}/*


%changelog
* Mon Sep 12 2005 Luke Macken  0.98c-1
- Bump to version 0.98c

* Tue Aug 16 2005 Luke Macken  0.98a-1
- Packaged for Fedora Extras


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-myghty/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	14 Sep 2005 17:33:35 -0000	1.1
+++ .cvsignore	14 Sep 2005 17:55:21 -0000	1.2
@@ -0,0 +1 @@
+Myghty-0.98c.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-myghty/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	14 Sep 2005 17:33:35 -0000	1.1
+++ sources	14 Sep 2005 17:55:21 -0000	1.2
@@ -0,0 +1 @@
+73d5ee5302ffb610059928c8353f2201  Myghty-0.98c.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep 14 18:25:51 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Wed, 14 Sep 2005 14:25:51 -0400
Subject: rpms/perl-Class-DBI-Loader/devel .cvsignore, NONE, 1.1 Makefile,
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <200509141825.j8EIPpm7022906@cvs-int.fedora.redhat.com>

Author: spot

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

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Class-DBI-Loader


--- NEW FILE .cvsignore ---


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

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Wed Sep 14 18:25:50 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Wed, 14 Sep 2005 14:25:50 -0400
Subject: rpms/perl-Class-DBI-Loader Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200509141825.j8EIPoG8022901@cvs-int.fedora.redhat.com>

Author: spot

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

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-Class-DBI-Loader


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

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

common : CVS/Root
	@cvs checkout common

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

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


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Wed Sep 14 18:30:09 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Wed, 14 Sep 2005 14:30:09 -0400
Subject: rpms/perl-Class-DBI-Loader-Relationship Makefile, NONE,
	1.1 import.log, NONE, 1.1
Message-ID: <200509141830.j8EIU9qH023356@cvs-int.fedora.redhat.com>

Author: spot

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

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-Class-DBI-Loader-Relationship


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Class-DBI-Loader-Relationship
all : CVS/Root common-update
	@cvs update

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

common : CVS/Root
	@cvs checkout common

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

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


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Wed Sep 14 17:55:23 2005
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Wed, 14 Sep 2005 13:55:23 -0400
Subject: rpms/python-myghty import.log,1.1,1.2
Message-ID: <200509141755.j8EHtrOl021252@cvs-int.fedora.redhat.com>

Author: lmacken

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

Modified Files:
	import.log 
Log Message:
auto-import python-myghty-0.98c-1 on branch devel from python-myghty-0.98c-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/python-myghty/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	14 Sep 2005 17:33:35 -0000	1.1
+++ import.log	14 Sep 2005 17:55:20 -0000	1.2
@@ -0,0 +1 @@
+python-myghty-0_98c-1:HEAD:python-myghty-0.98c-1.src.rpm:1126720515



From fedora-extras-commits at redhat.com  Wed Sep 14 17:33:16 2005
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Wed, 14 Sep 2005 13:33:16 -0400
Subject: rpms/python-myghty - New directory
Message-ID: <200509141733.j8EHXGGF021077@cvs-int.fedora.redhat.com>

Author: lmacken

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

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




From fedora-extras-commits at redhat.com  Wed Sep 14 17:33:16 2005
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Wed, 14 Sep 2005 13:33:16 -0400
Subject: rpms/python-myghty - New directory
Message-ID: <200509141733.j8EHXGGF021077@cvs-int.fedora.redhat.com>

<<< No Message Collected >>>



From fedora-extras-commits at redhat.com  Wed Sep 14 17:55:23 2005
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Wed, 14 Sep 2005 13:55:23 -0400
Subject: rpms/python-myghty import.log,1.1,1.2
Message-ID: <200509141755.j8EHtrOl021252@cvs-int.fedora.redhat.com>

<<< No Message Collected >>>



From fedora-extras-commits at redhat.com  Wed Sep 14 18:26:17 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Wed, 14 Sep 2005 14:26:17 -0400
Subject: rpms/perl-Class-DBI-Loader/devel perl-Class-DBI-Loader.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200509141826.j8EIQHO4022998@cvs-int.fedora.redhat.com>

Author: spot

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

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Class-DBI-Loader.spec 
Log Message:
auto-import perl-Class-DBI-Loader-0.22-4 on branch devel from perl-Class-DBI-Loader-0.22-4.src.rpm


--- NEW FILE perl-Class-DBI-Loader.spec ---
Name:           perl-Class-DBI-Loader
Version:        0.22
Release:        4%{?dist}
Summary:        Dynamic definition of Class::DBI sub classes
Group:          Development/Libraries
License:        GPL or Artistic
URL:            http://search.cpan.org/dist/Class-DBI-Loader
Source0:        http://search.cpan.org/CPAN/authors/id/S/SR/SRI/Class-DBI-Loader-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:	perl(Lingua::EN::Inflect), perl(Test::Pod::Coverage), perl(Test::Pod)
BuildRequires:  perl(Class::DBI::mysql), perl(Class::DBI::Pg), perl(Class::DBI::SQLite)
Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
%{summary}.

%prep
%setup -q -n Class-DBI-Loader-%{version}
perldoc -t perlartistic > Artistic
perldoc -t perlgpl > COPYING

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

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

%check
# Coverage test fails
mv t/03podcoverage.t .
TEST_POD=1 make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Artistic COPYING Changes
%{perl_vendorlib}/Class/DBI
%{_mandir}/man3/*.3*


%changelog
* Fri Sep  9 2005 Paul Howarth  0.22-4
- include POD tests in %%check, but disable failing POD coverage test
- remove explicit Class::DBI dep because it's pulled in by other deps
  that are autodetected

* Wed Sep  7 2005 Tom "spot" Callaway  0.22-3
- remove redundant BR: perl
- honor %%{_smp_mflags}
- include license text

* Fri Jul  8 2005 Tom "spot" Callaway  0.22-2
- cleanups

* Wed Jul  6 2005 Tom "spot" Callaway  0.22-1
- Initial package for Fedora Extras


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-Loader/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	14 Sep 2005 18:25:48 -0000	1.1
+++ .cvsignore	14 Sep 2005 18:26:15 -0000	1.2
@@ -0,0 +1 @@
+Class-DBI-Loader-0.22.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-Loader/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	14 Sep 2005 18:25:48 -0000	1.1
+++ sources	14 Sep 2005 18:26:15 -0000	1.2
@@ -0,0 +1 @@
+fdb246040add571cffc1134184e9ca0f  Class-DBI-Loader-0.22.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep 14 17:33:37 2005
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Wed, 14 Sep 2005 13:33:37 -0400
Subject: rpms/python-myghty Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200509141733.j8EHXbi7021131@cvs-int.fedora.redhat.com>

Author: lmacken

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

Added Files:
	Makefile import.log 
Log Message:
Setup of module python-myghty


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

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

common : CVS/Root
	@cvs checkout common

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

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


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Wed Sep 14 17:33:17 2005
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Wed, 14 Sep 2005 13:33:17 -0400
Subject: rpms/python-myghty/devel - New directory
Message-ID: <200509141733.j8EHXHuB021082@cvs-int.fedora.redhat.com>

Author: lmacken

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

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




From fedora-extras-commits at redhat.com  Wed Sep 14 17:33:37 2005
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Wed, 14 Sep 2005 13:33:37 -0400
Subject: rpms/python-myghty/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200509141733.j8EHXbYS021136@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/extras/rpms/python-myghty/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21102/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module python-myghty


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Wed Sep 14 16:53:31 2005
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Wed, 14 Sep 2005 12:53:31 -0400
Subject: extras-buildsys/utils distro-rebuild.py,1.5,1.6
Message-ID: <200509141653.j8EGrVRw019602@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys/utils
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19563/utils

Modified Files:
	distro-rebuild.py 
Log Message:
2005-09-14  Dan Williams  

    * utils/distro-rebuild.py
        - Optionally add a changelog entry to rebuilt specfile




Index: distro-rebuild.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/distro-rebuild.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- distro-rebuild.py	13 Sep 2005 15:55:56 -0000	1.5
+++ distro-rebuild.py	14 Sep 2005 16:53:29 -0000	1.6
@@ -66,7 +66,13 @@
     del srpm_dict
     return files_dict
 
-def rebuild_srpm(name, f):
+def rebuild_srpm(name, f, user=None):
+    ts = rpmUtils.transaction.initReadOnlyTransaction()
+    hdr = rpmUtils.miscutils.hdrFromPackage(ts, f)
+    chlog_ver = "%s-%s.1" % (hdr['version'], hdr['release'])
+    del ts
+    del hdr
+
     # Create a temp dir
     temp_dir = os.path.join("/tmp", "rebuild", name)
     if not os.path.exists(temp_dir):
@@ -96,10 +102,19 @@
     specfile_new = specfile+".new"
     dst = open(specfile_new, "w")
     found = False
+    changelog = False
     for line in src:
         if line.startswith("Release:"):
             line = string.strip(line) + ".1\n"
             found = True
+        if line.startswith("%changelog"):
+            changelog = True
+        elif changelog and user:
+            # Add a changelog entry for the rebuild
+            t = time.strftime("%a %b %e %Y")
+            entry = "* %s %s - %s\n- Rebuild\n\n" % (t, user, chlog_ver)
+            dst.write(entry)
+            changelog = False
         dst.write(line)
     dst.close()
     src.close()
@@ -138,12 +153,12 @@
 
 
 def usage(program):
-    print "%s  " % program
+    print "%s   [changelog user]" % program
     print ""
 
 
 if __name__ == '__main__':
-    if len(sys.argv) < 3:
+    if len(sys.argv) < 4:
         usage(sys.argv[0])
         sys.exit(1)
 
@@ -153,6 +168,9 @@
         sys.exit(1)
 
     target = sys.argv[2]
+    user = None
+    if len(sys.argv > 3)
+        user = sys.argv[3]
 
     # Build up a list of all SRPMs in the specified directory
     files = find_newest_srpms(search_dir)
@@ -163,9 +181,9 @@
     names = files.keys()
     names.sort()
     for name in names:
-        f = files[name]
+        f = names[name]
         try:
-            (rebuilt_srpm, temp_dir_path) = rebuild_srpm(name, f)
+            (rebuilt_srpm, temp_dir_path) = rebuild_srpm(name, f, user)
         except RebuildException, e:
             shutil.rmtree(temp_dir_path, ignore_errors=True)
             print "RE: %s (%s)" % (f, e)



From fedora-extras-commits at redhat.com  Wed Sep 14 16:53:31 2005
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Wed, 14 Sep 2005 12:53:31 -0400
Subject: extras-buildsys ChangeLog,1.122,1.123
Message-ID: <200509141653.j8EGrVn0019594@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19563

Modified Files:
	ChangeLog 
Log Message:
2005-09-14  Dan Williams  

    * utils/distro-rebuild.py
        - Optionally add a changelog entry to rebuilt specfile




Index: ChangeLog
===================================================================
RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -r1.122 -r1.123
--- ChangeLog	13 Sep 2005 18:43:00 -0000	1.122
+++ ChangeLog	14 Sep 2005 16:53:29 -0000	1.123
@@ -1,3 +1,8 @@
+2005-09-14  Dan Williams  
+
+    * utils/distro-rebuild.py
+        - Optionally add a changelog entry to rebuilt specfile
+
 2005-09-13  Dan Williams  
 
     * builder/builder.py



From fedora-extras-commits at redhat.com  Wed Sep 14 15:42:01 2005
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Wed, 14 Sep 2005 11:42:01 -0400
Subject: extras-buildsys/server Builder.py,1.19,1.20
Message-ID: <200509141542.j8EFg1no017999@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys/server
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17978/server

Modified Files:
	Builder.py 
Log Message:
Don't kill the server when a builder faults


Index: Builder.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/Builder.py,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- Builder.py	31 Aug 2005 19:55:20 -0000	1.19
+++ Builder.py	14 Sep 2005 15:41:59 -0000	1.20
@@ -156,6 +156,10 @@
             jobid = self._server.start_new_job(target_dict, srpm_url)
         except (socket.error, socket.timeout, OpenSSL.SSL.SysCallError, xmlrpclib.ProtocolError):
             jobid = 0
+        except xmlrpclib.Fault, e:
+            print "Builder Error (%s): builder replied '%s'" % (self.address, e)
+            time.sleep(0.5)
+            jobid = 0
 
         if jobid == 0:
             self._server_lock.release()



From fedora-extras-commits at redhat.com  Wed Sep 14 14:55:52 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Wed, 14 Sep 2005 10:55:52 -0400
Subject: rpms/Macaulay2/devel Macaulay2.spec,1.9,1.10
Message-ID: <200509141455.j8EEtq7c016602@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/Macaulay2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16583

Modified Files:
	Macaulay2.spec 
Log Message:
* Wed Sep 14 2005 Rex Dieter  - 0.9.2-18
- rebuild against gc-6.6



Index: Macaulay2.spec
===================================================================
RCS file: /cvs/extras/rpms/Macaulay2/devel/Macaulay2.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Macaulay2.spec	8 Aug 2005 15:59:58 -0000	1.9
+++ Macaulay2.spec	14 Sep 2005 14:55:50 -0000	1.10
@@ -6,7 +6,7 @@
 Summary: System for algebraic geometry and commutative algebra
 Name:    Macaulay2
 Version: 0.9.2
-Release: 17%{?dist}
+Release: 18%{?dist}
 License: GPL
 Group:   Applications/Engineering
 URL:     http://www.math.uiuc.edu/Macaulay2/
@@ -25,7 +25,7 @@
 Patch5: Macaulay2-0.9.2-gcc4.patch
 
 BuildRequires: desktop-file-utils
-BuildRequires: gc-devel >= 6.5
+BuildRequires: gc-devel >= 6.6
 BuildRequires: factory-devel >= 2.0.5
 BuildRequires: libfac-devel >= 2.0.5
 BuildRequires: gdbm-devel
@@ -161,6 +161,9 @@
 
 
 %changelog
+* Wed Sep 14 2005 Rex Dieter  - 0.9.2-18
+- rebuild against gc-6.6
+
 * Thu May 26 2005 Michael Schwendt  - 0.9.2-17
 - rebuild (build system x86_64 repository access failed for 0.9.2-16)
 - fix build for GCC 4 (#156223)



From fedora-extras-commits at redhat.com  Wed Sep 14 11:53:44 2005
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Wed, 14 Sep 2005 07:53:44 -0400
Subject: extras-buildsys/server BuilderManager.py,1.17,1.18
Message-ID: <200509141153.j8EBrilM011735@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys/server
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11716/server

Modified Files:
	BuilderManager.py 
Log Message:
Remove debug print


Index: BuilderManager.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/BuilderManager.py,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- BuilderManager.py	11 Sep 2005 03:29:34 -0000	1.17
+++ BuilderManager.py	14 Sep 2005 11:53:42 -0000	1.18
@@ -158,7 +158,6 @@
             for builder in self._builders:
                 if builder.available() and builder.can_build_for_target(req['target_dict']):
                     builder_list.append(builder)
-                    print "Appending builder %s" % builder.address()
 
             # Use the builder with the most free build slots
             if sys.version_info[:3] >= (2, 4, 0):



From fedora-extras-commits at redhat.com  Wed Sep 14 12:31:29 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 14 Sep 2005 08:31:29 -0400
Subject: rpms/perl-Test-WWW-Mechanize import.log,1.1,1.2
Message-ID: <200509141231.j8ECVTt9013571@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Test-WWW-Mechanize
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13534

Modified Files:
	import.log 
Log Message:
auto-import perl-Test-WWW-Mechanize-1.06-1 on branch devel from perl-Test-WWW-Mechanize-1.06-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-WWW-Mechanize/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	14 Sep 2005 12:30:53 -0000	1.1
+++ import.log	14 Sep 2005 12:31:27 -0000	1.2
@@ -0,0 +1 @@
+perl-Test-WWW-Mechanize-1_06-1:HEAD:perl-Test-WWW-Mechanize-1.06-1.src.rpm:1126701079



From fedora-extras-commits at redhat.com  Wed Sep 14 11:50:31 2005
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Wed, 14 Sep 2005 07:50:31 -0400
Subject: extras-buildsys/server PackageJob.py,1.29,1.30
Message-ID: <200509141150.j8EBoV0f011704@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys/server
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11685/server

Modified Files:
	PackageJob.py 
Log Message:
Fix traceback on failed downloads from builder.


Index: PackageJob.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/PackageJob.py,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- PackageJob.py	8 Sep 2005 21:10:25 -0000	1.29
+++ PackageJob.py	14 Sep 2005 11:50:29 -0000	1.30
@@ -559,7 +559,7 @@
                             msg = "Job failed on arch %s\n" % jobarch
                         elif job.download_failed():
                             msg = "Job failed on arch %s: couldn't download result files from builder '%s'.\n " \
-                            "Please contact the build system administrator." % (jobarch, builder.address())
+                            "Please contact the build system administrator." % (jobarch, job.builder.address())
                         self._archjobs_lock.release()
                         raise BuildError(msg, jobarch)
 



From fedora-extras-commits at redhat.com  Wed Sep 14 12:30:55 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 14 Sep 2005 08:30:55 -0400
Subject: rpms/perl-Test-WWW-Mechanize/devel .cvsignore, NONE, 1.1 Makefile,
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <200509141231.j8ECUtYi013468@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Test-WWW-Mechanize/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13422/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Test-WWW-Mechanize


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Wed Sep 14 12:48:44 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 14 Sep 2005 08:48:44 -0400
Subject: owners owners.list,1.205,1.206
Message-ID: <200509141248.j8ECmiSj013732@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13712

Modified Files:
	owners.list 
Log Message:
New package: perl-Test-WWW-Mechanize


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.205
retrieving revision 1.206
diff -u -r1.205 -r1.206
--- owners.list	14 Sep 2005 09:49:46 -0000	1.205
+++ owners.list	14 Sep 2005 12:48:42 -0000	1.206
@@ -732,6 +732,7 @@
 Fedora Extras|perl-Test-Pod|Perl module for checking for POD errors in files|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Test-Taint|Tools to test taintedness|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Test-Warn|Perl extension to test methods for warnings|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Test-WWW-Mechanize|Testing-specific WWW::Mechanize subclass|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-TeX-Hyphen|Hyphenate words using TeX's patterns|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Text-Autoformat|Perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Text-Glob|Perl module to match globbing patterns against text|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Wed Sep 14 12:31:30 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 14 Sep 2005 08:31:30 -0400
Subject: rpms/perl-Test-WWW-Mechanize/devel perl-Test-WWW-Mechanize.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200509141231.j8ECVUUD013582@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Test-WWW-Mechanize/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13534/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Test-WWW-Mechanize.spec 
Log Message:
auto-import perl-Test-WWW-Mechanize-1.06-1 on branch devel from perl-Test-WWW-Mechanize-1.06-1.src.rpm


--- NEW FILE perl-Test-WWW-Mechanize.spec ---
Name:           perl-Test-WWW-Mechanize
Version:        1.06
Release:        1%{?dist}
Summary:        Testing-specific WWW::Mechanize subclass

Group:          Development/Libraries
License:        GPL or Artistic
URL:            http://search.cpan.org/dist/Test-WWW-Mechanize/
Source0:        http://www.cpan.org/authors/id/P/PE/PETDANCE/Test-WWW-Mechanize-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  perl(Test::Builder::Tester), perl(Test::LongString)
BuildRequires:  perl(Test::Pod), perl(Test::Pod::Coverage)
BuildRequires:  perl(URI::file), perl(WWW::Mechanize)
BuildRequires:  perl(Carp::Assert::More), perl(HTTP::Server::Simple)
Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
Test::WWW::Mechanize is a subclass of WWW::Mechanize that incorporates
features for web application testing.


%prep
%setup -q -n Test-WWW-Mechanize-%{version}


%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'
find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';'
chmod -R u+w $RPM_BUILD_ROOT/*


%check
make test


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
# For license text(s), see the perl package.
%doc Changes README
%{perl_vendorlib}/Test/
%{_mandir}/man3/*.3*


%changelog
* Thu Aug 11 2005 Jose Pedro Oliveira  - 1.06-1
- Update to 1.06.

* Tue Mar 22 2005 Jose Pedro Oliveira  - 1.04-1
- First build.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-WWW-Mechanize/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	14 Sep 2005 12:30:53 -0000	1.1
+++ .cvsignore	14 Sep 2005 12:31:28 -0000	1.2
@@ -0,0 +1 @@
+Test-WWW-Mechanize-1.06.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-WWW-Mechanize/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	14 Sep 2005 12:30:53 -0000	1.1
+++ sources	14 Sep 2005 12:31:28 -0000	1.2
@@ -0,0 +1 @@
+f806b2b0601c49d12f3b0a36e81bd3dd  Test-WWW-Mechanize-1.06.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep 14 12:30:35 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 14 Sep 2005 08:30:35 -0400
Subject: rpms/perl-Test-WWW-Mechanize - New directory
Message-ID: <200509141230.j8ECUZWc013374@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Test-WWW-Mechanize
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13350/perl-Test-WWW-Mechanize

Log Message:
Directory /cvs/extras/rpms/perl-Test-WWW-Mechanize added to the repository




From fedora-extras-commits at redhat.com  Wed Sep 14 09:49:48 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Wed, 14 Sep 2005 05:49:48 -0400
Subject: owners owners.list,1.204,1.205
Message-ID: <200509140949.j8E9nmNA008720@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8701

Modified Files:
	owners.list 
Log Message:
Add perl-Test-ClassAPI


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.204
retrieving revision 1.205
diff -u -r1.204 -r1.205
--- owners.list	14 Sep 2005 05:17:52 -0000	1.204
+++ owners.list	14 Sep 2005 09:49:46 -0000	1.205
@@ -721,6 +721,7 @@
 Fedora Extras|perl-Template-Toolkit|Template processing system|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Tree-Simple|Tree::Simple Perl module|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Test-Builder-Tester|For bugs related to the perl-Test-Builder-Tester component|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Test-ClassAPI|Provides basic first-pass API testing for large class trees|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Test-Exception|Library of test functions for exception based Perl code|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Test-LongString|Perl module to test long strings|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Test-Manifest|Test case module for Perl|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Wed Sep 14 12:30:35 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 14 Sep 2005 08:30:35 -0400
Subject: rpms/perl-Test-WWW-Mechanize/devel - New directory
Message-ID: <200509141230.j8ECUZai013380@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Test-WWW-Mechanize/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13350/perl-Test-WWW-Mechanize/devel

Log Message:
Directory /cvs/extras/rpms/perl-Test-WWW-Mechanize/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Sep 14 11:12:11 2005
From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc))
Date: Wed, 14 Sep 2005 07:12:11 -0400
Subject: rpms/libtranslate/FC-3 libtranslate.spec,1.1,1.2
Message-ID: <200509141112.j8EBCfAS011562@cvs-int.fedora.redhat.com>

Author: buc

Update of /cvs/extras/rpms/libtranslate/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11535

Modified Files:
	libtranslate.spec 
Log Message:



Index: libtranslate.spec
===================================================================
RCS file: /cvs/extras/rpms/libtranslate/FC-3/libtranslate.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libtranslate.spec	7 Sep 2005 10:16:57 -0000	1.1
+++ libtranslate.spec	14 Sep 2005 11:12:05 -0000	1.2
@@ -97,6 +97,8 @@
 %changelog
 * Wed Sep  7 2005 Dmitry Butskoy  - 0.99-4
 - even more cleanups
+- Accepted for Fedora Extra
+  (review by Tom "spot" Callaway )
 
 * Fri Aug 19 2005 Dmitry Butskoy  - 0.99-3
 - more cleanups



From fedora-extras-commits at redhat.com  Wed Sep 14 12:30:55 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 14 Sep 2005 08:30:55 -0400
Subject: rpms/perl-Test-WWW-Mechanize Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200509141230.j8ECUt4N013462@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Test-WWW-Mechanize
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13422

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-Test-WWW-Mechanize


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Test-WWW-Mechanize
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Wed Sep 14 09:36:28 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Wed, 14 Sep 2005 05:36:28 -0400
Subject: rpms/perl-Test-ClassAPI/devel - New directory
Message-ID: <200509140936.j8E9aSDZ008416@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Test-ClassAPI/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8387/perl-Test-ClassAPI/devel

Log Message:
Directory /cvs/extras/rpms/perl-Test-ClassAPI/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Sep 14 04:50:10 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Wed, 14 Sep 2005 00:50:10 -0400
Subject: rpms/wesnoth/devel .cvsignore, 1.8, 1.9 sources, 1.8,
	1.9 wesnoth.spec, 1.18, 1.19
Message-ID: <200509140450.j8E4oAqc000519@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/wesnoth/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv496

Modified Files:
	.cvsignore sources wesnoth.spec 
Log Message:
* Wed Sep 14 2005 Michael Schwendt  - 0.9.7-1
- update to 0.9.7



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wesnoth/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	29 Aug 2005 10:06:34 -0000	1.8
+++ .cvsignore	14 Sep 2005 04:50:08 -0000	1.9
@@ -1 +1 @@
-wesnoth-0.9.6.tar.gz
+wesnoth-0.9.7.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wesnoth/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	29 Aug 2005 10:06:34 -0000	1.8
+++ sources	14 Sep 2005 04:50:08 -0000	1.9
@@ -1 +1 @@
-d3bb0d492ac01e30c02f882f8d45d9fc  wesnoth-0.9.6.tar.gz
+c2c863c58a3eb7de5fce882d8a1944e1  wesnoth-0.9.7.tar.gz


Index: wesnoth.spec
===================================================================
RCS file: /cvs/extras/rpms/wesnoth/devel/wesnoth.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- wesnoth.spec	31 Aug 2005 10:22:51 -0000	1.18
+++ wesnoth.spec	14 Sep 2005 04:50:08 -0000	1.19
@@ -1,6 +1,6 @@
 Name:           wesnoth
-Version:        0.9.6
-Release:        2%{?dist}
+Version:        0.9.7
+Release:        1%{?dist}
 Summary:        Turn-based strategy game with a fantasy theme
 
 Group:          Amusements/Games
@@ -156,6 +156,9 @@
 %ghost /var/run/wesnothd/socket
 
 %changelog
+* Wed Sep 14 2005 Michael Schwendt  - 0.9.7-1
+- update to 0.9.7
+
 * Wed Aug 31 2005 Michael Schwendt  - 0.9.6-2
 - update summary and description
 - move and specify server package scriptlet requirements



From fedora-extras-commits at redhat.com  Wed Sep 14 09:37:47 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Wed, 14 Sep 2005 05:37:47 -0400
Subject: rpms/perl-Test-ClassAPI import.log,1.1,1.2
Message-ID: <200509140937.j8E9blq3008535@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Test-ClassAPI
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8500

Modified Files:
	import.log 
Log Message:
auto-import perl-Test-ClassAPI-1.02-1 on branch devel from perl-Test-ClassAPI-1.02-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-ClassAPI/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	14 Sep 2005 09:36:49 -0000	1.1
+++ import.log	14 Sep 2005 09:37:45 -0000	1.2
@@ -0,0 +1 @@
+perl-Test-ClassAPI-1_02-1:HEAD:perl-Test-ClassAPI-1.02-1.src.rpm:1126690649



From fedora-extras-commits at redhat.com  Wed Sep 14 11:10:55 2005
From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc))
Date: Wed, 14 Sep 2005 07:10:55 -0400
Subject: rpms/libtranslate/FC-4 libtranslate.spec,1.1,1.2
Message-ID: <200509141111.j8EBBcXY011529@cvs-int.fedora.redhat.com>

Author: buc

Update of /cvs/extras/rpms/libtranslate/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11506

Modified Files:
	libtranslate.spec 
Log Message:



Index: libtranslate.spec
===================================================================
RCS file: /cvs/extras/rpms/libtranslate/FC-4/libtranslate.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libtranslate.spec	7 Sep 2005 10:16:57 -0000	1.1
+++ libtranslate.spec	14 Sep 2005 11:10:52 -0000	1.2
@@ -97,6 +97,8 @@
 %changelog
 * Wed Sep  7 2005 Dmitry Butskoy  - 0.99-4
 - even more cleanups
+- Accepted for Fedora Extra
+  (review by Tom "spot" Callaway )
 
 * Fri Aug 19 2005 Dmitry Butskoy  - 0.99-3
 - more cleanups



From fedora-extras-commits at redhat.com  Wed Sep 14 11:09:35 2005
From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc))
Date: Wed, 14 Sep 2005 07:09:35 -0400
Subject: rpms/libtranslate/devel libtranslate.spec,1.1,1.2
Message-ID: <200509141110.j8EBA5Rx011492@cvs-int.fedora.redhat.com>

Author: buc

Update of /cvs/extras/rpms/libtranslate/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11456

Modified Files:
	libtranslate.spec 
Log Message:



Index: libtranslate.spec
===================================================================
RCS file: /cvs/extras/rpms/libtranslate/devel/libtranslate.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libtranslate.spec	7 Sep 2005 10:16:57 -0000	1.1
+++ libtranslate.spec	14 Sep 2005 11:09:33 -0000	1.2
@@ -97,6 +97,8 @@
 %changelog
 * Wed Sep  7 2005 Dmitry Butskoy  - 0.99-4
 - even more cleanups
+- Accepted for Fedora Extra
+  (review by Tom "spot" Callaway )
 
 * Fri Aug 19 2005 Dmitry Butskoy  - 0.99-3
 - more cleanups



From fedora-extras-commits at redhat.com  Wed Sep 14 05:17:54 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Wed, 14 Sep 2005 01:17:54 -0400
Subject: owners owners.list,1.203,1.204
Message-ID: <200509140517.j8E5HsIQ002071@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2052

Modified Files:
	owners.list 
Log Message:
- add unshield



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.203
retrieving revision 1.204
diff -u -r1.203 -r1.204
--- owners.list	14 Sep 2005 02:48:07 -0000	1.203
+++ owners.list	14 Sep 2005 05:17:52 -0000	1.204
@@ -982,6 +982,7 @@
 Fedora Extras|umfpack|Routines for solving unsymmetric sparse linear systems|qspencer at ieee.org|extras-qa at fedoraproject.org|
 Fedora Extras|unison|File synchronization tool|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|unrtf|RTF to other formats converter|gauret at free.fr|extras-qa at fedoraproject.org|
+Fedora Extras|unshield|Install InstallShield applications on a Pocket PC|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|up-imapproxy|University of Pittsburgh IMAP Proxy|jeff at ultimateevil.org|extras-qa at fedoraproject.org|
 Fedora Extras|upx|The Ultimate Packer for eXecutables|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|uqm-content|Base content files for The Ur-Quan Masters|ville.skytta at iki.fi|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Wed Sep 14 09:36:51 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Wed, 14 Sep 2005 05:36:51 -0400
Subject: rpms/perl-Test-ClassAPI/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200509140936.j8E9apGE008466@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Test-ClassAPI/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8432/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Test-ClassAPI


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Wed Sep 14 09:36:28 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Wed, 14 Sep 2005 05:36:28 -0400
Subject: rpms/perl-Test-ClassAPI - New directory
Message-ID: <200509140936.j8E9aS4L008411@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Test-ClassAPI
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8387/perl-Test-ClassAPI

Log Message:
Directory /cvs/extras/rpms/perl-Test-ClassAPI added to the repository




From fedora-extras-commits at redhat.com  Wed Sep 14 09:43:14 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Wed, 14 Sep 2005 05:43:14 -0400
Subject: rpms/perl-Test-ClassAPI/devel perl-Test-ClassAPI.spec,1.1,1.2
Message-ID: <200509140943.j8E9hEC8008630@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Test-ClassAPI/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8611

Modified Files:
	perl-Test-ClassAPI.spec 
Log Message:
Misc. cleanups.


Index: perl-Test-ClassAPI.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-ClassAPI/devel/perl-Test-ClassAPI.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Test-ClassAPI.spec	14 Sep 2005 09:37:45 -0000	1.1
+++ perl-Test-ClassAPI.spec	14 Sep 2005 09:43:11 -0000	1.2
@@ -1,11 +1,11 @@
 Name: 		perl-Test-ClassAPI
 Version: 	1.02
-Release: 	1%{?dist}
-Summary: 	Test::ClassAPI Perl module
+Release: 	2%{?dist}
+Summary: 	Provides basic first-pass API testing for large class trees
 License: 	GPL or Artistic
 Group: 		Development/Libraries
 URL: 		http://search.cpan.org/dist/Test-ClassAPI/
-Source0: 	http://www.cpan.org/modules/by-module/Test/Test-ClassAPI-%{version}.tar.gz
+Source0: 	http://search.cpan.org/CPAN/authors/id/A/AD/ADAMK/Test-ClassAPI-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:  	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
@@ -15,7 +15,12 @@
 BuildRequires: 	perl(Class::Inspector) >= 1.06
 
 %description
-Provides basic first-pass API testing for large class trees
+Provides basic first-pass API testing for large class trees.
+
+For many APIs with large numbers of classes, it can be very useful to be 
+able to do a quick once-over to make sure that classes, methods, and 
+inheritance is correct, before doing more comprehensive testing.
+This module aims to provide such a capability.
 
 %prep
 %setup -q -n Test-ClassAPI-%{version}
@@ -39,11 +44,16 @@
 
 %files
 %defattr(-,root,root,-)
-%doc Changes README LICENSE
+%doc Changes LICENSE
 %{perl_vendorlib}/Test
 %{_mandir}/man3/*
 
 %changelog
+* Tue Sep 14 2005 Ralf Corsepius  - 1.02-2
+- New %%summary.
+- Extend %%description.
+- Don't put README into %%doc (Redundant to man page).
+
 * Tue Sep 13 2005 Ralf Corsepius  - 1.02-1
 - Spec file cleanup.
 - FE submission.



From fedora-extras-commits at redhat.com  Wed Sep 14 04:52:47 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Wed, 14 Sep 2005 00:52:47 -0400
Subject: rpms/wesnoth/FC-3 .cvsignore, 1.7, 1.8 sources, 1.7,
	1.8 wesnoth.spec, 1.8, 1.9
Message-ID: <200509140453.j8E4rHjL000605@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/wesnoth/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv563/FC-3

Modified Files:
	.cvsignore sources wesnoth.spec 
Log Message:
* Wed Sep 14 2005 Michael Schwendt  - 0.9.7-1
- update to 0.9.7



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wesnoth/FC-3/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	29 Aug 2005 10:06:05 -0000	1.7
+++ .cvsignore	14 Sep 2005 04:52:44 -0000	1.8
@@ -1 +1 @@
-wesnoth-0.9.6.tar.gz
+wesnoth-0.9.7.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wesnoth/FC-3/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	29 Aug 2005 10:06:05 -0000	1.7
+++ sources	14 Sep 2005 04:52:44 -0000	1.8
@@ -1 +1 @@
-d3bb0d492ac01e30c02f882f8d45d9fc  wesnoth-0.9.6.tar.gz
+c2c863c58a3eb7de5fce882d8a1944e1  wesnoth-0.9.7.tar.gz


Index: wesnoth.spec
===================================================================
RCS file: /cvs/extras/rpms/wesnoth/FC-3/wesnoth.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- wesnoth.spec	29 Aug 2005 10:06:05 -0000	1.8
+++ wesnoth.spec	14 Sep 2005 04:52:44 -0000	1.9
@@ -1,7 +1,7 @@
 Name:           wesnoth
-Version:        0.9.6
+Version:        0.9.7
 Release:        1%{?dist}
-Summary:        Battle for Wesnoth, a fantasy turn-based strategy game
+Summary:        Turn-based strategy game with a fantasy theme
 
 Group:          Amusements/Games
 License:        GPL
@@ -17,21 +17,32 @@
 BuildRequires:  libpng-devel
 BuildRequires:  desktop-file-utils, gettext
 
-Requires:       /sbin/chkconfig
 
 %description
-%{summary}.
+The Battle for Wesnoth is a turn-based strategy game with a fantasy theme.
 
-Battle for control of villages, using variety of units which have advantages
-and disadvantages in different types of terrains and against different types
-of attacks. Units gain experience and advance levels, and are carried over
-from one scenario to the next campaign.
+Build up a great army, gradually turning raw recruits into hardened
+veterans. In later games, recall your toughest warriors and form a deadly
+host against whom none can stand. Choose units from a large pool of
+specialists, and hand-pick a force with the right strengths to fight well
+on different terrains against all manner of opposition.
+
+Fight to regain the throne of Wesnoth, of which you are the legitimate
+heir, or use your dread power over the Undead to dominate the land of
+mortals, or lead your glorious Orcish tribe to victory against the humans
+who dared despoil your lands. Wesnoth has many different sagas waiting to
+be played out. You can create your own custom units, and write your own
+scenarios--or even full-blown campaigns. You can also challenge your
+friends--or strangers--and fight multi-player epic fantasy battles.
 
 
 %package server
 Summary:	%{summary}
 Group:		Amusements/Games
 Requires:	%{name} = %{version}-%{release}
+Requires(post): /sbin/chkconfig
+Requires(preun): /sbin/chkconfig
+Requires(pre): /usr/sbin/useradd
 
 %description server
 This package contains the binaries for running a Wesnoth server
@@ -145,6 +156,13 @@
 %ghost /var/run/wesnothd/socket
 
 %changelog
+* Wed Sep 14 2005 Michael Schwendt  - 0.9.7-1
+- update to 0.9.7
+
+* Wed Aug 31 2005 Michael Schwendt  - 0.9.6-2
+- update summary and description
+- move and specify server package scriptlet requirements
+
 * Sun Aug 28 2005 Michael Schwendt  - 0.9.6-1
 - update to 0.9.6
 



From fedora-extras-commits at redhat.com  Wed Sep 14 07:40:57 2005
From: fedora-extras-commits at redhat.com (Gavin Henry (ghenry))
Date: Wed, 14 Sep 2005 03:40:57 -0400
Subject: rpms/rdiff-backup/devel .cvsignore, 1.2, 1.3 rdiff-backup.spec, 1.8,
	1.9 sources, 1.3, 1.4
Message-ID: <200509140740.j8E7ev4n004971@cvs-int.fedora.redhat.com>

Author: ghenry

Update of /cvs/extras/rpms/rdiff-backup/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4939

Modified Files:
	.cvsignore rdiff-backup.spec sources 
Log Message:

Committing in .
 
Modified Files:
	.cvsignore rdiff-backup.spec sources 

New version of rdiff-backup



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rdiff-backup/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 05:17:55 -0000	1.2
+++ .cvsignore	14 Sep 2005 07:40:55 -0000	1.3
@@ -1 +1 @@
-rdiff-backup-0.12.6.tar.gz
+rdiff-backup-1.0.1.tar.gz


Index: rdiff-backup.spec
===================================================================
RCS file: /cvs/extras/rpms/rdiff-backup/devel/rdiff-backup.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- rdiff-backup.spec	12 May 2005 02:56:28 -0000	1.8
+++ rdiff-backup.spec	14 Sep 2005 07:40:55 -0000	1.9
@@ -1,9 +1,9 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
-Version: 0.12.7
+Version: 1.0.1
 Summary: Convenient and transparent local/remote incremental mirror/backup
 Name: rdiff-backup
-Release: 3
+Release: 1%{?dist}
 
 URL: http://www.nongnu.org/rdiff-backup/
 Source: http://savannah.nongnu.org/download/%{name}/%{name}-%{version}.tar.gz
@@ -53,6 +53,12 @@
 %ghost %{python_sitearch}/rdiff_backup/*.pyo
 
 %changelog
+* Wed Sep 14 2005 Gavin Henry  - 0:1.0.1-1
+- New version
+
+* Thu Aug 15 2005 Gavin Henry  - 0:1.0.0-1
+- Latest version
+
 * Wed May 11 2005 Bill Nottingham  - 0:0.12.7-3
 - rebuilt
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rdiff-backup/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	22 Jan 2005 20:27:02 -0000	1.3
+++ sources	14 Sep 2005 07:40:55 -0000	1.4
@@ -1 +1 @@
-12fb0085861483eab379cb578fa9c849  rdiff-backup-0.12.7.tar.gz
+765e8c97c696eeb7b19006d9ed0967be  rdiff-backup-1.0.1.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep 14 04:52:47 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Wed, 14 Sep 2005 00:52:47 -0400
Subject: rpms/wesnoth/FC-4 .cvsignore, 1.7, 1.8 sources, 1.7,
	1.8 wesnoth.spec, 1.12, 1.13
Message-ID: <200509140453.j8E4rHbm000610@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/wesnoth/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv563/FC-4

Modified Files:
	.cvsignore sources wesnoth.spec 
Log Message:
* Wed Sep 14 2005 Michael Schwendt  - 0.9.7-1
- update to 0.9.7



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wesnoth/FC-4/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	29 Aug 2005 10:06:32 -0000	1.7
+++ .cvsignore	14 Sep 2005 04:52:45 -0000	1.8
@@ -1 +1 @@
-wesnoth-0.9.6.tar.gz
+wesnoth-0.9.7.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wesnoth/FC-4/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	29 Aug 2005 10:06:32 -0000	1.7
+++ sources	14 Sep 2005 04:52:45 -0000	1.8
@@ -1 +1 @@
-d3bb0d492ac01e30c02f882f8d45d9fc  wesnoth-0.9.6.tar.gz
+c2c863c58a3eb7de5fce882d8a1944e1  wesnoth-0.9.7.tar.gz


Index: wesnoth.spec
===================================================================
RCS file: /cvs/extras/rpms/wesnoth/FC-4/wesnoth.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- wesnoth.spec	29 Aug 2005 10:06:32 -0000	1.12
+++ wesnoth.spec	14 Sep 2005 04:52:45 -0000	1.13
@@ -1,7 +1,7 @@
 Name:           wesnoth
-Version:        0.9.6
+Version:        0.9.7
 Release:        1%{?dist}
-Summary:        Battle for Wesnoth, a fantasy turn-based strategy game
+Summary:        Turn-based strategy game with a fantasy theme
 
 Group:          Amusements/Games
 License:        GPL
@@ -17,21 +17,32 @@
 BuildRequires:  libpng-devel
 BuildRequires:  desktop-file-utils, gettext
 
-Requires:       /sbin/chkconfig
 
 %description
-%{summary}.
+The Battle for Wesnoth is a turn-based strategy game with a fantasy theme.
 
-Battle for control of villages, using variety of units which have advantages
-and disadvantages in different types of terrains and against different types
-of attacks. Units gain experience and advance levels, and are carried over
-from one scenario to the next campaign.
+Build up a great army, gradually turning raw recruits into hardened
+veterans. In later games, recall your toughest warriors and form a deadly
+host against whom none can stand. Choose units from a large pool of
+specialists, and hand-pick a force with the right strengths to fight well
+on different terrains against all manner of opposition.
+
+Fight to regain the throne of Wesnoth, of which you are the legitimate
+heir, or use your dread power over the Undead to dominate the land of
+mortals, or lead your glorious Orcish tribe to victory against the humans
+who dared despoil your lands. Wesnoth has many different sagas waiting to
+be played out. You can create your own custom units, and write your own
+scenarios--or even full-blown campaigns. You can also challenge your
+friends--or strangers--and fight multi-player epic fantasy battles.
 
 
 %package server
 Summary:	%{summary}
 Group:		Amusements/Games
 Requires:	%{name} = %{version}-%{release}
+Requires(post): /sbin/chkconfig
+Requires(preun): /sbin/chkconfig
+Requires(pre): /usr/sbin/useradd
 
 %description server
 This package contains the binaries for running a Wesnoth server
@@ -145,6 +156,13 @@
 %ghost /var/run/wesnothd/socket
 
 %changelog
+* Wed Sep 14 2005 Michael Schwendt  - 0.9.7-1
+- update to 0.9.7
+
+* Wed Aug 31 2005 Michael Schwendt  - 0.9.6-2
+- update summary and description
+- move and specify server package scriptlet requirements
+
 * Sun Aug 28 2005 Michael Schwendt  - 0.9.6-1
 - update to 0.9.6
 



From fedora-extras-commits at redhat.com  Wed Sep 14 09:36:51 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Wed, 14 Sep 2005 05:36:51 -0400
Subject: rpms/perl-Test-ClassAPI Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200509140936.j8E9ap4j008461@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Test-ClassAPI
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8432

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-Test-ClassAPI


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Test-ClassAPI
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Wed Sep 14 09:37:47 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Wed, 14 Sep 2005 05:37:47 -0400
Subject: rpms/perl-Test-ClassAPI/devel perl-Test-ClassAPI.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200509140937.j8E9bl7o008542@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Test-ClassAPI/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8500/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Test-ClassAPI.spec 
Log Message:
auto-import perl-Test-ClassAPI-1.02-1 on branch devel from perl-Test-ClassAPI-1.02-1.src.rpm


--- NEW FILE perl-Test-ClassAPI.spec ---
Name: 		perl-Test-ClassAPI
Version: 	1.02
Release: 	1%{?dist}
Summary: 	Test::ClassAPI Perl module
License: 	GPL or Artistic
Group: 		Development/Libraries
URL: 		http://search.cpan.org/dist/Test-ClassAPI/
Source0: 	http://www.cpan.org/modules/by-module/Test/Test-ClassAPI-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:  	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
BuildArch: 	noarch

BuildRequires: 	perl(Config::Tiny) >= 2.00
BuildRequires: 	perl(Class::Inspector) >= 1.06

%description
Provides basic first-pass API testing for large class trees

%prep
%setup -q -n Test-ClassAPI-%{version}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'
find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';'
chmod -R u+w $RPM_BUILD_ROOT/*

%clean
rm -rf $RPM_BUILD_ROOT

%check
make test

%files
%defattr(-,root,root,-)
%doc Changes README LICENSE
%{perl_vendorlib}/Test
%{_mandir}/man3/*

%changelog
* Tue Sep 13 2005 Ralf Corsepius  - 1.02-1
- Spec file cleanup.
- FE submission.

* Wed Jun 22 2005 Ralf Corsepius  - 1.02-0.pm.0
- Initial packman version.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-ClassAPI/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	14 Sep 2005 09:36:49 -0000	1.1
+++ .cvsignore	14 Sep 2005 09:37:45 -0000	1.2
@@ -0,0 +1 @@
+Test-ClassAPI-1.02.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-ClassAPI/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	14 Sep 2005 09:36:49 -0000	1.1
+++ sources	14 Sep 2005 09:37:45 -0000	1.2
@@ -0,0 +1 @@
+f242a7d8ca652d7207a50461e328dafc  Test-ClassAPI-1.02.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep 14 07:39:51 2005
From: fedora-extras-commits at redhat.com (Gavin Henry (ghenry))
Date: Wed, 14 Sep 2005 03:39:51 -0400
Subject: rpms/rdiff-backup/FC-4 .cvsignore, 1.3, 1.4 rdiff-backup.spec, 1.9,
	1.10 sources, 1.4, 1.5
Message-ID: <200509140739.j8E7dpPA004931@cvs-int.fedora.redhat.com>

Author: ghenry

Update of /cvs/extras/rpms/rdiff-backup/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4905

Modified Files:
	.cvsignore rdiff-backup.spec sources 
Log Message:

Committing in .
 
Modified Files:
    .cvsignore rdiff-backup.spec sources 

New version of rdiff-backup



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rdiff-backup/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	18 Aug 2005 11:07:41 -0000	1.3
+++ .cvsignore	14 Sep 2005 07:39:49 -0000	1.4
@@ -1 +1 @@
-rdiff-backup-1.0.0.tar.gz
+rdiff-backup-1.0.1.tar.gz


Index: rdiff-backup.spec
===================================================================
RCS file: /cvs/extras/rpms/rdiff-backup/FC-4/rdiff-backup.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- rdiff-backup.spec	18 Aug 2005 11:07:41 -0000	1.9
+++ rdiff-backup.spec	14 Sep 2005 07:39:49 -0000	1.10
@@ -1,6 +1,6 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
-Version: 1.0.0
+Version: 1.0.1
 Summary: Convenient and transparent local/remote incremental mirror/backup
 Name: rdiff-backup
 Release: 1%{?dist}
@@ -53,6 +53,9 @@
 %ghost %{python_sitearch}/rdiff_backup/*.pyo
 
 %changelog
+* Wed Sep 14 2005 Gavin Henry  - 0:1.0.1-1
+- New version
+
 * Thu Aug 15 2005 Gavin Henry  - 0:1.0.0-1
 - Latest version
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rdiff-backup/FC-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	18 Aug 2005 11:07:41 -0000	1.4
+++ sources	14 Sep 2005 07:39:49 -0000	1.5
@@ -1 +1 @@
-bfd0cd4361a8c34423f12a69fdd31517  rdiff-backup-1.0.0.tar.gz
+765e8c97c696eeb7b19006d9ed0967be  rdiff-backup-1.0.1.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep 14 22:36:14 2005
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Wed, 14 Sep 2005 18:36:14 -0400
Subject: rpms/gforth - New directory
Message-ID: <200509142236.j8EMaEYo030522@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/gforth
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30502/gforth

Log Message:
Directory /cvs/extras/rpms/gforth added to the repository




From fedora-extras-commits at redhat.com  Wed Sep 14 22:36:15 2005
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Wed, 14 Sep 2005 18:36:15 -0400
Subject: rpms/gforth/devel - New directory
Message-ID: <200509142236.j8EMaFxk030527@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/gforth/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30502/gforth/devel

Log Message:
Directory /cvs/extras/rpms/gforth/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Sep 14 22:36:35 2005
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Wed, 14 Sep 2005 18:36:35 -0400
Subject: rpms/gforth Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200509142236.j8EMaZ4M030576@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/gforth
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30547

Added Files:
	Makefile import.log 
Log Message:
Setup of module gforth


--- NEW FILE Makefile ---
# Top level Makefile for module gforth
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Wed Sep 14 22:36:36 2005
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Wed, 14 Sep 2005 18:36:36 -0400
Subject: rpms/gforth/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200509142236.j8EMaaL5030581@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/gforth/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30547/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module gforth


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Wed Sep 14 22:38:37 2005
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Wed, 14 Sep 2005 18:38:37 -0400
Subject: rpms/gforth import.log,1.1,1.2
Message-ID: <200509142238.j8EMcb0L030667@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/gforth
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30630

Modified Files:
	import.log 
Log Message:
auto-import gforth-0.6.2-5 on branch devel from gforth-0.6.2-5.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/gforth/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	14 Sep 2005 22:36:33 -0000	1.1
+++ import.log	14 Sep 2005 22:38:35 -0000	1.2
@@ -0,0 +1 @@
+gforth-0_6_2-5:HEAD:gforth-0.6.2-5.src.rpm:1126737507



From fedora-extras-commits at redhat.com  Wed Sep 14 22:38:37 2005
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Wed, 14 Sep 2005 18:38:37 -0400
Subject: rpms/gforth/devel gforth-shebang.patch, NONE, 1.1 gforth.patch, NONE,
	1.1 gforth.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200509142238.j8EMcbS1030677@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/gforth/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30630/devel

Modified Files:
	.cvsignore sources 
Added Files:
	gforth-shebang.patch gforth.patch gforth.spec 
Log Message:
auto-import gforth-0.6.2-5 on branch devel from gforth-0.6.2-5.src.rpm

gforth-shebang.patch:

--- NEW FILE gforth-shebang.patch ---
--- gforth-0.6.2/filedump.fs.shebang	2005-09-13 00:57:01.000000000 +0200
+++ gforth-0.6.2/filedump.fs	2005-09-13 00:59:15.000000000 +0200
@@ -1,4 +1,4 @@
-#! /usr/local/lib/gforth/0.2.0/kernel.fi
+#! /usr/bin/gforth
 \ file hex dump
 
 \ Copyright (C) 1997,2002,2003 Free Software Foundation, Inc.
--- gforth-0.6.2/httpd.fs.shebang	2005-09-13 00:57:11.000000000 +0200
+++ gforth-0.6.2/httpd.fs	2005-09-13 01:00:01.000000000 +0200
@@ -1,4 +1,4 @@
-#! /usr/local/bin/gforth
+#! /usr/bin/gforth
 
 \ Copyright (C) 2000,2002,2003 Free Software Foundation, Inc.
 
@@ -22,7 +22,7 @@
 
 require string.fs
 
-Variable DocumentRoot  s" /usr/local/httpd/htdocs/" DocumentRoot $!
+Variable DocumentRoot  s" /var/www/html/" DocumentRoot $!
 Variable UserDir       s" .html-data/"              UserDir      $!
 
 Variable url
--- gforth-0.6.2/sieve.fs.shebang	2005-09-13 00:57:27.000000000 +0200
+++ gforth-0.6.2/sieve.fs	2005-09-13 01:00:15.000000000 +0200
@@ -1,4 +1,4 @@
-#! /usr/stud/paysan/bin/forth
+#! /usr/bin/gforth
 
 DECIMAL
 : SECS TIME&DATE  2DROP DROP  60 * + 60 * + ;
--- gforth-0.6.2/siev.fs.shebang	2005-09-13 00:57:35.000000000 +0200
+++ gforth-0.6.2/siev.fs	2005-09-13 01:00:27.000000000 +0200
@@ -1,4 +1,4 @@
-\ #! /usr/stud/paysan/bin/forth
+\ #! /usr/bin/gforth
 
 DECIMAL
 \ : SECS TIME&DATE  SWAP 60 * + SWAP 3600 * +  NIP NIP NIP ;

gforth.patch:

--- NEW FILE gforth.patch ---
--- gforth-0.6.2/comp-i.fs.fix	2004-11-22 17:15:09.292698638 +0100
+++ gforth-0.6.2/comp-i.fs	2004-11-22 17:16:06.122803737 +0100
@@ -43,7 +43,7 @@
     if
 	." : images have the same base address; producing only a data-relocatable image" cr
     else
-	offset abs expected-offset <> abort" images produced by different engines"
+	\ offset abs expected-offset <> abort" images produced by different engines"
 	."  offset=" offset . cr
 	0 image1 i-field + ! 0 image2 i-field + !
     endif


--- NEW FILE gforth.spec ---
Name:           gforth
Version:        0.6.2
Release:        5
Summary:        Fast and portable implementation of the ANS Forth language

Group:          Development/Languages
License:        GPL
URL:            http://www.jwdt.com/~paysan/gforth.html
Source:         http://www.complang.tuwien.ac.at/forth/gforth/gforth-0.6.2.tar.gz
Patch0:		gforth.patch
Patch1:		gforth-shebang.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires(post): /sbin/install-info
Requires(postun): /sbin/install-info

%description
Gforth is a fast and portable implementation of the ANS Forth
language. It works nicely with the Emacs editor, offers some nice
features such as input completion and history, backtraces, a
decompiler and a powerful locals facility, and it even has a
manual. Gforth combines traditional implementation techniques with
newer techniques for portability and performance performance: its
inner innerpreter is direct threaded with several optimizations, but
you can also use a traditional-style indirect threaded interpreter.

%define emacs_sitestart_d  %{_datadir}/emacs/site-lisp/site-start.d
%define emacs_site_lisp  %{_datadir}/emacs/site-lisp
%define xemacs_sitestart_d %{_datadir}/xemacs/site-packages/lisp/site-start.d
%define xemacs_site_lisp %{_datadir}/xemacs/site-packages/lisp
%define gforth_datadir %{_datadir}/gforth

%prep
%setup -q
%patch0 -p1
%patch1 -p1


%build
%configure
# %{_smp_mflags} breaks the build
make libdir=%{_libdir}


%install
rm -rf $RPM_BUILD_ROOT
%makeinstall
cat > $RPM_BUILD_ROOT%{gforth_datadir}/site-forth/siteinit.fs < $RPM_BUILD_ROOT%{gforth_datadir}/emacs/gforth-init.el </dev/null || :


%postun
if [ $1 = 0 ]; then
    /sbin/install-info --delete %{_infodir}/%{name}.info.gz %{_infodir}/dir 2>/dev/null || :
fi


%clean
rm -rf $RPM_BUILD_ROOT


%triggerin -- emacs-common
if [ -d %{emacs_sitestart_d} ]; then
  ln -sf %{gforth_datadir}/emacs/gforth-init.el %{emacs_sitestart_d} || :
  ln -sf %{gforth_datadir}/emacs/gforth.el %{emacs_site_lisp} || :
fi

%triggerin -- xemacs-common
if [ -d %{xemacs_sitestart_d} ]; then
  ln -sf %{gforth_datadir}/emacs/gforth-init.el %{xemacs_sitestart_d} || :
  ln -sf %{gforth_datadir}/emacs/gforth.el %{xemacs_site_lisp} || :
fi


%triggerun -- emacs-common
if [ $2 = 0 ]; then
  rm -f %{emacs_sitestart_d}/gforth-init.el* || :
  rm -f %{emacs_site_lisp}/gforth.el* || :
fi


%triggerun -- xemacs-common
if [ $2 = 0 ]; then
  rm -f %{xemacs_sitestart_d}/gforth-init.el* || :
  rm -f %{xemacs_site_lisp}/gforth.el* || :
fi


%files 
%defattr(-, root, root)
%doc COPYING COPYING.DOC README README.vmgen NEWS NEWS.vmgen AUTHORS BUGS ChangeLog
%{_bindir}/*
%{_infodir}/*
%{_datadir}/gforth
%{_libdir}/gforth
%{_mandir}/man1/*
%ghost %{_datadir}/*emacs


%changelog
* Wed Sep 14 2005 Gerard Milmeister  - 0.6.2-5
- changes to the trigger code

* Wed Sep 14 2005 Gerard Milmeister  - 0.6.2-4
- use triggers to install (x)emacs files
- create not-empty siteinit.fs

* Tue Sep 13 2005 Gerard Milmeister  - 0.6.2-3
- fix for building on x86_64
- patch fixing shebang executable path

* Sat Mar 19 2005 Gerard Milmeister  - 0.6.2-2
- Included gforth.el

* Sun Feb 13 2005 Gerard Milmeister  - 0:0.6.2-1
- Included patch for exec-shield

* Wed Oct 15 2003 Gerard Milmeister  - 0:0.6.2-0.fdr.1
- First Fedora release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gforth/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	14 Sep 2005 22:36:34 -0000	1.1
+++ .cvsignore	14 Sep 2005 22:38:35 -0000	1.2
@@ -0,0 +1 @@
+gforth-0.6.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gforth/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	14 Sep 2005 22:36:34 -0000	1.1
+++ sources	14 Sep 2005 22:38:35 -0000	1.2
@@ -0,0 +1 @@
+869112bd762b07fc4d2038a2d9965148  gforth-0.6.2.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep 14 22:41:39 2005
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Wed, 14 Sep 2005 18:41:39 -0400
Subject: rpms/gforth/devel gforth.spec,1.1,1.2
Message-ID: <200509142241.j8EMfdvf030754@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/gforth/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30735

Modified Files:
	gforth.spec 
Log Message:



Index: gforth.spec
===================================================================
RCS file: /cvs/extras/rpms/gforth/devel/gforth.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gforth.spec	14 Sep 2005 22:38:35 -0000	1.1
+++ gforth.spec	14 Sep 2005 22:41:37 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           gforth
 Version:        0.6.2
-Release:        5
+Release:        5%{?dist}
 Summary:        Fast and portable implementation of the ANS Forth language
 
 Group:          Development/Languages



From fedora-extras-commits at redhat.com  Thu Sep 15 00:44:14 2005
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Wed, 14 Sep 2005 20:44:14 -0400
Subject: owners owners.list,1.207,1.208
Message-ID: <200509150044.j8F0iEdE001856@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1837

Modified Files:
	owners.list 
Log Message:
- Add python-myghty



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.207
retrieving revision 1.208
diff -u -r1.207 -r1.208
--- owners.list	14 Sep 2005 18:33:58 -0000	1.207
+++ owners.list	15 Sep 2005 00:44:12 -0000	1.208
@@ -821,6 +821,7 @@
 Fedora Extras|python-kid|A simple and pythonic XML template language|icon at linux.duke.edu|extras-qa at fedoraproject.org|
 Fedora Extras|python-logilab-common|Common libraries for Logilab projects|icon at linux.duke.edu|extras-qa at fedoraproject.org|
 Fedora Extras|python-matplotlib|Python plotting library|orion at cora.nwra.com|extras-qa at fedoraproject.org|
+Fedora Extras|python-myghty|A Python-based templating system derived from HTML::Mason|lmacken at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|python-numarray|Python array manipulation and computational library|orion at cora.nwra.com|extras-qa at fedoraproject.org|
 Fedora Extras|python-numeric|Fast multidimensional array functions for Python|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|python-protocols|PyProtocols 'adapt()' implementation|shahms at shahms.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Thu Sep 15 00:47:19 2005
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Wed, 14 Sep 2005 20:47:19 -0400
Subject: owners owners.list,1.208,1.209
Message-ID: <200509150047.j8F0lJ5C001903@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1884

Modified Files:
	owners.list 
Log Message:
Taking over orphaned packages.


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.208
retrieving revision 1.209
diff -u -r1.208 -r1.209
--- owners.list	15 Sep 2005 00:44:12 -0000	1.208
+++ owners.list	15 Sep 2005 00:47:17 -0000	1.209
@@ -231,7 +231,7 @@
 Fedora Extras|gkrellm-volume|GKrellM volume plugin|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|gkrellm-weather|GKrellWeather is a weather plugin for GKrellM|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|gktools|GUI utilities for KerberosV tickets|nos at utelsystems.com|extras-qa at fedoraproject.org|
-Fedora Extras|gl-117|GL-117 is an action flight simulator|pmatilai at laiskiainen.org|extras-qa at fedoraproject.org|
+Fedora Extras|gl-117|GL-117 is an action flight simulator|steve at silug.org|extras-qa at fedoraproject.org|
 Fedora Extras|glabels|A program for creating labels and business cards for GNOME|jspaleta at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|glibmm24|A C++ interface for GTK2 (a GUI library for X)|denisleroy at yahoo.com|extras-qa at fedoraproject.org|
 Fedora Extras|Glide3|Glide3 runtime for the 3Dfx Voodoo family of cards|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
@@ -925,7 +925,7 @@
 Fedora Extras|straw|GNOME desktop news aggregator|colin at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|stripesnoop|Magnetic Stripe Reader|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|suck|Suck - download news from remote NNTP server|Jochen at herr-schmitt.de|extras-qa at fedoraproject.org|
-Fedora Extras|supertux|SuperTux is a jump'n run like game similar to Mario Bros|pmatilai at laiskiainen.org|extras-qa at fedoraproject.org|
+Fedora Extras|supertux|SuperTux is a jump'n run like game similar to Mario Bros|steve at silug.org|extras-qa at fedoraproject.org|
 Fedora Extras|svgalib|Low-level fullscreen SVGA graphics library|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|swatch|A tool for actively monitoring log files|jpo at di.uminho.pt|extras-qa at fedoraproject.org|
 Fedora Extras|sword|Free Bible Software Project|mpeters at mac.com|extras-qa at fedoraproject.org|
@@ -975,8 +975,8 @@
 Fedora Extras|treecc|Tree Compiler Compiler|compton at pcompton.com|extras-qa at fedoraproject.org|
 Fedora Extras|tripwire|An IDS (Intrusion Detection System)|tripwire-devel at genesis-x.nildram.co.uk|extras-qa at fedoraproject.org|
 Fedora Extras|ttf2pt1|TrueType to Adobe Type 1 converter|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
-Fedora Extras|tuxpaint|Drawing program designed for young children|pmatilai at laiskiainen.org|extras-qa at fedoraproject.org|
-Fedora Extras|tuxtype2|Tux Typing is an educational typing tutor for children|pmatilai at laiskiainen.org|extras-qa at fedoraproject.org|
+Fedora Extras|tuxpaint|Drawing program designed for young children|steve at silug.org|extras-qa at fedoraproject.org|
+Fedora Extras|tuxtype2|Tux Typing is an educational typing tutor for children|steve at silug.org|extras-qa at fedoraproject.org|
 Fedora Extras|ucarp|Common Address Redundancy Protocol (CARP) for Unix|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|ucl|Portable lossless data compression library|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|udftools|Linux UDF Filesystem userspace utilities|matthias at rpmforge.net|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Thu Sep 15 02:35:32 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 14 Sep 2005 22:35:32 -0400
Subject: rpms/srecord - New directory
Message-ID: <200509150235.j8F2ZWlu005143@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/srecord
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5123/srecord

Log Message:
Directory /cvs/extras/rpms/srecord added to the repository




From fedora-extras-commits at redhat.com  Thu Sep 15 02:35:32 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 14 Sep 2005 22:35:32 -0400
Subject: rpms/srecord/devel - New directory
Message-ID: <200509150235.j8F2ZWdn005148@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/srecord/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5123/srecord/devel

Log Message:
Directory /cvs/extras/rpms/srecord/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Sep 15 02:35:51 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 14 Sep 2005 22:35:51 -0400
Subject: rpms/srecord Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200509150235.j8F2Zpr9005203@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/srecord
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5168

Added Files:
	Makefile import.log 
Log Message:
Setup of module srecord


--- NEW FILE Makefile ---
# Top level Makefile for module srecord
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Thu Sep 15 02:35:51 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 14 Sep 2005 22:35:51 -0400
Subject: rpms/srecord/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200509150235.j8F2ZpMV005208@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/srecord/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5168/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module srecord


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Thu Sep 15 02:36:27 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 14 Sep 2005 22:36:27 -0400
Subject: rpms/srecord import.log,1.1,1.2
Message-ID: <200509150236.j8F2aRJY005271@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/srecord
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5236

Modified Files:
	import.log 
Log Message:
auto-import srecord-1.22-2 on branch devel from srecord-1.22-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/srecord/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	15 Sep 2005 02:35:49 -0000	1.1
+++ import.log	15 Sep 2005 02:36:25 -0000	1.2
@@ -0,0 +1 @@
+srecord-1_22-2:HEAD:srecord-1.22-2.src.rpm:1126751776



From fedora-extras-commits at redhat.com  Thu Sep 15 02:36:27 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 14 Sep 2005 22:36:27 -0400
Subject: rpms/srecord/devel srecord.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200509150236.j8F2aRXP005278@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/srecord/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5236/devel

Modified Files:
	.cvsignore sources 
Added Files:
	srecord.spec 
Log Message:
auto-import srecord-1.22-2 on branch devel from srecord-1.22-2.src.rpm


--- NEW FILE srecord.spec ---
Name:           srecord
Version:        1.22
Release:        2%{?dist}
Summary:        Manipulate EPROM load files

Group:          Development/Tools
License:        GPL
URL:            http://srecord.sourceforge.net/
Source:         http://srecord.sourceforge.net/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  diffutils, sharutils, groff

%description
The SRecord package is a collection of powerful tools for manipulating
EPROM load files.

* The SRecord package understands a number of file formats: Motorola
  S-Record, Intel, Tektronix, Binary.  These file formats may be read
  and written.  Also C array definitions, for output only.

* The SRecord package has a number of tools: srec_cat for copying and
  and converting files, srec_cmp for comparing files and srec_info for
  printing summaries.

* The SRecord package has a number for filters: checksum to add checksums
  to the data, crop to keep address ranges, exclude to remove address
  ranges, fill to plug holes in the data, length to insert the data
  length, maximum to insert the data address maximum, minimum to insert
  the data address minimum, offset to adjust addresses, and split for
  wide data buses and memory striping.

More than one filter may be applied to each input file.  Different filters
may be applied to each input file.  All filters may be applied to all
file formats.


%prep
%setup -q

%build
%configure
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

%check
# Test scripts requirements: cmp, diff, uudecode
make sure

%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr (-,root,root,-)
%doc LICENSE BUILDING README
%{_bindir}/*
%{_mandir}/man1/*.1*
%{_mandir}/man5/*.5*


%changelog
* Thu Sep 15 2005 Jose Pedro Oliveira  - 1.22-2
- Updated the source tarball (PATCHLEVEL "1.22.D002").
  The author repackages updates without changing the tarball version (ARGH!).

* Mon Sep 12 2005 Jose Pedro Oliveira  - 1.22-1
- Update to 1.22.

* Sun Aug  7 2005 Jose Pedro Oliveira  - 1.21-1
- Version 1.21.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/srecord/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	15 Sep 2005 02:35:49 -0000	1.1
+++ .cvsignore	15 Sep 2005 02:36:25 -0000	1.2
@@ -0,0 +1 @@
+srecord-1.22.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/srecord/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	15 Sep 2005 02:35:49 -0000	1.1
+++ sources	15 Sep 2005 02:36:25 -0000	1.2
@@ -0,0 +1 @@
+d67c70be352486db6a9c0929a4d8f08e  srecord-1.22.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep 15 02:40:10 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 14 Sep 2005 22:40:10 -0400
Subject: owners owners.list,1.209,1.210
Message-ID: <200509150240.j8F2eAnI005387@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5368

Modified Files:
	owners.list 
Log Message:
New package: srecord


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.209
retrieving revision 1.210
diff -u -r1.209 -r1.210
--- owners.list	15 Sep 2005 00:47:17 -0000	1.209
+++ owners.list	15 Sep 2005 02:40:08 -0000	1.210
@@ -919,6 +919,7 @@
 Fedora Extras|sqlite2|Embeddable SQL engine in a C library|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
 Fedora Extras|sqlite|An embeddable SQL engine in a C library|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
 Fedora Extras|squidGuard|Filter, redirector and access controller plugin for squid|oliver at linux-kernel.at|extras-qa at fedoraproject.org|
+Fedora Extras|srecord|Manipulate EPROM load files|jpo at di.uminho.pt|extras-qa at fedoraproject.org|
 Fedora Extras|starfighter|For bugs related to the starfighter component|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|stellarium|A photo-realistic nightsky renderer|Jochen at herr-schmitt.de|extras-qa at fedoraproject.org|
 Fedora Extras|stow|Manage the installation of software packages from source|gauret at free.fr|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Thu Sep 15 02:56:27 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Wed, 14 Sep 2005 22:56:27 -0400
Subject: rpms/perl-Params-Util - New directory
Message-ID: <200509150256.j8F2uRej005676@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Params-Util
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5652/perl-Params-Util

Log Message:
Directory /cvs/extras/rpms/perl-Params-Util added to the repository




From fedora-extras-commits at redhat.com  Thu Sep 15 02:56:27 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Wed, 14 Sep 2005 22:56:27 -0400
Subject: rpms/perl-Params-Util/devel - New directory
Message-ID: <200509150256.j8F2uRCq005681@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Params-Util/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5652/perl-Params-Util/devel

Log Message:
Directory /cvs/extras/rpms/perl-Params-Util/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Sep 15 02:56:57 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Wed, 14 Sep 2005 22:56:57 -0400
Subject: rpms/perl-Params-Util Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200509150256.j8F2uvLU005726@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Params-Util
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5697

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-Params-Util


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Params-Util
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Thu Sep 15 02:56:58 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Wed, 14 Sep 2005 22:56:58 -0400
Subject: rpms/perl-Params-Util/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200509150256.j8F2uwX3005731@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Params-Util/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5697/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Params-Util


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Thu Sep 15 02:57:55 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Wed, 14 Sep 2005 22:57:55 -0400
Subject: rpms/perl-Params-Util import.log,1.1,1.2
Message-ID: <200509150258.j8F2wP2e005804@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Params-Util
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5765

Modified Files:
	import.log 
Log Message:
auto-import perl-Params-Util-0.05-2 on branch devel from perl-Params-Util-0.05-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Params-Util/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	15 Sep 2005 02:56:55 -0000	1.1
+++ import.log	15 Sep 2005 02:57:52 -0000	1.2
@@ -0,0 +1 @@
+perl-Params-Util-0_05-2:HEAD:perl-Params-Util-0.05-2.src.rpm:1126753059



From fedora-extras-commits at redhat.com  Thu Sep 15 02:57:55 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Wed, 14 Sep 2005 22:57:55 -0400
Subject: rpms/perl-Params-Util/devel perl-Params-Util.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200509150258.j8F2wP1c005808@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Params-Util/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5765/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Params-Util.spec 
Log Message:
auto-import perl-Params-Util-0.05-2 on branch devel from perl-Params-Util-0.05-2.src.rpm


--- NEW FILE perl-Params-Util.spec ---
Name: 		perl-Params-Util
Version: 	0.05
Release: 	2%{?dist}
Summary: 	Simple standalone param-checking functions
License: 	GPL or Artistic
Group: 		Development/Libraries
URL: 		http://search.cpan.org/dist/Params-Util/
Source0: 	http://search.cpan.org/CPAN/authors/id/A/AD/ADAMK/Params-Util-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:  	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
BuildArch: 	noarch

BuildRequires:	perl(Test::More) >= 0.47
BuildRequires:	perl(File::Spec) >= 0.82
BuildRequires:  perl(Scalar::Util) >= 1.11
BuildRequires:	perl(ExtUtils::AutoInstall) >= 0.49

# Required by the tests
BuildRequires:  perl(Test::Pod) >= 1.00

%description
Params::Util provides a basic set of importable functions that 
makes checking parameters a hell of a lot easier.

%prep
%setup -q -n Params-Util-%{version}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'
find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';'
chmod -R u+w $RPM_BUILD_ROOT/*

%clean
rm -rf $RPM_BUILD_ROOT

%check
make test

%files
%defattr(-,root,root,-)
%doc Changes LICENSE
%{perl_vendorlib}/Params
%{_mandir}/man3/*

%changelog
* Tue Sep 14 2005 Ralf Corsepius  - 0.05-2
- Add BR: perl(ExtUtils::AutoInstall) and core deps.

* Tue Sep 14 2005 Ralf Corsepius  - 0.05-1
- Initial version.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Params-Util/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	15 Sep 2005 02:56:56 -0000	1.1
+++ .cvsignore	15 Sep 2005 02:57:53 -0000	1.2
@@ -0,0 +1 @@
+Params-Util-0.05.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Params-Util/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	15 Sep 2005 02:56:56 -0000	1.1
+++ sources	15 Sep 2005 02:57:53 -0000	1.2
@@ -0,0 +1 @@
+5d3f1abd93c0fec2e7cfe37d30ce48dc  Params-Util-0.05.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep 15 03:07:28 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Wed, 14 Sep 2005 23:07:28 -0400
Subject: rpms/perl-ExtUtils-AutoInstall - New directory
Message-ID: <200509150307.j8F37S40007223@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-ExtUtils-AutoInstall
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7203/perl-ExtUtils-AutoInstall

Log Message:
Directory /cvs/extras/rpms/perl-ExtUtils-AutoInstall added to the repository




From fedora-extras-commits at redhat.com  Thu Sep 15 03:07:29 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Wed, 14 Sep 2005 23:07:29 -0400
Subject: rpms/perl-ExtUtils-AutoInstall/devel - New directory
Message-ID: <200509150307.j8F37TDH007228@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-ExtUtils-AutoInstall/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7203/perl-ExtUtils-AutoInstall/devel

Log Message:
Directory /cvs/extras/rpms/perl-ExtUtils-AutoInstall/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Sep 15 03:08:09 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Wed, 14 Sep 2005 23:08:09 -0400
Subject: rpms/perl-ExtUtils-AutoInstall Makefile, NONE, 1.1 import.log, NONE,
	1.1
Message-ID: <200509150308.j8F389mt007262@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-ExtUtils-AutoInstall
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7248

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-ExtUtils-AutoInstall


--- NEW FILE Makefile ---
# Top level Makefile for module perl-ExtUtils-AutoInstall
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Thu Sep 15 03:08:26 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Wed, 14 Sep 2005 23:08:26 -0400
Subject: rpms/perl-ExtUtils-AutoInstall/devel .cvsignore, NONE, 1.1 Makefile,
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <200509150308.j8F38Qk6007288@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-ExtUtils-AutoInstall/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7248/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-ExtUtils-AutoInstall


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Thu Sep 15 03:10:24 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Wed, 14 Sep 2005 23:10:24 -0400
Subject: rpms/perl-ExtUtils-AutoInstall import.log,1.1,1.2
Message-ID: <200509150310.j8F3AsFc007387@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-ExtUtils-AutoInstall
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7337

Modified Files:
	import.log 
Log Message:
auto-import perl-ExtUtils-AutoInstall-0.63-2 on branch devel from perl-ExtUtils-AutoInstall-0.63-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-ExtUtils-AutoInstall/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	15 Sep 2005 03:08:07 -0000	1.1
+++ import.log	15 Sep 2005 03:10:19 -0000	1.2
@@ -0,0 +1 @@
+perl-ExtUtils-AutoInstall-0_63-2:HEAD:perl-ExtUtils-AutoInstall-0.63-2.src.rpm:1126753775



From fedora-extras-commits at redhat.com  Thu Sep 15 03:10:29 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Wed, 14 Sep 2005 23:10:29 -0400
Subject: rpms/perl-ExtUtils-AutoInstall/devel perl-ExtUtils-AutoInstall.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200509150310.j8F3AxfQ007391@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-ExtUtils-AutoInstall/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7337/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-ExtUtils-AutoInstall.spec 
Log Message:
auto-import perl-ExtUtils-AutoInstall-0.63-2 on branch devel from perl-ExtUtils-AutoInstall-0.63-2.src.rpm


--- NEW FILE perl-ExtUtils-AutoInstall.spec ---
Name: 		perl-ExtUtils-AutoInstall
Version: 	0.63
Release: 	2%{?dist}
Summary: 	Automatic install of dependencies via CPAN
License: 	GPL or Artistic
Group: 		Development/Libraries
URL: 		http://search.cpan.org/dist/ExtUtils-AutoInstall/
Source: 	http://search.cpan.org/CPAN/authors/id/A/AU/AUTRIJUS/ExtUtils-AutoInstall-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:  	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
BuildArch: 	noarch

%{?_with_perl_CPANPLUS:BuildRequires:  perl(CPANPLUS) >= 0.043}
BuildRequires:  perl(Sort::Versions) >= 1.2
BuildRequires:	perl(LWP::Simple)

%description
ExtUtils::AutoInstall lets module writers specify a more sophisticated
form of dependency information than the PREREQ_PM option offered by 
ExtUtils::MakeMaker.

%prep
%setup -q -n ExtUtils-AutoInstall-%{version}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor --defaultdeps
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'
find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';'
chmod -R u+w $RPM_BUILD_ROOT/*

%clean
rm -rf $RPM_BUILD_ROOT

%check
make test

%files
%defattr(-,root,root,-)
# For license text(s), see the perl package
%doc Changes AUTHORS README TODO
%{perl_vendorlib}/ExtUtils
%{_mandir}/man3/*

%changelog
* Tue Sep 13 2005 Ralf Corsepius  - 0.63-1
- FE submission.

* Tue Sep 13 2005 Ralf Corsepius  - 0.63-0
- Update to 0.63.
- FE submission preps.

* Wed Jun 29 2005 Ralf Corsepius  - 0.61-0.pm.2
- Add Sort::Versions.

* Tue Jun 28 2005 Ralf Corsepius  - 0.61-0.pm.1
- Initial packman version.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-ExtUtils-AutoInstall/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	15 Sep 2005 03:08:24 -0000	1.1
+++ .cvsignore	15 Sep 2005 03:10:24 -0000	1.2
@@ -0,0 +1 @@
+ExtUtils-AutoInstall-0.63.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-ExtUtils-AutoInstall/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	15 Sep 2005 03:08:24 -0000	1.1
+++ sources	15 Sep 2005 03:10:24 -0000	1.2
@@ -0,0 +1 @@
+87ce9c44a8ab52e9b0553a2e46805525  ExtUtils-AutoInstall-0.63.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep 15 03:14:12 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Wed, 14 Sep 2005 23:14:12 -0400
Subject: rpms/perl-ExtUtils-AutoInstall/devel perl-ExtUtils-AutoInstall.spec,
	1.1, 1.2
Message-ID: <200509150314.j8F3ECmm007447@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-ExtUtils-AutoInstall/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7428

Modified Files:
	perl-ExtUtils-AutoInstall.spec 
Log Message:
Spec file cleanup


Index: perl-ExtUtils-AutoInstall.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-ExtUtils-AutoInstall/devel/perl-ExtUtils-AutoInstall.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-ExtUtils-AutoInstall.spec	15 Sep 2005 03:10:24 -0000	1.1
+++ perl-ExtUtils-AutoInstall.spec	15 Sep 2005 03:14:10 -0000	1.2
@@ -1,6 +1,6 @@
 Name: 		perl-ExtUtils-AutoInstall
 Version: 	0.63
-Release: 	2%{?dist}
+Release: 	3%{?dist}
 Summary: 	Automatic install of dependencies via CPAN
 License: 	GPL or Artistic
 Group: 		Development/Libraries
@@ -48,15 +48,15 @@
 %{_mandir}/man3/*
 
 %changelog
+* Tue Sep 14 2005 Ralf Corsepius  - 0.63-3
+- Further spec file cleanup.
+
+* Tue Sep 14 2005 Ralf Corsepius  - 0.63-2
+- Spec file cleanup.
+
 * Tue Sep 13 2005 Ralf Corsepius  - 0.63-1
 - FE submission.
 
 * Tue Sep 13 2005 Ralf Corsepius  - 0.63-0
 - Update to 0.63.
 - FE submission preps.
-
-* Wed Jun 29 2005 Ralf Corsepius  - 0.61-0.pm.2
-- Add Sort::Versions.
-
-* Tue Jun 28 2005 Ralf Corsepius  - 0.61-0.pm.1
-- Initial packman version.



From fedora-extras-commits at redhat.com  Thu Sep 15 03:48:12 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Wed, 14 Sep 2005 23:48:12 -0400
Subject: rpms/perl-Class-Autouse - New directory
Message-ID: <200509150348.j8F3mCFD007721@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Class-Autouse
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7701/perl-Class-Autouse

Log Message:
Directory /cvs/extras/rpms/perl-Class-Autouse added to the repository




From fedora-extras-commits at redhat.com  Thu Sep 15 03:48:13 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Wed, 14 Sep 2005 23:48:13 -0400
Subject: rpms/perl-Class-Autouse/devel - New directory
Message-ID: <200509150348.j8F3mDjx007726@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Class-Autouse/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7701/perl-Class-Autouse/devel

Log Message:
Directory /cvs/extras/rpms/perl-Class-Autouse/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Sep 15 03:48:38 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Wed, 14 Sep 2005 23:48:38 -0400
Subject: rpms/perl-Class-Autouse Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200509150348.j8F3mcMg007775@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Class-Autouse
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7746

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-Class-Autouse


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Class-Autouse
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Thu Sep 15 03:48:39 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Wed, 14 Sep 2005 23:48:39 -0400
Subject: rpms/perl-Class-Autouse/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200509150348.j8F3mdKa007780@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Class-Autouse/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7746/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Class-Autouse


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Thu Sep 15 03:49:34 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Wed, 14 Sep 2005 23:49:34 -0400
Subject: rpms/perl-Class-Autouse import.log,1.1,1.2
Message-ID: <200509150349.j8F3nYbs007849@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Class-Autouse
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7814

Modified Files:
	import.log 
Log Message:
auto-import perl-Class-Autouse-1.20-1 on branch devel from perl-Class-Autouse-1.20-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-Autouse/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	15 Sep 2005 03:48:36 -0000	1.1
+++ import.log	15 Sep 2005 03:49:32 -0000	1.2
@@ -0,0 +1 @@
+perl-Class-Autouse-1_20-1:HEAD:perl-Class-Autouse-1.20-1.src.rpm:1126756158



From fedora-extras-commits at redhat.com  Thu Sep 15 03:49:35 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Wed, 14 Sep 2005 23:49:35 -0400
Subject: rpms/perl-Class-Autouse/devel perl-Class-Autouse.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200509150349.j8F3nZjP007856@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Class-Autouse/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7814/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Class-Autouse.spec 
Log Message:
auto-import perl-Class-Autouse-1.20-1 on branch devel from perl-Class-Autouse-1.20-1.src.rpm


--- NEW FILE perl-Class-Autouse.spec ---
Name: 		perl-Class-Autouse
Version: 	1.20
Release: 	1%{?dist}
Summary: 	Run-time class loading on first method call
License: 	GPL or Artistic
Group: 		Development/Libraries
URL: 		http://search.cpan.org/dist/Class-Autouse/
Source0: 	http://search.cpan.org/CPAN/authors/id/A/AD/ADAMK/Class-Autouse-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:  	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
BuildArch: 	noarch

BuildRequires: 	perl(Test::More) >= 0.47
BuildRequires: 	perl(Carp) >= 1.03
BuildRequires: 	perl(File::Spec) >= 0.82
BuildRequires: 	perl(List::Util) >= 1.11

# for improved tests
BuildRequires: 	perl(Test::Pod) >= 1.00

%description
Class::Autouse allows you to specify a class the will only load when a
method of that class is called. For large classes that might not be used
during the running of a program, such as Date::Manip, this can save you
large amounts of memory, and decrease the script load time.

%prep
%setup -q -n Class-Autouse-%{version}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'
find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';'
chmod -R u+w $RPM_BUILD_ROOT/*

%clean
rm -rf $RPM_BUILD_ROOT

%check
make test

%files
%defattr(-,root,root,-)
%doc Changes README LICENSE
%{perl_vendorlib}/Class
%{_mandir}/man3/*

%changelog
* Tue Sep 13 2005 Ralf Corsepius  - 1.20-1
- Spec cleanup.
- FE submission.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-Autouse/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	15 Sep 2005 03:48:37 -0000	1.1
+++ .cvsignore	15 Sep 2005 03:49:33 -0000	1.2
@@ -0,0 +1 @@
+Class-Autouse-1.20.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-Autouse/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	15 Sep 2005 03:48:37 -0000	1.1
+++ sources	15 Sep 2005 03:49:33 -0000	1.2
@@ -0,0 +1 @@
+746a4f415dd8c7267bcec07841022275  Class-Autouse-1.20.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep 15 03:54:33 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Wed, 14 Sep 2005 23:54:33 -0400
Subject: rpms/perl-Class-Autouse/devel perl-Class-Autouse.spec,1.1,1.2
Message-ID: <200509150354.j8F3sXiq008221@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Class-Autouse/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8202

Modified Files:
	perl-Class-Autouse.spec 
Log Message:
Spec cleanup.


Index: perl-Class-Autouse.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-Autouse/devel/perl-Class-Autouse.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Class-Autouse.spec	15 Sep 2005 03:49:33 -0000	1.1
+++ perl-Class-Autouse.spec	15 Sep 2005 03:54:30 -0000	1.2
@@ -1,6 +1,6 @@
 Name: 		perl-Class-Autouse
 Version: 	1.20
-Release: 	1%{?dist}
+Release: 	2%{?dist}
 Summary: 	Run-time class loading on first method call
 License: 	GPL or Artistic
 Group: 		Development/Libraries
@@ -18,6 +18,7 @@
 
 # for improved tests
 BuildRequires: 	perl(Test::Pod) >= 1.00
+BuildRequires:	perl(prefork)
 
 %description
 Class::Autouse allows you to specify a class the will only load when a
@@ -47,11 +48,14 @@
 
 %files
 %defattr(-,root,root,-)
-%doc Changes README LICENSE
+%doc Changes LICENSE
 %{perl_vendorlib}/Class
 %{_mandir}/man3/*
 
 %changelog
+* Thu Sep 15 2005 Ralf Corsepius  - 1.20-2
+- Spec cleanup.
+
 * Tue Sep 13 2005 Ralf Corsepius  - 1.20-1
 - Spec cleanup.
 - FE submission.



From fedora-extras-commits at redhat.com  Thu Sep 15 08:35:04 2005
From: fedora-extras-commits at redhat.com (Mark Cox (mjc))
Date: Thu, 15 Sep 2005 04:35:04 -0400
Subject: fedora-security/audit fc4,1.58,1.59
Message-ID: <200509150835.j8F8Z4Vl016362@cvs-int.fedora.redhat.com>

Author: mjc

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16337

Modified Files:
	fc4 
Log Message:
Catch up with email and fix my bad sorting of the names



Index: fc4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc4,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- fc4	13 Sep 2005 08:59:42 -0000	1.58
+++ fc4	15 Sep 2005 08:35:02 -0000	1.59
@@ -1,15 +1,16 @@
-Up to date CVE as of CVE email 20050911
-Up to date FC4 as of 20050911
+Up to date CVE as of CVE email 20050914
+Up to date FC4 as of 20050914
 
 ** are items that need attention
 
+2005-2876 backport (util-linux) [since FEDORA-2005-887]
+2005-2874 version (cups, fixed 1.1.23)
 2005-2873 ** kernel
-2005-2872 ** kernel
+2005-2872 version (kernel, fixed 2.6.12) [since FEDORA-2005-510]
 2005-2871 backport (firefox) [since FEDORA-2005-871]
 2005-2871 backport (mozilla) [since FEDORA-2005-873]
 2005-2871 VULNERABLE (thunderbird) (moderate only)
 2005-2811 version (net-snmp, not upstream gentoo only)
-2005-2802 version (kernel, fixed 2.6.12) [since FEDORA-2005-510]
 2005-2801 version (kernel, fixed 2.6.11)
 2005-2800 VULNERABLE (kernel)
 2005-2798 version (openssh, fixed 4.2) [since FEDORA-2005-860]
@@ -21,19 +22,12 @@
 2005-2693 backport (cvs) [since FEDORA-2005-790]
 2005-2672 VULNERABLE (lm_sensors) bz#166673
 2005-2666 ** openssh (hmm)
-2005-2558 ignore (mysql) not an issue
-2005-2499 backport (slocate) [since FEDORA-2005-770]
-2005-2496 backport (ntp, fixed 4.2.0b) ...0a-20040617-ntpd_guid.patch
-2005-2494 VULNERABLE (kdebase, fixed after 3.4.2) #166997
-2005-2491 VULNERABLE (python pcre)
-2005-2491 backport (pcre, fixed 6.2) [since FEDORA-2005-803]
-2005-2491 ignore (httpd, pcre uses system pcre)
-2005-2491 ignore (php, pcre uses system pcre)
 2005-2642 version (mutt, openbsd only)
 2005-2641 VULNERABLE (pam_ldap) bz#166164
 2005-2617 version (kernel, fixed 2.6.12.5) [since FEDORA-2005-820]
 2005-2602 VULNERABLE (firefox) probably
 2005-2602 VULNERABLE (thunderbird) probably
+2005-2558 ignore (mysql) not an issue
 2005-2558 VULNERABLE (mysql, fixed 4.1.13) probably
 2005-2555 backport (kernel, fixed 2.6.12.6pre) [since FEDORA-2005-820] patch-2.6.12.6pre.patch
 2005-2553 version (kernel, not 2.6)
@@ -43,7 +37,16 @@
 2005-2547 version (bluez-pin, fixed 2.19) not before 2.16
 2005-2541 ignore (tar) is documented behaviour
 2005-2500 version (kernel, flaw introduced after 2.6.12)
+2005-2499 backport (slocate) [since FEDORA-2005-770]
 2005-2498 version (php xml_rpc, fixed 1.4.0) [since FEDORA-2005-810]
+2005-2496 backport (ntp, fixed 4.2.0b) ...0a-20040617-ntpd_guid.patch
+2005-2494 VULNERABLE (kdebase, fixed after 3.4.2) bz#166997
+2005-2491 ignore (python, fc4 python does not contain pcre)
+2005-2491 backport (pcre, fixed 6.2) [since FEDORA-2005-803]
+2005-2491 ignore (httpd, pcre uses system pcre)
+2005-2491 ignore (php, pcre uses system pcre)
+2005-2492 VULNERABLE (kernel, fixed 2.6.13.1)
+2005-2490 VULNERABLE (kernel, fixed 2.6.13.1) bz#166249
 2005-2475 VULNERABLE (unzip) bz#164928
 2005-2471 backport (netpbm) [since FEDORA-2005-728]
 2005-2459 ignore (kernel, fixed 2.6.12.5) dropped as code path not possible



From fedora-extras-commits at redhat.com  Thu Sep 15 08:46:13 2005
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Thu, 15 Sep 2005 04:46:13 -0400
Subject: owners owners.list,1.210,1.211
Message-ID: <200509150846.j8F8kDmN016422@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16403

Modified Files:
	owners.list 
Log Message:



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.210
retrieving revision 1.211
diff -u -r1.210 -r1.211
--- owners.list	15 Sep 2005 02:40:08 -0000	1.210
+++ owners.list	15 Sep 2005 08:46:11 -0000	1.211
@@ -216,6 +216,7 @@
 Fedora Extras|general|For bugs not specific to any single component.|dkl at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|gentoo|Graphical file management program in GTK+ for Linux|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|geomview|An interactive 3D viewing program|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
+Fedora Extras|gforth|Fast and portable implementation of the ANS Forth language|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|ghasher|GUI hasher for GTK+ 2|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
 Fedora Extras|ghc|Glasgow Haskell Compiler|petersen at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|ghex|A binary editor for GNOME|fedora at leemhuis.info|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Thu Sep 15 10:07:00 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 15 Sep 2005 06:07:00 -0400
Subject: rpms/libnet/FC-3 Makefile,1.4,1.5
Message-ID: <200509151007.j8FA7VJi019636@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/libnet/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19581/FC-3

Modified Files:
	Makefile 
Log Message:
s/cppunit/libnet/g in Fedora Extras CVS framework Makefiles


Index: Makefile
===================================================================
RCS file: /cvs/extras/rpms/libnet/FC-3/Makefile,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Makefile	12 Sep 2005 21:14:48 -0000	1.4
+++ Makefile	15 Sep 2005 10:06:58 -0000	1.5
@@ -1,4 +1,4 @@
-# Makefile for source rpm: cppunit
+# Makefile for source rpm: libnet
 # $Id$
 NAME := libnet
 SPECFILE = $(firstword $(wildcard *.spec))



From fedora-extras-commits at redhat.com  Thu Sep 15 10:07:05 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 15 Sep 2005 06:07:05 -0400
Subject: rpms/libnet/FC-4 Makefile,1.4,1.5
Message-ID: <200509151007.j8FA7b7q019643@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/libnet/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19581/FC-4

Modified Files:
	Makefile 
Log Message:
s/cppunit/libnet/g in Fedora Extras CVS framework Makefiles


Index: Makefile
===================================================================
RCS file: /cvs/extras/rpms/libnet/FC-4/Makefile,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Makefile	12 Sep 2005 21:03:43 -0000	1.4
+++ Makefile	15 Sep 2005 10:07:03 -0000	1.5
@@ -1,4 +1,4 @@
-# Makefile for source rpm: cppunit
+# Makefile for source rpm: libnet
 # $Id$
 NAME := libnet
 SPECFILE = $(firstword $(wildcard *.spec))



From fedora-extras-commits at redhat.com  Thu Sep 15 10:07:31 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 15 Sep 2005 06:07:31 -0400
Subject: rpms/libnet/devel Makefile,1.4,1.5
Message-ID: <200509151007.j8FA7VCG019642@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/libnet/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19581/devel

Modified Files:
	Makefile 
Log Message:
s/cppunit/libnet/g in Fedora Extras CVS framework Makefiles


Index: Makefile
===================================================================
RCS file: /cvs/extras/rpms/libnet/devel/Makefile,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Makefile	12 Sep 2005 19:58:55 -0000	1.4
+++ Makefile	15 Sep 2005 10:07:29 -0000	1.5
@@ -1,4 +1,4 @@
-# Makefile for source rpm: cppunit
+# Makefile for source rpm: libnet
 # $Id$
 NAME := libnet
 SPECFILE = $(firstword $(wildcard *.spec))



From fedora-extras-commits at redhat.com  Thu Sep 15 10:08:04 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Thu, 15 Sep 2005 06:08:04 -0400
Subject: owners owners.list,1.211,1.212
Message-ID: <200509151008.j8FA84f9019666@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19590

Modified Files:
	owners.list 
Log Message:
Add perl-Class-Autouse


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.211
retrieving revision 1.212
diff -u -r1.211 -r1.212
--- owners.list	15 Sep 2005 08:46:11 -0000	1.211
+++ owners.list	15 Sep 2005 10:07:46 -0000	1.212
@@ -584,6 +584,7 @@
 Fedora Extras|perl-Chart|Perl modules for producing many types of charts|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Class-Accessor|Automated accessor generation|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Class-Accessor-Chained|Make chained accessors|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Class-Autouse|Run-time class loading on first method call|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Class-Container|Perl module for building frameworks of classes|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Class-Data-Inheritable|Inheritable, overridable class data|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Class-DBI|Simple Database Abstraction|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Thu Sep 15 10:10:20 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Thu, 15 Sep 2005 06:10:20 -0400
Subject: owners owners.list,1.212,1.213
Message-ID: <200509151010.j8FAAKFu019727@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19703

Modified Files:
	owners.list 
Log Message:
Add perl-Params-Util


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.212
retrieving revision 1.213
diff -u -r1.212 -r1.213
--- owners.list	15 Sep 2005 10:07:46 -0000	1.212
+++ owners.list	15 Sep 2005 10:10:18 -0000	1.213
@@ -703,6 +703,7 @@
 Fedora Extras|perl-OLE-Storage_Lite|Simple Class for OLE document interface|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-PAR-Dist|Toolkit for creating and manipulating Perl PAR distributions|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Params-Validate|Params-Validate Perl module|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Params-Util|Simple standalone param-checking functions|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-pmtools|A suite of small programs to help manage Perl modules|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-prefork|Optimized module loading for forking or non-forking processes|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Pod-Coverage|Checks if the documentation of a module is comprehensive|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Thu Sep 15 10:12:23 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Thu, 15 Sep 2005 06:12:23 -0400
Subject: owners owners.list,1.213,1.214
Message-ID: <200509151012.j8FACNTO019758@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19739

Modified Files:
	owners.list 
Log Message:
Add perl-ExtUtils-AutoInstall


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.213
retrieving revision 1.214
diff -u -r1.213 -r1.214
--- owners.list	15 Sep 2005 10:10:18 -0000	1.213
+++ owners.list	15 Sep 2005 10:12:21 -0000	1.214
@@ -626,6 +626,7 @@
 Fedora Extras|perl-Error|Error Perl module|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Exception-Class|Declare hierarchies of exception classes|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Exporter-Lite|Lightweight exporting of variables|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-ExtUtils-AutoInstall|Automatic install of dependencies via CPAN|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-ExtUtils-CBuilder|Compile and link C code for Perl modules|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-ExtUtils-Depends|Easily build XS extensions that depend on XS extensions|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-ExtUtils-ParseXS|Module and a script for converting Perl XS code into C code|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Thu Sep 15 10:19:16 2005
From: fedora-extras-commits at redhat.com (Marcin Garski (mgarski))
Date: Thu, 15 Sep 2005 06:19:16 -0400
Subject: owners owners.list,1.214,1.215
Message-ID: <200509151019.j8FAJGTB019824@cvs-int.fedora.redhat.com>

Author: mgarski

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19805

Modified Files:
	owners.list 
Log Message:
Add digikam.



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.214
retrieving revision 1.215
diff -u -r1.214 -r1.215
--- owners.list	15 Sep 2005 10:12:21 -0000	1.214
+++ owners.list	15 Sep 2005 10:19:13 -0000	1.215
@@ -126,6 +126,7 @@
 Fedora Extras|diag-ether|Diagnostic program for Ethernet adapters under Linux|anvil at livna.org|extras-qa at fedoraproject.org|
 Fedora Extras|diction|Identifies diction and style errors|icon at linux.duke.edu|extras-qa at fedoraproject.org|
 Fedora Extras|dietlibc|Small libc implementation|enrico.scholz at informatik.tu-chemnitz.de|extras-qa at fedoraproject.org|
+Fedora Extras|digikam|A digital camera accessing & photo management application|mgarski at post.pl|extras-qa at fedoraproject.org|
 Fedora Extras|dillo|Very small and fast GUI web browser|nos at utelsystems.com|extras-qa at fedoraproject.org|
 Fedora Extras|diradmin|User control management tool for LDAP directories|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|directfb|Graphics abstraction library for the Linux Framebuffer Device|thomas at apestaart.org|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Thu Sep 15 10:22:16 2005
From: fedora-extras-commits at redhat.com (Marcin Garski (mgarski))
Date: Thu, 15 Sep 2005 06:22:16 -0400
Subject: rpms/digikam - New directory
Message-ID: <200509151022.j8FAMG4L019918@cvs-int.fedora.redhat.com>

Author: mgarski

Update of /cvs/extras/rpms/digikam
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19894/digikam

Log Message:
Directory /cvs/extras/rpms/digikam added to the repository




From fedora-extras-commits at redhat.com  Thu Sep 15 10:22:17 2005
From: fedora-extras-commits at redhat.com (Marcin Garski (mgarski))
Date: Thu, 15 Sep 2005 06:22:17 -0400
Subject: rpms/digikam/devel - New directory
Message-ID: <200509151022.j8FAMHUS019923@cvs-int.fedora.redhat.com>

Author: mgarski

Update of /cvs/extras/rpms/digikam/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19894/digikam/devel

Log Message:
Directory /cvs/extras/rpms/digikam/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Sep 15 10:22:38 2005
From: fedora-extras-commits at redhat.com (Marcin Garski (mgarski))
Date: Thu, 15 Sep 2005 06:22:38 -0400
Subject: rpms/digikam Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200509151022.j8FAMc7Z019974@cvs-int.fedora.redhat.com>

Author: mgarski

Update of /cvs/extras/rpms/digikam
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19939

Added Files:
	Makefile import.log 
Log Message:
Setup of module digikam


--- NEW FILE Makefile ---
# Top level Makefile for module digikam
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Thu Sep 15 10:22:39 2005
From: fedora-extras-commits at redhat.com (Marcin Garski (mgarski))
Date: Thu, 15 Sep 2005 06:22:39 -0400
Subject: rpms/digikam/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200509151022.j8FAMdse019979@cvs-int.fedora.redhat.com>

Author: mgarski

Update of /cvs/extras/rpms/digikam/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19939/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module digikam


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Thu Sep 15 10:23:36 2005
From: fedora-extras-commits at redhat.com (Marcin Garski (mgarski))
Date: Thu, 15 Sep 2005 06:23:36 -0400
Subject: rpms/digikam import.log,1.1,1.2
Message-ID: <200509151024.j8FAO6m7020052@cvs-int.fedora.redhat.com>

Author: mgarski

Update of /cvs/extras/rpms/digikam
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20013

Modified Files:
	import.log 
Log Message:
auto-import digikam-0.7.4-2 on branch devel from digikam-0.7.4-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/digikam/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	15 Sep 2005 10:22:36 -0000	1.1
+++ import.log	15 Sep 2005 10:23:33 -0000	1.2
@@ -0,0 +1 @@
+digikam-0_7_4-2:HEAD:digikam-0.7.4-2.src.rpm:1126779845



From fedora-extras-commits at redhat.com  Thu Sep 15 10:23:36 2005
From: fedora-extras-commits at redhat.com (Marcin Garski (mgarski))
Date: Thu, 15 Sep 2005 06:23:36 -0400
Subject: rpms/digikam/devel digikam.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200509151023.j8FANa8Y020045@cvs-int.fedora.redhat.com>

Author: mgarski

Update of /cvs/extras/rpms/digikam/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20013/devel

Modified Files:
	.cvsignore sources 
Added Files:
	digikam.spec 
Log Message:
auto-import digikam-0.7.4-2 on branch devel from digikam-0.7.4-2.src.rpm


--- NEW FILE digikam.spec ---
Name:		digikam
Version:	0.7.4
Release:	2%{?dist}
Summary:	A digital camera accessing & photo management application

Group:		Applications/Multimedia
License:	GPL
URL:		http://www.digikam.org/
Source0:	http://dl.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	gphoto2-devel >= 2.0.0 imlib2-devel gdbm-devel >= 1.8.0
BuildRequires:	libkexif-devel >= 0.2 libkipi-devel >= 0.1 desktop-file-utils
BuildRequires:	gettext
Requires(post):	desktop-file-utils
Requires(postun): desktop-file-utils

%description
digiKam is an easy to use and powerful digital photo management application,
which makes importing, organizing and manipulating digital photos a "snap".
The photos can be organized in albums which are automatically sorted
chronologically. An easy to use interface is provided to connect to your
digital camera, preview the images and download and/or delete them.

digiKam buildin image editor makes the common photo correction a simple task.
The image editor is extensible via plugins.

%package devel
Summary:	Development files for %{name}
Group:		Development/Libraries
Requires:	%{name} = %{version}-%{release}

%description devel
This package contains the libraries, include files and other resources
needed to develop applications using %{name}.

%prep
%setup -q

%build
unset QTDIR || : ; . /etc/profile.d/qt.sh
export QTLIB=${QTDIR}/lib QTINC=${QTDIR}/include

%configure \
	--disable-rpath \
	--disable-debug
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT 

desktop-file-install --vendor fedora --delete-original \
	--dir $RPM_BUILD_ROOT%{_datadir}/applications \
	--add-category X-Fedora \
	--add-category Application \
	--add-category Photograph \
	--add-category Graphics \
	$RPM_BUILD_ROOT%{_datadir}/applnk/Graphics/%{name}.desktop

desktop-file-install --vendor fedora --delete-original \
	--dir $RPM_BUILD_ROOT%{_datadir}/applications \
	--add-category X-Fedora \
	--add-category Application \
	--add-category Photograph \
	--add-category Graphics \
	$RPM_BUILD_ROOT%{_datadir}/applications/kde/showfoto.desktop

%find_lang %{name}

%post
/sbin/ldconfig
update-desktop-database &> /dev/null ||:

touch --no-create %{_datadir}/icons/hicolor || :
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
	%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi

%postun
/sbin/ldconfig
update-desktop-database &> /dev/null ||:

touch --no-create %{_datadir}/icons/hicolor || :
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
	%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi

%clean
rm -rf $RPM_BUILD_ROOT

%files -f %name.lang
%defattr(-, root, root)
%doc AUTHORS ChangeLog COPYING HACKING README
%{_bindir}/*
%{_libdir}/libdigikam.la
%{_libdir}/libdigikam.so.*
%{_libdir}/kde3/digikamimageplugin_core.la
%{_libdir}/kde3/digikamimageplugin_core.so
%{_libdir}/kde3/kio_digikam*.la
%{_libdir}/kde3/kio_digikam*.so
%{_datadir}/applications/*.desktop
%{_datadir}/apps/digikam/
%{_datadir}/apps/showfoto/
%{_datadir}/icons/hicolor/*
%{_datadir}/services/digikam*
%{_datadir}/servicetypes/digikamimageplugin.desktop

%files devel
%defattr(-, root, root)
%{_includedir}/digikam/
%{_includedir}/digikam_export.h
%{_libdir}/libdigikam.so

%changelog
* Tue Sep 13 2005 Marcin Garski  0.7.4-2
- Spec improvements

* Mon Sep 12 2005 Marcin Garski  0.7.4-1
- Updated to version 0.7.4 & clean up for Fedora Extras

* Sat Jun 26 2004 Marcin Garski  0.6.2-1.fc2
- Updated to version 0.6.2

* Wed Jun 09 2004 Marcin Garski  0.6.2RC-1.fc2
- Initial specfile


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/digikam/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	15 Sep 2005 10:22:36 -0000	1.1
+++ .cvsignore	15 Sep 2005 10:23:34 -0000	1.2
@@ -0,0 +1 @@
+digikam-0.7.4.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/digikam/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	15 Sep 2005 10:22:37 -0000	1.1
+++ sources	15 Sep 2005 10:23:34 -0000	1.2
@@ -0,0 +1 @@
+3df53700ff78caca60cab4ea4116c7c5  digikam-0.7.4.tar.bz2



From fedora-extras-commits at redhat.com  Thu Sep 15 11:32:43 2005
From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters))
Date: Thu, 15 Sep 2005 07:32:43 -0400
Subject: rpms/gnomesword import.log,1.2,1.3
Message-ID: <200509151133.j8FBXDmJ021656@cvs-int.fedora.redhat.com>

Author: mpeters

Update of /cvs/extras/rpms/gnomesword
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21617

Modified Files:
	import.log 
Log Message:
auto-import gnomesword-2.1.2-2.2 on branch FC-4 from gnomesword-2.1.2-2.2.src.rpm
patch for x86_64


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/gnomesword/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	7 Jun 2005 12:04:30 -0000	1.2
+++ import.log	15 Sep 2005 11:32:40 -0000	1.3
@@ -1 +1,2 @@
 gnomesword-2_1_2-1:HEAD:gnomesword-2.1.2-1.src.rpm:1118145807
+gnomesword-2_1_2-2_2:FC-4:gnomesword-2.1.2-2.2.src.rpm:1126783889



From fedora-extras-commits at redhat.com  Thu Sep 15 11:32:43 2005
From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters))
Date: Thu, 15 Sep 2005 07:32:43 -0400
Subject: rpms/gnomesword/FC-4 gnomesword-2.1.2-gettext64.patch, NONE,
	1.1 gnomesword.spec, 1.3, 1.4
Message-ID: <200509151133.j8FBXDfx021659@cvs-int.fedora.redhat.com>

Author: mpeters

Update of /cvs/extras/rpms/gnomesword/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21617/FC-4

Modified Files:
	gnomesword.spec 
Added Files:
	gnomesword-2.1.2-gettext64.patch 
Log Message:
auto-import gnomesword-2.1.2-2.2 on branch FC-4 from gnomesword-2.1.2-2.2.src.rpm
patch for x86_64

gnomesword-2.1.2-gettext64.patch:

--- NEW FILE gnomesword-2.1.2-gettext64.patch ---
--- gnomesword-2.1.2/aclocal.m4.BAD	2005-09-04 15:56:31.000000000 -0500
+++ gnomesword-2.1.2/aclocal.m4	2005-09-04 15:56:47.000000000 -0500
@@ -144,7 +144,7 @@
         	[AC_TRY_LINK([
 #include 
 ],
-	          [return (int) dgettext ("","")],
+	          [return dgettext ("","") != 0],
 		  gt_cv_func_dgettext_libc=yes,
 	          gt_cv_func_dgettext_libc=no)
         	])
--- gnomesword-2.1.2/configure.BAD	2005-09-04 15:57:32.000000000 -0500
+++ gnomesword-2.1.2/configure	2005-09-04 16:00:29.000000000 -0500
@@ -22807,7 +22807,7 @@
 int
 main ()
 {
-return (int) dgettext ("","")
+return dgettext ("","") != 0
   ;
   return 0;
 }


Index: gnomesword.spec
===================================================================
RCS file: /cvs/extras/rpms/gnomesword/FC-4/gnomesword.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gnomesword.spec	13 Jun 2005 07:00:52 -0000	1.3
+++ gnomesword.spec	15 Sep 2005 11:32:41 -0000	1.4
@@ -1,12 +1,13 @@
 Name:           gnomesword           
 Version:        2.1.2
-Release:        2.1%{?dist}
+Release:        2.2%{?dist}
 Summary:        GNOME-based Bible research tool
 
 Group:          Applications/Text
 License:        GPL
 URL:            http://gnomesword.sourceforge.net/
 Source0:        http://easynews.dl.sourceforge.net/sourceforge/gnomesword/gnomesword-%{version}.tar.gz
+Patch0:         gnomesword-2.1.2-gettext64.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  sed >= 3.95
@@ -19,7 +20,7 @@
 BuildRequires:  libgnomeui-devel
 BuildRequires:  scrollkeeper
 # currently broken on x86_64
-ExcludeArch:    x86_64
+# ExcludeArch:    x86_64
 Requires(post):   scrollkeeper
 Requires(postun): scrollkeeper
 Obsoletes:      gnomesword2
@@ -33,7 +34,10 @@
 and other texts using your computer.
 
 %prep
-%setup -q 
+%setup -q
+%ifarch x86_64
+%patch0 -p1 -b .gettext64 
+%endif
 %{__sed} -i 's?\r??' doc/help/C/legal.xml
 %{__sed} -i 's?\r??' doc/help/fr/legal.xml
 
@@ -79,6 +83,10 @@
 
 
 %changelog
+* Thu Sep 15 2005 Michael A. Peters  - 2.1.2-2.2
+- trying patch suggested by Tom 'spot' Callaway to fix x86_64 bug
+- 160186
+
 * Sun Jun 12 2005 Michael A. Peters  - 2.1.2-2.1
 - Exclude x86_64 for now
 



From fedora-extras-commits at redhat.com  Thu Sep 15 11:40:02 2005
From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters))
Date: Thu, 15 Sep 2005 07:40:02 -0400
Subject: rpms/gnomesword/devel gnomesword-2.1.2-gettext64.patch, NONE,
	1.1 gnomesword.spec, 1.3, 1.4
Message-ID: <200509151140.j8FBe2Gk021804@cvs-int.fedora.redhat.com>

Author: mpeters

Update of /cvs/extras/rpms/gnomesword/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21762/devel

Modified Files:
	gnomesword.spec 
Added Files:
	gnomesword-2.1.2-gettext64.patch 
Log Message:
auto-import gnomesword-2.1.2-2.2 on branch devel from gnomesword-2.1.2-2.2.src.rpm
patch for x86_64

gnomesword-2.1.2-gettext64.patch:

--- NEW FILE gnomesword-2.1.2-gettext64.patch ---
--- gnomesword-2.1.2/aclocal.m4.BAD	2005-09-04 15:56:31.000000000 -0500
+++ gnomesword-2.1.2/aclocal.m4	2005-09-04 15:56:47.000000000 -0500
@@ -144,7 +144,7 @@
         	[AC_TRY_LINK([
 #include 
 ],
-	          [return (int) dgettext ("","")],
+	          [return dgettext ("","") != 0],
 		  gt_cv_func_dgettext_libc=yes,
 	          gt_cv_func_dgettext_libc=no)
         	])
--- gnomesword-2.1.2/configure.BAD	2005-09-04 15:57:32.000000000 -0500
+++ gnomesword-2.1.2/configure	2005-09-04 16:00:29.000000000 -0500
@@ -22807,7 +22807,7 @@
 int
 main ()
 {
-return (int) dgettext ("","")
+return dgettext ("","") != 0
   ;
   return 0;
 }


Index: gnomesword.spec
===================================================================
RCS file: /cvs/extras/rpms/gnomesword/devel/gnomesword.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gnomesword.spec	13 Jun 2005 07:00:52 -0000	1.3
+++ gnomesword.spec	15 Sep 2005 11:39:59 -0000	1.4
@@ -1,12 +1,13 @@
 Name:           gnomesword           
 Version:        2.1.2
-Release:        2.1%{?dist}
+Release:        2.2%{?dist}
 Summary:        GNOME-based Bible research tool
 
 Group:          Applications/Text
 License:        GPL
 URL:            http://gnomesword.sourceforge.net/
 Source0:        http://easynews.dl.sourceforge.net/sourceforge/gnomesword/gnomesword-%{version}.tar.gz
+Patch0:         gnomesword-2.1.2-gettext64.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  sed >= 3.95
@@ -19,7 +20,7 @@
 BuildRequires:  libgnomeui-devel
 BuildRequires:  scrollkeeper
 # currently broken on x86_64
-ExcludeArch:    x86_64
+# ExcludeArch:    x86_64
 Requires(post):   scrollkeeper
 Requires(postun): scrollkeeper
 Obsoletes:      gnomesword2
@@ -33,7 +34,10 @@
 and other texts using your computer.
 
 %prep
-%setup -q 
+%setup -q
+%ifarch x86_64
+%patch0 -p1 -b .gettext64 
+%endif
 %{__sed} -i 's?\r??' doc/help/C/legal.xml
 %{__sed} -i 's?\r??' doc/help/fr/legal.xml
 
@@ -79,6 +83,10 @@
 
 
 %changelog
+* Thu Sep 15 2005 Michael A. Peters  - 2.1.2-2.2
+- trying patch suggested by Tom 'spot' Callaway to fix x86_64 bug
+- 160186
+
 * Sun Jun 12 2005 Michael A. Peters  - 2.1.2-2.1
 - Exclude x86_64 for now
 



From fedora-extras-commits at redhat.com  Thu Sep 15 11:40:01 2005
From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters))
Date: Thu, 15 Sep 2005 07:40:01 -0400
Subject: rpms/gnomesword import.log,1.3,1.4
Message-ID: <200509151140.j8FBe1vC021796@cvs-int.fedora.redhat.com>

Author: mpeters

Update of /cvs/extras/rpms/gnomesword
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21762

Modified Files:
	import.log 
Log Message:
auto-import gnomesword-2.1.2-2.2 on branch devel from gnomesword-2.1.2-2.2.src.rpm
patch for x86_64


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/gnomesword/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	15 Sep 2005 11:32:40 -0000	1.3
+++ import.log	15 Sep 2005 11:39:59 -0000	1.4
@@ -1,2 +1,3 @@
 gnomesword-2_1_2-1:HEAD:gnomesword-2.1.2-1.src.rpm:1118145807
 gnomesword-2_1_2-2_2:FC-4:gnomesword-2.1.2-2.2.src.rpm:1126783889
+gnomesword-2_1_2-2_2:HEAD:gnomesword-2.1.2-2.2.src.rpm:1126784329



From fedora-extras-commits at redhat.com  Thu Sep 15 12:28:16 2005
From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters))
Date: Thu, 15 Sep 2005 08:28:16 -0400
Subject: rpms/gnomesword/FC-4 gnomesword.spec,1.4,1.5
Message-ID: <200509151228.j8FCSGZO023215@cvs-int.fedora.redhat.com>

Author: mpeters

Update of /cvs/extras/rpms/gnomesword/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23196

Modified Files:
	gnomesword.spec 
Log Message:
rerun aclocal, auto*, etc, on x86_64



Index: gnomesword.spec
===================================================================
RCS file: /cvs/extras/rpms/gnomesword/FC-4/gnomesword.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gnomesword.spec	15 Sep 2005 11:32:41 -0000	1.4
+++ gnomesword.spec	15 Sep 2005 12:28:14 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           gnomesword           
 Version:        2.1.2
-Release:        2.2%{?dist}
+Release:        2.3%{?dist}
 Summary:        GNOME-based Bible research tool
 
 Group:          Applications/Text
@@ -21,6 +21,10 @@
 BuildRequires:  scrollkeeper
 # currently broken on x86_64
 # ExcludeArch:    x86_64
+# for x86_64
+%ifarch x86_64
+BuildRequires:  libtool automake autoconf
+%endif
 Requires(post):   scrollkeeper
 Requires(postun): scrollkeeper
 Obsoletes:      gnomesword2
@@ -42,6 +46,9 @@
 %{__sed} -i 's?\r??' doc/help/fr/legal.xml
 
 %build
+%ifarch x86_64
+libtoolize -c --force && aclocal-1.9 && autoheader && automake-1.9 && autoconf
+%endif
 %configure
 make %{?_smp_mflags}
 
@@ -83,9 +90,10 @@
 
 
 %changelog
-* Thu Sep 15 2005 Michael A. Peters  - 2.1.2-2.2
+* Thu Sep 15 2005 Michael A. Peters  - 2.1.2-2.3
 - trying patch suggested by Tom 'spot' Callaway to fix x86_64 bug
 - 160186
+- libtool, aclocal, autoheader, automake, autoconf on x86_64
 
 * Sun Jun 12 2005 Michael A. Peters  - 2.1.2-2.1
 - Exclude x86_64 for now



From fedora-extras-commits at redhat.com  Thu Sep 15 12:48:32 2005
From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters))
Date: Thu, 15 Sep 2005 08:48:32 -0400
Subject: rpms/gnomesword/devel gnomesword.spec,1.4,1.5
Message-ID: <200509151248.j8FCmWPc023368@cvs-int.fedora.redhat.com>

Author: mpeters

Update of /cvs/extras/rpms/gnomesword/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23349

Modified Files:
	gnomesword.spec 
Log Message:
sync with FC4 spec file



Index: gnomesword.spec
===================================================================
RCS file: /cvs/extras/rpms/gnomesword/devel/gnomesword.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gnomesword.spec	15 Sep 2005 11:39:59 -0000	1.4
+++ gnomesword.spec	15 Sep 2005 12:48:30 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           gnomesword           
 Version:        2.1.2
-Release:        2.2%{?dist}
+Release:        2.3%{?dist}
 Summary:        GNOME-based Bible research tool
 
 Group:          Applications/Text
@@ -21,6 +21,10 @@
 BuildRequires:  scrollkeeper
 # currently broken on x86_64
 # ExcludeArch:    x86_64
+# for x86_64
+%ifarch x86_64
+BuildRequires:  libtool automake autoconf
+%endif
 Requires(post):   scrollkeeper
 Requires(postun): scrollkeeper
 Obsoletes:      gnomesword2
@@ -42,6 +46,9 @@
 %{__sed} -i 's?\r??' doc/help/fr/legal.xml
 
 %build
+%ifarch x86_64
+libtoolize -c --force && aclocal-1.9 && autoheader && automake-1.9 && autoconf
+%endif
 %configure
 make %{?_smp_mflags}
 
@@ -83,9 +90,10 @@
 
 
 %changelog
-* Thu Sep 15 2005 Michael A. Peters  - 2.1.2-2.2
+* Thu Sep 15 2005 Michael A. Peters  - 2.1.2-2.3
 - trying patch suggested by Tom 'spot' Callaway to fix x86_64 bug
 - 160186
+- libtool, aclocal, autoheader, automake, autoconf on x86_64
 
 * Sun Jun 12 2005 Michael A. Peters  - 2.1.2-2.1
 - Exclude x86_64 for now



From fedora-extras-commits at redhat.com  Thu Sep 15 13:41:07 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Thu, 15 Sep 2005 09:41:07 -0400
Subject: rpms/wmweather+ - New directory
Message-ID: <200509151341.j8FDf7Ji024979@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/wmweather+
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24955/wmweather+

Log Message:
Directory /cvs/extras/rpms/wmweather+ added to the repository




From fedora-extras-commits at redhat.com  Thu Sep 15 13:41:07 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Thu, 15 Sep 2005 09:41:07 -0400
Subject: rpms/wmweather+/devel - New directory
Message-ID: <200509151341.j8FDf7bv024984@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/wmweather+/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24955/wmweather+/devel

Log Message:
Directory /cvs/extras/rpms/wmweather+/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Sep 15 13:41:23 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Thu, 15 Sep 2005 09:41:23 -0400
Subject: rpms/wmweather+ Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200509151341.j8FDfN9M025035@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/wmweather+
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25000

Added Files:
	Makefile import.log 
Log Message:
Setup of module wmweather+


--- NEW FILE Makefile ---
# Top level Makefile for module wmweather+
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Thu Sep 15 13:41:24 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Thu, 15 Sep 2005 09:41:24 -0400
Subject: rpms/wmweather+/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200509151341.j8FDfOr0025040@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/wmweather+/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25000/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module wmweather+


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Thu Sep 15 13:42:12 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Thu, 15 Sep 2005 09:42:12 -0400
Subject: rpms/wmweather+ import.log,1.1,1.2
Message-ID: <200509151342.j8FDgDx2025110@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/wmweather+
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25073

Modified Files:
	import.log 
Log Message:
auto-import wmweather+-2.9-1 on branch devel from wmweather+-2.9-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/wmweather+/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	15 Sep 2005 13:41:21 -0000	1.1
+++ import.log	15 Sep 2005 13:42:10 -0000	1.2
@@ -0,0 +1 @@
+wmweather+-2_9-1:HEAD:wmweather+-2.9-1.src.rpm:1126791721



From fedora-extras-commits at redhat.com  Thu Sep 15 13:42:13 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Thu, 15 Sep 2005 09:42:13 -0400
Subject: rpms/wmweather+/devel wmweather+-configure.patch, NONE,
	1.1 wmweather+.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <200509151342.j8FDgD1p025119@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/wmweather+/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25073/devel

Modified Files:
	.cvsignore sources 
Added Files:
	wmweather+-configure.patch wmweather+.spec 
Log Message:
auto-import wmweather+-2.9-1 on branch devel from wmweather+-2.9-1.src.rpm

wmweather+-configure.patch:

--- NEW FILE wmweather+-configure.patch ---
--- configure.orig	2005-06-03 15:15:10.000000000 +0200
+++ configure	2005-06-03 15:23:34.000000000 +0200
@@ -3067,124 +3067,9 @@
 
 # Checks for libraries.
 
-#
-# Handle user hints
-#
-         echo "$as_me:$LINENO: checking if libpcre is wanted" >&5
-echo $ECHO_N "checking if libpcre is wanted... $ECHO_C" >&6
-
-# Check whether --with-libpcre or --without-libpcre was given.
-if test "${with_libpcre+set}" = set; then
-  withval="$with_libpcre"
-  if test "$withval" != no ; then
-                          LIBPCRE_HOME="$withval"
-                          echo "$as_me:$LINENO: result: yes: libraries ${LIBPCRE_HOME}/lib  includes ${LIBPCRE_HOME}/include" >&5
-echo "${ECHO_T}yes: libraries ${LIBPCRE_HOME}/lib  includes ${LIBPCRE_HOME}/include" >&6
-                      else
-                          echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-                      fi
-else
-  LIBPCRE_HOME=/usr/local
-                      if test ! -f "${LIBPCRE_HOME}/include/pcre.h"
-                      then
-                         LIBPCRE_HOME=/usr
-                      fi
-                      echo "$as_me:$LINENO: result: yes: libraries ${LIBPCRE_HOME}/lib  includes ${LIBPCRE_HOME}/include" >&5
-echo "${ECHO_T}yes: libraries ${LIBPCRE_HOME}/lib  includes ${LIBPCRE_HOME}/include" >&6
-
-fi;
-
-#
-# Locate libpcre, if wanted
-#
-         if test -n "${LIBPCRE_HOME}"
-         then
-             LDFLAGS="$LDFLAGS -L${LIBPCRE_HOME}/lib"
-             CPPFLAGS="$CPPFLAGS -I${LIBPCRE_HOME}/include"
-
-echo "$as_me:$LINENO: checking for pcre_compile in -lpcre" >&5
-echo $ECHO_N "checking for pcre_compile in -lpcre... $ECHO_C" >&6
-if test "${ac_cv_lib_pcre_pcre_compile+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lpcre  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char pcre_compile ();
-int
-main ()
-{
-pcre_compile ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_pcre_pcre_compile=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_pcre_pcre_compile=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_pcre_pcre_compile" >&5
-echo "${ECHO_T}$ac_cv_lib_pcre_pcre_compile" >&6
-if test $ac_cv_lib_pcre_pcre_compile = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBPCRE 1
-_ACEOF
-
-  LIBS="-lpcre $LIBS"
-
-else
-  { { echo "$as_me:$LINENO: error: libpcre is required" >&5
-echo "$as_me: error: libpcre is required" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-         else
-             { { echo "$as_me:$LINENO: error: libpcre is required" >&5
-echo "$as_me: error: libpcre is required" >&2;}
-   { (exit 1); exit 1; }; }
-         fi
-
+LDFLAGS="$LDFLAGS -L$/usr/lib"
+CPPFLAGS="$CPPFLAGS `pcre-config --cflags`"
+LIBS="-lpcre $LIBS"
 
 # Check whether --with-libwww-prefix or --without-libwww-prefix was given.
 if test "${with_libwww_prefix+set}" = set; then


--- NEW FILE wmweather+.spec ---
Name:           wmweather+
Version:        2.9
Release:        1
Summary:        Weather status dockapp

Group:          User Interface/X
License:        GPL
URL:            http://sourceforge.net/projects/wmweatherplus/
Source0:        http://dl.sf.net/wmweatherplus/wmweather+-2.9.tar.gz
Patch0:         wmweather+-configure.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  xorg-x11-devel
BuildRequires:  WindowMaker-devel
BuildRequires:  pcre-devel
BuildRequires:  w3c-libwww-devel
BuildRequires:  openssl-devel

%description
wmweather+ will download the National Weather Serivce METAR bulletins; AVN,
ETA, and MRF forecasts; and any weather map for display in a WindowMaker
dockapp. Think wmweather with a smaller font, forecasts, a weather map, and a
sky condition display.

%prep
%setup -q
%patch0

%build
%configure
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc ChangeLog COPYING README
%{_bindir}/wmweather+
%{_mandir}/man1/*

%changelog
* Fri Jun 03 2005 Andreas Bierfert 
2.9-1
- Initial Release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wmweather+/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	15 Sep 2005 13:41:22 -0000	1.1
+++ .cvsignore	15 Sep 2005 13:42:11 -0000	1.2
@@ -0,0 +1 @@
+wmweather+-2.9.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wmweather+/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	15 Sep 2005 13:41:22 -0000	1.1
+++ sources	15 Sep 2005 13:42:11 -0000	1.2
@@ -0,0 +1 @@
+ede58d7ed589d5c41b9b68a2703a8f7d  wmweather+-2.9.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep 15 13:43:42 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Thu, 15 Sep 2005 09:43:42 -0400
Subject: rpms/wmapmload - New directory
Message-ID: <200509151343.j8FDhgJH025217@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/wmapmload
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25197/wmapmload

Log Message:
Directory /cvs/extras/rpms/wmapmload added to the repository




From fedora-extras-commits at redhat.com  Thu Sep 15 13:43:42 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Thu, 15 Sep 2005 09:43:42 -0400
Subject: rpms/wmapmload/devel - New directory
Message-ID: <200509151343.j8FDhgvD025222@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/wmapmload/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25197/wmapmload/devel

Log Message:
Directory /cvs/extras/rpms/wmapmload/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Sep 15 13:44:03 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Thu, 15 Sep 2005 09:44:03 -0400
Subject: rpms/wmapmload Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200509151344.j8FDi3BF025277@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/wmapmload
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25242

Added Files:
	Makefile import.log 
Log Message:
Setup of module wmapmload


--- NEW FILE Makefile ---
# Top level Makefile for module wmapmload
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Thu Sep 15 13:44:03 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Thu, 15 Sep 2005 09:44:03 -0400
Subject: rpms/wmapmload/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200509151344.j8FDi3Ye025282@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/wmapmload/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25242/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module wmapmload


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Thu Sep 15 13:44:34 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Thu, 15 Sep 2005 09:44:34 -0400
Subject: rpms/wmapmload import.log,1.1,1.2
Message-ID: <200509151345.j8FDj5pV025350@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/wmapmload
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25310

Modified Files:
	import.log 
Log Message:
auto-import wmapmload-0.3.4-1 on branch devel from wmapmload-0.3.4-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/wmapmload/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	15 Sep 2005 13:44:01 -0000	1.1
+++ import.log	15 Sep 2005 13:44:32 -0000	1.2
@@ -0,0 +1 @@
+wmapmload-0_3_4-1:HEAD:wmapmload-0.3.4-1.src.rpm:1126791864



From fedora-extras-commits at redhat.com  Thu Sep 15 13:44:35 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Thu, 15 Sep 2005 09:44:35 -0400
Subject: rpms/wmapmload/devel wmapmload.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200509151345.j8FDj5BJ025354@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/wmapmload/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25310/devel

Modified Files:
	.cvsignore sources 
Added Files:
	wmapmload.spec 
Log Message:
auto-import wmapmload-0.3.4-1 on branch devel from wmapmload-0.3.4-1.src.rpm


--- NEW FILE wmapmload.spec ---
Name:           wmapmload
Version:        0.3.4
Release:        1
Summary:        Wmapmload monitors your apm status in an lcd display fashion

Group:          User Interface/X
License:        GPL
URL:     	http://tnemeth.free.fr/projets/dockapps.html
Source0:        http://tnemeth.free.fr/projets/programmes/wmapmload-0.3.4.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  xorg-x11-devel

%description
%{summary}

%prep
%setup -q

%build
%configure
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT


%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING THANKS TODO
%{_bindir}/wmapmload
%{_mandir}/man1/*

%changelog
* Fri Jun 03 2005 Andreas Bierfert 
0.3.4-1
- Initial Release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wmapmload/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	15 Sep 2005 13:44:01 -0000	1.1
+++ .cvsignore	15 Sep 2005 13:44:33 -0000	1.2
@@ -0,0 +1 @@
+wmapmload-0.3.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wmapmload/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	15 Sep 2005 13:44:01 -0000	1.1
+++ sources	15 Sep 2005 13:44:33 -0000	1.2
@@ -0,0 +1 @@
+8239e46cf4b193b75835578b688b326c  wmapmload-0.3.4.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep 15 13:55:03 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Thu, 15 Sep 2005 09:55:03 -0400
Subject: rpms/wmweather+/devel wmweather+.spec,1.1,1.2
Message-ID: <200509151355.j8FDt36X025498@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/wmweather+/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25477

Modified Files:
	wmweather+.spec 
Log Message:
- add dist
- don't doc ChangeLog



Index: wmweather+.spec
===================================================================
RCS file: /cvs/extras/rpms/wmweather+/devel/wmweather+.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wmweather+.spec	15 Sep 2005 13:42:11 -0000	1.1
+++ wmweather+.spec	15 Sep 2005 13:55:01 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           wmweather+
 Version:        2.9
-Release:        1
+Release:        2%{?dist}
 Summary:        Weather status dockapp
 
 Group:          User Interface/X
@@ -42,11 +42,16 @@
 
 %files
 %defattr(-,root,root,-)
-%doc ChangeLog COPYING README
+%doc COPYING README
 %{_bindir}/wmweather+
 %{_mandir}/man1/*
 
 %changelog
+* Thu Sep 15 2005 Andreas Bierfert 
+2.9-2
+- add dist tag
+- don't doc ChangeLog
+
 * Fri Jun 03 2005 Andreas Bierfert 
 2.9-1
 - Initial Release



From fedora-extras-commits at redhat.com  Thu Sep 15 13:56:20 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Thu, 15 Sep 2005 09:56:20 -0400
Subject: rpms/wmapmload/devel wmapmload.spec,1.1,1.2
Message-ID: <200509151356.j8FDuKu3025574@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/wmapmload/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25555

Modified Files:
	wmapmload.spec 
Log Message:
- add dist



Index: wmapmload.spec
===================================================================
RCS file: /cvs/extras/rpms/wmapmload/devel/wmapmload.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wmapmload.spec	15 Sep 2005 13:44:33 -0000	1.1
+++ wmapmload.spec	15 Sep 2005 13:56:18 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           wmapmload
 Version:        0.3.4
-Release:        1
+Release:        2%{?dist}
 Summary:        Wmapmload monitors your apm status in an lcd display fashion
 
 Group:          User Interface/X
@@ -36,6 +36,10 @@
 %{_mandir}/man1/*
 
 %changelog
+* Thu Sep 15 2005 Andreas Bierfert 
+0.3.4-2
+- add dist
+
 * Fri Jun 03 2005 Andreas Bierfert 
 0.3.4-1
 - Initial Release



From fedora-extras-commits at redhat.com  Thu Sep 15 14:28:46 2005
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Thu, 15 Sep 2005 10:28:46 -0400
Subject: rpms/gnumeric/FC-4 gnumeric.spec,1.2,1.3
Message-ID: <200509151428.j8FESkt5027029@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/gnumeric/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27010

Modified Files:
	gnumeric.spec 
Log Message:
add pygtk2-devel to buildrequires, this fixes bug 168052


Index: gnumeric.spec
===================================================================
RCS file: /cvs/extras/rpms/gnumeric/FC-4/gnumeric.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gnumeric.spec	15 Mar 2005 08:15:57 -0000	1.2
+++ gnumeric.spec	15 Sep 2005 14:28:44 -0000	1.3
@@ -4,7 +4,7 @@
 Summary:        A spreadsheet program for GNOME.
 Name:     	gnumeric
 Version: 	1.4.3
-Release: 	2
+Release: 	2.1
 Epoch:		1
 License:	GPL
 Group:		Applications/Productivity
@@ -28,6 +28,7 @@
 BuildRequires:  intltool scrollkeeper gettext desktop-file-utils
 BuildRequires:  libgnomedb-devel >= 1.0.4
 BuildRequires:  pango-devel >= 1.4.0
+BuildRequires:  pygtk2-devel
 Patch0: gnumeric-1.4.1-desktop.patch
 Patch1: gnumeric-1.4.1-excelcrash.patch
 Patch2: gnumeric-1.4.1-configure.patch
@@ -138,6 +139,9 @@
 %dir %{_libdir}/gnumeric/%{gnumeric_version}
 
 %changelog
+* Thu Sep 15 2005 Caolan McNamara  1.4.3-2.1
+- add pygtk2-devel to buildrequires, this fixes bug 168052
+
 * Tue Mar 15 2005 Caolan McNamara  1.4.3-2
 - add libgnomedb to extras and gnumeric's requires
 



From fedora-extras-commits at redhat.com  Thu Sep 15 14:58:56 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Thu, 15 Sep 2005 10:58:56 -0400
Subject: rpms/gtk+extra - New directory
Message-ID: <200509151458.j8FEwu6A027688@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/gtk+extra
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27668/gtk+extra

Log Message:
Directory /cvs/extras/rpms/gtk+extra added to the repository




From fedora-extras-commits at redhat.com  Thu Sep 15 14:58:57 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Thu, 15 Sep 2005 10:58:57 -0400
Subject: rpms/gtk+extra/devel - New directory
Message-ID: <200509151458.j8FEwvgP027691@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/gtk+extra/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27668/gtk+extra/devel

Log Message:
Directory /cvs/extras/rpms/gtk+extra/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Sep 15 14:59:42 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Thu, 15 Sep 2005 10:59:42 -0400
Subject: rpms/gtk+extra Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200509151459.j8FExhRs027746@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/gtk+extra
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27717

Added Files:
	Makefile import.log 
Log Message:
Setup of module gtk+extra


--- NEW FILE Makefile ---
# Top level Makefile for module gtk+extra
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Thu Sep 15 14:59:43 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Thu, 15 Sep 2005 10:59:43 -0400
Subject: rpms/gtk+extra/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200509151459.j8FExhtc027751@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/gtk+extra/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27717/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module gtk+extra


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Thu Sep 15 15:00:53 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Thu, 15 Sep 2005 11:00:53 -0400
Subject: rpms/gtk+extra import.log,1.1,1.2
Message-ID: <200509151500.j8FF0rOi027821@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/gtk+extra
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27786

Modified Files:
	import.log 
Log Message:
auto-import gtk+extra-1.1.0-3 on branch devel from gtk+extra-1.1.0-3.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/gtk+extra/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	15 Sep 2005 14:59:40 -0000	1.1
+++ import.log	15 Sep 2005 15:00:51 -0000	1.2
@@ -0,0 +1 @@
+gtk+extra-1_1_0-3:HEAD:gtk+extra-1.1.0-3.src.rpm:1126796442



From fedora-extras-commits at redhat.com  Thu Sep 15 15:00:54 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Thu, 15 Sep 2005 11:00:54 -0400
Subject: rpms/gtk+extra/devel gtk+extra.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200509151500.j8FF0sUw027828@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/gtk+extra/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27786/devel

Modified Files:
	.cvsignore sources 
Added Files:
	gtk+extra.spec 
Log Message:
auto-import gtk+extra-1.1.0-3 on branch devel from gtk+extra-1.1.0-3.src.rpm


--- NEW FILE gtk+extra.spec ---
Name:		gtk+extra
Version:	1.1.0
Release:	3%{?dist}
Summary:	A library of gtk+ widgets
Summary(fr):	Une biblioth??que de widgets gtk+

Group:		System Environment/Libraries
License:	LGPL
URL:		http://www.dattalo.com/gnupic/gpsim.html
Source:		http://www.dattalo.com/gnupic/gtk+extra-%{version}.tar.gz
BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	gtk2-devel

%description
A library of dynamically linked gtk+ widgets including:
GtkSheet, GtkPlot, and GtkIconList

%description -l fr
Une biblioth??que de widgets gtk+ li??s dynamiquement incluant :
GtkSheet, GtkPlot et GtkIconList

%package devel
Summary:	A library of gtk+ widgets
Summary(fr):	Une biblioth??que de widgets gtk+
Group:		Development/Libraries
Requires:       %{name} = %{version}-%{release}
Requires:       gtk2-devel

%description devel
The %{name}-devel package includes the static libraries, header files,
and documentation for compiling programs that use gtk+extra widgets.

%description -l fr devel
Le paquetage %{name}-devel contient les biblioth??ques statiques, les fichiers
d'en-t??tes et la documentation n??cessaires ?? la compilation des programmes
qui utilisent les widgets gtk+extra.

%prep
%setup -q
%{__sed} -i 's/\r//' docs/{gtk*.ChangeLog,HELP,README,TODO,VERSION}
%{__sed} -i 's/\r//' docs/reference/*.html
%{__sed} -i 's/\r//' docs/tutorial/{*.html,gtksheet/*.{c,html}}

%build
%configure
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig


%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING README
%{_libdir}/libgtkextra*.so.*

%files devel
%defattr(-,root,root,-)
%doc docs/{gtk*.ChangeLog,COPYING,HELP,README,TODO,VERSION}
%doc docs/reference/ docs/tutorial/
%{_libdir}/*.a
%exclude %{_libdir}/*.la
%{_libdir}/*.so
%{_libdir}/pkgconfig/*
%{_includedir}/*


%changelog
* Thu Sep 15 2005 Alain Portal  1.1.0-3
  - BuildRequires is gtk2-devel, not gtk+-devel
  - Add Requires gtk2-devel for package devel
  - Exclude .la files
  - Add a lot of documentation
  - Move gtk*.ChangeLog in devel package
  - Convert DOS format end-of-line to Unix-like format
  - Contributions of Jose Pedro Oliveira 
    Thanks to him.

* Tue Sep 13 2005 Alain Portal  1.1.0-2
  - Add french summary and description

* Mon Sep 12 2005 Alain Portal  1.1.0-1
  - New version

* Fri Oct 29 2004 Alain Portal  0:0.99.17-0.fdr.2
  - Add BuildRequires gtk+-devel

* Wed Oct 27 2004 Alain Portal  0:0.99.17-0.fdr.1
  - Initial Fedora RPM


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gtk+extra/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	15 Sep 2005 14:59:41 -0000	1.1
+++ .cvsignore	15 Sep 2005 15:00:52 -0000	1.2
@@ -0,0 +1 @@
+gtk+extra-1.1.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gtk+extra/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	15 Sep 2005 14:59:41 -0000	1.1
+++ sources	15 Sep 2005 15:00:52 -0000	1.2
@@ -0,0 +1 @@
+886bbd0c54d59a9159df097c125f54cd  gtk+extra-1.1.0.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep 15 15:08:06 2005
From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon))
Date: Thu, 15 Sep 2005 11:08:06 -0400
Subject: rpms/qscintilla - New directory
Message-ID: <200509151508.j8FF86Ma029288@cvs-int.fedora.redhat.com>

Author: icon

Update of /cvs/extras/rpms/qscintilla
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29262/qscintilla

Log Message:
Directory /cvs/extras/rpms/qscintilla added to the repository




From fedora-extras-commits at redhat.com  Thu Sep 15 15:08:06 2005
From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon))
Date: Thu, 15 Sep 2005 11:08:06 -0400
Subject: rpms/qscintilla/devel - New directory
Message-ID: <200509151508.j8FF86nY029289@cvs-int.fedora.redhat.com>

Author: icon

Update of /cvs/extras/rpms/qscintilla/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29262/qscintilla/devel

Log Message:
Directory /cvs/extras/rpms/qscintilla/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Sep 15 15:09:35 2005
From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon))
Date: Thu, 15 Sep 2005 11:09:35 -0400
Subject: rpms/qscintilla/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200509151509.j8FF9ZD9029361@cvs-int.fedora.redhat.com>

Author: icon

Update of /cvs/extras/rpms/qscintilla/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29328/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module qscintilla


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Thu Sep 15 15:09:40 2005
From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon))
Date: Thu, 15 Sep 2005 11:09:40 -0400
Subject: rpms/qscintilla Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200509151509.j8FF9eB0029378@cvs-int.fedora.redhat.com>

Author: icon

Update of /cvs/extras/rpms/qscintilla
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29328

Added Files:
	Makefile import.log 
Log Message:
Setup of module qscintilla


--- NEW FILE Makefile ---
# Top level Makefile for module qscintilla
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Thu Sep 15 15:10:46 2005
From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon))
Date: Thu, 15 Sep 2005 11:10:46 -0400
Subject: rpms/qscintilla import.log,1.1,1.2
Message-ID: <200509151511.j8FFBG0d029459@cvs-int.fedora.redhat.com>

Author: icon

Update of /cvs/extras/rpms/qscintilla
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29413

Modified Files:
	import.log 
Log Message:
auto-import qscintilla-1.6-3.fc4 on branch devel from qscintilla-1.6-3.fc4.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/qscintilla/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	15 Sep 2005 15:09:23 -0000	1.1
+++ import.log	15 Sep 2005 15:10:43 -0000	1.2
@@ -0,0 +1 @@
+qscintilla-1_6-3_fc4:HEAD:qscintilla-1.6-3.fc4.src.rpm:1126796976



From fedora-extras-commits at redhat.com  Thu Sep 15 15:10:46 2005
From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon))
Date: Thu, 15 Sep 2005 11:10:46 -0400
Subject: rpms/qscintilla/devel
	qscintilla-1.61-gpl-1.4-designer-incpath.patch, NONE,
	1.1 qscintilla.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <200509151510.j8FFAkfw029449@cvs-int.fedora.redhat.com>

Author: icon

Update of /cvs/extras/rpms/qscintilla/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29413/devel

Modified Files:
	.cvsignore sources 
Added Files:
	qscintilla-1.61-gpl-1.4-designer-incpath.patch qscintilla.spec 
Log Message:
auto-import qscintilla-1.6-3.fc4 on branch devel from qscintilla-1.6-3.fc4.src.rpm

qscintilla-1.61-gpl-1.4-designer-incpath.patch:

--- NEW FILE qscintilla-1.61-gpl-1.4-designer-incpath.patch ---
--- qscintilla-1.61-gpl-1.4/designer/designer.pro.designer-incpath	2004-09-16 15:09:24.000000000 -0500
+++ qscintilla-1.61-gpl-1.4/designer/designer.pro	2004-09-16 15:08:31.000000000 -0500
@@ -9,4 +9,6 @@
 
 SOURCES += qscintillaplugin.cpp
 
-LIBS += -lqscintilla
+LIBS += -L$(DESTDIR)../../lib -lqscintilla
+
+INCPATH = $(DESTDIR)../../include ../qt


--- NEW FILE qscintilla.spec ---
%define         scintilla_ver   1.65
%define         qtdir           %{_libdir}/qt-3.3

Name:	        qscintilla 
Version:        1.6
Release:        3%{?dist}
Summary:        A Scintilla port to Qt

License:        GPL
Group:          Development/Tools
Url:            http://www.riverbankcomputing.co.uk/qscintilla/
Source:         http://www.river-bank.demon.co.uk/download/QScintilla/qscintilla-%{scintilla_ver}-gpl-%{version}.tar.gz
Patch1:         qscintilla-1.61-gpl-1.4-designer-incpath.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  qt-devel >= 1:3.3, qt-devel < 1:3.4

%description
QScintilla is a port or Scintilla to the Qt GUI toolkit from Trolltech 
and runs on any operating system supported by Qt (eg. Windows, UNIX/Linux, 
MacOS/X).  Qt v3 or later is required.

This version of QScintilla is based on Scintilla v%{scintilla_ver}.


%package designer
Summary:        QScintilla designer plugin 
Group:          Development/Tools
Requires:       %{name} = %{version}-%{release}
Requires:       qt-designer >= 1:3.3, qt-designer < 1:3.4

%description designer
QScintillla designer plugin.


%package devel
Summary:        QScintilla Development Files
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}
Requires:       qt-devel >= 1:3.3, qt-devel < 1:3.4

%description devel
These are the development files for QScintilla, needed to build against
QScintilla.


%prep
%setup -q -n %{name}-%{scintilla_ver}-gpl-%{version}
%patch1 -p1 -b .designer-incpath
# fixups to support RPM_BUILD_ROOT/DESTDIR
sed -i "s/^DESTDIR = \$(QTDIR)/DESTDIR = \$(INSTALL_ROOT)\$(QTDIR)/" */*.pro
# fix permissions on doc files
find doc example -type f -exec chmod 0644 {} ';'


%build
pushd qt
qmake qscintilla
echo 'build: $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS) $(OBJCOMP)' >> Makefile
make %{?_smp_mflags} build
popd

pushd designer
qmake designer
echo 'build: $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS) $(OBJCOMP)' >> Makefile
make %{?_smp_mflags} build
popd


%install
rm -rf $RPM_BUILD_ROOT
pushd qt
make install INSTALL_ROOT=$RPM_BUILD_ROOT
popd
pushd designer
make INSTALL_ROOT=$RPM_BUILD_ROOT
popd


%clean
rm -rf $RPM_BUILD_ROOT


%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig


%files
%defattr(-,root,root,-)
%doc ChangeLog LICENSE NEWS README
%{qtdir}/lib/*.so.*
%{qtdir}/translations/*


%files designer
%defattr(-,root,root,-)
%{qtdir}/plugins/designer/*


%files devel
%defattr(-,root,root,-)
%doc doc/html doc/Scintilla example
%{qtdir}/lib/*.so
%{qtdir}/include/*


%changelog
* Wed Sep 14 2005 Konstantin Ryabitsev  - 1.6-3
- Fix permissions in prep, not in install.

* Tue Sep 13 2005 Konstantin Ryabitsev  - 1.6-2
- Fix permissions on doc files to be 0644.

* Sun Sep 11 2005 Konstantin Ryabitsev  1.6-1
- Update to 1.65-gpl-1.6
- Use the patch from Aurelien Bompard to build sanely in buildroot
- Include docs and examples for the -devel package

* Sat Aug 27 2005 Konstantin Ryabitsev  1.5.1-1
- Adapt for Fedora Extras
- Drop 0-Epoch
- Make specfile simpler
- Move .so to devel

* Mon Mar 09 2005 Rex Dieter 0:1.5.1-0.0.kde
- 1.5.1

* Thu Sep 16 2004 Rex Dieter  0:1.4-0.1.kde
- updated designer-incpath patch: don't require an already installed
  qscintilla-devel
- BuildConflicts: qscintilla-devel != %%version

* Thu Sep 16 2004 Rex Dieter  0:1.4-0.0.kde
- 1.4
- include designer plugin
- Prereq: %%qtdir

* Fri May 28 2004 Rex Dieter  0:1.3-0.fdr.0
- 1.3

* Thu Mar 11 2004 Rex Dieter  0:1.2-0.fdr.6
- dynamically determine version for qt dependancy.

* Wed Mar 10 2004 Rex Dieter  0:1.2-0.fdr.5
- (re)build against qt-3.3.1

* Wed Dec 03 2003 Rex Dieter  0:1.2-0.fdr.4
- remove extraneous macros
- (re)build against qt-3.2.3

* Mon Nov 10 2003 Rex Dieter  0:1.2-0.fdr.3
- (re)build against qt-3.2.2

* Wed Sep 17 2003 Rex Dieter  0:1.2-0.fdr.2
- use Epoch's in Requires

* Tue Aug 19 2003 Rex Dieter  0:1.2-0.fdr.1
- 1.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/qscintilla/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	15 Sep 2005 15:09:29 -0000	1.1
+++ .cvsignore	15 Sep 2005 15:10:44 -0000	1.2
@@ -0,0 +1 @@
+qscintilla-1.65-gpl-1.6.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/qscintilla/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	15 Sep 2005 15:09:29 -0000	1.1
+++ sources	15 Sep 2005 15:10:44 -0000	1.2
@@ -0,0 +1 @@
+8dbebef07cd2c934fbec3ee1bdfecfa3  qscintilla-1.65-gpl-1.6.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep 15 15:14:57 2005
From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon))
Date: Thu, 15 Sep 2005 11:14:57 -0400
Subject: owners owners.list,1.215,1.216
Message-ID: <200509151514.j8FFEvEQ029529@cvs-int.fedora.redhat.com>

Author: icon

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29510

Modified Files:
	owners.list 
Log Message:
Added qscintilla.



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.215
retrieving revision 1.216
diff -u -r1.215 -r1.216
--- owners.list	15 Sep 2005 10:19:13 -0000	1.215
+++ owners.list	15 Sep 2005 15:14:55 -0000	1.216
@@ -853,6 +853,7 @@
 Fedora Extras|qiv|Quick Image Viewer|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|qof|QOF provides a query engine library for C objects|toshio at tiki-lounge.com|extras-qa at fedoraproject.org|
 Fedora Extras|qps|Visual process status monitor|gajownik at gmail.com|extras-qa at fedoraproject.org|
+Fedora Extras|qscintilla|A Scintilla port to Qt|icon at linux.duke.edu|extras-qa at fedoraproject.org|
 Fedora Extras|qtparted|Partition Magic clone written in C++ using the Qt toolkit|steve at silug.org|extras-qa at fedoraproject.org|
 Fedora Extras|QuantLib| QuantLib is a free/open-source library for modeling, trading, and risk management in real-life|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|quilt|Patch management tool|jwboyer at jdub.homelinux.org|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Thu Sep 15 15:30:48 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Thu, 15 Sep 2005 11:30:48 -0400
Subject: owners owners.list,1.216,1.217
Message-ID: <200509151530.j8FFUmdo029605@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29586

Modified Files:
	owners.list 
Log Message:
New package: gtk+extra
Maintainer: Alain Portal 



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.216
retrieving revision 1.217
diff -u -r1.216 -r1.217
--- owners.list	15 Sep 2005 15:14:55 -0000	1.216
+++ owners.list	15 Sep 2005 15:30:45 -0000	1.217
@@ -283,6 +283,7 @@
 Fedora Extras|grisbi|Personal finances manager|gauret at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|gstreamer-python|Python bindings for GStreamer|thomas at apestaart.org|extras-qa at fedoraproject.org|
 Fedora Extras|gsview|PostScript and PDF previewer|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
+Fedora Extras|gtk+extra|A library of gtk+ widgets|aportal at univ-montp2.fr|extras-qa at fedoraproject.org|
 Fedora Extras|GtkAda|An Ada95 graphical toolkit based on Gtk+|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|gtkglarea2|An OpenGL GTK widget|anvil at livna.org|extras-qa at fedoraproject.org|
 Fedora Extras|gtkglext|OpenGL Extension to GTK|rc040203 at freenet.de|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Thu Sep 15 16:16:24 2005
From: fedora-extras-commits at redhat.com (José Abílio Oliveira Matos (jamatos))
Date: Thu, 15 Sep 2005 12:16:24 -0400
Subject: rpms/rpy - New directory
Message-ID: <200509151616.j8FGGOho031100@cvs-int.fedora.redhat.com>

Author: jamatos

Update of /cvs/extras/rpms/rpy
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31080/rpy

Log Message:
Directory /cvs/extras/rpms/rpy added to the repository




From fedora-extras-commits at redhat.com  Thu Sep 15 16:16:24 2005
From: fedora-extras-commits at redhat.com (José Abílio Oliveira Matos (jamatos))
Date: Thu, 15 Sep 2005 12:16:24 -0400
Subject: rpms/rpy/devel - New directory
Message-ID: <200509151616.j8FGGO4E031105@cvs-int.fedora.redhat.com>

Author: jamatos

Update of /cvs/extras/rpms/rpy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31080/rpy/devel

Log Message:
Directory /cvs/extras/rpms/rpy/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Sep 15 16:16:46 2005
From: fedora-extras-commits at redhat.com (José Abílio Oliveira Matos (jamatos))
Date: Thu, 15 Sep 2005 12:16:46 -0400
Subject: rpms/rpy Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200509151616.j8FGGkAP031154@cvs-int.fedora.redhat.com>

Author: jamatos

Update of /cvs/extras/rpms/rpy
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31125

Added Files:
	Makefile import.log 
Log Message:
Setup of module rpy


--- NEW FILE Makefile ---
# Top level Makefile for module rpy
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Thu Sep 15 16:16:46 2005
From: fedora-extras-commits at redhat.com (José Abílio Oliveira Matos (jamatos))
Date: Thu, 15 Sep 2005 12:16:46 -0400
Subject: rpms/rpy/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200509151616.j8FGGkhF031159@cvs-int.fedora.redhat.com>

Author: jamatos

Update of /cvs/extras/rpms/rpy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31125/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module rpy


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Thu Sep 15 16:17:25 2005
From: fedora-extras-commits at redhat.com (José Abílio Oliveira Matos (jamatos))
Date: Thu, 15 Sep 2005 12:17:25 -0400
Subject: rpms/rpy import.log,1.1,1.2
Message-ID: <200509151617.j8FGHtIW031235@cvs-int.fedora.redhat.com>

Author: jamatos

Update of /cvs/extras/rpms/rpy
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31193

Modified Files:
	import.log 
Log Message:
auto-import rpy-0.4.6-1 on branch devel from rpy-0.4.6-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/rpy/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	15 Sep 2005 16:16:44 -0000	1.1
+++ import.log	15 Sep 2005 16:17:23 -0000	1.2
@@ -0,0 +1 @@
+rpy-0_4_6-1:HEAD:rpy-0.4.6-1.src.rpm:1126801034



From fedora-extras-commits at redhat.com  Thu Sep 15 16:17:25 2005
From: fedora-extras-commits at redhat.com (José Abílio Oliveira Matos (jamatos))
Date: Thu, 15 Sep 2005 12:17:25 -0400
Subject: rpms/rpy/devel rpy.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1,
	1.2
Message-ID: <200509151618.j8FGHt4A031239@cvs-int.fedora.redhat.com>

Author: jamatos

Update of /cvs/extras/rpms/rpy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31193/devel

Modified Files:
	.cvsignore sources 
Added Files:
	rpy.spec 
Log Message:
auto-import rpy-0.4.6-1 on branch devel from rpy-0.4.6-1.src.rpm


--- NEW FILE rpy.spec ---
%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}

Name: 		rpy
Summary: 	Python interface to the R language
Version:	0.4.6
Release:	1%{?dist}
Url:		http://rpy.sourceforge.net
Source0:	http://dl.sf.net/%{name}/%{name}-%{version}.tar.gz
License:	GPL
Group:		Development/Libraries
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	R, python-numeric, python-devel
Requires:	R, python-numeric

%description
RPy provides a robust Python interface to the R
programming language.  It can manage all kinds of R objects and can
execute arbitrary R functions. All the errors from the R language are
converted to Python exceptions.

%prep
%setup


%build
env CFLAGS="$RPM_OPT_FLAGS" python setup.py build


%install
rm -rf $RPM_BUILD_ROOT
python setup.py install -O1 --skip-build --root=$RPM_BUILD_ROOT


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root)
%doc COPYING NEWS README examples/ doc/
%{python_sitearch}/*


%changelog
* Thu Sep 15 2005 Jose Matos  - 0.4.6-1
- Initial package for Fedora Extras


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rpy/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	15 Sep 2005 16:16:44 -0000	1.1
+++ .cvsignore	15 Sep 2005 16:17:23 -0000	1.2
@@ -0,0 +1 @@
+rpy-0.4.6.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rpy/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	15 Sep 2005 16:16:44 -0000	1.1
+++ sources	15 Sep 2005 16:17:23 -0000	1.2
@@ -0,0 +1 @@
+8b5411b275c66a5409a4a3aad711d860  rpy-0.4.6.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep 15 16:36:08 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu, 15 Sep 2005 12:36:08 -0400
Subject: rpms/perl-File-Tail/devel .cvsignore, 1.2, 1.3 perl-File-Tail.spec,
	1.6, 1.7 sources, 1.2, 1.3
Message-ID: <200509151636.j8FGa9W0031491@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/perl-File-Tail/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31468

Modified Files:
	.cvsignore perl-File-Tail.spec sources 
Log Message:
* Thu Sep 15 2005 Ville Skytt??  - 0.99.3-1
- 0.99.3.
- Specfile cleanups.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-File-Tail/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 05:00:29 -0000	1.2
+++ .cvsignore	15 Sep 2005 16:36:06 -0000	1.3
@@ -1 +1 @@
-File-Tail-0.98.tar.gz
+File-Tail-0.99.3.tar.gz


Index: perl-File-Tail.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-File-Tail/devel/perl-File-Tail.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- perl-File-Tail.spec	6 Apr 2005 22:12:44 -0000	1.6
+++ perl-File-Tail.spec	15 Sep 2005 16:36:06 -0000	1.7
@@ -1,15 +1,12 @@
-%{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)}
-
 Name:           perl-File-Tail
-Version:        0.98
-Release:        4
-
+Version:        0.99.3
+Release:        1%{?dist}
 Summary:        Perl extension for reading from continously updated files
 
 Group:          Development/Libraries
 License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/File-Tail/
-Source0:     http://www.cpan.org/authors/id/M/MG/MGRABNAR/File-Tail-0.98.tar.gz
+Source0:        http://www.cpan.org/authors/id/M/MG/MGRABNAR/File-Tail-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -25,22 +22,19 @@
 
 
 %build
-CFLAGS="$RPM_OPT_FLAGS" %{__perl} Makefile.PL INSTALLDIRS=vendor
-make %{?_smp_mflags} OPTIMIZE="$RPM_OPT_FLAGS"
+%{__perl} Makefile.PL INSTALLDIRS=vendor
+make %{?_smp_mflags}
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install \
-  PERL_INSTALL_ROOT=$RPM_BUILD_ROOT \
-  INSTALLARCHLIB=$RPM_BUILD_ROOT%{perl_archlib}
-find $RPM_BUILD_ROOT -type f -a \( -name perllocal.pod -o -name .packlist \
-  -o \( -name '*.bs' -a -empty \) \) -exec rm -f {} ';'
+make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
+find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'
 find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';'
 chmod -R u+w $RPM_BUILD_ROOT/*
 
 
-%check || :
+%check
 make test
 
 
@@ -51,13 +45,16 @@
 %files
 %defattr(-,root,root,-)
 %doc Changes README
-%{perl_vendorlib}/auto/File
-%{perl_vendorlib}/File
-%{_mandir}/man3/*.3*
+%{perl_vendorlib}/File/
+%{_mandir}/man3/File::Tail.3*
 
 
 %changelog
-* Fri Apr  7 2005 Michael Schwendt 
+* Thu Sep 15 2005 Ville Skytt??  - 0.99.3-1
+- 0.99.3.
+- Specfile cleanups.
+
+* Fri Apr  7 2005 Michael Schwendt  - 0.98-4
 - rebuilt
 
 * Sun Feb  8 2004 Ville Skytt??  - 0:0.98-0.fdr.3


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-File-Tail/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 05:00:29 -0000	1.2
+++ sources	15 Sep 2005 16:36:06 -0000	1.3
@@ -1 +1 @@
-d16d67052577a5cdcde03d5cd2dc5569  File-Tail-0.98.tar.gz
+ef0fb7bcb4181ba593f4a09940f61d1c  File-Tail-0.99.3.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep 15 18:13:22 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu, 15 Sep 2005 14:13:22 -0400
Subject: owners owners.list,1.217,1.218
Message-ID: <200509151813.j8FIDMQR002001@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1982

Modified Files:
	owners.list 
Log Message:
perl-File-Tail -> Jose


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.217
retrieving revision 1.218
diff -u -r1.217 -r1.218
--- owners.list	15 Sep 2005 15:30:45 -0000	1.217
+++ owners.list	15 Sep 2005 18:13:19 -0000	1.218
@@ -638,7 +638,7 @@
 Fedora Extras|perl-File-Find-Rule|Perl module implementing an alternative interface to File::Find|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-File-Remove|Convenience module for removing files and directories|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-File-Slurp|Efficient Reading/Writing of Complete Files|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
-Fedora Extras|perl-File-Tail|Perl extension for reading from continously updated files|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-File-Tail|Perl extension for reading from continously updated files|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Font-AFM|Perl interface to Adobe Font Metrics files|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-FreezeThaw|Convert Perl structures to strings and back|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-GDGraph3d|3D graph generation package for Perl|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Thu Sep 15 18:18:21 2005
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Thu, 15 Sep 2005 14:18:21 -0400
Subject: extras-buildsys/utils distro-rebuild.py,1.6,1.7
Message-ID: <200509151818.j8FIILFI002034@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys/utils
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2015

Modified Files:
	distro-rebuild.py 
Log Message:
Fix syntax error


Index: distro-rebuild.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/distro-rebuild.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- distro-rebuild.py	14 Sep 2005 16:53:29 -0000	1.6
+++ distro-rebuild.py	15 Sep 2005 18:18:19 -0000	1.7
@@ -169,7 +169,7 @@
 
     target = sys.argv[2]
     user = None
-    if len(sys.argv > 3)
+    if len(sys.argv) > 3:
         user = sys.argv[3]
 
     # Build up a list of all SRPMs in the specified directory



From fedora-extras-commits at redhat.com  Thu Sep 15 18:20:28 2005
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Thu, 15 Sep 2005 14:20:28 -0400
Subject: extras-buildsys/utils distro-rebuild.py,1.7,1.8
Message-ID: <200509151820.j8FIKS7k002077@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys/utils
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2058

Modified Files:
	distro-rebuild.py 
Log Message:
Fix another error


Index: distro-rebuild.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/distro-rebuild.py,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- distro-rebuild.py	15 Sep 2005 18:18:19 -0000	1.7
+++ distro-rebuild.py	15 Sep 2005 18:20:26 -0000	1.8
@@ -181,7 +181,7 @@
     names = files.keys()
     names.sort()
     for name in names:
-        f = names[name]
+        f = files[name]
         try:
             (rebuilt_srpm, temp_dir_path) = rebuild_srpm(name, f, user)
         except RebuildException, e:



From fedora-extras-commits at redhat.com  Thu Sep 15 18:43:47 2005
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Thu, 15 Sep 2005 14:43:47 -0400
Subject: rpms/grip/devel grip.desktop.patch,NONE,1.1 grip.spec,1.8,1.9
Message-ID: <200509151843.j8FIhleC002204@cvs-int.fedora.redhat.com>

Author: adrian

Update of /cvs/extras/rpms/grip/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2182

Modified Files:
	grip.spec 
Added Files:
	grip.desktop.patch 
Log Message:
* Wed Sep 14 2005 Adrian Reber  - 1:3.2.0-8
- added .desktop patch from Chong Kai Xiong (#167989)


grip.desktop.patch:

--- NEW FILE grip.desktop.patch ---
--- grip.desktop	2004-04-16 01:51:47.000000000 +0800
+++ grip.desktop	2005-09-13 10:54:09.000000000 +0800
@@ -1,21 +1,20 @@
 [Desktop Entry]
+Encoding=UTF-8
 Name=Grip
 Name[ca]=Grip
 Name[es]=Grip
+Name[de]=Grip
 Name[fi]=Grip
-Name[zh_CN]=Grip MP3 ?<88>???<9C>??<8B>??<8F>
-Name[zh_CN.GB2312]=Grip MP3 ?<88>???<9C>??<8B>??<8F>
-Name[zh_TW]=Grip MP3 ?????<9C>??<8B>??<8F>
-Name[zh_TW.Big5]=Grip MP3 ?????<9C>??<8B>??<8F>
+Name[zh_CN]=Grip
+Name[zh_TW]=Grip
 Comment=CD player/ripper
 Comment[ca]=Reproductor/extractor de CD d'audio
 Comment[es]=Reproductor/extractor de CDs de audio
+Comment[de]=Audio-CDs rippen und OGGs kodieren
 Comment[fr]=Lecteur/extracteur de CD audio
 Comment[fi]=CD-audion soitto- ja kopiointiohjelma
-Comment[zh_CN]=Grip ????<82>?????<9D>??<88>???<9C> MP3 ?<96><87>???
-Comment[zh_CN.GB2312]=Grip ????<82>?????<9D>??<88>???<9C> MP3 ?<96><87>???
-Comment[zh_TW]=Grip ??<93>?<82>???<95>??<86>?????<9C> MP3 ??<94>
-Comment[zh_TW.Big5]=Grip ??<93>?<82>???<95>??<86>?????<9C> MP3 ??<94>
+Comment[zh_CN]=CD ??????/?????????
+Comment[zh_TW]=CD ??????/????????????
 Exec=grip
 Icon=gripicon.png
 Type=Application


Index: grip.spec
===================================================================
RCS file: /cvs/extras/rpms/grip/devel/grip.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- grip.spec	23 Aug 2005 15:13:07 -0000	1.8
+++ grip.spec	15 Sep 2005 18:43:45 -0000	1.9
@@ -1,7 +1,7 @@
 Summary: Front-end for CD rippers and Ogg Vorbis encoders
 Name: grip
 Version: 3.2.0
-Release: 7%{?dist}
+Release: 8%{?dist}
 Epoch: 1
 License: GPL
 Group: Applications/Multimedia
@@ -10,6 +10,7 @@
 Patch1: grip-3.2.0-default.patch
 Patch2: grip-cell-renderer.patch
 Patch3: grip-3.2.0-id3.c.patch
+Patch4: grip.desktop.patch
 URL: http://www.nostatic.org/grip/
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: vorbis-tools
@@ -29,6 +30,7 @@
 %patch1 -p1 -b .rh-default-encoder
 %patch2 -p1 -b .cell-renderer
 %patch3 -p1 -b .id3
+%patch4
 
 %build
 %configure
@@ -44,14 +46,7 @@
 
 cat >> %{buildroot}%{_datadir}/applications/grip.desktop << EOF
 StartupWMClass=Grip
-Encoding=UTF-8
 EOF
-iconv -f ISO-8859-1 -t UTF-8 \
-	$RPM_BUILD_ROOT%{_datadir}/applications/grip.desktop > \
-	$RPM_BUILD_ROOT%{_datadir}/applications/grip.desktop.new
-
-mv	$RPM_BUILD_ROOT%{_datadir}/applications/grip.desktop.new \
-	$RPM_BUILD_ROOT%{_datadir}/applications/grip.desktop
 
 desktop-file-install \
 	--vendor=fedora \
@@ -77,6 +72,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Wed Sep 14 2005 Adrian Reber  - 1:3.2.0-8
+- added .desktop patch from Chong Kai Xiong (#167989)
+
 * Sat Aug 20 2005 Adrian Reber  - 1:3.2.0-7
 - rebuilt
 



From fedora-extras-commits at redhat.com  Thu Sep 15 19:37:58 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu, 15 Sep 2005 15:37:58 -0400
Subject: rpms/mathml-fonts/devel .cvsignore, 1.2, 1.3 find_symbol_font.sh,
	1.2, 1.3 mathml-fonts.spec, 1.8, 1.9 sources, 1.2, 1.3
Message-ID: <200509151937.j8FJbwQg003793@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/mathml-fonts/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3728/devel

Modified Files:
	.cvsignore find_symbol_font.sh mathml-fonts.spec sources 
Log Message:
* Thu Sep 15 2005 Rex Dieter  1.0-18
- replace latex-xft-fonts with bakoma4lyx
- remove non-distributable Math'ca fonts (#168405)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mathml-fonts/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 04:51:17 -0000	1.2
+++ .cvsignore	15 Sep 2005 19:37:56 -0000	1.3
@@ -1,3 +1,3 @@
 cmbx10.ttf
-latex-xft-fonts-0.1.tar.gz
+BaKoMa4LyX.zip
 mtextra.ttf


Index: find_symbol_font.sh
===================================================================
RCS file: /cvs/extras/rpms/mathml-fonts/devel/find_symbol_font.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- find_symbol_font.sh	5 Aug 2005 16:06:29 -0000	1.2
+++ find_symbol_font.sh	15 Sep 2005 19:37:56 -0000	1.3
@@ -1,6 +1,10 @@
 #!/bin/bash
 # $Id$
 
+if [ -f /etc/sysconfig/mathml-fonts ]; then
+ source /etc/sysconfig/mathml-fonts
+fi
+
 fontdir=${MATHML_FONTS_DIR:-/usr/share/fonts/mathml}
 
 while true


Index: mathml-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/mathml-fonts/devel/mathml-fonts.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- mathml-fonts.spec	5 Aug 2005 16:42:46 -0000	1.8
+++ mathml-fonts.spec	15 Sep 2005 19:37:56 -0000	1.9
@@ -5,8 +5,8 @@
 
 Summary: Mathematical symbol fonts
 Name:    mathml-fonts
-Version: 1.0
-Release: 17%{?dist}
+Version: 1.0 
+Release: 18%{?dist}
 
 URL:     http://www.mozilla.org/projects/mathml/fonts/
 License: Distributable
@@ -21,16 +21,17 @@
 %define find_symbol_font %{find_symbol_dir}/find_symbol_font.sh
 
 ## Mathematica fonts
-Source10: http://support.wolfram.com/mathematica/systems/windows/general/MathFonts_TrueType.exe
+#  License: http://support.wolfram.com/mathematica/systems/windows/general/latestfonts.html (non-distributable)
+%{?_with_mathematica:Source10: http://support.wolfram.com/mathematica/systems/windows/general/MathFonts_TrueType.exe}
 ## TeX fonts
 #Source20: ftp://tug.ctan.org/tex-archive/fonts/cm/ps-type1/bakoma/ttf.tar.gz
 Source20: ftp://tug.ctan.org/tex-archive/fonts/cm/ps-type1/bakoma/ttf/cmbx10.ttf
 # Reference: http://wiki.lyx.org/LyX/Troubleshooting 
-Source21: http://movementarian.org/latex-xft-fonts-0.1.tar.gz 
+Source21: ftp://ftp.lyx.org/pub/lyx/contrib/BaKoMa4LyX.zip
 ## Design Science fonts
-#  License: http://www.dessci.com/en/support/eula/mtextralic.htm
+#  License: http://www.dessci.com/en/support/eula/fonts/mtextralic.htm
 #  URL: http://www.dessci.com/en/dl/fonts/
-# extracted from MTW_Truetype.exe
+# extracted from MathTypeTrueTypeFonts.exe (rename from http://www.dessci.com/en/dl/MathTypeTrueTypeFonts.asp)
 # (couldn't figure out how extract at build-time -- Rex)
 Source30: mtextra.ttf
 
@@ -40,11 +41,14 @@
 # in %%post,%%postun,%%triggers 
 Prereq: fontconfig
 
-Provides: latex-xft-fonts = 0:0.1
+# Provide lyx upstream contrib rpms
+Provides: latex-xft-fonts = 0.1
+Provides: latex-bakoma4lyx-fonts = 1
 
 %description
 This package contains fonts required to display mathematical
 symbols.  Applications supported include:
+
 * mozilla (and netscape >= 7) to display MathML
 * lyx
 * kformula (koffice)
@@ -54,11 +58,12 @@
 %setup -T -c -n %{name}
 
 ## Math'ca
-unzip %{SOURCE10}
+%{?_with_mathematica:unzip %{SOURCE10}}
 
 ## TeX fonts
 #setup -T -D -n %{name} -a 20
 cp -a %{SOURCE20} .
+
 %setup -T -D -n %{name} -a 21
 
 ## dessci
@@ -74,11 +79,9 @@
 
 install -d $RPM_BUILD_ROOT%{fontdir}
 
-# Ignore warnings about duplicate files/fonts, they're indentical anyway.
 install -p -m644 \
-  math{1,2,4}___.ttf \
-  latex-xft-fonts*/*.ttf \
-  cmbx10.ttf mtextra.ttf \
+  %{?_with_mathematica:math{1,2,4}___.ttf} \
+  *10.ttf mtextra.ttf \
   $RPM_BUILD_ROOT%{fontdir}/
 
 # find_symbol_font
@@ -108,6 +111,7 @@
 
 %files
 %defattr(-,root,root)
+%doc Readme.txt
 %dir %{find_symbol_dir}
 %{find_symbol_font}
 %dir %{fontdir}
@@ -122,8 +126,12 @@
 
 
 %changelog
+* Thu Sep 15 2005 Rex Dieter  1.0-18
+- replace latex-xft-fonts with bakoma4lyx
+- remove non-distributable Math'ca fonts (#168405)
+
 * Wed Aug  3 2005 Rex Dieter  1.0-17
-- update for acroread7 (and SY_____.PFB) (bug #133709)
+- update for acroread7 (and SY_____.PFB) (#133709)
 - include/use find_symbol_font.sh helper script
 - readd %%postun
 - update latex-xft-fonts URL


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mathml-fonts/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 04:51:17 -0000	1.2
+++ sources	15 Sep 2005 19:37:56 -0000	1.3
@@ -1,3 +1,3 @@
 19f80def73f72679e916fa8143f9be02  cmbx10.ttf
-0f3275e403be5fdbd14117dd8a26675f  latex-xft-fonts-0.1.tar.gz
+46d1caf4e2bf294d641cf1c37be19082  BaKoMa4LyX.zip
 fe5c714162bf1b9c936b2bc5e66da03e  mtextra.ttf



From fedora-extras-commits at redhat.com  Thu Sep 15 19:37:52 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu, 15 Sep 2005 15:37:52 -0400
Subject: rpms/mathml-fonts/FC-3 .cvsignore, 1.2, 1.3 find_symbol_font.sh, 1.2,
	1.3 mathml-fonts.spec, 1.4, 1.5 sources, 1.2, 1.3
Message-ID: <200509151938.j8FJcMT0003799@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/mathml-fonts/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3728/FC-3

Modified Files:
	.cvsignore find_symbol_font.sh mathml-fonts.spec sources 
Log Message:
* Thu Sep 15 2005 Rex Dieter  1.0-18
- replace latex-xft-fonts with bakoma4lyx
- remove non-distributable Math'ca fonts (#168405)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mathml-fonts/FC-3/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 04:51:17 -0000	1.2
+++ .cvsignore	15 Sep 2005 19:37:50 -0000	1.3
@@ -1,3 +1,3 @@
 cmbx10.ttf
-latex-xft-fonts-0.1.tar.gz
+BaKoMa4LyX.zip
 mtextra.ttf


Index: find_symbol_font.sh
===================================================================
RCS file: /cvs/extras/rpms/mathml-fonts/FC-3/find_symbol_font.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- find_symbol_font.sh	5 Aug 2005 16:44:53 -0000	1.2
+++ find_symbol_font.sh	15 Sep 2005 19:37:50 -0000	1.3
@@ -1,6 +1,10 @@
 #!/bin/bash
 # $Id$
 
+if [ -f /etc/sysconfig/mathml-fonts ]; then
+ source /etc/sysconfig/mathml-fonts
+fi
+
 fontdir=${MATHML_FONTS_DIR:-/usr/share/fonts/mathml}
 
 while true


Index: mathml-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/mathml-fonts/FC-3/mathml-fonts.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- mathml-fonts.spec	5 Aug 2005 16:44:53 -0000	1.4
+++ mathml-fonts.spec	15 Sep 2005 19:37:50 -0000	1.5
@@ -5,8 +5,8 @@
 
 Summary: Mathematical symbol fonts
 Name:    mathml-fonts
-Version: 1.0
-Release: 17%{?dist}
+Version: 1.0 
+Release: 18%{?dist}
 
 URL:     http://www.mozilla.org/projects/mathml/fonts/
 License: Distributable
@@ -21,16 +21,17 @@
 %define find_symbol_font %{find_symbol_dir}/find_symbol_font.sh
 
 ## Mathematica fonts
-Source10: http://support.wolfram.com/mathematica/systems/windows/general/MathFonts_TrueType.exe
+#  License: http://support.wolfram.com/mathematica/systems/windows/general/latestfonts.html (non-distributable)
+%{?_with_mathematica:Source10: http://support.wolfram.com/mathematica/systems/windows/general/MathFonts_TrueType.exe}
 ## TeX fonts
 #Source20: ftp://tug.ctan.org/tex-archive/fonts/cm/ps-type1/bakoma/ttf.tar.gz
 Source20: ftp://tug.ctan.org/tex-archive/fonts/cm/ps-type1/bakoma/ttf/cmbx10.ttf
 # Reference: http://wiki.lyx.org/LyX/Troubleshooting 
-Source21: http://movementarian.org/latex-xft-fonts-0.1.tar.gz 
+Source21: ftp://ftp.lyx.org/pub/lyx/contrib/BaKoMa4LyX.zip
 ## Design Science fonts
-#  License: http://www.dessci.com/en/support/eula/mtextralic.htm
+#  License: http://www.dessci.com/en/support/eula/fonts/mtextralic.htm
 #  URL: http://www.dessci.com/en/dl/fonts/
-# extracted from MTW_Truetype.exe
+# extracted from MathTypeTrueTypeFonts.exe (rename from http://www.dessci.com/en/dl/MathTypeTrueTypeFonts.asp)
 # (couldn't figure out how extract at build-time -- Rex)
 Source30: mtextra.ttf
 
@@ -40,11 +41,14 @@
 # in %%post,%%postun,%%triggers 
 Prereq: fontconfig
 
-Provides: latex-xft-fonts = 0:0.1
+# Provide lyx upstream contrib rpms
+Provides: latex-xft-fonts = 0.1
+Provides: latex-bakoma4lyx-fonts = 1
 
 %description
 This package contains fonts required to display mathematical
 symbols.  Applications supported include:
+
 * mozilla (and netscape >= 7) to display MathML
 * lyx
 * kformula (koffice)
@@ -54,11 +58,12 @@
 %setup -T -c -n %{name}
 
 ## Math'ca
-unzip %{SOURCE10}
+%{?_with_mathematica:unzip %{SOURCE10}}
 
 ## TeX fonts
 #setup -T -D -n %{name} -a 20
 cp -a %{SOURCE20} .
+
 %setup -T -D -n %{name} -a 21
 
 ## dessci
@@ -74,11 +79,9 @@
 
 install -d $RPM_BUILD_ROOT%{fontdir}
 
-# Ignore warnings about duplicate files/fonts, they're indentical anyway.
 install -p -m644 \
-  math{1,2,4}___.ttf \
-  latex-xft-fonts*/*.ttf \
-  cmbx10.ttf mtextra.ttf \
+  %{?_with_mathematica:math{1,2,4}___.ttf} \
+  *10.ttf mtextra.ttf \
   $RPM_BUILD_ROOT%{fontdir}/
 
 # find_symbol_font
@@ -108,6 +111,7 @@
 
 %files
 %defattr(-,root,root)
+%doc Readme.txt
 %dir %{find_symbol_dir}
 %{find_symbol_font}
 %dir %{fontdir}
@@ -122,8 +126,12 @@
 
 
 %changelog
+* Thu Sep 15 2005 Rex Dieter  1.0-18
+- replace latex-xft-fonts with bakoma4lyx
+- remove non-distributable Math'ca fonts (#168405)
+
 * Wed Aug  3 2005 Rex Dieter  1.0-17
-- update for acroread7 (and SY_____.PFB) (bug #133709)
+- update for acroread7 (and SY_____.PFB) (#133709)
 - include/use find_symbol_font.sh helper script
 - readd %%postun
 - update latex-xft-fonts URL


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mathml-fonts/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 04:51:17 -0000	1.2
+++ sources	15 Sep 2005 19:37:50 -0000	1.3
@@ -1,3 +1,3 @@
 19f80def73f72679e916fa8143f9be02  cmbx10.ttf
-0f3275e403be5fdbd14117dd8a26675f  latex-xft-fonts-0.1.tar.gz
+46d1caf4e2bf294d641cf1c37be19082  BaKoMa4LyX.zip
 fe5c714162bf1b9c936b2bc5e66da03e  mtextra.ttf



From fedora-extras-commits at redhat.com  Thu Sep 15 19:37:52 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu, 15 Sep 2005 15:37:52 -0400
Subject: rpms/mathml-fonts/FC-4 .cvsignore, 1.2, 1.3 find_symbol_font.sh, 1.2,
	1.3 mathml-fonts.spec, 1.8, 1.9 sources, 1.2, 1.3
Message-ID: <200509151938.j8FJcMc2003805@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/mathml-fonts/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3728/FC-4

Modified Files:
	.cvsignore find_symbol_font.sh mathml-fonts.spec sources 
Log Message:
* Thu Sep 15 2005 Rex Dieter  1.0-18
- replace latex-xft-fonts with bakoma4lyx
- remove non-distributable Math'ca fonts (#168405)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mathml-fonts/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 04:51:17 -0000	1.2
+++ .cvsignore	15 Sep 2005 19:37:50 -0000	1.3
@@ -1,3 +1,3 @@
 cmbx10.ttf
-latex-xft-fonts-0.1.tar.gz
+BaKoMa4LyX.zip
 mtextra.ttf


Index: find_symbol_font.sh
===================================================================
RCS file: /cvs/extras/rpms/mathml-fonts/FC-4/find_symbol_font.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- find_symbol_font.sh	5 Aug 2005 16:41:14 -0000	1.2
+++ find_symbol_font.sh	15 Sep 2005 19:37:50 -0000	1.3
@@ -1,6 +1,10 @@
 #!/bin/bash
 # $Id$
 
+if [ -f /etc/sysconfig/mathml-fonts ]; then
+ source /etc/sysconfig/mathml-fonts
+fi
+
 fontdir=${MATHML_FONTS_DIR:-/usr/share/fonts/mathml}
 
 while true


Index: mathml-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/mathml-fonts/FC-4/mathml-fonts.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- mathml-fonts.spec	5 Aug 2005 16:44:16 -0000	1.8
+++ mathml-fonts.spec	15 Sep 2005 19:37:50 -0000	1.9
@@ -5,8 +5,8 @@
 
 Summary: Mathematical symbol fonts
 Name:    mathml-fonts
-Version: 1.0
-Release: 17%{?dist}
+Version: 1.0 
+Release: 18%{?dist}
 
 URL:     http://www.mozilla.org/projects/mathml/fonts/
 License: Distributable
@@ -21,16 +21,17 @@
 %define find_symbol_font %{find_symbol_dir}/find_symbol_font.sh
 
 ## Mathematica fonts
-Source10: http://support.wolfram.com/mathematica/systems/windows/general/MathFonts_TrueType.exe
+#  License: http://support.wolfram.com/mathematica/systems/windows/general/latestfonts.html (non-distributable)
+%{?_with_mathematica:Source10: http://support.wolfram.com/mathematica/systems/windows/general/MathFonts_TrueType.exe}
 ## TeX fonts
 #Source20: ftp://tug.ctan.org/tex-archive/fonts/cm/ps-type1/bakoma/ttf.tar.gz
 Source20: ftp://tug.ctan.org/tex-archive/fonts/cm/ps-type1/bakoma/ttf/cmbx10.ttf
 # Reference: http://wiki.lyx.org/LyX/Troubleshooting 
-Source21: http://movementarian.org/latex-xft-fonts-0.1.tar.gz 
+Source21: ftp://ftp.lyx.org/pub/lyx/contrib/BaKoMa4LyX.zip
 ## Design Science fonts
-#  License: http://www.dessci.com/en/support/eula/mtextralic.htm
+#  License: http://www.dessci.com/en/support/eula/fonts/mtextralic.htm
 #  URL: http://www.dessci.com/en/dl/fonts/
-# extracted from MTW_Truetype.exe
+# extracted from MathTypeTrueTypeFonts.exe (rename from http://www.dessci.com/en/dl/MathTypeTrueTypeFonts.asp)
 # (couldn't figure out how extract at build-time -- Rex)
 Source30: mtextra.ttf
 
@@ -40,11 +41,14 @@
 # in %%post,%%postun,%%triggers 
 Prereq: fontconfig
 
-Provides: latex-xft-fonts = 0:0.1
+# Provide lyx upstream contrib rpms
+Provides: latex-xft-fonts = 0.1
+Provides: latex-bakoma4lyx-fonts = 1
 
 %description
 This package contains fonts required to display mathematical
 symbols.  Applications supported include:
+
 * mozilla (and netscape >= 7) to display MathML
 * lyx
 * kformula (koffice)
@@ -54,11 +58,12 @@
 %setup -T -c -n %{name}
 
 ## Math'ca
-unzip %{SOURCE10}
+%{?_with_mathematica:unzip %{SOURCE10}}
 
 ## TeX fonts
 #setup -T -D -n %{name} -a 20
 cp -a %{SOURCE20} .
+
 %setup -T -D -n %{name} -a 21
 
 ## dessci
@@ -74,11 +79,9 @@
 
 install -d $RPM_BUILD_ROOT%{fontdir}
 
-# Ignore warnings about duplicate files/fonts, they're indentical anyway.
 install -p -m644 \
-  math{1,2,4}___.ttf \
-  latex-xft-fonts*/*.ttf \
-  cmbx10.ttf mtextra.ttf \
+  %{?_with_mathematica:math{1,2,4}___.ttf} \
+  *10.ttf mtextra.ttf \
   $RPM_BUILD_ROOT%{fontdir}/
 
 # find_symbol_font
@@ -108,6 +111,7 @@
 
 %files
 %defattr(-,root,root)
+%doc Readme.txt
 %dir %{find_symbol_dir}
 %{find_symbol_font}
 %dir %{fontdir}
@@ -122,8 +126,12 @@
 
 
 %changelog
+* Thu Sep 15 2005 Rex Dieter  1.0-18
+- replace latex-xft-fonts with bakoma4lyx
+- remove non-distributable Math'ca fonts (#168405)
+
 * Wed Aug  3 2005 Rex Dieter  1.0-17
-- update for acroread7 (and SY_____.PFB) (bug #133709)
+- update for acroread7 (and SY_____.PFB) (#133709)
 - include/use find_symbol_font.sh helper script
 - readd %%postun
 - update latex-xft-fonts URL


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mathml-fonts/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 04:51:17 -0000	1.2
+++ sources	15 Sep 2005 19:37:50 -0000	1.3
@@ -1,3 +1,3 @@
 19f80def73f72679e916fa8143f9be02  cmbx10.ttf
-0f3275e403be5fdbd14117dd8a26675f  latex-xft-fonts-0.1.tar.gz
+46d1caf4e2bf294d641cf1c37be19082  BaKoMa4LyX.zip
 fe5c714162bf1b9c936b2bc5e66da03e  mtextra.ttf



From fedora-extras-commits at redhat.com  Thu Sep 15 19:45:02 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu, 15 Sep 2005 15:45:02 -0400
Subject: rpms/mathml-fonts/devel MathFonts_TrueType.exe,1.1,NONE
Message-ID: <200509151945.j8FJj2Xd003983@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/mathml-fonts/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3928/devel

Removed Files:
	MathFonts_TrueType.exe 
Log Message:



--- MathFonts_TrueType.exe DELETED ---



From fedora-extras-commits at redhat.com  Thu Sep 15 19:45:00 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu, 15 Sep 2005 15:45:00 -0400
Subject: rpms/mathml-fonts/FC-3 MathFonts_TrueType.exe,1.1,NONE
Message-ID: <200509151945.j8FJj0uN003970@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/mathml-fonts/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3928/FC-3

Removed Files:
	MathFonts_TrueType.exe 
Log Message:



--- MathFonts_TrueType.exe DELETED ---



From fedora-extras-commits at redhat.com  Thu Sep 15 19:45:01 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu, 15 Sep 2005 15:45:01 -0400
Subject: rpms/mathml-fonts/FC-4 MathFonts_TrueType.exe,1.1,NONE
Message-ID: <200509151945.j8FJj1ib003976@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/mathml-fonts/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3928/FC-4

Removed Files:
	MathFonts_TrueType.exe 
Log Message:



--- MathFonts_TrueType.exe DELETED ---



From fedora-extras-commits at redhat.com  Thu Sep 15 20:10:28 2005
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Thu, 15 Sep 2005 16:10:28 -0400
Subject: rpms/grip/FC-4 grip.desktop.patch,NONE,1.1 grip.spec,1.7,1.8
Message-ID: <200509152010.j8FKASw5005436@cvs-int.fedora.redhat.com>

Author: adrian

Update of /cvs/extras/rpms/grip/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5413

Modified Files:
	grip.spec 
Added Files:
	grip.desktop.patch 
Log Message:
* Wed Sep 14 2005 Adrian Reber  - 1:3.2.0-8
- added .desktop patch from Chong Kai Xiong (#167989)


grip.desktop.patch:

--- NEW FILE grip.desktop.patch ---
--- grip.desktop	2004-04-16 01:51:47.000000000 +0800
+++ grip.desktop	2005-09-13 10:54:09.000000000 +0800
@@ -1,21 +1,20 @@
 [Desktop Entry]
+Encoding=UTF-8
 Name=Grip
 Name[ca]=Grip
 Name[es]=Grip
+Name[de]=Grip
 Name[fi]=Grip
-Name[zh_CN]=Grip MP3 ?<88>???<9C>??<8B>??<8F>
-Name[zh_CN.GB2312]=Grip MP3 ?<88>???<9C>??<8B>??<8F>
-Name[zh_TW]=Grip MP3 ?????<9C>??<8B>??<8F>
-Name[zh_TW.Big5]=Grip MP3 ?????<9C>??<8B>??<8F>
+Name[zh_CN]=Grip
+Name[zh_TW]=Grip
 Comment=CD player/ripper
 Comment[ca]=Reproductor/extractor de CD d'audio
 Comment[es]=Reproductor/extractor de CDs de audio
+Comment[de]=Audio-CDs rippen und OGGs kodieren
 Comment[fr]=Lecteur/extracteur de CD audio
 Comment[fi]=CD-audion soitto- ja kopiointiohjelma
-Comment[zh_CN]=Grip ????<82>?????<9D>??<88>???<9C> MP3 ?<96><87>???
-Comment[zh_CN.GB2312]=Grip ????<82>?????<9D>??<88>???<9C> MP3 ?<96><87>???
-Comment[zh_TW]=Grip ??<93>?<82>???<95>??<86>?????<9C> MP3 ??<94>
-Comment[zh_TW.Big5]=Grip ??<93>?<82>???<95>??<86>?????<9C> MP3 ??<94>
+Comment[zh_CN]=CD ??????/?????????
+Comment[zh_TW]=CD ??????/????????????
 Exec=grip
 Icon=gripicon.png
 Type=Application


Index: grip.spec
===================================================================
RCS file: /cvs/extras/rpms/grip/FC-4/grip.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- grip.spec	23 Aug 2005 15:13:07 -0000	1.7
+++ grip.spec	15 Sep 2005 20:10:26 -0000	1.8
@@ -1,7 +1,7 @@
 Summary: Front-end for CD rippers and Ogg Vorbis encoders
 Name: grip
 Version: 3.2.0
-Release: 6%{?dist}
+Release: 8%{?dist}
 Epoch: 1
 License: GPL
 Group: Applications/Multimedia
@@ -10,6 +10,7 @@
 Patch1: grip-3.2.0-default.patch
 Patch2: grip-cell-renderer.patch
 Patch3: grip-3.2.0-id3.c.patch
+Patch4: grip.desktop.patch
 URL: http://www.nostatic.org/grip/
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: vorbis-tools
@@ -29,6 +30,7 @@
 %patch1 -p1 -b .rh-default-encoder
 %patch2 -p1 -b .cell-renderer
 %patch3 -p1 -b .id3
+%patch4
 
 %build
 %configure
@@ -44,14 +46,7 @@
 
 cat >> %{buildroot}%{_datadir}/applications/grip.desktop << EOF
 StartupWMClass=Grip
-Encoding=UTF-8
 EOF
-iconv -f ISO-8859-1 -t UTF-8 \
-	$RPM_BUILD_ROOT%{_datadir}/applications/grip.desktop > \
-	$RPM_BUILD_ROOT%{_datadir}/applications/grip.desktop.new
-
-mv	$RPM_BUILD_ROOT%{_datadir}/applications/grip.desktop.new \
-	$RPM_BUILD_ROOT%{_datadir}/applications/grip.desktop
 
 desktop-file-install \
 	--vendor=fedora \
@@ -77,6 +72,12 @@
 %{_mandir}/man1/*
 
 %changelog
+* Wed Sep 14 2005 Adrian Reber  - 1:3.2.0-8
+- added .desktop patch from Chong Kai Xiong (#167989)
+
+* Sat Aug 20 2005 Adrian Reber  - 1:3.2.0-7
+- rebuilt
+
 * Thu Aug 04 2005 Adrian Reber  - 1:3.2.0-6
 - added patch for buffer overflow in id3.c (#160671)
 



From fedora-extras-commits at redhat.com  Thu Sep 15 23:33:49 2005
From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters))
Date: Thu, 15 Sep 2005 19:33:49 -0400
Subject: rpms/gnomesword import.log,1.4,1.5
Message-ID: <200509152333.j8FNXn5f010159@cvs-int.fedora.redhat.com>

Author: mpeters

Update of /cvs/extras/rpms/gnomesword
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10125

Modified Files:
	import.log 
Log Message:
auto-import gnomesword-2.1.2-2.3.fc4 on branch FC-3 from gnomesword-2.1.2-2.3.fc4.src.rpm
patch for x86_64


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/gnomesword/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- import.log	15 Sep 2005 11:39:59 -0000	1.4
+++ import.log	15 Sep 2005 23:33:47 -0000	1.5
@@ -1,3 +1,4 @@
 gnomesword-2_1_2-1:HEAD:gnomesword-2.1.2-1.src.rpm:1118145807
 gnomesword-2_1_2-2_2:FC-4:gnomesword-2.1.2-2.2.src.rpm:1126783889
 gnomesword-2_1_2-2_2:HEAD:gnomesword-2.1.2-2.2.src.rpm:1126784329
+gnomesword-2_1_2-2_3_fc4:FC-3:gnomesword-2.1.2-2.3.fc4.src.rpm:1126827156



From fedora-extras-commits at redhat.com  Thu Sep 15 23:33:50 2005
From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters))
Date: Thu, 15 Sep 2005 19:33:50 -0400
Subject: rpms/gnomesword/FC-3 gnomesword-2.1.2-gettext64.patch, NONE,
	1.1 gnomesword.spec, 1.4, 1.5
Message-ID: <200509152333.j8FNXoEg010167@cvs-int.fedora.redhat.com>

Author: mpeters

Update of /cvs/extras/rpms/gnomesword/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10125/FC-3

Modified Files:
	gnomesword.spec 
Added Files:
	gnomesword-2.1.2-gettext64.patch 
Log Message:
auto-import gnomesword-2.1.2-2.3.fc4 on branch FC-3 from gnomesword-2.1.2-2.3.fc4.src.rpm
patch for x86_64

gnomesword-2.1.2-gettext64.patch:

--- NEW FILE gnomesword-2.1.2-gettext64.patch ---
--- gnomesword-2.1.2/aclocal.m4.BAD	2005-09-04 15:56:31.000000000 -0500
+++ gnomesword-2.1.2/aclocal.m4	2005-09-04 15:56:47.000000000 -0500
@@ -144,7 +144,7 @@
         	[AC_TRY_LINK([
 #include 
 ],
-	          [return (int) dgettext ("","")],
+	          [return dgettext ("","") != 0],
 		  gt_cv_func_dgettext_libc=yes,
 	          gt_cv_func_dgettext_libc=no)
         	])
--- gnomesword-2.1.2/configure.BAD	2005-09-04 15:57:32.000000000 -0500
+++ gnomesword-2.1.2/configure	2005-09-04 16:00:29.000000000 -0500
@@ -22807,7 +22807,7 @@
 int
 main ()
 {
-return (int) dgettext ("","")
+return dgettext ("","") != 0
   ;
   return 0;
 }


Index: gnomesword.spec
===================================================================
RCS file: /cvs/extras/rpms/gnomesword/FC-3/gnomesword.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gnomesword.spec	13 Jun 2005 09:55:12 -0000	1.4
+++ gnomesword.spec	15 Sep 2005 23:33:47 -0000	1.5
@@ -1,12 +1,13 @@
 Name:           gnomesword           
 Version:        2.1.2
-Release:        2.2%{?dist}
+Release:        2.3%{?dist}
 Summary:        GNOME-based Bible research tool
 
 Group:          Applications/Text
 License:        GPL
 URL:            http://gnomesword.sourceforge.net/
 Source0:        http://easynews.dl.sourceforge.net/sourceforge/gnomesword/gnomesword-%{version}.tar.gz
+Patch0:         gnomesword-2.1.2-gettext64.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  sed >= 3.95
@@ -18,6 +19,8 @@
 BuildRequires:  curl-devel
 BuildRequires:  libgnomeui-devel
 BuildRequires:  scrollkeeper
+# currently broken on x86_64
+# ExcludeArch:    x86_64
 # for x86_64
 %ifarch x86_64
 BuildRequires:  libtool automake autoconf
@@ -35,7 +38,10 @@
 and other texts using your computer.
 
 %prep
-%setup -q 
+%setup -q
+%ifarch x86_64
+%patch0 -p1 -b .gettext64 
+%endif
 %{__sed} -i 's?\r??' doc/help/C/legal.xml
 %{__sed} -i 's?\r??' doc/help/fr/legal.xml
 
@@ -84,8 +90,10 @@
 
 
 %changelog
-* Mon Jun 13 2005 Michael A. Peters  - 2.1.2-2.2
-- Attempting fix for x86_64 base on lock-keys-applet fix
+* Thu Sep 15 2005 Michael A. Peters  - 2.1.2-2.3
+- trying patch suggested by Tom 'spot' Callaway to fix x86_64 bug
+- 160186
+- libtool, aclocal, autoheader, automake, autoconf on x86_64
 
 * Sun Jun 12 2005 Michael A. Peters  - 2.1.2-2.1
 - Exclude x86_64 for now



From fedora-extras-commits at redhat.com  Fri Sep 16 02:03:12 2005
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Thu, 15 Sep 2005 22:03:12 -0400
Subject: rpms/perl-HTML-Mason - New directory
Message-ID: <200509160203.j8G23CYq015364@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-HTML-Mason
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15354/perl-HTML-Mason

Log Message:
Directory /cvs/extras/rpms/perl-HTML-Mason added to the repository




From fedora-extras-commits at redhat.com  Fri Sep 16 02:03:15 2005
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Thu, 15 Sep 2005 22:03:15 -0400
Subject: rpms/perl-HTML-Mason/devel - New directory
Message-ID: <200509160203.j8G23Fqw015374@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-HTML-Mason/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15354/perl-HTML-Mason/devel

Log Message:
Directory /cvs/extras/rpms/perl-HTML-Mason/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Sep 16 02:04:35 2005
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Thu, 15 Sep 2005 22:04:35 -0400
Subject: rpms/perl-HTML-Mason Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200509160204.j8G24ZL2015423@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-HTML-Mason
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15409

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-HTML-Mason


--- NEW FILE Makefile ---
# Top level Makefile for module perl-HTML-Mason
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Fri Sep 16 02:05:07 2005
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Thu, 15 Sep 2005 22:05:07 -0400
Subject: rpms/perl-HTML-Mason/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200509160205.j8G257RA015444@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-HTML-Mason/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15409/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-HTML-Mason


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Fri Sep 16 02:06:52 2005
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Thu, 15 Sep 2005 22:06:52 -0400
Subject: owners owners.list,1.218,1.219
Message-ID: <200509160207.j8G27MFY015508@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15477

Modified Files:
	owners.list 
Log Message:
Add perl-HTML-Mason.


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.218
retrieving revision 1.219
diff -u -r1.218 -r1.219
--- owners.list	15 Sep 2005 18:13:19 -0000	1.218
+++ owners.list	16 Sep 2005 02:06:49 -0000	1.219
@@ -653,6 +653,7 @@
 Fedora Extras|perl-Heap|A collection of routines for managing a heap data structure|thm at duke.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Hook-LexWrap|Lexically scoped subroutine wrappers|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-HTML-Format|HTML formatter modules|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-HTML-Mason|HTML::Mason Perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-HTML-Scrubber|Library for scrubbing/sanitizing html|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-HTML-Template|Perl module to use HTML Templates|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-HTML-Template-Expr|Expression support extension for HTML::Template|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Fri Sep 16 02:09:57 2005
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Thu, 15 Sep 2005 22:09:57 -0400
Subject: rpms/perl-HTML-Mason import.log,1.1,1.2
Message-ID: <200509160209.j8G29vGN015582@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-HTML-Mason
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15544

Modified Files:
	import.log 
Log Message:
auto-import perl-HTML-Mason-1.3101-3 on branch devel from perl-HTML-Mason-1.3101-3.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-HTML-Mason/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	16 Sep 2005 02:04:33 -0000	1.1
+++ import.log	16 Sep 2005 02:09:55 -0000	1.2
@@ -0,0 +1 @@
+perl-HTML-Mason-1_3101-3:HEAD:perl-HTML-Mason-1.3101-3.src.rpm:1126836562



From fedora-extras-commits at redhat.com  Fri Sep 16 02:10:16 2005
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Thu, 15 Sep 2005 22:10:16 -0400
Subject: rpms/perl-HTML-Mason/devel filter-provides.sh, NONE,
	1.1 filter-requires.sh, NONE, 1.1 perl-HTML-Mason.conf, NONE,
	1.1 perl-HTML-Mason.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200509160210.j8G2AGXH015589@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-HTML-Mason/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15544/devel

Modified Files:
	.cvsignore sources 
Added Files:
	filter-provides.sh filter-requires.sh perl-HTML-Mason.conf 
	perl-HTML-Mason.spec 
Log Message:
auto-import perl-HTML-Mason-1.3101-3 on branch devel from perl-HTML-Mason-1.3101-3.src.rpm


--- NEW FILE filter-provides.sh ---
#!/bin/sh

/usr/lib/rpm/perl.prov $* | grep -v '^perl(MyApp::'


--- NEW FILE filter-requires.sh ---
#!/bin/sh

/usr/lib/rpm/perl.req $* | grep -v '^perl(MasonX::Request::PlusApacheSession)$'


--- NEW FILE perl-HTML-Mason.conf ---
#
# perl-HTML-Mason.conf - HTML::Mason httpd 2.0.x configuration
#

#
# For more information on configuring Mason, see
# http://www.masonhq.com/docs/manual/Params.html
#
# PerlModule HTML::Mason::ApacheHandler

#
# The component root marks the top of your component hierarchy and defines how
# component paths are translated into real file paths. For example, if your
# component root is /usr/local/httpd/docs, a component path of
# /products/index.html translates to the file
# /usr/local/httpd/docs/products/index.html.
#
# Uncomment the following line to set a single component root:
#
# PerlSetVar MasonCompRoot "/var/www/mason"
#
# Uncomment the following lines to set multiple component roots:
#
# PerlAddVar MasonCompRoot "main    => /var/www/html"
# PerlAddVar MasonCompRoot "private => /var/www/mason"
#

#
# The data directory is a writable directory that Mason uses for various
# features and optimizations: for example, component object files and data
# cache files. Mason will create the directory on startup, if necessary, and
# set its permissions according to the web server User/Group.
#
# PerlSetVar MasonDataDir "/var/cache/mason"

#
# The error mode indicates how errors are returned to the caller.  The default
# under Apache and CGI is output, causing the error to be displayed in the
# browser. Uncomment the following line to make Mason die with an error
# instead.
#
# PerlSetVar MasonErrorMode fatal

#
# To use the Apache args method with Mason, make sure you have libapreq2
# installed and loaded, and uncomment the following lines.
#
# PerlOptions +GlobalRequest
# PerlModule Apache2::Request
# PerlSetVar MasonArgsMethod mod_perl

#
# If you do not have libapreq2 installed, you may use the CGI args method with
# Mason. To do so, uncomment the following lines.
#
# PerlModule CGI
# PerlSetVar MasonArgsMethod CGI

#
# The following configuration will tell Apache to serve certain files in your
# document root using HTML::Mason.
#
#
#    DefaultType text/html
#    SetHandler modperl
#    PerlResponseHandler HTML::Mason::ApacheHandler
#

#
#    DefaultType text/plain
#    SetHandler modperl
#    PerlResponseHandler HTML::Mason::ApacheHandler
#



--- NEW FILE perl-HTML-Mason.spec ---
Name:           perl-HTML-Mason
Version:        1.3101
Release:        3%{?dist}
Summary:        HTML::Mason Perl module
License:        GPL or Artistic
Group:          Development/Libraries
URL:            http://www.masonhq.com/
Source0:        http://www.cpan.org/authors/id/D/DR/DROLSKY/HTML-Mason-%{version}.tar.gz
Source1:        perl-HTML-Mason.conf

# Filter perl(MasonX::Request::PlusApacheSession).
Source2:        filter-requires.sh
%define __perl_requires %{SOURCE2}

# Filter perl(MyApp::Mason) and perl(MyApp::MasonPlusSession).
Source3:        filter-provides.sh
%define __perl_provides %{SOURCE3}

BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(Cache::Cache) >= 1
BuildRequires:  perl(Class::Container) >= 0.07
BuildRequires:  perl(Exception::Class) >= 1.15
BuildRequires:  perl(Module::Build::Compat) >= 0.02
BuildRequires:  perl(Params::Validate) >= 0.7
BuildRequires:  perl(mod_perl2)
Requires:       perl(Cache::Cache) >= 1
Requires:       perl(Class::Container) >= 0.07
Requires:       perl(Exception::Class) >= 1.15
Requires:       perl(Params::Validate) >= 0.7
Requires:       perl(mod_perl2)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
Requires:       %{_sysconfdir}/httpd/conf.d

%description
Mason is a powerful Perl-based web site development and delivery
engine. With Mason you can embed Perl code in your HTML and construct
pages from shared, reusable components.  Mason solves the common
problems of site development: caching, debugging, templating,
maintaining development and production sites, and more.

%prep
%setup -q -n HTML-Mason-%{version}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT

# make: *** No rule to make target `pure_install'.  Stop.
make install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT

find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null \;

chmod -R u+rwX,go+rX,go-w $RPM_BUILD_ROOT/*

mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/httpd/conf.d
install -p -m 0644 %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/httpd/conf.d/

mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/www/mason
mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/cache/mason

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc CREDITS Changes LICENSE README UPGRADE
%doc htdocs/ eg/ samples/
%{perl_vendorlib}/*
%{_mandir}/man3/*
%config(noreplace) %{_sysconfdir}/httpd/conf.d/perl-HTML-Mason.conf
%dir %attr(775,root,apache) %{_localstatedir}/cache/mason
%dir %{_localstatedir}/www/mason

%changelog
* Thu Sep 15 2005 Steven Pritchard  1.3101-3
- Filter bogus provides/requires introduced by eg/ and samples/

* Thu Sep 15 2005 Steven Pritchard  1.3101-2
- More spec cleanup (jpo)

* Mon Aug 29 2005 Steven Pritchard  1.3101-1
- Update to 1.3101
- Spec cleanup (jpo)
- Include sample config file from Chris Grau

* Wed Aug 24 2005 Steven Pritchard  1.31-3
- Use /var/www/mason instead of /var/www/comp
- Spec cleanup

* Tue Aug 23 2005 Steven Pritchard  1.31-2
- Add some missing dependencies

* Tue Aug 23 2005 Steven Pritchard  1.31-1
- Update to 1.31
- Use /var/cache/mason instead of /var/www/mason
- Fix perl-HTML-Mason.conf
- Fix URL

* Thu Aug 11 2005 Steven Pritchard  1.30-1
- Specfile autogenerated.
- Add perl-HTML-Mason.conf and /var/www/*


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-HTML-Mason/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	16 Sep 2005 02:05:04 -0000	1.1
+++ .cvsignore	16 Sep 2005 02:09:55 -0000	1.2
@@ -0,0 +1 @@
+HTML-Mason-1.3101.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-HTML-Mason/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	16 Sep 2005 02:05:04 -0000	1.1
+++ sources	16 Sep 2005 02:09:55 -0000	1.2
@@ -0,0 +1 @@
+4904681296efeb9c58bf0d9926d37407  HTML-Mason-1.3101.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep 16 06:52:28 2005
From: fedora-extras-commits at redhat.com (Chris Wright (chrisw))
Date: Fri, 16 Sep 2005 02:52:28 -0400
Subject: rpms/cogito - New directory
Message-ID: <200509160652.j8G6qS4a021834@cvs-int.fedora.redhat.com>

Author: chrisw

Update of /cvs/extras/rpms/cogito
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21810/cogito

Log Message:
Directory /cvs/extras/rpms/cogito added to the repository




From fedora-extras-commits at redhat.com  Fri Sep 16 06:52:29 2005
From: fedora-extras-commits at redhat.com (Chris Wright (chrisw))
Date: Fri, 16 Sep 2005 02:52:29 -0400
Subject: rpms/cogito/devel - New directory
Message-ID: <200509160652.j8G6qTY0021839@cvs-int.fedora.redhat.com>

Author: chrisw

Update of /cvs/extras/rpms/cogito/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21810/cogito/devel

Log Message:
Directory /cvs/extras/rpms/cogito/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Sep 16 06:52:43 2005
From: fedora-extras-commits at redhat.com (Chris Wright (chrisw))
Date: Fri, 16 Sep 2005 02:52:43 -0400
Subject: rpms/cogito Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200509160652.j8G6qhum021884@cvs-int.fedora.redhat.com>

Author: chrisw

Update of /cvs/extras/rpms/cogito
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21855

Added Files:
	Makefile import.log 
Log Message:
Setup of module cogito


--- NEW FILE Makefile ---
# Top level Makefile for module cogito
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Fri Sep 16 06:52:43 2005
From: fedora-extras-commits at redhat.com (Chris Wright (chrisw))
Date: Fri, 16 Sep 2005 02:52:43 -0400
Subject: rpms/cogito/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200509160652.j8G6qhXq021889@cvs-int.fedora.redhat.com>

Author: chrisw

Update of /cvs/extras/rpms/cogito/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21855/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module cogito


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Fri Sep 16 06:53:09 2005
From: fedora-extras-commits at redhat.com (Chris Wright (chrisw))
Date: Fri, 16 Sep 2005 02:53:09 -0400
Subject: rpms/cogito import.log,1.1,1.2
Message-ID: <200509160653.j8G6rdh3021961@cvs-int.fedora.redhat.com>

Author: chrisw

Update of /cvs/extras/rpms/cogito
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21923

Modified Files:
	import.log 
Log Message:
auto-import cogito-0.14.1-1 on branch devel from cogito-0.14.1-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/cogito/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	16 Sep 2005 06:52:41 -0000	1.1
+++ import.log	16 Sep 2005 06:53:07 -0000	1.2
@@ -0,0 +1 @@
+cogito-0_14_1-1:HEAD:cogito-0.14.1-1.src.rpm:1126853582



From fedora-extras-commits at redhat.com  Fri Sep 16 06:53:10 2005
From: fedora-extras-commits at redhat.com (Chris Wright (chrisw))
Date: Fri, 16 Sep 2005 02:53:10 -0400
Subject: rpms/cogito/devel cogito.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200509160653.j8G6remL021965@cvs-int.fedora.redhat.com>

Author: chrisw

Update of /cvs/extras/rpms/cogito/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21923/devel

Modified Files:
	.cvsignore sources 
Added Files:
	cogito.spec 
Log Message:
auto-import cogito-0.14.1-1 on branch devel from cogito-0.14.1-1.src.rpm


--- NEW FILE cogito.spec ---
Name: 		cogito
Version: 	0.14.1
Release: 	1
Summary:  	The Cogito Version Control System
License: 	GPL
Group: 		Development/Tools
URL: 		http://kernel.org/pub/software/scm/cogito/
Source: 	http://kernel.org/pub/software/scm/cogito/%{name}-%{version}.tar.gz
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: 	git-core >= 0.99.3
BuildArch:	noarch

%description
Cogito is a version control system layered on top of the git tree history
storage system. It aims at seamless user interface and ease of use, providing
generally smoother user experience than the "raw" Core GIT itself and indeed
many other version control systems.

%prep
%setup -q

%build

make

%install
rm -rf $RPM_BUILD_ROOT
make DESTDIR=$RPM_BUILD_ROOT prefix=%{_prefix} install

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root)
%{_bindir}/*
%dir %{_libdir}/cogito
%{_libdir}/cogito/*
%doc README COPYING Documentation/*

%changelog
* Thu Sep 15 2005 Chris Wright  0.14.1-1
- Update to 0.14.1

* Mon Aug 15 2005 Chris Wright  0.13-3
- Update Buildroot, Requires and drop Vendor
- use %{_libdir}

* Wed Aug 10 2005 Pavel Roskin  0.13-1
- Update summary and description
- Make architecture-independent

* Wed Jul 6 2005 Chris Wright  0.12-1
- update spec file

* Thu Jun 9 2005 Chris Wright  0.11.3-1
- Add openssl patch from Dan Holmsand 
- Add cg-Xlib patch to fix showdate output
- Update %files with changes inspired by Neil Horman 

* Mon May 9 2005 H. Peter Anvin  0.10-1
- New upstream revision
- Rename spec file to cogito.spec

* Wed Apr 27 2005 Terje Rosten  0.8-2
- Doc files
- Use %%{_prefix} macro
- Rename spec file
- Drop -n option to %%setup macro

* Mon Apr 25 2005 Chris Wright  0.8-1
- Update to cogito, rename package, move to /usr/bin, update prereqs

* Mon Apr 25 2005 Chris Wright  0.7-1
- Update to 0.7

* Thu Apr 21 2005 Chris Wright  0.6.3-1
- Initial rpm build


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cogito/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	16 Sep 2005 06:52:41 -0000	1.1
+++ .cvsignore	16 Sep 2005 06:53:08 -0000	1.2
@@ -0,0 +1 @@
+cogito-0.14.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cogito/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	16 Sep 2005 06:52:41 -0000	1.1
+++ sources	16 Sep 2005 06:53:08 -0000	1.2
@@ -0,0 +1 @@
+e998a8d8146bd0c2b86fbb4b278cc4fc  cogito-0.14.1.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep 16 11:05:36 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Fri, 16 Sep 2005 07:05:36 -0400
Subject: rpms/d4x/devel .cvsignore,1.5,1.6 d4x.spec,1.8,1.9 sources,1.5,1.6
Message-ID: <200509161106.j8GB6TEK029675@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/d4x/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29647

Modified Files:
	.cvsignore d4x.spec sources 
Log Message:
Update to 2.5.5.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/d4x/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	7 Sep 2005 14:13:30 -0000	1.5
+++ .cvsignore	16 Sep 2005 11:05:33 -0000	1.6
@@ -1 +1 @@
-d4x-2.5.4.tar.bz2
+d4x-2.5.5.tar.bz2


Index: d4x.spec
===================================================================
RCS file: /cvs/extras/rpms/d4x/devel/d4x.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- d4x.spec	7 Sep 2005 14:13:30 -0000	1.8
+++ d4x.spec	16 Sep 2005 11:05:33 -0000	1.9
@@ -3,7 +3,7 @@
 
 Summary: Downloader for X that supports resuming and many other features
 Name: d4x
-Version: 2.5.4
+Version: 2.5.5
 Release: 1%{?pre:.%{pre}}%{?dist}
 Group: Applications/Internet
 License: Artistic
@@ -66,6 +66,9 @@
 
 
 %changelog
+* Fri Sep 16 2005 Matthias Saou  2.5.5-1
+- Update to 2.5.5.
+
 * Wed Sep  7 2005 Matthias Saou  2.5.4-1
 - Update to 2.5.4.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/d4x/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	7 Sep 2005 14:13:30 -0000	1.5
+++ sources	16 Sep 2005 11:05:33 -0000	1.6
@@ -1 +1 @@
-c797a933a8de1503b069b6d2499da727  d4x-2.5.4.tar.bz2
+ee3c7dc4618b6ead77a22685195fcf24  d4x-2.5.5.tar.bz2



From fedora-extras-commits at redhat.com  Fri Sep 16 11:19:41 2005
From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc))
Date: Fri, 16 Sep 2005 07:19:41 -0400
Subject: rpms/enca - New directory
Message-ID: <200509161119.j8GBJfcL029857@cvs-int.fedora.redhat.com>

Author: buc

Update of /cvs/extras/rpms/enca
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29836/enca

Log Message:
Directory /cvs/extras/rpms/enca added to the repository




From fedora-extras-commits at redhat.com  Fri Sep 16 11:19:42 2005
From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc))
Date: Fri, 16 Sep 2005 07:19:42 -0400
Subject: rpms/enca/devel - New directory
Message-ID: <200509161119.j8GBJglm029862@cvs-int.fedora.redhat.com>

Author: buc

Update of /cvs/extras/rpms/enca/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29836/enca/devel

Log Message:
Directory /cvs/extras/rpms/enca/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Sep 16 11:20:14 2005
From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc))
Date: Fri, 16 Sep 2005 07:20:14 -0400
Subject: rpms/enca Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200509161120.j8GBKEPC029911@cvs-int.fedora.redhat.com>

Author: buc

Update of /cvs/extras/rpms/enca
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29882

Added Files:
	Makefile import.log 
Log Message:
Setup of module enca


--- NEW FILE Makefile ---
# Top level Makefile for module enca
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Fri Sep 16 11:20:15 2005
From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc))
Date: Fri, 16 Sep 2005 07:20:15 -0400
Subject: rpms/enca/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200509161120.j8GBKFmI029916@cvs-int.fedora.redhat.com>

Author: buc

Update of /cvs/extras/rpms/enca/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29882/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module enca


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Fri Sep 16 11:21:03 2005
From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc))
Date: Fri, 16 Sep 2005 07:21:03 -0400
Subject: rpms/enca import.log,1.1,1.2
Message-ID: <200509161121.j8GBL3jx029986@cvs-int.fedora.redhat.com>

Author: buc

Update of /cvs/extras/rpms/enca
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29951

Modified Files:
	import.log 
Log Message:
auto-import enca-1.7-4 on branch devel from enca-1.7-4.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/enca/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	16 Sep 2005 11:20:12 -0000	1.1
+++ import.log	16 Sep 2005 11:21:01 -0000	1.2
@@ -0,0 +1 @@
+enca-1_7-4:HEAD:enca-1.7-4.src.rpm:1126869651



From fedora-extras-commits at redhat.com  Fri Sep 16 11:21:04 2005
From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc))
Date: Fri, 16 Sep 2005 07:21:04 -0400
Subject: rpms/enca/devel enca.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <200509161121.j8GBL4u0029992@cvs-int.fedora.redhat.com>

Author: buc

Update of /cvs/extras/rpms/enca/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29951/devel

Modified Files:
	.cvsignore sources 
Added Files:
	enca.spec 
Log Message:
auto-import enca-1.7-4 on branch devel from enca-1.7-4.src.rpm


--- NEW FILE enca.spec ---
Name: enca
Summary: Character set analyzer and detector
Version: 1.7
Release: 4%{?dist}
License: GPL
Group: Applications/Text
Source: http://trific.ath.cx/Ftp/enca/enca-1.7.tar.bz2
URL: http://trific.ath.cx/software/enca/
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)


%description
Enca is an Extremely Naive Charset Analyser. It detects character set and
encoding of text files and can also convert them to other encodings using
either a built-in converter or external libraries and tools like libiconv,
librecode, or cstocs.

Currently, it has support for Belarussian, Bulgarian, Croatian, Czech,
Estonian, Latvian, Lithuanian, Polish, Russian, Slovak, Slovene, and
Ukrainian and some multibyte encodings (mostly variants of Unicode)
independently on the language.

This package also contains shared Enca library other programs can make use of.

Install %{name} if you need to cope with text files of dubious origin
and unknown encoding and convert them to some reasonable encoding.


%package devel
Summary: Header files and libraries for %{name} charset analyzer
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
Requires: pkgconfig

%description devel
The %{name}-devel package contains the static libraries and header files
for writing programs using the Extremely Naive Charset Analyser library,
and its API documentation.

Install %{name}-devel if you are going to create applications using the Enca
library.


%prep
%setup -q


%build

%configure \
	--disable-dependency-tracking \
	--without-librecode \
	--disable-external \
	%{!?_with_static:--disable-static} \
	--disable-gtk-doc
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT

make install DESTDIR=$RPM_BUILD_ROOT HTML_DIR=/tmp/html

rm -rf $RPM_BUILD_ROOT/tmp/html
rm -rf $RPM_BUILD_ROOT/%{_libexecdir}
rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la


%check
make check


%clean
rm -rf $RPM_BUILD_ROOT


%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig


%files
%defattr(-,root,root)
%{_bindir}/*
%{_libdir}/libenca.so.*
%{_mandir}/*/*
%doc AUTHORS COPYING FAQ NEWS README THANKS TODO

%files devel
%defattr(-,root,root)
%{_includedir}/*
%{_libdir}/pkgconfig/*
%{?_with_static: %{_libdir}/*.a}
%{_libdir}/*.so
%doc devel-docs/html/*.html README.devel


%changelog
* Fri Sep 16 2005 Dmitry Butskoy  - 0.7-4
- clenup in docs
- Accepted for Fedora Extra (review by Ville Skytta )

* Thu Sep  9 2005 Dmitry Butskoy  - 0.7-3
- build static libs conditionally
- disable external converters (#167820)

* Thu Sep  8 2005 Dmitry Butskoy  - 0.7-2
- more cleanups (#167820)

* Thu Sep  8 2005 Dmitry Butskoy  - 0.7-1
- spec cleanups for Fedora Extra
- avoid build with librecode, use just glibc's iconv 
- avoid any gtk dependencies, html docs are already present in the source

* Mon May 17 2004 David Necas (Yeti) 
- doubled percents in changelog

* Mon Dec 22 2003 David Necas (Yeti) 
- moved wrappers to libexec

* Thu Nov  6 2003 David Necas (Yeti) 
- added b-piconv
- fixed HTML doc install paths

* Tue Oct 14 2003 David Necas (Yeti) 
- testing whether $RPM_BUILD_ROOT is not /
- updated for new HTML doc location
- changed make -> %%__make, rm -> %%__rm

* Sat Aug  2 2003 David Necas (Yeti) 
- cleaning $RPM_BUILD_ROOT in %%install

* Sat Jun 28 2003 David Necas (Yeti) 
- removed --disable-gtk-doc, no longer needed

* Fri Jun 20 2003 David Necas (Yeti) 
- added enca.pc to devel package

* Sat Jun 14 2003 David Necas (Yeti) 
- updated description
- added --disable-gtk-doc

* Mon Dec 23 2002 David Necas (Yeti) 
- added libenca.so

* Fri Dec 20 2002 David Necas (Yeti) 
- fixed URL and Source to trific.ath.cx

* Mon Oct 21 2002 David Necas (Yeti) 
- added FAQ to docs

* Thu Oct 10 2002 David Necas (Yeti) 
- removed twice-listed %%{docdir}/html

* Sat Sep 21 2002 David Necas (Yeti) 
- added b-umap

* Sun Sep 15 2002 David Necas (Yeti) 
- added enconv

* Thu Aug 29 2002 David Necas (Yeti) 
- removed bzip2-devel buildprereq

* Sat Aug 24 2002 David Necas (Yeti) 
- added postinstall and postuninstall scriptlets

* Wed Aug 21 2002 David Necas (Yeti) 
- updated to enca-0.10.0-pre2
- added libenca
- split into enca and enca-devel
- removed cache
- fixed HTML_DIR

* Tue Jul 10 2001 David Necas (Yeti) 
- changed rpm macros in Source and URL to autoconf macros to ease debian/
  stuff generation

* Sun May 20 2001 David Necas (Yeti) 
- added BuildPrereq: bzip2-devel

* Wed May  2 2001 David Necas (Yeti) 
- changed group to standard (but much less appropriate) Applications/Text
- rpm macros are used instead of autoconf macros (after the first definition)

* Sun Mar 11 2001 David Necas (Yeti) 
- added defattr, doc attributes
- uses global configure cache
- heavy use of predefined directories
- configure moved to build section as is usual

* Sun Feb 25 2001 David Necas (Yeti) 
- updated to enca-0.9.0pre4 (including files and descriptions)
- added sed dependency

* Sun Oct 25 2000 David Necas (Yeti) 
- updated to enca-0.7.5

* Sun Oct 11 2000 David Necas (Yeti) 
- removed redundant Provides: enca

* Sun Oct  1 2000 David Necas (Yeti) 
- updated to enca-0.7.1
- man page forced to be intstalled to ${prefix}/share/man

* Tue Sep 26 2000 David Necas (Yeti) 
- updated to enca-0.7.0
- spec autogenerated by configure

* Tue Sep 19 2000 David Necas (Yeti) 
- fixed not installing bcstocs

* Wed Sep 13 2000 David Necas (Yeti) 
- first packaged (0.6.2)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/enca/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	16 Sep 2005 11:20:13 -0000	1.1
+++ .cvsignore	16 Sep 2005 11:21:02 -0000	1.2
@@ -0,0 +1 @@
+enca-1.7.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/enca/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	16 Sep 2005 11:20:13 -0000	1.1
+++ sources	16 Sep 2005 11:21:02 -0000	1.2
@@ -0,0 +1 @@
+01dd5dbd4154c85cbf4a42d3580c517f  enca-1.7.tar.bz2



From fedora-extras-commits at redhat.com  Fri Sep 16 11:22:09 2005
From: fedora-extras-commits at redhat.com (Oliver Falk (oliver))
Date: Fri, 16 Sep 2005 07:22:09 -0400
Subject: rpms/syck/devel syck.spec,1.1,1.2
Message-ID: <200509161122.j8GBM9Vd030055@cvs-int.fedora.redhat.com>

Author: oliver

Update of /cvs/extras/rpms/syck/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30035

Modified Files:
	syck.spec 
Log Message:
* Recompile against php 5.0.5


Index: syck.spec
===================================================================
RCS file: /cvs/extras/rpms/syck/devel/syck.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- syck.spec	26 Aug 2005 08:15:11 -0000	1.1
+++ syck.spec	16 Sep 2005 11:22:07 -0000	1.2
@@ -7,7 +7,7 @@
 Summary:		YAML for C, Python, and PHP
 
 Version:		0.55
-Release:		5%{?dist}
+Release:		6%{?dist}
 
 License:		BSD
 Group:			System Environment/Libraries
@@ -185,6 +185,9 @@
 %{php_extdir}/*.so
 
 %changelog
+* Fri Sep 16 2005 Oliver Falk 		- 0.55-6
+- Compile against PHP 5.0.5
+
 * Thu Aug 25 2005 Toshio Kuratomi  - 0.55-5
 - Stop using a dynamically generated php-version in the BR.
 - Create a devel package



From fedora-extras-commits at redhat.com  Fri Sep 16 11:23:09 2005
From: fedora-extras-commits at redhat.com (Oliver Falk (oliver))
Date: Fri, 16 Sep 2005 07:23:09 -0400
Subject: rpms/syck/FC-4 syck.spec,1.1,1.2
Message-ID: <200509161123.j8GBN9Oh030161@cvs-int.fedora.redhat.com>

Author: oliver

Update of /cvs/extras/rpms/syck/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30142

Modified Files:
	syck.spec 
Log Message:
* Recompile against php 5.0.5


Index: syck.spec
===================================================================
RCS file: /cvs/extras/rpms/syck/FC-4/syck.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- syck.spec	26 Aug 2005 08:15:11 -0000	1.1
+++ syck.spec	16 Sep 2005 11:23:06 -0000	1.2
@@ -7,7 +7,7 @@
 Summary:		YAML for C, Python, and PHP
 
 Version:		0.55
-Release:		5%{?dist}
+Release:		6%{?dist}
 
 License:		BSD
 Group:			System Environment/Libraries
@@ -185,6 +185,9 @@
 %{php_extdir}/*.so
 
 %changelog
+* Fri Sep 16 2005 Oliver Falk 		- 0.55-6
+- Compile against PHP 5.0.5
+
 * Thu Aug 25 2005 Toshio Kuratomi  - 0.55-5
 - Stop using a dynamically generated php-version in the BR.
 - Create a devel package



From fedora-extras-commits at redhat.com  Fri Sep 16 12:05:51 2005
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Fri, 16 Sep 2005 08:05:51 -0400
Subject: rpms/libgnomedb/FC-4 libgnomedb.spec,1.2,1.3
Message-ID: <200509161206.j8GC6LRw031611@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/libgnomedb/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31592

Modified Files:
	libgnomedb.spec 
Log Message:
rebuild to fix hardcoded libtool .la dependencies on ppc


Index: libgnomedb.spec
===================================================================
RCS file: /cvs/extras/rpms/libgnomedb/FC-4/libgnomedb.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libgnomedb.spec	5 Aug 2005 17:56:57 -0000	1.2
+++ libgnomedb.spec	16 Sep 2005 12:05:26 -0000	1.3
@@ -1,7 +1,7 @@
 Summary:         Library for writing gnome database programs
 Name:            libgnomedb
 Version:         1.2.0
-Release:         3
+Release:         3.1
 Epoch:           1
 Source:          %{name}-%{version}.tar.bz2
 URL:             http://www.gnome-db.org/
@@ -99,6 +99,9 @@
 
 
 %changelog
+* Wed Mar 02 2005 Caolan McNamara  1.2.0-3.1
+- rebuild to fix hardcoded libtool .la dependencies on ppc
+
 * Wed Mar 02 2005 Caolan McNamara  1.2.0-3
 - rebuild with gcc4
 



From fedora-extras-commits at redhat.com  Fri Sep 16 12:17:09 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri, 16 Sep 2005 08:17:09 -0400
Subject: rpms/mathml-fonts/FC-3 mathml-fonts.spec,1.5,1.6
Message-ID: <200509161217.j8GCHdOw031797@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/mathml-fonts/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31741/FC-3

Modified Files:
	mathml-fonts.spec 
Log Message:
BaKoMa: update Lyx wiki reference, add Licence.txt



Index: mathml-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/mathml-fonts/FC-3/mathml-fonts.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- mathml-fonts.spec	15 Sep 2005 19:37:50 -0000	1.5
+++ mathml-fonts.spec	16 Sep 2005 12:17:07 -0000	1.6
@@ -26,7 +26,7 @@
 ## TeX fonts
 #Source20: ftp://tug.ctan.org/tex-archive/fonts/cm/ps-type1/bakoma/ttf.tar.gz
 Source20: ftp://tug.ctan.org/tex-archive/fonts/cm/ps-type1/bakoma/ttf/cmbx10.ttf
-# Reference: http://wiki.lyx.org/LyX/Troubleshooting 
+# Reference: http://wiki.lyx.org/Windows/LyX136 
 Source21: ftp://ftp.lyx.org/pub/lyx/contrib/BaKoMa4LyX.zip
 ## Design Science fonts
 #  License: http://www.dessci.com/en/support/eula/fonts/mtextralic.htm
@@ -111,7 +111,7 @@
 
 %files
 %defattr(-,root,root)
-%doc Readme.txt
+%doc Licence.txt Readme.txt
 %dir %{find_symbol_dir}
 %{find_symbol_font}
 %dir %{fontdir}



From fedora-extras-commits at redhat.com  Fri Sep 16 12:17:10 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri, 16 Sep 2005 08:17:10 -0400
Subject: rpms/mathml-fonts/FC-4 mathml-fonts.spec,1.9,1.10
Message-ID: <200509161217.j8GCHeIp031800@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/mathml-fonts/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31741/FC-4

Modified Files:
	mathml-fonts.spec 
Log Message:
BaKoMa: update Lyx wiki reference, add Licence.txt



Index: mathml-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/mathml-fonts/FC-4/mathml-fonts.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- mathml-fonts.spec	15 Sep 2005 19:37:50 -0000	1.9
+++ mathml-fonts.spec	16 Sep 2005 12:17:08 -0000	1.10
@@ -26,7 +26,7 @@
 ## TeX fonts
 #Source20: ftp://tug.ctan.org/tex-archive/fonts/cm/ps-type1/bakoma/ttf.tar.gz
 Source20: ftp://tug.ctan.org/tex-archive/fonts/cm/ps-type1/bakoma/ttf/cmbx10.ttf
-# Reference: http://wiki.lyx.org/LyX/Troubleshooting 
+# Reference: http://wiki.lyx.org/Windows/LyX136 
 Source21: ftp://ftp.lyx.org/pub/lyx/contrib/BaKoMa4LyX.zip
 ## Design Science fonts
 #  License: http://www.dessci.com/en/support/eula/fonts/mtextralic.htm
@@ -111,7 +111,7 @@
 
 %files
 %defattr(-,root,root)
-%doc Readme.txt
+%doc Licence.txt Readme.txt
 %dir %{find_symbol_dir}
 %{find_symbol_font}
 %dir %{fontdir}



From fedora-extras-commits at redhat.com  Fri Sep 16 12:17:10 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri, 16 Sep 2005 08:17:10 -0400
Subject: rpms/mathml-fonts/devel mathml-fonts.spec,1.9,1.10
Message-ID: <200509161217.j8GCHeCY031803@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/mathml-fonts/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31741/devel

Modified Files:
	mathml-fonts.spec 
Log Message:
BaKoMa: update Lyx wiki reference, add Licence.txt



Index: mathml-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/mathml-fonts/devel/mathml-fonts.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- mathml-fonts.spec	15 Sep 2005 19:37:56 -0000	1.9
+++ mathml-fonts.spec	16 Sep 2005 12:17:08 -0000	1.10
@@ -26,7 +26,7 @@
 ## TeX fonts
 #Source20: ftp://tug.ctan.org/tex-archive/fonts/cm/ps-type1/bakoma/ttf.tar.gz
 Source20: ftp://tug.ctan.org/tex-archive/fonts/cm/ps-type1/bakoma/ttf/cmbx10.ttf
-# Reference: http://wiki.lyx.org/LyX/Troubleshooting 
+# Reference: http://wiki.lyx.org/Windows/LyX136 
 Source21: ftp://ftp.lyx.org/pub/lyx/contrib/BaKoMa4LyX.zip
 ## Design Science fonts
 #  License: http://www.dessci.com/en/support/eula/fonts/mtextralic.htm
@@ -111,7 +111,7 @@
 
 %files
 %defattr(-,root,root)
-%doc Readme.txt
+%doc Licence.txt Readme.txt
 %dir %{find_symbol_dir}
 %{find_symbol_font}
 %dir %{fontdir}



From fedora-extras-commits at redhat.com  Fri Sep 16 15:40:27 2005
From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo))
Date: Fri, 16 Sep 2005 11:40:27 -0400
Subject: rpms/scim-skk/devel scim-skk.spec,1.1,1.2
Message-ID: <200509161540.j8GFeRKu003919@cvs-int.fedora.redhat.com>

Author: ryo

Update of /cvs/extras/rpms/scim-skk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3894

Modified Files:
	scim-skk.spec 
Log Message:
cleanup specfile



Index: scim-skk.spec
===================================================================
RCS file: /cvs/extras/rpms/scim-skk/devel/scim-skk.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- scim-skk.spec	12 Sep 2005 14:42:34 -0000	1.1
+++ scim-skk.spec	16 Sep 2005 15:40:25 -0000	1.2
@@ -1,20 +1,20 @@
 Name:		scim-skk
 Version:	0.3.0
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	SCIM IMEngine module for skk
 
 Group:		System Environment/Libraries
 License:	GPL
-URL:            http://scim-imengine.sourceforge.jp/
-Source0:        http://sourceforge.jp/projects/scim-imengine/files/%{name}-%{version}.tar.gz
-Patch0:         no-dictionary.diff
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+URL:		http://scim-imengine.sourceforge.jp/
+Source0:	http://sourceforge.jp/projects/scim-imengine/files/%{name}-%{version}.tar.gz
+Patch0:		no-dictionary.diff
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Requires:       skkdic
-BuildRequires:  scim-devel
+Requires		skkdic
+BuildRequires:	scim-devel
 
 %description
-Scim-skk is a SCIM IMEngine module for skk to support Japanese input.
+Scim-skk is a SCIM IMEngine module for skk to support Japanese input
 
 
 %prep
@@ -43,12 +43,18 @@
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING NEWS README ChangeLog
+%dir %{_libdir}/scim-1.0/IMEngine
 %{_libdir}/scim-1.0/IMEngine/skk.so
+%dir %{_libdir}/scim-1.0/SetupUI
 %{_libdir}/scim-1.0/SetupUI/skk-imengine-setup.so
 %{_datadir}/scim/icons/scim-skk.png
+%{_datadir}/scim/icons/scim-skk.png
 
 
 %changelog
+* Sat Sep 17 2005 Ryo Dairiki  - 0.3.0-3
+- a bit more cleanup (Thanks, Jens)
+
 * Tue Sep  6 2005 Ryo Dairiki  - 0.3.0-2
 - initial packaging for Fedora Extras
 - cleanup specfile (Jens Petersen)



From fedora-extras-commits at redhat.com  Fri Sep 16 15:42:07 2005
From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo))
Date: Fri, 16 Sep 2005 11:42:07 -0400
Subject: rpms/scim-skk/FC-3 scim-skk.spec,1.1,1.2
Message-ID: <200509161542.j8GFg7qm003948@cvs-int.fedora.redhat.com>

Author: ryo

Update of /cvs/extras/rpms/scim-skk/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3925

Modified Files:
	scim-skk.spec 
Log Message:
cleanup specfile



Index: scim-skk.spec
===================================================================
RCS file: /cvs/extras/rpms/scim-skk/FC-3/scim-skk.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- scim-skk.spec	12 Sep 2005 14:42:34 -0000	1.1
+++ scim-skk.spec	16 Sep 2005 15:42:05 -0000	1.2
@@ -1,20 +1,20 @@
 Name:		scim-skk
 Version:	0.3.0
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	SCIM IMEngine module for skk
 
 Group:		System Environment/Libraries
 License:	GPL
-URL:            http://scim-imengine.sourceforge.jp/
-Source0:        http://sourceforge.jp/projects/scim-imengine/files/%{name}-%{version}.tar.gz
-Patch0:         no-dictionary.diff
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+URL:		http://scim-imengine.sourceforge.jp/
+Source0:	http://sourceforge.jp/projects/scim-imengine/files/%{name}-%{version}.tar.gz
+Patch0:		no-dictionary.diff
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Requires:       skkdic
-BuildRequires:  scim-devel
+Requires		skkdic
+BuildRequires:	scim-devel
 
 %description
-Scim-skk is a SCIM IMEngine module for skk to support Japanese input.
+Scim-skk is a SCIM IMEngine module for skk to support Japanese input
 
 
 %prep
@@ -43,12 +43,18 @@
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING NEWS README ChangeLog
+%dir %{_libdir}/scim-1.0/IMEngine
 %{_libdir}/scim-1.0/IMEngine/skk.so
+%dir %{_libdir}/scim-1.0/SetupUI
 %{_libdir}/scim-1.0/SetupUI/skk-imengine-setup.so
 %{_datadir}/scim/icons/scim-skk.png
+%{_datadir}/scim/icons/scim-skk.png
 
 
 %changelog
+* Sat Sep 17 2005 Ryo Dairiki  - 0.3.0-3
+- a bit more cleanup (Thanks, Jens)
+
 * Tue Sep  6 2005 Ryo Dairiki  - 0.3.0-2
 - initial packaging for Fedora Extras
 - cleanup specfile (Jens Petersen)



From fedora-extras-commits at redhat.com  Fri Sep 16 15:42:29 2005
From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo))
Date: Fri, 16 Sep 2005 11:42:29 -0400
Subject: rpms/scim-skk/FC-4 scim-skk.spec,1.1,1.2
Message-ID: <200509161542.j8GFgTD0003973@cvs-int.fedora.redhat.com>

Author: ryo

Update of /cvs/extras/rpms/scim-skk/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3954

Modified Files:
	scim-skk.spec 
Log Message:
cleanup specfile



Index: scim-skk.spec
===================================================================
RCS file: /cvs/extras/rpms/scim-skk/FC-4/scim-skk.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- scim-skk.spec	12 Sep 2005 14:42:34 -0000	1.1
+++ scim-skk.spec	16 Sep 2005 15:42:27 -0000	1.2
@@ -1,20 +1,20 @@
 Name:		scim-skk
 Version:	0.3.0
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	SCIM IMEngine module for skk
 
 Group:		System Environment/Libraries
 License:	GPL
-URL:            http://scim-imengine.sourceforge.jp/
-Source0:        http://sourceforge.jp/projects/scim-imengine/files/%{name}-%{version}.tar.gz
-Patch0:         no-dictionary.diff
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+URL:		http://scim-imengine.sourceforge.jp/
+Source0:	http://sourceforge.jp/projects/scim-imengine/files/%{name}-%{version}.tar.gz
+Patch0:		no-dictionary.diff
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Requires:       skkdic
-BuildRequires:  scim-devel
+Requires		skkdic
+BuildRequires:	scim-devel
 
 %description
-Scim-skk is a SCIM IMEngine module for skk to support Japanese input.
+Scim-skk is a SCIM IMEngine module for skk to support Japanese input
 
 
 %prep
@@ -43,12 +43,18 @@
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING NEWS README ChangeLog
+%dir %{_libdir}/scim-1.0/IMEngine
 %{_libdir}/scim-1.0/IMEngine/skk.so
+%dir %{_libdir}/scim-1.0/SetupUI
 %{_libdir}/scim-1.0/SetupUI/skk-imengine-setup.so
 %{_datadir}/scim/icons/scim-skk.png
+%{_datadir}/scim/icons/scim-skk.png
 
 
 %changelog
+* Sat Sep 17 2005 Ryo Dairiki  - 0.3.0-3
+- a bit more cleanup (Thanks, Jens)
+
 * Tue Sep  6 2005 Ryo Dairiki  - 0.3.0-2
 - initial packaging for Fedora Extras
 - cleanup specfile (Jens Petersen)



From fedora-extras-commits at redhat.com  Fri Sep 16 15:55:14 2005
From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo))
Date: Fri, 16 Sep 2005 11:55:14 -0400
Subject: owners owners.list,1.219,1.220
Message-ID: <200509161555.j8GFtEBU004027@cvs-int.fedora.redhat.com>

Author: ryo

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4008

Modified Files:
	owners.list 
Log Message:
add scim-skk entry



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.219
retrieving revision 1.220
diff -u -r1.219 -r1.220
--- owners.list	16 Sep 2005 02:06:49 -0000	1.219
+++ owners.list	16 Sep 2005 15:55:11 -0000	1.220
@@ -891,6 +891,7 @@
 Fedora Extras|scim-hangul|SCIM IMEngine for Korean Hangul|tagoh at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|scim-pinyin|Chinese input method for SCIM|ryo-dairiki at mbm.nifty.com|extras-qa at fedoraproject.org|petersen at redhat.com
 Fedora Extras|scim-qtimm|SCIM Qt Input Method module|petersen at redhat.com|extras-qa at fedoraproject.org|
+Fedora Extras|scim-skk|Scim-skk is a SCIM IMEngine module for skk to support Japanese input|ryo-dairiki at users.sourceforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|scim-tables|SCIM Generic Table IMEngine and its data files|ryo-dairiki at mbm.nifty.com|extras-qa at fedoraproject.org|
 Fedora Extras|scim-tomoe|Tomoe module for SCIM for Japanese handwritten input|ryo-dairiki at mbm.nifty.com|extras-qa at fedoraproject.org|
 Fedora Extras|scmxx|Exchange data with Siemens mobile phones|andreas at bawue.net|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Fri Sep 16 16:06:47 2005
From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo))
Date: Fri, 16 Sep 2005 12:06:47 -0400
Subject: owners owners.list,1.220,1.221
Message-ID: <200509161607.j8GG7Nnp005418@cvs-int.fedora.redhat.com>

Author: ryo

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5393

Modified Files:
	owners.list 
Log Message:
change my address from *@mbm.nifty.com to *@users.sourceforge.net



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.220
retrieving revision 1.221
diff -u -r1.220 -r1.221
--- owners.list	16 Sep 2005 15:55:11 -0000	1.220
+++ owners.list	16 Sep 2005 16:06:45 -0000	1.221
@@ -889,11 +889,11 @@
 Fedora Extras|scim-anthy|SCIM IMEngine for Japanese input with anthy|tagoh at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|scim-chewing|SCIM IMEngine for Traditional Chinese|petersen at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|scim-hangul|SCIM IMEngine for Korean Hangul|tagoh at redhat.com|extras-qa at fedoraproject.org|
-Fedora Extras|scim-pinyin|Chinese input method for SCIM|ryo-dairiki at mbm.nifty.com|extras-qa at fedoraproject.org|petersen at redhat.com
+Fedora Extras|scim-pinyin|Chinese input method for SCIM|ryo-dairiki at users.sourceforge.net|extras-qa at fedoraproject.org|petersen at redhat.com
 Fedora Extras|scim-qtimm|SCIM Qt Input Method module|petersen at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|scim-skk|Scim-skk is a SCIM IMEngine module for skk to support Japanese input|ryo-dairiki at users.sourceforge.net|extras-qa at fedoraproject.org|
-Fedora Extras|scim-tables|SCIM Generic Table IMEngine and its data files|ryo-dairiki at mbm.nifty.com|extras-qa at fedoraproject.org|
-Fedora Extras|scim-tomoe|Tomoe module for SCIM for Japanese handwritten input|ryo-dairiki at mbm.nifty.com|extras-qa at fedoraproject.org|
+Fedora Extras|scim-tables|SCIM Generic Table IMEngine and its data files|ryo-dairiki at users.sourceforge.net|extras-qa at fedoraproject.org|
+Fedora Extras|scim-tomoe|Tomoe module for SCIM for Japanese handwritten input|ryo-dairiki at users.sourceforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|scmxx|Exchange data with Siemens mobile phones|andreas at bawue.net|extras-qa at fedoraproject.org|
 Fedora Extras|scons|An Open Source software construction tool|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|scorched3d|A game based loosely on the classic DOS game Scorched Earth|pmatilai at laiskiainen.org|extras-qa at fedoraproject.org|
@@ -977,7 +977,7 @@
 Fedora Extras|tkcvs|TkCVS and TkDiff|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|tktable|Table/matrix widget extension to Tcl/Tk|jfontain at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|tla|The Low-Budget arch Revision Control System|shahms at shahms.com|extras-qa at fedoraproject.org|
-Fedora Extras|tomoe|Japanese handwritten input system|ryo-dairiki at mbm.nifty.com|extras-qa at fedoraproject.org|
+Fedora Extras|tomoe|Japanese handwritten input system|ryo-dairiki at users.sourceforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|torcs|An OpenGL 3d racing game|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|torcs-data|The Open Racing Car Simulator data files|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|tpb|IBM ThinkPad button support utility|ville.skytta at iki.fi|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Fri Sep 16 16:07:50 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri, 16 Sep 2005 12:07:50 -0400
Subject: rpms/gc/devel gc-6.6-no-undefined.patch, NONE, 1.1 gc.spec, 1.12,
	1.13 gc6.5-opendl.patch, 1.1, NONE
Message-ID: <200509161608.j8GG8f9x005447@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/gc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5425

Modified Files:
	gc.spec 
Added Files:
	gc-6.6-no-undefined.patch 
Removed Files:
	gc6.5-opendl.patch 
Log Message:
* Wed Sep 14 2005 Rex Dieter  6.6-3
- no-undefined patch, libtool madness (#166344)


gc-6.6-no-undefined.patch:

--- NEW FILE gc-6.6-no-undefined.patch ---
--- gc6.6/Makefile.in.no-undefined	2005-09-09 11:34:45.000000000 -0500
+++ gc6.6/Makefile.in	2005-09-16 10:35:48.700954361 -0500
@@ -340,15 +340,15 @@
 # linuxthread semaphore functions get linked:
 libgc_la_LIBADD = @addobjs@ $(THREADDLLIBS) $(UNWINDLIBS)
 libgc_la_DEPENDENCIES = @addobjs@
-libgc_la_LDFLAGS = -version-info 1:2:0
+libgc_la_LDFLAGS = -version-info 1:2:0 -no-undefined -Wl,--no-undefined
 EXTRA_libgc_la_SOURCES = alpha_mach_dep.S \
     mips_sgi_mach_dep.s mips_ultrix_mach_dep.s powerpc_darwin_mach_dep.s \
     rs6000_mach_dep.s sparc_mach_dep.S sparc_netbsd_mach_dep.s \
     sparc_sunos4_mach_dep.s ia64_save_regs_in_stack.s
 
 libgccpp_la_SOURCES = gc_cpp.cc
-libgccpp_la_LIBADD = $(THREADDLLIBS) $(UNWINDLIBS)
-libgccpp_la_LDFLAGS = -version-info 1:2:0
+libgccpp_la_LIBADD = ./libgc.la
+libgccpp_la_LDFLAGS = -version-info 1:2:0 -no-undefined -Wl,--no-undefined
 AM_CXXFLAGS = @GC_CFLAGS@
 AM_CFLAGS = @GC_CFLAGS@
 @CPLUSPLUS_FALSE at extra_checks = 
@@ -356,9 +356,9 @@
 
 # gctest_OBJECTS = test.o
 gctest_SOURCES = tests/test.c
-gctest_LDADD = ./libgc.la $(THREADDLLIBS) $(UNWINDLIBS) $(EXTRA_TEST_LIBS)
+gctest_LDADD = ./libgc.la $(EXTRA_TEST_LIBS)
 test_cpp_SOURCES = tests/test_cpp.cc
-test_cpp_LDADD = ./libgc.la ./libgccpp.la $(THREADDLLIBS) $(UNWINDLIBS) $(EXTRA_TEST_LIBS)
+test_cpp_LDADD = ./libgccpp.la $(EXTRA_TEST_LIBS)
 TESTS = gctest $(extra_checks)
 all_objs = @addobjs@ $(libgc_la_OBJECTS)
 @COMPILER_XLC_FALSE at ASM_CPP_OPTIONS = -Wp,-P -x assembler-with-cpp
--- gc6.6/Makefile.am.no-undefined	2005-05-28 23:54:12.000000000 -0500
+++ gc6.6/Makefile.am	2005-09-16 10:35:02.816840997 -0500
@@ -57,7 +57,7 @@
 # linuxthread semaphore functions get linked:
 libgc_la_LIBADD = @addobjs@ $(THREADDLLIBS) $(UNWINDLIBS)
 libgc_la_DEPENDENCIES = @addobjs@
-libgc_la_LDFLAGS = -version-info 1:2:0
+libgc_la_LDFLAGS = -version-info 1:2:0 -no-undefined -Wl,--no-undefined
 
 EXTRA_libgc_la_SOURCES = alpha_mach_dep.S \
     mips_sgi_mach_dep.s mips_ultrix_mach_dep.s powerpc_darwin_mach_dep.s \
@@ -65,8 +65,8 @@
     sparc_sunos4_mach_dep.s ia64_save_regs_in_stack.s
 
 libgccpp_la_SOURCES = gc_cpp.cc
-libgccpp_la_LIBADD = $(THREADDLLIBS) $(UNWINDLIBS)
-libgccpp_la_LDFLAGS = -version-info 1:2:0
+libgccpp_la_LIBADD = ./libgc.la
+libgccpp_la_LDFLAGS = -version-info 1:2:0 -no-undefined -Wl,--no-undefined
 
 EXTRA_DIST += alpha_mach_dep.S mips_sgi_mach_dep.s sparc_mach_dep.S
 
@@ -91,9 +91,9 @@
 ##     are included in the distribution
 # gctest_OBJECTS = test.o
 gctest_SOURCES = tests/test.c
-gctest_LDADD = ./libgc.la $(THREADDLLIBS) $(UNWINDLIBS) $(EXTRA_TEST_LIBS)
+gctest_LDADD = ./libgc.la $(EXTRA_TEST_LIBS)
 test_cpp_SOURCES = tests/test_cpp.cc
-test_cpp_LDADD = ./libgc.la ./libgccpp.la $(THREADDLLIBS) $(UNWINDLIBS) $(EXTRA_TEST_LIBS)
+test_cpp_LDADD = ./libgccpp.la $(EXTRA_TEST_LIBS)
 
 TESTS = gctest $(extra_checks)
 


Index: gc.spec
===================================================================
RCS file: /cvs/extras/rpms/gc/devel/gc.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- gc.spec	13 Sep 2005 12:37:23 -0000	1.12
+++ gc.spec	16 Sep 2005 16:07:48 -0000	1.13
@@ -4,14 +4,16 @@
 Name:    gc	
 Version: 6.6
 
-Release: 2%{?dist}
+Release: 3%{?dist}
 Group:   System Environment/Libraries
 License: BSD
 Url:     http://www.hpl.hp.com/personal/Hans_Boehm/gc/	
 Source:  http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/gc6.6.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Patch1: gc6.5-opendl.patch
+# force no undefined symbols (#166344)
+Patch1: gc-6.6-no-undefined.patch
+BuildRequires: libtool automake autoconf
 
 
 %description
@@ -27,9 +29,16 @@
 
 
 %prep
-%setup -n %{name}%{version}
+%setup -q -n %{name}%{version}
 
-#patch1 -p1 -b .opendl
+%patch1 -p1 -b .no-undefined
+
+cp -f %{_datadir}/aclocal/libtool.m4 .
+libtoolize --copy --force
+aclocal
+automake
+autoconf
+#autoheader
 
 
 %build
@@ -44,6 +53,7 @@
 
 make %{?_smp_mflags}
 
+
 %check || :
 make check
 
@@ -51,7 +61,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT 
 
 install -p -D -m644 doc/gc.man	$RPM_BUILD_ROOT%{_mandir}/man3/gc.3
 
@@ -71,7 +81,8 @@
 
 %files 
 %defattr(-,root,root)
-%doc doc/README doc/README.changes doc/README.contributors
+%doc doc/README doc/README.changes doc/README.contributors 
+%doc doc/README.environment doc/README.linux
 %{_libdir}/lib*.so.*
 
 %files devel
@@ -83,6 +94,9 @@
 
 
 %changelog
+* Wed Sep 14 2005 Rex Dieter  6.6-3
+- no-undefined patch, libtool madness (#166344)
+
 * Mon Sep 12 2005 Rex Dieter  6.6-2
 - drop opendl patch (doesn't appear to be needed anymore)
 


--- gc6.5-opendl.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Sep 16 17:49:28 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri, 16 Sep 2005 13:49:28 -0400
Subject: rpms/gc/FC-3 gc-6.6-no-undefined.patch, NONE, 1.1 gc.spec, 1.9,
	1.10 gc6.5-opendl.patch, 1.1, NONE
Message-ID: <200509161749.j8GHnw8h007277@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/gc/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7228/FC-3

Modified Files:
	gc.spec 
Added Files:
	gc-6.6-no-undefined.patch 
Removed Files:
	gc6.5-opendl.patch 
Log Message:
* Wed Sep 14 2005 Rex Dieter  6.6-3
- no-undefined patch, libtool madness (#166344)


gc-6.6-no-undefined.patch:

--- NEW FILE gc-6.6-no-undefined.patch ---
--- gc6.6/Makefile.in.no-undefined	2005-09-09 11:34:45.000000000 -0500
+++ gc6.6/Makefile.in	2005-09-16 10:35:48.700954361 -0500
@@ -340,15 +340,15 @@
 # linuxthread semaphore functions get linked:
 libgc_la_LIBADD = @addobjs@ $(THREADDLLIBS) $(UNWINDLIBS)
 libgc_la_DEPENDENCIES = @addobjs@
-libgc_la_LDFLAGS = -version-info 1:2:0
+libgc_la_LDFLAGS = -version-info 1:2:0 -no-undefined -Wl,--no-undefined
 EXTRA_libgc_la_SOURCES = alpha_mach_dep.S \
     mips_sgi_mach_dep.s mips_ultrix_mach_dep.s powerpc_darwin_mach_dep.s \
     rs6000_mach_dep.s sparc_mach_dep.S sparc_netbsd_mach_dep.s \
     sparc_sunos4_mach_dep.s ia64_save_regs_in_stack.s
 
 libgccpp_la_SOURCES = gc_cpp.cc
-libgccpp_la_LIBADD = $(THREADDLLIBS) $(UNWINDLIBS)
-libgccpp_la_LDFLAGS = -version-info 1:2:0
+libgccpp_la_LIBADD = ./libgc.la
+libgccpp_la_LDFLAGS = -version-info 1:2:0 -no-undefined -Wl,--no-undefined
 AM_CXXFLAGS = @GC_CFLAGS@
 AM_CFLAGS = @GC_CFLAGS@
 @CPLUSPLUS_FALSE at extra_checks = 
@@ -356,9 +356,9 @@
 
 # gctest_OBJECTS = test.o
 gctest_SOURCES = tests/test.c
-gctest_LDADD = ./libgc.la $(THREADDLLIBS) $(UNWINDLIBS) $(EXTRA_TEST_LIBS)
+gctest_LDADD = ./libgc.la $(EXTRA_TEST_LIBS)
 test_cpp_SOURCES = tests/test_cpp.cc
-test_cpp_LDADD = ./libgc.la ./libgccpp.la $(THREADDLLIBS) $(UNWINDLIBS) $(EXTRA_TEST_LIBS)
+test_cpp_LDADD = ./libgccpp.la $(EXTRA_TEST_LIBS)
 TESTS = gctest $(extra_checks)
 all_objs = @addobjs@ $(libgc_la_OBJECTS)
 @COMPILER_XLC_FALSE at ASM_CPP_OPTIONS = -Wp,-P -x assembler-with-cpp
--- gc6.6/Makefile.am.no-undefined	2005-05-28 23:54:12.000000000 -0500
+++ gc6.6/Makefile.am	2005-09-16 10:35:02.816840997 -0500
@@ -57,7 +57,7 @@
 # linuxthread semaphore functions get linked:
 libgc_la_LIBADD = @addobjs@ $(THREADDLLIBS) $(UNWINDLIBS)
 libgc_la_DEPENDENCIES = @addobjs@
-libgc_la_LDFLAGS = -version-info 1:2:0
+libgc_la_LDFLAGS = -version-info 1:2:0 -no-undefined -Wl,--no-undefined
 
 EXTRA_libgc_la_SOURCES = alpha_mach_dep.S \
     mips_sgi_mach_dep.s mips_ultrix_mach_dep.s powerpc_darwin_mach_dep.s \
@@ -65,8 +65,8 @@
     sparc_sunos4_mach_dep.s ia64_save_regs_in_stack.s
 
 libgccpp_la_SOURCES = gc_cpp.cc
-libgccpp_la_LIBADD = $(THREADDLLIBS) $(UNWINDLIBS)
-libgccpp_la_LDFLAGS = -version-info 1:2:0
+libgccpp_la_LIBADD = ./libgc.la
+libgccpp_la_LDFLAGS = -version-info 1:2:0 -no-undefined -Wl,--no-undefined
 
 EXTRA_DIST += alpha_mach_dep.S mips_sgi_mach_dep.s sparc_mach_dep.S
 
@@ -91,9 +91,9 @@
 ##     are included in the distribution
 # gctest_OBJECTS = test.o
 gctest_SOURCES = tests/test.c
-gctest_LDADD = ./libgc.la $(THREADDLLIBS) $(UNWINDLIBS) $(EXTRA_TEST_LIBS)
+gctest_LDADD = ./libgc.la $(EXTRA_TEST_LIBS)
 test_cpp_SOURCES = tests/test_cpp.cc
-test_cpp_LDADD = ./libgc.la ./libgccpp.la $(THREADDLLIBS) $(UNWINDLIBS) $(EXTRA_TEST_LIBS)
+test_cpp_LDADD = ./libgccpp.la $(EXTRA_TEST_LIBS)
 
 TESTS = gctest $(extra_checks)
 


Index: gc.spec
===================================================================
RCS file: /cvs/extras/rpms/gc/FC-3/gc.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- gc.spec	13 Sep 2005 12:37:22 -0000	1.9
+++ gc.spec	16 Sep 2005 17:49:26 -0000	1.10
@@ -4,14 +4,16 @@
 Name:    gc	
 Version: 6.6
 
-Release: 2%{?dist}
+Release: 3%{?dist}
 Group:   System Environment/Libraries
 License: BSD
 Url:     http://www.hpl.hp.com/personal/Hans_Boehm/gc/	
 Source:  http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/gc6.6.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Patch1: gc6.5-opendl.patch
+# force no undefined symbols (#166344)
+Patch1: gc-6.6-no-undefined.patch
+BuildRequires: libtool automake autoconf
 
 
 %description
@@ -27,9 +29,16 @@
 
 
 %prep
-%setup -n %{name}%{version}
+%setup -q -n %{name}%{version}
 
-#patch1 -p1 -b .opendl
+%patch1 -p1 -b .no-undefined
+
+cp -f %{_datadir}/aclocal/libtool.m4 .
+libtoolize --copy --force
+aclocal
+automake
+autoconf
+#autoheader
 
 
 %build
@@ -44,6 +53,7 @@
 
 make %{?_smp_mflags}
 
+
 %check || :
 make check
 
@@ -51,7 +61,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT 
 
 install -p -D -m644 doc/gc.man	$RPM_BUILD_ROOT%{_mandir}/man3/gc.3
 
@@ -71,7 +81,8 @@
 
 %files 
 %defattr(-,root,root)
-%doc doc/README doc/README.changes doc/README.contributors
+%doc doc/README doc/README.changes doc/README.contributors 
+%doc doc/README.environment doc/README.linux
 %{_libdir}/lib*.so.*
 
 %files devel
@@ -83,6 +94,9 @@
 
 
 %changelog
+* Wed Sep 14 2005 Rex Dieter  6.6-3
+- no-undefined patch, libtool madness (#166344)
+
 * Mon Sep 12 2005 Rex Dieter  6.6-2
 - drop opendl patch (doesn't appear to be needed anymore)
 


--- gc6.5-opendl.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Sep 16 17:49:29 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri, 16 Sep 2005 13:49:29 -0400
Subject: rpms/gc/FC-4 gc-6.6-no-undefined.patch, NONE, 1.1 gc.spec, 1.11,
	1.12 gc6.5-opendl.patch, 1.1, NONE
Message-ID: <200509161749.j8GHnxFq007280@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/gc/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7228/FC-4

Modified Files:
	gc.spec 
Added Files:
	gc-6.6-no-undefined.patch 
Removed Files:
	gc6.5-opendl.patch 
Log Message:
* Wed Sep 14 2005 Rex Dieter  6.6-3
- no-undefined patch, libtool madness (#166344)


gc-6.6-no-undefined.patch:

--- NEW FILE gc-6.6-no-undefined.patch ---
--- gc6.6/Makefile.in.no-undefined	2005-09-09 11:34:45.000000000 -0500
+++ gc6.6/Makefile.in	2005-09-16 10:35:48.700954361 -0500
@@ -340,15 +340,15 @@
 # linuxthread semaphore functions get linked:
 libgc_la_LIBADD = @addobjs@ $(THREADDLLIBS) $(UNWINDLIBS)
 libgc_la_DEPENDENCIES = @addobjs@
-libgc_la_LDFLAGS = -version-info 1:2:0
+libgc_la_LDFLAGS = -version-info 1:2:0 -no-undefined -Wl,--no-undefined
 EXTRA_libgc_la_SOURCES = alpha_mach_dep.S \
     mips_sgi_mach_dep.s mips_ultrix_mach_dep.s powerpc_darwin_mach_dep.s \
     rs6000_mach_dep.s sparc_mach_dep.S sparc_netbsd_mach_dep.s \
     sparc_sunos4_mach_dep.s ia64_save_regs_in_stack.s
 
 libgccpp_la_SOURCES = gc_cpp.cc
-libgccpp_la_LIBADD = $(THREADDLLIBS) $(UNWINDLIBS)
-libgccpp_la_LDFLAGS = -version-info 1:2:0
+libgccpp_la_LIBADD = ./libgc.la
+libgccpp_la_LDFLAGS = -version-info 1:2:0 -no-undefined -Wl,--no-undefined
 AM_CXXFLAGS = @GC_CFLAGS@
 AM_CFLAGS = @GC_CFLAGS@
 @CPLUSPLUS_FALSE at extra_checks = 
@@ -356,9 +356,9 @@
 
 # gctest_OBJECTS = test.o
 gctest_SOURCES = tests/test.c
-gctest_LDADD = ./libgc.la $(THREADDLLIBS) $(UNWINDLIBS) $(EXTRA_TEST_LIBS)
+gctest_LDADD = ./libgc.la $(EXTRA_TEST_LIBS)
 test_cpp_SOURCES = tests/test_cpp.cc
-test_cpp_LDADD = ./libgc.la ./libgccpp.la $(THREADDLLIBS) $(UNWINDLIBS) $(EXTRA_TEST_LIBS)
+test_cpp_LDADD = ./libgccpp.la $(EXTRA_TEST_LIBS)
 TESTS = gctest $(extra_checks)
 all_objs = @addobjs@ $(libgc_la_OBJECTS)
 @COMPILER_XLC_FALSE at ASM_CPP_OPTIONS = -Wp,-P -x assembler-with-cpp
--- gc6.6/Makefile.am.no-undefined	2005-05-28 23:54:12.000000000 -0500
+++ gc6.6/Makefile.am	2005-09-16 10:35:02.816840997 -0500
@@ -57,7 +57,7 @@
 # linuxthread semaphore functions get linked:
 libgc_la_LIBADD = @addobjs@ $(THREADDLLIBS) $(UNWINDLIBS)
 libgc_la_DEPENDENCIES = @addobjs@
-libgc_la_LDFLAGS = -version-info 1:2:0
+libgc_la_LDFLAGS = -version-info 1:2:0 -no-undefined -Wl,--no-undefined
 
 EXTRA_libgc_la_SOURCES = alpha_mach_dep.S \
     mips_sgi_mach_dep.s mips_ultrix_mach_dep.s powerpc_darwin_mach_dep.s \
@@ -65,8 +65,8 @@
     sparc_sunos4_mach_dep.s ia64_save_regs_in_stack.s
 
 libgccpp_la_SOURCES = gc_cpp.cc
-libgccpp_la_LIBADD = $(THREADDLLIBS) $(UNWINDLIBS)
-libgccpp_la_LDFLAGS = -version-info 1:2:0
+libgccpp_la_LIBADD = ./libgc.la
+libgccpp_la_LDFLAGS = -version-info 1:2:0 -no-undefined -Wl,--no-undefined
 
 EXTRA_DIST += alpha_mach_dep.S mips_sgi_mach_dep.s sparc_mach_dep.S
 
@@ -91,9 +91,9 @@
 ##     are included in the distribution
 # gctest_OBJECTS = test.o
 gctest_SOURCES = tests/test.c
-gctest_LDADD = ./libgc.la $(THREADDLLIBS) $(UNWINDLIBS) $(EXTRA_TEST_LIBS)
+gctest_LDADD = ./libgc.la $(EXTRA_TEST_LIBS)
 test_cpp_SOURCES = tests/test_cpp.cc
-test_cpp_LDADD = ./libgc.la ./libgccpp.la $(THREADDLLIBS) $(UNWINDLIBS) $(EXTRA_TEST_LIBS)
+test_cpp_LDADD = ./libgccpp.la $(EXTRA_TEST_LIBS)
 
 TESTS = gctest $(extra_checks)
 


Index: gc.spec
===================================================================
RCS file: /cvs/extras/rpms/gc/FC-4/gc.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- gc.spec	12 Sep 2005 20:28:58 -0000	1.11
+++ gc.spec	16 Sep 2005 17:49:26 -0000	1.12
@@ -4,14 +4,16 @@
 Name:    gc	
 Version: 6.6
 
-Release: 2%{?dist}
+Release: 3%{?dist}
 Group:   System Environment/Libraries
 License: BSD
 Url:     http://www.hpl.hp.com/personal/Hans_Boehm/gc/	
 Source:  http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/gc6.6.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Patch1: gc6.5-opendl.patch
+# force no undefined symbols (#166344)
+Patch1: gc-6.6-no-undefined.patch
+BuildRequires: libtool automake autoconf
 
 
 %description
@@ -27,9 +29,16 @@
 
 
 %prep
-%setup -n %{name}%{version}
+%setup -q -n %{name}%{version}
 
-#patch1 -p1 -b .opendl
+%patch1 -p1 -b .no-undefined
+
+cp -f %{_datadir}/aclocal/libtool.m4 .
+libtoolize --copy --force
+aclocal
+automake
+autoconf
+#autoheader
 
 
 %build
@@ -44,6 +53,7 @@
 
 make %{?_smp_mflags}
 
+
 %check || :
 make check
 
@@ -51,7 +61,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT 
 
 install -p -D -m644 doc/gc.man	$RPM_BUILD_ROOT%{_mandir}/man3/gc.3
 
@@ -71,7 +81,8 @@
 
 %files 
 %defattr(-,root,root)
-%doc doc/README doc/README.changes doc/README.contributors
+%doc doc/README doc/README.changes doc/README.contributors 
+%doc doc/README.environment doc/README.linux
 %{_libdir}/lib*.so.*
 
 %files devel
@@ -83,6 +94,9 @@
 
 
 %changelog
+* Wed Sep 14 2005 Rex Dieter  6.6-3
+- no-undefined patch, libtool madness (#166344)
+
 * Mon Sep 12 2005 Rex Dieter  6.6-2
 - drop opendl patch (doesn't appear to be needed anymore)
 


--- gc6.5-opendl.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Sep 16 18:03:36 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Fri, 16 Sep 2005 14:03:36 -0400
Subject: rpms/perl-Config-General/devel .cvsignore, 1.3,
	1.4 perl-Config-General.spec, 1.7, 1.8 sources, 1.3, 1.4
Message-ID: <200509161804.j8GI4U4w008696@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/perl-Config-General/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8651/devel

Modified Files:
	.cvsignore perl-Config-General.spec sources 
Log Message:
* Fri Sep 16 2005 Ville Skytt??  - 2.30-1
- 2.30.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Config-General/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	18 May 2005 15:42:49 -0000	1.3
+++ .cvsignore	16 Sep 2005 18:03:33 -0000	1.4
@@ -1 +1 @@
-Config-General-2.28.tar.gz
+Config-General-2.30.tar.gz


Index: perl-Config-General.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Config-General/devel/perl-Config-General.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- perl-Config-General.spec	18 May 2005 15:42:49 -0000	1.7
+++ perl-Config-General.spec	16 Sep 2005 18:03:34 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           perl-Config-General
-Version:        2.28
-Release:        2
+Version:        2.30
+Release:        1%{?dist}
 Summary:        Generic configuration module for Perl
 
 Group:          Development/Libraries
@@ -47,7 +47,7 @@
 chmod -R u+w $RPM_BUILD_ROOT/*
 
 
-%check || :
+%check
 make test
 
 
@@ -57,12 +57,15 @@
 
 %files
 %defattr(-,root,root,-)
-%doc Changelog README
+%doc Changelog README example.cfg
 %{perl_vendorlib}/Config/
 %{_mandir}/man3/Config::*.3*
 
 
 %changelog
+* Fri Sep 16 2005 Ville Skytt??  - 2.30-1
+- 2.30.
+
 * Wed May 18 2005 Ville Skytt??  - 2.28-2
 - 2.28.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Config-General/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	18 May 2005 15:42:49 -0000	1.3
+++ sources	16 Sep 2005 18:03:34 -0000	1.4
@@ -1 +1 @@
-6f284f7fd06efd7ea1a1e66f1047fad2  Config-General-2.28.tar.gz
+289037b40ef5a78bd59f894bcc1d4f51  Config-General-2.30.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep 16 18:03:07 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Fri, 16 Sep 2005 14:03:07 -0400
Subject: rpms/perl-Config-General/FC-4 .cvsignore, 1.3,
	1.4 perl-Config-General.spec, 1.7, 1.8 sources, 1.3, 1.4
Message-ID: <200509161804.j8GI4cTg008703@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/perl-Config-General/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8651/FC-4

Modified Files:
	.cvsignore perl-Config-General.spec sources 
Log Message:
* Fri Sep 16 2005 Ville Skytt??  - 2.30-1
- 2.30.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Config-General/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	18 May 2005 15:42:49 -0000	1.3
+++ .cvsignore	16 Sep 2005 18:03:04 -0000	1.4
@@ -1 +1 @@
-Config-General-2.28.tar.gz
+Config-General-2.30.tar.gz


Index: perl-Config-General.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Config-General/FC-4/perl-Config-General.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- perl-Config-General.spec	18 May 2005 15:42:49 -0000	1.7
+++ perl-Config-General.spec	16 Sep 2005 18:03:04 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           perl-Config-General
-Version:        2.28
-Release:        2
+Version:        2.30
+Release:        1%{?dist}
 Summary:        Generic configuration module for Perl
 
 Group:          Development/Libraries
@@ -47,7 +47,7 @@
 chmod -R u+w $RPM_BUILD_ROOT/*
 
 
-%check || :
+%check
 make test
 
 
@@ -57,12 +57,15 @@
 
 %files
 %defattr(-,root,root,-)
-%doc Changelog README
+%doc Changelog README example.cfg
 %{perl_vendorlib}/Config/
 %{_mandir}/man3/Config::*.3*
 
 
 %changelog
+* Fri Sep 16 2005 Ville Skytt??  - 2.30-1
+- 2.30.
+
 * Wed May 18 2005 Ville Skytt??  - 2.28-2
 - 2.28.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Config-General/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	18 May 2005 15:42:49 -0000	1.3
+++ sources	16 Sep 2005 18:03:05 -0000	1.4
@@ -1 +1 @@
-6f284f7fd06efd7ea1a1e66f1047fad2  Config-General-2.28.tar.gz
+289037b40ef5a78bd59f894bcc1d4f51  Config-General-2.30.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep 16 18:11:21 2005
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Fri, 16 Sep 2005 14:11:21 -0400
Subject: extras-buildsys/common FileDownloader.py,1.14,1.15
Message-ID: <200509161811.j8GIBLx1008963@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8896/common

Modified Files:
	FileDownloader.py 
Log Message:
2005-09-16  Dan Williams  

    * builder/builder.py
      common/FileDownloader.py
      server/ArchJob.py
        - Rename FileNameError -> FileNameException

    * builder/builder.py
        - Clean up exception handling on job creation so that we
            don't end up calling start() before Thread.__init__() got
            called.




Index: FileDownloader.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/common/FileDownloader.py,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- FileDownloader.py	26 Jul 2005 17:47:19 -0000	1.14
+++ FileDownloader.py	16 Sep 2005 18:11:19 -0000	1.15
@@ -25,13 +25,7 @@
 import exceptions
 
 
-class FileNameError(exceptions.Exception):
-    def __init__(self, args=None):
-        exceptions.Exception.__init__(self)
-        self.args = args
-    def __str__(self):
-        return self.args
-
+class FileNameException(exceptions.Exception): pass
 
 def get_base_filename_from_url(url, legal_exts):
     """ Safely unquotes a URL and gets the base file name from it.
@@ -51,12 +45,12 @@
     # If after 5 iterations of unquoting, the strings still aren't the same,
     # something is wrong.
     if (count == 0) and (unquoted != last_unquoted):
-        raise FileNameError("URL quoting level too deep.")
+        raise FileNameException("URL quoting level too deep.")
 
     # Try to grab the filename off the end of the URL
     index = url.rfind('/')
     if index is -1:
-        raise FileNameError("No separator in URL.")
+        raise FileNameException("No separator in URL.")
     filename = url[index+1:]
 
     # Only accept certain file extensions
@@ -67,7 +61,7 @@
             break
 
     if not ext_ok:
-        raise FileNameError("Extension was not allowed.")
+        raise FileNameException("Extension was not allowed.")
 
     # FIXME: what other validation can we do here?
     safe_list = ['_', '-', '.', '+']
@@ -76,7 +70,7 @@
         if c in safe_list or c.isalnum():
             pass
         else:
-            raise FileNameError("Illegal character '%s' encountered." % c)
+            raise FileNameException("Illegal character '%s' encountered." % c)
 
     return filename
 
@@ -88,10 +82,9 @@
         self._cb_data = cb_data
         self._url = url
         self._target_dir = target_dir
-        try:
-            self._filename = get_base_filename_from_url(self._url, legal_exts)
-        except FileNameError, e:
-            print "Couldn't get base filename from url!! Error: '%s'  URL: %s." % (e, url)
+
+        # May fail with FileNameException, trapped elsewhere
+        self._filename = get_base_filename_from_url(self._url, legal_exts)
 
         if certs and len(certs) > 0:
             self._opener = HTTPSURLopener.HTTPSURLopener(certs)



From fedora-extras-commits at redhat.com  Fri Sep 16 18:11:22 2005
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Fri, 16 Sep 2005 14:11:22 -0400
Subject: extras-buildsys/server ArchJob.py,1.15,1.16
Message-ID: <200509161811.j8GIBM3o008969@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys/server
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8896/server

Modified Files:
	ArchJob.py 
Log Message:
2005-09-16  Dan Williams  

    * builder/builder.py
      common/FileDownloader.py
      server/ArchJob.py
        - Rename FileNameError -> FileNameException

    * builder/builder.py
        - Clean up exception handling on job creation so that we
            don't end up calling start() before Thread.__init__() got
            called.




Index: ArchJob.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/ArchJob.py,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- ArchJob.py	8 Sep 2005 21:10:25 -0000	1.15
+++ ArchJob.py	16 Sep 2005 18:11:20 -0000	1.16
@@ -187,15 +187,20 @@
                     target_dir = os.path.join(self.par_job.get_stage_dir(), self._target_dict['arch'])
                     if not os.path.exists(target_dir):
                         os.makedirs(target_dir)
-                    if self._use_ssl:
-                        dl_thread = FileDownloader.FileDownloader(self.dl_callback, url, url,
-                                    target_dir, ['.rpm', '.log'], self._certs)
-                    else:
-                        dl_thread = FileDownloader.FileDownloader(self.dl_callback, url, url,
-                                    target_dir, ['.rpm', '.log'], None)
-                    dl_thread.start()
-                    undownloaded = True
-                    self.downloads[url] = 1
+                    try:
+                        if self._use_ssl:
+                            dl_thread = FileDownloader.FileDownloader(self.dl_callback, url, url,
+                                        target_dir, ['.rpm', '.log'], self._certs)
+                        else:
+                            dl_thread = FileDownloader.FileDownloader(self.dl_callback, url, url,
+                                        target_dir, ['.rpm', '.log'], None)
+                        dl_thread.start()
+                        undownloaded = True
+                        self.downloads[url] = 1 # In Progress
+                    except FileDownloader.FileNameException, e:
+                        print "%s (%s/%s): [ %s ] Bad file name error when getting %s: '%s'" % (self.par_job.uid,
+                                    self.par_job.package, self._target_dict['arch'], self.bci.address(), url, e)
+                        self.downloads[url] = 2 # Error
                     break
                 elif dl_status == 1:
                     # in progress
@@ -251,7 +256,7 @@
                 fname = FileDownloader.get_base_filename_from_url(url, ['.rpm', '.log'])
                 if self.downloads[url] == 3:
                     files.append(fname)
-            except FileDownloader.FileNameError, e:
+            except FileDownloader.FileNameException, e:
                 # Just ignore the file then
                 print "%s (%s/%s): Illegal file name.  Error: '%s', URL: %s" % (self.par_job.uid,
                         self.par_job.package, self._target_dict['arch'], e, url)



From fedora-extras-commits at redhat.com  Fri Sep 16 18:10:59 2005
From: fedora-extras-commits at redhat.com (Chris Wright (chrisw))
Date: Fri, 16 Sep 2005 14:10:59 -0400
Subject: rpms/git-core import.log,1.2,1.3
Message-ID: <200509161811.j8GIBTq8008972@cvs-int.fedora.redhat.com>

Author: chrisw

Update of /cvs/extras/rpms/git-core
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8848

Modified Files:
	import.log 
Log Message:
auto-import git-core-0.99.6-1 on branch devel from git-core-0.99.6-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/git-core/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	30 Aug 2005 00:37:24 -0000	1.2
+++ import.log	16 Sep 2005 18:10:57 -0000	1.3
@@ -1 +1,2 @@
 git-core-0_99_4-4:HEAD:git-core-0.99.4-4.src.rpm:1125362230
+git-core-0_99_6-1:HEAD:git-core-0.99.6-1.src.rpm:1126894247



From fedora-extras-commits at redhat.com  Fri Sep 16 18:11:00 2005
From: fedora-extras-commits at redhat.com (Chris Wright (chrisw))
Date: Fri, 16 Sep 2005 14:11:00 -0400
Subject: rpms/git-core/devel .cvsignore, 1.2, 1.3 git-core.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <200509161811.j8GIBUYi008977@cvs-int.fedora.redhat.com>

Author: chrisw

Update of /cvs/extras/rpms/git-core/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8848/devel

Modified Files:
	.cvsignore git-core.spec sources 
Log Message:
auto-import git-core-0.99.6-1 on branch devel from git-core-0.99.6-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/git-core/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	30 Aug 2005 00:37:24 -0000	1.2
+++ .cvsignore	16 Sep 2005 18:10:58 -0000	1.3
@@ -1 +1 @@
-git-core-0.99.4.tar.gz
+git-core-0.99.6.tar.gz


Index: git-core.spec
===================================================================
RCS file: /cvs/extras/rpms/git-core/devel/git-core.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- git-core.spec	30 Aug 2005 00:37:24 -0000	1.1
+++ git-core.spec	16 Sep 2005 18:10:58 -0000	1.2
@@ -1,7 +1,7 @@
 # Pass --without docs to rpmbuild if you don't want the documetnation
 Name: 		git-core
-Version: 	0.99.4
-Release: 	4%{?dist}
+Version: 	0.99.6
+Release: 	1%{?dist}
 Summary:  	Git core and tools
 License: 	GPL
 Group: 		Development/Tools
@@ -24,12 +24,11 @@
 
 %build
 make COPTS="$RPM_OPT_FLAGS" prefix=%{_prefix} all %{!?_without_docs: doc}
-make COPTS="$RPM_OPT_FLAGS" -C tools all
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make dest=$RPM_BUILD_ROOT prefix=%{_prefix} mandir=%{_mandir} \
-     install install-tools %{!?_without_docs: install-doc}
+make DESTDIR=$RPM_BUILD_ROOT prefix=%{_prefix} mandir=%{_mandir} \
+     install %{!?_without_docs: install-doc}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -44,6 +43,9 @@
 %{!?_without_docs: %{_mandir}/man7/*.7.gz}
 
 %changelog
+* Fri Sep 16 2005 Chris Wright  0.99.6-1
+- update to 0.99.6
+
 * Thu Aug 18 2005 Chris Wright  0.99.4-4
 - drop sh_utils, sh-utils, diffutils, mktemp, and openssl Requires
 - use RPM_OPT_FLAGS in spec file, drop patch0


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/git-core/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	30 Aug 2005 00:37:24 -0000	1.2
+++ sources	16 Sep 2005 18:10:58 -0000	1.3
@@ -1 +1 @@
-06935e265e7a556d8819a097dcb44f35  git-core-0.99.4.tar.gz
+ca2f17bc1550909a2675386e8be46f0f  git-core-0.99.6.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep 16 18:11:15 2005
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Fri, 16 Sep 2005 14:11:15 -0400
Subject: extras-buildsys ChangeLog,1.124,1.125
Message-ID: <200509161811.j8GIBkcP009009@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8896

Modified Files:
	ChangeLog 
Log Message:
2005-09-16  Dan Williams  

    * builder/builder.py
      common/FileDownloader.py
      server/ArchJob.py
        - Rename FileNameError -> FileNameException

    * builder/builder.py
        - Clean up exception handling on job creation so that we
            don't end up calling start() before Thread.__init__() got
            called.




Index: ChangeLog
===================================================================
RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -r1.124 -r1.125
--- ChangeLog	14 Sep 2005 18:21:20 -0000	1.124
+++ ChangeLog	16 Sep 2005 18:11:13 -0000	1.125
@@ -1,3 +1,15 @@
+2005-09-16  Dan Williams  
+
+    * builder/builder.py
+      common/FileDownloader.py
+      server/ArchJob.py
+        - Rename FileNameError -> FileNameException
+
+    * builder/builder.py
+        - Clean up exception handling on job creation so that we
+            don't end up calling start() before Thread.__init__() got
+            called.
+
 2005-09-14  Dan Williams  
 
     * server/PackageJob.py



From fedora-extras-commits at redhat.com  Fri Sep 16 18:11:16 2005
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Fri, 16 Sep 2005 14:11:16 -0400
Subject: extras-buildsys/builder builder.py,1.42,1.43
Message-ID: <200509161811.j8GIBkgM009012@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys/builder
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8896/builder

Modified Files:
	builder.py 
Log Message:
2005-09-16  Dan Williams  

    * builder/builder.py
      common/FileDownloader.py
      server/ArchJob.py
        - Rename FileNameError -> FileNameException

    * builder/builder.py
        - Clean up exception handling on job creation so that we
            don't end up calling start() before Thread.__init__() got
            called.




Index: builder.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/builder/builder.py,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- builder.py	13 Sep 2005 18:43:01 -0000	1.42
+++ builder.py	16 Sep 2005 18:11:14 -0000	1.43
@@ -111,24 +111,6 @@
         logfile = os.path.join(self._result_dir, "job.log")
         self._log_fd = open(logfile, "w+")
 
-        target_dict = self._target_cfg.target_dict()
-        target_str = "%s-%s-%s-%s" % (target_dict['distro'], target_dict['target'], target_dict['arch'], target_dict['repo'])
-        self._log("""Starting job:
-   Time: %s
-   Target: %s
-   UID: %s
-   Architecture: %s
-   SRPM: %s\n\n""" % (time.asctime(time.localtime(self._starttime)), target_str, self._uniqid, self.buildarch, srpm_url))
-
-        try:
-            srpm_filename = FileDownloader.get_base_filename_from_url(srpm_url, ['.src.rpm'])
-        except FileDownloader.FileNameError, e:
-            self._status = 'failed'
-            self._srpm_path = None
-            self._log("Failed to extract SRPM filename.  Error: '%s'   URL: %s\n" % (e, srpm_url))
-            return
-
-        self._srpm_path = os.path.join(work_dir, self._uniqid, "source", srpm_filename)
         threading.Thread.__init__(self)
 
     def starttime(self):
@@ -153,7 +135,7 @@
             try:
                 os.kill(self._childpid, 9)
             except OSError, e:
-                self._log("Couldn't kill process %d: %s\n" % (self._childpid, e))
+                self._log("ERROR: Couldn't kill process %d: %s\n" % (self._childpid, e))
             else:
                 # Ensure child process is reaped
                 self._log("Waiting for mock process %d to exit...\n" % self._childpid)
@@ -186,7 +168,7 @@
             # and a download error ocurred
             if not self.is_done_status():
                 self._status = 'failed'
-                self._log("Failed to retrieve %s.\n" % url)
+                self._log("ERROR: Failed to retrieve %s.\n" % url)
 
     def _copy_mock_output_to_log(self):
         if self._mock_log and os.path.exists(self._mock_log):
@@ -323,38 +305,18 @@
         f.close()
         return contents
 
-    def _mock_done(self):
-        # Ensure child process is reaped
-        if self._childpid:
-            try:
-                (pid, status) = os.waitpid(self._childpid, 0)
-            except OSError, e:
-                self._childpid = 0
-                pass
-
-        self._copy_mock_output_to_log()
-
-        self._files = self._find_files()
-        self._log("\n\n-----------------------\n\n")
-        if self._status == 'done':
-            self._log("Job completed successfully.\n")
-        elif self._status == 'failed':
-            self._log("Job failed due to mock errors!  Please see output in root.log and build.log\n")
-        elif self._status == 'killed':
-            self._log("Job failed because it was killed.\n")
-
-        if self._log_fd:
-            self._log_fd.close()
-            self._log_fd = None
-
     def _status_init(self):
         self._log("Starting download of %s.\n" % self._srpm_url)
         self._status = 'downloading'
         target_dir = os.path.dirname(self._srpm_path)
-        dl_thread = FileDownloader.FileDownloader(self.dl_callback, self._srpm_url, self._srpm_url,
+        try:
+            dl_thread = FileDownloader.FileDownloader(self.dl_callback, self._srpm_url, self._srpm_url,
                         target_dir, ['.src.rpm'], certs)
-        dl_thread.start()
-
+            dl_thread.start()
+        except FileDownloader.FileNameException, e:
+            self._status = 'failed'
+            self._log("ERROR: Failed to begin SRPM download.  Error: '%s'   URL: %s\n" % (e, self._srpm_url))
+            
     def _status_downloading(self):
         pass
 
@@ -392,7 +354,7 @@
             # something is wrong if mock takes more than 15s to write the status file
             if time.time() > self._mockstarttime + 15:
                 self._mockstarttime = 0
-                self._log("Timed out waiting for the mock status file!  %s\n" % mockstatusfile)
+                self._log("ERROR: Timed out waiting for the mock status file!  %s\n" % mockstatusfile)
                 self.die()
         else:
             if not self._mock_config and self._mock_is_prepping():
@@ -424,8 +386,51 @@
                 if source_dir.endswith(os.path.join(self._uniqid, "source")):
                     shutil.rmtree(source_dir, ignore_errors=True)
 
+    def _job_done(self):
+        # Ensure child process is reaped, if any
+        if self._childpid:
+            try:
+                self._log("Waiting for child process %d to exit." % self._childpid)
+                (pid, status) = os.waitpid(self._childpid, 0)
+            except OSError, e:
+                self._childpid = 0
+                pass
+
+        self._copy_mock_output_to_log()
+
+        self._files = self._find_files()
+        self._log("\n\n-----------------------\n\n")
+        if self._status == 'done':
+            self._log("Job completed successfully.\n")
+        elif self._status == 'failed':
+            self._log("Job failed due to build errors!  Please see build logs.\n")
+        elif self._status == 'killed':
+            self._log("Job failed because it was killed.\n")
+
+        if self._log_fd:
+            self._log_fd.close()
+            self._log_fd = None
+
     def run(self):
-        while True:
+        # Print out a nice message at the start of the job
+        target_dict = self._target_cfg.target_dict()
+        target_str = "%s-%s-%s-%s" % (target_dict['distro'], target_dict['target'], target_dict['arch'], target_dict['repo'])
+        self._log("""Starting job:
+   Time: %s
+   Target: %s
+   UID: %s
+   Architecture: %s
+   SRPM: %s\n\n""" % (time.asctime(time.localtime(self._starttime)), target_str, self._uniqid, self.buildarch, self._srpm_url))
+
+        try:
+            srpm_filename = FileDownloader.get_base_filename_from_url(self._srpm_url, ['.src.rpm'])
+            self._srpm_path = os.path.join(work_dir, self._uniqid, "source", srpm_filename)
+        except FileDownloader.FileNameException, e:
+            self._log("ERROR: SRPM file name was invalid.  Message: '%s'" % e)
+            self._status = 'failed'
+
+        # Main build job work loop
+        while not self.is_done_status():
             if self._die:
                 self._handle_death()
 
@@ -433,16 +438,12 @@
             try:
                 func = getattr(self, "_status_%s" % self._status)
                 func()
+                time.sleep(3)
             except AttributeError:
                 self._log("ERROR: internal builder inconsistency, didn't recognize status '%s'." % self._status)
                 self._status = 'failed'
 
-            if self.is_done_status():
-                self._mock_done()
-                break
-
-            time.sleep(3)
-
+        self._job_done()
         self._endtime = time.time()
         if self._childpid:
             self._log("ERROR: childpid was !NULL  (%d)" % self._childpid)
@@ -460,6 +461,7 @@
                 self._log("  Output File: %s\n" % urllib.unquote(file_url))
             else:
                 self._log("  Error: Couldn't get file URL for file %s" % f)
+        self._log("-----------------\n")
         return file_list
 
     def status(self):
@@ -607,10 +609,10 @@
             self._building_jobs_lock.acquire()
             self._building_jobs.append(job)
             self._building_jobs_lock.release()
-            job.start()
             filename = os.path.basename(srpm_url)
             self._log("%s: started %s on %s arch %s at time %d" % (uniqid, filename,
                         target_str, target_dict['arch'], job.starttime()))
+            job.start()
         else:
             self._log("%s: Failed request for %s on %s UNSUPPORTED arch %s" %
                         (uniqid, srpm_url, target_str, target_dict['arch'], cur_time))



From fedora-extras-commits at redhat.com  Fri Sep 16 18:13:24 2005
From: fedora-extras-commits at redhat.com (Chris Wright (chrisw))
Date: Fri, 16 Sep 2005 14:13:24 -0400
Subject: rpms/git-core import.log,1.3,1.4
Message-ID: <200509161813.j8GIDtPt009100@cvs-int.fedora.redhat.com>

Author: chrisw

Update of /cvs/extras/rpms/git-core
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9060

Modified Files:
	import.log 
Log Message:
auto-import git-core-0.99.6-1 on branch FC-3 from git-core-0.99.6-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/git-core/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	16 Sep 2005 18:10:57 -0000	1.3
+++ import.log	16 Sep 2005 18:13:22 -0000	1.4
@@ -1,2 +1,3 @@
 git-core-0_99_4-4:HEAD:git-core-0.99.4-4.src.rpm:1125362230
 git-core-0_99_6-1:HEAD:git-core-0.99.6-1.src.rpm:1126894247
+git-core-0_99_6-1:FC-3:git-core-0.99.6-1.src.rpm:1126894397



From fedora-extras-commits at redhat.com  Fri Sep 16 18:13:25 2005
From: fedora-extras-commits at redhat.com (Chris Wright (chrisw))
Date: Fri, 16 Sep 2005 14:13:25 -0400
Subject: rpms/git-core/FC-3 .cvsignore, 1.2, 1.3 git-core.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <200509161813.j8GIDtmw009105@cvs-int.fedora.redhat.com>

Author: chrisw

Update of /cvs/extras/rpms/git-core/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9060/FC-3

Modified Files:
	.cvsignore git-core.spec sources 
Log Message:
auto-import git-core-0.99.6-1 on branch FC-3 from git-core-0.99.6-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/git-core/FC-3/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	30 Aug 2005 00:37:24 -0000	1.2
+++ .cvsignore	16 Sep 2005 18:13:23 -0000	1.3
@@ -1 +1 @@
-git-core-0.99.4.tar.gz
+git-core-0.99.6.tar.gz


Index: git-core.spec
===================================================================
RCS file: /cvs/extras/rpms/git-core/FC-3/git-core.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- git-core.spec	30 Aug 2005 00:37:24 -0000	1.1
+++ git-core.spec	16 Sep 2005 18:13:23 -0000	1.2
@@ -1,7 +1,7 @@
 # Pass --without docs to rpmbuild if you don't want the documetnation
 Name: 		git-core
-Version: 	0.99.4
-Release: 	4%{?dist}
+Version: 	0.99.6
+Release: 	1%{?dist}
 Summary:  	Git core and tools
 License: 	GPL
 Group: 		Development/Tools
@@ -24,12 +24,11 @@
 
 %build
 make COPTS="$RPM_OPT_FLAGS" prefix=%{_prefix} all %{!?_without_docs: doc}
-make COPTS="$RPM_OPT_FLAGS" -C tools all
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make dest=$RPM_BUILD_ROOT prefix=%{_prefix} mandir=%{_mandir} \
-     install install-tools %{!?_without_docs: install-doc}
+make DESTDIR=$RPM_BUILD_ROOT prefix=%{_prefix} mandir=%{_mandir} \
+     install %{!?_without_docs: install-doc}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -44,6 +43,9 @@
 %{!?_without_docs: %{_mandir}/man7/*.7.gz}
 
 %changelog
+* Fri Sep 16 2005 Chris Wright  0.99.6-1
+- update to 0.99.6
+
 * Thu Aug 18 2005 Chris Wright  0.99.4-4
 - drop sh_utils, sh-utils, diffutils, mktemp, and openssl Requires
 - use RPM_OPT_FLAGS in spec file, drop patch0


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/git-core/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	30 Aug 2005 00:37:24 -0000	1.2
+++ sources	16 Sep 2005 18:13:23 -0000	1.3
@@ -1 +1 @@
-06935e265e7a556d8819a097dcb44f35  git-core-0.99.4.tar.gz
+ca2f17bc1550909a2675386e8be46f0f  git-core-0.99.6.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep 16 18:24:18 2005
From: fedora-extras-commits at redhat.com (Chris Wright (chrisw))
Date: Fri, 16 Sep 2005 14:24:18 -0400
Subject: owners owners.list,1.221,1.222
Message-ID: <200509161824.j8GIOIgB009217@cvs-int.fedora.redhat.com>

Author: chrisw

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9198/owners

Modified Files:
	owners.list 
Log Message:
Add git-core to owners.list



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.221
retrieving revision 1.222
diff -u -r1.221 -r1.222
--- owners.list	16 Sep 2005 16:06:45 -0000	1.221
+++ owners.list	16 Sep 2005 18:24:16 -0000	1.222
@@ -225,6 +225,7 @@
 Fedora Extras|gif2png|A GIF to PNG converter|enrico.scholz at informatik.tu-chemnitz.de|extras-qa at fedoraproject.org|
 Fedora Extras|GiNaC|C++ library for symbolic calculation|qspencer at ieee.org|extras-qa at fedoraproject.org|
 Fedora Extras|ginac|C++ library for symbolic calculation|qspencer at ieee.org|extras-qa at fedoraproject.org|
+Fedora Extras|git-core|A distributed SCM|chrisw at osdl.org|extras-qa at fedoraproject.org|
 Fedora Extras|gkrellm-aclock|Analog clock plugin for GKrellM|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|gkrellm-freq|CPU frequency display plugin for GKrellM|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|gkrellm-hddtemp|Hard disk temperature plugin for GKrellM|ville.skytta at iki.fi|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Fri Sep 16 18:44:12 2005
From: fedora-extras-commits at redhat.com (Chris Wright (chrisw))
Date: Fri, 16 Sep 2005 14:44:12 -0400
Subject: rpms/git-core import.log,1.4,1.5
Message-ID: <200509161844.j8GIiCwT009366@cvs-int.fedora.redhat.com>

Author: chrisw

Update of /cvs/extras/rpms/git-core
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9331

Modified Files:
	import.log 
Log Message:
auto-import git-core-0.99.6-1 on branch FC-4 from git-core-0.99.6-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/git-core/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- import.log	16 Sep 2005 18:13:22 -0000	1.4
+++ import.log	16 Sep 2005 18:44:10 -0000	1.5
@@ -1,3 +1,4 @@
 git-core-0_99_4-4:HEAD:git-core-0.99.4-4.src.rpm:1125362230
 git-core-0_99_6-1:HEAD:git-core-0.99.6-1.src.rpm:1126894247
 git-core-0_99_6-1:FC-3:git-core-0.99.6-1.src.rpm:1126894397
+git-core-0_99_6-1:FC-4:git-core-0.99.6-1.src.rpm:1126896244



From fedora-extras-commits at redhat.com  Fri Sep 16 18:44:13 2005
From: fedora-extras-commits at redhat.com (Chris Wright (chrisw))
Date: Fri, 16 Sep 2005 14:44:13 -0400
Subject: rpms/git-core/FC-4 .cvsignore, 1.2, 1.3 git-core.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <200509161844.j8GIiDc3009374@cvs-int.fedora.redhat.com>

Author: chrisw

Update of /cvs/extras/rpms/git-core/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9331/FC-4

Modified Files:
	.cvsignore git-core.spec sources 
Log Message:
auto-import git-core-0.99.6-1 on branch FC-4 from git-core-0.99.6-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/git-core/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	30 Aug 2005 00:37:24 -0000	1.2
+++ .cvsignore	16 Sep 2005 18:44:11 -0000	1.3
@@ -1 +1 @@
-git-core-0.99.4.tar.gz
+git-core-0.99.6.tar.gz


Index: git-core.spec
===================================================================
RCS file: /cvs/extras/rpms/git-core/FC-4/git-core.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- git-core.spec	30 Aug 2005 00:37:24 -0000	1.1
+++ git-core.spec	16 Sep 2005 18:44:11 -0000	1.2
@@ -1,7 +1,7 @@
 # Pass --without docs to rpmbuild if you don't want the documetnation
 Name: 		git-core
-Version: 	0.99.4
-Release: 	4%{?dist}
+Version: 	0.99.6
+Release: 	1%{?dist}
 Summary:  	Git core and tools
 License: 	GPL
 Group: 		Development/Tools
@@ -24,12 +24,11 @@
 
 %build
 make COPTS="$RPM_OPT_FLAGS" prefix=%{_prefix} all %{!?_without_docs: doc}
-make COPTS="$RPM_OPT_FLAGS" -C tools all
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make dest=$RPM_BUILD_ROOT prefix=%{_prefix} mandir=%{_mandir} \
-     install install-tools %{!?_without_docs: install-doc}
+make DESTDIR=$RPM_BUILD_ROOT prefix=%{_prefix} mandir=%{_mandir} \
+     install %{!?_without_docs: install-doc}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -44,6 +43,9 @@
 %{!?_without_docs: %{_mandir}/man7/*.7.gz}
 
 %changelog
+* Fri Sep 16 2005 Chris Wright  0.99.6-1
+- update to 0.99.6
+
 * Thu Aug 18 2005 Chris Wright  0.99.4-4
 - drop sh_utils, sh-utils, diffutils, mktemp, and openssl Requires
 - use RPM_OPT_FLAGS in spec file, drop patch0


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/git-core/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	30 Aug 2005 00:37:24 -0000	1.2
+++ sources	16 Sep 2005 18:44:11 -0000	1.3
@@ -1 +1 @@
-06935e265e7a556d8819a097dcb44f35  git-core-0.99.4.tar.gz
+ca2f17bc1550909a2675386e8be46f0f  git-core-0.99.6.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep 16 18:53:03 2005
From: fedora-extras-commits at redhat.com (Chris Wright (chrisw))
Date: Fri, 16 Sep 2005 14:53:03 -0400
Subject: owners owners.list,1.222,1.223
Message-ID: <200509161853.j8GIr3hA009572@cvs-int.fedora.redhat.com>

Author: chrisw

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9553

Modified Files:
	owners.list 
Log Message:
Add asciidoc to owners.list



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.222
retrieving revision 1.223
diff -u -r1.222 -r1.223
--- owners.list	16 Sep 2005 18:24:16 -0000	1.222
+++ owners.list	16 Sep 2005 18:53:01 -0000	1.223
@@ -33,6 +33,7 @@
 Fedora Extras|apt|Debian's Advanced Packaging Tool with RPM support|pmatilai at laiskiainen.org|extras-qa at fedoraproject.org|
 Fedora Extras|aqhbci-qt-tools|Setup wizard and debugger for the HBCI backend for the Aqbanking library|notting at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|arc|Arc archiver|Nicolas.Mailhot at laPoste.net|extras-qa at fedoraproject.org|
+Fedora Extras|asciidoc|AsciiDoc text document fomatter|chrisw at osdl.org|extras-qa at fedoraproject.org|
 Fedora Extras|aterm|Aterm (Afterstep XVT) - a VT102 emulator for the X window system|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|athcool|Enables/disables Powersaving mode for AMD processors|gajownik at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|atitvout|ATI Rage/Radeon TV Out configuration program|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Fri Sep 16 18:55:52 2005
From: fedora-extras-commits at redhat.com (Chris Wright (chrisw))
Date: Fri, 16 Sep 2005 14:55:52 -0400
Subject: owners owners.list,1.223,1.224
Message-ID: <200509161855.j8GItqCd009630@cvs-int.fedora.redhat.com>

Author: chrisw

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9607

Modified Files:
	owners.list 
Log Message:
Add cogito to owners.list



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.223
retrieving revision 1.224
diff -u -r1.223 -r1.224
--- owners.list	16 Sep 2005 18:53:01 -0000	1.223
+++ owners.list	16 Sep 2005 18:55:50 -0000	1.224
@@ -88,6 +88,7 @@
 Fedora Extras|clamav|End-user tools for the Clam Antivirus scanner|enrico.scholz at informatik.tu-chemnitz.de|extras-qa at fedoraproject.org|
 Fedora Extras|clisp|Common Lisp (ANSI CL) implementation|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|cln|Class Library for Numbers|qspencer at ieee.org|extras-qa at fedoraproject.org|
+Fedora Extras|cogito|Cogito SCM based on git-core|chrisw at osdl.org|extras-qa at fedoraproject.org|
 Fedora Extras|Coin2|A high-level 3D visualization library|rc040203 at freenet.de|extras-qa at fedoraproject.org|
 Fedora Extras|colordiff|Color terminal highlighter for diff files|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|comical|GUI comic book viewer|tcallawa at redhat.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Fri Sep 16 19:15:47 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri, 16 Sep 2005 15:15:47 -0400
Subject: rpms/sbcl/devel sbcl.sh,1.3,1.4 sbcl.spec,1.10,1.11
Message-ID: <200509161915.j8GJFl9q011146@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/sbcl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11125

Modified Files:
	sbcl.sh sbcl.spec 
Log Message:
* Fri Sep 16 2005 Rex Dieter  0.9.4-14
- re-enable ppc
- drop Req: setarch
- drop extraneous app-wrapper bits



Index: sbcl.sh
===================================================================
RCS file: /cvs/extras/rpms/sbcl/devel/sbcl.sh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sbcl.sh	13 Sep 2005 16:50:44 -0000	1.3
+++ sbcl.sh	16 Sep 2005 19:15:45 -0000	1.4
@@ -1,8 +1,8 @@
 #!/bin/sh
 
 # Source global config, if it exists
-if [ -f /etc/sysconfig/sbcl ]; then
-  source /etc/sysconfig/sbcl
+if [  -f /etc/sbcl.conf ]; then
+  source /etc/sbcl.conf
 fi
 
 exec ${SBCL_HOME}/sbcl ${1+"$@"}


Index: sbcl.spec
===================================================================
RCS file: /cvs/extras/rpms/sbcl/devel/sbcl.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sbcl.spec	13 Sep 2005 19:03:04 -0000	1.10
+++ sbcl.spec	16 Sep 2005 19:15:45 -0000	1.11
@@ -9,7 +9,6 @@
 
 %if "%{?fedora}" >= "3"
 BuildRequires:setarch
-Requires:setarch
 %define setarch setarch %{_target_cpu}
 %endif
 
@@ -17,28 +16,22 @@
 %define setarch setarch %{_target_cpu} -R
 %endif
 
-%if "%{?rhel}" >= "4"
+%if "%{?rhel}" >= "3"
 BuildRequires:setarch
-Requires:setarch
 %define setarch setarch %{_target_cpu}
 %endif
 
 Name: 	 sbcl
 Summary: Steel Bank Common Lisp
 Version: 0.9.4
-Release: 13%{?dist}
+Release: 14%{?dist}
 
 License: BSD/MIT
 Group: 	 Development/Languages
 URL:	 http://sbcl.sourceforge.net/
 Source0:  http://dl.sourceforge.net/sourceforge/sbcl/sbcl-%{version}-source.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-ExclusiveArch: %{ix86} x86_64
-
-# App-wrapper
-Source1: sbcl.sh
-# /etc/sysconfig/sbcl
-Source2: sbcl.sysconfig
+ExclusiveArch: %{ix86} x86_64 ppc 
 
 %if "%{?sbcl_bootstrap}" == "%{nil}"
 # local Bootstrap binaries
@@ -148,14 +141,6 @@
 # (may) still need setarch if using ADDR_NO_RANDOMIZE-proc patch
 sh ./install.sh
 
-# app-wrapper 
-%if 0
-mv $RPM_BUILD_ROOT%{_bindir}/sbcl $RPM_BUILD_ROOT%{_libdir}/sbcl/sbcl
-install -p -m755 -D %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/sbcl
-install -p -m644 -D %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/sbcl
-#{?setarch:echo "SBCL_SETARCH=\"%{setarch}\"|" >> $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/sbcl 
-%endif
-
 ## Unpackaged files
 rm -rf $RPM_BUILD_ROOT%{_docdir}/sbcl
 rm -f  $RPM_BUILD_ROOT%{_infodir}/dir
@@ -192,6 +177,11 @@
 
 
 %changelog
+* Fri Sep 16 2005 Rex Dieter  0.9.4-14
+- re-enable ppc
+- drop Req: setarch
+- drop extraneous app-wrapper bits
+
 * Tue Sep 13 2005 Rex Dieter  0.9.4-13
 - don't enable sb-thread
 



From fedora-extras-commits at redhat.com  Fri Sep 16 19:22:20 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri, 16 Sep 2005 15:22:20 -0400
Subject: rpms/sbcl/FC-3 sbcl.spec, 1.9, 1.10 sbcl.sh, 1.3,
	NONE sbcl.sysconfig, 1.1, NONE
Message-ID: <200509161922.j8GJMKLU011319@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/sbcl/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11273/FC-3

Modified Files:
	sbcl.spec 
Removed Files:
	sbcl.sh sbcl.sysconfig 
Log Message:
* Fri Sep 16 2005 Rex Dieter  0.9.4-14
- re-enable ppc
- drop Req: setarch
- drop extraneous app-wrapper bits

* Tue Sep 13 2005 Rex Dieter  0.9.4-13
- don't enable sb-thread



Index: sbcl.spec
===================================================================
RCS file: /cvs/extras/rpms/sbcl/FC-3/sbcl.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sbcl.spec	13 Sep 2005 17:04:26 -0000	1.9
+++ sbcl.spec	16 Sep 2005 19:22:18 -0000	1.10
@@ -9,7 +9,6 @@
 
 %if "%{?fedora}" >= "3"
 BuildRequires:setarch
-Requires:setarch
 %define setarch setarch %{_target_cpu}
 %endif
 
@@ -17,28 +16,22 @@
 %define setarch setarch %{_target_cpu} -R
 %endif
 
-%if "%{?rhel}" >= "4"
+%if "%{?rhel}" >= "3"
 BuildRequires:setarch
-Requires:setarch
 %define setarch setarch %{_target_cpu}
 %endif
 
 Name: 	 sbcl
 Summary: Steel Bank Common Lisp
 Version: 0.9.4
-Release: 12%{?dist}
+Release: 14%{?dist}
 
 License: BSD/MIT
 Group: 	 Development/Languages
 URL:	 http://sbcl.sourceforge.net/
 Source0:  http://dl.sourceforge.net/sourceforge/sbcl/sbcl-%{version}-source.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-ExclusiveArch: %{ix86} x86_64
-
-# App-wrapper
-Source1: sbcl.sh
-# /etc/sysconfig/sbcl
-Source2: sbcl.sysconfig
+ExclusiveArch: %{ix86} x86_64 ppc 
 
 %if "%{?sbcl_bootstrap}" == "%{nil}"
 # local Bootstrap binaries
@@ -97,7 +90,7 @@
 #define kernel_ver %(uname -r | cut -d- -f1 | cut -d. -f-2 )
 #if "%{?kernel_ver}" >= "2.6"
 %ifarch %{ix86} x86_64
-sed -i -e "s|; :sb-thread|:sb-thread|" base-target-features.lisp-expr
+#sed -i -e "s|; :sb-thread|:sb-thread|" base-target-features.lisp-expr
 %endif
 #endif
 
@@ -148,14 +141,6 @@
 # (may) still need setarch if using ADDR_NO_RANDOMIZE-proc patch
 sh ./install.sh
 
-# app-wrapper 
-%if 0
-mv $RPM_BUILD_ROOT%{_bindir}/sbcl $RPM_BUILD_ROOT%{_libdir}/sbcl/sbcl
-install -p -m755 -D %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/sbcl
-install -p -m644 -D %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/sbcl
-#{?setarch:echo "SBCL_SETARCH=\"%{setarch}\"|" >> $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/sbcl 
-%endif
-
 ## Unpackaged files
 rm -rf $RPM_BUILD_ROOT%{_docdir}/sbcl
 rm -f  $RPM_BUILD_ROOT%{_infodir}/dir
@@ -192,6 +177,14 @@
 
 
 %changelog
+* Fri Sep 16 2005 Rex Dieter  0.9.4-14
+- re-enable ppc
+- drop Req: setarch
+- drop extraneous app-wrapper bits
+
+* Tue Sep 13 2005 Rex Dieter  0.9.4-13
+- don't enable sb-thread
+
 * Tue Sep 13 2005 Rex Dieter  0.9.4-12
 - omit ppc (for now, broken buildsystem)
 


--- sbcl.sh DELETED ---


--- sbcl.sysconfig DELETED ---



From fedora-extras-commits at redhat.com  Fri Sep 16 19:22:21 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri, 16 Sep 2005 15:22:21 -0400
Subject: rpms/sbcl/devel sbcl.sh,1.4,NONE sbcl.sysconfig,1.1,NONE
Message-ID: <200509161922.j8GJMLjx011330@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/sbcl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11273/devel

Removed Files:
	sbcl.sh sbcl.sysconfig 
Log Message:
* Fri Sep 16 2005 Rex Dieter  0.9.4-14
- re-enable ppc
- drop Req: setarch
- drop extraneous app-wrapper bits

* Tue Sep 13 2005 Rex Dieter  0.9.4-13
- don't enable sb-thread



--- sbcl.sh DELETED ---


--- sbcl.sysconfig DELETED ---



From fedora-extras-commits at redhat.com  Fri Sep 16 19:22:21 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri, 16 Sep 2005 15:22:21 -0400
Subject: rpms/sbcl/FC-4 sbcl.spec, 1.9, 1.10 sbcl.sh, 1.3,
	NONE sbcl.sysconfig, 1.1, NONE
Message-ID: <200509161922.j8GJMLqR011325@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/sbcl/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11273/FC-4

Modified Files:
	sbcl.spec 
Removed Files:
	sbcl.sh sbcl.sysconfig 
Log Message:
* Fri Sep 16 2005 Rex Dieter  0.9.4-14
- re-enable ppc
- drop Req: setarch
- drop extraneous app-wrapper bits

* Tue Sep 13 2005 Rex Dieter  0.9.4-13
- don't enable sb-thread



Index: sbcl.spec
===================================================================
RCS file: /cvs/extras/rpms/sbcl/FC-4/sbcl.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sbcl.spec	13 Sep 2005 17:04:26 -0000	1.9
+++ sbcl.spec	16 Sep 2005 19:22:18 -0000	1.10
@@ -9,7 +9,6 @@
 
 %if "%{?fedora}" >= "3"
 BuildRequires:setarch
-Requires:setarch
 %define setarch setarch %{_target_cpu}
 %endif
 
@@ -17,28 +16,22 @@
 %define setarch setarch %{_target_cpu} -R
 %endif
 
-%if "%{?rhel}" >= "4"
+%if "%{?rhel}" >= "3"
 BuildRequires:setarch
-Requires:setarch
 %define setarch setarch %{_target_cpu}
 %endif
 
 Name: 	 sbcl
 Summary: Steel Bank Common Lisp
 Version: 0.9.4
-Release: 12%{?dist}
+Release: 14%{?dist}
 
 License: BSD/MIT
 Group: 	 Development/Languages
 URL:	 http://sbcl.sourceforge.net/
 Source0:  http://dl.sourceforge.net/sourceforge/sbcl/sbcl-%{version}-source.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-ExclusiveArch: %{ix86} x86_64
-
-# App-wrapper
-Source1: sbcl.sh
-# /etc/sysconfig/sbcl
-Source2: sbcl.sysconfig
+ExclusiveArch: %{ix86} x86_64 ppc 
 
 %if "%{?sbcl_bootstrap}" == "%{nil}"
 # local Bootstrap binaries
@@ -97,7 +90,7 @@
 #define kernel_ver %(uname -r | cut -d- -f1 | cut -d. -f-2 )
 #if "%{?kernel_ver}" >= "2.6"
 %ifarch %{ix86} x86_64
-sed -i -e "s|; :sb-thread|:sb-thread|" base-target-features.lisp-expr
+#sed -i -e "s|; :sb-thread|:sb-thread|" base-target-features.lisp-expr
 %endif
 #endif
 
@@ -148,14 +141,6 @@
 # (may) still need setarch if using ADDR_NO_RANDOMIZE-proc patch
 sh ./install.sh
 
-# app-wrapper 
-%if 0
-mv $RPM_BUILD_ROOT%{_bindir}/sbcl $RPM_BUILD_ROOT%{_libdir}/sbcl/sbcl
-install -p -m755 -D %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/sbcl
-install -p -m644 -D %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/sbcl
-#{?setarch:echo "SBCL_SETARCH=\"%{setarch}\"|" >> $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/sbcl 
-%endif
-
 ## Unpackaged files
 rm -rf $RPM_BUILD_ROOT%{_docdir}/sbcl
 rm -f  $RPM_BUILD_ROOT%{_infodir}/dir
@@ -192,6 +177,14 @@
 
 
 %changelog
+* Fri Sep 16 2005 Rex Dieter  0.9.4-14
+- re-enable ppc
+- drop Req: setarch
+- drop extraneous app-wrapper bits
+
+* Tue Sep 13 2005 Rex Dieter  0.9.4-13
+- don't enable sb-thread
+
 * Tue Sep 13 2005 Rex Dieter  0.9.4-12
 - omit ppc (for now, broken buildsystem)
 


--- sbcl.sh DELETED ---


--- sbcl.sysconfig DELETED ---



From fedora-extras-commits at redhat.com  Fri Sep 16 19:54:37 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri, 16 Sep 2005 15:54:37 -0400
Subject: rpms/sbcl/FC-3 sbcl.spec,1.10,1.11
Message-ID: <200509161955.j8GJt74c011460@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/sbcl/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11407/FC-3

Modified Files:
	sbcl.spec 
Log Message:
* Sat Sep 16 2005 Rex Dieter  0.9.4-15
- disable ppc (probably related to #166347)



Index: sbcl.spec
===================================================================
RCS file: /cvs/extras/rpms/sbcl/FC-3/sbcl.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sbcl.spec	16 Sep 2005 19:22:18 -0000	1.10
+++ sbcl.spec	16 Sep 2005 19:54:35 -0000	1.11
@@ -24,14 +24,14 @@
 Name: 	 sbcl
 Summary: Steel Bank Common Lisp
 Version: 0.9.4
-Release: 14%{?dist}
+Release: 15%{?dist}
 
 License: BSD/MIT
 Group: 	 Development/Languages
 URL:	 http://sbcl.sourceforge.net/
 Source0:  http://dl.sourceforge.net/sourceforge/sbcl/sbcl-%{version}-source.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-ExclusiveArch: %{ix86} x86_64 ppc 
+ExclusiveArch: %{ix86} x86_64
 
 %if "%{?sbcl_bootstrap}" == "%{nil}"
 # local Bootstrap binaries
@@ -177,6 +177,9 @@
 
 
 %changelog
+* Sat Sep 16 2005 Rex Dieter  0.9.4-15
+- disable ppc (probably related to #166347)
+
 * Fri Sep 16 2005 Rex Dieter  0.9.4-14
 - re-enable ppc
 - drop Req: setarch



From fedora-extras-commits at redhat.com  Fri Sep 16 19:54:38 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri, 16 Sep 2005 15:54:38 -0400
Subject: rpms/sbcl/devel sbcl.spec,1.11,1.12
Message-ID: <200509161955.j8GJt8ZM011464@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/sbcl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11407/devel

Modified Files:
	sbcl.spec 
Log Message:
* Sat Sep 16 2005 Rex Dieter  0.9.4-15
- disable ppc (probably related to #166347)



Index: sbcl.spec
===================================================================
RCS file: /cvs/extras/rpms/sbcl/devel/sbcl.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sbcl.spec	16 Sep 2005 19:15:45 -0000	1.11
+++ sbcl.spec	16 Sep 2005 19:54:36 -0000	1.12
@@ -24,14 +24,14 @@
 Name: 	 sbcl
 Summary: Steel Bank Common Lisp
 Version: 0.9.4
-Release: 14%{?dist}
+Release: 15%{?dist}
 
 License: BSD/MIT
 Group: 	 Development/Languages
 URL:	 http://sbcl.sourceforge.net/
 Source0:  http://dl.sourceforge.net/sourceforge/sbcl/sbcl-%{version}-source.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-ExclusiveArch: %{ix86} x86_64 ppc 
+ExclusiveArch: %{ix86} x86_64
 
 %if "%{?sbcl_bootstrap}" == "%{nil}"
 # local Bootstrap binaries
@@ -177,6 +177,9 @@
 
 
 %changelog
+* Sat Sep 16 2005 Rex Dieter  0.9.4-15
+- disable ppc (probably related to #166347)
+
 * Fri Sep 16 2005 Rex Dieter  0.9.4-14
 - re-enable ppc
 - drop Req: setarch



From fedora-extras-commits at redhat.com  Fri Sep 16 19:54:37 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri, 16 Sep 2005 15:54:37 -0400
Subject: rpms/sbcl/FC-4 sbcl.spec,1.10,1.11
Message-ID: <200509161955.j8GJt8Fk011463@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/sbcl/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11407/FC-4

Modified Files:
	sbcl.spec 
Log Message:
* Sat Sep 16 2005 Rex Dieter  0.9.4-15
- disable ppc (probably related to #166347)



Index: sbcl.spec
===================================================================
RCS file: /cvs/extras/rpms/sbcl/FC-4/sbcl.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sbcl.spec	16 Sep 2005 19:22:18 -0000	1.10
+++ sbcl.spec	16 Sep 2005 19:54:35 -0000	1.11
@@ -24,14 +24,14 @@
 Name: 	 sbcl
 Summary: Steel Bank Common Lisp
 Version: 0.9.4
-Release: 14%{?dist}
+Release: 15%{?dist}
 
 License: BSD/MIT
 Group: 	 Development/Languages
 URL:	 http://sbcl.sourceforge.net/
 Source0:  http://dl.sourceforge.net/sourceforge/sbcl/sbcl-%{version}-source.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-ExclusiveArch: %{ix86} x86_64 ppc 
+ExclusiveArch: %{ix86} x86_64
 
 %if "%{?sbcl_bootstrap}" == "%{nil}"
 # local Bootstrap binaries
@@ -177,6 +177,9 @@
 
 
 %changelog
+* Sat Sep 16 2005 Rex Dieter  0.9.4-15
+- disable ppc (probably related to #166347)
+
 * Fri Sep 16 2005 Rex Dieter  0.9.4-14
 - re-enable ppc
 - drop Req: setarch



From fedora-extras-commits at redhat.com  Fri Sep 16 20:13:57 2005
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Fri, 16 Sep 2005 16:13:57 -0400
Subject: rpms/perl-DateTime - New directory
Message-ID: <200509162013.j8GKDvb1013083@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-DateTime
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13059/perl-DateTime

Log Message:
Directory /cvs/extras/rpms/perl-DateTime added to the repository




From fedora-extras-commits at redhat.com  Fri Sep 16 20:13:57 2005
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Fri, 16 Sep 2005 16:13:57 -0400
Subject: rpms/perl-DateTime/devel - New directory
Message-ID: <200509162014.j8GKDvnm013088@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-DateTime/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13059/perl-DateTime/devel

Log Message:
Directory /cvs/extras/rpms/perl-DateTime/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Sep 16 20:14:18 2005
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Fri, 16 Sep 2005 16:14:18 -0400
Subject: rpms/perl-DateTime Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200509162014.j8GKEINV013133@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-DateTime
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13104

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-DateTime


--- NEW FILE Makefile ---
# Top level Makefile for module perl-DateTime
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Fri Sep 16 20:14:19 2005
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Fri, 16 Sep 2005 16:14:19 -0400
Subject: rpms/perl-DateTime/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200509162014.j8GKEJZo013138@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-DateTime/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13104/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-DateTime


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Fri Sep 16 20:15:08 2005
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Fri, 16 Sep 2005 16:15:08 -0400
Subject: rpms/perl-DateTime/devel perl-DateTime.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200509162015.j8GKF8JR013216@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-DateTime/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13177/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-DateTime.spec 
Log Message:
auto-import perl-DateTime-0.2901-2 on branch devel from perl-DateTime-0.2901-2.src.rpm


--- NEW FILE perl-DateTime.spec ---
%define DTTimeZone_version 0.37
%define DTLocale_version 0.22

Name:           perl-DateTime
Version:        0.2901
Release:        2%{?dist}
Summary:        DateTime Perl module
License:        GPL or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/DateTime/
Source0:        http://www.cpan.org/modules/by-module/DateTime/DateTime-0.2901.tar.gz
Source1:        http://www.cpan.org/modules/by-module/DateTime/DateTime-TimeZone-%{DTTimeZone_version}.tar.gz
Source2:        http://www.cpan.org/modules/by-module/DateTime/DateTime-Locale-%{DTLocale_version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  perl(Module::Build)
BuildRequires:  perl(Params::Validate) >= 0.76
BuildRequires:  perl(Class::Singleton) >= 1.03
BuildRequires:  perl(Pod::Man) >= 1.14
BuildRequires:  perl(File::Find::Rule)
BuildRequires:  perl(Test::Pod)
Requires:       perl(Params::Validate) >= 0.76
Requires:       perl(Class::Singleton) >= 1.03
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
Provides:       perl-DateTime-TimeZone = %{DTTimeZone_version}
Provides:       perl-DateTime-Locale = %{DTLocale_version}
Provides:       perl(DateTime::TimeZoneCatalog)
Provides:       perl(DateTimePP)
Provides:       perl(DateTimePPExtra)

%description
The DateTime.pm module aims to provide a complete, correct, and easy to use
date/time object implementation. Currently it handles many date
calculations, date math (addition and subtraction), and provides convenient
methods for retrieving portions of a date/time.

%prep
%setup -q -T -c -n DateTimeBundle -a 0
%setup -q -T -D -n DateTimeBundle -a 1
%setup -q -T -D -n DateTimeBundle -a 2

cat > filter-provides.sh << EOF
#!/bin/sh
# Remove redundant unversioned provides of perl(DateTime) and perl(DateTime::TimeZone)
exec %{__perl_provides} $* | egrep -v '^perl[(]DateTime(::TimeZone)?[)]$'
EOF
%define __perl_provides %{_builddir}/DateTimeBundle/filter-provides.sh
chmod 755 filter-provides.sh

%build
cd DateTime-Locale-%{DTLocale_version}
%{__perl} Build.PL installdirs=vendor
./Build
cd -

cd DateTime-TimeZone-%{DTTimeZone_version}
%{__perl} Build.PL installdirs=vendor
./Build
cd -

cd DateTime-%{version}
PERLLIB=../DateTime-Locale-%{DTLocale_version}/blib/lib
PERLLIB=$PERLLIB:../DateTime-TimeZone-%{DTTimeZone_version}/blib/lib
export PERLLIB
%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="%{optflags}"
make %{?_smp_mflags}
cd -

%install
rm -rf %{buildroot}

cd DateTime-Locale-%{DTLocale_version}
./Build install destdir=%{buildroot}
cd -

cd DateTime-TimeZone-%{DTTimeZone_version}
./Build install destdir=%{buildroot}
cd -

cd DateTime-%{version}
make pure_install PERL_INSTALL_ROOT=%{buildroot}
cd -

find %{buildroot} -type f -name .packlist -exec rm -f {} \;
find %{buildroot} -type f -name '*.bs' -size 0 -exec rm -f {} \;
find %{buildroot} -type d -depth -exec rmdir {} 2>/dev/null \;

chmod -R u+rwX,go+rX,go-w %{buildroot}/*

# Move documentation into bundle area
mkdir DT::Locale DT::TimeZone
mv DateTime-%{version}/{CREDITS,Changes,LICENSE,README,TODO} .
mv DateTime-Locale-%{DTLocale_version}/{Changes,LICENSE.icu} DT::Locale
mv DateTime-TimeZone-%{DTTimeZone_version}/{Changes,README} DT::TimeZone

%check
# Have to use PERL5LIB rather than PERLLIB here because the test scripts
# clobber PERLLIB
PERL5LIB=$(pwd)/DateTime-%{version}/blib/arch:$(pwd)/DateTime-%{version}/blib/lib
PERL5LIB=$PERL5LIB:$(pwd)/DateTime-Locale-%{DTLocale_version}/blib/lib
PERL5LIB=$PERL5LIB:$(pwd)/DateTime-TimeZone-%{DTTimeZone_version}/blib/lib
export PERL5LIB

cd DateTime-Locale-%{DTLocale_version}
./Build test
cd -

cd DateTime-TimeZone-%{DTTimeZone_version}
./Build test
cd -

make -C DateTime-%{version} test

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,0755)
%doc CREDITS Changes LICENSE README TODO DT::Locale DT::TimeZone
%{_mandir}/man3/*
# DateTime::TimeZone and DateTime::Locale modules are arch-independent
%{perl_vendorlib}/DateTime/
# DateTime module is arch-specific
%{perl_vendorarch}/auto/*
%{perl_vendorarch}/DateTime/
%{perl_vendorarch}/DateTime*.pm

%changelog
* Fri Sep 16 2005 Paul Howarth  0.2901-2
- Unpack each tarball only once
- Use Module::Build's build script where available
- Help each module find the others when needed
- Clean up files list
- Include additional documentation from DT::Locale & DT::TimeZone
- Add BR: perl(File::Find::Rule) & perl(Test::Pod) to improve test coverage
- Remove unversioned provides of perl(DateTime) & perl(DateTime::TimeZone)

* Wed Aug 31 2005 Steven Pritchard  0.2901-1
- Specfile autogenerated.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-DateTime/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	16 Sep 2005 20:14:17 -0000	1.1
+++ .cvsignore	16 Sep 2005 20:15:06 -0000	1.2
@@ -0,0 +1,3 @@
+DateTime-0.2901.tar.gz
+DateTime-Locale-0.22.tar.gz
+DateTime-TimeZone-0.37.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-DateTime/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	16 Sep 2005 20:14:17 -0000	1.1
+++ sources	16 Sep 2005 20:15:06 -0000	1.2
@@ -0,0 +1,3 @@
+f96816e634700ae3c8bd849f97856861  DateTime-0.2901.tar.gz
+bcf9fa78efa8d00fad1293b9d860ce75  DateTime-Locale-0.22.tar.gz
+1adf3f14eda8faccaf5564437eadcfd5  DateTime-TimeZone-0.37.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep 16 20:15:03 2005
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Fri, 16 Sep 2005 16:15:03 -0400
Subject: rpms/perl-DateTime import.log,1.1,1.2
Message-ID: <200509162015.j8GKFXV9013220@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-DateTime
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13177

Modified Files:
	import.log 
Log Message:
auto-import perl-DateTime-0.2901-2 on branch devel from perl-DateTime-0.2901-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-DateTime/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	16 Sep 2005 20:14:16 -0000	1.1
+++ import.log	16 Sep 2005 20:15:01 -0000	1.2
@@ -0,0 +1 @@
+perl-DateTime-0_2901-2:HEAD:perl-DateTime-0.2901-2.src.rpm:1126901693



From fedora-extras-commits at redhat.com  Fri Sep 16 20:17:50 2005
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Fri, 16 Sep 2005 16:17:50 -0400
Subject: rpms/perl-HTML-Mason/FC-3 perl-HTML-Mason.spec,1.1,1.2
Message-ID: <200509162017.j8GKHoLL013307@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-HTML-Mason/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13259/FC-3

Modified Files:
	perl-HTML-Mason.spec 
Log Message:
Improve Summary (Ville Skytt??).


Index: perl-HTML-Mason.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-HTML-Mason/FC-3/perl-HTML-Mason.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-HTML-Mason.spec	16 Sep 2005 02:09:55 -0000	1.1
+++ perl-HTML-Mason.spec	16 Sep 2005 20:17:48 -0000	1.2
@@ -1,7 +1,7 @@
 Name:           perl-HTML-Mason
 Version:        1.3101
 Release:        3%{?dist}
-Summary:        HTML::Mason Perl module
+Summary:        Powerful Perl-based web site development and delivery engine
 License:        GPL or Artistic
 Group:          Development/Libraries
 URL:            http://www.masonhq.com/



From fedora-extras-commits at redhat.com  Fri Sep 16 20:17:51 2005
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Fri, 16 Sep 2005 16:17:51 -0400
Subject: rpms/perl-HTML-Mason/FC-4 perl-HTML-Mason.spec,1.1,1.2
Message-ID: <200509162017.j8GKHpHU013313@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-HTML-Mason/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13259/FC-4

Modified Files:
	perl-HTML-Mason.spec 
Log Message:
Improve Summary (Ville Skytt??).


Index: perl-HTML-Mason.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-HTML-Mason/FC-4/perl-HTML-Mason.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-HTML-Mason.spec	16 Sep 2005 02:09:55 -0000	1.1
+++ perl-HTML-Mason.spec	16 Sep 2005 20:17:49 -0000	1.2
@@ -1,7 +1,7 @@
 Name:           perl-HTML-Mason
 Version:        1.3101
 Release:        3%{?dist}
-Summary:        HTML::Mason Perl module
+Summary:        Powerful Perl-based web site development and delivery engine
 License:        GPL or Artistic
 Group:          Development/Libraries
 URL:            http://www.masonhq.com/



From fedora-extras-commits at redhat.com  Fri Sep 16 20:17:51 2005
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Fri, 16 Sep 2005 16:17:51 -0400
Subject: rpms/perl-HTML-Mason/devel perl-HTML-Mason.spec,1.1,1.2
Message-ID: <200509162017.j8GKHp4M013319@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-HTML-Mason/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13259/devel

Modified Files:
	perl-HTML-Mason.spec 
Log Message:
Improve Summary (Ville Skytt??).


Index: perl-HTML-Mason.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-HTML-Mason/devel/perl-HTML-Mason.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-HTML-Mason.spec	16 Sep 2005 02:09:55 -0000	1.1
+++ perl-HTML-Mason.spec	16 Sep 2005 20:17:49 -0000	1.2
@@ -1,7 +1,7 @@
 Name:           perl-HTML-Mason
 Version:        1.3101
 Release:        3%{?dist}
-Summary:        HTML::Mason Perl module
+Summary:        Powerful Perl-based web site development and delivery engine
 License:        GPL or Artistic
 Group:          Development/Libraries
 URL:            http://www.masonhq.com/



From fedora-extras-commits at redhat.com  Fri Sep 16 20:23:03 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri, 16 Sep 2005 16:23:03 -0400
Subject: rpms/maxima/devel maxima-5.9.2-htmlview.patch, NONE, 1.1 .cvsignore,
	1.2, 1.3 maxima.spec, 1.5, 1.6 sources, 1.2,
	1.3 maxima-5.9.0-htmlview.patch, 1.1, NONE
Message-ID: <200509162023.j8GKN3S9013367@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/maxima/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13341

Modified Files:
	.cvsignore maxima.spec sources 
Added Files:
	maxima-5.9.2-htmlview.patch 
Removed Files:
	maxima-5.9.0-htmlview.patch 
Log Message:
* Fri Sep 16 2005 Rex Dieter  5.9.1.9rc1-2
- -runtime-sbcl: with sbcl_ver macro
- use versioned maxima-exec Obsoletes.

* Mon Sep 12 2005 Rex Dieter  5.9.1.9rc1-1
- 5.9.1.9rc1


maxima-5.9.2-htmlview.patch:

--- NEW FILE maxima-5.9.2-htmlview.patch ---
--- maxima/interfaces/xmaxima/Tkmaxima/Menu.tcl.htmlview	2004-10-16 10:37:53.000000000 -0500
+++ maxima/interfaces/xmaxima/Tkmaxima/Menu.tcl	2005-08-22 07:27:23.000000000 -0500
@@ -215,9 +215,9 @@
 	}
     } else {
 	
-	set selectedbrowser mozilla
+	set selectedbrowser htmlview 
 
-	foreach b { mozilla konqueror epiphany firefox netscape } {
+	foreach b { htmlview firefox konqueror mozilla epiphany netscape } {
 	    if { ! [catch {exec which $b} ] } {
 		set selectedbrowser $b
 		break } }


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/maxima/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	6 Sep 2005 17:56:03 -0000	1.2
+++ .cvsignore	16 Sep 2005 20:23:00 -0000	1.3
@@ -1,3 +1,3 @@
-macref.pdf
-maxima-5.9.1.tar.gz
+maxima-5.9.1.9rc1.tar.gz
 maximabook-19-Sept-2004.pdf
+macref.pdf


Index: maxima.spec
===================================================================
RCS file: /cvs/extras/rpms/maxima/devel/maxima.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- maxima.spec	12 Sep 2005 12:29:32 -0000	1.5
+++ maxima.spec	16 Sep 2005 20:23:00 -0000	1.6
@@ -6,19 +6,21 @@
 %define _without_sbcl 1
 
 #define cvs .20050908
-#define beta cvs
+%define beta rc1 
 
 Summary: Symbolic Computation Program
 Name: 	 maxima
-Version: 5.9.1%{?beta}
+Version: 5.9.1.9rc1
 
-Release: 5%{?dist} 
+Release: 2%{?dist} 
 License: GPL
 Group:	 Applications/Engineering 
 URL: 	 http://maxima.sourceforge.net/
-Source:  http://dl.sourceforge.net/sourceforge/maxima/maxima-%{version}%{?cvs}.tar.gz
+#Source:  http://dl.sourceforge.net/sourceforge/maxima/maxima-%{version}%{?cvs}.tar.gz
+Source:	 http://maxima.sf.net/tmp-release/maxima-5.9.1.9rc1.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-ExcludeArch: ppc ppc64
+# add ppc (and maybe ppc64)  when clisp builds again on ppc (http://bugzilla.redhat.com/bugzilla/166347) 
+ExclusiveArch: %{ix86} x86_64 
 
 Source1: maxima.png
 Source2: xmaxima.desktop
@@ -28,14 +30,14 @@
 Source10: http://starship.python.net/crew/mike/TixMaxima/macref.pdf
 Source11: http://maxima.sourceforge.net/docs/maximabook/maximabook-19-Sept-2004.pdf
 
-Patch1: maxima-5.9.0-htmlview.patch
+Patch1: maxima-5.9.2-htmlview.patch
 # (mysterious?) xemacs patch
 Patch2: maxima.el-xemacs.patch
 
 # Inhibit automatic compressing of info files. Compressed info
 # files break maxima's internal help.
 %define __spec_install_post %{nil} 
-# debuginfo is empty/blank, disable
+# debuginfo is empty/blank (when using gcl?), disable
 %define debug_package   %{nil}
 
 BuildRequires: texinfo
@@ -43,8 +45,7 @@
 BuildRequires: desktop-file-utils
 # /usr/bin/wish
 BuildRequires: tk
-# cvs
-%{?cvs:BuildRequires: autoconf automake}
+%{?beta:BuildRequires: autoconf automake}
 
 Requires: %{name}-runtime = %{version}
 Requires: gnuplot
@@ -79,11 +80,11 @@
 %package runtime-clisp
 Summary: Maxima compiled with clisp
 Group:	 Applications/Engineering
-BuildRequires: clisp
+BuildRequires: clisp-devel
 %define clisp_ver %{expand:%%(rpm -q --qf '%%{VERSION}' clisp )}
 Requires: clisp >= %{clisp_ver}
 Requires: %{name} = %{version}
-Obsoletes: maxima-exec-lisp
+Obsoletes: maxima-exec-clisp < %{version}-%{release}
 Provides: %{name}-runtime = %{version}
 %description runtime-clisp
 Maxima compiled with Common Lisp (clisp) 
@@ -94,10 +95,8 @@
 Summary: Maxima compiled with CMUCL
 Group:	 Applications/Engineering 
 BuildRequires: cmucl 
-#define cmucl_ver %{expand:%%(rpm -q --qf '%%{VERSION}' cmucl )}
-#Requires: cmucl >= %{cmucl_ver}
 Requires:  %{name} = %{version}
-Obsoletes: maxima-exec-cmucl 
+Obsoletes: maxima-exec-cmucl < %{version}-%{release}
 Provides:  %{name}-runtime = %{version}
 %description runtime-cmucl
 Maxima compiled with CMU Common Lisp (cmucl) 
@@ -107,9 +106,9 @@
 %package runtime-gcl
 Summary: Maxima compiled with GCL
 Group:   Applications/Engineering
-BuildRequires: gcl
+BuildRequires: gcl-devel
 Requires:  %{name} = %{version}
-Obsoletes: maxima-exec-gcl 
+Obsoletes: maxima-exec-gcl < %{version}-%{release}
 Provides:  %{name}-runtime = %{version}
 %description runtime-gcl
 Maxima compiled with Gnu Common Lisp (gcl)
@@ -120,10 +119,10 @@
 Summary: Maxima compiled with SBCL 
 Group:   Applications/Engineering
 BuildRequires: sbcl 
-%define sbcl_ver %{expand:%%(rpm -q --qf '%%{version}' sbcl )}
+%define sbcl_ver %{expand:%%(rpm -q --qf '%%{VERSION}' sbcl )}
 Requires: sbcl >= %{sbcl_ver}
 Requires: %{name} = %{version}
-#Obsoletes: maxima-exec-sbcl
+Obsoletes: maxima-exec-sbcl < %{version}-%{release}
 Provides: %{name}-runtime = %{version}
 %description runtime-sbcl
 Maxima compiled with Steel Bank Common Lisp (sbcl).
@@ -145,16 +144,16 @@
   's/(defcustom\s+maxima-info-index-file\s+)(\S+)/$1\"maxima.info-16\"/' \
   interfaces/emacs/emaxima/maxima.el
 
-#if "%{?cvs:1}" == "1"
-if [ ! -f configure ]; then
+# remove CVS crud
+find -name CVS -type d | xargs rm -r
+
+%if "%{?beta:1}" == "1"
+#if [ ! -f configure ]; then
 aclocal
 automake --add-missing --copy
 autoconf
-fi
-
-# remove CVS crud
-find -name CVS -type d | xargs rm -r
-#endif
+#fi
+%endif
 
 
 %build
@@ -167,7 +166,7 @@
 # docs
 pushd doc
 
- install -p -m644 %{SOURCE11} maximabook/maxima.pdf
+ install -D -p -m644 %{SOURCE11} maximabook/maxima.pdf
 
  pushd info
   texi2dvi -p maxima.texi
@@ -310,6 +309,13 @@
 
 
 %changelog
+* Fri Sep 16 2005 Rex Dieter  5.9.1.9rc1-2
+- -runtime-sbcl: with sbcl_ver macro
+- use versioned maxima-exec Obsoletes.
+
+* Mon Sep 12 2005 Rex Dieter  5.9.1.9rc1-1
+- 5.9.1.9rc1
+
 * Fri Sep 09 2005 Rex Dieter  5.9.1-5
 - add more Obsoletes: maxima-exec- for cleaner upgrade from customized,
   rebuilt upstream rpms.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/maxima/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	6 Sep 2005 17:56:03 -0000	1.2
+++ sources	16 Sep 2005 20:23:00 -0000	1.3
@@ -1,3 +1,3 @@
-c101a1ce604d31b02bbc2f37cced280d  macref.pdf
-659acfad1f61444cf5b38f6c28279d40  maxima-5.9.1.tar.gz
+60e188d2c10515e7dadbc176bd138694  maxima-5.9.1.9rc1.tar.gz
 9faa5a513de43b5e7384216a8783f620  maximabook-19-Sept-2004.pdf
+c101a1ce604d31b02bbc2f37cced280d  macref.pdf


--- maxima-5.9.0-htmlview.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Sep 16 20:36:45 2005
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Fri, 16 Sep 2005 16:36:45 -0400
Subject: owners owners.list,1.224,1.225
Message-ID: <200509162036.j8GKajIB013419@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13400

Modified Files:
	owners.list 
Log Message:
Add perl-DateTime.


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.224
retrieving revision 1.225
diff -u -r1.224 -r1.225
--- owners.list	16 Sep 2005 18:55:50 -0000	1.224
+++ owners.list	16 Sep 2005 20:36:43 -0000	1.225
@@ -622,6 +622,7 @@
 Fedora Extras|perl-Crypt-CBC|Encrypt Data with Cipher Block Chaining Mode|andreas at bawue.net|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Data-Page|Help when paging through sets of results|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Date-Simple|Simple date object for perl|paul at city-fan.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-DateTime|DateTime Perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-DBD-SQLite|Self Contained RDBMS in a DBI Driver|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-DBD-SQLite2|Self Contained RDBMS in a DBI Driver (sqlite 2.x)|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-DBIx-ContextualFetch|Add contextual fetches to DBI|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Fri Sep 16 23:09:32 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri, 16 Sep 2005 19:09:32 -0400
Subject: rpms/netgo - New directory
Message-ID: <200509162309.j8GN9W2C017919@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/netgo
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17899/netgo

Log Message:
Directory /cvs/extras/rpms/netgo added to the repository




From fedora-extras-commits at redhat.com  Fri Sep 16 23:09:33 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri, 16 Sep 2005 19:09:33 -0400
Subject: rpms/netgo/devel - New directory
Message-ID: <200509162309.j8GN9XKj017924@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/netgo/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17899/netgo/devel

Log Message:
Directory /cvs/extras/rpms/netgo/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Sep 16 23:09:53 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri, 16 Sep 2005 19:09:53 -0400
Subject: rpms/netgo Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200509162309.j8GN9rJG017979@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/netgo
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17944

Added Files:
	Makefile import.log 
Log Message:
Setup of module netgo


--- NEW FILE Makefile ---
# Top level Makefile for module netgo
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Fri Sep 16 23:09:54 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri, 16 Sep 2005 19:09:54 -0400
Subject: rpms/netgo/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200509162309.j8GN9sN4017984@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/netgo/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17944/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module netgo


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Fri Sep 16 23:10:26 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri, 16 Sep 2005 19:10:26 -0400
Subject: rpms/netgo/devel netgo.console_apps, NONE, 1.1 netgo.desktop, NONE,
	1.1 netgo.pamd, NONE, 1.1 netgo.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200509162310.j8GNAQ1I018062@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/netgo/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18027/devel

Modified Files:
	.cvsignore sources 
Added Files:
	netgo.console_apps netgo.desktop netgo.pamd netgo.spec 
Log Message:
auto-import netgo-0.5-3 on branch devel from netgo-0.5-3.src.rpm


--- NEW FILE netgo.console_apps ---
USER=root
PROGRAM=/usr/sbin/netgo
SESSION=true


--- NEW FILE netgo.desktop ---
[Desktop Entry]
Name=Netgo
Comment=Network Profile Tool
Icon=/usr/share/pixmaps/netgo.png
Exec=/usr/bin/netgo
StartupNotify=true
Terminal=false
Type=Application
Encoding=UTF-8
Categories=Application;SystemSetup;System;X-Fedora



--- NEW FILE netgo.pamd ---
#%PAM-1.0
auth       sufficient   pam_rootok.so
auth       sufficient   pam_timestamp.so
auth       required     pam_stack.so service=system-auth
session    required     pam_permit.so
session    optional     pam_xauth.so
session    optional     pam_timestamp.so
account    required     pam_permit.so


--- NEW FILE netgo.spec ---
Name:		netgo
Version:	0.5
Release:	3%{?dist}
License:	GPL
Group:		Applications/System
Summary:	Networking profile manager
URL:		http://netgo.hjolug.org/
Source0:	http://netgo.hjolug.org/files/v0.5/netgo-%{version}.tar.gz
Source1:	netgo.console_apps
Source2:	netgo.pamd
Source3:	netgo.desktop
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:	qt-devel, desktop-file-utils
Requires(post): desktop-file-utils
Requires(postun): desktop-file-utils
Requires:	usermode


%description
netGo is a distribution-independent networking tool (written in Qt) for 
changing network settings quickly and easily. It is intended for laptop 
owners, who often need to change network settings when relocating.
It allows you to create profiles that contain the network settings such as the 
IP, netmask, gateway, name servers and wireless options. After creating a 
profile it can be executed with a single click.

%prep
%setup -q

%build
%configure
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make INSTALL_ROOT=$RPM_BUILD_ROOT install
mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/security/console.apps
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/pam.d
cp -a $RPM_BUILD_ROOT%{_datadir}/netgo/icons/globe_32x32.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/netgo.png
install -m0644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/security/console.apps/netgo
install -m0644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/netgo

# We're going to use consolehelper, since this is a GUI app.
rm -rf $RPM_BUILD_ROOT%{_bindir}/netgo
cd $RPM_BUILD_ROOT%{_bindir}/
ln -s consolehelper netgo

mkdir -p $RPM_BUILD_ROOT%{_sbindir}
mv $RPM_BUILD_ROOT%{_datadir}/netgo/netgo-bin $RPM_BUILD_ROOT%{_sbindir}/netgo

desktop-file-install --vendor fedora                            \
        --dir $RPM_BUILD_ROOT%{_datadir}/applications           \
        %{SOURCE3}

%post
update-desktop-database %{_datadir}/applications &> /dev/null

%postun
if [ "$1" = "0" ]; then
  update-desktop-database %{_datadir}/applications &> /dev/null
fi

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc COPYING README
%{_bindir}/netgo
%config(noreplace) %{_sysconfdir}/pam.d/netgo
%config(noreplace) %{_sysconfdir}/security/console.apps/netgo
%{_datadir}/applications/fedora-netgo.desktop
%{_datadir}/pixmaps/netgo.png
%{_datadir}/netgo/
%{_sbindir}/netgo

%changelog
* Sat Sep 17 2005 Christian Iseli  0.5-3
- fix unowned dir

* Fri Sep 16 2005 Tom "spot" Callaway  0.5-2
- move netgo-bin to %%{_sbindir}/netgo

* Sun Sep  4 2005 Tom "spot" Callaway  0.5-1
- initial package for Fedora Extras


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/netgo/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	16 Sep 2005 23:09:51 -0000	1.1
+++ .cvsignore	16 Sep 2005 23:10:24 -0000	1.2
@@ -0,0 +1 @@
+netgo-0.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/netgo/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	16 Sep 2005 23:09:51 -0000	1.1
+++ sources	16 Sep 2005 23:10:24 -0000	1.2
@@ -0,0 +1 @@
+fe62a4035e6449db9761f8724d26d458  netgo-0.5.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep 16 23:10:26 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri, 16 Sep 2005 19:10:26 -0400
Subject: rpms/netgo import.log,1.1,1.2
Message-ID: <200509162310.j8GNAuYl018071@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/netgo
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18027

Modified Files:
	import.log 
Log Message:
auto-import netgo-0.5-3 on branch devel from netgo-0.5-3.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/netgo/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	16 Sep 2005 23:09:51 -0000	1.1
+++ import.log	16 Sep 2005 23:10:24 -0000	1.2
@@ -0,0 +1 @@
+netgo-0_5-3:HEAD:netgo-0.5-3.src.rpm:1126912218



From fedora-extras-commits at redhat.com  Fri Sep 16 23:12:17 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri, 16 Sep 2005 19:12:17 -0400
Subject: owners owners.list,1.225,1.226
Message-ID: <200509162312.j8GNCHdm018328@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18309

Modified Files:
	owners.list 
Log Message:

netgo



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.225
retrieving revision 1.226
diff -u -r1.225 -r1.226
--- owners.list	16 Sep 2005 20:36:43 -0000	1.225
+++ owners.list	16 Sep 2005 23:12:15 -0000	1.226
@@ -519,6 +519,7 @@
 Fedora Extras|nedit|A GUI text editor for systems with X and Motif|jnovy at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|netcdf|Libraries for the Unidata network Common Data Form (NetCDF v3)|ed at eh3.com|extras-qa at fedoraproject.org|
 Fedora Extras|netdiag|Diagnostic program for Ethernet adapters under Linux|anvil at livna.org|extras-qa at fedoraproject.org|
+Fedora Extras|netgo|Networking profile manager|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|nethack|A rogue-like single player dungeon exploration game|lmacken at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|nethack-falconseye|NetHack - Falcon's Eye|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|netmask|Utility for determining network masks|ville.skytta at iki.fi|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Fri Sep 16 23:27:29 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri, 16 Sep 2005 19:27:29 -0400
Subject: rpms/xsupplicant/devel xsupplicant-1.2.1-bz167467.patch, NONE,
	1.1 xsupplicant.spec, 1.6, 1.7
Message-ID: <200509162327.j8GNRTUA018545@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/xsupplicant/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18483/devel

Modified Files:
	xsupplicant.spec 
Added Files:
	xsupplicant-1.2.1-bz167467.patch 
Log Message:

patch to try to resolve bz 167467


xsupplicant-1.2.1-bz167467.patch:

--- NEW FILE xsupplicant-1.2.1-bz167467.patch ---
--- xsupplicant-1.2.1/src/cardif/linux/cardif_linux_rtnetlink.c.BAD	2005-09-16 18:22:29.000000000 -0500
+++ xsupplicant-1.2.1/src/cardif/linux/cardif_linux_rtnetlink.c	2005-09-16 18:22:44.000000000 -0500
@@ -135,7 +135,7 @@
   struct iw_event *iwe=NULL;
   unsigned char flags=0;
   u_char *wpa_ie=NULL, *rsn_ie=NULL, wpa_ie_len=0, rsn_ie_len=0;
-  unsigned int freq;
+  uint16_t freq;
   u_char temp_rsn_len = 0, temp_wpa_len = 0;
 
   tptr = bptr;
--- xsupplicant-1.2.1/doc/xml-userguide/userguide.xml.BAD	2005-09-04 10:28:44.000000000 -0500
+++ xsupplicant-1.2.1/doc/xml-userguide/userguide.xml	2005-09-04 10:28:53.000000000 -0500
@@ -1,6 +1,6 @@
 
 
       


Index: xsupplicant.spec
===================================================================
RCS file: /cvs/extras/rpms/xsupplicant/devel/xsupplicant.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- xsupplicant.spec	4 Sep 2005 21:57:58 -0000	1.6
+++ xsupplicant.spec	16 Sep 2005 23:27:27 -0000	1.7
@@ -1,7 +1,7 @@
 Name:		xsupplicant
 Summary:	Open Source Implementation of IEEE 802.1x
 Version:	1.2.1
-Release:	4%{?dist}
+Release:	5%{?dist}
 License:	GPL
 Group:		System Environment/Base
 URL:		http://www.open1x.org/
@@ -11,6 +11,7 @@
 BuildRequires:	docbook-dtds, docbook-style-dsssl
 Patch0:		xsupplicant-1.2.1-docsfix.patch
 Patch1:		xsupplicant-1.2.1-gcc4-cleanups.patch
+Patch2:		xsupplicant-1.2.1-bz167467.patch
 
 %description
 This software allows a GNU/Linux or BSD workstation to authenticate with
@@ -22,6 +23,7 @@
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 perl -pi.orig -e 's|/lib\b|/%{_lib}|g' configure*
 
@@ -52,6 +54,9 @@
 %{_sbindir}/xsupplicant
 
 %changelog
+* Fri Sep 16 2005 Tom "spot" Callaway  1.2.1-5
+- patch to try to resolve bz 167467
+
 * Sun Sep  4 2005 Tom "spot" Callaway  1.2.1-4
 - use lynx instead of elinks
 



From fedora-extras-commits at redhat.com  Fri Sep 16 23:27:23 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri, 16 Sep 2005 19:27:23 -0400
Subject: rpms/xsupplicant/FC-3 xsupplicant-1.2.1-bz167467.patch, NONE,
	1.1 xsupplicant.spec, 1.6, 1.7
Message-ID: <200509162327.j8GNRrrm018548@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/xsupplicant/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18483/FC-3

Modified Files:
	xsupplicant.spec 
Added Files:
	xsupplicant-1.2.1-bz167467.patch 
Log Message:

patch to try to resolve bz 167467


xsupplicant-1.2.1-bz167467.patch:

--- NEW FILE xsupplicant-1.2.1-bz167467.patch ---
--- xsupplicant-1.2.1/src/cardif/linux/cardif_linux_rtnetlink.c.BAD	2005-09-16 18:22:29.000000000 -0500
+++ xsupplicant-1.2.1/src/cardif/linux/cardif_linux_rtnetlink.c	2005-09-16 18:22:44.000000000 -0500
@@ -135,7 +135,7 @@
   struct iw_event *iwe=NULL;
   unsigned char flags=0;
   u_char *wpa_ie=NULL, *rsn_ie=NULL, wpa_ie_len=0, rsn_ie_len=0;
-  unsigned int freq;
+  uint16_t freq;
   u_char temp_rsn_len = 0, temp_wpa_len = 0;
 
   tptr = bptr;
--- xsupplicant-1.2.1/doc/xml-userguide/userguide.xml.BAD	2005-09-04 10:28:44.000000000 -0500
+++ xsupplicant-1.2.1/doc/xml-userguide/userguide.xml	2005-09-04 10:28:53.000000000 -0500
@@ -1,6 +1,6 @@
 
 
       


Index: xsupplicant.spec
===================================================================
RCS file: /cvs/extras/rpms/xsupplicant/FC-3/xsupplicant.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- xsupplicant.spec	4 Sep 2005 21:57:52 -0000	1.6
+++ xsupplicant.spec	16 Sep 2005 23:27:21 -0000	1.7
@@ -1,7 +1,7 @@
 Name:		xsupplicant
 Summary:	Open Source Implementation of IEEE 802.1x
 Version:	1.2.1
-Release:	4%{?dist}
+Release:	5%{?dist}
 License:	GPL
 Group:		System Environment/Base
 URL:		http://www.open1x.org/
@@ -11,6 +11,7 @@
 BuildRequires:	docbook-dtds, docbook-style-dsssl
 Patch0:		xsupplicant-1.2.1-docsfix.patch
 Patch1:		xsupplicant-1.2.1-gcc4-cleanups.patch
+Patch2:		xsupplicant-1.2.1-bz167467.patch
 
 %description
 This software allows a GNU/Linux or BSD workstation to authenticate with
@@ -22,6 +23,7 @@
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 perl -pi.orig -e 's|/lib\b|/%{_lib}|g' configure*
 
@@ -52,6 +54,9 @@
 %{_sbindir}/xsupplicant
 
 %changelog
+* Fri Sep 16 2005 Tom "spot" Callaway  1.2.1-5
+- patch to try to resolve bz 167467
+
 * Sun Sep  4 2005 Tom "spot" Callaway  1.2.1-4
 - use lynx instead of elinks
 



From fedora-extras-commits at redhat.com  Fri Sep 16 23:27:23 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri, 16 Sep 2005 19:27:23 -0400
Subject: rpms/xsupplicant/FC-4 xsupplicant-1.2.1-bz167467.patch, NONE,
	1.1 xsupplicant.spec, 1.6, 1.7
Message-ID: <200509162327.j8GNRsoR018551@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/xsupplicant/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18483/FC-4

Modified Files:
	xsupplicant.spec 
Added Files:
	xsupplicant-1.2.1-bz167467.patch 
Log Message:

patch to try to resolve bz 167467


xsupplicant-1.2.1-bz167467.patch:

--- NEW FILE xsupplicant-1.2.1-bz167467.patch ---
--- xsupplicant-1.2.1/src/cardif/linux/cardif_linux_rtnetlink.c.BAD	2005-09-16 18:22:29.000000000 -0500
+++ xsupplicant-1.2.1/src/cardif/linux/cardif_linux_rtnetlink.c	2005-09-16 18:22:44.000000000 -0500
@@ -135,7 +135,7 @@
   struct iw_event *iwe=NULL;
   unsigned char flags=0;
   u_char *wpa_ie=NULL, *rsn_ie=NULL, wpa_ie_len=0, rsn_ie_len=0;
-  unsigned int freq;
+  uint16_t freq;
   u_char temp_rsn_len = 0, temp_wpa_len = 0;
 
   tptr = bptr;
--- xsupplicant-1.2.1/doc/xml-userguide/userguide.xml.BAD	2005-09-04 10:28:44.000000000 -0500
+++ xsupplicant-1.2.1/doc/xml-userguide/userguide.xml	2005-09-04 10:28:53.000000000 -0500
@@ -1,6 +1,6 @@
 
 
       


Index: xsupplicant.spec
===================================================================
RCS file: /cvs/extras/rpms/xsupplicant/FC-4/xsupplicant.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- xsupplicant.spec	4 Sep 2005 21:57:53 -0000	1.6
+++ xsupplicant.spec	16 Sep 2005 23:27:21 -0000	1.7
@@ -1,7 +1,7 @@
 Name:		xsupplicant
 Summary:	Open Source Implementation of IEEE 802.1x
 Version:	1.2.1
-Release:	4%{?dist}
+Release:	5%{?dist}
 License:	GPL
 Group:		System Environment/Base
 URL:		http://www.open1x.org/
@@ -11,6 +11,7 @@
 BuildRequires:	docbook-dtds, docbook-style-dsssl
 Patch0:		xsupplicant-1.2.1-docsfix.patch
 Patch1:		xsupplicant-1.2.1-gcc4-cleanups.patch
+Patch2:		xsupplicant-1.2.1-bz167467.patch
 
 %description
 This software allows a GNU/Linux or BSD workstation to authenticate with
@@ -22,6 +23,7 @@
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 perl -pi.orig -e 's|/lib\b|/%{_lib}|g' configure*
 
@@ -52,6 +54,9 @@
 %{_sbindir}/xsupplicant
 
 %changelog
+* Fri Sep 16 2005 Tom "spot" Callaway  1.2.1-5
+- patch to try to resolve bz 167467
+
 * Sun Sep  4 2005 Tom "spot" Callaway  1.2.1-4
 - use lynx instead of elinks
 



From fedora-extras-commits at redhat.com  Fri Sep 16 23:30:09 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri, 16 Sep 2005 19:30:09 -0400
Subject: rpms/xsupplicant/FC-3 xsupplicant-1.2.1-bz167467.patch,1.1,1.2
Message-ID: <200509162330.j8GNU9GP018607@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/xsupplicant/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18557/FC-3

Modified Files:
	xsupplicant-1.2.1-bz167467.patch 
Log Message:

fix bad patch


xsupplicant-1.2.1-bz167467.patch:

Index: xsupplicant-1.2.1-bz167467.patch
===================================================================
RCS file: /cvs/extras/rpms/xsupplicant/FC-3/xsupplicant-1.2.1-bz167467.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xsupplicant-1.2.1-bz167467.patch	16 Sep 2005 23:27:21 -0000	1.1
+++ xsupplicant-1.2.1-bz167467.patch	16 Sep 2005 23:30:07 -0000	1.2
@@ -9,13 +9,3 @@
    u_char temp_rsn_len = 0, temp_wpa_len = 0;
  
    tptr = bptr;
---- xsupplicant-1.2.1/doc/xml-userguide/userguide.xml.BAD	2005-09-04 10:28:44.000000000 -0500
-+++ xsupplicant-1.2.1/doc/xml-userguide/userguide.xml	2005-09-04 10:28:53.000000000 -0500
-@@ -1,6 +1,6 @@
- 
- 
-       



From fedora-extras-commits at redhat.com  Fri Sep 16 23:30:10 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri, 16 Sep 2005 19:30:10 -0400
Subject: rpms/xsupplicant/devel xsupplicant-1.2.1-bz167467.patch,1.1,1.2
Message-ID: <200509162330.j8GNUA9b018625@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/xsupplicant/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18557/devel

Modified Files:
	xsupplicant-1.2.1-bz167467.patch 
Log Message:

fix bad patch


xsupplicant-1.2.1-bz167467.patch:

Index: xsupplicant-1.2.1-bz167467.patch
===================================================================
RCS file: /cvs/extras/rpms/xsupplicant/devel/xsupplicant-1.2.1-bz167467.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xsupplicant-1.2.1-bz167467.patch	16 Sep 2005 23:27:27 -0000	1.1
+++ xsupplicant-1.2.1-bz167467.patch	16 Sep 2005 23:30:08 -0000	1.2
@@ -9,13 +9,3 @@
    u_char temp_rsn_len = 0, temp_wpa_len = 0;
  
    tptr = bptr;
---- xsupplicant-1.2.1/doc/xml-userguide/userguide.xml.BAD	2005-09-04 10:28:44.000000000 -0500
-+++ xsupplicant-1.2.1/doc/xml-userguide/userguide.xml	2005-09-04 10:28:53.000000000 -0500
-@@ -1,6 +1,6 @@
- 
- 
-       



From fedora-extras-commits at redhat.com  Fri Sep 16 23:30:09 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri, 16 Sep 2005 19:30:09 -0400
Subject: rpms/xsupplicant/FC-4 xsupplicant-1.2.1-bz167467.patch,1.1,1.2
Message-ID: <200509162330.j8GNUAK5018616@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/xsupplicant/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18557/FC-4

Modified Files:
	xsupplicant-1.2.1-bz167467.patch 
Log Message:

fix bad patch


xsupplicant-1.2.1-bz167467.patch:

Index: xsupplicant-1.2.1-bz167467.patch
===================================================================
RCS file: /cvs/extras/rpms/xsupplicant/FC-4/xsupplicant-1.2.1-bz167467.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xsupplicant-1.2.1-bz167467.patch	16 Sep 2005 23:27:21 -0000	1.1
+++ xsupplicant-1.2.1-bz167467.patch	16 Sep 2005 23:30:07 -0000	1.2
@@ -9,13 +9,3 @@
    u_char temp_rsn_len = 0, temp_wpa_len = 0;
  
    tptr = bptr;
---- xsupplicant-1.2.1/doc/xml-userguide/userguide.xml.BAD	2005-09-04 10:28:44.000000000 -0500
-+++ xsupplicant-1.2.1/doc/xml-userguide/userguide.xml	2005-09-04 10:28:53.000000000 -0500
-@@ -1,6 +1,6 @@
- 
- 
-       



From fedora-extras-commits at redhat.com  Fri Sep 16 23:59:52 2005
From: fedora-extras-commits at redhat.com (Chris Wright (chrisw))
Date: Fri, 16 Sep 2005 19:59:52 -0400
Subject: rpms/cogito/devel cogito.spec,1.1,1.2
Message-ID: <200509162359.j8GNxqSU018667@cvs-int.fedora.redhat.com>

Author: chrisw

Update of /cvs/extras/rpms/cogito/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18648

Modified Files:
	cogito.spec 
Log Message:
Update spec file to use %{?dist} and fix _libdir breakage



Index: cogito.spec
===================================================================
RCS file: /cvs/extras/rpms/cogito/devel/cogito.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cogito.spec	16 Sep 2005 06:53:08 -0000	1.1
+++ cogito.spec	16 Sep 2005 23:59:49 -0000	1.2
@@ -1,6 +1,6 @@
 Name: 		cogito
 Version: 	0.14.1
-Release: 	1
+Release: 	2%{?dist}
 Summary:  	The Cogito Version Control System
 License: 	GPL
 Group: 		Development/Tools
@@ -25,7 +25,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make DESTDIR=$RPM_BUILD_ROOT prefix=%{_prefix} install
+make DESTDIR=$RPM_BUILD_ROOT prefix=%{_prefix} libdir=%{_libdir}/cogito install
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -38,6 +38,9 @@
 %doc README COPYING Documentation/*
 
 %changelog
+* Fri Sep 16 2005 Chris Wright  0.14.1-2
+- fix _libdir breakage on 64-bit, the irony...
+
 * Thu Sep 15 2005 Chris Wright  0.14.1-1
 - Update to 0.14.1
 



From fedora-extras-commits at redhat.com  Sat Sep 17 00:01:09 2005
From: fedora-extras-commits at redhat.com (Chris Wright (chrisw))
Date: Fri, 16 Sep 2005 20:01:09 -0400
Subject: rpms/cogito/FC-4 cogito.spec,1.1,1.2
Message-ID: <200509170001.j8H01unA020047@cvs-int.fedora.redhat.com>

Author: chrisw

Update of /cvs/extras/rpms/cogito/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19958

Modified Files:
	cogito.spec 
Log Message:
Update spec file to use %{?dist} and fix _libdir breakage



Index: cogito.spec
===================================================================
RCS file: /cvs/extras/rpms/cogito/FC-4/cogito.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cogito.spec	16 Sep 2005 06:53:08 -0000	1.1
+++ cogito.spec	17 Sep 2005 00:01:07 -0000	1.2
@@ -1,6 +1,6 @@
 Name: 		cogito
 Version: 	0.14.1
-Release: 	1
+Release: 	2%{?dist}
 Summary:  	The Cogito Version Control System
 License: 	GPL
 Group: 		Development/Tools
@@ -25,7 +25,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make DESTDIR=$RPM_BUILD_ROOT prefix=%{_prefix} install
+make DESTDIR=$RPM_BUILD_ROOT prefix=%{_prefix} libdir=%{_libdir}/cogito install
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -38,6 +38,9 @@
 %doc README COPYING Documentation/*
 
 %changelog
+* Fri Sep 16 2005 Chris Wright  0.14.1-2
+- fix _libdir breakage on 64-bit, the irony...
+
 * Thu Sep 15 2005 Chris Wright  0.14.1-1
 - Update to 0.14.1
 



From fedora-extras-commits at redhat.com  Sat Sep 17 00:04:19 2005
From: fedora-extras-commits at redhat.com (Chris Wright (chrisw))
Date: Fri, 16 Sep 2005 20:04:19 -0400
Subject: rpms/cogito/FC-3 cogito.spec,1.1,1.2
Message-ID: <200509170004.j8H04jDB020125@cvs-int.fedora.redhat.com>

Author: chrisw

Update of /cvs/extras/rpms/cogito/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20111

Modified Files:
	cogito.spec 
Log Message:
Update spec file to use %{?dist} and fix _libdir breakage



Index: cogito.spec
===================================================================
RCS file: /cvs/extras/rpms/cogito/FC-3/cogito.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cogito.spec	16 Sep 2005 06:53:08 -0000	1.1
+++ cogito.spec	17 Sep 2005 00:04:17 -0000	1.2
@@ -1,6 +1,6 @@
 Name: 		cogito
 Version: 	0.14.1
-Release: 	1
+Release: 	2%{?dist}
 Summary:  	The Cogito Version Control System
 License: 	GPL
 Group: 		Development/Tools
@@ -25,7 +25,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make DESTDIR=$RPM_BUILD_ROOT prefix=%{_prefix} install
+make DESTDIR=$RPM_BUILD_ROOT prefix=%{_prefix} libdir=%{_libdir}/cogito install
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -38,6 +38,9 @@
 %doc README COPYING Documentation/*
 
 %changelog
+* Fri Sep 16 2005 Chris Wright  0.14.1-2
+- fix _libdir breakage on 64-bit, the irony...
+
 * Thu Sep 15 2005 Chris Wright  0.14.1-1
 - Update to 0.14.1
 



From fedora-extras-commits at redhat.com  Sat Sep 17 04:20:23 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Sat, 17 Sep 2005 00:20:23 -0400
Subject: rpms/perl-Algorithm-Dependency - New directory
Message-ID: <200509170420.j8H4KNOQ025912@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Algorithm-Dependency
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25888/perl-Algorithm-Dependency

Log Message:
Directory /cvs/extras/rpms/perl-Algorithm-Dependency added to the repository




From fedora-extras-commits at redhat.com  Sat Sep 17 04:20:23 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Sat, 17 Sep 2005 00:20:23 -0400
Subject: rpms/perl-Algorithm-Dependency/devel - New directory
Message-ID: <200509170420.j8H4KNjP025917@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Algorithm-Dependency/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25888/perl-Algorithm-Dependency/devel

Log Message:
Directory /cvs/extras/rpms/perl-Algorithm-Dependency/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Sep 17 04:20:45 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Sat, 17 Sep 2005 00:20:45 -0400
Subject: rpms/perl-Algorithm-Dependency Makefile, NONE, 1.1 import.log, NONE,
	1.1
Message-ID: <200509170420.j8H4Kjs6025968@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Algorithm-Dependency
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25933

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-Algorithm-Dependency


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Algorithm-Dependency
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Sat Sep 17 04:20:45 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Sat, 17 Sep 2005 00:20:45 -0400
Subject: rpms/perl-Algorithm-Dependency/devel .cvsignore, NONE, 1.1 Makefile,
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <200509170420.j8H4Kj6x025973@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Algorithm-Dependency/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25933/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Algorithm-Dependency


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Sat Sep 17 04:21:52 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Sat, 17 Sep 2005 00:21:52 -0400
Subject: rpms/perl-Algorithm-Dependency import.log,1.1,1.2
Message-ID: <200509170421.j8H4Lqva026036@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Algorithm-Dependency
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26001

Modified Files:
	import.log 
Log Message:
auto-import perl-Algorithm-Dependency-1.04-2 on branch devel from perl-Algorithm-Dependency-1.04-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Algorithm-Dependency/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	17 Sep 2005 04:20:43 -0000	1.1
+++ import.log	17 Sep 2005 04:21:50 -0000	1.2
@@ -0,0 +1 @@
+perl-Algorithm-Dependency-1_04-2:HEAD:perl-Algorithm-Dependency-1.04-2.src.rpm:1126930895



From fedora-extras-commits at redhat.com  Sat Sep 17 04:21:52 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Sat, 17 Sep 2005 00:21:52 -0400
Subject: rpms/perl-Algorithm-Dependency/devel perl-Algorithm-Dependency.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200509170421.j8H4LqRq026043@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Algorithm-Dependency/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26001/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Algorithm-Dependency.spec 
Log Message:
auto-import perl-Algorithm-Dependency-1.04-2 on branch devel from perl-Algorithm-Dependency-1.04-2.src.rpm


--- NEW FILE perl-Algorithm-Dependency.spec ---
Name: 		perl-Algorithm-Dependency
Version: 	1.04
Release: 	2%{?dist}
Summary: 	Algorithmic framework for implementing dependency trees
License: 	GPL or Artistic
Group: 		Development/Libraries
URL: 		http://search.cpan.org/dist/Algorithm-Dependency/
Source0:	http://search.cpan.org/CPAN/authors/id/A/AD/ADAMK/Algorithm-Dependency-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
BuildArch: noarch

BuildRequires: perl(File::Spec)		>= 0.82
BuildRequires: perl(Test::ClassAPI)	>= 0.6
BuildRequires: perl(Test::More)		>= 0.47
BuildRequires: perl(Params::Util)	>= 0.05
BuildRequires: perl(Test::Pod)		>= 1.00

%description
Algorithm::Dependency is a framework for creating simple read-only
dependency hierarchies, where you have a set of items that rely on other
items in the set, and require actions on them as well.

%prep
%setup -q -n Algorithm-Dependency-%{version}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'
find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';'
chmod -R u+w $RPM_BUILD_ROOT/*

%clean
rm -rf $RPM_BUILD_ROOT

%check
make test

%files
%defattr(-,root,root,-)
%doc Changes LICENSE
%{perl_vendorlib}/Algorithm
%{_mandir}/man3/*

%changelog
* Thu Sep 15 2005 Paul Howarth  - 1.04-2
- Fix Source0 URL
- Fix perl(Params::Util) BuildReq version
- Add BR: perl(Test::Pod) for improved test coverage

* Thu Sep 15 2005 Ralf Corsepius  - 1.04-1
- Upstream update.
- Drop shipping README.

* Tue Sep 13 2005 Ralf Corsepius  - 1.03-1
- Spec file cleanup.
- FE submission.

* Wed Jun 29 2005 Ralf Corsepius  - 1.03-0.pm.1
- Initial packman version.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Algorithm-Dependency/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	17 Sep 2005 04:20:43 -0000	1.1
+++ .cvsignore	17 Sep 2005 04:21:50 -0000	1.2
@@ -0,0 +1 @@
+Algorithm-Dependency-1.04.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Algorithm-Dependency/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	17 Sep 2005 04:20:43 -0000	1.1
+++ sources	17 Sep 2005 04:21:50 -0000	1.2
@@ -0,0 +1 @@
+de94e564ce296804400f04a79b00a715  Algorithm-Dependency-1.04.tar.gz



From fedora-extras-commits at redhat.com  Sat Sep 17 04:24:10 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Sat, 17 Sep 2005 00:24:10 -0400
Subject: rpms/perl-Algorithm-Dependency/devel perl-Algorithm-Dependency.spec,
	1.1, 1.2
Message-ID: <200509170424.j8H4OAJM026099@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Algorithm-Dependency/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26080

Modified Files:
	perl-Algorithm-Dependency.spec 
Log Message:
Spec cleanup.


Index: perl-Algorithm-Dependency.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Algorithm-Dependency/devel/perl-Algorithm-Dependency.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Algorithm-Dependency.spec	17 Sep 2005 04:21:50 -0000	1.1
+++ perl-Algorithm-Dependency.spec	17 Sep 2005 04:24:08 -0000	1.2
@@ -1,6 +1,6 @@
 Name: 		perl-Algorithm-Dependency
 Version: 	1.04
-Release: 	2%{?dist}
+Release: 	3%{?dist}
 Summary: 	Algorithmic framework for implementing dependency trees
 License: 	GPL or Artistic
 Group: 		Development/Libraries
@@ -49,6 +49,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Sat Sep 17 2005 Ralf Corsepius  - 1.04-3
+- Spec cleanup.
+
 * Thu Sep 15 2005 Paul Howarth  - 1.04-2
 - Fix Source0 URL
 - Fix perl(Params::Util) BuildReq version
@@ -61,6 +64,3 @@
 * Tue Sep 13 2005 Ralf Corsepius  - 1.03-1
 - Spec file cleanup.
 - FE submission.
-
-* Wed Jun 29 2005 Ralf Corsepius  - 1.03-0.pm.1
-- Initial packman version.



From fedora-extras-commits at redhat.com  Sat Sep 17 04:37:15 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Sat, 17 Sep 2005 00:37:15 -0400
Subject: rpms/perl-Locale-Maketext-Lexicon - New directory
Message-ID: <200509170437.j8H4bFrS026216@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Locale-Maketext-Lexicon
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26196/perl-Locale-Maketext-Lexicon

Log Message:
Directory /cvs/extras/rpms/perl-Locale-Maketext-Lexicon added to the repository




From fedora-extras-commits at redhat.com  Sat Sep 17 04:37:15 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Sat, 17 Sep 2005 00:37:15 -0400
Subject: rpms/perl-Locale-Maketext-Lexicon/devel - New directory
Message-ID: <200509170437.j8H4bFGK026221@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Locale-Maketext-Lexicon/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26196/perl-Locale-Maketext-Lexicon/devel

Log Message:
Directory /cvs/extras/rpms/perl-Locale-Maketext-Lexicon/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Sep 17 04:37:44 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Sat, 17 Sep 2005 00:37:44 -0400
Subject: rpms/perl-Locale-Maketext-Lexicon Makefile, NONE, 1.1 import.log,
	NONE, 1.1
Message-ID: <200509170437.j8H4bioP026276@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Locale-Maketext-Lexicon
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26241

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-Locale-Maketext-Lexicon


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Locale-Maketext-Lexicon
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Sat Sep 17 04:37:45 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Sat, 17 Sep 2005 00:37:45 -0400
Subject: rpms/perl-Locale-Maketext-Lexicon/devel .cvsignore, NONE,
	1.1 Makefile, NONE, 1.1 sources, NONE, 1.1
Message-ID: <200509170437.j8H4bjZ7026281@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Locale-Maketext-Lexicon/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26241/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Locale-Maketext-Lexicon


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Sat Sep 17 04:38:43 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Sat, 17 Sep 2005 00:38:43 -0400
Subject: rpms/perl-Locale-Maketext-Lexicon import.log,1.1,1.2
Message-ID: <200509170439.j8H4dEdp026354@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Locale-Maketext-Lexicon
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26315

Modified Files:
	import.log 
Log Message:
auto-import perl-Locale-Maketext-Lexicon-0.49-1 on branch devel from perl-Locale-Maketext-Lexicon-0.49-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Locale-Maketext-Lexicon/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	17 Sep 2005 04:37:42 -0000	1.1
+++ import.log	17 Sep 2005 04:38:41 -0000	1.2
@@ -0,0 +1 @@
+perl-Locale-Maketext-Lexicon-0_49-1:HEAD:perl-Locale-Maketext-Lexicon-0.49-1.src.rpm:1126931909



From fedora-extras-commits at redhat.com  Sat Sep 17 04:38:44 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Sat, 17 Sep 2005 00:38:44 -0400
Subject: rpms/perl-Locale-Maketext-Lexicon/devel
	perl-Locale-Maketext-Lexicon-filter-provides.sh, NONE,
	1.1 perl-Locale-Maketext-Lexicon.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200509170439.j8H4dEtY026358@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Locale-Maketext-Lexicon/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26315/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Locale-Maketext-Lexicon-filter-provides.sh 
	perl-Locale-Maketext-Lexicon.spec 
Log Message:
auto-import perl-Locale-Maketext-Lexicon-0.49-1 on branch devel from perl-Locale-Maketext-Lexicon-0.49-1.src.rpm


--- NEW FILE perl-Locale-Maketext-Lexicon-filter-provides.sh ---
#!/bin/sh

/usr/lib/rpm/perl.prov $* |\
    sed -e '/perl(MyParser/d'


--- NEW FILE perl-Locale-Maketext-Lexicon.spec ---
Name: 		perl-Locale-Maketext-Lexicon
Version: 	0.49
Release: 	1%{?dist}
Summary: 	Locale::Maketext::Lexicon Perl module
License:	GPL or Artistic
Group: 		Development/Libraries
URL: 		http://search.cpan.org/dist/Locale-Maketext-Lexicon/
Source0: 	http://www.cpan.org/CPAN/authors/id/A/AU/AUTRIJUS/Locale-Maketext-Lexicon-0.49.tar.gz
Source1: 	%{name}-filter-provides.sh
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%define __perl_provides %{SOURCE1}

Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
BuildArch: noarch

%description
Locale::Maketext::Lexicon provides lexicon-handling backends for
Locale::Maketext to read from other localization formats, such as PO files,
MO files, or from databases via the "Tie" interface.

%prep
%setup -q -n Locale-Maketext-Lexicon-%{version}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'
find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';'
chmod -R u+w $RPM_BUILD_ROOT/*

%clean
rm -rf $RPM_BUILD_ROOT

%check
make test

%files
%defattr(-,root,root,-)
%doc AUTHORS Changes README
%{_bindir}/*
%{_mandir}/man1/*
%{perl_vendorlib}/Locale
%{_mandir}/man3/*

%changelog
* Tue Sep 13 2005 Ralf Corsepius  - 0.49-1
- FE submission.

* Sun Sep 04 2005 Ralf Corsepius  - 0.49-0.pm.1
- Cosmetics.

* Sat May 07 2005 Ralf Corsepius  - 0.49-0.pm.0
- Update to 0.49

* Tue Mar 22 2005 Ralf Corsepius  - 0.48-0.pm.2
- Initial packman version.
- Update to FE standards.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Locale-Maketext-Lexicon/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	17 Sep 2005 04:37:42 -0000	1.1
+++ .cvsignore	17 Sep 2005 04:38:42 -0000	1.2
@@ -0,0 +1 @@
+Locale-Maketext-Lexicon-0.49.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Locale-Maketext-Lexicon/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	17 Sep 2005 04:37:42 -0000	1.1
+++ sources	17 Sep 2005 04:38:42 -0000	1.2
@@ -0,0 +1 @@
+c9a37ce122e02163a4589db84ee6f08b  Locale-Maketext-Lexicon-0.49.tar.gz



From fedora-extras-commits at redhat.com  Sat Sep 17 04:43:13 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Sat, 17 Sep 2005 00:43:13 -0400
Subject: rpms/perl-Locale-Maketext-Lexicon/devel
	perl-Locale-Maketext-Lexicon.spec, 1.1, 1.2
Message-ID: <200509170443.j8H4hDor026415@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Locale-Maketext-Lexicon/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26396

Modified Files:
	perl-Locale-Maketext-Lexicon.spec 
Log Message:
Spec file cleanup.


Index: perl-Locale-Maketext-Lexicon.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Locale-Maketext-Lexicon/devel/perl-Locale-Maketext-Lexicon.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Locale-Maketext-Lexicon.spec	17 Sep 2005 04:38:42 -0000	1.1
+++ perl-Locale-Maketext-Lexicon.spec	17 Sep 2005 04:43:11 -0000	1.2
@@ -1,11 +1,11 @@
 Name: 		perl-Locale-Maketext-Lexicon
 Version: 	0.49
-Release: 	1%{?dist}
-Summary: 	Locale::Maketext::Lexicon Perl module
+Release: 	2%{?dist}
+Summary: 	Extract translatable strings from source
 License:	GPL or Artistic
 Group: 		Development/Libraries
 URL: 		http://search.cpan.org/dist/Locale-Maketext-Lexicon/
-Source0: 	http://www.cpan.org/CPAN/authors/id/A/AU/AUTRIJUS/Locale-Maketext-Lexicon-0.49.tar.gz
+Source0: 	http://search.cpan.org/CPAN/authors/id/A/AU/AUTRIJUS/Locale-Maketext-Lexicon-0.49.tar.gz
 Source1: 	%{name}-filter-provides.sh
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -48,16 +48,8 @@
 %{_mandir}/man3/*
 
 %changelog
+* Sat Sep 17 2005 Ralf Corsepius  - 0.49-2
+- Spec file cleanup.
+
 * Tue Sep 13 2005 Ralf Corsepius  - 0.49-1
 - FE submission.
-
-* Sun Sep 04 2005 Ralf Corsepius  - 0.49-0.pm.1
-- Cosmetics.
-
-* Sat May 07 2005 Ralf Corsepius  - 0.49-0.pm.0
-- Update to 0.49
-
-* Tue Mar 22 2005 Ralf Corsepius  - 0.48-0.pm.2
-- Initial packman version.
-- Update to FE standards.
-



From fedora-extras-commits at redhat.com  Sat Sep 17 06:05:24 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Sat, 17 Sep 2005 02:05:24 -0400
Subject: rpms/rxvt-unicode/devel rxvt-unicode.spec,1.3,1.4
Message-ID: <200509170605.j8H65OKE029219@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/rxvt-unicode/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29166/devel

Modified Files:
	rxvt-unicode.spec 
Log Message:
- enable iso14755 (#168548)



Index: rxvt-unicode.spec
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/devel/rxvt-unicode.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- rxvt-unicode.spec	23 Aug 2005 14:37:47 -0000	1.3
+++ rxvt-unicode.spec	17 Sep 2005 06:05:22 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           rxvt-unicode
 Version:        5.7
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Rxvt-unicode is an unicode version of rxvt
 
 Group:          User Interface/X
@@ -37,7 +37,7 @@
   --enable-mousewheel --enable-slipwheeling --enable-smart-resize \
   --enable-pointer-blank --enable-xpm-background --enable-next-scroll \
   --enable-xim --enable-linespace --with-save-lines=2000 --enable-resources \
-  --with-codesets=all
+  --with-codesets=all --enable-combining --enable-iso14755
 
 make CFLAGS="${RPM_OPT_FLAGS}" %{?_smp_mflags}
 
@@ -65,6 +65,10 @@
 %{_datadir}/applications/*
 
 %changelog
+* Sat Sep 17 2005 Andreas Bierfert 
+5.7-2
+- enable iso14755 (#168548)
+
 * Tue Aug 23 2005 Andreas Bierfert 
 5.7-1
 - version upgrade



From fedora-extras-commits at redhat.com  Sat Sep 17 06:05:05 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Sat, 17 Sep 2005 02:05:05 -0400
Subject: rpms/rxvt-unicode/FC-4 rxvt-unicode.spec,1.3,1.4
Message-ID: <200509170605.j8H65tWG029223@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/rxvt-unicode/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29166/FC-4

Modified Files:
	rxvt-unicode.spec 
Log Message:
- enable iso14755 (#168548)



Index: rxvt-unicode.spec
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/FC-4/rxvt-unicode.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- rxvt-unicode.spec	23 Aug 2005 14:37:41 -0000	1.3
+++ rxvt-unicode.spec	17 Sep 2005 06:05:03 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           rxvt-unicode
 Version:        5.7
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Rxvt-unicode is an unicode version of rxvt
 
 Group:          User Interface/X
@@ -37,7 +37,7 @@
   --enable-mousewheel --enable-slipwheeling --enable-smart-resize \
   --enable-pointer-blank --enable-xpm-background --enable-next-scroll \
   --enable-xim --enable-linespace --with-save-lines=2000 --enable-resources \
-  --with-codesets=all
+  --with-codesets=all --enable-combining --enable-iso14755
 
 make CFLAGS="${RPM_OPT_FLAGS}" %{?_smp_mflags}
 
@@ -65,6 +65,10 @@
 %{_datadir}/applications/*
 
 %changelog
+* Sat Sep 17 2005 Andreas Bierfert 
+5.7-2
+- enable iso14755 (#168548)
+
 * Tue Aug 23 2005 Andreas Bierfert 
 5.7-1
 - version upgrade



From fedora-extras-commits at redhat.com  Sat Sep 17 06:05:01 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Sat, 17 Sep 2005 02:05:01 -0400
Subject: rpms/rxvt-unicode/FC-3 rxvt-unicode.spec,1.3,1.4
Message-ID: <200509170605.j8H65tUS029222@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/rxvt-unicode/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29166/FC-3

Modified Files:
	rxvt-unicode.spec 
Log Message:
- enable iso14755 (#168548)



Index: rxvt-unicode.spec
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/FC-3/rxvt-unicode.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- rxvt-unicode.spec	23 Aug 2005 14:37:41 -0000	1.3
+++ rxvt-unicode.spec	17 Sep 2005 06:04:59 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           rxvt-unicode
 Version:        5.7
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Rxvt-unicode is an unicode version of rxvt
 
 Group:          User Interface/X
@@ -37,7 +37,7 @@
   --enable-mousewheel --enable-slipwheeling --enable-smart-resize \
   --enable-pointer-blank --enable-xpm-background --enable-next-scroll \
   --enable-xim --enable-linespace --with-save-lines=2000 --enable-resources \
-  --with-codesets=all
+  --with-codesets=all --enable-combining --enable-iso14755
 
 make CFLAGS="${RPM_OPT_FLAGS}" %{?_smp_mflags}
 
@@ -65,6 +65,10 @@
 %{_datadir}/applications/*
 
 %changelog
+* Sat Sep 17 2005 Andreas Bierfert 
+5.7-2
+- enable iso14755 (#168548)
+
 * Tue Aug 23 2005 Andreas Bierfert 
 5.7-1
 - version upgrade



From fedora-extras-commits at redhat.com  Sat Sep 17 06:38:05 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Sat, 17 Sep 2005 02:38:05 -0400
Subject: owners owners.list,1.226,1.227
Message-ID: <200509170638.j8H6c5D8029449@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29430

Modified Files:
	owners.list 
Log Message:
- add wmapmload
- add wmweather+



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.226
retrieving revision 1.227
diff -u -r1.226 -r1.227
--- owners.list	16 Sep 2005 23:12:15 -0000	1.226
+++ owners.list	17 Sep 2005 06:38:03 -0000	1.227
@@ -1022,6 +1022,8 @@
 Fedora Extras|whowatch|Displays informations about the users currently logged in|nos at utelsystems.com|extras-qa at fedoraproject.org|
 Fedora Extras|WindowMaker|A fast, feature rich Window manager|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|wine|A Windows 16/32 bit emulator|pmatilai at laiskiainen.org|extras-qa at fedoraproject.org|
+Fedora Extras|wmapmload|Wmapmload monitors your apm status in an lcd display fashion|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
+Fedora Extras|wmweather+|Weather status dockapp|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|wv2|A library which allows access to Microsoft?? Word files|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|wv|MSWord 6/7/8/9 binary file format to HTML converter|gauret at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|wxGTK|GTK+ port of the wxWidgets GUI library|anvil at livna.org|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sat Sep 17 07:39:01 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Sat, 17 Sep 2005 03:39:01 -0400
Subject: rpms/fluxbox/FC-3 .cvsignore, 1.4, 1.5 fluxbox.spec, 1.10,
	1.11 sources, 1.4, 1.5
Message-ID: <200509170739.j8H7d1UV030876@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/fluxbox/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30821/FC-3

Modified Files:
	.cvsignore fluxbox.spec sources 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fluxbox/FC-3/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	31 May 2005 21:42:26 -0000	1.4
+++ .cvsignore	17 Sep 2005 07:38:59 -0000	1.5
@@ -1,2 +1,2 @@
-fluxbox-0.9.13.tar.bz2
+fluxbox-0.9.14.tar.bz2
 artwiz-aleczapka.tar.bz2


Index: fluxbox.spec
===================================================================
RCS file: /cvs/extras/rpms/fluxbox/FC-3/fluxbox.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- fluxbox.spec	9 Sep 2005 08:07:38 -0000	1.10
+++ fluxbox.spec	17 Sep 2005 07:38:59 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           fluxbox
-Version:        0.9.13
-Release:        4%{?dist}
+Version:        0.9.14
+Release:        1%{?dist}
 
 Summary:	Window Manager based on Blackbox
 
@@ -8,7 +8,7 @@
 License:        MIT
 URL:            http://fluxbox.sourceforge.net
 
-Source0:        http://download.sourceforge.net/fluxbox/fluxbox-0.9.13.tar.bz2
+Source0:        http://download.sourceforge.net/fluxbox/fluxbox-0.9.14.tar.bz2
 Source1:        Xclients.%{name}
 Source2:        FluxBox
 Source3:        fluxbox.desktop
@@ -38,15 +38,14 @@
 %configure      --enable-xft \
                 --enable-gnome \
                 --enable-kde \
-                --enable-xinerama \
-		#-enable-debug \
+                --enable-xinerama
 
 make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%makeinstall
+make install DESTDIR=$RPM_BUILD_ROOT
 
 # make gdm users happy
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/apps/switchdesk/
@@ -69,7 +68,7 @@
 	-kg -in -ds\
 	-p %{_usr} \
 	-o %{_datadir}/fluxbox/menu \
-	-m Fluxbox-0.9.13 2>&1 > /dev/null
+	-m Fluxbox-0.9.14 2>&1 > /dev/null
 
 
 #artwiz fontz
@@ -106,6 +105,10 @@
 %{_libdir}/X11/fonts/artwiz-aleczapka
 
 %changelog
+* Thu Sep 15 2005 Andreas Bierfert 
+0.9.14-1
+- version upgrade
+
 * Tue Sep 06 2005 Andreas Bierfert 
 0.9.13-4
 - remove X11R6 path stuff #167601


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fluxbox/FC-3/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	31 May 2005 21:42:26 -0000	1.4
+++ sources	17 Sep 2005 07:38:59 -0000	1.5
@@ -1,2 +1,2 @@
-f9b7b3c3b8e1e9ce3449601b238d4fba  fluxbox-0.9.13.tar.bz2
+7641aaea532841e103e9705bb5b98f62  fluxbox-0.9.14.tar.bz2
 3c7da9a10a84d517e6846b2031950380  artwiz-aleczapka.tar.bz2



From fedora-extras-commits at redhat.com  Sat Sep 17 07:39:02 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Sat, 17 Sep 2005 03:39:02 -0400
Subject: rpms/fluxbox/devel .cvsignore, 1.4, 1.5 fluxbox.spec, 1.12,
	1.13 sources, 1.4, 1.5
Message-ID: <200509170739.j8H7d2Sj030892@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/fluxbox/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30821/devel

Modified Files:
	.cvsignore fluxbox.spec sources 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fluxbox/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	8 Jun 2005 21:29:07 -0000	1.4
+++ .cvsignore	17 Sep 2005 07:38:59 -0000	1.5
@@ -1,2 +1,2 @@
-fluxbox-0.9.13.tar.bz2
+fluxbox-0.9.14.tar.bz2
 artwiz-aleczapka.tar.bz2


Index: fluxbox.spec
===================================================================
RCS file: /cvs/extras/rpms/fluxbox/devel/fluxbox.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- fluxbox.spec	9 Sep 2005 08:07:56 -0000	1.12
+++ fluxbox.spec	17 Sep 2005 07:38:59 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           fluxbox
-Version:        0.9.13
-Release:        4%{?dist}
+Version:        0.9.14
+Release:        1%{?dist}
 
 Summary:	Window Manager based on Blackbox
 
@@ -8,7 +8,7 @@
 License:        MIT
 URL:            http://fluxbox.sourceforge.net
 
-Source0:        http://download.sourceforge.net/fluxbox/fluxbox-0.9.13.tar.bz2
+Source0:        http://download.sourceforge.net/fluxbox/fluxbox-0.9.14.tar.bz2
 Source1:        Xclients.%{name}
 Source2:        FluxBox
 Source3:        fluxbox.desktop
@@ -38,15 +38,14 @@
 %configure      --enable-xft \
                 --enable-gnome \
                 --enable-kde \
-                --enable-xinerama \
-		#-enable-debug \
+                --enable-xinerama
 
 make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%makeinstall
+make install DESTDIR=$RPM_BUILD_ROOT
 
 # make gdm users happy
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/apps/switchdesk/
@@ -69,7 +68,7 @@
 	-kg -in -ds\
 	-p %{_usr} \
 	-o %{_datadir}/fluxbox/menu \
-	-m Fluxbox-0.9.13 2>&1 > /dev/null
+	-m Fluxbox-0.9.14 2>&1 > /dev/null
 
 
 #artwiz fontz
@@ -106,6 +105,10 @@
 %{_libdir}/X11/fonts/artwiz-aleczapka
 
 %changelog
+* Thu Sep 15 2005 Andreas Bierfert 
+0.9.14-1
+- version upgrade
+
 * Tue Sep 06 2005 Andreas Bierfert 
 0.9.13-4
 - remove X11R6 path stuff #167601


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fluxbox/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	8 Jun 2005 21:29:07 -0000	1.4
+++ sources	17 Sep 2005 07:38:59 -0000	1.5
@@ -1,2 +1,2 @@
-f9b7b3c3b8e1e9ce3449601b238d4fba  fluxbox-0.9.13.tar.bz2
+7641aaea532841e103e9705bb5b98f62  fluxbox-0.9.14.tar.bz2
 3c7da9a10a84d517e6846b2031950380  artwiz-aleczapka.tar.bz2



From fedora-extras-commits at redhat.com  Sat Sep 17 07:39:01 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Sat, 17 Sep 2005 03:39:01 -0400
Subject: rpms/fluxbox/FC-4 .cvsignore, 1.4, 1.5 fluxbox.spec, 1.14,
	1.15 sources, 1.4, 1.5
Message-ID: <200509170739.j8H7d1pl030884@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/fluxbox/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30821/FC-4

Modified Files:
	.cvsignore fluxbox.spec sources 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fluxbox/FC-4/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	31 May 2005 21:55:25 -0000	1.4
+++ .cvsignore	17 Sep 2005 07:38:59 -0000	1.5
@@ -1,2 +1,2 @@
-fluxbox-0.9.13.tar.bz2
+fluxbox-0.9.14.tar.bz2
 artwiz-aleczapka.tar.bz2


Index: fluxbox.spec
===================================================================
RCS file: /cvs/extras/rpms/fluxbox/FC-4/fluxbox.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- fluxbox.spec	9 Sep 2005 08:07:40 -0000	1.14
+++ fluxbox.spec	17 Sep 2005 07:38:59 -0000	1.15
@@ -1,6 +1,6 @@
 Name:           fluxbox
-Version:        0.9.13
-Release:        4%{?dist}
+Version:        0.9.14
+Release:        1%{?dist}
 
 Summary:	Window Manager based on Blackbox
 
@@ -8,7 +8,7 @@
 License:        MIT
 URL:            http://fluxbox.sourceforge.net
 
-Source0:        http://download.sourceforge.net/fluxbox/fluxbox-0.9.13.tar.bz2
+Source0:        http://download.sourceforge.net/fluxbox/fluxbox-0.9.14.tar.bz2
 Source1:        Xclients.%{name}
 Source2:        FluxBox
 Source3:        fluxbox.desktop
@@ -38,15 +38,14 @@
 %configure      --enable-xft \
                 --enable-gnome \
                 --enable-kde \
-                --enable-xinerama \
-		#-enable-debug \
+                --enable-xinerama
 
 make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%makeinstall
+make install DESTDIR=$RPM_BUILD_ROOT
 
 # make gdm users happy
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/apps/switchdesk/
@@ -69,7 +68,7 @@
 	-kg -in -ds\
 	-p %{_usr} \
 	-o %{_datadir}/fluxbox/menu \
-	-m Fluxbox-0.9.13 2>&1 > /dev/null
+	-m Fluxbox-0.9.14 2>&1 > /dev/null
 
 
 #artwiz fontz
@@ -106,6 +105,10 @@
 %{_libdir}/X11/fonts/artwiz-aleczapka
 
 %changelog
+* Thu Sep 15 2005 Andreas Bierfert 
+0.9.14-1
+- version upgrade
+
 * Tue Sep 06 2005 Andreas Bierfert 
 0.9.13-4
 - remove X11R6 path stuff #167601


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fluxbox/FC-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	31 May 2005 21:55:25 -0000	1.4
+++ sources	17 Sep 2005 07:38:59 -0000	1.5
@@ -1,2 +1,2 @@
-f9b7b3c3b8e1e9ce3449601b238d4fba  fluxbox-0.9.13.tar.bz2
+7641aaea532841e103e9705bb5b98f62  fluxbox-0.9.14.tar.bz2
 3c7da9a10a84d517e6846b2031950380  artwiz-aleczapka.tar.bz2



From fedora-extras-commits at redhat.com  Sat Sep 17 08:39:16 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sat, 17 Sep 2005 04:39:16 -0400
Subject: rpms/libsidplay/devel libsidplay.spec,1.10,1.11
Message-ID: <200509170839.j8H8dGqw000540@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/libsidplay/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv521

Modified Files:
	libsidplay.spec 
Log Message:
* Sat Sep 17 2005 Michael Schwendt  1.36.57-9
- don't build/include static library



Index: libsidplay.spec
===================================================================
RCS file: /cvs/extras/rpms/libsidplay/devel/libsidplay.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- libsidplay.spec	27 Jun 2005 18:19:36 -0000	1.10
+++ libsidplay.spec	17 Sep 2005 08:39:14 -0000	1.11
@@ -1,7 +1,7 @@
 Name: libsidplay
 Summary: Commodore 64 music player and SID chip emulator library
 Version: 1.36.57
-Release: 8%{?dist}
+Release: 9%{?dist}
 Source: http://www.geocities.com/SiliconValley/Lakes/5147/sidplay/packages/%{name}-%{version}.tgz
 Patch: libsidplay-post57fixes.patch
 Group: System Environment/Libraries
@@ -29,11 +29,11 @@
 %patch -p1 -b .post57fixes
 
 %build
+CXXFLAGS="$RPM_OPT_FLAGS" %configure \
 %ifarch %{ix86}
-CXXFLAGS="$RPM_OPT_FLAGS" %configure --enable-optfixpoint --enable-optendian
-%else
-CXXFLAGS="$RPM_OPT_FLAGS" %configure
+  --enable-optfixpoint --enable-optendian \
 %endif
+  --disable-static
 make
 
 %install
@@ -58,10 +58,13 @@
 %files devel
 %defattr(-,root,root)
 %{_libdir}/libsidplay.so
-%{_libdir}/libsidplay.a
+#%{_libdir}/libsidplay.a
 %{_includedir}/sidplay
 
 %changelog
+* Sat Sep 17 2005 Michael Schwendt  1.36.57-9
+- don't build/include static library
+
 * Thu May 12 2005 Michael Schwendt  1.36.57-8
 - rebuilt
 



From fedora-extras-commits at redhat.com  Sat Sep 17 08:58:54 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sat, 17 Sep 2005 04:58:54 -0400
Subject: rpms/clamav/FC-3 clamav-0.86.2-timeout.patch,1.1,NONE
Message-ID: <200509170858.j8H8wseF000671@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/clamav/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv628/FC-3

Removed Files:
	clamav-0.86.2-timeout.patch 
Log Message:
not needed for 0.87 anymore



--- clamav-0.86.2-timeout.patch DELETED ---



From fedora-extras-commits at redhat.com  Sat Sep 17 08:58:55 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sat, 17 Sep 2005 04:58:55 -0400
Subject: rpms/clamav/devel clamav-0.86.2-timeout.patch,1.1,NONE
Message-ID: <200509170858.j8H8wtxd000681@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/clamav/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv628/devel

Removed Files:
	clamav-0.86.2-timeout.patch 
Log Message:
not needed for 0.87 anymore



--- clamav-0.86.2-timeout.patch DELETED ---



From fedora-extras-commits at redhat.com  Sat Sep 17 08:58:54 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sat, 17 Sep 2005 04:58:54 -0400
Subject: rpms/clamav/FC-4 clamav-0.86.2-timeout.patch,1.1,NONE
Message-ID: <200509170858.j8H8wsF7000676@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/clamav/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv628/FC-4

Removed Files:
	clamav-0.86.2-timeout.patch 
Log Message:
not needed for 0.87 anymore



--- clamav-0.86.2-timeout.patch DELETED ---



From fedora-extras-commits at redhat.com  Sat Sep 17 08:59:17 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sat, 17 Sep 2005 04:59:17 -0400
Subject: rpms/clamav/FC-3 freshclam.sysconfig,1.1,1.2
Message-ID: <200509170859.j8H8xlJb000740@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/clamav/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv687/FC-3

Modified Files:
	freshclam.sysconfig 
Log Message:
fixed typo



Index: freshclam.sysconfig
===================================================================
RCS file: /cvs/extras/rpms/clamav/FC-3/freshclam.sysconfig,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- freshclam.sysconfig	25 Jul 2005 17:47:53 -0000	1.1
+++ freshclam.sysconfig	17 Sep 2005 08:59:15 -0000	1.2
@@ -11,7 +11,7 @@
 ## calculated by the 'hostid' program. This predefined value guarantees
 ## constant timespans of 3 hours between two subsequent freshclam runs.
 ##
-## This options accepts two special values:
+## This option accepts two special values:
 ## 'disabled-warn'  ...  disables the automatic freshclam update and
 ##                         gives out a warning
 ## 'disabled'       ...  disables the automatic freshclam silently



From fedora-extras-commits at redhat.com  Sat Sep 17 08:59:18 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sat, 17 Sep 2005 04:59:18 -0400
Subject: rpms/clamav/devel freshclam.sysconfig,1.1,1.2
Message-ID: <200509170859.j8H8xmbO000746@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/clamav/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv687/devel

Modified Files:
	freshclam.sysconfig 
Log Message:
fixed typo



Index: freshclam.sysconfig
===================================================================
RCS file: /cvs/extras/rpms/clamav/devel/freshclam.sysconfig,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- freshclam.sysconfig	25 Jul 2005 17:17:06 -0000	1.1
+++ freshclam.sysconfig	17 Sep 2005 08:59:16 -0000	1.2
@@ -11,7 +11,7 @@
 ## calculated by the 'hostid' program. This predefined value guarantees
 ## constant timespans of 3 hours between two subsequent freshclam runs.
 ##
-## This options accepts two special values:
+## This option accepts two special values:
 ## 'disabled-warn'  ...  disables the automatic freshclam update and
 ##                         gives out a warning
 ## 'disabled'       ...  disables the automatic freshclam silently



From fedora-extras-commits at redhat.com  Sat Sep 17 08:59:18 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sat, 17 Sep 2005 04:59:18 -0400
Subject: rpms/clamav/FC-4 freshclam.sysconfig,1.1,1.2
Message-ID: <200509170859.j8H8xmdB000743@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/clamav/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv687/FC-4

Modified Files:
	freshclam.sysconfig 
Log Message:
fixed typo



Index: freshclam.sysconfig
===================================================================
RCS file: /cvs/extras/rpms/clamav/FC-4/freshclam.sysconfig,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- freshclam.sysconfig	25 Jul 2005 17:47:54 -0000	1.1
+++ freshclam.sysconfig	17 Sep 2005 08:59:15 -0000	1.2
@@ -11,7 +11,7 @@
 ## calculated by the 'hostid' program. This predefined value guarantees
 ## constant timespans of 3 hours between two subsequent freshclam runs.
 ##
-## This options accepts two special values:
+## This option accepts two special values:
 ## 'disabled-warn'  ...  disables the automatic freshclam update and
 ##                         gives out a warning
 ## 'disabled'       ...  disables the automatic freshclam silently



From fedora-extras-commits at redhat.com  Sat Sep 17 09:00:18 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sat, 17 Sep 2005 05:00:18 -0400
Subject: rpms/clamav/devel sources,1.11,1.12
Message-ID: <200509170900.j8H90IDR000806@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/clamav/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv753/devel

Modified Files:
	sources 
Log Message:
version 0.87



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/clamav/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	25 Jul 2005 17:19:38 -0000	1.11
+++ sources	17 Sep 2005 09:00:16 -0000	1.12
@@ -1,2 +1,2 @@
-870de14ba123d6e9cba9850498c49f5d  clamav-0.86.2.tar.gz
-7d9ffe964a67ee6db157e112203a2678  clamav-0.86.2.tar.gz.sig
+dd0a12deb4f48f760fa1fcd378ae7c24  clamav-0.87.tar.gz
+db9c17eec9e05085795b48ba199af895  clamav-0.87.tar.gz.sig



From fedora-extras-commits at redhat.com  Sat Sep 17 09:00:13 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sat, 17 Sep 2005 05:00:13 -0400
Subject: rpms/clamav/FC-3 sources,1.9,1.10
Message-ID: <200509170900.j8H90hOw000809@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/clamav/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv753/FC-3

Modified Files:
	sources 
Log Message:
version 0.87



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/clamav/FC-3/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	25 Jul 2005 17:47:53 -0000	1.9
+++ sources	17 Sep 2005 09:00:10 -0000	1.10
@@ -1,2 +1,2 @@
-870de14ba123d6e9cba9850498c49f5d  clamav-0.86.2.tar.gz
-7d9ffe964a67ee6db157e112203a2678  clamav-0.86.2.tar.gz.sig
+dd0a12deb4f48f760fa1fcd378ae7c24  clamav-0.87.tar.gz
+db9c17eec9e05085795b48ba199af895  clamav-0.87.tar.gz.sig



From fedora-extras-commits at redhat.com  Sat Sep 17 09:00:13 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sat, 17 Sep 2005 05:00:13 -0400
Subject: rpms/clamav/FC-4 sources,1.11,1.12
Message-ID: <200509170900.j8H90hMo000812@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/clamav/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv753/FC-4

Modified Files:
	sources 
Log Message:
version 0.87



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/clamav/FC-4/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	25 Jul 2005 17:47:54 -0000	1.11
+++ sources	17 Sep 2005 09:00:11 -0000	1.12
@@ -1,2 +1,2 @@
-870de14ba123d6e9cba9850498c49f5d  clamav-0.86.2.tar.gz
-7d9ffe964a67ee6db157e112203a2678  clamav-0.86.2.tar.gz.sig
+dd0a12deb4f48f760fa1fcd378ae7c24  clamav-0.87.tar.gz
+db9c17eec9e05085795b48ba199af895  clamav-0.87.tar.gz.sig



From fedora-extras-commits at redhat.com  Sat Sep 17 09:01:30 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sat, 17 Sep 2005 05:01:30 -0400
Subject: rpms/clamav/devel clamav.spec,1.28,1.29
Message-ID: <200509170901.j8H91UNe002157@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/clamav/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2121/devel

Modified Files:
	clamav.spec 
Log Message:
- 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



Index: clamav.spec
===================================================================
RCS file: /cvs/extras/rpms/clamav/devel/clamav.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- clamav.spec	10 Sep 2005 11:20:26 -0000	1.28
+++ clamav.spec	17 Sep 2005 09:01:24 -0000	1.29
@@ -14,9 +14,6 @@
 %global milterlog	%_var/log/clamd.milter
 %global milteruser	clamilt
 %global milterstatedir	%_var/run/clamav-milter
-%global clameximlog	%_var/log/clamd.exim
-%global clameximuser	clamexim
-%global clameximstatedir %_var/run/clamd.exim
 %global pkgdatadir	%_datadir/%name
 
 
@@ -24,14 +21,14 @@
 
 Summary:	End-user tools for the Clam Antivirus scanner
 Name:		clamav
-Version:	0.86.2
-Release:	%release_func 5
+Version:	0.87
+Release:	%release_func 1
 
 License:	GPL
 Group:		Applications/File
 URL:		http://www.clamav.net
 Source0:	http://download.sourceforge.net/sourceforge/clamav/%{name}-%{version}.tar.gz
-#Source999:	http://download.sourceforge.net/sourceforge/clamav/%{name}-%{version}.tar.gz.sig
+Source999:	http://download.sourceforge.net/sourceforge/clamav/%{name}-%{version}.tar.gz.sig
 Source1:	clamd-wrapper
 Source2:	clamd.sysconfig
 Source3:	clamd.logrotate
@@ -42,7 +39,6 @@
 Patch20:	clamav-0.70-user.patch
 Patch21:	clamav-0.70-path.patch
 Patch22:	clamav-0.80-initoff.patch
-Patch23:	clamav-0.86.2-timeout.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root
 Requires:	clamav-lib = %{version}-%{release}
 Requires:	data(clamav)
@@ -110,21 +106,6 @@
 Requires(pre):		fedora-usermgmt >= 0.7
 Requires(postun):	fedora-usermgmt >= 0.7
 
-%package exim
-Summary:	Exim d??mon configuration for the Clam Antivirus scanner
-Group:		System Environment/Daemons
-## For now, use this as a placeholder. Later, generate separate -sysv
-## and -minit subpackages
-Requires:	init(clamav-exim)
-Provides:	init(clamav-exim)
-Requires(pre):		exim
-Requires(pre):		%_initrddir
-Requires(postun):	%_initrddir initscripts
-Requires(post):		chkconfig coreutils
-Requires(preun):	chkconfig initscripts
-Requires(pre):		fedora-usermgmt >= 0.7
-Requires(postun):	fedora-usermgmt >= 0.7
-
 
 %description
 Clam AntiVirus is an anti-virus toolkit for UNIX. The main purpose of this
@@ -177,22 +158,6 @@
 
 THIS PACKAGE IS TO BE CONSIDERED AS EXPERIMENTAL!
 
-%description exim
-This package contains files which are needed to run the clamav d??mon for use
-by the Exim MTA. It can be activated by adding
-
-   av_scanner = clamd:%clameximstatedir/clamd.sock 
-
-to your exim.conf, and using the 'malware' condition in the data ACL, 
-as follows:
-
-   deny message = This message contains malware ($malware_name)
-      demime = *
-      malware = *
-
-For further details of Exim content scanning, see chapter 40 of the Exim 
-specification: http://www.exim.org/exim-html-4.50/doc/html/spec_40.html
-
 ## ------------------------------------------------------------
 
 %prep
@@ -200,7 +165,6 @@
 %patch20 -p1 -b .user
 %patch21 -p1 -b .path
 %patch22 -p1 -b .initoff
-%patch23 -p1 -b .timeout
 
 perl -pi -e 's!^(#?LogFile ).*!\1/var/log/clamd.!g;
 	     s!^#?(LocalSocket ).*!\1/var/run/clamd./clamd.sock!g;
@@ -260,7 +224,6 @@
 	${RPM_BUILD_ROOT}%{_sysconfdir}/{clamd.d,cron.d,logrotate.d,sysconfig} \
 	${RPM_BUILD_ROOT}%{_var}/log \
 	${RPM_BUILD_ROOT}%milterstatedir \
-	${RPM_BUILD_ROOT}%clameximstatedir \
 	${RPM_BUILD_ROOT}%pkgdatadir/template \
 	${RPM_BUILD_ROOT}%{_initrddir}
 
@@ -303,34 +266,15 @@
    $RPM_BUILD_ROOT%pkgdatadir/freshclam-sleep
 
 
-#### The Exim stuff
+%if 0%{!?_without_milter:1}
+#### The milter stuff
 
 function subst() {
-	sed -e "s!!$3!g;s!!$4!g;""$5" "$1" >"$RPM_BUILD_ROOT$2"
+	sed -e 's!!milter!g;s!!%milteruser!g;'"$3" "$1" >"$RPM_BUILD_ROOT$2"
 }
 
-subst etc/clamd.conf %_sysconfdir/clamd.d/exim.conf exim %clameximuser \
-	's!^##*\(\(LogFile\|LocalSocket\|PidFile\|User\)\s\|\(StreamSaveToDisk\|ScanMail\|LogTime\|ScanArchive\)$\)!\1!;s!^Example!#Example!;'
 
-
-subst %{SOURCE7} %_initrddir/clamd.exim exim %clameximuser ''
-chmod 0755 $RPM_BUILD_ROOT%_initrddir/clamd.exim
-subst %{SOURCE3} %_sysconfdir/logrotate.d/clamd.exim exim %clameximuser ''
-
-cat <$RPM_BUILD_ROOT%_sysconfdir/sysconfig/clamd.exim
-CLAMD_CONFIG='%_sysconfdir/clamd.d/exim.conf'
-CLAMD_SOCKET=%clameximstatedir/clamd.sock
-EOF
-
-mkdir -p $RPM_BUILD_ROOT/%clameximstatedir
-ln -sf clamd $RPM_BUILD_ROOT%_sbindir/clamd.exim
-
-touch $RPM_BUILD_ROOT%clameximstatedir/clamd.sock $RPM_BUILD_ROOT%clameximlog
-
-%if 0%{!?_without_milter:1}
-#### The milter stuff
-
-subst etc/clamd.conf /etc/clamd.d/milter.conf milter %milteruser \
+subst etc/clamd.conf /etc/clamd.d/milter.conf \
 	's!^##*\(\(LogFile\|LocalSocket\|PidFile\|User\)\s\|\(StreamSaveToDisk\|ScanMail\)$\)!\1!;'
 
 
@@ -391,26 +335,6 @@
 test "$1" != 0 || /usr/sbin/fedora-groupdel %{milteruser} &>/dev/null || :
 test "$1"  = 0 || %{_initrddir}/clamav-milter condrestart >/dev/null || :
 
-%pre exim
-/usr/sbin/fedora-useradd  5 -r -s /sbin/nologin -d %clameximstatedir -M \
-                            -c 'Clamav Exim User' -g exim %clameximuser &>/dev/null || :
-
-%post exim
-/sbin/chkconfig --add clamd.exim
-test -e %clameximlog || {
-	touch %clameximlog
-	chmod 0620             %clameximlog
-	chown root:exim %clameximlog
-}
-
-%preun exim
-test "$1" != 0 || %{_initrddir}/clamd.exim stop &>/dev/null || :
-test "$1" != 0 || /sbin/chkconfig --del clamd.exim
-
-%postun exim
-test "$1" != 0 || /usr/sbin/fedora-userdel  %{clameximuser} &>/dev/null || :
-test "$1"  = 0 || %{_initrddir}/clamd.exim condrestart >/dev/null || :
-
 
 %post   lib -p /sbin/ldconfig
 %postun lib -p /sbin/ldconfig
@@ -488,19 +412,6 @@
 
 ## -----------------------
 
-%files exim
-%defattr(-,root,root,-)
-%_sbindir/clamd.exim
-%config %{_initrddir}/clamd.exim
-%config(noreplace) %verify(not mtime) %{_sysconfdir}/clamd.d/exim.conf
-%config(noreplace) %verify(not mtime) %{_sysconfdir}/sysconfig/clamd.exim
-%config(noreplace) %verify(not mtime) %{_sysconfdir}/logrotate.d/clamd.exim
-%attr(0750,%clameximuser,exim) %dir %clameximstatedir
-%ghost %clameximstatedir/*
-%ghost %attr(0620,root,exim) %verify(not size md5 mtime) %clameximlog
-
-## -----------------------
-
 %files milter
 %defattr(-,root,root,-)
 %doc clamav-milter/INSTALL
@@ -515,6 +426,12 @@
 %endif	# _without_milter
 
 %changelog
+* 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
 



From fedora-extras-commits at redhat.com  Sat Sep 17 09:01:24 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sat, 17 Sep 2005 05:01:24 -0400
Subject: rpms/clamav/FC-4 clamav.spec,1.27,1.28
Message-ID: <200509170901.j8H91sBj002169@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/clamav/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2121/FC-4

Modified Files:
	clamav.spec 
Log Message:
- 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



Index: clamav.spec
===================================================================
RCS file: /cvs/extras/rpms/clamav/FC-4/clamav.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- clamav.spec	10 Sep 2005 11:20:32 -0000	1.27
+++ clamav.spec	17 Sep 2005 09:01:17 -0000	1.28
@@ -14,9 +14,6 @@
 %global milterlog	%_var/log/clamd.milter
 %global milteruser	clamilt
 %global milterstatedir	%_var/run/clamav-milter
-%global clameximlog	%_var/log/clamd.exim
-%global clameximuser	clamexim
-%global clameximstatedir %_var/run/clamd.exim
 %global pkgdatadir	%_datadir/%name
 
 
@@ -24,14 +21,14 @@
 
 Summary:	End-user tools for the Clam Antivirus scanner
 Name:		clamav
-Version:	0.86.2
-Release:	%release_func 5
+Version:	0.87
+Release:	%release_func 1
 
 License:	GPL
 Group:		Applications/File
 URL:		http://www.clamav.net
 Source0:	http://download.sourceforge.net/sourceforge/clamav/%{name}-%{version}.tar.gz
-#Source999:	http://download.sourceforge.net/sourceforge/clamav/%{name}-%{version}.tar.gz.sig
+Source999:	http://download.sourceforge.net/sourceforge/clamav/%{name}-%{version}.tar.gz.sig
 Source1:	clamd-wrapper
 Source2:	clamd.sysconfig
 Source3:	clamd.logrotate
@@ -42,7 +39,6 @@
 Patch20:	clamav-0.70-user.patch
 Patch21:	clamav-0.70-path.patch
 Patch22:	clamav-0.80-initoff.patch
-Patch23:	clamav-0.86.2-timeout.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root
 Requires:	clamav-lib = %{version}-%{release}
 Requires:	data(clamav)
@@ -110,21 +106,6 @@
 Requires(pre):		fedora-usermgmt >= 0.7
 Requires(postun):	fedora-usermgmt >= 0.7
 
-%package exim
-Summary:	Exim d??mon configuration for the Clam Antivirus scanner
-Group:		System Environment/Daemons
-## For now, use this as a placeholder. Later, generate separate -sysv
-## and -minit subpackages
-Requires:	init(clamav-exim)
-Provides:	init(clamav-exim)
-Requires(pre):		exim
-Requires(pre):		%_initrddir
-Requires(postun):	%_initrddir initscripts
-Requires(post):		chkconfig coreutils
-Requires(preun):	chkconfig initscripts
-Requires(pre):		fedora-usermgmt >= 0.7
-Requires(postun):	fedora-usermgmt >= 0.7
-
 
 %description
 Clam AntiVirus is an anti-virus toolkit for UNIX. The main purpose of this
@@ -177,22 +158,6 @@
 
 THIS PACKAGE IS TO BE CONSIDERED AS EXPERIMENTAL!
 
-%description exim
-This package contains files which are needed to run the clamav d??mon for use
-by the Exim MTA. It can be activated by adding
-
-   av_scanner = clamd:%clameximstatedir/clamd.sock 
-
-to your exim.conf, and using the 'malware' condition in the data ACL, 
-as follows:
-
-   deny message = This message contains malware ($malware_name)
-      demime = *
-      malware = *
-
-For further details of Exim content scanning, see chapter 40 of the Exim 
-specification: http://www.exim.org/exim-html-4.50/doc/html/spec_40.html
-
 ## ------------------------------------------------------------
 
 %prep
@@ -200,7 +165,6 @@
 %patch20 -p1 -b .user
 %patch21 -p1 -b .path
 %patch22 -p1 -b .initoff
-%patch23 -p1 -b .timeout
 
 perl -pi -e 's!^(#?LogFile ).*!\1/var/log/clamd.!g;
 	     s!^#?(LocalSocket ).*!\1/var/run/clamd./clamd.sock!g;
@@ -260,7 +224,6 @@
 	${RPM_BUILD_ROOT}%{_sysconfdir}/{clamd.d,cron.d,logrotate.d,sysconfig} \
 	${RPM_BUILD_ROOT}%{_var}/log \
 	${RPM_BUILD_ROOT}%milterstatedir \
-	${RPM_BUILD_ROOT}%clameximstatedir \
 	${RPM_BUILD_ROOT}%pkgdatadir/template \
 	${RPM_BUILD_ROOT}%{_initrddir}
 
@@ -303,34 +266,15 @@
    $RPM_BUILD_ROOT%pkgdatadir/freshclam-sleep
 
 
-#### The Exim stuff
+%if 0%{!?_without_milter:1}
+#### The milter stuff
 
 function subst() {
-	sed -e "s!!$3!g;s!!$4!g;""$5" "$1" >"$RPM_BUILD_ROOT$2"
+	sed -e 's!!milter!g;s!!%milteruser!g;'"$3" "$1" >"$RPM_BUILD_ROOT$2"
 }
 
-subst etc/clamd.conf %_sysconfdir/clamd.d/exim.conf exim %clameximuser \
-	's!^##*\(\(LogFile\|LocalSocket\|PidFile\|User\)\s\|\(StreamSaveToDisk\|ScanMail\|LogTime\|ScanArchive\)$\)!\1!;s!^Example!#Example!;'
 
-
-subst %{SOURCE7} %_initrddir/clamd.exim exim %clameximuser ''
-chmod 0755 $RPM_BUILD_ROOT%_initrddir/clamd.exim
-subst %{SOURCE3} %_sysconfdir/logrotate.d/clamd.exim exim %clameximuser ''
-
-cat <$RPM_BUILD_ROOT%_sysconfdir/sysconfig/clamd.exim
-CLAMD_CONFIG='%_sysconfdir/clamd.d/exim.conf'
-CLAMD_SOCKET=%clameximstatedir/clamd.sock
-EOF
-
-mkdir -p $RPM_BUILD_ROOT/%clameximstatedir
-ln -sf clamd $RPM_BUILD_ROOT%_sbindir/clamd.exim
-
-touch $RPM_BUILD_ROOT%clameximstatedir/clamd.sock $RPM_BUILD_ROOT%clameximlog
-
-%if 0%{!?_without_milter:1}
-#### The milter stuff
-
-subst etc/clamd.conf /etc/clamd.d/milter.conf milter %milteruser \
+subst etc/clamd.conf /etc/clamd.d/milter.conf \
 	's!^##*\(\(LogFile\|LocalSocket\|PidFile\|User\)\s\|\(StreamSaveToDisk\|ScanMail\)$\)!\1!;'
 
 
@@ -391,26 +335,6 @@
 test "$1" != 0 || /usr/sbin/fedora-groupdel %{milteruser} &>/dev/null || :
 test "$1"  = 0 || %{_initrddir}/clamav-milter condrestart >/dev/null || :
 
-%pre exim
-/usr/sbin/fedora-useradd  5 -r -s /sbin/nologin -d %clameximstatedir -M \
-                            -c 'Clamav Exim User' -g exim %clameximuser &>/dev/null || :
-
-%post exim
-/sbin/chkconfig --add clamd.exim
-test -e %clameximlog || {
-	touch %clameximlog
-	chmod 0620             %clameximlog
-	chown root:exim %clameximlog
-}
-
-%preun exim
-test "$1" != 0 || %{_initrddir}/clamd.exim stop &>/dev/null || :
-test "$1" != 0 || /sbin/chkconfig --del clamd.exim
-
-%postun exim
-test "$1" != 0 || /usr/sbin/fedora-userdel  %{clameximuser} &>/dev/null || :
-test "$1"  = 0 || %{_initrddir}/clamd.exim condrestart >/dev/null || :
-
 
 %post   lib -p /sbin/ldconfig
 %postun lib -p /sbin/ldconfig
@@ -488,19 +412,6 @@
 
 ## -----------------------
 
-%files exim
-%defattr(-,root,root,-)
-%_sbindir/clamd.exim
-%config %{_initrddir}/clamd.exim
-%config(noreplace) %verify(not mtime) %{_sysconfdir}/clamd.d/exim.conf
-%config(noreplace) %verify(not mtime) %{_sysconfdir}/sysconfig/clamd.exim
-%config(noreplace) %verify(not mtime) %{_sysconfdir}/logrotate.d/clamd.exim
-%attr(0750,%clameximuser,exim) %dir %clameximstatedir
-%ghost %clameximstatedir/*
-%ghost %attr(0620,root,exim) %verify(not size md5 mtime) %clameximlog
-
-## -----------------------
-
 %files milter
 %defattr(-,root,root,-)
 %doc clamav-milter/INSTALL
@@ -515,6 +426,12 @@
 %endif	# _without_milter
 
 %changelog
+* 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
 



From fedora-extras-commits at redhat.com  Sat Sep 17 09:03:00 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sat, 17 Sep 2005 05:03:00 -0400
Subject: rpms/clamav/FC-3 clamav.spec,1.17,1.18
Message-ID: <200509170903.j8H93Vsi002195@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/clamav/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2175/FC-3

Modified Files:
	clamav.spec 
Log Message:
- updated to 0.87 (SECURITY)
- removed -timeout patch; it is solved upstream



Index: clamav.spec
===================================================================
RCS file: /cvs/extras/rpms/clamav/FC-3/clamav.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- clamav.spec	29 Jul 2005 16:37:45 -0000	1.17
+++ clamav.spec	17 Sep 2005 09:02:55 -0000	1.18
@@ -21,14 +21,14 @@
 
 Summary:	End-user tools for the Clam Antivirus scanner
 Name:		clamav
-Version:	0.86.2
-Release:	%release_func 4
+Version:	0.87
+Release:	%release_func 1
 
 License:	GPL
 Group:		Applications/File
 URL:		http://www.clamav.net
 Source0:	http://download.sourceforge.net/sourceforge/clamav/%{name}-%{version}.tar.gz
-#Source999:	http://download.sourceforge.net/sourceforge/clamav/%{name}-%{version}.tar.gz.sig
+Source999:	http://download.sourceforge.net/sourceforge/clamav/%{name}-%{version}.tar.gz.sig
 Source1:	clamd-wrapper
 Source2:	clamd.sysconfig
 Source3:	clamd.logrotate
@@ -39,7 +39,6 @@
 Patch20:	clamav-0.70-user.patch
 Patch21:	clamav-0.70-path.patch
 Patch22:	clamav-0.80-initoff.patch
-Patch23:	clamav-0.86.2-timeout.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root
 Requires:	clamav-lib = %{version}-%{release}
 Requires:	data(clamav)
@@ -166,7 +165,6 @@
 %patch20 -p1 -b .user
 %patch21 -p1 -b .path
 %patch22 -p1 -b .initoff
-%patch23 -p1 -b .timeout
 
 perl -pi -e 's!^(#?LogFile ).*!\1/var/log/clamd.!g;
 	     s!^#?(LocalSocket ).*!\1/var/run/clamd./clamd.sock!g;
@@ -428,6 +426,10 @@
 %endif	# _without_milter
 
 %changelog
+* Sat Sep 17 2005 Enrico Scholz  - 0.87-1
+- updated to 0.87 (SECURITY)
+- removed -timeout patch; it is solved upstream
+
 * 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



From fedora-extras-commits at redhat.com  Sat Sep 17 09:08:06 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sat, 17 Sep 2005 05:08:06 -0400
Subject: common tobuild,1.2214,1.2215
Message-ID: <200509170908.j8H986th002335@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2316

Modified Files:
	tobuild 
Log Message:
request build of rpms/clamav/devel clamav-0_87-1_fc5 for devel


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.2214
retrieving revision 1.2215
diff -u -r1.2214 -r1.2215
--- tobuild	10 Sep 2005 11:20:51 -0000	1.2214
+++ tobuild	17 Sep 2005 09:08:04 -0000	1.2215
@@ -38,3 +38,4 @@
 gemi	rpms/clisp/FC-3	clisp-2_34-5_fc3	fc3
 katzj	rpms/perl-Class-Trigger/devel	perl-Class-Trigger-0_09-3_fc5	devel
 dwmw2	rpms/clamav/FC-4	clamav-0_86_2-5_fc4	fc4
+ensc	rpms/clamav/devel	clamav-0_87-1_fc5	devel



From fedora-extras-commits at redhat.com  Sat Sep 17 09:11:01 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sat, 17 Sep 2005 05:11:01 -0400
Subject: common tobuild,1.2215,1.2216
Message-ID: <200509170911.j8H9B1xc002451@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2429

Modified Files:
	tobuild 
Log Message:
request build of rpms/clamav/FC-4 clamav-0_87-1_fc4 for fc4


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.2215
retrieving revision 1.2216
diff -u -r1.2215 -r1.2216
--- tobuild	17 Sep 2005 09:08:04 -0000	1.2215
+++ tobuild	17 Sep 2005 09:10:59 -0000	1.2216
@@ -39,3 +39,4 @@
 katzj	rpms/perl-Class-Trigger/devel	perl-Class-Trigger-0_09-3_fc5	devel
 dwmw2	rpms/clamav/FC-4	clamav-0_86_2-5_fc4	fc4
 ensc	rpms/clamav/devel	clamav-0_87-1_fc5	devel
+ensc	rpms/clamav/FC-4	clamav-0_87-1_fc4	fc4



From fedora-extras-commits at redhat.com  Sat Sep 17 09:12:53 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sat, 17 Sep 2005 05:12:53 -0400
Subject: common tobuild,1.2216,1.2217
Message-ID: <200509170912.j8H9CrJs002532@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2513

Modified Files:
	tobuild 
Log Message:
request build of rpms/clamav/FC-3 clamav-0_87-1_fc3 for fc3


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.2216
retrieving revision 1.2217
diff -u -r1.2216 -r1.2217
--- tobuild	17 Sep 2005 09:10:59 -0000	1.2216
+++ tobuild	17 Sep 2005 09:12:51 -0000	1.2217
@@ -40,3 +40,4 @@
 dwmw2	rpms/clamav/FC-4	clamav-0_86_2-5_fc4	fc4
 ensc	rpms/clamav/devel	clamav-0_87-1_fc5	devel
 ensc	rpms/clamav/FC-4	clamav-0_87-1_fc4	fc4
+ensc	rpms/clamav/FC-3	clamav-0_87-1_fc3	fc3



From fedora-extras-commits at redhat.com  Sat Sep 17 09:52:36 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sat, 17 Sep 2005 05:52:36 -0400
Subject: common tobuild,1.2217,1.2218
Message-ID: <200509170952.j8H9qax5002656@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2637

Modified Files:
	tobuild 
Log Message:
clamav submitted through 'make plague' per Enrico's request.


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.2217
retrieving revision 1.2218
diff -u -r1.2217 -r1.2218
--- tobuild	17 Sep 2005 09:12:51 -0000	1.2217
+++ tobuild	17 Sep 2005 09:52:33 -0000	1.2218
@@ -37,7 +37,3 @@
 joost	rpms/fpc/FC-3	fpc-2_0_0-1	fc3
 gemi	rpms/clisp/FC-3	clisp-2_34-5_fc3	fc3
 katzj	rpms/perl-Class-Trigger/devel	perl-Class-Trigger-0_09-3_fc5	devel
-dwmw2	rpms/clamav/FC-4	clamav-0_86_2-5_fc4	fc4
-ensc	rpms/clamav/devel	clamav-0_87-1_fc5	devel
-ensc	rpms/clamav/FC-4	clamav-0_87-1_fc4	fc4
-ensc	rpms/clamav/FC-3	clamav-0_87-1_fc3	fc3



From fedora-extras-commits at redhat.com  Sat Sep 17 13:17:15 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Sat, 17 Sep 2005 09:17:15 -0400
Subject: rpms/check/devel check.spec,1.1,1.2
Message-ID: <200509171317.j8HDHFkd008340@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/check/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8287/devel

Modified Files:
	check.spec 
Log Message:

Trim down check package, get rid of so files (and only build -devel).



Index: check.spec
===================================================================
RCS file: /cvs/extras/rpms/check/devel/check.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- check.spec	12 Sep 2005 14:23:07 -0000	1.1
+++ check.spec	17 Sep 2005 13:17:13 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		check
 Version:	0.9.3
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	A unit test framework for C
 Source0:	http://download.sourceforge.net/check/%{name}-%{version}.tar.gz
 Group:		Development/Tools
@@ -8,8 +8,6 @@
 URL:		http://check.sourceforge.net/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	docbook-utils
-Patch0:		check-0.9.2-shared.patch
-Patch1:		check-0.9.2-fPIC.patch
 
 %description
 Check is a unit test framework for C. It features a simple interface for 
@@ -21,15 +19,17 @@
 %package devel
 Summary:	Libraries and headers for developing programs with check
 Group:		Development/Libraries
-Requires:	%{name} = %{version}-%{release}
+Provides:	%{name} = %{version}-%{release}
 
 %description devel
-%{summary}.
+Check is a unit test framework for C. It features a simple interface for
+defining unit tests, putting little in the way of the developer. Tests
+are run in a separate address space, so Check can catch both assertion
+failures and code errors that cause segmentation faults or other signals.
+The output from unit tests can be used within source code editors and IDEs.
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
 
 %build
 %configure
@@ -38,30 +38,21 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT install
-cd $RPM_BUILD_ROOT/%{_libdir}
-chmod +x libcheck.so.0.0.0
-ln -s libcheck.so.0.0.0 libcheck.so.0
-ln -s libcheck.so.0.0.0 libcheck.so
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post -p /sbin/ldconfig
-
-%postun -p /sbin/ldconfig
-
-%files
-%defattr(-,root,root,-)
-%{_libdir}/libcheck.so.*
-%{_datadir}/doc/%{name}-%{version}
-%{_datadir}/aclocal/check.m4
-
 %files devel
 %defattr(-,root,root,-)
 %{_includedir}/check.h
 %{_libdir}/libcheck.a
-%{_libdir}/libcheck.so
+%{_datadir}/doc/%{name}-%{version}
+%{_datadir}/aclocal/check.m4
 
 %changelog
+* Sat Sep 17 2005 Tom "spot" Callaway  0.9.2-2
+- get rid of the so file (not needed)
+- only make devel package
+
 * Sun Aug 14 2005 Tom "spot" Callaway  0.9.2-1
 - initial package for Fedora Extras



From fedora-extras-commits at redhat.com  Sat Sep 17 13:17:09 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Sat, 17 Sep 2005 09:17:09 -0400
Subject: rpms/check/FC-3 check.spec,1.1,1.2
Message-ID: <200509171317.j8HDHd7v008343@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/check/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8287/FC-3

Modified Files:
	check.spec 
Log Message:

Trim down check package, get rid of so files (and only build -devel).



Index: check.spec
===================================================================
RCS file: /cvs/extras/rpms/check/FC-3/check.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- check.spec	12 Sep 2005 14:23:07 -0000	1.1
+++ check.spec	17 Sep 2005 13:17:06 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		check
 Version:	0.9.3
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	A unit test framework for C
 Source0:	http://download.sourceforge.net/check/%{name}-%{version}.tar.gz
 Group:		Development/Tools
@@ -8,8 +8,6 @@
 URL:		http://check.sourceforge.net/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	docbook-utils
-Patch0:		check-0.9.2-shared.patch
-Patch1:		check-0.9.2-fPIC.patch
 
 %description
 Check is a unit test framework for C. It features a simple interface for 
@@ -21,15 +19,17 @@
 %package devel
 Summary:	Libraries and headers for developing programs with check
 Group:		Development/Libraries
-Requires:	%{name} = %{version}-%{release}
+Provides:	%{name} = %{version}-%{release}
 
 %description devel
-%{summary}.
+Check is a unit test framework for C. It features a simple interface for
+defining unit tests, putting little in the way of the developer. Tests
+are run in a separate address space, so Check can catch both assertion
+failures and code errors that cause segmentation faults or other signals.
+The output from unit tests can be used within source code editors and IDEs.
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
 
 %build
 %configure
@@ -38,30 +38,21 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT install
-cd $RPM_BUILD_ROOT/%{_libdir}
-chmod +x libcheck.so.0.0.0
-ln -s libcheck.so.0.0.0 libcheck.so.0
-ln -s libcheck.so.0.0.0 libcheck.so
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post -p /sbin/ldconfig
-
-%postun -p /sbin/ldconfig
-
-%files
-%defattr(-,root,root,-)
-%{_libdir}/libcheck.so.*
-%{_datadir}/doc/%{name}-%{version}
-%{_datadir}/aclocal/check.m4
-
 %files devel
 %defattr(-,root,root,-)
 %{_includedir}/check.h
 %{_libdir}/libcheck.a
-%{_libdir}/libcheck.so
+%{_datadir}/doc/%{name}-%{version}
+%{_datadir}/aclocal/check.m4
 
 %changelog
+* Sat Sep 17 2005 Tom "spot" Callaway  0.9.2-2
+- get rid of the so file (not needed)
+- only make devel package
+
 * Sun Aug 14 2005 Tom "spot" Callaway  0.9.2-1
 - initial package for Fedora Extras



From fedora-extras-commits at redhat.com  Sat Sep 17 13:17:09 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Sat, 17 Sep 2005 09:17:09 -0400
Subject: rpms/check/FC-4 check.spec,1.1,1.2
Message-ID: <200509171317.j8HDHeB7008346@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/check/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8287/FC-4

Modified Files:
	check.spec 
Log Message:

Trim down check package, get rid of so files (and only build -devel).



Index: check.spec
===================================================================
RCS file: /cvs/extras/rpms/check/FC-4/check.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- check.spec	12 Sep 2005 14:23:07 -0000	1.1
+++ check.spec	17 Sep 2005 13:17:07 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		check
 Version:	0.9.3
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	A unit test framework for C
 Source0:	http://download.sourceforge.net/check/%{name}-%{version}.tar.gz
 Group:		Development/Tools
@@ -8,8 +8,6 @@
 URL:		http://check.sourceforge.net/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	docbook-utils
-Patch0:		check-0.9.2-shared.patch
-Patch1:		check-0.9.2-fPIC.patch
 
 %description
 Check is a unit test framework for C. It features a simple interface for 
@@ -21,15 +19,17 @@
 %package devel
 Summary:	Libraries and headers for developing programs with check
 Group:		Development/Libraries
-Requires:	%{name} = %{version}-%{release}
+Provides:	%{name} = %{version}-%{release}
 
 %description devel
-%{summary}.
+Check is a unit test framework for C. It features a simple interface for
+defining unit tests, putting little in the way of the developer. Tests
+are run in a separate address space, so Check can catch both assertion
+failures and code errors that cause segmentation faults or other signals.
+The output from unit tests can be used within source code editors and IDEs.
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
 
 %build
 %configure
@@ -38,30 +38,21 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT install
-cd $RPM_BUILD_ROOT/%{_libdir}
-chmod +x libcheck.so.0.0.0
-ln -s libcheck.so.0.0.0 libcheck.so.0
-ln -s libcheck.so.0.0.0 libcheck.so
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post -p /sbin/ldconfig
-
-%postun -p /sbin/ldconfig
-
-%files
-%defattr(-,root,root,-)
-%{_libdir}/libcheck.so.*
-%{_datadir}/doc/%{name}-%{version}
-%{_datadir}/aclocal/check.m4
-
 %files devel
 %defattr(-,root,root,-)
 %{_includedir}/check.h
 %{_libdir}/libcheck.a
-%{_libdir}/libcheck.so
+%{_datadir}/doc/%{name}-%{version}
+%{_datadir}/aclocal/check.m4
 
 %changelog
+* Sat Sep 17 2005 Tom "spot" Callaway  0.9.2-2
+- get rid of the so file (not needed)
+- only make devel package
+
 * Sun Aug 14 2005 Tom "spot" Callaway  0.9.2-1
 - initial package for Fedora Extras



From fedora-extras-commits at redhat.com  Sat Sep 17 14:07:15 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Sat, 17 Sep 2005 10:07:15 -0400
Subject: rpms/tinyerp/devel tinyerp-2.1.3-client-syspath.patch, 1.1,
	1.2 tinyerp.spec, 1.1, 1.2
Message-ID: <200509171407.j8HE7FT2009997@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/tinyerp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9929/devel

Modified Files:
	tinyerp-2.1.3-client-syspath.patch tinyerp.spec 
Log Message:

fix missing plugin (Dan Hor??k)


tinyerp-2.1.3-client-syspath.patch:

Index: tinyerp-2.1.3-client-syspath.patch
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/devel/tinyerp-2.1.3-client-syspath.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tinyerp-2.1.3-client-syspath.patch	18 Aug 2005 19:31:23 -0000	1.1
+++ tinyerp-2.1.3-client-syspath.patch	17 Sep 2005 14:07:13 -0000	1.2
@@ -1,5 +1,14 @@
---- tinyerp-2.1.3/tinyerp-client-2.1.3/setup.py.BAD	2005-08-01 19:29:30.000000000 -0500
-+++ tinyerp-2.1.3/tinyerp-client-2.1.3/setup.py	2005-08-01 19:29:39.000000000 -0500
+--- tinyerp-2.1.3/tinyerp-client-2.1.3/setup.py.BAD	2005-09-17 11:17:54.000000000 +0200
++++ tinyerp-2.1.3/tinyerp-client-2.1.3/setup.py	2005-09-17 11:35:29.000000000 +0200
+@@ -46,7 +46,7 @@
+               ['bin/terp.glade'])]
+     return files
+ 
+-included_plugins = ['auction_lots_html', 'slideshow', 'workflow_print']
++included_plugins = ['auction_lots_html', 'huissier', 'slideshow', 'workflow_print']
+ 
+ def find_plugins():
+     for plugin in included_plugins:
 @@ -54,7 +54,7 @@
          for dirpath, dirnames, filenames in os.walk(path):
              if '__init__.py' in filenames:
@@ -9,7 +18,7 @@
  
  def translations():
      trans = []
-@@ -96,19 +96,19 @@
+@@ -96,19 +96,20 @@
        translations     = translations(),
        pot_file         = 'bin/po/terp-msg.pot',
        scripts          = ['bin/tinyerp-client'],
@@ -37,7 +46,8 @@
 +                          'tinyerp_client.widget',
 +                          'tinyerp_client.widget.form',
 +                          'tinyerp_client.widget.search',
-+                          'tinyerp_client.widget.tree'] + list(find_plugins()),
++                          'tinyerp_client.widget.tree',
++                          'tinyerp_client.plugins'] + list(find_plugins()),
 +      package_dir      = {'tinyerp_client': 'bin'},
        )
  


Index: tinyerp.spec
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/devel/tinyerp.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tinyerp.spec	18 Aug 2005 19:31:23 -0000	1.1
+++ tinyerp.spec	17 Sep 2005 14:07:13 -0000	1.2
@@ -1,9 +1,9 @@
-%{?!pyver: %define pyver %(python -c 'import sys;print(sys.version[0:3])')}
+%{?!pyver: %define pyver %(%{__python} -c 'import sys;print(sys.version[0:3])')}
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:		tinyerp
 Version:	2.1.3
-Release:	6%{?dist}
+Release:	7%{?dist}
 License:	GPL
 Group:		Applications/Productivity
 Summary:	Open Source ERP Client
@@ -102,6 +102,9 @@
 %{_mandir}/man1/tinyerp-server.*
 
 %changelog
+* Sat Sep 17 2005 Tom "spot" Callaway  2.1.3-7
+- fix missing plugin (Dan Hor??k)
+
 * Thu Aug 18 2005 Tom "spot" Callaway  2.1.3-6
 - use Xvfb to fake DISPLAY
 



From fedora-extras-commits at redhat.com  Sat Sep 17 14:07:14 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Sat, 17 Sep 2005 10:07:14 -0400
Subject: rpms/tinyerp/FC-4 tinyerp-2.1.3-client-syspath.patch, 1.1,
	1.2 tinyerp.spec, 1.1, 1.2
Message-ID: <200509171407.j8HE7E4U009983@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/tinyerp/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9929/FC-4

Modified Files:
	tinyerp-2.1.3-client-syspath.patch tinyerp.spec 
Log Message:

fix missing plugin (Dan Hor??k)


tinyerp-2.1.3-client-syspath.patch:

Index: tinyerp-2.1.3-client-syspath.patch
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/FC-4/tinyerp-2.1.3-client-syspath.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tinyerp-2.1.3-client-syspath.patch	18 Aug 2005 19:31:23 -0000	1.1
+++ tinyerp-2.1.3-client-syspath.patch	17 Sep 2005 14:07:11 -0000	1.2
@@ -1,5 +1,14 @@
---- tinyerp-2.1.3/tinyerp-client-2.1.3/setup.py.BAD	2005-08-01 19:29:30.000000000 -0500
-+++ tinyerp-2.1.3/tinyerp-client-2.1.3/setup.py	2005-08-01 19:29:39.000000000 -0500
+--- tinyerp-2.1.3/tinyerp-client-2.1.3/setup.py.BAD	2005-09-17 11:17:54.000000000 +0200
++++ tinyerp-2.1.3/tinyerp-client-2.1.3/setup.py	2005-09-17 11:35:29.000000000 +0200
+@@ -46,7 +46,7 @@
+               ['bin/terp.glade'])]
+     return files
+ 
+-included_plugins = ['auction_lots_html', 'slideshow', 'workflow_print']
++included_plugins = ['auction_lots_html', 'huissier', 'slideshow', 'workflow_print']
+ 
+ def find_plugins():
+     for plugin in included_plugins:
 @@ -54,7 +54,7 @@
          for dirpath, dirnames, filenames in os.walk(path):
              if '__init__.py' in filenames:
@@ -9,7 +18,7 @@
  
  def translations():
      trans = []
-@@ -96,19 +96,19 @@
+@@ -96,19 +96,20 @@
        translations     = translations(),
        pot_file         = 'bin/po/terp-msg.pot',
        scripts          = ['bin/tinyerp-client'],
@@ -37,7 +46,8 @@
 +                          'tinyerp_client.widget',
 +                          'tinyerp_client.widget.form',
 +                          'tinyerp_client.widget.search',
-+                          'tinyerp_client.widget.tree'] + list(find_plugins()),
++                          'tinyerp_client.widget.tree',
++                          'tinyerp_client.plugins'] + list(find_plugins()),
 +      package_dir      = {'tinyerp_client': 'bin'},
        )
  


Index: tinyerp.spec
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/FC-4/tinyerp.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tinyerp.spec	18 Aug 2005 19:31:23 -0000	1.1
+++ tinyerp.spec	17 Sep 2005 14:07:11 -0000	1.2
@@ -1,9 +1,9 @@
-%{?!pyver: %define pyver %(python -c 'import sys;print(sys.version[0:3])')}
+%{?!pyver: %define pyver %(%{__python} -c 'import sys;print(sys.version[0:3])')}
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:		tinyerp
 Version:	2.1.3
-Release:	6%{?dist}
+Release:	7%{?dist}
 License:	GPL
 Group:		Applications/Productivity
 Summary:	Open Source ERP Client
@@ -102,6 +102,9 @@
 %{_mandir}/man1/tinyerp-server.*
 
 %changelog
+* Sat Sep 17 2005 Tom "spot" Callaway  2.1.3-7
+- fix missing plugin (Dan Hor??k)
+
 * Thu Aug 18 2005 Tom "spot" Callaway  2.1.3-6
 - use Xvfb to fake DISPLAY
 



From fedora-extras-commits at redhat.com  Sat Sep 17 14:07:07 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Sat, 17 Sep 2005 10:07:07 -0400
Subject: rpms/tinyerp/FC-3 tinyerp-2.1.3-client-syspath.patch, 1.1,
	1.2 tinyerp.spec, 1.1, 1.2
Message-ID: <200509171407.j8HE7iXD010006@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/tinyerp/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9929/FC-3

Modified Files:
	tinyerp-2.1.3-client-syspath.patch tinyerp.spec 
Log Message:

fix missing plugin (Dan Hor??k)


tinyerp-2.1.3-client-syspath.patch:

Index: tinyerp-2.1.3-client-syspath.patch
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/FC-3/tinyerp-2.1.3-client-syspath.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tinyerp-2.1.3-client-syspath.patch	18 Aug 2005 19:31:23 -0000	1.1
+++ tinyerp-2.1.3-client-syspath.patch	17 Sep 2005 14:06:59 -0000	1.2
@@ -1,5 +1,14 @@
---- tinyerp-2.1.3/tinyerp-client-2.1.3/setup.py.BAD	2005-08-01 19:29:30.000000000 -0500
-+++ tinyerp-2.1.3/tinyerp-client-2.1.3/setup.py	2005-08-01 19:29:39.000000000 -0500
+--- tinyerp-2.1.3/tinyerp-client-2.1.3/setup.py.BAD	2005-09-17 11:17:54.000000000 +0200
++++ tinyerp-2.1.3/tinyerp-client-2.1.3/setup.py	2005-09-17 11:35:29.000000000 +0200
+@@ -46,7 +46,7 @@
+               ['bin/terp.glade'])]
+     return files
+ 
+-included_plugins = ['auction_lots_html', 'slideshow', 'workflow_print']
++included_plugins = ['auction_lots_html', 'huissier', 'slideshow', 'workflow_print']
+ 
+ def find_plugins():
+     for plugin in included_plugins:
 @@ -54,7 +54,7 @@
          for dirpath, dirnames, filenames in os.walk(path):
              if '__init__.py' in filenames:
@@ -9,7 +18,7 @@
  
  def translations():
      trans = []
-@@ -96,19 +96,19 @@
+@@ -96,19 +96,20 @@
        translations     = translations(),
        pot_file         = 'bin/po/terp-msg.pot',
        scripts          = ['bin/tinyerp-client'],
@@ -37,7 +46,8 @@
 +                          'tinyerp_client.widget',
 +                          'tinyerp_client.widget.form',
 +                          'tinyerp_client.widget.search',
-+                          'tinyerp_client.widget.tree'] + list(find_plugins()),
++                          'tinyerp_client.widget.tree',
++                          'tinyerp_client.plugins'] + list(find_plugins()),
 +      package_dir      = {'tinyerp_client': 'bin'},
        )
  


Index: tinyerp.spec
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/FC-3/tinyerp.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tinyerp.spec	18 Aug 2005 19:31:23 -0000	1.1
+++ tinyerp.spec	17 Sep 2005 14:06:59 -0000	1.2
@@ -1,9 +1,9 @@
-%{?!pyver: %define pyver %(python -c 'import sys;print(sys.version[0:3])')}
+%{?!pyver: %define pyver %(%{__python} -c 'import sys;print(sys.version[0:3])')}
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:		tinyerp
 Version:	2.1.3
-Release:	6%{?dist}
+Release:	7%{?dist}
 License:	GPL
 Group:		Applications/Productivity
 Summary:	Open Source ERP Client
@@ -102,6 +102,9 @@
 %{_mandir}/man1/tinyerp-server.*
 
 %changelog
+* Sat Sep 17 2005 Tom "spot" Callaway  2.1.3-7
+- fix missing plugin (Dan Hor??k)
+
 * Thu Aug 18 2005 Tom "spot" Callaway  2.1.3-6
 - use Xvfb to fake DISPLAY
 



From fedora-extras-commits at redhat.com  Sat Sep 17 14:16:32 2005
From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc))
Date: Sat, 17 Sep 2005 10:16:32 -0400
Subject: owners owners.list,1.227,1.228
Message-ID: <200509171416.j8HEGW20010080@cvs-int.fedora.redhat.com>

Author: buc

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10060

Modified Files:
	owners.list 
Log Message:



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.227
retrieving revision 1.228
diff -u -r1.227 -r1.228
--- owners.list	17 Sep 2005 06:38:03 -0000	1.227
+++ owners.list	17 Sep 2005 14:16:30 -0000	1.228
@@ -149,6 +149,7 @@
 Fedora Extras|eet|A library designed to write an arbitary set of chunks of data to a file|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
 Fedora Extras|elmo|Terminal-based mail client|gauret at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|emacs-auctex|Enhanced TeX modes for Emacsen|ed at eh3.com|extras-qa at fedoraproject.org|
+Fedora Extras|enca|Character set analyzer and detector|dmitry at butskoy.name|extras-qa at fedoraproject.org|
 Fedora Extras|enchant|An Enchanting Spell Checking Library|uwog at uwog.net|extras-qa at fedoraproject.org|
 Fedora Extras|enemies-of-carlotta|A simple mailing list manager|redhat-bugzilla at camperquake.de|extras-qa at fedoraproject.org|
 Fedora Extras|enigma|Clone of the ATARI game Oxyd|fedora at leemhuis.info|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sat Sep 17 14:21:21 2005
From: fedora-extras-commits at redhat.com (Marcin Garski (mgarski))
Date: Sat, 17 Sep 2005 10:21:21 -0400
Subject: rpms/digikam/devel digikam.spec,1.1,1.2
Message-ID: <200509171421.j8HELrhc010151@cvs-int.fedora.redhat.com>

Author: mgarski

Update of /cvs/extras/rpms/digikam/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10130

Modified Files:
	digikam.spec 
Log Message:
- Change confusing warning about Big Endian Platform



Index: digikam.spec
===================================================================
RCS file: /cvs/extras/rpms/digikam/devel/digikam.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- digikam.spec	15 Sep 2005 10:23:34 -0000	1.1
+++ digikam.spec	17 Sep 2005 14:21:18 -0000	1.2
@@ -1,12 +1,13 @@
 Name:		digikam
 Version:	0.7.4
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	A digital camera accessing & photo management application
 
 Group:		Applications/Multimedia
 License:	GPL
 URL:		http://www.digikam.org/
 Source0:	http://dl.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
+Patch0:		digikam-0.7.4-64bit-typo.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	gphoto2-devel >= 2.0.0 imlib2-devel gdbm-devel >= 1.8.0
@@ -36,6 +37,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b 64bit-typo.patch
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
@@ -48,7 +50,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT 
+make install DESTDIR=$RPM_BUILD_ROOT
 
 desktop-file-install --vendor fedora --delete-original \
 	--dir $RPM_BUILD_ROOT%{_datadir}/applications \
@@ -113,6 +115,9 @@
 %{_libdir}/libdigikam.so
 
 %changelog
+* Sat Sep 17 2005 Marcin Garski  0.7.4-3
+- Change confusing warning about Big Endian Platform
+
 * Tue Sep 13 2005 Marcin Garski  0.7.4-2
 - Spec improvements
 



From fedora-extras-commits at redhat.com  Sat Sep 17 14:27:38 2005
From: fedora-extras-commits at redhat.com (Marcin Garski (mgarski))
Date: Sat, 17 Sep 2005 10:27:38 -0400
Subject: rpms/digikam/devel digikam-0.7.4-64bit-typo.patch,NONE,1.1
Message-ID: <200509171427.j8HERcej010206@cvs-int.fedora.redhat.com>

Author: mgarski

Update of /cvs/extras/rpms/digikam/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10186

Added Files:
	digikam-0.7.4-64bit-typo.patch 
Log Message:
- Change confusing warning about Big Endian Platform


digikam-0.7.4-64bit-typo.patch:

--- NEW FILE digikam-0.7.4-64bit-typo.patch ---
--- digikam-0.7.4/digikam/sqlite/sqliteInt.h-orig	2005-08-21 05:20:42.000000000 +0200
+++ digikam-0.7.4/digikam/sqlite/sqliteInt.h	2005-09-17 15:44:54.000000000 +0200
@@ -115,7 +115,7 @@
 #   define INTPTR_TYPE int
 # else
 #   define INTPTR_TYPE long long
-#warning "WARNING: Compiling sqlite for a Big Endian Platform."
+#warning "WARNING: Compiling sqlite for a 64 bit Platform."
 #warning "WARNING: If you know this isn't true, please file a bugreport."
 # endif
 #endif



From fedora-extras-commits at redhat.com  Sat Sep 17 15:00:41 2005
From: fedora-extras-commits at redhat.com (Marcin Garski (mgarski))
Date: Sat, 17 Sep 2005 11:00:41 -0400
Subject: rpms/digikam/FC-3 digikam-0.7.4-64bit-typo.patch, NONE,
	1.1 digikam.spec, 1.1, 1.2
Message-ID: <200509171500.j8HF0f3Y010478@cvs-int.fedora.redhat.com>

Author: mgarski

Update of /cvs/extras/rpms/digikam/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10454

Modified Files:
	digikam.spec 
Added Files:
	digikam-0.7.4-64bit-typo.patch 
Log Message:
- Change confusing warning about Big Endian Platform


digikam-0.7.4-64bit-typo.patch:

--- NEW FILE digikam-0.7.4-64bit-typo.patch ---
--- digikam-0.7.4/digikam/sqlite/sqliteInt.h-orig	2005-08-21 05:20:42.000000000 +0200
+++ digikam-0.7.4/digikam/sqlite/sqliteInt.h	2005-09-17 15:44:54.000000000 +0200
@@ -115,7 +115,7 @@
 #   define INTPTR_TYPE int
 # else
 #   define INTPTR_TYPE long long
-#warning "WARNING: Compiling sqlite for a Big Endian Platform."
+#warning "WARNING: Compiling sqlite for a 64 bit Platform."
 #warning "WARNING: If you know this isn't true, please file a bugreport."
 # endif
 #endif


Index: digikam.spec
===================================================================
RCS file: /cvs/extras/rpms/digikam/FC-3/digikam.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- digikam.spec	15 Sep 2005 10:23:34 -0000	1.1
+++ digikam.spec	17 Sep 2005 15:00:39 -0000	1.2
@@ -1,12 +1,13 @@
 Name:		digikam
 Version:	0.7.4
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	A digital camera accessing & photo management application
 
 Group:		Applications/Multimedia
 License:	GPL
 URL:		http://www.digikam.org/
 Source0:	http://dl.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
+Patch0:		digikam-0.7.4-64bit-typo.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	gphoto2-devel >= 2.0.0 imlib2-devel gdbm-devel >= 1.8.0
@@ -36,6 +37,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b 64bit-typo.patch
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
@@ -48,7 +50,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT 
+make install DESTDIR=$RPM_BUILD_ROOT
 
 desktop-file-install --vendor fedora --delete-original \
 	--dir $RPM_BUILD_ROOT%{_datadir}/applications \
@@ -113,6 +115,9 @@
 %{_libdir}/libdigikam.so
 
 %changelog
+* Sat Sep 17 2005 Marcin Garski  0.7.4-3
+- Change confusing warning about Big Endian Platform
+
 * Tue Sep 13 2005 Marcin Garski  0.7.4-2
 - Spec improvements
 



From fedora-extras-commits at redhat.com  Sat Sep 17 15:02:27 2005
From: fedora-extras-commits at redhat.com (Marcin Garski (mgarski))
Date: Sat, 17 Sep 2005 11:02:27 -0400
Subject: rpms/digikam/FC-4 digikam-0.7.4-64bit-typo.patch, NONE,
	1.1 digikam.spec, 1.1, 1.2
Message-ID: <200509171503.j8HF2wBV011864@cvs-int.fedora.redhat.com>

Author: mgarski

Update of /cvs/extras/rpms/digikam/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11842

Modified Files:
	digikam.spec 
Added Files:
	digikam-0.7.4-64bit-typo.patch 
Log Message:
- Change confusing warning about Big Endian Platform


digikam-0.7.4-64bit-typo.patch:

--- NEW FILE digikam-0.7.4-64bit-typo.patch ---
--- digikam-0.7.4/digikam/sqlite/sqliteInt.h-orig	2005-08-21 05:20:42.000000000 +0200
+++ digikam-0.7.4/digikam/sqlite/sqliteInt.h	2005-09-17 15:44:54.000000000 +0200
@@ -115,7 +115,7 @@
 #   define INTPTR_TYPE int
 # else
 #   define INTPTR_TYPE long long
-#warning "WARNING: Compiling sqlite for a Big Endian Platform."
+#warning "WARNING: Compiling sqlite for a 64 bit Platform."
 #warning "WARNING: If you know this isn't true, please file a bugreport."
 # endif
 #endif


Index: digikam.spec
===================================================================
RCS file: /cvs/extras/rpms/digikam/FC-4/digikam.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- digikam.spec	15 Sep 2005 10:23:34 -0000	1.1
+++ digikam.spec	17 Sep 2005 15:02:25 -0000	1.2
@@ -1,12 +1,13 @@
 Name:		digikam
 Version:	0.7.4
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	A digital camera accessing & photo management application
 
 Group:		Applications/Multimedia
 License:	GPL
 URL:		http://www.digikam.org/
 Source0:	http://dl.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
+Patch0:		digikam-0.7.4-64bit-typo.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	gphoto2-devel >= 2.0.0 imlib2-devel gdbm-devel >= 1.8.0
@@ -36,6 +37,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b 64bit-typo.patch
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
@@ -48,7 +50,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT 
+make install DESTDIR=$RPM_BUILD_ROOT
 
 desktop-file-install --vendor fedora --delete-original \
 	--dir $RPM_BUILD_ROOT%{_datadir}/applications \
@@ -113,6 +115,9 @@
 %{_libdir}/libdigikam.so
 
 %changelog
+* Sat Sep 17 2005 Marcin Garski  0.7.4-3
+- Change confusing warning about Big Endian Platform
+
 * Tue Sep 13 2005 Marcin Garski  0.7.4-2
 - Spec improvements
 



From fedora-extras-commits at redhat.com  Sat Sep 17 20:51:56 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Sat, 17 Sep 2005 16:51:56 -0400
Subject: rpms/wlassistant/devel - New directory
Message-ID: <200509172051.j8HKpua3019406@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/wlassistant/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19381/wlassistant/devel

Log Message:
Directory /cvs/extras/rpms/wlassistant/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Sep 17 20:51:56 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Sat, 17 Sep 2005 16:51:56 -0400
Subject: rpms/wlassistant - New directory
Message-ID: <200509172051.j8HKpugM019401@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/wlassistant
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19381/wlassistant

Log Message:
Directory /cvs/extras/rpms/wlassistant added to the repository




From fedora-extras-commits at redhat.com  Sat Sep 17 20:52:10 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Sat, 17 Sep 2005 16:52:10 -0400
Subject: rpms/wlassistant Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200509172052.j8HKqAe2019461@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/wlassistant
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19426

Added Files:
	Makefile import.log 
Log Message:
Setup of module wlassistant


--- NEW FILE Makefile ---
# Top level Makefile for module wlassistant
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Sat Sep 17 20:52:10 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Sat, 17 Sep 2005 16:52:10 -0400
Subject: rpms/wlassistant/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200509172052.j8HKqAU5019466@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/wlassistant/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19426/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module wlassistant


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Sat Sep 17 20:52:56 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Sat, 17 Sep 2005 16:52:56 -0400
Subject: rpms/wlassistant import.log,1.1,1.2
Message-ID: <200509172052.j8HKqucS019553@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/wlassistant
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19514

Modified Files:
	import.log 
Log Message:
auto-import wlassistant-0.5.4a-2 on branch devel from wlassistant-0.5.4a-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/wlassistant/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	17 Sep 2005 20:52:08 -0000	1.1
+++ import.log	17 Sep 2005 20:52:54 -0000	1.2
@@ -0,0 +1 @@
+wlassistant-0_5_4a-2:HEAD:wlassistant-0.5.4a-2.src.rpm:1126990368



From fedora-extras-commits at redhat.com  Sat Sep 17 20:52:56 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Sat, 17 Sep 2005 16:52:56 -0400
Subject: rpms/wlassistant/devel wlassistant-0.5.4a-desktopfix.patch, NONE,
	1.1 wlassistant-0.5.4a-rpath.patch, NONE,
	1.1 wlassistant.console_apps, NONE, 1.1 wlassistant.pamd, NONE,
	1.1 wlassistant.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <200509172052.j8HKqu2q019563@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/wlassistant/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19514/devel

Modified Files:
	.cvsignore sources 
Added Files:
	wlassistant-0.5.4a-desktopfix.patch 
	wlassistant-0.5.4a-rpath.patch wlassistant.console_apps 
	wlassistant.pamd wlassistant.spec 
Log Message:
auto-import wlassistant-0.5.4a-2 on branch devel from wlassistant-0.5.4a-2.src.rpm

wlassistant-0.5.4a-desktopfix.patch:

--- NEW FILE wlassistant-0.5.4a-desktopfix.patch ---
--- wlassistant-0.5.4a/src/wlassistant.desktop.orig	2005-09-01 23:23:44.000000000 -0500
+++ wlassistant-0.5.4a/src/wlassistant.desktop	2005-09-04 20:00:41.000000000 -0500
@@ -3,7 +3,10 @@
 Name=Wireless Assistant
 Comment[pl]=Program do obs??ugi sieci bezprzewodowych
 Comment[es]=Aplicaci??n para buscar redes inal??mbricas
-Exec=sudo wlassistant
-Icon=wlassistant
+Comment=Application to look for wireless networks
+Exec=/usr/sbin/wlassistant
+Icon=/usr/share/icons/hicolor/32x32/apps/wlassistant.png
 Type=Application
+Categories=Application;SystemSetup;System;
+StartupNotify=true
 

wlassistant-0.5.4a-rpath.patch:

--- NEW FILE wlassistant-0.5.4a-rpath.patch ---
--- wlassistant-0.5.4a/configure.BAD	2005-09-04 19:32:40.000000000 -0500
+++ wlassistant-0.5.4a/configure	2005-09-04 19:33:10.000000000 -0500
@@ -29220,17 +29220,8 @@
 
 if test -z "$KDE_RPATH" && test "$USE_RPATH" = "yes"; then
 
-  KDE_RPATH="-R \$(kde_libraries)"
-
   if test -n "$qt_libraries"; then
-    KDE_RPATH="$KDE_RPATH -R \$(qt_libraries)"
-  fi
-    if test -n "$X_LDFLAGS"; then
-    X_RPATH="-R \$(x_libraries)"
-    KDE_RPATH="$KDE_RPATH $X_RPATH"
-  fi
-  if test -n "$KDE_EXTRA_RPATH"; then
-    KDE_RPATH="$KDE_RPATH \$(KDE_EXTRA_RPATH)"
+    KDE_RPATH="-R \$(qt_libraries)"
   fi
 fi
 


--- NEW FILE wlassistant.console_apps ---
USER=root
PROGRAM=/usr/bin/wlassistant
SESSION=true


--- NEW FILE wlassistant.pamd ---
#%PAM-1.0
auth       sufficient   pam_rootok.so
auth       sufficient   pam_timestamp.so
auth       required     pam_stack.so service=system-auth
session    required     pam_permit.so
session    optional     pam_xauth.so
session    optional     pam_timestamp.so
account    required     pam_permit.so


--- NEW FILE wlassistant.spec ---
Name:		wlassistant
Version:	0.5.4a
Release:	2%{?dist}
License:	GPL
Group:		Applications/System
Summary:	Wireless network management tool
URL:		http://wlassistant.sourceforge.net
Source0:	http://download.sourceforge.net/wlassistant/wlassistant-%{version}.tar.bz2
Source1:	wlassistant.console_apps
Source2:	wlassistant.pamd
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:	kdebase-devel, desktop-file-utils, dos2unix, wireless-tools
Requires(post): desktop-file-utils
Requires(postun): desktop-file-utils
Requires:       usermode, wireless-tools, net-tools, dhclient
Patch0:		wlassistant-0.5.4a-rpath.patch
Patch1:		wlassistant-0.5.4a-desktopfix.patch

%description
Wireless Assistant (wlassistant) is a small application that allows you to 
connect to wireless networks.

MAIN FEATURES:
- Managed Networks Support
- WEP Encryption Support
- Not Broadcasted ("hidden") ESSIDs Support
- Per Network (AP) Configuration Profiles
- Automatic (DHCP, both dhcpcd and dhclient) and manual configuration options.

%prep
%setup -q
%patch0 -p1
%patch1 -p1

%build
%configure
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make DESTDIR=$RPM_BUILD_ROOT install
mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/security/console.apps
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/pam.d
mkdir -p $RPM_BUILD_ROOT%{_sbindir}
install -m0644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/security/console.apps/wlassistant
install -m0644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/wlassistant

dos2unix $RPM_BUILD_ROOT%{_datadir}/applnk/Utilities/wlassistant.desktop

desktop-file-install --vendor fedora \
	--dir $RPM_BUILD_ROOT%{_datadir}/applications \
	--add-category X-Fedora \
	--delete-original \
	$RPM_BUILD_ROOT%{_datadir}/applnk/Utilities/wlassistant.desktop

%find_lang %{name}

# We're going to use consolehelper, since this is a GUI app.
cd $RPM_BUILD_ROOT%{_sbindir}/
ln -s /usr/bin/consolehelper wlassistant

%post
update-desktop-database %{_datadir}/applications &> /dev/null

%postun
if [ "$1" = "0" ]; then
  update-desktop-database %{_datadir}/applications &> /dev/null
fi

%clean
rm -rf $RPM_BUILD_ROOT

%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING README NEWS ChangeLog
%config(noreplace) %{_sysconfdir}/pam.d/wlassistant
%config(noreplace) %{_sysconfdir}/security/console.apps/wlassistant
%{_bindir}/wlassistant
%{_sbindir}/wlassistant
%{_datadir}/applications/*.desktop
%{_datadir}/icons/hicolor/16x16/apps/wlassistant.png
%{_datadir}/icons/hicolor/32x32/apps/wlassistant.png

%changelog
* Sat Sep 17 2005 Tom "spot" Callaway  0.5.4a-2
- add BR: wireless-tools

* Sun Sep  4 2005 Tom "spot" Callaway  0.5.4a-1
- initial package for Fedora Extras


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wlassistant/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	17 Sep 2005 20:52:08 -0000	1.1
+++ .cvsignore	17 Sep 2005 20:52:54 -0000	1.2
@@ -0,0 +1 @@
+wlassistant-0.5.4a.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wlassistant/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	17 Sep 2005 20:52:08 -0000	1.1
+++ sources	17 Sep 2005 20:52:54 -0000	1.2
@@ -0,0 +1 @@
+4836d595a27f34c24784cdf9c2a9d5a8  wlassistant-0.5.4a.tar.bz2



From fedora-extras-commits at redhat.com  Sat Sep 17 21:00:00 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Sat, 17 Sep 2005 17:00:00 -0400
Subject: owners owners.list,1.228,1.229
Message-ID: <200509172100.j8HL00fe019620@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19601

Modified Files:
	owners.list 
Log Message:

wlassistant



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.228
retrieving revision 1.229
diff -u -r1.228 -r1.229
--- owners.list	17 Sep 2005 14:16:30 -0000	1.228
+++ owners.list	17 Sep 2005 20:59:58 -0000	1.229
@@ -1023,6 +1023,7 @@
 Fedora Extras|whowatch|Displays informations about the users currently logged in|nos at utelsystems.com|extras-qa at fedoraproject.org|
 Fedora Extras|WindowMaker|A fast, feature rich Window manager|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|wine|A Windows 16/32 bit emulator|pmatilai at laiskiainen.org|extras-qa at fedoraproject.org|
+Fedora Extras|wlassistant|Wireless network management tool|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|wmapmload|Wmapmload monitors your apm status in an lcd display fashion|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|wmweather+|Weather status dockapp|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|wv2|A library which allows access to Microsoft?? Word files|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sat Sep 17 21:31:57 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Sat, 17 Sep 2005 17:31:57 -0400
Subject: rpms/wlassistant/FC-3 wlassistant.desktop, NONE,
	1.1 wlassistant.spec, 1.1, 1.2
Message-ID: <200509172131.j8HLVvI8022020@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/wlassistant/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21967/FC-3

Modified Files:
	wlassistant.spec 
Added Files:
	wlassistant.desktop 
Log Message:

Don't bother messing with the existing desktop file, use a known good copy.



--- NEW FILE wlassistant.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=Wireless Assistant
Comment[pl]=Program do obs??ugi sieci bezprzewodowych
Comment[es]=Aplicaci??n para buscar redes inal??mbricas
Comment=Application to look for wireless networks
Exec=/usr/sbin/wlassistant
Icon=/usr/share/icons/hicolor/32x32/apps/wlassistant.png
Type=Application
Categories=Application;SystemSetup;System;
StartupNotify=true



Index: wlassistant.spec
===================================================================
RCS file: /cvs/extras/rpms/wlassistant/FC-3/wlassistant.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wlassistant.spec	17 Sep 2005 20:52:54 -0000	1.1
+++ wlassistant.spec	17 Sep 2005 21:31:55 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		wlassistant
 Version:	0.5.4a
-Release:	2%{?dist}
+Release:	3%{?dist}
 License:	GPL
 Group:		Applications/System
 Summary:	Wireless network management tool
@@ -8,13 +8,13 @@
 Source0:	http://download.sourceforge.net/wlassistant/wlassistant-%{version}.tar.bz2
 Source1:	wlassistant.console_apps
 Source2:	wlassistant.pamd
+Source3:	wlassistant.desktop
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:	kdebase-devel, desktop-file-utils, dos2unix, wireless-tools
+BuildRequires:	kdebase-devel, desktop-file-utils, wireless-tools
 Requires(post): desktop-file-utils
 Requires(postun): desktop-file-utils
 Requires:       usermode, wireless-tools, net-tools, dhclient
 Patch0:		wlassistant-0.5.4a-rpath.patch
-Patch1:		wlassistant-0.5.4a-desktopfix.patch
 
 %description
 Wireless Assistant (wlassistant) is a small application that allows you to 
@@ -30,7 +30,6 @@
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 
 %build
 %configure
@@ -46,13 +45,12 @@
 install -m0644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/security/console.apps/wlassistant
 install -m0644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/wlassistant
 
-dos2unix $RPM_BUILD_ROOT%{_datadir}/applnk/Utilities/wlassistant.desktop
+rm -rf $RPM_BUILD_ROOT%{_datadir}/applnk/Utilities/wlassistant.desktop
 
 desktop-file-install --vendor fedora \
 	--dir $RPM_BUILD_ROOT%{_datadir}/applications \
 	--add-category X-Fedora \
-	--delete-original \
-	$RPM_BUILD_ROOT%{_datadir}/applnk/Utilities/wlassistant.desktop
+	%{SOURCE3}
 
 %find_lang %{name}
 
@@ -83,6 +81,9 @@
 %{_datadir}/icons/hicolor/32x32/apps/wlassistant.png
 
 %changelog
+* Sat Sep 17 2005 Tom "spot" Callaway  0.5.4a-3
+- use .desktop file as SOURCE3 rather than screwing around with dos2unix
+
 * Sat Sep 17 2005 Tom "spot" Callaway  0.5.4a-2
 - add BR: wireless-tools
 



From fedora-extras-commits at redhat.com  Sat Sep 17 21:31:58 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Sat, 17 Sep 2005 17:31:58 -0400
Subject: rpms/wlassistant/devel wlassistant.desktop, NONE,
	1.1 wlassistant.spec, 1.1, 1.2
Message-ID: <200509172131.j8HLVwnX022030@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/wlassistant/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21967/devel

Modified Files:
	wlassistant.spec 
Added Files:
	wlassistant.desktop 
Log Message:

Don't bother messing with the existing desktop file, use a known good copy.



--- NEW FILE wlassistant.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=Wireless Assistant
Comment[pl]=Program do obs??ugi sieci bezprzewodowych
Comment[es]=Aplicaci??n para buscar redes inal??mbricas
Comment=Application to look for wireless networks
Exec=/usr/sbin/wlassistant
Icon=/usr/share/icons/hicolor/32x32/apps/wlassistant.png
Type=Application
Categories=Application;SystemSetup;System;
StartupNotify=true



Index: wlassistant.spec
===================================================================
RCS file: /cvs/extras/rpms/wlassistant/devel/wlassistant.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wlassistant.spec	17 Sep 2005 20:52:54 -0000	1.1
+++ wlassistant.spec	17 Sep 2005 21:31:56 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		wlassistant
 Version:	0.5.4a
-Release:	2%{?dist}
+Release:	3%{?dist}
 License:	GPL
 Group:		Applications/System
 Summary:	Wireless network management tool
@@ -8,13 +8,13 @@
 Source0:	http://download.sourceforge.net/wlassistant/wlassistant-%{version}.tar.bz2
 Source1:	wlassistant.console_apps
 Source2:	wlassistant.pamd
+Source3:	wlassistant.desktop
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:	kdebase-devel, desktop-file-utils, dos2unix, wireless-tools
+BuildRequires:	kdebase-devel, desktop-file-utils, wireless-tools
 Requires(post): desktop-file-utils
 Requires(postun): desktop-file-utils
 Requires:       usermode, wireless-tools, net-tools, dhclient
 Patch0:		wlassistant-0.5.4a-rpath.patch
-Patch1:		wlassistant-0.5.4a-desktopfix.patch
 
 %description
 Wireless Assistant (wlassistant) is a small application that allows you to 
@@ -30,7 +30,6 @@
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 
 %build
 %configure
@@ -46,13 +45,12 @@
 install -m0644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/security/console.apps/wlassistant
 install -m0644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/wlassistant
 
-dos2unix $RPM_BUILD_ROOT%{_datadir}/applnk/Utilities/wlassistant.desktop
+rm -rf $RPM_BUILD_ROOT%{_datadir}/applnk/Utilities/wlassistant.desktop
 
 desktop-file-install --vendor fedora \
 	--dir $RPM_BUILD_ROOT%{_datadir}/applications \
 	--add-category X-Fedora \
-	--delete-original \
-	$RPM_BUILD_ROOT%{_datadir}/applnk/Utilities/wlassistant.desktop
+	%{SOURCE3}
 
 %find_lang %{name}
 
@@ -83,6 +81,9 @@
 %{_datadir}/icons/hicolor/32x32/apps/wlassistant.png
 
 %changelog
+* Sat Sep 17 2005 Tom "spot" Callaway  0.5.4a-3
+- use .desktop file as SOURCE3 rather than screwing around with dos2unix
+
 * Sat Sep 17 2005 Tom "spot" Callaway  0.5.4a-2
 - add BR: wireless-tools
 



From fedora-extras-commits at redhat.com  Sat Sep 17 21:31:57 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Sat, 17 Sep 2005 17:31:57 -0400
Subject: rpms/wlassistant/FC-4 wlassistant.desktop, NONE,
	1.1 wlassistant.spec, 1.1, 1.2
Message-ID: <200509172132.j8HLVwYX022026@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/wlassistant/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21967/FC-4

Modified Files:
	wlassistant.spec 
Added Files:
	wlassistant.desktop 
Log Message:

Don't bother messing with the existing desktop file, use a known good copy.



--- NEW FILE wlassistant.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=Wireless Assistant
Comment[pl]=Program do obs??ugi sieci bezprzewodowych
Comment[es]=Aplicaci??n para buscar redes inal??mbricas
Comment=Application to look for wireless networks
Exec=/usr/sbin/wlassistant
Icon=/usr/share/icons/hicolor/32x32/apps/wlassistant.png
Type=Application
Categories=Application;SystemSetup;System;
StartupNotify=true



Index: wlassistant.spec
===================================================================
RCS file: /cvs/extras/rpms/wlassistant/FC-4/wlassistant.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wlassistant.spec	17 Sep 2005 20:52:54 -0000	1.1
+++ wlassistant.spec	17 Sep 2005 21:31:55 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		wlassistant
 Version:	0.5.4a
-Release:	2%{?dist}
+Release:	3%{?dist}
 License:	GPL
 Group:		Applications/System
 Summary:	Wireless network management tool
@@ -8,13 +8,13 @@
 Source0:	http://download.sourceforge.net/wlassistant/wlassistant-%{version}.tar.bz2
 Source1:	wlassistant.console_apps
 Source2:	wlassistant.pamd
+Source3:	wlassistant.desktop
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:	kdebase-devel, desktop-file-utils, dos2unix, wireless-tools
+BuildRequires:	kdebase-devel, desktop-file-utils, wireless-tools
 Requires(post): desktop-file-utils
 Requires(postun): desktop-file-utils
 Requires:       usermode, wireless-tools, net-tools, dhclient
 Patch0:		wlassistant-0.5.4a-rpath.patch
-Patch1:		wlassistant-0.5.4a-desktopfix.patch
 
 %description
 Wireless Assistant (wlassistant) is a small application that allows you to 
@@ -30,7 +30,6 @@
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 
 %build
 %configure
@@ -46,13 +45,12 @@
 install -m0644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/security/console.apps/wlassistant
 install -m0644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/wlassistant
 
-dos2unix $RPM_BUILD_ROOT%{_datadir}/applnk/Utilities/wlassistant.desktop
+rm -rf $RPM_BUILD_ROOT%{_datadir}/applnk/Utilities/wlassistant.desktop
 
 desktop-file-install --vendor fedora \
 	--dir $RPM_BUILD_ROOT%{_datadir}/applications \
 	--add-category X-Fedora \
-	--delete-original \
-	$RPM_BUILD_ROOT%{_datadir}/applnk/Utilities/wlassistant.desktop
+	%{SOURCE3}
 
 %find_lang %{name}
 
@@ -83,6 +81,9 @@
 %{_datadir}/icons/hicolor/32x32/apps/wlassistant.png
 
 %changelog
+* Sat Sep 17 2005 Tom "spot" Callaway  0.5.4a-3
+- use .desktop file as SOURCE3 rather than screwing around with dos2unix
+
 * Sat Sep 17 2005 Tom "spot" Callaway  0.5.4a-2
 - add BR: wireless-tools
 



From fedora-extras-commits at redhat.com  Sat Sep 17 23:20:34 2005
From: fedora-extras-commits at redhat.com (W. Michael Petullo (mikep))
Date: Sat, 17 Sep 2005 19:20:34 -0400
Subject: rpms/roundup - New directory
Message-ID: <200509172320.j8HNKYne025100@cvs-int.fedora.redhat.com>

Author: mikep

Update of /cvs/extras/rpms/roundup
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25080/roundup

Log Message:
Directory /cvs/extras/rpms/roundup added to the repository




From fedora-extras-commits at redhat.com  Sat Sep 17 23:20:35 2005
From: fedora-extras-commits at redhat.com (W. Michael Petullo (mikep))
Date: Sat, 17 Sep 2005 19:20:35 -0400
Subject: rpms/roundup/devel - New directory
Message-ID: <200509172320.j8HNKZ5J025105@cvs-int.fedora.redhat.com>

Author: mikep

Update of /cvs/extras/rpms/roundup/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25080/roundup/devel

Log Message:
Directory /cvs/extras/rpms/roundup/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Sep 17 23:20:48 2005
From: fedora-extras-commits at redhat.com (W. Michael Petullo (mikep))
Date: Sat, 17 Sep 2005 19:20:48 -0400
Subject: rpms/roundup Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200509172320.j8HNKmL1025160@cvs-int.fedora.redhat.com>

Author: mikep

Update of /cvs/extras/rpms/roundup
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25125

Added Files:
	Makefile import.log 
Log Message:
Setup of module roundup


--- NEW FILE Makefile ---
# Top level Makefile for module roundup
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Sat Sep 17 23:20:49 2005
From: fedora-extras-commits at redhat.com (W. Michael Petullo (mikep))
Date: Sat, 17 Sep 2005 19:20:49 -0400
Subject: rpms/roundup/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200509172320.j8HNKnVl025165@cvs-int.fedora.redhat.com>

Author: mikep

Update of /cvs/extras/rpms/roundup/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25125/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module roundup


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Sat Sep 17 23:21:34 2005
From: fedora-extras-commits at redhat.com (W. Michael Petullo (mikep))
Date: Sat, 17 Sep 2005 19:21:34 -0400
Subject: rpms/roundup import.log,1.1,1.2
Message-ID: <200509172321.j8HNLYMT025252@cvs-int.fedora.redhat.com>

Author: mikep

Update of /cvs/extras/rpms/roundup
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25213

Modified Files:
	import.log 
Log Message:
auto-import roundup-0.8.4-5 on branch devel from roundup-0.8.4-5.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/roundup/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	17 Sep 2005 23:20:46 -0000	1.1
+++ import.log	17 Sep 2005 23:21:32 -0000	1.2
@@ -0,0 +1 @@
+roundup-0_8_4-5:HEAD:roundup-0.8.4-5.src.rpm:1126999290



From fedora-extras-commits at redhat.com  Sat Sep 17 23:21:34 2005
From: fedora-extras-commits at redhat.com (W. Michael Petullo (mikep))
Date: Sat, 17 Sep 2005 19:21:34 -0400
Subject: rpms/roundup/devel README.Fedora, NONE, 1.1 roundup, NONE,
	1.1 roundup-setup.patch, NONE, 1.1 roundup.conf, NONE,
	1.1 roundup.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200509172321.j8HNLY9O025260@cvs-int.fedora.redhat.com>

Author: mikep

Update of /cvs/extras/rpms/roundup/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25213/devel

Modified Files:
	.cvsignore sources 
Added Files:
	README.Fedora roundup roundup-setup.patch roundup.conf 
	roundup.spec 
Log Message:
auto-import roundup-0.8.4-5 on branch devel from roundup-0.8.4-5.src.rpm


--- NEW FILE README.Fedora ---
Some steps in the installation of Roundup are difficult to automate.
Because of this, the roundup installation must be completed manually
after installing the Roundup package.  The following steps will complete
the installation of Roundup:

1.  Set the following items in
/var/lib/roundup/trackers/default/config.ini as appropriate for your
network:

	[mail]
	domain
	host
	username
	password

	[tracker]
	web
	email

	[rdbms]
	password

2.  Create a mysql database:
	
	mysql -e "CREATE DATABASE roundup;"
	mysql -e "GRANT ALL PRIVILEGES ON roundup.* TO roundup at localhost
		IDENTIFIED BY 'PASSWORD';"

3.  Initialize the system.

	roundup-admin -i /var/lib/roundup/trackers/default initialise
		PASSWORD

To fully uninstall Roundup (and DESTROY any Roundup data), perform the
following steps:

1.  mysql -e "DROP DATABASE roundup;"
2.  rm -rf /var/lib/roundup


--- NEW FILE roundup ---
#!/bin/bash
#
#	/etc/rc.d/init.d/roundup
#
# Starts the roundup daemon
#
# chkconfig: - 95 5
# description: Bug tracking system.
# processname: roundup

# Source function library.
. /etc/init.d/functions

test -x /usr/bin/roundup-server || exit 0

RETVAL=0

#
#	See how we were called.
#

prog="roundup-server"

start() {
	# Check if roundup is already running
	if [ ! -f /var/lock/subsys/roundup ]; then
	    echo -n $"Starting $prog: "
	    daemon /usr/bin/roundup-server -d /var/run/roundup-server.pid -u roundup -g roundup -p 8080 issues=/var/lib/roundup/trackers/default
	    RETVAL=$?
	    [ $RETVAL -eq 0 ] && touch /var/lock/subsys/roundup
	    echo
	fi
	return $RETVAL
}

stop() {
	echo -n $"Stopping $prog: "
	killproc /usr/bin/roundup-server
	RETVAL=$?
	[ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/roundup
	echo
        return $RETVAL
}


restart() {
	stop
	start
}	

reload() {
	restart
}	

status_roundup() {
 	status /usr/bin/roundup-server
}

case "$1" in
start)
	start
	;;
stop)
	stop
	;;
reload|restart)
	restart
	;;
condrestart)
	if [ -f /var/lock/subsys/roundup ]; then
	    restart
	fi
	;;
status)
	status_roundup
	;;
*)
	echo $"Usage: $0 {start|stop|restart|condrestart|status}"
	exit 1
esac

exit $?
exit $RETVAL

roundup-setup.patch:

--- NEW FILE roundup-setup.patch ---
diff -u --recursive roundup-0.8.4-vanilla/setup.py roundup-0.8.4/setup.py
--- roundup-0.8.4-vanilla/setup.py	2005-07-17 23:09:47.000000000 -0400
+++ roundup-0.8.4/setup.py	2005-09-04 14:11:18.000000000 -0400
@@ -306,7 +306,7 @@
 
     # install man pages on POSIX platforms
     if os.name == 'posix':
-        installdatafiles.append(('man/man1', ['doc/roundup-admin.1',
+        installdatafiles.append(('share/man/man1', ['doc/roundup-admin.1',
             'doc/roundup-mailgw.1', 'doc/roundup-server.1',
             'doc/roundup-demo.1']))
 


--- NEW FILE roundup.conf ---
#
# Roundup is an issue-tracking system.
#

ProxyPass /roundup/ http://localhost:8080/


--- NEW FILE roundup.spec ---
%define pythonver 2.4
%define pythonsitedir %{_libdir}/python%{pythonver}/site-packages

Summary: Simple and flexible issue-tracking system
Name: roundup
Version: 0.8.4
Release: 5
License: MIT
Group: Applications/Engineering
Source: http://dl.sourceforge.net/roundup/roundup-%{version}.tar.gz
Source1: roundup.conf
Source2: roundup
Source3: README.Fedora
Patch0: roundup-setup.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
URL: http://roundup.sourceforge.net/
Requires: python >= %{pythonver} httpd mysql-server MySQL-python sharutils
Requires(post): /sbin/chkconfig
Requires(post): /sbin/service
Requires(preun): /sbin/chkconfig
Requires(preun): /sbin/service

%description
Roundup is a simple and flexible issue-tracking system with command line,
web and email interfaces.  It is based on the winning design from Ka-Ping
Yee in the Software Carpentry "Track" design competition.

%prep
%setup
%patch0 -p1
cp -p %{SOURCE3} .

%build
CFLAGS="$RPM_OPT_FLAGS" python setup.py build

%install
python setup.py install --root=$RPM_BUILD_ROOT
install -p -D -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/roundup.conf
install -p -D -m 755 %{SOURCE2} $RPM_BUILD_ROOT%{_initrddir}/roundup
%find_lang %{name}

%post
useradd -M -r -d /var/lib/roundup -s /sbin/nologin -c "Roundup Issue Tracker" roundup > /dev/null 2>&1 || :
if [ ! -d /var/lib/roundup ]; then
	install -d /var/lib/roundup/trackers/default/db > /dev/null 2>&1
	install -d /var/lib/roundup/trackers/default/db/files -m 2770 -o root -g roundup > /dev/null 2>&1

	# Create Roundup configuration.
	roundup-admin -i /var/lib/roundup/trackers/default install classic mysql > /dev/null 2>&1
fi
/sbin/chkconfig --add roundup >/dev/null 2>&1
if [ "$1" -ge "1" ]; then
	/sbin/service roundup condrestart >/dev/null 2>&1
fi

%preun
if [ $1 = 0 ]; then
	/sbin/service roundup stop > /dev/null 2>&1
	/sbin/chkconfig --del roundup >/dev/null 2>&1
fi

%clean
rm -rf $RPM_BUILD_ROOT

%files -f %{name}.lang
%{_bindir}/*
%{pythonsitedir}/*
%{_datadir}/roundup/*
%{_mandir}/man1/*
%defattr(-,root,root)
%config(noreplace) %{_initrddir}/roundup
%config(noreplace) %{_sysconfdir}/httpd/conf.d/*.conf

%doc README.Fedora COPYING.txt

%changelog
* Sun Sep 05 2005 W. Michael Petullo  - 0.8.4-5
   - No longer use setup.py's --record feature.
   - Really fix init script.
   - %{_mandir}/man1/* instead of %{_mandir}/*.

* Sun Sep 05 2005 W. Michael Petullo  - 0.8.4-4
   - Put man pages in /usr/share/man.
   - Use a shorter summary.
   - Do not enable service by default.
   - Include license in installed files.
   - Restart service if needed after upgrade.
   - Use %{find_lang}.
   - Tag %{_initrddir}/roundup as %config(noreplace).

* Sun Aug 14 2005 W. Michael Petullo  - 0.8.4-3
   - Do not use useradd's -o option.

* Thu Aug 11 2005 W. Michael Petullo  - 0.8.4-2
   - Set GID roundup will use from startup script.
   - Set proper permissions on db/files.
   - Change Source URL.
   - Use %{SOURCE1}, %{SOURCE2}, ...
   - Use install's -p switch.
   - Don't hardcode useradd UID.
   - Scriptlets no longer output anything.
   - Don't delete user in postun.
   - Use %{_initrddir}.
   - Only stop service if uninstalling.

* Sun Aug 07 2005 W. Michael Petullo  - 0.8.4-1
   - Stop roundup service after uninstalling.
   - New upstream version.

* Tue Jul 26 2005 W. Michael Petullo  - 0.8.3-2
   - Use proxy feature to increase performance.
   - Print better instructions after installing.

* Tue Jun 28 2005 W. Michael Petullo  - 0.8.3-1
   - Initial package for Fedora Extras.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/roundup/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	17 Sep 2005 23:20:46 -0000	1.1
+++ .cvsignore	17 Sep 2005 23:21:32 -0000	1.2
@@ -0,0 +1 @@
+roundup-0.8.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/roundup/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	17 Sep 2005 23:20:46 -0000	1.1
+++ sources	17 Sep 2005 23:21:32 -0000	1.2
@@ -0,0 +1 @@
+6b995d7d6c5b49666e5297929e70bbc7  roundup-0.8.4.tar.gz



From fedora-extras-commits at redhat.com  Sat Sep 17 23:24:55 2005
From: fedora-extras-commits at redhat.com (W. Michael Petullo (mikep))
Date: Sat, 17 Sep 2005 19:24:55 -0400
Subject: owners owners.list,1.229,1.230
Message-ID: <200509172324.j8HNOtsJ025326@cvs-int.fedora.redhat.com>

Author: mikep

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25307

Modified Files:
	owners.list 
Log Message:
Added entry for new roundup package.



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.229
retrieving revision 1.230
diff -u -r1.229 -r1.230
--- owners.list	17 Sep 2005 20:59:58 -0000	1.229
+++ owners.list	17 Sep 2005 23:24:53 -0000	1.230
@@ -877,6 +877,7 @@
 Fedora Extras|R-hdf5|R Interface to the NCSA HDF5 library|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|rinetd|TCP redirection server|kaboom at oobleck.net|extras-qa at fedoraproject.org|
 Fedora Extras|rkhunter|Rootkit Hunter scans for rootkits, backdoors and local exploits|tamaster at pobox.com|extras-qa at fedoraproject.org|
+Fedora Extras|roundup|Simple and flexible issue-tracking system|redhat at flyn.org|extras-qa at fedoraproject.org|
 Fedora Extras|rpmDirectoryCheck|Tool to detect some RPM packaging errors|enrico.scholz at informatik.tu-chemnitz.de|extras-qa at fedoraproject.org|
 Fedora Extras|rpmlint|RPM correctness checker|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|rpmproc|Perl script to help manage and build RPM packages|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sun Sep 18 00:28:11 2005
From: fedora-extras-commits at redhat.com (W. Michael Petullo (mikep))
Date: Sat, 17 Sep 2005 20:28:11 -0400
Subject: rpms/roundup import.log,1.2,1.3
Message-ID: <200509180028.j8I0SfdR026828@cvs-int.fedora.redhat.com>

Author: mikep

Update of /cvs/extras/rpms/roundup
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26792

Modified Files:
	import.log 
Log Message:
auto-import roundup-0.8.4-6 on branch devel from roundup-0.8.4-6.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/roundup/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	17 Sep 2005 23:21:32 -0000	1.2
+++ import.log	18 Sep 2005 00:28:09 -0000	1.3
@@ -1 +1,2 @@
 roundup-0_8_4-5:HEAD:roundup-0.8.4-5.src.rpm:1126999290
+roundup-0_8_4-6:HEAD:roundup-0.8.4-6.src.rpm:1127003286



From fedora-extras-commits at redhat.com  Sun Sep 18 00:28:11 2005
From: fedora-extras-commits at redhat.com (W. Michael Petullo (mikep))
Date: Sat, 17 Sep 2005 20:28:11 -0400
Subject: rpms/roundup/devel roundup.spec,1.1,1.2
Message-ID: <200509180028.j8I0Sg0X026831@cvs-int.fedora.redhat.com>

Author: mikep

Update of /cvs/extras/rpms/roundup/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26792/devel

Modified Files:
	roundup.spec 
Log Message:
auto-import roundup-0.8.4-6 on branch devel from roundup-0.8.4-6.src.rpm


Index: roundup.spec
===================================================================
RCS file: /cvs/extras/rpms/roundup/devel/roundup.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- roundup.spec	17 Sep 2005 23:21:32 -0000	1.1
+++ roundup.spec	18 Sep 2005 00:28:09 -0000	1.2
@@ -1,10 +1,10 @@
 %define pythonver 2.4
-%define pythonsitedir %{_libdir}/python%{pythonver}/site-packages
+%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Summary: Simple and flexible issue-tracking system
 Name: roundup
 Version: 0.8.4
-Release: 5
+Release: 6
 License: MIT
 Group: Applications/Engineering
 Source: http://dl.sourceforge.net/roundup/roundup-%{version}.tar.gz
@@ -64,7 +64,7 @@
 
 %files -f %{name}.lang
 %{_bindir}/*
-%{pythonsitedir}/*
+%{python_sitelib}/*
 %{_datadir}/roundup/*
 %{_mandir}/man1/*
 %defattr(-,root,root)
@@ -74,6 +74,9 @@
 %doc README.Fedora COPYING.txt
 
 %changelog
+* Sat Sep 17 2005 W. Michael Petullo  - 0.8.4-6
+   - Fix installation of Python modules on x86_64.
+
 * Sun Sep 05 2005 W. Michael Petullo  - 0.8.4-5
    - No longer use setup.py's --record feature.
    - Really fix init script.



From fedora-extras-commits at redhat.com  Sun Sep 18 08:47:13 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Sun, 18 Sep 2005 04:47:13 -0400
Subject: owners owners.list,1.230,1.231
Message-ID: <200509180847.j8I8lDoA009828@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9809

Modified Files:
	owners.list 
Log Message:
Add perl-Locale-Maketext-Lexicon


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.230
retrieving revision 1.231
diff -u -r1.230 -r1.231
--- owners.list	17 Sep 2005 23:24:53 -0000	1.230
+++ owners.list	18 Sep 2005 08:47:11 -0000	1.231
@@ -686,6 +686,7 @@
 Fedora Extras|perl-Lingua-EN-Inflect|Convert singular to plural, select "a" or "an"|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Lingua-EN-Inflect-Number|Force number of words to singular or plural|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Locale-Maketext-Fuzzy|Maketext from already interpolated strings|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Locale-Maketext-Lexicon|Extract translatable strings from source|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Locale-gettext|Interface to gettext family of functions|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Log-Dispatch|Dispatches messages to one or more outputs|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Mail-Alias|For bugs related to the perl-Mail-Alias component|oliver at linux-kernel.at|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Sun Sep 18 08:50:16 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Sun, 18 Sep 2005 04:50:16 -0400
Subject: owners owners.list,1.231,1.232
Message-ID: <200509180850.j8I8oGQ4009858@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9839

Modified Files:
	owners.list 
Log Message:
Add perl-Algorithm-Dependency


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.231
retrieving revision 1.232
diff -u -r1.231 -r1.232
--- owners.list	18 Sep 2005 08:47:11 -0000	1.231
+++ owners.list	18 Sep 2005 08:50:14 -0000	1.232
@@ -571,6 +571,7 @@
 Fedora Extras|pdfjam|Utilities for join, rotate and align PDFs|jpo at di.uminho.pt|extras-qa at fedoraproject.org|
 Fedora Extras|pdftk|The PDF Tool Kit|Jochen at herr-schmitt.de|extras-qa at fedoraproject.org|
 Fedora Extras|pdftohtml|A PDF to HTML converter|gauret at free.fr|extras-qa at fedoraproject.org|
+Fedora Extras|perl-Algorithm-Dependency|Algorithmic framework for implementing dependency trees|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Algorithm-Diff|Algorithm::Diff Perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Apache-LogRegex|Perl module for parsing a line from an Apache logfile into a hash|ghenry at suretecsystems.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Apache-Session|Apache::Session Perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Sun Sep 18 09:59:15 2005
From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo))
Date: Sun, 18 Sep 2005 05:59:15 -0400
Subject: rpms/scim-skk/FC-3 scim-skk.spec,1.2,1.3
Message-ID: <200509180959.j8I9xFVO011273@cvs-int.fedora.redhat.com>

Author: ryo

Update of /cvs/extras/rpms/scim-skk/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11254

Modified Files:
	scim-skk.spec 
Log Message:
fix requires tag



Index: scim-skk.spec
===================================================================
RCS file: /cvs/extras/rpms/scim-skk/FC-3/scim-skk.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- scim-skk.spec	16 Sep 2005 15:42:05 -0000	1.2
+++ scim-skk.spec	18 Sep 2005 09:59:13 -0000	1.3
@@ -10,7 +10,7 @@
 Patch0:		no-dictionary.diff
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Requires		skkdic
+Requires:		skkdic
 BuildRequires:	scim-devel
 
 %description



From fedora-extras-commits at redhat.com  Sun Sep 18 10:00:09 2005
From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo))
Date: Sun, 18 Sep 2005 06:00:09 -0400
Subject: rpms/scim-skk/FC-4 scim-skk.spec,1.2,1.3
Message-ID: <200509181000.j8IA092J011331@cvs-int.fedora.redhat.com>

Author: ryo

Update of /cvs/extras/rpms/scim-skk/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11312

Modified Files:
	scim-skk.spec 
Log Message:



Index: scim-skk.spec
===================================================================
RCS file: /cvs/extras/rpms/scim-skk/FC-4/scim-skk.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- scim-skk.spec	16 Sep 2005 15:42:27 -0000	1.2
+++ scim-skk.spec	18 Sep 2005 10:00:07 -0000	1.3
@@ -10,7 +10,7 @@
 Patch0:		no-dictionary.diff
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Requires		skkdic
+Requires:		skkdic
 BuildRequires:	scim-devel
 
 %description



From fedora-extras-commits at redhat.com  Sun Sep 18 10:00:49 2005
From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo))
Date: Sun, 18 Sep 2005 06:00:49 -0400
Subject: rpms/scim-skk/devel scim-skk.spec,1.2,1.3
Message-ID: <200509181000.j8IA0nJw011389@cvs-int.fedora.redhat.com>

Author: ryo

Update of /cvs/extras/rpms/scim-skk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11370

Modified Files:
	scim-skk.spec 
Log Message:



Index: scim-skk.spec
===================================================================
RCS file: /cvs/extras/rpms/scim-skk/devel/scim-skk.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- scim-skk.spec	16 Sep 2005 15:40:25 -0000	1.2
+++ scim-skk.spec	18 Sep 2005 10:00:47 -0000	1.3
@@ -10,7 +10,7 @@
 Patch0:		no-dictionary.diff
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Requires		skkdic
+Requires:		skkdic
 BuildRequires:	scim-devel
 
 %description



From fedora-extras-commits at redhat.com  Sun Sep 18 23:19:01 2005
From: fedora-extras-commits at redhat.com (Byron Young (bkyoung))
Date: Sun, 18 Sep 2005 19:19:01 -0400
Subject: rpms/swish-e - New directory
Message-ID: <200509182319.j8INJ15e031663@cvs-int.fedora.redhat.com>

Author: bkyoung

Update of /cvs/extras/rpms/swish-e
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31643/swish-e

Log Message:
Directory /cvs/extras/rpms/swish-e added to the repository




From fedora-extras-commits at redhat.com  Sun Sep 18 23:19:02 2005
From: fedora-extras-commits at redhat.com (Byron Young (bkyoung))
Date: Sun, 18 Sep 2005 19:19:02 -0400
Subject: rpms/swish-e/devel - New directory
Message-ID: <200509182319.j8INJ2N6031668@cvs-int.fedora.redhat.com>

Author: bkyoung

Update of /cvs/extras/rpms/swish-e/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31643/swish-e/devel

Log Message:
Directory /cvs/extras/rpms/swish-e/devel added to the repository




From fedora-extras-commits at redhat.com  Sun Sep 18 23:19:26 2005
From: fedora-extras-commits at redhat.com (Byron Young (bkyoung))
Date: Sun, 18 Sep 2005 19:19:26 -0400
Subject: rpms/swish-e Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200509182319.j8INJQBh031723@cvs-int.fedora.redhat.com>

Author: bkyoung

Update of /cvs/extras/rpms/swish-e
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31688

Added Files:
	Makefile import.log 
Log Message:
Setup of module swish-e


--- NEW FILE Makefile ---
# Top level Makefile for module swish-e
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Sun Sep 18 23:19:27 2005
From: fedora-extras-commits at redhat.com (Byron Young (bkyoung))
Date: Sun, 18 Sep 2005 19:19:27 -0400
Subject: rpms/swish-e/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200509182319.j8INJRci031728@cvs-int.fedora.redhat.com>

Author: bkyoung

Update of /cvs/extras/rpms/swish-e/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31688/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module swish-e


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Sun Sep 18 23:30:47 2005
From: fedora-extras-commits at redhat.com (Byron Young (bkyoung))
Date: Sun, 18 Sep 2005 19:30:47 -0400
Subject: rpms/swish-e import.log,1.1,1.2
Message-ID: <200509182330.j8INUlme031815@cvs-int.fedora.redhat.com>

Author: bkyoung

Update of /cvs/extras/rpms/swish-e
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31776

Modified Files:
	import.log 
Log Message:
auto-import swish-e-2.4.2-2_FC4 on branch devel from swish-e-2.4.2-2_FC4.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/swish-e/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	18 Sep 2005 23:19:24 -0000	1.1
+++ import.log	18 Sep 2005 23:30:45 -0000	1.2
@@ -0,0 +1 @@
+swish-e-2_4_2-2_FC4:HEAD:swish-e-2.4.2-2_FC4.src.rpm:1127089736



From fedora-extras-commits at redhat.com  Sun Sep 18 23:30:47 2005
From: fedora-extras-commits at redhat.com (Byron Young (bkyoung))
Date: Sun, 18 Sep 2005 19:30:47 -0400
Subject: rpms/swish-e/devel swish-e-2.4.2-httpd.conf, NONE,
	1.1 swish-e-2.4.2-src_compress.c.patch, NONE,
	1.1 swish-e-2.4.2-src_parser.c.patch, NONE,
	1.1 swish-e-2.4.2.FC4.spec, NONE, 1.1 swish-e.xpm, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200509182330.j8INUlPd031825@cvs-int.fedora.redhat.com>

Author: bkyoung

Update of /cvs/extras/rpms/swish-e/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31776/devel

Modified Files:
	.cvsignore sources 
Added Files:
	swish-e-2.4.2-httpd.conf swish-e-2.4.2-src_compress.c.patch 
	swish-e-2.4.2-src_parser.c.patch swish-e-2.4.2.FC4.spec 
	swish-e.xpm 
Log Message:
auto-import swish-e-2.4.2-2_FC4 on branch devel from swish-e-2.4.2-2_FC4.src.rpm


--- NEW FILE swish-e-2.4.2-httpd.conf ---
Alias /swish-e "/usr/share/doc/swish-e-2.4.2/html"


    Options Indexes
    AllowOverride None
    Order allow,deny
    Allow from all


swish-e-2.4.2-src_compress.c.patch:

--- NEW FILE swish-e-2.4.2-src_compress.c.patch ---
*** src/compress.c.orig	2005-04-26 19:24:25.000000000 -0700
--- src/compress.c	2005-04-26 19:32:05.000000000 -0700
***************
*** 689,695 ****
      if(! saved_bytes)     /* nothing to do */
          return;   
      new_buf= (unsigned char *) emalloc(*buf_size + saved_bytes);
!     zlib_status = uncompress(new_buf, &new_buf_size, *buf, (uLongf)buf_size );
      if ( zlib_status != Z_OK )
      {
          // $$$ make sure this works ok if returning null $$$
--- 689,695 ----
      if(! saved_bytes)     /* nothing to do */
          return;   
      new_buf= (unsigned char *) emalloc(*buf_size + saved_bytes);
!     zlib_status = uncompress(new_buf, &new_buf_size, *buf, (uLongf) *buf_size );
      if ( zlib_status != Z_OK )
      {
          // $$$ make sure this works ok if returning null $$$

swish-e-2.4.2-src_parser.c.patch:

--- NEW FILE swish-e-2.4.2-src_parser.c.patch ---
*** src/parser.c.orig	2005-09-14 10:34:21.000000000 -0700
--- src/parser.c	2005-09-14 11:13:40.000000000 -0700
***************
*** 870,876 ****
          if ( used > 0 )         // tally up total bytes consumed
              buf->cur += used;
  
!         if ( ret == 0 )         // all done
              return;
  
          if ( ret == -2 )        // encoding failed
--- 870,876 ----
          if ( used > 0 )         // tally up total bytes consumed
              buf->cur += used;
  
!         if ( ret >= 0 )         // all done
              return;
  
          if ( ret == -2 )        // encoding failed


--- NEW FILE swish-e-2.4.2.FC4.spec ---
%define	name	swish-e
%define	version	2.4.2
%define release 2_FC4
%define httpd_conf_d_dir /etc/httpd/conf.d

# Conditionals
# --with debug: Replaces -O2 with -O0 in CFLAGS, AND builds debuginfo package.
# --without debug OR missing: Disables debuginfo package AND Removes -g.

%{!?_with_debug:%define debug_package %{nil}}

Summary:        SWISH-E - Simple Web Indexing System for Humans - Enhanced
Name:           %{name}
Version:        %{version}
Release:        %{release}
License:        GPL
Group:          Networking/Other
Source:         http://swish-e.org/Download/%{name}-%{version}.tar.gz
Source1:	%{name}-%{version}-httpd.conf
URL:            http://swish-e.org/
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Icon:           swish-e.xpm
Provides:       %{name}
Obsoletes:	swish
Requires:       libxml2 >= 2.6.19, pcre >= 5.0, zlib >= 1.2.2.2
BuildRequires:	libxml2-devel >= 2.6.19, pcre-devel >= 5.0, zlib-devel >= 1.2.2.2
Prefix:         /usr
Patch0:         %{name}-%{version}-src_parser.c.patch
Patch1:         %{name}-%{version}-src_compress.c.patch
BuildArch:      i386 x86_64

%description
Swish-e is Simple Web Indexing System for Humans - Enhanced

Swish-e can quickly and easily index directories of files or remote 
web sites and search the generated indexes.

Swish-e is extremely fast in both indexing and searching, highly
configurable, and can be seamlessly integrated with existing web sites
to maintain a consistent design. Swish-e can index web pages, but can
just as easily index text files, mailing list archives, or data stored
in a relational database.

%package        perl
Summary:        SWISH-E - PERL Scripts and Modules
Group:          Networking/Other
Provides:       %{name}-perl
Requires:       %{name} = %{version}, perl >= 5.8.0

%description    perl
PERL SWISH-E language bindings and scripts.

%package doc
Summary:     doc
Group:          Networking/Other
Provides:      %{name}-doc
Requires:     %{name} = %{version}  

%description doc
SWISH-E documentation and examples

%package	devel
Summary:	SWISH-E - Static libraries and header files.
Group:		Networking/Other
Obsoletes:	swish-devel
Provides:       %{name}-devel
Requires:	%{name} = %{version}, libxml2-devel, pcre-devel, zlib-devel

%description	devel
Libraries and header files required for compiling applications based on the SWISH-E API.

%prep
%setup -q
A=`find ./ -name "Makefile.in"`
for i in $A; do
	%{__sed} -i 's/\$(datadir)\/doc\/swish-e/\/usr\/share\/doc/g' $i
	done

%{__sed} -i 's/\$(datadir)\/doc\/\$(PACKAGE)/\/usr\/share\/doc/g' Makefile.in
%patch0
%patch1

%build
CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS
%{?_with_debug:CFLAGS="${CFLAGS//-O2/-O0}"}
%{!?_with_debug:CFLAGS="${CFLAGS//-g/}"}
CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS
FFLAGS="${FFLAGS:-%optflags}" ; export FFLAGS
for i in $(find . -name config.guess -o -name config.sub) ; do
	if [ -f /usr/lib/rpm/redhat/$(basename $i) ]; then
	%{__rm} -f $i
	%{__cp} -fv /usr/lib/rpm/redhat/$(basename $i) $i
	fi
done
./configure \
	--host=%{_host} \
	--build=%{_build} \
	--target=%{_target_platform} \
	--with-pcre \
	--with-libxml2 \
	--with-zlib \
	--prefix=%{_prefix} \
	--exec-prefix=%{_exec_prefix} \
	--bindir=%{_bindir} \
	--sbindir=%{_sbindir} \
	--sysconfdir=%{_sysconfdir} \
	--datadir=%{_datadir} \
	--includedir=%{_includedir} \
	--libdir=%{_libdir} \
	--libexecdir=%{_libexecdir} \
	--localstatedir=%{_localstatedir} \
	--sharedstatedir=%{_sharedstatedir} \
	--mandir=%{_mandir} \
	--infodir=%{_infodir} \

make

%install
[ "${RPM_BUILD_ROOT}" != "/" ] && [ -d ${RPM_BUILD_ROOT} ] && rm -rf ${RPM_BUILD_ROOT};
make DESTDIR=$RPM_BUILD_ROOT prefix=%{_prefix} sysconfdir=%{_sysconfdir} install

# If httpd is installed, this aliases the docs into webspace.
# if httpd is not installed, this just creates some directories.
%{__install} -D -p -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{httpd_conf_d_dir}/swish-e.conf

for i in $RPM_BUILD_ROOT%{_mandir}/man1/*.gz; do
	%{__rm} -f $i
	done

%{__install} -d -p -m 755 $RPM_BUILD_ROOT%{_defaultdocdir}/swish-e-%{version}
%{__mv} $RPM_BUILD_ROOT%{_defaultdocdir}/swish-e/* $RPM_BUILD_ROOT%{_defaultdocdir}/swish-e-%{version}
rmdir $RPM_BUILD_ROOT%{_defaultdocdir}/swish-e
%{__mv} $RPM_BUILD_ROOT%{_defaultdocdir}/INSTALL $RPM_BUILD_ROOT%{_defaultdocdir}/swish-e-%{version}
%{__mv} $RPM_BUILD_ROOT%{_defaultdocdir}/README $RPM_BUILD_ROOT%{_defaultdocdir}/swish-e-%{version}
%{__mv} $RPM_BUILD_ROOT%{_defaultdocdir}/README.cvs $RPM_BUILD_ROOT%{_defaultdocdir}/swish-e-%{version}


%clean
[ "${RPM_BUILD_ROOT}" != "/" ] && [ -d ${RPM_BUILD_ROOT} ] && %{__rm} -rf ${RPM_BUILD_ROOT};

%files
%defattr(-, root, root)
%{_bindir}/swish-e
%{_libdir}/swish-e/swishspider
%{_libdir}/libswish-e.so.2.0.0
%{_libdir}/libswish-e.so.2
%{_mandir}/man1/swish-e.1.gz
%{_mandir}/man1/SWISH-CONFIG.1.gz
%{_mandir}/man1/SWISH-FAQ.1.gz
%{_mandir}/man1/SWISH-LIBRARY.1.gz
%{_mandir}/man1/SWISH-RUN.1.gz

%files perl
%defattr(-, root, root)
%{_libdir}/swish-e/perl/SWISH/Filters/Doc2txt.pm
%{_libdir}/swish-e/perl/SWISH/Filters/Pdf2HTML.pm
%{_libdir}/swish-e/perl/SWISH/Filters/ID3toHTML.pm
%{_libdir}/swish-e/perl/SWISH/Filters/XLtoHTML.pm
%{_libdir}/swish-e/perl/SWISH/Filter.pm
%{_libdir}/swish-e/perl/SWISH/DateRanges.pm
%{_libdir}/swish-e/perl/SWISH/DefaultHighlight.pm
%{_libdir}/swish-e/perl/SWISH/PhraseHighlight.pm
%{_libdir}/swish-e/perl/SWISH/SimpleHighlight.pm
%{_libdir}/swish-e/perl/SWISH/TemplateDefault.pm
%{_libdir}/swish-e/perl/SWISH/TemplateDumper.pm
%{_libdir}/swish-e/perl/SWISH/TemplateFrame.pm
%{_libdir}/swish-e/perl/SWISH/TemplateHTMLTemplate.pm
%{_libdir}/swish-e/perl/SWISH/TemplateToolkit.pm
%{_libdir}/swish-e/perl/SWISH/ParseQuery.pm
%{_libdir}/swish-e/perl/doc2txt.pm
%{_libdir}/swish-e/perl/pdf2html.pm
%{_libdir}/swish-e/perl/pdf2xml.pm
%{_libdir}/swish-e/spider.pl
%{_libdir}/swish-e/DirTree.pl
%{_libdir}/swish-e/search.cgi
%{_libdir}/swish-e/swish.cgi
%{_bindir}/swish-filter-test
%{_datadir}/swish-e/search.tt
%{_datadir}/swish-e/swish.tmpl

%files doc
%defattr(-, root, root)
%docdir %{_defaultdocdir}/swish-e-%{version}
%doc %{_defaultdocdir}/swish-e-%{version}
#%doc %{_defaultdocdir}/swish-e/examples
#%doc %{_defaultdocdir}/swish-e-%{version}/html
#%doc %{_defaultdocdir}/swish-e-%{version}/examples
#%doc %{_defaultdocdir}/swish-e-%{version}/INSTALL
#%doc %{_defaultdocdir}/swish-e-%{version}/README
#%doc %{_defaultdocdir}/swish-e-%{version}/README.cvs
%config %{httpd_conf_d_dir}/swish-e.conf

%files devel
%defattr(-, root, root)
%{_includedir}/swish-e.h
%{_libdir}/libswish-e.la
%{_libdir}/libswish-e.a
%{_libdir}/libswish-e.so

%changelog
* Wed Sep 14 2005 Byron Young  2.4.2
- Packaged for FC4
- Added --with debug conditional rpmbuild option.
- Fixed error on x86_64 systems.
- Fixed harmless UTF8 to latin1 error message.
* Fri Oct 24 2003 David L Norris  2.4.0-pr4-0
- Added new files and moved extra documentation and examples to a separate package.
* Mon Jun 30 2003 David L Norris  2.4.0-pr1-1cefha
- Modified spec file to minimize dependences on CEFHA.org server.
* Thu Jun 19 2003 David L Norris  2.4.0-pr1
- Updated RPM spec to provide recently added files
* Sun Apr 20 2003 David L Norris  2.3.5
- Updated RPM to provide the SWISH-E helper scripts.
* Fri Mar 28 2003 David L Norris  2.3.5
- Updated RPM for the new libtool-based 2.3.5 build system.
* Wed Dec 04 2002 David L Norris  2.3-dev04
- Created RPM spec file


--- NEW FILE swish-e.xpm ---
/* XPM */
static char *swish-e[] = {
/* columns rows colors chars-per-pixel */
"20 20 16 1",
"  c #5a3025",
". c #743f33",
"X c #7c4d44",
"o c #855c50",
"O c #957065",
"+ c #997d70",
"@ c #a68c7f",
"# c #af9a8e",
"$ c #b0a396",
"% c #bbb0a6",
"& c #c5c1b8",
"* c #cecec1",
"= c #d7d7c8",
"- c #e2e2d5",
"; c #f0f0e5",
": c #fcfcf7",
/* pixels */
"::::;&&%&%&%&&&&&#%:",
":::&%%%%%%%%%%%%%X$;",
"::&&%;;;;;;;;;;;; #;",
":;%%:;;;;;;-;;;-- @-",
":%%=;-+XXX....    +=",
":%$;;# +@@@@@@@+++$&",
":%$;-Oo===****=**&&&",
":$$--$+@@@@@@@%*&&&&",
":$%&--#@@@@@+@@O&&&&",
":;@@*==**&&*&&@@O&**",
":;*+O%=********%X+==",
":;;&oXoO+OOO@%**#.*-",
":;;--#Oooooo.+&*&.#=",
":;;--======*$%@=* @-",
":&%$$##@@@@@+$%=* +=",
":%&$#@@@@@@@@@**@ &*",
":%%---**&&&*&***XX**",
":$$;-===*****=%X %*&",
":$+@#@@@@@@@@o  %**&",
";O           o+&&*&*"
};


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/swish-e/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	18 Sep 2005 23:19:24 -0000	1.1
+++ .cvsignore	18 Sep 2005 23:30:45 -0000	1.2
@@ -0,0 +1 @@
+swish-e-2.4.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/swish-e/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	18 Sep 2005 23:19:24 -0000	1.1
+++ sources	18 Sep 2005 23:30:45 -0000	1.2
@@ -0,0 +1 @@
+1606e2f55034540f88c1748eeaae5274  swish-e-2.4.2.tar.gz



From fedora-extras-commits at redhat.com  Sun Sep 18 23:38:44 2005
From: fedora-extras-commits at redhat.com (Byron Young (bkyoung))
Date: Sun, 18 Sep 2005 19:38:44 -0400
Subject: owners owners.list,1.232,1.233
Message-ID: <200509182338.j8INciQ8031882@cvs-int.fedora.redhat.com>

Author: bkyoung

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31863

Modified Files:
	owners.list 
Log Message:
Added swish-e to Fedora Extras.



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.232
retrieving revision 1.233
diff -u -r1.232 -r1.233
--- owners.list	18 Sep 2005 08:50:14 -0000	1.232
+++ owners.list	18 Sep 2005 23:38:42 -0000	1.233
@@ -947,6 +947,7 @@
 Fedora Extras|supertux|SuperTux is a jump'n run like game similar to Mario Bros|steve at silug.org|extras-qa at fedoraproject.org|
 Fedora Extras|svgalib|Low-level fullscreen SVGA graphics library|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|swatch|A tool for actively monitoring log files|jpo at di.uminho.pt|extras-qa at fedoraproject.org|
+Fedora Extras|swish-e|Simple Web Indexing System for Humans - Enhanced|bkyoung at users.sourceforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|sword|Free Bible Software Project|mpeters at mac.com|extras-qa at fedoraproject.org|
 Fedora Extras|sylpheed-claws|The bleeding edge branch of Sylpheed|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|sylpheed-claws-plugins|Additional plugins for sylpheed-claws|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Mon Sep 19 14:22:07 2005
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Mon, 19 Sep 2005 10:22:07 -0400
Subject: rpms/nexuiz-data/devel .cvsignore, 1.3, 1.4 nexuiz-data.spec, 1.3,
	1.4 sources, 1.3, 1.4
Message-ID: <200509191422.j8JEM702021928@cvs-int.fedora.redhat.com>

Author: adrian

Update of /cvs/extras/rpms/nexuiz-data/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21905

Modified Files:
	.cvsignore nexuiz-data.spec sources 
Log Message:
* Mon Sep 19 2005 Adrian Reber  - 1.2.1-1
- updated to 1.2.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nexuiz-data/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	3 Sep 2005 14:13:03 -0000	1.3
+++ .cvsignore	19 Sep 2005 14:22:04 -0000	1.4
@@ -1,2 +1 @@
-nexuiz-data-1.2.tar
-serverfix12.zip
+nexuiz-data-1.2.1.tar


Index: nexuiz-data.spec
===================================================================
RCS file: /cvs/extras/rpms/nexuiz-data/devel/nexuiz-data.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- nexuiz-data.spec	3 Sep 2005 14:41:04 -0000	1.3
+++ nexuiz-data.spec	19 Sep 2005 14:22:04 -0000	1.4
@@ -1,21 +1,21 @@
-%define datadate 20050818
+%define datadate 20050905
 
 Summary: Game data for the Nexuiz first person shooter
 Name: nexuiz-data
-Version: 1.2
-Release: 2
+Version: 1.2.1
+Release: 1
 License: GPL
 Group: Amusements/Games
 URL: http://www.nexuiz.com/
 # Source is custom, obtained with :
-# wget http://dl.sf.net/sourceforge/nexuiz/nexuiz11.zip
-# unzip nexuiz12.zip
-# mkdir nexuiz-data-1.2/
+# wget http://dl.sf.net/sourceforge/nexuiz/nexuiz121.zip
+# unzip nexuiz121.zip
+# mkdir nexuiz-data-1.2.1/
 # mv Nexuiz/data/ Nexuiz/Readme.htm Nexuiz/gpl.txt \
-#    nexuiz-data-1.2/
-# tar cvf nexuiz-data-1.2.tar nexuiz-data-1.2/
+#    Nexuiz/betacredits.txt  Nexuiz/gamemodes.txt \
+#    nexuiz-data-1.2.1/
+# tar cvf nexuiz-data-1.2.1.tar nexuiz-data-1.2.1/
 Source0: nexuiz-data-%{version}.tar
-Source1: http://dl.sf.net/sourceforge/nexuiz/serverfix12.zip
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 
@@ -27,8 +27,7 @@
 
 %prep
 %setup -q
-%{__sed} -i 's/\r//' Readme.htm
-%{__unzip} %{SOURCE1} data/data20050830.pk3
+%{__sed} -i 's/\r//' Readme.htm *.txt data/*.txt
 
 %build
 
@@ -36,7 +35,6 @@
 %{__rm} -rf %{buildroot}
 %{__mkdir_p} %{buildroot}%{_datadir}/nexuiz/data/
 %{__install} -p data/data%{datadate}-full.pk3 \
-	data/data20050830.pk3 \
         %{buildroot}%{_datadir}/nexuiz/data/
 
 %clean
@@ -44,10 +42,14 @@
 
 %files
 %defattr(0644, root, root, 0755)
-%doc Readme.htm gpl.txt data/cvars.txt data/mapping.txt
+%doc Readme.htm gpl.txt data/cvars.txt data/mapping.txt betacredits.txt
+%doc gamemodes.txt
 %{_datadir}/nexuiz/
 
 %changelog
+* Mon Sep 19 2005 Adrian Reber  - 1.2.1-1
+- updated to 1.2.1
+
 * Sat Sep 03 2005 Adrian Reber  - 1.2-2
 - I should really test my changes before check-in
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nexuiz-data/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	3 Sep 2005 14:13:03 -0000	1.3
+++ sources	19 Sep 2005 14:22:04 -0000	1.4
@@ -1,2 +1 @@
-d6cc369900e6356a21daf4b95297c7f3  nexuiz-data-1.2.tar
-6e5f8fe6b9933f628779121eb31c9550  serverfix12.zip
+64d371d2008b096c67980e7a65a412bc  nexuiz-data-1.2.1.tar



From fedora-extras-commits at redhat.com  Mon Sep 19 14:25:50 2005
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Mon, 19 Sep 2005 10:25:50 -0400
Subject: rpms/nexuiz/devel .cvsignore, 1.3, 1.4 nexuiz.spec, 1.5, 1.6 sources,
	1.3, 1.4
Message-ID: <200509191425.j8JEPoMi022017@cvs-int.fedora.redhat.com>

Author: adrian

Update of /cvs/extras/rpms/nexuiz/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21994

Modified Files:
	.cvsignore nexuiz.spec sources 
Log Message:
* Mon Sep 19 2005 Adrian Reber  - 1.2.1-1
- updated to 1.2.1
- icons and binaries are now being renamed from darkplaces* to nexuiz*



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nexuiz/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	3 Sep 2005 14:14:02 -0000	1.3
+++ .cvsignore	19 Sep 2005 14:25:48 -0000	1.4
@@ -1 +1 @@
-nexuizenginesource20050814beta1.zip
+nexuizenginesource20050911.zip


Index: nexuiz.spec
===================================================================
RCS file: /cvs/extras/rpms/nexuiz/devel/nexuiz.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- nexuiz.spec	3 Sep 2005 14:35:48 -0000	1.5
+++ nexuiz.spec	19 Sep 2005 14:25:48 -0000	1.6
@@ -1,14 +1,14 @@
 Summary: Multiplayer, deathmatch oriented first person shooter
 Name: nexuiz
-Version: 1.2
-Release: 2%{?dist}
+Version: 1.2.1
+Release: 1%{?dist}
 License: GPL
 Group: Amusements/Games
 URL: http://www.nexuiz.com/
 # Source is custom, obtained with :
-# wget http://dl.sf.net/sourceforge/nexuiz/nexuiz12.zip
-# unzip nexuiz12.zip  Nexuiz/nexuizenginesource20050814beta1.zip
-Source: nexuizenginesource20050814beta1.zip
+# wget http://dl.sf.net/sourceforge/nexuiz/nexuiz121.zip
+# unzip nexuiz121.zip Nexuiz/nexuizenginesource20050911.zip
+Source: nexuizenginesource20050911.zip
 Patch0: nexuiz-1.0-basedir.patch
 Patch1: nexuiz-1.1-nostrip.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -52,7 +52,7 @@
 
 %build
 %{__make} cl-release sv-release OPTIM_RELEASE="$RPM_OPT_FLAGS"
-convert nexuiz.ico nexuiz.png
+convert darkplaces.ico nexuiz.png
 
 
 %install
@@ -60,8 +60,10 @@
 
 # Install the main programs
 %{__mkdir_p} %{buildroot}%{_bindir}
-%{__install} -m 0755 nexuiz-{glx,dedicated} \
-        %{buildroot}%{_bindir}/
+%{__install} -m 0755 darkplaces-glx \
+        %{buildroot}%{_bindir}/nexuiz-glx
+%{__install} -m 0755 darkplaces-dedicated \
+        %{buildroot}%{_bindir}/nexuiz-dedicated
 
 # Create the desktop file
 %{__cat} > %{name}.desktop << EOF
@@ -108,18 +110,22 @@
 
 %files
 %defattr(-,root,root,-)
-%doc COPYING ChangeLog darkplaces.txt
+%doc COPYING darkplaces.txt
 %{_bindir}/nexuiz-glx
 %{_datadir}/icons/hicolor/*/apps/nexuiz.png
 %{_datadir}/applications/*%{name}.desktop
 
 %files server
 %defattr(-,root,root,-)
-%doc COPYING ChangeLog darkplaces.txt
+%doc COPYING darkplaces.txt
 %{_bindir}/nexuiz-dedicated
 
 
 %changelog
+* Mon Sep 19 2005 Adrian Reber  - 1.2.1-1
+- updated to 1.2.1
+- icons and binaries are now being renamed from darkplaces* to nexuiz*
+
 * Fri Sep 02 2005 Adrian Reber  - 1.2-2
 - another try without smp_mflags
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nexuiz/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	3 Sep 2005 14:14:02 -0000	1.3
+++ sources	19 Sep 2005 14:25:48 -0000	1.4
@@ -1 +1 @@
-f46eab779e2d5d08bd21dad648a1e62f  nexuizenginesource20050814beta1.zip
+ea845ee2842ad6a2304da1f0b2c95bdd  nexuizenginesource20050911.zip



From fedora-extras-commits at redhat.com  Mon Sep 19 14:43:45 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Mon, 19 Sep 2005 10:43:45 -0400
Subject: rpms/perl-File-NCopy - New directory
Message-ID: <200509191443.j8JEhjXr022174@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-File-NCopy
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22154/perl-File-NCopy

Log Message:
Directory /cvs/extras/rpms/perl-File-NCopy added to the repository




From fedora-extras-commits at redhat.com  Mon Sep 19 14:43:45 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Mon, 19 Sep 2005 10:43:45 -0400
Subject: rpms/perl-File-NCopy/devel - New directory
Message-ID: <200509191443.j8JEhjD7022179@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-File-NCopy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22154/perl-File-NCopy/devel

Log Message:
Directory /cvs/extras/rpms/perl-File-NCopy/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Sep 19 14:44:13 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Mon, 19 Sep 2005 10:44:13 -0400
Subject: rpms/perl-File-NCopy Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200509191444.j8JEiDtM022228@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-File-NCopy
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22199

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-File-NCopy


--- NEW FILE Makefile ---
# Top level Makefile for module perl-File-NCopy
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Mon Sep 19 14:44:13 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Mon, 19 Sep 2005 10:44:13 -0400
Subject: rpms/perl-File-NCopy/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200509191444.j8JEiDwf022233@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-File-NCopy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22199/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-File-NCopy


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Mon Sep 19 14:45:10 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Mon, 19 Sep 2005 10:45:10 -0400
Subject: rpms/perl-File-NCopy import.log,1.1,1.2
Message-ID: <200509191445.j8JEjei3022313@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-File-NCopy
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22272

Modified Files:
	import.log 
Log Message:
auto-import perl-File-NCopy-0.34-2 on branch devel from perl-File-NCopy-0.34-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-File-NCopy/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	19 Sep 2005 14:44:11 -0000	1.1
+++ import.log	19 Sep 2005 14:45:08 -0000	1.2
@@ -0,0 +1 @@
+perl-File-NCopy-0_34-2:HEAD:perl-File-NCopy-0.34-2.src.rpm:1127141089



From fedora-extras-commits at redhat.com  Mon Sep 19 14:45:10 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Mon, 19 Sep 2005 10:45:10 -0400
Subject: rpms/perl-File-NCopy/devel perl-File-NCopy.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200509191445.j8JEjfoT022317@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-File-NCopy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22272/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-File-NCopy.spec 
Log Message:
auto-import perl-File-NCopy-0.34-2 on branch devel from perl-File-NCopy-0.34-2.src.rpm


--- NEW FILE perl-File-NCopy.spec ---
Name: 		perl-File-NCopy
Version: 	0.34
Release: 	2%{?dist}
Summary:	Copy files to directories, or a single file to another file
License: 	GPL or Artistic
Group: 		Development/Libraries
URL: 		http://search.cpan.org/dist/File-NCopy/
Source0:        http://www.cpan.org/authors/id/M/MZ/MZSANFORD/File-NCopy-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
BuildArch: noarch

%description
File::NCopy copies files to directories, or a single file to another
file. The functionality is very similar to cp.

%prep
%setup -q -n File-NCopy-%{version}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'
find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';'
chmod -R u+w $RPM_BUILD_ROOT/*

%clean
rm -rf $RPM_BUILD_ROOT

%check
make test

%files
%defattr(-,root,root,-)
%doc Changes
%{perl_vendorlib}/File
%{_mandir}/man3/*

%changelog
* Thu Sep 01 2005 Ralf Corsepius  - 0.34-1
- FE submission.

* Tue Jun 28 2005 Ralf Corsepius  - 0.34-0.pm.1
- Initial packman version.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-File-NCopy/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	19 Sep 2005 14:44:11 -0000	1.1
+++ .cvsignore	19 Sep 2005 14:45:08 -0000	1.2
@@ -0,0 +1 @@
+File-NCopy-0.34.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-File-NCopy/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	19 Sep 2005 14:44:11 -0000	1.1
+++ sources	19 Sep 2005 14:45:08 -0000	1.2
@@ -0,0 +1 @@
+a2633eb0f3f8a6906303e709a35af26f  File-NCopy-0.34.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 19 14:54:33 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Mon, 19 Sep 2005 10:54:33 -0400
Subject: rpms/perl-File-NCopy/devel perl-File-NCopy.spec,1.1,1.2
Message-ID: <200509191454.j8JEsXOH022385@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-File-NCopy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22366

Modified Files:
	perl-File-NCopy.spec 
Log Message:
Spec cleanup.


Index: perl-File-NCopy.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-File-NCopy/devel/perl-File-NCopy.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-File-NCopy.spec	19 Sep 2005 14:45:08 -0000	1.1
+++ perl-File-NCopy.spec	19 Sep 2005 14:54:31 -0000	1.2
@@ -1,11 +1,11 @@
 Name: 		perl-File-NCopy
 Version: 	0.34
-Release: 	2%{?dist}
+Release: 	3%{?dist}
 Summary:	Copy files to directories, or a single file to another file
 License: 	GPL or Artistic
 Group: 		Development/Libraries
 URL: 		http://search.cpan.org/dist/File-NCopy/
-Source0:        http://www.cpan.org/authors/id/M/MZ/MZSANFORD/File-NCopy-%{version}.tar.gz
+Source0:        http://search.cpan.org/CPAN/authors/id/M/MZ/MZSANFORD/File-NCopy-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
@@ -42,8 +42,8 @@
 %{_mandir}/man3/*
 
 %changelog
+* Mon Sep 19 2005 Ralf Corsepius  - 0.34-3
+- Spec cleanup.
+
 * Thu Sep 01 2005 Ralf Corsepius  - 0.34-1
 - FE submission.
-
-* Tue Jun 28 2005 Ralf Corsepius  - 0.34-0.pm.1
-- Initial packman version.



From fedora-extras-commits at redhat.com  Mon Sep 19 15:29:22 2005
From: fedora-extras-commits at redhat.com (Jason Tibbitts (tibbs))
Date: Mon, 19 Sep 2005 11:29:22 -0400
Subject: rpms/denyhosts/devel .cvsignore, 1.9, 1.10 denyhosts.spec, 1.13,
	1.14 sources, 1.9, 1.10
Message-ID: <200509191529.j8JFTMDT023865@cvs-int.fedora.redhat.com>

Author: tibbs

Update of /cvs/extras/rpms/denyhosts/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23840

Modified Files:
	.cvsignore denyhosts.spec sources 
Log Message:
* Mon Sep 19 2005 Jason L Tibbitts III  - 1.0.3-1
- Update to 1.0.3



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/denyhosts/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	23 Aug 2005 22:14:22 -0000	1.9
+++ .cvsignore	19 Sep 2005 15:29:20 -0000	1.10
@@ -1 +1 @@
-DenyHosts-1.0.2.tar.gz
+DenyHosts-1.0.3.tar.gz


Index: denyhosts.spec
===================================================================
RCS file: /cvs/extras/rpms/denyhosts/devel/denyhosts.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- denyhosts.spec	23 Aug 2005 22:14:22 -0000	1.13
+++ denyhosts.spec	19 Sep 2005 15:29:20 -0000	1.14
@@ -1,5 +1,5 @@
 Name:           denyhosts
-Version:        1.0.2
+Version:        1.0.3
 release:	1%{?dist}
 Summary:        A script to help thwart ssh server attacks
 
@@ -125,6 +125,9 @@
 %{_bindir}/denyhosts-control
 
 %changelog
+* Mon Sep 19 2005 Jason L Tibbitts III  - 1.0.3-1
+- Update to 1.0.3
+
 * Tue Aug 23 2005 Jason L Tibbitts III  - 1.0.2-1
 - Update to 1.0.2
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/denyhosts/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	23 Aug 2005 22:14:22 -0000	1.9
+++ sources	19 Sep 2005 15:29:20 -0000	1.10
@@ -1 +1 @@
-171da60b51c39c56056af6a3e8de49d9  DenyHosts-1.0.2.tar.gz
+1c610e0354408ee7c29b7ac86764b844  DenyHosts-1.0.3.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 19 15:47:13 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 19 Sep 2005 11:47:13 -0400
Subject: rpms/rekall - New directory
Message-ID: <200509191547.j8JFlDrl024007@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/rekall
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23983/rekall

Log Message:
Directory /cvs/extras/rpms/rekall added to the repository




From fedora-extras-commits at redhat.com  Mon Sep 19 15:47:13 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 19 Sep 2005 11:47:13 -0400
Subject: rpms/rekall/devel - New directory
Message-ID: <200509191547.j8JFlDCM024012@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/rekall/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23983/rekall/devel

Log Message:
Directory /cvs/extras/rpms/rekall/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Sep 19 15:47:23 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 19 Sep 2005 11:47:23 -0400
Subject: rpms/rekall Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200509191547.j8JFlNG6024057@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/rekall
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24028

Added Files:
	Makefile import.log 
Log Message:
Setup of module rekall


--- NEW FILE Makefile ---
# Top level Makefile for module rekall
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Mon Sep 19 15:47:24 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 19 Sep 2005 11:47:24 -0400
Subject: rpms/rekall/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200509191547.j8JFlOHh024062@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/rekall/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24028/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module rekall


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Mon Sep 19 15:49:53 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 19 Sep 2005 11:49:53 -0400
Subject: rpms/rekall import.log,1.1,1.2
Message-ID: <200509191550.j8JFoNEh024180@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/rekall
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24132

Modified Files:
	import.log 
Log Message:
auto-import rekall-2.2.3-5 on branch devel from rekall-2.2.3-5.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/rekall/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	19 Sep 2005 15:47:21 -0000	1.1
+++ import.log	19 Sep 2005 15:49:51 -0000	1.2
@@ -0,0 +1 @@
+rekall-2_2_3-5:HEAD:rekall-2.2.3-5.src.rpm:1127144984



From fedora-extras-commits at redhat.com  Mon Sep 19 15:49:53 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 19 Sep 2005 11:49:53 -0400
Subject: rpms/rekall/devel rekall-2.2.3-64bitfix.patch, NONE,
	1.1 rekall-2.2.3-norpath3.patch, NONE,
	1.1 rekall-2.2.3-py24.patch, NONE, 1.1 rekall.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200509191549.j8JFnrF9024172@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/rekall/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24132/devel

Modified Files:
	.cvsignore sources 
Added Files:
	rekall-2.2.3-64bitfix.patch rekall-2.2.3-norpath3.patch 
	rekall-2.2.3-py24.patch rekall.spec 
Log Message:
auto-import rekall-2.2.3-5 on branch devel from rekall-2.2.3-5.src.rpm

rekall-2.2.3-64bitfix.patch:

--- NEW FILE rekall-2.2.3-64bitfix.patch ---
--- rekall-2.2.3/configure.BAD	2005-06-18 18:54:56.478497376 -0500
+++ rekall-2.2.3/configure	2005-06-18 18:58:49.389089584 -0500
@@ -28918,7 +28918,7 @@
 if test "${with_qt_dir+set}" = set; then
   withval="$with_qt_dir"
     ac_qt_includes="$withval"/include
-       ac_qt_libraries="$withval"/lib${kdelibsuff}
+       ac_qt_libraries="$withval"/lib
        ac_qt_bindir="$withval"/bin
 
 fi;
@@ -28982,7 +28982,7 @@
 
 qt_libdirs=""
 for dir in $kde_qt_dirs; do
-   qt_libdirs="$qt_libdirs $dir/lib${kdelibsuff} $dir"
+   qt_libdirs="$qt_libdirs $dir/lib $dir"
 done
 qt_libdirs="$QTLIB $qt_libdirs /usr/X11R6/lib /usr/lib /usr/local/qt/lib $x_libraries"
 if test ! "$ac_qt_libraries" = "NO"; then
@@ -32627,7 +32627,7 @@
   MYSQL_INCDIR=$mysql_incdir
 fi
 
-mysql_libdirs="$ac_mysql_libdir /usr/lib /usr/lib/mysql /usr/local/lib/mysql /usr/local/lib"
+mysql_libdirs="$ac_mysql_libdir /usr/lib /usr/lib/mysql /usr/local/lib/mysql /usr/local/lib /usr/lib${kdelibsuff}/mysql"
 
 mysql_libdir=NO
 for i in $mysql_libdirs;

rekall-2.2.3-norpath3.patch:

--- NEW FILE rekall-2.2.3-norpath3.patch ---
--- rekall-2.2.3/configure.BAD	2005-06-18 10:36:14.000000000 -0500
+++ rekall-2.2.3/configure	2005-06-18 10:37:04.000000000 -0500
@@ -29730,17 +29730,8 @@
 
 if test -z "$KDE_RPATH" && test "$USE_RPATH" = "yes"; then
 
-  KDE_RPATH="-R \$(kde_libraries)"
-
   if test -n "$qt_libraries"; then
-    KDE_RPATH="$KDE_RPATH -R \$(qt_libraries)"
-  fi
-    if test -n "$X_LDFLAGS"; then
-    X_RPATH="-R \$(x_libraries)"
-    KDE_RPATH="$KDE_RPATH $X_RPATH"
-  fi
-  if test -n "$KDE_EXTRA_RPATH"; then
-    KDE_RPATH="$KDE_RPATH \$(KDE_EXTRA_RPATH)"
+    KDE_RPATH="-R \$(qt_libraries)"
   fi
 fi
 

rekall-2.2.3-py24.patch:

--- NEW FILE rekall-2.2.3-py24.patch ---
--- rekall-2.2.3/configure.BAD	2005-06-17 10:57:53.000000000 -0500
+++ rekall-2.2.3/configure	2005-06-17 10:58:20.000000000 -0500
@@ -32488,6 +32488,9 @@
 			2.3) SYSPYVER="2.3"
 			     USESYSPY=1
 			     ;;
+			2.4) SYSPYVER="2.4"
+			     USESYSPY=1
+			     ;;
 
 			*)   { { echo "$as_me:$LINENO: error: Unrecognised python version: $pyver" >&5
 echo "$as_me: error: Unrecognised python version: $pyver" >&2;}


--- NEW FILE rekall.spec ---
Name:		rekall
Summary:	A KDE database front-end application
Version:	2.2.3
Release:	5%{?dist}
Group:		Development/Tools
License:	GPL
URL:		http://www.rekallrevealed.org/
Source0: 	http://www.rekallrevealed.org/packages/%{name}-%{version}-2.tar.gz
Patch0:		rekall-2.2.3-py24.patch
Patch1:		rekall-2.2.3-norpath3.patch
Patch2:		rekall-2.2.3-64bitfix.patch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:	xbsql-devel, python-devel, mysql-devel, postgresql-devel
BuildRequires:	kdelibs-devel, desktop-file-utils
Requires(post): desktop-file-utils
Requires(postun): desktop-file-utils
Requires:	rekall-common = %{version}-%{release}

%description
Rekall is a database front-end, however, Rekall is not itself a 
database, and does not include a database. By this we mean that data 
is stored somewhere else in an SQL server, and Rekall is fundementally 
just a tool to extract, display and update that data (of course, it does 
lots more than that, it does forms and reports and scripting...). It is 
database agnostic, and does not have any preferred database (plugins are 
available for MySQL and PostgreSQL).

%package common
Summary: Rekall common libraries
Group: System Environment/Libraries

%description common
This package contains a set of common libraries that both rekall and 
rekall-runtime require to function.

%package devel
Summary: Rekall development libraries and headers
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}

%description devel
Headers and libraries for compiling programs that use Rekall.

%package docs
Summary: Rekall documentation
Group: Documentation
Requires: %{name} = %{version}-%{release}

%description docs
Documentation for Rekall

%package extra
Summary: Rekall Extra Stuff Plugin
Group: System Environment/Libraries
Requires: %{name} = %{version}-%{release}

%description extra
Rekall Extra Stuff Plugin.

%package mysql
Summary: Rekall MySQL driver
Group: System Environment/Libraries
Requires: %{name} = %{version}-%{release}

%description mysql
Driver to add MySQL support to Rekall.

%package postgresql
Summary: Rekall PostgreSQL driver
Group: System Environment/Libraries
Requires: %{name} = %{version}-%{release}

%description postgresql
Driver to add PostgreSQL support to Rekall.

%package python
Summary: Rekall Python support
Group: System Environment/Libraries
Requires: %{name} = %{version}-%{release}

%description python
Python components and scripts for Rekall.

%package runtime
Summary: Rekall runtime environment
Group: Development/Tools
Provides: %{name}-runtime-devel = %{version}-%{release}
Requires(post): desktop-file-utils
Requires(postun): desktop-file-utils
Requires: rekall-common = %{version}-%{release}

%description runtime
RekallRT is the runtime version of Rekall. It contains all the functionality 
of Rekall except that all design functions are removed, and direct access to 
tables and queries is restricted.

Typically, you can develop a Rekall application with the full version, then 
allow users to run it under the runtime version. Such a user is restricted 
to accessing the database only via the forms and reports that you have 
designed, and via any associated scripts.

%prep
%setup -q
%patch0 -p1
%patch1 -p1
%patch2 -p1

%build
export KDEDIR=%{_prefix}

%configure				\
	--with-qlib-loader		\
	--with-gui=kde			\
	--disable-rpath			\
	--enable-docs=yes		\
	--enable-odbc=yes		\
	--enable-iodbc=yes		\
	--enable-runtime=yes		\
	--enable-debug=yes		\
	--with-qt-dir=%{_libdir}/qt-3.3	\
%ifarch x86_64 ia64 sparc64 ppc64 
	--enable-libsuffix=64		\
%endif
	--with-sgml-prefix=%{_prefix}

make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make DESTDIR=$RPM_BUILD_ROOT install
# Normally, we'd nuke the .la files, but rekall actually seems to want them...
# rm -rf $RPM_BUILD_ROOT%{_libdir}/*.la
mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
mv $RPM_BUILD_ROOT%{_datadir}/doc/HTML $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}

mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
desktop-file-install --vendor fedora --delete-original \
  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
  --add-category X-Fedora \
  --add-category Application \
  --add-category Office \
  --add-mime-type Application/x-rlk \
  $RPM_BUILD_ROOT%{_datadir}/%{name}.desktop

sed -i -e 's|Rekall|Rekall RT|' $RPM_BUILD_ROOT%{_datadir}/%{name}rt.desktop
sed -i -e 's|rekall.png|rekallrt.png|' $RPM_BUILD_ROOT%{_datadir}/%{name}rt.desktop

desktop-file-install --vendor fedora --delete-original \
  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
  --add-category X-Fedora \
  --add-category Application \
  --add-category Office \
  --add-mime-type Application/x-rlk \
  $RPM_BUILD_ROOT%{_datadir}/%{name}rt.desktop

# No need to have this file twice.
rm -rf $RPM_BUILD_ROOT%{_datadir}/apps/rekall/LICENSE

%find_lang %{name}

cd $RPM_BUILD_ROOT%{_datadir}
ln -s %{_datadir}/apps/rekall/icons/hicolor/32x32/apps/rekall.png pixmaps/rekall.png
cp apps/rekall/icons/hicolor/32x32/apps/rekall.png pixmaps/rekallrt.png

%clean
rm -rf $RPM_BUILD_ROOT

%post
/sbin/ldconfig
update-desktop-database %{_datadir}/applications &> /dev/null

%postun
/sbin/ldconfig
if [ "$1" = "0" ]; then
  update-desktop-database %{_datadir}/applications &> /dev/null
fi

%post common -p /sbin/ldconfig

%postun common -p /sbin/ldconfig

%post extra -p /sbin/ldconfig

%postun extra -p /sbin/ldconfig

%post mysql -p /sbin/ldconfig

%postun mysql -p /sbin/ldconfig

%post postgresql -p /sbin/ldconfig

%postun postgresql -p /sbin/ldconfig

%post python -p /sbin/ldconfig

%postun python -p /sbin/ldconfig

%post runtime
/sbin/ldconfig
update-desktop-database %{_datadir}/applications &> /dev/null

%postun runtime
/sbin/ldconfig
if [ "$1" = "0" ]; then
  update-desktop-database %{_datadir}/applications &> /dev/null
fi

%files -f %{name}.lang
%defattr(-, root, root, 0755)
%doc LICENSE
%{_libdir}/libel_*.so.*
%{_libdir}/libel_*.la
%{_libdir}/libkbase.so.*
%{_libdir}/libkbase.la
%{_libdir}/libkbase_*.so.*
%exclude %{_libdir}/libkbase_common.so.*
%exclude %{_libdir}/libkbase_kde.so.*
%exclude %{_libdir}/libkbase_tkwidgets.so.*
%{_libdir}/libkbase_*.la
%{_libdir}/librekall.so.*
%{_libdir}/librekall.la
%{_bindir}/rekall
%{_datadir}/pixmaps/rekall.png
%dir %{_datadir}/apps/rekall
%{_datadir}/apps/rekall/dict/*
%{_datadir}/apps/rekall/help/*
%{_datadir}/apps/rekall/highlight/*
%{_datadir}/apps/rekall/icons/*
%{_datadir}/apps/rekall/keymap
%{_datadir}/apps/rekall/pics/*
%{_datadir}/apps/rekall/rekall.png
%{_datadir}/apps/rekall/rekallui.*
%{_datadir}/apps/rekall/services/kdeparts.lst
%{_datadir}/apps/rekall/services/rekall_component.desktop
%{_datadir}/apps/rekall/services/rekall_copier.desktop
%{_datadir}/apps/rekall/services/rekall_driver_xbase.desktop
%{_datadir}/apps/rekall/services/rekall_dummy.desktop
%{_datadir}/apps/rekall/services/rekall_editor.desktop
%{_datadir}/apps/rekall/services/rekall_form.desktop
%{_datadir}/apps/rekall/services/rekall_macro.desktop
%{_datadir}/apps/rekall/services/rekall_plugin_kde.desktop
%{_datadir}/apps/rekall/services/rekall_query.desktop
%{_datadir}/apps/rekall/services/rekall_report.desktop
%{_datadir}/apps/rekall/services/rekall_table.desktop
%{_datadir}/apps/rekall/wizards/*
%{_datadir}/applications/fedora-rekall.desktop
%{_libdir}/libkbase_componentview.so
%{_libdir}/libkbase_copierview.so
%{_libdir}/libkbase_editor.so
%{_libdir}/libkbase_formview.so
%{_libdir}/libkbase_macroview.so
%{_libdir}/libkbase_queryview.so
%{_libdir}/libkbase_reportview.so
%{_libdir}/libkbase_tableview.so

%files common
%defattr(-, root, root, 0755)
%{_libdir}/libkbase_common.so.*
%{_libdir}/libkbase_kde.so.*
%{_libdir}/libkbase_tkwidgets.so.*

%files devel
%defattr(-, root, root, 0755)
%{_includedir}/*
%{_libdir}/libel_compile.so
%{_libdir}/libel_interp.so
%{_libdir}/libkbase.so
%{_libdir}/libkbase_app.so
%{_libdir}/libkbase_common.so
%{_libdir}/libkbase_driver_xbase.so
%{_libdir}/libkbase_driver_xbase.la
%{_libdir}/libkbase_kde.so
%{_libdir}/libkbase_plugin_kde.so
%{_libdir}/libkbase_tkwidgets.so
%{_libdir}/libkbase_wizard.so
%{_libdir}/librekall.so

%files docs
%defattr(-, root, root, 0755)
%doc AUTHORS INSTALL.KDE README.FIRST Release.Notes
%{_docdir}/%{name}-%{version}/*

%files extra
%defattr(-, root, root, 0755)
%{_datadir}/apps/rekall/services/rekall_plugin_extra.desktop
%{_libdir}/libkbase_plugin_extra.so
%{_libdir}/libkbase_plugin_extra.la

%files mysql
%defattr(-, root, root, 0755)
%{_datadir}/apps/rekall/services/rekall_driver_mysql.desktop
%{_libdir}/libkbase_driver_mysql.so
%{_libdir}/libkbase_driver_mysql.la

%files postgresql
%defattr(-, root, root, 0755)
%{_datadir}/apps/rekall/services/rekall_driver_pgsql.desktop
%{_libdir}/libkbase_driver_pgsql.so
%{_libdir}/libkbase_driver_pgsql.la

%files python
%defattr(-, root, root, 0755)
%dir %{_datadir}/apps/rekall/stock/component/py
%{_datadir}/apps/rekall/stock/component/py/*
%dir %{_datadir}/apps/rekall/script/py
%{_datadir}/apps/rekall/script/py/*
%{_datadir}/apps/rekall/services/rekall_script_py.desktop
%{_libdir}/libkbase_script_py.so
%{_libdir}/libkbase_script_pysys.so

%files runtime
%defattr(-, root, root, 0755)
%{_bindir}/rekallrt
%{_datadir}/apps/rekall/services/rekallrt_copier.desktop
%{_datadir}/apps/rekall/services/rekallrt_form.desktop
%{_datadir}/apps/rekall/services/rekallrt_query.desktop
%{_datadir}/apps/rekall/services/rekallrt_report.desktop
%{_datadir}/apps/rekall/services/rekallrt_table.desktop
%{_datadir}/apps/rekall/services/rekallrt_plugin_extra.desktop
%{_datadir}/apps/rekall/services/rekallrt_script_py.desktop
%{_datadir}/apps/rekallrt
%{_datadir}/applications/fedora-rekallrt.desktop
%{_datadir}/pixmaps/rekallrt.png
%{_libdir}/libkbasert_plugin_extra.so
%{_libdir}/libkbasert_script_py.so
%{_libdir}/libkbasert_script_pysys.so
%{_libdir}/libkbasert.so*
%{_libdir}/libkbasert_app.so*
%{_libdir}/libkbasert_formview.so
%{_libdir}/libkbasert_queryview.so
%{_libdir}/libkbasert_reportview.so
%{_libdir}/libkbasert_tableview.so
%{_libdir}/libkbasert*.la
%{_libdir}/librekallrt.so*
%{_libdir}/librekallrt.la

%changelog
* Mon Sep 19 2005 Tom "spot" Callaway  2.2.3-5
- get rid of unnecessary BR: xbase-devel and qt-devel

* Sat Sep 17 2005 Tom "spot" Callaway  2.2.3-4
- fix runtime package to actually be standalone
- create common package that both rekall and rekall-runtime need

* Thu Sep  8 2005 Tom "spot" Callaway  2.2.3-3
- runtime: R: desktop-file-utils
- use %%{_datadir} everywhere

* Sun Sep  4 2005 Tom "spot" Callaway  2.2.3-2
- BR: desktop-file-utils
- R: desktop-file-utils
- fix typo in runtime desc
- set vendor to fedora not kde
- add Office, Application to category
- add rlk mimetype
- make symlink for icon
- provide runtime-devel in runtime package
- include .la files
- lots of missing post/postun added
- icon for the runtime bits

* Fri Jun 17 2005 Tom "spot" Callaway  2.2.3-1
- initial package for Fedora Extras


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rekall/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	19 Sep 2005 15:47:22 -0000	1.1
+++ .cvsignore	19 Sep 2005 15:49:51 -0000	1.2
@@ -0,0 +1 @@
+rekall-2.2.3-2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rekall/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	19 Sep 2005 15:47:22 -0000	1.1
+++ sources	19 Sep 2005 15:49:51 -0000	1.2
@@ -0,0 +1 @@
+0c27445eb9d58877067d60c94ef0dca9  rekall-2.2.3-2.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 19 15:50:50 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Mon, 19 Sep 2005 11:50:50 -0400
Subject: rpms/perl-File-Flat - New directory
Message-ID: <200509191550.j8JFoonE024261@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-File-Flat
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24241/perl-File-Flat

Log Message:
Directory /cvs/extras/rpms/perl-File-Flat added to the repository




From fedora-extras-commits at redhat.com  Mon Sep 19 15:50:50 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Mon, 19 Sep 2005 11:50:50 -0400
Subject: rpms/perl-File-Flat/devel - New directory
Message-ID: <200509191550.j8JFooj0024266@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-File-Flat/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24241/perl-File-Flat/devel

Log Message:
Directory /cvs/extras/rpms/perl-File-Flat/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Sep 19 15:51:17 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Mon, 19 Sep 2005 11:51:17 -0400
Subject: rpms/perl-File-Flat Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200509191551.j8JFpHeV024315@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-File-Flat
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24286

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-File-Flat


--- NEW FILE Makefile ---
# Top level Makefile for module perl-File-Flat
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Mon Sep 19 15:51:17 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Mon, 19 Sep 2005 11:51:17 -0400
Subject: rpms/perl-File-Flat/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200509191551.j8JFpHIB024320@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-File-Flat/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24286/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-File-Flat


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Mon Sep 19 15:52:14 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Mon, 19 Sep 2005 11:52:14 -0400
Subject: rpms/perl-File-Flat import.log,1.1,1.2
Message-ID: <200509191552.j8JFqEpl024389@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-File-Flat
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24354

Modified Files:
	import.log 
Log Message:
auto-import perl-File-Flat-0.95-1 on branch devel from perl-File-Flat-0.95-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-File-Flat/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	19 Sep 2005 15:51:14 -0000	1.1
+++ import.log	19 Sep 2005 15:52:12 -0000	1.2
@@ -0,0 +1 @@
+perl-File-Flat-0_95-1:HEAD:perl-File-Flat-0.95-1.src.rpm:1127145114



From fedora-extras-commits at redhat.com  Mon Sep 19 15:52:15 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Mon, 19 Sep 2005 11:52:15 -0400
Subject: rpms/perl-File-Flat/devel perl-File-Flat.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200509191552.j8JFqFIW024396@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-File-Flat/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24354/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-File-Flat.spec 
Log Message:
auto-import perl-File-Flat-0.95-1 on branch devel from perl-File-Flat-0.95-1.src.rpm


--- NEW FILE perl-File-Flat.spec ---
Name: 		perl-File-Flat
Version: 	0.95
Release: 	1%{?dist}
Summary: 	Implements a flat filesystem
License: 	GPL or Artistic
Group: 		Development/Libraries
URL: 		http://search.cpan.org/dist/File-Flat/
Source0: 	http://search.cpan.org/CPAN/authors/id/A/AD/ADAMK/File-Flat-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:  	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
BuildArch: 	noarch

BuildRequires: perl(ExtUtils::AutoInstall) >= 0.49
BuildRequires: perl(Test::More) >= 0.47
BuildRequires: perl(Test::ClassAPI) >= 1.02
BuildRequires: perl(File::Find) >= 1.07
BuildRequires: perl(prefork) >= 0.02
BuildRequires: perl(File::Spec) >= 0.85
BuildRequires: perl(File::Copy) >= 2.08
BuildRequires: perl(File::NCopy) >= 0.32
BuildRequires: perl(File::Slurp) >= 9999.04
BuildRequires: perl(File::Remove) >= 0.21
BuildRequires: perl(File::Temp) >= 0.14
BuildRequires: perl(IO::File) >= 1.10

%description
File::Flat implements a flat filesystem. A flat filesystem is a filesystem
in which directories do not exist. It provides an abstraction over any 
normal filesystem which makes it appear as if directories do not exist.

%prep
%setup -q -n File-Flat-%{version}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'
find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';'
chmod -R u+w $RPM_BUILD_ROOT/*

%clean
rm -rf $RPM_BUILD_ROOT

%check
make test

%files
%defattr(-,root,root,-)
%doc Changes README LICENSE
%{perl_vendorlib}/File
%{_mandir}/man3/*

%changelog
* Tue Sep 13 2005 Ralf Corsepius  - 0.95-1
- Spec file cleanup.
- FE submission.

* Tue Jun 28 2005 Ralf Corsepius  - 0.95-0.pm.1
- Initial packman version.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-File-Flat/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	19 Sep 2005 15:51:15 -0000	1.1
+++ .cvsignore	19 Sep 2005 15:52:12 -0000	1.2
@@ -0,0 +1 @@
+File-Flat-0.95.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-File-Flat/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	19 Sep 2005 15:51:15 -0000	1.1
+++ sources	19 Sep 2005 15:52:12 -0000	1.2
@@ -0,0 +1 @@
+4b018c9d2a366cfd15c920f3544e9cf1  File-Flat-0.95.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 19 16:02:39 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Mon, 19 Sep 2005 12:02:39 -0400
Subject: rpms/perl-File-Flat/devel perl-File-Flat.spec,1.1,1.2
Message-ID: <200509191603.j8JG39KU025778@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-File-Flat/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25762

Modified Files:
	perl-File-Flat.spec 
Log Message:
Spec cleanup.


Index: perl-File-Flat.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-File-Flat/devel/perl-File-Flat.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-File-Flat.spec	19 Sep 2005 15:52:12 -0000	1.1
+++ perl-File-Flat.spec	19 Sep 2005 16:02:37 -0000	1.2
@@ -1,6 +1,6 @@
 Name: 		perl-File-Flat
 Version: 	0.95
-Release: 	1%{?dist}
+Release: 	2%{?dist}
 Summary: 	Implements a flat filesystem
 License: 	GPL or Artistic
 Group: 		Development/Libraries
@@ -14,15 +14,15 @@
 BuildRequires: perl(ExtUtils::AutoInstall) >= 0.49
 BuildRequires: perl(Test::More) >= 0.47
 BuildRequires: perl(Test::ClassAPI) >= 1.02
-BuildRequires: perl(File::Find) >= 1.07
+BuildRequires: perl(File::Find)
 BuildRequires: perl(prefork) >= 0.02
 BuildRequires: perl(File::Spec) >= 0.85
-BuildRequires: perl(File::Copy) >= 2.08
+BuildRequires: perl(File::Copy)
 BuildRequires: perl(File::NCopy) >= 0.32
 BuildRequires: perl(File::Slurp) >= 9999.04
 BuildRequires: perl(File::Remove) >= 0.21
 BuildRequires: perl(File::Temp) >= 0.14
-BuildRequires: perl(IO::File) >= 1.10
+BuildRequires: perl(IO::File)
 
 %description
 File::Flat implements a flat filesystem. A flat filesystem is a filesystem
@@ -56,6 +56,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Mon Sep 19 2005 Ralf Corsepius  - 0.95-2
+- Spec file cleanup.
+
 * Tue Sep 13 2005 Ralf Corsepius  - 0.95-1
 - Spec file cleanup.
 - FE submission.



From fedora-extras-commits at redhat.com  Mon Sep 19 16:36:04 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 19 Sep 2005 12:36:04 -0400
Subject: owners owners.list,1.233,1.234
Message-ID: <200509191636.j8JGa4nZ026328@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26309

Modified Files:
	owners.list 
Log Message:

rekall



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.233
retrieving revision 1.234
diff -u -r1.233 -r1.234
--- owners.list	18 Sep 2005 23:38:42 -0000	1.233
+++ owners.list	19 Sep 2005 16:36:02 -0000	1.234
@@ -872,6 +872,7 @@
 Fedora Extras|rbldnsd|Small, fast daemon to serve DNSBLs|paul at city-fan.org|extras-qa at fedoraproject.org|
 Fedora Extras|rdiff-backup|Convenient and transparent local/remote incremental mirror/backup|ghenry at suretecsystems.com|extras-qa at fedoraproject.org|
 Fedora Extras|recode|Conversion between character sets and surfaces|z.kota at gmx.net|extras-qa at fedoraproject.org|
+Fedora Extras|rekall|A KDE database front-end application|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|repoml|Tools and data for working with RepoML files|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
 Fedora Extras|repoview|Creates a set of static HTML pages in a yum repository|icon at linux.duke.edu|extras-qa at fedoraproject.org|
 Fedora Extras|revelation|Password manager for GNOME 2|fedora at leemhuis.info|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Mon Sep 19 18:03:32 2005
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Mon, 19 Sep 2005 14:03:32 -0400
Subject: rpms/nexuiz-data/FC-4 .cvsignore, 1.2, 1.3 nexuiz-data.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <200509191804.j8JI4jAT029245@cvs-int.fedora.redhat.com>

Author: adrian

Update of /cvs/extras/rpms/nexuiz-data/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29222

Modified Files:
	.cvsignore nexuiz-data.spec sources 
Log Message:
* Mon Sep 19 2005 Adrian Reber  - 1.2.1-1
- updated to 1.2.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nexuiz-data/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Jul 2005 21:57:05 -0000	1.2
+++ .cvsignore	19 Sep 2005 18:03:30 -0000	1.3
@@ -1 +1 @@
-nexuiz-data-1.1.tar
+nexuiz-data-1.2.1.tar


Index: nexuiz-data.spec
===================================================================
RCS file: /cvs/extras/rpms/nexuiz-data/FC-4/nexuiz-data.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nexuiz-data.spec	8 Jul 2005 21:57:05 -0000	1.1
+++ nexuiz-data.spec	19 Sep 2005 18:03:30 -0000	1.2
@@ -1,20 +1,21 @@
-%define datadate 20050703
+%define datadate 20050905
 
 Summary: Game data for the Nexuiz first person shooter
 Name: nexuiz-data
-Version: 1.1
+Version: 1.2.1
 Release: 1
 License: GPL
 Group: Amusements/Games
 URL: http://www.nexuiz.com/
 # Source is custom, obtained with :
-# wget http://dl.sf.net/sourceforge/nexuiz/nexuiz11.zip
-# unzip nexuiz11.zip
-# mkdir nexuiz-data-1.1/
-# mv Nexuiz/data/ Nexuiz/Readme.htm Nexuiz/sources/darkplaces/COPYING \
-#    nexuiz-data-1.1/
-# tar cvf nexuiz-data-1.1.tar nexuiz-data-1.1/
-Source: nexuiz-data-%{version}.tar
+# wget http://dl.sf.net/sourceforge/nexuiz/nexuiz121.zip
+# unzip nexuiz121.zip
+# mkdir nexuiz-data-1.2.1/
+# mv Nexuiz/data/ Nexuiz/Readme.htm Nexuiz/gpl.txt \
+#    Nexuiz/betacredits.txt  Nexuiz/gamemodes.txt \
+#    nexuiz-data-1.2.1/
+# tar cvf nexuiz-data-1.2.1.tar nexuiz-data-1.2.1/
+Source0: nexuiz-data-%{version}.tar
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 
@@ -23,28 +24,39 @@
 focused on providing basic, old style deathmatches.
 
 Data (textures, maps, sounds and models) required to play nexuiz.
-This includes 17 maps, 28 playable characters and 10 music tracks.
 
 %prep
 %setup -q
-%{__sed} -i 's/\r//' Readme.htm
+%{__sed} -i 's/\r//' Readme.htm *.txt data/*.txt
 
 %build
 
 %install
 %{__rm} -rf %{buildroot}
-%{__install} -D -p data/data%{datadate}.pk3 \
-        %{buildroot}%{_datadir}/nexuiz/data/data%{datadate}.pk3
+%{__mkdir_p} %{buildroot}%{_datadir}/nexuiz/data/
+%{__install} -p data/data%{datadate}-full.pk3 \
+        %{buildroot}%{_datadir}/nexuiz/data/
 
 %clean
 %{__rm} -rf %{buildroot}
 
 %files
 %defattr(0644, root, root, 0755)
-%doc Readme.htm COPYING
+%doc Readme.htm gpl.txt data/cvars.txt data/mapping.txt betacredits.txt
+%doc gamemodes.txt
 %{_datadir}/nexuiz/
 
 %changelog
+* Mon Sep 19 2005 Adrian Reber  - 1.2.1-1
+- updated to 1.2.1
+
+* Sat Sep 03 2005 Adrian Reber  - 1.2-2
+- I should really test my changes before check-in
+
+* Fri Sep 02 2005 Adrian Reber  - 1.2-1
+- updated to 1.2
+- included serverfix12.zip
+
 * Fri Jul  8 2005 Matthias Saou  1.1-0
 - Split off data from the main package, will make fixing the binaries much
   easier and allow sharing this noarch package between archs. It also avoids


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nexuiz-data/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Jul 2005 21:57:05 -0000	1.2
+++ sources	19 Sep 2005 18:03:30 -0000	1.3
@@ -1 +1 @@
-c177cce8cf6ac9134d1d9b8a08dc3272  nexuiz-data-1.1.tar
+64d371d2008b096c67980e7a65a412bc  nexuiz-data-1.2.1.tar



From fedora-extras-commits at redhat.com  Mon Sep 19 18:40:11 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Mon, 19 Sep 2005 14:40:11 -0400
Subject: rpms/SDL_ttf/devel .cvsignore, 1.2, 1.3 SDL_ttf.spec, 1.6,
	1.7 sources, 1.2, 1.3 SDL_ttf-2.0.6-ft2-build.patch, 1.1,
	NONE SDL_ttf-2.0.6-openstream.patch, 1.1, NONE
Message-ID: <200509191840.j8JIeBiq029527@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/SDL_ttf/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29504

Modified Files:
	.cvsignore SDL_ttf.spec sources 
Removed Files:
	SDL_ttf-2.0.6-ft2-build.patch SDL_ttf-2.0.6-openstream.patch 
Log Message:
* Sun Sep 18 2005 Ville Skytt??  - 2.0.7-1
- 2.0.7, patches applied upstream.
- Require SDL-devel in -devel.
- Build with dependency tracking disabled.
- Don't ship static libs.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/SDL_ttf/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 03:59:03 -0000	1.2
+++ .cvsignore	19 Sep 2005 18:40:09 -0000	1.3
@@ -1 +1 @@
-SDL_ttf-2.0.6.tar.gz
+SDL_ttf-2.0.7.tar.gz


Index: SDL_ttf.spec
===================================================================
RCS file: /cvs/extras/rpms/SDL_ttf/devel/SDL_ttf.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- SDL_ttf.spec	6 Apr 2005 22:10:46 -0000	1.6
+++ SDL_ttf.spec	19 Sep 2005 18:40:09 -0000	1.7
@@ -1,12 +1,9 @@
 Summary: Simple DirectMedia Layer TrueType Font library
 Name: SDL_ttf
-Version: 2.0.6
-Release: 5
-
+Version: 2.0.7
+Release: 1%{?dist}
 URL: http://www.libsdl.org/projects/SDL_ttf/
-Source0: http://www.libsdl.org/projects/SDL_ttf/release/SDL_ttf-2.0.6.tar.gz
-Patch0: %{name}-%{version}-openstream.patch
-Patch1: %{name}-%{version}-ft2-build.patch
+Source0: http://www.libsdl.org/projects/SDL_ttf/release/%{name}-%{version}.tar.gz
 License: LGPL
 Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -22,6 +19,7 @@
 Summary: Files to develop SDL applications which use TrueType fonts
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
+Requires: SDL-devel >= 1.2.4
 
 %description devel
 This library allows you to use TrueType fonts to render text in SDL
@@ -30,17 +28,14 @@
 
 %prep
 %setup -q
-%patch -p1
-%patch1 -p1 -b .ft2
 
 %build
-%configure
+%configure --disable-dependency-tracking --disable-static
 make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%makeinstall
-
+make install DESTDIR=$RPM_BUILD_ROOT
 rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la
 
 %clean
@@ -57,12 +52,17 @@
 
 %files devel
 %defattr(-,root,root)
-%{_libdir}/*.a
 %{_libdir}/*.so
-%{_includedir}/SDL/
+%{_includedir}/SDL/*.h
 
 %changelog
-* Fri Apr  7 2005 Michael Schwendt 
+* Sun Sep 18 2005 Ville Skytt??  - 2.0.7-1
+- 2.0.7, patches applied upstream.
+- Require SDL-devel in -devel.
+- Build with dependency tracking disabled.
+- Don't ship static libs.
+
+* Fri Apr  7 2005 Michael Schwendt  - 2.0.6-5
 - rebuilt
 
 * Wed Mar 21 2004 Panu Matilainen  0:2.0.6-0.fdr.4


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/SDL_ttf/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 03:59:03 -0000	1.2
+++ sources	19 Sep 2005 18:40:09 -0000	1.3
@@ -1 +1 @@
-880ca22ac3e8beb5cca2326cc8069733  SDL_ttf-2.0.6.tar.gz
+0f6ee1a502e6913a412aac353dc75bbc  SDL_ttf-2.0.7.tar.gz


--- SDL_ttf-2.0.6-ft2-build.patch DELETED ---


--- SDL_ttf-2.0.6-openstream.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Sep 19 18:50:51 2005
From: fedora-extras-commits at redhat.com (Karsten Wade (kwade))
Date: Mon, 19 Sep 2005 14:50:51 -0400
Subject: web/html/participate/documentation-guide acknowledgments.php, 1.3,
 1.4 ch-converting.php, 1.3, 1.4 ch-cvs.php, 1.3, 1.4 ch-emacs-nxml.php, 1.3,
 1.4 ch-emacs.php, 1.3, 1.4 ch-getting-files.php, 1.3, 1.4 ch-intro.php, 1.3,
 1.4 ch-rh-guidelines.php, 1.3, 1.4 ch-style.php, 1.2, 1.3 ch-tutorial.php,
 1.3, 1.4 ch-vim.php, 1.3, 1.4 ch-xml-tags.php, 1.3, 1.4 generated-index.php,
 1.3, 1.4 index.php, 1.3, 1.4 ln-legalnotice.php, 1.3,
 1.4 s1-diagrams-images.php, 1.3, 1.4 s1-emacs-additional-resources.php, 1.3,
 1.4 s1-emacs-basic-commands.php, 1.3, 1.4 s1-emacs-cedfile.php, 1.3,
 1.4 s1-emacs-colors.php, 1.3, 1.4 s1-emacs-examples.php, 1.3,
 1.4 s1-emacs-loadced.php, 1.3, 1.4 s1-emacs-nxml-additional-resources.php,
 1.3, 1.4 s1-emacs-nxml-readme.php, 1.3, 1.4 s1-nxml-examples.php, 1.3,
 1.4 s1-screenshots.php, 1.3, 1.4 s1-tutorial-license.php, 1.3,
 1.4 s1-vim-additional-resources.php, 1.3, 1.4 s1-vim-keymapping.php, 1.3,
 1.4 s1-xml-admon.php, 1.3, 1.4 s1-xml-guidelines-header.php, 1.3,
 1.4 s1-xml-tag-sulink.php, 1.3, 1.4 s1-xml-tags-application.!
 php, 1.3, 1.4 s1-xml-tags-chapter.php, 1.3, 1.4 s1-xml-tags-citetitle.php,
 1.3, 1.4 s1-xml-tags-command.php, 1.3, 1.4 s1-xml-tags-compoutput.php, 1.3,
 1.4 s1-xml-tags-emphasis.php, 1.3, 1.4 s1-xml-tags-example.php, 1.3,
 1.4 s1-xml-tags-figure.php, 1.3, 1.4 s1-xml-tags-filename.php, 1.3,
 1.4 s1-xml-tags-firstterm.php, 1.3, 1.4 s1-xml-tags-footnote.php, 1.3,
 1.4 s1-xml-tags-gui.php, 1.3, 1.4 s1-xml-tags-indexing.php, 1.3,
 1.4 s1-xml-tags-keycap.php, 1.3, 1.4 s1-xml-tags-lists.php, 1.3,
 1.4 s1-xml-tags-option.php, 1.3, 1.4 s1-xml-tags-para.php, 1.3,
 1.4 s1-xml-tags-part.php, 1.3, 1.4 s1-xml-tags-prompt.php, 1.3,
 1.4 s1-xml-tags-replaceable.php, 1.3, 1.4 s1-xml-tags-screen.php, 1.3,
 1.4 s1-xml-tags-sections.php, 1.3, 1.4 s1-xml-tags-table.php, 1.3,
 1.4 s1-xml-tags-trademark.php, 1.3, 1.4 s1-xml-tags-userinput.php, 1.3,
 1.4 s1-xml-tags-wordasword.php, 1.3, 1.4 s1-xml-tags-xref.php, 1.3,
 1.4 sn-composition-tips.php, 1.2, 1.3 sn-cvs-config.php, 1.1,
 1.2 sn-cvs-cvscommands.php, 1.1, 1.2 sn-cvs-preparation.php, 1.1,
 1.2 sn-grammar-and-usage.ph!
 p,1.2,1.3 sn-tech-docs-fundamentals.php,1.2,1.3 s1-cvs-configu!
 re.php
Message-ID: <200509191850.j8JIopU5029681@cvs-int.fedora.redhat.com>

Author: kwade

Update of /cvs/fedora/web/html/participate/documentation-guide
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29592

Modified Files:
	acknowledgments.php ch-converting.php ch-cvs.php 
	ch-emacs-nxml.php ch-emacs.php ch-getting-files.php 
	ch-intro.php ch-rh-guidelines.php ch-style.php ch-tutorial.php 
	ch-vim.php ch-xml-tags.php generated-index.php index.php 
	ln-legalnotice.php s1-diagrams-images.php 
	s1-emacs-additional-resources.php s1-emacs-basic-commands.php 
	s1-emacs-cedfile.php s1-emacs-colors.php s1-emacs-examples.php 
	s1-emacs-loadced.php s1-emacs-nxml-additional-resources.php 
	s1-emacs-nxml-readme.php s1-nxml-examples.php 
	s1-screenshots.php s1-tutorial-license.php 
	s1-vim-additional-resources.php s1-vim-keymapping.php 
	s1-xml-admon.php s1-xml-guidelines-header.php 
	s1-xml-tag-sulink.php s1-xml-tags-application.php 
	s1-xml-tags-chapter.php s1-xml-tags-citetitle.php 
	s1-xml-tags-command.php s1-xml-tags-compoutput.php 
	s1-xml-tags-emphasis.php s1-xml-tags-example.php 
	s1-xml-tags-figure.php s1-xml-tags-filename.php 
	s1-xml-tags-firstterm.php s1-xml-tags-footnote.php 
	s1-xml-tags-gui.php s1-xml-tags-indexing.php 
	s1-xml-tags-keycap.php s1-xml-tags-lists.php 
	s1-xml-tags-option.php s1-xml-tags-para.php 
	s1-xml-tags-part.php s1-xml-tags-prompt.php 
	s1-xml-tags-replaceable.php s1-xml-tags-screen.php 
	s1-xml-tags-sections.php s1-xml-tags-table.php 
	s1-xml-tags-trademark.php s1-xml-tags-userinput.php 
	s1-xml-tags-wordasword.php s1-xml-tags-xref.php 
	sn-composition-tips.php sn-cvs-config.php 
	sn-cvs-cvscommands.php sn-cvs-preparation.php 
	sn-grammar-and-usage.php sn-tech-docs-fundamentals.php 
Removed Files:
	s1-cvs-configure.php s1-cvs-cvscommands.php 
Log Message:
Updating Doc Guide to reflect latest CVS information.






Index: ch-cvs.php
===================================================================
RCS file: /cvs/fedora/web/html/participate/documentation-guide/ch-cvs.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ch-cvs.php	24 Aug 2005 17:49:48 -0000	1.3
+++ ch-cvs.php	19 Sep 2005 18:50:48 -0000	1.4
@@ -18,7 +18,7 @@
     conflicts arise, CVS lets you know.
     CVS is often used so that programmers can
     share code, but it also works well for documentation.
-  
    10.1. How CVS Works
    
+  
    10.1. How CVS Works
    
       In most cases, each set of files that make up a package or project
       is stored as a module on the CVS server.
     
    


Index: ch-emacs-nxml.php
===================================================================
RCS file: /cvs/fedora/web/html/participate/documentation-guide/ch-emacs-nxml.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ch-emacs-nxml.php	24 Aug 2005 17:49:48 -0000	1.3
+++ ch-emacs-nxml.php	19 Sep 2005 18:50:48 -0000	1.4
@@ -7,7 +7,7 @@
 
 ?>
 
-
    Chapter 4. Emacs and nXML Mode
    Prev   Next
    Chapter 4. Emacs and nXML Mode
    
+
    Chapter 4. Emacs and nXML Mode
    Prev   Next
    Chapter 4. Emacs and nXML Mode
    
       You can also use the nXML mode available for
       Emacs to make it even easier to write in
       DocBook XML format. nXML mode provides context-sensitive editing using
@@ -19,7 +19,7 @@
 	when using it with other documents types. If you keep an eye on the
 	mailing-list, you can keep up to date with these, as well as ask
 	questions. For more details, check out Section 4.4, “nXML README File”.
-      
    4.1. Getting the nXML RPM
    
+      
    4.1. Getting the nXML RPM
    
          To use nXML mode with emacs, you will need to install the nXML RPM
          available from Tim
          Waugh's website or the source from http://www.thaiopensource.com/download/. The


Index: ch-emacs.php
===================================================================
RCS file: /cvs/fedora/web/html/participate/documentation-guide/ch-emacs.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ch-emacs.php	24 Aug 2005 17:49:48 -0000	1.3
+++ ch-emacs.php	19 Sep 2005 18:50:48 -0000	1.4
@@ -7,11 +7,11 @@
 
 ?>
 
-
    Chapter 3. Emacs and PSGML Mode
    Prev   Next
    Chapter 3. Emacs and PSGML Mode
    
+
    Chapter 3. Emacs and PSGML Mode
    Prev   Next
    Chapter 3. Emacs and PSGML Mode
    
       You can use the PSGML mode available for Emacs to make it easier to write
       in XML format. PSGML mode provides syntax-highlighting, tag completion,
       and more.
-    
    3.1. Setting Up Your .emacs File
    
+    
    3.1. Setting Up Your .emacs File
    
 	For Emacs to parse your DocBook documents correctly, you must have a
 	.emacs file.   Cut and paste the following into your
 	existing .emacs file or create a new one that


Index: ch-getting-files.php
===================================================================
RCS file: /cvs/fedora/web/html/participate/documentation-guide/ch-getting-files.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ch-getting-files.php	24 Aug 2005 17:49:48 -0000	1.3
+++ ch-getting-files.php	19 Sep 2005 18:50:48 -0000	1.4
@@ -26,7 +26,8 @@
 cd my-fedora-docs
 export CVSROOT=:pserver:anonymous at cvs.fedora.redhat.com:/cvs/docs
 cvs login
-cvs co docs-setup
+cvs co docs-common
+cvs co example-tutorial
 
    • 
       When you perform an anonymous CVS checkout, you can view the files and
       retreive the latest versions.  You cannot add (commit) any updates or new
@@ -35,7 +36,7 @@
     about getting write access to CVS.
     
    
       To see a list of the available documents:
-    
    $ cvs co -c
    
+    
    cvs co -c
    
       Pick your document of interest and then download it to your working directory:
     
    cvs co example-tutorial
    
       Except for the Installation Guide, all documentation in CVS must




Index: ch-rh-guidelines.php
===================================================================
RCS file: /cvs/fedora/web/html/participate/documentation-guide/ch-rh-guidelines.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ch-rh-guidelines.php	24 Aug 2005 17:49:48 -0000	1.3
+++ ch-rh-guidelines.php	19 Sep 2005 18:50:48 -0000	1.4
@@ -7,9 +7,9 @@
 
 ?>
 
-
    Chapter 2. Red Hat Documentation Guidelines
    Prev   Next
    Chapter 2. Red Hat Documentation Guidelines
    Please read this chapter carefully. This chapter describes the
+
    Chapter 2. Red Hat Documentation Guidelines
    Prev   Next
    Chapter 2. Red Hat Documentation Guidelines
    Please read this chapter carefully. This chapter describes the
       guidelines that must be followed such as naming conventions.
-    
    2.1. ID Naming Conventions
    You will see certain ID names referred to below and this will
+    
    2.1. ID Naming Conventions
    You will see certain ID names referred to below and this will
 	help to explain how we come up with those names. For example:
       
     
@@ -21,7 +21,7 @@
 
 
    IDs are unique identifiers, allowing DocBook XML to know where to
 	cross-reference a section or chapter or the like.
-      
    The general rules for defining an ID are:
    • Keep it 32 characters or under (this is counted as
+      
      The general rules for defining an ID are:
      • Keep it 32 characters or under (this is counted as
 	  everything between the quotation marks)
      • Keep it as short and simple as possible
      • Make sure the name is relevant to the information (make it
 	    recognizable)
      Some examples are "ch-uniquename" (with 13
 	characters) and "s3-install-make-disks" (with 21


Index: ch-style.php
===================================================================
RCS file: /cvs/fedora/web/html/participate/documentation-guide/ch-style.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ch-style.php	24 Aug 2005 17:49:48 -0000	1.2
+++ ch-style.php	19 Sep 2005 18:50:48 -0000	1.3
@@ -35,7 +35,7 @@
       Writing well comes naturally to almost no one.  It is a skill that
       professional writers, even famous ones, must practice constantly.
       Style
-       is the quality
+       is the quality
       that separates elegant writing from the merely functional.
     
      
       Elegance comes in many forms.  In prose and poetry, elegant
@@ -55,12 +55,12 @@
       idioms, or jargon, a reader or translator may easily become
       confused.  The following example compares two different written
       executions of the same idea:
-    
      
+    
      
         So you made the changes I showed you in the last section. What's
 	the next thing you should do?  Just pop your thumb drive onto
 	your system and read the messages log. When
 	you see "USB device found," then Bob's your uncle.
-      
      Example 8.1. Incorrect style
      
+      
      Example 8.1. Incorrect style
      
         After you complete the configuration changes above, attach the
 	USB removable media to your system.  Use the
 	dmesg command to examine the kernel message




Index: ch-vim.php
===================================================================
RCS file: /cvs/fedora/web/html/participate/documentation-guide/ch-vim.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ch-vim.php	24 Aug 2005 17:49:48 -0000	1.3
+++ ch-vim.php	19 Sep 2005 18:50:48 -0000	1.4
@@ -7,7 +7,7 @@
 
 ?>
 
-
      Chapter 5. VIM and DocBook
      Prev   Next
      Chapter 5. VIM and DocBook
      
+
      Chapter 5. VIM and DocBook
      Prev   Next
      Chapter 5. VIM and DocBook
      
       VIM has many features to help you write XML content such as DocBook,
       including syntax highlighting and customizable key bindings.
       Additionally, one can easily use external programs from VIM for features
@@ -15,7 +15,7 @@
       This chapter assumes you already know generally how to use VIM; if you
       want to learn how, try the vimtutor or by typing
       :help tutor from inside VIM.
-    
      5.1. Setting Up Your .vimrc File
      
+    
      5.1. Setting Up Your .vimrc File
      
         Below is a short sample .vimrc file that turns on
 	some VIM features useful for editing SGML or XML content such as 
 	DocBook:


Index: ch-xml-tags.php
===================================================================
RCS file: /cvs/fedora/web/html/participate/documentation-guide/ch-xml-tags.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ch-xml-tags.php	24 Aug 2005 17:49:48 -0000	1.3
+++ ch-xml-tags.php	19 Sep 2005 18:50:48 -0000	1.4
@@ -7,7 +7,7 @@
 
 ?>
 
-
      Chapter 6. DocBook XML Tags
      Prev   Next
      Chapter 6. DocBook XML Tags
      Please read this chapter carefully. This chapter describes the tags
+
      Chapter 6. DocBook XML Tags
      Prev   Next
      Chapter 6. DocBook XML Tags
      Please read this chapter carefully. This chapter describes the tags
       used by the Docs Project. Some of the rules described are specific to the
       project.
     
      If these tags are used appropriately, document searches will provide
@@ -15,7 +15,7 @@
       information relevant to the search request. Another benefit is that all
       Fedora Project documents will have a similar look and feel (however, they will have
       some differences depending upon the output format).
-    
      All tags in XML must have an opening and closing tag Additionally,
+    
      All tags in XML must have an opening and closing tag Additionally,
       proper XML conventions say that there must be a unique identifier for
       sections, chapters, figures, tables, and so on, so that they may be
       correctly identified, and cross referenced if needed.
      Although XML is capable of handling many document types, the format
@@ -26,7 +26,7 @@
 
 http://www.docbook.org/tdg/en/html/docbook.html
 
-

    6.1. Tags and Entities Caveats

    +

    6.1. Tags and Entities Caveats

    It is very important that you remember the caveats in this section. Even though they are more strict than valid DocBook XML, these rules exist so that both the HTML and PDF outputs look proper. Index: index.php =================================================================== RCS file: /cvs/fedora/web/html/participate/documentation-guide/index.php,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- index.php 24 Aug 2005 17:49:48 -0000 1.3 +++ index.php 19 Sep 2005 18:50:48 -0000 1.4 @@ -7,7 +7,7 @@ ?> -

    Fedora Project Documentation Guide
       Next

    Fedora Project Documentation Guide

    Version 0.2.6.1

    Tammy Fox

    Johnray Fuller

    Sandra Moore

    ! Copyright © 2003,2004,2005 Red Hat, Inc., Tammy Fox, Johnray Fuller, Sandra Moore

    Table of Contents

    Introduction
    1. Getting the Files
    2. Red Hat Documentation Guidelines
    2.1. ID Naming Conventions
    2.2. File Header
    2.3. Admonitions
    2.3.1. Creating Notes, Tips, Cautions, Importants, and Warnings
    2.4. Screenshots!
    2.5. Diagrams and Images
    3. Emacs and PSGML Mode
    3.1. Setting Up Your .emacs File
    3.2. Customizing Emacs
    3.3. Create Recompiled DTD Subset
    3.4. Load the Parsed DTD
    3.5. Basic Emacs Commands
    3.6. Examples
    3.6.1. Tag Completion
    3.6.2. Tag Closure
    3.6.3. Other Emacs Tasks
    3.7. Additional Resources
    4. Emacs and nXML Mode
    4.1. Getting the nXML RPM
    4.2. Examples
    4.2.1. Commands
    4.3. Additional Resources
    4.4. nXML README File
    5. VIM and DocBook
    5.1. Setting Up Your .vimrc File
    5.2. Keymapping with VIM
    5.3. Additional VIM Resources
    6. DocBook XML Tags
    6.1. Tags and Entities Caveats
    6.2. application
    6.3. chapter
    6.4. citetitle
    6.5. command
    6.6. computeroutput
    6.7. emphasis
    6.8. example
    6.9. filename
    6.10. firstterm
    6.11. footnote
    6.12. figure
    6.13. GUI Tags
    6.13.1. guilabel
    6.13.2. guibutton
    6.13.3. guiicon
    6.13.4. guimenu and +
    Fedora Project Documentation Guide
       Next

    Fedora Project Documentation Guide

    Version 0.2.6.3

    Tammy Fox

    Johnray Fuller

    Sandra Moore

    ! Copyright © 2003,2004,2005 Red Hat, Inc., Tammy Fox, Johnray Fuller, Sandra Moore

    Table of Contents

    Introduction
    1. Getting the Files
    2. Red Hat Documentation Guidelines
    2.1. ID Naming Conventions
    2.2. File Header
    2.3. Admonitions
    2.3.1. Creating Notes, Tips, Cautions, Importants, and Warnings
    2.4. Screenshots!
    2.5. Diagrams and Images
    3. Emacs and PSGML Mode
    3.1. Setting Up Your .emacs File
    3.2. Customizing Emacs
    3.3. Create Recompiled DTD Subset
    3.4. Load the Parsed DTD
    3.5. Basic Emacs Commands
    3.6. Examples
    3.6.1. Tag Completion
    3.6.2. Tag Closure
    3.6.3. Other Emacs Tasks
    3.7. Additional Resources
    4. Emacs and nXML Mode
    4.1. Getting the nXML RPM
    4.2. Examples
    4.2.1. Commands
    4.3. Additional Resources
    4.4. nXML README File
    5. VIM and DocBook
    5.1. Setting Up Your .vimrc File
    5.2. Keymapping with VIM
    5.3. Additional VIM Resources
    6. DocBook XML Tags
    6.1. Tags and Entities Caveats
    6.2. application
    6.3. chapter
    6.4. citetitle
    6.5. command
    6.6. computeroutput
    6.7. emphasis
    6.8. example
    6.9. filename
    6.10. firstterm
    6.11. footnote
    6.12. figure
    6.13. GUI Tags
    6.13.1. guilabel
    6.13.2. guibutton
    6.13.3. guiicon
    6.13.4. guimenu and guimenuitem
    6.14. keycap
    6.14.1. menuchoice
    6.14.2. keycombo
    6.15. Lists
    6.15.1. itemizedlist
    6.15.2. OrderedList
    6.15.3. Variablelist
    6.15.4. Creating a List Within a Table Using Simplelist
    6.15.5. glosslist
    6.16. option
    6.17. Index Entries
    6.18. para
    6.19. part
    6.20. prompt
    6.21. replaceable
    6.22. screen
    6.22.1. Using Inline Tags with screen
    6.23. Sections
    6.24. table
    6.24.1. Creating a List Within a Table
    6.25. trademark
    6.26. userinput
    6.27. ulink
    6.28. wordasword
    6.29. xref
    7. The Layout of a Tutorial
    7.1. The Parent File
    7.2. Including the License Information
    8. Style
    8.1. Why Style Is Important
    8.2. Fundamental Concepts of Technical Documentation
    8.2.1. General Style Requirements
    8.2.2. Golden Rules
    8.2.3. Tone
    8.2.4. Reaching the Right Audience
    8.2.5. User Motivation
    8.2.6. New Users
    .7. Experienced Users
    8.2.8. Do Not Offend Your Audience
    8.3. Grammar and Usage Guidelines
    8.4. Composition Tips
    8.4.1. Active Voice
    8.4.2. Present Tense
    8.4.3. Narrative Voice
    8.4.4. Negative Words
    8.4.5. Uncertainty
    8.4.6. Redundant Coverage
    8.4.7. Self-referential Value Judgments
    8.4.8. Precision of Language
    8.4.9. DocBook Tips
    8.4.9.1. Admonitions
    8.4.9.2. The replaceable Tag
    8.4.9.3. XML Entities
    9. Converting to HTML and PDF
    10. CVS
    10.1. How CVS Works
    10.2. Preparing For CVS Use
    10.2.1. Is CVS Installed On Your System
    10.2.2. Generating SSH Keys
    10.3. Configuring For CVS Access
    10.3.1. Avoiding Repetitive Typing
    10.3.2. Configuring for Read-Only CVS Access
    10.3.3. Configuring Read/Write CVS Access
    10.4. Basic CVS Commands
    10.4.1. Checking Out Modules
    10.4.1.1. Checking Out Branches of Modules
    10.4.2. Updating Files
    10.4.3. Committing Files
    10.4.5. Managing Binary Files
    10.4.6. Removing Files
    10.4.7. Status of Files
    10.4.8. Resolving Conflicts
    10.4.9. Summary
    11. Acknowledgments
    Index
       Next
       Introduction
    Index: ln-legalnotice.php =================================================================== RCS file: /cvs/fedora/web/html/participate/documentation-guide/ln-legalnotice.php,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- ln-legalnotice.php 24 Aug 2005 17:49:48 -0000 1.3 +++ ln-legalnotice.php 19 Sep 2005 18:50:48 -0000 1.4 @@ -26,7 +26,7 @@ They all may be freely redistributed with documentation produced for the Fedora Project.

    - documentation-guide-0.2.6.1 (2005-08-24) + documentation-guide-0.2.6.3 (2005-09-18)

    Red Hat, Red Hat Network, the Red Hat "Shadow Man" logo, RPM, Maximum RPM, the RPM logo, Linux Library, PowerTools, Linux Undercover, RHmember, RHmember More, Rough Cuts, Index: s1-diagrams-images.php =================================================================== RCS file: /cvs/fedora/web/html/participate/documentation-guide/s1-diagrams-images.php,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- s1-diagrams-images.php 24 Aug 2005 17:49:48 -0000 1.3 +++ s1-diagrams-images.php 19 Sep 2005 18:50:48 -0000 1.4 @@ -7,7 +7,7 @@ ?> -

    2.5. Diagrams and Images
    Prev Chapter 2. Red Hat Documentation Guidelines Next

    2.5. Diagrams and Images

    +

    2.5. Diagrams and Images
    Prev Chapter 2. Red Hat Documentation Guidelines Next

    2.5. Diagrams and Images

    To be written

    Prev Up Next
    2.4. Screenshots Home Chapter 3. Emacs and PSGML Mode
    Index: s1-emacs-colors.php =================================================================== RCS file: /cvs/fedora/web/html/participate/documentation-guide/s1-emacs-colors.php,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- s1-emacs-colors.php 24 Aug 2005 17:49:48 -0000 1.3 +++ s1-emacs-colors.php 19 Sep 2005 18:50:48 -0000 1.4 @@ -7,7 +7,7 @@ ?> -
    3.2. Customizing Emacs
    Prev Chapter 3. Emacs and PSGML Mode Next

    3.2. Customizing Emacs

    +

    3.2. Customizing Emacs
    Prev Chapter 3. Emacs and PSGML Mode Next

    3.2. Customizing Emacs

    The colors, font, and geometry (default size of window) for Emacs in your ~/.Xresources file. The format for the settings is emacs.keyword:value Index: s1-screenshots.php =================================================================== RCS file: /cvs/fedora/web/html/participate/documentation-guide/s1-screenshots.php,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- s1-screenshots.php 24 Aug 2005 17:49:48 -0000 1.3 +++ s1-screenshots.php 19 Sep 2005 18:50:48 -0000 1.4 @@ -7,7 +7,7 @@ ?> -

    2.4. Screenshots
    Prev Chapter 2. Red Hat Documentation Guidelines Next

    2.4. Screenshots

    +

    2.4. Screenshots
    Prev Chapter 2. Red Hat Documentation Guidelines Next

    2.4. Screenshots

    There are two types of screenshots: graphical and textual. The philosophy on using these two types is rely on text over graphics. This means, if you can say it in text instead of Index: s1-tutorial-license.php =================================================================== RCS file: /cvs/fedora/web/html/participate/documentation-guide/s1-tutorial-license.php,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- s1-tutorial-license.php 24 Aug 2005 17:49:48 -0000 1.3 +++ s1-tutorial-license.php 19 Sep 2005 18:50:48 -0000 1.4 @@ -7,7 +7,7 @@ ?> -

    7.2. Including the License Information
    Prev Chapter 7. The Layout of a Tutorial Next

    7.2. Including the License Information

    +

    7.2. Including the License Information
    Prev Chapter 7. The Layout of a Tutorial Next

    7.2. Including the License Information

    All Fedora Project manuals must contain the file legalnotice.xml. This file makes the license for the file the GNU Free Documentation License (FDL). Index: s1-xml-admon.php =================================================================== RCS file: /cvs/fedora/web/html/participate/documentation-guide/s1-xml-admon.php,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- s1-xml-admon.php 24 Aug 2005 17:49:48 -0000 1.3 +++ s1-xml-admon.php 19 Sep 2005 18:50:48 -0000 1.4 @@ -7,12 +7,12 @@ ?> -

    2.3. Admonitions
    Prev Chapter 2. Red Hat Documentation Guidelines Next

    2.3. Admonitions

    There are five types of admonitions in DocBook: Caution, Important, +

    2.3. Admonitions
    Prev Chapter 2. Red Hat Documentation Guidelines Next

    2.3. Admonitions

    There are five types of admonitions in DocBook: Caution, Important, Note, Tip, and Warning.

    All of the admonitions have the same structure: an optional Title followed by paragraph-level elements. The DocBook DTD does not impose any specific semantics on the individual admonitions. For example, DocBook does not mandate that Warnings be reserved for cases where bodily harm can - result.

    2.3.1. Creating Notes, Tips, Cautions, Importants, and Warnings

    There are several ways to bring attention to text within a + result.

    2.3.1. Creating Notes, Tips, Cautions, Importants, and Warnings

    There are several ways to bring attention to text within a document. A Note is used to bring additional information to the users' attention. A Tip is used to show the user helpful information or another way to do Index: s1-xml-tag-sulink.php =================================================================== RCS file: /cvs/fedora/web/html/participate/documentation-guide/s1-xml-tag-sulink.php,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- s1-xml-tag-sulink.php 24 Aug 2005 17:49:48 -0000 1.3 +++ s1-xml-tag-sulink.php 19 Sep 2005 18:50:48 -0000 1.4 @@ -7,7 +7,7 @@ ?> -

    6.27. ulink
    Prev Chapter 6. DocBook XML Tags Next

    6.27. ulink

    +

    6.27. ulink
    Prev Chapter 6. DocBook XML Tags Next

    6.27. ulink

    To create a URL link within your text, use the following example: 

     


Index: s1-xml-tags-application.php
===================================================================
RCS file: /cvs/fedora/web/html/participate/documentation-guide/s1-xml-tags-application.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- s1-xml-tags-application.php	24 Aug 2005 17:49:48 -0000	1.3
+++ s1-xml-tags-application.php	19 Sep 2005 18:50:48 -0000	1.4
@@ -7,7 +7,7 @@
 
 ?>
 
-
    6.2. application
    Prev Chapter 6. DocBook XML Tags Next
    6.2. application
    An application is the name of a GUI software program. A command is
+
    6.2. application
    Prev Chapter 6. DocBook XML Tags Next
    6.2. application
    An application is the name of a GUI software program. A command is
 	the name of an executable (text) program or a software command.
    The <application> and
       </application> tags allow you to refer to an
       application or program. For example, the following XML:


Index: s1-xml-tags-chapter.php
===================================================================
RCS file: /cvs/fedora/web/html/participate/documentation-guide/s1-xml-tags-chapter.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- s1-xml-tags-chapter.php	24 Aug 2005 17:49:48 -0000	1.3
+++ s1-xml-tags-chapter.php	19 Sep 2005 18:50:48 -0000	1.4
@@ -7,7 +7,7 @@
 
 ?>
 
-
    6.3. chapter
    Prev Chapter 6. DocBook XML Tags Next
    6.3. chapter
    
+
    6.3. chapter
    Prev Chapter 6. DocBook XML Tags Next
    6.3. chapter
    
 	A DocBook book can be divided into chapters such as:
       
     


Index: s1-xml-tags-citetitle.php
===================================================================
RCS file: /cvs/fedora/web/html/participate/documentation-guide/s1-xml-tags-citetitle.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- s1-xml-tags-citetitle.php	24 Aug 2005 17:49:48 -0000	1.3
+++ s1-xml-tags-citetitle.php	19 Sep 2005 18:50:48 -0000	1.4
@@ -7,10 +7,10 @@
 
 ?>
 
-
    6.4. citetitle
    Prev Chapter 6. DocBook XML Tags Next
    6.4. citetitle
    
+
    6.4. citetitle
    Prev Chapter 6. DocBook XML Tags Next
    6.4. citetitle
    
 	The <citetitle> tag provides formatting for a
 	specific references (title can be manually typed out or if already
-	defined within your document set, given as an entity[1]
+	defined within your document set, given as an entity[1]
 	).
    
       For example:
     
    @@ -20,7 +20,7 @@
 
    
 	The output looks like Installation Guide because &IG; is an
 	entity.
-      

    [1] An
+      

    [1] An
 	entity is a short hand way of referring to another manual or guide. It
 	can be defined within the parent document or within a set of files that
 	your DTD references for your specific documentation set.
    Prev Up Next
    6.3. chapter Home 6.5. command
    


Index: s1-xml-tags-command.php
===================================================================
RCS file: /cvs/fedora/web/html/participate/documentation-guide/s1-xml-tags-command.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- s1-xml-tags-command.php	24 Aug 2005 17:49:48 -0000	1.3
+++ s1-xml-tags-command.php	19 Sep 2005 18:50:48 -0000	1.4
@@ -7,7 +7,7 @@
 
 ?>
 
-
    6.5. command
    Prev Chapter 6. DocBook XML Tags Next
    6.5. command
    An application is the name of a GUI software program. A command is
+
    6.5. command
    Prev Chapter 6. DocBook XML Tags Next
    6.5. command
    An application is the name of a GUI software program. A command is
 	the name of an executable (text) program or a software command. Any
 	program that is a command line or text-based only tool is marked with
 	command tags. 
    If you have text that is a command, use the


Index: s1-xml-tags-compoutput.php
===================================================================
RCS file: /cvs/fedora/web/html/participate/documentation-guide/s1-xml-tags-compoutput.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- s1-xml-tags-compoutput.php	24 Aug 2005 17:49:48 -0000	1.3
+++ s1-xml-tags-compoutput.php	19 Sep 2005 18:50:48 -0000	1.4
@@ -7,7 +7,7 @@
 
 ?>
 
-
    6.6. computeroutput
    Prev Chapter 6. DocBook XML Tags Next
    6.6. computeroutput
    
+
    6.6. computeroutput
    Prev Chapter 6. DocBook XML Tags Next
    6.6. computeroutput
    
 	To show computer output use the following tags:
       
     


Index: s1-xml-tags-emphasis.php
===================================================================
RCS file: /cvs/fedora/web/html/participate/documentation-guide/s1-xml-tags-emphasis.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- s1-xml-tags-emphasis.php	24 Aug 2005 17:49:48 -0000	1.3
+++ s1-xml-tags-emphasis.php	19 Sep 2005 18:50:48 -0000	1.4
@@ -7,7 +7,7 @@
 
 ?>
 
-
    6.7. emphasis
    Prev Chapter 6. DocBook XML Tags Next
    6.7. emphasis
    
+
    6.7. emphasis
    Prev Chapter 6. DocBook XML Tags Next
    6.7. emphasis
    
 	To emphasis content, use the <emphasis> and
 	</emphasis> tags. For example:
       
    

Index: s1-xml-tags-example.php
===================================================================
RCS file: /cvs/fedora/web/html/participate/documentation-guide/s1-xml-tags-example.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- s1-xml-tags-example.php	24 Aug 2005 17:49:48 -0000	1.3
+++ s1-xml-tags-example.php	19 Sep 2005 18:50:48 -0000	1.4
@@ -7,7 +7,7 @@
 
 ?>
 
-
    6.8. example
    Prev Chapter 6. DocBook XML Tags Next
    6.8. example
    The <example> and
+
    6.8. example
    Prev Chapter 6. DocBook XML Tags Next
    6.8. example
    The <example> and
       </example> tags are used to format text within a
       document and is great for adding emphasis to show examples of code,
       exercises, and more. 
    The <example> tag set should be given an ID


Index: s1-xml-tags-figure.php
===================================================================
RCS file: /cvs/fedora/web/html/participate/documentation-guide/s1-xml-tags-figure.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- s1-xml-tags-figure.php	24 Aug 2005 17:49:48 -0000	1.3
+++ s1-xml-tags-figure.php	19 Sep 2005 18:50:48 -0000	1.4
@@ -7,7 +7,7 @@
 
 ?>
 
-
    6.12. figure
    Prev Chapter 6. DocBook XML Tags Next
    6.12. figure
    [Important]Important
    
+
    6.12. figure
    Prev Chapter 6. DocBook XML Tags Next
    6.12. figure
    [Important]Important
    
 	  Order matters! The EPS file must be declared
 	  first.
 	
    


Index: s1-xml-tags-filename.php
===================================================================
RCS file: /cvs/fedora/web/html/participate/documentation-guide/s1-xml-tags-filename.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- s1-xml-tags-filename.php	24 Aug 2005 17:49:48 -0000	1.3
+++ s1-xml-tags-filename.php	19 Sep 2005 18:50:48 -0000	1.4
@@ -7,7 +7,7 @@
 
 ?>
 
-
    6.9. filename
    Prev Chapter 6. DocBook XML Tags Next
    6.9. filename
    
+
    6.9. filename
    Prev Chapter 6. DocBook XML Tags Next
    6.9. filename
    
 	The <filename> and
 	</filename> tags define a filename or path to a
 	file. Since directories are just special files, they are marked with the


Index: s1-xml-tags-firstterm.php
===================================================================
RCS file: /cvs/fedora/web/html/participate/documentation-guide/s1-xml-tags-firstterm.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- s1-xml-tags-firstterm.php	24 Aug 2005 17:49:48 -0000	1.3
+++ s1-xml-tags-firstterm.php	19 Sep 2005 18:50:48 -0000	1.4
@@ -7,7 +7,7 @@
 
 ?>
 
-
    6.10. firstterm
    Prev Chapter 6. DocBook XML Tags Next
    6.10. firstterm
    
+
    6.10. firstterm
    Prev Chapter 6. DocBook XML Tags Next
    6.10. firstterm
    
 	The <firstterm> and
 	</firstterm> tags helps to define a word that
 	may be unfamiliar to the user, but that will be seen commonly throughout


Index: s1-xml-tags-footnote.php
===================================================================
RCS file: /cvs/fedora/web/html/participate/documentation-guide/s1-xml-tags-footnote.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- s1-xml-tags-footnote.php	24 Aug 2005 17:49:48 -0000	1.3
+++ s1-xml-tags-footnote.php	19 Sep 2005 18:50:48 -0000	1.4
@@ -7,7 +7,7 @@
 
 ?>
 
-
    6.11. footnote
    Prev Chapter 6. DocBook XML Tags Next
    6.11. footnote
    
+
    6.11. footnote
    Prev Chapter 6. DocBook XML Tags Next
    6.11. footnote
    
 	If you need to make a footnote, use the following example:
       
     
@@ -23,9 +23,9 @@
 
    
 	The output:
       
    
-	For those of you who need to perform a server-class [2] installation, refer to the
+	For those of you who need to perform a server-class [2] installation, refer to the
 	Installation Guide.
-      

    [2] A
+      

    [2] A
 	    server-class installation sets up a typical server environment. Please note, no
 	    graphical environment is installed during a server-class installation.
    Prev Up Next
    6.10. firstterm Home 6.12. figure
    
 


Index: s1-xml-tags-gui.php
===================================================================
RCS file: /cvs/fedora/web/html/participate/documentation-guide/s1-xml-tags-gui.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- s1-xml-tags-gui.php	24 Aug 2005 17:49:48 -0000	1.3
+++ s1-xml-tags-gui.php	19 Sep 2005 18:50:48 -0000	1.4
@@ -7,7 +7,7 @@
 
 ?>
 
-
    6.13. GUI Tags
    Prev Chapter 6. DocBook XML Tags Next
    6.13. GUI Tags
    6.13.1. guilabel
    
+
    6.13. GUI Tags
    Prev Chapter 6. DocBook XML Tags Next
    6.13. GUI Tags
    6.13.1. guilabel
    
 	  Use the <guilabel> and
 	  </guilabel> tags as a default for GUI
 	  descriptions, like a screen name or screen title. For example:
@@ -21,7 +21,7 @@
 	
    
 	  The Authentication Configuration screen shows you how to
 	  make your system more secure.
-	
    6.13.2. guibutton
    
+	
    6.13.2. guibutton
    
 	  Use the <guibutton> and
 	  </guibutton> tags to denote a button on a screen or
 	  menu. For example:
@@ -35,7 +35,7 @@
 	
    
 	  Check the Activate on boot button to have the X
 	  Window System start automatically.
-	
    6.13.3. guiicon
    
+	
    6.13.3. guiicon
    
 	  The <guiicon> and </guiicon>
 	  tags are used to denote a panel or desktop icon. For example:
 	
    @@ -47,7 +47,7 @@
 	
    
 	  Double-click the Start Here icon on the desktop.
 	
    6.13.4. guimenu and
-	  guimenuitem
    
+	  guimenuitem
    
 	  To note a menu (like in the installation program or within the control panel),
 	  use the <guimenu> and
 	  </guimenu> tags. 


Index: s1-xml-tags-indexing.php
===================================================================
RCS file: /cvs/fedora/web/html/participate/documentation-guide/s1-xml-tags-indexing.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- s1-xml-tags-indexing.php	24 Aug 2005 17:49:48 -0000	1.3
+++ s1-xml-tags-indexing.php	19 Sep 2005 18:50:48 -0000	1.4
@@ -7,7 +7,7 @@
 
 ?>
 
-
    6.17. Index Entries
    Prev Chapter 6. DocBook XML Tags Next
    6.17. Index Entries
    The following command sequence shows you the code inserted into
+
    6.17. Index Entries
    Prev Chapter 6. DocBook XML Tags Next
    6.17. Index Entries
    The following command sequence shows you the code inserted into
 	the body of the text to add an index entry to your document:
 	
     
@@ -16,11 +16,11 @@
 <secondary>bar</secondary> <-- "bar" will be listed under "foo" 
 </indexterm> <-- closes this index entry
 
-
    The <seealso> tag allows you to
+
    The <seealso> tag allows you to
 	reference another index entry or refer to another manual. Make sure
 	the <seealso> reference you are pointing to
 	has its own entry. For example:
-      
    +      
     
 <indexterm> 
 <primary>SWAK</primary> 
@@ -32,10 +32,10 @@
 <primary>salutations</primary> 
 </indexterm>
 
-
    
+
    
 	The <see> tag allows you to reference to
 	another index entry entirely. For example:
-      
    +      
     
 <indexterm> 
 <primary>Guinness</primary> 
@@ -48,7 +48,7 @@
 <primary>beer</primary>
 </indexterm>
 
-
    To view the HTML output of the index entries shown here, refer
+
    To view the HTML output of the index entries shown here, refer
 	to the generated-index.php file at the end of
 	this document.
    How does the index get generated? If indexterms exist in the
 	document and the beginning and ending index tags exist before the end


Index: s1-xml-tags-keycap.php
===================================================================
RCS file: /cvs/fedora/web/html/participate/documentation-guide/s1-xml-tags-keycap.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- s1-xml-tags-keycap.php	24 Aug 2005 17:49:48 -0000	1.3
+++ s1-xml-tags-keycap.php	19 Sep 2005 18:50:48 -0000	1.4
@@ -7,7 +7,7 @@
 
 ?>
 
-
    6.14. keycap
    Prev Chapter 6. DocBook XML Tags Next
    6.14. keycap
    
+
    6.14. keycap
    Prev Chapter 6. DocBook XML Tags Next
    6.14. keycap
    
 	To denote a specific key, you will need to use the
 	<keycap> and </keycap>
 	tags. Brackets are automatically added around the keycap, so do not add
@@ -20,7 +20,7 @@
 	The output:
       
    
 	To make your selection, press the Enter key.
-      
    6.14.1. menuchoice
    
+      
    6.14.1. menuchoice
    
 	  Often using a mouse is tedious for common tasks. Therefore,
 	  programmers often build in keyboard-shortcuts to simplify their
 	  program. These should be described using the shortcut tag as a wrapper
@@ -42,7 +42,7 @@
       
    
 	  Go to the menu bar and choose: 
 	  File->Save (Ctrl-s).
-	
    6.14.2. keycombo
    
+	
    6.14.2. keycombo
    
 	  To illustrate a key combination, you need to use the
 	  <keycombo> and
 	  </keycombo>,


Index: s1-xml-tags-lists.php
===================================================================
RCS file: /cvs/fedora/web/html/participate/documentation-guide/s1-xml-tags-lists.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- s1-xml-tags-lists.php	24 Aug 2005 17:49:48 -0000	1.3
+++ s1-xml-tags-lists.php	19 Sep 2005 18:50:48 -0000	1.4
@@ -7,11 +7,11 @@
 
 ?>
 
-
    6.15. Lists
    Prev Chapter 6. DocBook XML Tags Next
    6.15. Lists
    There are several types of lists you can create using XML. You
+
    6.15. Lists
    Prev Chapter 6. DocBook XML Tags Next
    6.15. Lists
    There are several types of lists you can create using XML. You
 	can have a itemized (bulleted) list, a ordered (numbered) list, or a
 	variable list (presents a term and then a separate paragraph).
    There is also a list format for tables and for for creating a
 	list of glossary terms and their definitions.
    The sections below will discuss the proper uses for the various
-	list and how to create them.
    6.15.1. itemizedlist
    An ItemizedList is best used to present
+	list and how to create them.
    6.15.1. itemizedlist
    An ItemizedList is best used to present
 	  information that is important for the reader to know, but that does
 	  not need to be in a specific order. It is shorter than a
 	  VariableList and presents the information in a
@@ -38,7 +38,7 @@
   </listitem>
 </itemizedlist>
 
-
    The output looks like:
    • Getting familiar with the installation program's user interface
    • Starting the installation program
    • Selecting an installation method
    6.15.2. OrderedList
    An orderedlist is best used to present
+
    The output looks like:
    • Getting familiar with the installation program's user interface
    • Starting the installation program
    • Selecting an installation method
    6.15.2. OrderedList
    An orderedlist is best used to present
 	  information that is important for the reader to know in a specific
 	  order. orderedlists are a good way to convey
 	  step-by-step senarios to the audience you are writing for.
    
@@ -82,7 +82,7 @@
 	      errata. Using these URLs, you can download any necessary
 	      diskette images. Please note: use binary mode when transferring
 	      a diskette image.
-	    
    6.15.3. Variablelist
    A variablelist best represents a list of
+	    
    6.15.3. Variablelist
    A variablelist best represents a list of
 	  terms and definitions or descriptions for those terms.
    To create a variablelist, use the following
 	  command sequence:
 	
    [Note]Note
    Notice below that the text for the list
@@ -125,7 +125,7 @@
 	    Do not specify the
 	    frame attribute to the table. Doing
 	    so breaks PDF production.
-	  
    6.15.4. Creating a List Within a Table Using Simplelist
    A simplelist is an unadorned list of
+	  
    6.15.4. Creating a List Within a Table Using Simplelist
    A simplelist is an unadorned list of
 	  items. simplelists can be inline or arranged in
 	  columns.
    We use simplelist to add separate paragraphs
 	  of text within a table element. A regular list, such as
@@ -208,7 +208,7 @@
 	    used. The  <entry> and <simplelist> tags must be aligned
 	    beside one another, otherwise you will receive a parsing error.
    For each paragraph or list item to be added within a
 	  SimpleList, the <member> tag set must be
-	  added around that particular text item.
    6.15.5. glosslist
    Use the glosslist command set to create a
+	  added around that particular text item.
    6.15.5. glosslist
    Use the glosslist command set to create a
 	  list of glossary terms and their definitions.
    In XML, an example looks like the following:
     
 	  <glosslist>


Index: s1-xml-tags-option.php
===================================================================
RCS file: /cvs/fedora/web/html/participate/documentation-guide/s1-xml-tags-option.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- s1-xml-tags-option.php	24 Aug 2005 17:49:48 -0000	1.3
+++ s1-xml-tags-option.php	19 Sep 2005 18:50:48 -0000	1.4
@@ -7,7 +7,7 @@
 
 ?>
 
-
    6.16. option
    Prev Chapter 6. DocBook XML Tags Next
    6.16. option
    If you have a command that offers an option or a flag, use the
+
    6.16. option
    Prev Chapter 6. DocBook XML Tags Next
    6.16. option
    If you have a command that offers an option or a flag, use the
 	<option> and
 	</option> tags.
       
    [Note]Note
    The <option> tag set is only meant to be used for command


Index: s1-xml-tags-para.php
===================================================================
RCS file: /cvs/fedora/web/html/participate/documentation-guide/s1-xml-tags-para.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- s1-xml-tags-para.php	24 Aug 2005 17:49:48 -0000	1.3
+++ s1-xml-tags-para.php	19 Sep 2005 18:50:48 -0000	1.4
@@ -7,7 +7,7 @@
 
 ?>
 
-
    6.18. para
    Prev Chapter 6. DocBook XML Tags Next
    6.18. para
    For any paragraph, the <para> and
+
    6.18. para
    Prev Chapter 6. DocBook XML Tags Next
    6.18. para
    For any paragraph, the <para> and
 	</para> tags must open and close that
 	particular paragraph.
       
    Do not use para tags around anything other than a simple


Index: s1-xml-tags-part.php
===================================================================
RCS file: /cvs/fedora/web/html/participate/documentation-guide/s1-xml-tags-part.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- s1-xml-tags-part.php	24 Aug 2005 17:49:48 -0000	1.3
+++ s1-xml-tags-part.php	19 Sep 2005 18:50:48 -0000	1.4
@@ -7,7 +7,7 @@
 
 ?>
 
-
    6.19. part
    Prev Chapter 6. DocBook XML Tags Next
    6.19. part
    
+
    6.19. part
    Prev Chapter 6. DocBook XML Tags Next
    6.19. part
    
 	In the parent file, you can separate the chapters into parts to divide
 	them into logical groups. For example, in the parent file, the
 	part tags surround the chapter entities:


Index: s1-xml-tags-prompt.php
===================================================================
RCS file: /cvs/fedora/web/html/participate/documentation-guide/s1-xml-tags-prompt.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- s1-xml-tags-prompt.php	24 Aug 2005 17:49:48 -0000	1.3
+++ s1-xml-tags-prompt.php	19 Sep 2005 18:50:48 -0000	1.4
@@ -7,7 +7,7 @@
 
 ?>
 
-
    6.20. prompt
    Prev Chapter 6. DocBook XML Tags Next
    6.20. prompt
    
+
    6.20. prompt
    Prev Chapter 6. DocBook XML Tags Next
    6.20. prompt
    
 	To show a prompt, such as a root or DOS prompt, use the
 	<prompt> and </prompt>
 	commands. For example:


Index: s1-xml-tags-replaceable.php
===================================================================
RCS file: /cvs/fedora/web/html/participate/documentation-guide/s1-xml-tags-replaceable.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- s1-xml-tags-replaceable.php	24 Aug 2005 17:49:48 -0000	1.3
+++ s1-xml-tags-replaceable.php	19 Sep 2005 18:50:48 -0000	1.4
@@ -7,7 +7,7 @@
 
 ?>
 
-
    6.21. replaceable
    Prev Chapter 6. DocBook XML Tags Next
    6.21. replaceable
    
+
    6.21. replaceable
    Prev Chapter 6. DocBook XML Tags Next
    6.21. replaceable
    
 	To create replaceable text, use the tags
 	<replaceable> and
 	</replaceable> around the text you want to use as a


Index: s1-xml-tags-screen.php
===================================================================
RCS file: /cvs/fedora/web/html/participate/documentation-guide/s1-xml-tags-screen.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- s1-xml-tags-screen.php	24 Aug 2005 17:49:48 -0000	1.3
+++ s1-xml-tags-screen.php	19 Sep 2005 18:50:48 -0000	1.4
@@ -7,7 +7,7 @@
 
 ?>
 
-
    6.22. screen
    Prev Chapter 6. DocBook XML Tags Next
    6.22. screen
    
+
    6.22. screen
    Prev Chapter 6. DocBook XML Tags Next
    6.22. screen
    
       The <screen> command is used to format text
       within a document and is great for adding emphasis to show examples of
       code, computer output, and more. In HTML with the Fedora CSS file, this


Index: s1-xml-tags-sections.php
===================================================================
RCS file: /cvs/fedora/web/html/participate/documentation-guide/s1-xml-tags-sections.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- s1-xml-tags-sections.php	24 Aug 2005 17:49:48 -0000	1.3
+++ s1-xml-tags-sections.php	19 Sep 2005 18:50:48 -0000	1.4
@@ -7,7 +7,7 @@
 
 ?>
 
-
    6.23. Sections
    Prev Chapter 6. DocBook XML Tags Next
    6.23. Sections
    Within an article (or chapter if it is a DocBook XML book like the
+
    6.23. Sections
    Prev Chapter 6. DocBook XML Tags Next
    6.23. Sections
    Within an article (or chapter if it is a DocBook XML book like the
 	Installation Guide), you can have sections and
 	subsections. <sect1> is always the highest
 	section and you cannot have two sections of the same level within one


Index: s1-xml-tags-table.php
===================================================================
RCS file: /cvs/fedora/web/html/participate/documentation-guide/s1-xml-tags-table.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- s1-xml-tags-table.php	24 Aug 2005 17:49:48 -0000	1.3
+++ s1-xml-tags-table.php	19 Sep 2005 18:50:48 -0000	1.4
@@ -7,7 +7,7 @@
 
 ?>
 
-
    6.24. table
    Prev Chapter 6. DocBook XML Tags Next
    6.24. table
    
+
    6.24. table
    Prev Chapter 6. DocBook XML Tags Next
    6.24. table
    
 	The following is an example of creating a table. 
       
     <table id="tb-mockup-before-begin">
@@ -78,7 +78,7 @@
 </tbody> 
 </tgroup> 
 </table> 
-
    Features GNOMEKDE
    highly configurableyesyes
    multiple window managers yesyes
    Internet applicationsyes yes 
    Table 6.2. Available Features of GNOME and KDE
    6.24.1. Creating a List Within a Table
    Creating a list within a table can be a difficult task. It
+
    Features GNOMEKDE
    highly configurableyesyes
    multiple window managers yesyes
    Internet applicationsyes yes 
    Table 6.2. Available Features of GNOME and KDE
    6.24.1. Creating a List Within a Table
    Creating a list within a table can be a difficult task. It
 	  requires strict formatting and a set of commands that are not
 	  available for command completion in
 	  Emacs.
    The tags you will need to use are


Index: s1-xml-tags-trademark.php
===================================================================
RCS file: /cvs/fedora/web/html/participate/documentation-guide/s1-xml-tags-trademark.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- s1-xml-tags-trademark.php	24 Aug 2005 17:49:48 -0000	1.3
+++ s1-xml-tags-trademark.php	19 Sep 2005 18:50:48 -0000	1.4
@@ -7,7 +7,7 @@
 
 ?>
 
-
    6.25. trademark
    Prev Chapter 6. DocBook XML Tags Next
    6.25. trademark
    Do not use the trademark entities &trade;, &copy;, or
+
    6.25. trademark
    Prev Chapter 6. DocBook XML Tags Next
    6.25. trademark
    Do not use the trademark entities &trade;, &copy;, or
 	&reg; because the do not produce HTML output that works for all
 	charsets. The HTML output produces by these entities are declared in
 	the DTD and cannot be changed via the stylesheet.
    Instead, use the trademark tag and its


Index: s1-xml-tags-userinput.php
===================================================================
RCS file: /cvs/fedora/web/html/participate/documentation-guide/s1-xml-tags-userinput.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- s1-xml-tags-userinput.php	24 Aug 2005 17:49:48 -0000	1.3
+++ s1-xml-tags-userinput.php	19 Sep 2005 18:50:48 -0000	1.4
@@ -7,7 +7,7 @@
 
 ?>
 
-
    6.26. userinput
    Prev Chapter 6. DocBook XML Tags Next
    6.26. userinput
    
+
    6.26. userinput
    Prev Chapter 6. DocBook XML Tags Next
    6.26. userinput
    
 	To show what a user would type, use the userinput
 	tag. For example:
       
    

Index: s1-xml-tags-wordasword.php
===================================================================
RCS file: /cvs/fedora/web/html/participate/documentation-guide/s1-xml-tags-wordasword.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- s1-xml-tags-wordasword.php	24 Aug 2005 17:49:48 -0000	1.3
+++ s1-xml-tags-wordasword.php	19 Sep 2005 18:50:48 -0000	1.4
@@ -7,7 +7,7 @@
 
 ?>
 
-
    6.28. wordasword
    Prev Chapter 6. DocBook XML Tags Next
    6.28. wordasword
    The <wordasword> tag set is used to define a word meant
+
    6.28. wordasword
    Prev Chapter 6. DocBook XML Tags Next
    6.28. wordasword
    The <wordasword> tag set is used to define a word meant
 	specifically as a word and not representing anything else.
    A lot of technical documentation contains words that have overloaded
 	meanings. Sometimes it is useful to be able to use a word without invoking
 	its technical meaning. The <wordasword> element identifies a word or


Index: s1-xml-tags-xref.php
===================================================================
RCS file: /cvs/fedora/web/html/participate/documentation-guide/s1-xml-tags-xref.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- s1-xml-tags-xref.php	24 Aug 2005 17:49:48 -0000	1.3
+++ s1-xml-tags-xref.php	19 Sep 2005 18:50:48 -0000	1.4
@@ -7,7 +7,7 @@
 
 ?>
 
-
    6.29. xref
    Prev Chapter 6. DocBook XML Tags Next
    6.29. xref
    
+
    6.29. xref
    Prev Chapter 6. DocBook XML Tags Next
    6.29. xref
    
 	To refer to other sections or chapters within a manual, use the
 	<xref> tag.
       
    




Index: sn-cvs-config.php
===================================================================
RCS file: /cvs/fedora/web/html/participate/documentation-guide/sn-cvs-config.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sn-cvs-config.php	24 Aug 2005 17:56:10 -0000	1.1
+++ sn-cvs-config.php	19 Sep 2005 18:50:48 -0000	1.2
@@ -7,7 +7,7 @@
 
 ?>
 
-
    10.3. Configuring For CVS Access
    Prev Chapter 10. CVS Next
    10.3. Configuring For CVS Access
    10.3.1. Avoiding Repetitive Typing
    
+
    10.3. Configuring For CVS Access
    Prev Chapter 10. CVS Next
    10.3. Configuring For CVS Access
    10.3.1. Avoiding Repetitive Typing
    
         Many CVS commands need certain
         command line switches to operate consistently. Rather than
         typing them every time that command is used, you can save the
@@ -21,7 +21,7 @@
 diff -uNp
 rdiff -uNp
 update -dP
    
-      
    10.3.2. Configuring for Read-Only CVS Access
    
+      
    10.3.2. Configuring for Read-Only CVS Access
    
         If your goal is to download the various Fedora Core documents and to
         render them on your system, you only need read-only access to
         the CVS repository. Follow the
@@ -33,7 +33,7 @@
         following commands:
       
    $ export CVSROOT=:pserver:cvs.fedora.redhat.com:/cvs/docs
 $ cvs login
-$ cvs checkout docs-setup module-name
+$ cvs checkout docs-common module-name
 $ cvs checkout module-name
 $ cd module-name
    
         Once you have checked the module out, it doesn't matter what
@@ -45,7 +45,7 @@
         CVS/ directory, the
         CVS program will automatically locate
         the Fedora Core repository.
-      
    10.3.3. Configuring Read/Write CVS Access
    
+      
    10.3.3. Configuring Read/Write CVS Access
    
         To author a new document or to change an existing one, you must
         obtain full read/write access to the Fedora Core Docs
         CVS repository. For the full details


Index: sn-cvs-cvscommands.php
===================================================================
RCS file: /cvs/fedora/web/html/participate/documentation-guide/sn-cvs-cvscommands.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sn-cvs-cvscommands.php	24 Aug 2005 17:56:10 -0000	1.1
+++ sn-cvs-cvscommands.php	19 Sep 2005 18:50:48 -0000	1.2
@@ -7,7 +7,7 @@
 
 ?>
 
-
    10.4. Basic CVS Commands
    Prev Chapter 10. CVS Next
    10.4. Basic CVS Commands
    
+
    10.4. Basic CVS Commands
    Prev Chapter 10. CVS Next
    10.4. Basic CVS Commands
    
       After configuring your system to work with CVS, checkout the
       modules you will be working on.
     
    [Tip]Tip
    
@@ -22,7 +22,7 @@
         CVS ignores any
         $CVSROOT
         or -m command line switch.
-      
    10.4.1. Checking Out Modules
    
+      
    10.4.1. Checking Out Modules
    
         You only need to checkout a module once. After a local copy of
         the module is on your system, it is on your system.
       
    
@@ -38,7 +38,7 @@
         If a branch name is not specified when checking out a module, it
         is referred to as the HEAD of the
         CVS module.
-      
    10.4.1.1. Checking Out Branches of Modules
    
+      
    10.4.1.1. Checking Out Branches of Modules
    
           Think of a CVS branch as a version
           of the files for a particular version of a manual or package.
         
    
@@ -81,7 +81,7 @@
           Only tags marked as branches in the second column under the
           Existing Tags section can be
           checked out as a branch.
-        
    10.4.2. Updating Files
    
+        
    10.4.2. Updating Files
    
         To retrieve the latest versions of the files in a module, change
         to the directory that contains the files for the module and
         execute the command:
@@ -89,7 +89,7 @@
         The latest versions of all the files in the module are
         downloaded into your local copy. If you notice a file conflict,
         refer to Section 10.4.8, “Resolving Conflicts”.
-      
    10.4.3. Committing Files
    
+      
    10.4.3. Committing Files
    
         After modifying files in your local version of a module, commit
         them to save the changes on the CVS
         server:
@@ -123,13 +123,13 @@
       
    
         If you notice a file conflict, refer to
         Section 10.4.8, “Resolving Conflicts”.
-      
    10.4.4. Adding Files
    
+      
    10.4.4. Adding Files
    
         To add a file to a module, create the file in your local copy
         then execute the following command:
       
    $ cvs add  file-to-add
    
         After adding the file, you must commit the
         add to copy it to the server:
-      
    $ cvs commit -m "some log message" file-to-add
    10.4.5. Managing Binary Files
    
+      
    $ cvs commit -m "some log message" file-to-add
    10.4.5. Managing Binary Files
    
         The most commonly-archived files are simple text files but
         sometimes binary files are also archived. The
         cvs program recognizes most common
@@ -160,7 +160,7 @@
           it corrupted when it is checked out, do not panic. Simply use
           the admin command as described above, delete
           your local file copy, and check it out again.
-        
    10.4.6. Removing Files
    
+        
    10.4.6. Removing Files
    
         If a file is no longer needed in the module, use the
         remove command to remove it from your local
         copy and then commit the removal to the
@@ -182,7 +182,7 @@
         email to
         cvsdocs-administrator at fedora.redhat.com
          asking to have the file renamed.
-      
    10.4.7. Status of Files
    
+      
    10.4.7. Status of Files
    
         Sometimes it is necessary to view the
         status of a file in a
         CVS module. To view the status of a
@@ -233,7 +233,7 @@
               generated-index.sgml or for files
               that you want to add to the repository but have not yet
               issued the cvs add command.
-

    10.4.8. Resolving Conflicts

    +

    10.4.8. Resolving Conflicts

    If you modify a file and the same region is modified by someone else and committed first, you will probably see a message similar to the following when committing the file or updating @@ -274,7 +274,7 @@ the content from the server.

    Resolve the conflict by editing your copy, and commit the file. -

    10.4.9. Summary

    +

    10.4.9. Summary

    All commands assume you are in the proper directory for the CVS module.

    CommandDescription
    cvs checkout Index: sn-cvs-preparation.php =================================================================== RCS file: /cvs/fedora/web/html/participate/documentation-guide/sn-cvs-preparation.php,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sn-cvs-preparation.php 24 Aug 2005 17:56:10 -0000 1.1 +++ sn-cvs-preparation.php 19 Sep 2005 18:50:48 -0000 1.2 @@ -7,12 +7,12 @@ ?> -
    10.2. Preparing For CVS Use
    Prev Chapter 10. CVS Next

    10.2. Preparing For CVS Use

    +

    10.2. Preparing For CVS Use
    Prev Chapter 10. CVS Next

    10.2. Preparing For CVS Use

    Before using CVS, you need to establish an account with the CVS server. After getting an account, you do not need to perform these actions again. -

    10.2.1. Is CVS Installed On Your System

    +

    10.2.1. Is CVS Installed On Your System

    You must have the CVS RPM package installed. Verify its presence by typing the command: @@ -24,7 +24,7 @@ cvs package before continuing. If you do not know how to do this, consult your system administrator who can install it for you. -

    10.2.2. Generating SSH Keys

    +

    10.2.2. Generating SSH Keys

    The CVS server uses SSH Protocol 2 keys to authenticate users. Thus, you need to generate a pair of keys before applying @@ -44,7 +44,7 @@ required for an cvs.fedora.redhat.com CVS account. -

    1. +

      1. To generate a DSA key to work with version 2.0 protocol, at a shell prompt, --- s1-cvs-configure.php DELETED --- --- s1-cvs-cvscommands.php DELETED --- From fedora-extras-commits at redhat.com Mon Sep 19 18:58:10 2005 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Mon, 19 Sep 2005 14:58:10 -0400 Subject: rpms/nexuiz/FC-4 .cvsignore, 1.2, 1.3 nexuiz.spec, 1.3, 1.4 sources, 1.2, 1.3 Message-ID: <200509191858.j8JIwAAO029807@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/rpms/nexuiz/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29784 Modified Files: .cvsignore nexuiz.spec sources Log Message: * Mon Sep 19 2005 Adrian Reber - 1.2.1-1 - updated to 1.2.1 - icons and binaries are now being renamed from darkplaces* to nexuiz* Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/nexuiz/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 9 Jul 2005 11:59:33 -0000 1.2 +++ .cvsignore 19 Sep 2005 18:58:07 -0000 1.3 @@ -1 +1 @@ -nexuiz-1.1.tar.bz2 +nexuizenginesource20050911.zip Index: nexuiz.spec =================================================================== RCS file: /cvs/extras/rpms/nexuiz/FC-4/nexuiz.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- nexuiz.spec 16 Aug 2005 08:16:57 -0000 1.3 +++ nexuiz.spec 19 Sep 2005 18:58:07 -0000 1.4 @@ -1,17 +1,14 @@ Summary: Multiplayer, deathmatch oriented first person shooter Name: nexuiz -Version: 1.1 -Release: 2%{?dist} +Version: 1.2.1 +Release: 1%{?dist} License: GPL Group: Amusements/Games URL: http://www.nexuiz.com/ # Source is custom, obtained with : -# wget http://dl.sf.net/sourceforge/nexuiz/nexuiz11.zip -# unzip nexuiz11.zip -# mkdir nexuiz-1.1/ -# mv Nexuiz/sources/darkplaces/* Nexuiz/Readme.htm nexuiz-1.1/ -# tar cjvf nexuiz-1.1.tar.bz2 nexuiz-1.1/ -Source: nexuiz-%{version}.tar.bz2 +# wget http://dl.sf.net/sourceforge/nexuiz/nexuiz121.zip +# unzip nexuiz121.zip Nexuiz/nexuizenginesource20050911.zip +Source: nexuizenginesource20050911.zip Patch0: nexuiz-1.0-basedir.patch Patch1: nexuiz-1.1-nostrip.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -22,7 +19,7 @@ # and therefore it isn't picked up by RPM during build Requires: libz.so.1 libvorbis.so.0 libvorbisfile.so.3 libjpeg.so.62 Requires: desktop-file-utils >= 0.9 -Requires: nexuiz-data +Requires: nexuiz-data = %{version} Requires(post): desktop-file-utils Requires(postun): desktop-file-utils @@ -34,7 +31,7 @@ %package server Group: Amusements/Games Summary: Dedicated server for the Nexuiz first person shooter -Requires: nexuiz-data +Requires: nexuiz-data = %{version} # This is necessary as these libraries are loaded during runtime # and therefore it isn't picked up by RPM during build Requires: libz.so.1 @@ -47,15 +44,15 @@ %prep -%setup -q +%setup -q -n darkplaces %patch0 -p0 -b .basedir %patch1 -p0 -b .nostrip -%{__sed} -i 's/\r//' Readme.htm +%{__sed} -i 's/\r//' darkplaces.txt %build -%{__make} %{?_smp_mflags} cl-release sv-release OPTIM_RELEASE="$RPM_OPT_FLAGS" -convert nexuiz.ico nexuiz.png +%{__make} cl-release sv-release OPTIM_RELEASE="$RPM_OPT_FLAGS" +convert darkplaces.ico nexuiz.png %install @@ -63,8 +60,10 @@ # Install the main programs %{__mkdir_p} %{buildroot}%{_bindir} -%{__install} -m 0755 nexuiz-{glx,dedicated} \ - %{buildroot}%{_bindir}/ +%{__install} -m 0755 darkplaces-glx \ + %{buildroot}%{_bindir}/nexuiz-glx +%{__install} -m 0755 darkplaces-dedicated \ + %{buildroot}%{_bindir}/nexuiz-dedicated # Create the desktop file %{__cat} > %{name}.desktop << EOF @@ -111,18 +110,28 @@ %files %defattr(-,root,root,-) -%doc Readme.htm COPYING +%doc COPYING darkplaces.txt %{_bindir}/nexuiz-glx %{_datadir}/icons/hicolor/*/apps/nexuiz.png %{_datadir}/applications/*%{name}.desktop %files server %defattr(-,root,root,-) -%doc Readme.htm COPYING +%doc COPYING darkplaces.txt %{_bindir}/nexuiz-dedicated %changelog +* Mon Sep 19 2005 Adrian Reber - 1.2.1-1 +- updated to 1.2.1 +- icons and binaries are now being renamed from darkplaces* to nexuiz* + +* Fri Sep 02 2005 Adrian Reber - 1.2-2 +- another try without smp_mflags + +* Fri Sep 02 2005 Adrian Reber - 1.2-1 +- updated to 1.2 + * Tue Aug 16 2005 Adrian Reber - 1.1-2 - support building on RHEL4 (#165522) Index: sources =================================================================== RCS file: /cvs/extras/rpms/nexuiz/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 9 Jul 2005 11:59:33 -0000 1.2 +++ sources 19 Sep 2005 18:58:07 -0000 1.3 @@ -1 +1 @@ -a2177339360d4ad19816c66a7dfd0353 nexuiz-1.1.tar.bz2 +ea845ee2842ad6a2304da1f0b2c95bdd nexuizenginesource20050911.zip From fedora-extras-commits at redhat.com Mon Sep 19 20:47:00 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Mon, 19 Sep 2005 16:47:00 -0400 Subject: rpms/sbcl/FC-4 sbcl.spec, 1.11, 1.12 sbcl-0.9.4-ADDR_NO_RANDOMIZE-argv0.patch, 1.1, NONE sbcl-0.9.4-ADDR_NO_RANDOMIZE-proc.patch, 1.1, NONE Message-ID: <200509192047.j8JKl0Mo000335@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/sbcl/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv316 Modified Files: sbcl.spec Removed Files: sbcl-0.9.4-ADDR_NO_RANDOMIZE-argv0.patch sbcl-0.9.4-ADDR_NO_RANDOMIZE-proc.patch Log Message: * Mon Sep 19 2005 Rex Dieter 0.9.4-16 - rework personality/reexec patch (execve -> execvp) Index: sbcl.spec =================================================================== RCS file: /cvs/extras/rpms/sbcl/FC-4/sbcl.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- sbcl.spec 16 Sep 2005 19:54:35 -0000 1.11 +++ sbcl.spec 19 Sep 2005 20:46:58 -0000 1.12 @@ -24,12 +24,12 @@ Name: sbcl Summary: Steel Bank Common Lisp Version: 0.9.4 -Release: 15%{?dist} +Release: 16%{?dist} License: BSD/MIT Group: Development/Languages URL: http://sbcl.sourceforge.net/ -Source0: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-%{version}-source.tar.bz2 +Source0: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-%{version}-source.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) ExclusiveArch: %{ix86} x86_64 @@ -51,11 +51,7 @@ %endif Patch1: sbcl-0.8.18-default-sbcl-home.patch -# See http://sourceforge.net/mailarchive/message.php?msg_id=12787069 -# use /proc/self/exe -#Patch2: sbcl-0.9.4-ADDR_NO_RANDOMIZE-proc.patch -# use argv[0] -Patch2: sbcl-0.9.4-ADDR_NO_RANDOMIZE-argv0.patch +Patch2: sbcl-0.9.4-personality.patch Patch3: sbcl-0.9.4-optflags.patch Patch4: sbcl-0.9.4-LIB_DIR.patch @@ -79,7 +75,7 @@ #sed -i -e "s|/usr/local/lib/sbcl/|%{_libdir}/sbcl/|" src/runtime/runtime.c #or patch to use SBCL_HOME env var %patch1 -p0 -b .default-sbcl-home -%{?setarch:%patch2 -p1 -b .ADDR_NO_RANDOMIZE} +%patch2 -p1 -b .personality %patch3 -p1 -b .optflags %patch4 -p1 -b .LIB_DIR @@ -125,8 +121,6 @@ %check || : pushd tests -# still need setarch if using ADDR_NO_RANDOMIZE-proc patch, since /proc isn't available on buildsystem/mock. -#{?setarch} sh ./run-tests.sh sh ./run-tests.sh popd @@ -138,7 +132,6 @@ unset SBCL_HOME ||: export INSTALL_ROOT=$RPM_BUILD_ROOT%{_prefix} export LIB_DIR=$RPM_BUILD_ROOT%{_libdir} -# (may) still need setarch if using ADDR_NO_RANDOMIZE-proc patch sh ./install.sh ## Unpackaged files @@ -177,6 +170,9 @@ %changelog +* Mon Sep 19 2005 Rex Dieter 0.9.4-16 +- rework personality/reexec patch (execve -> execvp) + * Sat Sep 16 2005 Rex Dieter 0.9.4-15 - disable ppc (probably related to #166347) --- sbcl-0.9.4-ADDR_NO_RANDOMIZE-argv0.patch DELETED --- --- sbcl-0.9.4-ADDR_NO_RANDOMIZE-proc.patch DELETED --- From fedora-extras-commits at redhat.com Mon Sep 19 20:47:51 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Mon, 19 Sep 2005 16:47:51 -0400 Subject: rpms/sbcl/FC-4 sbcl-0.9.4-personality.patch, NONE, 1.1 sbcl.spec, 1.12, 1.13 Message-ID: <200509192047.j8JKlpcq000411@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/sbcl/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv389 Modified Files: sbcl.spec Added Files: sbcl-0.9.4-personality.patch Log Message: forgot new patch sbcl-0.9.4-personality.patch: --- NEW FILE sbcl-0.9.4-personality.patch --- --- sbcl-0.9.4/src/runtime/os.h.ADDR_NO_RANDOMIZE 2005-07-14 10:41:20.000000000 -0500 +++ sbcl-0.9.4/src/runtime/os.h 2005-09-13 11:23:31.319884384 -0500 @@ -50,7 +50,7 @@ /* Do anything we need to do when starting up the runtime environment * in this OS. */ -extern void os_init(void); +extern void os_init(char *argv[]); /* Install any OS-dependent low-level signal handlers which are needed * by the runtime environment. E.g. the signals raised by a violation --- sbcl-0.9.4/src/runtime/linux-os.c.ADDR_NO_RANDOMIZE 2005-08-12 14:08:19.000000000 -0500 +++ sbcl-0.9.4/src/runtime/linux-os.c 2005-09-13 11:26:47.110833967 -0500 @@ -44,6 +44,7 @@ #include #include #include +#include #include "validate.h" #include "thread.h" @@ -92,7 +93,7 @@ int linux_no_threads_p = 0; void -os_init(void) +os_init(char *argv[]) { /* Conduct various version checks: do we have enough mmap(), is * this a sparc running 2.2, can we do threads? */ @@ -117,7 +118,7 @@ FSHOW((stderr,"linux kernel %d.%d predates 2.4;\n enabling workarounds for SPARC kernel bugs in signal handling.\n", major_version,minor_version)); linux_sparc_siginfo_bug = 1; #endif - } + } #ifdef LISP_FEATURE_SB_THREAD futex_wait(futex,-1); if(errno==ENOSYS) linux_no_threads_p = 1; @@ -125,6 +126,28 @@ fprintf(stderr,"Linux with NPTL support (e.g. kernel 2.6 or newer) required for \nthread-enabled SBCL. Disabling thread support.\n\n"); #endif os_vm_page_size = getpagesize(); + + /* KLUDGE: Disable memory randomization on new Linux kernels + * by setting a personality flag and re-executing. (We need + * to re-execute, since the memory maps that can conflict with + * the SBCL spaces have already been done at this point). + */ +#if defined(LISP_FEATURE_X86) + if ((major_version == 2) && (minor_version >= 6) || (major_version >= 3)) { + long pers = personality(-1); + /* 0x40000 aka. ADDR_NO_RANDOMIZE */ + if (!(pers & 0x40000)) { + if (personality(pers | 0x40000) != -1) { + execvp(argv[0], argv); + } + /* Either changing the personality or (re)exec failed. Either + * way we might as well continue, and hope that the random + * memory maps are ok this time around. + */ + fprintf(stderr, "WARNING: Couldn't re-execute SBCL with the proper personality flags. Trying to continue anyway.\n"); + } + } +#endif } --- sbcl-0.9.4/src/runtime/runtime.c.ADDR_NO_RANDOMIZE 2005-09-13 11:23:31.315884548 -0500 +++ sbcl-0.9.4/src/runtime/runtime.c 2005-09-13 11:23:31.323884220 -0500 @@ -194,7 +194,7 @@ /* KLUDGE: os_vm_page_size is set by os_init(), and on some * systems (e.g. Alpha) arch_init() needs need os_vm_page_size, so * it must follow os_init(). -- WHN 2000-01-26 */ - os_init(); + os_init(argv); arch_init(); gc_init(); validate(); Index: sbcl.spec =================================================================== RCS file: /cvs/extras/rpms/sbcl/FC-4/sbcl.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- sbcl.spec 19 Sep 2005 20:46:58 -0000 1.12 +++ sbcl.spec 19 Sep 2005 20:47:49 -0000 1.13 @@ -24,7 +24,7 @@ Name: sbcl Summary: Steel Bank Common Lisp Version: 0.9.4 -Release: 16%{?dist} +Release: 17%{?dist} License: BSD/MIT Group: Development/Languages @@ -170,7 +170,7 @@ %changelog -* Mon Sep 19 2005 Rex Dieter 0.9.4-16 +* Mon Sep 19 2005 Rex Dieter 0.9.4-17 - rework personality/reexec patch (execve -> execvp) * Sat Sep 16 2005 Rex Dieter 0.9.4-15 From fedora-extras-commits at redhat.com Mon Sep 19 21:10:55 2005 From: fedora-extras-commits at redhat.com (Linus Walleij (snirkel)) Date: Mon, 19 Sep 2005 17:10:55 -0400 Subject: rpms/libnjb/devel .cvsignore, 1.3, 1.4 libnjb.spec, 1.2, 1.3 sources, 1.3, 1.4 Message-ID: <200509192110.j8JLAtdi001853@cvs-int.fedora.redhat.com> Author: snirkel Update of /cvs/extras/rpms/libnjb/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1828 Modified Files: .cvsignore libnjb.spec sources Log Message: New upstream release. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libnjb/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 6 Sep 2005 20:33:51 -0000 1.3 +++ .cvsignore 19 Sep 2005 21:10:53 -0000 1.4 @@ -1 +1 @@ -libnjb-2.2.2.tar.gz +libnjb-2.2.3.tar.gz Index: libnjb.spec =================================================================== RCS file: /cvs/extras/rpms/libnjb/devel/libnjb.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- libnjb.spec 6 Sep 2005 20:33:51 -0000 1.2 +++ libnjb.spec 19 Sep 2005 21:10:53 -0000 1.3 @@ -11,7 +11,7 @@ # Name: libnjb -Version: 2.2.2 +Version: 2.2.3 Release: 1%{?dist} Summary: A software library for talking to the Creative Nomad Jukeboxes and Dell DJs URL: http://libnjb.sourceforge.net/ @@ -100,6 +100,8 @@ %changelog +* Mon Sep 19 2005 Linus Walleij 2.2.3-1 +- New upstream release. * Tue Sep 6 2005 Linus Walleij 2.2.2-1 - New upstream release. * Wed Aug 11 2005 Linus Walleij 2.2.1-7 Index: sources =================================================================== RCS file: /cvs/extras/rpms/libnjb/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 6 Sep 2005 20:33:51 -0000 1.3 +++ sources 19 Sep 2005 21:10:53 -0000 1.4 @@ -1 +1 @@ -5d17da61ea6a43fd3831789d1d518bc7 libnjb-2.2.2.tar.gz +a11b7b010c09b2f6c387c45c29bf3b64 libnjb-2.2.3.tar.gz From fedora-extras-commits at redhat.com Mon Sep 19 21:12:41 2005 From: fedora-extras-commits at redhat.com (Linus Walleij (snirkel)) Date: Mon, 19 Sep 2005 17:12:41 -0400 Subject: rpms/libnjb/FC-4 .cvsignore, 1.3, 1.4 libnjb.spec, 1.2, 1.3 sources, 1.3, 1.4 Message-ID: <200509192112.j8JLCftJ001931@cvs-int.fedora.redhat.com> Author: snirkel Update of /cvs/extras/rpms/libnjb/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1908 Modified Files: .cvsignore libnjb.spec sources Log Message: New upstream release. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libnjb/FC-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 6 Sep 2005 20:36:25 -0000 1.3 +++ .cvsignore 19 Sep 2005 21:12:39 -0000 1.4 @@ -1 +1 @@ -libnjb-2.2.2.tar.gz +libnjb-2.2.3.tar.gz Index: libnjb.spec =================================================================== RCS file: /cvs/extras/rpms/libnjb/FC-4/libnjb.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- libnjb.spec 6 Sep 2005 20:36:25 -0000 1.2 +++ libnjb.spec 19 Sep 2005 21:12:39 -0000 1.3 @@ -11,7 +11,7 @@ # Name: libnjb -Version: 2.2.2 +Version: 2.2.3 Release: 1%{?dist} Summary: A software library for talking to the Creative Nomad Jukeboxes and Dell DJs URL: http://libnjb.sourceforge.net/ @@ -100,6 +100,8 @@ %changelog +* Mon Sep 19 2005 Linus Walleij 2.2.3-1 +- New upstream release. * Tue Sep 6 2005 Linus Walleij 2.2.2-1 - New upstream release. * Wed Aug 11 2005 Linus Walleij 2.2.1-7 Index: sources =================================================================== RCS file: /cvs/extras/rpms/libnjb/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 6 Sep 2005 20:36:25 -0000 1.3 +++ sources 19 Sep 2005 21:12:39 -0000 1.4 @@ -1 +1 @@ -5d17da61ea6a43fd3831789d1d518bc7 libnjb-2.2.2.tar.gz +a11b7b010c09b2f6c387c45c29bf3b64 libnjb-2.2.3.tar.gz From fedora-extras-commits at redhat.com Mon Sep 19 21:13:52 2005 From: fedora-extras-commits at redhat.com (Linus Walleij (snirkel)) Date: Mon, 19 Sep 2005 17:13:52 -0400 Subject: rpms/libnjb/FC-3 .cvsignore, 1.3, 1.4 libnjb.spec, 1.2, 1.3 sources, 1.3, 1.4 Message-ID: <200509192113.j8JLDq9f002009@cvs-int.fedora.redhat.com> Author: snirkel Update of /cvs/extras/rpms/libnjb/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1986 Modified Files: .cvsignore libnjb.spec sources Log Message: New upstream release. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libnjb/FC-3/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 6 Sep 2005 20:38:34 -0000 1.3 +++ .cvsignore 19 Sep 2005 21:13:50 -0000 1.4 @@ -1 +1 @@ -libnjb-2.2.2.tar.gz +libnjb-2.2.3.tar.gz Index: libnjb.spec =================================================================== RCS file: /cvs/extras/rpms/libnjb/FC-3/libnjb.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- libnjb.spec 6 Sep 2005 20:38:34 -0000 1.2 +++ libnjb.spec 19 Sep 2005 21:13:50 -0000 1.3 @@ -11,7 +11,7 @@ # Name: libnjb -Version: 2.2.2 +Version: 2.2.3 Release: 1%{?dist} Summary: A software library for talking to the Creative Nomad Jukeboxes and Dell DJs URL: http://libnjb.sourceforge.net/ @@ -100,6 +100,8 @@ %changelog +* Mon Sep 19 2005 Linus Walleij 2.2.3-1 +- New upstream release. * Tue Sep 6 2005 Linus Walleij 2.2.2-1 - New upstream release. * Wed Aug 11 2005 Linus Walleij 2.2.1-7 Index: sources =================================================================== RCS file: /cvs/extras/rpms/libnjb/FC-3/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 6 Sep 2005 20:38:34 -0000 1.3 +++ sources 19 Sep 2005 21:13:50 -0000 1.4 @@ -1 +1 @@ -5d17da61ea6a43fd3831789d1d518bc7 libnjb-2.2.2.tar.gz +a11b7b010c09b2f6c387c45c29bf3b64 libnjb-2.2.3.tar.gz From fedora-extras-commits at redhat.com Mon Sep 19 22:10:14 2005 From: fedora-extras-commits at redhat.com (Chris Wright (chrisw)) Date: Mon, 19 Sep 2005 18:10:14 -0400 Subject: rpms/cogito/devel .cvsignore, 1.2, 1.3 cogito.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200509192210.j8JMAERE003514@cvs-int.fedora.redhat.com> Author: chrisw Update of /cvs/extras/rpms/cogito/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3488 Modified Files: .cvsignore cogito.spec sources Log Message: Update cogito to 0.15 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/cogito/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 16 Sep 2005 06:53:08 -0000 1.2 +++ .cvsignore 19 Sep 2005 22:10:12 -0000 1.3 @@ -1 +1 @@ -cogito-0.14.1.tar.gz +cogito-0.15.tar.gz Index: cogito.spec =================================================================== RCS file: /cvs/extras/rpms/cogito/devel/cogito.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- cogito.spec 16 Sep 2005 23:59:49 -0000 1.2 +++ cogito.spec 19 Sep 2005 22:10:12 -0000 1.3 @@ -1,13 +1,13 @@ Name: cogito -Version: 0.14.1 -Release: 2%{?dist} +Version: 0.15 +Release: 1 Summary: The Cogito Version Control System License: GPL Group: Development/Tools URL: http://kernel.org/pub/software/scm/cogito/ Source: http://kernel.org/pub/software/scm/cogito/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires: git-core >= 0.99.3 +Requires: git-core >= 0.99.7 BuildArch: noarch %description Index: sources =================================================================== RCS file: /cvs/extras/rpms/cogito/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 16 Sep 2005 06:53:08 -0000 1.2 +++ sources 19 Sep 2005 22:10:12 -0000 1.3 @@ -1 +1 @@ -e998a8d8146bd0c2b86fbb4b278cc4fc cogito-0.14.1.tar.gz +66da34e90b53e4904d8c4acca40c7ff0 cogito-0.15.tar.gz From fedora-extras-commits at redhat.com Mon Sep 19 22:15:35 2005 From: fedora-extras-commits at redhat.com (Chris Wright (chrisw)) Date: Mon, 19 Sep 2005 18:15:35 -0400 Subject: rpms/cogito/devel cogito.spec,1.3,1.4 Message-ID: <200509192215.j8JMFZFe003607@cvs-int.fedora.redhat.com> Author: chrisw Update of /cvs/extras/rpms/cogito/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3550 Modified Files: cogito.spec Log Message: Add %{?dist} again Index: cogito.spec =================================================================== RCS file: /cvs/extras/rpms/cogito/devel/cogito.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- cogito.spec 19 Sep 2005 22:10:12 -0000 1.3 +++ cogito.spec 19 Sep 2005 22:15:33 -0000 1.4 @@ -1,6 +1,6 @@ Name: cogito Version: 0.15 -Release: 1 +Release: 1%{?dist} Summary: The Cogito Version Control System License: GPL Group: Development/Tools From fedora-extras-commits at redhat.com Mon Sep 19 22:19:15 2005 From: fedora-extras-commits at redhat.com (Chris Wright (chrisw)) Date: Mon, 19 Sep 2005 18:19:15 -0400 Subject: rpms/cogito/FC-4 .cvsignore, 1.2, 1.3 cogito.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200509192219.j8JMJF0w003703@cvs-int.fedora.redhat.com> Author: chrisw Update of /cvs/extras/rpms/cogito/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3680 Modified Files: .cvsignore cogito.spec sources Log Message: Update to cogito-0.15 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/cogito/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 16 Sep 2005 06:53:08 -0000 1.2 +++ .cvsignore 19 Sep 2005 22:19:13 -0000 1.3 @@ -1 +1 @@ -cogito-0.14.1.tar.gz +cogito-0.15.tar.gz Index: cogito.spec =================================================================== RCS file: /cvs/extras/rpms/cogito/FC-4/cogito.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- cogito.spec 17 Sep 2005 00:01:07 -0000 1.2 +++ cogito.spec 19 Sep 2005 22:19:13 -0000 1.3 @@ -1,13 +1,13 @@ Name: cogito -Version: 0.14.1 -Release: 2%{?dist} +Version: 0.15 +Release: 1%{?dist} Summary: The Cogito Version Control System License: GPL Group: Development/Tools URL: http://kernel.org/pub/software/scm/cogito/ Source: http://kernel.org/pub/software/scm/cogito/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires: git-core >= 0.99.3 +Requires: git-core >= 0.99.7 BuildArch: noarch %description Index: sources =================================================================== RCS file: /cvs/extras/rpms/cogito/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 16 Sep 2005 06:53:08 -0000 1.2 +++ sources 19 Sep 2005 22:19:13 -0000 1.3 @@ -1 +1 @@ -e998a8d8146bd0c2b86fbb4b278cc4fc cogito-0.14.1.tar.gz +66da34e90b53e4904d8c4acca40c7ff0 cogito-0.15.tar.gz From fedora-extras-commits at redhat.com Mon Sep 19 22:20:35 2005 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Mon, 19 Sep 2005 18:20:35 -0400 Subject: rpms/python-matplotlib/FC-4 .cvsignore, 1.4, 1.5 python-matplotlib.spec, 1.9, 1.10 sources, 1.4, 1.5 Message-ID: <200509192220.j8JMKZ4R003792@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/python-matplotlib/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3765 Modified Files: .cvsignore python-matplotlib.spec sources Log Message: New upstream version 0.84 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/python-matplotlib/FC-4/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 1 Aug 2005 21:06:05 -0000 1.4 +++ .cvsignore 19 Sep 2005 22:20:33 -0000 1.5 @@ -1 +1 @@ -matplotlib-0.83.2.tar.gz +matplotlib-0.84.tar.gz Index: python-matplotlib.spec =================================================================== RCS file: /cvs/extras/rpms/python-matplotlib/FC-4/python-matplotlib.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- python-matplotlib.spec 2 Aug 2005 21:46:51 -0000 1.9 +++ python-matplotlib.spec 19 Sep 2005 22:20:33 -0000 1.10 @@ -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-matplotlib -Version: 0.83.2 -Release: 3%{?dist} +Version: 0.84 +Release: 1%{?dist} Summary: Python plotting library Group: Development/Libraries @@ -48,6 +48,9 @@ %{_datadir}/matplotlib/ %changelog +* Mon Sep 19 2005 Orion Poplawski 0.84-1 +- New upstream version 0.84 + * Tue Aug 02 2005 Orion Poplawski 0.83.2-3 - Add Requires: python-numeric, pytz, python-dateutil Index: sources =================================================================== RCS file: /cvs/extras/rpms/python-matplotlib/FC-4/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 1 Aug 2005 21:06:05 -0000 1.4 +++ sources 19 Sep 2005 22:20:33 -0000 1.5 @@ -1 +1 @@ -c5d7c39eeeeafd88a419194fba93a6cb matplotlib-0.83.2.tar.gz +9d7a9831f64a7c376b98333604e38cc1 matplotlib-0.84.tar.gz From fedora-extras-commits at redhat.com Mon Sep 19 22:20:39 2005 From: fedora-extras-commits at redhat.com (Chris Wright (chrisw)) Date: Mon, 19 Sep 2005 18:20:39 -0400 Subject: rpms/cogito/FC-3 .cvsignore, 1.2, 1.3 cogito.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200509192220.j8JMKd5k003817@cvs-int.fedora.redhat.com> Author: chrisw Update of /cvs/extras/rpms/cogito/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3769 Modified Files: .cvsignore cogito.spec sources Log Message: Update to cogito-0.15 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/cogito/FC-3/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 16 Sep 2005 06:53:08 -0000 1.2 +++ .cvsignore 19 Sep 2005 22:20:37 -0000 1.3 @@ -1 +1 @@ -cogito-0.14.1.tar.gz +cogito-0.15.tar.gz Index: cogito.spec =================================================================== RCS file: /cvs/extras/rpms/cogito/FC-3/cogito.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- cogito.spec 17 Sep 2005 00:04:17 -0000 1.2 +++ cogito.spec 19 Sep 2005 22:20:37 -0000 1.3 @@ -1,13 +1,13 @@ Name: cogito -Version: 0.14.1 -Release: 2%{?dist} +Version: 0.15 +Release: 1%{?dist} Summary: The Cogito Version Control System License: GPL Group: Development/Tools URL: http://kernel.org/pub/software/scm/cogito/ Source: http://kernel.org/pub/software/scm/cogito/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires: git-core >= 0.99.3 +Requires: git-core >= 0.99.7 BuildArch: noarch %description Index: sources =================================================================== RCS file: /cvs/extras/rpms/cogito/FC-3/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 16 Sep 2005 06:53:08 -0000 1.2 +++ sources 19 Sep 2005 22:20:37 -0000 1.3 @@ -1 +1 @@ -e998a8d8146bd0c2b86fbb4b278cc4fc cogito-0.14.1.tar.gz +66da34e90b53e4904d8c4acca40c7ff0 cogito-0.15.tar.gz From fedora-extras-commits at redhat.com Mon Sep 19 22:21:27 2005 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Mon, 19 Sep 2005 18:21:27 -0400 Subject: common tobuild,1.2218,1.2219 Message-ID: <200509192221.j8JMLRBT003931@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3910 Modified Files: tobuild Log Message: request build of rpms/python-matplotlib/FC-4 python-matplotlib-0_84-1_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2218 retrieving revision 1.2219 diff -u -r1.2218 -r1.2219 --- tobuild 17 Sep 2005 09:52:33 -0000 1.2218 +++ tobuild 19 Sep 2005 22:21:25 -0000 1.2219 @@ -37,3 +37,4 @@ joost rpms/fpc/FC-3 fpc-2_0_0-1 fc3 gemi rpms/clisp/FC-3 clisp-2_34-5_fc3 fc3 katzj rpms/perl-Class-Trigger/devel perl-Class-Trigger-0_09-3_fc5 devel +orion rpms/python-matplotlib/FC-4 python-matplotlib-0_84-1_fc4 fc4 From fedora-extras-commits at redhat.com Mon Sep 19 22:23:27 2005 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Mon, 19 Sep 2005 18:23:27 -0400 Subject: rpms/python-matplotlib/devel .cvsignore, 1.4, 1.5 python-matplotlib.spec, 1.9, 1.10 sources, 1.4, 1.5 Message-ID: <200509192223.j8JMNRbg004002@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/python-matplotlib/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3979 Modified Files: .cvsignore python-matplotlib.spec sources Log Message: New upstream version 0.84 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/python-matplotlib/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 1 Aug 2005 20:49:18 -0000 1.4 +++ .cvsignore 19 Sep 2005 22:23:25 -0000 1.5 @@ -1 +1 @@ -matplotlib-0.83.2.tar.gz +matplotlib-0.84.tar.gz Index: python-matplotlib.spec =================================================================== RCS file: /cvs/extras/rpms/python-matplotlib/devel/python-matplotlib.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- python-matplotlib.spec 2 Aug 2005 21:47:45 -0000 1.9 +++ python-matplotlib.spec 19 Sep 2005 22:23:25 -0000 1.10 @@ -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-matplotlib -Version: 0.83.2 -Release: 3%{?dist} +Version: 0.84 +Release: 1%{?dist} Summary: Python plotting library Group: Development/Libraries @@ -48,6 +48,9 @@ %{_datadir}/matplotlib/ %changelog +* Mon Sep 19 2005 Orion Poplawski 0.84-1 +- New upstream version 0.84 + * Tue Aug 02 2005 Orion Poplawski 0.83.2-3 - bump release Index: sources =================================================================== RCS file: /cvs/extras/rpms/python-matplotlib/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 1 Aug 2005 20:49:18 -0000 1.4 +++ sources 19 Sep 2005 22:23:25 -0000 1.5 @@ -1 +1 @@ -c5d7c39eeeeafd88a419194fba93a6cb matplotlib-0.83.2.tar.gz +9d7a9831f64a7c376b98333604e38cc1 matplotlib-0.84.tar.gz From fedora-extras-commits at redhat.com Mon Sep 19 22:23:59 2005 From: fedora-extras-commits at redhat.com (Chris Wright (chrisw)) Date: Mon, 19 Sep 2005 18:23:59 -0400 Subject: rpms/git-core/devel .cvsignore, 1.3, 1.4 git-core.spec, 1.2, 1.3 sources, 1.3, 1.4 Message-ID: <200509192223.j8JMNxcX004069@cvs-int.fedora.redhat.com> Author: chrisw Update of /cvs/extras/rpms/git-core/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4042 Modified Files: .cvsignore git-core.spec sources Log Message: Update to git-core 0.99.7 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/git-core/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 16 Sep 2005 18:10:58 -0000 1.3 +++ .cvsignore 19 Sep 2005 22:23:57 -0000 1.4 @@ -1 +1 @@ -git-core-0.99.6.tar.gz +git-core-0.99.7.tar.gz Index: git-core.spec =================================================================== RCS file: /cvs/extras/rpms/git-core/devel/git-core.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- git-core.spec 16 Sep 2005 18:10:58 -0000 1.2 +++ git-core.spec 19 Sep 2005 22:23:57 -0000 1.3 @@ -1,6 +1,6 @@ # Pass --without docs to rpmbuild if you don't want the documetnation Name: git-core -Version: 0.99.6 +Version: 0.99.7 Release: 1%{?dist} Summary: Git core and tools License: GPL @@ -9,7 +9,7 @@ Source: http://kernel.org/pub/software/scm/git/%{name}-%{version}.tar.gz BuildRequires: zlib-devel, openssl-devel, curl-devel %{!?_without_docs:, xmlto, asciidoc > 6.0.3} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires: rsync, rcs, curl +Requires: rsync, rcs, curl, less, openssh-clients, python >= 2.4, tk %description This is a stupid (but extremely fast) directory content manager. It @@ -39,13 +39,20 @@ %{_datadir}/git-core/ %doc README COPYING Documentation/*.txt %{!?_without_docs: %doc Documentation/*.html } -%{!?_without_docs: %{_mandir}/man1/*.1.gz} -%{!?_without_docs: %{_mandir}/man7/*.7.gz} +%{!?_without_docs: %{_mandir}/man1/*.1*} +%{!?_without_docs: %{_mandir}/man7/*.7*} %changelog * Fri Sep 16 2005 Chris Wright 0.99.6-1 - update to 0.99.6 +* Fri Sep 16 2005 Horst H. von Brand +- Linus noticed that less is required, added to the dependencies + +* Sun Sep 11 2005 Horst H. von Brand +- Updated dependencies +- Don't assume manpages are gzipped + * Thu Aug 18 2005 Chris Wright 0.99.4-4 - drop sh_utils, sh-utils, diffutils, mktemp, and openssl Requires - use RPM_OPT_FLAGS in spec file, drop patch0 Index: sources =================================================================== RCS file: /cvs/extras/rpms/git-core/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 16 Sep 2005 18:10:58 -0000 1.3 +++ sources 19 Sep 2005 22:23:57 -0000 1.4 @@ -1 +1 @@ -ca2f17bc1550909a2675386e8be46f0f git-core-0.99.6.tar.gz +0035da109f1e0f9f4fdbd425f2f6723b git-core-0.99.7.tar.gz From fedora-extras-commits at redhat.com Mon Sep 19 22:32:11 2005 From: fedora-extras-commits at redhat.com (Chris Wright (chrisw)) Date: Mon, 19 Sep 2005 18:32:11 -0400 Subject: rpms/git-core/FC-3 .cvsignore, 1.3, 1.4 git-core.spec, 1.2, 1.3 sources, 1.3, 1.4 Message-ID: <200509192232.j8JMWB0t004159@cvs-int.fedora.redhat.com> Author: chrisw Update of /cvs/extras/rpms/git-core/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4131 Modified Files: .cvsignore git-core.spec sources Log Message: Update git-core to 0.99.7 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/git-core/FC-3/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 16 Sep 2005 18:13:23 -0000 1.3 +++ .cvsignore 19 Sep 2005 22:32:09 -0000 1.4 @@ -1 +1 @@ -git-core-0.99.6.tar.gz +git-core-0.99.7.tar.gz Index: git-core.spec =================================================================== RCS file: /cvs/extras/rpms/git-core/FC-3/git-core.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- git-core.spec 16 Sep 2005 18:13:23 -0000 1.2 +++ git-core.spec 19 Sep 2005 22:32:09 -0000 1.3 @@ -1,6 +1,6 @@ # Pass --without docs to rpmbuild if you don't want the documetnation Name: git-core -Version: 0.99.6 +Version: 0.99.7 Release: 1%{?dist} Summary: Git core and tools License: GPL @@ -9,7 +9,7 @@ Source: http://kernel.org/pub/software/scm/git/%{name}-%{version}.tar.gz BuildRequires: zlib-devel, openssl-devel, curl-devel %{!?_without_docs:, xmlto, asciidoc > 6.0.3} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires: rsync, rcs, curl +Requires: rsync, rcs, curl, less, openssh-clients, python >= 2.4, tk %description This is a stupid (but extremely fast) directory content manager. It @@ -39,13 +39,20 @@ %{_datadir}/git-core/ %doc README COPYING Documentation/*.txt %{!?_without_docs: %doc Documentation/*.html } -%{!?_without_docs: %{_mandir}/man1/*.1.gz} -%{!?_without_docs: %{_mandir}/man7/*.7.gz} +%{!?_without_docs: %{_mandir}/man1/*.1*} +%{!?_without_docs: %{_mandir}/man7/*.7*} %changelog * Fri Sep 16 2005 Chris Wright 0.99.6-1 - update to 0.99.6 +* Fri Sep 16 2005 Horst H. von Brand +- Linus noticed that less is required, added to the dependencies + +* Sun Sep 11 2005 Horst H. von Brand +- Updated dependencies +- Don't assume manpages are gzipped + * Thu Aug 18 2005 Chris Wright 0.99.4-4 - drop sh_utils, sh-utils, diffutils, mktemp, and openssl Requires - use RPM_OPT_FLAGS in spec file, drop patch0 Index: sources =================================================================== RCS file: /cvs/extras/rpms/git-core/FC-3/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 16 Sep 2005 18:13:23 -0000 1.3 +++ sources 19 Sep 2005 22:32:09 -0000 1.4 @@ -1 +1 @@ -ca2f17bc1550909a2675386e8be46f0f git-core-0.99.6.tar.gz +0035da109f1e0f9f4fdbd425f2f6723b git-core-0.99.7.tar.gz From fedora-extras-commits at redhat.com Mon Sep 19 22:34:59 2005 From: fedora-extras-commits at redhat.com (Chris Wright (chrisw)) Date: Mon, 19 Sep 2005 18:34:59 -0400 Subject: rpms/git-core/FC-4 .cvsignore, 1.3, 1.4 git-core.spec, 1.2, 1.3 sources, 1.3, 1.4 Message-ID: <200509192234.j8JMYxHH004202@cvs-int.fedora.redhat.com> Author: chrisw Update of /cvs/extras/rpms/git-core/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4179 Modified Files: .cvsignore git-core.spec sources Log Message: Update git-core to 0.99.7 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/git-core/FC-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 16 Sep 2005 18:44:11 -0000 1.3 +++ .cvsignore 19 Sep 2005 22:34:57 -0000 1.4 @@ -1 +1 @@ -git-core-0.99.6.tar.gz +git-core-0.99.7.tar.gz Index: git-core.spec =================================================================== RCS file: /cvs/extras/rpms/git-core/FC-4/git-core.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- git-core.spec 16 Sep 2005 18:44:11 -0000 1.2 +++ git-core.spec 19 Sep 2005 22:34:57 -0000 1.3 @@ -1,6 +1,6 @@ # Pass --without docs to rpmbuild if you don't want the documetnation Name: git-core -Version: 0.99.6 +Version: 0.99.7 Release: 1%{?dist} Summary: Git core and tools License: GPL @@ -9,7 +9,7 @@ Source: http://kernel.org/pub/software/scm/git/%{name}-%{version}.tar.gz BuildRequires: zlib-devel, openssl-devel, curl-devel %{!?_without_docs:, xmlto, asciidoc > 6.0.3} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires: rsync, rcs, curl +Requires: rsync, rcs, curl, less, openssh-clients, python >= 2.4, tk %description This is a stupid (but extremely fast) directory content manager. It @@ -39,13 +39,20 @@ %{_datadir}/git-core/ %doc README COPYING Documentation/*.txt %{!?_without_docs: %doc Documentation/*.html } -%{!?_without_docs: %{_mandir}/man1/*.1.gz} -%{!?_without_docs: %{_mandir}/man7/*.7.gz} +%{!?_without_docs: %{_mandir}/man1/*.1*} +%{!?_without_docs: %{_mandir}/man7/*.7*} %changelog * Fri Sep 16 2005 Chris Wright 0.99.6-1 - update to 0.99.6 +* Fri Sep 16 2005 Horst H. von Brand +- Linus noticed that less is required, added to the dependencies + +* Sun Sep 11 2005 Horst H. von Brand +- Updated dependencies +- Don't assume manpages are gzipped + * Thu Aug 18 2005 Chris Wright 0.99.4-4 - drop sh_utils, sh-utils, diffutils, mktemp, and openssl Requires - use RPM_OPT_FLAGS in spec file, drop patch0 Index: sources =================================================================== RCS file: /cvs/extras/rpms/git-core/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 16 Sep 2005 18:44:11 -0000 1.3 +++ sources 19 Sep 2005 22:34:57 -0000 1.4 @@ -1 +1 @@ -ca2f17bc1550909a2675386e8be46f0f git-core-0.99.6.tar.gz +0035da109f1e0f9f4fdbd425f2f6723b git-core-0.99.7.tar.gz From fedora-extras-commits at redhat.com Mon Sep 19 22:45:19 2005 From: fedora-extras-commits at redhat.com (Karsten Wade (kwade)) Date: Mon, 19 Sep 2005 18:45:19 -0400 Subject: CVSROOT avail,1.12,1.13 Message-ID: <200509192245.j8JMjJV3004411@cvs-int.fedora.redhat.com> Author: kwade Update of /cvs/fedora/CVSROOT In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4392 Modified Files: avail Log Message: Spreading the documentation update work into the community more. Index: avail =================================================================== RCS file: /cvs/fedora/CVSROOT/avail,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- avail 12 Sep 2005 20:16:57 -0000 1.12 +++ avail 19 Sep 2005 22:45:16 -0000 1.13 @@ -48,3 +48,8 @@ avail | mjc,bressers,jorton,notting,sopwith,katzj | fedora-security avail | pfrields | web/html/projects/docs +avail | pfrields | web/html/participate/documentation-faq/ +avail | pfrields | web/html/participate/documentation-guide/ +avail | pfrields,mjohnson | web/html/participate/documentation-quick-start/ + + From fedora-extras-commits at redhat.com Tue Sep 20 07:09:18 2005 From: fedora-extras-commits at redhat.com (Denis Leroy (denis)) Date: Tue, 20 Sep 2005 03:09:18 -0400 Subject: rpms/libsigc++20/devel .cvsignore, 1.3, 1.4 libsigc++.spec, 1.6, 1.7 sources, 1.4, 1.5 Message-ID: <200509200709.j8K79I2v017468@cvs-int.fedora.redhat.com> Author: denis Update of /cvs/extras/rpms/libsigc++20/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17435 Modified Files: .cvsignore libsigc++.spec sources Log Message: Update to version 2.0.16 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libsigc++20/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 28 Apr 2005 21:39:37 -0000 1.3 +++ .cvsignore 20 Sep 2005 07:09:15 -0000 1.4 @@ -1 +1 @@ -libsigc++-2.0.11.tar.bz2 +libsigc++-2.0.16.tar.bz2 Index: libsigc++.spec =================================================================== RCS file: /cvs/extras/rpms/libsigc++20/devel/libsigc++.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- libsigc++.spec 28 Apr 2005 21:39:37 -0000 1.6 +++ libsigc++.spec 20 Sep 2005 07:09:15 -0000 1.7 @@ -1,5 +1,5 @@ Name: libsigc++20 -Version: 2.0.11 +Version: 2.0.16 Release: 1 Summary: Typesafe signal framework for C++ @@ -81,6 +81,9 @@ %{_libdir}/*.a %changelog +* Sun Sep 18 2005 Denis Leroy - 2.0.16-1 +- Upgrade to version 2.0.16 + * Sat Apr 9 2005 Denis Leroy - 2.0.11-1 - Upgrade to version 2.0.11 Index: sources =================================================================== RCS file: /cvs/extras/rpms/libsigc++20/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 28 Apr 2005 21:39:37 -0000 1.4 +++ sources 20 Sep 2005 07:09:15 -0000 1.5 @@ -1 +1 @@ -9e28167ebe664593c9222092e2a51d06 libsigc++-2.0.11.tar.bz2 +bd997b35a420861259a68d5f27a7592e libsigc++-2.0.16.tar.bz2 From fedora-extras-commits at redhat.com Tue Sep 20 07:13:00 2005 From: fedora-extras-commits at redhat.com (Denis Leroy (denis)) Date: Tue, 20 Sep 2005 03:13:00 -0400 Subject: rpms/glibmm24/devel .cvsignore, 1.3, 1.4 glibmm.spec, 1.6, 1.7 sources, 1.4, 1.5 Message-ID: <200509200713.j8K7D0BD017516@cvs-int.fedora.redhat.com> Author: denis Update of /cvs/extras/rpms/glibmm24/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17493 Modified Files: .cvsignore glibmm.spec sources Log Message: Update to 2.8.0, updated glib2 dependency Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/glibmm24/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 28 Apr 2005 22:31:10 -0000 1.3 +++ .cvsignore 20 Sep 2005 07:12:58 -0000 1.4 @@ -1 +1 @@ -glibmm-2.6.1.tar.bz2 +glibmm-2.8.0.tar.bz2 Index: glibmm.spec =================================================================== RCS file: /cvs/extras/rpms/glibmm24/devel/glibmm.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- glibmm.spec 2 Sep 2005 11:15:33 -0000 1.6 +++ glibmm.spec 20 Sep 2005 07:12:58 -0000 1.7 @@ -1,18 +1,18 @@ Name: glibmm24 -Version: 2.6.1 -Release: 2 +Version: 2.8.0 +Release: 1 Summary: C++ interface for GTK2 (a GUI library for X) Group: System Environment/Libraries License: LGPL URL: http://gtkmm.sourceforge.net/ -Source0: http://ftp.gnome.org/pub/GNOME/sources/glibmm/2.6/glibmm-%{version}.tar.bz2 +Source0: http://ftp.gnome.org/pub/GNOME/sources/glibmm/2.8/glibmm-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires(post): /sbin/ldconfig Requires(postun): /sbin/ldconfig BuildRequires: libsigc++20-devel >= 2.0.0 -BuildRequires: glib2-devel >= 2.6.0 +BuildRequires: glib2-devel >= 2.8.0 %description gtkmm provides a C++ interface to the GTK+ GUI library. gtkmm2 wraps GTK+ 2. @@ -77,6 +77,10 @@ %{_datadir}/aclocal/*.m4 %changelog +* Mon Sep 19 2005 Denis Leroy - 2.8.0-1 +- Upgrade to 2.8.0 +- Updated glib2 version dependency + * Fri Sep 2 2005 Michael Schwendt - 2.6.1-2 - rebuild for gcc-c++-4.0.1-12 result for GLIBMM_CXX_ALLOWS_STATIC_INLINE_NPOS check changed Index: sources =================================================================== RCS file: /cvs/extras/rpms/glibmm24/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 28 Apr 2005 22:31:10 -0000 1.4 +++ sources 20 Sep 2005 07:12:58 -0000 1.5 @@ -1 +1 @@ -e37da352bf581503c5866f0231fd4a74 glibmm-2.6.1.tar.bz2 +e1823b926e01db09aacf3da69234e3c5 glibmm-2.8.0.tar.bz2 From fedora-extras-commits at redhat.com Tue Sep 20 07:17:16 2005 From: fedora-extras-commits at redhat.com (Denis Leroy (denis)) Date: Tue, 20 Sep 2005 03:17:16 -0400 Subject: rpms/gtkmm24/devel .cvsignore, 1.3, 1.4 gtkmm.spec, 1.8, 1.9 sources, 1.5, 1.6 Message-ID: <200509200717.j8K7HG2Q017578@cvs-int.fedora.redhat.com> Author: denis Update of /cvs/extras/rpms/gtkmm24/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17555 Modified Files: .cvsignore gtkmm.spec sources Log Message: Update to 2.8.0, updated gtk dependencies Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gtkmm24/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 28 Apr 2005 22:36:05 -0000 1.3 +++ .cvsignore 20 Sep 2005 07:17:14 -0000 1.4 @@ -1 +1 @@ -gtkmm-2.6.2.tar.bz2 +gtkmm-2.8.0.tar.bz2 Index: gtkmm.spec =================================================================== RCS file: /cvs/extras/rpms/gtkmm24/devel/gtkmm.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- gtkmm.spec 29 Apr 2005 11:16:25 -0000 1.8 +++ gtkmm.spec 20 Sep 2005 07:17:14 -0000 1.9 @@ -1,22 +1,22 @@ Name: gtkmm24 -Version: 2.6.2 -Release: 2 +Version: 2.8.0 +Release: 1 Summary: C++ interface for GTK2 (a GUI library for X) Group: System Environment/Libraries License: LGPL URL: http://gtkmm.sourceforge.net/ -Source0: http://ftp.gnome.org/pub/GNOME/sources/gtkmm/2.6/gtkmm-%{version}.tar.bz2 +Source0: http://ftp.gnome.org/pub/GNOME/sources/gtkmm/2.8/gtkmm-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires(post): /sbin/ldconfig Requires(postun): /sbin/ldconfig -BuildRequires: glibmm24-devel >= 2.6.0 +BuildRequires: glibmm24-devel >= 2.8.0 BuildRequires: atk-devel >= 1.9.0 -BuildRequires: pango-devel >= 1.5.2 -BuildRequires: gtk2-devel >= 2.6.0 -BuildRequires: glib2-devel >= 2.4.0 +BuildRequires: pango-devel >= 1.10.0 +BuildRequires: gtk2-devel >= 2.8.0 +BuildRequires: glib2-devel >= 2.8.0 %description gtkmm provides a C++ interface to the GTK+ GUI library. gtkmm2 wraps GTK+ 2. @@ -100,6 +100,10 @@ %changelog +* Mon Sep 19 2005 Denis Leroy - 2.8.0-1 +- Update to gtkmm 2.8.0 +- Incorporated dependency updates from Rick Vinyard + * Fri Apr 29 2005 Denis Leroy - 2.6.2-2 - Disabled building of demo and examples Index: sources =================================================================== RCS file: /cvs/extras/rpms/gtkmm24/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 28 Apr 2005 22:36:05 -0000 1.5 +++ sources 20 Sep 2005 07:17:14 -0000 1.6 @@ -1 +1 @@ -c1ffa447172b16d1ee787b1c69379c30 gtkmm-2.6.2.tar.bz2 +337027bb21635967fd232fcc6bcb9359 gtkmm-2.8.0.tar.bz2 From fedora-extras-commits at redhat.com Tue Sep 20 07:20:19 2005 From: fedora-extras-commits at redhat.com (Denis Leroy (denis)) Date: Tue, 20 Sep 2005 03:20:19 -0400 Subject: rpms/gconfmm26/devel .cvsignore, 1.4, 1.5 gconfmm.spec, 1.7, 1.8 sources, 1.4, 1.5 Message-ID: <200509200720.j8K7KJXl017655@cvs-int.fedora.redhat.com> Author: denis Update of /cvs/extras/rpms/gconfmm26/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17632 Modified Files: .cvsignore gconfmm.spec sources Log Message: Update to 2.12.0, patches no longer necessary Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gconfmm26/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 7 May 2005 22:00:53 -0000 1.4 +++ .cvsignore 20 Sep 2005 07:20:16 -0000 1.5 @@ -1,3 +1 @@ -gconfmm-2.10.0-gcc4.patch -gconfmm-2.10.0.tar.bz2 -gconfmm-2.10.0-x86_64.patch +gconfmm-2.12.0.tar.bz2 Index: gconfmm.spec =================================================================== RCS file: /cvs/extras/rpms/gconfmm26/devel/gconfmm.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- gconfmm.spec 7 May 2005 22:00:53 -0000 1.7 +++ gconfmm.spec 20 Sep 2005 07:20:16 -0000 1.8 @@ -1,15 +1,13 @@ Name: gconfmm26 -Version: 2.10.0 -Release: 2 +Version: 2.12.0 +Release: 1 Summary: C++ wrapper for GConf2 Group: System Environment/Libraries License: LGPL URL: http://gtkmm.sourceforge.net/ -Source0: http://ftp.gnome.org/pub/GNOME/sources/gconfmm/2.10/gconfmm-%{version}.tar.bz2 -Patch0: gconfmm-2.10.0-gcc4.patch -Patch1: gconfmm-2.10.0-x86_64.patch +Source0: http://ftp.gnome.org/pub/GNOME/sources/gconfmm/2.12/gconfmm-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires(post): /sbin/ldconfig @@ -40,8 +38,6 @@ %prep %setup -q -n gconfmm-%{version} -%patch0 -p1 -%patch1 -p1 %build %configure --enable-static --enable-shared @@ -80,6 +76,9 @@ %{_libdir}/pkgconfig/*.pc %changelog +* Mon Sep 19 2005 Denis Leroy - 2.12.0-1 +- Update to 2.12.0 + * Sat May 7 2005 Denis Leroy - 2.10.0-2 - Added patch to fix x86_64 compile Index: sources =================================================================== RCS file: /cvs/extras/rpms/gconfmm26/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 7 May 2005 22:00:53 -0000 1.4 +++ sources 20 Sep 2005 07:20:16 -0000 1.5 @@ -1,3 +1 @@ -9b9a1ff7456698bf73c7cfe1b5792415 gconfmm-2.10.0-gcc4.patch -0f3787ff3f7089698da49b694b5f9155 gconfmm-2.10.0.tar.bz2 -2f29fc7e491118bbf0b98812944d3120 gconfmm-2.10.0-x86_64.patch +dfd62a95e7675943933b793183649402 gconfmm-2.12.0.tar.bz2 From fedora-extras-commits at redhat.com Tue Sep 20 07:23:00 2005 From: fedora-extras-commits at redhat.com (Denis Leroy (denis)) Date: Tue, 20 Sep 2005 03:23:00 -0400 Subject: rpms/libglademm24/devel .cvsignore, 1.3, 1.4 libglademm.spec, 1.6, 1.7 sources, 1.3, 1.4 Message-ID: <200509200723.j8K7N07u017708@cvs-int.fedora.redhat.com> Author: denis Update of /cvs/extras/rpms/libglademm24/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17685 Modified Files: .cvsignore libglademm.spec sources Log Message: Update to 2.6.1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libglademm24/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 28 Apr 2005 22:42:43 -0000 1.3 +++ .cvsignore 20 Sep 2005 07:22:58 -0000 1.4 @@ -1 +1 @@ -libglademm-2.6.0.tar.bz2 +libglademm-2.6.1.tar.bz2 Index: libglademm.spec =================================================================== RCS file: /cvs/extras/rpms/libglademm24/devel/libglademm.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- libglademm.spec 28 Apr 2005 22:42:43 -0000 1.6 +++ libglademm.spec 20 Sep 2005 07:22:58 -0000 1.7 @@ -1,5 +1,5 @@ Name: libglademm24 -Version: 2.6.0 +Version: 2.6.1 Release: 1 Summary: C++ wrapper for libglade @@ -79,6 +79,9 @@ %{_libdir}/pkgconfig/*.pc %changelog +* Mon Sep 19 2005 Denis Leroy - 2.6.1-1 +- Update to 2.6.1 + * Thu Apr 28 2005 Denis Leroy - 2.6.0-1 - Upgrade to 2.6.0 Index: sources =================================================================== RCS file: /cvs/extras/rpms/libglademm24/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 28 Apr 2005 22:42:43 -0000 1.3 +++ sources 20 Sep 2005 07:22:58 -0000 1.4 @@ -1 +1 @@ -be10dcaca106d4381dc339a39e2fe776 libglademm-2.6.0.tar.bz2 +0e9dd1e7b0e3170b56c50e5c4630fe95 libglademm-2.6.1.tar.bz2 From fedora-extras-commits at redhat.com Tue Sep 20 07:24:22 2005 From: fedora-extras-commits at redhat.com (Denis Leroy (denis)) Date: Tue, 20 Sep 2005 03:24:22 -0400 Subject: rpms/gnome-vfsmm26/devel .cvsignore, 1.3, 1.4 gnome-vfsmm.spec, 1.6, 1.7 sources, 1.4, 1.5 Message-ID: <200509200724.j8K7OM3R017761@cvs-int.fedora.redhat.com> Author: denis Update of /cvs/extras/rpms/gnome-vfsmm26/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17738 Modified Files: .cvsignore gnome-vfsmm.spec sources Log Message: Update to 2.12.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gnome-vfsmm26/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 28 Apr 2005 22:40:45 -0000 1.3 +++ .cvsignore 20 Sep 2005 07:24:20 -0000 1.4 @@ -1 +1 @@ -gnome-vfsmm-2.10.0.tar.bz2 +gnome-vfsmm-2.12.0.tar.bz2 Index: gnome-vfsmm.spec =================================================================== RCS file: /cvs/extras/rpms/gnome-vfsmm26/devel/gnome-vfsmm.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- gnome-vfsmm.spec 28 Apr 2005 22:40:45 -0000 1.6 +++ gnome-vfsmm.spec 20 Sep 2005 07:24:20 -0000 1.7 @@ -1,5 +1,5 @@ Name: gnome-vfsmm26 -Version: 2.10.0 +Version: 2.12.0 Release: 1 Summary: C++ wrapper for gnome-vfs @@ -7,7 +7,7 @@ Group: System Environment/Libraries License: LGPL URL: http://gtkmm.sourceforge.net/ -Source0: http://ftp.gnome.org/pub/GNOME/sources/gnome-vfsmm/2.10/gnome-vfsmm-%{version}.tar.bz2 +Source0: http://ftp.gnome.org/pub/GNOME/sources/gnome-vfsmm/2.12/gnome-vfsmm-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires(post): /sbin/ldconfig @@ -72,6 +72,9 @@ %changelog +* Mon Sep 19 2005 Denis Leroy - 2.12.0-1 +- Update to 2.12.0 + * Thu Apr 28 2005 Denis Leroy - 2.10.0-1 - Upgrade to 2.10.0. x86_64 patch should no longer be necessary Index: sources =================================================================== RCS file: /cvs/extras/rpms/gnome-vfsmm26/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 28 Apr 2005 22:40:45 -0000 1.4 +++ sources 20 Sep 2005 07:24:20 -0000 1.5 @@ -1 +1 @@ -0d5751f1c0074289c3e6a858357f9c4d gnome-vfsmm-2.10.0.tar.bz2 +4a73741ab5232bf85cb631108c5b6430 gnome-vfsmm-2.12.0.tar.bz2 From fedora-extras-commits at redhat.com Tue Sep 20 07:25:30 2005 From: fedora-extras-commits at redhat.com (Aaron Kurtz (dragoon)) Date: Tue, 20 Sep 2005 03:25:30 -0400 Subject: rpms/gnome-applet-netspeed/devel .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 gnome-applet-netspeed.spec, 1.3, 1.4 Message-ID: <200509200726.j8K7Q0vc017821@cvs-int.fedora.redhat.com> Author: dragoon Update of /cvs/extras/rpms/gnome-applet-netspeed/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17774/devel Modified Files: .cvsignore sources gnome-applet-netspeed.spec Log Message: * Tue Sep 20 2005 Aaron Kurtz - 0.13-1 - Bump to 0.13 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gnome-applet-netspeed/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 23 Apr 2005 03:55:52 -0000 1.2 +++ .cvsignore 20 Sep 2005 07:25:28 -0000 1.3 @@ -1 +1 @@ -netspeed_applet-0.12.1.tar.gz +netspeed_applet-0.13.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/gnome-applet-netspeed/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 23 Apr 2005 03:55:52 -0000 1.2 +++ sources 20 Sep 2005 07:25:28 -0000 1.3 @@ -1 +1 @@ -7a651eab80c1a10654595fcfd4832463 netspeed_applet-0.12.1.tar.gz +b5c5332993ed779c3653433c6f3b6a9a netspeed_applet-0.13.tar.gz Index: gnome-applet-netspeed.spec =================================================================== RCS file: /cvs/extras/rpms/gnome-applet-netspeed/devel/gnome-applet-netspeed.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- gnome-applet-netspeed.spec 16 Jun 2005 09:40:02 -0000 1.3 +++ gnome-applet-netspeed.spec 20 Sep 2005 07:25:28 -0000 1.4 @@ -1,6 +1,6 @@ Name: gnome-applet-netspeed -Version: 0.12.1 -Release: 3%{?dist} +Version: 0.13 +Release: 1%{?dist} Summary: GNOME applet that shows traffic on a network device Group: Applications/Internet @@ -53,6 +53,9 @@ %{_datadir}/omf/netspeed_applet/ %changelog +* Tue Sep 20 2005 Aaron Kurtz - 0.13-1 +- Bump to 0.13 + * Thu Jun 16 2005 Aaron Kurtz - 0.12.1-3 - Removing spec-defined dist From fedora-extras-commits at redhat.com Tue Sep 20 07:25:31 2005 From: fedora-extras-commits at redhat.com (Aaron Kurtz (dragoon)) Date: Tue, 20 Sep 2005 03:25:31 -0400 Subject: rpms/gnome-applet-netspeed/FC-4 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 gnome-applet-netspeed.spec, 1.3, 1.4 Message-ID: <200509200726.j8K7Q1Y3017826@cvs-int.fedora.redhat.com> Author: dragoon Update of /cvs/extras/rpms/gnome-applet-netspeed/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17774/FC-4 Modified Files: .cvsignore sources gnome-applet-netspeed.spec Log Message: * Tue Sep 20 2005 Aaron Kurtz - 0.13-1 - Bump to 0.13 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gnome-applet-netspeed/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 23 Apr 2005 03:55:52 -0000 1.2 +++ .cvsignore 20 Sep 2005 07:25:29 -0000 1.3 @@ -1 +1 @@ -netspeed_applet-0.12.1.tar.gz +netspeed_applet-0.13.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/gnome-applet-netspeed/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 23 Apr 2005 03:55:52 -0000 1.2 +++ sources 20 Sep 2005 07:25:29 -0000 1.3 @@ -1 +1 @@ -7a651eab80c1a10654595fcfd4832463 netspeed_applet-0.12.1.tar.gz +b5c5332993ed779c3653433c6f3b6a9a netspeed_applet-0.13.tar.gz Index: gnome-applet-netspeed.spec =================================================================== RCS file: /cvs/extras/rpms/gnome-applet-netspeed/FC-4/gnome-applet-netspeed.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- gnome-applet-netspeed.spec 16 Jun 2005 09:40:01 -0000 1.3 +++ gnome-applet-netspeed.spec 20 Sep 2005 07:25:29 -0000 1.4 @@ -1,6 +1,6 @@ Name: gnome-applet-netspeed -Version: 0.12.1 -Release: 3%{?dist} +Version: 0.13 +Release: 1%{?dist} Summary: GNOME applet that shows traffic on a network device Group: Applications/Internet @@ -53,6 +53,9 @@ %{_datadir}/omf/netspeed_applet/ %changelog +* Tue Sep 20 2005 Aaron Kurtz - 0.13-1 +- Bump to 0.13 + * Thu Jun 16 2005 Aaron Kurtz - 0.12.1-3 - Removing spec-defined dist From fedora-extras-commits at redhat.com Tue Sep 20 07:26:37 2005 From: fedora-extras-commits at redhat.com (Aaron Kurtz (dragoon)) Date: Tue, 20 Sep 2005 03:26:37 -0400 Subject: rpms/gnome-applet-sensors/FC-4 sources, 1.3, 1.4 .cvsignore, 1.3, 1.4 gnome-applet-sensors.spec, 1.2, 1.3 Message-ID: <200509200726.j8K7QbVK017893@cvs-int.fedora.redhat.com> Author: dragoon Update of /cvs/extras/rpms/gnome-applet-sensors/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17832/FC-4 Modified Files: sources .cvsignore gnome-applet-sensors.spec Log Message: * Tue Sep 20 2005 Aaron Kurtz - 1.4-1 - bump to stable release 1.4 Index: sources =================================================================== RCS file: /cvs/extras/rpms/gnome-applet-sensors/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 2 Jul 2005 22:41:06 -0000 1.3 +++ sources 20 Sep 2005 07:26:35 -0000 1.4 @@ -1 +1 @@ -d624349d668c7d25f94a042f3da75983 sensors-applet-1.0.tar.gz +e71ea9fe79cbc281293fa90857a92b04 sensors-applet-1.4.tar.gz Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gnome-applet-sensors/FC-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 2 Jul 2005 22:41:06 -0000 1.3 +++ .cvsignore 20 Sep 2005 07:26:35 -0000 1.4 @@ -1 +1 @@ -sensors-applet-1.0.tar.gz +sensors-applet-1.4.tar.gz Index: gnome-applet-sensors.spec =================================================================== RCS file: /cvs/extras/rpms/gnome-applet-sensors/FC-4/gnome-applet-sensors.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- gnome-applet-sensors.spec 2 Jul 2005 22:41:06 -0000 1.2 +++ gnome-applet-sensors.spec 20 Sep 2005 07:26:35 -0000 1.3 @@ -1,5 +1,5 @@ Name: gnome-applet-sensors -Version: 1.0 +Version: 1.4 Release: 1%{?dist} Summary: Gnome panel applet for hardware sensors @@ -59,6 +59,9 @@ %changelog +* Tue Sep 20 2005 Aaron Kurtz - 1.4-1 +- bump to stable release 1.4 + * Sat Jul 02 2005 Aaron Kurtz - 1.0-1 - bump to stable release 1.0 From fedora-extras-commits at redhat.com Tue Sep 20 07:26:31 2005 From: fedora-extras-commits at redhat.com (Aaron Kurtz (dragoon)) Date: Tue, 20 Sep 2005 03:26:31 -0400 Subject: rpms/gnome-applet-sensors/FC-3 sources, 1.3, 1.4 .cvsignore, 1.3, 1.4 gnome-applet-sensors.spec, 1.2, 1.3 Message-ID: <200509200727.j8K7R2NO017944@cvs-int.fedora.redhat.com> Author: dragoon Update of /cvs/extras/rpms/gnome-applet-sensors/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17832/FC-3 Modified Files: sources .cvsignore gnome-applet-sensors.spec Log Message: * Tue Sep 20 2005 Aaron Kurtz - 1.4-1 - bump to stable release 1.4 Index: sources =================================================================== RCS file: /cvs/extras/rpms/gnome-applet-sensors/FC-3/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 2 Jul 2005 22:40:43 -0000 1.3 +++ sources 20 Sep 2005 07:26:29 -0000 1.4 @@ -1 +1 @@ -d624349d668c7d25f94a042f3da75983 sensors-applet-1.0.tar.gz +e71ea9fe79cbc281293fa90857a92b04 sensors-applet-1.4.tar.gz Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gnome-applet-sensors/FC-3/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 2 Jul 2005 22:40:43 -0000 1.3 +++ .cvsignore 20 Sep 2005 07:26:29 -0000 1.4 @@ -1 +1 @@ -sensors-applet-1.0.tar.gz +sensors-applet-1.4.tar.gz Index: gnome-applet-sensors.spec =================================================================== RCS file: /cvs/extras/rpms/gnome-applet-sensors/FC-3/gnome-applet-sensors.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- gnome-applet-sensors.spec 2 Jul 2005 22:40:43 -0000 1.2 +++ gnome-applet-sensors.spec 20 Sep 2005 07:26:29 -0000 1.3 @@ -1,5 +1,5 @@ Name: gnome-applet-sensors -Version: 1.0 +Version: 1.4 Release: 1%{?dist} Summary: Gnome panel applet for hardware sensors @@ -59,6 +59,9 @@ %changelog +* Tue Sep 20 2005 Aaron Kurtz - 1.4-1 +- bump to stable release 1.4 + * Sat Jul 02 2005 Aaron Kurtz - 1.0-1 - bump to stable release 1.0 From fedora-extras-commits at redhat.com Tue Sep 20 07:26:31 2005 From: fedora-extras-commits at redhat.com (Aaron Kurtz (dragoon)) Date: Tue, 20 Sep 2005 03:26:31 -0400 Subject: rpms/gnome-applet-sensors/devel sources, 1.3, 1.4 .cvsignore, 1.3, 1.4 gnome-applet-sensors.spec, 1.3, 1.4 Message-ID: <200509200727.j8K7R255017947@cvs-int.fedora.redhat.com> Author: dragoon Update of /cvs/extras/rpms/gnome-applet-sensors/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17832/devel Modified Files: sources .cvsignore gnome-applet-sensors.spec Log Message: * Tue Sep 20 2005 Aaron Kurtz - 1.4-1 - bump to stable release 1.4 Index: sources =================================================================== RCS file: /cvs/extras/rpms/gnome-applet-sensors/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 2 Jul 2005 22:37:00 -0000 1.3 +++ sources 20 Sep 2005 07:26:29 -0000 1.4 @@ -1 +1 @@ -d624349d668c7d25f94a042f3da75983 sensors-applet-1.0.tar.gz +e71ea9fe79cbc281293fa90857a92b04 sensors-applet-1.4.tar.gz Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gnome-applet-sensors/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 2 Jul 2005 22:37:00 -0000 1.3 +++ .cvsignore 20 Sep 2005 07:26:29 -0000 1.4 @@ -1 +1 @@ -sensors-applet-1.0.tar.gz +sensors-applet-1.4.tar.gz Index: gnome-applet-sensors.spec =================================================================== RCS file: /cvs/extras/rpms/gnome-applet-sensors/devel/gnome-applet-sensors.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- gnome-applet-sensors.spec 5 Jul 2005 23:04:27 -0000 1.3 +++ gnome-applet-sensors.spec 20 Sep 2005 07:26:29 -0000 1.4 @@ -1,6 +1,6 @@ Name: gnome-applet-sensors -Version: 1.0 -Release: 2%{?dist} +Version: 1.4 +Release: 1%{?dist} Summary: Gnome panel applet for hardware sensors Group: User Interface/Desktops @@ -12,8 +12,7 @@ BuildRequires: gettext BuildRequires: gnome-panel-devel >= 2.8 -#Cairo needs this, so why didn't gnome-panel-devel grab it -BuildRequires: libpng-devel + %description GNOME Sensors Applet is an applet for the GNOME Panel to display readings @@ -60,8 +59,8 @@ %changelog -* Tue Jul 05 2005 Aaron Kurtz - 1.0-2 -- rawhide Cairo dependencies +* Tue Sep 20 2005 Aaron Kurtz - 1.4-1 +- bump to stable release 1.4 * Sat Jul 02 2005 Aaron Kurtz - 1.0-1 - bump to stable release 1.0 From fedora-extras-commits at redhat.com Tue Sep 20 07:27:19 2005 From: fedora-extras-commits at redhat.com (Denis Leroy (denis)) Date: Tue, 20 Sep 2005 03:27:19 -0400 Subject: rpms/libgnomecanvasmm26/devel .cvsignore, 1.3, 1.4 libgnomecanvasmm.spec, 1.6, 1.7 sources, 1.3, 1.4 Message-ID: <200509200727.j8K7RJCB017983@cvs-int.fedora.redhat.com> Author: denis Update of /cvs/extras/rpms/libgnomecanvasmm26/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17960 Modified Files: .cvsignore libgnomecanvasmm.spec sources Log Message: Update to 2.12.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libgnomecanvasmm26/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 28 Apr 2005 22:50:55 -0000 1.3 +++ .cvsignore 20 Sep 2005 07:27:17 -0000 1.4 @@ -1 +1 @@ -libgnomecanvasmm-2.10.0.tar.bz2 +libgnomecanvasmm-2.12.0.tar.bz2 Index: libgnomecanvasmm.spec =================================================================== RCS file: /cvs/extras/rpms/libgnomecanvasmm26/devel/libgnomecanvasmm.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- libgnomecanvasmm.spec 28 Apr 2005 22:50:55 -0000 1.6 +++ libgnomecanvasmm.spec 20 Sep 2005 07:27:17 -0000 1.7 @@ -1,5 +1,5 @@ Name: libgnomecanvasmm26 -Version: 2.10.0 +Version: 2.12.0 Release: 1 Summary: C++ interface for Gnome libs (a GUI library for X) @@ -7,7 +7,7 @@ Group: System Environment/Libraries License: LGPL URL: http://gtkmm.sourceforge.net/ -Source0: http://ftp.gnome.org/pub/GNOME/sources/libgnomecanvasmm/2.10/libgnomecanvasmm-%{version}.tar.bz2 +Source0: http://ftp.gnome.org/pub/GNOME/sources/libgnomecanvasmm/2.12/libgnomecanvasmm-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires(post): /sbin/ldconfig @@ -75,6 +75,9 @@ %{_libdir}/pkgconfig/*.pc %changelog +* Mon Sep 19 2005 Denis Leroy - 2.12.0-1 +- Update to 2.12.0 + * Thu Apr 28 2005 Denis Leroy - 2.10.0-1 - Upgrade to 2.10.0 Index: sources =================================================================== RCS file: /cvs/extras/rpms/libgnomecanvasmm26/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 28 Apr 2005 22:50:55 -0000 1.3 +++ sources 20 Sep 2005 07:27:17 -0000 1.4 @@ -1 +1 @@ -09010717524f990915a6923d685ca5c1 libgnomecanvasmm-2.10.0.tar.bz2 +b05bba03433745043ef0c781020d4738 libgnomecanvasmm-2.12.0.tar.bz2 From fedora-extras-commits at redhat.com Tue Sep 20 07:28:49 2005 From: fedora-extras-commits at redhat.com (Denis Leroy (denis)) Date: Tue, 20 Sep 2005 03:28:49 -0400 Subject: rpms/libgnomemm26/devel .cvsignore, 1.3, 1.4 libgnomemm.spec, 1.7, 1.8 sources, 1.4, 1.5 Message-ID: <200509200728.j8K7SnaO018114@cvs-int.fedora.redhat.com> Author: denis Update of /cvs/extras/rpms/libgnomemm26/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18091 Modified Files: .cvsignore libgnomemm.spec sources Log Message: Update to 2.12.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libgnomemm26/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 28 Apr 2005 22:56:41 -0000 1.3 +++ .cvsignore 20 Sep 2005 07:28:47 -0000 1.4 @@ -1 +1 @@ -libgnomemm-2.10.0.tar.bz2 +libgnomemm-2.12.0.tar.bz2 Index: libgnomemm.spec =================================================================== RCS file: /cvs/extras/rpms/libgnomemm26/devel/libgnomemm.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- libgnomemm.spec 28 Apr 2005 22:56:41 -0000 1.7 +++ libgnomemm.spec 20 Sep 2005 07:28:47 -0000 1.8 @@ -1,5 +1,5 @@ Name: libgnomemm26 -Version: 2.10.0 +Version: 2.12.0 Release: 1 Summary: C++ interface for Gnome libs (a GUI library for X) @@ -7,7 +7,7 @@ Group: System Environment/Libraries License: LGPL URL: http://gtkmm.sourceforge.net/ -Source0: http://ftp.gnome.org/pub/GNOME/sources/libgnomemm/2.10/libgnomemm-%{version}.tar.bz2 +Source0: http://ftp.gnome.org/pub/GNOME/sources/libgnomemm/2.12/libgnomemm-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires(post): /sbin/ldconfig @@ -76,6 +76,9 @@ %{_libdir}/pkgconfig/*.pc %changelog +* Mon Sep 19 2005 Denis Leroy - 2.12.0-1 +- Update to 2.12.0 + * Thu Apr 28 2005 Denis Leroy - 2.10.0-1 - Upgrade to 2.10.0; x86_64 patch should no longer be necessary Index: sources =================================================================== RCS file: /cvs/extras/rpms/libgnomemm26/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 28 Apr 2005 22:56:41 -0000 1.4 +++ sources 20 Sep 2005 07:28:47 -0000 1.5 @@ -1 +1 @@ -095cbf2a023a82a009dc19ffc1a9d9c8 libgnomemm-2.10.0.tar.bz2 +2a618db87d023525391372a6268290b9 libgnomemm-2.12.0.tar.bz2 From fedora-extras-commits at redhat.com Tue Sep 20 07:31:08 2005 From: fedora-extras-commits at redhat.com (Denis Leroy (denis)) Date: Tue, 20 Sep 2005 03:31:08 -0400 Subject: rpms/libgnomeuimm26/devel .cvsignore, 1.3, 1.4 libgnomeuimm.spec, 1.7, 1.8 sources, 1.4, 1.5 Message-ID: <200509200731.j8K7V8QP018162@cvs-int.fedora.redhat.com> Author: denis Update of /cvs/extras/rpms/libgnomeuimm26/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18139 Modified Files: .cvsignore libgnomeuimm.spec sources Log Message: Update to 2.12.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libgnomeuimm26/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 28 Apr 2005 23:00:04 -0000 1.3 +++ .cvsignore 20 Sep 2005 07:31:06 -0000 1.4 @@ -1 +1 @@ -libgnomeuimm-2.10.0.tar.bz2 +libgnomeuimm-2.12.0.tar.bz2 Index: libgnomeuimm.spec =================================================================== RCS file: /cvs/extras/rpms/libgnomeuimm26/devel/libgnomeuimm.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- libgnomeuimm.spec 28 Apr 2005 23:00:04 -0000 1.7 +++ libgnomeuimm.spec 20 Sep 2005 07:31:06 -0000 1.8 @@ -1,5 +1,5 @@ Name: libgnomeuimm26 -Version: 2.10.0 +Version: 2.12.0 Release: 1 Summary: C++ interface for Gnome libs (a GUI library for X) @@ -7,7 +7,7 @@ Group: System Environment/Libraries License: LGPL URL: http://gtkmm.sourceforge.net/ -Source0: http://ftp.gnome.org/pub/GNOME/sources/libgnomeuimm/2.10/libgnomeuimm-%{version}.tar.bz2 +Source0: http://ftp.gnome.org/pub/GNOME/sources/libgnomeuimm/2.12/libgnomeuimm-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires(post): /sbin/ldconfig @@ -83,6 +83,9 @@ %{_libdir}/pkgconfig/*.pc %changelog +* Mon Sep 19 2005 Denis Leroy - 2.10.0-1 +- Update to 2.12.0 + * Wed Apr 20 2005 Denis Leroy - 2.10.0-1 - Upgrade to 2.10.0. Removed x86_64 patch. Index: sources =================================================================== RCS file: /cvs/extras/rpms/libgnomeuimm26/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 28 Apr 2005 23:00:04 -0000 1.4 +++ sources 20 Sep 2005 07:31:06 -0000 1.5 @@ -1 +1 @@ -3ec51ceca78fcccff3df940689f8538b libgnomeuimm-2.10.0.tar.bz2 +50ee34ec10c4527f1dc49bb12d0e0954 libgnomeuimm-2.12.0.tar.bz2 From fedora-extras-commits at redhat.com Tue Sep 20 07:48:08 2005 From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard)) Date: Tue, 20 Sep 2005 03:48:08 -0400 Subject: rpms/colorscheme - New directory Message-ID: <200509200748.j8K7m87I018390@cvs-int.fedora.redhat.com> Author: abompard Update of /cvs/extras/rpms/colorscheme In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18366/colorscheme Log Message: Directory /cvs/extras/rpms/colorscheme added to the repository From fedora-extras-commits at redhat.com Tue Sep 20 07:48:08 2005 From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard)) Date: Tue, 20 Sep 2005 03:48:08 -0400 Subject: rpms/colorscheme/devel - New directory Message-ID: <200509200748.j8K7m8Q6018395@cvs-int.fedora.redhat.com> Author: abompard Update of /cvs/extras/rpms/colorscheme/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18366/colorscheme/devel Log Message: Directory /cvs/extras/rpms/colorscheme/devel added to the repository From fedora-extras-commits at redhat.com Tue Sep 20 07:48:32 2005 From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard)) Date: Tue, 20 Sep 2005 03:48:32 -0400 Subject: rpms/colorscheme Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200509200748.j8K7mW8n018440@cvs-int.fedora.redhat.com> Author: abompard Update of /cvs/extras/rpms/colorscheme In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18411 Added Files: Makefile import.log Log Message: Setup of module colorscheme --- NEW FILE Makefile --- # Top level Makefile for module colorscheme all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Tue Sep 20 07:48:33 2005 From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard)) Date: Tue, 20 Sep 2005 03:48:33 -0400 Subject: rpms/colorscheme/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200509200748.j8K7mXNt018445@cvs-int.fedora.redhat.com> Author: abompard Update of /cvs/extras/rpms/colorscheme/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18411/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module colorscheme --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Tue Sep 20 07:49:29 2005 From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard)) Date: Tue, 20 Sep 2005 03:49:29 -0400 Subject: rpms/colorscheme import.log,1.1,1.2 Message-ID: <200509200749.j8K7nTBV018514@cvs-int.fedora.redhat.com> Author: abompard Update of /cvs/extras/rpms/colorscheme In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18479 Modified Files: import.log Log Message: auto-import colorscheme-0.2.1-1 on branch devel from colorscheme-0.2.1-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/colorscheme/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 20 Sep 2005 07:48:30 -0000 1.1 +++ import.log 20 Sep 2005 07:49:27 -0000 1.2 @@ -0,0 +1 @@ +colorscheme-0_2_1-1:HEAD:colorscheme-0.2.1-1.src.rpm:1127202546 From fedora-extras-commits at redhat.com Tue Sep 20 07:49:30 2005 From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard)) Date: Tue, 20 Sep 2005 03:49:30 -0400 Subject: rpms/colorscheme/devel colorscheme.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200509200749.j8K7nUbQ018521@cvs-int.fedora.redhat.com> Author: abompard Update of /cvs/extras/rpms/colorscheme/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18479/devel Modified Files: .cvsignore sources Added Files: colorscheme.spec Log Message: auto-import colorscheme-0.2.1-1 on branch devel from colorscheme-0.2.1-1.src.rpm --- NEW FILE colorscheme.spec --- Name: colorscheme Version: 0.2.1 Release: 1%{?dist} Summary: Generate a variety of colorschemes from a single starting color Group: Applications/Multimedia License: GPL URL: http://home.gna.org/colorscheme/ Source0: http://download.gna.org/colorscheme/0.2/colorscheme-0.2.1.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gtkmm24-devel >= 2.5, libgnomeui-devel >= 2.0, desktop-file-utils BuildRequires: cppunit-devel %description Have you ever been re-finishing a room in your home and found yourself asking "What color would go well with this" ? Or been working on a website and not able to find the perfect colorscheme to go with the company logo ? Try GNOME Colorscheme. GNOME Colorscheme is a very simple application for the GNOME desktop that allows you to generate a variety of colorschemes from a single starting color. %prep %setup -q %build %configure make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT desktop-file-install --vendor fedora \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ --delete-original \ --add-category X-Fedora \ --remove-category GNOME \ $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop %check make check || : %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc README COPYING NEWS AUTHORS ChangeLog TODO %{_bindir}/colorscheme %{_datadir}/applications/*.desktop %{_datadir}/%{name} %{_datadir}/pixmaps/* %changelog * Sun Sep 18 2005 Aurelien Bompard 0.2.1-1 - initial Fedora package (reviewed in bug 168635) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/colorscheme/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 20 Sep 2005 07:48:31 -0000 1.1 +++ .cvsignore 20 Sep 2005 07:49:28 -0000 1.2 @@ -0,0 +1 @@ +colorscheme-0.2.1.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/colorscheme/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 20 Sep 2005 07:48:31 -0000 1.1 +++ sources 20 Sep 2005 07:49:28 -0000 1.2 @@ -0,0 +1 @@ +e1465624d3373b5593b7c6ca25856aee colorscheme-0.2.1.tar.bz2 From fedora-extras-commits at redhat.com Tue Sep 20 08:14:42 2005 From: fedora-extras-commits at redhat.com (José Abílio Oliveira Matos (jamatos)) Date: Tue, 20 Sep 2005 04:14:42 -0400 Subject: owners owners.list,1.234,1.235 Message-ID: <200509200814.j8K8Ehwa020474@cvs-int.fedora.redhat.com> Author: jamatos Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20455 Modified Files: owners.list Log Message: add entry to rpy Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.234 retrieving revision 1.235 diff -u -r1.234 -r1.235 --- owners.list 19 Sep 2005 16:36:02 -0000 1.234 +++ owners.list 20 Sep 2005 08:14:40 -0000 1.235 @@ -884,6 +884,7 @@ Fedora Extras|rpmDirectoryCheck|Tool to detect some RPM packaging errors|enrico.scholz at informatik.tu-chemnitz.de|extras-qa at fedoraproject.org| Fedora Extras|rpmlint|RPM correctness checker|ville.skytta at iki.fi|extras-qa at fedoraproject.org| Fedora Extras|rpmproc|Perl script to help manage and build RPM packages|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| +Fedora Extras|rpy|Python interface to the R language|jamatos at fc.up.pt|extras-qa at fedoraproject.org| Fedora Extras|rrdtool|Round Robin Database Tool to store and display time-series data|matthias at rpmforge.net|extras-qa at fedoraproject.org| Fedora Extras|R-RScaLAPACK|An interface to perform parallel computation on linear algebra problems using ScaLAPACK|tcallawa at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|rsnapshot|Local and remote filesystem snapshot utility|ghenry at suretecsystems.com|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Tue Sep 20 08:21:26 2005 From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard)) Date: Tue, 20 Sep 2005 04:21:26 -0400 Subject: owners owners.list,1.235,1.236 Message-ID: <200509200821.j8K8LQZ0020598@cvs-int.fedora.redhat.com> Author: abompard Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20579 Modified Files: owners.list Log Message: - adding colorscheme Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.235 retrieving revision 1.236 diff -u -r1.235 -r1.236 --- owners.list 20 Sep 2005 08:14:40 -0000 1.235 +++ owners.list 20 Sep 2005 08:21:24 -0000 1.236 @@ -91,6 +91,7 @@ Fedora Extras|cogito|Cogito SCM based on git-core|chrisw at osdl.org|extras-qa at fedoraproject.org| Fedora Extras|Coin2|A high-level 3D visualization library|rc040203 at freenet.de|extras-qa at fedoraproject.org| Fedora Extras|colordiff|Color terminal highlighter for diff files|ville.skytta at iki.fi|extras-qa at fedoraproject.org| +Fedora Extras|colorscheme|Generate a variety of colorschemes from a single starting color|gauret at free.fr|extras-qa at fedoraproject.org| Fedora Extras|comical|GUI comic book viewer|tcallawa at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|compface|Library for handling X-Faces|ville.skytta at iki.fi|extras-qa at fedoraproject.org| Fedora Extras|comps|The list of groups and packages displayed by yum and repoview.|notting at redhat.com|katzj at redhat.com|skvidal at phy.duke.edu,sopwith at redhat.com From fedora-extras-commits at redhat.com Tue Sep 20 08:21:51 2005 From: fedora-extras-commits at redhat.com (Gavin Henry (ghenry)) Date: Tue, 20 Sep 2005 04:21:51 -0400 Subject: rpms/perl-Imager - New directory Message-ID: <200509200821.j8K8Lpmo020652@cvs-int.fedora.redhat.com> Author: ghenry Update of /cvs/extras/rpms/perl-Imager In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20632/perl-Imager Log Message: Directory /cvs/extras/rpms/perl-Imager added to the repository From fedora-extras-commits at redhat.com Tue Sep 20 08:21:51 2005 From: fedora-extras-commits at redhat.com (Gavin Henry (ghenry)) Date: Tue, 20 Sep 2005 04:21:51 -0400 Subject: rpms/perl-Imager/devel - New directory Message-ID: <200509200821.j8K8LpTl020657@cvs-int.fedora.redhat.com> Author: ghenry Update of /cvs/extras/rpms/perl-Imager/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20632/perl-Imager/devel Log Message: Directory /cvs/extras/rpms/perl-Imager/devel added to the repository From fedora-extras-commits at redhat.com Tue Sep 20 08:22:21 2005 From: fedora-extras-commits at redhat.com (Gavin Henry (ghenry)) Date: Tue, 20 Sep 2005 04:22:21 -0400 Subject: rpms/perl-Imager Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200509200822.j8K8MLMF020706@cvs-int.fedora.redhat.com> Author: ghenry Update of /cvs/extras/rpms/perl-Imager In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20677 Added Files: Makefile import.log Log Message: Setup of module perl-Imager --- NEW FILE Makefile --- # Top level Makefile for module perl-Imager all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Tue Sep 20 08:22:21 2005 From: fedora-extras-commits at redhat.com (Gavin Henry (ghenry)) Date: Tue, 20 Sep 2005 04:22:21 -0400 Subject: rpms/perl-Imager/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200509200822.j8K8ML5U020711@cvs-int.fedora.redhat.com> Author: ghenry Update of /cvs/extras/rpms/perl-Imager/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20677/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-Imager --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Tue Sep 20 08:23:28 2005 From: fedora-extras-commits at redhat.com (Gavin Henry (ghenry)) Date: Tue, 20 Sep 2005 04:23:28 -0400 Subject: rpms/perl-Imager import.log,1.1,1.2 Message-ID: <200509200823.j8K8Nwv6020783@cvs-int.fedora.redhat.com> Author: ghenry Update of /cvs/extras/rpms/perl-Imager In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20745 Modified Files: import.log Log Message: auto-import perl-Imager-0.45-2 on branch devel from perl-Imager-0.45-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-Imager/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 20 Sep 2005 08:22:19 -0000 1.1 +++ import.log 20 Sep 2005 08:23:26 -0000 1.2 @@ -0,0 +1 @@ +perl-Imager-0_45-2:HEAD:perl-Imager-0.45-2.src.rpm:1127204593 From fedora-extras-commits at redhat.com Tue Sep 20 08:23:28 2005 From: fedora-extras-commits at redhat.com (Gavin Henry (ghenry)) Date: Tue, 20 Sep 2005 04:23:28 -0400 Subject: rpms/perl-Imager/devel perl-Imager.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200509200824.j8K8NwhQ020787@cvs-int.fedora.redhat.com> Author: ghenry Update of /cvs/extras/rpms/perl-Imager/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20745/devel Modified Files: .cvsignore sources Added Files: perl-Imager.spec Log Message: auto-import perl-Imager-0.45-2 on branch devel from perl-Imager-0.45-2.src.rpm --- NEW FILE perl-Imager.spec --- Name: perl-Imager Version: 0.45 Release: 2%{?dist} Summary: Imager - Perl extension for Generating 24 bit Images Group: Development/Libraries License: GPL or Artistic URL: http://search.cpan.org/dist/Imager/ Source0: http://search.cpan.org/CPAN/authors/id/T/TO/TONYC/Imager-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: perl(ExtUtils::Depends), perl(Parse::RecDescent) BuildRequires: libungif-devel, libpng-devel, freetype-devel, libtiff-devel BuildRequires: libjpeg-devel, t1lib-devel Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description Imager is a module for creating and altering images. It can read and write various image formats, draw primitive shapes like lines,and polygons, blend multiple images together in various ways, scale, crop, render text and more. %prep %setup -q -n Imager-%{version} %{__perl} -pi -e 's/my \$resp = /my \$resp = "n"/g' Makefile.PL # Quiet rpmlint. find . -type f \( -perm +100 -o -name '*.pl' \) \ -exec perl -pi -e 's,^(\#\!)perl,$1%{__perl}, if ($.==1);' {} \; find . -type f -name '*.pm' \ -exec perl -pi -e '$_=undef if ($.==1 and /^\#\!.*perl/)' {} \; chmod a-x samples/* %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 d -depth -exec rmdir {} 2>/dev/null ';' find $RPM_BUILD_ROOT -type f -name '*.bs' -empty -exec rm -f {} ';' chmod -R u+w $RPM_BUILD_ROOT/* perldoc -t perlgpl > COPYING perldoc -t perlartistic > Artistic %check make test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc README COPYING Artistic %doc samples/ %{perl_vendorarch}/Imager* %{perl_vendorarch}/auto/* %{_mandir}/man3/*.3* %changelog * Wed Sep 14 2005 Gavin Henry - 0.45-2 - Applied Steven Pritchard's kind patch to cleanup - https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=166254 * Thu Aug 18 2005 Gavin Henry - 0.45-1 - First build. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Imager/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 20 Sep 2005 08:22:19 -0000 1.1 +++ .cvsignore 20 Sep 2005 08:23:26 -0000 1.2 @@ -0,0 +1 @@ +Imager-0.45.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Imager/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 20 Sep 2005 08:22:19 -0000 1.1 +++ sources 20 Sep 2005 08:23:26 -0000 1.2 @@ -0,0 +1 @@ +85dd3736426396341b54b632d239e5e5 Imager-0.45.tar.gz From fedora-extras-commits at redhat.com Tue Sep 20 09:16:51 2005 From: fedora-extras-commits at redhat.com (Gavin Henry (ghenry)) Date: Tue, 20 Sep 2005 05:16:51 -0400 Subject: rpms/perl-Gnome2-Canvas - New directory Message-ID: <200509200916.j8K9Gp2q022756@cvs-int.fedora.redhat.com> Author: ghenry Update of /cvs/extras/rpms/perl-Gnome2-Canvas In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22729/perl-Gnome2-Canvas Log Message: Directory /cvs/extras/rpms/perl-Gnome2-Canvas added to the repository From fedora-extras-commits at redhat.com Tue Sep 20 09:16:52 2005 From: fedora-extras-commits at redhat.com (Gavin Henry (ghenry)) Date: Tue, 20 Sep 2005 05:16:52 -0400 Subject: rpms/perl-Gnome2-Canvas/devel - New directory Message-ID: <200509200916.j8K9GqPk022761@cvs-int.fedora.redhat.com> Author: ghenry Update of /cvs/extras/rpms/perl-Gnome2-Canvas/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22729/perl-Gnome2-Canvas/devel Log Message: Directory /cvs/extras/rpms/perl-Gnome2-Canvas/devel added to the repository From fedora-extras-commits at redhat.com Tue Sep 20 09:17:32 2005 From: fedora-extras-commits at redhat.com (Gavin Henry (ghenry)) Date: Tue, 20 Sep 2005 05:17:32 -0400 Subject: rpms/perl-Gnome2-Canvas Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200509200917.j8K9HWEP022806@cvs-int.fedora.redhat.com> Author: ghenry Update of /cvs/extras/rpms/perl-Gnome2-Canvas In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22777 Added Files: Makefile import.log Log Message: Setup of module perl-Gnome2-Canvas --- NEW FILE Makefile --- # Top level Makefile for module perl-Gnome2-Canvas all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Tue Sep 20 09:17:32 2005 From: fedora-extras-commits at redhat.com (Gavin Henry (ghenry)) Date: Tue, 20 Sep 2005 05:17:32 -0400 Subject: rpms/perl-Gnome2-Canvas/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200509200917.j8K9HWIE022811@cvs-int.fedora.redhat.com> Author: ghenry Update of /cvs/extras/rpms/perl-Gnome2-Canvas/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22777/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-Gnome2-Canvas --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Tue Sep 20 09:18:22 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Tue, 20 Sep 2005 05:18:22 -0400 Subject: rpms/Coin2/devel Coin2.spec,1.12,1.13 Message-ID: <200509200918.j8K9IPhs022865@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/Coin2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22844 Modified Files: Coin2.spec Log Message: Check if x86_64 still requires simmacros Index: Coin2.spec =================================================================== RCS file: /cvs/extras/rpms/Coin2/devel/Coin2.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- Coin2.spec 7 Jul 2005 10:34:00 -0000 1.12 +++ Coin2.spec 20 Sep 2005 09:18:20 -0000 1.13 @@ -13,7 +13,7 @@ Summary: High-level 3D visualization library Name: Coin2 -Version: 2.4.3 +Version: 2.4.4 Release: 1%{?dist} License: GPL @@ -39,6 +39,9 @@ Requires(post): /sbin/ldconfig Requires(postun): /sbin/ldconfig +# TESTING +ExclusiveArch: x86_64 + %description Coin is a 3D graphics library with an Application Programming Interface based on the Open Inventor 2.1 API. @@ -57,8 +60,8 @@ %patch0 -p1 %patch1 -p1 %patch2 -p1 -%patch3 -p1 -%patch4 -p1 +# %patch3 -p1 +# %patch4 -p1 %patch5 -p1 sed -i -e 's, at LIBFREETYPE_SONAME@,"%{libfreetype_SONAME}",' \ @@ -86,6 +89,9 @@ rm -rf $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT install +# TESTING +exit 1 + %clean rm -rf $RPM_BUILD_ROOT @@ -114,6 +120,9 @@ %doc %{coin_htmldir} %changelog +* Tue Sep 20 2005 Ralf Corsepius - 2.4.4-1 +- Upstream update. + * Thu Jul 07 2005 Ralf Corsepius - 0:2.4.3-1 - Upstream update. From fedora-extras-commits at redhat.com Tue Sep 20 09:18:35 2005 From: fedora-extras-commits at redhat.com (Gavin Henry (ghenry)) Date: Tue, 20 Sep 2005 05:18:35 -0400 Subject: rpms/perl-Gnome2-Canvas import.log,1.1,1.2 Message-ID: <200509200919.j8K9J54U022939@cvs-int.fedora.redhat.com> Author: ghenry Update of /cvs/extras/rpms/perl-Gnome2-Canvas In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22870 Modified Files: import.log Log Message: auto-import perl-Gnome2-Canvas-1.002-4 on branch devel from perl-Gnome2-Canvas-1.002-4.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-Gnome2-Canvas/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 20 Sep 2005 09:17:30 -0000 1.1 +++ import.log 20 Sep 2005 09:18:33 -0000 1.2 @@ -0,0 +1 @@ +perl-Gnome2-Canvas-1_002-4:HEAD:perl-Gnome2-Canvas-1.002-4.src.rpm:1127207897 From fedora-extras-commits at redhat.com Tue Sep 20 09:18:35 2005 From: fedora-extras-commits at redhat.com (Gavin Henry (ghenry)) Date: Tue, 20 Sep 2005 05:18:35 -0400 Subject: rpms/perl-Gnome2-Canvas/devel perl-Gnome2-Canvas.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200509200919.j8K9J6To022943@cvs-int.fedora.redhat.com> Author: ghenry Update of /cvs/extras/rpms/perl-Gnome2-Canvas/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22870/devel Modified Files: .cvsignore sources Added Files: perl-Gnome2-Canvas.spec Log Message: auto-import perl-Gnome2-Canvas-1.002-4 on branch devel from perl-Gnome2-Canvas-1.002-4.src.rpm --- NEW FILE perl-Gnome2-Canvas.spec --- Name: perl-Gnome2-Canvas Version: 1.002 Release: 4%{?dist} Summary: An engine for structured graphics in Gnome2 Group: Development/Libraries License: GPL URL: http://search.cpan.org/dist/Gnome2-Canvas/ Source0: http://search.cpan.org/CPAN/authors/id/T/TS/TSCH/Gnome2-Canvas-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: perl(ExtUtils::Depends), perl(ExtUtils::PkgConfig) BuildRequires: perl(Glib), perl(Gtk2) BuildRequires: libgnomecanvas-devel >= 2.0.0 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description The Gnome Canvas is an engine for structured graphics that offers a rich imaging model, high-performance rendering, and a powerful, high level API. It offers a choice of two rendering back-ends, one based on GDK for extremely fast display, and another based on Libart, a sophisticated, antialiased, alpha-compositing engine. This widget can be used for flexible display of graphics and for creating interactive user interface elements. %prep %setup -q -n Gnome2-Canvas-%{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 d -depth -exec rmdir {} 2>/dev/null ';' find $RPM_BUILD_ROOT -type f -name '*.bs' -empty -exec rm -f {} ';' chmod -R u+w $RPM_BUILD_ROOT/* %check make test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc AUTHORS ChangeLog LICENSE NEWS README TODO %doc canvas_demo/ %{perl_vendorarch}/auto/Gnome2/ %{perl_vendorarch}/Gnome2* %{_mandir}/man3/*.3* %changelog * Wed Sep 14 2005 Gavin Henry - 1.002-4 - Added OPTIMIZE="$RPM_OPT_FLAGS" * Fri Aug 19 2005 Gavin Henry - 1.002-3 - Third build. * Thu Aug 18 2005 Gavin Henry - 1.002-2 - Second build. * Sun Jul 3 2005 Gavin Henry - 1.002-1 - First build. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Gnome2-Canvas/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 20 Sep 2005 09:17:30 -0000 1.1 +++ .cvsignore 20 Sep 2005 09:18:33 -0000 1.2 @@ -0,0 +1 @@ +Gnome2-Canvas-1.002.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Gnome2-Canvas/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 20 Sep 2005 09:17:30 -0000 1.1 +++ sources 20 Sep 2005 09:18:33 -0000 1.2 @@ -0,0 +1 @@ +93405a987ba4bbd03c2f91592b88f5cb Gnome2-Canvas-1.002.tar.gz From fedora-extras-commits at redhat.com Tue Sep 20 09:19:45 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Tue, 20 Sep 2005 05:19:45 -0400 Subject: rpms/Coin2/devel .cvsignore,1.6,1.7 sources,1.6,1.7 Message-ID: <200509200919.j8K9Jjxq023009@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/Coin2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22984 Modified Files: .cvsignore sources Log Message: Update preps Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/Coin2/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 7 Jul 2005 10:34:00 -0000 1.6 +++ .cvsignore 20 Sep 2005 09:19:43 -0000 1.7 @@ -1,3 +1,4 @@ Coin-2.4.3-libtool.diff.bz2 Coin-2.4.3-simacros.diff.bz2 Coin-2.4.3.tar.gz +Coin-2.4.4.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/Coin2/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 7 Jul 2005 10:34:00 -0000 1.6 +++ sources 20 Sep 2005 09:19:43 -0000 1.7 @@ -1,3 +1,4 @@ e2dcc9dde9d97577d211f3caba10c7e0 Coin-2.4.3-libtool.diff.bz2 4f4d4e4172db2107c578d0d99fde2888 Coin-2.4.3-simacros.diff.bz2 57c039a55133c5037ebef6759d26f603 Coin-2.4.3.tar.gz +7976fcf2d1154bc8574d75b99bab45ee Coin-2.4.4.tar.gz From fedora-extras-commits at redhat.com Tue Sep 20 09:20:33 2005 From: fedora-extras-commits at redhat.com (Gavin Henry (ghenry)) Date: Tue, 20 Sep 2005 05:20:33 -0400 Subject: rpms/perl-Gtk2-GladeXML/devel - New directory Message-ID: <200509200920.j8K9KXei023109@cvs-int.fedora.redhat.com> Author: ghenry Update of /cvs/extras/rpms/perl-Gtk2-GladeXML/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23080/perl-Gtk2-GladeXML/devel Log Message: Directory /cvs/extras/rpms/perl-Gtk2-GladeXML/devel added to the repository From fedora-extras-commits at redhat.com Tue Sep 20 09:20:32 2005 From: fedora-extras-commits at redhat.com (Gavin Henry (ghenry)) Date: Tue, 20 Sep 2005 05:20:32 -0400 Subject: rpms/perl-Gtk2-GladeXML - New directory Message-ID: <200509200920.j8K9KWJN023104@cvs-int.fedora.redhat.com> Author: ghenry Update of /cvs/extras/rpms/perl-Gtk2-GladeXML In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23080/perl-Gtk2-GladeXML Log Message: Directory /cvs/extras/rpms/perl-Gtk2-GladeXML added to the repository From fedora-extras-commits at redhat.com Tue Sep 20 09:21:06 2005 From: fedora-extras-commits at redhat.com (Gavin Henry (ghenry)) Date: Tue, 20 Sep 2005 05:21:06 -0400 Subject: rpms/perl-Gtk2-GladeXML Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200509200921.j8K9L6gE023165@cvs-int.fedora.redhat.com> Author: ghenry Update of /cvs/extras/rpms/perl-Gtk2-GladeXML In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23130 Added Files: Makefile import.log Log Message: Setup of module perl-Gtk2-GladeXML --- NEW FILE Makefile --- # Top level Makefile for module perl-Gtk2-GladeXML all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Tue Sep 20 09:21:06 2005 From: fedora-extras-commits at redhat.com (Gavin Henry (ghenry)) Date: Tue, 20 Sep 2005 05:21:06 -0400 Subject: rpms/perl-Gtk2-GladeXML/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200509200921.j8K9L6Xq023168@cvs-int.fedora.redhat.com> Author: ghenry Update of /cvs/extras/rpms/perl-Gtk2-GladeXML/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23130/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-Gtk2-GladeXML --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Tue Sep 20 09:22:17 2005 From: fedora-extras-commits at redhat.com (Gavin Henry (ghenry)) Date: Tue, 20 Sep 2005 05:22:17 -0400 Subject: rpms/perl-Gtk2-GladeXML import.log,1.1,1.2 Message-ID: <200509200922.j8K9Mlvl023271@cvs-int.fedora.redhat.com> Author: ghenry Update of /cvs/extras/rpms/perl-Gtk2-GladeXML In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23233 Modified Files: import.log Log Message: auto-import perl-Gtk2-GladeXML-1.005-4 on branch devel from perl-Gtk2-GladeXML-1.005-4.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-Gtk2-GladeXML/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 20 Sep 2005 09:21:04 -0000 1.1 +++ import.log 20 Sep 2005 09:22:15 -0000 1.2 @@ -0,0 +1 @@ +perl-Gtk2-GladeXML-1_005-4:HEAD:perl-Gtk2-GladeXML-1.005-4.src.rpm:1127208120 From fedora-extras-commits at redhat.com Tue Sep 20 09:22:18 2005 From: fedora-extras-commits at redhat.com (Gavin Henry (ghenry)) Date: Tue, 20 Sep 2005 05:22:18 -0400 Subject: rpms/perl-Gtk2-GladeXML/devel perl-Gtk2-GladeXML.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200509200922.j8K9Mmdu023275@cvs-int.fedora.redhat.com> Author: ghenry Update of /cvs/extras/rpms/perl-Gtk2-GladeXML/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23233/devel Modified Files: .cvsignore sources Added Files: perl-Gtk2-GladeXML.spec Log Message: auto-import perl-Gtk2-GladeXML-1.005-4 on branch devel from perl-Gtk2-GladeXML-1.005-4.src.rpm --- NEW FILE perl-Gtk2-GladeXML.spec --- Name: perl-Gtk2-GladeXML Version: 1.005 Release: 4%{?dist} Summary: Create user interfaces directly from Glade XML files Group: Development/Libraries License: GPL URL: http://search.cpan.org/dist/Gtk2-GladeXML/ Source0: http://search.cpan.org/CPAN/authors/id/T/TS/TSCH/Gtk2-GladeXML-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: perl(ExtUtils::Depends), perl(ExtUtils::PkgConfig) BuildRequires: perl(Glib), perl(Gtk2) BuildRequires: libglade2-devel >= 2.0.0 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description Glade is a free user interface builder for GTK+ and GNOME. After designing a user interface with glade-2 the layout and configuration are saved in an XML file. libglade is a library which knows how to build and hook up the user interface described in the Glade XML file at application run time. This extension module binds libglade to Perl so you can create and manipulate user interfaces in Perl code in conjunction with Gtk2 and even Gnome2. Better yet you can load a file's contents into a PERL scalar do a few magical regular expressions to customize things and the load up the app. It doesn't get any easier. %prep %setup -q -n Gtk2-GladeXML-%{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 d -depth -exec rmdir {} 2>/dev/null ';' find $RPM_BUILD_ROOT -type f -name '*.bs' -empty -exec rm -f {} ';' chmod -R u+w $RPM_BUILD_ROOT/* %check make test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc AUTHORS ChangeLog LICENSE NEWS README %doc examples/ %{perl_vendorarch}/auto/Gtk2/ %{perl_vendorarch}/Gtk2* %{_mandir}/man3/*.3* %changelog * Wed Sep 14 2005 Gavin Henry - 1.005-4 - Added OPTIMIZE="$RPM_OPT_FLAGS" and removed "find examples -type f -exec chmod -x {} ';'" * Thu Aug 18 2005 Gavin Henry - 1.005-3 - Third build. * Thu Aug 18 2005 Gavin Henry - 1.005-2 - Second build. * Sun Jul 3 2005 Gavin Henry - 1.002-1 - First build. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Gtk2-GladeXML/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 20 Sep 2005 09:21:04 -0000 1.1 +++ .cvsignore 20 Sep 2005 09:22:15 -0000 1.2 @@ -0,0 +1 @@ +Gtk2-GladeXML-1.005.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Gtk2-GladeXML/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 20 Sep 2005 09:21:04 -0000 1.1 +++ sources 20 Sep 2005 09:22:15 -0000 1.2 @@ -0,0 +1 @@ +097ab67c4f0025b74e721ae835a2d554 Gtk2-GladeXML-1.005.tar.gz From fedora-extras-commits at redhat.com Tue Sep 20 09:23:07 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Tue, 20 Sep 2005 05:23:07 -0400 Subject: rpms/Coin2/devel Coin2.spec,1.13,1.14 Message-ID: <200509200923.j8K9N710023326@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/Coin2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23307 Modified Files: Coin2.spec Log Message: tag inflation Index: Coin2.spec =================================================================== RCS file: /cvs/extras/rpms/Coin2/devel/Coin2.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- Coin2.spec 20 Sep 2005 09:18:20 -0000 1.13 +++ Coin2.spec 20 Sep 2005 09:23:05 -0000 1.14 @@ -14,7 +14,7 @@ Summary: High-level 3D visualization library Name: Coin2 Version: 2.4.4 -Release: 1%{?dist} +Release: 1.1%{?dist} License: GPL Group: System Environment/Libraries From fedora-extras-commits at redhat.com Tue Sep 20 12:26:03 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Tue, 20 Sep 2005 08:26:03 -0400 Subject: rpms/Coin2/devel Coin2.spec,1.14,1.15 Message-ID: <200509201226.j8KCQ35U027730@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/Coin2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27711 Modified Files: Coin2.spec Log Message: More testing Index: Coin2.spec =================================================================== RCS file: /cvs/extras/rpms/Coin2/devel/Coin2.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- Coin2.spec 20 Sep 2005 09:23:05 -0000 1.14 +++ Coin2.spec 20 Sep 2005 12:26:01 -0000 1.15 @@ -9,7 +9,7 @@ %define libopenal_SONAME libopenal.so.0 %define libsimage_SONAME libsimage.so.20 -%define libfreetype_SONAME libfreetype.so.6 +# %define libfreetype_SONAME libfreetype.so.6 Summary: High-level 3D visualization library Name: Coin2 @@ -32,7 +32,10 @@ BuildRequires: xorg-x11-Mesa-libGL BuildRequires: xorg-x11-Mesa-libGLU BuildRequires: xorg-x11-devel -BuildRequires: zlib-devel bzip2-devel +BuildRequires: zlib-devel +BuildRequires: bzip2-devel +# BuildRequires: fontconfig-devel +# BuildRequries: freetype-devel BuildRequires: doxygen BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -59,13 +62,13 @@ %setup -q -n Coin-%{version} %patch0 -p1 %patch1 -p1 -%patch2 -p1 +# %patch2 -p1 # %patch3 -p1 # %patch4 -p1 %patch5 -p1 -sed -i -e 's, at LIBFREETYPE_SONAME@,"%{libfreetype_SONAME}",' \ - src/glue/freetype.c +# sed -i -e 's, at LIBFREETYPE_SONAME@,"%{libfreetype_SONAME}",' \ +# src/glue/freetype.c sed -i -e 's, at LIBSIMAGE_SONAME@,"%{libsimage_SONAME}",' \ src/glue/simage_wrapper.c sed -i -e 's, at LIBOPENAL_SONAME@,"%{libopenal_SONAME}",' \ @@ -79,10 +82,14 @@ --disable-dl-libbzip2 \ --disable-dl-glu \ --disable-dl-zlib \ + --disable-dl-freetype \ + --disable-dl-fontconfig \ + --disable-spidermonkey \ --enable-man \ --enable-html \ --enable-3ds-import \ - htmldir=%{coin_htmldir}/Coin + htmldir=%{coin_htmldir}/Coin \ + CFLAGS="$RPM_OPT_FLAGS "$(pkg-config --cflags freetype2) make %{?_smp_mflags} %install From fedora-extras-commits at redhat.com Tue Sep 20 16:04:27 2005 From: fedora-extras-commits at redhat.com (Robert Theisen (trobert)) Date: Tue, 20 Sep 2005 12:04:27 -0400 Subject: web/html/download mirrors.php,1.28,1.29 Message-ID: <200509201604.j8KG4wmT001209@cvs-int.fedora.redhat.com> Author: trobert Update of /cvs/fedora/web/html/download In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1189 Modified Files: mirrors.php Log Message: Added new link for http://fedora.secs.oakland.edu/ Index: mirrors.php =================================================================== RCS file: /cvs/fedora/web/html/download/mirrors.php,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- mirrors.php 13 Sep 2005 20:46:32 -0000 1.28 +++ mirrors.php 20 Sep 2005 16:04:25 -0000 1.29 @@ -86,6 +86,7 @@

      2. ftp://fedora.omnispring.com/
      3. http://srl.cs.jhu.edu/YUM/fedora-core/
      4. rsync://srl.cs.jhu.edu/YUM/fedora-core/
        5. +
      5. http://fedora.secs.oakland.edu/
      6. USA West From fedora-extras-commits at redhat.com Tue Sep 20 18:22:51 2005 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Tue, 20 Sep 2005 14:22:51 -0400 Subject: rpms/TeXmacs/devel .cvsignore, 1.12, 1.13 TeXmacs.spec, 1.18, 1.19 sources, 1.13, 1.14 Message-ID: <200509201822.j8KIMpKG004359@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/TeXmacs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4336 Modified Files: .cvsignore TeXmacs.spec sources Log Message: new version 1.0.5.8 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/TeXmacs/devel/.cvsignore,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- .cvsignore 25 Jul 2005 17:42:58 -0000 1.12 +++ .cvsignore 20 Sep 2005 18:22:48 -0000 1.13 @@ -1 +1 @@ -TeXmacs-1.0.5.6-src.tar.gz +TeXmacs-1.0.5.8-src.tar.gz Index: TeXmacs.spec =================================================================== RCS file: /cvs/extras/rpms/TeXmacs/devel/TeXmacs.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- TeXmacs.spec 22 Aug 2005 13:59:45 -0000 1.18 +++ TeXmacs.spec 20 Sep 2005 18:22:48 -0000 1.19 @@ -1,12 +1,12 @@ Name: TeXmacs -Version: 1.0.5.7 +Version: 1.0.5.8 Release: 1%{?dist} Summary: Structured wysiwyg scientific text editor Group: Applications/Editors License: GPL URL: http://www.texmacs.org -Source: ftp://ftp.texmacs.org/pub/TeXmacs/targz/TeXmacs-1.0.5.7-src.tar.gz +Source: ftp://ftp.texmacs.org/pub/TeXmacs/targz/TeXmacs-1.0.5.8-src.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: tetex, tetex-fonts, ghostscript Buildrequires: guile-devel, desktop-file-utils, tetex, freetype-devel, XFree86-devel @@ -124,6 +124,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Sep 20 2005 Gerard Milmeister - 1.0.5.8 +- New Version 1.0.5.8 + * Mon Aug 22 2005 Gerard Milmeister - 1.0.5.7 - New Version 1.0.5.7 Index: sources =================================================================== RCS file: /cvs/extras/rpms/TeXmacs/devel/sources,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- sources 22 Aug 2005 13:59:45 -0000 1.13 +++ sources 20 Sep 2005 18:22:48 -0000 1.14 @@ -1 +1 @@ -c5dc2bd407f238041982291acada8b02 TeXmacs-1.0.5.7-src.tar.gz +3ebeed05713a410ce57fbddb3a540244 TeXmacs-1.0.5.8-src.tar.gz From fedora-extras-commits at redhat.com Tue Sep 20 18:27:45 2005 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Tue, 20 Sep 2005 14:27:45 -0400 Subject: rpms/TeXmacs/FC-4 TeXmacs.spec,1.19,1.20 sources,1.13,1.14 Message-ID: <200509201827.j8KIRjEV004426@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/TeXmacs/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4405 Modified Files: TeXmacs.spec sources Log Message: new version 1.0.5.8 Index: TeXmacs.spec =================================================================== RCS file: /cvs/extras/rpms/TeXmacs/FC-4/TeXmacs.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- TeXmacs.spec 22 Aug 2005 13:57:01 -0000 1.19 +++ TeXmacs.spec 20 Sep 2005 18:27:42 -0000 1.20 @@ -1,12 +1,12 @@ Name: TeXmacs -Version: 1.0.5.7 +Version: 1.0.5.8 Release: 1%{?dist} Summary: Structured wysiwyg scientific text editor Group: Applications/Editors License: GPL URL: http://www.texmacs.org -Source: ftp://ftp.texmacs.org/pub/TeXmacs/targz/TeXmacs-1.0.5.7-src.tar.gz +Source: ftp://ftp.texmacs.org/pub/TeXmacs/targz/TeXmacs-1.0.5.8-src.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: tetex, tetex-fonts, ghostscript Buildrequires: guile-devel, desktop-file-utils, tetex, freetype-devel, XFree86-devel @@ -124,6 +124,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Sep 20 2005 Gerard Milmeister - 1.0.5.8 +- New Version 1.0.5.8 + * Mon Aug 22 2005 Gerard Milmeister - 1.0.5.7 - New Version 1.0.5.7 Index: sources =================================================================== RCS file: /cvs/extras/rpms/TeXmacs/FC-4/sources,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- sources 22 Aug 2005 13:57:01 -0000 1.13 +++ sources 20 Sep 2005 18:27:43 -0000 1.14 @@ -1 +1 @@ -c5dc2bd407f238041982291acada8b02 TeXmacs-1.0.5.7-src.tar.gz +3ebeed05713a410ce57fbddb3a540244 TeXmacs-1.0.5.8-src.tar.gz From fedora-extras-commits at redhat.com Tue Sep 20 18:28:01 2005 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Tue, 20 Sep 2005 14:28:01 -0400 Subject: rpms/TeXmacs/FC-3 TeXmacs.spec,1.9,1.10 sources,1.9,1.10 Message-ID: <200509201828.j8KIS1Jl004457@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/TeXmacs/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4434 Modified Files: TeXmacs.spec sources Log Message: new version 1.0.5.8 Index: TeXmacs.spec =================================================================== RCS file: /cvs/extras/rpms/TeXmacs/FC-3/TeXmacs.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- TeXmacs.spec 22 Aug 2005 13:58:45 -0000 1.9 +++ TeXmacs.spec 20 Sep 2005 18:27:59 -0000 1.10 @@ -1,12 +1,12 @@ Name: TeXmacs -Version: 1.0.5.7 +Version: 1.0.5.8 Release: 1%{?dist} Summary: Structured wysiwyg scientific text editor Group: Applications/Editors License: GPL URL: http://www.texmacs.org -Source: ftp://ftp.texmacs.org/pub/TeXmacs/targz/TeXmacs-1.0.5.7-src.tar.gz +Source: ftp://ftp.texmacs.org/pub/TeXmacs/targz/TeXmacs-1.0.5.8-src.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: tetex, tetex-fonts, ghostscript Buildrequires: guile-devel, desktop-file-utils, tetex, freetype-devel, XFree86-devel @@ -124,6 +124,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Sep 20 2005 Gerard Milmeister - 1.0.5.8 +- New Version 1.0.5.8 + * Mon Aug 22 2005 Gerard Milmeister - 1.0.5.7 - New Version 1.0.5.7 Index: sources =================================================================== RCS file: /cvs/extras/rpms/TeXmacs/FC-3/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 22 Aug 2005 13:58:45 -0000 1.9 +++ sources 20 Sep 2005 18:27:59 -0000 1.10 @@ -1 +1 @@ -c5dc2bd407f238041982291acada8b02 TeXmacs-1.0.5.7-src.tar.gz +3ebeed05713a410ce57fbddb3a540244 TeXmacs-1.0.5.8-src.tar.gz From fedora-extras-commits at redhat.com Tue Sep 20 19:09:41 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Tue, 20 Sep 2005 15:09:41 -0400 Subject: rpms/imlib2/devel .cvsignore, 1.3, 1.4 imlib2.spec, 1.14, 1.15 sources, 1.4, 1.5 imlib2-1.2.0-configure-xlib64.patch, 1.1, NONE imlib2-1.2.0-xpmcescape.patch, 1.1, NONE Message-ID: <200509201909.j8KJ9fXE006395@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/imlib2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6372 Modified Files: .cvsignore imlib2.spec sources Removed Files: imlib2-1.2.0-configure-xlib64.patch imlib2-1.2.0-xpmcescape.patch Log Message: * Sun Aug 28 2005 Ville Skytt?? - 1.2.1-2 - 1.2.1, patches applied/obsoleted upstream. - Improve summary and description, fix URL. - Move HTML docs to -devel. - Build with dependency tracking disabled. - Drop x86_64 freetype rpath hack, require a fixed freetype-devel. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/imlib2/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 8 Nov 2004 04:35:58 -0000 1.3 +++ .cvsignore 20 Sep 2005 19:09:39 -0000 1.4 @@ -1 +1 @@ -imlib2-1.1.2.tar.gz +imlib2-1.2.1.tar.gz Index: imlib2.spec =================================================================== RCS file: /cvs/extras/rpms/imlib2/devel/imlib2.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- imlib2.spec 9 May 2005 19:28:56 -0000 1.14 +++ imlib2.spec 20 Sep 2005 19:09:39 -0000 1.15 @@ -1,87 +1,74 @@ -Summary: Graphic library for file loading, saving, rendering, and manipulation +Summary: Image loading, saving, rendering, and manipulation library Name: imlib2 -Version: 1.2.0 -Release: 8.fc4 +Version: 1.2.1 +Release: 2%{?dist} License: BSD Group: System Environment/Libraries -URL: http://www.enlightenment.org/pages/imlib2.html +URL: http://www.enlightenment.org/Libraries/Imlib2/ Source0: http://download.sf.net/enlightenment/%{name}-%{version}.tar.gz -Patch0: imlib2-1.2.0-configure-xlib64.patch -Patch1: imlib2-1.2.0-xpmcescape.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot BuildRequires: XFree86-devel libjpeg-devel libpng-devel libtiff-devel -BuildRequires: libungif-devel freetype-devel libtool bzip2-devel %{__perl} +BuildRequires: libungif-devel freetype-devel >= 2.1.9-4 libtool bzip2-devel %package devel Summary: Development package for %{name} Group: Development/Libraries Requires: %{name} = %{version}-%{release} -Requires: XFree86-devel freetype-devel pkgconfig +Requires: XFree86-devel freetype-devel >= 2.1.9-4 pkgconfig %description -Imlib 2 is the successor to Imlib. It is NOT a newer version -- it is -a completely new library. Imlib 2 can be installed alongside Imlib 1.x -without any problems since they are effectively different libraries -which have very similar functionality. Please see the homepage for the -long description of the differences. +Imlib 2 is a library that does image file loading and saving as well +as rendering, manipulation, arbitrary polygon support, etc. It does +ALL of these operations FAST. Imlib2 also tries to be highly +intelligent about doing them, so writing naive programs can be done +easily, without sacrificing speed. This is a complete rewrite over +the Imlib 1.x series. The architecture is more modular, simple, and +flexible. %description devel This package contains development files for %{name}. -Imlib 2 is the successor to Imlib. It is NOT a newer version -- it is -a completely new library. Imlib 2 can be installed alongside Imlib 1.x -without any problems since they are effectively different libraries -which have very similar functionality. Please see the homepage for the -long description of the differences. +Imlib 2 is a library that does image file loading and saving as well +as rendering, manipulation, arbitrary polygon support, etc. It does +ALL of these operations FAST. Imlib2 also tries to be highly +intelligent about doing them, so writing naive programs can be done +easily, without sacrificing speed. This is a complete rewrite over +the Imlib 1.x series. The architecture is more modular, simple, and +flexible. %prep %setup -q -%ifarch x86_64 -%patch0 -b .patch0 -%endif -%patch1 -p1 -b .xpmcescape -# loaders need to link with the main lib -%{__perl} -pi -e \ - 's|^(\w+_la_LDFLAGS .*)|$1 -L\$(top_builddir)/src/lib| ; - s|^(\w+_la_LIBADD .*)|$1 -lImlib2|' src/modules/loaders/Makefile.* %build -%configure \ - --x-libraries=%{_prefix}/X11R6/%{_lib} \ - --with-pic \ +asmopts="--disable-mmx --disable-amd64" %ifarch %{ix86} ia64 - --enable-mmx -%else - --disable-mmx +asmopts="--enable-mmx --disable-amd64" %endif %ifarch x86_64 -# fix hardcoded rpath im Makefiles on x86_64 due to freetype-config --libs -# returning "-L/usr/lib64 -Wl,--rpath -Wl,/usr/lib64 -lfreetype -lz": -%{__perl} -pi.orig -e 's|-Wl,--rpath -Wl,/usr/lib64||g;' \ - Makefile */Makefile */*/Makefile imlib2-config +asmopts="--disable-mmx --enable-amd64" %endif +# Note: --disable-static doesn't work as of 1.2.1. +%configure --disable-dependency-tracking \ + --x-libraries=%{_prefix}/X11R6/%{_lib} \ + --with-pic \ + $asmopts + make %{?_smp_mflags} LIBTOOL=/usr/bin/libtool %install -rm -rf $RPM_BUILD_ROOT __doc +rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT LIBTOOL=/usr/bin/libtool -cp -a doc __doc -rm -f __doc/Makefile* - -# remove unexpanded variable in pkgconfig file -sed -i -e 's!@requirements@!!g' ${RPM_BUILD_ROOT}%{_libdir}/pkgconfig/imlib2.pc - rm -f \ $RPM_BUILD_ROOT%{_libdir}/imlib2/{loaders,filters}/*.a \ - $RPM_BUILD_ROOT%{_bindir}/{color_spaces,imlib2,*test} + $RPM_BUILD_ROOT%{_bindir}/imlib2_test -# ship .la files due to a bug in kdelibs (see changelog): +# ship .la files due to a bug in kdelibs (bugzilla.fedora.us #2284): # $RPM_BUILD_ROOT%{_libdir}/libImlib2.la \ @@ -95,7 +82,7 @@ %files %defattr(-,root,root,-) -%doc COPYING AUTHORS README ChangeLog TODO __doc/* +%doc COPYING AUTHORS README ChangeLog TODO %{_bindir}/imlib2_view %{_bindir}/imlib2_bumpmap %{_bindir}/imlib2_colorspace @@ -115,6 +102,7 @@ %files devel %defattr(-,root,root,-) +%doc doc/*.gif doc/*.html %{_bindir}/imlib2-config %{_includedir}/Imlib2.h %{_libdir}/libImlib2.a @@ -124,6 +112,13 @@ %changelog +* Sun Aug 28 2005 Ville Skytt?? - 1.2.1-2 +- 1.2.1, patches applied/obsoleted upstream. +- Improve summary and description, fix URL. +- Move HTML docs to -devel. +- Build with dependency tracking disabled. +- Drop x86_64 freetype rpath hack, require a fixed freetype-devel. + * Mon May 9 2005 Michael Schwendt - 1.2.0-8.fc4 - Fix segfault in XPM loader (#156058). Index: sources =================================================================== RCS file: /cvs/extras/rpms/imlib2/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 17 Jan 2005 09:43:09 -0000 1.4 +++ sources 20 Sep 2005 19:09:39 -0000 1.5 @@ -1 +1 @@ -853fb77100ee3c3ca944f52c892ab49b imlib2-1.2.0.tar.gz +e32970d03d8aee2885782312d0a7f15f imlib2-1.2.1.tar.gz --- imlib2-1.2.0-configure-xlib64.patch DELETED --- --- imlib2-1.2.0-xpmcescape.patch DELETED --- From fedora-extras-commits at redhat.com Tue Sep 20 19:09:57 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Tue, 20 Sep 2005 15:09:57 -0400 Subject: rpms/imlib2/FC-4 .cvsignore, 1.3, 1.4 imlib2.spec, 1.14, 1.15 sources, 1.4, 1.5 imlib2-1.2.0-configure-xlib64.patch, 1.1, NONE imlib2-1.2.0-xpmcescape.patch, 1.1, NONE Message-ID: <200509201909.j8KJ9v1K006424@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/imlib2/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6401 Modified Files: .cvsignore imlib2.spec sources Removed Files: imlib2-1.2.0-configure-xlib64.patch imlib2-1.2.0-xpmcescape.patch Log Message: * Sun Aug 28 2005 Ville Skytt?? - 1.2.1-1 - 1.2.1, patches applied/obsoleted upstream. - Improve summary and description, fix URL. - Move HTML docs to -devel. - Build with dependency tracking disabled. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/imlib2/FC-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 8 Nov 2004 04:35:58 -0000 1.3 +++ .cvsignore 20 Sep 2005 19:09:55 -0000 1.4 @@ -1 +1 @@ -imlib2-1.1.2.tar.gz +imlib2-1.2.1.tar.gz Index: imlib2.spec =================================================================== RCS file: /cvs/extras/rpms/imlib2/FC-4/imlib2.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- imlib2.spec 9 May 2005 19:28:56 -0000 1.14 +++ imlib2.spec 20 Sep 2005 19:09:55 -0000 1.15 @@ -1,13 +1,11 @@ -Summary: Graphic library for file loading, saving, rendering, and manipulation +Summary: Image loading, saving, rendering, and manipulation library Name: imlib2 -Version: 1.2.0 -Release: 8.fc4 +Version: 1.2.1 +Release: 1%{?dist} License: BSD Group: System Environment/Libraries -URL: http://www.enlightenment.org/pages/imlib2.html +URL: http://www.enlightenment.org/Libraries/Imlib2/ Source0: http://download.sf.net/enlightenment/%{name}-%{version}.tar.gz -Patch0: imlib2-1.2.0-configure-xlib64.patch -Patch1: imlib2-1.2.0-xpmcescape.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot BuildRequires: XFree86-devel libjpeg-devel libpng-devel libtiff-devel BuildRequires: libungif-devel freetype-devel libtool bzip2-devel %{__perl} @@ -20,44 +18,45 @@ %description -Imlib 2 is the successor to Imlib. It is NOT a newer version -- it is -a completely new library. Imlib 2 can be installed alongside Imlib 1.x -without any problems since they are effectively different libraries -which have very similar functionality. Please see the homepage for the -long description of the differences. +Imlib 2 is a library that does image file loading and saving as well +as rendering, manipulation, arbitrary polygon support, etc. It does +ALL of these operations FAST. Imlib2 also tries to be highly +intelligent about doing them, so writing naive programs can be done +easily, without sacrificing speed. This is a complete rewrite over +the Imlib 1.x series. The architecture is more modular, simple, and +flexible. %description devel This package contains development files for %{name}. -Imlib 2 is the successor to Imlib. It is NOT a newer version -- it is -a completely new library. Imlib 2 can be installed alongside Imlib 1.x -without any problems since they are effectively different libraries -which have very similar functionality. Please see the homepage for the -long description of the differences. +Imlib 2 is a library that does image file loading and saving as well +as rendering, manipulation, arbitrary polygon support, etc. It does +ALL of these operations FAST. Imlib2 also tries to be highly +intelligent about doing them, so writing naive programs can be done +easily, without sacrificing speed. This is a complete rewrite over +the Imlib 1.x series. The architecture is more modular, simple, and +flexible. %prep %setup -q -%ifarch x86_64 -%patch0 -b .patch0 -%endif -%patch1 -p1 -b .xpmcescape -# loaders need to link with the main lib -%{__perl} -pi -e \ - 's|^(\w+_la_LDFLAGS .*)|$1 -L\$(top_builddir)/src/lib| ; - s|^(\w+_la_LIBADD .*)|$1 -lImlib2|' src/modules/loaders/Makefile.* %build -%configure \ - --x-libraries=%{_prefix}/X11R6/%{_lib} \ - --with-pic \ +asmopts="--disable-mmx --disable-amd64" %ifarch %{ix86} ia64 - --enable-mmx -%else - --disable-mmx +asmopts="--enable-mmx --disable-amd64" %endif %ifarch x86_64 +asmopts="--disable-mmx --enable-amd64" +%endif + +%configure --disable-dependency-tracking \ + --x-libraries=%{_prefix}/X11R6/%{_lib} \ + --with-pic \ + $asmopts + +%ifarch x86_64 # fix hardcoded rpath im Makefiles on x86_64 due to freetype-config --libs # returning "-L/usr/lib64 -Wl,--rpath -Wl,/usr/lib64 -lfreetype -lz": %{__perl} -pi.orig -e 's|-Wl,--rpath -Wl,/usr/lib64||g;' \ @@ -68,20 +67,14 @@ %install -rm -rf $RPM_BUILD_ROOT __doc +rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT LIBTOOL=/usr/bin/libtool -cp -a doc __doc -rm -f __doc/Makefile* - -# remove unexpanded variable in pkgconfig file -sed -i -e 's!@requirements@!!g' ${RPM_BUILD_ROOT}%{_libdir}/pkgconfig/imlib2.pc - rm -f \ $RPM_BUILD_ROOT%{_libdir}/imlib2/{loaders,filters}/*.a \ - $RPM_BUILD_ROOT%{_bindir}/{color_spaces,imlib2,*test} + $RPM_BUILD_ROOT%{_bindir}/imlib2_test -# ship .la files due to a bug in kdelibs (see changelog): +# ship .la files due to a bug in kdelibs (bugzilla.fedora.us #2284): # $RPM_BUILD_ROOT%{_libdir}/libImlib2.la \ @@ -95,7 +88,7 @@ %files %defattr(-,root,root,-) -%doc COPYING AUTHORS README ChangeLog TODO __doc/* +%doc COPYING AUTHORS README ChangeLog TODO %{_bindir}/imlib2_view %{_bindir}/imlib2_bumpmap %{_bindir}/imlib2_colorspace @@ -115,6 +108,7 @@ %files devel %defattr(-,root,root,-) +%doc doc/*.gif doc/*.html %{_bindir}/imlib2-config %{_includedir}/Imlib2.h %{_libdir}/libImlib2.a @@ -124,6 +118,12 @@ %changelog +* Sun Aug 28 2005 Ville Skytt?? - 1.2.1-1 +- 1.2.1, patches applied/obsoleted upstream. +- Improve summary and description, fix URL. +- Move HTML docs to -devel. +- Build with dependency tracking disabled. + * Mon May 9 2005 Michael Schwendt - 1.2.0-8.fc4 - Fix segfault in XPM loader (#156058). Index: sources =================================================================== RCS file: /cvs/extras/rpms/imlib2/FC-4/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 17 Jan 2005 09:43:09 -0000 1.4 +++ sources 20 Sep 2005 19:09:55 -0000 1.5 @@ -1 +1 @@ -853fb77100ee3c3ca944f52c892ab49b imlib2-1.2.0.tar.gz +e32970d03d8aee2885782312d0a7f15f imlib2-1.2.1.tar.gz --- imlib2-1.2.0-configure-xlib64.patch DELETED --- --- imlib2-1.2.0-xpmcescape.patch DELETED --- From fedora-extras-commits at redhat.com Tue Sep 20 20:15:40 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Tue, 20 Sep 2005 16:15:40 -0400 Subject: rpms/ks3switch - New directory Message-ID: <200509202015.j8KKFeRT007940@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/ks3switch In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7920/ks3switch Log Message: Directory /cvs/extras/rpms/ks3switch added to the repository From fedora-extras-commits at redhat.com Tue Sep 20 20:15:40 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Tue, 20 Sep 2005 16:15:40 -0400 Subject: rpms/ks3switch/devel - New directory Message-ID: <200509202015.j8KKFeTD007945@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/ks3switch/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7920/ks3switch/devel Log Message: Directory /cvs/extras/rpms/ks3switch/devel added to the repository From fedora-extras-commits at redhat.com Tue Sep 20 20:16:04 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Tue, 20 Sep 2005 16:16:04 -0400 Subject: rpms/ks3switch Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200509202016.j8KKG4U3008000@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/ks3switch In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7965 Added Files: Makefile import.log Log Message: Setup of module ks3switch --- NEW FILE Makefile --- # Top level Makefile for module ks3switch all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Tue Sep 20 20:16:04 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Tue, 20 Sep 2005 16:16:04 -0400 Subject: rpms/ks3switch/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200509202016.j8KKG4mQ008005@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/ks3switch/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7965/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module ks3switch --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Tue Sep 20 20:17:12 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Tue, 20 Sep 2005 16:17:12 -0400 Subject: rpms/ks3switch import.log,1.1,1.2 Message-ID: <200509202017.j8KKHgq2008089@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/ks3switch In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8044 Modified Files: import.log Log Message: auto-import ks3switch-0.1-0.3 on branch devel from ks3switch-0.1-0.3.src.rpm Initial import (#165464). Index: import.log =================================================================== RCS file: /cvs/extras/rpms/ks3switch/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 20 Sep 2005 20:16:01 -0000 1.1 +++ import.log 20 Sep 2005 20:17:10 -0000 1.2 @@ -0,0 +1 @@ +ks3switch-0_1-0_3:HEAD:ks3switch-0.1-0.3.src.rpm:1127247421 From fedora-extras-commits at redhat.com Tue Sep 20 20:17:12 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Tue, 20 Sep 2005 16:17:12 -0400 Subject: rpms/ks3switch/devel ks3switch-desktop.patch, NONE, 1.1 ks3switch-exec.patch, NONE, 1.1 ks3switch.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200509202017.j8KKHCUi008082@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/ks3switch/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8044/devel Modified Files: .cvsignore sources Added Files: ks3switch-desktop.patch ks3switch-exec.patch ks3switch.spec Log Message: auto-import ks3switch-0.1-0.3 on branch devel from ks3switch-0.1-0.3.src.rpm Initial import (#165464). ks3switch-desktop.patch: --- NEW FILE ks3switch-desktop.patch --- --- ks3switch/ks3switch.desktop~ 2002-07-11 22:59:31.000000000 +0300 +++ ks3switch/ks3switch.desktop 2004-07-22 14:50:51.000000000 +0300 @@ -4,9 +4,7 @@ Type=Application Exec=ks3switch -caption "%c" %i %m Icon=ks3switch.png -DocPath=ks3switch/index.html -Comment= -Comment[de]= -Terminal=0 +Comment=Manage output devices of S3 chips +Terminal=false Name=KS3Switch -Name[de]=KS3Switch +Categories=Settings;HardwareSettings;System;SystemSetup;KDE; ks3switch-exec.patch: --- NEW FILE ks3switch-exec.patch --- Prevent an empty "exec=" in the config file from causing "" to be launched. --- ks3switch/ks3switch.cpp~ 2002-07-12 10:45:13.000000000 +0300 +++ ks3switch/ks3switch.cpp 2004-07-22 16:44:54.000000000 +0300 @@ -160,6 +160,10 @@ /** Set the values */ config->setGroup("General options"); s3switch = config->readEntry("exec"); + if (s3switch.isEmpty()) + { + s3switch = "s3switch"; + } if (config->readBoolEntry("PAL")){ TV_mode = "PAL"; } --- NEW FILE ks3switch.spec --- Name: ks3switch Version: 0.1 Release: 0.3 Summary: KDE utility for managing the output device on S3 Savage chips Group: Applications/System License: GPL URL: http://francois.bochatay.net/apps/ks3switch/ Source0: http://francois.bochatay.net/apps/ks3switch/%{name}-%{version}.tar.gz Patch0: %{name}-desktop.patch Patch1: %{name}-exec.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: kdelibs-devel BuildRequires: qt-devel >= 1:3.0 BuildRequires: desktop-file-utils Requires: s3switch # ExclusiveArch due to s3switch availability ExclusiveArch: %{ix86} %description KS3switch is a KDE frontend to s3switch, the utility for managing the output device on S3 Savage chips. %prep %setup -q %patch0 -p0 %patch1 -p0 %build [ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/qt.sh %configure --disable-rpath --disable-dependency-tracking make clean # 0.1 ships unclean make # %{?_smp_mflags} # not parallel build clean %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT desktop-file-install \ --vendor fedora \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ --mode 644 \ --add-category X-Fedora \ $RPM_BUILD_ROOT%{_datadir}/applnk/Applications/%{name}.desktop rm -rf $RPM_BUILD_ROOT%{_datadir}/applnk rm -rf $RPM_BUILD_ROOT%{_docdir}/HTML # it's just the template in 0.1 %clean rm -rf $RPM_BUILD_ROOT %post gtk-update-icon-cache -qf %{_datadir}/icons/hicolor >/dev/null 2>&1 || : %postun gtk-update-icon-cache -qf %{_datadir}/icons/hicolor >/dev/null 2>&1 || : %files %defattr(-,root,root,-) %doc AUTHORS COPYING %{_bindir}/ks3switch %{_datadir}/applications/*%{name}.desktop %{_datadir}/icons/hicolor/*x*/apps/%{name}.png %changelog * Sun Aug 7 2005 Ville Skytt?? - 0.1-0.3 - ExclusiveArch ix86 due to s3switch availability. * Sun May 29 2005 Ville Skytt?? - 0.1-0.2 - Rebuild for FC4. * Sun Feb 6 2005 Ville Skytt?? - 0.1-0.1 - Fix Group tag. - Reduce dir ownership. * Sat Dec 4 2004 Ville Skytt?? - 0:0.1-0.fdr.2 - Add -fpermissive to C(XX)FLAGS for gcc 3.4. * Thu Jul 22 2004 Ville Skytt?? - 0:0.1-0.fdr.1 - First build. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/ks3switch/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 20 Sep 2005 20:16:02 -0000 1.1 +++ .cvsignore 20 Sep 2005 20:17:10 -0000 1.2 @@ -0,0 +1 @@ +ks3switch-0.1.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/ks3switch/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 20 Sep 2005 20:16:02 -0000 1.1 +++ sources 20 Sep 2005 20:17:10 -0000 1.2 @@ -0,0 +1 @@ +e560f7db57ae12a60a08dbc75734fb8b ks3switch-0.1.tar.gz From fedora-extras-commits at redhat.com Tue Sep 20 20:41:22 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Tue, 20 Sep 2005 16:41:22 -0400 Subject: rpms/ks3switch/devel ks3switch-desktop.patch, 1.1, 1.2 ks3switch.spec, 1.1, 1.2 Message-ID: <200509202041.j8KKfM7b008250@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/ks3switch/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8226 Modified Files: ks3switch-desktop.patch ks3switch.spec Log Message: * Tue Sep 20 2005 Ville Skytt?? - 0.1-1 - Fix desktop entry categories (#165464). - Tidy up build dependencies. ks3switch-desktop.patch: Index: ks3switch-desktop.patch =================================================================== RCS file: /cvs/extras/rpms/ks3switch/devel/ks3switch-desktop.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ks3switch-desktop.patch 20 Sep 2005 20:17:10 -0000 1.1 +++ ks3switch-desktop.patch 20 Sep 2005 20:41:20 -0000 1.2 @@ -1,6 +1,9 @@ --- ks3switch/ks3switch.desktop~ 2002-07-11 22:59:31.000000000 +0300 -+++ ks3switch/ks3switch.desktop 2004-07-22 14:50:51.000000000 +0300 -@@ -4,9 +4,7 @@ ++++ ks3switch/ks3switch.desktop 2005-09-20 23:22:32.000000000 +0300 +@@ -1,12 +1,9 @@ +-# KDE Config File + [Desktop Entry] + Encoding=UTF-8 Type=Application Exec=ks3switch -caption "%c" %i %m Icon=ks3switch.png @@ -12,4 +15,4 @@ +Terminal=false Name=KS3Switch -Name[de]=KS3Switch -+Categories=Settings;HardwareSettings;System;SystemSetup;KDE; ++Categories=Settings;HardwareSettings;System;TrayIcon;KDE; Index: ks3switch.spec =================================================================== RCS file: /cvs/extras/rpms/ks3switch/devel/ks3switch.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ks3switch.spec 20 Sep 2005 20:17:10 -0000 1.1 +++ ks3switch.spec 20 Sep 2005 20:41:20 -0000 1.2 @@ -1,6 +1,6 @@ Name: ks3switch Version: 0.1 -Release: 0.3 +Release: 1%{?dist} Summary: KDE utility for managing the output device on S3 Savage chips Group: Applications/System @@ -12,7 +12,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: kdelibs-devel -BuildRequires: qt-devel >= 1:3.0 BuildRequires: desktop-file-utils Requires: s3switch # ExclusiveArch due to s3switch availability @@ -69,6 +68,10 @@ %changelog +* Tue Sep 20 2005 Ville Skytt?? - 0.1-1 +- Fix desktop entry categories (#165464). +- Tidy up build dependencies. + * Sun Aug 7 2005 Ville Skytt?? - 0.1-0.3 - ExclusiveArch ix86 due to s3switch availability. From fedora-extras-commits at redhat.com Tue Sep 20 21:07:53 2005 From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj)) Date: Tue, 20 Sep 2005 17:07:53 -0400 Subject: rpms/mercurial/devel .cvsignore, 1.4, 1.5 mercurial.spec, 1.3, 1.4 sources, 1.4, 1.5 Message-ID: <200509202107.j8KL7r3h009677@cvs-int.fedora.redhat.com> Author: katzj Update of /cvs/extras/rpms/mercurial/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9653 Modified Files: .cvsignore mercurial.spec sources Log Message: * Tue Sep 20 2005 Jeremy Katz - 0.7 - update to 0.7 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/mercurial/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 22 Aug 2005 17:06:49 -0000 1.4 +++ .cvsignore 20 Sep 2005 21:07:51 -0000 1.5 @@ -1 +1 @@ -mercurial-0.6c.tar.gz +mercurial-0.7.tar.gz Index: mercurial.spec =================================================================== RCS file: /cvs/extras/rpms/mercurial/devel/mercurial.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- mercurial.spec 22 Aug 2005 17:06:49 -0000 1.3 +++ mercurial.spec 20 Sep 2005 21:07:51 -0000 1.4 @@ -1,6 +1,6 @@ Summary: A fast, lightweight distributed source control management system Name: mercurial -Version: 0.6c +Version: 0.7 Release: 1%{?dist} License: GPL Group: Development/Tools @@ -34,6 +34,9 @@ %changelog +* Tue Sep 20 2005 Jeremy Katz - 0.7 +- update to 0.7 + * Mon Aug 22 2005 Jeremy Katz - 0.6c - update to 0.6c Index: sources =================================================================== RCS file: /cvs/extras/rpms/mercurial/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 22 Aug 2005 17:06:49 -0000 1.4 +++ sources 20 Sep 2005 21:07:51 -0000 1.5 @@ -1 +1 @@ -52c8cef44e3367f6abdb7bc8c16894d3 mercurial-0.6c.tar.gz +c024ca9ed3ef35af8c5618316b6ab00a mercurial-0.7.tar.gz From fedora-extras-commits at redhat.com Tue Sep 20 21:31:25 2005 From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj)) Date: Tue, 20 Sep 2005 17:31:25 -0400 Subject: rpms/mercurial/FC-4 .cvsignore, 1.2, 1.3 mercurial.spec, 1.3, 1.4 sources, 1.4, 1.5 Message-ID: <200509202131.j8KLVP67009799@cvs-int.fedora.redhat.com> Author: katzj Update of /cvs/extras/rpms/mercurial/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9776 Modified Files: .cvsignore mercurial.spec sources Log Message: * Tue Sep 20 2005 Jeremy Katz - 0.7 - update to 0.7 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/mercurial/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 1 Jul 2005 19:53:16 -0000 1.2 +++ .cvsignore 20 Sep 2005 21:31:23 -0000 1.3 @@ -1 +1 @@ -mercurial-0.6.tar.gz +mercurial-0.7.tar.gz Index: mercurial.spec =================================================================== RCS file: /cvs/extras/rpms/mercurial/FC-4/mercurial.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- mercurial.spec 22 Aug 2005 17:12:27 -0000 1.3 +++ mercurial.spec 20 Sep 2005 21:31:23 -0000 1.4 @@ -1,6 +1,6 @@ Summary: A fast, lightweight distributed source control management system Name: mercurial -Version: 0.6c +Version: 0.7 Release: 1%{?dist} License: GPL Group: Development/Tools @@ -34,6 +34,9 @@ %changelog +* Tue Sep 20 2005 Jeremy Katz - 0.7 +- update to 0.7 + * Mon Aug 22 2005 Jeremy Katz - 0.6c - update to 0.6c Index: sources =================================================================== RCS file: /cvs/extras/rpms/mercurial/FC-4/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 22 Aug 2005 17:12:27 -0000 1.4 +++ sources 20 Sep 2005 21:31:23 -0000 1.5 @@ -1 +1 @@ -52c8cef44e3367f6abdb7bc8c16894d3 mercurial-0.6c.tar.gz +c024ca9ed3ef35af8c5618316b6ab00a mercurial-0.7.tar.gz From fedora-extras-commits at redhat.com Tue Sep 20 21:36:45 2005 From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj)) Date: Tue, 20 Sep 2005 17:36:45 -0400 Subject: rpms/mercurial/FC-3 .cvsignore, 1.2, 1.3 mercurial.spec, 1.2, 1.3 sources, 1.3, 1.4 Message-ID: <200509202136.j8KLajYm009873@cvs-int.fedora.redhat.com> Author: katzj Update of /cvs/extras/rpms/mercurial/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9850 Modified Files: .cvsignore mercurial.spec sources Log Message: * Tue Sep 20 2005 Jeremy Katz - 0.7 - update to 0.7 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/mercurial/FC-3/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 1 Jul 2005 19:53:16 -0000 1.2 +++ .cvsignore 20 Sep 2005 21:36:43 -0000 1.3 @@ -1 +1 @@ -mercurial-0.6.tar.gz +mercurial-0.7.tar.gz Index: mercurial.spec =================================================================== RCS file: /cvs/extras/rpms/mercurial/FC-3/mercurial.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- mercurial.spec 12 Jul 2005 21:52:38 -0000 1.2 +++ mercurial.spec 20 Sep 2005 21:36:43 -0000 1.3 @@ -1,6 +1,6 @@ Summary: A fast, lightweight distributed source control management system Name: mercurial -Version: 0.6b +Version: 0.7 Release: 1%{?dist} License: GPL Group: Development/Tools @@ -30,10 +30,16 @@ %files -f %{name}.files %defattr(-,root,root,-) -%doc doc/FAQ.txt README doc/hg.1.txt +%doc README doc/hg.1.txt doc/hgmerge.1.txt doc/hgrc.5.txt %changelog +* Tue Sep 20 2005 Jeremy Katz - 0.7 +- update to 0.7 + +* Mon Aug 22 2005 Jeremy Katz - 0.6c +- update to 0.6c + * Tue Jul 12 2005 Jeremy Katz - 0.6b - update to new upstream 0.6b Index: sources =================================================================== RCS file: /cvs/extras/rpms/mercurial/FC-3/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 12 Jul 2005 21:52:38 -0000 1.3 +++ sources 20 Sep 2005 21:36:43 -0000 1.4 @@ -1 +1 @@ -502b7de4244017cb0b16658acbbbddc2 mercurial-0.6b.tar.gz +c024ca9ed3ef35af8c5618316b6ab00a mercurial-0.7.tar.gz From fedora-extras-commits at redhat.com Tue Sep 20 22:01:07 2005 From: fedora-extras-commits at redhat.com (Josh Bressers (bressers)) Date: Tue, 20 Sep 2005 18:01:07 -0400 Subject: fedora-security/audit fc4,1.59,1.60 Message-ID: <200509202201.j8KM1bm0011285@cvs-int.fedora.redhat.com> Author: bressers Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9945 Modified Files: fc4 Log Message: Add new ncompress CVE id. Index: fc4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc4,v retrieving revision 1.59 retrieving revision 1.60 diff -u -r1.59 -r1.60 --- fc4 15 Sep 2005 08:35:02 -0000 1.59 +++ fc4 20 Sep 2005 22:01:04 -0000 1.60 @@ -3,6 +3,7 @@ ** are items that need attention +2005-2991 ignore (ncompress) don't ship zdiff or zcmp scripts 2005-2876 backport (util-linux) [since FEDORA-2005-887] 2005-2874 version (cups, fixed 1.1.23) 2005-2873 ** kernel From fedora-extras-commits at redhat.com Tue Sep 20 23:37:18 2005 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Tue, 20 Sep 2005 19:37:18 -0400 Subject: rpms/ghc/devel .cvsignore, 1.4, 1.5 ghc.spec, 1.6, 1.7 sources, 1.4, 1.5 ghc-6.4-dsforeign-x86_64-1097471.patch, 1.1, NONE ghc-6.4-powerpc.patch, 1.1, NONE ghc-6.4-rts-adjustor-x86_64-1097471.patch, 1.1, NONE rts-GCCompact.h-x86_64.patch, 1.1, NONE Message-ID: <200509202337.j8KNbI1L012803@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/ghc/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12780 Modified Files: .cvsignore ghc.spec sources Removed Files: ghc-6.4-dsforeign-x86_64-1097471.patch ghc-6.4-powerpc.patch ghc-6.4-rts-adjustor-x86_64-1097471.patch rts-GCCompact.h-x86_64.patch Log Message: - 6.4.1 release - the following patches are now upstream: ghc-6.4-powerpc.patch, rts-GCCompact.h-x86_64.patch, ghc-6.4-dsforeign-x86_64-1097471.patch, ghc-6.4-rts-adjustor-x86_64-1097471.patch - builds with gcc4 so drop %%_with_gcc32 - x86_64 build restrictions (no ghci and split objects) no longer apply Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/ghc/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 2 Jun 2005 01:55:58 -0000 1.4 +++ .cvsignore 20 Sep 2005 23:37:16 -0000 1.5 @@ -1 +1 @@ -ghc-6.4-src.tar.bz2 +ghc-6.4.1-src.tar.bz2 Index: ghc.spec =================================================================== RCS file: /cvs/extras/rpms/ghc/devel/ghc.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- ghc.spec 2 Jun 2005 01:55:58 -0000 1.6 +++ ghc.spec 20 Sep 2005 23:37:16 -0000 1.7 @@ -1,16 +1,13 @@ %define build_version 6.4 -%define ghcver ghc64 +%define ghcver ghc641 # speed up test builds by not building profiled libraries %define build_prof 1 %define build_doc 0 -# ghc-6.4 doesn't build with gcc-4.0 yet -%define _with_gcc32 %{nil} - Name: ghc -Version: 6.4 -Release: 8%{?dist} +Version: 6.4.1 +Release: 0.1%{?dist} Summary: Glasgow Haskell Compilation system License: BSD style Group: Development/Languages @@ -18,17 +15,13 @@ URL: http://haskell.org/ghc/ Requires: %{ghcver} = %{version}-%{release} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: sed, %{ghcver}, %{?_with_gcc32: compat-gcc-32} +BuildRequires: ghc, sed Buildrequires: gmp-devel, readline-devel, xorg-x11-devel, freeglut-devel, openal-devel %if %{build_doc} # haddock generates libraries/ docs Buildrequires: libxslt, docbook-style-xsl, haddock %endif Prefix: %{_prefix} -Patch1: ghc-6.4-powerpc.patch -Patch2: rts-GCCompact.h-x86_64.patch -Patch3: ghc-6.4-dsforeign-x86_64-1097471.patch -Patch4: ghc-6.4-rts-adjustor-x86_64-1097471.patch %description GHC is a state-of-the-art programming suite for Haskell, a purely @@ -85,22 +78,14 @@ %prep %setup -q -n ghc-%{version} -%patch1 -p1 -b .1-ppc -%patch2 -p1 -b .2-x86_64 -%patch3 -p1 -b .3-x86_64 -%patch4 -p1 -b .4-x86_64 %build -%ifarch x86_64 -echo "SplitObjs = NO" >> mk/build.mk -echo "GhcWithInterpreter = NO" >> mk/build.mk -%endif %if !%{build_prof} echo "GhcLibWays=" >> mk/build.mk echo "GhcRTSWays=thr debug" >> mk/build.mk %endif -./configure --prefix=%{_prefix} --libdir=%{_libdir} --with-ghc=ghc-%{build_version} %{?_with_gcc32: --with-gcc=%{_bindir}/gcc32} +./configure --prefix=%{_prefix} --libdir=%{_libdir} --with-ghc=ghc-%{build_version} make all %if %{build_doc} @@ -171,6 +156,14 @@ %endif %changelog +* Tue Sep 20 2005 Jens Petersen - 6.4.1-0 +- 6.4.1 release + - the following patches are now upstream: ghc-6.4-powerpc.patch, + rts-GCCompact.h-x86_64.patch, ghc-6.4-dsforeign-x86_64-1097471.patch, + ghc-6.4-rts-adjustor-x86_64-1097471.patch + - builds with gcc4 so drop %%_with_gcc32 + - x86_64 build restrictions (no ghci and split objects) no longer apply + * Tue May 31 2005 Jens Petersen - add %%dist to release Index: sources =================================================================== RCS file: /cvs/extras/rpms/ghc/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 2 Jun 2005 01:55:58 -0000 1.4 +++ sources 20 Sep 2005 23:37:16 -0000 1.5 @@ -1 +1 @@ -45ea4e15f135698feb88d12c5000aaf8 ghc-6.4-src.tar.bz2 +fd289bc7c3afa272ff831a71a50b5b00 ghc-6.4.1-src.tar.bz2 --- ghc-6.4-dsforeign-x86_64-1097471.patch DELETED --- --- ghc-6.4-powerpc.patch DELETED --- --- ghc-6.4-rts-adjustor-x86_64-1097471.patch DELETED --- --- rts-GCCompact.h-x86_64.patch DELETED --- From fedora-extras-commits at redhat.com Tue Sep 20 23:38:36 2005 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Tue, 20 Sep 2005 19:38:36 -0400 Subject: rpms/ghc/devel ghc.spec,1.7,1.8 Message-ID: <200509202338.j8KNcaFD012833@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/ghc/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12814 Modified Files: ghc.spec Log Message: bump release Index: ghc.spec =================================================================== RCS file: /cvs/extras/rpms/ghc/devel/ghc.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- ghc.spec 20 Sep 2005 23:37:16 -0000 1.7 +++ ghc.spec 20 Sep 2005 23:38:34 -0000 1.8 @@ -7,7 +7,7 @@ Name: ghc Version: 6.4.1 -Release: 0.1%{?dist} +Release: 1%{?dist} Summary: Glasgow Haskell Compilation system License: BSD style Group: Development/Languages @@ -156,7 +156,7 @@ %endif %changelog -* Tue Sep 20 2005 Jens Petersen - 6.4.1-0 +* Tue Sep 20 2005 Jens Petersen - 6.4.1-1 - 6.4.1 release - the following patches are now upstream: ghc-6.4-powerpc.patch, rts-GCCompact.h-x86_64.patch, ghc-6.4-dsforeign-x86_64-1097471.patch, From fedora-extras-commits at redhat.com Tue Sep 20 23:50:04 2005 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Tue, 20 Sep 2005 19:50:04 -0400 Subject: rpms/ghc/FC-4 .cvsignore, 1.4, 1.5 ghc.spec, 1.6, 1.7 sources, 1.4, 1.5 ghc-6.4-dsforeign-x86_64-1097471.patch, 1.1, NONE ghc-6.4-powerpc.patch, 1.1, NONE ghc-6.4-rts-adjustor-x86_64-1097471.patch, 1.1, NONE rts-GCCompact.h-x86_64.patch, 1.1, NONE Message-ID: <200509202350.j8KNo4jG012926@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/ghc/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12901 Modified Files: .cvsignore ghc.spec sources Removed Files: ghc-6.4-dsforeign-x86_64-1097471.patch ghc-6.4-powerpc.patch ghc-6.4-rts-adjustor-x86_64-1097471.patch rts-GCCompact.h-x86_64.patch Log Message: - sync with devel branch: - 6.4.1 release - the following patches are now upstream: ghc-6.4-powerpc.patch, rts-GCCompact.h-x86_64.patch, ghc-6.4-dsforeign-x86_64-1097471.patch, ghc-6.4-rts-adjustor-x86_64-1097471.patch - builds with gcc4 so drop %%_with_gcc32 - x86_64 build restrictions (no ghci and split objects) no longer apply Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/ghc/FC-4/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 2 Jun 2005 01:49:10 -0000 1.4 +++ .cvsignore 20 Sep 2005 23:50:02 -0000 1.5 @@ -1 +1 @@ -ghc-6.4-src.tar.bz2 +ghc-6.4.1-src.tar.bz2 Index: ghc.spec =================================================================== RCS file: /cvs/extras/rpms/ghc/FC-4/ghc.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- ghc.spec 2 Jun 2005 01:49:10 -0000 1.6 +++ ghc.spec 20 Sep 2005 23:50:02 -0000 1.7 @@ -1,16 +1,13 @@ %define build_version 6.4 -%define ghcver ghc64 +%define ghcver ghc641 # speed up test builds by not building profiled libraries %define build_prof 1 %define build_doc 0 -# ghc-6.4 doesn't build with gcc-4.0 yet -%define _with_gcc32 %{nil} - Name: ghc -Version: 6.4 -Release: 8%{?dist} +Version: 6.4.1 +Release: 1%{?dist} Summary: Glasgow Haskell Compilation system License: BSD style Group: Development/Languages @@ -18,17 +15,13 @@ URL: http://haskell.org/ghc/ Requires: %{ghcver} = %{version}-%{release} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: sed, %{ghcver}, %{?_with_gcc32: compat-gcc-32} +BuildRequires: ghc, sed Buildrequires: gmp-devel, readline-devel, xorg-x11-devel, freeglut-devel, openal-devel %if %{build_doc} # haddock generates libraries/ docs Buildrequires: libxslt, docbook-style-xsl, haddock %endif Prefix: %{_prefix} -Patch1: ghc-6.4-powerpc.patch -Patch2: rts-GCCompact.h-x86_64.patch -Patch3: ghc-6.4-dsforeign-x86_64-1097471.patch -Patch4: ghc-6.4-rts-adjustor-x86_64-1097471.patch %description GHC is a state-of-the-art programming suite for Haskell, a purely @@ -85,22 +78,14 @@ %prep %setup -q -n ghc-%{version} -%patch1 -p1 -b .1-ppc -%patch2 -p1 -b .2-x86_64 -%patch3 -p1 -b .3-x86_64 -%patch4 -p1 -b .4-x86_64 %build -%ifarch x86_64 -echo "SplitObjs = NO" >> mk/build.mk -echo "GhcWithInterpreter = NO" >> mk/build.mk -%endif %if !%{build_prof} echo "GhcLibWays=" >> mk/build.mk echo "GhcRTSWays=thr debug" >> mk/build.mk %endif -./configure --prefix=%{_prefix} --libdir=%{_libdir} --with-ghc=ghc-%{build_version} %{?_with_gcc32: --with-gcc=%{_bindir}/gcc32} +./configure --prefix=%{_prefix} --libdir=%{_libdir} --with-ghc=ghc-%{build_version} make all %if %{build_doc} @@ -171,6 +156,14 @@ %endif %changelog +* Tue Sep 20 2005 Jens Petersen - 6.4.1-1 +- 6.4.1 release + - the following patches are now upstream: ghc-6.4-powerpc.patch, + rts-GCCompact.h-x86_64.patch, ghc-6.4-dsforeign-x86_64-1097471.patch, + ghc-6.4-rts-adjustor-x86_64-1097471.patch + - builds with gcc4 so drop %%_with_gcc32 + - x86_64 build restrictions (no ghci and split objects) no longer apply + * Tue May 31 2005 Jens Petersen - add %%dist to release Index: sources =================================================================== RCS file: /cvs/extras/rpms/ghc/FC-4/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 2 Jun 2005 01:49:10 -0000 1.4 +++ sources 20 Sep 2005 23:50:02 -0000 1.5 @@ -1 +1 @@ -45ea4e15f135698feb88d12c5000aaf8 ghc-6.4-src.tar.bz2 +fd289bc7c3afa272ff831a71a50b5b00 ghc-6.4.1-src.tar.bz2 --- ghc-6.4-dsforeign-x86_64-1097471.patch DELETED --- --- ghc-6.4-powerpc.patch DELETED --- --- ghc-6.4-rts-adjustor-x86_64-1097471.patch DELETED --- --- rts-GCCompact.h-x86_64.patch DELETED --- From fedora-extras-commits at redhat.com Wed Sep 21 00:14:46 2005 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Tue, 20 Sep 2005 20:14:46 -0400 Subject: rpms/ghc/FC-3 .cvsignore, 1.4, 1.5 ghc.spec, 1.3, 1.4 sources, 1.4, 1.5 ghc-6.4-dsforeign-x86_64-1097471.patch, 1.1, NONE ghc-6.4-powerpc.patch, 1.1, NONE ghc-6.4-rts-adjustor-x86_64-1097471.patch, 1.1, NONE rts-GCCompact.h-x86_64.patch, 1.1, NONE Message-ID: <200509210014.j8L0EkVO014443@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/ghc/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14420 Modified Files: .cvsignore ghc.spec sources Removed Files: ghc-6.4-dsforeign-x86_64-1097471.patch ghc-6.4-powerpc.patch ghc-6.4-rts-adjustor-x86_64-1097471.patch rts-GCCompact.h-x86_64.patch Log Message: - 6.4.1 release - the following patches are now upstream: ghc-6.4-powerpc.patch, rts-GCCompact.h-x86_64.patch, ghc-6.4-dsforeign-x86_64-1097471.patch, ghc-6.4-rts-adjustor-x86_64-1097471.patch - x86_64 build restrictions (no ghci and split objects) no longer apply Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/ghc/FC-3/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 2 Jun 2005 01:46:01 -0000 1.4 +++ .cvsignore 21 Sep 2005 00:14:44 -0000 1.5 @@ -1 +1 @@ -ghc-6.4-src.tar.bz2 +ghc-6.4.1-src.tar.bz2 Index: ghc.spec =================================================================== RCS file: /cvs/extras/rpms/ghc/FC-3/ghc.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- ghc.spec 31 May 2005 08:50:25 -0000 1.3 +++ ghc.spec 21 Sep 2005 00:14:44 -0000 1.4 @@ -1,13 +1,13 @@ %define build_version 6.4 -%define ghcver ghc64 +%define ghcver ghc641 # speed up test builds by not building profiled libraries %define build_prof 1 %define build_doc 0 Name: ghc -Version: 6.4 -Release: 8%{?dist} +Version: 6.4.1 +Release: 1%{?dist} Summary: Glasgow Haskell Compilation system License: BSD style Group: Development/Languages @@ -15,17 +15,13 @@ URL: http://haskell.org/ghc/ Requires: %{ghcver} = %{version}-%{release} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: sed, %{ghcver} +BuildRequires: ghc, sed Buildrequires: gmp-devel, readline-devel, xorg-x11-devel, freeglut-devel, openal-devel %if %{build_doc} # haddock generates libraries/ docs Buildrequires: libxslt, docbook-style-xsl, haddock %endif Prefix: %{_prefix} -Patch1: ghc-6.4-powerpc.patch -Patch2: rts-GCCompact.h-x86_64.patch -Patch3: ghc-6.4-dsforeign-x86_64-1097471.patch -Patch4: ghc-6.4-rts-adjustor-x86_64-1097471.patch %description GHC is a state-of-the-art programming suite for Haskell, a purely @@ -82,16 +78,8 @@ %prep %setup -q -n ghc-%{version} -%patch1 -p1 -b .1-ppc -%patch2 -p1 -b .2-x86_64 -%patch3 -p1 -b .3-x86_64 -%patch4 -p1 -b .4-x86_64 %build -%ifarch x86_64 -echo "SplitObjs = NO" >> mk/build.mk -echo "GhcWithInterpreter = NO" >> mk/build.mk -%endif %if !%{build_prof} echo "GhcLibWays=" >> mk/build.mk echo "GhcRTSWays=thr debug" >> mk/build.mk @@ -168,6 +156,13 @@ %endif %changelog +* Tue Sep 20 2005 Jens Petersen - 6.4.1-1 +- 6.4.1 release + - the following patches are now upstream: ghc-6.4-powerpc.patch, + rts-GCCompact.h-x86_64.patch, ghc-6.4-dsforeign-x86_64-1097471.patch, + ghc-6.4-rts-adjustor-x86_64-1097471.patch + - x86_64 build restrictions (no ghci and split objects) no longer apply + * Tue May 31 2005 Jens Petersen - add %%dist to release Index: sources =================================================================== RCS file: /cvs/extras/rpms/ghc/FC-3/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 2 Jun 2005 01:46:02 -0000 1.4 +++ sources 21 Sep 2005 00:14:44 -0000 1.5 @@ -1 +1 @@ -45ea4e15f135698feb88d12c5000aaf8 ghc-6.4-src.tar.bz2 +fd289bc7c3afa272ff831a71a50b5b00 ghc-6.4.1-src.tar.bz2 --- ghc-6.4-dsforeign-x86_64-1097471.patch DELETED --- --- ghc-6.4-powerpc.patch DELETED --- --- ghc-6.4-rts-adjustor-x86_64-1097471.patch DELETED --- --- rts-GCCompact.h-x86_64.patch DELETED --- From fedora-extras-commits at redhat.com Wed Sep 21 01:14:58 2005 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Tue, 20 Sep 2005 21:14:58 -0400 Subject: rpms/fig2ps - New directory Message-ID: <200509210114.j8L1EwU0016003@cvs-int.fedora.redhat.com> Author: qspencer Update of /cvs/extras/rpms/fig2ps In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15983/fig2ps Log Message: Directory /cvs/extras/rpms/fig2ps added to the repository From fedora-extras-commits at redhat.com Wed Sep 21 01:14:58 2005 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Tue, 20 Sep 2005 21:14:58 -0400 Subject: rpms/fig2ps/devel - New directory Message-ID: <200509210115.j8L1EwDM016008@cvs-int.fedora.redhat.com> Author: qspencer Update of /cvs/extras/rpms/fig2ps/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15983/fig2ps/devel Log Message: Directory /cvs/extras/rpms/fig2ps/devel added to the repository From fedora-extras-commits at redhat.com Wed Sep 21 01:15:36 2005 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Tue, 20 Sep 2005 21:15:36 -0400 Subject: rpms/fig2ps Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200509210115.j8L1Fa0k016059@cvs-int.fedora.redhat.com> Author: qspencer Update of /cvs/extras/rpms/fig2ps In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16030 Added Files: Makefile import.log Log Message: Setup of module fig2ps --- NEW FILE Makefile --- # Top level Makefile for module fig2ps all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Wed Sep 21 01:15:37 2005 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Tue, 20 Sep 2005 21:15:37 -0400 Subject: rpms/fig2ps/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200509210115.j8L1Fbix016064@cvs-int.fedora.redhat.com> Author: qspencer Update of /cvs/extras/rpms/fig2ps/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16030/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module fig2ps --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Wed Sep 21 01:16:41 2005 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Tue, 20 Sep 2005 21:16:41 -0400 Subject: rpms/fig2ps import.log,1.1,1.2 Message-ID: <200509210116.j8L1GfKd016133@cvs-int.fedora.redhat.com> Author: qspencer Update of /cvs/extras/rpms/fig2ps In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16098 Modified Files: import.log Log Message: auto-import fig2ps-1.3.3-1 on branch devel from fig2ps-1.3.3-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/fig2ps/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 21 Sep 2005 01:15:34 -0000 1.1 +++ import.log 21 Sep 2005 01:16:39 -0000 1.2 @@ -0,0 +1 @@ +fig2ps-1_3_3-1:HEAD:fig2ps-1.3.3-1.src.rpm:1127265388 From fedora-extras-commits at redhat.com Wed Sep 21 01:16:41 2005 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Tue, 20 Sep 2005 21:16:41 -0400 Subject: rpms/fig2ps/devel fig2ps.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200509210116.j8L1GfgB016140@cvs-int.fedora.redhat.com> Author: qspencer Update of /cvs/extras/rpms/fig2ps/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16098/devel Modified Files: .cvsignore sources Added Files: fig2ps.spec Log Message: auto-import fig2ps-1.3.3-1 on branch devel from fig2ps-1.3.3-1.src.rpm --- NEW FILE fig2ps.spec --- Name: fig2ps Version: 1.3.3 Release: 1 Summary: Utility for converting xfig pictures to PS/PDF Group: Applications/Publishing License: GPL URL: http://fig2ps.sourceforge.net/ Source0: http://prdownloads.sourceforge.net/fig2ps/%{name}_%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch Requires: tetex-latex tetex-dvips ghostscript transfig %description fig2ps is a perl script which converts xfig files to postscript or PDF, using LaTeX for processing text (a capability not included in transfig). This provides the benefit of seamless integration of figures into documents (the font in the figures is the same as in the text), and allows for special typesetting commands (such as mathematical equations) to be included in figures. %prep %setup -q %build %install rm -rf $RPM_BUILD_ROOT %makeinstall DESTDIR=$RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT%{_datadir}/doc %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc README examples %{_bindir}/* %{_mandir}/*/* %config(noreplace) /etc/fig2ps %changelog * Tue Sep 20 2005 Quentin Spencer 1.3.3-1 - Initial version. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/fig2ps/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 21 Sep 2005 01:15:34 -0000 1.1 +++ .cvsignore 21 Sep 2005 01:16:39 -0000 1.2 @@ -0,0 +1 @@ +fig2ps_1.3.3.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/fig2ps/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 21 Sep 2005 01:15:34 -0000 1.1 +++ sources 21 Sep 2005 01:16:39 -0000 1.2 @@ -0,0 +1 @@ +24d2061f7491160e870beb6904672663 fig2ps_1.3.3.tar.gz From fedora-extras-commits at redhat.com Wed Sep 21 06:28:56 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Wed, 21 Sep 2005 02:28:56 -0400 Subject: rpms/wesnoth/devel .cvsignore, 1.9, 1.10 sources, 1.9, 1.10 wesnoth.spec, 1.19, 1.20 Message-ID: <200509210628.j8L6SuJ9023435@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/wesnoth/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23412 Modified Files: .cvsignore sources wesnoth.spec Log Message: * Wed Sep 21 2005 Michael Schwendt - 1.0-0.1.rc1 - update to 1.0rc1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/wesnoth/devel/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 14 Sep 2005 04:50:08 -0000 1.9 +++ .cvsignore 21 Sep 2005 06:28:54 -0000 1.10 @@ -1 +1 @@ -wesnoth-0.9.7.tar.gz +wesnoth-1.0rc1.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/wesnoth/devel/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 14 Sep 2005 04:50:08 -0000 1.9 +++ sources 21 Sep 2005 06:28:54 -0000 1.10 @@ -1 +1 @@ -c2c863c58a3eb7de5fce882d8a1944e1 wesnoth-0.9.7.tar.gz +9a12505fbbb81d91a2975f73b0788174 wesnoth-1.0rc1.tar.gz Index: wesnoth.spec =================================================================== RCS file: /cvs/extras/rpms/wesnoth/devel/wesnoth.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- wesnoth.spec 14 Sep 2005 04:50:08 -0000 1.19 +++ wesnoth.spec 21 Sep 2005 06:28:54 -0000 1.20 @@ -1,12 +1,12 @@ Name: wesnoth -Version: 0.9.7 -Release: 1%{?dist} +Version: 1.0 +Release: 0.1.rc1%{?dist} Summary: Turn-based strategy game with a fantasy theme Group: Amusements/Games License: GPL URL: http://www.wesnoth.org -Source0: http://www.wesnoth.org/files/wesnoth-%{version}.tar.gz +Source0: http://www.wesnoth.org/files/wesnoth-1.0rc1.tar.gz Source1: wesnothd.init Source2: wesnoth.sysconfig Source3: README.fedora @@ -59,7 +59,7 @@ %prep -%setup -q +%setup -q -n %{name}-1.0rc1 cp %{SOURCE3} . @@ -156,6 +156,9 @@ %ghost /var/run/wesnothd/socket %changelog +* Wed Sep 21 2005 Michael Schwendt - 1.0-0.1.rc1 +- update to 1.0rc1 + * Wed Sep 14 2005 Michael Schwendt - 0.9.7-1 - update to 0.9.7 From fedora-extras-commits at redhat.com Wed Sep 21 06:29:47 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Wed, 21 Sep 2005 02:29:47 -0400 Subject: common tobuild,1.2219,1.2220 Message-ID: <200509210629.j8L6TlwB023499@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23480 Modified Files: tobuild Log Message: request build of rpms/wesnoth/devel wesnoth-1_0-0_1_rc1_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2219 retrieving revision 1.2220 diff -u -r1.2219 -r1.2220 --- tobuild 19 Sep 2005 22:21:25 -0000 1.2219 +++ tobuild 21 Sep 2005 06:29:45 -0000 1.2220 @@ -38,3 +38,4 @@ gemi rpms/clisp/FC-3 clisp-2_34-5_fc3 fc3 katzj rpms/perl-Class-Trigger/devel perl-Class-Trigger-0_09-3_fc5 devel orion rpms/python-matplotlib/FC-4 python-matplotlib-0_84-1_fc4 fc4 +mschwendt rpms/wesnoth/devel wesnoth-1_0-0_1_rc1_fc5 devel From fedora-extras-commits at redhat.com Wed Sep 21 06:30:28 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Wed, 21 Sep 2005 02:30:28 -0400 Subject: common tobuild,1.2220,1.2221 Message-ID: <200509210630.j8L6USgd023524@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23505 Modified Files: tobuild Log Message: Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2220 retrieving revision 1.2221 diff -u -r1.2220 -r1.2221 --- tobuild 21 Sep 2005 06:29:45 -0000 1.2220 +++ tobuild 21 Sep 2005 06:30:26 -0000 1.2221 @@ -38,4 +38,3 @@ gemi rpms/clisp/FC-3 clisp-2_34-5_fc3 fc3 katzj rpms/perl-Class-Trigger/devel perl-Class-Trigger-0_09-3_fc5 devel orion rpms/python-matplotlib/FC-4 python-matplotlib-0_84-1_fc4 fc4 -mschwendt rpms/wesnoth/devel wesnoth-1_0-0_1_rc1_fc5 devel From fedora-extras-commits at redhat.com Wed Sep 21 06:47:45 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Wed, 21 Sep 2005 02:47:45 -0400 Subject: rpms/wesnoth/devel wesnoth.spec,1.20,1.21 Message-ID: <200509210647.j8L6ljWt023581@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/wesnoth/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23562 Modified Files: wesnoth.spec Log Message: remove exe bit from Turkish manual Index: wesnoth.spec =================================================================== RCS file: /cvs/extras/rpms/wesnoth/devel/wesnoth.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- wesnoth.spec 21 Sep 2005 06:28:54 -0000 1.20 +++ wesnoth.spec 21 Sep 2005 06:47:42 -0000 1.21 @@ -61,6 +61,7 @@ %prep %setup -q -n %{name}-1.0rc1 cp %{SOURCE3} . +chmod -x MANUAL* %build @@ -158,6 +159,7 @@ %changelog * Wed Sep 21 2005 Michael Schwendt - 1.0-0.1.rc1 - update to 1.0rc1 +- remove exe bit from Turkish manual * Wed Sep 14 2005 Michael Schwendt - 0.9.7-1 - update to 0.9.7 From fedora-extras-commits at redhat.com Wed Sep 21 07:02:30 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Wed, 21 Sep 2005 03:02:30 -0400 Subject: rpms/imlib2/devel imlib2-1.2.1-X11-path.patch, NONE, 1.1 imlib2.spec, 1.15, 1.16 Message-ID: <200509210702.j8L72Umm024960@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/imlib2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24943 Modified Files: imlib2.spec Added Files: imlib2-1.2.1-X11-path.patch Log Message: * Wed Sep 21 2005 Michael Schwendt - 1.2.1-3 - Make XPM loader use /usr/lib/X11/rgb.txt instead of /usr/X11R6/... imlib2-1.2.1-X11-path.patch: --- NEW FILE imlib2-1.2.1-X11-path.patch --- diff -Nur imlib2-1.2.1-orig/src/modules/loaders/loader_xpm.c imlib2-1.2.1/src/modules/loaders/loader_xpm.c --- imlib2-1.2.1-orig/src/modules/loaders/loader_xpm.c 2005-05-18 07:26:16.000000000 +0200 +++ imlib2-1.2.1/src/modules/loaders/loader_xpm.c 2005-09-21 08:55:11.000000000 +0200 @@ -66,7 +66,7 @@ /* look in rgb txt database */ if (!rgb_txt) #ifndef __EMX__ - rgb_txt = fopen("/usr/X11R6/lib/X11/rgb.txt", "r"); + rgb_txt = fopen("/usr/lib/X11/rgb.txt", "r"); #else rgb_txt = fopen(__XOS2RedirRoot("/XFree86/lib/X11/rgb.txt"), "rt"); #endif Index: imlib2.spec =================================================================== RCS file: /cvs/extras/rpms/imlib2/devel/imlib2.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- imlib2.spec 20 Sep 2005 19:09:39 -0000 1.15 +++ imlib2.spec 21 Sep 2005 07:02:28 -0000 1.16 @@ -1,11 +1,12 @@ Summary: Image loading, saving, rendering, and manipulation library Name: imlib2 Version: 1.2.1 -Release: 2%{?dist} +Release: 3%{?dist} License: BSD Group: System Environment/Libraries URL: http://www.enlightenment.org/Libraries/Imlib2/ Source0: http://download.sf.net/enlightenment/%{name}-%{version}.tar.gz +Patch0: imlib2-1.2.1-X11-path.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot BuildRequires: XFree86-devel libjpeg-devel libpng-devel libtiff-devel BuildRequires: libungif-devel freetype-devel >= 2.1.9-4 libtool bzip2-devel @@ -40,6 +41,7 @@ %prep %setup -q +%patch0 -p1 -b .x11-path %build @@ -112,6 +114,9 @@ %changelog +* Wed Sep 21 2005 Michael Schwendt - 1.2.1-3 +- Make XPM loader use /usr/lib/X11/rgb.txt instead of /usr/X11R6/... + * Sun Aug 28 2005 Ville Skytt?? - 1.2.1-2 - 1.2.1, patches applied/obsoleted upstream. - Improve summary and description, fix URL. From fedora-extras-commits at redhat.com Wed Sep 21 08:58:13 2005 From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard)) Date: Wed, 21 Sep 2005 04:58:13 -0400 Subject: rpms/amarok/FC-3 .cvsignore, 1.9, 1.10 amarok.spec, 1.12, 1.13 sources, 1.9, 1.10 Message-ID: <200509210858.j8L8wD4H027230@cvs-int.fedora.redhat.com> Author: abompard Update of /cvs/extras/rpms/amarok/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27192/FC-3 Modified Files: .cvsignore amarok.spec sources Log Message: - version 1.3.2 - remove patch 4 (applied upstream) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/amarok/FC-3/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 24 May 2005 10:56:28 -0000 1.9 +++ .cvsignore 21 Sep 2005 08:58:11 -0000 1.10 @@ -1 +1 @@ -amarok-1.2.4.tar.bz2 +amarok-1.3.2.tar.bz2 Index: amarok.spec =================================================================== RCS file: /cvs/extras/rpms/amarok/FC-3/amarok.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- amarok.spec 29 May 2005 13:51:39 -0000 1.12 +++ amarok.spec 21 Sep 2005 08:58:11 -0000 1.13 @@ -6,14 +6,16 @@ Name: amarok Summary: Media player for KDE -Version: 1.2.4 +Version: 1.3.2 Release: 1%{?dist} Group: Applications/Multimedia License: GPL Url: http://amarok.kde.org -Source0: http://dl.sf.net/amarok/amarok-1.2.4.tar.bz2 +Source0: http://dl.sf.net/amarok/amarok-1.3.2.tar.bz2 Patch0: amarok-1.2.4-gcc4bl.patch +Patch2: amarok-1.3-engines-cfg.patch +Patch3: amarok-1.3-endian.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: kdemultimedia-devel >= 6:3.2 @@ -23,10 +25,9 @@ BuildRequires: gstreamer-plugins-devel >= 0.8.4 BuildRequires: libmusicbrainz-devel, xmms-devel >= 1:1.2 BuildRequires: libvisual-devel >= 0.2.0, SDL-devel, gtk+-devel -%if "%fedora" >= "4" BuildRequires: libtool-ltdl-devel -%else -BuildRequires: libtool +%ifnarch ppc64 x86_64 s390 s390x ia64 +BuildRequires: HelixPlayer %endif %if 0%{?use_xine} @@ -36,14 +37,22 @@ Requires: kdemultimedia >= 6:3.2 +Obsoletes: amarok-arts < 1.3, amarok-akode < 1.3 + + %description Amarok is a KDE multimedia player with: - fresh playlist concept, very fast to use, with drag and drop - - plays all formats supported by aRts, gstreamer or xine + - plays all formats supported by the various engines - audio effects, like reverb and compressor - compatible with the .m3u and .pls formats for playlists - nice GUI, integrates into the KDE look, but with a unique touch +Amarok can use various engines to decode sound : gstreamer, arts, +helix and xine (disabled by default for patent reasons) +To use the helix engine, you'll have to install either HelixPlayer +or RealPlayer + %package visualisation Summary: Visualisation plugins for Amarok @@ -56,27 +65,6 @@ use any of xmms' visualisation plugins with Amarok. -%package arts -Summary: Arts engine for Amarok -Group: Applications/Multimedia -Requires: %{name} = %{version} - -%description arts -Amarok can also use the arts engine to decode sound. This package -enables it. - - -%if "%fedora" >= "4" -%package akode -Summary: AKode engine for Amarok -Group: Applications/Multimedia -Requires: %{name} = %{version} - -%description akode -Amarok can also use the akode engine to decode sound. This package -enables it. -%endif - %if 0%{?use_xine} %package xine Summary: Xine engine for Amarok @@ -93,10 +81,14 @@ %setup -q # remove test for GCC blacklisting %patch0 -p1 -b .gcc4bl +%patch2 -p1 -b .engines-cfg +%patch3 -p1 -b .endian %build -unset QTDIR || : ; . /etc/profile.d/qt.sh +unset QTDIR && . %{_sysconfdir}/profile.d/qt.sh +# work around an improper ${kdelibsuff} +export QTLIB=${QTDIR}/lib QTINC=${QTDIR}/include %configure \ --disable-debug \ %if %{?use_xine:0}%{!?use_xine:1} @@ -139,8 +131,22 @@ %find_lang %{name} -%post -p /sbin/ldconfig -%postun -p /sbin/ldconfig +%post +/sbin/ldconfig +# update icon themes if necessary +if [ -x %{_bindir}/gtk-update-icon-cache ]; then + %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg || : + # needed because amarok 1.2 puts icon in hicolor + # and the RPM did not update the cache on uninstall + %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : +fi + +%postun +/sbin/ldconfig +# update icon themes if necessary +if [ -x %{_bindir}/gtk-update-icon-cache ]; then + %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg || : +fi %clean @@ -163,33 +169,28 @@ %{_libdir}/kde3/konqsidebar_universalamarok.* %{_datadir}/apps/konqsidebartng/*/amarok.desktop %{_datadir}/apps/profiles/amarok.profile.xml - %{_libdir}/mcop/Amarok %{_libdir}/mcop/amarok* %{_datadir}/config/amarokrc %{_datadir}/config.kcfg/*.kcfg %{_datadir}/doc/HTML/*/amarok - - -%files visualisation -%defattr(-,root,root) -%{_bindir}/amarok_libvisual -%{_bindir}/amarok_xmmswrapper2 - - -%files arts -%defattr(-,root,root) +# Arts engine %{_libdir}/libamarokarts* %{_libdir}/kde3/libamarok_artsengine_plugin.* %{_datadir}/services/amarok_artsengine_plugin.desktop +# Helix engine +%ifnarch ppc64 x86_64 s390 s390x ia64 +%{_libdir}/kde3/libamarok_helixengine_plugin.* +%{_datadir}/services/amarok_helixengine_plugin.desktop +%endif +%exclude %{_datadir}/apps/zeroconf/_shoutcast._tcp -%if "%fedora" >= "4" -%files akode + +%files visualisation %defattr(-,root,root) -%{_libdir}/kde3/libamarok_aKode-engine.* -%{_datadir}/services/amarok_aKode-engine.desktop -%endif +%{_bindir}/amarok_libvisual +%{_bindir}/amarok_xmmswrapper2 %if 0%{?use_xine} @@ -202,6 +203,66 @@ %changelog +* Wed Sep 21 2005 Aurelien Bompard 1.3.2-1 +- version 1.3.2 +- remove patch 4 (applied upstream) + +* Sat Sep 10 2005 Aurelien Bompard 1.3.1-2 +- add patch from upstream to fix alsasink in gstreamer +- default to autoaudiosink for gstreamer + +* Mon Sep 05 2005 Aurelien Bompard 1.3.1-1 +- version 1.3.1 + +* Tue Aug 23 2005 Aurelien Bompard 1.3-6 +- add version to obsoletes + +* Tue Aug 23 2005 Aurelien Bompard 1.3-5 +- add missing Obsoletes. + +* Mon Aug 22 2005 Aurelien Bompard 1.3-4 +- fix endian declaration on ppc + +* Mon Aug 22 2005 Aurelien Bompard 1.3-3 +- dont build the Helix engine on arches where HelixPlayer is not built + +* Mon Aug 22 2005 Aurelien Bompard 1.3-2 +- disable the akode engine (disabled upstream, see Changelog) +- merge in the Helix engine, since it does not have special Requires. + HelixPlayer or RealPlayer need to be installed manually (either one) +- updated description + +* Mon Aug 22 2005 Aurelien Bompard 1.3-1 +- update to version 1.3 +- add Michel Salim's improvements: + - call gtk-update-icon-cache to (de-)register icons + - new output plugin subpackage: helix + - patched gst and helix plugins' default settings + +* Fri Jul 01 2005 Aurelien Bompard 1.2.4-6 +- remove -arts subpackage, it is useless + +* Thu Jun 2 2005 Michael Schwendt - 1.2.4-6.fc5 +- remove temporary work-around from 1.2.4-2.fc4 +- add patch to fix several missing forward declarations which let + compilation with gcc >= 4.0.0-9 fail +- re-enable SMP make flags + +* Thu Jun 2 2005 Michael Schwendt - 1.2.4-5.fc4 +- disable SMP make flags, since previous release failed miserably on + i386 while the one before it succeeded + +* Thu Jun 2 2005 Michael Schwendt - 1.2.4-4.fc4 +- set QTLIB and QTINC, so configure script does not search for Qt in + QTDIR/lib64 on 64-bit multilib platforms + +* Thu Jun 2 2005 Michael Schwendt - 1.2.4-3.fc4 +- try to fix build problems (#158654): always set QTDIR, always + buildrequire libtool-ltdl-devel, disable %%fedora conditional BR + +* Thu Jun 2 2005 Michael Schwendt - 1.2.4-2.fc4 +- temporarily add patch to work around Fedora Core bug 159090 + * Mon May 23 2005 Aurelien Bompard 1.2.4-1 - version 1.2.4 - use dist tag Index: sources =================================================================== RCS file: /cvs/extras/rpms/amarok/FC-3/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 24 May 2005 10:56:28 -0000 1.9 +++ sources 21 Sep 2005 08:58:11 -0000 1.10 @@ -1 +1 @@ -9a3bb2c043d1db169c6a370aff439e0f amarok-1.2.4.tar.bz2 +5988bf5a1e6ac8da41e1a8710d75b6a8 amarok-1.3.2.tar.bz2 From fedora-extras-commits at redhat.com Wed Sep 21 08:58:14 2005 From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard)) Date: Wed, 21 Sep 2005 04:58:14 -0400 Subject: rpms/amarok/devel .cvsignore, 1.11, 1.12 amarok.spec, 1.24, 1.25 sources, 1.11, 1.12 amarok-1.2.4-forward-decl.patch, 1.1, NONE amarok-1.3.1-alsa-gst.patch, 1.1, NONE Message-ID: <200509210858.j8L8wEpu027239@cvs-int.fedora.redhat.com> Author: abompard Update of /cvs/extras/rpms/amarok/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27192/devel Modified Files: .cvsignore amarok.spec sources Removed Files: amarok-1.2.4-forward-decl.patch amarok-1.3.1-alsa-gst.patch Log Message: - version 1.3.2 - remove patch 4 (applied upstream) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/amarok/devel/.cvsignore,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- .cvsignore 10 Sep 2005 08:22:35 -0000 1.11 +++ .cvsignore 21 Sep 2005 08:58:12 -0000 1.12 @@ -1 +1 @@ -amarok-1.3.1.tar.bz2 +amarok-1.3.2.tar.bz2 Index: amarok.spec =================================================================== RCS file: /cvs/extras/rpms/amarok/devel/amarok.spec,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- amarok.spec 10 Sep 2005 08:22:35 -0000 1.24 +++ amarok.spec 21 Sep 2005 08:58:12 -0000 1.25 @@ -6,18 +6,16 @@ Name: amarok Summary: Media player for KDE -Version: 1.3.1 -Release: 2%{?dist} +Version: 1.3.2 +Release: 1%{?dist} Group: Applications/Multimedia License: GPL Url: http://amarok.kde.org -Source0: http://dl.sf.net/amarok/amarok-1.3.1.tar.bz2 +Source0: http://dl.sf.net/amarok/amarok-1.3.2.tar.bz2 Patch0: amarok-1.2.4-gcc4bl.patch -#Patch1: amarok-1.2.4-forward-decl.patch Patch2: amarok-1.3-engines-cfg.patch Patch3: amarok-1.3-endian.patch -Patch4: amarok-1.3.1-alsa-gst.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: kdemultimedia-devel >= 6:3.2 @@ -27,11 +25,7 @@ BuildRequires: gstreamer-plugins-devel >= 0.8.4 BuildRequires: libmusicbrainz-devel, xmms-devel >= 1:1.2 BuildRequires: libvisual-devel >= 0.2.0, SDL-devel, gtk+-devel -#%if "%fedora" >= "4" BuildRequires: libtool-ltdl-devel -#%else -#BuildRequires: libtool -#%endif %ifnarch ppc64 x86_64 s390 s390x ia64 BuildRequires: HelixPlayer %endif @@ -71,18 +65,6 @@ use any of xmms' visualisation plugins with Amarok. -#%if "%fedora" >= "4" -#%package akode -#Summary: AKode engine for Amarok -#Group: Applications/Multimedia -#Requires: %{name} = %{version} -# -#%description akode -#Amarok can also use the akode engine to decode sound. This package -#enables it. -#%endif - - %if 0%{?use_xine} %package xine Summary: Xine engine for Amarok @@ -99,10 +81,8 @@ %setup -q # remove test for GCC blacklisting %patch0 -p1 -b .gcc4bl -#%patch1 -p1 -b .forward-decl %patch2 -p1 -b .engines-cfg %patch3 -p1 -b .endian -%patch4 -p1 -b .alsa-gst %build @@ -213,16 +193,6 @@ %{_bindir}/amarok_xmmswrapper2 -#%if "%fedora" >= "4" -#%files akode -#%defattr(-,root,root) -#%{_libdir}/kde3/libamarok_aKode-engine.* -#%{_datadir}/services/amarok_aKode-engine.desktop -#%endif - - - - %if 0%{?use_xine} %files xine %defattr(-,root,root) @@ -233,6 +203,10 @@ %changelog +* Wed Sep 21 2005 Aurelien Bompard 1.3.2-1 +- version 1.3.2 +- remove patch 4 (applied upstream) + * Sat Sep 10 2005 Aurelien Bompard 1.3.1-2 - add patch from upstream to fix alsasink in gstreamer - default to autoaudiosink for gstreamer Index: sources =================================================================== RCS file: /cvs/extras/rpms/amarok/devel/sources,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- sources 10 Sep 2005 08:22:35 -0000 1.11 +++ sources 21 Sep 2005 08:58:12 -0000 1.12 @@ -1 +1 @@ -31f504e5fe985bbdb3c99f0e72d08fa1 amarok-1.3.1.tar.bz2 +5988bf5a1e6ac8da41e1a8710d75b6a8 amarok-1.3.2.tar.bz2 --- amarok-1.2.4-forward-decl.patch DELETED --- --- amarok-1.3.1-alsa-gst.patch DELETED --- From fedora-extras-commits at redhat.com Wed Sep 21 08:59:21 2005 From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard)) Date: Wed, 21 Sep 2005 04:59:21 -0400 Subject: rpms/amarok/FC-4 .cvsignore, 1.11, 1.12 amarok.spec, 1.27, 1.28 sources, 1.11, 1.12 Message-ID: <200509210859.j8L8xLuJ027306@cvs-int.fedora.redhat.com> Author: abompard Update of /cvs/extras/rpms/amarok/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27283/FC-4 Modified Files: .cvsignore amarok.spec sources Log Message: - version 1.3.2 - remove patch 4 (applied upstream) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/amarok/FC-4/.cvsignore,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- .cvsignore 10 Sep 2005 08:22:34 -0000 1.11 +++ .cvsignore 21 Sep 2005 08:59:19 -0000 1.12 @@ -1 +1 @@ -amarok-1.3.1.tar.bz2 +amarok-1.3.2.tar.bz2 Index: amarok.spec =================================================================== RCS file: /cvs/extras/rpms/amarok/FC-4/amarok.spec,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- amarok.spec 10 Sep 2005 08:22:34 -0000 1.27 +++ amarok.spec 21 Sep 2005 08:59:19 -0000 1.28 @@ -6,18 +6,16 @@ Name: amarok Summary: Media player for KDE -Version: 1.3.1 -Release: 2%{?dist} +Version: 1.3.2 +Release: 1%{?dist} Group: Applications/Multimedia License: GPL Url: http://amarok.kde.org -Source0: http://dl.sf.net/amarok/amarok-1.3.1.tar.bz2 +Source0: http://dl.sf.net/amarok/amarok-1.3.2.tar.bz2 Patch0: amarok-1.2.4-gcc4bl.patch -#Patch1: amarok-1.2.4-forward-decl.patch Patch2: amarok-1.3-engines-cfg.patch Patch3: amarok-1.3-endian.patch -Patch4: amarok-1.3.1-alsa-gst.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: kdemultimedia-devel >= 6:3.2 @@ -27,11 +25,7 @@ BuildRequires: gstreamer-plugins-devel >= 0.8.4 BuildRequires: libmusicbrainz-devel, xmms-devel >= 1:1.2 BuildRequires: libvisual-devel >= 0.2.0, SDL-devel, gtk+-devel -#%if "%fedora" >= "4" BuildRequires: libtool-ltdl-devel -#%else -#BuildRequires: libtool -#%endif %ifnarch ppc64 x86_64 s390 s390x ia64 BuildRequires: HelixPlayer %endif @@ -71,18 +65,6 @@ use any of xmms' visualisation plugins with Amarok. -#%if "%fedora" >= "4" -#%package akode -#Summary: AKode engine for Amarok -#Group: Applications/Multimedia -#Requires: %{name} = %{version} -# -#%description akode -#Amarok can also use the akode engine to decode sound. This package -#enables it. -#%endif - - %if 0%{?use_xine} %package xine Summary: Xine engine for Amarok @@ -99,10 +81,8 @@ %setup -q # remove test for GCC blacklisting %patch0 -p1 -b .gcc4bl -#%patch1 -p1 -b .forward-decl %patch2 -p1 -b .engines-cfg %patch3 -p1 -b .endian -%patch4 -p1 -b .alsa-gst %build @@ -213,16 +193,6 @@ %{_bindir}/amarok_xmmswrapper2 -#%if "%fedora" >= "4" -#%files akode -#%defattr(-,root,root) -#%{_libdir}/kde3/libamarok_aKode-engine.* -#%{_datadir}/services/amarok_aKode-engine.desktop -#%endif - - - - %if 0%{?use_xine} %files xine %defattr(-,root,root) @@ -233,6 +203,10 @@ %changelog +* Wed Sep 21 2005 Aurelien Bompard 1.3.2-1 +- version 1.3.2 +- remove patch 4 (applied upstream) + * Sat Sep 10 2005 Aurelien Bompard 1.3.1-2 - add patch from upstream to fix alsasink in gstreamer - default to autoaudiosink for gstreamer Index: sources =================================================================== RCS file: /cvs/extras/rpms/amarok/FC-4/sources,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- sources 10 Sep 2005 08:22:34 -0000 1.11 +++ sources 21 Sep 2005 08:59:19 -0000 1.12 @@ -1 +1 @@ -31f504e5fe985bbdb3c99f0e72d08fa1 amarok-1.3.1.tar.bz2 +5988bf5a1e6ac8da41e1a8710d75b6a8 amarok-1.3.2.tar.bz2 From fedora-extras-commits at redhat.com Wed Sep 21 09:36:50 2005 From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard)) Date: Wed, 21 Sep 2005 05:36:50 -0400 Subject: rpms/amarok/FC-3 .cvsignore, 1.10, 1.11 amarok.spec, 1.13, 1.14 sources, 1.10, 1.11 Message-ID: <200509210936.j8L9aoOM028967@cvs-int.fedora.redhat.com> Author: abompard Update of /cvs/extras/rpms/amarok/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28944 Modified Files: .cvsignore amarok.spec sources Log Message: - revert commit in the wrong branch Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/amarok/FC-3/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 21 Sep 2005 08:58:11 -0000 1.10 +++ .cvsignore 21 Sep 2005 09:36:48 -0000 1.11 @@ -1 +1 @@ -amarok-1.3.2.tar.bz2 +amarok-1.2.4.tar.bz2 Index: amarok.spec =================================================================== RCS file: /cvs/extras/rpms/amarok/FC-3/amarok.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- amarok.spec 21 Sep 2005 08:58:11 -0000 1.13 +++ amarok.spec 21 Sep 2005 09:36:48 -0000 1.14 @@ -6,16 +6,14 @@ Name: amarok Summary: Media player for KDE -Version: 1.3.2 +Version: 1.2.4 Release: 1%{?dist} Group: Applications/Multimedia License: GPL Url: http://amarok.kde.org -Source0: http://dl.sf.net/amarok/amarok-1.3.2.tar.bz2 +Source0: http://dl.sf.net/amarok/amarok-1.2.4.tar.bz2 Patch0: amarok-1.2.4-gcc4bl.patch -Patch2: amarok-1.3-engines-cfg.patch -Patch3: amarok-1.3-endian.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: kdemultimedia-devel >= 6:3.2 @@ -25,9 +23,10 @@ BuildRequires: gstreamer-plugins-devel >= 0.8.4 BuildRequires: libmusicbrainz-devel, xmms-devel >= 1:1.2 BuildRequires: libvisual-devel >= 0.2.0, SDL-devel, gtk+-devel +%if "%fedora" >= "4" BuildRequires: libtool-ltdl-devel -%ifnarch ppc64 x86_64 s390 s390x ia64 -BuildRequires: HelixPlayer +%else +BuildRequires: libtool %endif %if 0%{?use_xine} @@ -37,22 +36,14 @@ Requires: kdemultimedia >= 6:3.2 -Obsoletes: amarok-arts < 1.3, amarok-akode < 1.3 - - %description Amarok is a KDE multimedia player with: - fresh playlist concept, very fast to use, with drag and drop - - plays all formats supported by the various engines + - plays all formats supported by aRts, gstreamer or xine - audio effects, like reverb and compressor - compatible with the .m3u and .pls formats for playlists - nice GUI, integrates into the KDE look, but with a unique touch -Amarok can use various engines to decode sound : gstreamer, arts, -helix and xine (disabled by default for patent reasons) -To use the helix engine, you'll have to install either HelixPlayer -or RealPlayer - %package visualisation Summary: Visualisation plugins for Amarok @@ -65,6 +56,27 @@ use any of xmms' visualisation plugins with Amarok. +%package arts +Summary: Arts engine for Amarok +Group: Applications/Multimedia +Requires: %{name} = %{version} + +%description arts +Amarok can also use the arts engine to decode sound. This package +enables it. + + +%if "%fedora" >= "4" +%package akode +Summary: AKode engine for Amarok +Group: Applications/Multimedia +Requires: %{name} = %{version} + +%description akode +Amarok can also use the akode engine to decode sound. This package +enables it. +%endif + %if 0%{?use_xine} %package xine Summary: Xine engine for Amarok @@ -81,14 +93,10 @@ %setup -q # remove test for GCC blacklisting %patch0 -p1 -b .gcc4bl -%patch2 -p1 -b .engines-cfg -%patch3 -p1 -b .endian %build -unset QTDIR && . %{_sysconfdir}/profile.d/qt.sh -# work around an improper ${kdelibsuff} -export QTLIB=${QTDIR}/lib QTINC=${QTDIR}/include +unset QTDIR || : ; . /etc/profile.d/qt.sh %configure \ --disable-debug \ %if %{?use_xine:0}%{!?use_xine:1} @@ -131,22 +139,8 @@ %find_lang %{name} -%post -/sbin/ldconfig -# update icon themes if necessary -if [ -x %{_bindir}/gtk-update-icon-cache ]; then - %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg || : - # needed because amarok 1.2 puts icon in hicolor - # and the RPM did not update the cache on uninstall - %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : -fi - -%postun -/sbin/ldconfig -# update icon themes if necessary -if [ -x %{_bindir}/gtk-update-icon-cache ]; then - %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg || : -fi +%post -p /sbin/ldconfig +%postun -p /sbin/ldconfig %clean @@ -169,22 +163,12 @@ %{_libdir}/kde3/konqsidebar_universalamarok.* %{_datadir}/apps/konqsidebartng/*/amarok.desktop %{_datadir}/apps/profiles/amarok.profile.xml + %{_libdir}/mcop/Amarok %{_libdir}/mcop/amarok* %{_datadir}/config/amarokrc %{_datadir}/config.kcfg/*.kcfg %{_datadir}/doc/HTML/*/amarok -# Arts engine -%{_libdir}/libamarokarts* -%{_libdir}/kde3/libamarok_artsengine_plugin.* -%{_datadir}/services/amarok_artsengine_plugin.desktop -# Helix engine -%ifnarch ppc64 x86_64 s390 s390x ia64 -%{_libdir}/kde3/libamarok_helixengine_plugin.* -%{_datadir}/services/amarok_helixengine_plugin.desktop -%endif - -%exclude %{_datadir}/apps/zeroconf/_shoutcast._tcp %files visualisation @@ -193,6 +177,21 @@ %{_bindir}/amarok_xmmswrapper2 +%files arts +%defattr(-,root,root) +%{_libdir}/libamarokarts* +%{_libdir}/kde3/libamarok_artsengine_plugin.* +%{_datadir}/services/amarok_artsengine_plugin.desktop + + +%if "%fedora" >= "4" +%files akode +%defattr(-,root,root) +%{_libdir}/kde3/libamarok_aKode-engine.* +%{_datadir}/services/amarok_aKode-engine.desktop +%endif + + %if 0%{?use_xine} %files xine %defattr(-,root,root) @@ -203,66 +202,6 @@ %changelog -* Wed Sep 21 2005 Aurelien Bompard 1.3.2-1 -- version 1.3.2 -- remove patch 4 (applied upstream) - -* Sat Sep 10 2005 Aurelien Bompard 1.3.1-2 -- add patch from upstream to fix alsasink in gstreamer -- default to autoaudiosink for gstreamer - -* Mon Sep 05 2005 Aurelien Bompard 1.3.1-1 -- version 1.3.1 - -* Tue Aug 23 2005 Aurelien Bompard 1.3-6 -- add version to obsoletes - -* Tue Aug 23 2005 Aurelien Bompard 1.3-5 -- add missing Obsoletes. - -* Mon Aug 22 2005 Aurelien Bompard 1.3-4 -- fix endian declaration on ppc - -* Mon Aug 22 2005 Aurelien Bompard 1.3-3 -- dont build the Helix engine on arches where HelixPlayer is not built - -* Mon Aug 22 2005 Aurelien Bompard 1.3-2 -- disable the akode engine (disabled upstream, see Changelog) -- merge in the Helix engine, since it does not have special Requires. - HelixPlayer or RealPlayer need to be installed manually (either one) -- updated description - -* Mon Aug 22 2005 Aurelien Bompard 1.3-1 -- update to version 1.3 -- add Michel Salim's improvements: - - call gtk-update-icon-cache to (de-)register icons - - new output plugin subpackage: helix - - patched gst and helix plugins' default settings - -* Fri Jul 01 2005 Aurelien Bompard 1.2.4-6 -- remove -arts subpackage, it is useless - -* Thu Jun 2 2005 Michael Schwendt - 1.2.4-6.fc5 -- remove temporary work-around from 1.2.4-2.fc4 -- add patch to fix several missing forward declarations which let - compilation with gcc >= 4.0.0-9 fail -- re-enable SMP make flags - -* Thu Jun 2 2005 Michael Schwendt - 1.2.4-5.fc4 -- disable SMP make flags, since previous release failed miserably on - i386 while the one before it succeeded - -* Thu Jun 2 2005 Michael Schwendt - 1.2.4-4.fc4 -- set QTLIB and QTINC, so configure script does not search for Qt in - QTDIR/lib64 on 64-bit multilib platforms - -* Thu Jun 2 2005 Michael Schwendt - 1.2.4-3.fc4 -- try to fix build problems (#158654): always set QTDIR, always - buildrequire libtool-ltdl-devel, disable %%fedora conditional BR - -* Thu Jun 2 2005 Michael Schwendt - 1.2.4-2.fc4 -- temporarily add patch to work around Fedora Core bug 159090 - * Mon May 23 2005 Aurelien Bompard 1.2.4-1 - version 1.2.4 - use dist tag Index: sources =================================================================== RCS file: /cvs/extras/rpms/amarok/FC-3/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 21 Sep 2005 08:58:11 -0000 1.10 +++ sources 21 Sep 2005 09:36:48 -0000 1.11 @@ -1 +1 @@ -5988bf5a1e6ac8da41e1a8710d75b6a8 amarok-1.3.2.tar.bz2 +9a3bb2c043d1db169c6a370aff439e0f amarok-1.2.4.tar.bz2 From fedora-extras-commits at redhat.com Wed Sep 21 11:10:52 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Wed, 21 Sep 2005 07:10:52 -0400 Subject: rpms/wesnoth/FC-3 .cvsignore, 1.8, 1.9 sources, 1.8, 1.9 wesnoth.spec, 1.9, 1.10 Message-ID: <200509211111.j8LBBMnc031939@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/wesnoth/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31894 Modified Files: .cvsignore sources wesnoth.spec Log Message: * Wed Sep 21 2005 Michael Schwendt - 1.0-0.1.rc1 - update to 1.0rc1 - remove exe bit from Turkish manual Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/wesnoth/FC-3/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 14 Sep 2005 04:52:44 -0000 1.8 +++ .cvsignore 21 Sep 2005 11:10:30 -0000 1.9 @@ -1 +1 @@ -wesnoth-0.9.7.tar.gz +wesnoth-1.0rc1.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/wesnoth/FC-3/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 14 Sep 2005 04:52:44 -0000 1.8 +++ sources 21 Sep 2005 11:10:30 -0000 1.9 @@ -1 +1 @@ -c2c863c58a3eb7de5fce882d8a1944e1 wesnoth-0.9.7.tar.gz +9a12505fbbb81d91a2975f73b0788174 wesnoth-1.0rc1.tar.gz Index: wesnoth.spec =================================================================== RCS file: /cvs/extras/rpms/wesnoth/FC-3/wesnoth.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- wesnoth.spec 14 Sep 2005 04:52:44 -0000 1.9 +++ wesnoth.spec 21 Sep 2005 11:10:30 -0000 1.10 @@ -1,12 +1,12 @@ Name: wesnoth -Version: 0.9.7 -Release: 1%{?dist} +Version: 1.0 +Release: 0.1.rc1%{?dist} Summary: Turn-based strategy game with a fantasy theme Group: Amusements/Games License: GPL URL: http://www.wesnoth.org -Source0: http://www.wesnoth.org/files/wesnoth-%{version}.tar.gz +Source0: http://www.wesnoth.org/files/wesnoth-1.0rc1.tar.gz Source1: wesnothd.init Source2: wesnoth.sysconfig Source3: README.fedora @@ -59,8 +59,9 @@ %prep -%setup -q +%setup -q -n %{name}-1.0rc1 cp %{SOURCE3} . +chmod -x MANUAL* %build @@ -156,6 +157,10 @@ %ghost /var/run/wesnothd/socket %changelog +* Wed Sep 21 2005 Michael Schwendt - 1.0-0.1.rc1 +- update to 1.0rc1 +- remove exe bit from Turkish manual + * Wed Sep 14 2005 Michael Schwendt - 0.9.7-1 - update to 0.9.7 From fedora-extras-commits at redhat.com Wed Sep 21 11:12:02 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Wed, 21 Sep 2005 07:12:02 -0400 Subject: rpms/wesnoth/FC-4 .cvsignore, 1.8, 1.9 sources, 1.8, 1.9 wesnoth.spec, 1.13, 1.14 Message-ID: <200509211112.j8LBC2se032006@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/wesnoth/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31983 Modified Files: .cvsignore sources wesnoth.spec Log Message: * Wed Sep 21 2005 Michael Schwendt - 1.0-0.1.rc1 - update to 1.0rc1 - remove exe bit from Turkish manual Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/wesnoth/FC-4/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 14 Sep 2005 04:52:45 -0000 1.8 +++ .cvsignore 21 Sep 2005 11:12:00 -0000 1.9 @@ -1 +1 @@ -wesnoth-0.9.7.tar.gz +wesnoth-1.0rc1.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/wesnoth/FC-4/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 14 Sep 2005 04:52:45 -0000 1.8 +++ sources 21 Sep 2005 11:12:00 -0000 1.9 @@ -1 +1 @@ -c2c863c58a3eb7de5fce882d8a1944e1 wesnoth-0.9.7.tar.gz +9a12505fbbb81d91a2975f73b0788174 wesnoth-1.0rc1.tar.gz Index: wesnoth.spec =================================================================== RCS file: /cvs/extras/rpms/wesnoth/FC-4/wesnoth.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- wesnoth.spec 14 Sep 2005 04:52:45 -0000 1.13 +++ wesnoth.spec 21 Sep 2005 11:12:00 -0000 1.14 @@ -1,12 +1,12 @@ Name: wesnoth -Version: 0.9.7 -Release: 1%{?dist} +Version: 1.0 +Release: 0.1.rc1%{?dist} Summary: Turn-based strategy game with a fantasy theme Group: Amusements/Games License: GPL URL: http://www.wesnoth.org -Source0: http://www.wesnoth.org/files/wesnoth-%{version}.tar.gz +Source0: http://www.wesnoth.org/files/wesnoth-1.0rc1.tar.gz Source1: wesnothd.init Source2: wesnoth.sysconfig Source3: README.fedora @@ -59,8 +59,9 @@ %prep -%setup -q +%setup -q -n %{name}-1.0rc1 cp %{SOURCE3} . +chmod -x MANUAL* %build @@ -156,6 +157,10 @@ %ghost /var/run/wesnothd/socket %changelog +* Wed Sep 21 2005 Michael Schwendt - 1.0-0.1.rc1 +- update to 1.0rc1 +- remove exe bit from Turkish manual + * Wed Sep 14 2005 Michael Schwendt - 0.9.7-1 - update to 0.9.7 From fedora-extras-commits at redhat.com Wed Sep 21 13:40:21 2005 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Wed, 21 Sep 2005 09:40:21 -0400 Subject: rpms/fig2ps/devel fig2ps.spec,1.1,1.2 Message-ID: <200509211340.j8LDeLch002670@cvs-int.fedora.redhat.com> Author: qspencer Update of /cvs/extras/rpms/fig2ps/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2651 Modified Files: fig2ps.spec Log Message: Fix make install command. Index: fig2ps.spec =================================================================== RCS file: /cvs/extras/rpms/fig2ps/devel/fig2ps.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- fig2ps.spec 21 Sep 2005 01:16:39 -0000 1.1 +++ fig2ps.spec 21 Sep 2005 13:40:19 -0000 1.2 @@ -1,6 +1,6 @@ Name: fig2ps Version: 1.3.3 -Release: 1 +Release: 2 Summary: Utility for converting xfig pictures to PS/PDF Group: Applications/Publishing @@ -28,7 +28,7 @@ %install rm -rf $RPM_BUILD_ROOT -%makeinstall DESTDIR=$RPM_BUILD_ROOT +make install DESTDIR=$RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT%{_datadir}/doc %clean @@ -43,5 +43,8 @@ %config(noreplace) /etc/fig2ps %changelog +* Wed Sep 21 2005 Quentin Spencer 1.3.3-2 +- fix make install command + * Tue Sep 20 2005 Quentin Spencer 1.3.3-1 - Initial version. From fedora-extras-commits at redhat.com Wed Sep 21 13:47:18 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 21 Sep 2005 09:47:18 -0400 Subject: rpms/sbcl/devel sbcl-0.9.4-personality.patch, NONE, 1.1 sbcl.spec, 1.12, 1.13 sbcl-0.9.4-ADDR_NO_RANDOMIZE-argv0.patch, 1.1, NONE sbcl-0.9.4-ADDR_NO_RANDOMIZE-proc.patch, 1.1, NONE Message-ID: <200509211347.j8LDlILM002802@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/sbcl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2780 Modified Files: sbcl.spec Added Files: sbcl-0.9.4-personality.patch Removed Files: sbcl-0.9.4-ADDR_NO_RANDOMIZE-argv0.patch sbcl-0.9.4-ADDR_NO_RANDOMIZE-proc.patch Log Message: * Mon Sep 19 2005 Rex Dieter 0.9.4-17 - rework personality/reexec patch (execve -> execvp) sbcl-0.9.4-personality.patch: --- NEW FILE sbcl-0.9.4-personality.patch --- --- sbcl-0.9.4/src/runtime/os.h.ADDR_NO_RANDOMIZE 2005-07-14 10:41:20.000000000 -0500 +++ sbcl-0.9.4/src/runtime/os.h 2005-09-13 11:23:31.319884384 -0500 @@ -50,7 +50,7 @@ /* Do anything we need to do when starting up the runtime environment * in this OS. */ -extern void os_init(void); +extern void os_init(char *argv[]); /* Install any OS-dependent low-level signal handlers which are needed * by the runtime environment. E.g. the signals raised by a violation --- sbcl-0.9.4/src/runtime/linux-os.c.ADDR_NO_RANDOMIZE 2005-08-12 14:08:19.000000000 -0500 +++ sbcl-0.9.4/src/runtime/linux-os.c 2005-09-13 11:26:47.110833967 -0500 @@ -44,6 +44,7 @@ #include #include #include +#include #include "validate.h" #include "thread.h" @@ -92,7 +93,7 @@ int linux_no_threads_p = 0; void -os_init(void) +os_init(char *argv[]) { /* Conduct various version checks: do we have enough mmap(), is * this a sparc running 2.2, can we do threads? */ @@ -117,7 +118,7 @@ FSHOW((stderr,"linux kernel %d.%d predates 2.4;\n enabling workarounds for SPARC kernel bugs in signal handling.\n", major_version,minor_version)); linux_sparc_siginfo_bug = 1; #endif - } + } #ifdef LISP_FEATURE_SB_THREAD futex_wait(futex,-1); if(errno==ENOSYS) linux_no_threads_p = 1; @@ -125,6 +126,28 @@ fprintf(stderr,"Linux with NPTL support (e.g. kernel 2.6 or newer) required for \nthread-enabled SBCL. Disabling thread support.\n\n"); #endif os_vm_page_size = getpagesize(); + + /* KLUDGE: Disable memory randomization on new Linux kernels + * by setting a personality flag and re-executing. (We need + * to re-execute, since the memory maps that can conflict with + * the SBCL spaces have already been done at this point). + */ +#if defined(LISP_FEATURE_X86) + if ((major_version == 2) && (minor_version >= 6) || (major_version >= 3)) { + long pers = personality(-1); + /* 0x40000 aka. ADDR_NO_RANDOMIZE */ + if (!(pers & 0x40000)) { + if (personality(pers | 0x40000) != -1) { + execvp(argv[0], argv); + } + /* Either changing the personality or (re)exec failed. Either + * way we might as well continue, and hope that the random + * memory maps are ok this time around. + */ + fprintf(stderr, "WARNING: Couldn't re-execute SBCL with the proper personality flags. Trying to continue anyway.\n"); + } + } +#endif } --- sbcl-0.9.4/src/runtime/runtime.c.ADDR_NO_RANDOMIZE 2005-09-13 11:23:31.315884548 -0500 +++ sbcl-0.9.4/src/runtime/runtime.c 2005-09-13 11:23:31.323884220 -0500 @@ -194,7 +194,7 @@ /* KLUDGE: os_vm_page_size is set by os_init(), and on some * systems (e.g. Alpha) arch_init() needs need os_vm_page_size, so * it must follow os_init(). -- WHN 2000-01-26 */ - os_init(); + os_init(argv); arch_init(); gc_init(); validate(); Index: sbcl.spec =================================================================== RCS file: /cvs/extras/rpms/sbcl/devel/sbcl.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- sbcl.spec 16 Sep 2005 19:54:36 -0000 1.12 +++ sbcl.spec 21 Sep 2005 13:47:15 -0000 1.13 @@ -7,6 +7,7 @@ #define sbcl_bootstrap cmucl #define sbcl_bootstrap clisp +%if "%{?bootstrap}" == "%{nil}" %if "%{?fedora}" >= "3" BuildRequires:setarch %define setarch setarch %{_target_cpu} @@ -20,16 +21,17 @@ BuildRequires:setarch %define setarch setarch %{_target_cpu} %endif +%endif Name: sbcl Summary: Steel Bank Common Lisp Version: 0.9.4 -Release: 15%{?dist} +Release: 17%{?dist} License: BSD/MIT Group: Development/Languages URL: http://sbcl.sourceforge.net/ -Source0: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-%{version}-source.tar.bz2 +Source0: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-%{version}-source.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) ExclusiveArch: %{ix86} x86_64 @@ -51,11 +53,7 @@ %endif Patch1: sbcl-0.8.18-default-sbcl-home.patch -# See http://sourceforge.net/mailarchive/message.php?msg_id=12787069 -# use /proc/self/exe -#Patch2: sbcl-0.9.4-ADDR_NO_RANDOMIZE-proc.patch -# use argv[0] -Patch2: sbcl-0.9.4-ADDR_NO_RANDOMIZE-argv0.patch +Patch2: sbcl-0.9.4-personality.patch Patch3: sbcl-0.9.4-optflags.patch Patch4: sbcl-0.9.4-LIB_DIR.patch @@ -79,7 +77,7 @@ #sed -i -e "s|/usr/local/lib/sbcl/|%{_libdir}/sbcl/|" src/runtime/runtime.c #or patch to use SBCL_HOME env var %patch1 -p0 -b .default-sbcl-home -%{?setarch:%patch2 -p1 -b .ADDR_NO_RANDOMIZE} +%patch2 -p1 -b .personality %patch3 -p1 -b .optflags %patch4 -p1 -b .LIB_DIR @@ -125,8 +123,6 @@ %check || : pushd tests -# still need setarch if using ADDR_NO_RANDOMIZE-proc patch, since /proc isn't available on buildsystem/mock. -#{?setarch} sh ./run-tests.sh sh ./run-tests.sh popd @@ -138,7 +134,6 @@ unset SBCL_HOME ||: export INSTALL_ROOT=$RPM_BUILD_ROOT%{_prefix} export LIB_DIR=$RPM_BUILD_ROOT%{_libdir} -# (may) still need setarch if using ADDR_NO_RANDOMIZE-proc patch sh ./install.sh ## Unpackaged files @@ -177,6 +172,9 @@ %changelog +* Mon Sep 19 2005 Rex Dieter 0.9.4-17 +- rework personality/reexec patch (execve -> execvp) + * Sat Sep 16 2005 Rex Dieter 0.9.4-15 - disable ppc (probably related to #166347) --- sbcl-0.9.4-ADDR_NO_RANDOMIZE-argv0.patch DELETED --- --- sbcl-0.9.4-ADDR_NO_RANDOMIZE-proc.patch DELETED --- From fedora-extras-commits at redhat.com Wed Sep 21 14:12:09 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Wed, 21 Sep 2005 10:12:09 -0400 Subject: rpms/Coin2/devel Coin2.spec,1.15,1.16 Message-ID: <200509211412.j8LEC9eA004374@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/Coin2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4355 Modified Files: Coin2.spec Log Message: Still testing Index: Coin2.spec =================================================================== RCS file: /cvs/extras/rpms/Coin2/devel/Coin2.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- Coin2.spec 20 Sep 2005 12:26:01 -0000 1.15 +++ Coin2.spec 21 Sep 2005 14:12:07 -0000 1.16 @@ -34,8 +34,8 @@ BuildRequires: xorg-x11-devel BuildRequires: zlib-devel BuildRequires: bzip2-devel -# BuildRequires: fontconfig-devel -# BuildRequries: freetype-devel +BuildRequires: fontconfig-devel +BuildRequries: freetype-devel BuildRequires: doxygen BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -89,7 +89,7 @@ --enable-html \ --enable-3ds-import \ htmldir=%{coin_htmldir}/Coin \ - CFLAGS="$RPM_OPT_FLAGS "$(pkg-config --cflags freetype2) + CPPFLAGS=$(pkg-config --cflags freetype2) make %{?_smp_mflags} %install From fedora-extras-commits at redhat.com Wed Sep 21 14:26:33 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Wed, 21 Sep 2005 10:26:33 -0400 Subject: rpms/Coin2/devel Coin2.spec,1.16,1.17 Message-ID: <200509211426.j8LEQXSw004562@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/Coin2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4539 Modified Files: Coin2.spec Log Message: Still testing Index: Coin2.spec =================================================================== RCS file: /cvs/extras/rpms/Coin2/devel/Coin2.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- Coin2.spec 21 Sep 2005 14:12:07 -0000 1.16 +++ Coin2.spec 21 Sep 2005 14:26:31 -0000 1.17 @@ -35,7 +35,7 @@ BuildRequires: zlib-devel BuildRequires: bzip2-devel BuildRequires: fontconfig-devel -BuildRequries: freetype-devel +BuildRequires: freetype-devel BuildRequires: doxygen BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) From fedora-extras-commits at redhat.com Wed Sep 21 16:01:47 2005 From: fedora-extras-commits at redhat.com (Elliot Lee (sopwith)) Date: Wed, 21 Sep 2005 12:01:47 -0400 Subject: web/html/css fedora.css,NONE,1.1 Message-ID: <200509211601.j8LG1lWT008402@cvs-int.fedora.redhat.com> Author: sopwith Update of /cvs/fedora/web/html/css In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8390 Added Files: fedora.css Log Message: Add fedora.css --- NEW FILE fedora.css --- /* CSS for Red Hat Linux Project docs from the Documentation Project Written by Tammy Fox and Garrett LeSage Copyright 2003 Tammy Fox, Garrett LeSage, and Red Hat, Inc. License: GPL */ li p { display: inline; } div.table table { width: 95%; background-color: #DCDCDC; color: #000000; border-spacing: 0; } div.table table th { border: 1px solid #A9A9A9; background-color: #A9A9A9; color: #000000; } div.table table td { border: 1px solid #A9A9A9; background-color: #DCDCDC; color: #000000; padding: 0.5em; margin-bottom: 0.5em; margin-top: 2px; } div.note table, div.tip table, div.important table, div.caution table, div.warning table { width: 95%; border: 2px solid #B0C4DE; background-color: #F0F8FF; color: #000000; /* padding inside table area */ padding: 0.5em; margin-bottom: 0.5em; margin-top: 0.5em; } .qandaset table { border-collapse: collapse; } .qandaset { } .qandaset tr.question { } .qandaset tr.question td { font-weight: bold; padding: 1em 1em 0; } .qandaset tr.answer td { padding: 0.25em 1em 1.5em; } .qandaset tr.question td, .qandaset tr.answer td { } hr { border: 0; border-bottom: 1px solid #ccc; } h1, h2, h3, h4 { font-family: luxi sans,sans-serif; color: #990000; font-weight: bold; } h1 { font-size: 1.75em; } h2 { font-size: 1.25em; } h3 { font-size: 1.1em; } code.screen, pre.screen { font-family: monospace; font-size: 1em; display: block; padding: 10px; border: 1px solid #bbb; background-color: #eee; color: #000; overflow: auto; border-radius: 2.5px; -moz-border-radius: 2.5px; margin: 0.5em 2em; } div.example { padding: 10px; border: 1px solid #bbb; margin: 0.5em 2em; } .procedure ol li { margin-bottom: 0.5em; } .procedure ol li li { /* prevent inheritance */ margin-bottom: 0em; } .itemizedlist ul li { margin-bottom: 0.5em; } .itemizedlist ul li li { /* prevent inheritance */ margin-bottom: 0em; } From fedora-extras-commits at redhat.com Wed Sep 21 17:35:53 2005 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Wed, 21 Sep 2005 13:35:53 -0400 Subject: owners owners.list,1.236,1.237 Message-ID: <200509211735.j8LHZrak010003@cvs-int.fedora.redhat.com> Author: qspencer Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9984 Modified Files: owners.list Log Message: Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.236 retrieving revision 1.237 diff -u -r1.236 -r1.237 --- owners.list 20 Sep 2005 08:21:24 -0000 1.236 +++ owners.list 21 Sep 2005 17:35:51 -0000 1.237 @@ -171,6 +171,7 @@ Fedora Extras|feh|Fast command line image viewer using Imlib2|a.kurtz at hardsun.net|extras-qa at fedoraproject.org| Fedora Extras|fftw3|Fast Fourier Transform library|qspencer at ieee.org|extras-qa at fedoraproject.org| Fedora Extras|fftw|Fast Fourier Transform library|compton at pcompton.com|extras-qa at fedoraproject.org| +Fedora Extras|fig2ps|Utility for converting xfig pictures to PS/PDF|qspencer at ieee.org|extras-qa at fedoraproject.org| Fedora Extras|fillets-ng-data-cs|Czech audio data files for Fish Fillets Next Generation|matthias at rpmforge.net|extras-qa at fedoraproject.org| Fedora Extras|fillets-ng-data|Game data files for Fish Fillets Next Generation|matthias at rpmforge.net|extras-qa at fedoraproject.org| Fedora Extras|fillets-ng|Fish Fillets Next Generation, a puzzle game with 70 levels|matthias at rpmforge.net|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Wed Sep 21 17:48:23 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Wed, 21 Sep 2005 13:48:23 -0400 Subject: owners owners.list,1.237,1.238 Message-ID: <200509211748.j8LHmNdn010146@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10127 Modified Files: owners.list Log Message: +ks3switch Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.237 retrieving revision 1.238 diff -u -r1.237 -r1.238 --- owners.list 21 Sep 2005 17:35:51 -0000 1.237 +++ owners.list 21 Sep 2005 17:48:21 -0000 1.238 @@ -377,6 +377,7 @@ Fedora Extras|kphone|A SIP (Session Initiation Protocol) user agent for Linux|dennis at dgilmore.net|extras-qa at fedoraproject.org| Fedora Extras|krecipes|Application to manage recipes and shopping-lists|dennis at ausil.us|extras-qa at fedoraproject.org| Fedora Extras|krusader|An advanced twin-panel (commander-style) file-manager for KDE|mgarski at post.pl|extras-qa at fedoraproject.org| +Fedora Extras|ks3switch|KDE utility for managing the output device on S3 Savage chips|ville.skytta at iki.fi|extras-qa at fedoraproject.org| Fedora Extras|ksensors|An lm_sensors frontend for KDE|ville.skytta at iki.fi|extras-qa at fedoraproject.org| Fedora Extras|ktrack|Satellite prediction software for KDE|dennis at dgilmore.net|extras-qa at fedoraproject.org| Fedora Extras|kyum|Graphical User Frontend (GUI) for yum|Jochen at herr-schmitt.de|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Wed Sep 21 18:09:14 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Wed, 21 Sep 2005 14:09:14 -0400 Subject: rpms/hddtemp/FC-4 .cvsignore, 1.5, 1.6 hddtemp.db, 1.7, 1.8 hddtemp.spec, 1.13, 1.14 sources, 1.6, 1.7 Message-ID: <200509211809.j8LI9E4t011586@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/hddtemp/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11528/FC-4 Modified Files: .cvsignore hddtemp.db hddtemp.spec sources Log Message: * Tue Sep 20 2005 Ville Skytt?? - 0.3-0.6.beta14 - 0.3-beta14, drive database 2005-09-20. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/hddtemp/FC-4/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 24 Mar 2005 16:57:47 -0000 1.5 +++ .cvsignore 21 Sep 2005 18:09:12 -0000 1.6 @@ -1 +1 @@ -hddtemp-0.3-beta13.tar.bz2 +hddtemp-0.3-beta14.tar.bz2 Index: hddtemp.db =================================================================== RCS file: /cvs/extras/rpms/hddtemp/FC-4/hddtemp.db,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- hddtemp.db 13 Sep 2005 15:34:24 -0000 1.7 +++ hddtemp.db 21 Sep 2005 18:09:12 -0000 1.8 @@ -6,7 +6,7 @@ # a temperature sensor (you can set the unit to C or F). # ############################################################################ -# The following list was found at (http://www.almico.com/sfhardware.php) +# The following list was found at (http://www.almico.com/forumharddisks.php) # If your drive is in the list send me a mail. # # Manufacturer Model Size Notes @@ -45,6 +45,7 @@ # "ExcelStor Technology CT215" ??? ? "ExcelStor CT215" "ExcelStor Technology J3.0" 194 C "ExcelStor Technology 3xy (xy GB)" "ExcelStor Technology J6.0" 194 C "ExcelStor Technology 6xy (xy GB)" +"ExcelStor Technology J860" 194 C "ExcelStor Technology J860 (60 GB)" ######################################## @@ -101,6 +102,8 @@ "HDT722525DLAT80" 194 C "Hitachi Deskstar T7K250 250GB, 7200RPM, 8MB, PATA" "HDT722516DLA380 V43O" 194 C "Hitachi T7K250 SATA" +"HDS722580VLSA80" 194 C "Hitachi Deskstar 7K250 80GB SATA" +"HDS728040PLAT20" 194 C "Hitachi Deskstar 7K80 40GB" "HTE726060M9AT00" 194 C "Hitachi Travelstar 60GB (7200RPM)" "HTS424030M9AT00" 194 C "Hitachi Travelstar 30GB (4200RPM)" @@ -165,7 +168,7 @@ "Maxtor 5A250J0" 194 C "Maxtor MaXline II 250GB 5400RPM" "Maxtor 5A300J0" 194 C "Maxtor 5A300J0" "Maxtor 5T0[24]0H[24]" 0 C "Maxtor DiamondMax Plus 60" -"Maxtor 6B(08|12|16|20|25|30)0[RSPM]0" 194 C "Maxtor DiamondMax Plus 10" +"Maxtor 6(B|L)(08|12|16|20|25|30)0[RSPM]0" 194 C "Maxtor DiamondMax Plus 10" "Maxtor 6E0[234]0L0" 194 C "Maxtor DiamondMax Plus 8" "MAXTOR 6L0[2468]0[LJ][1234]" 194 C "Maxtor DiamondMax Plus D740X family" "Maxtor 6L250R0" 194 C "Maxtor DiamondMax 10 250GB 16MB buffer 7200rpm" @@ -176,7 +179,6 @@ - ######################################## ############# Quantum drives ######################################## @@ -204,7 +206,7 @@ "SAMSUNG SP(0812|1213|1614)C" 194 C "Samsung Spinpoint 160G SATA" "SAMSUNG SV0432A" 0 C "Samsung SV0432A" "SAMSUNG SV3002H" 0 C "Samsung SpinPoint V30 serie" -"SAMSUNG SV(2001|4002|6003|8004)H" 194 C "Samsung SpinPoint V40 serie" +"SAMSUNG SV(2001|4002|4012|6003|8004)H" 194 C "Samsung SpinPoint V40 serie" #"SAMSUNG SV(0221|0602|0813|1204)H" 9 C "Samsung SpinPoint V60 serie" #"SAMSUNG SV1204H" 194 C "Samsung 120G" "SAMSUNG SV(0401|0802|1203|1604)N" 194 C "Samsung SpinPoint V80 serie" @@ -268,6 +270,7 @@ "ST3300831A" 194 C "Seagate 300GB ST3300831A" "ST3400832A" 194 C "Seagate Barracuda 7200.8 Plus 400GB" "ST9100823A" 194 C "Seagate Momentus 5400.2 100GB" +"ST94019A" 194 C "Seagate ST94019A" "ST94[08]11A" 194 C "Seagate ST94011A" "ST960821A" 194 C "Seagate ST960821A" "ST960822A" 194 C "Seagate Momentus 5400.2 60GB" @@ -285,6 +288,7 @@ #"TOSHIBA MK4019GAX" 222 C "Toshiba MK4019GAX" "TOSHIBA MK4021GAS" 194 C "Toshiba MK4021GAS" "TOSHIBA MK4025GAS" 194 C "Toshiba MK4025GAS 40 Go" +"TOSHIBA MK4026GAS" 194 C "Toshiba MK4026GAS 40 Go" "TOSHIBA MK6021GAS" 194 C "Toshiba MK6021GAS" "TOSHIBA MK6022GAX" 194 C "Toshiba MK6022GAX" "TOSHIBA MK6025GAS" 194 C "Toshiba MK6025GAS" @@ -301,6 +305,7 @@ "WDC AC22000L" 0 C "Western Digital Caviar AC22000" "WDC AC420400D" 231 C "Western Digital Caviar AC420400D" "WDC AC418000D" 231 C "Western Digital AC418000D" +"WDC WD135BA" 231 C "Western Digital WD135BA" "WDC WD100EB-00BHF0" 0 C "Western Digital 100EB-00BHF0" "WDC WD200BB-00AUA1" 0 C "Western Digital Caviar WD200BB" @@ -308,12 +313,14 @@ "WDC WD300BB-00CAA0" 0 C "Western Digital WD300BB" "WDC WD360GD-00FNA0" 194 C "Western Digital SATA Raptor 36.7GB" "WDC WD400BB-00J[KH]A0" 194 C "Western Digital Caviar WD400BB" +"WDC WD400BB-23JHC0" 194 C "Western Digital 23JHC0" #"WDC WD400BB-00GFA0" 0 C "" "WDC WD400BB-55HEA0" 194 C "Western Digital Caviar WD400BB" "WDC WD400BB-(18CA|00DE)A0" 0 C "Western Digital Caviar WD400BB" "WDC WD400BB-75FJA1" 194 C "Western Digital Caviar WD400BB" "WDC WD400EB-00CPF0" 0 C "Western Digital 400EB-00CPF0" -"WDC WD400JB-00(JJ|FM|FS)A0" 194 C "Western Digital Caviar 40GB Special Edition 8MB" +"WDC WD400JB-00(JJ|FM|FS)A0" 194 C "Western Digital Caviar 40GB Special Edition 8MB" +"WDC WD400JB-00ETA0" 194 C "Western Digital 400JB-00ETA0" "WDC WD400JB-00JJC0" 194 C "Western Digital 400JB-00JJC0 40GB" "WDC WD600BB-32BSA0" 0 C "Western Digital 600BB-32BSA0" "WDC WD600JB-00ETA0" 194 C "Western Digital 600JB-00ETA0" @@ -324,6 +331,7 @@ "WDC WD800BB-(00|22)DKA0" 194 C "Western Digital WD800BB 80 Go" "WDC WD800BB-32CCB0" 194 C "Western Digital 800BB-32CCB0" "WDC WD800BB-55HEA0" 194 C "Western Digital 800BB-55HEA0" +"WDC WD800BB-00JHA0" 194 C "Western Digital 800BB-00JHA0" "WDC WD800BB-00JKA0" 194 C "Western Digital 800BB-00JKA0" "WDC WD800BB-55JKA0" 194 C "Western Digital 800BB-55JKA0" "WDC WD800BB-75FRA0" 194 C "Western Digital Caviar WD800BB" @@ -339,13 +347,12 @@ "WDC WD1200LB-55EDA0" 194 C "Western Digital WD1220LB" "WDC WD1600BB-00DWA0" 194 C "Western Digital Caviar WD1600BB" "WDC WD1600JB-(00EV|00FU|00GV|75GV)A0" 194 C "Western Digital Caviar 160GB Special Edition 8MB" -"WDC WD2000JB-(00EV|34EV|00FU|00GV|55GV|98GV)A0" 194 C "Western Digital Caviar 200GB Special Edition 8MB" +"WDC WD2000JB-(00EV|32EV|34EV|00FU|00GV|55GV|98GV)A0" 194 C "Western Digital Caviar 200GB Special Edition 8MB" "WDC WD2500JB-(00FU|32FU|00GV|55GV)A0" 194 C "Western Digital Caviar 250GB Special Edition 8MB" "WDC WD2500JB-00GVC0" 194 C "Western Digital 250GB" "WDC WD2500JD-00GBB0" 194 C "Western Digital SATA Caviar 250GB Special Edition 8MB" "WDC WD2500PB-98FBA0" 194 C "Western Digital Caviar 250GB Special Edition 8MB" -"WDC WD135BA" 231 C "Western Digital WD135BA" - +"WDC WD3200JB-00KFA0" 194 C "Western Digital Caviar 320GB 8MB" # not sure for next # "WDC WD1200JB-00CRA1" 9 C "Western Digital 1200JB-00CRA1" Index: hddtemp.spec =================================================================== RCS file: /cvs/extras/rpms/hddtemp/FC-4/hddtemp.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- hddtemp.spec 13 Sep 2005 15:34:24 -0000 1.13 +++ hddtemp.spec 21 Sep 2005 18:09:12 -0000 1.14 @@ -1,4 +1,4 @@ -%define beta beta13 +%define beta beta14 Name: hddtemp Version: 0.3 @@ -96,6 +96,9 @@ %changelog +* Tue Sep 20 2005 Ville Skytt?? - 0.3-0.6.beta14 +- 0.3-beta14, drive database 2005-09-20. + * Sun Sep 11 2005 Ville Skytt?? - 0.3-0.6.beta13 - Update drive database to 2005-09-11. Index: sources =================================================================== RCS file: /cvs/extras/rpms/hddtemp/FC-4/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 24 Mar 2005 16:57:47 -0000 1.6 +++ sources 21 Sep 2005 18:09:12 -0000 1.7 @@ -1 +1 @@ -36d98101daeac1ae8c1589a75aaab00c hddtemp-0.3-beta13.tar.bz2 +bbf8be4539495e18bec54af77511a680 hddtemp-0.3-beta14.tar.bz2 From fedora-extras-commits at redhat.com Wed Sep 21 18:09:34 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Wed, 21 Sep 2005 14:09:34 -0400 Subject: rpms/hddtemp/devel .cvsignore, 1.5, 1.6 hddtemp.db, 1.7, 1.8 hddtemp.spec, 1.13, 1.14 sources, 1.6, 1.7 Message-ID: <200509211809.j8LI9YOr011600@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/hddtemp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11528/devel Modified Files: .cvsignore hddtemp.db hddtemp.spec sources Log Message: * Tue Sep 20 2005 Ville Skytt?? - 0.3-0.6.beta14 - 0.3-beta14, drive database 2005-09-20. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/hddtemp/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 24 Mar 2005 16:57:47 -0000 1.5 +++ .cvsignore 21 Sep 2005 18:09:14 -0000 1.6 @@ -1 +1 @@ -hddtemp-0.3-beta13.tar.bz2 +hddtemp-0.3-beta14.tar.bz2 Index: hddtemp.db =================================================================== RCS file: /cvs/extras/rpms/hddtemp/devel/hddtemp.db,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- hddtemp.db 13 Sep 2005 15:34:25 -0000 1.7 +++ hddtemp.db 21 Sep 2005 18:09:14 -0000 1.8 @@ -6,7 +6,7 @@ # a temperature sensor (you can set the unit to C or F). # ############################################################################ -# The following list was found at (http://www.almico.com/sfhardware.php) +# The following list was found at (http://www.almico.com/forumharddisks.php) # If your drive is in the list send me a mail. # # Manufacturer Model Size Notes @@ -45,6 +45,7 @@ # "ExcelStor Technology CT215" ??? ? "ExcelStor CT215" "ExcelStor Technology J3.0" 194 C "ExcelStor Technology 3xy (xy GB)" "ExcelStor Technology J6.0" 194 C "ExcelStor Technology 6xy (xy GB)" +"ExcelStor Technology J860" 194 C "ExcelStor Technology J860 (60 GB)" ######################################## @@ -101,6 +102,8 @@ "HDT722525DLAT80" 194 C "Hitachi Deskstar T7K250 250GB, 7200RPM, 8MB, PATA" "HDT722516DLA380 V43O" 194 C "Hitachi T7K250 SATA" +"HDS722580VLSA80" 194 C "Hitachi Deskstar 7K250 80GB SATA" +"HDS728040PLAT20" 194 C "Hitachi Deskstar 7K80 40GB" "HTE726060M9AT00" 194 C "Hitachi Travelstar 60GB (7200RPM)" "HTS424030M9AT00" 194 C "Hitachi Travelstar 30GB (4200RPM)" @@ -165,7 +168,7 @@ "Maxtor 5A250J0" 194 C "Maxtor MaXline II 250GB 5400RPM" "Maxtor 5A300J0" 194 C "Maxtor 5A300J0" "Maxtor 5T0[24]0H[24]" 0 C "Maxtor DiamondMax Plus 60" -"Maxtor 6B(08|12|16|20|25|30)0[RSPM]0" 194 C "Maxtor DiamondMax Plus 10" +"Maxtor 6(B|L)(08|12|16|20|25|30)0[RSPM]0" 194 C "Maxtor DiamondMax Plus 10" "Maxtor 6E0[234]0L0" 194 C "Maxtor DiamondMax Plus 8" "MAXTOR 6L0[2468]0[LJ][1234]" 194 C "Maxtor DiamondMax Plus D740X family" "Maxtor 6L250R0" 194 C "Maxtor DiamondMax 10 250GB 16MB buffer 7200rpm" @@ -176,7 +179,6 @@ - ######################################## ############# Quantum drives ######################################## @@ -204,7 +206,7 @@ "SAMSUNG SP(0812|1213|1614)C" 194 C "Samsung Spinpoint 160G SATA" "SAMSUNG SV0432A" 0 C "Samsung SV0432A" "SAMSUNG SV3002H" 0 C "Samsung SpinPoint V30 serie" -"SAMSUNG SV(2001|4002|6003|8004)H" 194 C "Samsung SpinPoint V40 serie" +"SAMSUNG SV(2001|4002|4012|6003|8004)H" 194 C "Samsung SpinPoint V40 serie" #"SAMSUNG SV(0221|0602|0813|1204)H" 9 C "Samsung SpinPoint V60 serie" #"SAMSUNG SV1204H" 194 C "Samsung 120G" "SAMSUNG SV(0401|0802|1203|1604)N" 194 C "Samsung SpinPoint V80 serie" @@ -268,6 +270,7 @@ "ST3300831A" 194 C "Seagate 300GB ST3300831A" "ST3400832A" 194 C "Seagate Barracuda 7200.8 Plus 400GB" "ST9100823A" 194 C "Seagate Momentus 5400.2 100GB" +"ST94019A" 194 C "Seagate ST94019A" "ST94[08]11A" 194 C "Seagate ST94011A" "ST960821A" 194 C "Seagate ST960821A" "ST960822A" 194 C "Seagate Momentus 5400.2 60GB" @@ -285,6 +288,7 @@ #"TOSHIBA MK4019GAX" 222 C "Toshiba MK4019GAX" "TOSHIBA MK4021GAS" 194 C "Toshiba MK4021GAS" "TOSHIBA MK4025GAS" 194 C "Toshiba MK4025GAS 40 Go" +"TOSHIBA MK4026GAS" 194 C "Toshiba MK4026GAS 40 Go" "TOSHIBA MK6021GAS" 194 C "Toshiba MK6021GAS" "TOSHIBA MK6022GAX" 194 C "Toshiba MK6022GAX" "TOSHIBA MK6025GAS" 194 C "Toshiba MK6025GAS" @@ -301,6 +305,7 @@ "WDC AC22000L" 0 C "Western Digital Caviar AC22000" "WDC AC420400D" 231 C "Western Digital Caviar AC420400D" "WDC AC418000D" 231 C "Western Digital AC418000D" +"WDC WD135BA" 231 C "Western Digital WD135BA" "WDC WD100EB-00BHF0" 0 C "Western Digital 100EB-00BHF0" "WDC WD200BB-00AUA1" 0 C "Western Digital Caviar WD200BB" @@ -308,12 +313,14 @@ "WDC WD300BB-00CAA0" 0 C "Western Digital WD300BB" "WDC WD360GD-00FNA0" 194 C "Western Digital SATA Raptor 36.7GB" "WDC WD400BB-00J[KH]A0" 194 C "Western Digital Caviar WD400BB" +"WDC WD400BB-23JHC0" 194 C "Western Digital 23JHC0" #"WDC WD400BB-00GFA0" 0 C "" "WDC WD400BB-55HEA0" 194 C "Western Digital Caviar WD400BB" "WDC WD400BB-(18CA|00DE)A0" 0 C "Western Digital Caviar WD400BB" "WDC WD400BB-75FJA1" 194 C "Western Digital Caviar WD400BB" "WDC WD400EB-00CPF0" 0 C "Western Digital 400EB-00CPF0" -"WDC WD400JB-00(JJ|FM|FS)A0" 194 C "Western Digital Caviar 40GB Special Edition 8MB" +"WDC WD400JB-00(JJ|FM|FS)A0" 194 C "Western Digital Caviar 40GB Special Edition 8MB" +"WDC WD400JB-00ETA0" 194 C "Western Digital 400JB-00ETA0" "WDC WD400JB-00JJC0" 194 C "Western Digital 400JB-00JJC0 40GB" "WDC WD600BB-32BSA0" 0 C "Western Digital 600BB-32BSA0" "WDC WD600JB-00ETA0" 194 C "Western Digital 600JB-00ETA0" @@ -324,6 +331,7 @@ "WDC WD800BB-(00|22)DKA0" 194 C "Western Digital WD800BB 80 Go" "WDC WD800BB-32CCB0" 194 C "Western Digital 800BB-32CCB0" "WDC WD800BB-55HEA0" 194 C "Western Digital 800BB-55HEA0" +"WDC WD800BB-00JHA0" 194 C "Western Digital 800BB-00JHA0" "WDC WD800BB-00JKA0" 194 C "Western Digital 800BB-00JKA0" "WDC WD800BB-55JKA0" 194 C "Western Digital 800BB-55JKA0" "WDC WD800BB-75FRA0" 194 C "Western Digital Caviar WD800BB" @@ -339,13 +347,12 @@ "WDC WD1200LB-55EDA0" 194 C "Western Digital WD1220LB" "WDC WD1600BB-00DWA0" 194 C "Western Digital Caviar WD1600BB" "WDC WD1600JB-(00EV|00FU|00GV|75GV)A0" 194 C "Western Digital Caviar 160GB Special Edition 8MB" -"WDC WD2000JB-(00EV|34EV|00FU|00GV|55GV|98GV)A0" 194 C "Western Digital Caviar 200GB Special Edition 8MB" +"WDC WD2000JB-(00EV|32EV|34EV|00FU|00GV|55GV|98GV)A0" 194 C "Western Digital Caviar 200GB Special Edition 8MB" "WDC WD2500JB-(00FU|32FU|00GV|55GV)A0" 194 C "Western Digital Caviar 250GB Special Edition 8MB" "WDC WD2500JB-00GVC0" 194 C "Western Digital 250GB" "WDC WD2500JD-00GBB0" 194 C "Western Digital SATA Caviar 250GB Special Edition 8MB" "WDC WD2500PB-98FBA0" 194 C "Western Digital Caviar 250GB Special Edition 8MB" -"WDC WD135BA" 231 C "Western Digital WD135BA" - +"WDC WD3200JB-00KFA0" 194 C "Western Digital Caviar 320GB 8MB" # not sure for next # "WDC WD1200JB-00CRA1" 9 C "Western Digital 1200JB-00CRA1" Index: hddtemp.spec =================================================================== RCS file: /cvs/extras/rpms/hddtemp/devel/hddtemp.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- hddtemp.spec 13 Sep 2005 15:34:25 -0000 1.13 +++ hddtemp.spec 21 Sep 2005 18:09:14 -0000 1.14 @@ -1,4 +1,4 @@ -%define beta beta13 +%define beta beta14 Name: hddtemp Version: 0.3 @@ -96,6 +96,9 @@ %changelog +* Tue Sep 20 2005 Ville Skytt?? - 0.3-0.6.beta14 +- 0.3-beta14, drive database 2005-09-20. + * Sun Sep 11 2005 Ville Skytt?? - 0.3-0.6.beta13 - Update drive database to 2005-09-11. Index: sources =================================================================== RCS file: /cvs/extras/rpms/hddtemp/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 24 Mar 2005 16:57:47 -0000 1.6 +++ sources 21 Sep 2005 18:09:14 -0000 1.7 @@ -1 +1 @@ -36d98101daeac1ae8c1589a75aaab00c hddtemp-0.3-beta13.tar.bz2 +bbf8be4539495e18bec54af77511a680 hddtemp-0.3-beta14.tar.bz2 From fedora-extras-commits at redhat.com Wed Sep 21 19:56:08 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Wed, 21 Sep 2005 15:56:08 -0400 Subject: rpms/pam_pkcs11/devel pam_pkcs11-0.5.3-examples.patch, NONE, 1.1 pam_pkcs11-0.5.3-genmapper-config.patch, NONE, 1.1 pam_pkcs11-0.5.3-pcsc120.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 pam_pkcs11.spec, 1.1, 1.2 sources, 1.2, 1.3 pam_pkcs11-0.5.2-pki.patch, 1.1, NONE Message-ID: <200509211956.j8LJu806013435@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/pam_pkcs11/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13406 Modified Files: .cvsignore pam_pkcs11.spec sources Added Files: pam_pkcs11-0.5.3-examples.patch pam_pkcs11-0.5.3-genmapper-config.patch pam_pkcs11-0.5.3-pcsc120.patch Removed Files: pam_pkcs11-0.5.2-pki.patch Log Message: WIP commit, not quite ready yet: * Wed Sep 21 2005 Ville Skytt?? - 0.5.3-1 - 0.5.3, patch to compile with pcsc-lite < 1.2.9. - Comment out example entries in default configuration files. - Sync installation layout in config files and on disk. - Specfile cleanups and maintainability improvements. pam_pkcs11-0.5.3-examples.patch: --- NEW FILE pam_pkcs11-0.5.3-examples.patch --- Index: etc/digest_mapping.example =================================================================== --- etc/digest_mapping.example (revision 182) +++ etc/digest_mapping.example (working copy) @@ -1,4 +1,5 @@ # Mapping for certificate sha1 digest # Format: Cert SHA1 digest (hexdot) -> login # -90:17:64:09:4C:42:D6:9C:91:52:7F:1C:86:00:23:DC:BB:5D:27:50 -> jantonio +# Example: +# 90:17:64:09:4C:42:D6:9C:91:52:7F:1C:86:00:23:DC:BB:5D:27:50 -> jantonio Index: etc/subject_mapping.example =================================================================== --- etc/subject_mapping.example (revision 182) +++ etc/subject_mapping.example (working copy) @@ -1,4 +1,5 @@ # Mapping file for Certificate Subject # format: Certificate Subject -> login # -/C=ES/O=FNMT/OU=FNMT Clase 2 CA/OU=500051483/CN=NOMBRE MARTINEZ CASTA\xF1O JUAN ANTONIO - NIF 50431138G -> jantonio +# Example: +# /C=ES/O=FNMT/OU=FNMT Clase 2 CA/OU=500051483/CN=NOMBRE MARTINEZ CASTA\xF1O JUAN ANTONIO - NIF 50431138G -> jantonio Index: etc/mail_mapping.example =================================================================== --- etc/mail_mapping.example (revision 182) +++ etc/mail_mapping.example (working copy) @@ -1,7 +1,8 @@ # mapping file for Certificate E-email # format: email -> login # -jantonio at dit.upm.es -> jantonio -juan_a_mtnez at yahoo.es -> jantonio -jonsito at terra.es -> jantonio -pjpg at dit.upm.es -> pjpg +# Examples: +# jantonio at dit.upm.es -> jantonio +# juan_a_mtnez at yahoo.es -> jantonio +# jonsito at terra.es -> jantonio +# pjpg at dit.upm.es -> pjpg pam_pkcs11-0.5.3-genmapper-config.patch: --- NEW FILE pam_pkcs11-0.5.3-genmapper-config.patch --- Index: src/mappers/Makefile.am =================================================================== --- src/mappers/Makefile.am (revision 182) +++ src/mappers/Makefile.am (working copy) @@ -10,6 +10,7 @@ # Statically linked mapperis list # Uncomment to get refered mapper statically linked # DON'T FORGET update libmappers_la_SOURCES and lib_LTLIBRARIES entries below +# nor the corresponding "module = ..." in etc/pam_pkcs11.conf.example # AM_CFLAGS += -DSUBJECT_MAPPER_STATIC #AM_CFLAGS += -DLDAP_MAPPER_STATIC Index: etc/pam_pkcs11.conf.example =================================================================== --- etc/pam_pkcs11.conf.example (revision 182) +++ etc/pam_pkcs11.conf.example (working copy) @@ -99,7 +99,8 @@ # Generic certificate contents mapper mapper generic { debug = true; - module = /usr/lib/pam_pkcs11/generic_mapper.so; + # module = /usr/lib/pam_pkcs11/generic_mapper.so; + module = internal; # ignore letter case on match/compare ignorecase = false; # Use one of "cn" , "subject" , "kpn" , "email" , "upn" or "uid" pam_pkcs11-0.5.3-pcsc120.patch: --- NEW FILE pam_pkcs11-0.5.3-pcsc120.patch --- --- src/tools/card_eventmgr.c~ 2005-09-21 00:19:50.000000000 +0300 +++ src/tools/card_eventmgr.c 2005-09-21 00:25:54.000000000 +0300 @@ -311,7 +311,7 @@ LONG rv; SCARD_READERSTATE_A *rgReaderStates_t = NULL; DWORD dwReaders, dwReadersOld; - LPTSTR mszReaders = NULL; + char *mszReaders = NULL; char *ptr, **readers = NULL; int nbReaders, i; int first_loop = TRUE; Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/pam_pkcs11/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 29 Aug 2005 03:15:27 -0000 1.2 +++ .cvsignore 21 Sep 2005 19:56:06 -0000 1.3 @@ -1 +1 @@ -pam_pkcs11-0.5.2.tar.gz +pam_pkcs11-0.5.3.tar.gz Index: pam_pkcs11.spec =================================================================== RCS file: /cvs/extras/rpms/pam_pkcs11/devel/pam_pkcs11.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- pam_pkcs11.spec 29 Aug 2005 03:15:27 -0000 1.1 +++ pam_pkcs11.spec 21 Sep 2005 19:56:06 -0000 1.2 @@ -1,19 +1,24 @@ Name: pam_pkcs11 -Version: 0.5.2 -Release: 2%{?dist} +Version: 0.5.3 +Release: 1%{?dist} Summary: PKCS #11 PAM login module Group: System Environment/Base License: LGPL URL: http://www.opensc.org/pam_pkcs11 -Source0: http://oasis.dit.upm.es/~jantonio/pam-pkcs11/downloads/%{name}-%{version}.tar.gz +Source0: http://www.opensc.org/files/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Patch0: pam_pkcs11-0.5.2-pki.patch -Patch1: pam_pkcs11-0.5.2-badstatic.patch +# http://www.opensc.org/pam_pkcs11/ticket/11 +Patch0: %{name}-0.5.3-pcsc120.patch +Patch1: %{name}-0.5.2-badstatic.patch +# http://www.opensc.org/pam_pkcs11/ticket/9 +Patch2: %{name}-0.5.3-examples.patch +# http://www.opensc.org/pam_pkcs11/ticket/10 +Patch3: %{name}-0.5.3-genmapper-config.patch BuildRequires: pam-devel, openssl-devel, openldap-devel %{?_with_curl:BuildRequires: curl-devel} -BuildRequires: libxslt docbook-style-xsl +BuildRequires: libxslt docbook-style-xsl Provides: pkcs11_login = %{version}-%{release} %description @@ -41,17 +46,25 @@ %prep %setup -q -%patch0 -p1 -%patch1 -p1 -# 64bit arches -%ifarch ia64 sparc64 alpha ppc64 x86_64 -for i in etc/pam_pkcs11.conf.example etc/pkcs11_eventmgr.conf.example etc/pam.d_login.example src/pam_pkcs11/pam_config.c src/tools/pkcs11_eventmgr.c; do - sed -i 's/usr\/lib/usr\/lib64/g' $i -done -%endif +if ! pkg-config --atleast-version 1.2.9 libpcsclite ; then +%patch0 +fi +#patch1 -p1 +%patch2 +%patch3 + +grep -rlF /etc/pam_pkcs11/pkcs11_module.so * \ +| xargs sed -i -e \ + 's|/etc/pam_pkcs11/pkcs11_module\.so|%{_libdir}/pam_pkcs11/pkcs11_module.so|g' + +grep -rlF /etc/pam_pkcs11 * \ +| xargs sed -i -e 's|/etc/pam_pkcs11|%{_sysconfdir}/pki/pam_pkcs11|g' + +grep -rl '/usr/lib\b' * | xargs sed -i -e 's|/usr/lib\b|%{_libdir}|g' %build +# --disable-static is broken as of 0.5.[23] %configure --disable-dependency-tracking %{?_with_curl} make %{?_smp_mflags} @@ -59,45 +72,41 @@ %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT +install -dm 755 $RPM_BUILD_ROOT/%{_lib} +mv $RPM_BUILD_ROOT%{_libdir}/security $RPM_BUILD_ROOT/%{_lib} + # Nuke the static and libtool bits rm -rf $RPM_BUILD_ROOT%{_libdir}/pam_pkcs11/*.*a -# 64 bit correction -%ifarch ia64 sparc64 alpha ppc64 x86_64 -mv $RPM_BUILD_ROOT/lib $RPM_BUILD_ROOT/lib64 -%endif - -# Nuke %{_datadir}/pam_pkcs11 +# Example configs are installed in-place and some as docs rm -rf $RPM_BUILD_ROOT%{_datadir}/pam_pkcs11 -# Hardcoded defaults... no sysconfdir -mkdir -p $RPM_BUILD_ROOT/etc/pki/pkcs11/mapdir -install -dm 755 $RPM_BUILD_ROOT/etc/pki/pkcs11/cacerts -install -dm 755 $RPM_BUILD_ROOT/etc/pki/pkcs11/crls -install -m 644 etc/pam_pkcs11.conf.example $RPM_BUILD_ROOT/etc/pki/pkcs11/pam_pkcs11.conf -install -m 644 etc/card_eventmgr.conf.example $RPM_BUILD_ROOT/etc/pki/pkcs11/card_eventmgr.conf -install -m 644 etc/pkcs11_eventmgr.conf.example $RPM_BUILD_ROOT/etc/pki/pkcs11/pkcs11_eventmgr.conf -install -m 644 etc/digest_mapping.example $RPM_BUILD_ROOT/etc/pki/pkcs11/digest_mapping -install -m 644 etc/mail_mapping.example $RPM_BUILD_ROOT/etc/pki/pkcs11/mail_mapping -install -m 644 etc/subject_mapping.example $RPM_BUILD_ROOT/etc/pki/pkcs11/subject_mapping +install -dm 755 \ + $RPM_BUILD_ROOT%{_sysconfdir}/pki/pam_pkcs11/{cacerts,crls,mapdir} +for file in card_eventmgr.conf pam_pkcs11.conf pkcs11_eventmgr.conf {digest,mail,subject}_mapping ; do + install -pm 644 etc/$file.example \ + $RPM_BUILD_ROOT%{_sysconfdir}/pki/pam_pkcs11/$file +done + %clean rm -rf $RPM_BUILD_ROOT + %files %defattr(-,root,root,-) %doc AUTHORS COPYING README TODO ChangeLog NEWS -%doc docs/pam_pkcs11.html -%doc docs/README.autologin -%doc docs/README.mappers +%doc doc/pam_pkcs11.html +%doc doc/README.autologin doc/README.ldap_mapper doc/README.mappers %doc etc/pam.d_login.example -%dir %{_sysconfdir}/pki/pkcs11 -%config(noreplace) %{_sysconfdir}/pki/pkcs11/cacerts -%config(noreplace) %{_sysconfdir}/pki/pkcs11/crls -%config(noreplace) %{_sysconfdir}/pki/pkcs11/pam_pkcs11.conf -%config(noreplace) %{_sysconfdir}/pki/pkcs11/digest_mapping -%config(noreplace) %{_sysconfdir}/pki/pkcs11/mail_mapping -%config(noreplace) %{_sysconfdir}/pki/pkcs11/subject_mapping +%dir %{_sysconfdir}/pki/pam_pkcs11 +%config(noreplace) %{_sysconfdir}/pki/pam_pkcs11/cacerts/ +%config(noreplace) %{_sysconfdir}/pki/pam_pkcs11/crls/ +%config(noreplace) %{_sysconfdir}/pki/pam_pkcs11/mapdir/ +%config(noreplace) %{_sysconfdir}/pki/pam_pkcs11/pam_pkcs11.conf +%config(noreplace) %{_sysconfdir}/pki/pam_pkcs11/digest_mapping +%config(noreplace) %{_sysconfdir}/pki/pam_pkcs11/mail_mapping +%config(noreplace) %{_sysconfdir}/pki/pam_pkcs11/subject_mapping %{_bindir}/make_hash_link.sh %{_libdir}/pam_pkcs11/ /%{_lib}/security/pam_pkcs11.so @@ -105,20 +114,23 @@ %files tools %defattr(-,root,root,-) -%dir %{_sysconfdir}/pki/pkcs11 -%config(noreplace) %{_sysconfdir}/pki/pkcs11/card_eventmgr.conf -%config(noreplace) %{_sysconfdir}/pki/pkcs11/pkcs11_eventmgr.conf +%doc doc/README.eventmgr +%config(noreplace) %{_sysconfdir}/pki/pam_pkcs11/card_eventmgr.conf +%config(noreplace) %{_sysconfdir}/pki/pam_pkcs11/pkcs11_eventmgr.conf %{_bindir}/card_eventmgr %{_bindir}/pkcs11_eventmgr %{_bindir}/pklogin_finder %{_bindir}/pkcs11_inspect -%{_mandir}/man1/card_eventmgr.1.gz -%{_mandir}/man1/pkcs11_eventmgr.1.gz -%{_mandir}/man1/pkcs11_inspect.1.gz -%{_mandir}/man1/pklogin_finder.1.gz -%doc docs/README.eventmgr +%{_mandir}/man1/* + %changelog +* Wed Sep 21 2005 Ville Skytt?? - 0.5.3-1 +- 0.5.3, patch to compile with pcsc-lite < 1.2.9. +- Comment out example entries in default configuration files. +- Sync installation layout in config files and on disk. +- Specfile cleanups and maintainability improvements. + * Sun Aug 28 2005 Tom "spot" Callaway 0.5.2-2 - don't need the datadir - 64bit fixups @@ -131,7 +143,6 @@ - remove BR:automake - own directories - use /etc/pki -- use --disable-static * Sat Aug 13 2005 Tom "spot" Callaway 0.5.1-1 - minor cleanups (and naming change) for Fedora Extras Index: sources =================================================================== RCS file: /cvs/extras/rpms/pam_pkcs11/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 29 Aug 2005 03:15:27 -0000 1.2 +++ sources 21 Sep 2005 19:56:06 -0000 1.3 @@ -1 +1 @@ -5b5c6ac1c718297fa250d8a5b6e7cb82 pam_pkcs11-0.5.2.tar.gz +607e3ba84b8938eff20c51c597e522c0 pam_pkcs11-0.5.3.tar.gz --- pam_pkcs11-0.5.2-pki.patch DELETED --- From fedora-extras-commits at redhat.com Wed Sep 21 20:07:26 2005 From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard)) Date: Wed, 21 Sep 2005 16:07:26 -0400 Subject: rpms/colorscheme/devel colorscheme-0.2.1-include64.patch, NONE, 1.1 colorscheme.spec, 1.1, 1.2 Message-ID: <200509212007.j8LK7QBQ014892@cvs-int.fedora.redhat.com> Author: abompard Update of /cvs/extras/rpms/colorscheme/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14846 Modified Files: colorscheme.spec Added Files: colorscheme-0.2.1-include64.patch Log Message: - add patch for missing include colorscheme-0.2.1-include64.patch: --- NEW FILE colorscheme-0.2.1-include64.patch --- --- ./src/main.cc.include64 2005-09-21 22:01:06.000000000 +0200 +++ ./src/main.cc 2005-09-21 22:01:40.000000000 +0200 @@ -33,6 +33,7 @@ #include #include "gcs-mainwindow.h" +#include "gcs-i18n.h" namespace gcs { Index: colorscheme.spec =================================================================== RCS file: /cvs/extras/rpms/colorscheme/devel/colorscheme.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- colorscheme.spec 20 Sep 2005 07:49:28 -0000 1.1 +++ colorscheme.spec 21 Sep 2005 20:07:24 -0000 1.2 @@ -1,12 +1,13 @@ Name: colorscheme Version: 0.2.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Generate a variety of colorschemes from a single starting color Group: Applications/Multimedia License: GPL URL: http://home.gna.org/colorscheme/ Source0: http://download.gna.org/colorscheme/0.2/colorscheme-0.2.1.tar.bz2 +Patch0: colorscheme-0.2.1-include64.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gtkmm24-devel >= 2.5, libgnomeui-devel >= 2.0, desktop-file-utils @@ -24,6 +25,7 @@ %prep %setup -q +%patch0 -p1 -b .include64 %build @@ -61,5 +63,8 @@ %changelog +* Wed Sep 21 2005 Aurelien Bompard 0.2.1-2 +- add patch for missing include + * Sun Sep 18 2005 Aurelien Bompard 0.2.1-1 - initial Fedora package (reviewed in bug 168635) From fedora-extras-commits at redhat.com Wed Sep 21 20:09:27 2005 From: fedora-extras-commits at redhat.com (Aaron Kurtz (dragoon)) Date: Wed, 21 Sep 2005 16:09:27 -0400 Subject: rpms/gnome-applet-netspeed/devel gnome-applet-netspeed.spec, 1.4, 1.5 Message-ID: <200509212009.j8LK9Rlk014980@cvs-int.fedora.redhat.com> Author: dragoon Update of /cvs/extras/rpms/gnome-applet-netspeed/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14952/devel Modified Files: gnome-applet-netspeed.spec Log Message: * Wed Sep 21 2005 Aaron Kurtz - 0.13-2 - Proper buildreps this time Index: gnome-applet-netspeed.spec =================================================================== RCS file: /cvs/extras/rpms/gnome-applet-netspeed/devel/gnome-applet-netspeed.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- gnome-applet-netspeed.spec 20 Sep 2005 07:25:28 -0000 1.4 +++ gnome-applet-netspeed.spec 21 Sep 2005 20:09:25 -0000 1.5 @@ -1,6 +1,6 @@ Name: gnome-applet-netspeed Version: 0.13 -Release: 1%{?dist} +Release: 2%{?dist} Summary: GNOME applet that shows traffic on a network device Group: Applications/Internet @@ -9,7 +9,7 @@ Source0: http://www.wh-hms.uni-ulm.de/~mfcn/netspeed/packages/netspeed_applet-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: pkgconfig, gettext, scrollkeeper -BuildRequires: libgnomeui-devel >= 2.8 +BuildRequires: libgnomeui-devel >= 2.8, libgtop2-devel BuildRequires: gnome-panel-devel >= 2.8 Requires(post): scrollkeeper Requires(postun): scrollkeeper @@ -53,6 +53,9 @@ %{_datadir}/omf/netspeed_applet/ %changelog +* Wed Sep 21 2005 Aaron Kurtz - 0.13-2 +- Proper buildreps this time + * Tue Sep 20 2005 Aaron Kurtz - 0.13-1 - Bump to 0.13 From fedora-extras-commits at redhat.com Wed Sep 21 20:09:28 2005 From: fedora-extras-commits at redhat.com (Aaron Kurtz (dragoon)) Date: Wed, 21 Sep 2005 16:09:28 -0400 Subject: rpms/gnome-applet-netspeed/FC-4 gnome-applet-netspeed.spec,1.4,1.5 Message-ID: <200509212009.j8LK9SlR014991@cvs-int.fedora.redhat.com> Author: dragoon Update of /cvs/extras/rpms/gnome-applet-netspeed/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14952/FC-4 Modified Files: gnome-applet-netspeed.spec Log Message: * Wed Sep 21 2005 Aaron Kurtz - 0.13-2 - Proper buildreps this time Index: gnome-applet-netspeed.spec =================================================================== RCS file: /cvs/extras/rpms/gnome-applet-netspeed/FC-4/gnome-applet-netspeed.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- gnome-applet-netspeed.spec 20 Sep 2005 07:25:29 -0000 1.4 +++ gnome-applet-netspeed.spec 21 Sep 2005 20:09:26 -0000 1.5 @@ -1,6 +1,6 @@ Name: gnome-applet-netspeed Version: 0.13 -Release: 1%{?dist} +Release: 2%{?dist} Summary: GNOME applet that shows traffic on a network device Group: Applications/Internet @@ -9,7 +9,7 @@ Source0: http://www.wh-hms.uni-ulm.de/~mfcn/netspeed/packages/netspeed_applet-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: pkgconfig, gettext, scrollkeeper -BuildRequires: libgnomeui-devel >= 2.8 +BuildRequires: libgnomeui-devel >= 2.8, libgtop2-devel BuildRequires: gnome-panel-devel >= 2.8 Requires(post): scrollkeeper Requires(postun): scrollkeeper @@ -53,6 +53,9 @@ %{_datadir}/omf/netspeed_applet/ %changelog +* Wed Sep 21 2005 Aaron Kurtz - 0.13-2 +- Proper buildreps this time + * Tue Sep 20 2005 Aaron Kurtz - 0.13-1 - Bump to 0.13 From fedora-extras-commits at redhat.com Thu Sep 22 02:33:52 2005 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Wed, 21 Sep 2005 22:33:52 -0400 Subject: rpms/scim/FC-4 scim.spec,1.21,1.22 Message-ID: <200509220233.j8M2Xqgr024259@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/scim/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24238 Modified Files: scim.spec Log Message: - move libs and the gtk immodule to scim-libs for multilib - make scim-devel require scim-libs - add xinput.d entries for Indic langs Index: scim.spec =================================================================== RCS file: /cvs/extras/rpms/scim/FC-4/scim.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- scim.spec 9 Sep 2005 05:47:23 -0000 1.21 +++ scim.spec 22 Sep 2005 02:33:50 -0000 1.22 @@ -1,7 +1,7 @@ Name: scim Version: 1.4.2 # must be less than the release number of scim in Core -Release: 1%{?dist} +Release: 3%{?dist} Summary: Smart Common Input Method platform License: LGPL @@ -26,7 +26,7 @@ %package devel Summary: Smart Common Input Method platform Group: Development/Libraries -Requires: %{name} = %{version}-%{release} +Requires: %{name}-libs = %{version}-%{release} Requires: gtk2-devel %description devel @@ -36,12 +36,20 @@ %package doc Summary: Smart Common Input Method platform documentation -Group: Development/Libraries +Group: Documentation %description doc SCIM development documentation files generated from the sourcecode. +%package libs +Summary: Smart Common Input Method libraries +Group: System Environment/Libraries + +%description libs +This package provides the libraries and GTK input method module for SCIM. + + %prep %setup -q %patch1 -p1 -b .1-restart @@ -86,11 +94,14 @@ %clean rm -rf ${RPM_BUILD_ROOT} +%define cjk_langs ja_JP ko_KR zh_CN zh_TW +%define indic_langs bn_IN gu_IN hi_IN kn_IN ml_IN pa_IN ta_IN te_IN +%define supported_langs %{cjk_langs} %{indic_langs} ne_NE th_TH %post /sbin/ldconfig -for llcc in ja_JP ko_KR zh_CN zh_TW; do +for llcc in %{supported_langs}; do %{_sbindir}/alternatives --install %{_sysconfdir}/X11/xinit/xinput.d/$llcc xinput-$llcc %{_sysconfdir}/X11/xinit/xinput.d/scim 81 done @@ -101,7 +112,7 @@ /sbin/ldconfig if [ "$1" = "0" ]; then - for llcc in ja_JP ko_KR zh_CN zh_TW; do + for llcc in %{supported_langs}; do %{_sbindir}/alternatives --remove xinput-$llcc %{_sysconfdir}/X11/xinit/xinput.d/scim # if alternative was set to manual scim, reset to auto [ "`readlink %{_sysconfdir}/alternatives/xinput-$llcc`" = "%{_sysconfdir}/X11/xinit/xinput.d/scim" ] && %{_sbindir}/alternatives --auto xinput-$llcc @@ -118,9 +129,7 @@ %config(noreplace) %{_sysconfdir}/scim/* %{_sysconfdir}/X11/xinit/xinput.d %{_bindir}/* -%{_libdir}/libscim*.so.* %{_libdir}/scim-1.0 -%{_libdir}/gtk-2.0/immodules %{_datadir}/scim %{_datadir}/pixmaps/* %{_datadir}/applications/fedora-scim-setup.desktop @@ -136,8 +145,20 @@ %defattr(-,root,root,-) %doc docs/html +%files libs +%defattr(-,root,root,-) +%{_libdir}/libscim-*.so.* +%{_libdir}/gtk-2.0/immodules + %changelog +* Thu Sep 22 2005 Jens Petersen - 1.4.2-3 +- make scim-devel require scim-libs +- add xinput.d entries for Indic langs + +* Thu Sep 15 2005 Jens Petersen +- move libs and the gtk immodule to scim-libs for multilib + * Fri Sep 9 2005 Jens Petersen - 1.4.2-1 - improve scim-restart script to take account of the config module in use (Liu Cougar) From fedora-extras-commits at redhat.com Thu Sep 22 02:58:43 2005 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Wed, 21 Sep 2005 22:58:43 -0400 Subject: rpms/scim/FC-3 scim.spec,1.15,1.16 Message-ID: <200509220258.j8M2whvF024340@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/scim/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24319 Modified Files: scim.spec Log Message: sync with FC-4: - move libs and the gtk immodule to scim-libs for multilib - make scim-devel require scim-libs - add xinput.d entries for Indic langs Index: scim.spec =================================================================== RCS file: /cvs/extras/rpms/scim/FC-3/scim.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- scim.spec 9 Sep 2005 06:39:54 -0000 1.15 +++ scim.spec 22 Sep 2005 02:58:41 -0000 1.16 @@ -1,7 +1,7 @@ Name: scim Version: 1.4.2 # must be less than the release number of scim in Core -Release: 1%{?dist} +Release: 3%{?dist} Summary: Smart Common Input Method platform License: LGPL @@ -26,7 +26,7 @@ %package devel Summary: Smart Common Input Method platform Group: Development/Libraries -Requires: %{name} = %{version}-%{release} +Requires: %{name}-libs = %{version}-%{release} Requires: gtk2-devel %description devel @@ -36,12 +36,20 @@ %package doc Summary: Smart Common Input Method platform documentation -Group: Development/Libraries +Group: Documentation %description doc SCIM development documentation files generated from the sourcecode. +%package libs +Summary: Smart Common Input Method libraries +Group: System Environment/Libraries + +%description libs +This package provides the libraries and GTK input method module for SCIM. + + %prep %setup -q %patch1 -p1 -b .1-restart @@ -51,6 +59,7 @@ %build +# symbol versioning enabled for FC3 and RHEL4 %configure --disable-static --enable-ld-version-script make %{?_smp_mflags} @@ -85,11 +94,14 @@ %clean rm -rf ${RPM_BUILD_ROOT} +%define cjk_langs ja_JP ko_KR zh_CN zh_TW +%define indic_langs bn_IN gu_IN hi_IN kn_IN ml_IN pa_IN ta_IN te_IN +%define supported_langs %{cjk_langs} %{indic_langs} ne_NE th_TH %post /sbin/ldconfig -for llcc in ja_JP ko_KR zh_CN zh_TW; do +for llcc in %{supported_langs}; do %{_sbindir}/alternatives --install %{_sysconfdir}/X11/xinit/xinput.d/$llcc xinput-$llcc %{_sysconfdir}/X11/xinit/xinput.d/scim 81 done @@ -100,7 +112,7 @@ /sbin/ldconfig if [ "$1" = "0" ]; then - for llcc in ja_JP ko_KR zh_CN zh_TW; do + for llcc in %{supported_langs}; do %{_sbindir}/alternatives --remove xinput-$llcc %{_sysconfdir}/X11/xinit/xinput.d/scim # if alternative was set to manual scim, reset to auto [ "`readlink %{_sysconfdir}/alternatives/xinput-$llcc`" = "%{_sysconfdir}/X11/xinit/xinput.d/scim" ] && %{_sbindir}/alternatives --auto xinput-$llcc @@ -117,9 +129,7 @@ %config(noreplace) %{_sysconfdir}/scim/* %{_sysconfdir}/X11/xinit/xinput.d %{_bindir}/* -%{_libdir}/libscim*.so.* %{_libdir}/scim-1.0 -%{_libdir}/gtk-2.0/immodules %{_datadir}/scim %{_datadir}/pixmaps/* %{_datadir}/applications/fedora-scim-setup.desktop @@ -135,8 +145,20 @@ %defattr(-,root,root,-) %doc docs/html +%files libs +%defattr(-,root,root,-) +%{_libdir}/libscim-*.so.* +%{_libdir}/gtk-2.0/immodules + %changelog +* Thu Sep 22 2005 Jens Petersen - 1.4.2-3 +- make scim-devel require scim-libs +- add xinput.d entries for Indic langs + +* Thu Sep 15 2005 Jens Petersen +- move libs and the gtk immodule to scim-libs for multilib + * Fri Sep 9 2005 Jens Petersen - 1.4.2-1 - improve scim-restart script to take account of the config module in use (Liu Cougar) @@ -148,7 +170,7 @@ for now so that rhgb doesn't load scim (Warren Togami, #167088) * Thu Aug 25 2005 Warren Togami -- --enable-ld-version-script +- configure with --enable-ld-version-script (#166041) * Mon Aug 22 2005 Jens Petersen - 1.4.2-0 - update to 1.4.2 release From fedora-extras-commits at redhat.com Thu Sep 22 03:06:16 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Wed, 21 Sep 2005 23:06:16 -0400 Subject: rpms/Coin2/devel Coin2.spec,1.17,1.18 Message-ID: <200509220306.j8M36qFD025735@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/Coin2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25716 Modified Files: Coin2.spec Log Message: - Remove simacros patch. - Remove libtool patch. - Link against freetype2. Index: Coin2.spec =================================================================== RCS file: /cvs/extras/rpms/Coin2/devel/Coin2.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- Coin2.spec 21 Sep 2005 14:26:31 -0000 1.17 +++ Coin2.spec 22 Sep 2005 03:06:09 -0000 1.18 @@ -9,12 +9,11 @@ %define libopenal_SONAME libopenal.so.0 %define libsimage_SONAME libsimage.so.20 -# %define libfreetype_SONAME libfreetype.so.6 Summary: High-level 3D visualization library Name: Coin2 Version: 2.4.4 -Release: 1.1%{?dist} +Release: 2%{?dist} License: GPL Group: System Environment/Libraries @@ -24,9 +23,6 @@ Patch0: coin-2.3.0-simage-soname.diff Patch1: coin-2.3.0-openal-soname.diff -Patch2: coin-2.3.0-freetype-soname.diff -Patch3: Coin-2.4.3-simacros.diff.bz2 -Patch4: Coin-2.4.3-libtool.diff.bz2 Patch5: coin-2.3.0-man3.diff BuildRequires: xorg-x11-Mesa-libGL @@ -42,9 +38,6 @@ Requires(post): /sbin/ldconfig Requires(postun): /sbin/ldconfig -# TESTING -ExclusiveArch: x86_64 - %description Coin is a 3D graphics library with an Application Programming Interface based on the Open Inventor 2.1 API. @@ -62,13 +55,8 @@ %setup -q -n Coin-%{version} %patch0 -p1 %patch1 -p1 -# %patch2 -p1 -# %patch3 -p1 -# %patch4 -p1 %patch5 -p1 -# sed -i -e 's, at LIBFREETYPE_SONAME@,"%{libfreetype_SONAME}",' \ -# src/glue/freetype.c sed -i -e 's, at LIBSIMAGE_SONAME@,"%{libsimage_SONAME}",' \ src/glue/simage_wrapper.c sed -i -e 's, at LIBOPENAL_SONAME@,"%{libopenal_SONAME}",' \ @@ -93,14 +81,11 @@ make %{?_smp_mflags} %install - rm -rf $RPM_BUILD_ROOT +rm -rf $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT install -# TESTING -exit 1 - %clean - rm -rf $RPM_BUILD_ROOT +rm -rf $RPM_BUILD_ROOT %post /sbin/ldconfig @@ -127,6 +112,11 @@ %doc %{coin_htmldir} %changelog +* Thu Sep 22 2005 Ralf Corsepius - 2.4.4-2 +- Remove simacros patch. +- Remove libtool patch. +- Link against freetype2. + * Tue Sep 20 2005 Ralf Corsepius - 2.4.4-1 - Upstream update. From fedora-extras-commits at redhat.com Thu Sep 22 03:10:23 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Wed, 21 Sep 2005 23:10:23 -0400 Subject: rpms/Coin2/devel sources,1.7,1.8 .cvsignore,1.7,1.8 Message-ID: <200509220310.j8M3ANsH025813@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/Coin2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25794 Modified Files: sources .cvsignore Log Message: - Remove simacros patch. - Remove libtool patch. - Link against freetype2. Index: sources =================================================================== RCS file: /cvs/extras/rpms/Coin2/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 20 Sep 2005 09:19:43 -0000 1.7 +++ sources 22 Sep 2005 03:10:21 -0000 1.8 @@ -1,4 +1 @@ -e2dcc9dde9d97577d211f3caba10c7e0 Coin-2.4.3-libtool.diff.bz2 -4f4d4e4172db2107c578d0d99fde2888 Coin-2.4.3-simacros.diff.bz2 -57c039a55133c5037ebef6759d26f603 Coin-2.4.3.tar.gz 7976fcf2d1154bc8574d75b99bab45ee Coin-2.4.4.tar.gz Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/Coin2/devel/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 20 Sep 2005 09:19:43 -0000 1.7 +++ .cvsignore 22 Sep 2005 03:10:21 -0000 1.8 @@ -1,4 +1 @@ -Coin-2.4.3-libtool.diff.bz2 -Coin-2.4.3-simacros.diff.bz2 -Coin-2.4.3.tar.gz Coin-2.4.4.tar.gz From fedora-extras-commits at redhat.com Thu Sep 22 03:13:55 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Wed, 21 Sep 2005 23:13:55 -0400 Subject: rpms/Coin2/devel coin-2.3.0-freetype-soname.diff,1.1,NONE Message-ID: <200509220313.j8M3Dtj4025911@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/Coin2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25894 Removed Files: coin-2.3.0-freetype-soname.diff Log Message: Remove --- coin-2.3.0-freetype-soname.diff DELETED --- From fedora-extras-commits at redhat.com Thu Sep 22 03:15:18 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Wed, 21 Sep 2005 23:15:18 -0400 Subject: rpms/Coin2/devel Coin2.spec,1.18,1.19 Message-ID: <200509220315.j8M3FILf025943@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/Coin2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25924 Modified Files: Coin2.spec Log Message: Version inflation. Index: Coin2.spec =================================================================== RCS file: /cvs/extras/rpms/Coin2/devel/Coin2.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- Coin2.spec 22 Sep 2005 03:06:09 -0000 1.18 +++ Coin2.spec 22 Sep 2005 03:15:16 -0000 1.19 @@ -13,7 +13,7 @@ Summary: High-level 3D visualization library Name: Coin2 Version: 2.4.4 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL Group: System Environment/Libraries @@ -112,7 +112,7 @@ %doc %{coin_htmldir} %changelog -* Thu Sep 22 2005 Ralf Corsepius - 2.4.4-2 +* Thu Sep 22 2005 Ralf Corsepius - 2.4.4-3 - Remove simacros patch. - Remove libtool patch. - Link against freetype2. From fedora-extras-commits at redhat.com Thu Sep 22 04:05:01 2005 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Thu, 22 Sep 2005 00:05:01 -0400 Subject: rpms/scim-tables/FC-4 Thai.png, NONE, 1.1 scim-tables-indic.patch, NONE, 1.1 thai-table.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 scim-tables.spec, 1.6, 1.7 sources, 1.2, 1.3 Message-ID: <200509220405.j8M451nM027414@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/scim-tables/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26053 Modified Files: .cvsignore scim-tables.spec sources Added Files: Thai.png scim-tables-indic.patch thai-table.patch Log Message: * Thu Sep 22 2005 Jens Petersen - 0.5.3-4 - add a Thai table derived from m17n-db with a Thai icon - separate the Indic tables and the additional language tables into separate language subpackages * Fri Sep 9 2005 Jens Petersen - add 14 new Indic tables for Bengali, Gujarati, Hindi, Kannada, Malayalam, Punjabi, Tamil and Telugu in updated scim-tables-indic.patch - inscript tables are derived from iiimf unitle tables - new icons for all Indic tables by Amanpreet Singh Brar - Indic tables are now in new scim-tables-indic subpackage - make {chinese,japanese,korean} subpackages obsolete {zh,ja,ko} - make subpackages own %{_datadir}/scim/tables * Wed Aug 17 2005 Jens Petersen - 0.5.3 release - update files lists for new tables (ipa, latex, nepali, wu) - rename {zh,ja,ko} subpackages to {chinese,japanese,korean} scim-tables-indic.patch: --- NEW FILE scim-tables-indic.patch --- diff -ruN --exclude='*~' scim-tables-0.5.3.orig/Makefile.am scim-tables-0.5.3/Makefile.am --- scim-tables-0.5.3.orig/Makefile.am 2005-08-04 22:29:46.000000000 +0900 +++ scim-tables-0.5.3/Makefile.am 2005-09-21 17:25:28.000000000 +0900 @@ -30,7 +30,7 @@ SKIM_SUBDIR=skim endif -SUBDIRS = intl m4 src zh ja ko ne additional icons po $(SKIM_SUBDIR) +SUBDIRS = intl m4 src zh ja ko bn gu hi kn ml ne pa ta te additional icons po $(SKIM_SUBDIR) MAINTAINERCLEANFILES = Makefile.in aclocal.m4 configure $(AUX_DIST) diff -ruN --exclude='*~' scim-tables-0.5.3.orig/bn/Bengali-inscript.txt.in scim-tables-0.5.3/bn/Bengali-inscript.txt.in --- scim-tables-0.5.3.orig/bn/Bengali-inscript.txt.in 1970-01-01 09:00:00.000000000 +0900 +++ scim-tables-0.5.3/bn/Bengali-inscript.txt.in 2005-09-21 17:25:28.000000000 +0900 @@ -0,0 +1,205 @@ +### File header must not be modified +### This file must be encoded into UTF-8. +### This file is derived from iiimf unitLE's Bengali inscript layout. +SCIM_Generic_Table_Phrase_Library_TEXT +VERSION_1_0 + +### Begin Table definition. +BEGIN_DEFINITION + +### An unique id to distinguish this table among others. +### Use uuidgen to generate this kind of id. +UUID = b01beb4c-c1ba-4cb5-afb7-d21a9372a231 + +### A unique number indicates the version of this file. +### For example the last modified date of this file. +### This number must be less than 2^32. +SERIAL_NUMBER = 20050808 + +ICON = @SCIM_ICONDIR@/Bengali-inscript.png + +### The default name of this table +NAME = Inscript + +### The local names of this table +NAME.bn_IN = ????????????????????????????????? + +### Supported languages of this table +LANGUAGES = bn + +### The author of this table +AUTHOR = Amanpreet Singh Brar + +### Prompt string to be displayed in the status area. +STATUS_PROMPT = Bn + +### If true then the first candidate phrase +### will be selected automatically during inputing. +AUTO_SELECT = TRUE + +### If true then a multi wildcard will be appended +### at the end of inputing string automatically. +AUTO_WILDCARD = FALSE + +### If true then the result string will be committed to client automatically. +### This should be used with AUTO_SELECT = TRUE. +AUTO_COMMIT = TRUE + +### If true then the inputed string will be automatically splitted during inputing. +AUTO_SPLIT = TRUE + +### If true then the phrases' frequencies will be adjusted dynamically. +DYNAMIC_ADJUST = FALSE + +### If true then the preedit area will be filled up by the current candidate phrase automatically. +AUTO_FILL = TRUE + +### Whether to discard invalid key automatically. +### This takes effact only when AUTO_FILL and AUTO_COMMIT is true. +DISCARD_INVALID_KEY = TRUE + +### If true then the lookup table will always be shown if there is any candidate phrase. +### Otherwise the lookup table won't be shown unless the user requires it by moving the preedit caret left. +ALWAYS_SHOW_LOOKUP = FALSE + +### Enable full width punctuation property +USE_FULL_WIDTH_PUNCT = FALSE + +### Use full width punctuation by default +DEF_FULL_WIDTH_PUNCT = FALSE + +### Enable full width letter property +USE_FULL_WIDTH_LETTER = FALSE + +### Use full width letter by default +DEF_FULL_WIDTH_LETTER = FALSE + +### The maxmium length of a key. +MAX_KEY_LENGTH = 1 + +### Valid input chars. +VALID_INPUT_CHARS = abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890!@#$%^&*()_-+=|\~`:;"'{[}]<,>.?/ + +### Single wildcard char, can have multiple chars. +###SINGLE_WILDCARD_CHAR = ? + +### Multi wildcard char. +###MULTI_WILDCARD_CHAR = * + +### The key strokes to split inputted string. +###SPLIT_KEYS = quoteright + +### The key strokes to commit the convert result to client. +COMMIT_KEYS = space + +### The key strokes to forward the inputed string to client. +FORWARD_KEYS = VoidSymbol + +### The key strokes to select candidiate phrases. +SELECT_KEYS = VoidSymbol + +### The key strokes to page up the lookup table. +PAGE_UP_KEYS = VoidSymbol + +### The key strokes to page down the lookup table. +PAGE_DOWN_KEYS = VoidSymbol + +END_DEFINITION + +### Begin Table data. +BEGIN_TABLE +! ! 0 +" ??? 0 +' ??? 0 +( ( 0 +) ) 0 ++ ??? 0 +, , 0 +- - 0 +. ??? 0 +/ ??? 0 +0 ??? 0 +1 ??? 0 +2 ??? 0 +3 ??? 0 +4 ??? 0 +5 ??? 0 +6 ??? 0 +7 ??? 0 +8 ??? 0 +9 ??? 0 +: ??? 0 +; ??? 0 +< ??? 0 += ??? 0 +> > 0 +? ??? 0 +@ @ 0 +# ?????? 0 +$ ?????? 0 +% ????????? 0 +& ????????? 0 +* ????????? 0 +^ ????????? 0 +A ??? 0 +B B 0 +C ??? 0 +D ??? 0 +E ??? 0 +F ??? 0 +G ??? 0 +H ??? 0 +I ??? 0 +J J 0 +K ??? 0 +L ??? 0 +M ??? 0 +N N 0 +O ??? 0 +P ??? 0 +Q ??? 0 +R ??? 0 +S ??? 0 +T ??? 0 +U ??? 0 +V V 0 +W ??? 0 +X ??? 0 +Y ??? 0 +Z Z 0 +[ ??? 0 +\ \ 0 +] ??? 0 +_ ??? 0 +` ` 0 +a ??? 0 +b b 0 +c ??? 0 +d ??? 0 +e ??? 0 +f ??? 0 +g ??? 0 +h ??? 0 +i ??? 0 [...3498 lines suppressed...] + +### Begin Table definition. +BEGIN_DEFINITION + +### An unique id to distinguish this table among others. +### Use uuidgen to generate this kind of id. +UUID = 0bd6518c-5aec-4b97-817c-6efa43be8c8d + +### A unique number indicates the version of this file. +### For example the last modified date of this file. +### This number must be less than 2^32. +SERIAL_NUMBER = 20050901 + +ICON = @SCIM_ICONDIR@/Telugu-inscript.png + +### The default name of this table +NAME = Inscript + +### The local names of this table +NAME.te_IN = ?????????????????????????????? + +### Supported languages of this table +LANGUAGES = te_IN + +### The author of this table +AUTHOR = Jens Petersen + +### Prompt string to be displayed in the status area. +STATUS_PROMPT = Te + +### If true then the first candidate phrase +### will be selected automatically during inputing. +AUTO_SELECT = TRUE + +### If true then a multi wildcard will be appended +### at the end of inputing string automatically. +AUTO_WILDCARD = FALSE + +### If true then the result string will be committed to client automatically. +### This should be used with AUTO_SELECT = TRUE. +AUTO_COMMIT = TRUE + +### If true then the inputed string will be automatically splitted during inputing. +AUTO_SPLIT = TRUE + +### If true then the phrases' frequencies will be adjusted dynamically. +DYNAMIC_ADJUST = FALSE + +### If true then the preedit area will be filled up by the current candidate phrase automatically. +AUTO_FILL = TRUE + +### Whether to discard invalid key automatically. +### This takes effact only when AUTO_FILL and AUTO_COMMIT is true. +DISCARD_INVALID_KEY = TRUE + +### If true then the lookup table will always be shown if there is any candidate phrase. +### Otherwise the lookup table won't be shown unless the user requires it by moving the preedit caret left. +ALWAYS_SHOW_LOOKUP = FALSE + +### Enable full width punctuation property +USE_FULL_WIDTH_PUNCT = FALSE + +### Use full width punctuation by default +DEF_FULL_WIDTH_PUNCT = FALSE + +### Enable full width letter property +USE_FULL_WIDTH_LETTER = FALSE + +### Use full width letter by default +DEF_FULL_WIDTH_LETTER = FALSE + +### The maxmium length of a key. +MAX_KEY_LENGTH = 1 + +### Valid input chars. +VALID_INPUT_CHARS = abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890!@#$%^&*()_-+=|\~`:;"'{[}]<,>.?/ + +### Single wildcard char, can have multiple chars. +###SINGLE_WILDCARD_CHAR = ? + +### Multi wildcard char. +###MULTI_WILDCARD_CHAR = * + +### The key strokes to split inputted string. +###SPLIT_KEYS = quoteright + +### The key strokes to commit the convert result to client. +COMMIT_KEYS = space + +### The key strokes to forward the inputed string to client. +FORWARD_KEYS = VoidSymbol + +### The key strokes to select candidiate phrases. +SELECT_KEYS = VoidSymbol + +### The key strokes to page up the lookup table. +PAGE_UP_KEYS = VoidSymbol + +### The key strokes to page down the lookup table. +PAGE_DOWN_KEYS = VoidSymbol + +END_DEFINITION + +### Begin Table data. +BEGIN_TABLE +! ! +1 ??? +@ @ +2 ??? +# # +3 ??? +$ $ +4 ??? +5 ??? +6 ??? +7 ??? +8 ??? +( ( +9 ??? +) ) +0 ??? +_ _ +- - ++ ??? += ??? +Q ??? +q ??? +W ??? +w ??? +E ??? +e ??? +R ??? +r ??? +T ??? +t ??? +Y ??? +y ??? +U ??? +u ??? +I ??? +i ??? +O ??? +o ??? +P ??? +p ??? +{ ??? +[ ??? +} ??? +] ] +A ??? +a ??? +S ??? +s ??? +D ??? +d ??? +F ??? +f ??? +G ??? +g ??? +H ??? +h ??? +J ??? +j ??? +K ??? +k ??? +L ??? +l ??? +: ??? +; ??? +" ??? +' ??? +| | +\ \ +~ ??? +` ??? +Z ??? +z ??? +X X +x ??? +C ??? +c ??? +V V +v ??? +B B +b ??? +N ??? +n ??? +M ??? +m ??? +< ??? +, , +> > +. . +? ? +/ ??? +% ????????? +^ ????????? +& ????????? +* ????????? +END_TABLE thai-table.patch: --- NEW FILE thai-table.patch --- --- scim-tables-0.5.3/configure.ac~ 2005-09-06 18:17:52.000000000 +0900 +++ scim-tables-0.5.3/configure.ac 2005-09-08 19:52:58.000000000 +0900 @@ -160,6 +160,7 @@ additional/Arabic.txt additional/Danish.txt additional/LaTeX.txt + additional/Thai.txt additional/Viqr.txt additional/Yawerty.txt additional/IPA-X-SAMPA.txt --- scim-tables-0.5.3/additional/Makefile.am~ 2005-09-06 18:17:52.000000000 +0900 +++ scim-tables-0.5.3/additional/Makefile.am 2005-09-08 20:05:30.000000000 +0900 @@ -21,6 +21,7 @@ Arabic.txt.in \ Danish.txt.in \ LaTeX.txt.in \ + Thai.txt.in \ Viqr.txt.in \ Yawerty.txt.in \ IPA-X-SAMPA.txt.in @@ -29,6 +30,7 @@ Arabic.txt \ Danish.txt \ LaTeX.txt \ + Thai.txt \ Viqr.txt \ Yawerty.txt \ IPA-X-SAMPA.txt @@ -38,6 +40,7 @@ Arabic.bin \ Danish.bin \ LaTeX.bin \ + Thai.bin \ Viqr.bin \ Yawerty.bin \ IPA-X-SAMPA.bin --- scim-tables-0.5.3/additional/Thai.txt.in~ 2005-09-09 09:36:42.000000000 +0900 +++ scim-tables-0.5.3/additional/Thai.txt.in 2005-09-09 09:37:28.000000000 +0900 @@ -0,0 +1,198 @@ +### File header must not be modified +### This file must be encoded into UTF-8. +### Derived from th-kesmanee.mim table in m17n-db. +SCIM_Generic_Table_Phrase_Library_TEXT +VERSION_1_0 + +### Begin Table definition. +BEGIN_DEFINITION + +### An unique id to distinguish this table among others. +### Use uuidgen to generate this kind of id. +UUID = d63402a2-2268-44fc-b415-99eb2276ff7b + +### A unique number indicates the version of this file. +### For example the last modified date of this file. +### This number must be less than 2^32. +SERIAL_NUMBER = 20050908 + +ICON = @SCIM_ICONDIR@/Thai.png + +### The default name of this table +NAME = Thai + +### Author of this table +AUTHOR = Jens Petersen + +### Supported locales of this table +LANGUAGES = th + +### Prompt string to be displayed in the status area. +STATUS_PROMPT = Th + +### If true then the first candidate phrase +### will be selected automatically during inputing. +AUTO_SELECT = TRUE + +### If true then a multi wildcard will be appended +### at the end of inputting string automatically. +AUTO_WILDCARD = FALSE + +### If true then the result string will be committed to client automatically. +### This should be used with AUTO_SELECT = TRUE. +AUTO_COMMIT = TRUE + +### If true then the inputted string will be automatically splitted during inputing. +AUTO_SPLIT = TRUE + +### If true then the phrases' frequencies will be adjusted dynamically. +DYNAMIC_ADJUST = FALSE + +### If true then the preedit area will be filled up by the current candidate phrase automatically. +AUTO_FILL = TRUE + +### If true then the lookup table will always be shown if there is any candidate phrase. +### Otherwise the lookup table won't be shown unless the user requires it by moving the preedit caret left. +ALWAYS_SHOW_LOOKUP = FALSE + +### Enable full width punctuation property +USE_FULL_WIDTH_PUNCT = FALSE + +### Use full width punctuation by default +DEF_FULL_WIDTH_PUNCT = FALSE + +### Enable full width letter property +USE_FULL_WIDTH_LETTER = FALSE + +### Use full width letter by default +DEF_FULL_WIDTH_LETTER = FALSE + +### The maxmium length of a key. +MAX_KEY_LENGTH = 1 + +### Valid input chars. +VALID_INPUT_CHARS = !"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}~ + +### Single wildcard char, can have multiple chars. +###SINGLE_WILDCARD_CHAR = ? + +### Multi wildcard char. +###MULTI_WILDCARD_CHAR = * + +### The key strokes to split inputted string. +### SPLIT_KEYS = quoteright + +### The key strokes to commit the convert result to client. +COMMIT_KEYS = VoidSymbol + +### The key strokes to forward the inputted string to client. +FORWARD_KEYS = VoidSymbol + +### The key strokes to select candidiate phrases. +SELECT_KEYS = VoidSymbol + +### The key strokes to page up the lookup table. +PAGE_UP_KEYS = VoidSymbol + +### The key strokes to page down the lookup table. +PAGE_DOWN_KEYS = VoidSymbol + +END_DEFINITION + +### Begin Table data. +BEGIN_TABLE +! # +" ??? +# ??? +$ ??? +% ??? +& ?????? +' ??? +( ??? +) ??? +* ??? ++ ??? +, ??? +- ??? +. ??? +/ ??? +0 ??? +1 ??? +2 / +3 _ +4 ??? +5 ??? +6 ??? +7 ??? +8 ??? +9 ??? +: ??? +; ??? +< ??? += ??? +> ??? +? ??? +@ ??? +A ??? +B ??? +C ??? +D ??? +E ??? +F ??? +G ??? +H ??? +I ??? +J ??? +K ??? +L ??? +M ??? +N ??? +O ??? +P ??? +Q ??? +R ??? +S ??? +T ??? +U ??? +V ??? +W " +X ) +Y ??? +Z ( +[ ??? +\ ??? +] ??? +^ ??? +_ ??? +` ??? +a ??? +b ??? +c ??? +d ??? +e ??? +f ??? +g ??? +h ??? +i ??? +j ??? +k ??? +l ??? +m ??? +n ??? +o ??? +p ??? +q ??? +r ??? +s ??? +t ??? +u ??? +v ??? +w ??? +x ??? +y ??? +z ??? +{ ??? +| ??? +} . +~ ??? +END_TABLE --- scim-tables-0.5.3/icons/Makefile.am~ 2005-09-15 16:33:35.000000000 +0900 +++ scim-tables-0.5.3/icons/Makefile.am 2005-09-15 16:33:35.000000000 +0900 @@ -57,6 +57,7 @@ Tamil-inscript.png \ Tamil-phonetic.png \ Telugu-inscript.png \ + Thai.png \ Viqr.png \ Wu.png \ Wubi.png \ Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/scim-tables/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 11 Jun 2005 01:15:47 -0000 1.2 +++ .cvsignore 22 Sep 2005 04:04:59 -0000 1.3 @@ -1 +1,2 @@ -scim-tables-0.5.1.tar.gz +scim-tables-0.5.3.tar.gz +indic-icons-1.tar.gz Index: scim-tables.spec =================================================================== RCS file: /cvs/extras/rpms/scim-tables/FC-4/scim-tables.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- scim-tables.spec 2 Aug 2005 09:13:28 -0000 1.6 +++ scim-tables.spec 22 Sep 2005 04:04:59 -0000 1.7 @@ -1,60 +1,192 @@ -Name: scim-tables -Version: 0.5.1 -Release: 3.2%{?dist} -Summary: SCIM Generic Table IMEngine - -License: GPL -Group: System Environment/Libraries -URL: http://sourceforge.net/projects/scim -Source0: http://download.sourceforge.net/scim/%{name}-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n) +Name: scim-tables +Version: 0.5.3 +Release: 4%{?dist} +Summary: SCIM Generic Table IMEngine -BuildRequires: scim-devel, gtk2-devel - +License: GPL +Group: System Environment/Libraries +URL: http://sourceforge.net/projects/scim +Source0: http://download.sourceforge.net/scim/%{name}-%{version}.tar.gz +Source1: indic-icons-1.tar.gz +Source2: Thai.png +BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n) + +BuildRequires: scim-devel, gtk2-devel +BuildRequires: gettext-devel +Patch1: scim-tables-indic.patch +Patch2: thai-table.patch %description This package contains the Generic Table IMEngine for SCIM. -%package zh +%package amharic +Summary: SCIM tables for Amharic +Group: System Environment/Libraries +Requires: scim-tables = %{version} + +%description amharic +This package contains scim-tables files for Amharic input. + +%package arabic +Summary: SCIM tables for Arabic +Group: System Environment/Libraries +Requires: scim-tables = %{version} + +%description arabic +This package contains scim-tables files for Chinese input. + +%package bengali +Summary: SCIM tables for Bengali +Group: System Environment/Libraries +Requires: scim-tables = %{version} + +%description bengali +This package contains scim-tables files for Bengali input. + +%package chinese Summary: SCIM tables for Chinese Group: System Environment/Libraries Requires: scim-tables = %{version} +Obsoletes: scim-tables-zh + +%description chinese +This package contains scim-tables files for Chinese input. -%description zh -This package includes table IM data files for Chinese. +%package danish +Summary: SCIM tables for Danish +Group: System Environment/Libraries +Requires: scim-tables = %{version} -%package ja +%description danish +This package contains scim-tables files for Danish input. + +%package gujarati +Summary: SCIM tables for Gujarati +Group: System Environment/Libraries +Requires: scim-tables = %{version} + +%description gujarati +This package contains scim-tables files for Gujarati input. + +%package hindi +Summary: SCIM tables for Hindi +Group: System Environment/Libraries +Requires: scim-tables = %{version} + +%description hindi +This package contains scim-tables files for Hindi input. + +%package japanese Summary: SCIM tables for Japanese Group: System Environment/Libraries Requires: scim-tables = %{version} +Obsoletes: scim-tables-ja + +%description japanese +This package contains scim-tables files for Japanese. -%description ja -This package includes table IM data files for Japanese. +%package kannada +Summary: SCIM tables for Kannada +Group: System Environment/Libraries +Requires: scim-tables = %{version} -%package ko +%description kannada +This package contains scim-tables files for Kannada input. + +%package korean Summary: SCIM tables for Korean Group: System Environment/Libraries Requires: scim-tables = %{version} +Obsoletes: scim-tables-ko + +%description korean +This package contains scim-tables files for Korean. + +%package malayalam +Summary: SCIM tables for Malayalam scripts +Group: System Environment/Libraries +Requires: scim-tables = %{version} + +%description malayalam +This package contains scim-tables files for Malayalam languages. + +%package nepali +Summary: SCIM tables for +Group: System Environment/Libraries +Requires: scim-tables = %{version} + +%description nepali +This package contains scim-tables files for input. + +%package punjabi +Summary: SCIM tables for Punjabi +Group: System Environment/Libraries +Requires: scim-tables = %{version} + +%description punjabi +This package contains scim-tables files for Punjabi input. + +%package russian +Summary: SCIM tables for Russian +Group: System Environment/Libraries +Requires: scim-tables = %{version} + +%description russian +This package contains scim-tables files for Russian input. + +%package tamil +Summary: SCIM tables for Tamil +Group: System Environment/Libraries +Requires: scim-tables = %{version} + +%description tamil +This package contains scim-tables files for Tamil input. + +%package thai +Summary: SCIM tables for Thai +Group: System Environment/Libraries +Requires: scim-tables = %{version} + +%description thai +This package contains scim-tables files for Thai input. + +%package telugu +Summary: SCIM tables for Telugu +Group: System Environment/Libraries +Requires: scim-tables = %{version} + +%description telugu +This package contains scim-tables files for Telugu input. + +%package vietnamese +Summary: SCIM tables for Vietnamese +Group: System Environment/Libraries +Requires: scim-tables = %{version} -%description ko -This package includes table IM data files for Korean. +%description vietnamese +This package contains scim-tables files for Vietnamese input. %package additional -Summary: SCIM tables for some additional languages +Summary: Other miscellaneous SCIM tables Group: System Environment/Libraries Requires: scim-tables = %{version} %description additional -This package includes table IM data files for additional languages, -such as Russian etc.. +This package contains some miscellaneous scim-tables. %prep -%setup -q +%setup -q -a1 +%patch1 -p1 -b .1 +%patch2 -p1 -b .2 +# patch1, patch2, and patch3 touch Makefile.am's and configure.ac +autoreconf + +cp %SOURCE2 %SOURCE3 icons %build -%configure +%configure --disable-static make %{?_smp_mflags} @@ -63,7 +195,7 @@ make DESTDIR=${RPM_BUILD_ROOT} install # kill *.a and *.la files -rm -f ${RPM_BUILD_ROOT}/%{_libdir}/scim-1.0/*/*.{a,la} +rm -f ${RPM_BUILD_ROOT}/%{_libdir}/scim-1.0/*/*.la %find_lang %{name} @@ -73,12 +205,10 @@ rm -rf $RPM_BUILD_ROOT -%post -/sbin/ldconfig +%post -p /sbin/ldconfig -%postun -/sbin/ldconfig +%postun -p /sbin/ldconfig %files -f %{name}.lang @@ -89,9 +219,33 @@ %{_datadir}/scim/icons/table.png -%files zh +%files amharic +%defattr(-, root, root, -) +%dir %{_datadir}/scim/tables +%{_datadir}/scim/tables/Amharic.bin +%{_datadir}/scim/icons/Amharic.png + + +%files arabic +%defattr(-, root, root, -) +%dir %{_datadir}/scim/tables +%{_datadir}/scim/tables/Arabic.bin +%{_datadir}/scim/icons/Arabic.png + + +%files bengali +%defattr(-, root, root, -) +%dir %{_datadir}/scim/tables +%{_datadir}/scim/tables/Bengali-inscript.bin +%{_datadir}/scim/tables/Bengali-probhat.bin +%{_datadir}/scim/icons/Bengali-inscript.png +%{_datadir}/scim/icons/Bengali-probhat.png + + +%files chinese %defattr(-, root, root, -) %doc zh/README-Erbi.txt zh/README-CangJie.txt +%dir %{_datadir}/scim/tables %{_datadir}/scim/tables/Array30.bin %{_datadir}/scim/tables/CangJie.bin %{_datadir}/scim/tables/CangJie3.bin @@ -105,6 +259,7 @@ %{_datadir}/scim/tables/Quick.bin %{_datadir}/scim/tables/Simplex.bin %{_datadir}/scim/tables/Stroke5.bin +%{_datadir}/scim/tables/Wu.bin %{_datadir}/scim/tables/Wubi.bin %{_datadir}/scim/tables/Ziranma.bin %{_datadir}/scim/tables/ZhuYin.bin @@ -121,14 +276,41 @@ %{_datadir}/scim/icons/Quick.png %{_datadir}/scim/icons/Simplex.png %{_datadir}/scim/icons/Stroke5.png +%{_datadir}/scim/icons/Wu.png %{_datadir}/scim/icons/Wubi.png %{_datadir}/scim/icons/Ziranma.png %{_datadir}/scim/icons/ZhuYin.png -%files ja +%files danish +%defattr(-, root, root, -) +%dir %{_datadir}/scim/tables +%{_datadir}/scim/tables/Danish.bin +%{_datadir}/scim/icons/Danish.png + + +%files gujarati +%defattr(-, root, root, -) +%dir %{_datadir}/scim/tables +%{_datadir}/scim/tables/Gujarati-inscript.bin +%{_datadir}/scim/tables/Gujarati-phonetic.bin +%{_datadir}/scim/icons/Gujarati-inscript.png +%{_datadir}/scim/icons/Gujarati-phonetic.png + + +%files hindi +%defattr(-, root, root, -) +%dir %{_datadir}/scim/tables +%{_datadir}/scim/tables/Hindi-inscript.bin +%{_datadir}/scim/tables/Hindi-phonetic.bin +%{_datadir}/scim/icons/Hindi-inscript.png +%{_datadir}/scim/icons/Hindi-phonetic.png + + +%files japanese %defattr(-, root, root, -) %doc ja/kanjidic_licence.html ja/kanjidic_doc.html +%dir %{_datadir}/scim/tables %{_datadir}/scim/tables/HIRAGANA.bin %{_datadir}/scim/tables/KATAKANA.bin %{_datadir}/scim/tables/Nippon.bin @@ -137,8 +319,18 @@ %{_datadir}/scim/icons/Nippon.png -%files ko +%files kannada %defattr(-, root, root, -) +%dir %{_datadir}/scim/tables +%{_datadir}/scim/tables/Kannada-inscript.bin +%{_datadir}/scim/tables/Kannada-kgp.bin +%{_datadir}/scim/icons/Kannada-inscript.png +%{_datadir}/scim/icons/Kannada-kgp.png + + +%files korean +%defattr(-, root, root, -) +%dir %{_datadir}/scim/tables %{_datadir}/scim/tables/Hangul.bin %{_datadir}/scim/tables/HangulRomaja.bin %{_datadir}/scim/tables/Hanja.bin @@ -146,26 +338,102 @@ %{_datadir}/scim/icons/Hanja.png -%files additional +%files malayalam %defattr(-, root, root, -) -%{_datadir}/scim/tables/Arabic.bin -%{_datadir}/scim/tables/Amharic.bin -%{_datadir}/scim/tables/Viqr.bin +%dir %{_datadir}/scim/tables +%{_datadir}/scim/tables/Malayalam-inscript.bin +%{_datadir}/scim/icons/Malayalam-inscript.png + + +%files nepali +%defattr(-, root, root, -) +%dir %{_datadir}/scim/tables +%{_datadir}/scim/tables/Nepali_*.bin +%{_datadir}/scim/icons/Nepali.png + + +%files punjabi +%defattr(-, root, root, -) +%dir %{_datadir}/scim/tables +%{_datadir}/scim/tables/Punjabi-inscript.bin +%{_datadir}/scim/tables/Punjabi-jhelum.bin +%{_datadir}/scim/tables/Punjabi-phonetic.bin +%{_datadir}/scim/icons/Punjabi-inscript.png +%{_datadir}/scim/icons/Punjabi-jhelum.png +%{_datadir}/scim/icons/Punjabi-phonetic.png + + +%files russian +%defattr(-, root, root, -) +%dir %{_datadir}/scim/tables %{_datadir}/scim/tables/Yawerty.bin -%{_datadir}/scim/icons/Arabic.png -%{_datadir}/scim/icons/Amharic.png -%{_datadir}/scim/icons/Viqr.png %{_datadir}/scim/icons/Yawerty.png +%files tamil +%defattr(-, root, root, -) +%dir %{_datadir}/scim/tables +%{_datadir}/scim/tables/Tamil-inscript.bin +%{_datadir}/scim/tables/Tamil-phonetic.bin +%{_datadir}/scim/icons/Tamil-inscript.png +%{_datadir}/scim/icons/Tamil-phonetic.png + + +%files thai +%defattr(-, root, root, -) +%dir %{_datadir}/scim/tables +%{_datadir}/scim/tables/Thai.bin +%{_datadir}/scim/icons/Thai.png + + +%files telugu +%defattr(-, root, root, -) +%dir %{_datadir}/scim/tables +%{_datadir}/scim/tables/Telugu-inscript.bin +%{_datadir}/scim/icons/Telugu-inscript.png + + +%files vietnamese +%defattr(-, root, root, -) +%dir %{_datadir}/scim/tables +%{_datadir}/scim/tables/Viqr.bin +%{_datadir}/scim/icons/Viqr.png + + +%files additional +%defattr(-, root, root, -) +%dir %{_datadir}/scim/tables +%{_datadir}/scim/tables/IPA-X-SAMPA.bin +%{_datadir}/scim/tables/LaTeX.bin +%{_datadir}/scim/icons/IPA-X-SAMPA.png +%{_datadir}/scim/icons/LaTeX.png + + %changelog -* Tue Aug 2 2005 Ryo Dairiki -0.5.1-3.2 -- Remove update-xinput-scim script +* Thu Sep 22 2005 Jens Petersen - 0.5.3-4 +- add a Thai table derived from m17n-db with a Thai icon +- separate the Indic tables and the additional language tables into separate + language subpackages + +* Fri Sep 9 2005 Jens Petersen +- add 14 new Indic tables for Bengali, Gujarati, Hindi, Kannada, Malayalam, + Punjabi, Tamil and Telugu in updated scim-tables-indic.patch + - inscript tables are derived from iiimf unitle tables + - new icons for all Indic tables by Amanpreet Singh Brar + - Indic tables are now in new scim-tables-indic subpackage +- make {chinese,japanese,korean} subpackages obsolete {zh,ja,ko} +- make subpackages own %{_datadir}/scim/tables + +* Wed Aug 17 2005 Jens Petersen +- 0.5.3 release + - replace scim-tables-0.5.1-add-hindi.patch with scim-tables-indic.patch + - update files lists for new tables (ipa, latex, nepali, wu) +- rename {zh,ja,ko} subpackages to {chinese,japanese,korean} -* Sun Jul 31 2005 Ryo Dairiki -0.5.1-3.1 -- Modify to use update-xinput-scim script +* Tue Aug 2 2005 Ryo Dairiki - 0.5.1-3.2 +- rebuild -* Wed Jul 27 2005 Ryo Dairiki -0.5.1-3 +* Wed Jul 27 2005 Ryo Dairiki - 0.5.1-3 - Rebuild for scim-1.4.0 * Sat Jun 25 2005 Colin Charles 0.5.1-2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/scim-tables/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 11 Jun 2005 01:15:47 -0000 1.2 +++ sources 22 Sep 2005 04:04:59 -0000 1.3 @@ -1 +1,2 @@ -3249d0fbdb731c2003bea093dc43f19c scim-tables-0.5.1.tar.gz +0e4c216af80e6a7d40d3d0224f84b22a scim-tables-0.5.3.tar.gz +e537986f66aaaad9a8e8e2fad7c2b8f1 indic-icons-1.tar.gz From fedora-extras-commits at redhat.com Thu Sep 22 05:13:42 2005 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Thu, 22 Sep 2005 01:13:42 -0400 Subject: common tobuild,1.2221,1.2222 Message-ID: <200509220513.j8M5Dgik028971@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28952 Modified Files: tobuild Log Message: request build of rpms/scim-tables/FC-4 scim-tables-0_5_3-4_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2221 retrieving revision 1.2222 diff -u -r1.2221 -r1.2222 --- tobuild 21 Sep 2005 06:30:26 -0000 1.2221 +++ tobuild 22 Sep 2005 05:13:39 -0000 1.2222 @@ -38,3 +38,4 @@ gemi rpms/clisp/FC-3 clisp-2_34-5_fc3 fc3 katzj rpms/perl-Class-Trigger/devel perl-Class-Trigger-0_09-3_fc5 devel orion rpms/python-matplotlib/FC-4 python-matplotlib-0_84-1_fc4 fc4 +petersen rpms/scim-tables/FC-4 scim-tables-0_5_3-4_fc4 fc4 From fedora-extras-commits at redhat.com Thu Sep 22 05:16:55 2005 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Thu, 22 Sep 2005 01:16:55 -0400 Subject: common tobuild,1.2222,1.2223 Message-ID: <200509220516.j8M5GtIP029003@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28984 Modified Files: tobuild Log Message: remove scim-tables fc4 build (iwbni "make build" ran cvs update ../common"...) Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2222 retrieving revision 1.2223 diff -u -r1.2222 -r1.2223 --- tobuild 22 Sep 2005 05:13:39 -0000 1.2222 +++ tobuild 22 Sep 2005 05:16:53 -0000 1.2223 @@ -38,4 +38,3 @@ gemi rpms/clisp/FC-3 clisp-2_34-5_fc3 fc3 katzj rpms/perl-Class-Trigger/devel perl-Class-Trigger-0_09-3_fc5 devel orion rpms/python-matplotlib/FC-4 python-matplotlib-0_84-1_fc4 fc4 -petersen rpms/scim-tables/FC-4 scim-tables-0_5_3-4_fc4 fc4 From fedora-extras-commits at redhat.com Thu Sep 22 05:25:41 2005 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Thu, 22 Sep 2005 01:25:41 -0400 Subject: rpms/scim-tables/FC-4 scim-tables.spec,1.7,1.8 Message-ID: <200509220526.j8M5QCm5029061@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/scim-tables/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29040 Modified Files: scim-tables.spec Log Message: no source3 here Index: scim-tables.spec =================================================================== RCS file: /cvs/extras/rpms/scim-tables/FC-4/scim-tables.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- scim-tables.spec 22 Sep 2005 04:04:59 -0000 1.7 +++ scim-tables.spec 22 Sep 2005 05:25:39 -0000 1.8 @@ -180,10 +180,10 @@ %patch1 -p1 -b .1 %patch2 -p1 -b .2 -# patch1, patch2, and patch3 touch Makefile.am's and configure.ac +# patch1 and patch2 touch Makefile.am's and configure.ac autoreconf -cp %SOURCE2 %SOURCE3 icons +cp %SOURCE2 icons %build %configure --disable-static From fedora-extras-commits at redhat.com Thu Sep 22 05:39:39 2005 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Thu, 22 Sep 2005 01:39:39 -0400 Subject: rpms/scim-tables/FC-4 scim-tables.spec,1.8,1.9 Message-ID: <200509220539.j8M5ddGd029184@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/scim-tables/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29165 Modified Files: scim-tables.spec Log Message: danish table not included Index: scim-tables.spec =================================================================== RCS file: /cvs/extras/rpms/scim-tables/FC-4/scim-tables.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- scim-tables.spec 22 Sep 2005 05:25:39 -0000 1.8 +++ scim-tables.spec 22 Sep 2005 05:39:37 -0000 1.9 @@ -52,14 +52,6 @@ %description chinese This package contains scim-tables files for Chinese input. -%package danish -Summary: SCIM tables for Danish -Group: System Environment/Libraries -Requires: scim-tables = %{version} - -%description danish -This package contains scim-tables files for Danish input. - %package gujarati Summary: SCIM tables for Gujarati Group: System Environment/Libraries @@ -282,13 +274,6 @@ %{_datadir}/scim/icons/ZhuYin.png -%files danish -%defattr(-, root, root, -) -%dir %{_datadir}/scim/tables -%{_datadir}/scim/tables/Danish.bin -%{_datadir}/scim/icons/Danish.png - - %files gujarati %defattr(-, root, root, -) %dir %{_datadir}/scim/tables From fedora-extras-commits at redhat.com Thu Sep 22 06:38:53 2005 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Thu, 22 Sep 2005 02:38:53 -0400 Subject: rpms/scim-tables/FC-3 Thai.png, NONE, 1.1 scim-tables-indic.patch, NONE, 1.1 thai-table.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 scim-tables.spec, 1.4, 1.5 sources, 1.2, 1.3 Message-ID: <200509220638.j8M6crp6030762@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/scim-tables/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30677 Modified Files: .cvsignore scim-tables.spec sources Added Files: Thai.png scim-tables-indic.patch thai-table.patch Log Message: sync with FC-4: * Thu Sep 22 2005 Jens Petersen - 0.5.3-4 - add a Thai table derived from m17n-db with a Thai icon - separate the Indic tables and the additional language tables into separate language subpackages * Fri Sep 9 2005 Jens Petersen - add 14 new Indic tables for Bengali, Gujarati, Hindi, Kannada, Malayalam, Punjabi, Tamil and Telugu in updated scim-tables-indic.patch - inscript tables are derived from iiimf unitle tables - new icons for all Indic tables by Amanpreet Singh Brar - Indic tables are now in new scim-tables-indic subpackage - make {chinese,japanese,korean} subpackages obsolete {zh,ja,ko} - make subpackages own %{_datadir}/scim/tables * Wed Aug 17 2005 Jens Petersen - 0.5.3 release - replace scim-tables-0.5.1-add-hindi.patch with scim-tables-indic.patch - update files lists for new tables (ipa, latex, nepali, wu) - rename {zh,ja,ko} subpackages to {chinese,japanese,korean} scim-tables-indic.patch: --- NEW FILE scim-tables-indic.patch --- diff -ruN --exclude='*~' scim-tables-0.5.3.orig/Makefile.am scim-tables-0.5.3/Makefile.am --- scim-tables-0.5.3.orig/Makefile.am 2005-08-04 22:29:46.000000000 +0900 +++ scim-tables-0.5.3/Makefile.am 2005-09-21 17:25:28.000000000 +0900 @@ -30,7 +30,7 @@ SKIM_SUBDIR=skim endif -SUBDIRS = intl m4 src zh ja ko ne additional icons po $(SKIM_SUBDIR) +SUBDIRS = intl m4 src zh ja ko bn gu hi kn ml ne pa ta te additional icons po $(SKIM_SUBDIR) MAINTAINERCLEANFILES = Makefile.in aclocal.m4 configure $(AUX_DIST) diff -ruN --exclude='*~' scim-tables-0.5.3.orig/bn/Bengali-inscript.txt.in scim-tables-0.5.3/bn/Bengali-inscript.txt.in --- scim-tables-0.5.3.orig/bn/Bengali-inscript.txt.in 1970-01-01 09:00:00.000000000 +0900 +++ scim-tables-0.5.3/bn/Bengali-inscript.txt.in 2005-09-21 17:25:28.000000000 +0900 @@ -0,0 +1,205 @@ +### File header must not be modified +### This file must be encoded into UTF-8. +### This file is derived from iiimf unitLE's Bengali inscript layout. +SCIM_Generic_Table_Phrase_Library_TEXT +VERSION_1_0 + +### Begin Table definition. +BEGIN_DEFINITION + +### An unique id to distinguish this table among others. +### Use uuidgen to generate this kind of id. +UUID = b01beb4c-c1ba-4cb5-afb7-d21a9372a231 + +### A unique number indicates the version of this file. +### For example the last modified date of this file. +### This number must be less than 2^32. +SERIAL_NUMBER = 20050808 + +ICON = @SCIM_ICONDIR@/Bengali-inscript.png + +### The default name of this table +NAME = Inscript + +### The local names of this table +NAME.bn_IN = ????????????????????????????????? + +### Supported languages of this table +LANGUAGES = bn + +### The author of this table +AUTHOR = Amanpreet Singh Brar + +### Prompt string to be displayed in the status area. +STATUS_PROMPT = Bn + +### If true then the first candidate phrase +### will be selected automatically during inputing. +AUTO_SELECT = TRUE + +### If true then a multi wildcard will be appended +### at the end of inputing string automatically. +AUTO_WILDCARD = FALSE + +### If true then the result string will be committed to client automatically. +### This should be used with AUTO_SELECT = TRUE. +AUTO_COMMIT = TRUE + +### If true then the inputed string will be automatically splitted during inputing. +AUTO_SPLIT = TRUE + +### If true then the phrases' frequencies will be adjusted dynamically. +DYNAMIC_ADJUST = FALSE + +### If true then the preedit area will be filled up by the current candidate phrase automatically. +AUTO_FILL = TRUE + +### Whether to discard invalid key automatically. +### This takes effact only when AUTO_FILL and AUTO_COMMIT is true. +DISCARD_INVALID_KEY = TRUE + +### If true then the lookup table will always be shown if there is any candidate phrase. +### Otherwise the lookup table won't be shown unless the user requires it by moving the preedit caret left. +ALWAYS_SHOW_LOOKUP = FALSE + +### Enable full width punctuation property +USE_FULL_WIDTH_PUNCT = FALSE + +### Use full width punctuation by default +DEF_FULL_WIDTH_PUNCT = FALSE + +### Enable full width letter property +USE_FULL_WIDTH_LETTER = FALSE + +### Use full width letter by default +DEF_FULL_WIDTH_LETTER = FALSE + +### The maxmium length of a key. +MAX_KEY_LENGTH = 1 + +### Valid input chars. +VALID_INPUT_CHARS = abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890!@#$%^&*()_-+=|\~`:;"'{[}]<,>.?/ + +### Single wildcard char, can have multiple chars. +###SINGLE_WILDCARD_CHAR = ? + +### Multi wildcard char. +###MULTI_WILDCARD_CHAR = * + +### The key strokes to split inputted string. +###SPLIT_KEYS = quoteright + +### The key strokes to commit the convert result to client. +COMMIT_KEYS = space + +### The key strokes to forward the inputed string to client. +FORWARD_KEYS = VoidSymbol + +### The key strokes to select candidiate phrases. +SELECT_KEYS = VoidSymbol + +### The key strokes to page up the lookup table. +PAGE_UP_KEYS = VoidSymbol + +### The key strokes to page down the lookup table. +PAGE_DOWN_KEYS = VoidSymbol + +END_DEFINITION + +### Begin Table data. +BEGIN_TABLE +! ! 0 +" ??? 0 +' ??? 0 +( ( 0 +) ) 0 ++ ??? 0 +, , 0 +- - 0 +. ??? 0 +/ ??? 0 +0 ??? 0 +1 ??? 0 +2 ??? 0 +3 ??? 0 +4 ??? 0 +5 ??? 0 +6 ??? 0 +7 ??? 0 +8 ??? 0 +9 ??? 0 +: ??? 0 +; ??? 0 +< ??? 0 += ??? 0 +> > 0 +? ??? 0 +@ @ 0 +# ?????? 0 +$ ?????? 0 +% ????????? 0 +& ????????? 0 +* ????????? 0 +^ ????????? 0 +A ??? 0 +B B 0 +C ??? 0 +D ??? 0 +E ??? 0 +F ??? 0 +G ??? 0 +H ??? 0 +I ??? 0 +J J 0 +K ??? 0 +L ??? 0 +M ??? 0 +N N 0 +O ??? 0 +P ??? 0 +Q ??? 0 +R ??? 0 +S ??? 0 +T ??? 0 +U ??? 0 +V V 0 +W ??? 0 +X ??? 0 +Y ??? 0 +Z Z 0 +[ ??? 0 +\ \ 0 +] ??? 0 +_ ??? 0 +` ` 0 +a ??? 0 +b b 0 +c ??? 0 +d ??? 0 +e ??? 0 +f ??? 0 +g ??? 0 +h ??? 0 +i ??? 0 [...3498 lines suppressed...] + +### Begin Table definition. +BEGIN_DEFINITION + +### An unique id to distinguish this table among others. +### Use uuidgen to generate this kind of id. +UUID = 0bd6518c-5aec-4b97-817c-6efa43be8c8d + +### A unique number indicates the version of this file. +### For example the last modified date of this file. +### This number must be less than 2^32. +SERIAL_NUMBER = 20050901 + +ICON = @SCIM_ICONDIR@/Telugu-inscript.png + +### The default name of this table +NAME = Inscript + +### The local names of this table +NAME.te_IN = ?????????????????????????????? + +### Supported languages of this table +LANGUAGES = te_IN + +### The author of this table +AUTHOR = Jens Petersen + +### Prompt string to be displayed in the status area. +STATUS_PROMPT = Te + +### If true then the first candidate phrase +### will be selected automatically during inputing. +AUTO_SELECT = TRUE + +### If true then a multi wildcard will be appended +### at the end of inputing string automatically. +AUTO_WILDCARD = FALSE + +### If true then the result string will be committed to client automatically. +### This should be used with AUTO_SELECT = TRUE. +AUTO_COMMIT = TRUE + +### If true then the inputed string will be automatically splitted during inputing. +AUTO_SPLIT = TRUE + +### If true then the phrases' frequencies will be adjusted dynamically. +DYNAMIC_ADJUST = FALSE + +### If true then the preedit area will be filled up by the current candidate phrase automatically. +AUTO_FILL = TRUE + +### Whether to discard invalid key automatically. +### This takes effact only when AUTO_FILL and AUTO_COMMIT is true. +DISCARD_INVALID_KEY = TRUE + +### If true then the lookup table will always be shown if there is any candidate phrase. +### Otherwise the lookup table won't be shown unless the user requires it by moving the preedit caret left. +ALWAYS_SHOW_LOOKUP = FALSE + +### Enable full width punctuation property +USE_FULL_WIDTH_PUNCT = FALSE + +### Use full width punctuation by default +DEF_FULL_WIDTH_PUNCT = FALSE + +### Enable full width letter property +USE_FULL_WIDTH_LETTER = FALSE + +### Use full width letter by default +DEF_FULL_WIDTH_LETTER = FALSE + +### The maxmium length of a key. +MAX_KEY_LENGTH = 1 + +### Valid input chars. +VALID_INPUT_CHARS = abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890!@#$%^&*()_-+=|\~`:;"'{[}]<,>.?/ + +### Single wildcard char, can have multiple chars. +###SINGLE_WILDCARD_CHAR = ? + +### Multi wildcard char. +###MULTI_WILDCARD_CHAR = * + +### The key strokes to split inputted string. +###SPLIT_KEYS = quoteright + +### The key strokes to commit the convert result to client. +COMMIT_KEYS = space + +### The key strokes to forward the inputed string to client. +FORWARD_KEYS = VoidSymbol + +### The key strokes to select candidiate phrases. +SELECT_KEYS = VoidSymbol + +### The key strokes to page up the lookup table. +PAGE_UP_KEYS = VoidSymbol + +### The key strokes to page down the lookup table. +PAGE_DOWN_KEYS = VoidSymbol + +END_DEFINITION + +### Begin Table data. +BEGIN_TABLE +! ! +1 ??? +@ @ +2 ??? +# # +3 ??? +$ $ +4 ??? +5 ??? +6 ??? +7 ??? +8 ??? +( ( +9 ??? +) ) +0 ??? +_ _ +- - ++ ??? += ??? +Q ??? +q ??? +W ??? +w ??? +E ??? +e ??? +R ??? +r ??? +T ??? +t ??? +Y ??? +y ??? +U ??? +u ??? +I ??? +i ??? +O ??? +o ??? +P ??? +p ??? +{ ??? +[ ??? +} ??? +] ] +A ??? +a ??? +S ??? +s ??? +D ??? +d ??? +F ??? +f ??? +G ??? +g ??? +H ??? +h ??? +J ??? +j ??? +K ??? +k ??? +L ??? +l ??? +: ??? +; ??? +" ??? +' ??? +| | +\ \ +~ ??? +` ??? +Z ??? +z ??? +X X +x ??? +C ??? +c ??? +V V +v ??? +B B +b ??? +N ??? +n ??? +M ??? +m ??? +< ??? +, , +> > +. . +? ? +/ ??? +% ????????? +^ ????????? +& ????????? +* ????????? +END_TABLE thai-table.patch: --- NEW FILE thai-table.patch --- --- scim-tables-0.5.3/configure.ac~ 2005-09-06 18:17:52.000000000 +0900 +++ scim-tables-0.5.3/configure.ac 2005-09-08 19:52:58.000000000 +0900 @@ -160,6 +160,7 @@ additional/Arabic.txt additional/Danish.txt additional/LaTeX.txt + additional/Thai.txt additional/Viqr.txt additional/Yawerty.txt additional/IPA-X-SAMPA.txt --- scim-tables-0.5.3/additional/Makefile.am~ 2005-09-06 18:17:52.000000000 +0900 +++ scim-tables-0.5.3/additional/Makefile.am 2005-09-08 20:05:30.000000000 +0900 @@ -21,6 +21,7 @@ Arabic.txt.in \ Danish.txt.in \ LaTeX.txt.in \ + Thai.txt.in \ Viqr.txt.in \ Yawerty.txt.in \ IPA-X-SAMPA.txt.in @@ -29,6 +30,7 @@ Arabic.txt \ Danish.txt \ LaTeX.txt \ + Thai.txt \ Viqr.txt \ Yawerty.txt \ IPA-X-SAMPA.txt @@ -38,6 +40,7 @@ Arabic.bin \ Danish.bin \ LaTeX.bin \ + Thai.bin \ Viqr.bin \ Yawerty.bin \ IPA-X-SAMPA.bin --- scim-tables-0.5.3/additional/Thai.txt.in~ 2005-09-09 09:36:42.000000000 +0900 +++ scim-tables-0.5.3/additional/Thai.txt.in 2005-09-09 09:37:28.000000000 +0900 @@ -0,0 +1,198 @@ +### File header must not be modified +### This file must be encoded into UTF-8. +### Derived from th-kesmanee.mim table in m17n-db. +SCIM_Generic_Table_Phrase_Library_TEXT +VERSION_1_0 + +### Begin Table definition. +BEGIN_DEFINITION + +### An unique id to distinguish this table among others. +### Use uuidgen to generate this kind of id. +UUID = d63402a2-2268-44fc-b415-99eb2276ff7b + +### A unique number indicates the version of this file. +### For example the last modified date of this file. +### This number must be less than 2^32. +SERIAL_NUMBER = 20050908 + +ICON = @SCIM_ICONDIR@/Thai.png + +### The default name of this table +NAME = Thai + +### Author of this table +AUTHOR = Jens Petersen + +### Supported locales of this table +LANGUAGES = th + +### Prompt string to be displayed in the status area. +STATUS_PROMPT = Th + +### If true then the first candidate phrase +### will be selected automatically during inputing. +AUTO_SELECT = TRUE + +### If true then a multi wildcard will be appended +### at the end of inputting string automatically. +AUTO_WILDCARD = FALSE + +### If true then the result string will be committed to client automatically. +### This should be used with AUTO_SELECT = TRUE. +AUTO_COMMIT = TRUE + +### If true then the inputted string will be automatically splitted during inputing. +AUTO_SPLIT = TRUE + +### If true then the phrases' frequencies will be adjusted dynamically. +DYNAMIC_ADJUST = FALSE + +### If true then the preedit area will be filled up by the current candidate phrase automatically. +AUTO_FILL = TRUE + +### If true then the lookup table will always be shown if there is any candidate phrase. +### Otherwise the lookup table won't be shown unless the user requires it by moving the preedit caret left. +ALWAYS_SHOW_LOOKUP = FALSE + +### Enable full width punctuation property +USE_FULL_WIDTH_PUNCT = FALSE + +### Use full width punctuation by default +DEF_FULL_WIDTH_PUNCT = FALSE + +### Enable full width letter property +USE_FULL_WIDTH_LETTER = FALSE + +### Use full width letter by default +DEF_FULL_WIDTH_LETTER = FALSE + +### The maxmium length of a key. +MAX_KEY_LENGTH = 1 + +### Valid input chars. +VALID_INPUT_CHARS = !"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}~ + +### Single wildcard char, can have multiple chars. +###SINGLE_WILDCARD_CHAR = ? + +### Multi wildcard char. +###MULTI_WILDCARD_CHAR = * + +### The key strokes to split inputted string. +### SPLIT_KEYS = quoteright + +### The key strokes to commit the convert result to client. +COMMIT_KEYS = VoidSymbol + +### The key strokes to forward the inputted string to client. +FORWARD_KEYS = VoidSymbol + +### The key strokes to select candidiate phrases. +SELECT_KEYS = VoidSymbol + +### The key strokes to page up the lookup table. +PAGE_UP_KEYS = VoidSymbol + +### The key strokes to page down the lookup table. +PAGE_DOWN_KEYS = VoidSymbol + +END_DEFINITION + +### Begin Table data. +BEGIN_TABLE +! # +" ??? +# ??? +$ ??? +% ??? +& ?????? +' ??? +( ??? +) ??? +* ??? ++ ??? +, ??? +- ??? +. ??? +/ ??? +0 ??? +1 ??? +2 / +3 _ +4 ??? +5 ??? +6 ??? +7 ??? +8 ??? +9 ??? +: ??? +; ??? +< ??? += ??? +> ??? +? ??? +@ ??? +A ??? +B ??? +C ??? +D ??? +E ??? +F ??? +G ??? +H ??? +I ??? +J ??? +K ??? +L ??? +M ??? +N ??? +O ??? +P ??? +Q ??? +R ??? +S ??? +T ??? +U ??? +V ??? +W " +X ) +Y ??? +Z ( +[ ??? +\ ??? +] ??? +^ ??? +_ ??? +` ??? +a ??? +b ??? +c ??? +d ??? +e ??? +f ??? +g ??? +h ??? +i ??? +j ??? +k ??? +l ??? +m ??? +n ??? +o ??? +p ??? +q ??? +r ??? +s ??? +t ??? +u ??? +v ??? +w ??? +x ??? +y ??? +z ??? +{ ??? +| ??? +} . +~ ??? +END_TABLE --- scim-tables-0.5.3/icons/Makefile.am~ 2005-09-15 16:33:35.000000000 +0900 +++ scim-tables-0.5.3/icons/Makefile.am 2005-09-15 16:33:35.000000000 +0900 @@ -57,6 +57,7 @@ Tamil-inscript.png \ Tamil-phonetic.png \ Telugu-inscript.png \ + Thai.png \ Viqr.png \ Wu.png \ Wubi.png \ Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/scim-tables/FC-3/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 11 Jun 2005 01:15:47 -0000 1.2 +++ .cvsignore 22 Sep 2005 06:38:51 -0000 1.3 @@ -1 +1,2 @@ -scim-tables-0.5.1.tar.gz +scim-tables-0.5.3.tar.gz +indic-icons-1.tar.gz Index: scim-tables.spec =================================================================== RCS file: /cvs/extras/rpms/scim-tables/FC-3/scim-tables.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- scim-tables.spec 2 Aug 2005 09:14:29 -0000 1.4 +++ scim-tables.spec 22 Sep 2005 06:38:51 -0000 1.5 @@ -1,60 +1,184 @@ -Name: scim-tables -Version: 0.5.1 -Release: 3.2%{?dist} -Summary: SCIM Generic Table IMEngine - -License: GPL -Group: System Environment/Libraries -URL: http://sourceforge.net/projects/scim -Source0: http://download.sourceforge.net/scim/%{name}-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n) +Name: scim-tables +Version: 0.5.3 +Release: 4%{?dist} +Summary: SCIM Generic Table IMEngine -BuildRequires: scim-devel, gtk2-devel - +License: GPL +Group: System Environment/Libraries +URL: http://sourceforge.net/projects/scim +Source0: http://download.sourceforge.net/scim/%{name}-%{version}.tar.gz +Source1: indic-icons-1.tar.gz +Source2: Thai.png +BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n) + +BuildRequires: scim-devel, gtk2-devel +BuildRequires: gettext-devel +Patch1: scim-tables-indic.patch +Patch2: thai-table.patch %description This package contains the Generic Table IMEngine for SCIM. -%package zh +%package amharic +Summary: SCIM tables for Amharic +Group: System Environment/Libraries +Requires: scim-tables = %{version} + +%description amharic +This package contains scim-tables files for Amharic input. + +%package arabic +Summary: SCIM tables for Arabic +Group: System Environment/Libraries +Requires: scim-tables = %{version} + +%description arabic +This package contains scim-tables files for Chinese input. + +%package bengali +Summary: SCIM tables for Bengali +Group: System Environment/Libraries +Requires: scim-tables = %{version} + +%description bengali +This package contains scim-tables files for Bengali input. + +%package chinese Summary: SCIM tables for Chinese Group: System Environment/Libraries Requires: scim-tables = %{version} +Obsoletes: scim-tables-zh -%description zh -This package includes table IM data files for Chinese. +%description chinese +This package contains scim-tables files for Chinese input. -%package ja +%package gujarati +Summary: SCIM tables for Gujarati +Group: System Environment/Libraries +Requires: scim-tables = %{version} + +%description gujarati +This package contains scim-tables files for Gujarati input. + +%package hindi +Summary: SCIM tables for Hindi +Group: System Environment/Libraries +Requires: scim-tables = %{version} + +%description hindi +This package contains scim-tables files for Hindi input. + +%package japanese Summary: SCIM tables for Japanese Group: System Environment/Libraries Requires: scim-tables = %{version} +Obsoletes: scim-tables-ja + +%description japanese +This package contains scim-tables files for Japanese. + +%package kannada +Summary: SCIM tables for Kannada +Group: System Environment/Libraries +Requires: scim-tables = %{version} -%description ja -This package includes table IM data files for Japanese. +%description kannada +This package contains scim-tables files for Kannada input. -%package ko +%package korean Summary: SCIM tables for Korean Group: System Environment/Libraries Requires: scim-tables = %{version} +Obsoletes: scim-tables-ko + +%description korean +This package contains scim-tables files for Korean. + +%package malayalam +Summary: SCIM tables for Malayalam scripts +Group: System Environment/Libraries +Requires: scim-tables = %{version} + +%description malayalam +This package contains scim-tables files for Malayalam languages. + +%package nepali +Summary: SCIM tables for +Group: System Environment/Libraries +Requires: scim-tables = %{version} + +%description nepali +This package contains scim-tables files for input. + +%package punjabi +Summary: SCIM tables for Punjabi +Group: System Environment/Libraries +Requires: scim-tables = %{version} + +%description punjabi +This package contains scim-tables files for Punjabi input. + +%package russian +Summary: SCIM tables for Russian +Group: System Environment/Libraries +Requires: scim-tables = %{version} + +%description russian +This package contains scim-tables files for Russian input. + +%package tamil +Summary: SCIM tables for Tamil +Group: System Environment/Libraries +Requires: scim-tables = %{version} + +%description tamil +This package contains scim-tables files for Tamil input. + +%package thai +Summary: SCIM tables for Thai +Group: System Environment/Libraries +Requires: scim-tables = %{version} + +%description thai +This package contains scim-tables files for Thai input. + +%package telugu +Summary: SCIM tables for Telugu +Group: System Environment/Libraries +Requires: scim-tables = %{version} + +%description telugu +This package contains scim-tables files for Telugu input. + +%package vietnamese +Summary: SCIM tables for Vietnamese +Group: System Environment/Libraries +Requires: scim-tables = %{version} -%description ko -This package includes table IM data files for Korean. +%description vietnamese +This package contains scim-tables files for Vietnamese input. %package additional -Summary: SCIM tables for some additional languages +Summary: Other miscellaneous SCIM tables Group: System Environment/Libraries Requires: scim-tables = %{version} %description additional -This package includes table IM data files for additional languages, -such as Russian etc.. +This package contains some miscellaneous scim-tables. %prep -%setup -q +%setup -q -a1 +%patch1 -p1 -b .1 +%patch2 -p1 -b .2 +# patch1 and patch2 touch Makefile.am's and configure.ac +autoreconf + +cp %SOURCE2 icons %build -%configure +%configure --disable-static make %{?_smp_mflags} @@ -63,7 +187,7 @@ make DESTDIR=${RPM_BUILD_ROOT} install # kill *.a and *.la files -rm -f ${RPM_BUILD_ROOT}/%{_libdir}/scim-1.0/*/*.{a,la} +rm -f ${RPM_BUILD_ROOT}/%{_libdir}/scim-1.0/*/*.la %find_lang %{name} @@ -73,12 +197,10 @@ rm -rf $RPM_BUILD_ROOT -%post -/sbin/ldconfig +%post -p /sbin/ldconfig -%postun -/sbin/ldconfig +%postun -p /sbin/ldconfig %files -f %{name}.lang @@ -89,9 +211,33 @@ %{_datadir}/scim/icons/table.png -%files zh +%files amharic +%defattr(-, root, root, -) +%dir %{_datadir}/scim/tables +%{_datadir}/scim/tables/Amharic.bin +%{_datadir}/scim/icons/Amharic.png + + +%files arabic +%defattr(-, root, root, -) +%dir %{_datadir}/scim/tables +%{_datadir}/scim/tables/Arabic.bin +%{_datadir}/scim/icons/Arabic.png + + +%files bengali +%defattr(-, root, root, -) +%dir %{_datadir}/scim/tables +%{_datadir}/scim/tables/Bengali-inscript.bin +%{_datadir}/scim/tables/Bengali-probhat.bin +%{_datadir}/scim/icons/Bengali-inscript.png +%{_datadir}/scim/icons/Bengali-probhat.png + + +%files chinese %defattr(-, root, root, -) %doc zh/README-Erbi.txt zh/README-CangJie.txt +%dir %{_datadir}/scim/tables %{_datadir}/scim/tables/Array30.bin %{_datadir}/scim/tables/CangJie.bin %{_datadir}/scim/tables/CangJie3.bin @@ -105,6 +251,7 @@ %{_datadir}/scim/tables/Quick.bin %{_datadir}/scim/tables/Simplex.bin %{_datadir}/scim/tables/Stroke5.bin +%{_datadir}/scim/tables/Wu.bin %{_datadir}/scim/tables/Wubi.bin %{_datadir}/scim/tables/Ziranma.bin %{_datadir}/scim/tables/ZhuYin.bin @@ -121,14 +268,34 @@ %{_datadir}/scim/icons/Quick.png %{_datadir}/scim/icons/Simplex.png %{_datadir}/scim/icons/Stroke5.png +%{_datadir}/scim/icons/Wu.png %{_datadir}/scim/icons/Wubi.png %{_datadir}/scim/icons/Ziranma.png %{_datadir}/scim/icons/ZhuYin.png -%files ja +%files gujarati +%defattr(-, root, root, -) +%dir %{_datadir}/scim/tables +%{_datadir}/scim/tables/Gujarati-inscript.bin +%{_datadir}/scim/tables/Gujarati-phonetic.bin +%{_datadir}/scim/icons/Gujarati-inscript.png +%{_datadir}/scim/icons/Gujarati-phonetic.png + + +%files hindi +%defattr(-, root, root, -) +%dir %{_datadir}/scim/tables +%{_datadir}/scim/tables/Hindi-inscript.bin +%{_datadir}/scim/tables/Hindi-phonetic.bin +%{_datadir}/scim/icons/Hindi-inscript.png +%{_datadir}/scim/icons/Hindi-phonetic.png + + +%files japanese %defattr(-, root, root, -) %doc ja/kanjidic_licence.html ja/kanjidic_doc.html +%dir %{_datadir}/scim/tables %{_datadir}/scim/tables/HIRAGANA.bin %{_datadir}/scim/tables/KATAKANA.bin %{_datadir}/scim/tables/Nippon.bin @@ -137,8 +304,18 @@ %{_datadir}/scim/icons/Nippon.png -%files ko +%files kannada +%defattr(-, root, root, -) +%dir %{_datadir}/scim/tables +%{_datadir}/scim/tables/Kannada-inscript.bin +%{_datadir}/scim/tables/Kannada-kgp.bin +%{_datadir}/scim/icons/Kannada-inscript.png +%{_datadir}/scim/icons/Kannada-kgp.png + + +%files korean %defattr(-, root, root, -) +%dir %{_datadir}/scim/tables %{_datadir}/scim/tables/Hangul.bin %{_datadir}/scim/tables/HangulRomaja.bin %{_datadir}/scim/tables/Hanja.bin @@ -146,26 +323,102 @@ %{_datadir}/scim/icons/Hanja.png -%files additional +%files malayalam %defattr(-, root, root, -) -%{_datadir}/scim/tables/Arabic.bin -%{_datadir}/scim/tables/Amharic.bin -%{_datadir}/scim/tables/Viqr.bin +%dir %{_datadir}/scim/tables +%{_datadir}/scim/tables/Malayalam-inscript.bin +%{_datadir}/scim/icons/Malayalam-inscript.png + + +%files nepali +%defattr(-, root, root, -) +%dir %{_datadir}/scim/tables +%{_datadir}/scim/tables/Nepali_*.bin +%{_datadir}/scim/icons/Nepali.png + + +%files punjabi +%defattr(-, root, root, -) +%dir %{_datadir}/scim/tables +%{_datadir}/scim/tables/Punjabi-inscript.bin +%{_datadir}/scim/tables/Punjabi-jhelum.bin +%{_datadir}/scim/tables/Punjabi-phonetic.bin +%{_datadir}/scim/icons/Punjabi-inscript.png +%{_datadir}/scim/icons/Punjabi-jhelum.png +%{_datadir}/scim/icons/Punjabi-phonetic.png + + +%files russian +%defattr(-, root, root, -) +%dir %{_datadir}/scim/tables %{_datadir}/scim/tables/Yawerty.bin -%{_datadir}/scim/icons/Arabic.png -%{_datadir}/scim/icons/Amharic.png -%{_datadir}/scim/icons/Viqr.png %{_datadir}/scim/icons/Yawerty.png +%files tamil +%defattr(-, root, root, -) +%dir %{_datadir}/scim/tables +%{_datadir}/scim/tables/Tamil-inscript.bin +%{_datadir}/scim/tables/Tamil-phonetic.bin +%{_datadir}/scim/icons/Tamil-inscript.png +%{_datadir}/scim/icons/Tamil-phonetic.png + + +%files thai +%defattr(-, root, root, -) +%dir %{_datadir}/scim/tables +%{_datadir}/scim/tables/Thai.bin +%{_datadir}/scim/icons/Thai.png + + +%files telugu +%defattr(-, root, root, -) +%dir %{_datadir}/scim/tables +%{_datadir}/scim/tables/Telugu-inscript.bin +%{_datadir}/scim/icons/Telugu-inscript.png + + +%files vietnamese +%defattr(-, root, root, -) +%dir %{_datadir}/scim/tables +%{_datadir}/scim/tables/Viqr.bin +%{_datadir}/scim/icons/Viqr.png + + +%files additional +%defattr(-, root, root, -) +%dir %{_datadir}/scim/tables +%{_datadir}/scim/tables/IPA-X-SAMPA.bin +%{_datadir}/scim/tables/LaTeX.bin +%{_datadir}/scim/icons/IPA-X-SAMPA.png +%{_datadir}/scim/icons/LaTeX.png + + %changelog -* Tue Aug 2 2005 Ryo Dairiki -0.5.1-3.2 -- Remove update-xinput-scim script +* Thu Sep 22 2005 Jens Petersen - 0.5.3-4 +- add a Thai table derived from m17n-db with a Thai icon +- separate the Indic tables and the additional language tables into separate + language subpackages + +* Fri Sep 9 2005 Jens Petersen +- add 14 new Indic tables for Bengali, Gujarati, Hindi, Kannada, Malayalam, + Punjabi, Tamil and Telugu in updated scim-tables-indic.patch + - inscript tables are derived from iiimf unitle tables + - new icons for all Indic tables by Amanpreet Singh Brar + - Indic tables are now in new scim-tables-indic subpackage +- make {chinese,japanese,korean} subpackages obsolete {zh,ja,ko} +- make subpackages own %{_datadir}/scim/tables + +* Wed Aug 17 2005 Jens Petersen +- 0.5.3 release + - replace scim-tables-0.5.1-add-hindi.patch with scim-tables-indic.patch + - update files lists for new tables (ipa, latex, nepali, wu) +- rename {zh,ja,ko} subpackages to {chinese,japanese,korean} -* Sun Jul 31 2005 Ryo Dairiki -0.5.1-3.1 -- Modify to use update-xinput-scim script +* Tue Aug 2 2005 Ryo Dairiki - 0.5.1-3.2 +- rebuild -* Wed Jul 27 2005 Ryo Dairiki -0.5.1-3 +* Wed Jul 27 2005 Ryo Dairiki - 0.5.1-3 - Rebuild for scim-1.4.0 * Sat Jun 25 2005 Colin Charles 0.5.1-2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/scim-tables/FC-3/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 11 Jun 2005 01:15:47 -0000 1.2 +++ sources 22 Sep 2005 06:38:51 -0000 1.3 @@ -1 +1,2 @@ -3249d0fbdb731c2003bea093dc43f19c scim-tables-0.5.1.tar.gz +0e4c216af80e6a7d40d3d0224f84b22a scim-tables-0.5.3.tar.gz +e537986f66aaaad9a8e8e2fad7c2b8f1 indic-icons-1.tar.gz From fedora-extras-commits at redhat.com Thu Sep 22 07:03:17 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Thu, 22 Sep 2005 03:03:17 -0400 Subject: rpms/Coin2/FC-4 sources,1.6,1.7 Coin2.spec,1.12,1.13 Message-ID: <200509220703.j8M73lbT032216@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/Coin2/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32195 Modified Files: sources Coin2.spec Log Message: Update to 2.4.4 Index: sources =================================================================== RCS file: /cvs/extras/rpms/Coin2/FC-4/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 13 Jul 2005 10:42:32 -0000 1.6 +++ sources 22 Sep 2005 07:03:14 -0000 1.7 @@ -1,3 +1,4 @@ e2dcc9dde9d97577d211f3caba10c7e0 Coin-2.4.3-libtool.diff.bz2 4f4d4e4172db2107c578d0d99fde2888 Coin-2.4.3-simacros.diff.bz2 57c039a55133c5037ebef6759d26f603 Coin-2.4.3.tar.gz +7976fcf2d1154bc8574d75b99bab45ee Coin-2.4.4.tar.gz Index: Coin2.spec =================================================================== RCS file: /cvs/extras/rpms/Coin2/FC-4/Coin2.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- Coin2.spec 13 Jul 2005 10:42:32 -0000 1.12 +++ Coin2.spec 22 Sep 2005 07:03:14 -0000 1.13 @@ -9,12 +9,11 @@ %define libopenal_SONAME libopenal.so.0 %define libsimage_SONAME libsimage.so.20 -%define libfreetype_SONAME libfreetype.so.6 Summary: High-level 3D visualization library Name: Coin2 -Version: 2.4.3 -Release: 1%{?dist} +Version: 2.4.4 +Release: 2%{?dist} License: GPL Group: System Environment/Libraries @@ -24,15 +23,15 @@ Patch0: coin-2.3.0-simage-soname.diff Patch1: coin-2.3.0-openal-soname.diff -Patch2: coin-2.3.0-freetype-soname.diff -Patch3: Coin-2.4.3-simacros.diff.bz2 -Patch4: Coin-2.4.3-libtool.diff.bz2 Patch5: coin-2.3.0-man3.diff BuildRequires: xorg-x11-Mesa-libGL BuildRequires: xorg-x11-Mesa-libGLU BuildRequires: xorg-x11-devel -BuildRequires: zlib-devel bzip2-devel +BuildRequires: zlib-devel +BuildRequires: bzip2-devel +BuildRequires: fontconfig-devel +BuildRequires: freetype-devel BuildRequires: doxygen BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -56,13 +55,8 @@ %setup -q -n Coin-%{version} %patch0 -p1 %patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 %patch5 -p1 -sed -i -e 's, at LIBFREETYPE_SONAME@,"%{libfreetype_SONAME}",' \ - src/glue/freetype.c sed -i -e 's, at LIBSIMAGE_SONAME@,"%{libsimage_SONAME}",' \ src/glue/simage_wrapper.c sed -i -e 's, at LIBOPENAL_SONAME@,"%{libopenal_SONAME}",' \ @@ -76,18 +70,24 @@ --disable-dl-libbzip2 \ --disable-dl-glu \ --disable-dl-zlib \ + --disable-dl-freetype \ + --disable-dl-fontconfig \ + --disable-spidermonkey \ --enable-man \ --enable-html \ --enable-3ds-import \ - htmldir=%{coin_htmldir}/Coin + htmldir=%{coin_htmldir}/Coin \ + CPPFLAGS=$(pkg-config --cflags freetype2) make %{?_smp_mflags} %install - rm -rf $RPM_BUILD_ROOT +rm -rf $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT install +# TESTING +exit 1 %clean - rm -rf $RPM_BUILD_ROOT +rm -rf $RPM_BUILD_ROOT %post /sbin/ldconfig @@ -114,6 +114,14 @@ %doc %{coin_htmldir} %changelog +* Thu Sep 22 2005 Ralf Corsepius - 2.4.4-3 +- Remove simacros patch. +- Remove libtool patch. +- Link against freetype2. + +* Tue Sep 20 2005 Ralf Corsepius - 2.4.4-1 +- Upstream update. + * Thu Jul 07 2005 Ralf Corsepius - 0:2.4.3-1 - Upstream update. From fedora-extras-commits at redhat.com Thu Sep 22 07:06:12 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Thu, 22 Sep 2005 03:06:12 -0400 Subject: rpms/Coin2/FC-4 .cvsignore,1.6,1.7 Message-ID: <200509220706.j8M76unh032275@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/Coin2/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32252 Modified Files: .cvsignore Log Message: Update to 2.4.4 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/Coin2/FC-4/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 13 Jul 2005 10:42:32 -0000 1.6 +++ .cvsignore 22 Sep 2005 07:06:10 -0000 1.7 @@ -1,3 +1 @@ -Coin-2.4.3-libtool.diff.bz2 -Coin-2.4.3-simacros.diff.bz2 -Coin-2.4.3.tar.gz +Coin-2.4.4.tar.gz From fedora-extras-commits at redhat.com Thu Sep 22 07:31:36 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Thu, 22 Sep 2005 03:31:36 -0400 Subject: rpms/Coin2/FC-4 Coin2.spec,1.13,1.14 sources,1.7,1.8 Message-ID: <200509220731.j8M7VaqB032540@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/Coin2/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32519 Modified Files: Coin2.spec sources Log Message: Sync with devel Index: Coin2.spec =================================================================== RCS file: /cvs/extras/rpms/Coin2/FC-4/Coin2.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- Coin2.spec 22 Sep 2005 07:03:14 -0000 1.13 +++ Coin2.spec 22 Sep 2005 07:31:34 -0000 1.14 @@ -13,7 +13,7 @@ Summary: High-level 3D visualization library Name: Coin2 Version: 2.4.4 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL Group: System Environment/Libraries @@ -83,8 +83,6 @@ %install rm -rf $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT install -# TESTING -exit 1 %clean rm -rf $RPM_BUILD_ROOT Index: sources =================================================================== RCS file: /cvs/extras/rpms/Coin2/FC-4/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 22 Sep 2005 07:03:14 -0000 1.7 +++ sources 22 Sep 2005 07:31:34 -0000 1.8 @@ -1,4 +1 @@ -e2dcc9dde9d97577d211f3caba10c7e0 Coin-2.4.3-libtool.diff.bz2 -4f4d4e4172db2107c578d0d99fde2888 Coin-2.4.3-simacros.diff.bz2 -57c039a55133c5037ebef6759d26f603 Coin-2.4.3.tar.gz 7976fcf2d1154bc8574d75b99bab45ee Coin-2.4.4.tar.gz From fedora-extras-commits at redhat.com Thu Sep 22 07:33:16 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Thu, 22 Sep 2005 03:33:16 -0400 Subject: rpms/Coin2/FC-4 coin-2.3.0-freetype-soname.diff,1.1,NONE Message-ID: <200509220733.j8M7XGYV032584@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/Coin2/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32567 Removed Files: coin-2.3.0-freetype-soname.diff Log Message: Sync with devel --- coin-2.3.0-freetype-soname.diff DELETED --- From fedora-extras-commits at redhat.com Thu Sep 22 10:00:41 2005 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Thu, 22 Sep 2005 06:00:41 -0400 Subject: rpms/bittorrent/FC-4 bittorrent.spec, 1.14, 1.15 bttrack.init, 1.1, 1.2 btseed.init, 1.1, 1.2 sources, 1.6, 1.7 .cvsignore, 1.6, 1.7 Message-ID: <200509221000.j8MA0fde003756@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/rpms/bittorrent/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3732 Modified Files: bittorrent.spec bttrack.init btseed.init sources .cvsignore Log Message: * Thu Sep 15 2005 Paul Howarth 4.0.4-1 - new upstream release 4.0.4 (#168323) - tidy up description text - improved initscripts (#158273) - for versions on Fedora Core >= 4 or RHEL, put server data under /srv rather than %{_localstatedir} - separate logs/logrotate scripts for tracker and seeder - have the gui subpackage obsolete the official BitTorrent RPM package, which is called BitTorrent, includes the GUI in the same package and is built using python's dist tools and hence doesn't include all dependencies, provide initscripts etc.; this provides a clean upgrade path to Extras - don't delete user/group torrent on uninstall (see https://www.redhat.com/archives/fedora-extras-commits/2005-June/msg00271.html) - move icon to %{_datadir}/icons/hicolor/48x48/apps instead of %{_datadir}/pixmaps and update icon cache on installation if necessary (#162465) - no need to set CFLAGS in %build for noarch package - don't generate redundant python-abi dependency for FC >= 4 - don't need to edit out "env python2"... stuff Index: bittorrent.spec =================================================================== RCS file: /cvs/extras/rpms/bittorrent/FC-4/bittorrent.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- bittorrent.spec 24 May 2005 11:18:05 -0000 1.14 +++ bittorrent.spec 22 Sep 2005 10:00:39 -0000 1.15 @@ -3,7 +3,7 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: bittorrent -Version: 4.0.2 +Version: 4.0.4 Release: 1%{?dist} Summary: BitTorrent swarming network file transfer tool @@ -19,24 +19,24 @@ BuildArch: noarch BuildRequires: python-devel desktop-file-utils -Requires: python +# FC4 and later auto-generate python version dependency +%if %{!?fedora:0}%{?fedora} < 4 || %{!?rhel:0}%{?rhel} Requires: python-abi = %(%{__python} -c "import sys ; print sys.version[:3]") +%endif Requires(pre): %{_sbindir}/useradd Requires(post): /sbin/chkconfig Requires(post): /sbin/service Requires(preun): /sbin/chkconfig Requires(preun): /sbin/service -Requires(postun): %{_sbindir}/userdel -Requires(postun): %{_sbindir}/groupdel Requires(postun): /sbin/service %description -BitTorrent is a tool for copying files from one machine to -another. FTP punishes sites for being popular: Since all uploading is -done from one place, a popular site needs big iron and big -bandwidth. With BitTorrent, clients automatically mirror files they -download, making the publisher's burden almost nothing. +BitTorrent is a tool for copying files from one machine to another. FTP +punishes sites for being popular: Since all uploading is done from one place, +a popular site needs big iron and big bandwidth. With BitTorrent, clients +automatically mirror files they download, making the publisher's burden almost +nothing. %package gui Summary: GUI versions of the BitTorrent file transfer tool @@ -45,29 +45,51 @@ Requires: %{name} = %{version}-%{release} Requires(post): desktop-file-utils Requires(postun): desktop-file-utils +Obsoletes: BitTorrent <= %{version} +Provides: BitTorrent = %{version}-%{release} %description gui This package contains the GUI versions of the BitTorrent file transfer tool. +# Fedora >= 4 has /srv, as does RHEL >= 4 +%if %{!?fedora:0}%{?fedora} >= 4 || %{!?rhel:0}%{?rhel} >= 4 +%define bt_dir /srv/bittorrent/data +%define bt_statedir /srv/bittorrent/state +%else +%define bt_dir %{_localstatedir}/spool/bittorrent +%define bt_statedir %{_localstatedir}/lib/bittorrent +%endif + %prep %setup -q -n BitTorrent-%{version} %{__sed} -i "s/appdir = .*/appdir = '%{name}-%{version}'/" BitTorrent/__init__.py %{__cat} <btseed.sysconfig -#DIR=%{_localstatedir}/spool/bittorrent -OPTIONS="--max_upload_rate 350" +DIR=%{bt_dir} +OPTIONS="--max_upload_rate 350 --display_interval 300" +SEEDLOG=%{_localstatedir}/log/bittorrent/btseed.log EOF %{__cat} <bttrack.sysconfig -#PORT=6969 -#DIR=%{_localstatedir}/spool/bittorrent -#STATEFILE=%{_localstatedir}/lib/bittorrent/bttrack -#LOGFILE=%{_localstatedir}/log/bittorrent/bttrack.log -OPTIONS="--show_names 1 --hupmonitor 1" +PORT=6969 +DIR=%{bt_dir} +STATEFILE=%{bt_statedir}/bttrack +LOGFILE=%{_localstatedir}/log/bittorrent/bttrack.log +OPTIONS="--min_time_between_log_flushes 4.0 --show_names 1 --hupmonitor 1" +EOF + +%{__cat} <btseed.logrotate +%{_localstatedir}/log/bittorrent/btseed.log { + notifempty + missingok + postrotate + /sbin/service btseed condrestart 2>/dev/null >/dev/null || true + endscript +} EOF -%{__cat} <torrent.logrotate +%{__cat} <bttrack.logrotate %{_localstatedir}/log/bittorrent/bttrack.log { notifempty missingok @@ -78,24 +100,26 @@ EOF %build -CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build +%{__python} setup.py build %install %{__rm} -rf $RPM_BUILD_ROOT %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT -%{__sed} -i -e 's/env python2/env python/' $RPM_BUILD_ROOT%{_bindir}/* %{_bindir}/desktop-file-install --vendor %{desktopvendor} \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ --add-category X-Fedora \ %{SOURCE1} -%{__install} -d $RPM_BUILD_ROOT%{_localstatedir}/{spool,lib,log}/bittorrent -%{__install} -m 0644 -D %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/pixmaps/bittorrent.png +%{__install} -d $RPM_BUILD_ROOT%{bt_dir} +%{__install} -d $RPM_BUILD_ROOT%{bt_statedir} +%{__install} -d $RPM_BUILD_ROOT%{_localstatedir}/log/bittorrent +%{__install} -m 0644 -D %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/bittorrent.png %{__install} -m 0755 -D %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/btseed %{__install} -m 0755 -D %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/bttrack %{__install} -m 0644 -D btseed.sysconfig $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/btseed %{__install} -m 0644 -D bttrack.sysconfig $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/bttrack -%{__install} -m 0644 -D torrent.logrotate $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/bittorrent +%{__install} -m 0644 -D btseed.logrotate $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/btseed +%{__install} -m 0644 -D bttrack.logrotate $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/bttrack %clean %{__rm} -rf $RPM_BUILD_ROOT @@ -117,19 +141,20 @@ fi %postun -if [ $1 -eq 0 ]; then - %{_sbindir}/userdel torrent &>/dev/null || : - %{_sbindir}/groupdel torrent &>/dev/null || : -else +if [ $1 -gt 0 ]; then /sbin/service btseed condrestart &>/dev/null || : /sbin/service bttrack condrestart &>/dev/null || : fi %post gui %{_bindir}/update-desktop-database %{_datadir}/applications &>/dev/null || : +/bin/touch --no-create %{_datadir}/icons/hicolor || : +[ -x %{_bindir}/gtk-update-icon-cache ] && %{_bindir}/gtk-update-icon-cache -q %{_datadir}/icons/hicolor || : %postun gui %{_bindir}/update-desktop-database %{_datadir}/applications &>/dev/null || : +/bin/touch --no-create %{_datadir}/icons/hicolor || : +[ -x %{_bindir}/gtk-update-icon-cache ] && %{_bindir}/gtk-update-icon-cache -q %{_datadir}/icons/hicolor || : %files %defattr(-,root,root,-) @@ -147,12 +172,13 @@ %{python_sitelib}/BitTorrent/*.py %{python_sitelib}/BitTorrent/*.pyc %ghost %{python_sitelib}/BitTorrent/*.pyo -%attr(-,torrent,torrent) %dir %{_localstatedir}/spool/bittorrent -%attr(-,torrent,torrent) %dir %{_localstatedir}/lib/bittorrent +%attr(-,torrent,torrent) %dir %{bt_dir} +%attr(-,torrent,torrent) %dir %{bt_statedir} %attr(-,torrent,torrent) %dir %{_localstatedir}/log/bittorrent %{_sysconfdir}/rc.d/init.d/btseed %{_sysconfdir}/rc.d/init.d/bttrack -%config(noreplace) %{_sysconfdir}/logrotate.d/bittorrent +%config(noreplace) %{_sysconfdir}/logrotate.d/btseed +%config(noreplace) %{_sysconfdir}/logrotate.d/bttrack %config(noreplace) %{_sysconfdir}/sysconfig/btseed %config(noreplace) %{_sysconfdir}/sysconfig/bttrack @@ -162,20 +188,40 @@ %{_bindir}/btmaketorrentgui.py %{_datadir}/applications/%{desktopvendor}-bittorrent.desktop %{_datadir}/pixmaps/%{name}-%{version} -%{_datadir}/pixmaps/bittorrent.png +%{_datadir}/icons/hicolor/48x48/apps/bittorrent.png %changelog -* Tue May 24 2005 Paul Howarth 4.0.2-1%{?dist} -- Update to 4.0.2 +* Thu Sep 15 2005 Paul Howarth 4.0.4-1 +- new upstream release 4.0.4 (#168323) +- tidy up description text +- improved initscripts (#158273) +- for versions on Fedora Core >= 4 or RHEL, put server data under /srv rather + than %{_localstatedir} +- separate logs/logrotate scripts for tracker and seeder +- have the gui subpackage obsolete the official BitTorrent RPM package, which + is called BitTorrent, includes the GUI in the same package and is built + using python's dist tools and hence doesn't include all dependencies, + provide initscripts etc.; this provides a clean upgrade path to Extras +- don't delete user/group torrent on uninstall + (see https://www.redhat.com/archives/fedora-extras-commits/2005-June/msg00271.html) +- move icon to %{_datadir}/icons/hicolor/48x48/apps instead of + %{_datadir}/pixmaps and update icon cache on installation if + necessary (#162465) +- no need to set CFLAGS in %%build for noarch package +- don't generate redundant python-abi dependency for FC >= 4 +- don't need to edit out "env python2"... stuff + +* Tue May 24 2005 Paul Howarth 4.0.2-1 +- update to 4.0.2 -* Mon May 23 2005 Paul Howarth 4.0.1-2%{?dist} +* Mon May 23 2005 Paul Howarth 4.0.1-2 - use macros consistently throughout - add initscripts so users can easily set up trackers and seeders on their own (#158273) - add user torrent for tracker/seeder - add logrotate script for tracker -* Wed May 18 2005 Paul Howarth 4.0.1-1%{?dist} +* Wed May 18 2005 Paul Howarth 4.0.1-1 - new upstream release 4.0.1 (#157632) - add dist tag - source now found on sourceforge.net Index: bttrack.init =================================================================== RCS file: /cvs/extras/rpms/bittorrent/FC-4/bttrack.init,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- bttrack.init 22 May 2005 22:55:32 -0000 1.1 +++ bttrack.init 22 Sep 2005 10:00:39 -0000 1.2 @@ -13,13 +13,13 @@ [ "${NETWORKING}" = "no" ] && exit 0 -#default +# defaults PORT=6969 -STATEFILE=/var/lib/bittorrent/bttrack +STATEFILE=/srv/bittorrent/state/bttrack OPTIONS= LOGFILE=/var/log/bittorrent/bttrack.log -# directly of torrents that the tracker is allowed to serve -DIR="/var/spool/bittorrent" +# directory of torrents that the tracker is allowed to serve +DIR="/srv/bittorrent/data" # source the config . /etc/sysconfig/bttrack @@ -32,10 +32,13 @@ case "$1" in start) echo -n $"Starting BitTorrent tracker: " - daemon --user $btuser $prog --port $PORT --dfile $STATEFILE \ - --logfile $LOGFILE $OPTIONS --allowed_dir $DIR & + runuser -s /bin/sh -c "$prog --port $PORT --dfile $STATEFILE --logfile $LOGFILE \ + $OPTIONS --allowed_dir $DIR" $btuser &> /dev/null & + disown -ar + usleep 500000 + status bttrack.py &> /dev/null && echo_success || echo_failure RETVAL=$? - [ $RETVAL -eq 0 ] && touch /var/lock/subsys/bttrack + [ $RETVAL -eq 0 ] && touch /var/lock/subsys/bttrack.py echo ;; stop) @@ -43,7 +46,7 @@ killproc $prog #killproc "/usr/bin/python $prog" RETVAL=$? - [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/bttrack + [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/bttrack.py echo ;; restart|reload) @@ -52,14 +55,14 @@ RETVAL=$? ;; condrestart) - if [ -f /var/lock/subsys/bttrack ]; then + if [ -f /var/lock/subsys/bttrack.py ]; then $0 stop $0 start fi RETVAL=$? ;; status) - status bttrack + status bttrack.py RETVAL=$? ;; *) Index: btseed.init =================================================================== RCS file: /cvs/extras/rpms/bittorrent/FC-4/btseed.init,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- btseed.init 22 May 2005 22:55:32 -0000 1.1 +++ btseed.init 22 Sep 2005 10:00:39 -0000 1.2 @@ -16,7 +16,10 @@ [ "${NETWORKING}" = "no" ] && exit 0 # default directory for torrents to seed -DIR=/var/spool/bittorrent +DIR=/srv/bittorrent/data + +# default log file +SEEDLOG=/var/log/btseed.log # source the config . /etc/sysconfig/btseed @@ -28,9 +31,12 @@ case "$1" in start) echo -n $"Starting BitTorrent seed client: " - daemon --user $btuser $prog $OPTIONS $DIR & + runuser -s /bin/sh -c "$prog $OPTIONS $DIR" $btuser &> $SEEDLOG & + disown -ar + usleep 500000 + status btlaunchmany.py &> /dev/null && echo_success || echo_failure RETVAL=$? - [ $RETVAL -eq 0 ] && touch /var/lock/subsys/btseed + [ $RETVAL -eq 0 ] && touch /var/lock/subsys/btlaunchmany.py echo ;; stop) @@ -38,7 +44,7 @@ killproc $prog #killproc "/usr/bin/python $prog" RETVAL=$? - [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/btseed + [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/btlaunchmany.py echo ;; restart|reload) @@ -47,14 +53,14 @@ RETVAL=$? ;; condrestart) - if [ -f /var/lock/subsys/btseed ]; then + if [ -f /var/lock/subsys/btlaunchmany.py ]; then $0 stop $0 start fi RETVAL=$? ;; status) - status btseed + status btlaunchmany.py RETVAL=$? ;; *) Index: sources =================================================================== RCS file: /cvs/extras/rpms/bittorrent/FC-4/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 24 May 2005 11:18:05 -0000 1.6 +++ sources 22 Sep 2005 10:00:39 -0000 1.7 @@ -1 +1 @@ -4640b7c1bac3146d628f54b20afb87b7 BitTorrent-4.0.2.tar.gz +7f03514dd4d684728a4e54c6ffce7d1f BitTorrent-4.0.4.tar.gz Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/bittorrent/FC-4/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 24 May 2005 11:18:05 -0000 1.6 +++ .cvsignore 22 Sep 2005 10:00:39 -0000 1.7 @@ -1 +1 @@ -BitTorrent-4.0.2.tar.gz +BitTorrent-4.0.4.tar.gz From fedora-extras-commits at redhat.com Thu Sep 22 10:04:25 2005 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Thu, 22 Sep 2005 06:04:25 -0400 Subject: rpms/bittorrent/FC-3 bittorrent.spec, 1.9, 1.10 bttrack.init, 1.1, 1.2 btseed.init, 1.1, 1.2 sources, 1.6, 1.7 .cvsignore, 1.6, 1.7 Message-ID: <200509221005.j8MA5CAI005153@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/rpms/bittorrent/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5133 Modified Files: bittorrent.spec bttrack.init btseed.init sources .cvsignore Log Message: resync with FC-4 Index: bittorrent.spec =================================================================== RCS file: /cvs/extras/rpms/bittorrent/FC-3/bittorrent.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- bittorrent.spec 26 May 2005 06:12:56 -0000 1.9 +++ bittorrent.spec 22 Sep 2005 10:04:22 -0000 1.10 @@ -3,7 +3,7 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: bittorrent -Version: 4.0.2 +Version: 4.0.4 Release: 1%{?dist} Summary: BitTorrent swarming network file transfer tool @@ -19,24 +19,24 @@ BuildArch: noarch BuildRequires: python-devel desktop-file-utils -Requires: python +# FC4 and later auto-generate python version dependency +%if %{!?fedora:0}%{?fedora} < 4 || %{!?rhel:0}%{?rhel} Requires: python-abi = %(%{__python} -c "import sys ; print sys.version[:3]") +%endif Requires(pre): %{_sbindir}/useradd Requires(post): /sbin/chkconfig Requires(post): /sbin/service Requires(preun): /sbin/chkconfig Requires(preun): /sbin/service -Requires(postun): %{_sbindir}/userdel -Requires(postun): %{_sbindir}/groupdel Requires(postun): /sbin/service %description -BitTorrent is a tool for copying files from one machine to -another. FTP punishes sites for being popular: Since all uploading is -done from one place, a popular site needs big iron and big -bandwidth. With BitTorrent, clients automatically mirror files they -download, making the publisher's burden almost nothing. +BitTorrent is a tool for copying files from one machine to another. FTP +punishes sites for being popular: Since all uploading is done from one place, +a popular site needs big iron and big bandwidth. With BitTorrent, clients +automatically mirror files they download, making the publisher's burden almost +nothing. %package gui Summary: GUI versions of the BitTorrent file transfer tool @@ -45,29 +45,51 @@ Requires: %{name} = %{version}-%{release} Requires(post): desktop-file-utils Requires(postun): desktop-file-utils +Obsoletes: BitTorrent <= %{version} +Provides: BitTorrent = %{version}-%{release} %description gui This package contains the GUI versions of the BitTorrent file transfer tool. +# Fedora >= 4 has /srv, as does RHEL >= 4 +%if %{!?fedora:0}%{?fedora} >= 4 || %{!?rhel:0}%{?rhel} >= 4 +%define bt_dir /srv/bittorrent/data +%define bt_statedir /srv/bittorrent/state +%else +%define bt_dir %{_localstatedir}/spool/bittorrent +%define bt_statedir %{_localstatedir}/lib/bittorrent +%endif + %prep %setup -q -n BitTorrent-%{version} %{__sed} -i "s/appdir = .*/appdir = '%{name}-%{version}'/" BitTorrent/__init__.py %{__cat} <btseed.sysconfig -#DIR=%{_localstatedir}/spool/bittorrent -OPTIONS="--max_upload_rate 350" +DIR=%{bt_dir} +OPTIONS="--max_upload_rate 350 --display_interval 300" +SEEDLOG=%{_localstatedir}/log/bittorrent/btseed.log EOF %{__cat} <bttrack.sysconfig -#PORT=6969 -#DIR=%{_localstatedir}/spool/bittorrent -#STATEFILE=%{_localstatedir}/lib/bittorrent/bttrack -#LOGFILE=%{_localstatedir}/log/bittorrent/bttrack.log -OPTIONS="--show_names 1 --hupmonitor 1" +PORT=6969 +DIR=%{bt_dir} +STATEFILE=%{bt_statedir}/bttrack +LOGFILE=%{_localstatedir}/log/bittorrent/bttrack.log +OPTIONS="--min_time_between_log_flushes 4.0 --show_names 1 --hupmonitor 1" +EOF + +%{__cat} <btseed.logrotate +%{_localstatedir}/log/bittorrent/btseed.log { + notifempty + missingok + postrotate + /sbin/service btseed condrestart 2>/dev/null >/dev/null || true + endscript +} EOF -%{__cat} <torrent.logrotate +%{__cat} <bttrack.logrotate %{_localstatedir}/log/bittorrent/bttrack.log { notifempty missingok @@ -78,24 +100,26 @@ EOF %build -CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build +%{__python} setup.py build %install %{__rm} -rf $RPM_BUILD_ROOT %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT -%{__sed} -i -e 's/env python2/env python/' $RPM_BUILD_ROOT%{_bindir}/* %{_bindir}/desktop-file-install --vendor %{desktopvendor} \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ --add-category X-Fedora \ %{SOURCE1} -%{__install} -d $RPM_BUILD_ROOT%{_localstatedir}/{spool,lib,log}/bittorrent -%{__install} -m 0644 -D %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/pixmaps/bittorrent.png +%{__install} -d $RPM_BUILD_ROOT%{bt_dir} +%{__install} -d $RPM_BUILD_ROOT%{bt_statedir} +%{__install} -d $RPM_BUILD_ROOT%{_localstatedir}/log/bittorrent +%{__install} -m 0644 -D %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/bittorrent.png %{__install} -m 0755 -D %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/btseed %{__install} -m 0755 -D %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/bttrack %{__install} -m 0644 -D btseed.sysconfig $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/btseed %{__install} -m 0644 -D bttrack.sysconfig $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/bttrack -%{__install} -m 0644 -D torrent.logrotate $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/bittorrent +%{__install} -m 0644 -D btseed.logrotate $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/btseed +%{__install} -m 0644 -D bttrack.logrotate $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/bttrack %clean %{__rm} -rf $RPM_BUILD_ROOT @@ -117,19 +141,20 @@ fi %postun -if [ $1 -eq 0 ]; then - %{_sbindir}/userdel torrent &>/dev/null || : - %{_sbindir}/groupdel torrent &>/dev/null || : -else +if [ $1 -gt 0 ]; then /sbin/service btseed condrestart &>/dev/null || : /sbin/service bttrack condrestart &>/dev/null || : fi %post gui %{_bindir}/update-desktop-database %{_datadir}/applications &>/dev/null || : +/bin/touch --no-create %{_datadir}/icons/hicolor || : +[ -x %{_bindir}/gtk-update-icon-cache ] && %{_bindir}/gtk-update-icon-cache -q %{_datadir}/icons/hicolor || : %postun gui %{_bindir}/update-desktop-database %{_datadir}/applications &>/dev/null || : +/bin/touch --no-create %{_datadir}/icons/hicolor || : +[ -x %{_bindir}/gtk-update-icon-cache ] && %{_bindir}/gtk-update-icon-cache -q %{_datadir}/icons/hicolor || : %files %defattr(-,root,root,-) @@ -147,12 +172,13 @@ %{python_sitelib}/BitTorrent/*.py %{python_sitelib}/BitTorrent/*.pyc %ghost %{python_sitelib}/BitTorrent/*.pyo -%attr(-,torrent,torrent) %dir %{_localstatedir}/spool/bittorrent -%attr(-,torrent,torrent) %dir %{_localstatedir}/lib/bittorrent +%attr(-,torrent,torrent) %dir %{bt_dir} +%attr(-,torrent,torrent) %dir %{bt_statedir} %attr(-,torrent,torrent) %dir %{_localstatedir}/log/bittorrent %{_sysconfdir}/rc.d/init.d/btseed %{_sysconfdir}/rc.d/init.d/bttrack -%config(noreplace) %{_sysconfdir}/logrotate.d/bittorrent +%config(noreplace) %{_sysconfdir}/logrotate.d/btseed +%config(noreplace) %{_sysconfdir}/logrotate.d/bttrack %config(noreplace) %{_sysconfdir}/sysconfig/btseed %config(noreplace) %{_sysconfdir}/sysconfig/bttrack @@ -162,20 +188,40 @@ %{_bindir}/btmaketorrentgui.py %{_datadir}/applications/%{desktopvendor}-bittorrent.desktop %{_datadir}/pixmaps/%{name}-%{version} -%{_datadir}/pixmaps/bittorrent.png +%{_datadir}/icons/hicolor/48x48/apps/bittorrent.png %changelog -* Tue May 24 2005 Paul Howarth 4.0.2-1%{?dist} -- Update to 4.0.2 +* Thu Sep 15 2005 Paul Howarth 4.0.4-1 +- new upstream release 4.0.4 (#168323) +- tidy up description text +- improved initscripts (#158273) +- for versions on Fedora Core >= 4 or RHEL, put server data under /srv rather + than %{_localstatedir} +- separate logs/logrotate scripts for tracker and seeder +- have the gui subpackage obsolete the official BitTorrent RPM package, which + is called BitTorrent, includes the GUI in the same package and is built + using python's dist tools and hence doesn't include all dependencies, + provide initscripts etc.; this provides a clean upgrade path to Extras +- don't delete user/group torrent on uninstall + (see https://www.redhat.com/archives/fedora-extras-commits/2005-June/msg00271.html) +- move icon to %{_datadir}/icons/hicolor/48x48/apps instead of + %{_datadir}/pixmaps and update icon cache on installation if + necessary (#162465) +- no need to set CFLAGS in %%build for noarch package +- don't generate redundant python-abi dependency for FC >= 4 +- don't need to edit out "env python2"... stuff + +* Tue May 24 2005 Paul Howarth 4.0.2-1 +- update to 4.0.2 -* Mon May 23 2005 Paul Howarth 4.0.1-2%{?dist} +* Mon May 23 2005 Paul Howarth 4.0.1-2 - use macros consistently throughout - add initscripts so users can easily set up trackers and seeders on their own (#158273) - add user torrent for tracker/seeder - add logrotate script for tracker -* Wed May 18 2005 Paul Howarth 4.0.1-1%{?dist} +* Wed May 18 2005 Paul Howarth 4.0.1-1 - new upstream release 4.0.1 (#157632) - add dist tag - source now found on sourceforge.net Index: bttrack.init =================================================================== RCS file: /cvs/extras/rpms/bittorrent/FC-3/bttrack.init,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- bttrack.init 26 May 2005 06:12:56 -0000 1.1 +++ bttrack.init 22 Sep 2005 10:04:22 -0000 1.2 @@ -13,13 +13,13 @@ [ "${NETWORKING}" = "no" ] && exit 0 -#default +# defaults PORT=6969 -STATEFILE=/var/lib/bittorrent/bttrack +STATEFILE=/srv/bittorrent/state/bttrack OPTIONS= LOGFILE=/var/log/bittorrent/bttrack.log -# directly of torrents that the tracker is allowed to serve -DIR="/var/spool/bittorrent" +# directory of torrents that the tracker is allowed to serve +DIR="/srv/bittorrent/data" # source the config . /etc/sysconfig/bttrack @@ -32,10 +32,13 @@ case "$1" in start) echo -n $"Starting BitTorrent tracker: " - daemon --user $btuser $prog --port $PORT --dfile $STATEFILE \ - --logfile $LOGFILE $OPTIONS --allowed_dir $DIR & + runuser -s /bin/sh -c "$prog --port $PORT --dfile $STATEFILE --logfile $LOGFILE \ + $OPTIONS --allowed_dir $DIR" $btuser &> /dev/null & + disown -ar + usleep 500000 + status bttrack.py &> /dev/null && echo_success || echo_failure RETVAL=$? - [ $RETVAL -eq 0 ] && touch /var/lock/subsys/bttrack + [ $RETVAL -eq 0 ] && touch /var/lock/subsys/bttrack.py echo ;; stop) @@ -43,7 +46,7 @@ killproc $prog #killproc "/usr/bin/python $prog" RETVAL=$? - [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/bttrack + [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/bttrack.py echo ;; restart|reload) @@ -52,14 +55,14 @@ RETVAL=$? ;; condrestart) - if [ -f /var/lock/subsys/bttrack ]; then + if [ -f /var/lock/subsys/bttrack.py ]; then $0 stop $0 start fi RETVAL=$? ;; status) - status bttrack + status bttrack.py RETVAL=$? ;; *) Index: btseed.init =================================================================== RCS file: /cvs/extras/rpms/bittorrent/FC-3/btseed.init,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- btseed.init 26 May 2005 06:12:56 -0000 1.1 +++ btseed.init 22 Sep 2005 10:04:22 -0000 1.2 @@ -16,7 +16,10 @@ [ "${NETWORKING}" = "no" ] && exit 0 # default directory for torrents to seed -DIR=/var/spool/bittorrent +DIR=/srv/bittorrent/data + +# default log file +SEEDLOG=/var/log/btseed.log # source the config . /etc/sysconfig/btseed @@ -28,9 +31,12 @@ case "$1" in start) echo -n $"Starting BitTorrent seed client: " - daemon --user $btuser $prog $OPTIONS $DIR & + runuser -s /bin/sh -c "$prog $OPTIONS $DIR" $btuser &> $SEEDLOG & + disown -ar + usleep 500000 + status btlaunchmany.py &> /dev/null && echo_success || echo_failure RETVAL=$? - [ $RETVAL -eq 0 ] && touch /var/lock/subsys/btseed + [ $RETVAL -eq 0 ] && touch /var/lock/subsys/btlaunchmany.py echo ;; stop) @@ -38,7 +44,7 @@ killproc $prog #killproc "/usr/bin/python $prog" RETVAL=$? - [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/btseed + [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/btlaunchmany.py echo ;; restart|reload) @@ -47,14 +53,14 @@ RETVAL=$? ;; condrestart) - if [ -f /var/lock/subsys/btseed ]; then + if [ -f /var/lock/subsys/btlaunchmany.py ]; then $0 stop $0 start fi RETVAL=$? ;; status) - status btseed + status btlaunchmany.py RETVAL=$? ;; *) Index: sources =================================================================== RCS file: /cvs/extras/rpms/bittorrent/FC-3/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 26 May 2005 06:12:56 -0000 1.6 +++ sources 22 Sep 2005 10:04:22 -0000 1.7 @@ -1 +1 @@ -4640b7c1bac3146d628f54b20afb87b7 BitTorrent-4.0.2.tar.gz +7f03514dd4d684728a4e54c6ffce7d1f BitTorrent-4.0.4.tar.gz Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/bittorrent/FC-3/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 26 May 2005 06:12:56 -0000 1.6 +++ .cvsignore 22 Sep 2005 10:04:22 -0000 1.7 @@ -1 +1 @@ -BitTorrent-4.0.2.tar.gz +BitTorrent-4.0.4.tar.gz From fedora-extras-commits at redhat.com Thu Sep 22 11:04:27 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Thu, 22 Sep 2005 07:04:27 -0400 Subject: rpms/tetex-font-tipa/FC-4 tetex-font-tipa.spec,1.4,1.5 Message-ID: <200509221104.j8MB4SSh006835@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/tetex-font-tipa/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6821 Modified Files: tetex-font-tipa.spec Log Message: * Thu Sep 22 2005 Michael Schwendt - 1.3-3 - Run udpmap-sys in scriptlets, not udpmap. - Update location of map files. - Own all relevant directories. Index: tetex-font-tipa.spec =================================================================== RCS file: /cvs/extras/rpms/tetex-font-tipa/FC-4/tetex-font-tipa.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- tetex-font-tipa.spec 6 Apr 2005 22:13:33 -0000 1.4 +++ tetex-font-tipa.spec 22 Sep 2005 11:04:25 -0000 1.5 @@ -1,11 +1,15 @@ +# This package is for Fedora Core >= 4. + %define texmf %{_datadir}/texmf %define tdsname tipa + %define fontpath fkr/tipa +# The directory prefix of fontpath we want to own. +%define fontpathtop fkr Name: tetex-font-tipa Version: 1.3 -Release: 2 - +Release: 3 Summary: TIPA fonts for LaTeX Group: Applications/Publishing @@ -14,13 +18,12 @@ # NOTE: This tarball cannot be verified directly as it is # automatically generated by the FTP site. Instead, the # files contained in the tarball have to be verified one by one ;( -Source0: ftp://ftp.dante.de/tex-archive/fonts/tipa/tipa-1.3.tar.gz +Source0: ftp://ftp.dante.de/tex-archive/fonts/tipa/tipa-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: tetex-latex Requires: tetex-latex Requires(post): tetex -Requires(preun): tetex Requires(postun): tetex BuildArch: noarch @@ -51,8 +54,8 @@ install -p -m 644 tfm/*.tfm $RPM_BUILD_ROOT%{texmf}/fonts/tfm/%{fontpath}/ install -p -m 644 mf/*.mf $RPM_BUILD_ROOT%{texmf}/fonts/source/%{fontpath}/ -mkdir -p $RPM_BUILD_ROOT%{texmf}/dvips/config -install -m 644 dvips/*.map $RPM_BUILD_ROOT%{texmf}/dvips/config/ +mkdir -p $RPM_BUILD_ROOT%{texmf}/fonts/map/dvips/%{tdsname} +install -m 644 dvips/*.map $RPM_BUILD_ROOT%{texmf}/fonts/map/dvips/%{tdsname}/ %clean @@ -61,14 +64,17 @@ %post /usr/bin/mktexlsr %{texmf} -/usr/bin/updmap --quiet --nohash --outputdir %{texmf}/dvips/config --enable Map tipa.map - -%preun -if [ "$1" = "0" ]; then - /usr/bin/updmap --quiet --nohash --outputdir %{texmf}/dvips/config --disable tipa.map +if [ "$1" = "2" ]; then + [ -f /usr/share/texmf/dvips/config/tipa.map ] && \ + rm -f /usr/share/texmf/dvips/config/tipa.map fi +/usr/bin/updmap-sys --quiet --nohash --outputdir %{texmf}/dvips/config --enable Map tipa.map + %postun +if [ "$1" = "0" ]; then + /usr/bin/updmap-sys --quiet --nohash --outputdir %{texmf}/dvips/config --disable tipa.map +fi /usr/bin/mktexlsr %{texmf} @@ -76,14 +82,19 @@ %defattr(-,root,root,-) %doc doc/tipaman.dvi %{texmf}/tex/latex/%{tdsname} -%{texmf}/fonts/tfm/%{fontpath} -%{texmf}/fonts/type1/%{fontpath} -%{texmf}/fonts/source/%{fontpath} -%{texmf}/dvips/config/tipa.map +%{texmf}/fonts/tfm/%{fontpathtop} +%{texmf}/fonts/type1/%{fontpathtop} +%{texmf}/fonts/source/%{fontpathtop} +%{texmf}/fonts/map/dvips/%{tdsname}/ %changelog -* Fri Apr 7 2005 Michael Schwendt +* Thu Sep 22 2005 Michael Schwendt - 1.3-3 +- Run udpmap-sys in scriptlets, not udpmap. +- Update location of map files. +- Own all relevant directories. + +* Thu Apr 7 2005 Michael Schwendt - 1.3-2 - rebuilt * Thu Apr 22 2004 Marius L. J??hndal - 0:1.3-0.fdr.1 From fedora-extras-commits at redhat.com Thu Sep 22 11:06:37 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Thu, 22 Sep 2005 07:06:37 -0400 Subject: rpms/tetex-font-tipa/devel tetex-font-tipa.spec,1.4,1.5 Message-ID: <200509221106.j8MB6b2e006907@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/tetex-font-tipa/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6888 Modified Files: tetex-font-tipa.spec Log Message: * Thu Sep 22 2005 Michael Schwendt - 1.3-4 - rebuilt * Thu Sep 22 2005 Michael Schwendt - 1.3-3 - Run udpmap-sys in scriptlets, not udpmap. - Update location of map files. - Own all relevant directories. Index: tetex-font-tipa.spec =================================================================== RCS file: /cvs/extras/rpms/tetex-font-tipa/devel/tetex-font-tipa.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- tetex-font-tipa.spec 6 Apr 2005 22:13:33 -0000 1.4 +++ tetex-font-tipa.spec 22 Sep 2005 11:06:35 -0000 1.5 @@ -1,11 +1,15 @@ +# This package is for Fedora Core >= 4. + %define texmf %{_datadir}/texmf %define tdsname tipa + %define fontpath fkr/tipa +# The directory prefix of fontpath we want to own. +%define fontpathtop fkr Name: tetex-font-tipa Version: 1.3 -Release: 2 - +Release: 4 Summary: TIPA fonts for LaTeX Group: Applications/Publishing @@ -14,13 +18,12 @@ # NOTE: This tarball cannot be verified directly as it is # automatically generated by the FTP site. Instead, the # files contained in the tarball have to be verified one by one ;( -Source0: ftp://ftp.dante.de/tex-archive/fonts/tipa/tipa-1.3.tar.gz +Source0: ftp://ftp.dante.de/tex-archive/fonts/tipa/tipa-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: tetex-latex Requires: tetex-latex Requires(post): tetex -Requires(preun): tetex Requires(postun): tetex BuildArch: noarch @@ -51,8 +54,8 @@ install -p -m 644 tfm/*.tfm $RPM_BUILD_ROOT%{texmf}/fonts/tfm/%{fontpath}/ install -p -m 644 mf/*.mf $RPM_BUILD_ROOT%{texmf}/fonts/source/%{fontpath}/ -mkdir -p $RPM_BUILD_ROOT%{texmf}/dvips/config -install -m 644 dvips/*.map $RPM_BUILD_ROOT%{texmf}/dvips/config/ +mkdir -p $RPM_BUILD_ROOT%{texmf}/fonts/map/dvips/%{tdsname} +install -m 644 dvips/*.map $RPM_BUILD_ROOT%{texmf}/fonts/map/dvips/%{tdsname}/ %clean @@ -61,14 +64,17 @@ %post /usr/bin/mktexlsr %{texmf} -/usr/bin/updmap --quiet --nohash --outputdir %{texmf}/dvips/config --enable Map tipa.map - -%preun -if [ "$1" = "0" ]; then - /usr/bin/updmap --quiet --nohash --outputdir %{texmf}/dvips/config --disable tipa.map +if [ "$1" = "2" ]; then + [ -f /usr/share/texmf/dvips/config/tipa.map ] && \ + rm -f /usr/share/texmf/dvips/config/tipa.map fi +/usr/bin/updmap-sys --quiet --nohash --outputdir %{texmf}/dvips/config --enable Map tipa.map + %postun +if [ "$1" = "0" ]; then + /usr/bin/updmap-sys --quiet --nohash --outputdir %{texmf}/dvips/config --disable tipa.map +fi /usr/bin/mktexlsr %{texmf} @@ -76,14 +82,22 @@ %defattr(-,root,root,-) %doc doc/tipaman.dvi %{texmf}/tex/latex/%{tdsname} -%{texmf}/fonts/tfm/%{fontpath} -%{texmf}/fonts/type1/%{fontpath} -%{texmf}/fonts/source/%{fontpath} -%{texmf}/dvips/config/tipa.map +%{texmf}/fonts/tfm/%{fontpathtop} +%{texmf}/fonts/type1/%{fontpathtop} +%{texmf}/fonts/source/%{fontpathtop} +%{texmf}/fonts/map/dvips/%{tdsname}/ %changelog -* Fri Apr 7 2005 Michael Schwendt +* Thu Sep 22 2005 Michael Schwendt - 1.3-4 +- rebuilt + +* Thu Sep 22 2005 Michael Schwendt - 1.3-3 +- Run udpmap-sys in scriptlets, not udpmap. +- Update location of map files. +- Own all relevant directories. + +* Thu Apr 7 2005 Michael Schwendt - 1.3-2 - rebuilt * Thu Apr 22 2004 Marius L. J??hndal - 0:1.3-0.fdr.1 From fedora-extras-commits at redhat.com Thu Sep 22 11:14:54 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Thu, 22 Sep 2005 07:14:54 -0400 Subject: owners owners.list,1.238,1.239 Message-ID: <200509221114.j8MBEs5C007016@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6997 Modified Files: owners.list Log Message: I believe Seth has taken over over seahorse many weeks ago Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.238 retrieving revision 1.239 diff -u -r1.238 -r1.239 --- owners.list 21 Sep 2005 17:48:21 -0000 1.238 +++ owners.list 22 Sep 2005 11:14:52 -0000 1.239 @@ -920,7 +920,7 @@ Fedora Extras|SDL_mixer|Simple DirectMedia Layer - Sample Mixer Library|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| Fedora Extras|SDL_net|SDL portable network library|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| Fedora Extras|SDL_ttf|Simple DirectMedia Layer - Sample TrueType Font Library|pmatilai at laiskiainen.org|extras-qa at fedoraproject.org| -Fedora Extras|seahorse|GNOME2 interface for gnupg|compton at pcompton.com|extras-qa at fedoraproject.org| +Fedora Extras|seahorse|GNOME2 interface for gnupg|skvidal at phy.duke.edu|extras-qa at fedoraproject.org| Fedora Extras|shapelib|API in "C" for Shapefile handling|mccann0011 at hotmail.com|extras-qa at fedoraproject.org| Fedora Extras|shorewall|Shoreline Firewall is an iptables-based firewall for Linux systems|kuko at maarmas.com|extras-qa at fedoraproject.org| Fedora Extras|showimg|Feature-rich image viewer for KDE|gauret at free.fr|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Thu Sep 22 12:19:08 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 22 Sep 2005 08:19:08 -0400 Subject: rpms/maxima/devel maxima.spec,1.6,1.7 Message-ID: <200509221219.j8MCJ8uI008557@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/maxima/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8538 Modified Files: maxima.spec Log Message: enable sbcl Index: maxima.spec =================================================================== RCS file: /cvs/extras/rpms/maxima/devel/maxima.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- maxima.spec 16 Sep 2005 20:23:00 -0000 1.6 +++ maxima.spec 22 Sep 2005 12:19:05 -0000 1.7 @@ -3,9 +3,8 @@ %define _with_clisp 1 %define _without_cmucl 1 %define _without_gcl 1 -%define _without_sbcl 1 +%define _with_sbcl 1 -#define cvs .20050908 %define beta rc1 Summary: Symbolic Computation Program @@ -16,10 +15,11 @@ License: GPL Group: Applications/Engineering URL: http://maxima.sourceforge.net/ -#Source: http://dl.sourceforge.net/sourceforge/maxima/maxima-%{version}%{?cvs}.tar.gz +#Source: http://dl.sourceforge.net/sourceforge/maxima/maxima-%{version}%{?cvs}.tar.gz Source: http://maxima.sf.net/tmp-release/maxima-5.9.1.9rc1.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -# add ppc (and maybe ppc64) when clisp builds again on ppc (http://bugzilla.redhat.com/bugzilla/166347) +# add ppc (and maybe ppc64) when lisps build again on ppc +# (clisp: http://bugzilla.redhat.com/bugzilla/166347) ExclusiveArch: %{ix86} x86_64 Source1: maxima.png @@ -106,7 +106,7 @@ %package runtime-gcl Summary: Maxima compiled with GCL Group: Applications/Engineering -BuildRequires: gcl-devel +BuildRequires: gcl Requires: %{name} = %{version} Obsoletes: maxima-exec-gcl < %{version}-%{release} Provides: %{name}-runtime = %{version} From fedora-extras-commits at redhat.com Thu Sep 22 12:34:52 2005 From: fedora-extras-commits at redhat.com (Mark Cox (mjc)) Date: Thu, 22 Sep 2005 08:34:52 -0400 Subject: fedora-security/audit fc4,1.60,1.61 Message-ID: <200509221234.j8MCYqJd008675@cvs-int.fedora.redhat.com> Author: mjc Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8656 Modified Files: fc4 Log Message: Last few days updates Index: fc4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc4,v retrieving revision 1.60 retrieving revision 1.61 diff -u -r1.60 -r1.61 --- fc4 20 Sep 2005 22:01:04 -0000 1.60 +++ fc4 22 Sep 2005 12:34:50 -0000 1.61 @@ -1,9 +1,13 @@ -Up to date CVE as of CVE email 20050914 -Up to date FC4 as of 20050914 +Up to date CVE as of CVE email 20050921 +Up to date FC4 as of 20050921 ** are items that need attention +2005-3011 ** texinfo 2005-2991 ignore (ncompress) don't ship zdiff or zcmp scripts +2005-2968 version (mozilla, not 1.7.10) +we include a different mozilla sh +2005-2968 VULNERABLE (firefox) +2005-2946 VULNERABLE (openssl, fixed 0.9.8) (as it uses md5 md) 2005-2876 backport (util-linux) [since FEDORA-2005-887] 2005-2874 version (cups, fixed 1.1.23) 2005-2873 ** kernel @@ -41,6 +45,7 @@ 2005-2499 backport (slocate) [since FEDORA-2005-770] 2005-2498 version (php xml_rpc, fixed 1.4.0) [since FEDORA-2005-810] 2005-2496 backport (ntp, fixed 4.2.0b) ...0a-20040617-ntpd_guid.patch +2005-2495 backport (xorg-x11) [since FEDORA-2005-894] 2005-2494 VULNERABLE (kdebase, fixed after 3.4.2) bz#166997 2005-2491 ignore (python, fc4 python does not contain pcre) 2005-2491 backport (pcre, fixed 6.2) [since FEDORA-2005-803] From fedora-extras-commits at redhat.com Thu Sep 22 12:37:24 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 22 Sep 2005 08:37:24 -0400 Subject: rpms/maxima/FC-4 .cvsignore, 1.2, 1.3 maxima.spec, 1.5, 1.6 sources, 1.2, 1.3 maxima-5.9.0-htmlview.patch, 1.1, NONE Message-ID: <200509221237.j8MCbOtE008720@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/maxima/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8693 Modified Files: .cvsignore maxima.spec sources Removed Files: maxima-5.9.0-htmlview.patch Log Message: 5.9.1.9rc1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/maxima/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 6 Sep 2005 17:56:03 -0000 1.2 +++ .cvsignore 22 Sep 2005 12:37:22 -0000 1.3 @@ -1,3 +1,3 @@ -macref.pdf -maxima-5.9.1.tar.gz +maxima-5.9.1.9rc1.tar.gz maximabook-19-Sept-2004.pdf +macref.pdf Index: maxima.spec =================================================================== RCS file: /cvs/extras/rpms/maxima/FC-4/maxima.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- maxima.spec 12 Sep 2005 12:29:32 -0000 1.5 +++ maxima.spec 22 Sep 2005 12:37:22 -0000 1.6 @@ -3,22 +3,24 @@ %define _with_clisp 1 %define _without_cmucl 1 %define _without_gcl 1 -%define _without_sbcl 1 +%define _with_sbcl 1 -#define cvs .20050908 -#define beta cvs +%define beta rc1 Summary: Symbolic Computation Program Name: maxima -Version: 5.9.1%{?beta} +Version: 5.9.1.9rc1 -Release: 5%{?dist} +Release: 2%{?dist} License: GPL Group: Applications/Engineering URL: http://maxima.sourceforge.net/ -Source: http://dl.sourceforge.net/sourceforge/maxima/maxima-%{version}%{?cvs}.tar.gz +#Source: http://dl.sourceforge.net/sourceforge/maxima/maxima-%{version}%{?cvs}.tar.gz +Source: http://maxima.sf.net/tmp-release/maxima-5.9.1.9rc1.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -ExcludeArch: ppc ppc64 +# add ppc (and maybe ppc64) when lisps build again on ppc +# (clisp: http://bugzilla.redhat.com/bugzilla/166347) +ExclusiveArch: %{ix86} x86_64 Source1: maxima.png Source2: xmaxima.desktop @@ -28,14 +30,14 @@ Source10: http://starship.python.net/crew/mike/TixMaxima/macref.pdf Source11: http://maxima.sourceforge.net/docs/maximabook/maximabook-19-Sept-2004.pdf -Patch1: maxima-5.9.0-htmlview.patch +Patch1: maxima-5.9.2-htmlview.patch # (mysterious?) xemacs patch Patch2: maxima.el-xemacs.patch # Inhibit automatic compressing of info files. Compressed info # files break maxima's internal help. %define __spec_install_post %{nil} -# debuginfo is empty/blank, disable +# debuginfo is empty/blank (when using gcl?), disable %define debug_package %{nil} BuildRequires: texinfo @@ -43,8 +45,7 @@ BuildRequires: desktop-file-utils # /usr/bin/wish BuildRequires: tk -# cvs -%{?cvs:BuildRequires: autoconf automake} +%{?beta:BuildRequires: autoconf automake} Requires: %{name}-runtime = %{version} Requires: gnuplot @@ -79,11 +80,11 @@ %package runtime-clisp Summary: Maxima compiled with clisp Group: Applications/Engineering -BuildRequires: clisp +BuildRequires: clisp-devel %define clisp_ver %{expand:%%(rpm -q --qf '%%{VERSION}' clisp )} Requires: clisp >= %{clisp_ver} Requires: %{name} = %{version} -Obsoletes: maxima-exec-lisp +Obsoletes: maxima-exec-clisp < %{version}-%{release} Provides: %{name}-runtime = %{version} %description runtime-clisp Maxima compiled with Common Lisp (clisp) @@ -94,10 +95,8 @@ Summary: Maxima compiled with CMUCL Group: Applications/Engineering BuildRequires: cmucl -#define cmucl_ver %{expand:%%(rpm -q --qf '%%{VERSION}' cmucl )} -#Requires: cmucl >= %{cmucl_ver} Requires: %{name} = %{version} -Obsoletes: maxima-exec-cmucl +Obsoletes: maxima-exec-cmucl < %{version}-%{release} Provides: %{name}-runtime = %{version} %description runtime-cmucl Maxima compiled with CMU Common Lisp (cmucl) @@ -109,7 +108,7 @@ Group: Applications/Engineering BuildRequires: gcl Requires: %{name} = %{version} -Obsoletes: maxima-exec-gcl +Obsoletes: maxima-exec-gcl < %{version}-%{release} Provides: %{name}-runtime = %{version} %description runtime-gcl Maxima compiled with Gnu Common Lisp (gcl) @@ -120,10 +119,10 @@ Summary: Maxima compiled with SBCL Group: Applications/Engineering BuildRequires: sbcl -%define sbcl_ver %{expand:%%(rpm -q --qf '%%{version}' sbcl )} +%define sbcl_ver %{expand:%%(rpm -q --qf '%%{VERSION}' sbcl )} Requires: sbcl >= %{sbcl_ver} Requires: %{name} = %{version} -#Obsoletes: maxima-exec-sbcl +Obsoletes: maxima-exec-sbcl < %{version}-%{release} Provides: %{name}-runtime = %{version} %description runtime-sbcl Maxima compiled with Steel Bank Common Lisp (sbcl). @@ -145,16 +144,16 @@ 's/(defcustom\s+maxima-info-index-file\s+)(\S+)/$1\"maxima.info-16\"/' \ interfaces/emacs/emaxima/maxima.el -#if "%{?cvs:1}" == "1" -if [ ! -f configure ]; then +# remove CVS crud +find -name CVS -type d | xargs rm -r + +%if "%{?beta:1}" == "1" +#if [ ! -f configure ]; then aclocal automake --add-missing --copy autoconf -fi - -# remove CVS crud -find -name CVS -type d | xargs rm -r -#endif +#fi +%endif %build @@ -167,7 +166,7 @@ # docs pushd doc - install -p -m644 %{SOURCE11} maximabook/maxima.pdf + install -D -p -m644 %{SOURCE11} maximabook/maxima.pdf pushd info texi2dvi -p maxima.texi @@ -310,6 +309,13 @@ %changelog +* Fri Sep 16 2005 Rex Dieter 5.9.1.9rc1-2 +- -runtime-sbcl: with sbcl_ver macro +- use versioned maxima-exec Obsoletes. + +* Mon Sep 12 2005 Rex Dieter 5.9.1.9rc1-1 +- 5.9.1.9rc1 + * Fri Sep 09 2005 Rex Dieter 5.9.1-5 - add more Obsoletes: maxima-exec- for cleaner upgrade from customized, rebuilt upstream rpms. Index: sources =================================================================== RCS file: /cvs/extras/rpms/maxima/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 6 Sep 2005 17:56:03 -0000 1.2 +++ sources 22 Sep 2005 12:37:22 -0000 1.3 @@ -1,3 +1,3 @@ -c101a1ce604d31b02bbc2f37cced280d macref.pdf -659acfad1f61444cf5b38f6c28279d40 maxima-5.9.1.tar.gz +60e188d2c10515e7dadbc176bd138694 maxima-5.9.1.9rc1.tar.gz 9faa5a513de43b5e7384216a8783f620 maximabook-19-Sept-2004.pdf +c101a1ce604d31b02bbc2f37cced280d macref.pdf --- maxima-5.9.0-htmlview.patch DELETED --- From fedora-extras-commits at redhat.com Thu Sep 22 12:39:07 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 22 Sep 2005 08:39:07 -0400 Subject: rpms/maxima/FC-4 maxima-5.9.2-htmlview.patch,NONE,1.1 Message-ID: <200509221239.j8MCd7lQ008759@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/maxima/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8739 Added Files: maxima-5.9.2-htmlview.patch Log Message: updated htmlview patch maxima-5.9.2-htmlview.patch: --- NEW FILE maxima-5.9.2-htmlview.patch --- --- maxima/interfaces/xmaxima/Tkmaxima/Menu.tcl.htmlview 2004-10-16 10:37:53.000000000 -0500 +++ maxima/interfaces/xmaxima/Tkmaxima/Menu.tcl 2005-08-22 07:27:23.000000000 -0500 @@ -215,9 +215,9 @@ } } else { - set selectedbrowser mozilla + set selectedbrowser htmlview - foreach b { mozilla konqueror epiphany firefox netscape } { + foreach b { htmlview firefox konqueror mozilla epiphany netscape } { if { ! [catch {exec which $b} ] } { set selectedbrowser $b break } } From fedora-extras-commits at redhat.com Thu Sep 22 13:21:45 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 22 Sep 2005 09:21:45 -0400 Subject: rpms/sbcl/FC-3 my_setarch.c, NONE, 1.1 sbcl.spec, 1.11, 1.12 sbcl-0.9.4-ADDR_NO_RANDOMIZE-argv0.patch, 1.1, NONE sbcl-0.9.4-ADDR_NO_RANDOMIZE-proc.patch, 1.1, NONE Message-ID: <200509221321.j8MDLj7n010411@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/sbcl/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10387 Modified Files: sbcl.spec Added Files: my_setarch.c Removed Files: sbcl-0.9.4-ADDR_NO_RANDOMIZE-argv0.patch sbcl-0.9.4-ADDR_NO_RANDOMIZE-proc.patch Log Message: * Thu Sep 22 2005 Rex Dieter 0.9.4-18 - drop use of setarch, use my_setarch.c * Mon Sep 19 2005 Rex Dieter 0.9.4-17 - rework personality/reexec patch (execve -> execvp) --- NEW FILE my_setarch.c --- #include #include #include #include int main(int argc, char **argv) { if ( argc >= 2 ) { long pers = personality(-1); /* 0x40000 aka. ADDR_NO_RANDOMIZE */ if (!(pers & 0x40000)) { if (personality(pers | 0x40000) == -1) { fprintf(stderr, "WARNING: Couldn't set the proper personality flags. Trying to continue anyway.\n"); } } /* fprintf (stdout, "DEBUG: execing %s with arg %s",argv[1],&argv[1]); */ execvp(argv[1], &argv[1]); } exit(0); } Index: sbcl.spec =================================================================== RCS file: /cvs/extras/rpms/sbcl/FC-3/sbcl.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- sbcl.spec 16 Sep 2005 19:54:35 -0000 1.11 +++ sbcl.spec 22 Sep 2005 13:21:42 -0000 1.12 @@ -7,29 +7,15 @@ #define sbcl_bootstrap cmucl #define sbcl_bootstrap clisp -%if "%{?fedora}" >= "3" -BuildRequires:setarch -%define setarch setarch %{_target_cpu} -%endif - -%if "%{?fedora}" >= "4" -%define setarch setarch %{_target_cpu} -R -%endif - -%if "%{?rhel}" >= "3" -BuildRequires:setarch -%define setarch setarch %{_target_cpu} -%endif - Name: sbcl Summary: Steel Bank Common Lisp Version: 0.9.4 -Release: 15%{?dist} +Release: 18%{?dist} License: BSD/MIT Group: Development/Languages URL: http://sbcl.sourceforge.net/ -Source0: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-%{version}-source.tar.bz2 +Source0: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-%{version}-source.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) ExclusiveArch: %{ix86} x86_64 @@ -50,12 +36,10 @@ %endif %endif +Source100: my_setarch.c + Patch1: sbcl-0.8.18-default-sbcl-home.patch -# See http://sourceforge.net/mailarchive/message.php?msg_id=12787069 -# use /proc/self/exe -#Patch2: sbcl-0.9.4-ADDR_NO_RANDOMIZE-proc.patch -# use argv[0] -Patch2: sbcl-0.9.4-ADDR_NO_RANDOMIZE-argv0.patch +Patch2: sbcl-0.9.4-personality.patch Patch3: sbcl-0.9.4-optflags.patch Patch4: sbcl-0.9.4-LIB_DIR.patch @@ -79,7 +63,7 @@ #sed -i -e "s|/usr/local/lib/sbcl/|%{_libdir}/sbcl/|" src/runtime/runtime.c #or patch to use SBCL_HOME env var %patch1 -p0 -b .default-sbcl-home -%{?setarch:%patch2 -p1 -b .ADDR_NO_RANDOMIZE} +%patch2 -p1 -b .personality %patch3 -p1 -b .optflags %patch4 -p1 -b .LIB_DIR @@ -115,6 +99,9 @@ %if "%{?sbcl_bootstrap}" == "%{nil}" export SBCL_HOME=`pwd`/sbcl-bootstrap/lib/sbcl export PATH=`pwd`/sbcl-bootstrap/bin:${PATH} + +%{__cc} %{SOURCE100} -o my_setarch +%define setarch ./my_setarch %endif %{?setarch} ./make.sh %{?bootstrap} @@ -125,8 +112,6 @@ %check || : pushd tests -# still need setarch if using ADDR_NO_RANDOMIZE-proc patch, since /proc isn't available on buildsystem/mock. -#{?setarch} sh ./run-tests.sh sh ./run-tests.sh popd @@ -138,7 +123,6 @@ unset SBCL_HOME ||: export INSTALL_ROOT=$RPM_BUILD_ROOT%{_prefix} export LIB_DIR=$RPM_BUILD_ROOT%{_libdir} -# (may) still need setarch if using ADDR_NO_RANDOMIZE-proc patch sh ./install.sh ## Unpackaged files @@ -177,6 +161,12 @@ %changelog +* Thu Sep 22 2005 Rex Dieter 0.9.4-18 +- drop use of setarch, use my_setarch.c + +* Mon Sep 19 2005 Rex Dieter 0.9.4-17 +- rework personality/reexec patch (execve -> execvp) + * Sat Sep 16 2005 Rex Dieter 0.9.4-15 - disable ppc (probably related to #166347) --- sbcl-0.9.4-ADDR_NO_RANDOMIZE-argv0.patch DELETED --- --- sbcl-0.9.4-ADDR_NO_RANDOMIZE-proc.patch DELETED --- From fedora-extras-commits at redhat.com Thu Sep 22 13:24:15 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 22 Sep 2005 09:24:15 -0400 Subject: rpms/sbcl/FC-3 sbcl-0.9.4-personality.patch, NONE, 1.1 sbcl.spec, 1.12, 1.13 Message-ID: <200509221324.j8MDOFUv010539@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/sbcl/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10516 Modified Files: sbcl.spec Added Files: sbcl-0.9.4-personality.patch Log Message: respin for missing patch sbcl-0.9.4-personality.patch: --- NEW FILE sbcl-0.9.4-personality.patch --- --- sbcl-0.9.4/src/runtime/os.h.ADDR_NO_RANDOMIZE 2005-07-14 10:41:20.000000000 -0500 +++ sbcl-0.9.4/src/runtime/os.h 2005-09-13 11:23:31.319884384 -0500 @@ -50,7 +50,7 @@ /* Do anything we need to do when starting up the runtime environment * in this OS. */ -extern void os_init(void); +extern void os_init(char *argv[]); /* Install any OS-dependent low-level signal handlers which are needed * by the runtime environment. E.g. the signals raised by a violation --- sbcl-0.9.4/src/runtime/linux-os.c.ADDR_NO_RANDOMIZE 2005-08-12 14:08:19.000000000 -0500 +++ sbcl-0.9.4/src/runtime/linux-os.c 2005-09-13 11:26:47.110833967 -0500 @@ -44,6 +44,7 @@ #include #include #include +#include #include "validate.h" #include "thread.h" @@ -92,7 +93,7 @@ int linux_no_threads_p = 0; void -os_init(void) +os_init(char *argv[]) { /* Conduct various version checks: do we have enough mmap(), is * this a sparc running 2.2, can we do threads? */ @@ -117,7 +118,7 @@ FSHOW((stderr,"linux kernel %d.%d predates 2.4;\n enabling workarounds for SPARC kernel bugs in signal handling.\n", major_version,minor_version)); linux_sparc_siginfo_bug = 1; #endif - } + } #ifdef LISP_FEATURE_SB_THREAD futex_wait(futex,-1); if(errno==ENOSYS) linux_no_threads_p = 1; @@ -125,6 +126,28 @@ fprintf(stderr,"Linux with NPTL support (e.g. kernel 2.6 or newer) required for \nthread-enabled SBCL. Disabling thread support.\n\n"); #endif os_vm_page_size = getpagesize(); + + /* KLUDGE: Disable memory randomization on new Linux kernels + * by setting a personality flag and re-executing. (We need + * to re-execute, since the memory maps that can conflict with + * the SBCL spaces have already been done at this point). + */ +#if defined(LISP_FEATURE_X86) + if ((major_version == 2) && (minor_version >= 6) || (major_version >= 3)) { + long pers = personality(-1); + /* 0x40000 aka. ADDR_NO_RANDOMIZE */ + if (!(pers & 0x40000)) { + if (personality(pers | 0x40000) != -1) { + execvp(argv[0], argv); + } + /* Either changing the personality or (re)exec failed. Either + * way we might as well continue, and hope that the random + * memory maps are ok this time around. + */ + fprintf(stderr, "WARNING: Couldn't re-execute SBCL with the proper personality flags. Trying to continue anyway.\n"); + } + } +#endif } --- sbcl-0.9.4/src/runtime/runtime.c.ADDR_NO_RANDOMIZE 2005-09-13 11:23:31.315884548 -0500 +++ sbcl-0.9.4/src/runtime/runtime.c 2005-09-13 11:23:31.323884220 -0500 @@ -194,7 +194,7 @@ /* KLUDGE: os_vm_page_size is set by os_init(), and on some * systems (e.g. Alpha) arch_init() needs need os_vm_page_size, so * it must follow os_init(). -- WHN 2000-01-26 */ - os_init(); + os_init(argv); arch_init(); gc_init(); validate(); Index: sbcl.spec =================================================================== RCS file: /cvs/extras/rpms/sbcl/FC-3/sbcl.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- sbcl.spec 22 Sep 2005 13:21:42 -0000 1.12 +++ sbcl.spec 22 Sep 2005 13:24:13 -0000 1.13 @@ -10,7 +10,7 @@ Name: sbcl Summary: Steel Bank Common Lisp Version: 0.9.4 -Release: 18%{?dist} +Release: 19%{?dist} License: BSD/MIT Group: Development/Languages @@ -161,7 +161,7 @@ %changelog -* Thu Sep 22 2005 Rex Dieter 0.9.4-18 +* Thu Sep 22 2005 Rex Dieter 0.9.4-19 - drop use of setarch, use my_setarch.c * Mon Sep 19 2005 Rex Dieter 0.9.4-17 From fedora-extras-commits at redhat.com Thu Sep 22 14:10:13 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 22 Sep 2005 10:10:13 -0400 Subject: rpms/sbcl/FC-4 my_setarch.c,NONE,1.1 sbcl.spec,1.13,1.14 Message-ID: <200509221410.j8MEADfm012153@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/sbcl/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12133 Modified Files: sbcl.spec Added Files: my_setarch.c Log Message: * Thu Sep 22 2005 Rex Dieter 0.9.4-19 - drop use of setarch, use my_setarch.c --- NEW FILE my_setarch.c --- #include #include #include #include int main(int argc, char **argv) { if ( argc >= 2 ) { long pers = personality(-1); /* 0x40000 aka. ADDR_NO_RANDOMIZE */ if (!(pers & 0x40000)) { if (personality(pers | 0x40000) == -1) { fprintf(stderr, "WARNING: Couldn't set the proper personality flags. Trying to continue anyway.\n"); } } /* fprintf (stdout, "DEBUG: execing %s with arg %s",argv[1],&argv[1]); */ execvp(argv[1], &argv[1]); } exit(0); } Index: sbcl.spec =================================================================== RCS file: /cvs/extras/rpms/sbcl/FC-4/sbcl.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- sbcl.spec 19 Sep 2005 20:47:49 -0000 1.13 +++ sbcl.spec 22 Sep 2005 14:10:11 -0000 1.14 @@ -7,24 +7,10 @@ #define sbcl_bootstrap cmucl #define sbcl_bootstrap clisp -%if "%{?fedora}" >= "3" -BuildRequires:setarch -%define setarch setarch %{_target_cpu} -%endif - -%if "%{?fedora}" >= "4" -%define setarch setarch %{_target_cpu} -R -%endif - -%if "%{?rhel}" >= "3" -BuildRequires:setarch -%define setarch setarch %{_target_cpu} -%endif - Name: sbcl Summary: Steel Bank Common Lisp Version: 0.9.4 -Release: 17%{?dist} +Release: 19%{?dist} License: BSD/MIT Group: Development/Languages @@ -50,6 +36,8 @@ %endif %endif +Source100: my_setarch.c + Patch1: sbcl-0.8.18-default-sbcl-home.patch Patch2: sbcl-0.9.4-personality.patch Patch3: sbcl-0.9.4-optflags.patch @@ -111,6 +99,9 @@ %if "%{?sbcl_bootstrap}" == "%{nil}" export SBCL_HOME=`pwd`/sbcl-bootstrap/lib/sbcl export PATH=`pwd`/sbcl-bootstrap/bin:${PATH} + +%{__cc} -o my_setarch %{optflags} %{SOURCE100} +%define setarch ./my_setarch %endif %{?setarch} ./make.sh %{?bootstrap} @@ -170,6 +161,9 @@ %changelog +* Thu Sep 22 2005 Rex Dieter 0.9.4-19 +- drop use of setarch, use my_setarch.c + * Mon Sep 19 2005 Rex Dieter 0.9.4-17 - rework personality/reexec patch (execve -> execvp) From fedora-extras-commits at redhat.com Thu Sep 22 14:10:31 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 22 Sep 2005 10:10:31 -0400 Subject: rpms/sbcl/devel my_setarch.c,NONE,1.1 sbcl.spec,1.13,1.14 Message-ID: <200509221410.j8MEAV0q012179@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/sbcl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12159 Modified Files: sbcl.spec Added Files: my_setarch.c Log Message: * Thu Sep 22 2005 Rex Dieter 0.9.4-19 - drop use of setarch, use my_setarch.c --- NEW FILE my_setarch.c --- #include #include #include #include int main(int argc, char **argv) { if ( argc >= 2 ) { long pers = personality(-1); /* 0x40000 aka. ADDR_NO_RANDOMIZE */ if (!(pers & 0x40000)) { if (personality(pers | 0x40000) == -1) { fprintf(stderr, "WARNING: Couldn't set the proper personality flags. Trying to continue anyway.\n"); } } /* fprintf (stdout, "DEBUG: execing %s with arg %s",argv[1],&argv[1]); */ execvp(argv[1], &argv[1]); } exit(0); } Index: sbcl.spec =================================================================== RCS file: /cvs/extras/rpms/sbcl/devel/sbcl.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- sbcl.spec 21 Sep 2005 13:47:15 -0000 1.13 +++ sbcl.spec 22 Sep 2005 14:10:29 -0000 1.14 @@ -7,26 +7,10 @@ #define sbcl_bootstrap cmucl #define sbcl_bootstrap clisp -%if "%{?bootstrap}" == "%{nil}" -%if "%{?fedora}" >= "3" -BuildRequires:setarch -%define setarch setarch %{_target_cpu} -%endif - -%if "%{?fedora}" >= "4" -%define setarch setarch %{_target_cpu} -R -%endif - -%if "%{?rhel}" >= "3" -BuildRequires:setarch -%define setarch setarch %{_target_cpu} -%endif -%endif - Name: sbcl Summary: Steel Bank Common Lisp Version: 0.9.4 -Release: 17%{?dist} +Release: 19%{?dist} License: BSD/MIT Group: Development/Languages @@ -52,6 +36,8 @@ %endif %endif +Source100: my_setarch.c + Patch1: sbcl-0.8.18-default-sbcl-home.patch Patch2: sbcl-0.9.4-personality.patch Patch3: sbcl-0.9.4-optflags.patch @@ -113,6 +99,9 @@ %if "%{?sbcl_bootstrap}" == "%{nil}" export SBCL_HOME=`pwd`/sbcl-bootstrap/lib/sbcl export PATH=`pwd`/sbcl-bootstrap/bin:${PATH} + +%{__cc} -o my_setarch %{optflags} %{SOURCE100} +%define setarch ./my_setarch %endif %{?setarch} ./make.sh %{?bootstrap} @@ -172,6 +161,9 @@ %changelog +* Thu Sep 22 2005 Rex Dieter 0.9.4-19 +- drop use of setarch, use my_setarch.c + * Mon Sep 19 2005 Rex Dieter 0.9.4-17 - rework personality/reexec patch (execve -> execvp) From fedora-extras-commits at redhat.com Thu Sep 22 14:10:54 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 22 Sep 2005 10:10:54 -0400 Subject: rpms/sbcl/FC-3 sbcl.spec,1.13,1.14 Message-ID: <200509221410.j8MEAsWI012211@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/sbcl/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12190 Modified Files: sbcl.spec Log Message: use %%optflags when building my_setarch Index: sbcl.spec =================================================================== RCS file: /cvs/extras/rpms/sbcl/FC-3/sbcl.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- sbcl.spec 22 Sep 2005 13:24:13 -0000 1.13 +++ sbcl.spec 22 Sep 2005 14:10:52 -0000 1.14 @@ -100,7 +100,7 @@ export SBCL_HOME=`pwd`/sbcl-bootstrap/lib/sbcl export PATH=`pwd`/sbcl-bootstrap/bin:${PATH} -%{__cc} %{SOURCE100} -o my_setarch +%{__cc} -o my_setarch %{optflags} %{SOURCE100} %define setarch ./my_setarch %endif From fedora-extras-commits at redhat.com Thu Sep 22 15:15:23 2005 From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj)) Date: Thu, 22 Sep 2005 11:15:23 -0400 Subject: rpms/gnome-applet-timer - New directory Message-ID: <200509221515.j8MFFNrI013913@cvs-int.fedora.redhat.com> Author: katzj Update of /cvs/extras/rpms/gnome-applet-timer In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13893/gnome-applet-timer Log Message: Directory /cvs/extras/rpms/gnome-applet-timer added to the repository From fedora-extras-commits at redhat.com Thu Sep 22 15:15:23 2005 From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj)) Date: Thu, 22 Sep 2005 11:15:23 -0400 Subject: rpms/gnome-applet-timer/devel - New directory Message-ID: <200509221515.j8MFFN5D013918@cvs-int.fedora.redhat.com> Author: katzj Update of /cvs/extras/rpms/gnome-applet-timer/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13893/gnome-applet-timer/devel Log Message: Directory /cvs/extras/rpms/gnome-applet-timer/devel added to the repository From fedora-extras-commits at redhat.com Thu Sep 22 15:15:47 2005 From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj)) Date: Thu, 22 Sep 2005 11:15:47 -0400 Subject: rpms/gnome-applet-timer Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200509221515.j8MFFlbA013973@cvs-int.fedora.redhat.com> Author: katzj Update of /cvs/extras/rpms/gnome-applet-timer In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13938 Added Files: Makefile import.log Log Message: Setup of module gnome-applet-timer --- NEW FILE Makefile --- # Top level Makefile for module gnome-applet-timer all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Thu Sep 22 15:15:47 2005 From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj)) Date: Thu, 22 Sep 2005 11:15:47 -0400 Subject: rpms/gnome-applet-timer/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200509221515.j8MFFl6l013978@cvs-int.fedora.redhat.com> Author: katzj Update of /cvs/extras/rpms/gnome-applet-timer/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13938/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module gnome-applet-timer --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Thu Sep 22 15:16:24 2005 From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj)) Date: Thu, 22 Sep 2005 11:16:24 -0400 Subject: rpms/gnome-applet-timer import.log,1.1,1.2 Message-ID: <200509221516.j8MFGORT014041@cvs-int.fedora.redhat.com> Author: katzj Update of /cvs/extras/rpms/gnome-applet-timer In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14006 Modified Files: import.log Log Message: auto-import gnome-applet-timer-1.1.1-8.fc4 on branch devel from gnome-applet-timer-1.1.1-8.fc4.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/gnome-applet-timer/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 22 Sep 2005 15:15:45 -0000 1.1 +++ import.log 22 Sep 2005 15:16:22 -0000 1.2 @@ -0,0 +1 @@ +gnome-applet-timer-1_1_1-8_fc4:HEAD:gnome-applet-timer-1.1.1-8.fc4.src.rpm:1127402148 From fedora-extras-commits at redhat.com Thu Sep 22 15:16:24 2005 From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj)) Date: Thu, 22 Sep 2005 11:16:24 -0400 Subject: rpms/gnome-applet-timer/devel gnome-applet-timer.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200509221516.j8MFGOJW014047@cvs-int.fedora.redhat.com> Author: katzj Update of /cvs/extras/rpms/gnome-applet-timer/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14006/devel Modified Files: .cvsignore sources Added Files: gnome-applet-timer.spec Log Message: auto-import gnome-applet-timer-1.1.1-8.fc4 on branch devel from gnome-applet-timer-1.1.1-8.fc4.src.rpm --- NEW FILE gnome-applet-timer.spec --- Name: gnome-applet-timer Version: 1.1.1 Release: 8%{?dist} Summary: A countdown timer applet for the GNOME panel Group: User Interface/Desktops License: GPL URL: http://timerapplet.sourceforge.net/ Source0: http://download.sourceforge.net/timerapplet/timer-applet-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gnome-panel-devel >= 2.6, gettext, scrollkeeper Provides: timer-applet = %{version} Requires(pre): GConf2 Requires(post): GConf2, scrollkeeper Requires(preun): GConf2 Requires(postun): scrollkeeper %description Timer Applet is a countdown timer applet for the GNOME panel. Highlights: * Run multiple Timer Applets simultaneously to have different timers * Quickly set a time and the applet will notify you when time's up * Create presets for quick access to frequently-used times * Small and unobtrusive. Choose to either view the remaining time right in the panel or hide it so you don't get distracted by the countdown. %prep %setup -q -n timer-applet-%{version} %build %configure make %{?_smp_mflags} # Part one of omf install hack sed -i 's!!!' help/C/timer-applet-C.omf sed -i 's!!!' help/fr/timer-applet-fr.omf # Part one of libexec install hack sed -i 's!!!' GNOME_TimerApplet.server %install rm -rf $RPM_BUILD_ROOT # For GConf apps: prevent schemas from being installed at this stage export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 make install DESTDIR=$RPM_BUILD_ROOT # Part two of omf install hack mkdir -p $RPM_BUILD_ROOT%{_datadir}/omf/timer-applet install -m 0644 -p help/C/timer-applet-C.omf $RPM_BUILD_ROOT%{_datadir}/omf/timer-applet install -m 0644 -p help/fr/timer-applet-fr.omf $RPM_BUILD_ROOT%{_datadir}/omf/timer-applet # Part two of libexec install hack mkdir -p $RPM_BUILD_ROOT%{_libexecdir} mv ${RPM_BUILD_ROOT}%{_bindir}/timer-applet ${RPM_BUILD_ROOT}%{_libexecdir}/timer-applet %find_lang timer-applet find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';' %check || : %clean rm -rf $RPM_BUILD_ROOT %pre if [ "$1" -gt 1 ]; then export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` gconftool-2 --makefile-uninstall-rule \ %{_sysconfdir}/gconf/schemas/timer-applet.schemas >/dev/null || : killall -HUP gconfd-2 || : fi %post export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` gconftool-2 --makefile-install-rule \ %{_sysconfdir}/gconf/schemas/timer-applet.schemas >/dev/null || : killall -HUP gconfd-2 || : scrollkeeper-update -q -o %{_datadir}/omf/timer-applet || : %preun if [ "$1" -eq 0 ]; then export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` gconftool-2 --makefile-uninstall-rule \ %{_sysconfdir}/gconf/schemas/timer-applet.schemas > /dev/null || : killall -HUP gconfd-2 || : fi %postun scrollkeeper-update -q || : %files -f timer-applet.lang %defattr(-,root,root,-) %doc AUTHORS COPYING ChangeLog NEWS README %{_libexecdir}/timer-applet %{_sysconfdir}/gconf/schemas/timer-applet.schemas %{_libdir}/bonobo/servers/GNOME_TimerApplet.server %{_datadir}/gnome/help/timer-applet %{_datadir}/gnome-2.0/ui/GNOME_TimerApplet.xml %{_datadir}/omf/timer-applet %{_datadir}/pixmaps/timer-applet %changelog * Mon Sep 19 2005 Christoph Wickert - 1.1.1-8 - Minor Specfile Changes. * Sun Sep 18 2005 Christoph Wickert - 1.1.1-7 - removed all patches and use Toshi's specfile hacks instead. (#168032) * Sun Sep 18 2005 Christoph Wickert - 1.1.1-6 - removed omf file install specfile hack. * Sun Sep 18 2005 Christoph Wickert - 1.1.1-5 - added timer-applet-libexec.patch by Toshio Kuratomi (#168032) - modified timer-applet-docinstall.patch: replaced *.old with *.docinstall - modified specfile to install omf file. * Sat Sep 17 2005 Christoph Wickert - 1.1.1-4 - added timer-applet-docinstall.patch by Toshio Kuratomi (#168032) * Fri Sep 16 2005 Christoph Wickert - 1.1.1-3 - Renamed package from gnome-timer-applet to gnome-applet-timer according to Fedora Extras package naming guidelines. - Minor Specfile Changes: Added scrollkeeper requirements and snipplets * Sat Sep 10 2005 Christoph Wickert - 1.1.1-2 - Renamed package from timer-applet to gnome-timer-applet according to Fedora Extras package naming guidelines. - Several fixes for FE (version etc). - Cleaned up Specfile. * Fri Aug 19 2005 Christoph Wickert - 1.1.1-1.fc4.cw - Updated to version 1.1.1. - Rebuild for Core 4. * Wed Apr 13 2005 Christoph Wickert - 1.0-2.fc3.cw - Rebuild to fit to repos naming conventions. * Sun Apr 03 2005 Christoph Wickert - 1.0-fc3_cw.1 - Updated to version 1.0. * Thu Mar 24 2005 Christoph Wickert - 0.9-fc3_cw.1 - Updated to version 0.9. * Mon Mar 21 2005 Christoph Wickert - 0.8-fc3_cw.1 - Initial RPM release. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gnome-applet-timer/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 22 Sep 2005 15:15:45 -0000 1.1 +++ .cvsignore 22 Sep 2005 15:16:22 -0000 1.2 @@ -0,0 +1 @@ +timer-applet-1.1.1.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/gnome-applet-timer/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 22 Sep 2005 15:15:45 -0000 1.1 +++ sources 22 Sep 2005 15:16:22 -0000 1.2 @@ -0,0 +1 @@ +db9dacfa6bd35904dc88740764b1750e timer-applet-1.1.1.tar.gz From fedora-extras-commits at redhat.com Thu Sep 22 15:21:26 2005 From: fedora-extras-commits at redhat.com (Marc Maurer (uwog)) Date: Thu, 22 Sep 2005 11:21:26 -0400 Subject: rpms/abiword/devel .cvsignore, 1.9, 1.10 abiword.spec, 1.18, 1.19 sources, 1.9, 1.10 Message-ID: <200509221521.j8MFLQqj014110@cvs-int.fedora.redhat.com> Author: uwog Update of /cvs/extras/rpms/abiword/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14087 Modified Files: .cvsignore abiword.spec sources Log Message: 2.3.99 release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/abiword/devel/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 10 Sep 2005 09:29:50 -0000 1.9 +++ .cvsignore 22 Sep 2005 15:21:24 -0000 1.10 @@ -1 +1 @@ -abiword-2.3.6.tar.bz2 +abiword-2.3.99.tar.bz2 Index: abiword.spec =================================================================== RCS file: /cvs/extras/rpms/abiword/devel/abiword.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- abiword.spec 10 Sep 2005 09:29:50 -0000 1.18 +++ abiword.spec 22 Sep 2005 15:21:24 -0000 1.19 @@ -2,7 +2,7 @@ Summary: The AbiWord word processor Name: abiword -Version: 2.3.6 +Version: 2.3.99 Release: 1 Epoch: 1 Group: Applications/Editors @@ -131,6 +131,9 @@ %{_datadir}/icons/*png %changelog +* Thu Sep 22 2005 Marc Maurer - 1:2.3.99-1 +- Update to 2.3.99 + * Sat Sep 10 2005 Marc Maurer - 1:2.3.6-1 - Update to 2.3.6 - Drop the pango patch Index: sources =================================================================== RCS file: /cvs/extras/rpms/abiword/devel/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 10 Sep 2005 09:29:50 -0000 1.9 +++ sources 22 Sep 2005 15:21:24 -0000 1.10 @@ -1 +1 @@ -8a1fc6a2a9cec61ed15231d2fa1b3110 abiword-2.3.6.tar.bz2 +9dada36fc81c2af204f85a5db0627935 abiword-2.3.99.tar.bz2 From fedora-extras-commits at redhat.com Thu Sep 22 15:34:05 2005 From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert)) Date: Thu, 22 Sep 2005 11:34:05 -0400 Subject: owners owners.list,1.239,1.240 Message-ID: <200509221534.j8MFY5of014224@cvs-int.fedora.redhat.com> Author: cwickert Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14205 Modified Files: owners.list Log Message: added gnome-applet-timer Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.239 retrieving revision 1.240 diff -u -r1.239 -r1.240 --- owners.list 22 Sep 2005 11:14:52 -0000 1.239 +++ owners.list 22 Sep 2005 15:34:03 -0000 1.240 @@ -255,6 +255,7 @@ Fedora Extras|gnome-applet-netspeed|GNOME applet that shows traffic on a network device|a.kurtz at hardsun.net|extras-qa at fedoraproject.org| Fedora Extras|gnome-applet-rhythmbox|A GNOME panel applet to control Rhythmbox's playback|ivazquez at ivazquez.net|extras-qa at fedoraproject.org| Fedora Extras|gnome-applet-sensors|Gnome panel applet for hardware sensors|a.kurtz at hardsun.net|extras-qa at fedoraproject.org| +Fedora Extras|gnome-applet-timer|A countdown timer applet for the GNOME panel|wickerpms at arcor.de|extras-qa at fedoraproject.org| Fedora Extras|gnome-blog|GNOME panel object for posting blog entries|bdpepple at ameritech.net|extras-qa at fedoraproject.org| Fedora Extras|gnome-common|Useful things common to building gnome packages from scratch|toshio at tiki-lounge.com|extras-qa at fedoraproject.org| Fedora Extras|gnome-cpufreq-applet|CPU frequency scaling monitor applet|adrian at lisas.de|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Thu Sep 22 15:35:09 2005 From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl)) Date: Thu, 22 Sep 2005 11:35:09 -0400 Subject: rpms/gwget/devel .cvsignore, 1.4, 1.5 gwget.spec, 1.6, 1.7 sources, 1.4, 1.5 Message-ID: <200509221535.j8MFZ9nc014260@cvs-int.fedora.redhat.com> Author: thl Update of /cvs/extras/rpms/gwget/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14236 Modified Files: .cvsignore gwget.spec sources Log Message: Update to 0.96; dropped x86_64 patch; make install DESTDIR= instead of makeinstall macro; Use epimajor macro to simplify spec for different dists; Remove the epiphanye build-option and build it always Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gwget/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 4 Mar 2005 16:56:22 -0000 1.4 +++ .cvsignore 22 Sep 2005 15:35:07 -0000 1.5 @@ -1,2 +1 @@ -gwget-0.93.tar.gz -gwget-autoreconf.patch.bz2 +gwget-0.96.tar.gz Index: gwget.spec =================================================================== RCS file: /cvs/extras/rpms/gwget/devel/gwget.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- gwget.spec 5 Mar 2005 21:10:21 -0000 1.6 +++ gwget.spec 22 Sep 2005 15:35:07 -0000 1.7 @@ -1,21 +1,21 @@ -# use "--without epiphanye" as rpmbuildparameter to disable epiphany-extension (requires FC3 Core package) +%define epimajor 1.8 Summary: Graphical download manager that uses wget Name: gwget -Version: 0.93 +Version: 0.96 Release: 2 License: GPL Group: Applications/Internet -Source0: http://dl.sf.net/gwget/gwget-0.93.tar.gz +Source0: http://ftp.gnome.org/pub/GNOME/sources/gwget/0.96/gwget-0.96.tar.gz Source1: gwget.desktop -Patch0: gwget-autoreconf.patch.bz2 -URL: http://gwget.sourceforge.net/ +URL: http://gnome.org/projects/gwget Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Buildrequires: libgnomeui-devel >= 2.0 Buildrequires: libglade2-devel >= 2.0 BuildRequires: perl-XML-Parser BuildRequires: gettext >= 0.14.1 BuildRequires: desktop-file-utils +BuildRequires: epiphany-devel >= %{epimajor} Requires: wget >= 1.9 Requires(post): GConf2 Requires(preun): GConf2 @@ -26,32 +26,27 @@ Currently, very basic wget options are available, supporting multiple downloads, drag&drop and display the errors from wget process. -%if 0%{!?_without_epiphanye:1} - %package epiphany-extension Summary: This Package contains extensions gwget2 extensions for epiphany. Group: Applications/Internet Requires: %{name} = %{version} -Requires: epiphany >= 1.4.4 -BuildRequires: epiphany-devel >= 1.4.4 +Requires: epiphany >= %{epimajor} %description epiphany-extension This Package contains extensions gwget2 extensions for epiphany. -%endif # _without_epiphanye %prep %setup -q -%patch0 -p1 %build -%configure %{?_without_epiphanye:--disable-epiphany-extension} +%configure --with-epiphany-version=%{epimajor} make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT # For GConf apps: prevent schemas from being installed at this stage export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 -%makeinstall +make install DESTDIR=$RPM_BUILD_ROOT rm ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop desktop-file-install --vendor fedora \ --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ @@ -89,16 +84,22 @@ %{_datadir}/idl/GNOME_Gwget.idl %{_datadir}/applications/fedora-%{name}.desktop -%if 0%{!?_without_epiphanye:1} %files epiphany-extension %defattr (-,root,root) -%dir %{_libdir}/epiphany/extensions/ -%{_libdir}/epiphany/extensions/* -%endif # _without_epiphanye - +%{_libdir}/epiphany-%{epimajor}/extensions/ %changelog +* Mon Sep 19 2005 Thorsten Leemhuis 0.96-2 +- Remove the epiphanye build-option and build it always +- Use epimajor macro to simplify spec for different dists +- make install DESTDIR= instead of makeinstall macro + +* Mon Sep 19 2005 Adel Gadllah 0.96-1 +- Update to 0.96 +- Fix urls in spec file (project has moved) +- dropped x86_64 patch (not needed anymore) + * Tue Mar 01 2005 Thorsten Leemhuis 0:0.93-2 - Add gwget-autoreconf.patch.bz2 ; fixes x86_64 Index: sources =================================================================== RCS file: /cvs/extras/rpms/gwget/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 4 Mar 2005 16:56:37 -0000 1.4 +++ sources 22 Sep 2005 15:35:07 -0000 1.5 @@ -1,2 +1 @@ -79a3625ef99a5a417164e0d97020fcc5 gwget-0.93.tar.gz -159d5d2c94c0bb88a82cdfdb2ecbe0d2 gwget-autoreconf.patch.bz2 +f4c78534574300ce7997e9fdc3c3b6be gwget-0.96.tar.gz From fedora-extras-commits at redhat.com Thu Sep 22 15:36:59 2005 From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl)) Date: Thu, 22 Sep 2005 11:36:59 -0400 Subject: rpms/gwget/devel gwget.spec,1.7,1.8 Message-ID: <200509221536.j8MFaxeU014297@cvs-int.fedora.redhat.com> Author: thl Update of /cvs/extras/rpms/gwget/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14278 Modified Files: gwget.spec Log Message: use dist Index: gwget.spec =================================================================== RCS file: /cvs/extras/rpms/gwget/devel/gwget.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- gwget.spec 22 Sep 2005 15:35:07 -0000 1.7 +++ gwget.spec 22 Sep 2005 15:36:57 -0000 1.8 @@ -3,7 +3,7 @@ Summary: Graphical download manager that uses wget Name: gwget Version: 0.96 -Release: 2 +Release: 3%{?dist} License: GPL Group: Applications/Internet Source0: http://ftp.gnome.org/pub/GNOME/sources/gwget/0.96/gwget-0.96.tar.gz @@ -90,6 +90,9 @@ %changelog +* Thu Sep 22 2005 Thorsten Leemhuis 0.96-3 +- use dist + * Mon Sep 19 2005 Thorsten Leemhuis 0.96-2 - Remove the epiphanye build-option and build it always - Use epimajor macro to simplify spec for different dists From fedora-extras-commits at redhat.com Thu Sep 22 16:27:16 2005 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Thu, 22 Sep 2005 12:27:16 -0400 Subject: rpms/perl-ExtUtils-CBuilder/devel .cvsignore, 1.9, 1.10 perl-ExtUtils-CBuilder.spec, 1.13, 1.14 sources, 1.9, 1.10 Message-ID: <200509221627.j8MGRGgO018031@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-ExtUtils-CBuilder/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17968/devel Modified Files: .cvsignore perl-ExtUtils-CBuilder.spec sources Log Message: Update to 0.14. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-ExtUtils-CBuilder/devel/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 25 Aug 2005 14:29:43 -0000 1.9 +++ .cvsignore 22 Sep 2005 16:27:14 -0000 1.10 @@ -1 +1 @@ -ExtUtils-CBuilder-0.13.tar.gz +ExtUtils-CBuilder-0.14.tar.gz Index: perl-ExtUtils-CBuilder.spec =================================================================== RCS file: /cvs/extras/rpms/perl-ExtUtils-CBuilder/devel/perl-ExtUtils-CBuilder.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- perl-ExtUtils-CBuilder.spec 25 Aug 2005 14:29:43 -0000 1.13 +++ perl-ExtUtils-CBuilder.spec 22 Sep 2005 16:27:14 -0000 1.14 @@ -1,5 +1,5 @@ Name: perl-ExtUtils-CBuilder -Version: 0.13 +Version: 0.14 Release: 1%{?dist} Summary: Compile and link C code for Perl modules @@ -37,7 +37,7 @@ chmod -R u+w $RPM_BUILD_ROOT/* -%check || : +%check make test @@ -48,11 +48,14 @@ %files %defattr(-,root,root,-) %doc Changes -%{perl_vendorlib}/ExtUtils +%{perl_vendorlib}/ExtUtils/ %{_mandir}/man3/*.3* %changelog +* Thu Sep 22 2005 Jose Pedro Oliveira - 0.14-1 +- Update 0.14. + * Thu Aug 25 2005 Jose Pedro Oliveira - 0.13-1 - Update 0.13. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-ExtUtils-CBuilder/devel/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 25 Aug 2005 14:29:43 -0000 1.9 +++ sources 22 Sep 2005 16:27:14 -0000 1.10 @@ -1 +1 @@ -c90c5e20d931eea02efa4d0f68483648 ExtUtils-CBuilder-0.13.tar.gz +f651ae9246952f56fe92583796fc1950 ExtUtils-CBuilder-0.14.tar.gz From fedora-extras-commits at redhat.com Thu Sep 22 16:27:10 2005 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Thu, 22 Sep 2005 12:27:10 -0400 Subject: rpms/perl-ExtUtils-CBuilder/FC-3 .cvsignore, 1.9, 1.10 perl-ExtUtils-CBuilder.spec, 1.11, 1.12 sources, 1.9, 1.10 Message-ID: <200509221627.j8MGRfmD018036@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-ExtUtils-CBuilder/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17968/FC-3 Modified Files: .cvsignore perl-ExtUtils-CBuilder.spec sources Log Message: Update to 0.14. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-ExtUtils-CBuilder/FC-3/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 25 Aug 2005 14:29:42 -0000 1.9 +++ .cvsignore 22 Sep 2005 16:27:08 -0000 1.10 @@ -1 +1 @@ -ExtUtils-CBuilder-0.13.tar.gz +ExtUtils-CBuilder-0.14.tar.gz Index: perl-ExtUtils-CBuilder.spec =================================================================== RCS file: /cvs/extras/rpms/perl-ExtUtils-CBuilder/FC-3/perl-ExtUtils-CBuilder.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- perl-ExtUtils-CBuilder.spec 25 Aug 2005 14:29:42 -0000 1.11 +++ perl-ExtUtils-CBuilder.spec 22 Sep 2005 16:27:08 -0000 1.12 @@ -1,5 +1,5 @@ Name: perl-ExtUtils-CBuilder -Version: 0.13 +Version: 0.14 Release: 1%{?dist} Summary: Compile and link C code for Perl modules @@ -37,7 +37,7 @@ chmod -R u+w $RPM_BUILD_ROOT/* -%check || : +%check make test @@ -48,11 +48,14 @@ %files %defattr(-,root,root,-) %doc Changes -%{perl_vendorlib}/ExtUtils +%{perl_vendorlib}/ExtUtils/ %{_mandir}/man3/*.3* %changelog +* Thu Sep 22 2005 Jose Pedro Oliveira - 0.14-1 +- Update 0.14. + * Thu Aug 25 2005 Jose Pedro Oliveira - 0.13-1 - Update 0.13. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-ExtUtils-CBuilder/FC-3/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 25 Aug 2005 14:29:42 -0000 1.9 +++ sources 22 Sep 2005 16:27:08 -0000 1.10 @@ -1 +1 @@ -c90c5e20d931eea02efa4d0f68483648 ExtUtils-CBuilder-0.13.tar.gz +f651ae9246952f56fe92583796fc1950 ExtUtils-CBuilder-0.14.tar.gz From fedora-extras-commits at redhat.com Thu Sep 22 16:27:11 2005 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Thu, 22 Sep 2005 12:27:11 -0400 Subject: rpms/perl-ExtUtils-CBuilder/FC-4 .cvsignore, 1.9, 1.10 perl-ExtUtils-CBuilder.spec, 1.13, 1.14 sources, 1.9, 1.10 Message-ID: <200509221627.j8MGRfxh018041@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-ExtUtils-CBuilder/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17968/FC-4 Modified Files: .cvsignore perl-ExtUtils-CBuilder.spec sources Log Message: Update to 0.14. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-ExtUtils-CBuilder/FC-4/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 25 Aug 2005 14:29:42 -0000 1.9 +++ .cvsignore 22 Sep 2005 16:27:09 -0000 1.10 @@ -1 +1 @@ -ExtUtils-CBuilder-0.13.tar.gz +ExtUtils-CBuilder-0.14.tar.gz Index: perl-ExtUtils-CBuilder.spec =================================================================== RCS file: /cvs/extras/rpms/perl-ExtUtils-CBuilder/FC-4/perl-ExtUtils-CBuilder.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- perl-ExtUtils-CBuilder.spec 25 Aug 2005 14:29:42 -0000 1.13 +++ perl-ExtUtils-CBuilder.spec 22 Sep 2005 16:27:09 -0000 1.14 @@ -1,5 +1,5 @@ Name: perl-ExtUtils-CBuilder -Version: 0.13 +Version: 0.14 Release: 1%{?dist} Summary: Compile and link C code for Perl modules @@ -37,7 +37,7 @@ chmod -R u+w $RPM_BUILD_ROOT/* -%check || : +%check make test @@ -48,11 +48,14 @@ %files %defattr(-,root,root,-) %doc Changes -%{perl_vendorlib}/ExtUtils +%{perl_vendorlib}/ExtUtils/ %{_mandir}/man3/*.3* %changelog +* Thu Sep 22 2005 Jose Pedro Oliveira - 0.14-1 +- Update 0.14. + * Thu Aug 25 2005 Jose Pedro Oliveira - 0.13-1 - Update 0.13. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-ExtUtils-CBuilder/FC-4/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 25 Aug 2005 14:29:42 -0000 1.9 +++ sources 22 Sep 2005 16:27:09 -0000 1.10 @@ -1 +1 @@ -c90c5e20d931eea02efa4d0f68483648 ExtUtils-CBuilder-0.13.tar.gz +f651ae9246952f56fe92583796fc1950 ExtUtils-CBuilder-0.14.tar.gz From fedora-extras-commits at redhat.com Thu Sep 22 16:31:25 2005 From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert)) Date: Thu, 22 Sep 2005 12:31:25 -0400 Subject: rpms/gnome-applet-timer/devel gnome-applet-timer.spec,1.1,1.2 Message-ID: <200509221631.j8MGVPWN018115@cvs-int.fedora.redhat.com> Author: cwickert Update of /cvs/extras/rpms/gnome-applet-timer/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18095 Modified Files: gnome-applet-timer.spec Log Message: increase revision due to tag collision Index: gnome-applet-timer.spec =================================================================== RCS file: /cvs/extras/rpms/gnome-applet-timer/devel/gnome-applet-timer.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gnome-applet-timer.spec 22 Sep 2005 15:16:22 -0000 1.1 +++ gnome-applet-timer.spec 22 Sep 2005 16:31:23 -0000 1.2 @@ -1,6 +1,6 @@ Name: gnome-applet-timer Version: 1.1.1 -Release: 8%{?dist} +Release: 9%{?dist} Summary: A countdown timer applet for the GNOME panel Group: User Interface/Desktops @@ -105,6 +105,9 @@ %{_datadir}/pixmaps/timer-applet %changelog +* Thu Sep 22 2005 Christoph Wickert - 1.1.1-9 +- Increase release due to tag collision. + * Mon Sep 19 2005 Christoph Wickert - 1.1.1-8 - Minor Specfile Changes. From fedora-extras-commits at redhat.com Thu Sep 22 16:33:06 2005 From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl)) Date: Thu, 22 Sep 2005 12:33:06 -0400 Subject: rpms/gwget/devel gwget.spec,1.8,1.9 Message-ID: <200509221633.j8MGX6eY018187@cvs-int.fedora.redhat.com> Author: thl Update of /cvs/extras/rpms/gwget/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18170 Modified Files: gwget.spec Log Message: extension-dir is different on epiphany 1.8; Own _libdir/epiphany Index: gwget.spec =================================================================== RCS file: /cvs/extras/rpms/gwget/devel/gwget.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- gwget.spec 22 Sep 2005 15:36:57 -0000 1.8 +++ gwget.spec 22 Sep 2005 16:32:44 -0000 1.9 @@ -3,7 +3,7 @@ Summary: Graphical download manager that uses wget Name: gwget Version: 0.96 -Release: 3%{?dist} +Release: 4%{?dist} License: GPL Group: Applications/Internet Source0: http://ftp.gnome.org/pub/GNOME/sources/gwget/0.96/gwget-0.96.tar.gz @@ -86,10 +86,14 @@ %files epiphany-extension %defattr (-,root,root) -%{_libdir}/epiphany-%{epimajor}/extensions/ +%{_libdir}/epiphany*/ %changelog +* Thu Sep 22 2005 Thorsten Leemhuis 0.96-4 +- extension-dir is different on epiphany 1.8 +- Own _libdir/epiphany + * Thu Sep 22 2005 Thorsten Leemhuis 0.96-3 - use dist From fedora-extras-commits at redhat.com Thu Sep 22 16:41:10 2005 From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl)) Date: Thu, 22 Sep 2005 12:41:10 -0400 Subject: rpms/gwget/FC-4 .cvsignore, 1.4, 1.5 gwget.spec, 1.6, 1.7 sources, 1.4, 1.5 Message-ID: <200509221641.j8MGfATQ018812@cvs-int.fedora.redhat.com> Author: thl Update of /cvs/extras/rpms/gwget/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18785 Modified Files: .cvsignore gwget.spec sources Log Message: sync with devel -- update to 0.96, always build epiphany extension and more Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gwget/FC-4/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 4 Mar 2005 16:56:22 -0000 1.4 +++ .cvsignore 22 Sep 2005 16:41:08 -0000 1.5 @@ -1,2 +1 @@ -gwget-0.93.tar.gz -gwget-autoreconf.patch.bz2 +gwget-0.96.tar.gz Index: gwget.spec =================================================================== RCS file: /cvs/extras/rpms/gwget/FC-4/gwget.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- gwget.spec 5 Mar 2005 21:10:21 -0000 1.6 +++ gwget.spec 22 Sep 2005 16:41:08 -0000 1.7 @@ -1,21 +1,21 @@ -# use "--without epiphanye" as rpmbuildparameter to disable epiphany-extension (requires FC3 Core package) +%define epimajor 1.6 Summary: Graphical download manager that uses wget Name: gwget -Version: 0.93 -Release: 2 +Version: 0.96 +Release: 4%{?dist} License: GPL Group: Applications/Internet -Source0: http://dl.sf.net/gwget/gwget-0.93.tar.gz +Source0: http://ftp.gnome.org/pub/GNOME/sources/gwget/0.96/gwget-0.96.tar.gz Source1: gwget.desktop -Patch0: gwget-autoreconf.patch.bz2 -URL: http://gwget.sourceforge.net/ +URL: http://gnome.org/projects/gwget Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Buildrequires: libgnomeui-devel >= 2.0 Buildrequires: libglade2-devel >= 2.0 BuildRequires: perl-XML-Parser BuildRequires: gettext >= 0.14.1 BuildRequires: desktop-file-utils +BuildRequires: epiphany-devel >= %{epimajor} Requires: wget >= 1.9 Requires(post): GConf2 Requires(preun): GConf2 @@ -26,32 +26,27 @@ Currently, very basic wget options are available, supporting multiple downloads, drag&drop and display the errors from wget process. -%if 0%{!?_without_epiphanye:1} - %package epiphany-extension Summary: This Package contains extensions gwget2 extensions for epiphany. Group: Applications/Internet Requires: %{name} = %{version} -Requires: epiphany >= 1.4.4 -BuildRequires: epiphany-devel >= 1.4.4 +Requires: epiphany >= %{epimajor} %description epiphany-extension This Package contains extensions gwget2 extensions for epiphany. -%endif # _without_epiphanye %prep %setup -q -%patch0 -p1 %build -%configure %{?_without_epiphanye:--disable-epiphany-extension} +%configure --with-epiphany-version=%{epimajor} make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT # For GConf apps: prevent schemas from being installed at this stage export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 -%makeinstall +make install DESTDIR=$RPM_BUILD_ROOT rm ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop desktop-file-install --vendor fedora \ --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ @@ -89,16 +84,29 @@ %{_datadir}/idl/GNOME_Gwget.idl %{_datadir}/applications/fedora-%{name}.desktop -%if 0%{!?_without_epiphanye:1} %files epiphany-extension %defattr (-,root,root) -%dir %{_libdir}/epiphany/extensions/ -%{_libdir}/epiphany/extensions/* -%endif # _without_epiphanye - +%{_libdir}/epiphany*/ %changelog +* Thu Sep 22 2005 Thorsten Leemhuis 0.96-4 +- extension-dir is different on epiphany 1.8 +- Own _libdir/epiphany + +* Thu Sep 22 2005 Thorsten Leemhuis 0.96-3 +- use dist + +* Mon Sep 19 2005 Thorsten Leemhuis 0.96-2 +- Remove the epiphanye build-option and build it always +- Use epimajor macro to simplify spec for different dists +- make install DESTDIR= instead of makeinstall macro + +* Mon Sep 19 2005 Adel Gadllah 0.96-1 +- Update to 0.96 +- Fix urls in spec file (project has moved) +- dropped x86_64 patch (not needed anymore) + * Tue Mar 01 2005 Thorsten Leemhuis 0:0.93-2 - Add gwget-autoreconf.patch.bz2 ; fixes x86_64 Index: sources =================================================================== RCS file: /cvs/extras/rpms/gwget/FC-4/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 4 Mar 2005 16:56:37 -0000 1.4 +++ sources 22 Sep 2005 16:41:08 -0000 1.5 @@ -1,2 +1 @@ -79a3625ef99a5a417164e0d97020fcc5 gwget-0.93.tar.gz -159d5d2c94c0bb88a82cdfdb2ecbe0d2 gwget-autoreconf.patch.bz2 +f4c78534574300ce7997e9fdc3c3b6be gwget-0.96.tar.gz From fedora-extras-commits at redhat.com Thu Sep 22 16:48:27 2005 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Thu, 22 Sep 2005 12:48:27 -0400 Subject: rpms/gdl - New directory Message-ID: <200509221648.j8MGmRe4019111@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/gdl In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19087/gdl Log Message: Directory /cvs/extras/rpms/gdl added to the repository From fedora-extras-commits at redhat.com Thu Sep 22 16:48:28 2005 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Thu, 22 Sep 2005 12:48:28 -0400 Subject: rpms/gdl/devel - New directory Message-ID: <200509221648.j8MGmSVc019116@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/gdl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19087/gdl/devel Log Message: Directory /cvs/extras/rpms/gdl/devel added to the repository From fedora-extras-commits at redhat.com Thu Sep 22 16:48:43 2005 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Thu, 22 Sep 2005 12:48:43 -0400 Subject: rpms/gdl Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200509221648.j8MGmhCA019161@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/gdl In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19132 Added Files: Makefile import.log Log Message: Setup of module gdl --- NEW FILE Makefile --- # Top level Makefile for module gdl all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Thu Sep 22 16:48:43 2005 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Thu, 22 Sep 2005 12:48:43 -0400 Subject: rpms/gdl/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200509221648.j8MGmhad019167@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/gdl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19132/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module gdl --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Thu Sep 22 16:49:37 2005 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Thu, 22 Sep 2005 12:49:37 -0400 Subject: rpms/gdl import.log,1.1,1.2 Message-ID: <200509221650.j8MGo8as019287@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/gdl In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19243 Modified Files: import.log Log Message: auto-import gdl-0.8.10-1 on branch devel from gdl-0.8.10-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/gdl/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 22 Sep 2005 16:48:41 -0000 1.1 +++ import.log 22 Sep 2005 16:49:35 -0000 1.2 @@ -0,0 +1 @@ +gdl-0_8_10-1:HEAD:gdl-0.8.10-1.src.rpm:1127407770 From fedora-extras-commits at redhat.com Thu Sep 22 16:49:37 2005 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Thu, 22 Sep 2005 12:49:37 -0400 Subject: rpms/gdl/devel gdl-0.8.10-hdf5.patch, NONE, 1.1 gdl.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200509221650.j8MGo8Vi019288@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/gdl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19243/devel Modified Files: .cvsignore sources Added Files: gdl-0.8.10-hdf5.patch gdl.spec Log Message: auto-import gdl-0.8.10-1 on branch devel from gdl-0.8.10-1.src.rpm gdl-0.8.10-hdf5.patch: --- NEW FILE gdl-0.8.10-hdf5.patch --- --- gdl-0.8.10/src/hdf5_fun.cpp.orig 2005-08-05 16:50:37.000000000 -0600 +++ gdl-0.8.10/src/hdf5_fun.cpp 2005-08-05 16:50:56.000000000 -0600 @@ -128,7 +128,7 @@ // define hyperslab in dataset - hssize_t offset[MAXRANK]; + hsize_t offset[MAXRANK]; hsize_t count[MAXRANK]; for(int i=0; i - 0.8.10-1 - Initial Fedora Extras version Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gdl/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 22 Sep 2005 16:48:41 -0000 1.1 +++ .cvsignore 22 Sep 2005 16:49:35 -0000 1.2 @@ -0,0 +1 @@ +gdl-0.8.10.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/gdl/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 22 Sep 2005 16:48:41 -0000 1.1 +++ sources 22 Sep 2005 16:49:35 -0000 1.2 @@ -0,0 +1 @@ +5dc3efbe49b6aa98de5033e6746b865a gdl-0.8.10.tar.gz From fedora-extras-commits at redhat.com Thu Sep 22 17:02:11 2005 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Thu, 22 Sep 2005 13:02:11 -0400 Subject: rpms/octave/devel octave.spec,1.18,1.19 Message-ID: <200509221702.j8MH2gQi020814@cvs-int.fedora.redhat.com> Author: qspencer Update of /cvs/extras/rpms/octave/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20791 Modified Files: octave.spec Log Message: Add -devel to lapack and blas dependencies (due to recent changes in lapack). Index: octave.spec =================================================================== RCS file: /cvs/extras/rpms/octave/devel/octave.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- octave.spec 9 Aug 2005 15:23:22 -0000 1.18 +++ octave.spec 22 Sep 2005 17:02:09 -0000 1.19 @@ -1,6 +1,6 @@ Name: octave Version: 2.9.3 -Release: 4%{?dist} +Release: 5%{?dist} Summary: A high-level language for numerical computations Epoch: 6 @@ -10,10 +10,10 @@ URL: http://www.octave.org Requires: gnuplot less info texinfo Requires: /sbin/install-info -BuildPrereq: gnuplot bison flex less tetex gcc-gfortran lapack blas +BuildPrereq: bison flex less tetex gcc-gfortran lapack-devel blas-devel BuildPrereq: ncurses-devel zlib-devel libtermcap-devel hdf5-devel BuildPrereq: readline-devel glibc-devel fftw3-devel autoconf gperf -BuildPrereq: umfpack-devel glpk-devel +BuildPrereq: umfpack-devel glpk-devel gnuplot Prereq: /sbin/ldconfig BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: /etc/ld.so.conf.d @@ -123,6 +123,9 @@ %changelog +* Thu Sep 22 2005 Quentin Spencer 2.9.3-5 +- Change lapack and blas dependencies to lapack-devel and blas-devel + * Mon Aug 08 2005 Quentin Spencer 2.9.3-4 - Cleanup: remove redefinition of __libtoolize, ExcludeArch of two platforms, old s390 workarounds, and LC_ALL setting. None of these appear to be From fedora-extras-commits at redhat.com Thu Sep 22 17:03:15 2005 From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert)) Date: Thu, 22 Sep 2005 13:03:15 -0400 Subject: rpms/gnome-applet-timer/FC-4 gnome-applet-timer.spec,1.1,1.2 Message-ID: <200509221703.j8MH3F41020841@cvs-int.fedora.redhat.com> Author: cwickert Update of /cvs/extras/rpms/gnome-applet-timer/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20822 Modified Files: gnome-applet-timer.spec Log Message: increase revision due to tag collision Index: gnome-applet-timer.spec =================================================================== RCS file: /cvs/extras/rpms/gnome-applet-timer/FC-4/gnome-applet-timer.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gnome-applet-timer.spec 22 Sep 2005 15:16:22 -0000 1.1 +++ gnome-applet-timer.spec 22 Sep 2005 17:03:13 -0000 1.2 @@ -1,6 +1,6 @@ Name: gnome-applet-timer Version: 1.1.1 -Release: 8%{?dist} +Release: 9%{?dist} Summary: A countdown timer applet for the GNOME panel Group: User Interface/Desktops @@ -105,6 +105,9 @@ %{_datadir}/pixmaps/timer-applet %changelog +* Thu Sep 22 2005 Christoph Wickert - 1.1.1-9 +- Increase release due to tag collision. + * Mon Sep 19 2005 Christoph Wickert - 1.1.1-8 - Minor Specfile Changes. From fedora-extras-commits at redhat.com Thu Sep 22 17:06:27 2005 From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert)) Date: Thu, 22 Sep 2005 13:06:27 -0400 Subject: rpms/gnome-applet-timer/FC-3 gnome-applet-timer.spec,1.1,1.2 Message-ID: <200509221707.j8MH6w2R020935@cvs-int.fedora.redhat.com> Author: cwickert Update of /cvs/extras/rpms/gnome-applet-timer/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20913 Modified Files: gnome-applet-timer.spec Log Message: increase revision due to tag collision Index: gnome-applet-timer.spec =================================================================== RCS file: /cvs/extras/rpms/gnome-applet-timer/FC-3/gnome-applet-timer.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gnome-applet-timer.spec 22 Sep 2005 15:16:22 -0000 1.1 +++ gnome-applet-timer.spec 22 Sep 2005 17:06:25 -0000 1.2 @@ -1,6 +1,6 @@ Name: gnome-applet-timer Version: 1.1.1 -Release: 8%{?dist} +Release: 9%{?dist} Summary: A countdown timer applet for the GNOME panel Group: User Interface/Desktops @@ -105,6 +105,9 @@ %{_datadir}/pixmaps/timer-applet %changelog +* Thu Sep 22 2005 Christoph Wickert - 1.1.1-9 +- Increase release due to tag collision. + * Mon Sep 19 2005 Christoph Wickert - 1.1.1-8 - Minor Specfile Changes. From fedora-extras-commits at redhat.com Thu Sep 22 17:08:05 2005 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Thu, 22 Sep 2005 13:08:05 -0400 Subject: rpms/octave/FC-4 octave.spec,1.18,1.19 Message-ID: <200509221708.j8MH8aSn020963@cvs-int.fedora.redhat.com> Author: qspencer Update of /cvs/extras/rpms/octave/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20944 Modified Files: octave.spec Log Message: Change lapack and blas dependencies to lapack-devel and blas-devel. Index: octave.spec =================================================================== RCS file: /cvs/extras/rpms/octave/FC-4/octave.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- octave.spec 8 Aug 2005 13:49:03 -0000 1.18 +++ octave.spec 22 Sep 2005 17:08:02 -0000 1.19 @@ -11,7 +11,8 @@ URL: http://www.octave.org Requires: gnuplot less info texinfo Requires: /sbin/install-info -BuildPrereq: gnuplot bison flex less tetex gcc-gfortran lapack blas +BuildPrereq: gnuplot bison flex less tetex gcc-gfortran +BuildPrereq: lapack-devel blas-devel BuildPrereq: ncurses-devel zlib-devel libtermcap-devel hdf5-devel BuildPrereq: readline-devel glibc-devel fftw3-devel autoconf gperf Prereq: /sbin/ldconfig @@ -118,6 +119,9 @@ %changelog +* Thu Sep 22 2005 Quentin Spencer 2.1.71-15 +- Change lapack and blas dependencies to lapack-devel and blas-devel + * Mon Aug 08 2005 Quentin Spencer 2.1.71-15 - Cleanup: remove redefinition of __libtoolize, ExcludeArch of two platforms, old s390 workarounds, and LC_ALL setting. None of these appear to be From fedora-extras-commits at redhat.com Thu Sep 22 17:21:55 2005 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Thu, 22 Sep 2005 13:21:55 -0400 Subject: rpms/gdl/devel gdl.spec,1.1,1.2 Message-ID: <200509221721.j8MHLtI4021084@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/gdl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21063 Modified Files: gdl.spec Log Message: Don't include hdf support on ppc Index: gdl.spec =================================================================== RCS file: /cvs/extras/rpms/gdl/devel/gdl.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gdl.spec 22 Sep 2005 16:49:35 -0000 1.1 +++ gdl.spec 22 Sep 2005 17:21:53 -0000 1.2 @@ -1,6 +1,6 @@ Name: gdl Version: 0.8.10 -Release: 1%{?dist} +Release: 2%{?dist} Summary: GNU Data Language Group: Applications/Engineering @@ -12,9 +12,17 @@ BuildRequires: readline-devel, ncurses-devel BuildRequires: gsl-devel, plplot-devel, ImageMagick-c++-devel -BuildRequires: netcdf-devel, hdf5-devel, hdf-devel, libjpeg-devel +BuildRequires: netcdf-devel, hdf5-devel, libjpeg-devel BuildRequires: python-devel, python-numarray, python-matplotlib -#Requires: +%ifnarch ppc ppc64 +BuildRequires: hdf-devel +%define hdfinclude "-I/usr/include/hdf" +%define hdflib "-L%{_libdir}/hdf" +%else +%define hdfinclude %{nil} +%define hdflib %{nil} +%endif + %description A free IDL (Interactive Data Language) compatible incremental compiler @@ -29,8 +37,8 @@ %build %configure --disable-static \ - INCLUDES="-I/usr/include/netcdf-3 -I/usr/include/hdf" \ - LIBS="-L%{_libdir}/netcdf-3 -L%{_libdir}/hdf -L/usr/X11R6/%{_lib}" + INCLUDES="-I/usr/include/netcdf-3 %{hdfinclude}" \ + LIBS="-L%{_libdir}/netcdf-3 %{hdflib} -L/usr/X11R6/%{_lib}" make %{?_smp_mflags} @@ -50,5 +58,8 @@ %changelog +* Thu Sep 22 2005 - Orion Poplawski - 0.8.10-2 +- Don't include hdf support on ppc + * Fri Aug 19 2005 - Orion Poplawski - 0.8.10-1 - Initial Fedora Extras version From fedora-extras-commits at redhat.com Thu Sep 22 17:27:35 2005 From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl)) Date: Thu, 22 Sep 2005 13:27:35 -0400 Subject: rpms/mail-notification/devel mail-notification-evolution.patch, NONE, 1.1 mail-notification.spec, 1.10, 1.11 Message-ID: <200509221727.j8MHRZng021158@cvs-int.fedora.redhat.com> Author: thl Update of /cvs/extras/rpms/mail-notification/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21136 Modified Files: mail-notification.spec Added Files: mail-notification-evolution.patch Log Message: add mail-notification-evolution.patch and enable evo-support (from Radek Vokal) mail-notification-evolution.patch: --- NEW FILE mail-notification-evolution.patch --- --- mail-notification-2.0/src/mn-evolution-folder-tree-control.c.evolution 2005-09-14 16:17:50.000000000 +0200 +++ mail-notification-2.0/src/mn-evolution-folder-tree-control.c 2005-09-14 16:17:37.000000000 +0200 @@ -22,7 +22,7 @@ #include /* headers from the Evolution source tree */ -#include "mail/mail-component.h" +/*#include "mail/mail-component.h"*/ #include "mail/em-folder-tree.h" #include "mn-evolution.h" --- mail-notification-2.0/configure.evolution 2005-08-09 22:01:09.000000000 +0200 +++ mail-notification-2.0/configure 2005-09-14 16:15:51.000000000 +0200 @@ -24784,12 +24784,12 @@ if test "x$ac_cv_env_EVOLUTION_PLUGIN_CFLAGS_set" = "xset"; then pkg_cv_EVOLUTION_PLUGIN_CFLAGS=$ac_cv_env_EVOLUTION_PLUGIN_CFLAGS_value elif test -n "$PKG_CONFIG"; then - if { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists \"evolution-plugin-2.2 \$evolution_plugin_min_version\" >/dev/null 2>&1") >&5 - ($PKG_CONFIG --exists "evolution-plugin-2.2 $evolution_plugin_min_version" >/dev/null 2>&1) 2>&5 + if { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists \"evolution-plugin-2.4 \$evolution_plugin_min_version\" >/dev/null 2>&1") >&5 + ($PKG_CONFIG --exists "evolution-plugin-2.4 $evolution_plugin_min_version" >/dev/null 2>&1) 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then - pkg_cv_EVOLUTION_PLUGIN_CFLAGS=`$PKG_CONFIG --cflags "evolution-plugin-2.2 $evolution_plugin_min_version" 2>/dev/null` + pkg_cv_EVOLUTION_PLUGIN_CFLAGS=`$PKG_CONFIG --cflags "evolution-plugin-2.4 $evolution_plugin_min_version" 2>/dev/null` else pkg_failed=yes fi @@ -24807,12 +24807,12 @@ if test "x$ac_cv_env_EVOLUTION_PLUGIN_LIBS_set" = "xset"; then pkg_cv_EVOLUTION_PLUGIN_LIBS=$ac_cv_env_EVOLUTION_PLUGIN_LIBS_value elif test -n "$PKG_CONFIG"; then - if { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists \"evolution-plugin-2.2 \$evolution_plugin_min_version\" >/dev/null 2>&1") >&5 - ($PKG_CONFIG --exists "evolution-plugin-2.2 $evolution_plugin_min_version" >/dev/null 2>&1) 2>&5 + if { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists \"evolution-plugin-2.4 \$evolution_plugin_min_version\" >/dev/null 2>&1") >&5 + ($PKG_CONFIG --exists "evolution-plugin-2.4 $evolution_plugin_min_version" >/dev/null 2>&1) 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then - pkg_cv_EVOLUTION_PLUGIN_LIBS=`$PKG_CONFIG --libs "evolution-plugin-2.2 $evolution_plugin_min_version" 2>/dev/null` + pkg_cv_EVOLUTION_PLUGIN_LIBS=`$PKG_CONFIG --libs "evolution-plugin-2.4 $evolution_plugin_min_version" 2>/dev/null` else pkg_failed=yes fi @@ -24824,7 +24824,7 @@ echo "${ECHO_T}$pkg_cv_EVOLUTION_PLUGIN_LIBS" >&6 if test $pkg_failed = yes; then - EVOLUTION_PLUGIN_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "evolution-plugin-2.2 $evolution_plugin_min_version"` + EVOLUTION_PLUGIN_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "evolution-plugin-2.4 $evolution_plugin_min_version"` # Put the nasty error message in config.log where it belongs echo "$EVOLUTION_PLUGIN_PKG_ERRORS" 1>&5 @@ -24841,7 +24841,7 @@ if test $found = yes; then echo "$as_me:$LINENO: checking for the Evolution plugin directory" >&5 echo $ECHO_N "checking for the Evolution plugin directory... $ECHO_C" >&6 - evolution_plugindir=`$PKG_CONFIG --variable=plugindir evolution-plugin-2.2 2>/dev/null` + evolution_plugindir=`$PKG_CONFIG --variable=plugindir evolution-plugin-2.4 2>/dev/null` if test -n "$evolution_plugindir"; then echo "$as_me:$LINENO: result: $evolution_plugindir" >&5 echo "${ECHO_T}$evolution_plugindir" >&6 Index: mail-notification.spec =================================================================== RCS file: /cvs/extras/rpms/mail-notification/devel/mail-notification.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- mail-notification.spec 3 Sep 2005 17:00:53 -0000 1.10 +++ mail-notification.spec 22 Sep 2005 17:27:33 -0000 1.11 @@ -1,6 +1,6 @@ Name: mail-notification Version: 2.0 -Release: 3%{?dist} +Release: 5%{?dist} Summary: Status icon that informs you if you have new mail Group: Applications/Internet @@ -10,6 +10,7 @@ Source1: mail-notification-README.FEDORA Patch0: http://savannah.nongnu.org/download/mailnotify/mail-notification-2.0-buildfix.diff Patch1: http://savannah.nongnu.org/download/mailnotify/mail-notification-2.0-gmail-properties-fix.diff +Patch2: mail-notification-evolution.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gettext >= 0.14.1 @@ -24,6 +25,7 @@ BuildRequires: libgcrypt-devel >= 1.2.0 BuildRequires: libicu-devel >= 2.6 BuildRequires: gob2 +BuildRequires: evolution-devel Requires(post): GConf2 @@ -43,10 +45,10 @@ cp %{SOURCE1} ./README.FEDORA %patch0 -b .patch0 %patch1 -b .patch1 - +%patch2 -p1 -b .evolution %build -%configure --disable-evolution +%configure --enable-evolution --with-evolution-source-dir=/usr/include/evolution-2.4 make %{?_smp_mflags} @@ -102,10 +104,12 @@ %{_sysconfdir}/sound/events/mail-notification.soundlist %{_bindir}/* %{_libdir}/bonobo/servers/GNOME_MailNotification.server +%{_libdir}/bonobo/servers/GNOME_MailNotification_Evolution.server %{_datadir}/%{name} %{_datadir}/applications/fedora-mail-notification.desktop %{_datadir}/applications/fedora-mail-notification-properties.desktop %{_datadir}/gnome/help/mail-notification/ +%{_libdir}/evolution/2.4/plugins/* %dir %{_datadir}/omf/mail-notification/ %{_datadir}/omf/mail-notification/mail-notification-C.omf %{_datadir}/pixmaps/mail-notification.png @@ -113,6 +117,12 @@ %changelog +* Thu Sep 22 2005 Thorsten Leemhuis 2.0-5 +- BR evo-devel + +* Tue Sep 20 2005 Radek Vokal 2.0-4 +- add mail-notification-evolution.patch and enable evo-support + * Sat Sep 03 2005 Thorsten Leemhuis - 2.0-3 - rebuild for new icu From fedora-extras-commits at redhat.com Thu Sep 22 17:34:18 2005 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Thu, 22 Sep 2005 13:34:18 -0400 Subject: owners owners.list,1.240,1.241 Message-ID: <200509221734.j8MHYISE021228@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21209 Modified Files: owners.list Log Message: Add gdl Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.240 retrieving revision 1.241 diff -u -r1.240 -r1.241 --- owners.list 22 Sep 2005 15:34:03 -0000 1.240 +++ owners.list 22 Sep 2005 17:34:16 -0000 1.241 @@ -218,6 +218,7 @@ Fedora Extras|gconfmm20|A C++ interface for GTK2 (a GUI library for X)|denisleroy at yahoo.com|extras-qa at fedoraproject.org| Fedora Extras|gconfmm26|A C++ wrapper for GConf2|denisleroy at yahoo.com|extras-qa at fedoraproject.org| Fedora Extras|gdeskcal|Eye-candy calendar for your desktop.|compton at pcompton.com|extras-qa at fedoraproject.org| +Fedora Extras|gdl|GNU Data Language|orion at cora.nwra.com|extras-qa at fedoraproject.org| Fedora Extras|gdome2|DOM level 2 library for accessing XML files|ville.skytta at iki.fi|extras-qa at fedoraproject.org| Fedora Extras|general|For bugs not specific to any single component.|dkl at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|gentoo|Graphical file management program in GTK+ for Linux|matthias at rpmforge.net|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Thu Sep 22 17:36:42 2005 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Thu, 22 Sep 2005 13:36:42 -0400 Subject: rpms/gdl/devel gdl.spec,1.2,1.3 Message-ID: <200509221736.j8MHag4K021309@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/gdl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21290 Modified Files: gdl.spec Log Message: Disable hdf with configure on ppc Index: gdl.spec =================================================================== RCS file: /cvs/extras/rpms/gdl/devel/gdl.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- gdl.spec 22 Sep 2005 17:21:53 -0000 1.2 +++ gdl.spec 22 Sep 2005 17:36:40 -0000 1.3 @@ -1,6 +1,6 @@ Name: gdl Version: 0.8.10 -Release: 2%{?dist} +Release: 3%{?dist} Summary: GNU Data Language Group: Applications/Engineering @@ -16,9 +16,11 @@ BuildRequires: python-devel, python-numarray, python-matplotlib %ifnarch ppc ppc64 BuildRequires: hdf-devel +%define hdfconfig %{nil} %define hdfinclude "-I/usr/include/hdf" %define hdflib "-L%{_libdir}/hdf" %else +%define hdfconfig "--with-hdf=no" %define hdfinclude %{nil} %define hdflib %{nil} %endif @@ -58,6 +60,9 @@ %changelog +* Thu Sep 22 2005 - Orion Poplawski - 0.8.10-3 +- Disable hdf with configure on ppc + * Thu Sep 22 2005 - Orion Poplawski - 0.8.10-2 - Don't include hdf support on ppc From fedora-extras-commits at redhat.com Thu Sep 22 17:48:33 2005 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Thu, 22 Sep 2005 13:48:33 -0400 Subject: rpms/perl-Log-Dispatch/devel perl-Log-Dispatch.spec,1.2,1.3 Message-ID: <200509221748.j8MHmXV9021423@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Log-Dispatch/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21370/devel Modified Files: perl-Log-Dispatch.spec Log Message: - Exclude mod_perl from the requirements list (overkill for most applications using Log::Dispatch). Index: perl-Log-Dispatch.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Log-Dispatch/devel/perl-Log-Dispatch.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-Log-Dispatch.spec 12 Sep 2005 18:49:17 -0000 1.2 +++ perl-Log-Dispatch.spec 22 Sep 2005 17:48:31 -0000 1.3 @@ -8,7 +8,7 @@ Name: perl-Log-Dispatch Version: 2.11 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Dispatches messages to one or more outputs Group: Development/Libraries @@ -46,6 +46,15 @@ %patch1 -p1 %endif +# Requirements list: exclude mod_perl +cat <<__EOF__ > %{name}-perlreq +#!/bin/sh +/usr/lib/rpm/perl.req \$* | grep -v 'perl(Apache' +__EOF__ +%define __perl_requires %{_builddir}/Log-Dispatch-%{version}/%{name}-perlreq +chmod +x %{__perl_requires} + + %build %{__perl} Build.PL installdirs=vendor @@ -74,6 +83,10 @@ %changelog +* Thu Sep 22 2005 Jose Pedro Oliveira - 2.11-3 +- Exclude mod_perl from the requirements list + (overkill for most applications using Log::Dispatch). + * Mon Sep 12 2005 Jose Pedro Oliveira - 2.11-2 - Better mod_perl handling. From fedora-extras-commits at redhat.com Thu Sep 22 17:48:27 2005 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Thu, 22 Sep 2005 13:48:27 -0400 Subject: rpms/perl-Log-Dispatch/FC-3 perl-Log-Dispatch.spec,1.3,1.4 Message-ID: <200509221748.j8MHmvoo021428@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Log-Dispatch/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21370/FC-3 Modified Files: perl-Log-Dispatch.spec Log Message: - Exclude mod_perl from the requirements list (overkill for most applications using Log::Dispatch). Index: perl-Log-Dispatch.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Log-Dispatch/FC-3/perl-Log-Dispatch.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- perl-Log-Dispatch.spec 12 Sep 2005 18:58:23 -0000 1.3 +++ perl-Log-Dispatch.spec 22 Sep 2005 17:48:25 -0000 1.4 @@ -8,7 +8,7 @@ Name: perl-Log-Dispatch Version: 2.11 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Dispatches messages to one or more outputs Group: Development/Libraries @@ -46,6 +46,15 @@ %patch1 -p1 %endif +# Requirements list: exclude mod_perl +cat <<__EOF__ > %{name}-perlreq +#!/bin/sh +/usr/lib/rpm/perl.req \$* | grep -v 'perl(Apache' +__EOF__ +%define __perl_requires %{_builddir}/Log-Dispatch-%{version}/%{name}-perlreq +chmod +x %{__perl_requires} + + %build %{__perl} Build.PL installdirs=vendor @@ -74,6 +83,10 @@ %changelog +* Thu Sep 22 2005 Jose Pedro Oliveira - 2.11-3 +- Exclude mod_perl from the requirements list + (overkill for most applications using Log::Dispatch). + * Mon Sep 12 2005 Jose Pedro Oliveira - 2.11-2 - Better mod_perl handling. From fedora-extras-commits at redhat.com Thu Sep 22 17:48:27 2005 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Thu, 22 Sep 2005 13:48:27 -0400 Subject: rpms/perl-Log-Dispatch/FC-4 perl-Log-Dispatch.spec,1.2,1.3 Message-ID: <200509221748.j8MHmwmp021431@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Log-Dispatch/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21370/FC-4 Modified Files: perl-Log-Dispatch.spec Log Message: - Exclude mod_perl from the requirements list (overkill for most applications using Log::Dispatch). Index: perl-Log-Dispatch.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Log-Dispatch/FC-4/perl-Log-Dispatch.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-Log-Dispatch.spec 12 Sep 2005 18:58:23 -0000 1.2 +++ perl-Log-Dispatch.spec 22 Sep 2005 17:48:25 -0000 1.3 @@ -8,7 +8,7 @@ Name: perl-Log-Dispatch Version: 2.11 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Dispatches messages to one or more outputs Group: Development/Libraries @@ -46,6 +46,15 @@ %patch1 -p1 %endif +# Requirements list: exclude mod_perl +cat <<__EOF__ > %{name}-perlreq +#!/bin/sh +/usr/lib/rpm/perl.req \$* | grep -v 'perl(Apache' +__EOF__ +%define __perl_requires %{_builddir}/Log-Dispatch-%{version}/%{name}-perlreq +chmod +x %{__perl_requires} + + %build %{__perl} Build.PL installdirs=vendor @@ -74,6 +83,10 @@ %changelog +* Thu Sep 22 2005 Jose Pedro Oliveira - 2.11-3 +- Exclude mod_perl from the requirements list + (overkill for most applications using Log::Dispatch). + * Mon Sep 12 2005 Jose Pedro Oliveira - 2.11-2 - Better mod_perl handling. From fedora-extras-commits at redhat.com Thu Sep 22 17:50:16 2005 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Thu, 22 Sep 2005 13:50:16 -0400 Subject: rpms/gdl/devel gdl.spec,1.3,1.4 Message-ID: <200509221750.j8MHoGRg021495@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/gdl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21475 Modified Files: gdl.spec Log Message: Really pass the hdfconfig arg to configure Index: gdl.spec =================================================================== RCS file: /cvs/extras/rpms/gdl/devel/gdl.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- gdl.spec 22 Sep 2005 17:36:40 -0000 1.3 +++ gdl.spec 22 Sep 2005 17:50:14 -0000 1.4 @@ -38,7 +38,7 @@ %build -%configure --disable-static \ +%configure --disable-static %{hdfconfig} \ INCLUDES="-I/usr/include/netcdf-3 %{hdfinclude}" \ LIBS="-L%{_libdir}/netcdf-3 %{hdflib} -L/usr/X11R6/%{_lib}" make %{?_smp_mflags} From fedora-extras-commits at redhat.com Thu Sep 22 18:14:49 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 22 Sep 2005 14:14:49 -0400 Subject: rpms/pychart - New directory Message-ID: <200509221814.j8MIEnMw023279@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/pychart In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23257/pychart Log Message: Directory /cvs/extras/rpms/pychart added to the repository From fedora-extras-commits at redhat.com Thu Sep 22 18:14:49 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 22 Sep 2005 14:14:49 -0400 Subject: rpms/pychart/devel - New directory Message-ID: <200509221814.j8MIEnQk023285@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/pychart/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23257/pychart/devel Log Message: Directory /cvs/extras/rpms/pychart/devel added to the repository From fedora-extras-commits at redhat.com Thu Sep 22 18:15:07 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 22 Sep 2005 14:15:07 -0400 Subject: rpms/pychart Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200509221815.j8MIF7Cd023336@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/pychart In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23307 Added Files: Makefile import.log Log Message: Setup of module pychart --- NEW FILE Makefile --- # Top level Makefile for module pychart all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Thu Sep 22 18:15:07 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 22 Sep 2005 14:15:07 -0400 Subject: rpms/pychart/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200509221815.j8MIF7ax023341@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/pychart/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23307/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module pychart --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Thu Sep 22 18:15:43 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 22 Sep 2005 14:15:43 -0400 Subject: rpms/pychart import.log,1.1,1.2 Message-ID: <200509221816.j8MIGDUU023427@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/pychart In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23382 Modified Files: import.log Log Message: auto-import pychart-1.38-2 on branch devel from pychart-1.38-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/pychart/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 22 Sep 2005 18:15:05 -0000 1.1 +++ import.log 22 Sep 2005 18:15:40 -0000 1.2 @@ -0,0 +1 @@ +pychart-1_38-2:HEAD:pychart-1.38-2.src.rpm:1127412920 From fedora-extras-commits at redhat.com Thu Sep 22 18:15:43 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 22 Sep 2005 14:15:43 -0400 Subject: rpms/pychart/devel pychart.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200509221816.j8MIGD7o023432@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/pychart/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23382/devel Modified Files: .cvsignore sources Added Files: pychart.spec Log Message: auto-import pychart-1.38-2 on branch devel from pychart-1.38-2.src.rpm --- NEW FILE pychart.spec --- %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: pychart Version: 1.38 Release: 2%{?dist} License: GPL Group: System Environment/Libraries Summary: Python library for generating chart images URL: http://home.gna.org/pychart/ Source0: http://download.gna.org/pychart/PyChart-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ghostscript-devel BuildArch: noarch %description PyChart is a Python library for creating high quality Encapsulated Postscript, PDF, PNG, or SVG charts. It currently supports line plots, bar plots, range-fill plots, and pie charts. Because it is based on Python, you can make full use of Python's scripting power. %package doc Summary: Documentation for using pychart in python programs Group: Documentation Requires: %{name} = %{version}-%{release} %description doc PyChart is a Python library for creating high quality Encapsulated Postscript, PDF, PNG, or SVG charts. It currently supports line plots, bar plots, range-fill plots, and pie charts. Because it is based on Python, you can make full use of Python's scripting power. Install this package if you want the developers' documentation and examples that tell you how to program with the pychart library. %prep %setup -q -n PyChart-%{version} %build %{__python} setup.py build cd doc/ make %install rm -rf $RPM_BUILD_ROOT %{__python} setup.py install --skip-build --root=$RPM_BUILD_ROOT %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc COPYING %{python_sitelib}/pychart/ %files doc %defattr(-,root,root,-) %doc doc/examples doc/pychart %changelog * Mon Sep 19 2005 Toshio Kuratomi 1.38-2 - Create a doc subpackage with the developers documentation * Sat Sep 17 2005 Tom "spot" Callaway 1.38-1 - initial package for Fedora Extras Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/pychart/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 22 Sep 2005 18:15:05 -0000 1.1 +++ .cvsignore 22 Sep 2005 18:15:41 -0000 1.2 @@ -0,0 +1 @@ +PyChart-1.38.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/pychart/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 22 Sep 2005 18:15:05 -0000 1.1 +++ sources 22 Sep 2005 18:15:41 -0000 1.2 @@ -0,0 +1 @@ +30b41cb4e0cd4957a8e54b0a58ee48a2 PyChart-1.38.tar.gz From fedora-extras-commits at redhat.com Thu Sep 22 18:19:12 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 22 Sep 2005 14:19:12 -0400 Subject: owners owners.list,1.241,1.242 Message-ID: <200509221819.j8MIJCTL023681@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23662 Modified Files: owners.list Log Message: pychart Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.241 retrieving revision 1.242 diff -u -r1.241 -r1.242 --- owners.list 22 Sep 2005 17:34:16 -0000 1.241 +++ owners.list 22 Sep 2005 18:19:10 -0000 1.242 @@ -820,6 +820,7 @@ Fedora Extras|pure-ftpd|Lightweight, fast and secure FTP server|gauret at free.fr|extras-qa at fedoraproject.org| Fedora Extras|putty|Putty - a SSH, Telnet & Rlogin client|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| Fedora Extras|pybliographer|A framework for working with bibliographic databases|z.kota at gmx.net|extras-qa at fedoraproject.org| +Fedora Extras|pychart|Python library for generating chart images|tcallawa at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|pylint|Analyzes Python code looking for bugs and signs of poor quality|icon at linux.duke.edu|extras-qa at fedoraproject.org| Fedora Extras|pyparsing|An object-oriented approach to text processing|ivazquez at ivazquez.net|extras-qa at fedoraproject.org| Fedora Extras|PyRTF|Rich Text Format (RTF) Document Generation in Python|mpeters at mac.com|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Thu Sep 22 18:28:55 2005 From: fedora-extras-commits at redhat.com (José Abílio Oliveira Matos (jamatos)) Date: Thu, 22 Sep 2005 14:28:55 -0400 Subject: owners owners.list,1.242,1.243 Message-ID: <200509221828.j8MIStKh023847@cvs-int.fedora.redhat.com> Author: jamatos Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23828 Modified Files: owners.list Log Message: fix ownership of pygsl Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.242 retrieving revision 1.243 diff -u -r1.242 -r1.243 --- owners.list 22 Sep 2005 18:19:10 -0000 1.242 +++ owners.list 22 Sep 2005 18:28:53 -0000 1.243 @@ -854,7 +854,7 @@ Fedora Extras|python-sqlite|Python bindings for SQLite|thomas at apestaart.org|extras-qa at fedoraproject.org| Fedora Extras|python-tpg|Toy Parser Generator|shahms at shahms.com|extras-qa at fedoraproject.org| Fedora Extras|python-twisted|Event-driven networking framework written in Python|thomas at apestaart.org|extras-qa at fedoraproject.org| -Fedora Extras|pygsl|GNU Scientific Library Interface for python|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| +Fedora Extras|pygsl|GNU Scientific Library Interface for python|jamatos at fc.up.pt|extras-qa at fedoraproject.org| Fedora Extras|pytz|World Timezone Definitions for Python|orion at cora.nwra.com|extras-qa at fedoraproject.org| Fedora Extras|pyxdg|PyXDG is a python library to access freedesktop.org standards|jpmahowald at gmail.com|extras-qa at fedoraproject.org|foolish at guezz.net Fedora Extras|pyzor|Pyzor collaborative spam filtering system|wtogami at redhat.com|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Thu Sep 22 18:45:46 2005 From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj)) Date: Thu, 22 Sep 2005 14:45:46 -0400 Subject: rpms/mercurial/devel mercurial.spec,1.4,1.5 Message-ID: <200509221845.j8MIjk3I023910@cvs-int.fedora.redhat.com> Author: katzj Update of /cvs/extras/rpms/mercurial/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23891 Modified Files: mercurial.spec Log Message: * Thu Sep 22 2005 Jeremy Katz - add contributors to %doc Index: mercurial.spec =================================================================== RCS file: /cvs/extras/rpms/mercurial/devel/mercurial.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- mercurial.spec 20 Sep 2005 21:07:51 -0000 1.4 +++ mercurial.spec 22 Sep 2005 18:45:44 -0000 1.5 @@ -30,10 +30,13 @@ %files -f %{name}.files %defattr(-,root,root,-) -%doc README doc/hg.1.txt doc/hgmerge.1.txt doc/hgrc.5.txt +%doc CONTRIBUTORS README doc/hg.1.txt doc/hgmerge.1.txt doc/hgrc.5.txt %changelog +* Thu Sep 22 2005 Jeremy Katz +- add contributors to %%doc + * Tue Sep 20 2005 Jeremy Katz - 0.7 - update to 0.7 From fedora-extras-commits at redhat.com Thu Sep 22 18:46:22 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 22 Sep 2005 14:46:22 -0400 Subject: rpms/rekall/devel .cvsignore, 1.2, 1.3 rekall-2.2.3-64bitfix.patch, 1.1, 1.2 rekall.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200509221846.j8MIkMi2023988@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/rekall/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23916/devel Modified Files: .cvsignore rekall-2.2.3-64bitfix.patch rekall.spec sources Log Message: fix 64bit long issue, go to new version of rekall Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/rekall/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 19 Sep 2005 15:49:51 -0000 1.2 +++ .cvsignore 22 Sep 2005 18:46:20 -0000 1.3 @@ -1 +1,2 @@ rekall-2.2.3-2.tar.gz +rekall-2.2.4-2.tar.gz rekall-2.2.3-64bitfix.patch: Index: rekall-2.2.3-64bitfix.patch =================================================================== RCS file: /cvs/extras/rpms/rekall/devel/rekall-2.2.3-64bitfix.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- rekall-2.2.3-64bitfix.patch 19 Sep 2005 15:49:51 -0000 1.1 +++ rekall-2.2.3-64bitfix.patch 22 Sep 2005 18:46:20 -0000 1.2 @@ -27,3 +27,14 @@ mysql_libdir=NO for i in $mysql_libdirs; +--- rekall-2.2.3/libs/el32/hash.cpp.BAD 2005-09-22 13:34:45.000000000 -0500 ++++ rekall-2.2.3/libs/el32/hash.cpp 2005-09-22 13:34:53.000000000 -0500 +@@ -141,7 +141,7 @@ + /* otherwise use just the tag (pretty useless */ + /* but so what, not a common case). */ + if ((key.tag->flags & TF_SHARED) == 0) +- hval = (int)key.val.shared ; ++ hval = (long)key.val.shared ; + else hval = key.tag->tag ; + break ; + } Index: rekall.spec =================================================================== RCS file: /cvs/extras/rpms/rekall/devel/rekall.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- rekall.spec 19 Sep 2005 15:49:51 -0000 1.1 +++ rekall.spec 22 Sep 2005 18:46:20 -0000 1.2 @@ -1,7 +1,7 @@ Name: rekall Summary: A KDE database front-end application -Version: 2.2.3 -Release: 5%{?dist} +Version: 2.2.4 +Release: 1%{?dist} Group: Development/Tools License: GPL URL: http://www.rekallrevealed.org/ @@ -336,6 +336,10 @@ %{_libdir}/librekallrt.la %changelog +* Thu Sep 22 2005 Tom "spot" Callaway 2.2.4-1 +- go to 2.2.4 +- fix 64 bit long issue + * Mon Sep 19 2005 Tom "spot" Callaway 2.2.3-5 - get rid of unnecessary BR: xbase-devel and qt-devel Index: sources =================================================================== RCS file: /cvs/extras/rpms/rekall/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 19 Sep 2005 15:49:51 -0000 1.2 +++ sources 22 Sep 2005 18:46:20 -0000 1.3 @@ -1 +1 @@ -0c27445eb9d58877067d60c94ef0dca9 rekall-2.2.3-2.tar.gz +437b45a98884cd9e192ff8c0a5a7e286 rekall-2.2.4-2.tar.gz From fedora-extras-commits at redhat.com Thu Sep 22 18:46:17 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 22 Sep 2005 14:46:17 -0400 Subject: rpms/rekall/FC-4 rekall-2.2.3-64bitfix.patch, 1.1, 1.2 rekall.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200509221846.j8MIkluO023998@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/rekall/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23916/FC-4 Modified Files: rekall-2.2.3-64bitfix.patch rekall.spec sources Log Message: fix 64bit long issue, go to new version of rekall rekall-2.2.3-64bitfix.patch: Index: rekall-2.2.3-64bitfix.patch =================================================================== RCS file: /cvs/extras/rpms/rekall/FC-4/rekall-2.2.3-64bitfix.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- rekall-2.2.3-64bitfix.patch 19 Sep 2005 15:49:51 -0000 1.1 +++ rekall-2.2.3-64bitfix.patch 22 Sep 2005 18:46:15 -0000 1.2 @@ -27,3 +27,14 @@ mysql_libdir=NO for i in $mysql_libdirs; +--- rekall-2.2.3/libs/el32/hash.cpp.BAD 2005-09-22 13:34:45.000000000 -0500 ++++ rekall-2.2.3/libs/el32/hash.cpp 2005-09-22 13:34:53.000000000 -0500 +@@ -141,7 +141,7 @@ + /* otherwise use just the tag (pretty useless */ + /* but so what, not a common case). */ + if ((key.tag->flags & TF_SHARED) == 0) +- hval = (int)key.val.shared ; ++ hval = (long)key.val.shared ; + else hval = key.tag->tag ; + break ; + } Index: rekall.spec =================================================================== RCS file: /cvs/extras/rpms/rekall/FC-4/rekall.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- rekall.spec 19 Sep 2005 15:49:51 -0000 1.1 +++ rekall.spec 22 Sep 2005 18:46:15 -0000 1.2 @@ -1,7 +1,7 @@ Name: rekall Summary: A KDE database front-end application -Version: 2.2.3 -Release: 5%{?dist} +Version: 2.2.4 +Release: 1%{?dist} Group: Development/Tools License: GPL URL: http://www.rekallrevealed.org/ @@ -336,6 +336,10 @@ %{_libdir}/librekallrt.la %changelog +* Thu Sep 22 2005 Tom "spot" Callaway 2.2.4-1 +- go to 2.2.4 +- fix 64 bit long issue + * Mon Sep 19 2005 Tom "spot" Callaway 2.2.3-5 - get rid of unnecessary BR: xbase-devel and qt-devel Index: sources =================================================================== RCS file: /cvs/extras/rpms/rekall/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 19 Sep 2005 15:49:51 -0000 1.2 +++ sources 22 Sep 2005 18:46:15 -0000 1.3 @@ -1 +1 @@ -0c27445eb9d58877067d60c94ef0dca9 rekall-2.2.3-2.tar.gz +437b45a98884cd9e192ff8c0a5a7e286 rekall-2.2.4-2.tar.gz From fedora-extras-commits at redhat.com Thu Sep 22 18:46:16 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 22 Sep 2005 14:46:16 -0400 Subject: rpms/rekall/FC-3 rekall-2.2.3-64bitfix.patch, 1.1, 1.2 rekall.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200509221846.j8MIklwr023993@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/rekall/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23916/FC-3 Modified Files: rekall-2.2.3-64bitfix.patch rekall.spec sources Log Message: fix 64bit long issue, go to new version of rekall rekall-2.2.3-64bitfix.patch: Index: rekall-2.2.3-64bitfix.patch =================================================================== RCS file: /cvs/extras/rpms/rekall/FC-3/rekall-2.2.3-64bitfix.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- rekall-2.2.3-64bitfix.patch 19 Sep 2005 15:49:51 -0000 1.1 +++ rekall-2.2.3-64bitfix.patch 22 Sep 2005 18:46:14 -0000 1.2 @@ -27,3 +27,14 @@ mysql_libdir=NO for i in $mysql_libdirs; +--- rekall-2.2.3/libs/el32/hash.cpp.BAD 2005-09-22 13:34:45.000000000 -0500 ++++ rekall-2.2.3/libs/el32/hash.cpp 2005-09-22 13:34:53.000000000 -0500 +@@ -141,7 +141,7 @@ + /* otherwise use just the tag (pretty useless */ + /* but so what, not a common case). */ + if ((key.tag->flags & TF_SHARED) == 0) +- hval = (int)key.val.shared ; ++ hval = (long)key.val.shared ; + else hval = key.tag->tag ; + break ; + } Index: rekall.spec =================================================================== RCS file: /cvs/extras/rpms/rekall/FC-3/rekall.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- rekall.spec 19 Sep 2005 15:49:51 -0000 1.1 +++ rekall.spec 22 Sep 2005 18:46:14 -0000 1.2 @@ -1,7 +1,7 @@ Name: rekall Summary: A KDE database front-end application -Version: 2.2.3 -Release: 5%{?dist} +Version: 2.2.4 +Release: 1%{?dist} Group: Development/Tools License: GPL URL: http://www.rekallrevealed.org/ @@ -336,6 +336,10 @@ %{_libdir}/librekallrt.la %changelog +* Thu Sep 22 2005 Tom "spot" Callaway 2.2.4-1 +- go to 2.2.4 +- fix 64 bit long issue + * Mon Sep 19 2005 Tom "spot" Callaway 2.2.3-5 - get rid of unnecessary BR: xbase-devel and qt-devel Index: sources =================================================================== RCS file: /cvs/extras/rpms/rekall/FC-3/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 19 Sep 2005 15:49:51 -0000 1.2 +++ sources 22 Sep 2005 18:46:14 -0000 1.3 @@ -1 +1 @@ -0c27445eb9d58877067d60c94ef0dca9 rekall-2.2.3-2.tar.gz +437b45a98884cd9e192ff8c0a5a7e286 rekall-2.2.4-2.tar.gz From fedora-extras-commits at redhat.com Thu Sep 22 19:32:01 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 22 Sep 2005 15:32:01 -0400 Subject: rpms/rekall/devel rekall-2.2.3-64bitfix.patch, 1.2, 1.3 rekall.spec, 1.2, 1.3 Message-ID: <200509221932.j8MJW1W5025655@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/rekall/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25589/devel Modified Files: rekall-2.2.3-64bitfix.patch rekall.spec Log Message: more 64 bit precision issues rekall-2.2.3-64bitfix.patch: Index: rekall-2.2.3-64bitfix.patch =================================================================== RCS file: /cvs/extras/rpms/rekall/devel/rekall-2.2.3-64bitfix.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- rekall-2.2.3-64bitfix.patch 22 Sep 2005 18:46:20 -0000 1.2 +++ rekall-2.2.3-64bitfix.patch 22 Sep 2005 19:31:59 -0000 1.3 @@ -38,3 +38,32 @@ else hval = key.tag->tag ; break ; } +--- rekall-2.2.4/libs/kbase/kb_parse.cpp.BAD 2005-09-22 14:29:36.000000000 -0500 ++++ rekall-2.2.4/libs/kbase/kb_parse.cpp 2005-09-22 14:29:52.000000000 -0500 +@@ -971,7 +971,7 @@ + receiver, + SLOT (newNode(int)), + 0, +- (int)nsItem ++ (long)nsItem + ) ; + + sep = true ; +@@ -1025,7 +1025,7 @@ + receiver, + SLOT (newNode(int)), + 0, +- (int)nsItem ++ (long)nsItem + ) ; + } + +@@ -1043,7 +1043,7 @@ + receiver, + SLOT (newNode(int)), + 0, +- (int)exItem ++ (long)exItem + ) ; + ) + Index: rekall.spec =================================================================== RCS file: /cvs/extras/rpms/rekall/devel/rekall.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- rekall.spec 22 Sep 2005 18:46:20 -0000 1.2 +++ rekall.spec 22 Sep 2005 19:31:59 -0000 1.3 @@ -1,7 +1,7 @@ Name: rekall Summary: A KDE database front-end application Version: 2.2.4 -Release: 1%{?dist} +Release: 2%{?dist} Group: Development/Tools License: GPL URL: http://www.rekallrevealed.org/ @@ -336,6 +336,9 @@ %{_libdir}/librekallrt.la %changelog +* Thu Sep 22 2005 Tom "spot" Callaway 2.2.4-2 +- another 64 bit long issue + * Thu Sep 22 2005 Tom "spot" Callaway 2.2.4-1 - go to 2.2.4 - fix 64 bit long issue From fedora-extras-commits at redhat.com Thu Sep 22 19:31:55 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 22 Sep 2005 15:31:55 -0400 Subject: rpms/rekall/FC-3 rekall-2.2.3-64bitfix.patch, 1.2, 1.3 rekall.spec, 1.2, 1.3 Message-ID: <200509221932.j8MJWQx1025661@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/rekall/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25589/FC-3 Modified Files: rekall-2.2.3-64bitfix.patch rekall.spec Log Message: more 64 bit precision issues rekall-2.2.3-64bitfix.patch: Index: rekall-2.2.3-64bitfix.patch =================================================================== RCS file: /cvs/extras/rpms/rekall/FC-3/rekall-2.2.3-64bitfix.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- rekall-2.2.3-64bitfix.patch 22 Sep 2005 18:46:14 -0000 1.2 +++ rekall-2.2.3-64bitfix.patch 22 Sep 2005 19:31:53 -0000 1.3 @@ -38,3 +38,32 @@ else hval = key.tag->tag ; break ; } +--- rekall-2.2.4/libs/kbase/kb_parse.cpp.BAD 2005-09-22 14:29:36.000000000 -0500 ++++ rekall-2.2.4/libs/kbase/kb_parse.cpp 2005-09-22 14:29:52.000000000 -0500 +@@ -971,7 +971,7 @@ + receiver, + SLOT (newNode(int)), + 0, +- (int)nsItem ++ (long)nsItem + ) ; + + sep = true ; +@@ -1025,7 +1025,7 @@ + receiver, + SLOT (newNode(int)), + 0, +- (int)nsItem ++ (long)nsItem + ) ; + } + +@@ -1043,7 +1043,7 @@ + receiver, + SLOT (newNode(int)), + 0, +- (int)exItem ++ (long)exItem + ) ; + ) + Index: rekall.spec =================================================================== RCS file: /cvs/extras/rpms/rekall/FC-3/rekall.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- rekall.spec 22 Sep 2005 18:46:14 -0000 1.2 +++ rekall.spec 22 Sep 2005 19:31:53 -0000 1.3 @@ -1,7 +1,7 @@ Name: rekall Summary: A KDE database front-end application Version: 2.2.4 -Release: 1%{?dist} +Release: 2%{?dist} Group: Development/Tools License: GPL URL: http://www.rekallrevealed.org/ @@ -336,6 +336,9 @@ %{_libdir}/librekallrt.la %changelog +* Thu Sep 22 2005 Tom "spot" Callaway 2.2.4-2 +- another 64 bit long issue + * Thu Sep 22 2005 Tom "spot" Callaway 2.2.4-1 - go to 2.2.4 - fix 64 bit long issue From fedora-extras-commits at redhat.com Thu Sep 22 19:31:56 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 22 Sep 2005 15:31:56 -0400 Subject: rpms/rekall/FC-4 rekall-2.2.3-64bitfix.patch, 1.2, 1.3 rekall.spec, 1.2, 1.3 Message-ID: <200509221932.j8MJWQZV025665@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/rekall/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25589/FC-4 Modified Files: rekall-2.2.3-64bitfix.patch rekall.spec Log Message: more 64 bit precision issues rekall-2.2.3-64bitfix.patch: Index: rekall-2.2.3-64bitfix.patch =================================================================== RCS file: /cvs/extras/rpms/rekall/FC-4/rekall-2.2.3-64bitfix.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- rekall-2.2.3-64bitfix.patch 22 Sep 2005 18:46:15 -0000 1.2 +++ rekall-2.2.3-64bitfix.patch 22 Sep 2005 19:31:54 -0000 1.3 @@ -38,3 +38,32 @@ else hval = key.tag->tag ; break ; } +--- rekall-2.2.4/libs/kbase/kb_parse.cpp.BAD 2005-09-22 14:29:36.000000000 -0500 ++++ rekall-2.2.4/libs/kbase/kb_parse.cpp 2005-09-22 14:29:52.000000000 -0500 +@@ -971,7 +971,7 @@ + receiver, + SLOT (newNode(int)), + 0, +- (int)nsItem ++ (long)nsItem + ) ; + + sep = true ; +@@ -1025,7 +1025,7 @@ + receiver, + SLOT (newNode(int)), + 0, +- (int)nsItem ++ (long)nsItem + ) ; + } + +@@ -1043,7 +1043,7 @@ + receiver, + SLOT (newNode(int)), + 0, +- (int)exItem ++ (long)exItem + ) ; + ) + Index: rekall.spec =================================================================== RCS file: /cvs/extras/rpms/rekall/FC-4/rekall.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- rekall.spec 22 Sep 2005 18:46:15 -0000 1.2 +++ rekall.spec 22 Sep 2005 19:31:54 -0000 1.3 @@ -1,7 +1,7 @@ Name: rekall Summary: A KDE database front-end application Version: 2.2.4 -Release: 1%{?dist} +Release: 2%{?dist} Group: Development/Tools License: GPL URL: http://www.rekallrevealed.org/ @@ -336,6 +336,9 @@ %{_libdir}/librekallrt.la %changelog +* Thu Sep 22 2005 Tom "spot" Callaway 2.2.4-2 +- another 64 bit long issue + * Thu Sep 22 2005 Tom "spot" Callaway 2.2.4-1 - go to 2.2.4 - fix 64 bit long issue From fedora-extras-commits at redhat.com Thu Sep 22 19:33:16 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 22 Sep 2005 15:33:16 -0400 Subject: rpms/maxima/FC-4 maxima.spec,1.6,1.7 Message-ID: <200509221933.j8MJXG0N025703@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/maxima/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25684 Modified Files: maxima.spec Log Message: * Thu Sep 22 2005 Rex Dieter 5.9.1.9rc1-3 - runtime-clisp: workaround "cpio: MD5 sum mismatch" error - --with-gcl - make %_libdir/maxima owned by runtime pkgs Index: maxima.spec =================================================================== RCS file: /cvs/extras/rpms/maxima/FC-4/maxima.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- maxima.spec 22 Sep 2005 12:37:22 -0000 1.6 +++ maxima.spec 22 Sep 2005 19:33:14 -0000 1.7 @@ -2,7 +2,7 @@ ## Which runtimes to build/enable? %define _with_clisp 1 %define _without_cmucl 1 -%define _without_gcl 1 +%define _with_gcl 1 %define _with_sbcl 1 %define beta rc1 @@ -11,7 +11,7 @@ Name: maxima Version: 5.9.1.9rc1 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL Group: Applications/Engineering URL: http://maxima.sourceforge.net/ @@ -37,7 +37,7 @@ # Inhibit automatic compressing of info files. Compressed info # files break maxima's internal help. %define __spec_install_post %{nil} -# debuginfo is empty/blank (when using gcl?), disable +# debuginfo.list ends up empty/blank anyway. disable %define debug_package %{nil} BuildRequires: texinfo @@ -77,6 +77,8 @@ %{name} lisp source code. %if "%{?_with_clisp:1}" == "1" +# to workaround mysterious(?) "cpio: MD5 sum mismatch" errors on this subpkg +%define __prelink_undo_cmd %{nil} %package runtime-clisp Summary: Maxima compiled with clisp Group: Applications/Engineering @@ -261,8 +263,6 @@ %{_datadir}/maxima/%{version}/[a-c,f-r,t-w,y-z,A-Z]* %{_datadir}/maxima/%{version}/demo/ %{_datadir}/maxima/%{version}/share/ -%dir %{_libdir}/maxima -%dir %{_libdir}/maxima/%{version} %{_libexecdir}/maxima %{_infodir}/*.info* %{_mandir}/man1/maxima.* @@ -286,29 +286,42 @@ %if "%{?_with_clisp:1}" == "1" %files runtime-clisp %defattr(-,root,root) +%dir %{_libdir}/maxima/ +%dir %{_libdir}/maxima/%{version}/ %{_libdir}/maxima/%{version}/binary-clisp %endif %if "%{?_with_cmucl:1}" == "1" %files runtime-cmucl %defattr(-,root,root) +%dir %{_libdir}/maxima/ +%dir %{_libdir}/maxima/%{version}/ %{_libdir}/maxima/%{version}/binary-cmucl %endif %if "%{?_with_gcl:1}" == "1" %files runtime-gcl %defattr(-,root,root) +%dir %{_libdir}/maxima/ +%dir %{_libdir}/maxima/%{version}/ %{_libdir}/maxima/%{version}/binary-gcl %endif %if "%{?_with_sbcl:1}" == "1" %files runtime-sbcl %defattr(-,root,root) +%dir %{_libdir}/maxima/ +%dir %{_libdir}/maxima/%{version}/ %{_libdir}/maxima/%{version}/binary-sbcl %endif %changelog +* Thu Sep 22 2005 Rex Dieter 5.9.1.9rc1-3 +- runtime-clisp: workaround "cpio: MD5 sum mismatch" error +- --with-gcl +- make %%_libdir/maxima owned by runtime pkgs + * Fri Sep 16 2005 Rex Dieter 5.9.1.9rc1-2 - -runtime-sbcl: with sbcl_ver macro - use versioned maxima-exec Obsoletes. From fedora-extras-commits at redhat.com Thu Sep 22 19:34:32 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 22 Sep 2005 15:34:32 -0400 Subject: rpms/maxima/FC-4 maxima.spec,1.7,1.8 Message-ID: <200509221934.j8MJYW8x025852@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/maxima/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25833 Modified Files: maxima.spec Log Message: move doc generation to end of %%build Index: maxima.spec =================================================================== RCS file: /cvs/extras/rpms/maxima/FC-4/maxima.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- maxima.spec 22 Sep 2005 19:33:14 -0000 1.7 +++ maxima.spec 22 Sep 2005 19:34:30 -0000 1.8 @@ -165,6 +165,8 @@ %{?_with_gcl: --enable-gcl }%{?_without_gcl: --disable-gcl } \ %{?_with_sbcl: --enable-sbcl }%{?_without_sbcl: --disable-sbcl } +make %{?_smp_mflags} + # docs pushd doc @@ -180,9 +182,6 @@ popd -# everything else -make %{?_smp_mflags} - %check || : make check From fedora-extras-commits at redhat.com Thu Sep 22 19:44:13 2005 From: fedora-extras-commits at redhat.com (Chris Wright (chrisw)) Date: Thu, 22 Sep 2005 15:44:13 -0400 Subject: rpms/git-core/devel .cvsignore, 1.4, 1.5 git-core.spec, 1.3, 1.4 sources, 1.4, 1.5 Message-ID: <200509221944.j8MJiDJU025989@cvs-int.fedora.redhat.com> Author: chrisw Update of /cvs/extras/rpms/git-core/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25966 Modified Files: .cvsignore git-core.spec sources Log Message: Update git-core to 0.99.7a (bugfix release) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/git-core/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 19 Sep 2005 22:23:57 -0000 1.4 +++ .cvsignore 22 Sep 2005 19:44:11 -0000 1.5 @@ -1 +1 @@ -git-core-0.99.7.tar.gz +git-core-0.99.7a.tar.gz Index: git-core.spec =================================================================== RCS file: /cvs/extras/rpms/git-core/devel/git-core.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- git-core.spec 19 Sep 2005 22:23:57 -0000 1.3 +++ git-core.spec 22 Sep 2005 19:44:11 -0000 1.4 @@ -1,6 +1,6 @@ # Pass --without docs to rpmbuild if you don't want the documetnation Name: git-core -Version: 0.99.7 +Version: 0.99.7a Release: 1%{?dist} Summary: Git core and tools License: GPL @@ -9,7 +9,7 @@ Source: http://kernel.org/pub/software/scm/git/%{name}-%{version}.tar.gz BuildRequires: zlib-devel, openssl-devel, curl-devel %{!?_without_docs:, xmlto, asciidoc > 6.0.3} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires: rsync, rcs, curl, less, openssh-clients, python >= 2.4, tk +Requires: rsync, rcs, curl, less, openssh-clients, python >= 2.3, tk %description This is a stupid (but extremely fast) directory content manager. It @@ -23,11 +23,13 @@ %setup -q %build -make COPTS="$RPM_OPT_FLAGS" prefix=%{_prefix} all %{!?_without_docs: doc} +make COPTS="$RPM_OPT_FLAGS" WITH_OWN_SUBPROCESS_PY=YesPlease \ + prefix=%{_prefix} all %{!?_without_docs: doc} %install rm -rf $RPM_BUILD_ROOT -make DESTDIR=$RPM_BUILD_ROOT prefix=%{_prefix} mandir=%{_mandir} \ +make DESTDIR=$RPM_BUILD_ROOT WITH_OWN_SUBPROCESS_PY=YesPlease \ + prefix=%{_prefix} mandir=%{_mandir} \ install %{!?_without_docs: install-doc} %clean Index: sources =================================================================== RCS file: /cvs/extras/rpms/git-core/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 19 Sep 2005 22:23:57 -0000 1.4 +++ sources 22 Sep 2005 19:44:11 -0000 1.5 @@ -1 +1 @@ -0035da109f1e0f9f4fdbd425f2f6723b git-core-0.99.7.tar.gz +9c1f316a34f00e1b595cc0063010a213 git-core-0.99.7a.tar.gz From fedora-extras-commits at redhat.com Thu Sep 22 19:46:02 2005 From: fedora-extras-commits at redhat.com (Chris Wright (chrisw)) Date: Thu, 22 Sep 2005 15:46:02 -0400 Subject: rpms/git-core/FC-4 .cvsignore, 1.4, 1.5 git-core.spec, 1.3, 1.4 sources, 1.4, 1.5 Message-ID: <200509221946.j8MJk2pv026074@cvs-int.fedora.redhat.com> Author: chrisw Update of /cvs/extras/rpms/git-core/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26051 Modified Files: .cvsignore git-core.spec sources Log Message: Update git-core to 0.99.7a (bugfix release) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/git-core/FC-4/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 19 Sep 2005 22:34:57 -0000 1.4 +++ .cvsignore 22 Sep 2005 19:46:00 -0000 1.5 @@ -1 +1 @@ -git-core-0.99.7.tar.gz +git-core-0.99.7a.tar.gz Index: git-core.spec =================================================================== RCS file: /cvs/extras/rpms/git-core/FC-4/git-core.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- git-core.spec 19 Sep 2005 22:34:57 -0000 1.3 +++ git-core.spec 22 Sep 2005 19:46:00 -0000 1.4 @@ -1,6 +1,6 @@ # Pass --without docs to rpmbuild if you don't want the documetnation Name: git-core -Version: 0.99.7 +Version: 0.99.7a Release: 1%{?dist} Summary: Git core and tools License: GPL @@ -9,7 +9,7 @@ Source: http://kernel.org/pub/software/scm/git/%{name}-%{version}.tar.gz BuildRequires: zlib-devel, openssl-devel, curl-devel %{!?_without_docs:, xmlto, asciidoc > 6.0.3} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires: rsync, rcs, curl, less, openssh-clients, python >= 2.4, tk +Requires: rsync, rcs, curl, less, openssh-clients, python >= 2.3, tk %description This is a stupid (but extremely fast) directory content manager. It @@ -23,11 +23,13 @@ %setup -q %build -make COPTS="$RPM_OPT_FLAGS" prefix=%{_prefix} all %{!?_without_docs: doc} +make COPTS="$RPM_OPT_FLAGS" WITH_OWN_SUBPROCESS_PY=YesPlease \ + prefix=%{_prefix} all %{!?_without_docs: doc} %install rm -rf $RPM_BUILD_ROOT -make DESTDIR=$RPM_BUILD_ROOT prefix=%{_prefix} mandir=%{_mandir} \ +make DESTDIR=$RPM_BUILD_ROOT WITH_OWN_SUBPROCESS_PY=YesPlease \ + prefix=%{_prefix} mandir=%{_mandir} \ install %{!?_without_docs: install-doc} %clean Index: sources =================================================================== RCS file: /cvs/extras/rpms/git-core/FC-4/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 19 Sep 2005 22:34:57 -0000 1.4 +++ sources 22 Sep 2005 19:46:00 -0000 1.5 @@ -1 +1 @@ -0035da109f1e0f9f4fdbd425f2f6723b git-core-0.99.7.tar.gz +9c1f316a34f00e1b595cc0063010a213 git-core-0.99.7a.tar.gz From fedora-extras-commits at redhat.com Thu Sep 22 19:47:54 2005 From: fedora-extras-commits at redhat.com (Chris Wright (chrisw)) Date: Thu, 22 Sep 2005 15:47:54 -0400 Subject: rpms/git-core/FC-3 .cvsignore, 1.4, 1.5 git-core.spec, 1.3, 1.4 sources, 1.4, 1.5 Message-ID: <200509221947.j8MJlshR026182@cvs-int.fedora.redhat.com> Author: chrisw Update of /cvs/extras/rpms/git-core/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26159 Modified Files: .cvsignore git-core.spec sources Log Message: Update git-core to 0.99.7a (bugfix release) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/git-core/FC-3/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 19 Sep 2005 22:32:09 -0000 1.4 +++ .cvsignore 22 Sep 2005 19:47:52 -0000 1.5 @@ -1 +1 @@ -git-core-0.99.7.tar.gz +git-core-0.99.7a.tar.gz Index: git-core.spec =================================================================== RCS file: /cvs/extras/rpms/git-core/FC-3/git-core.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- git-core.spec 19 Sep 2005 22:32:09 -0000 1.3 +++ git-core.spec 22 Sep 2005 19:47:52 -0000 1.4 @@ -1,6 +1,6 @@ # Pass --without docs to rpmbuild if you don't want the documetnation Name: git-core -Version: 0.99.7 +Version: 0.99.7a Release: 1%{?dist} Summary: Git core and tools License: GPL @@ -9,7 +9,7 @@ Source: http://kernel.org/pub/software/scm/git/%{name}-%{version}.tar.gz BuildRequires: zlib-devel, openssl-devel, curl-devel %{!?_without_docs:, xmlto, asciidoc > 6.0.3} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires: rsync, rcs, curl, less, openssh-clients, python >= 2.4, tk +Requires: rsync, rcs, curl, less, openssh-clients, python >= 2.3, tk %description This is a stupid (but extremely fast) directory content manager. It @@ -23,11 +23,13 @@ %setup -q %build -make COPTS="$RPM_OPT_FLAGS" prefix=%{_prefix} all %{!?_without_docs: doc} +make COPTS="$RPM_OPT_FLAGS" WITH_OWN_SUBPROCESS_PY=YesPlease \ + prefix=%{_prefix} all %{!?_without_docs: doc} %install rm -rf $RPM_BUILD_ROOT -make DESTDIR=$RPM_BUILD_ROOT prefix=%{_prefix} mandir=%{_mandir} \ +make DESTDIR=$RPM_BUILD_ROOT WITH_OWN_SUBPROCESS_PY=YesPlease \ + prefix=%{_prefix} mandir=%{_mandir} \ install %{!?_without_docs: install-doc} %clean Index: sources =================================================================== RCS file: /cvs/extras/rpms/git-core/FC-3/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 19 Sep 2005 22:32:09 -0000 1.4 +++ sources 22 Sep 2005 19:47:52 -0000 1.5 @@ -1 +1 @@ -0035da109f1e0f9f4fdbd425f2f6723b git-core-0.99.7.tar.gz +9c1f316a34f00e1b595cc0063010a213 git-core-0.99.7a.tar.gz From fedora-extras-commits at redhat.com Thu Sep 22 20:58:03 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 22 Sep 2005 16:58:03 -0400 Subject: rpms/rekall/FC-3 rekall-2.2.3-64bitfix.patch, 1.3, 1.4 rekall.spec, 1.3, 1.4 Message-ID: <200509222058.j8MKw3LP027874@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/rekall/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27820/FC-3 Modified Files: rekall-2.2.3-64bitfix.patch rekall.spec Log Message: yet another 64bit fix rekall-2.2.3-64bitfix.patch: Index: rekall-2.2.3-64bitfix.patch =================================================================== RCS file: /cvs/extras/rpms/rekall/FC-3/rekall-2.2.3-64bitfix.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- rekall-2.2.3-64bitfix.patch 22 Sep 2005 19:31:53 -0000 1.3 +++ rekall-2.2.3-64bitfix.patch 22 Sep 2005 20:58:01 -0000 1.4 @@ -67,3 +67,30 @@ ) ; ) +--- rekall-2.2.4/libs/kbase/kb_link.cpp.BAD 2005-09-22 15:53:11.000000000 -0500 ++++ rekall-2.2.4/libs/kbase/kb_link.cpp 2005-09-22 15:53:53.000000000 -0500 +@@ -849,21 +849,21 @@ + receiver, + SLOT(newNode(int)), + 0, +- (int)&nodeSpecTable ++ (long)&nodeSpecTable + ) ; + lp->insertItem + ( TR("Query link"), + receiver, + SLOT(newNode(int)), + 0, +- (int)&nodeSpecQuery ++ (long)&nodeSpecQuery + ) ; + lp->insertItem + ( TR("SQL link" ), + receiver, + SLOT(newNode(int)), + 0, +- (int)&nodeSpecSQL ++ (long)&nodeSpecSQL + ) ; + + popup->insertItem (TR("New &Link"), lp) ; Index: rekall.spec =================================================================== RCS file: /cvs/extras/rpms/rekall/FC-3/rekall.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- rekall.spec 22 Sep 2005 19:31:53 -0000 1.3 +++ rekall.spec 22 Sep 2005 20:58:01 -0000 1.4 @@ -1,7 +1,7 @@ Name: rekall Summary: A KDE database front-end application Version: 2.2.4 -Release: 2%{?dist} +Release: 3%{?dist} Group: Development/Tools License: GPL URL: http://www.rekallrevealed.org/ @@ -336,6 +336,9 @@ %{_libdir}/librekallrt.la %changelog +* Thu Sep 22 2005 Tom "spot" Callaway 2.2.4-3 +- yet another 64 bit long issue + * Thu Sep 22 2005 Tom "spot" Callaway 2.2.4-2 - another 64 bit long issue From fedora-extras-commits at redhat.com Thu Sep 22 20:58:04 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 22 Sep 2005 16:58:04 -0400 Subject: rpms/rekall/FC-4 rekall-2.2.3-64bitfix.patch, 1.3, 1.4 rekall.spec, 1.3, 1.4 Message-ID: <200509222058.j8MKw4sj027884@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/rekall/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27820/FC-4 Modified Files: rekall-2.2.3-64bitfix.patch rekall.spec Log Message: yet another 64bit fix rekall-2.2.3-64bitfix.patch: Index: rekall-2.2.3-64bitfix.patch =================================================================== RCS file: /cvs/extras/rpms/rekall/FC-4/rekall-2.2.3-64bitfix.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- rekall-2.2.3-64bitfix.patch 22 Sep 2005 19:31:54 -0000 1.3 +++ rekall-2.2.3-64bitfix.patch 22 Sep 2005 20:58:02 -0000 1.4 @@ -67,3 +67,30 @@ ) ; ) +--- rekall-2.2.4/libs/kbase/kb_link.cpp.BAD 2005-09-22 15:53:11.000000000 -0500 ++++ rekall-2.2.4/libs/kbase/kb_link.cpp 2005-09-22 15:53:53.000000000 -0500 +@@ -849,21 +849,21 @@ + receiver, + SLOT(newNode(int)), + 0, +- (int)&nodeSpecTable ++ (long)&nodeSpecTable + ) ; + lp->insertItem + ( TR("Query link"), + receiver, + SLOT(newNode(int)), + 0, +- (int)&nodeSpecQuery ++ (long)&nodeSpecQuery + ) ; + lp->insertItem + ( TR("SQL link" ), + receiver, + SLOT(newNode(int)), + 0, +- (int)&nodeSpecSQL ++ (long)&nodeSpecSQL + ) ; + + popup->insertItem (TR("New &Link"), lp) ; Index: rekall.spec =================================================================== RCS file: /cvs/extras/rpms/rekall/FC-4/rekall.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- rekall.spec 22 Sep 2005 19:31:54 -0000 1.3 +++ rekall.spec 22 Sep 2005 20:58:02 -0000 1.4 @@ -1,7 +1,7 @@ Name: rekall Summary: A KDE database front-end application Version: 2.2.4 -Release: 2%{?dist} +Release: 3%{?dist} Group: Development/Tools License: GPL URL: http://www.rekallrevealed.org/ @@ -336,6 +336,9 @@ %{_libdir}/librekallrt.la %changelog +* Thu Sep 22 2005 Tom "spot" Callaway 2.2.4-3 +- yet another 64 bit long issue + * Thu Sep 22 2005 Tom "spot" Callaway 2.2.4-2 - another 64 bit long issue From fedora-extras-commits at redhat.com Thu Sep 22 20:58:04 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 22 Sep 2005 16:58:04 -0400 Subject: rpms/rekall/devel rekall-2.2.3-64bitfix.patch, 1.3, 1.4 rekall.spec, 1.3, 1.4 Message-ID: <200509222058.j8MKw4e6027894@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/rekall/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27820/devel Modified Files: rekall-2.2.3-64bitfix.patch rekall.spec Log Message: yet another 64bit fix rekall-2.2.3-64bitfix.patch: Index: rekall-2.2.3-64bitfix.patch =================================================================== RCS file: /cvs/extras/rpms/rekall/devel/rekall-2.2.3-64bitfix.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- rekall-2.2.3-64bitfix.patch 22 Sep 2005 19:31:59 -0000 1.3 +++ rekall-2.2.3-64bitfix.patch 22 Sep 2005 20:58:02 -0000 1.4 @@ -67,3 +67,30 @@ ) ; ) +--- rekall-2.2.4/libs/kbase/kb_link.cpp.BAD 2005-09-22 15:53:11.000000000 -0500 ++++ rekall-2.2.4/libs/kbase/kb_link.cpp 2005-09-22 15:53:53.000000000 -0500 +@@ -849,21 +849,21 @@ + receiver, + SLOT(newNode(int)), + 0, +- (int)&nodeSpecTable ++ (long)&nodeSpecTable + ) ; + lp->insertItem + ( TR("Query link"), + receiver, + SLOT(newNode(int)), + 0, +- (int)&nodeSpecQuery ++ (long)&nodeSpecQuery + ) ; + lp->insertItem + ( TR("SQL link" ), + receiver, + SLOT(newNode(int)), + 0, +- (int)&nodeSpecSQL ++ (long)&nodeSpecSQL + ) ; + + popup->insertItem (TR("New &Link"), lp) ; Index: rekall.spec =================================================================== RCS file: /cvs/extras/rpms/rekall/devel/rekall.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- rekall.spec 22 Sep 2005 19:31:59 -0000 1.3 +++ rekall.spec 22 Sep 2005 20:58:02 -0000 1.4 @@ -1,7 +1,7 @@ Name: rekall Summary: A KDE database front-end application Version: 2.2.4 -Release: 2%{?dist} +Release: 3%{?dist} Group: Development/Tools License: GPL URL: http://www.rekallrevealed.org/ @@ -336,6 +336,9 @@ %{_libdir}/librekallrt.la %changelog +* Thu Sep 22 2005 Tom "spot" Callaway 2.2.4-3 +- yet another 64 bit long issue + * Thu Sep 22 2005 Tom "spot" Callaway 2.2.4-2 - another 64 bit long issue From fedora-extras-commits at redhat.com Thu Sep 22 21:17:15 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Thu, 22 Sep 2005 17:17:15 -0400 Subject: rpms/freedroidrpg/devel .cvsignore, 1.4, 1.5 freedroidrpg.spec, 1.10, 1.11 sources, 1.4, 1.5 freedroidrpg-lvalue.patch, 1.1, NONE Message-ID: <200509222117.j8MLHFsT029439@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/freedroidrpg/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29416 Modified Files: .cvsignore freedroidrpg.spec sources Removed Files: freedroidrpg-lvalue.patch Log Message: * Sat Sep 10 2005 Ville Skytt?? - 0.9.13-1 - 0.9.13. - Drop some outdated docs. * Thu Aug 4 2005 Ville Skytt?? - 0.9.13-0.2.rc3 - 0.9.13rc3, build with gcc4, lvalue cast fix applied upstream. - Move icon to %%{datadir}/icons/hicolor. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/freedroidrpg/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 31 Jul 2005 17:08:29 -0000 1.4 +++ .cvsignore 22 Sep 2005 21:17:13 -0000 1.5 @@ -1 +1 @@ -freedroidrpg-0.9.13-rc2.tar.bz2 +freedroidrpg-0.9.13.tar.bz2 Index: freedroidrpg.spec =================================================================== RCS file: /cvs/extras/rpms/freedroidrpg/devel/freedroidrpg.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- freedroidrpg.spec 31 Jul 2005 17:08:29 -0000 1.10 +++ freedroidrpg.spec 22 Sep 2005 21:17:13 -0000 1.11 @@ -1,14 +1,13 @@ Name: freedroidrpg Version: 0.9.13 -Release: 0.2.rc2 +Release: 1%{?dist} Summary: Role playing game with Freedroid theme and Tux as the hero Group: Amusements/Games License: GPL URL: http://freedroid.sourceforge.net/ -Source0: http://download.sf.net/freedroid/%{name}-%{version}-rc2.tar.bz2 +Source0: http://download.sf.net/freedroid/%{name}-%{version}.tar.bz2 Source1: %{name}.desktop -Patch0: %{name}-lvalue.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: SDL_image-devel @@ -20,7 +19,6 @@ BuildRequires: ImageMagick BuildRequires: libvorbis-devel BuildRequires: desktop-file-utils -BuildRequires: compat-gcc-32 %description The Freedroid RPG is an extension/modification of the classical @@ -28,13 +26,10 @@ %prep -%setup -q -n %{name}-%{version}-rc2 -%patch0 -p2 +%setup -q %build -export CC=gcc32 -%{expand: %%define optflags %(echo %optflags | sed -e s/mtune/mcpu/)} %configure --datadir=%{_datadir}/games --disable-dependency-tracking make %{?_smp_mflags} @@ -47,9 +42,9 @@ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ --add-category X-Fedora \ %{SOURCE1} -mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps -convert -resize 48x48 graphics/droids/001.png \ - $RPM_BUILD_ROOT%{_datadir}/pixmaps/freedroidrpg.png +mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps +convert -transparent "#077300" graphics/paraicon.bmp \ + $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/freedroidrpg.png # Fix permissions, remove extra junk. find $RPM_BUILD_ROOT%{_datadir}/games/freedroidrpg -name "*.sh" | xargs rm rm -r $RPM_BUILD_ROOT%{_datadir}/games/freedroidrpg/graphics/blender_sources @@ -60,17 +55,32 @@ rm -rf $RPM_BUILD_ROOT +%post +gtk-update-icon-cache -qf %{_datadir}/icons/hicolor >/dev/null 2>&1 || : + +%postun +gtk-update-icon-cache -qf %{_datadir}/icons/hicolor >/dev/null 2>&1 || : + + %files %defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING NEWS README TODO +%doc AUTHORS COPYING README TODO %{_bindir}/* -%{_datadir}/games/freedroidrpg +%{_datadir}/games/freedroidrpg/ %{_mandir}/man6/freedroidRPG.6* %{_datadir}/applications/*freedroidrpg.desktop -%{_datadir}/pixmaps/freedroidrpg.png +%{_datadir}/icons/hicolor/32x32/apps/freedroidrpg.png %changelog +* Sat Sep 10 2005 Ville Skytt?? - 0.9.13-1 +- 0.9.13. +- Drop some outdated docs. + +* Thu Aug 4 2005 Ville Skytt?? - 0.9.13-0.2.rc3 +- 0.9.13rc3, build with gcc4, lvalue cast fix applied upstream. +- Move icon to %%{datadir}/icons/hicolor. + * Sun Jul 31 2005 Ville Skytt?? - 0.9.13-0.2.rc2 - 0.9.13rc2. - Apply upstream lvalue cast fix. Index: sources =================================================================== RCS file: /cvs/extras/rpms/freedroidrpg/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 31 Jul 2005 17:08:29 -0000 1.4 +++ sources 22 Sep 2005 21:17:13 -0000 1.5 @@ -1 +1 @@ -eda34581d784cbd1db59ebc46208880e freedroidrpg-0.9.13-rc2.tar.bz2 +d57e366a69e8999f5f0e30e960f72d15 freedroidrpg-0.9.13.tar.bz2 --- freedroidrpg-lvalue.patch DELETED --- From fedora-extras-commits at redhat.com Thu Sep 22 22:43:58 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Thu, 22 Sep 2005 18:43:58 -0400 Subject: rpms/libetpan/devel .cvsignore, 1.2, 1.3 libetpan.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200509222243.j8MMhwU8031088@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/libetpan/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31026/devel Modified Files: .cvsignore libetpan.spec sources Log Message: - version upgrade Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libetpan/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 12 Aug 2005 22:43:46 -0000 1.2 +++ .cvsignore 22 Sep 2005 22:43:55 -0000 1.3 @@ -1 +1 @@ -libetpan-0.38.tar.gz +libetpan-0.39.1.tar.gz Index: libetpan.spec =================================================================== RCS file: /cvs/extras/rpms/libetpan/devel/libetpan.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- libetpan.spec 12 Aug 2005 22:51:46 -0000 1.2 +++ libetpan.spec 22 Sep 2005 22:43:55 -0000 1.3 @@ -1,6 +1,6 @@ Name: libetpan -Version: 0.38 -Release: 4%{?dist} +Version: 0.39.1 +Release: 1%{?dist} Summary: Portable, efficient middleware for different kinds of mail access Group: System Environment/Libraries @@ -31,7 +31,7 @@ with %{name}. %prep -%setup -q +%setup -q -n %{name}-0.39 %build %configure --disable-static --with-gnutls=no @@ -43,7 +43,7 @@ make install DESTDIR=$RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT%{_libdir}/libetpan.la -chmod 755 $RPM_BUILD_ROOT%{_libdir}/libetpan.so.3.0.0 +chmod 755 $RPM_BUILD_ROOT%{_libdir}/libetpan.so.3.1.0 %clean rm -rf $RPM_BUILD_ROOT @@ -65,6 +65,10 @@ %{_libdir}/*.so %changelog +* Fri Sep 23 2005 Andreas Bierfert +0.39.1-1 +- version upgrade + * Sat Aug 13 2005 Andreas Bierfert 0.38-4 - add dist tag Index: sources =================================================================== RCS file: /cvs/extras/rpms/libetpan/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 12 Aug 2005 22:43:46 -0000 1.2 +++ sources 22 Sep 2005 22:43:55 -0000 1.3 @@ -1 +1 @@ -4d31145dee857beca7e283aa03fe9450 libetpan-0.38.tar.gz +d737fa265944ef76dd1d0b0455c9ff97 libetpan-0.39.1.tar.gz From fedora-extras-commits at redhat.com Thu Sep 22 22:43:52 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Thu, 22 Sep 2005 18:43:52 -0400 Subject: rpms/libetpan/FC-3 .cvsignore, 1.2, 1.3 libetpan.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200509222244.j8MMiMmU031093@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/libetpan/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31026/FC-3 Modified Files: .cvsignore libetpan.spec sources Log Message: - version upgrade Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libetpan/FC-3/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 12 Aug 2005 22:43:46 -0000 1.2 +++ .cvsignore 22 Sep 2005 22:43:50 -0000 1.3 @@ -1 +1 @@ -libetpan-0.38.tar.gz +libetpan-0.39.1.tar.gz Index: libetpan.spec =================================================================== RCS file: /cvs/extras/rpms/libetpan/FC-3/libetpan.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- libetpan.spec 12 Aug 2005 22:51:46 -0000 1.2 +++ libetpan.spec 22 Sep 2005 22:43:50 -0000 1.3 @@ -1,6 +1,6 @@ Name: libetpan -Version: 0.38 -Release: 4%{?dist} +Version: 0.39.1 +Release: 1%{?dist} Summary: Portable, efficient middleware for different kinds of mail access Group: System Environment/Libraries @@ -31,7 +31,7 @@ with %{name}. %prep -%setup -q +%setup -q -n %{name}-0.39 %build %configure --disable-static --with-gnutls=no @@ -43,7 +43,7 @@ make install DESTDIR=$RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT%{_libdir}/libetpan.la -chmod 755 $RPM_BUILD_ROOT%{_libdir}/libetpan.so.3.0.0 +chmod 755 $RPM_BUILD_ROOT%{_libdir}/libetpan.so.3.1.0 %clean rm -rf $RPM_BUILD_ROOT @@ -65,6 +65,10 @@ %{_libdir}/*.so %changelog +* Fri Sep 23 2005 Andreas Bierfert +0.39.1-1 +- version upgrade + * Sat Aug 13 2005 Andreas Bierfert 0.38-4 - add dist tag Index: sources =================================================================== RCS file: /cvs/extras/rpms/libetpan/FC-3/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 12 Aug 2005 22:43:46 -0000 1.2 +++ sources 22 Sep 2005 22:43:50 -0000 1.3 @@ -1 +1 @@ -4d31145dee857beca7e283aa03fe9450 libetpan-0.38.tar.gz +d737fa265944ef76dd1d0b0455c9ff97 libetpan-0.39.1.tar.gz From fedora-extras-commits at redhat.com Thu Sep 22 22:43:52 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Thu, 22 Sep 2005 18:43:52 -0400 Subject: rpms/libetpan/FC-4 .cvsignore, 1.2, 1.3 libetpan.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200509222244.j8MMiM0k031098@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/libetpan/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31026/FC-4 Modified Files: .cvsignore libetpan.spec sources Log Message: - version upgrade Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libetpan/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 12 Aug 2005 22:43:46 -0000 1.2 +++ .cvsignore 22 Sep 2005 22:43:50 -0000 1.3 @@ -1 +1 @@ -libetpan-0.38.tar.gz +libetpan-0.39.1.tar.gz Index: libetpan.spec =================================================================== RCS file: /cvs/extras/rpms/libetpan/FC-4/libetpan.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- libetpan.spec 12 Aug 2005 22:51:46 -0000 1.2 +++ libetpan.spec 22 Sep 2005 22:43:50 -0000 1.3 @@ -1,6 +1,6 @@ Name: libetpan -Version: 0.38 -Release: 4%{?dist} +Version: 0.39.1 +Release: 1%{?dist} Summary: Portable, efficient middleware for different kinds of mail access Group: System Environment/Libraries @@ -31,7 +31,7 @@ with %{name}. %prep -%setup -q +%setup -q -n %{name}-0.39 %build %configure --disable-static --with-gnutls=no @@ -43,7 +43,7 @@ make install DESTDIR=$RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT%{_libdir}/libetpan.la -chmod 755 $RPM_BUILD_ROOT%{_libdir}/libetpan.so.3.0.0 +chmod 755 $RPM_BUILD_ROOT%{_libdir}/libetpan.so.3.1.0 %clean rm -rf $RPM_BUILD_ROOT @@ -65,6 +65,10 @@ %{_libdir}/*.so %changelog +* Fri Sep 23 2005 Andreas Bierfert +0.39.1-1 +- version upgrade + * Sat Aug 13 2005 Andreas Bierfert 0.38-4 - add dist tag Index: sources =================================================================== RCS file: /cvs/extras/rpms/libetpan/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 12 Aug 2005 22:43:46 -0000 1.2 +++ sources 22 Sep 2005 22:43:50 -0000 1.3 @@ -1 +1 @@ -4d31145dee857beca7e283aa03fe9450 libetpan-0.38.tar.gz +d737fa265944ef76dd1d0b0455c9ff97 libetpan-0.39.1.tar.gz From fedora-extras-commits at redhat.com Thu Sep 22 23:25:21 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 22 Sep 2005 19:25:21 -0400 Subject: rpms/lapack/FC-4 lapack.spec,1.3,1.4 Message-ID: <200509222325.j8MNPqrm032625@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/lapack/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32589/FC-4 Modified Files: lapack.spec Log Message: Actually install liblapack_pic.a Index: lapack.spec =================================================================== RCS file: /cvs/extras/rpms/lapack/FC-4/lapack.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- lapack.spec 14 Sep 2005 19:32:23 -0000 1.3 +++ lapack.spec 22 Sep 2005 23:25:19 -0000 1.4 @@ -1,7 +1,7 @@ Summary: The LAPACK libraries for numerical linear algebra. Name: lapack Version: 3.0 -Release: 30%{?dist} +Release: 31%{?dist} License: Freely distributable Group: Development/Libraries URL: http://www.netlib.org/lapack/ @@ -105,7 +105,7 @@ mkdir -p ${RPM_BUILD_ROOT}%{_libdir} mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/manl -for f in liblapack.so.3.0.3 libblas.so.3.0.3 libblas.a liblapack.a; do +for f in liblapack.so.3.0.3 libblas.so.3.0.3 libblas.a liblapack.a liblapack_pic.a; do cp -f $f ${RPM_BUILD_ROOT}%{_libdir}/$f done @@ -159,6 +159,9 @@ %{_libdir}/libblas*.a %changelog +* Thu Sep 22 2005 Tom "spot" Callaway 3.0-31 +- actually install liblapack_pic.a + * Wed Sep 14 2005 Tom "spot" Callaway 3.0-30 - make -devel packages - make liblapack_pic.a package From fedora-extras-commits at redhat.com Thu Sep 22 23:25:22 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 22 Sep 2005 19:25:22 -0400 Subject: rpms/lapack/devel lapack.spec,1.3,1.4 Message-ID: <200509222325.j8MNPqkw032628@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/lapack/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32589/devel Modified Files: lapack.spec Log Message: Actually install liblapack_pic.a Index: lapack.spec =================================================================== RCS file: /cvs/extras/rpms/lapack/devel/lapack.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- lapack.spec 14 Sep 2005 19:32:24 -0000 1.3 +++ lapack.spec 22 Sep 2005 23:25:20 -0000 1.4 @@ -1,7 +1,7 @@ Summary: The LAPACK libraries for numerical linear algebra. Name: lapack Version: 3.0 -Release: 30%{?dist} +Release: 31%{?dist} License: Freely distributable Group: Development/Libraries URL: http://www.netlib.org/lapack/ @@ -105,7 +105,7 @@ mkdir -p ${RPM_BUILD_ROOT}%{_libdir} mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/manl -for f in liblapack.so.3.0.3 libblas.so.3.0.3 libblas.a liblapack.a; do +for f in liblapack.so.3.0.3 libblas.so.3.0.3 libblas.a liblapack.a liblapack_pic.a; do cp -f $f ${RPM_BUILD_ROOT}%{_libdir}/$f done @@ -159,6 +159,9 @@ %{_libdir}/libblas*.a %changelog +* Thu Sep 22 2005 Tom "spot" Callaway 3.0-31 +- actually install liblapack_pic.a + * Wed Sep 14 2005 Tom "spot" Callaway 3.0-30 - make -devel packages - make liblapack_pic.a package From fedora-extras-commits at redhat.com Fri Sep 23 02:57:26 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Thu, 22 Sep 2005 22:57:26 -0400 Subject: rpms/SoQt/devel .cvsignore, 1.3, 1.4 SoQt.spec, 1.10, 1.11 sources, 1.3, 1.4 Message-ID: <200509230257.j8N2vQev004750@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/SoQt/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4727 Modified Files: .cvsignore SoQt.spec sources Log Message: - Update to 1.3.0 - Build w/o simacros. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/SoQt/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 21 Apr 2005 15:32:46 -0000 1.3 +++ .cvsignore 23 Sep 2005 02:57:24 -0000 1.4 @@ -1,3 +1,4 @@ SoQt-1.2.0.tar.gz SoQt-1.2.0-config.diff.bz2 SoQt-1.2.0-simacros.diff.bz2 +SoQt-1.3.0.tar.gz Index: SoQt.spec =================================================================== RCS file: /cvs/extras/rpms/SoQt/devel/SoQt.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- SoQt.spec 13 Jul 2005 10:35:55 -0000 1.10 +++ SoQt.spec 23 Sep 2005 02:57:24 -0000 1.11 @@ -3,8 +3,8 @@ Summary: High-level 3D visualization library Name: SoQt -Version: 1.2.0 -Release: 7%{?dist} +Version: 1.3.0 +Release: 1%{?dist} License: GPL Group: System Environment/Libraries @@ -50,8 +50,8 @@ %prep %setup -%patch0 -p1 -%patch1 -p1 +# %patch0 -p1 +# %patch1 -p1 %patch2 -p1 %build @@ -66,11 +66,14 @@ make %install - rm -rf $RPM_BUILD_ROOT +rm -rf $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT install +# TESTING +exit 1; + %clean - rm -rf $RPM_BUILD_ROOT +rm -rf $RPM_BUILD_ROOT %post /sbin/ldconfig @@ -96,6 +99,10 @@ %{_mandir}/man?/*.?.gz %changelog +* Fri Sep 23 2005 Ralf Corsepius - 0:1.3.0-1 +- Update to 1.3.0 +- Build w/o simacros. + * Wed Jul 13 2005 Ralf Corsepius - 0:1.2.0-7 - Rebuild against Coin-2.4.3. - Let devel provide Coin2-SoQt-devel. Index: sources =================================================================== RCS file: /cvs/extras/rpms/SoQt/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 21 Apr 2005 15:32:46 -0000 1.3 +++ sources 23 Sep 2005 02:57:24 -0000 1.4 @@ -1,3 +1,4 @@ 4a20e834ace358f3e81fd43b38a69efb SoQt-1.2.0.tar.gz 22454ea02257dbff7304da6e9e12dc63 SoQt-1.2.0-config.diff.bz2 99db70be7488e3b15a164ece03492db6 SoQt-1.2.0-simacros.diff.bz2 +85d6b2b1a78eacd38f1c7219f4a745e3 SoQt-1.3.0.tar.gz From fedora-extras-commits at redhat.com Fri Sep 23 03:08:49 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 22 Sep 2005 23:08:49 -0400 Subject: rpms/rekall/FC-4 rekall-2.2.3-64bitfix.patch, 1.4, 1.5 rekall.spec, 1.4, 1.5 Message-ID: <200509230308.j8N38n40006154@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/rekall/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6094/FC-4 Modified Files: rekall-2.2.3-64bitfix.patch rekall.spec Log Message: 64bit hell. rekall-2.2.3-64bitfix.patch: Index: rekall-2.2.3-64bitfix.patch =================================================================== RCS file: /cvs/extras/rpms/rekall/FC-4/rekall-2.2.3-64bitfix.patch,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- rekall-2.2.3-64bitfix.patch 22 Sep 2005 20:58:02 -0000 1.4 +++ rekall-2.2.3-64bitfix.patch 23 Sep 2005 03:08:47 -0000 1.5 @@ -94,3 +94,25 @@ ) ; popup->insertItem (TR("New &Link"), lp) ; +--- rekall-2.2.4/libs/kbase/kb_framer.cpp.BAD 2005-09-22 22:04:21.000000000 -0500 ++++ rekall-2.2.4/libs/kbase/kb_framer.cpp 2005-09-22 22:04:30.000000000 -0500 +@@ -321,7 +321,7 @@ + return false ; + } + +- newNode ((int)nSpec) ; ++ newNode ((long)nSpec) ; + return true ; + } + +--- rekall-2.2.4/libs/kbase/kb_formblock.cpp.BAD 2005-09-22 22:03:30.000000000 -0500 ++++ rekall-2.2.4/libs/kbase/kb_formblock.cpp 2005-09-22 22:03:46.000000000 -0500 +@@ -1510,7 +1510,7 @@ + return false ; + } + +- newNode ((int)nSpec) ; ++ newNode ((long)nSpec) ; + return true ; + } + Index: rekall.spec =================================================================== RCS file: /cvs/extras/rpms/rekall/FC-4/rekall.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- rekall.spec 22 Sep 2005 20:58:02 -0000 1.4 +++ rekall.spec 23 Sep 2005 03:08:47 -0000 1.5 @@ -1,7 +1,7 @@ Name: rekall Summary: A KDE database front-end application Version: 2.2.4 -Release: 3%{?dist} +Release: 4%{?dist} Group: Development/Tools License: GPL URL: http://www.rekallrevealed.org/ @@ -336,6 +336,9 @@ %{_libdir}/librekallrt.la %changelog +* Thu Sep 22 2005 Tom "spot" Callaway 2.2.4-4 +- yes. another one. + * Thu Sep 22 2005 Tom "spot" Callaway 2.2.4-3 - yet another 64 bit long issue From fedora-extras-commits at redhat.com Fri Sep 23 03:08:50 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 22 Sep 2005 23:08:50 -0400 Subject: rpms/rekall/devel rekall-2.2.3-64bitfix.patch, 1.4, 1.5 rekall.spec, 1.4, 1.5 Message-ID: <200509230308.j8N38okB006164@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/rekall/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6094/devel Modified Files: rekall-2.2.3-64bitfix.patch rekall.spec Log Message: 64bit hell. rekall-2.2.3-64bitfix.patch: Index: rekall-2.2.3-64bitfix.patch =================================================================== RCS file: /cvs/extras/rpms/rekall/devel/rekall-2.2.3-64bitfix.patch,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- rekall-2.2.3-64bitfix.patch 22 Sep 2005 20:58:02 -0000 1.4 +++ rekall-2.2.3-64bitfix.patch 23 Sep 2005 03:08:47 -0000 1.5 @@ -94,3 +94,25 @@ ) ; popup->insertItem (TR("New &Link"), lp) ; +--- rekall-2.2.4/libs/kbase/kb_framer.cpp.BAD 2005-09-22 22:04:21.000000000 -0500 ++++ rekall-2.2.4/libs/kbase/kb_framer.cpp 2005-09-22 22:04:30.000000000 -0500 +@@ -321,7 +321,7 @@ + return false ; + } + +- newNode ((int)nSpec) ; ++ newNode ((long)nSpec) ; + return true ; + } + +--- rekall-2.2.4/libs/kbase/kb_formblock.cpp.BAD 2005-09-22 22:03:30.000000000 -0500 ++++ rekall-2.2.4/libs/kbase/kb_formblock.cpp 2005-09-22 22:03:46.000000000 -0500 +@@ -1510,7 +1510,7 @@ + return false ; + } + +- newNode ((int)nSpec) ; ++ newNode ((long)nSpec) ; + return true ; + } + Index: rekall.spec =================================================================== RCS file: /cvs/extras/rpms/rekall/devel/rekall.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- rekall.spec 22 Sep 2005 20:58:02 -0000 1.4 +++ rekall.spec 23 Sep 2005 03:08:47 -0000 1.5 @@ -1,7 +1,7 @@ Name: rekall Summary: A KDE database front-end application Version: 2.2.4 -Release: 3%{?dist} +Release: 4%{?dist} Group: Development/Tools License: GPL URL: http://www.rekallrevealed.org/ @@ -336,6 +336,9 @@ %{_libdir}/librekallrt.la %changelog +* Thu Sep 22 2005 Tom "spot" Callaway 2.2.4-4 +- yes. another one. + * Thu Sep 22 2005 Tom "spot" Callaway 2.2.4-3 - yet another 64 bit long issue From fedora-extras-commits at redhat.com Fri Sep 23 03:08:46 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 22 Sep 2005 23:08:46 -0400 Subject: rpms/rekall/FC-3 rekall-2.2.3-64bitfix.patch, 1.4, 1.5 rekall.spec, 1.4, 1.5 Message-ID: <200509230309.j8N39H4p006168@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/rekall/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6094/FC-3 Modified Files: rekall-2.2.3-64bitfix.patch rekall.spec Log Message: 64bit hell. rekall-2.2.3-64bitfix.patch: Index: rekall-2.2.3-64bitfix.patch =================================================================== RCS file: /cvs/extras/rpms/rekall/FC-3/rekall-2.2.3-64bitfix.patch,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- rekall-2.2.3-64bitfix.patch 22 Sep 2005 20:58:01 -0000 1.4 +++ rekall-2.2.3-64bitfix.patch 23 Sep 2005 03:08:34 -0000 1.5 @@ -94,3 +94,25 @@ ) ; popup->insertItem (TR("New &Link"), lp) ; +--- rekall-2.2.4/libs/kbase/kb_framer.cpp.BAD 2005-09-22 22:04:21.000000000 -0500 ++++ rekall-2.2.4/libs/kbase/kb_framer.cpp 2005-09-22 22:04:30.000000000 -0500 +@@ -321,7 +321,7 @@ + return false ; + } + +- newNode ((int)nSpec) ; ++ newNode ((long)nSpec) ; + return true ; + } + +--- rekall-2.2.4/libs/kbase/kb_formblock.cpp.BAD 2005-09-22 22:03:30.000000000 -0500 ++++ rekall-2.2.4/libs/kbase/kb_formblock.cpp 2005-09-22 22:03:46.000000000 -0500 +@@ -1510,7 +1510,7 @@ + return false ; + } + +- newNode ((int)nSpec) ; ++ newNode ((long)nSpec) ; + return true ; + } + Index: rekall.spec =================================================================== RCS file: /cvs/extras/rpms/rekall/FC-3/rekall.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- rekall.spec 22 Sep 2005 20:58:01 -0000 1.4 +++ rekall.spec 23 Sep 2005 03:08:34 -0000 1.5 @@ -1,7 +1,7 @@ Name: rekall Summary: A KDE database front-end application Version: 2.2.4 -Release: 3%{?dist} +Release: 4%{?dist} Group: Development/Tools License: GPL URL: http://www.rekallrevealed.org/ @@ -336,6 +336,9 @@ %{_libdir}/librekallrt.la %changelog +* Thu Sep 22 2005 Tom "spot" Callaway 2.2.4-4 +- yes. another one. + * Thu Sep 22 2005 Tom "spot" Callaway 2.2.4-3 - yet another 64 bit long issue From fedora-extras-commits at redhat.com Fri Sep 23 04:37:09 2005 From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters)) Date: Fri, 23 Sep 2005 00:37:09 -0400 Subject: rpms/gourmet import.log,1.2,1.3 Message-ID: <200509230437.j8N4b9ZD007862@cvs-int.fedora.redhat.com> Author: mpeters Update of /cvs/extras/rpms/gourmet In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7827 Modified Files: import.log Log Message: auto-import gourmet-0.8.5.12-1.fc3 on branch FC-3 from gourmet-0.8.5.12-1.fc3.src.rpm new improved upstream version Index: import.log =================================================================== RCS file: /cvs/extras/rpms/gourmet/import.log,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- import.log 14 Jun 2005 01:44:05 -0000 1.2 +++ import.log 23 Sep 2005 04:37:07 -0000 1.3 @@ -1 +1,2 @@ gourmet-0_8_5_2-1:HEAD:gourmet-0.8.5.2-1.src.rpm:1118713419 +gourmet-0_8_5_12-1_fc3:FC-3:gourmet-0.8.5.12-1.fc3.src.rpm:1127450140 From fedora-extras-commits at redhat.com Fri Sep 23 04:37:10 2005 From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters)) Date: Fri, 23 Sep 2005 00:37:10 -0400 Subject: rpms/gourmet/FC-3 .cvsignore, 1.2, 1.3 gourmet.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200509230437.j8N4bA1u007870@cvs-int.fedora.redhat.com> Author: mpeters Update of /cvs/extras/rpms/gourmet/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7827/FC-3 Modified Files: .cvsignore gourmet.spec sources Log Message: auto-import gourmet-0.8.5.12-1.fc3 on branch FC-3 from gourmet-0.8.5.12-1.fc3.src.rpm new improved upstream version Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gourmet/FC-3/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 14 Jun 2005 01:44:06 -0000 1.2 +++ .cvsignore 23 Sep 2005 04:37:07 -0000 1.3 @@ -1 +1 @@ -gourmet-0.8.5.2.tar.gz +gourmet-0.8.5.12.tar.gz Index: gourmet.spec =================================================================== RCS file: /cvs/extras/rpms/gourmet/FC-3/gourmet.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gourmet.spec 14 Jun 2005 01:44:06 -0000 1.1 +++ gourmet.spec 23 Sep 2005 04:37:07 -0000 1.2 @@ -1,7 +1,7 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: gourmet -Version: 0.8.5.2 +Version: 0.8.5.12 Release: 1%{?dist} Summary: PyGTK Recipe Manager @@ -33,8 +33,8 @@ %prep %setup -q %{__sed} -i 's?\.$??g' gourmet.desktop -%{__sed} -i 's?\r??' src/lib/defaults_pt.py -%{__sed} -i 's?\r??' src/lib/defaults_sk.py +#%{__sed} -i 's?\r??' src/lib/defaults_pt.py +#%{__sed} -i 's?\r??' src/lib/defaults_sk.py # remove *.mo files - we'll regenerate them pushd i18n find -name \*.mo |xargs rm -f @@ -90,11 +90,18 @@ %{python_sitelib}/gourmet/importers/*.py %{python_sitelib}/gourmet/importers/*.pyc %ghost %{python_sitelib}/gourmet/importers/*.pyo +%dir %{python_sitelib}/gourmet/importers/html_plugins +%{python_sitelib}/gourmet/importers/html_plugins/*.py +%{python_sitelib}/gourmet/importers/html_plugins/*.pyc +%ghost %{python_sitelib}/gourmet/importers/html_plugins/*.pyo # datadir stuff %{_datadir}/applications/fedora-gourmet.desktop %{_datadir}/pixmaps/recbox.png %{_datadir}/gourmet %changelog +* Thu Sep 22 2005 Michael A. Peters - 0.8.5.12-1 +- New upstream version + * Mon Jun 13 2005 Michael A. Peters - 0.8.5.2-1 - Initial checkin to cvs Index: sources =================================================================== RCS file: /cvs/extras/rpms/gourmet/FC-3/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 14 Jun 2005 01:44:06 -0000 1.2 +++ sources 23 Sep 2005 04:37:07 -0000 1.3 @@ -1 +1 @@ -9a1014582aacc58ff2ea86ad66fdc2cb gourmet-0.8.5.2.tar.gz +77b615493759a5a37a55589e7a24b9a9 gourmet-0.8.5.12.tar.gz From fedora-extras-commits at redhat.com Fri Sep 23 04:38:53 2005 From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters)) Date: Fri, 23 Sep 2005 00:38:53 -0400 Subject: rpms/gourmet import.log,1.3,1.4 Message-ID: <200509230439.j8N4dNZ6007969@cvs-int.fedora.redhat.com> Author: mpeters Update of /cvs/extras/rpms/gourmet In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7931 Modified Files: import.log Log Message: auto-import gourmet-0.8.5.12-1.fc4 on branch FC-4 from gourmet-0.8.5.12-1.fc4.src.rpm new improved upstream version Index: import.log =================================================================== RCS file: /cvs/extras/rpms/gourmet/import.log,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- import.log 23 Sep 2005 04:37:07 -0000 1.3 +++ import.log 23 Sep 2005 04:38:50 -0000 1.4 @@ -1,2 +1,3 @@ gourmet-0_8_5_2-1:HEAD:gourmet-0.8.5.2-1.src.rpm:1118713419 gourmet-0_8_5_12-1_fc3:FC-3:gourmet-0.8.5.12-1.fc3.src.rpm:1127450140 +gourmet-0_8_5_12-1_fc4:FC-4:gourmet-0.8.5.12-1.fc4.src.rpm:1127450247 From fedora-extras-commits at redhat.com Fri Sep 23 04:38:53 2005 From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters)) Date: Fri, 23 Sep 2005 00:38:53 -0400 Subject: rpms/gourmet/FC-4 .cvsignore, 1.2, 1.3 gourmet.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200509230439.j8N4dNee007974@cvs-int.fedora.redhat.com> Author: mpeters Update of /cvs/extras/rpms/gourmet/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7931/FC-4 Modified Files: .cvsignore gourmet.spec sources Log Message: auto-import gourmet-0.8.5.12-1.fc4 on branch FC-4 from gourmet-0.8.5.12-1.fc4.src.rpm new improved upstream version Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gourmet/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 14 Jun 2005 01:44:06 -0000 1.2 +++ .cvsignore 23 Sep 2005 04:38:51 -0000 1.3 @@ -1 +1 @@ -gourmet-0.8.5.2.tar.gz +gourmet-0.8.5.12.tar.gz Index: gourmet.spec =================================================================== RCS file: /cvs/extras/rpms/gourmet/FC-4/gourmet.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gourmet.spec 14 Jun 2005 01:44:06 -0000 1.1 +++ gourmet.spec 23 Sep 2005 04:38:51 -0000 1.2 @@ -1,7 +1,7 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: gourmet -Version: 0.8.5.2 +Version: 0.8.5.12 Release: 1%{?dist} Summary: PyGTK Recipe Manager @@ -33,8 +33,8 @@ %prep %setup -q %{__sed} -i 's?\.$??g' gourmet.desktop -%{__sed} -i 's?\r??' src/lib/defaults_pt.py -%{__sed} -i 's?\r??' src/lib/defaults_sk.py +#%{__sed} -i 's?\r??' src/lib/defaults_pt.py +#%{__sed} -i 's?\r??' src/lib/defaults_sk.py # remove *.mo files - we'll regenerate them pushd i18n find -name \*.mo |xargs rm -f @@ -90,11 +90,18 @@ %{python_sitelib}/gourmet/importers/*.py %{python_sitelib}/gourmet/importers/*.pyc %ghost %{python_sitelib}/gourmet/importers/*.pyo +%dir %{python_sitelib}/gourmet/importers/html_plugins +%{python_sitelib}/gourmet/importers/html_plugins/*.py +%{python_sitelib}/gourmet/importers/html_plugins/*.pyc +%ghost %{python_sitelib}/gourmet/importers/html_plugins/*.pyo # datadir stuff %{_datadir}/applications/fedora-gourmet.desktop %{_datadir}/pixmaps/recbox.png %{_datadir}/gourmet %changelog +* Thu Sep 22 2005 Michael A. Peters - 0.8.5.12-1 +- New upstream version + * Mon Jun 13 2005 Michael A. Peters - 0.8.5.2-1 - Initial checkin to cvs Index: sources =================================================================== RCS file: /cvs/extras/rpms/gourmet/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 14 Jun 2005 01:44:06 -0000 1.2 +++ sources 23 Sep 2005 04:38:51 -0000 1.3 @@ -1 +1 @@ -9a1014582aacc58ff2ea86ad66fdc2cb gourmet-0.8.5.2.tar.gz +77b615493759a5a37a55589e7a24b9a9 gourmet-0.8.5.12.tar.gz From fedora-extras-commits at redhat.com Fri Sep 23 04:41:10 2005 From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters)) Date: Fri, 23 Sep 2005 00:41:10 -0400 Subject: rpms/gourmet import.log,1.4,1.5 Message-ID: <200509230441.j8N4fAwh008071@cvs-int.fedora.redhat.com> Author: mpeters Update of /cvs/extras/rpms/gourmet In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8036 Modified Files: import.log Log Message: auto-import gourmet-0.8.5.12-1.fc5 on branch devel from gourmet-0.8.5.12-1.fc5.src.rpm new improved upstream version Index: import.log =================================================================== RCS file: /cvs/extras/rpms/gourmet/import.log,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- import.log 23 Sep 2005 04:38:50 -0000 1.4 +++ import.log 23 Sep 2005 04:41:08 -0000 1.5 @@ -1,3 +1,4 @@ gourmet-0_8_5_2-1:HEAD:gourmet-0.8.5.2-1.src.rpm:1118713419 gourmet-0_8_5_12-1_fc3:FC-3:gourmet-0.8.5.12-1.fc3.src.rpm:1127450140 gourmet-0_8_5_12-1_fc4:FC-4:gourmet-0.8.5.12-1.fc4.src.rpm:1127450247 +gourmet-0_8_5_12-1_fc5:HEAD:gourmet-0.8.5.12-1.fc5.src.rpm:1127450383 From fedora-extras-commits at redhat.com Fri Sep 23 04:41:11 2005 From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters)) Date: Fri, 23 Sep 2005 00:41:11 -0400 Subject: rpms/gourmet/devel .cvsignore, 1.2, 1.3 gourmet.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200509230441.j8N4fBs4008079@cvs-int.fedora.redhat.com> Author: mpeters Update of /cvs/extras/rpms/gourmet/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8036/devel Modified Files: .cvsignore gourmet.spec sources Log Message: auto-import gourmet-0.8.5.12-1.fc5 on branch devel from gourmet-0.8.5.12-1.fc5.src.rpm new improved upstream version Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gourmet/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 14 Jun 2005 01:44:06 -0000 1.2 +++ .cvsignore 23 Sep 2005 04:41:09 -0000 1.3 @@ -1 +1 @@ -gourmet-0.8.5.2.tar.gz +gourmet-0.8.5.12.tar.gz Index: gourmet.spec =================================================================== RCS file: /cvs/extras/rpms/gourmet/devel/gourmet.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gourmet.spec 14 Jun 2005 01:44:06 -0000 1.1 +++ gourmet.spec 23 Sep 2005 04:41:09 -0000 1.2 @@ -1,7 +1,7 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: gourmet -Version: 0.8.5.2 +Version: 0.8.5.12 Release: 1%{?dist} Summary: PyGTK Recipe Manager @@ -33,8 +33,8 @@ %prep %setup -q %{__sed} -i 's?\.$??g' gourmet.desktop -%{__sed} -i 's?\r??' src/lib/defaults_pt.py -%{__sed} -i 's?\r??' src/lib/defaults_sk.py +#%{__sed} -i 's?\r??' src/lib/defaults_pt.py +#%{__sed} -i 's?\r??' src/lib/defaults_sk.py # remove *.mo files - we'll regenerate them pushd i18n find -name \*.mo |xargs rm -f @@ -90,11 +90,18 @@ %{python_sitelib}/gourmet/importers/*.py %{python_sitelib}/gourmet/importers/*.pyc %ghost %{python_sitelib}/gourmet/importers/*.pyo +%dir %{python_sitelib}/gourmet/importers/html_plugins +%{python_sitelib}/gourmet/importers/html_plugins/*.py +%{python_sitelib}/gourmet/importers/html_plugins/*.pyc +%ghost %{python_sitelib}/gourmet/importers/html_plugins/*.pyo # datadir stuff %{_datadir}/applications/fedora-gourmet.desktop %{_datadir}/pixmaps/recbox.png %{_datadir}/gourmet %changelog +* Thu Sep 22 2005 Michael A. Peters - 0.8.5.12-1 +- New upstream version + * Mon Jun 13 2005 Michael A. Peters - 0.8.5.2-1 - Initial checkin to cvs Index: sources =================================================================== RCS file: /cvs/extras/rpms/gourmet/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 14 Jun 2005 01:44:06 -0000 1.2 +++ sources 23 Sep 2005 04:41:09 -0000 1.3 @@ -1 +1 @@ -9a1014582aacc58ff2ea86ad66fdc2cb gourmet-0.8.5.2.tar.gz +77b615493759a5a37a55589e7a24b9a9 gourmet-0.8.5.12.tar.gz From fedora-extras-commits at redhat.com Fri Sep 23 04:54:03 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Fri, 23 Sep 2005 00:54:03 -0400 Subject: rpms/SoQt/devel SoQt.spec,1.11,1.12 Message-ID: <200509230454.j8N4s3gx008208@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/SoQt/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8188 Modified Files: SoQt.spec Log Message: More testing Index: SoQt.spec =================================================================== RCS file: /cvs/extras/rpms/SoQt/devel/SoQt.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- SoQt.spec 23 Sep 2005 02:57:24 -0000 1.11 +++ SoQt.spec 23 Sep 2005 04:54:00 -0000 1.12 @@ -10,6 +10,8 @@ Group: System Environment/Libraries URL: http://www.coin3d.org +ExclusiveArch: x86_64 + Source: ftp://ftp.coin3d.org/pub/coin/src/SoQt-%{version}.tar.gz # Needed to rebuild patch1 @@ -69,12 +71,12 @@ rm -rf $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT install -# TESTING -exit 1; - %clean rm -rf $RPM_BUILD_ROOT +# TESTING +exit 1; + %post /sbin/ldconfig From fedora-extras-commits at redhat.com Fri Sep 23 05:33:42 2005 From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters)) Date: Fri, 23 Sep 2005 01:33:42 -0400 Subject: rpms/pan/devel pan-0.14.2.91-linewrap.patch, NONE, 1.1 pan.spec, 1.4, 1.5 Message-ID: <200509230533.j8N5Xggi009673@cvs-int.fedora.redhat.com> Author: mpeters Update of /cvs/extras/rpms/pan/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9651 Modified Files: pan.spec Added Files: pan-0.14.2.91-linewrap.patch Log Message: Adding patch to cvs pan-0.14.2.91-linewrap.patch: --- NEW FILE pan-0.14.2.91-linewrap.patch --- --- patch-text-massager.c::wrap begins here --- --- pan/base/text-massager.c.orig Mon Jan 26 00:51:26 2004 +++ pan/base/text-massager.c Mon Jan 26 00:55:48 2004 @@ -250,23 +250,29 @@ char * pch; char * line_start; char * end; + int pos; /* walk through the entire string */ linefeed_here = NULL; - for (line_start=pch=str->str, end=line_start+str->len; pch!=end; ) + for (pos = 0, line_start=pch=str->str, end=line_start+str->len; pch=column && linefeed_here!=NULL) + if (pos>=column && linefeed_here!=NULL) { *linefeed_here = '\n'; pch = line_start = linefeed_here + 1; linefeed_here = NULL; + pos = 0; + } + else + { + pch = g_utf8_next_char (pch); + ++ pos; } - else ++pch; } } --- patch-text-massager.c::wrap ends here --- Index: pan.spec =================================================================== RCS file: /cvs/extras/rpms/pan/devel/pan.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- pan.spec 11 Sep 2005 11:38:16 -0000 1.4 +++ pan.spec 23 Sep 2005 05:33:40 -0000 1.5 @@ -1,7 +1,7 @@ Summary: A GNOME/GTK+ news reader for X Name: pan Version: 0.14.2.91 -Release: 3.1%{?dist} +Release: 3.2%{?dist} Epoch: 1 License: GPL Group: Applications/Internet @@ -83,6 +83,9 @@ %{_datadir}/applications/fedora-pan.desktop %changelog +* Thu Sep 22 2005 Michael A. Peters - 1:0.14.2.91-3.2 +- forgot to commit patch to cvs in devel branch. + * Sun Sep 11 2005 Michael A. Peters - 1:0.14.2.91-3.1 - added patch12 to fix bug 165626 From fedora-extras-commits at redhat.com Fri Sep 23 06:29:38 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Fri, 23 Sep 2005 02:29:38 -0400 Subject: owners owners.list,1.243,1.244 Message-ID: <200509230629.j8N6Tc7U011220@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11201 Modified Files: owners.list Log Message: Add perl-File-Flat Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.243 retrieving revision 1.244 diff -u -r1.243 -r1.244 --- owners.list 22 Sep 2005 18:28:53 -0000 1.243 +++ owners.list 23 Sep 2005 06:29:36 -0000 1.244 @@ -648,6 +648,7 @@ Fedora Extras|perl-ExtUtils-XSBuilder| Modules that parse C header files and create XS glue code|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-File-BOM|Utilities for reading Byte Order Marks|mpeters at mac.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-File-Find-Rule|Perl module implementing an alternative interface to File::Find|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-File-Flat|Implements a flat filesystem|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-File-Remove|Convenience module for removing files and directories|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-File-Slurp|Efficient Reading/Writing of Complete Files|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-File-Tail|Perl extension for reading from continously updated files|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com From fedora-extras-commits at redhat.com Fri Sep 23 06:32:00 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Fri, 23 Sep 2005 02:32:00 -0400 Subject: owners owners.list,1.244,1.245 Message-ID: <200509230632.j8N6W0dX011251@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11237 Modified Files: owners.list Log Message: Add perl-File-NCopy Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.244 retrieving revision 1.245 diff -u -r1.244 -r1.245 --- owners.list 23 Sep 2005 06:29:36 -0000 1.244 +++ owners.list 23 Sep 2005 06:31:58 -0000 1.245 @@ -649,6 +649,7 @@ Fedora Extras|perl-File-BOM|Utilities for reading Byte Order Marks|mpeters at mac.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-File-Find-Rule|Perl module implementing an alternative interface to File::Find|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-File-Flat|Implements a flat filesystem|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-File-NCopy|Copy files to directories, or a single file to another file|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-File-Remove|Convenience module for removing files and directories|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-File-Slurp|Efficient Reading/Writing of Complete Files|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-File-Tail|Perl extension for reading from continously updated files|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com From fedora-extras-commits at redhat.com Fri Sep 23 07:45:42 2005 From: fedora-extras-commits at redhat.com (Mark Cox (mjc)) Date: Fri, 23 Sep 2005 03:45:42 -0400 Subject: fedora-security/audit fc4,1.61,1.62 Message-ID: <200509230745.j8N7jgqH012737@cvs-int.fedora.redhat.com> Author: mjc Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12718 Modified Files: fc4 Log Message: Deal with kernel issues fixed in fc4 released kernel Index: fc4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc4,v retrieving revision 1.61 retrieving revision 1.62 diff -u -r1.61 -r1.62 --- fc4 22 Sep 2005 12:34:50 -0000 1.61 +++ fc4 23 Sep 2005 07:45:40 -0000 1.62 @@ -1,8 +1,9 @@ -Up to date CVE as of CVE email 20050921 -Up to date FC4 as of 20050921 +Up to date CVE as of CVE email 20050922 +Up to date FC4 as of 20050922 ** are items that need attention +2005-3044 VULNERABLE (kernel, fixed 2.6.13.2) 2005-3011 ** texinfo 2005-2991 ignore (ncompress) don't ship zdiff or zcmp scripts 2005-2968 version (mozilla, not 1.7.10) +we include a different mozilla sh @@ -17,7 +18,7 @@ 2005-2871 VULNERABLE (thunderbird) (moderate only) 2005-2811 version (net-snmp, not upstream gentoo only) 2005-2801 version (kernel, fixed 2.6.11) -2005-2800 VULNERABLE (kernel) +2005-2800 backport (kernel, fixed 2.6.12.6) [since FEDORA-2005-906] 2005-2798 version (openssh, fixed 4.2) [since FEDORA-2005-860] 2005-2797 version (openssh, fixed 4.2) [since FEDORA-2005-860] 2005-2796 backport (squid, fixed after 2.5.STABLE10) [since FEDORA-2005-851] @@ -51,8 +52,8 @@ 2005-2491 backport (pcre, fixed 6.2) [since FEDORA-2005-803] 2005-2491 ignore (httpd, pcre uses system pcre) 2005-2491 ignore (php, pcre uses system pcre) -2005-2492 VULNERABLE (kernel, fixed 2.6.13.1) -2005-2490 VULNERABLE (kernel, fixed 2.6.13.1) bz#166249 +2005-2492 backport (kernel, fixed 2.6.13.1) [since FEDORA-2005-906] +2005-2490 backport (kernel, fixed 2.6.13.1) [since FEDORA-2005-906] 2005-2475 VULNERABLE (unzip) bz#164928 2005-2471 backport (netpbm) [since FEDORA-2005-728] 2005-2459 ignore (kernel, fixed 2.6.12.5) dropped as code path not possible From rc040203 at freenet.de Fri Sep 23 07:52:02 2005 From: rc040203 at freenet.de (Ralf Corsepius) Date: Fri, 23 Sep 2005 09:52:02 +0200 Subject: rpms/perl-Log-Dispatch/devel perl-Log-Dispatch.spec,1.2,1.3 In-Reply-To: <200509221748.j8MHmXV9021423@cvs-int.fedora.redhat.com> References: <200509221748.j8MHmXV9021423@cvs-int.fedora.redhat.com> Message-ID: <1127461922.7815.103.camel@mccallum.corsepiu.local> On Thu, 2005-09-22 at 13:48 -0400, Jose Pedro Oliveira wrote: > Author: jpo > > Update of /cvs/extras/rpms/perl-Log-Dispatch/devel > In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21370/devel > > Modified Files: > perl-Log-Dispatch.spec > Log Message: > - Exclude mod_perl from the requirements list > (overkill for most applications using Log::Dispatch). VETO IMO, this decision is a fault and should be reverted. You are breaking package dependencies. If you find this dependency to be too annoying, you probably better should consider to package %perl_vendordir/Log/Dispatch/ApacheLog.pm into a separate subpackage. Ralf From fedora-extras-commits at redhat.com Fri Sep 23 08:56:15 2005 From: fedora-extras-commits at redhat.com (Gavin Henry (ghenry)) Date: Fri, 23 Sep 2005 04:56:15 -0400 Subject: rpms/perl-Apache-LogRegex/FC-4 Makefile,1.1,1.2 Message-ID: <200509230856.j8N8uFp3014937@cvs-int.fedora.redhat.com> Author: ghenry Update of /cvs/extras/rpms/perl-Apache-LogRegex/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14918 Modified Files: Makefile Log Message: perl-Apache-Regex was no the name in Makefile, cheanged from meld. Index: Makefile =================================================================== RCS file: /cvs/extras/rpms/perl-Apache-LogRegex/FC-4/Makefile,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- Makefile 21 Aug 2005 00:09:41 -0000 1.1 +++ Makefile 23 Sep 2005 08:56:12 -0000 1.2 @@ -1,6 +1,6 @@ # Makefile for source rpm: perl-Apache-LogRegex # $Id$ -NAME := meld +NAME := perl-Apache-LogRegex SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common From fedora-extras-commits at redhat.com Fri Sep 23 12:09:52 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Fri, 23 Sep 2005 08:09:52 -0400 Subject: rpms/maxima/FC-4 maxima.spec,1.8,1.9 Message-ID: <200509231209.j8NC9qhD020752@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/maxima/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20733 Modified Files: maxima.spec Log Message: * Fri Sep 23 2005 Rex Dieter 5.9.1.9rc1-4 - --with-clisp only (for now) Index: maxima.spec =================================================================== RCS file: /cvs/extras/rpms/maxima/FC-4/maxima.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- maxima.spec 22 Sep 2005 19:34:30 -0000 1.8 +++ maxima.spec 23 Sep 2005 12:09:50 -0000 1.9 @@ -2,8 +2,8 @@ ## Which runtimes to build/enable? %define _with_clisp 1 %define _without_cmucl 1 -%define _with_gcl 1 -%define _with_sbcl 1 +%define _without_gcl 1 +%define _without_sbcl 1 %define beta rc1 @@ -11,7 +11,7 @@ Name: maxima Version: 5.9.1.9rc1 -Release: 3%{?dist} +Release: 4%{?dist} License: GPL Group: Applications/Engineering URL: http://maxima.sourceforge.net/ @@ -316,6 +316,9 @@ %changelog +* Fri Sep 23 2005 Rex Dieter 5.9.1.9rc1-4 +- --with-clisp only (for now) + * Thu Sep 22 2005 Rex Dieter 5.9.1.9rc1-3 - runtime-clisp: workaround "cpio: MD5 sum mismatch" error - --with-gcl From fedora-extras-commits at redhat.com Fri Sep 23 12:25:49 2005 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Fri, 23 Sep 2005 08:25:49 -0400 Subject: rpms/srecord/devel .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 srecord.spec, 1.1, 1.2 Message-ID: <200509231225.j8NCPnGK020932@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/srecord/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20870/devel Modified Files: .cvsignore sources srecord.spec Log Message: Update to 1.23. (It should now pass all tests in x86_64). Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/srecord/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 15 Sep 2005 02:36:25 -0000 1.2 +++ .cvsignore 23 Sep 2005 12:25:47 -0000 1.3 @@ -1 +1 @@ -srecord-1.22.tar.gz +srecord-1.23.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/srecord/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 15 Sep 2005 02:36:25 -0000 1.2 +++ sources 23 Sep 2005 12:25:47 -0000 1.3 @@ -1 +1 @@ -d67c70be352486db6a9c0929a4d8f08e srecord-1.22.tar.gz +fcca798d3cc3f186410b8ed0e1c2e793 srecord-1.23.tar.gz Index: srecord.spec =================================================================== RCS file: /cvs/extras/rpms/srecord/devel/srecord.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- srecord.spec 15 Sep 2005 02:36:25 -0000 1.1 +++ srecord.spec 23 Sep 2005 12:25:47 -0000 1.2 @@ -1,12 +1,12 @@ Name: srecord -Version: 1.22 -Release: 2%{?dist} +Version: 1.23 +Release: 1%{?dist} Summary: Manipulate EPROM load files Group: Development/Tools License: GPL URL: http://srecord.sourceforge.net/ -Source: http://srecord.sourceforge.net/%{name}-%{version}.tar.gz +Source: http://srecord.sourceforge.net/srecord-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: diffutils, sharutils, groff @@ -40,7 +40,8 @@ %build %configure -make %{?_smp_mflags} +# Fails to build in SMP machines using "make %{?_smp_mflags}" +make %install rm -rf $RPM_BUILD_ROOT @@ -63,6 +64,9 @@ %changelog +* Fri Sep 23 2005 Jose Pedro Oliveira - 1.23-1 +- Update to 1.23. + * Thu Sep 15 2005 Jose Pedro Oliveira - 1.22-2 - Updated the source tarball (PATCHLEVEL "1.22.D002"). The author repackages updates without changing the tarball version (ARGH!). From fedora-extras-commits at redhat.com Fri Sep 23 12:25:43 2005 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Fri, 23 Sep 2005 08:25:43 -0400 Subject: rpms/srecord/FC-3 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 srecord.spec, 1.1, 1.2 Message-ID: <200509231226.j8NCQDqH020937@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/srecord/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20870/FC-3 Modified Files: .cvsignore sources srecord.spec Log Message: Update to 1.23. (It should now pass all tests in x86_64). Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/srecord/FC-3/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 15 Sep 2005 02:36:25 -0000 1.2 +++ .cvsignore 23 Sep 2005 12:25:41 -0000 1.3 @@ -1 +1 @@ -srecord-1.22.tar.gz +srecord-1.23.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/srecord/FC-3/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 15 Sep 2005 02:36:25 -0000 1.2 +++ sources 23 Sep 2005 12:25:41 -0000 1.3 @@ -1 +1 @@ -d67c70be352486db6a9c0929a4d8f08e srecord-1.22.tar.gz +fcca798d3cc3f186410b8ed0e1c2e793 srecord-1.23.tar.gz Index: srecord.spec =================================================================== RCS file: /cvs/extras/rpms/srecord/FC-3/srecord.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- srecord.spec 15 Sep 2005 02:36:25 -0000 1.1 +++ srecord.spec 23 Sep 2005 12:25:41 -0000 1.2 @@ -1,12 +1,12 @@ Name: srecord -Version: 1.22 -Release: 2%{?dist} +Version: 1.23 +Release: 1%{?dist} Summary: Manipulate EPROM load files Group: Development/Tools License: GPL URL: http://srecord.sourceforge.net/ -Source: http://srecord.sourceforge.net/%{name}-%{version}.tar.gz +Source: http://srecord.sourceforge.net/srecord-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: diffutils, sharutils, groff @@ -40,7 +40,8 @@ %build %configure -make %{?_smp_mflags} +# Fails to build in SMP machines using "make %{?_smp_mflags}" +make %install rm -rf $RPM_BUILD_ROOT @@ -63,6 +64,9 @@ %changelog +* Fri Sep 23 2005 Jose Pedro Oliveira - 1.23-1 +- Update to 1.23. + * Thu Sep 15 2005 Jose Pedro Oliveira - 1.22-2 - Updated the source tarball (PATCHLEVEL "1.22.D002"). The author repackages updates without changing the tarball version (ARGH!). From fedora-extras-commits at redhat.com Fri Sep 23 12:25:43 2005 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Fri, 23 Sep 2005 08:25:43 -0400 Subject: rpms/srecord/FC-4 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 srecord.spec, 1.1, 1.2 Message-ID: <200509231226.j8NCQE44020942@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/srecord/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20870/FC-4 Modified Files: .cvsignore sources srecord.spec Log Message: Update to 1.23. (It should now pass all tests in x86_64). Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/srecord/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 15 Sep 2005 02:36:25 -0000 1.2 +++ .cvsignore 23 Sep 2005 12:25:41 -0000 1.3 @@ -1 +1 @@ -srecord-1.22.tar.gz +srecord-1.23.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/srecord/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 15 Sep 2005 02:36:25 -0000 1.2 +++ sources 23 Sep 2005 12:25:41 -0000 1.3 @@ -1 +1 @@ -d67c70be352486db6a9c0929a4d8f08e srecord-1.22.tar.gz +fcca798d3cc3f186410b8ed0e1c2e793 srecord-1.23.tar.gz Index: srecord.spec =================================================================== RCS file: /cvs/extras/rpms/srecord/FC-4/srecord.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- srecord.spec 15 Sep 2005 02:36:25 -0000 1.1 +++ srecord.spec 23 Sep 2005 12:25:41 -0000 1.2 @@ -1,12 +1,12 @@ Name: srecord -Version: 1.22 -Release: 2%{?dist} +Version: 1.23 +Release: 1%{?dist} Summary: Manipulate EPROM load files Group: Development/Tools License: GPL URL: http://srecord.sourceforge.net/ -Source: http://srecord.sourceforge.net/%{name}-%{version}.tar.gz +Source: http://srecord.sourceforge.net/srecord-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: diffutils, sharutils, groff @@ -40,7 +40,8 @@ %build %configure -make %{?_smp_mflags} +# Fails to build in SMP machines using "make %{?_smp_mflags}" +make %install rm -rf $RPM_BUILD_ROOT @@ -63,6 +64,9 @@ %changelog +* Fri Sep 23 2005 Jose Pedro Oliveira - 1.23-1 +- Update to 1.23. + * Thu Sep 15 2005 Jose Pedro Oliveira - 1.22-2 - Updated the source tarball (PATCHLEVEL "1.22.D002"). The author repackages updates without changing the tarball version (ARGH!). From fedora-extras-commits at redhat.com Fri Sep 23 12:52:23 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Fri, 23 Sep 2005 08:52:23 -0400 Subject: rpms/SoQt/devel .cvsignore, 1.4, 1.5 SoQt.spec, 1.12, 1.13 sources, 1.4, 1.5 Message-ID: <200509231252.j8NCqNWu021206@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/SoQt/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21183 Modified Files: .cvsignore SoQt.spec sources Log Message: Remove remnants of 1.2.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/SoQt/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 23 Sep 2005 02:57:24 -0000 1.4 +++ .cvsignore 23 Sep 2005 12:52:21 -0000 1.5 @@ -1,4 +1 @@ -SoQt-1.2.0.tar.gz -SoQt-1.2.0-config.diff.bz2 -SoQt-1.2.0-simacros.diff.bz2 SoQt-1.3.0.tar.gz Index: SoQt.spec =================================================================== RCS file: /cvs/extras/rpms/SoQt/devel/SoQt.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- SoQt.spec 23 Sep 2005 04:54:00 -0000 1.12 +++ SoQt.spec 23 Sep 2005 12:52:21 -0000 1.13 @@ -14,14 +14,6 @@ Source: ftp://ftp.coin3d.org/pub/coin/src/SoQt-%{version}.tar.gz -# Needed to rebuild patch1 -Patch0: SoQt-1.2.0-simacros.diff.bz2 - -# Work-around to issues with RH's libtool on ix86_64 -# libtoolize -f -c -# aclocal-1.7 -I cfg/m4 -# autoconf -Patch1: SoQt-1.2.0-config.diff.bz2 Patch2: SoQt-1.2.0-man3.diff BuildRequires: doxygen @@ -42,7 +34,7 @@ %package devel Summary: Development files for SoQt Requires: %{name} = %{version}-%{release} -Requires: autoconf +Requires: %{_datadir}/aclocal Requires: Coin2-devel qt-devel Provides: Coin2-SoQt-devel = %{version}-%{release} Group: Development/Libraries @@ -52,8 +44,6 @@ %prep %setup -# %patch0 -p1 -# %patch1 -p1 %patch2 -p1 %build @@ -74,9 +64,6 @@ %clean rm -rf $RPM_BUILD_ROOT -# TESTING -exit 1; - %post /sbin/ldconfig Index: sources =================================================================== RCS file: /cvs/extras/rpms/SoQt/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 23 Sep 2005 02:57:24 -0000 1.4 +++ sources 23 Sep 2005 12:52:21 -0000 1.5 @@ -1,4 +1 @@ -4a20e834ace358f3e81fd43b38a69efb SoQt-1.2.0.tar.gz -22454ea02257dbff7304da6e9e12dc63 SoQt-1.2.0-config.diff.bz2 -99db70be7488e3b15a164ece03492db6 SoQt-1.2.0-simacros.diff.bz2 85d6b2b1a78eacd38f1c7219f4a745e3 SoQt-1.3.0.tar.gz From fedora-extras-commits at redhat.com Fri Sep 23 12:53:31 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Fri, 23 Sep 2005 08:53:31 -0400 Subject: rpms/SoQt/devel SoQt.spec,1.13,1.14 Message-ID: <200509231254.j8NCs1Fe021245@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/SoQt/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21222 Modified Files: SoQt.spec Log Message: Remove testing stuff Index: SoQt.spec =================================================================== RCS file: /cvs/extras/rpms/SoQt/devel/SoQt.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- SoQt.spec 23 Sep 2005 12:52:21 -0000 1.13 +++ SoQt.spec 23 Sep 2005 12:53:21 -0000 1.14 @@ -10,8 +10,6 @@ Group: System Environment/Libraries URL: http://www.coin3d.org -ExclusiveArch: x86_64 - Source: ftp://ftp.coin3d.org/pub/coin/src/SoQt-%{version}.tar.gz Patch2: SoQt-1.2.0-man3.diff From fedora-extras-commits at redhat.com Fri Sep 23 13:20:58 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Fri, 23 Sep 2005 09:20:58 -0400 Subject: rpms/SoQt/FC-4 .cvsignore, 1.3, 1.4 SoQt.spec, 1.9, 1.10 sources, 1.3, 1.4 Message-ID: <200509231320.j8NDKw92022755@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/SoQt/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22732 Modified Files: .cvsignore SoQt.spec sources Log Message: Upgrade to 1.3.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/SoQt/FC-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 21 Apr 2005 15:32:46 -0000 1.3 +++ .cvsignore 23 Sep 2005 13:20:55 -0000 1.4 @@ -1,3 +1 @@ -SoQt-1.2.0.tar.gz -SoQt-1.2.0-config.diff.bz2 -SoQt-1.2.0-simacros.diff.bz2 +SoQt-1.3.0.tar.gz Index: SoQt.spec =================================================================== RCS file: /cvs/extras/rpms/SoQt/FC-4/SoQt.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- SoQt.spec 20 May 2005 14:09:48 -0000 1.9 +++ SoQt.spec 23 Sep 2005 13:20:55 -0000 1.10 @@ -3,8 +3,8 @@ Summary: High-level 3D visualization library Name: SoQt -Version: 1.2.0 -Release: 6%{?dist} +Version: 1.3.0 +Release: 1%{?dist} License: GPL Group: System Environment/Libraries @@ -12,14 +12,6 @@ Source: ftp://ftp.coin3d.org/pub/coin/src/SoQt-%{version}.tar.gz -# Needed to rebuild patch1 -Patch0: SoQt-1.2.0-simacros.diff.bz2 - -# Work-around to issues with RH's libtool on ix86_64 -# libtoolize -f -c -# aclocal-1.7 -I cfg/m4 -# autoconf -Patch1: SoQt-1.2.0-config.diff.bz2 Patch2: SoQt-1.2.0-man3.diff BuildRequires: doxygen @@ -40,9 +32,9 @@ %package devel Summary: Development files for SoQt Requires: %{name} = %{version}-%{release} -Requires: autoconf +Requires: %{_datadir}/aclocal Requires: Coin2-devel qt-devel -Provides: Coin2-SoQt = %{version}-%{release} +Provides: Coin2-SoQt-devel = %{version}-%{release} Group: Development/Libraries %description devel @@ -50,8 +42,6 @@ %prep %setup -%patch0 -p1 -%patch1 -p1 %patch2 -p1 %build @@ -66,11 +56,11 @@ make %install - rm -rf $RPM_BUILD_ROOT +rm -rf $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT install %clean - rm -rf $RPM_BUILD_ROOT +rm -rf $RPM_BUILD_ROOT %post /sbin/ldconfig @@ -96,6 +86,14 @@ %{_mandir}/man?/*.?.gz %changelog +* Fri Sep 23 2005 Ralf Corsepius - 0:1.3.0-1 +- Update to 1.3.0 +- Build w/o simacros. + +* Wed Jul 13 2005 Ralf Corsepius - 0:1.2.0-7 +- Rebuild against Coin-2.4.3. +- Let devel provide Coin2-SoQt-devel. + * Mon May 10 2005 Ralf Corsepius - 0:1.2.0-6 - Rebuild against Coin-2.4.1. Index: sources =================================================================== RCS file: /cvs/extras/rpms/SoQt/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 21 Apr 2005 15:32:46 -0000 1.3 +++ sources 23 Sep 2005 13:20:55 -0000 1.4 @@ -1,3 +1 @@ -4a20e834ace358f3e81fd43b38a69efb SoQt-1.2.0.tar.gz -22454ea02257dbff7304da6e9e12dc63 SoQt-1.2.0-config.diff.bz2 -99db70be7488e3b15a164ece03492db6 SoQt-1.2.0-simacros.diff.bz2 +85d6b2b1a78eacd38f1c7219f4a745e3 SoQt-1.3.0.tar.gz From fedora-extras-commits at redhat.com Fri Sep 23 14:43:56 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 23 Sep 2005 10:43:56 -0400 Subject: rpms/rocksndiamonds - New directory Message-ID: <200509231443.j8NEhu4E024426@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/rocksndiamonds In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24406/rocksndiamonds Log Message: Directory /cvs/extras/rpms/rocksndiamonds added to the repository From fedora-extras-commits at redhat.com Fri Sep 23 14:43:56 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 23 Sep 2005 10:43:56 -0400 Subject: rpms/rocksndiamonds/devel - New directory Message-ID: <200509231444.j8NEhue8024431@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/rocksndiamonds/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24406/rocksndiamonds/devel Log Message: Directory /cvs/extras/rpms/rocksndiamonds/devel added to the repository From fedora-extras-commits at redhat.com Fri Sep 23 14:44:18 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 23 Sep 2005 10:44:18 -0400 Subject: rpms/rocksndiamonds Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200509231444.j8NEiI5l024498@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/rocksndiamonds In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24460 Added Files: Makefile import.log Log Message: Setup of module rocksndiamonds --- NEW FILE Makefile --- # Top level Makefile for module rocksndiamonds all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Fri Sep 23 14:44:19 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 23 Sep 2005 10:44:19 -0400 Subject: rpms/rocksndiamonds/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200509231444.j8NEiJbn024503@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/rocksndiamonds/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24460/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module rocksndiamonds --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Fri Sep 23 14:46:18 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 23 Sep 2005 10:46:18 -0400 Subject: rpms/rocksndiamonds import.log,1.1,1.2 Message-ID: <200509231446.j8NEkIN6024624@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/rocksndiamonds In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24584 Modified Files: import.log Log Message: auto-import rocksndiamonds-3.1.1-2 on branch devel from rocksndiamonds-3.1.1-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/rocksndiamonds/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 23 Sep 2005 14:44:16 -0000 1.1 +++ import.log 23 Sep 2005 14:46:16 -0000 1.2 @@ -0,0 +1 @@ +rocksndiamonds-3_1_1-2:HEAD:rocksndiamonds-3.1.1-2.src.rpm:1127486754 From fedora-extras-commits at redhat.com Fri Sep 23 14:46:19 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 23 Sep 2005 10:46:19 -0400 Subject: rpms/rocksndiamonds/devel rocksndiamonds-3.1.1-nosmpeg.patch, NONE, 1.1 rocksndiamonds.desktop, NONE, 1.1 rocksndiamonds.png, NONE, 1.1 rocksndiamonds.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200509231446.j8NEkJ9X024633@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/rocksndiamonds/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24584/devel Modified Files: .cvsignore sources Added Files: rocksndiamonds-3.1.1-nosmpeg.patch rocksndiamonds.desktop rocksndiamonds.png rocksndiamonds.spec Log Message: auto-import rocksndiamonds-3.1.1-2 on branch devel from rocksndiamonds-3.1.1-2.src.rpm rocksndiamonds-3.1.1-nosmpeg.patch: --- NEW FILE rocksndiamonds-3.1.1-nosmpeg.patch --- --- rocksndiamonds-3.1.1/src/Makefile.BAD 2005-09-22 16:20:14.000000000 -0500 +++ rocksndiamonds-3.1.1/src/Makefile 2005-09-22 16:20:23.000000000 -0500 @@ -91,13 +91,13 @@ ifeq ($(TARGET),sdl) SYS_CFLAGS = -DTARGET_SDL $(shell sdl-config --cflags) -SDL_LIBS = -lSDL_image -lSDL_mixer -lSDL_net -lsmpeg +SDL_LIBS = -lSDL_image -lSDL_mixer -lSDL_net SYS_LDFLAGS = $(SDL_LIBS) $(shell sdl-config --libs) endif ifeq ($(TARGET),sdl-static) SYS_CFLAGS = -DTARGET_SDL $(shell sdl-config --cflags) -SDL_LIBS = -lSDL_image -lSDL_mixer -lSDL_net -lsmpeg +SDL_LIBS = -lSDL_image -lSDL_mixer -lSDL_net SYS_LDFLAGS = $(SDL_LIBS) $(shell sdl-config --static-libs) endif --- NEW FILE rocksndiamonds.desktop --- [Desktop Entry] Type=Application Version=1.0 Encoding=UTF-8 Name=Rocks'N'Diamonds GenericName=Underground digging game Comment=Dig for treasure and solve puzzles underground Icon=rocksndiamonds.png Exec=rocksndiamonds Terminal=false StartupNotify=false Categories=Application;Game; --- NEW FILE rocksndiamonds.spec --- Name: rocksndiamonds Version: 3.1.1 Release: 2%{?dist} License: GPL Group: Amusements/Games Summary: Underground digging game URL: http://www.artsoft.org/rocksndiamonds/ Source0: http://www.artsoft.org/RELEASES/unix/rocksndiamonds/rocksndiamonds-%{version}.tar.gz Source1: rocksndiamonds.desktop Source2: rocksndiamonds.png Patch0: rocksndiamonds-3.1.1-nosmpeg.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: SDL-devel, xorg-x11-devel, desktop-file-utils BuildRequires: SDL_image-devel, SDL_mixer-devel, SDL_net-devel %description Dig for treasure and solve puzzles underground, but watch out for falling rocks and strange creatures! %prep %setup -q %patch0 -p1 %build make %{?_smp_mflags} RO_GAME_DIR=%{_datadir}/%{name}/ RW_GAME_DIR=%{_localstatedir}/games/%{name}/ EXTRA_CFLAGS="$RPM_OPT_FLAGS" %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name} mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/games/%{name} mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1 mkdir -p $RPM_BUILD_ROOT%{_bindir} install -m0755 rocksndiamonds $RPM_BUILD_ROOT%{_bindir} for i in graphics levels music scores sounds; do cp -a $i $RPM_BUILD_ROOT%{_datadir}/%{name}/ done install -m0644 rocksndiamonds.1 $RPM_BUILD_ROOT%{_mandir}/man1 cp %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/pixmaps desktop-file-install \ --vendor fedora \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ --mode 0644 \ --add-category X-Fedora \ %{SOURCE1} %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc ChangeLog CHANGES COPYING CREDITS HARDWARE INSTALL README TODO %doc docs/elements/ %{_bindir}/* %{_datadir}/%{name}/ %{_datadir}/pixmaps/* %{_datadir}/applications/*.desktop %{_localstatedir}/games/%{name}/ %{_mandir}/man1/* %changelog * Thu Sep 22 2005 Tom "spot" Callaway 3.1.1-2 - add missing BR: SDL_net-devel * Thu Sep 22 2005 Tom "spot" Callaway 3.1.1-1 - initial package for Fedora Extras Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/rocksndiamonds/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 23 Sep 2005 14:44:16 -0000 1.1 +++ .cvsignore 23 Sep 2005 14:46:17 -0000 1.2 @@ -0,0 +1 @@ +rocksndiamonds-3.1.1.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/rocksndiamonds/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 23 Sep 2005 14:44:16 -0000 1.1 +++ sources 23 Sep 2005 14:46:17 -0000 1.2 @@ -0,0 +1 @@ +6a6e0397f043314e3df8ee85c03590b5 rocksndiamonds-3.1.1.tar.gz From fedora-extras-commits at redhat.com Fri Sep 23 15:51:14 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 23 Sep 2005 11:51:14 -0400 Subject: owners owners.list,1.245,1.246 Message-ID: <200509231551.j8NFpEHu026463@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26444 Modified Files: owners.list Log Message: rocksndiamonds Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.245 retrieving revision 1.246 diff -u -r1.245 -r1.246 --- owners.list 23 Sep 2005 06:31:58 -0000 1.245 +++ owners.list 23 Sep 2005 15:51:12 -0000 1.246 @@ -888,6 +888,7 @@ Fedora Extras|R-hdf5|R Interface to the NCSA HDF5 library|tcallawa at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|rinetd|TCP redirection server|kaboom at oobleck.net|extras-qa at fedoraproject.org| Fedora Extras|rkhunter|Rootkit Hunter scans for rootkits, backdoors and local exploits|tamaster at pobox.com|extras-qa at fedoraproject.org| +Fedora Extras|rocksndiamonds|Underground digging game|tcallawa at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|roundup|Simple and flexible issue-tracking system|redhat at flyn.org|extras-qa at fedoraproject.org| Fedora Extras|rpmDirectoryCheck|Tool to detect some RPM packaging errors|enrico.scholz at informatik.tu-chemnitz.de|extras-qa at fedoraproject.org| Fedora Extras|rpmlint|RPM correctness checker|ville.skytta at iki.fi|extras-qa at fedoraproject.org| From tcallawa at redhat.com Fri Sep 23 16:12:25 2005 From: tcallawa at redhat.com (Tom 'spot' Callaway) Date: Fri, 23 Sep 2005 11:12:25 -0500 Subject: rpms/perl-Log-Dispatch/devel perl-Log-Dispatch.spec,1.2,1.3 In-Reply-To: <1127461922.7815.103.camel@mccallum.corsepiu.local> References: <200509221748.j8MHmXV9021423@cvs-int.fedora.redhat.com> <1127461922.7815.103.camel@mccallum.corsepiu.local> Message-ID: <1127491945.2481.125.camel@localhost.localdomain> On Fri, 2005-09-23 at 09:52 +0200, Ralf Corsepius wrote: > On Thu, 2005-09-22 at 13:48 -0400, Jose Pedro Oliveira wrote: > > Author: jpo > > > > Update of /cvs/extras/rpms/perl-Log-Dispatch/devel > > In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21370/devel > > > > Modified Files: > > perl-Log-Dispatch.spec > > Log Message: > > - Exclude mod_perl from the requirements list > > (overkill for most applications using Log::Dispatch). > > VETO > > IMO, this decision is a fault and should be reverted. You are breaking > package dependencies. > > If you find this dependency to be too annoying, you probably better > should consider to package > %perl_vendordir/Log/Dispatch/ApacheLog.pm > into a separate subpackage. I agree. If a file in a package needs mod_perl (or any other dependency) to fully function, then you should NOT be excluding that dependency from the list. The only time excluding dependencies is ok is if it is a false positive (rpm says it needs perl, but nothing actually does). ~spot -- Tom "spot" Callaway: Red Hat Senior Sales Engineer || GPG ID: 93054260 Fedora Extras Steering Committee Member (RPM Standards and Practices) Aurora Linux Project Leader: http://auroralinux.org Lemurs, llamas, and sparcs, oh my! From fedora-extras-commits at redhat.com Fri Sep 23 18:44:03 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 23 Sep 2005 14:44:03 -0400 Subject: rpms/physfs - New directory Message-ID: <200509231844.j8NIi3Xu031072@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/physfs In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31048/physfs Log Message: Directory /cvs/extras/rpms/physfs added to the repository From fedora-extras-commits at redhat.com Fri Sep 23 18:44:03 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 23 Sep 2005 14:44:03 -0400 Subject: rpms/physfs/devel - New directory Message-ID: <200509231844.j8NIi3jk031077@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/physfs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31048/physfs/devel Log Message: Directory /cvs/extras/rpms/physfs/devel added to the repository From fedora-extras-commits at redhat.com Fri Sep 23 18:44:17 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 23 Sep 2005 14:44:17 -0400 Subject: rpms/physfs Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200509231844.j8NIiH4W031122@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/physfs In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31093 Added Files: Makefile import.log Log Message: Setup of module physfs --- NEW FILE Makefile --- # Top level Makefile for module physfs all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Fri Sep 23 18:44:17 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 23 Sep 2005 14:44:17 -0400 Subject: rpms/physfs/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200509231844.j8NIiHu8031127@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/physfs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31093/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module physfs --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Fri Sep 23 18:44:59 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 23 Sep 2005 14:44:59 -0400 Subject: rpms/physfs import.log,1.1,1.2 Message-ID: <200509231844.j8NIix2v031201@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/physfs In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31166 Modified Files: import.log Log Message: auto-import physfs-1.0.1-2 on branch devel from physfs-1.0.1-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/physfs/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 23 Sep 2005 18:44:15 -0000 1.1 +++ import.log 23 Sep 2005 18:44:57 -0000 1.2 @@ -0,0 +1 @@ +physfs-1_0_1-2:HEAD:physfs-1.0.1-2.src.rpm:1127501076 From fedora-extras-commits at redhat.com Fri Sep 23 18:45:00 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 23 Sep 2005 14:45:00 -0400 Subject: rpms/physfs/devel physfs.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200509231845.j8NIj05L031208@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/physfs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31166/devel Modified Files: .cvsignore sources Added Files: physfs.spec Log Message: auto-import physfs-1.0.1-2 on branch devel from physfs-1.0.1-2.src.rpm --- NEW FILE physfs.spec --- Name: physfs Version: 1.0.1 Release: 2%{?dist} License: BSD Group: System Environment/Libraries Summary: Library to provide abstract access to various archives URL: http://www.icculus.org/physfs/ Source0: http://www.icculus.org/physfs/downloads/physfs-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: doxygen, zlib-devel, readline-devel %description PhysicsFS is a library to provide abstract access to various archives. It is intended for use in video games, and the design was somewhat inspired by Quake 3's file subsystem. The programmer defines a "write directory" on the physical filesystem. No file writing done through the PhysicsFS API can leave that write directory, for security. For example, an embedded scripting language cannot write outside of this path if it uses PhysFS for all of its I/O, which means that untrusted scripts can run more safely. Symbolic links can be disabled as well, for added safety. For file reading, the programmer lists directories and archives that form a "search path". Once the search path is defined, it becomes a single, transparent hierarchical filesystem. This makes for easy access to ZIP files in the same way as you access a file directly on the disk, and it makes it easy to ship a new archive that will override a previous archive on a per-file basis. Finally, PhysicsFS gives you platform-abstracted means to determine if CD-ROMs are available, the user's home directory, where in the real filesystem your program is running, etc. %package devel Summary: Development libraries and headers for physfs Group: Development/Libraries Requires: %{name} = %{version}-%{release} %description devel This package contains the libraries and headers necessary for developing packages with physfs functionality. %prep %setup -q %build %configure make %{?_smp_mflags} doxygen %install rm -rf $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT install rm -rf $RPM_BUILD_ROOT%{_libdir}/*.la mkdir -p $RPM_BUILD_ROOT%{_mandir}/man3 install -m0644 docs/man/man3/* $RPM_BUILD_ROOT%{_mandir}/man3 %clean rm -rf $RPM_BUILD_ROOT %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files %defattr(-,root,root,-) %doc CHANGELOG CREDITS LICENSE TODO %{_libdir}/*.so.* %{_bindir}/test_physfs %files devel %defattr(-,root,root,-) %doc docs/html/ docs/latex/ %{_includedir}/physfs.h %{_libdir}/*.a %{_libdir}/*.so %{_mandir}/man3/* %changelog * Fri Sep 23 2005 Tom "spot" Callaway 1.0.1-2 - add docs for devel * Fri Aug 19 2005 Tom "spot" Callaway 1.0.1-1 - initial package for Fedora Extras Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/physfs/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 23 Sep 2005 18:44:15 -0000 1.1 +++ .cvsignore 23 Sep 2005 18:44:58 -0000 1.2 @@ -0,0 +1 @@ +physfs-1.0.1.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/physfs/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 23 Sep 2005 18:44:15 -0000 1.1 +++ sources 23 Sep 2005 18:44:58 -0000 1.2 @@ -0,0 +1 @@ +d0bd118c6b55fb1e020fe982d6ec6957 physfs-1.0.1.tar.gz From fedora-extras-commits at redhat.com Fri Sep 23 18:45:21 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 23 Sep 2005 14:45:21 -0400 Subject: owners owners.list,1.246,1.247 Message-ID: <200509231845.j8NIjLEs031261@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31242 Modified Files: owners.list Log Message: physfs Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.246 retrieving revision 1.247 diff -u -r1.246 -r1.247 --- owners.list 23 Sep 2005 15:51:12 -0000 1.246 +++ owners.list 23 Sep 2005 18:45:19 -0000 1.247 @@ -801,6 +801,7 @@ Fedora Extras|php-pecl-pdo|PECL package for PHP Data Objects Interface|matthias at rpmforge.net|extras-qa at fedoraproject.org| Fedora Extras|php-pecl-pdo-sqlite|PECL package for PHP Data Objects Interface to SQLite v3|matthias at rpmforge.net|extras-qa at fedoraproject.org| Fedora Extras|php-pecl-sqlite|PECL package for accessing SQLite databases|matthias at rpmforge.net|extras-qa at fedoraproject.org| +Fedora Extras|physfs|Library to provide abstract access to various archives|tcallawa at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|pinentry|Collection of simple PIN or passphrase entry dialogs|ville.skytta at iki.fi|extras-qa at fedoraproject.org| Fedora Extras|plague|Distributed build system for RPMs|dcbw at redhat.com|extras-qa at fedoraproject.org Fedora Extras|plib16|Set of portable libraries especially useful for games|matthias at rpmforge.net|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Fri Sep 23 20:33:48 2005 From: fedora-extras-commits at redhat.com (Elliot Lee (sopwith)) Date: Fri, 23 Sep 2005 16:33:48 -0400 Subject: web/include navigation.inc,1.11,1.12 Message-ID: <200509232034.j8NKYIxY002051@cvs-int.fedora.redhat.com> Author: sopwith Update of /cvs/fedora/web/include In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2032 Modified Files: navigation.inc Log Message: remove leadership.html Index: navigation.inc =================================================================== RCS file: /cvs/fedora/web/include/navigation.inc,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- navigation.inc 22 Aug 2005 17:07:40 -0000 1.11 +++ navigation.inc 23 Sep 2005 20:33:44 -0000 1.12 @@ -50,7 +50,6 @@ "About"=>array("uri"=>"/about/","sub"=>array( "FAQs"=>array("uri"=>"/about/faq/"), "History"=>array("uri"=>"/about/history/"), - "Leadership"=>array("uri"=>"/about/leadership.php"), "Objectives"=>array("uri"=>"/about/objectives.php"), "Product Relationship"=>array("uri"=>"/about/rhel.php"), "Fedora Name"=>array("uri"=>"/about/name.php"), From jpo at di.uminho.pt Sat Sep 24 00:28:44 2005 From: jpo at di.uminho.pt (=?ISO-8859-1?Q?Jos=E9_Pedro_Oliveira?=) Date: Sat, 24 Sep 2005 01:28:44 +0100 Subject: rpms/perl-Log-Dispatch/devel perl-Log-Dispatch.spec,1.2,1.3 In-Reply-To: <1127461922.7815.103.camel@mccallum.corsepiu.local> References: <200509221748.j8MHmXV9021423@cvs-int.fedora.redhat.com> <1127461922.7815.103.camel@mccallum.corsepiu.local> Message-ID: <43349DBC.7030906@di.uminho.pt> Ralf Corsepius wrote: > On Thu, 2005-09-22 at 13:48 -0400, Jose Pedro Oliveira wrote: > >>Author: jpo >> >>Update of /cvs/extras/rpms/perl-Log-Dispatch/devel >>In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21370/devel >> >>Modified Files: >> perl-Log-Dispatch.spec >>Log Message: >>- Exclude mod_perl from the requirements list >> (overkill for most applications using Log::Dispatch). > > > VETO > > IMO, this decision is a fault and should be reverted. You are breaking > package dependencies. I disagree with your opinion and I believe my decision is correct. Reasoning: 1) to create an ApacheLog dispatcher you need to supply an Apache object (see http://search.cpan.org/dist/Log-Dispatch/lib/Log/Dispatch/ApacheLog.pm) 2) you can only obtain an Apache* object if your app is running under mod_perl So, your app should be the one requiring mod_perl and not perl-Log-Dispatch. Also, when installing this perl package using CPAN you are not required to install mod_perl (see Build.PL). This kind of requirements nightmare can even get worst if we start to talk about Log::Log4perl which uses Log::Dispatch. > If you find this dependency to be too annoying, you probably better > should consider to package > %perl_vendordir/Log/Dispatch/ApacheLog.pm > into a separate subpackage. This could be a solution if there are packages that need perl-Log-Dispatch to install mod_perl and apache (I never came across one). jpo -- Jos? Pedro Oliveira * mailto: jpo at di.uminho.pt * http://gsd.di.uminho.pt/jpo * * gpg fingerprint = F9B6 8D87 859D 1C94 48F0 84C0 9749 9EB5 91BD 851B * http://conferences.yapceurope.org/2005/ * http://braga.yapceurope.org/ -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 251 bytes Desc: OpenPGP digital signature URL: From fedora-extras-commits at redhat.com Sat Sep 24 03:16:23 2005 From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon)) Date: Fri, 23 Sep 2005 23:16:23 -0400 Subject: rpms/repoview/FC-4 .cvsignore, 1.2, 1.3 repoview.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200509240316.j8O3GNHC013039@cvs-int.fedora.redhat.com> Author: icon Update of /cvs/extras/rpms/repoview/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13016 Modified Files: .cvsignore repoview.spec sources Log Message: Version 0.4 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/repoview/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 30 Mar 2005 15:18:00 -0000 1.2 +++ .cvsignore 24 Sep 2005 03:16:21 -0000 1.3 @@ -1 +1 @@ -repoview-0.3.tar.gz +repoview-0.4.tar.gz Index: repoview.spec =================================================================== RCS file: /cvs/extras/rpms/repoview/FC-4/repoview.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- repoview.spec 4 Apr 2005 21:09:47 -0000 1.2 +++ repoview.spec 24 Sep 2005 03:16:21 -0000 1.3 @@ -1,16 +1,16 @@ Name: repoview -Version: 0.3 -Release: 3 +Version: 0.4 +Release: 1%{?dist} Summary: Creates a set of static HTML pages in a yum repository Group: Applications/System License: GPL URL: http://linux.duke.edu/projects/mini/repoview -Source0: http://linux.duke.edu/projects/mini/repoview/download/repoview-0.3.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-root +Source0: http://linux.duke.edu/projects/mini/repoview/download/%{name}-%{version}.tar.gz +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -Requires: python-kid >= 0.6.3, python-elementtree +Requires: python-kid >= 0.6.3, yum >= 2.3 %description RepoView creates a set of static HTML pages in a yum repository for easy @@ -52,6 +52,12 @@ %changelog +* Fri Sep 23 2005 Konstantin Ryabitsev - 0.4-1 +- Version 0.4 +- Require yum >= 2.3 +- Drop requirement for python-elementtree, since it's required by yum +- Disttagging. + * Mon Apr 04 2005 Konstantin Ryabitsev 0.3-3 - Do not BuildRequire sed -- basic enough dependency, even for version 4. Index: sources =================================================================== RCS file: /cvs/extras/rpms/repoview/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 30 Mar 2005 15:18:00 -0000 1.2 +++ sources 24 Sep 2005 03:16:21 -0000 1.3 @@ -1 +1 @@ -03a14fccdb7cae46d3a6da9f1069ca14 repoview-0.3.tar.gz +d0d10417310ea5e4e03c84ec33ec1129 repoview-0.4.tar.gz From fedora-extras-commits at redhat.com Sat Sep 24 03:20:47 2005 From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon)) Date: Fri, 23 Sep 2005 23:20:47 -0400 Subject: rpms/repoview/devel .cvsignore, 1.2, 1.3 repoview.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200509240320.j8O3KlSx013080@cvs-int.fedora.redhat.com> Author: icon Update of /cvs/extras/rpms/repoview/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13057 Modified Files: .cvsignore repoview.spec sources Log Message: Version 0.4 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/repoview/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 30 Mar 2005 15:18:00 -0000 1.2 +++ .cvsignore 24 Sep 2005 03:20:45 -0000 1.3 @@ -1 +1 @@ -repoview-0.3.tar.gz +repoview-0.4.tar.gz Index: repoview.spec =================================================================== RCS file: /cvs/extras/rpms/repoview/devel/repoview.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- repoview.spec 4 Apr 2005 21:09:47 -0000 1.2 +++ repoview.spec 24 Sep 2005 03:20:45 -0000 1.3 @@ -1,16 +1,16 @@ Name: repoview -Version: 0.3 -Release: 3 +Version: 0.4 +Release: 1%{?dist} Summary: Creates a set of static HTML pages in a yum repository Group: Applications/System License: GPL URL: http://linux.duke.edu/projects/mini/repoview -Source0: http://linux.duke.edu/projects/mini/repoview/download/repoview-0.3.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-root +Source0: http://linux.duke.edu/projects/mini/repoview/download/%{name}-%{version}.tar.gz +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -Requires: python-kid >= 0.6.3, python-elementtree +Requires: python-kid >= 0.6.3, yum >= 2.3 %description RepoView creates a set of static HTML pages in a yum repository for easy @@ -52,6 +52,12 @@ %changelog +* Fri Sep 23 2005 Konstantin Ryabitsev - 0.4-1 +- Version 0.4 +- Require yum >= 2.3 +- Drop requirement for python-elementtree, since it's required by yum +- Disttagging. + * Mon Apr 04 2005 Konstantin Ryabitsev 0.3-3 - Do not BuildRequire sed -- basic enough dependency, even for version 4. Index: sources =================================================================== RCS file: /cvs/extras/rpms/repoview/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 30 Mar 2005 15:18:00 -0000 1.2 +++ sources 24 Sep 2005 03:20:45 -0000 1.3 @@ -1 +1 @@ -03a14fccdb7cae46d3a6da9f1069ca14 repoview-0.3.tar.gz +d0d10417310ea5e4e03c84ec33ec1129 repoview-0.4.tar.gz From rc040203 at freenet.de Sat Sep 24 03:47:55 2005 From: rc040203 at freenet.de (Ralf Corsepius) Date: Sat, 24 Sep 2005 05:47:55 +0200 Subject: rpms/perl-Log-Dispatch/devel perl-Log-Dispatch.spec,1.2,1.3 In-Reply-To: <43349DBC.7030906@di.uminho.pt> References: <200509221748.j8MHmXV9021423@cvs-int.fedora.redhat.com> <1127461922.7815.103.camel@mccallum.corsepiu.local> <43349DBC.7030906@di.uminho.pt> Message-ID: <1127533675.7815.152.camel@mccallum.corsepiu.local> On Sat, 2005-09-24 at 01:28 +0100, Jos? Pedro Oliveira wrote: > Ralf Corsepius wrote: > > On Thu, 2005-09-22 at 13:48 -0400, Jose Pedro Oliveira wrote: > > > >>Author: jpo > >> > >>Update of /cvs/extras/rpms/perl-Log-Dispatch/devel > >>In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21370/devel > >> > >>Modified Files: > >> perl-Log-Dispatch.spec > >>Log Message: > >>- Exclude mod_perl from the requirements list > >> (overkill for most applications using Log::Dispatch). > > > > > > VETO > > > > IMO, this decision is a fault and should be reverted. You are breaking > > package dependencies. > > I disagree with your opinion and I believe my decision is correct. > > Reasoning: > > 1) to create an ApacheLog dispatcher you need to supply an Apache > object (see > http://search.cpan.org/dist/Log-Dispatch/lib/Log/Dispatch/ApacheLog.pm) > > 2) you can only obtain an Apache* object if your app is running > under mod_perl ApacheLog.pm does not depend on mod_perl. It depends on perl(Apache2::Log), which currently just happens to be provided by mod_perl. So, if you split out ApacheLog.pm into a separate sub package, the whole problem is gone. I.e. a new perl-Log-Dispatch-ApacheLog subpackage would Require: perl(Apache2::Log) which would cause installation to implicitly/indirectly pull-in mod_perl. > So, your app should be the one requiring mod_perl and not > perl-Log-Dispatch. > > Also, when installing this perl package using CPAN you are not > required to install mod_perl (see Build.PL). > > This kind of requirements nightmare can even get worst if we > start to talk about Log::Log4perl which uses Log::Dispatch. I am not familiar with Log::Log4perl, but I don't see where the problem is. AFAIS, the only part inside of the current perl-Log-Dispatch package which indirectly depends on something inside of mod_perl is ApacheLog.pm. I.e. this all is ordinary perl module dependencies. > > If you find this dependency to be too annoying, you probably better > > should consider to package > > %perl_vendordir/Log/Dispatch/ApacheLog.pm > > into a separate subpackage. > > This could be a solution if there are packages that need > perl-Log-Dispatch to install mod_perl and apache (I never > came across one). Ralf From fedora-extras-commits at redhat.com Sat Sep 24 04:17:16 2005 From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon)) Date: Sat, 24 Sep 2005 00:17:16 -0400 Subject: rpms/verbiste/FC-4 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 verbiste.spec, 1.5, 1.6 Message-ID: <200509240417.j8O4HGP7014645@cvs-int.fedora.redhat.com> Author: icon Update of /cvs/extras/rpms/verbiste/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14621 Modified Files: .cvsignore sources verbiste.spec Log Message: Version 0.1.12 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/verbiste/FC-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 6 May 2005 19:53:18 -0000 1.3 +++ .cvsignore 24 Sep 2005 04:17:14 -0000 1.4 @@ -1 +1 @@ -verbiste-0.1.11.tar.gz +verbiste-0.1.12.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/verbiste/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 6 May 2005 19:53:18 -0000 1.3 +++ sources 24 Sep 2005 04:17:14 -0000 1.4 @@ -1 +1 @@ -8cce96efa9764ca57ba444524b4aeb19 verbiste-0.1.11.tar.gz +291f28dbb1fa4b160d2193ea7c141041 verbiste-0.1.12.tar.gz Index: verbiste.spec =================================================================== RCS file: /cvs/extras/rpms/verbiste/FC-4/verbiste.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- verbiste.spec 9 May 2005 21:12:28 -0000 1.5 +++ verbiste.spec 24 Sep 2005 04:17:14 -0000 1.6 @@ -1,6 +1,6 @@ Name: verbiste -Version: 0.1.11 -Release: 2 +Version: 0.1.12 +Release: 1 Summary: French conjugation system Group: Applications/Text @@ -101,6 +101,9 @@ %changelog +* Fri Sep 23 2005 Konstantin Ryabitsev - 0.1.12-1 +- Version 0.1.12. + * Mon May 09 2005 Konstantin Ryabitsev - 0.1.11-2 - Remove /usr/share/locale/locale.alias created on x86_64 on the buildsystem. From fedora-extras-commits at redhat.com Sat Sep 24 04:18:15 2005 From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon)) Date: Sat, 24 Sep 2005 00:18:15 -0400 Subject: rpms/verbiste/FC-4 verbiste.spec,1.6,1.7 Message-ID: <200509240418.j8O4Ijiu014671@cvs-int.fedora.redhat.com> Author: icon Update of /cvs/extras/rpms/verbiste/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14652 Modified Files: verbiste.spec Log Message: Add disttag. Index: verbiste.spec =================================================================== RCS file: /cvs/extras/rpms/verbiste/FC-4/verbiste.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- verbiste.spec 24 Sep 2005 04:17:14 -0000 1.6 +++ verbiste.spec 24 Sep 2005 04:18:13 -0000 1.7 @@ -1,6 +1,6 @@ Name: verbiste Version: 0.1.12 -Release: 1 +Release: 1%{?dist} Summary: French conjugation system Group: Applications/Text @@ -103,6 +103,7 @@ %changelog * Fri Sep 23 2005 Konstantin Ryabitsev - 0.1.12-1 - Version 0.1.12. +- Disttagging. * Mon May 09 2005 Konstantin Ryabitsev - 0.1.11-2 - Remove /usr/share/locale/locale.alias created on x86_64 on the From fedora-extras-commits at redhat.com Sat Sep 24 04:20:05 2005 From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon)) Date: Sat, 24 Sep 2005 00:20:05 -0400 Subject: rpms/verbiste/devel .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 verbiste.spec, 1.5, 1.6 Message-ID: <200509240420.j8O4K5oH014706@cvs-int.fedora.redhat.com> Author: icon Update of /cvs/extras/rpms/verbiste/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14683 Modified Files: .cvsignore sources verbiste.spec Log Message: Version 0.1.12 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/verbiste/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 6 May 2005 19:53:18 -0000 1.3 +++ .cvsignore 24 Sep 2005 04:20:03 -0000 1.4 @@ -1 +1 @@ -verbiste-0.1.11.tar.gz +verbiste-0.1.12.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/verbiste/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 6 May 2005 19:53:18 -0000 1.3 +++ sources 24 Sep 2005 04:20:03 -0000 1.4 @@ -1 +1 @@ -8cce96efa9764ca57ba444524b4aeb19 verbiste-0.1.11.tar.gz +291f28dbb1fa4b160d2193ea7c141041 verbiste-0.1.12.tar.gz Index: verbiste.spec =================================================================== RCS file: /cvs/extras/rpms/verbiste/devel/verbiste.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- verbiste.spec 9 May 2005 21:12:28 -0000 1.5 +++ verbiste.spec 24 Sep 2005 04:20:03 -0000 1.6 @@ -1,6 +1,6 @@ Name: verbiste -Version: 0.1.11 -Release: 2 +Version: 0.1.12 +Release: 1%{?dist} Summary: French conjugation system Group: Applications/Text @@ -101,6 +101,10 @@ %changelog +* Fri Sep 23 2005 Konstantin Ryabitsev - 0.1.12-1 +- Version 0.1.12. +- Disttagging. + * Mon May 09 2005 Konstantin Ryabitsev - 0.1.11-2 - Remove /usr/share/locale/locale.alias created on x86_64 on the buildsystem. From fedora-extras-commits at redhat.com Sat Sep 24 12:08:47 2005 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Sat, 24 Sep 2005 08:08:47 -0400 Subject: rpms/tagtool - New directory Message-ID: <200509241208.j8OC8lUU026853@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/tagtool In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26838/tagtool Log Message: Directory /cvs/extras/rpms/tagtool added to the repository From fedora-extras-commits at redhat.com Sat Sep 24 12:08:49 2005 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Sat, 24 Sep 2005 08:08:49 -0400 Subject: rpms/tagtool/devel - New directory Message-ID: <200509241208.j8OC8nU4026876@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/tagtool/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26838/tagtool/devel Log Message: Directory /cvs/extras/rpms/tagtool/devel added to the repository From fedora-extras-commits at redhat.com Sat Sep 24 12:09:13 2005 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Sat, 24 Sep 2005 08:09:13 -0400 Subject: rpms/tagtool/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200509241209.j8OC9Djd026937@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/tagtool/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26895/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module tagtool --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Sat Sep 24 12:09:11 2005 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Sat, 24 Sep 2005 08:09:11 -0400 Subject: rpms/tagtool Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200509241209.j8OC9Br5026922@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/tagtool In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26895 Added Files: Makefile import.log Log Message: Setup of module tagtool --- NEW FILE Makefile --- # Top level Makefile for module tagtool all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Sat Sep 24 12:09:46 2005 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Sat, 24 Sep 2005 08:09:46 -0400 Subject: rpms/tagtool import.log,1.1,1.2 Message-ID: <200509241209.j8OC9knR027023@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/tagtool In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26987 Modified Files: import.log Log Message: auto-import tagtool-0.12.2-2 on branch devel from tagtool-0.12.2-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/tagtool/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 24 Sep 2005 12:09:09 -0000 1.1 +++ import.log 24 Sep 2005 12:09:44 -0000 1.2 @@ -0,0 +1 @@ +tagtool-0_12_2-2:HEAD:tagtool-0.12.2-2.src.rpm:1127563780 From fedora-extras-commits at redhat.com Sat Sep 24 12:09:46 2005 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Sat, 24 Sep 2005 08:09:46 -0400 Subject: rpms/tagtool/devel tagtool-contents.patch, NONE, 1.1 tagtool.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200509241209.j8OC9kHg027031@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/tagtool/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26987/devel Modified Files: .cvsignore sources Added Files: tagtool-contents.patch tagtool.spec Log Message: auto-import tagtool-0.12.2-2 on branch devel from tagtool-0.12.2-2.src.rpm tagtool-contents.patch: --- NEW FILE tagtool-contents.patch --- diff -ur tagtool-0.12.2.OLD/src/main_win.c tagtool-0.12.2/src/main_win.c --- tagtool-0.12.2.OLD/src/main_win.c 2005-05-26 05:44:21.000000000 -0400 +++ tagtool-0.12.2/src/main_win.c 2005-09-16 15:08:45.000000000 -0400 @@ -61,15 +61,6 @@ prefs_display(); } -void cb_help_contents(GtkWidget *widget, GdkEvent *event) -{ - GError *err = NULL; - - // XXX - should check with g_find_program_in_path() - - g_spawn_command_line_async ("yelp "HELPDIR"tagtool.xml", &err); -} - void cb_help_about(GtkWidget *widget, GdkEvent *event) { about_display(); diff -ur tagtool-0.12.2.OLD/src/tagtool.glade tagtool-0.12.2/src/tagtool.glade --- tagtool-0.12.2.OLD/src/tagtool.glade 2005-05-26 11:12:54.000000000 -0400 +++ tagtool-0.12.2/src/tagtool.glade 2005-09-16 16:08:50.000000000 -0400 @@ -274,27 +274,6 @@ - - True - Contents... - True - - - - - True - gtk-help - 1 - 0.5 - 0.5 - 0 - 0 - - - - - - True About... --- NEW FILE tagtool.spec --- Name: tagtool Version: 0.12.2 Release: 2 Summary: Ogg Vorbis and MP3 tag manager Group: Applications/Multimedia License: GPL URL: http://pwp.netcabo.pt/paol/tagtool/ Source0: http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.gz Patch1: %{name}-contents.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libglade2-devel BuildRequires: libvorbis-devel BuildRequires: id3lib-devel BuildRequires: desktop-file-utils BuildRequires: gettext Requires(post): desktop-file-utils Requires(postun):desktop-file-utils %description Audio Tag Tool is a program to manage the information fields in MP3 and Ogg Vorbis files. It can be used to edit tags one by one, but the most useful features are mass tag and mass rename. These are designed to tag or rename hundreds of files at once, in any desired format. %prep %setup -q %patch1 -p1 -b .contents %build %configure make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT %find_lang %{name} desktop-file-install --vendor fedora --delete-original \ --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ --add-category X-Fedora \ --add-category AudioVideoEditing \ --add-category AudioVideo \ --add-category Application \ $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop %clean rm -rf $RPM_BUILD_ROOT %post update-desktop-database &> /dev/null ||: %postun update-desktop-database &> /dev/null ||: %files -f %{name}.lang %defattr(-,root,root,-) %doc AUTHORS BUGS COPYING ChangeLog NEWS README %{_bindir}/%{name} %{_datadir}/applications/fedora-%{name}.desktop %{_datadir}/%{name}/ %{_datadir}/pixmaps/TagTool.png %changelog * Fri Sep 23 2005 Brian Pepple - 0.12.2-2 - Drop redundant BR's: gtk2-devel, libxml2-devel. - Add missing scriplets for desktop-database. - Merge directories. * Fri Sep 16 2005 Brian Pepple - 0.12.2-1 - Initial Fedora Extras spec. - Add patch to remove content from menu, since no help file is provided. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/tagtool/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 24 Sep 2005 12:09:11 -0000 1.1 +++ .cvsignore 24 Sep 2005 12:09:44 -0000 1.2 @@ -0,0 +1 @@ +tagtool-0.12.2.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/tagtool/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 24 Sep 2005 12:09:11 -0000 1.1 +++ sources 24 Sep 2005 12:09:44 -0000 1.2 @@ -0,0 +1 @@ +4d688dbbe7cd8a08a9f9faef4d1c5b27 tagtool-0.12.2.tar.gz From fedora-extras-commits at redhat.com Sat Sep 24 12:12:59 2005 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Sat, 24 Sep 2005 08:12:59 -0400 Subject: owners owners.list,1.247,1.248 Message-ID: <200509241212.j8OCCxSf027095@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27076 Modified Files: owners.list Log Message: Add tagtool Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.247 retrieving revision 1.248 diff -u -r1.247 -r1.248 --- owners.list 23 Sep 2005 18:45:19 -0000 1.247 +++ owners.list 24 Sep 2005 12:12:57 -0000 1.248 @@ -973,6 +973,7 @@ Fedora Extras|t1lib|PostScript Type 1 font rasterizer|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| Fedora Extras|t1utils|Collection of Type 1 and 2 font manipulation utilities|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| Fedora Extras|taglib|Audio Meta-Data Library|gauret at free.fr|extras-qa at fedoraproject.org| +Fedora Extras|tagtool|Ogg Vorbis and MP3 tag manager|bdpepple at ameritech.net|extras-qa at fedoraproject.org| Fedora Extras|tdl|To-do list manager|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| Fedora Extras|Terminal|Xfce Terminal Emulator|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org| Fedora Extras|tetex-arabtex|The ArabTeX package for TeX/LaTeX|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| From chris at chrisgrau.com Sat Sep 24 16:11:17 2005 From: chris at chrisgrau.com (Chris Grau) Date: Sat, 24 Sep 2005 09:11:17 -0700 Subject: rpms/perl-Log-Dispatch/devel perl-Log-Dispatch.spec,1.2,1.3 In-Reply-To: <1127533675.7815.152.camel@mccallum.corsepiu.local> References: <200509221748.j8MHmXV9021423@cvs-int.fedora.redhat.com> <1127461922.7815.103.camel@mccallum.corsepiu.local> <43349DBC.7030906@di.uminho.pt> <1127533675.7815.152.camel@mccallum.corsepiu.local> Message-ID: <20050924161116.GA14207@chrisgrau.com> On Sat, Sep 24, 2005 at 05:47:55AM +0200, Ralf Corsepius wrote: > On Sat, 2005-09-24 at 01:28 +0100, Jos? Pedro Oliveira wrote: > > Ralf Corsepius wrote: > > > On Thu, 2005-09-22 at 13:48 -0400, Jose Pedro Oliveira wrote: > > > > > >>Author: jpo > > >> > > >>Update of /cvs/extras/rpms/perl-Log-Dispatch/devel > > >>In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21370/devel > > >> > > >>Modified Files: > > >> perl-Log-Dispatch.spec > > >>Log Message: > > >>- Exclude mod_perl from the requirements list > > >> (overkill for most applications using Log::Dispatch). > > > > > > > > > VETO > > > > > > IMO, this decision is a fault and should be reverted. You are breaking > > > package dependencies. > > > > I disagree with your opinion and I believe my decision is correct. > > > > Reasoning: > > > > 1) to create an ApacheLog dispatcher you need to supply an Apache > > object (see > > http://search.cpan.org/dist/Log-Dispatch/lib/Log/Dispatch/ApacheLog.pm) > > > > 2) you can only obtain an Apache* object if your app is running > > under mod_perl > > ApacheLog.pm does not depend on mod_perl. It depends on > perl(Apache2::Log), which currently just happens to be provided by > mod_perl. And probably always will be. It's an integral part of mod_perl. As Jos? wrote, Log::Dispatch::ApacheLog will always require an Apache2::RequestRec object and thus mod_perl. I don't know what percentage of the Log::Dispatch user space uses it in conjunction with mod_perl, but it's a certainty that those users will have mod_perl installed anyway. Thus the dependencies don't need to be forced by RPM. > So, if you split out ApacheLog.pm into a separate sub package, the whole > problem is gone. > > I.e. a new perl-Log-Dispatch-ApacheLog subpackage would > Require: perl(Apache2::Log) > which would cause installation to implicitly/indirectly pull-in > mod_perl. Since the filtering method appears to be unpopular, this is the solution I'd prefer to see. I use Log::Dispatch both with and without mod_perl, and I'd hate to see it pull in mod_perl (and thus httpd) on those systems that don't need it. > > So, your app should be the one requiring mod_perl and not > > perl-Log-Dispatch. > > > > Also, when installing this perl package using CPAN you are not > > required to install mod_perl (see Build.PL). > > > > This kind of requirements nightmare can even get worst if we > > start to talk about Log::Log4perl which uses Log::Dispatch. > I am not familiar with Log::Log4perl, but I don't see where the problem > is. > > AFAIS, the only part inside of the current perl-Log-Dispatch package > which indirectly depends on something inside of mod_perl is > ApacheLog.pm. > > I.e. this all is ordinary perl module dependencies. > > > > If you find this dependency to be too annoying, you probably better > > > should consider to package > > > %perl_vendordir/Log/Dispatch/ApacheLog.pm > > > into a separate subpackage. > > > > This could be a solution if there are packages that need > > perl-Log-Dispatch to install mod_perl and apache (I never > > came across one). > > Ralf -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 189 bytes Desc: not available URL: From fedora-extras-commits at redhat.com Sat Sep 24 16:34:55 2005 From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard)) Date: Sat, 24 Sep 2005 12:34:55 -0400 Subject: rpms/colorscheme/FC-4 .cvsignore, 1.2, 1.3 colorscheme.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200509241635.j8OGZPmO000585@cvs-int.fedora.redhat.com> Author: abompard Update of /cvs/extras/rpms/colorscheme/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv543/FC-4 Modified Files: .cvsignore colorscheme.spec sources Log Message: - version 0.2.2 - drop patch (applied upstream) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/colorscheme/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 20 Sep 2005 07:49:28 -0000 1.2 +++ .cvsignore 24 Sep 2005 16:34:52 -0000 1.3 @@ -1 +1 @@ -colorscheme-0.2.1.tar.bz2 +colorscheme-0.2.2.tar.bz2 Index: colorscheme.spec =================================================================== RCS file: /cvs/extras/rpms/colorscheme/FC-4/colorscheme.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- colorscheme.spec 20 Sep 2005 07:49:28 -0000 1.1 +++ colorscheme.spec 24 Sep 2005 16:34:52 -0000 1.2 @@ -1,12 +1,12 @@ Name: colorscheme -Version: 0.2.1 +Version: 0.2.2 Release: 1%{?dist} Summary: Generate a variety of colorschemes from a single starting color Group: Applications/Multimedia License: GPL URL: http://home.gna.org/colorscheme/ -Source0: http://download.gna.org/colorscheme/0.2/colorscheme-0.2.1.tar.bz2 +Source0: http://download.gna.org/colorscheme/0.2/colorscheme-0.2.2.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gtkmm24-devel >= 2.5, libgnomeui-devel >= 2.0, desktop-file-utils @@ -61,5 +61,12 @@ %changelog +* Sat Sep 24 2005 Aurelien Bompard 0.2.2-1 +- version 0.2.2 +- drop patch (applied upstream) + +* Wed Sep 21 2005 Aurelien Bompard 0.2.1-2 +- add patch for missing include + * Sun Sep 18 2005 Aurelien Bompard 0.2.1-1 - initial Fedora package (reviewed in bug 168635) Index: sources =================================================================== RCS file: /cvs/extras/rpms/colorscheme/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 20 Sep 2005 07:49:28 -0000 1.2 +++ sources 24 Sep 2005 16:34:53 -0000 1.3 @@ -1 +1 @@ -e1465624d3373b5593b7c6ca25856aee colorscheme-0.2.1.tar.bz2 +0106bd04856d89181984ea8fa1c4647c colorscheme-0.2.2.tar.bz2 From fedora-extras-commits at redhat.com Sat Sep 24 16:34:56 2005 From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard)) Date: Sat, 24 Sep 2005 12:34:56 -0400 Subject: rpms/colorscheme/devel .cvsignore, 1.2, 1.3 colorscheme.spec, 1.2, 1.3 sources, 1.2, 1.3 colorscheme-0.2.1-include64.patch, 1.1, NONE Message-ID: <200509241635.j8OGZQnl000590@cvs-int.fedora.redhat.com> Author: abompard Update of /cvs/extras/rpms/colorscheme/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv543/devel Modified Files: .cvsignore colorscheme.spec sources Removed Files: colorscheme-0.2.1-include64.patch Log Message: - version 0.2.2 - drop patch (applied upstream) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/colorscheme/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 20 Sep 2005 07:49:28 -0000 1.2 +++ .cvsignore 24 Sep 2005 16:34:54 -0000 1.3 @@ -1 +1 @@ -colorscheme-0.2.1.tar.bz2 +colorscheme-0.2.2.tar.bz2 Index: colorscheme.spec =================================================================== RCS file: /cvs/extras/rpms/colorscheme/devel/colorscheme.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- colorscheme.spec 21 Sep 2005 20:07:24 -0000 1.2 +++ colorscheme.spec 24 Sep 2005 16:34:54 -0000 1.3 @@ -1,13 +1,12 @@ Name: colorscheme -Version: 0.2.1 -Release: 2%{?dist} +Version: 0.2.2 +Release: 1%{?dist} Summary: Generate a variety of colorschemes from a single starting color Group: Applications/Multimedia License: GPL URL: http://home.gna.org/colorscheme/ -Source0: http://download.gna.org/colorscheme/0.2/colorscheme-0.2.1.tar.bz2 -Patch0: colorscheme-0.2.1-include64.patch +Source0: http://download.gna.org/colorscheme/0.2/colorscheme-0.2.2.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gtkmm24-devel >= 2.5, libgnomeui-devel >= 2.0, desktop-file-utils @@ -25,7 +24,6 @@ %prep %setup -q -%patch0 -p1 -b .include64 %build @@ -63,6 +61,10 @@ %changelog +* Sat Sep 24 2005 Aurelien Bompard 0.2.2-1 +- version 0.2.2 +- drop patch (applied upstream) + * Wed Sep 21 2005 Aurelien Bompard 0.2.1-2 - add patch for missing include Index: sources =================================================================== RCS file: /cvs/extras/rpms/colorscheme/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 20 Sep 2005 07:49:28 -0000 1.2 +++ sources 24 Sep 2005 16:34:54 -0000 1.3 @@ -1 +1 @@ -e1465624d3373b5593b7c6ca25856aee colorscheme-0.2.1.tar.bz2 +0106bd04856d89181984ea8fa1c4647c colorscheme-0.2.2.tar.bz2 --- colorscheme-0.2.1-include64.patch DELETED --- From fedora-extras-commits at redhat.com Sat Sep 24 19:21:50 2005 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Sat, 24 Sep 2005 15:21:50 -0400 Subject: rpms/perl-BerkeleyDB/devel perl-BerkeleyDB.spec,1.3,1.4 Message-ID: <200509241921.j8OJLoep005019@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-BerkeleyDB/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5000 Modified Files: perl-BerkeleyDB.spec Log Message: bump Index: perl-BerkeleyDB.spec =================================================================== RCS file: /cvs/extras/rpms/perl-BerkeleyDB/devel/perl-BerkeleyDB.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- perl-BerkeleyDB.spec 6 Sep 2005 00:14:34 -0000 1.3 +++ perl-BerkeleyDB.spec 24 Sep 2005 19:21:47 -0000 1.4 @@ -1,6 +1,6 @@ Name: perl-BerkeleyDB Version: 0.26 -Release: 4%{?dist} +Release: 5%{?dist} Summary: BerkeleyDB Perl module License: GPL or Artistic Group: Development/Libraries @@ -60,6 +60,9 @@ %{_bindir}/* %changelog +* Sat Sep 24 2005 Steven Pritchard 0.26-5 +- Rebuild for new db4 in rawhide + * Mon Sep 05 2005 Steven Pritchard 0.26-4 - Spec cleanup - Include COPYING and Artistic From fedora-extras-commits at redhat.com Sun Sep 25 12:46:01 2005 From: fedora-extras-commits at redhat.com (Marc Maurer (uwog)) Date: Sun, 25 Sep 2005 08:46:01 -0400 Subject: rpms/gtkmathview/devel .cvsignore, 1.3, 1.4 gtkmathview.spec, 1.2, 1.3 sources, 1.3, 1.4 Message-ID: <200509251246.j8PCk1sc002586@cvs-int.fedora.redhat.com> Author: uwog Update of /cvs/extras/rpms/gtkmathview/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2563 Modified Files: .cvsignore gtkmathview.spec sources Log Message: Update to 0.7.5 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gtkmathview/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 12 Sep 2005 09:27:37 -0000 1.3 +++ .cvsignore 25 Sep 2005 12:45:58 -0000 1.4 @@ -1 +1 @@ -gtkmathview-0.7.4.tar.gz +gtkmathview-0.7.5.tar.gz Index: gtkmathview.spec =================================================================== RCS file: /cvs/extras/rpms/gtkmathview/devel/gtkmathview.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- gtkmathview.spec 12 Sep 2005 09:26:42 -0000 1.2 +++ gtkmathview.spec 25 Sep 2005 12:45:58 -0000 1.3 @@ -1,6 +1,6 @@ Summary: A MathML rendering library Name: gtkmathview -Version: 0.7.4 +Version: 0.7.5 Release: 1 Group: System Environment/Libraries License: GPL @@ -75,6 +75,9 @@ rm -r $RPM_BUILD_ROOT %changelog +* Sun Sep 25 2005 Marc Maurer - 0.7.5-1 +- Update to 0.7.5 + * Mon Sep 12 2005 Marc Maurer - 0.7.4-1 - Update to 0.7.4 Index: sources =================================================================== RCS file: /cvs/extras/rpms/gtkmathview/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 12 Sep 2005 09:27:37 -0000 1.3 +++ sources 25 Sep 2005 12:45:58 -0000 1.4 @@ -1 +1 @@ -3309357cfc4d09854da046773f14d919 gtkmathview-0.7.4.tar.gz +94a4415a8226874075037a88972baa11 gtkmathview-0.7.5.tar.gz From fedora-extras-commits at redhat.com Sun Sep 25 16:07:32 2005 From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl)) Date: Sun, 25 Sep 2005 12:07:32 -0400 Subject: rpms/baobab/devel .cvsignore, 1.2, 1.3 baobab.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200509251607.j8PG7WAZ008348@cvs-int.fedora.redhat.com> Author: thl Update of /cvs/extras/rpms/baobab/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8327 Modified Files: .cvsignore baobab.spec sources Log Message: update to 1.2.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/baobab/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 13 Sep 2005 07:33:23 -0000 1.2 +++ .cvsignore 25 Sep 2005 16:07:29 -0000 1.3 @@ -1 +1 @@ -baobab-1.1.0.tar.gz +baobab-1.2.0.tar.gz Index: baobab.spec =================================================================== RCS file: /cvs/extras/rpms/baobab/devel/baobab.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- baobab.spec 13 Sep 2005 13:56:41 -0000 1.2 +++ baobab.spec 25 Sep 2005 16:07:29 -0000 1.3 @@ -1,12 +1,12 @@ Name: baobab -Version: 1.1.0 -Release: 3%{?dist} +Version: 1.2.0 +Release: 1%{?dist} Summary: Graphical tool to analyse directory trees Group: Applications/System License: GPL URL: http://www.marzocca.net/linux/baobab.html -Source0: http://www.marzocca.net/linux/downloads/baobab-1.1.0.tar.gz +Source0: http://www.marzocca.net/linux/downloads/baobab-1.2.0.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gtk2-devel >= 2.6 @@ -57,6 +57,9 @@ %changelog +* Sun Sep 25 2005 Thorsten Leemhuis - 1.2.0-1 +- Update to 1.2.0 + * Sat Sep 10 2005 Thorsten Leemhuis - 1.1.0-3 - Don't ship INSTALL in doc as suggested by adrianr in #167940 Index: sources =================================================================== RCS file: /cvs/extras/rpms/baobab/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 13 Sep 2005 07:33:23 -0000 1.2 +++ sources 25 Sep 2005 16:07:29 -0000 1.3 @@ -1 +1 @@ -7387ab6621beaba07daaa02c85cbe1a0 baobab-1.1.0.tar.gz +a2917d5c6b5f867d71e77832ea2f0801 baobab-1.2.0.tar.gz From fedora-extras-commits at redhat.com Sun Sep 25 16:21:17 2005 From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl)) Date: Sun, 25 Sep 2005 12:21:17 -0400 Subject: rpms/baobab/FC-4 .cvsignore, 1.2, 1.3 baobab.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200509251621.j8PGLHOm008476@cvs-int.fedora.redhat.com> Author: thl Update of /cvs/extras/rpms/baobab/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8453 Modified Files: .cvsignore baobab.spec sources Log Message: update to 1.2.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/baobab/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 13 Sep 2005 07:33:23 -0000 1.2 +++ .cvsignore 25 Sep 2005 16:21:15 -0000 1.3 @@ -1 +1 @@ -baobab-1.1.0.tar.gz +baobab-1.2.0.tar.gz Index: baobab.spec =================================================================== RCS file: /cvs/extras/rpms/baobab/FC-4/baobab.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- baobab.spec 13 Sep 2005 13:56:40 -0000 1.2 +++ baobab.spec 25 Sep 2005 16:21:15 -0000 1.3 @@ -1,12 +1,12 @@ Name: baobab -Version: 1.1.0 -Release: 3%{?dist} +Version: 1.2.0 +Release: 1%{?dist} Summary: Graphical tool to analyse directory trees Group: Applications/System License: GPL URL: http://www.marzocca.net/linux/baobab.html -Source0: http://www.marzocca.net/linux/downloads/baobab-1.1.0.tar.gz +Source0: http://www.marzocca.net/linux/downloads/baobab-1.2.0.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gtk2-devel >= 2.6 @@ -57,6 +57,9 @@ %changelog +* Sun Sep 25 2005 Thorsten Leemhuis - 1.2.0-1 +- Update to 1.2.0 + * Sat Sep 10 2005 Thorsten Leemhuis - 1.1.0-3 - Don't ship INSTALL in doc as suggested by adrianr in #167940 Index: sources =================================================================== RCS file: /cvs/extras/rpms/baobab/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 13 Sep 2005 07:33:23 -0000 1.2 +++ sources 25 Sep 2005 16:21:15 -0000 1.3 @@ -1 +1 @@ -7387ab6621beaba07daaa02c85cbe1a0 baobab-1.1.0.tar.gz +a2917d5c6b5f867d71e77832ea2f0801 baobab-1.2.0.tar.gz From fedora-extras-commits at redhat.com Sun Sep 25 18:15:23 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Sun, 25 Sep 2005 14:15:23 -0400 Subject: rpms/sylpheed/FC-4 sylpheed-1.0.5-summaryview.patch, NONE, 1.1 sylpheed.spec, 1.11, 1.12 Message-ID: <200509251815.j8PIFNAR011645@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/sylpheed/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11623 Modified Files: sylpheed.spec Added Files: sylpheed-1.0.5-summaryview.patch Log Message: * Sun Sep 25 2005 Michael Schwendt - 1.0.5-2.fc4 - Fix summary view "Delete" skipping first unselected message when deleting multiple messages. sylpheed-1.0.5-summaryview.patch: --- NEW FILE sylpheed-1.0.5-summaryview.patch --- diff -Nur sylpheed-1.0.5-orig/src/summaryview.c sylpheed-1.0.5/src/summaryview.c --- sylpheed-1.0.5-orig/src/summaryview.c 2005-05-26 10:00:43.000000000 +0200 +++ sylpheed-1.0.5/src/summaryview.c 2005-09-25 20:08:32.000000000 +0200 @@ -2402,7 +2402,7 @@ summary_delete_row(summaryview, sel_last); } - node = summary_find_next_msg(summaryview, sel_last); + node = sel_last; if (!node) node = summary_find_prev_msg(summaryview, sel_last); Index: sylpheed.spec =================================================================== RCS file: /cvs/extras/rpms/sylpheed/FC-4/sylpheed.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- sylpheed.spec 17 Jun 2005 17:53:03 -0000 1.11 +++ sylpheed.spec 25 Sep 2005 18:15:21 -0000 1.12 @@ -5,7 +5,7 @@ Summary: GTK+ based, lightweight, and fast email client Name: sylpheed Version: 1.0.5 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL URL: http://sylpheed.good-day.net/ Group: Applications/Internet @@ -21,6 +21,7 @@ Patch1: %{name}-0.8.9-ssl.patch Patch2: sylpheed-default-browser.patch Patch3: sylpheed-1.0.3-desktop.patch +Patch4: sylpheed-1.0.5-summaryview.patch %description This program is an X based fast email client which has features @@ -43,6 +44,7 @@ %patch1 -p1 -b .ssl %patch2 -p1 -b .default-browser %patch3 -p1 -b .desktop +%patch4 -p1 -b .summaryview %build autoconf @@ -81,6 +83,10 @@ %{_mandir}/man1 %changelog +* Sun Sep 25 2005 Michael Schwendt - 1.0.5-2.fc4 +- Fix summary view "Delete" skipping first unselected message + when deleting multiple messages. + * Fri Jun 17 2005 Michael Schwendt - 1.0.5-1.fc4 - Update to 1.0.5 (minor bug fixes). From fedora-extras-commits at redhat.com Sun Sep 25 18:34:46 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Sun, 25 Sep 2005 14:34:46 -0400 Subject: rpms/sylpheed/FC-4 sylpheed-1.0.5-summaryview.patch, 1.1, 1.2 sylpheed.spec, 1.12, 1.13 Message-ID: <200509251834.j8PIYkDI011742@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/sylpheed/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11718 Modified Files: sylpheed-1.0.5-summaryview.patch sylpheed.spec Log Message: * Sun Sep 25 2005 Michael Schwendt - 1.0.5-2.fc4 - Fix summary view Delete/Move skipping first unselected message when deleting/moving multiple messages. sylpheed-1.0.5-summaryview.patch: Index: sylpheed-1.0.5-summaryview.patch =================================================================== RCS file: /cvs/extras/rpms/sylpheed/FC-4/sylpheed-1.0.5-summaryview.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sylpheed-1.0.5-summaryview.patch 25 Sep 2005 18:15:21 -0000 1.1 +++ sylpheed-1.0.5-summaryview.patch 25 Sep 2005 18:34:44 -0000 1.2 @@ -1,6 +1,6 @@ diff -Nur sylpheed-1.0.5-orig/src/summaryview.c sylpheed-1.0.5/src/summaryview.c --- sylpheed-1.0.5-orig/src/summaryview.c 2005-05-26 10:00:43.000000000 +0200 -+++ sylpheed-1.0.5/src/summaryview.c 2005-09-25 20:08:32.000000000 +0200 ++++ sylpheed-1.0.5/src/summaryview.c 2005-09-25 20:32:29.000000000 +0200 @@ -2402,7 +2402,7 @@ summary_delete_row(summaryview, sel_last); } @@ -10,3 +10,12 @@ if (!node) node = summary_find_prev_msg(summaryview, sel_last); +@@ -2548,8 +2548,6 @@ + summary_move_row_to + (summaryview, GTK_CTREE_NODE(cur->data), to_folder); + +- summary_step(summaryview, GTK_SCROLL_STEP_FORWARD); +- + if (prefs_common.immediate_exec) + summary_execute(summaryview); + else Index: sylpheed.spec =================================================================== RCS file: /cvs/extras/rpms/sylpheed/FC-4/sylpheed.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- sylpheed.spec 25 Sep 2005 18:15:21 -0000 1.12 +++ sylpheed.spec 25 Sep 2005 18:34:44 -0000 1.13 @@ -84,8 +84,8 @@ %changelog * Sun Sep 25 2005 Michael Schwendt - 1.0.5-2.fc4 -- Fix summary view "Delete" skipping first unselected message - when deleting multiple messages. +- Fix summary view Delete/Move skipping first unselected message + when deleting/moving multiple messages. * Fri Jun 17 2005 Michael Schwendt - 1.0.5-1.fc4 - Update to 1.0.5 (minor bug fixes). From fedora-extras-commits at redhat.com Sun Sep 25 19:34:10 2005 From: fedora-extras-commits at redhat.com (Marc Maurer (uwog)) Date: Sun, 25 Sep 2005 15:34:10 -0400 Subject: rpms/abiword/FC-4 .cvsignore, 1.6, 1.7 abiword.spec, 1.11, 1.12 sources, 1.6, 1.7 Message-ID: <200509251934.j8PJYAGr013210@cvs-int.fedora.redhat.com> Author: uwog Update of /cvs/extras/rpms/abiword/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13187 Modified Files: .cvsignore abiword.spec sources Log Message: 2.2.10 release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/abiword/FC-4/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 29 Jul 2005 11:33:26 -0000 1.6 +++ .cvsignore 25 Sep 2005 19:34:08 -0000 1.7 @@ -1 +1 @@ -abiword-2.2.9.tar.bz2 +abiword-2.2.10.tar.bz2 Index: abiword.spec =================================================================== RCS file: /cvs/extras/rpms/abiword/FC-4/abiword.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- abiword.spec 29 Jul 2005 11:33:26 -0000 1.11 +++ abiword.spec 25 Sep 2005 19:34:08 -0000 1.12 @@ -2,8 +2,8 @@ Summary: The AbiWord word processor Name: abiword -Version: 2.2.9 -Release: 2%{?dist} +Version: 2.2.10 +Release: 1%{?dist} Epoch: 1 Group: Applications/Editors License: GPL @@ -127,6 +127,9 @@ %{_datadir}/icons/*png %changelog +* Sun Sep 25 2005 Marc Maurer - 1:2.2.10-1.fc4 +- Update to 2.2.10, fixing security issue + * Fri Jul 2 2005 Marc Maurer - 1:2.2.9-2.fc4 - Bump release number Index: sources =================================================================== RCS file: /cvs/extras/rpms/abiword/FC-4/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 29 Jul 2005 11:33:26 -0000 1.6 +++ sources 25 Sep 2005 19:34:08 -0000 1.7 @@ -1 +1 @@ -17fe5169f03643dd59c83af7cf1c448a abiword-2.2.9.tar.bz2 +4aa8838d211129b8fc9c1231bc9df18a abiword-2.2.10.tar.bz2 From fedora-extras-commits at redhat.com Sun Sep 25 19:44:48 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Sun, 25 Sep 2005 15:44:48 -0400 Subject: rpms/sylpheed/FC-4 sylpheed.spec, 1.13, 1.14 sylpheed-1.0.5-summaryview.patch, 1.2, NONE Message-ID: <200509251944.j8PJimjY013291@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/sylpheed/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13272 Modified Files: sylpheed.spec Removed Files: sylpheed-1.0.5-summaryview.patch Log Message: revert for now since there are other problems left Index: sylpheed.spec =================================================================== RCS file: /cvs/extras/rpms/sylpheed/FC-4/sylpheed.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- sylpheed.spec 25 Sep 2005 18:34:44 -0000 1.13 +++ sylpheed.spec 25 Sep 2005 19:44:46 -0000 1.14 @@ -5,7 +5,7 @@ Summary: GTK+ based, lightweight, and fast email client Name: sylpheed Version: 1.0.5 -Release: 2%{?dist} +Release: 1%{?dist} License: GPL URL: http://sylpheed.good-day.net/ Group: Applications/Internet @@ -21,7 +21,6 @@ Patch1: %{name}-0.8.9-ssl.patch Patch2: sylpheed-default-browser.patch Patch3: sylpheed-1.0.3-desktop.patch -Patch4: sylpheed-1.0.5-summaryview.patch %description This program is an X based fast email client which has features @@ -44,7 +43,6 @@ %patch1 -p1 -b .ssl %patch2 -p1 -b .default-browser %patch3 -p1 -b .desktop -%patch4 -p1 -b .summaryview %build autoconf @@ -83,10 +81,6 @@ %{_mandir}/man1 %changelog -* Sun Sep 25 2005 Michael Schwendt - 1.0.5-2.fc4 -- Fix summary view Delete/Move skipping first unselected message - when deleting/moving multiple messages. - * Fri Jun 17 2005 Michael Schwendt - 1.0.5-1.fc4 - Update to 1.0.5 (minor bug fixes). --- sylpheed-1.0.5-summaryview.patch DELETED --- From fedora-extras-commits at redhat.com Sun Sep 25 21:02:27 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sun, 25 Sep 2005 17:02:27 -0400 Subject: rpms/cvsweb/devel .cvsignore, 1.4, 1.5 cvsweb.spec, 1.6, 1.7 sources, 1.4, 1.5 Message-ID: <200509252103.j8PL34Ki016252@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/cvsweb/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16207/devel Modified Files: .cvsignore cvsweb.spec sources Log Message: * Sun Sep 25 2005 Ville Skytt?? - 3.0.6-1 - 3.0.6. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/cvsweb/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 29 May 2005 09:08:45 -0000 1.4 +++ .cvsignore 25 Sep 2005 21:02:24 -0000 1.5 @@ -1 +1 @@ -cvsweb-3.0.5.tar.gz +cvsweb-3.0.6.tar.gz Index: cvsweb.spec =================================================================== RCS file: /cvs/extras/rpms/cvsweb/devel/cvsweb.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- cvsweb.spec 29 May 2005 09:15:27 -0000 1.6 +++ cvsweb.spec 25 Sep 2005 21:02:24 -0000 1.7 @@ -1,6 +1,6 @@ Name: cvsweb -Version: 3.0.5 -Release: 2 +Version: 3.0.6 +Release: 1%{?dist} Summary: Web interface for CVS repositories License: BSD @@ -11,8 +11,9 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -# Perl deps autodetected by rpm. -Requires: rcs, cvs, httpd +Requires: rcs +Requires: cvs +Requires: httpd %description CVSweb is a WWW interface for CVS repositories with which you can @@ -58,6 +59,9 @@ %changelog +* Sun Sep 25 2005 Ville Skytt?? - 3.0.6-1 +- 3.0.6. + * Sun May 29 2005 Ville Skytt?? - 3.0.5-2 - 3.0.5. - Install the sample httpd.conf as doc instead of into place; running Index: sources =================================================================== RCS file: /cvs/extras/rpms/cvsweb/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 29 May 2005 09:08:45 -0000 1.4 +++ sources 25 Sep 2005 21:02:24 -0000 1.5 @@ -1 +1 @@ -572dbb2d66ad6487c0a3536f93023086 cvsweb-3.0.5.tar.gz +0e1eec962b1db00e01b295fff84b6e89 cvsweb-3.0.6.tar.gz From fedora-extras-commits at redhat.com Sun Sep 25 21:02:16 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sun, 25 Sep 2005 17:02:16 -0400 Subject: rpms/cvsweb/FC-4 .cvsignore, 1.4, 1.5 cvsweb.spec, 1.6, 1.7 sources, 1.4, 1.5 Message-ID: <200509252103.j8PL34VD016251@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/cvsweb/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16207/FC-4 Modified Files: .cvsignore cvsweb.spec sources Log Message: * Sun Sep 25 2005 Ville Skytt?? - 3.0.6-1 - 3.0.6. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/cvsweb/FC-4/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 29 May 2005 09:08:45 -0000 1.4 +++ .cvsignore 25 Sep 2005 21:02:14 -0000 1.5 @@ -1 +1 @@ -cvsweb-3.0.5.tar.gz +cvsweb-3.0.6.tar.gz Index: cvsweb.spec =================================================================== RCS file: /cvs/extras/rpms/cvsweb/FC-4/cvsweb.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- cvsweb.spec 29 May 2005 09:15:27 -0000 1.6 +++ cvsweb.spec 25 Sep 2005 21:02:14 -0000 1.7 @@ -1,6 +1,6 @@ Name: cvsweb -Version: 3.0.5 -Release: 2 +Version: 3.0.6 +Release: 1%{?dist} Summary: Web interface for CVS repositories License: BSD @@ -11,8 +11,9 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -# Perl deps autodetected by rpm. -Requires: rcs, cvs, httpd +Requires: rcs +Requires: cvs +Requires: httpd %description CVSweb is a WWW interface for CVS repositories with which you can @@ -58,6 +59,9 @@ %changelog +* Sun Sep 25 2005 Ville Skytt?? - 3.0.6-1 +- 3.0.6. + * Sun May 29 2005 Ville Skytt?? - 3.0.5-2 - 3.0.5. - Install the sample httpd.conf as doc instead of into place; running Index: sources =================================================================== RCS file: /cvs/extras/rpms/cvsweb/FC-4/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 29 May 2005 09:08:45 -0000 1.4 +++ sources 25 Sep 2005 21:02:14 -0000 1.5 @@ -1 +1 @@ -572dbb2d66ad6487c0a3536f93023086 cvsweb-3.0.5.tar.gz +0e1eec962b1db00e01b295fff84b6e89 cvsweb-3.0.6.tar.gz From fedora-extras-commits at redhat.com Sun Sep 25 21:43:31 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sun, 25 Sep 2005 17:43:31 -0400 Subject: rpms/lincity-ng/devel - New directory Message-ID: <200509252143.j8PLhVnI017026@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/lincity-ng/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17001/lincity-ng/devel Log Message: Directory /cvs/extras/rpms/lincity-ng/devel added to the repository From fedora-extras-commits at redhat.com Sun Sep 25 21:43:30 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sun, 25 Sep 2005 17:43:30 -0400 Subject: rpms/lincity-ng - New directory Message-ID: <200509252143.j8PLhUXb017021@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/lincity-ng In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17001/lincity-ng Log Message: Directory /cvs/extras/rpms/lincity-ng added to the repository From fedora-extras-commits at redhat.com Sun Sep 25 21:43:45 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sun, 25 Sep 2005 17:43:45 -0400 Subject: rpms/lincity-ng Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200509252143.j8PLhjpC017075@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/lincity-ng In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17046 Added Files: Makefile import.log Log Message: Setup of module lincity-ng --- NEW FILE Makefile --- # Top level Makefile for module lincity-ng all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Sun Sep 25 21:43:45 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sun, 25 Sep 2005 17:43:45 -0400 Subject: rpms/lincity-ng/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200509252143.j8PLhjS3017080@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/lincity-ng/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17046/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module lincity-ng --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Sun Sep 25 21:45:08 2005 From: fedora-extras-commits at redhat.com (Marc Maurer (uwog)) Date: Sun, 25 Sep 2005 17:45:08 -0400 Subject: rpms/gtkmathview/FC-4 gtkmathview.spec,1.3,1.4 Message-ID: <200509252145.j8PLj8xH017125@cvs-int.fedora.redhat.com> Author: uwog Update of /cvs/extras/rpms/gtkmathview/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17104 Modified Files: gtkmathview.spec Log Message: Initial release on FC-4 Index: gtkmathview.spec =================================================================== RCS file: /cvs/extras/rpms/gtkmathview/FC-4/gtkmathview.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- gtkmathview.spec 25 Sep 2005 12:45:58 -0000 1.3 +++ gtkmathview.spec 25 Sep 2005 21:45:05 -0000 1.4 @@ -1,6 +1,6 @@ Summary: A MathML rendering library Name: gtkmathview -Version: 0.7.5 +Version: 0.7.5%{?dist} Release: 1 Group: System Environment/Libraries License: GPL @@ -75,30 +75,5 @@ rm -r $RPM_BUILD_ROOT %changelog -* Sun Sep 25 2005 Marc Maurer - 0.7.5-1 -- Update to 0.7.5 - -* Mon Sep 12 2005 Marc Maurer - 0.7.4-1 -- Update to 0.7.4 - -* Tue Aug 30 2005 Marc Maurer - 0.7.3-5 -- Drop more unneeded Requires - -* Tue Aug 30 2005 Marc Maurer - 0.7.3-4 -- Drop the explicit Requires - -* Mon Aug 29 2005 Marc Maurer - 0.7.3-3 -- Use smaller lines in the Description field -- Remove the --disable-gmetadom and --without-t1lib flags -- Add a '/' to directories in the files section -- Remove the mathmlviewer man page - -* Tue Aug 23 2005 Marc Maurer - 0.7.3-2 -- Add the proper Requires and Buildrequires -- Make the description field more descriptive -- Add CONTRIBUTORS BUGS LICENSE to the doc section -- Disable gmetadom and t1lib -- Remove the mathml2ps man page - -* Sun Aug 14 2005 Marc Maurer - 0.7.3-1 -- Initial version +* Sun Sep 25 2005 Marc Maurer - 0.7.5-1.fc4 +- Initial release into FC-4 From fedora-extras-commits at redhat.com Sun Sep 25 21:49:26 2005 From: fedora-extras-commits at redhat.com (Marc Maurer (uwog)) Date: Sun, 25 Sep 2005 17:49:26 -0400 Subject: rpms/link-grammar/FC-4 link-grammar.spec,1.1,1.2 Message-ID: <200509252149.j8PLnQIC017197@cvs-int.fedora.redhat.com> Author: uwog Update of /cvs/extras/rpms/link-grammar/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17178 Modified Files: link-grammar.spec Log Message: Initial link-grammar package for fc4 Index: link-grammar.spec =================================================================== RCS file: /cvs/extras/rpms/link-grammar/FC-4/link-grammar.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- link-grammar.spec 11 Aug 2005 13:45:41 -0000 1.1 +++ link-grammar.spec 25 Sep 2005 21:49:24 -0000 1.2 @@ -1,7 +1,7 @@ Summary: A Grammar Checking library Name: link-grammar -Version: 4.1.3 -Release: 3 +Version: 4.1.3%{?dist} +Release: 1 Group: System Environment/Libraries License: BSD-style Source: http://www.abisource.com/downloads/link-grammar/%{version}/link-grammar-%{version}.tar.gz @@ -55,14 +55,5 @@ rm -r $RPM_BUILD_ROOT %changelog -* Wed Aug 10 2005 Marc Maurer - 4.1.3-3 -- Set the buildroot to the standard Fedora buildroot -- Make the package own the %{_datadir}/link-grammar - directory (thanks go to Aurelien Bompard for both issues) - -* Wed Aug 10 2005 Marc Maurer - 4.1.3-2 -- Remove epoch -- Make rpmlint happy - -* Sun Aug 7 2005 Marc Maurer - 1:4.1.3-1 -- Initial version +* Sun Sep 25 2005 Marc Maurer - 4.1.3-1.fc4 +- Initial release for FC4 \ No newline at end of file From fedora-extras-commits at redhat.com Sun Sep 25 21:49:59 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sun, 25 Sep 2005 17:49:59 -0400 Subject: owners owners.list,1.248,1.249 Message-ID: <200509252149.j8PLnxVw017251@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17207 Modified Files: owners.list Log Message: lincity-ng Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.248 retrieving revision 1.249 diff -u -r1.248 -r1.249 --- owners.list 24 Sep 2005 12:12:57 -0000 1.248 +++ owners.list 25 Sep 2005 21:49:57 -0000 1.249 @@ -465,6 +465,7 @@ Fedora Extras|libzvt|ZVT - Zed's Virtual Terminal|compton at pcompton.com|extras-qa at fedoraproject.org| Fedora Extras|liferea|An RSS/RDF feed reader|bdpepple at ameritech.net|extras-qa at fedoraproject.org| Fedora Extras|lighttpd|Lightning fast webserver with light system requirements|matthias at rpmforge.net|extras-qa at fedoraproject.org| +Fedora Extras|lincity-ng|City Simulation Game|tcallawa at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|lincvs|Graphical CVS Client|compton at pcompton.com|extras-qa at fedoraproject.org| Fedora Extras|link-grammar|Library that can perform grammar checking|uwog at uwog.net|extras-qa at fedoraproject.org| Fedora Extras|linphone|Phone anywhere in the whole world by using the Internet|ivazquez at ivazquez.net|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Sun Sep 25 21:54:50 2005 From: fedora-extras-commits at redhat.com (Marc Maurer (uwog)) Date: Sun, 25 Sep 2005 17:54:50 -0400 Subject: rpms/link-grammar/FC-4 link-grammar.spec,1.2,1.3 Message-ID: <200509252154.j8PLsoEW017288@cvs-int.fedora.redhat.com> Author: uwog Update of /cvs/extras/rpms/link-grammar/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17265 Modified Files: link-grammar.spec Log Message: Fix build Index: link-grammar.spec =================================================================== RCS file: /cvs/extras/rpms/link-grammar/FC-4/link-grammar.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- link-grammar.spec 25 Sep 2005 21:49:24 -0000 1.2 +++ link-grammar.spec 25 Sep 2005 21:54:48 -0000 1.3 @@ -1,7 +1,7 @@ Summary: A Grammar Checking library Name: link-grammar -Version: 4.1.3%{?dist} -Release: 1 +Version: 4.1.3 +Release: 2%{?dist} Group: System Environment/Libraries License: BSD-style Source: http://www.abisource.com/downloads/link-grammar/%{version}/link-grammar-%{version}.tar.gz @@ -55,5 +55,8 @@ rm -r $RPM_BUILD_ROOT %changelog +* Sun Sep 25 2005 Marc Maurer - 4.1.3-2.fc4 +- Add %{?dist} to the release field, not the version field + * Sun Sep 25 2005 Marc Maurer - 4.1.3-1.fc4 - Initial release for FC4 \ No newline at end of file From fedora-extras-commits at redhat.com Sun Sep 25 21:56:56 2005 From: fedora-extras-commits at redhat.com (Marc Maurer (uwog)) Date: Sun, 25 Sep 2005 17:56:56 -0400 Subject: rpms/gtkmathview/FC-4 gtkmathview.spec,1.4,1.5 Message-ID: <200509252156.j8PLuurq017351@cvs-int.fedora.redhat.com> Author: uwog Update of /cvs/extras/rpms/gtkmathview/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17332 Modified Files: gtkmathview.spec Log Message: Fix build Index: gtkmathview.spec =================================================================== RCS file: /cvs/extras/rpms/gtkmathview/FC-4/gtkmathview.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- gtkmathview.spec 25 Sep 2005 21:45:05 -0000 1.4 +++ gtkmathview.spec 25 Sep 2005 21:56:53 -0000 1.5 @@ -1,7 +1,7 @@ Summary: A MathML rendering library Name: gtkmathview -Version: 0.7.5%{?dist} -Release: 1 +Version: 0.7.5 +Release: 2%{?dist} Group: System Environment/Libraries License: GPL Source: http://helm.cs.unibo.it/mml-widget/sources/gtkmathview-%{version}.tar.gz @@ -75,5 +75,8 @@ rm -r $RPM_BUILD_ROOT %changelog +* Sun Sep 25 2005 Marc Maurer - 0.7.5-2.fc4 +- Add %{?dist} to the release field, not the version field + * Sun Sep 25 2005 Marc Maurer - 0.7.5-1.fc4 - Initial release into FC-4 From fedora-extras-commits at redhat.com Sun Sep 25 21:59:15 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sun, 25 Sep 2005 17:59:15 -0400 Subject: rpms/lincity-ng import.log,1.1,1.2 Message-ID: <200509252159.j8PLxjKi017438@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/lincity-ng In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17400 Modified Files: import.log Log Message: auto-import lincity-ng-1.0.1-2 on branch devel from lincity-ng-1.0.1-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/lincity-ng/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 25 Sep 2005 21:43:43 -0000 1.1 +++ import.log 25 Sep 2005 21:59:13 -0000 1.2 @@ -0,0 +1 @@ +lincity-ng-1_0_1-2:HEAD:lincity-ng-1.0.1-2.src.rpm:1127685531 From fedora-extras-commits at redhat.com Sun Sep 25 21:59:15 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sun, 25 Sep 2005 17:59:15 -0400 Subject: rpms/lincity-ng/devel lincity-ng.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200509252159.j8PLxkuM017442@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/lincity-ng/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17400/devel Modified Files: .cvsignore sources Added Files: lincity-ng.spec Log Message: auto-import lincity-ng-1.0.1-2 on branch devel from lincity-ng-1.0.1-2.src.rpm --- NEW FILE lincity-ng.spec --- Name: lincity-ng Version: 1.0.1 Release: 2%{?dist} License: GPL Group: Amusements/Games Summary: City Simulation Game URL: http://lincity-ng.berlios.de/ Source0: http://download.berlios.de/lincity-ng/lincity-ng-1.0.1.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: jam, physfs-devel, zlib-devel, libxml2-devel BuildRequires: SDL-devel, SDL_mixer-devel, SDL_image-devel, SDL_gfx-devel BuildRequires: SDL_ttf-devel, xorg-x11-devel, desktop-file-utils Requires: %{name}-data = %{version}-%{release} %description LinCity-NG is a City Simulation Game. It is a polished and improved version of the classic LinCity (http://www.floot.demon.co.uk/lincity.html) game with a new iso-3D graphics engine and a completely redone and modern GUI. %package data Summary: Data files needed to run lincity-ng Group: Amusements/Games Requires: %{name} = %{version}-%{release} %description data This package contains the data files (graphics, models, audio) necessary to play Lincity-NG. %prep %setup -q %build %configure jam %install rm -rf $RPM_BUILD_ROOT DESTDIR=$RPM_BUILD_ROOT jam install desktop-file-install --delete-original \ --vendor fedora \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ --mode 0644 \ --add-category X-Fedora \ $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc %{_datadir}/doc/%{name}-%{version} %{_bindir}/lincity-ng %{_datadir}/pixmaps/* %{_datadir}/applications/fedora-lincity-ng.desktop %files data %defattr(-,root,root,-) %{_datadir}/lincity-ng/ %changelog * Sun Sep 25 2005 Tom "spot" Callaway 1.0.1-2 - split datadir/lincity-ng into its own package - shorten main description * Fri Aug 19 2005 Tom "spot" Callaway 1.0.1-1 - initial package for Fedora Extras Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/lincity-ng/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 25 Sep 2005 21:43:43 -0000 1.1 +++ .cvsignore 25 Sep 2005 21:59:13 -0000 1.2 @@ -0,0 +1 @@ +lincity-ng-1.0.1.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/lincity-ng/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 25 Sep 2005 21:43:43 -0000 1.1 +++ sources 25 Sep 2005 21:59:13 -0000 1.2 @@ -0,0 +1 @@ +1576a0765eb29a668f7af3084de00739 lincity-ng-1.0.1.tar.bz2 From fedora-extras-commits at redhat.com Sun Sep 25 22:07:25 2005 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Sun, 25 Sep 2005 18:07:25 -0400 Subject: rpms/tagtool/FC-4 tagtool.spec,1.1,1.2 Message-ID: <200509252207.j8PM7uTx018841@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/tagtool/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18819 Modified Files: tagtool.spec Log Message: * Sun Sep 25 2005 Brian Pepple - 0.12.2-3 - Add dist tag. Index: tagtool.spec =================================================================== RCS file: /cvs/extras/rpms/tagtool/FC-4/tagtool.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- tagtool.spec 24 Sep 2005 12:09:44 -0000 1.1 +++ tagtool.spec 25 Sep 2005 22:07:21 -0000 1.2 @@ -1,6 +1,6 @@ Name: tagtool Version: 0.12.2 -Release: 2 +Release: 3%{?dist} Summary: Ogg Vorbis and MP3 tag manager Group: Applications/Multimedia @@ -75,6 +75,9 @@ %changelog +* Sun Sep 25 2005 Brian Pepple - 0.12.2-3 +- Add dist tag. + * Fri Sep 23 2005 Brian Pepple - 0.12.2-2 - Drop redundant BR's: gtk2-devel, libxml2-devel. - Add missing scriplets for desktop-database. From fedora-extras-commits at redhat.com Sun Sep 25 22:09:06 2005 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Sun, 25 Sep 2005 18:09:06 -0400 Subject: rpms/tagtool/devel tagtool.spec,1.1,1.2 Message-ID: <200509252209.j8PM9aF5018909@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/tagtool/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18890 Modified Files: tagtool.spec Log Message: * Sun Sep 25 2005 Brian Pepple - 0.12.2-4 - Add dist tag. Index: tagtool.spec =================================================================== RCS file: /cvs/extras/rpms/tagtool/devel/tagtool.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- tagtool.spec 24 Sep 2005 12:09:44 -0000 1.1 +++ tagtool.spec 25 Sep 2005 22:09:03 -0000 1.2 @@ -1,6 +1,6 @@ Name: tagtool Version: 0.12.2 -Release: 2 +Release: 4%{?dist} Summary: Ogg Vorbis and MP3 tag manager Group: Applications/Multimedia @@ -75,6 +75,9 @@ %changelog +* Sun Sep 25 2005 Brian Pepple - 0.12.2-4 +- Add dist tag. + * Fri Sep 23 2005 Brian Pepple - 0.12.2-2 - Drop redundant BR's: gtk2-devel, libxml2-devel. - Add missing scriplets for desktop-database. From fedora-extras-commits at redhat.com Mon Sep 26 08:19:44 2005 From: fedora-extras-commits at redhat.com (Mark Cox (mjc)) Date: Mon, 26 Sep 2005 04:19:44 -0400 Subject: fedora-security/audit fc4,1.62,1.63 Message-ID: <200509260819.j8Q8JipJ001706@cvs-int.fedora.redhat.com> Author: mjc Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1687 Modified Files: fc4 Log Message: Updates for pending Mozilla/Fedora updates, also squid got moved to new upstream version so ensured that all the previously backported issues got addressed in stable11 and note each issue. Fix a 2005->2004 typo Index: fc4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc4,v retrieving revision 1.62 retrieving revision 1.63 diff -u -r1.62 -r1.63 --- fc4 23 Sep 2005 07:45:40 -0000 1.62 +++ fc4 26 Sep 2005 08:19:41 -0000 1.63 @@ -1,5 +1,5 @@ -Up to date CVE as of CVE email 20050922 -Up to date FC4 as of 20050922 +Up to date CVE as of CVE email 20050925 +Up to date FC4 as of 20050925 ** are items that need attention @@ -21,9 +21,29 @@ 2005-2800 backport (kernel, fixed 2.6.12.6) [since FEDORA-2005-906] 2005-2798 version (openssh, fixed 4.2) [since FEDORA-2005-860] 2005-2797 version (openssh, fixed 4.2) [since FEDORA-2005-860] -2005-2796 backport (squid, fixed after 2.5.STABLE10) [since FEDORA-2005-851] -2005-2794 backport (squid, fixed after 2.5.STABLE10) [since FEDORA-2005-851] +2005-2796 version (squid, fixed 2.5.STABLE11) [since FEDORA-2005-913] was backport since FEDORA-2005-851 +2005-2794 version (squid, fixed 2.5.STABLE11) [since FEDORA-2005-913] was backport since FEDORA-2005-851 2005-2728 backport (httpd, fixed 2.0.55-dev) [since FEDORA-2005-849] +2005-2707 VULNERABLE (thunderbird) +2005-2707 VULNERABLE (firefox, fixed 1.0.7) +2005-2707 VULNERABLE (mozilla, fixed 1.7.12) +2005-2706 VULNERABLE (thunderbird) +2005-2706 VULNERABLE (firefox, fixed 1.0.7) +2005-2706 VULNERABLE (mozilla, fixed 1.7.12) +2005-2705 VULNERABLE (thunderbird) +2005-2705 VULNERABLE (firefox, fixed 1.0.7) +2005-2705 VULNERABLE (mozilla, fixed 1.7.12) +2005-2704 VULNERABLE (thunderbird) +2005-2704 VULNERABLE (firefox, fixed 1.0.7) +2005-2704 VULNERABLE (mozilla, fixed 1.7.12) +2005-2703 VULNERABLE (thunderbird) +2005-2703 VULNERABLE (firefox, fixed 1.0.7) +2005-2703 VULNERABLE (mozilla, fixed 1.7.12) +2005-2702 VULNERABLE (thunderbird) +2005-2702 VULNERABLE (firefox, fixed 1.0.7) +2005-2702 VULNERABLE (mozilla, fixed 1.7.12) +2005-2701 VULNERABLE (firefox, fixed 1.0.7) +2005-2701 VULNERABLE (mozilla, fixed 1.7.12) 2005-2700 backport (httpd, fixed 2.0.55-dev) [since FEDORA-2005-849] 2005-2693 backport (cvs) [since FEDORA-2005-790] 2005-2672 VULNERABLE (lm_sensors) bz#166673 @@ -163,7 +183,7 @@ 2005-1532 version (mozilla, fixed 1.7.8) [since re0522.0] 2005-1531 version (firefox, fixed 1.0.4) [since re0522.0] 2005-1531 version (mozilla, fixed 1.7.8) [since re0522.0] -2005-1519 backport (squid, after 2.5.STABLE9) ..ry-5.patch [since re0522.0] +2005-1519 version (squid, fixed 2.5.STABLE10) [since FEDORA-2005-913] was backport since GA (re0522.0) 2005-1470 version (ethereal, fixed 0.10.11) 2005-1469 version (ethereal, fixed 0.10.11) 2005-1468 version (ethereal, fixed 0.10.11) @@ -186,7 +206,7 @@ 2005-1409 version (postgresql, fixed 8.0.1) 2005-1369 version (kernel, fixed 2.6.12) [since FEDORA-2005-510] was backport in patch-2.6.12-rc3 2005-1368 version (kernel, fixed 2.6.12) [since FEDORA-2005-510] was backport in patch-2.6.12-rc3 -2005-1345 backport (squid, affects 2.5.STABLE9) ...-extaclauth.patch +2005-1345 version (squid, fixed 2.5.STABLE10) [since FEDORA-2005-913] was backport since GA 2005-1344 ignore (httpd) not a vulnerability 2005-1281 version (ethereal, fixed 0.10.11) 2005-1280 backport (tcpdump, not fixed in 3.8.3) in srpm @@ -280,7 +300,7 @@ 2005-0664 version (libexif, fixed 0.6.12) 2005-0654 ignore (gimp, not fixed 2.2) upstream considers harmless 2005-0627 version (qt, fixed 3.3.4) -2005-0626 backport (squid, affects 2.5.STABLE9) ..-setcookie.patch +2005-0626 version (squid, fixed 2.5.STABLE10) [since FEDORA-2005-913] was backport since GA 2005-0605 backport (xorg-x11) ...-fix-CAN-2005-0605.patch 2005-0602 VULNERABLE (unzip, fixed 5.52) not in srpm 2005-0596 version (php, fixed 5.0) @@ -429,8 +449,8 @@ 2005-0004 version (mysql, fixed 4.1.10) 2005-0003 version (kernel, fixed 2.6.10) 2005-0001 version (kernel, fixed 2.6.10) -2005-2480 ignore (squid) bz#166523, not reproducable -2005-2479 version (squid, fixed 2.5.STABLE8) +2004-2480 ignore (squid) bz#166523, not reproducable +2004-2479 version (squid, fixed 2.5.STABLE8) 2004-2396 version (passwd, fixed 0.69) verified in source 2004-2395 version (passwd, fixed 0.69) verified in source 2004-2394 version (passwd, fixed 0.69) verified in source From fedora-extras-commits at redhat.com Mon Sep 26 08:21:51 2005 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Mon, 26 Sep 2005 04:21:51 -0400 Subject: rpms/libcdio/devel .cvsignore, 1.6, 1.7 libcdio.spec, 1.14, 1.15 sources, 1.6, 1.7 Message-ID: <200509260821.j8Q8LpGD001745@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/rpms/libcdio/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1722 Modified Files: .cvsignore libcdio.spec sources Log Message: * Mon Sep 26 2005 Adrian Reber - 0.76-1 - Updated to 0.76. - Included doxygen generated documentation into -devel - Included examples into -devel Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libcdio/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 15 Jul 2005 06:30:22 -0000 1.6 +++ .cvsignore 26 Sep 2005 08:21:49 -0000 1.7 @@ -1,2 +1,2 @@ -libcdio-0.75.tar.gz -libcdio-0.75.tar.gz.sig +libcdio-0.76.tar.gz +libcdio-0.76.tar.gz.sig Index: libcdio.spec =================================================================== RCS file: /cvs/extras/rpms/libcdio/devel/libcdio.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- libcdio.spec 23 Aug 2005 15:13:08 -0000 1.14 +++ libcdio.spec 26 Sep 2005 08:21:49 -0000 1.15 @@ -1,17 +1,17 @@ Name: libcdio -Version: 0.75 -Release: 4%{?dist} +Version: 0.76 +Release: 1%{?dist} Summary: CD-ROM input and control library Group: Applications/Multimedia License: GPL URL: http://www.gnu.org/software/libcdio/ -Source0: http://ftp.gnu.org/gnu/libcdio/libcdio-0.75.tar.gz -Source1: http://ftp.gnu.org/gnu/libcdio/libcdio-0.75.tar.gz.sig +Source0: http://ftp.gnu.org/gnu/libcdio/libcdio-0.76.tar.gz +Source1: http://ftp.gnu.org/gnu/libcdio/libcdio-0.76.tar.gz.sig BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) #BuildRequires: libcddb-devel >= 0.9.4 -BuildRequires: pkgconfig +BuildRequires: pkgconfig doxygen BuildRequires: ncurses-devel Requires(post): /sbin/ldconfig Requires(post): /sbin/install-info @@ -45,6 +45,8 @@ --disable-cddb \ --disable-rpath make %{?_smp_mflags} +cd doc/doxygen +./run_doxygen %install @@ -56,8 +58,14 @@ mv $RPM_BUILD_ROOT%{_mandir}/{jp,ja} +rm -rf examples +mkdir -p examples/C++ +cp -a example/{*.c,README} examples +cp -a example/C++/{*.cpp,README} examples/C++ + %check || : +# disable test using local CDROM %{__sed} -i -e "s/am__EXEEXT_1 =.*$/am__EXEEXT_1 =/g" test/Makefile make check @@ -91,6 +99,7 @@ %files devel %defattr(-,root,root,-) +%doc doc/doxygen/html examples %{_includedir}/cdio %{_libdir}/*.a %{_libdir}/*.so @@ -98,6 +107,11 @@ %changelog +* Mon Sep 26 2005 Adrian Reber - 0.76-1 +- Updated to 0.76. +- Included doxygen generated documentation into -devel +- Included examples into -devel + * Mon Aug 01 2005 Adrian Reber - 0.75-4 - disable test accessing local CDROM drive (#164266) Index: sources =================================================================== RCS file: /cvs/extras/rpms/libcdio/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 15 Jul 2005 06:30:22 -0000 1.6 +++ sources 26 Sep 2005 08:21:49 -0000 1.7 @@ -1,2 +1,2 @@ -628bd9e6d62747ff6a2b14f976673ea0 libcdio-0.75.tar.gz -3a861ce2e430451107d923127c64cf77 libcdio-0.75.tar.gz.sig +6d5f97847c8be003f4018dd2b5afe23d libcdio-0.76.tar.gz +99dec4b805556a5a6cccaa3539707422 libcdio-0.76.tar.gz.sig From fedora-extras-commits at redhat.com Mon Sep 26 09:20:29 2005 From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh)) Date: Mon, 26 Sep 2005 05:20:29 -0400 Subject: rpms/Canna - New directory Message-ID: <200509260920.j8Q9KTD8003430@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/extras/rpms/Canna In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3405/Canna Log Message: Directory /cvs/extras/rpms/Canna added to the repository From fedora-extras-commits at redhat.com Mon Sep 26 09:20:29 2005 From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh)) Date: Mon, 26 Sep 2005 05:20:29 -0400 Subject: rpms/Canna/devel - New directory Message-ID: <200509260920.j8Q9KT55003435@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/extras/rpms/Canna/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3405/Canna/devel Log Message: Directory /cvs/extras/rpms/Canna/devel added to the repository From fedora-extras-commits at redhat.com Mon Sep 26 09:21:12 2005 From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh)) Date: Mon, 26 Sep 2005 05:21:12 -0400 Subject: rpms/Canna Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200509260921.j8Q9LCPM003487@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/extras/rpms/Canna In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3455 Added Files: Makefile import.log Log Message: Setup of module Canna --- NEW FILE Makefile --- # Top level Makefile for module Canna all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Mon Sep 26 09:21:13 2005 From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh)) Date: Mon, 26 Sep 2005 05:21:13 -0400 Subject: rpms/Canna/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200509260921.j8Q9LDYh003493@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/extras/rpms/Canna/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3455/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module Canna --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Mon Sep 26 09:29:16 2005 From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh)) Date: Mon, 26 Sep 2005 05:29:16 -0400 Subject: rpms/Canna import.log,1.1,1.2 Message-ID: <200509260929.j8Q9TGWb003739@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/extras/rpms/Canna In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3685 Modified Files: import.log Log Message: auto-import Canna-3.7p3-13 on branch devel from Canna-3.7p3-13.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/Canna/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 26 Sep 2005 09:21:10 -0000 1.1 +++ import.log 26 Sep 2005 09:29:14 -0000 1.2 @@ -0,0 +1 @@ +Canna-3_7p3-13:HEAD:Canna-3.7p3-13.src.rpm:1127726812 From fedora-extras-commits at redhat.com Mon Sep 26 09:29:17 2005 From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh)) Date: Mon, 26 Sep 2005 05:29:17 -0400 Subject: rpms/Canna/devel Canna-3.6-bonobo.patch, NONE, 1.1 Canna-3.6-cannadic.patch, NONE, 1.1 Canna-3.6-dont-grab-ctrl-o.patch, NONE, 1.1 Canna-3.6-fix-warnings.patch, NONE, 1.1 Canna-3.6-sharedir.patch, NONE, 1.1 Canna-3.6-shion.patch, NONE, 1.1 Canna-3.6-wconv.patch, NONE, 1.1 Canna-3.7p1-fix-duplicated-strings.patch, NONE, 1.1 Canna-3.7p1-notimeout.patch, NONE, 1.1 Canna-3.7p3-fix-gcc4-warning.patch, NONE, 1.1 Canna-3.7p3-redecl.patch, NONE, 1.1 Canna-3.7p3-yenbs.patch, NONE, 1.1 Canna-conf.patch, NONE, 1.1 Canna-oldsock.patch, NONE, 1.1 Canna-x86_64.patch, NONE, 1.1 Canna.spec, NONE, 1.1 canna.init, NONE, 1.1 cannaping.c, NONE, 1.1 dot-canna, NONE, 1.1 skk-dictionaries.patch, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200509260929.j8Q9THc2003755@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/extras/rpms/Canna/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3685/devel Modified Files: .cvsignore sources Added Files: Canna-3.6-bonobo.patch Canna-3.6-cannadic.patch Canna-3.6-dont-grab-ctrl-o.patch Canna-3.6-fix-warnings.patch Canna-3.6-sharedir.patch Canna-3.6-shion.patch Canna-3.6-wconv.patch Canna-3.7p1-fix-duplicated-strings.patch Canna-3.7p1-notimeout.patch Canna-3.7p3-fix-gcc4-warning.patch Canna-3.7p3-redecl.patch Canna-3.7p3-yenbs.patch Canna-conf.patch Canna-oldsock.patch Canna-x86_64.patch Canna.spec canna.init cannaping.c dot-canna skk-dictionaries.patch Log Message: auto-import Canna-3.7p3-13 on branch devel from Canna-3.7p3-13.src.rpm Canna-3.6-bonobo.patch: --- NEW FILE Canna-3.6-bonobo.patch --- --- Canna36/dic/ideo/words/dics.dir.orig Tue Apr 2 18:08:49 2002 +++ Canna36/dic/ideo/words/dics.dir Tue Apr 2 18:09:06 2002 @@ -54,3 +54,6 @@ pub.cld(pub.mwd) -pub--- scien.cld(scien.mwd) -scien--- sup.cld(sup.mwd) -sup--- + +bonobo.cbd(bonobo.mwd) -bonobo--- +bonobo.cld(bonobo.mwd) -bonobo--- Canna-3.6-cannadic.patch: --- NEW FILE Canna-3.6-cannadic.patch --- --- Canna36/dic/ideo/words/dics.dir.orig Sat Jan 5 23:03:06 2002 +++ Canna36/dic/ideo/words/dics.dir Sat Jan 5 23:04:54 2002 @@ -40,3 +40,7 @@ software.ctd(.mwd) -software--- zipcode.ctd(.mwd) -zipcode--- geo.ctd(.mwd) -geo--- +gcanna.cbd(gcanna.mwd) -gcanna--- +gcanna.cld(gcanna.mwd) -gcanna--- +gcannaf.cbd(gcannaf.swd) -gcannaf--- +gcannaf.cld(gcannaf.swd) -gcannaf--- Canna-3.6-dont-grab-ctrl-o.patch: --- NEW FILE Canna-3.6-dont-grab-ctrl-o.patch --- diff -ruN Canna36p3.orig/lib/canna/alphamap.h Canna36p3/lib/canna/alphamap.h --- Canna36p3.orig/lib/canna/alphamap.h 2003-04-21 18:44:26.000000000 +0900 +++ Canna36p3/lib/canna/alphamap.h 2003-04-21 18:46:01.000000000 +0900 @@ -65,7 +65,7 @@ /* C-l */ CANNA_FN_SelfInsert, /* C-m */ CANNA_FN_SelfInsert, /* C-n */ CANNA_FN_SelfInsert, -/* C-o */ CANNA_FN_JapaneseMode, +/* C-o */ CANNA_FN_SelfInsert, /* C-p */ CANNA_FN_SelfInsert, /* C-q */ CANNA_FN_SelfInsert, /* C-r */ CANNA_FN_SelfInsert, Canna-3.6-fix-warnings.patch: --- NEW FILE Canna-3.6-fix-warnings.patch --- diff -ruN Canna36p3.orig/lib/canna/kctrl.c Canna36p3/lib/canna/kctrl.c --- Canna36p3.orig/lib/canna/kctrl.c 2003-04-21 18:44:26.000000000 +0900 +++ Canna36p3/lib/canna/kctrl.c 2003-04-21 19:03:24.000000000 +0900 @@ -27,6 +27,7 @@ #include "canna.h" #include +#include #include #include Canna-3.6-sharedir.patch: --- NEW FILE Canna-3.6-sharedir.patch --- diff -ruN Canna36p3.orig/lib/canna/romaji.c Canna36p3/lib/canna/romaji.c --- Canna36p3.orig/lib/canna/romaji.c 2003-03-25 18:41:14.000000000 +0900 +++ Canna36p3/lib/canna/romaji.c 2003-03-26 17:11:58.000000000 +0900 @@ -438,7 +438,6 @@ } } -#if 0 /* currently CANNASHAREDDIR is not defined */ if (retval == (struct RkRxDic *)NULL) { /* added for Debian by ISHIKAWA Mutsumi */ extern jrUserInfoStruct *uinfo; @@ -463,7 +462,6 @@ } } } -#endif if (retval == (struct RkRxDic *)NULL) { /* ???????????????????? */ sprintf(rdic, Canna-3.6-shion.patch: --- NEW FILE Canna-3.6-shion.patch --- --- Canna36/dic/ideo/words/dics.dir.shion Wed Jan 9 18:00:33 2002 +++ Canna36/dic/ideo/words/dics.dir Wed Jan 9 18:02:04 2002 @@ -44,4 +44,15 @@ gcanna.cbd(gcanna.mwd) -gcanna--- gcanna.cld(gcanna.mwd) -gcanna--- gcannaf.cbd(gcannaf.swd) -gcannaf--- gcannaf.cld(gcannaf.swd) -gcannaf--- + +basho.cbd(basho.mwd) -basho--- +keisan.cbd(keisan.mwd) -keisan--- +pub.cbd(pub.mwd) -pub--- +scien.cbd(scien.mwd) -scien--- +sup.cbd(sup.mwd) -sup--- +basho.cld(basho.mwd) -basho--- +keisan.cld(keisan.mwd) -keisan--- +pub.cld(pub.mwd) -pub--- +scien.cld(scien.mwd) -scien--- +sup.cld(sup.mwd) -sup--- Canna-3.6-wconv.patch: --- NEW FILE Canna-3.6-wconv.patch --- --- Canna36/server/wconvert.c.orig 2002-11-01 17:21:49.000000000 +0900 +++ Canna36/server/wconvert.c 2002-11-01 17:23:25.000000000 +0900 @@ -2096,12 +2096,12 @@ char *buf = (char *)0; if (validcontext(cxnum, client, wThrough)) { - buf = malloc((int)Request.type20.bufsize); + content_size = Request.type20.datalen - (SIZEOFINT * 2 + SIZEOFSHORT); + buf = malloc(content_size); if (buf) { - content_size = Request.type20.datalen - (SIZEOFINT * 2 + SIZEOFSHORT); bcopy(Request.type20.buf, buf, content_size); stat = size = RkThrough(cxnum, Request.type20.command, - buf, content_size, (int)Request.type20.bufsize); + buf, content_size, content_size); } } retval = SendType6Reply(client, wThrough, EXTPROTO, stat, buf, size); Canna-3.7p1-fix-duplicated-strings.patch: --- NEW FILE Canna-3.7p1-fix-duplicated-strings.patch --- diff -ruN Canna37p1.orig/lib/canna/romaji.c Canna37p1/lib/canna/romaji.c --- Canna37p1.orig/lib/canna/romaji.c 2004-03-17 17:56:42.651277000 +0900 +++ Canna37p1/lib/canna/romaji.c 2004-03-17 17:57:23.207908504 +0900 @@ -21,7 +21,7 @@ */ #if !defined(lint) && !defined(__CODECENTER__) -static char rcs_id[] = "@(#) 102.1 $Id: romaji.c,v 1.10 2003/09/17 08:50:53 aida_s Exp $"; +static char rcs_id[] = "@(#) 102.1 $Id: romaji.c,v 1.11 2004/03/15 04:33:23 aida_s Exp $"; #endif /* lint */ #include "canna.h" @@ -2626,6 +2626,7 @@ yc->englishtype = CANNA_ENG_KANA; yc->cStartp = yc->cRStartp = 0; yc->jishu_kEndp = 0; + yc->n_susp_chars = 0; } static int @@ -2782,8 +2783,13 @@ } yc->last_rule = 0; howManyDelete = howFarToGoBackward(yc); - if (howManyDelete > 0 && (yc->generalFlags & CANNA_YOMI_BREAK_ROMAN)) { - yc->generalFlags &= ~CANNA_YOMI_BREAK_ROMAN; + if (howManyDelete > 0 && (yc->generalFlags & CANNA_YOMI_BREAK_ROMAN) + && (yc->kAttr[yc->kCurs] & SENTOU)) { + /* + * ????????1???????????????????????????????????????????????? + * SENTOU????????1???????? + * ????????????????SENTOU???????????????????????? + */ yc->rStartp = yc->rCurs - 1; while ( yc->rStartp > 0 && !(yc->rAttr[yc->rStartp] & SENTOU) ) { yc->rStartp--; @@ -2792,16 +2798,23 @@ yc->kRStartp = yc->kCurs - 1; while ( yc->kRStartp > 0 && !(yc->kAttr[yc->kRStartp] & SENTOU) ) yc->kRStartp--; + /* ??????????????? */ prevflag = (yc->kAttr[yc->kRStartp] & SENTOU); kanaReplace(yc->kRStartp - yc->kCurs, yc->romaji_buffer + yc->rStartp, yc->rCurs - yc->rStartp, 0); + /* ????????1????????????????????????????????????????SENTOU?????? */ yc->kAttr[yc->kRStartp] |= prevflag; yc->n_susp_chars = 0; /* ???????????????????????? */ makePhonoOnBuffer(d, yc, (unsigned char)0, 0, 0); + /* ???????????????????????????????????????????????????????????????? + * ?????????????????????????? */ + if (yc->kRStartp == yc->kCurs) + yc->generalFlags &= ~CANNA_YOMI_BREAK_ROMAN; } else { + yc->generalFlags &= ~CANNA_YOMI_BREAK_ROMAN; if ( yc->kAttr[yc->kCurs - howManyDelete] & HENKANSUMI ) { if (yc->kAttr[yc->kCurs - howManyDelete] & SENTOU) { /* ?????????????????????????????? */ @@ -2821,6 +2834,12 @@ yc->rEndp -= n; } else { + /* ????????????????????????????????????????????????????????????*/ + while ( yc->rCurs > 0 && !(yc->rAttr[--yc->rCurs] & SENTOU) ) + ; + if (yc->rCurs < yc->rStartp) { + yc->rStartp = yc->rCurs; + } yc->kAttr[yc->kCurs] |= SENTOU; } } @@ -2829,6 +2848,12 @@ romajiReplace(-howManyDelete, (wchar_t *)NULL, 0, 0); } kanaReplace(-howManyDelete, (wchar_t *)NULL, 0, 0); + if ((yc->rAttr[yc->rCurs] & SENTOU) && yc->kRStartp == yc->kCurs) { + /* ???????????????????????????????????????????????????????????? + * SENTOU???????????????????? + */ + yc->rStartp = yc->rCurs; + } } debug_yomi(yc); return(0); @@ -2944,6 +2969,7 @@ currentModeInfo(d); } makeYomiReturnStruct(d); + debug_yomi(yc); return 0; } Canna-3.7p1-notimeout.patch: --- NEW FILE Canna-3.7p1-notimeout.patch --- ??????????????????????????????Canna37p1.orig/lib/RKC/.wconvert.c.swp???Canna37p1/lib/RKC/.wconvert.c.swp??????????????? diff -ruN Canna37p1.orig/lib/RKC/conf.c Canna37p1/lib/RKC/conf.c --- Canna37p1.orig/lib/RKC/conf.c 2003-12-28 02:15:24.000000000 +0900 +++ Canna37p1/lib/RKC/conf.c 2004-02-19 22:24:48.882713989 +0900 @@ -1496,7 +1496,7 @@ }; const NumberDefaultRec host_num_defaults[] = { - { CONF_SERVER_TIMEOUT, 1500u }, + { CONF_SERVER_TIMEOUT, 0u }, }; const char * Canna-3.7p3-fix-gcc4-warning.patch: --- NEW FILE Canna-3.7p3-fix-gcc4-warning.patch --- diff -ruN Canna37p3.orig/cmd/crxgram/crxgram.c Canna37p3/cmd/crxgram/crxgram.c --- Canna37p3.orig/cmd/crxgram/crxgram.c 2003-03-24 13:04:25.000000000 +0900 +++ Canna37p3/cmd/crxgram/crxgram.c 2005-03-02 17:15:28.000000000 +0900 @@ -485,7 +485,7 @@ int j; nextS = scanToken(nextS, namevec, sizeof(namevec)); - name = strtok(namevec, SEP); + name = strtok((char *)namevec, SEP); for (j = 0; name && j < 255;) { if (r = probeIdent(Row, name)) rdata[i][j++] = r->rownum; diff -ruN Canna37p3.orig/cmd/cshost/cshost.c Canna37p3/cmd/cshost/cshost.c --- Canna37p3.orig/cmd/cshost/cshost.c 2003-12-28 02:15:22.000000000 +0900 +++ Canna37p3/cmd/cshost/cshost.c 2005-03-02 17:15:28.000000000 +0900 @@ -152,12 +152,12 @@ goto protoerr; assert(wp + 2 <= endp); printf("HOST NAME:%s\n", wp ) ; - wp += strlen( wp ) + 1 ; + wp += strlen((char *) wp ) + 1 ; if( *wp ) { printf("USER NAME:" ) ; while( *wp ) { printf("%s ", wp ) ; - wp += strlen( wp ) + 1 ; + wp += strlen((char *) wp ) + 1 ; } } else printf("ALL USER" ) ; diff -ruN Canna37p3.orig/cmd/wtoc/wtoc.c Canna37p3/cmd/wtoc/wtoc.c --- Canna37p3.orig/cmd/wtoc/wtoc.c 2003-12-28 02:15:23.000000000 +0900 +++ Canna37p3/cmd/wtoc/wtoc.c 2005-03-02 17:15:28.000000000 +0900 @@ -144,8 +144,8 @@ int hindo; { if( !strcmp((char *)hinshi,"#kxuru") || !strcmp((char *)hinshi,"#sxuru")){ - strcat(yomi,"??"); - strcat(kouho,"??"); + strcat((char *)yomi,"??"); + strcat((char *)kouho,"??"); } if( hindo == 0 ) fprintf( fp, "%s %s %s \n", yomi, hinshi, kouho ); diff -ruN Canna37p3.orig/lib/canna/ebind.c Canna37p3/lib/canna/ebind.c --- Canna37p3.orig/lib/canna/ebind.c 2003-09-17 17:50:53.000000000 +0900 +++ Canna37p3/lib/canna/ebind.c 2005-03-02 17:15:28.000000000 +0900 @@ -364,7 +364,7 @@ /* list_cb??KC_setListCallback??d->elistcb?????????? */ list_cb.client_data = (char *)arg; list_cb.callback_func = &EUCListCallback; - ret = XwcKanjiControl2(display, window, request, (char *)&list_cb); + ret = XwcKanjiControl2(display, window, request, (BYTE *)&list_cb); goto return_ret; /* FALLTHROUGH */ default: /* ??????????EUC?????????????????? */ diff -ruN Canna37p3.orig/lib/canna/obind.c Canna37p3/lib/canna/obind.c --- Canna37p3.orig/lib/canna/obind.c 2004-04-27 07:49:21.000000000 +0900 +++ Canna37p3/lib/canna/obind.c 2005-03-02 17:15:28.000000000 +0900 @@ -500,7 +500,7 @@ /* list_cb??KC_setListCallback??d->elistcb?????????? */ list_cb.client_data = (char *)arg; list_cb.callback_func = &owcListCallback; - ret = XwcKanjiControl2(display, window, request, (char *)&list_cb); + ret = XwcKanjiControl2(display, window, request, (BYTE *)&list_cb); goto return_ret; default: /* ???????????????????????? */ ret = XwcKanjiControl2(display, window, request, arg); diff -ruN Canna37p3.orig/server/convert.c Canna37p3/server/convert.c --- Canna37p3.orig/server/convert.c 2003-12-28 02:15:24.000000000 +0900 +++ Canna37p3/server/convert.c 2005-03-02 17:15:28.000000000 +0900 @@ -1506,7 +1506,7 @@ const char *username; const char *hostname; { - int (*ReqCallFunc) pro((char *, int)) ; + int (*ReqCallFunc) pro((BYTE *, int)) ; register Req0 *req0 = &Request.Request0 ; const char *username0 = username ? username : ""; const char *hostname0 = hostname ? hostname : ""; diff -ruN Canna37p3.orig/server/wconvert.c Canna37p3/server/wconvert.c --- Canna37p3.orig/server/wconvert.c 2005-03-02 17:15:05.000000000 +0900 +++ Canna37p3/server/wconvert.c 2005-03-02 17:15:28.000000000 +0900 @@ -189,7 +189,7 @@ size_t size; { ir_debug( Dmsg(10, "WriteClient:") ); - ir_debug( DebugDump( 10, buf, size ) ); + ir_debug( DebugDump( 10, (const char *)buf, size ) ); return ClientBuf_store_reply(client->client_buf, buf, size); } #else @@ -1372,8 +1372,8 @@ /* ?????????????????????????????? */ stat = ACCES; if (checkPermissionToRead(client, dirname, (char *)0) >= 0) { - stat = RkwListDic(cxnum, (unsigned char *)dirname, - (unsigned char *)dicnames, requestsize); + stat = RkwListDic(cxnum, (char *)dirname, + (char *)dicnames, requestsize); } listdicdone: @@ -1403,7 +1403,7 @@ ir_debug( Dmsg(5, "dicname = %s\n", (req->dicname)?req->dicname:null) ); - stat = (char)RkwCreateDic(cxnum, (unsigned char *)req->dicname, + stat = (char)RkwCreateDic(cxnum, (char *)req->dicname, req->mode); } @@ -1438,7 +1438,7 @@ ir_debug( Dmsg(5, "dicname = %s\n", (req->dicname)?req->dicname:null) ); - stat = (char)RkwRemoveDic(cxnum, (unsigned char *)req->dicname, + stat = (char)RkwRemoveDic(cxnum, (char *)req->dicname, req->mode); } @@ -1456,8 +1456,8 @@ if (validcontext(cxnum, client, wRenameDictionary)) { diclen = strlen(req->dicname) + 1 ; - stat = RkwRenameDic(cxnum, (unsigned char *)req->dicname, - (unsigned char *)&(req->dicname)[diclen], + stat = RkwRenameDic(cxnum, (char *)req->dicname, + (char *)&(req->dicname)[diclen], req->mode); } return SendType2Reply(client, wRenameDictionary, EXTPROTO, stat); @@ -1950,8 +1950,8 @@ ir_debug( Dmsg(5, "dicname = %s\n", Request.type15.dicname) ); ir_debug( Dmsg(5, "username = %s\n", username) ); - stat = (RkwQueryDic(cxnum, (unsigned char *)username, - (unsigned char *)Request.type15.dicname, + stat = (RkwQueryDic(cxnum, (char *)username, + (char *)Request.type15.dicname, dicinfo) < 0) ? -1 : 0; if (stat < 0) { Canna-3.7p3-redecl.patch: --- NEW FILE Canna-3.7p3-redecl.patch --- --- Canna37p3/lib/canna/lisp.c.redecl 2004-11-24 00:08:05.429789120 +0100 +++ Canna37p3/lib/canna/lisp.c 2004-11-24 00:08:30.246016480 +0100 @@ -1355,8 +1355,6 @@ static int tyi() { - char *gets(), *fgets(); - if (untyibuf) { int ret = untyibuf[--untyip]; if (untyip == 0) { Canna-3.7p3-yenbs.patch: --- NEW FILE Canna-3.7p3-yenbs.patch --- --- Canna37p3/lib/RK/RkGetDic.man.yenbs 2004-11-23 23:01:21.908416880 +0100 +++ Canna37p3/lib/RK/RkGetDic.man 2004-11-23 23:02:00.867494200 +0100 @@ -41,7 +41,7 @@ Dictionary names are got in the area \f2dics\f1 in the following format: .P .RS 0.2c -dictionary-name-1 ??0 dictionary-name-2 ??0 ... dictionary-name-n ??0 ??0 +dictionary-name-1 \\0 dictionary-name-2 \\0 ... dictionary-name-n \\0 \\0 .RE .P The size of the area \f2dics\f1 is given in bytes by \f2maxdics\f1. The dictionary list is truncated in character strings when it exceeds this size. Canna-conf.patch: --- NEW FILE Canna-conf.patch --- diff -ruN Canna37p1.orig/Canna.conf Canna37p1/Canna.conf --- Canna37p1.orig/Canna.conf 2004-01-02 21:26:27.000000000 +0900 +++ Canna37p1/Canna.conf 2004-04-30 17:45:30.268087408 +0900 @@ -109,12 +109,12 @@ # define DefErrDir $(cannaPrefix)/log # define DefLibCannaDir $(cannaExecPrefix)/lib #else -# define DefCannaPrefix /usr/local/canna +# define DefCannaPrefix /usr # ifdef ObsoleteInstallDir # define DefErrDir /usr/spool/canna # define DefLibCannaDir /usr/lib # else -# define DefErrDir /var/log +# define DefErrDir /var/log/canna # define DefLibCannaDir $(cannaExecPrefix)/lib # endif #endif @@ -123,7 +123,7 @@ # define DefCannaLibDir $(cannaPrefix)/lib #else # define DefCannaSrvDir $(cannaExecPrefix)/sbin -# define DefCannaLibDir $(cannaPrefix)/share/canna +# define DefCannaLibDir $(cannaPrefix)/lib #endif #if defined(LinuxArchitecture) || defined(FreeBSDArchitecture) \ @@ -146,9 +146,11 @@ cannaSrvDir = DefCannaSrvDir XCOMM cannaLibDir = /var/lib/canna XCOMM cannaLibDir = /var/db/canna -cannaLibDir = DefCannaLibDir +cannaLibDir = /etc/canna +cannaEtcDir = /etc/canna +cannaShareDir = $(cannaPrefix)/share/canna XCOMM cannaManDir = $(cannaPrefix)/share/man -cannaManDir = $(cannaPrefix)/man +cannaManDir = $(cannaPrefix)/share/man cannaIncDir = $(cannaPrefix)/include/canna libCannaDir = DefLibCannaDir @@ -158,7 +160,7 @@ #define SupportOldWchar 1 /* IPv6??????????????1?????????????????? */ -#define UseInet6 0 /* requires newer IPv6 implementation */ +#define UseInet6 1 /* requires newer IPv6 implementation */ /* 3.2??????3.6???????????????????????????????????????????????????? */ /* #define DIC_3_6_COMPAT */ @@ -175,10 +177,10 @@ #ifdef InstallAsUser cannaOwnerGroup = #else -cannaOwnerGroup = -o $(cannaOwner) -g $(cannaGroup) +cannaOwnerGroup = #endif -cannaDsoRev = 1.2 +cannaDsoRev = 1.2.0 #if defined(cygwinArchitecture) /* import library????????????????????DLL??????/usr/X11R6/bin???????? */ @@ -199,8 +201,8 @@ CHGRP = : CHMOD = : #else -CHOWN = chown -CHGRP = chgrp +CHOWN = echo +CHGRP = echo CHMOD = chmod #endif @@ -237,7 +239,7 @@ /* #define UseInstalledLibCanna YES */ #define UseInstalledLibCanna NO -DicDir = $(cannaLibDir)/dic +DicDir = /var/lib/canna/dic /* ???????????????????????? */ @@ -339,10 +341,10 @@ #endif #ifdef InstallAsUser -UnixSockDir = $(cannaPrefix)/tmp/.iroha_unix +UnixSockDir = $(cannaPrefix)/var/run/.iroha_unix AccessFile = $(cannaPrefix)/etc/hosts.canna #else -UnixSockDir = /tmp/.iroha_unix +UnixSockDir = /var/run/.iroha_unix AccessFile = /etc/hosts.canna #endif UnixSockName = IROHA diff -ruN Canna37p1.orig/Imakefile Canna37p1/Imakefile --- Canna37p1.orig/Imakefile 2003-12-28 02:15:20.000000000 +0900 +++ Canna37p1/Imakefile 2004-04-30 17:45:01.586886913 +0900 @@ -58,6 +58,7 @@ @echo "#define CANNAHOSTFILE '$(cannaLibDir)/cannahost'" >> junkjunk @echo "/* for lib/canna */" >> junkjunk @echo "#define CANNALIBDIR '$(cannaLibDir)'" >> junkjunk + @echo "#define CANNASHAREDIR '$(cannaShareDir)'" >> junkjunk @echo "#define SUPPORT_OLD_WCHAR '$(supportOldWchar)'" >> junkjunk @echo "/* for scripts */" >> junkjunk @echo "#define CANNABINDIR $(cannaBinDir)" >> junkjunk @@ -89,6 +90,7 @@ echo "#define CANNAHOSTFILE \"$(cannaLibDir)/cannahost\"";\ echo "/* for lib/canna */";\ echo "#define CANNALIBDIR \"$(cannaLibDir)\""; \ + echo "#define CANNASHAREDIR \"$(cannaShareDir)\""; \ echo "#define SUPPORT_OLD_WCHAR $(supportOldWchar)"; \ echo "/* for scripts */";\ echo "#define CANNABINDIR $(cannaBinDir)"; \ diff -ruN Canna37p1.orig/dic/phono/Imakefile Canna37p1/dic/phono/Imakefile --- Canna37p1.orig/dic/phono/Imakefile 2002-10-19 17:27:40.000000000 +0900 +++ Canna37p1/dic/phono/Imakefile 2004-04-30 17:45:01.587886780 +0900 @@ -28,6 +28,7 @@ ROMAJI_DIC_DEF = -DSHIFT DICDIR = $(cannaLibDir)/dic + CANNASHAREDIR = $(cannaShareDir) SAMPLEDIR = $(cannaLibDir)/sample SAMPLESRCDIR = $(cannaLibDir)/sample/src @@ -69,7 +70,7 @@ MakeDirectories(install,$(DICDIR)) MakeDirectories(install,$(SAMPLESRCDIR)) -InstallMultiple($(ROMKANA_TABLES),$(DICDIR)) +InstallMultiple($(ROMKANA_TABLES),$(CANNASHAREDIR)) #ifdef USE_OBSOLETE_STYLE_FILENAME InstallNonExec(default.kpdef,$(SAMPLESRCDIR)) diff -ruN Canna37p1.orig/misc/initfiles/Imakefile Canna37p1/misc/initfiles/Imakefile --- Canna37p1.orig/misc/initfiles/Imakefile 2003-02-04 05:13:01.000000000 +0900 +++ Canna37p1/misc/initfiles/Imakefile 2004-04-30 17:45:01.587886780 +0900 @@ -6,7 +6,7 @@ #endif CANNAROOT = ../.. - SAMPLEDIR = $(cannaLibDir)/sample + SAMPLEDIR = $(cannaShareDir) all:: Canna-oldsock.patch: --- NEW FILE Canna-oldsock.patch --- diff -ruN Canna37p1.orig/lib/RKC/wconvert.c Canna37p1/lib/RKC/wconvert.c --- Canna37p1.orig/lib/RKC/wconvert.c 2003-09-24 23:50:40.000000000 +0900 +++ Canna37p1/lib/RKC/wconvert.c 2004-04-30 19:10:18.762882047 +0900 @@ -150,8 +150,25 @@ if ((ServerFD = socket((int) addr->sa_family, SOCK_STREAM, 0)) >= 0){ if( try_connect( ServerFD, addr, sizeof unaddr ) < 0 ) { close( ServerFD ) ; - return( -1 ) ; + ServerFD = -1; + } + } + if (ServerFD < 0) { + /* for the backward compatibility */ +#define OLD_IR_UNIX_PATH "/tmp/.iroha_unix/IROHA" + + if (number) + sprintf (unaddr.sun_path, "%s:%d", OLD_IR_UNIX_PATH, number); + else + strcpy (unaddr.sun_path, OLD_IR_UNIX_PATH); + + if ((ServerFD = socket ((int) addr->sa_family, SOCK_STREAM, 0)) >= 0) { + if (try_connect (ServerFD, addr, sizeof (unaddr)) < 0) { + close (ServerFD); + return -1; + } } +#undef OLD_IR_UNIX_PATH } return( ServerFD ) ; } Canna-x86_64.patch: --- NEW FILE Canna-x86_64.patch --- diff -ruN Canna37.orig/Canna.conf Canna37/Canna.conf --- Canna37.orig/Canna.conf 2003-12-24 13:20:19.000000000 +0900 +++ Canna37/Canna.conf 2003-12-24 13:20:48.000000000 +0900 @@ -112,7 +112,7 @@ # define DefCannaPrefix /usr # ifdef ObsoleteInstallDir # define DefErrDir /usr/spool/canna -# define DefLibCannaDir /usr/lib +# define DefLibCannaDir /usr/lib64 # else # define DefErrDir /var/log/canna # define DefLibCannaDir $(cannaExecPrefix)/lib --- NEW FILE Canna.spec --- %define pubdicrhver 20021028 %define zipcodever 20030204 %define cannadicver 0.95c %define cannadir Canna37p3 Summary: A Japanese character set input system. Name: Canna Version: 3.7p3 Release: 13 License: Distributable Group: System Environment/Libraries URL: http://www.nec.co.jp/japanese/product/computer/soft/canna/ Source0: http://prdownloads.sourceforge.jp/canna/7240/%{cannadir}.tar.bz2 Source1: http://cannadic.oucrc.org/cannadic-%{cannadicver}.tar.gz Source2: pubdic-bonobo-%{pubdicrhver}.tar.bz2 Source3: http://www.coolbrain.net/dl/shion/shion.tar.gz Source4: http://bonobo.gnome.gr.jp/~nakai/canna/zipcode-%{zipcodever}.tar.bz2 Source20: canna.init Source21: dot-canna Source22: cannaping.c Patch0: Canna-conf.patch Patch2: Canna-3.6-sharedir.patch Patch4: Canna-3.6-dont-grab-ctrl-o.patch Patch5: Canna-3.6-fix-warnings.patch ## some dictionaries were ported from SKK-JISYO.* Patch17: skk-dictionaries.patch Patch18: Canna-3.6-cannadic.patch Patch19: Canna-3.6-shion.patch Patch21: Canna-3.6-bonobo.patch # Fix for buffer overrun Patch23: Canna-3.6-wconv.patch Patch25: Canna-x86_64.patch Patch27: Canna-3.7p1-notimeout.patch Patch28: Canna-oldsock.patch # Patch from the upstream Patch40: Canna-3.7p1-fix-duplicated-strings.patch Patch41: Canna-3.7p3-yenbs.patch Patch42: Canna-3.7p3-redecl.patch Patch43: Canna-3.7p3-fix-gcc4-warning.patch BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot Prereq: /sbin/chkconfig, /etc/services, /bin/grep, /bin/cp BuildPrereq: XFree86-devel,cpp,gawk Obsoletes: tamago %description Canna provides a user interface for inputting Japanese characters. Canna supports Nemacs (Mule), kinput2, and canuum. All of these tools can then use a single customization file, Romaji-to-Kana conversion rules and dictionaries, and input Japanese in the same way. Canna automatically supports Kana-to-Kanji conversions; the conversions are based on a client-server model. %package devel Summary: Header file and library for developing programs which use Canna. Group: Development/Libraries Requires: Canna-libs >= %{version}-%{release} %package libs Summary: The runtime library for Canna. Group: System Environment/Libraries %description devel The Canna-devel package contains the development files needed to build programs that will use the Canna Japanese character input system. %description libs The Canna-libs package contains the runtime library for running programs with the Canna Japanese input system. %prep %setup -q -c -a 1 -a 2 -a 3 -a 4 cd %{cannadir} %patch0 -p1 -b .conffix %patch2 -p1 -b .share %patch4 -p1 -b .ctrl-o %patch5 -p1 -b .warnings %patch17 -p1 -b .skk %patch18 -p1 -b .cannadic %patch19 -p1 -b .shion %patch21 -p1 -b .bonobo %patch23 -p1 -b .wconv %ifarch x86_64 %patch25 -p1 -b .x86_64 %endif %patch27 -p1 -b .notimeout %patch28 -p1 -b .oldsock %patch40 -p1 -b .duplicate %patch41 -p1 -b .yenbs %patch42 -p1 -b .redecl %patch43 -p1 -b .gcc4 cd .. for file in %{cannadir}/{cmd/mkromdic/mkromdic.man,lib/RK/RkIntro.man}; do iconv -f euc-jp -t utf-8 < "$file" > "${file}_" mv "${file}_" "$file" done cat $RPM_BUILD_DIR/Canna-%{version}/zipcode-%{zipcodever}/zipcode.t \ $RPM_BUILD_DIR/Canna-%{version}/zipcode-%{zipcodever}/jigyosyo.t | sort \ > $RPM_BUILD_DIR/Canna-%{version}/%{cannadir}/dic/ideo/words/zipcode.t cat $RPM_BUILD_DIR/Canna-%{version}/pubdic-bonobo/*.p | sort >> \ $RPM_BUILD_DIR/Canna-%{version}/%{cannadir}/dic/ideo/pubdic/y.p # find CVS files and remove it. find $RPM_BUILD_DIR/%{name}-%{version} -name .cvsignore -exec rm -f {} \; %build function builddic() { dic=$1 dicname=`echo $dic | sed -e 's/\(.*\)\..*\$/\1/'` case $2 in mwd) mode="mwd"; flag="-m"; ;; swd) mode="swd"; flag="-s"; ;; *) echo "unknown dictionary type: $2"; exit 1; ;; esac export buildcannadir=$RPM_BUILD_DIR/%{name}-%{version}/%{cannadir} if [ "x$3" = "xsort" ]; then $buildcannadir/cmd/splitwd/splitword $dic | $buildcannadir/cmd/forsort/forsort -7 | sort | $buildcannadir/cmd/forsort/forsort -8 | $buildcannadir/cmd/mergewd/mergeword > $dicname.$mode else cat $dic > $dicname.$mode fi $buildcannadir/cmd/crxdic/crxdic -D $buildcannadir/dic/ideo/grammar/cnj.bits $flag -o $dicname.cbd -n $dicname $dicname.$mode $buildcannadir/cmd/crfreq/crfreq -div 512 -o $dicname.cld $dicname.cbd $dicname.$mode rm $dicname.$mode } cd %{cannadir} xmkmf make Makefile pushd lib/canna xmkmf make sglobal.h popd %ifarch ia64 sed 's/-O2//' Makefile > Makefile.tmp mv Makefile.tmp Makefile %endif # ugly hack to avoid X.Org: no such file or directory issue TMP_MAKEFILE=`mktemp /tmp/Canna-build-makefile.XXXXXX` sed -e 's/$(VENDOR_DEFINES)//' Makefile > $TMP_MAKEFILE && cp $TMP_MAKEFILE Makefile rm $TMP_MAKEFILE make canna gcc -o ./misc/cannaping %{SOURCE22} -I./include -L./lib/canna -lcanna cd .. cd cannadic-%{cannadicver} for i in $RPM_BUILD_DIR/Canna-%{version}/%{cannadir}/cmd/*; do \ if [ -d $i ]; then \ export PATH=$PATH:$i; \ fi \ done; export RPM_CANNAIDEO_DIR=$RPM_BUILD_DIR/Canna-%{version}/%{cannadir}/dic/ideo export RPM_CANNACMD_DIR=$RPM_BUILD_DIR/Canna-%{version}/%{cannadir}/cmd export RPM_CANNA_POD=$RPM_BUILD_DIR/Canna-%{version}/%{cannadir}/dic/ideo/pubdic/pod builddic gcanna.ctd mwd none builddic gcannaf.ctd swd none cd .. cd pubdic-bonobo cat *.p | $RPM_CANNA_POD - -p -i -2 > bonobo.spl $RPM_CANNACMD_DIR/mergewd/mergeword< bonobo.spl > bonobo.t rm -rf bonobo.spl builddic bonobo.t mwd sort cd .. cd shion builddic basho.ctd mwd sort builddic keisan.ctd mwd sort builddic pub.ctd mwd sort builddic scien.ctd mwd none builddic sup.ctd mwd sort cd .. %install [ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT cd %{cannadir} make libCannaDir=%{_libdir} DESTDIR=$RPM_BUILD_ROOT install make DESTDIR=$RPM_BUILD_ROOT MANDIR=%{_mandir} MANSUFFIX=1 LIBMANSUFFIX=3 install.man for i in `find $RPM_BUILD_ROOT%{_mandir}/ja -type f`; do iconv -f euc-jp -t utf-8 $i > $i.new && mv -f $i.new $i && chmod 444 $i done %{__install} -c -s -m755 ./misc/cannaping $RPM_BUILD_ROOT%{_bindir}/cannaping cd .. cd %{cannadir} %{__mv} misc/manual.sed . %{__rm} -fr misc %{__mkdir} misc %{__mv} manual.sed misc cd .. cd cannadic-%{cannadicver} %{__mkdir_p} $RPM_BUILD_ROOT%{_localstatedir}/lib/canna/dic/canna %{__install} -m 644 gcanna*.c[bl]d \ $RPM_BUILD_ROOT%{_localstatedir}/lib/canna/dic/canna cd .. cd pubdic-bonobo %{__install} -m 644 bonobo*.c[bl]d \ $RPM_BUILD_ROOT%{_localstatedir}/lib/canna/dic/canna cd .. cd shion %{__install} -m 644 basho.cld basho.cbd kaom.ctd keisan.cld keisan.cbd \ pub.cld pub.cbd scien.cld scien.cbd sup.cld sup.cbd \ $RPM_BUILD_ROOT%{_localstatedir}/lib/canna/dic/canna cd .. %{__mkdir_p} $RPM_BUILD_ROOT/etc/rc.d/init.d %{__mkdir_p} $RPM_BUILD_ROOT/etc/skel %{__install} -m 755 %SOURCE20 $RPM_BUILD_ROOT/etc/rc.d/init.d/canna %{__cp} %SOURCE21 $RPM_BUILD_ROOT/etc/skel/.canna %{__cp} -f %SOURCE21 $RPM_BUILD_ROOT/etc/canna/default.canna ## chmod 755 $RPM_BUILD_ROOT/etc/rc.d/init.d/canna cat > $RPM_BUILD_ROOT%{_sysconfdir}/hosts.canna << EOF unix EOF cat > $RPM_BUILD_ROOT%{_sysconfdir}/canna/cannahost << EOF unix EOF for bin in addwords cpdic delwords lsdic mkdic mvdic rmdic syncdic ; do ln -sf catdic $RPM_BUILD_ROOT%{_bindir}/${bin} done ln -sf ../bin/catdic $RPM_BUILD_ROOT%{_sbindir}/cannakill mv $RPM_BUILD_ROOT%{_sysconfdir}/canna/sample $RPM_BUILD_DIR/%{name}-%{version} %{__mkdir_p} $RPM_BUILD_ROOT%{_localstatedir}/run/.iroha_unix %clean [ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -fr $RPM_BUILD_ROOT %pre if %{__grep} -q '^canna:' /etc/passwd then %{_sbindir}/userdel canna fi %{_sbindir}/useradd -c "Canna Service User" -r \ -s /sbin/nologin -u 39 -d %{_localstatedir}/lib/canna canna 2>/dev/null || : %post if ! grep -q canna /etc/services then echo "canna 5680/tcp" >>/etc/services fi /sbin/chkconfig --add canna chown -R canna:canna /var/lib/canna %preun if [ "$1" = "0" ]; then /sbin/service canna stop > /dev/null 2>&1 || : /sbin/chkconfig --del canna fi %postun if [ "$1" -ge "1" ]; then /sbin/service canna condrestart >/dev/null 2>&1 || : fi %post libs -p /sbin/ldconfig %postun libs -p /sbin/ldconfig %files %defattr (-,root,root) %doc %{cannadir}/CHANGES.jp %{cannadir}/ChangeLog %doc %{cannadir}/OCHANGES.jp %{cannadir}/RKCCONF.jp %doc %{cannadir}/README %{cannadir}/README.jp %{cannadir}/WHATIS %doc %{cannadir}/WHATIS.jp %{cannadir}/Canna.conf %doc $RPM_BUILD_DIR/%{name}-%{version}/sample %config %{_sysconfdir}/rc.d/init.d/canna %config %{_sysconfdir}/skel/.canna %config(noreplace) %{_sysconfdir}/hosts.canna %config(noreplace) %{_sysconfdir}/canna/cannahost %config %{_sysconfdir}/canna/default.canna %{_bindir}/* %{_datadir}/canna/* %{_mandir}/man1/* %{_mandir}/ja/man1/* %defattr (0755,root,root) %{_sbindir}/cannaserver %{_sbindir}/cannakill %defattr (-,canna,canna) %dir %{_localstatedir}/run/.iroha_unix %{_localstatedir}/lib/canna %{_localstatedir}/log/canna %files devel %defattr (-,root,root) %{_includedir}/canna/ %{_mandir}/man3/* %{_mandir}/ja/man3/* %{_libdir}/libRKC.a %{_libdir}/libRKC.so %{_libdir}/libRKC16.a %{_libdir}/libRKC16.so %{_libdir}/libcanna.a %{_libdir}/libcanna.so %{_libdir}/libcanna16.a %{_libdir}/libcanna16.so %files libs %defattr (-,root,root) %{_libdir}/libRKC.so.* %{_libdir}/libRKC16.so.* %{_libdir}/libcanna.so.* %{_libdir}/libcanna16.so.* %changelog * Mon Mar 7 2005 Akira TAGOH - 3.7p3-13 - stop to sort the words on some dictionaries during making the binary dictionaries. * Wed Mar 2 2005 Akira TAGOH - 3.7p3-12 - rebuild for gcc4. - Canna-3.7p3-fix-gcc4-warning.patch: applied to fix more compiler warnings. * Tue Feb 22 2005 Akira TAGOH - 3.7p3-11 - updates to cannadic-0.95c * Mon Jan 3 2005 Bill Nottingham - 3.7p3-10 - don't use initlog * Tue Nov 23 2004 Miloslav Trmac - 3.7p3-9 - Convert man pages to UTF-8 - Don't use Yen symbol instead of backspace in RkGetDicList man page - Fix build failure when redeclaring glibc functions * Thu Nov 4 2004 Akira TAGOH - 3.7p3-8 - rebuilt * Thu Oct 21 2004 Akira TAGOH - 3.7p3-7 - dot.canna: assigned quit to Escape key to escape with Escape key from the mode. (#135039) * Tue Sep 21 2004 Warren Togami - 3.7p3-6 - remove unnecessary docs * Wed Sep 08 2004 Akira TAGOH 3.7p3-5 - fixed default.canna to get usability and improve the default behavior without proper .canna file. NOTE: you must always have proper .canna file however, since your .canna file is prior than the default behavior and it probably overrides the default thing. * Thu Jun 24 2004 Akira TAGOH 3.7p3-4 - Canna-conf.patch: updated to change the socket file directory under /var/run. - Canna-oldsock.patch: applied to ensure that restarting the daemon works during upgrading. - made /var/run/.iroha_unix at the build time. * Tue Jun 15 2004 Elliot Lee - rebuilt * Sun Jun 06 2004 Florian La Roche - use /var/lib/canna in filelist to also include that dir in the rpm listing and set proper ownership from rpm and not only via the post script * Mon May 24 2004 Akira TAGOH 3.7p3-1 - New upstream release. - Canna-3.7p1-pod-fix-wrongparam.patch: removed. * Wed Apr 14 2004 Akira TAGOH 3.7p1-7 - updates cannadic-0.95b * Sun Mar 21 2004 Florian La Roche 3.7p1-6 - apps owned by root instead of bin * Wed Mar 17 2004 Akira TAGOH 3.7p1-5 - Canna-3.7p1-fix-duplicated-strings.patch: applied a backport patch from CVS. when the characters like 'bbb...' is deleted, the preedit strings is duplicated. (#117140) * Tue Mar 02 2004 Elliot Lee 3.7p1-4.1 - rebuilt * Thu Feb 19 2004 Akira TAGOH 3.7p1-4 - Canna-3.7p1-notimeout.patch: applied to avoid cant-mount-the-dictionaries issue. (#114886) * Fri Feb 13 2004 Elliot Lee - rebuilt * Wed Jan 14 2004 Akira TAGOH 3.7p1-2 - fix broken dictionaries on ia64. - Canna-3.7p1-pod-fix-wrongparam.patch: applied to fix the wrong function parameter. (#113662) * Fri Jan 09 2004 Akira TAGOH 3.7p1-1 - New upstream release. * Mon Dec 24 2003 Akira TAGOH 3.7-1 - New upstream release. - Canna-3.6-cannadic.patch: updated to fix the warning. - Canna-3.6-fix-warnings.patch: updated. - Canna-3.6-sleep.patch: removed because it's unnecessary anymore. - Canna-3.6-fix-ia64-unaligned-access.patch: removed. should be unnecessary. - canna.init: correct path for cannakill. - dot-canna: re-enabled fuzokugo entry. * Wed Dec 10 2003 Akira TAGOH 3.6-25 - updated to cannadic-0.95a * Fri Oct 10 2003 Akira TAGOH 3.6-24 - Canna-3.6-fix-ia64-unaligned-access.patch: fixed unaligned access on ia64. (#101762) * Tue Sep 30 2003 Akira TAGOH 3.6-22 - converted Japanese manpages to UTF-8. * Wed Sep 24 2003 Akira TAGOH 3.6-21 - updates to Canna-3.6p4 - Canna-3.6-fix-segv-amd64.patch: removed. - dot-canna: comment "fuzokugo" dictionary out. it isn't contained anymore. * Wed Sep 17 2003 Akira TAGOH 3.6-20.1 - rebuilt * Wed Sep 17 2003 Akira TAGOH 3.6-20 - Canna-3.6-fix-segv-amd64.patch: applied to fix segfault on x86-64. (#104539) * Wed Jul 09 2003 Akira TAGOH 3.6-19 - updates to cannadic-0.95 * Wed Jun 04 2003 Elliot Lee - rebuilt * Wed Apr 23 2003 Akira TAGOH 3.6-17 - updates to cannadic-0.94g * Mon Apr 21 2003 Akira TAGOH 3.6-16 - rebuild. * Mon Apr 21 2003 Akira TAGOH 3.6-15 - Canna-3.6-dont-grab-ctrl-o.patch: applied to not grab ctrl-o. (#75865) - Canna-3.6-fix-warnings.patch: applied to fix some compiler warnings. (#80639) * Tue Apr 01 2003 Akira TAGOH 3.6-14 - don't ship .cvsignore files. * Tue Mar 25 2003 Akira TAGOH 3.6-13 - updates to 3.6p3 - clean up - Canna-3.6-Imakefile.patch: removed an unnecessary patch. - Canna-3.6-sharedir.patch: find the dictionary files from /usr/share/canna - Canna-3.6-sleep.patch: to fix very strange problem. when the child process tries to kill the parent process, the parent process isn't terminated, and it seems that the parent process doesn't still return from fork() and waiting on SYS_futex. - moved cannahost and default.canna to /etc/canna so that config files should be moved on /etc. - moved sample files to /usr/share/doc/Canna-/ * Tue Feb 4 2003 Yukihiro Nakai 3.6-9 - Add cannaping command for init script (#82163) - Update canna init script (#82163) * Thu Jan 23 2003 Tim Powers 3.6-8 - rebuild * Sat Dec 21 2002 Yukihiro Nakai 3.6-7 - Change shell to /sbin/nologin (#80175) * Thu Dec 12 2002 Yukihiro Nakai 3.6-5 - Update to 3.6p1 * Thu Nov 28 2002 Yukihiro Nakai 3.6-4 - Disable -O2 on ia64 * Wed Nov 27 2002 Yukihiro Nakai 3.6-3 - Update bonobo - Update zipcode - Update cannadic * Tue Nov 19 2002 Yukihiro Nakai 3.6-1 - Update to 3.6 * Tue Nov 12 2002 Elliot Lee 3.5b2-71 - Remove/fix ldconfig usage in scripts - _smp_mflags - Rebuild * Mon Nov 11 2002 Yukihiro Nakai 3.5b2-70.8.0.1 - Add CANNA-2002-01 patch * Fri Nov 01 2002 Yukihiro Nakai 3.5b2-70.8.0 - Add wconvert.c buffer overrun fix patch * Tue Aug 06 2002 Yukihiro Nakai 3.5b2-70 - Delete -inet option from canna.init script (#67217) - Obsolete tamago with this version (#67217) - Delete localhost from /etc/hosts.canna * Fri Aug 02 2002 Yukihiro Nakai 3.5b2-69 - Update zipcode - Update pubdic-bonobo * Thu Jul 18 2002 Akira TAGOH 3.5b2-68 - Canna-3.5b2-nonstrip.patch: applied to fix the stripped binary. * Tue Jul 09 2002 Yukihiro Nakai - Update zipcode - Update pubdic-bonobo - Update Cannadic * Thu Jun 27 2002 Yukihiro Nakai - Make users at install(%%pre) (#66306) * Wed Jun 26 2002 Yukihiro Nakai - Update pubdic-bonobo * Thu Jun 06 2002 Yukihiro Nakai - Update pubdic-bonobo - Update zipcode * Thu May 23 2002 Tim Powers - automated rebuild * Tue Mar 28 2002 Yukihiro Nakai 3.5b2-62 - Update cannadic to 0.94b to fix pubdic wrong entry - Update pubdic-bonobo - Remove refer to pubdic - celebrate pubdic-bonobo indepence day * Tue Feb 26 2002 Yukihiro Nakai 3.5b2-61 - Update cannadic to 0.94 * Wed Jan 30 2002 Yukihiro Nakai 3.5b2-58 - Update zipcode dic - Update pubdic-bonobo * Mon Jan 21 2002 Yukihiro Nakai 3.5b2-56 - Update pubdic-bonobo(renamed from pubdic-redhat) * Sat Jan 12 2002 Yukihiro Nakai 3.5b2-55 - Minor fix for shion - Update cannadic to 0.93 * Wed Jan 9 2002 Yukihiro Nakai 3.5b2-52 - %%doc fix - Add pubdic-redhat - Add dictionary 'shion' * Sun Jan 6 2002 Yukihiro Nakai 3.5b2-51 - Add cannadic, GPL dictionary * Thu Aug 30 2001 Yukihiro Nakai - Set -inet option by default in canna init script and add localhost to hosts.canna. It affects to tamago/emacs problem(#52886) * Wed Aug 29 2001 Yukihiro Nakai - Apply patch3 in all case * Thu Aug 23 2001 Jens Petersen - 3.5b2-48 - Add defattr before /var/lib/canna, so that files therein not made executable. * Wed Aug 22 2001 SATO Satoru - 3.5b2-47 - cleaned up SPEC (remove meaningless 'Prefix:' tag, use macros, etc.) - added BuildPrereq: XFree86-devel (xmkmf) - added some dictionaries ported from skk (#52248) - added %%config(noreplace) /var/lib/canna/cannahost * Tue Aug 21 2001 Yukihiro Nakai - 3.5b2-46 - Build fix with (#52088) * Wed Aug 15 2001 Jens Petersen - 3.5b2-45 - Added patch by Ishikawa to make cannaserver listen only on a unix domain socket by default (#33420) and create "/var/lib/canna/cannahost" to help kinput2 find it. - Added fix from Ishikawa for "typo" in malloc call in lib/RK/dd.c. * Tue Aug 9 2001 Yukihiro Nakai - 3.5b2-44 - Off the S bit (#13135) * Sun Jun 24 2001 Elliot Lee - Bump release + rebuild. * Mon Apr 23 2001 Yukihiro Nakai - Add complete ia64 patch * Tue Apr 17 2001 Bill Nottingham - build on ia64 so that dependencies work * Tue Feb 6 2001 Matt Wilson - changed requires on Canna-devel to require Canna-libs, not Canna * Tue Feb 6 2001 Trond Eivind Glomsrd - Display OK or FAILED from initscript (#26111) * Fri Jan 26 2001 Yukihiro Nakai - More fix to reduce warning * Fri Jan 26 2001 Yukihiro Nakai - Capitalize summary - Add Requires to Canna-devel - Minor fix for %%files * Wed Jan 24 2001 Adrian Havill - changed dangerous suid bin/bin uid/gid of server to canna/canna * Tue Jan 23 2001 Yukihiro Nakai - Update canna.init (teg at redhat.com> * Tue Jan 23 2001 Yukihiro Nakai - Add defattr - Add post and postun for -libs to ldconfig * Mon Jan 22 2001 Yukihiro Nakai - Split the runtime library - bzip2 * Fri Jan 19 2001 Yukihiro Nakai - Disable IA64 patch. It seems to cause serious problem. (Such IA64 fix is not needed with the newer compiler?) * Fri Jan 19 2001 Matt Wilson - use -DCANNA_WCHAR (revert the the part of the ia64 patch that disables -DCANNA_WCHAR * Tue Dec 19 2000 Yukihiro Nakai - Add IA64 patch (Not complete) * Wed Sep 13 2000 ISHIKAWA Mutsumi - spcfile typo fix (doc-canna -> dot-canna) * Wed Sep 13 2000 ISHIKAWA Mutsumi - add /etc/skel/.canna * Thu Sep 12 2000 ISHIKAWA Mutsumi - fix initscript * Mon Sep 11 2000 ISHIKAWA Mutsumi - chown bin.bin /usr/sbin/{cannaserver,cannakill},/var/lib/canna and /var/log/canna * Mon Sep 11 2000 ISHIKAWA Mutsumi - hosts.canna read bug fix. * Thu Sep 7 2000 ISHIKAWA Mutsumi - move back /etc/init.d -> /etc/rc.d/init.d * Thu Aug 24 2000 ISHIKAWA Mutsumi - chmod +x /etc/init.d/canna * Fri Aug 4 2000 ISHIKAWA Mutsumi - move /etc/rc.d/init.d -> /etc/init.d * Thu Aug 3 2000 ISHIKAWA Mutsumi - rebuilt for RedHat 7.0. - man directory ja_JP.UJIS -> ja - Canna-3.5b2.conf.patch modified to install manpages to /usr/share/man - remove Canna-3.5b2-fhs.patch to install manpages to /usr/share/man * Tue Jul 18 2000 Nalin Dahyabhai - fix syntax error in postun - no need to remove the services entry in postun - make all symlinks to catdic relative instead of absolute * Fri Jul 14 2000 Bill Nottingham - move initscript back * Wed Jul 12 2000 Prospector - automatic rebuild * Tue Jul 11 2000 Bill Nottingham - don't run by default - add buffer overflow patch - add configuration that should in theory only accept connections from localhost or unix socket * Mon Jun 26 2000 Preston Brown - initscript to /etc/init.d, and updated for new initscript stds. * Mon Jun 19 2000 Preston Brown - FHS paths * Mon Jun 12 2000 Matt Wilson - don't redefine bcopy - add defattr * Sun Mar 26 2000 Chris Ding - ja -> ja_JP.eucJP * Tue Mar 21 2000 Chris Ding - ja_JP.eucJP -> ja * Thu Mar 9 2000 Matt Wilson - build for 6.2, gzip manpages * Sat Mar 4 2000 Chris Ding - ja -> ja_JP.eucJP - changed group * Thu Oct 21 1999 Matt Wilson - added prereq for grep and cp * Wed Oct 20 1999 Matt Wilson - added prereq for /sbin/chkconfig and /etc/services * Tue Oct 12 1999 Matt Wilson - fixed redirection path for 4 man pages * Thu Oct 7 1999 Matt Wilson - rebuilt against 6.1 * Thu Jun 24 1999 Japanese LinuxPPC Users' Group - build against Linuxppc R5 - add Oe's stdin patch in Canna-3.5b2-3rh.src.rpm - change canna.init and spec file for safty shutdown cannaserver. Thanks to Shoichiro Nagata. * Sun May 30 1999 FURUSAWA,Kazuhisa - 4th Release for i386 (glibc2.1). - Original Packager: Atsushi Yamagata * Fri Jan 22 1999 Atsushi Yamagata - 4th release - changed installed directories (See Canna.conf and INSTALL.jp) - added post-{un}install scripts for Canna and Canna-devel packages - added URL, Distribution, Vendor, and Prefix tags * Tue Nov 04 1997 Atsushi Yamagata - 3rd release - patched for glibc. Thanks Mr. Daisuke Sato - divided the Canna packege into Canna and Canna-devel * Sun Jul 27 1997 Atsushi Yamagata - 2nd release * Fri Jul 11 1997 Atsushi Yamagata - 1st release --- NEW FILE canna.init --- #!/bin/bash # # chkconfig: 2345 90 12 # description: Canna Japanese Conversion Engine # # canna Canna server # # Author Manabe Takashi # Modifier Atsushi Yamagata # Modifier 22 Jan 1999 Atsushi Yamagata # Modifier 23 Jun 1999 Shoichiro Nagata # Modifier 04 Feb 2003 Yukihiro Nakai # Source function library. . /etc/init.d/functions PATH=$PATH:/usr/sbin SERVER=/usr/sbin/cannaserver KILLER=/usr/sbin/cannakill prog="Canna server" [ -f $SERVER ] || exit 0 start() { rm -f /tmp/.iroha_unix/IROHA rm -f /var/run/.iroha_unix/IROHA echo -n $"Starting $prog: " $SERVER -syslog -u canna cannaping && success || failure RETVAL=$? [ "$RETVAL" = 0 ] && touch /var/lock/subsys/canna echo } stop() { action "Stopping $prog:" $KILLER 2> /dev/null rm -f /tmp/.iroha_unix/IROHA rm -f /var/run/.iroha_unix/IROHA rm -f /var/lock/subsys/canna } case "$1" in start) start ;; stop) stop ;; status) status cannaserver ;; restart|reload) stop start ;; condrestart) if [ -f /var/lock/subsys/canna ]; then stop start fi ;; *) echo $"Usage: $0 {start|stop|restart|condrestart|status}" exit 1 esac exit 0 --- NEW FILE cannaping.c --- /* * cannaping - the minimal cannaserver check program * * Copyright (C) 2003 Red Hat, Inc. * * 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. */ /* * Bugs & suggestions about this program are welcome: * http://bugzilla.redhat.com/ * * 2003/02/04 * Yukihiro Nakai */ #include #include #include int main() { char** warning = NULL; int res = jrKanjiControl(0, KC_INITIALIZE, (char*)&warning); if( res != 0 ) { exit(-1); } else if( warning ) { exit(-1); } jrKanjiControl(0, KC_FINALIZE, 0); return 0; } --- NEW FILE dot-canna --- ;; Copyright 1992 NEC Corporation, Tokyo, Japan. ;; ;; Permission to use, copy, modify, distribute and sell this software ;; and its documentation for any purpose is hereby granted without ;; fee, provided that the above copyright notice appear in all copies ;; and that both that copyright notice and this permission notice ;; appear in supporting documentation, and that the name of NEC ;; Corporation not be used in advertising or publicity pertaining to ;; distribution of the software without specific, written prior ;; permission. NEC Corporation makes no representations about the ;; suitability of this software for any purpose. It is provided "as ;; is" without express or implied warranty. ;; ;; NEC CORPORATION DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, ;; INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN ;; NO EVENT SHALL NEC CORPORATION BE LIABLE FOR ANY SPECIAL, INDIRECT OR ;; CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF ;; USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR ;; OTHER TORTUOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR ;; PERFORMANCE OF THIS SOFTWARE. ;; $Id: unix.canna,v 1.4 1996/10/25 05:23:02 kon Exp $ ;; ?????????????????????????????? (setq use-symbolic-definition t) ;;; ?????????????????????? ; ; ???????????????????????????????????????????????????????????????? ; (1) ???????????????????? ; (2) ?????????????????? ; (3) /usr/lib/canna/dic ; ?????????????????????? ; ;(setq romkana-table "unix.cbp") (setq romkana-table "default.cbp") ;; ?????????? ;(setq english-table "canna/english.cbp") ;;; ???????????? ; ; ???????????????????????????????????????????????????????????????????? ; ?????????????????? ; ; ?????????????????? :bushu ???????????????????????? ; ; ?????????????????????????????? :user ?????????????????????????????? ; ???????????????????????????????????????????????????????????????????? ; ?????? mkdic user ?????????????????????????????????????????????????? ; ???????? ; (use-dictionary "gcanna" "gcannaf" "chimei" ; "iroha" "fuzokugo" "hojomwd" "hojoswd" "software" "keishiki" "zipcode" "geo" ; "zip99" "basho" "keisan" "pub" "scien" "sup" "bonobo" :bushu "bushu" :user "user" ) ;;; ???????????????????????? ; ; ?????????????????????????????????????????? t ?????????????? nil ???? ; ?????????? ; ???????????????????????????????????????????????? (setq cursor-wrap t) ; default t ; ????????????????????????????????????????????????(nil)?????????????? ; ????????(t) (setq select-direct t) ; default t ; ??????????????????????????(t)??nil?????????????????????????? (setq numerical-key-select t) ; default t ; ???????????????????????????????????????? (setq bunsetsu-kugiri nil) ; default nil ; ????????????????????????(t)?? nil?????????????????????????????????? ; ?????????????????????? (setq character-based-move t) ; default t ; ???????????????????????????????? (setq reverse-widely nil) ; default nil ; ???????????????? (setq gakushu t) ; default t ; ???????????????????????????????????????????? (setq quit-if-end-of-ichiran nil); default nil ; ???????????????????????????????????????????????? (setq kakutei-if-end-of-bunsetsu nil) ; default nil ; ??????????????????????????????(t)??nil?????????????????????????????? ; ???????????????????? (setq stay-after-validate t) ; default t ; ???????????????????????????????????????????????????????????????? (setq break-into-roman t) ; default nil ; ?????????????????????????????????????????????????????????????? ; ???????????????????????????????????? C-w ?????????????????????? ; ???????? (setq n-henkan-for-ichiran 2) ; default 2 ; ??????????????????????????????????(t)??nil?????????????????????????? ; ?????????? (setq gramatical-question t) ; default t ; ???????????????????????????????? (setq kouho-count t) ; default t ; ???????????????? (setq auto nil) ; default nil ; ???????????????????????????????????????????????????? (setq n-kouho-bunsetsu 16) ; default 16 ; ???????????????????????????????????????????????? (setq abandon-illegal-phonogram nil) ; default nil ; ???????????????????????????? (setq allow-next-input t) ; default t ; ???????????????????????????????????????????? (if use-symbolic-definition (progn (defsymbol ?- "??" "-" "??" "??") (defsymbol ?/ "/" "??" "??") (defsymbol ?\\ "\\" "??" "??") (defsymbol ?( "(" "??" "??" ?) ")" "??" "??" ) (defsymbol ?[ "??" "??" "??" "??" "[" ?] "??" "??" "??" "??" "]") (defsymbol ?. "??" "??" "." ?, "??" "??" "," ) (defsymbol ?0 "0" "??" "??" "??" ?1 "1" "??" "??" "??" ?2 "2" "??" "??" "??" ?3 "3" "??" "??" "??" ?4 "4" "??" "??" "??" ?5 "5" "??" "??" "??" ?6 "6" "??" "??" "??" ?7 "7" "??" "??" "??" ?8 "8" "??" "??" "??" ?9 "9" "??" "??" "??" ) (defsymbol ?? "?" "??" ?! "!" "??") (defsymbol ?# "#" "??") (defsymbol ?$ "$" "??") (defsymbol ?% "%" "??") (defsymbol ?& "&" "??") (defsymbol ?+ "+" "??") (defsymbol ?* "*" "??" "??") (defsymbol ?_ "_" "??") (defsymbol ?' "'" "??") (defsymbol ?` "`" "??") (defsymbol ?\" "\"" "??") )) ;; delete ?????????????????????????????????????? (global-set-key "\Delete" 'delete-previous) ; necessary in using Emacs ;; Help ?????????????????? F1 ?????????????????????? (global-set-key "\F1" 'extend-mode) ;; Escape key should escape from the mode. (global-set-key "\Escape" 'quit) ;; Ctrl-o ?????? (global-unbind-key-function 'japanese-mode) skk-dictionaries.patch: --- NEW FILE skk-dictionaries.patch --- diff -uNr Canna35b2/dic/ideo/words/Imakefile Canna35b2.new/dic/ideo/words/Imakefile --- Canna35b2/dic/ideo/words/Imakefile Wed Aug 22 08:44:52 2001 +++ Canna35b2.new/dic/ideo/words/Imakefile Wed Aug 22 08:44:30 2001 @@ -82,6 +82,8 @@ InstallNamedNonExec(kanasmpl.t,kanasmpl.ctd,$(CANNADICDIR)) InstallNamedNonExec(software.t,software.ctd,$(CANNADICDIR)) InstallNamedNonExec(chimei.t,chimei.ctd,$(CANNADICDIR)) +InstallNamedNonExec(zipcode.t,zipcode.ctd,$(CANNADICDIR)) +InstallNamedNonExec(geo.t,geo.ctd,$(CANNADICDIR)) InstallNamedNonExec(hojomwd.t,hojomwd.ctd,$(CANNADICDIR)) InstallNamedNonExec(hojoswd.t,hojoswd.ctd,$(CANNADICDIR)) InstallNamedNonExec(suffix.t,suffix.ctd,$(CANNADICDIR)) @@ -90,6 +92,7 @@ InstallNamedNonExec(keishiki.t,keishiki.ctd,$(CANNADICDIR)) #else TEXTDICS = necgaiji.t kanasmpl.t software.t chimei.t \ + zipcode.t geo.t \ hojomwd.t hojoswd.t suffix.t number.t katakana.t keishiki.t InstallMultipleFlags($(TEXTDICS),$(CANNADICDIR),-m 0664) #endif diff -uNr Canna35b2/dic/ideo/words/dics.dir Canna35b2.new/dic/ideo/words/dics.dir --- Canna35b2/dic/ideo/words/dics.dir Sat Nov 9 11:14:13 1996 +++ Canna35b2.new/dic/ideo/words/dics.dir Wed Aug 22 08:44:30 2001 @@ -38,3 +38,5 @@ kanasmpl.ctd(.mwd) -kanasample--- necgaiji.ctd(.mwd) -necgaiji--- software.ctd(.mwd) -software--- +zipcode.ctd(.mwd) -zipcode--- +geo.ctd(.mwd) -geo--- diff -uNr Canna35b2/dic/ideo/words/geo.t Canna35b2.new/dic/ideo/words/geo.t --- Canna35b2/dic/ideo/words/geo.t Thu Jan 1 09:00:00 1970 +++ Canna35b2.new/dic/ideo/words/geo.t Wed Aug 22 08:44:30 2001 @@ -0,0 +1,68607 @@ +# +# This dictionary was generated from /usr/share/skk/SKK-JISYO.geo by ./Geo.rb +# Date: Wed Aug 22 07:57:49 JST 2001 +# +?????????????? #CN ???????????? +???? #CN ???? ???? +???????? #CN ???? +???????? #CN ???? +???????? #CN ???? +???????? #CN ???? +???????? #CN ???? +?????????? #CNS ?????? +?????????????? #CNS ?????? ?????? +?????????????? #CN ?????? +???????????? #CNS ?????? +???????? #CN ???? +?????????????? #CN ???????? +???????? #CN ???? +???????? #CN ???? +???????????? #CNS ?????? +?????????? #CN ???? +???????? #CN ???? +???????? #CN ???? ???? ???? +???????????? #CN ?????? +?????????????? #CNS ?????? ?????? +???????????? #CNS ?????? ?????? +?????????????????? #CNS ?????????? +???????????? #CNS ?????? +???????????????????? #CN ?????????? +?????????????????? #CN ?????????? +???????????????????? #CN ?????????? +???????????????????????? #CN ???????????? +?????????????????????? #CN ???????????? +?????????????????????? #CN ???????????? +???????????? #CNS ?????? +???????????? #CN ???????? +???????????? #CNS ?????? +???????? #CN ???? +?????????????? #CNS ?????? +???????????????????????? #CNS ???????????? +???????????????????????? #CNS ???????????? +?????????????? #CNS ?????? +?????????????? #CNS ?????? +???????????? #CN ?????? +?????????????? #CN ?????? +?????????? #CN ?????? +???????? #CN ???? +???????? #CN ???? +???????? #CN ???? +?????????????? #CNS ?????? +???????? #CN ???? +???????? #CN ???? +???????? #CN ???? +???????? #CN ???? +???????? #CN ???? +?????????????? #CNS ?????? +???????? #CN ???? +?????????????????? #CNS ???????? +???????? #CN ?????? ???? +???????????????? #CN ???????? +?????? #CN ???? +???????? #CN ???? +?????????????? #CNS ?????? +?????? #CN ???? +???????????????? #CNS ???????? +???????? #CN ???? +???????????????????? #CN ?????????? +?????????????? #CNS ?????? +?????? #CN ???? ???? +???????? #CN ???? +?????????????? #CNS ?????? +???????? #CN ???? +?????? #CN ???? ???? ???? +???????? #CN ???? +?????????????????????? #CNS ???????????? +???????????????????????? #CNS ???????????? +???????????????????????? #CNS ???????????? +?????????????????????????? #CNS ?????????????? +???????????????????????????? #CNS ?????????????? +???????????????????????? #CNS ???????????? +???????????? #CNS ?????? +???????? #CN ???? +?????? #CN ???? +???????????????????????? #CNS ???????????? +???????????????????????? #CNS ?????????????? +???????????? #CNS ?????? +?????? #CN ???? +???????? #CN ???? +???????? #CN ???? +?????????????? #CN ???????? +?????????? #CNS ?????? +?????????????? #CNS ?????? +???????????? #CNS ?????? +?????? #CN ???? ???? +?????????? #CN ???? +???????????? #CNS ?????? +?????? #CN ???? ???? +???????? #CN ???? ???? +?????????????? #CN ?????????? +???????? #CN ???? +?????? #CN ???? +???????? #CN ???? +?????????? #CN ?????? +???????????????? #CNS ?????? +?????????? #CN ?????? +???????? #CN ?????? ???? +???????????? #CN ?????? +???????????????? #CNS ?????????? +???????????? #CNS ?????? +?????????? #CN ???? +?????????? #CN ???? +?????????????? #CN ???????? +?????????????? #CN ???????? +?????????? #CN ?????? +??????????1?????? #CN ???????????? +??????????2?????? #CN ???????????? +??????????3?????? #CN ???????????? +??????????4?????? #CN ???????????? +??????????5?????? #CN ???????????? +?????????? #CN ?????? ?????? +?????????? #CN ???? ?????? ???? +???????? #CN ?????? +?????????? #CN ?????? ???? +???????????? #CNS ?????? +???????????????? #CNS ?????? +???????? #CN ?????? +?????????? #CN ?????? ?????? +?????????? #CNS ?????? +????????????????2???????????? #CN ???????????????? +???????????????????????????????? #CN ?????????????????? +?????????? #CN ?????? +?????????? #CN ???? +???????? #CN ?????? ?????? ?????? +?????????? #CN ?????? +?????????? #CN ?????? +???????????? #CNS ???????? +???????? #CN ???? +???????? #CN ???? +???????? #CN ???? +?????????????? #CN ???????? +?????????????????????? #CN ???????????? +???????????? #CN ?????? +?????????????? #CN ???????? +???????????????? #CN ?????????? +???????????? #CN ?????? +???????????????? #CN ???????? +???????????????? #CN ???????? +?????????????? #CN ???????? +???????????????? #CN ???????? +???????????? #CN ?????? +???????????? #CNS ?????? +?????????????????? #CN ???????? +???????????????? #CN ?????????? +?????????????? #CN ???????? +?????? #CN ???? ???? +?????????? #CN ???? +???????????? #CNS ?????? ?????? +???????????? #CN ?????? +???????? #CN ???? +???????? #CN ???? ???? +???????? #CN ???? +???????????? #CN ?????? +???????????????????????????????????? #CN ?????????????????? +?????????????? #CNS ???????? +???????????? #CNS ???????? +?????? #CN ???? [...185178 lines suppressed...] +9997312 #CN ?????????????????????????? +9997313 #CN ?????????????????????????? +9997314 #CN ???????????????????????? +9997315 #CN ???????????????????????? +9997316 #CN ???????????????????????? +9997461 #CN ?????????????????? +9997462 #CN ?????????????????? +9997463 #CN ???????????????? +9997464 #CN ???????????????? +9997541 #CN ???????????????? +9997542 #CN ???????????????? +9997543 #CN ???????????????? +9997544 #CN ???????????????? +9997545 #CN ???????????????? +9997546 #CN ???????????????? +9997547 #CN ???????????????? +9997600 #CN ???????????????????? +9997601 #CN ???????????????????????? +9997602 #CN ?????????????????????????? +9997604 #CN ???????????????????????? +9997611 #CN ?????????????????????????? +9997621 #CN ???????????????????????? +9997622 #CN ???????????????????????? +9997631 #CN ?????????????????????????? +9997632 #CN ?????????????????????????? +9997633 #CN ???????????????????????? +9997634 #CN ???????????????????????? +9997635 #CN ???????????????????????????? +9997636 #CN ?????????????????????????? +9997637 #CN ???????????????????????????? +9997638 #CN ???????????????????????? +9997641 #CN ?????????????????????? +9997642 #CN ???????????????????????? +9997643 #CN ???????????????????????? +9997644 #CN ???????????????????????? +9997645 #CN ???????????????????????? +9997646 #CN ???????????????????????? +9997651 #CN ???????????????????????? +9997652 #CN ???????????????????????? +9997653 #CN ?????????????????????????? +9997661 #CN ?????????????????????????? +9997662 #CN ???????????????????????????? +9997663 #CN ???????????????????????????? +9997664 #CN ???????????????????????????? +9997671 #CN ???????????????????????? +9997672 #CN ?????????????????????????? +9997673 #CN ???????????????????????? +9997674 #CN ???????????????????????????? +9997675 #CN ???????????????????????? +9997676 #CN ?????????????????????????? +9997677 #CN ?????????????????????????? +9997681 #CN ???????????????????????? +9997682 #CN ?????????????????????????? +9997683 #CN ???????????????????????? +9997684 #CN ?????????????????????????? +9997685 #CN ???????????????????????? +9997700 #CN ???????????????????? +9997701 #CN ?????????????????????? +9997702 #CN ???????????????????????? +9997703 #CN ???????????????????????? +9997704 #CN ?????????????????????????? +9997705 #CN ???????????????????????? +9997706 #CN ?????????????????????????? +9997707 #CN ?????????????????????????? +9997711 #CN ???????????????????????? +9997712 #CN ???????????????????????? +9997713 #CN ???????????????????????? +9997714 #CN ???????????????????????????? +9997715 #CN ???????????????????????? +9997721 #CN ?????????????????????????? +9997722 #CN ???????????????????????????? +9997723 #CN ???????????????????????? +9997724 #CN ???????????????????????????? +9997725 #CN ?????????????????????????? +9997726 #CN ???????????????????????? +9997727 #CN ???????????????????????? +9997731 #CN ???????????????????????????? +9997732 #CN ???????????????????????????? +9997733 #CN ?????????????????????????? +9997734 #CN ???????????????????????? +9997735 #CN ???????????????????????????? +9997736 #CN ???????????????????????? +9997737 #CN ?????????????????????????? +9997741 #CN ???????????????????????? +9997742 #CN ???????????????????????? +9997743 #CN ?????????????????????????? +9997744 #CN ???????????????????????????? +9997745 #CN ?????????????????????????? +9997746 #CN ???????????????????????? +9997747 #CN ???????????????????????? +9997748 #CN ???????????????????????? +9997749 #CN ???????????????????????? +9997751 #CN ???????????????????????????? +9997752 #CN ???????????????????????????? +9997753 #CN ???????????????????????? +9997754 #CN ???????????????????????? +9997755 #CN ???????????????????????? +9997756 #CN ?????????????????????????? +9997757 #CN ???????????????????????? +9997761 #CN ?????????????????????????? +9997762 #CN ?????????????????????????? +9997763 #CN ???????????????????????? +9997764 #CN ?????????????????????????? +9997765 #CN ???????????????????????? +9997766 #CN ???????????????????????? +9997767 #CN ???????????????????????? +9997768 #CN ???????????????????????? +9997771 #CN ?????????????? +9997772 #CN ???????????????? +9997773 #CN ???????????????? +9997774 #CN ???????????????? +9997775 #CN ?????????????????? +9997776 #CN ???????????????? +9997777 #CN ???????????????? +9997781 #CN ???????????????????????? +9998131 #CN ???????????????? ???????????????????? +9998132 #CN ???????????????? +9998133 #CN ?????????????????? +9998134 #CN ???????????????? +9998141 #CN ???????????????? +9998142 #CN ???????????????? +9998143 #CN ???????????????? +9998144 #CN ???????????????? +9998145 #CN ???????????????? +9998151 #CN ???????????????? +9998152 #CN ?????????????????? +9998153 #CN ?????????????????? +9998154 #CN ?????????????????? +9998155 #CN ?????????????????? +9998156 #CN ?????????????????? +9998157 #CN ?????????????????? +9998158 #CN ???????????????? +9998161 #CN ???????????????? +9998162 #CN ???????????????????? +9998163 #CN ?????????????????? +9998164 #CN ?????????????????? +9998165 #CN ???????????????????? +9998166 #CN ?????????????????? +9998167 #CN ???????????????????? +9998168 #CN ???????????????? +9998200 #CN ?????????????????? +9998201 #CN ?????????????????????? +9998202 #CN ?????????????????????? +9998203 #CN ?????????????????????? +9998204 #CN ?????????????????????? +9998205 #CN ???????????????????????? +9998206 #CN ???????????????????????? +9998207 #CN ?????????????????????? +9998211 #CN ???????????????????????? +9998212 #CN ???????????????????????? +9998213 #CN ???????????????????????? +9998214 #CN ???????????????????????? +9998215 #CN ?????????????????????? +9998221 #CN ?????????????????????? +9998222 #CN ???????????????????????? +9998223 #CN ???????????????????????? +9998224 #CN ?????????????????????? +9998225 #CN ???????????????????????? +9998226 #CN ?????????????????????? +9998227 #CN ???????????????????????? +9998231 #CN ???????????????????? +9998232 #CN ?????????????????????? +9998233 #CN ???????????????????????? +9998234 #CN ?????????????????????? +9998235 #CN ???????????????????????? +9998241 #CN ?????????????????????? +9998242 #CN ?????????????????????? +9998243 #CN ???????????????????????? +9998244 #CN ???????????????????????? +9998245 #CN ?????????????????????? +9998246 #CN ?????????????????????? +9998300 #CN ?????????????????? +9998301 #CN ???????????????????????? +9998302 #CN ?????????????????????? +9998303 #CN ?????????????????????? +9998304 #CN ?????????????????????????? +9998311 #CN ???????????????????????? +9998312 #CN ???????????????????????? +9998313 #CN ?????????????????????? +9998314 #CN ???????????????????????? +9998315 #CN ???????????????????????? +9998316 #CN ?????????????????????? +9998317 #CN ?????????????????????? +9998421 #CN ???????????????? +9998422 #CN ?????????????????? +9998423 #CN ???????????????? +9998431 #CN ?????????????????????? ???????????????????????????? +9998432 #CN ?????????????????????? +9998433 #CN ?????????????????????? +9998434 #CN ?????????????????????? +9998435 #CN ?????????????????????? +9998436 #CN ?????????????????????? +9998437 #CN ?????????????????????? +9998438 #CN ?????????????????????? +9998521 #CN ?????????????????????? +9998522 #CN ?????????????????????? +9998523 #CN ?????????????????????? +9998524 #CN ?????????????????????? +9998525 #CN ?????????????????????? +9998531 #CN ?????????????????????? Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/Canna/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 26 Sep 2005 09:21:11 -0000 1.1 +++ .cvsignore 26 Sep 2005 09:29:14 -0000 1.2 @@ -0,0 +1,5 @@ +Canna37p3.tar.bz2 +cannadic-0.95c.tar.gz +pubdic-bonobo-20021028.tar.bz2 +shion.tar.gz +zipcode-20030204.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/Canna/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 26 Sep 2005 09:21:11 -0000 1.1 +++ sources 26 Sep 2005 09:29:14 -0000 1.2 @@ -0,0 +1,5 @@ +0b8c241f63ab4cd3c0b9be569456dc33 Canna37p3.tar.bz2 +2a7fc1be5a50e0ca5dd6e5721be4371a cannadic-0.95c.tar.gz +1c89701cc7a274068c3b265e2aa36ac2 pubdic-bonobo-20021028.tar.bz2 +9df0656abbcfdcc2001071805d23229b shion.tar.gz +d6287eb37f8b9151fa38cc2684952177 zipcode-20030204.tar.bz2 From fedora-extras-commits at redhat.com Mon Sep 26 09:39:54 2005 From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh)) Date: Mon, 26 Sep 2005 05:39:54 -0400 Subject: rpms/Canna/devel Canna.spec,1.1,1.2 Message-ID: <200509260939.j8Q9dsFv003851@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/extras/rpms/Canna/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3832 Modified Files: Canna.spec Log Message: * Mon Sep 26 2005 Akira TAGOH - 3.7p3-14 - Imported into Extras. Index: Canna.spec =================================================================== RCS file: /cvs/extras/rpms/Canna/devel/Canna.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- Canna.spec 26 Sep 2005 09:29:14 -0000 1.1 +++ Canna.spec 26 Sep 2005 09:39:52 -0000 1.2 @@ -6,7 +6,7 @@ Summary: A Japanese character set input system. Name: Canna Version: 3.7p3 -Release: 13 +Release: 14%{?dist} License: Distributable Group: System Environment/Libraries URL: http://www.nec.co.jp/japanese/product/computer/soft/canna/ @@ -324,6 +324,9 @@ %{_libdir}/libcanna16.so.* %changelog +* Mon Sep 26 2005 Akira TAGOH - 3.7p3-14 +- Imported into Extras. + * Mon Mar 7 2005 Akira TAGOH - 3.7p3-13 - stop to sort the words on some dictionaries during making the binary dictionaries. From fedora-extras-commits at redhat.com Mon Sep 26 09:42:35 2005 From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh)) Date: Mon, 26 Sep 2005 05:42:35 -0400 Subject: owners owners.list,1.249,1.250 Message-ID: <200509260942.j8Q9gZvu003910@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3891 Modified Files: owners.list Log Message: added Canna owner Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.249 retrieving revision 1.250 diff -u -r1.249 -r1.250 --- owners.list 25 Sep 2005 21:49:57 -0000 1.249 +++ owners.list 26 Sep 2005 09:42:33 -0000 1.250 @@ -70,6 +70,7 @@ Fedora Extras|cabextract|A Microsoft Cabinet file extractor|ville.skytta at iki.fi|extras-qa at fedoraproject.org| Fedora Extras|camE|Rewrite of the xawtv webcam app, which adds imlib2 support|matthias at rpmforge.net|extras-qa at fedoraproject.org| Fedora Extras|camstream|CamStream - a set of programs to make use of your webcam|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| +Fedora Extras|Canna|A Japanese character set input system|tagoh at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|c-ares|A library that performs asynchronous DNS operations|tcallawa at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|ccache|Compiler cache|wtogami at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|ccid|Generic USB CCID smart card reader driver|ville.skytta at iki.fi|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Mon Sep 26 10:07:24 2005 From: fedora-extras-commits at redhat.com (Marc Maurer (uwog)) Date: Mon, 26 Sep 2005 06:07:24 -0400 Subject: rpms/link-grammar/FC-4 link-grammar.spec,1.3,1.4 Message-ID: <200509261007.j8QA7uQ1005334@cvs-int.fedora.redhat.com> Author: uwog Update of /cvs/extras/rpms/link-grammar/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5311 Modified Files: link-grammar.spec Log Message: Escape the dist macro in the changelog Index: link-grammar.spec =================================================================== RCS file: /cvs/extras/rpms/link-grammar/FC-4/link-grammar.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- link-grammar.spec 25 Sep 2005 21:54:48 -0000 1.3 +++ link-grammar.spec 26 Sep 2005 10:07:17 -0000 1.4 @@ -1,7 +1,7 @@ Summary: A Grammar Checking library Name: link-grammar Version: 4.1.3 -Release: 2%{?dist} +Release: 3%{?dist} Group: System Environment/Libraries License: BSD-style Source: http://www.abisource.com/downloads/link-grammar/%{version}/link-grammar-%{version}.tar.gz @@ -55,8 +55,11 @@ rm -r $RPM_BUILD_ROOT %changelog +* Mon Sep 25 2005 Marc Maurer - 4.1.3-3.fc4 +- Escape the dist macro in the changelog + * Sun Sep 25 2005 Marc Maurer - 4.1.3-2.fc4 -- Add %{?dist} to the release field, not the version field +- Add %%{?dist} to the release field, not the version field * Sun Sep 25 2005 Marc Maurer - 4.1.3-1.fc4 -- Initial release for FC4 \ No newline at end of file +- Initial release for FC4 From fedora-extras-commits at redhat.com Mon Sep 26 10:27:19 2005 From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc)) Date: Mon, 26 Sep 2005 06:27:19 -0400 Subject: rpms/nail - New directory Message-ID: <200509261027.j8QARJP8005516@cvs-int.fedora.redhat.com> Author: buc Update of /cvs/extras/rpms/nail In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5492/nail Log Message: Directory /cvs/extras/rpms/nail added to the repository From fedora-extras-commits at redhat.com Mon Sep 26 10:27:19 2005 From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc)) Date: Mon, 26 Sep 2005 06:27:19 -0400 Subject: rpms/nail/devel - New directory Message-ID: <200509261027.j8QARJ1j005521@cvs-int.fedora.redhat.com> Author: buc Update of /cvs/extras/rpms/nail/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5492/nail/devel Log Message: Directory /cvs/extras/rpms/nail/devel added to the repository From fedora-extras-commits at redhat.com Mon Sep 26 10:27:42 2005 From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc)) Date: Mon, 26 Sep 2005 06:27:42 -0400 Subject: rpms/nail Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200509261027.j8QARg1t005572@cvs-int.fedora.redhat.com> Author: buc Update of /cvs/extras/rpms/nail In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5537 Added Files: Makefile import.log Log Message: Setup of module nail --- NEW FILE Makefile --- # Top level Makefile for module nail all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Mon Sep 26 10:27:42 2005 From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc)) Date: Mon, 26 Sep 2005 06:27:42 -0400 Subject: rpms/nail/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200509261027.j8QARg8L005577@cvs-int.fedora.redhat.com> Author: buc Update of /cvs/extras/rpms/nail/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5537/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module nail --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Mon Sep 26 10:28:38 2005 From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc)) Date: Mon, 26 Sep 2005 06:28:38 -0400 Subject: rpms/nail import.log,1.1,1.2 Message-ID: <200509261028.j8QAScWw005660@cvs-int.fedora.redhat.com> Author: buc Update of /cvs/extras/rpms/nail In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5623 Modified Files: import.log Log Message: auto-import nail-11.25-3 on branch devel from nail-11.25-3.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/nail/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 26 Sep 2005 10:27:40 -0000 1.1 +++ import.log 26 Sep 2005 10:28:35 -0000 1.2 @@ -0,0 +1 @@ +nail-11_25-3:HEAD:nail-11.25-3.src.rpm:1127730503 From fedora-extras-commits at redhat.com Mon Sep 26 10:28:38 2005 From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc)) Date: Mon, 26 Sep 2005 06:28:38 -0400 Subject: rpms/nail/devel nail-11.25-config.patch, NONE, 1.1 nail.html, NONE, 1.1 nail.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200509261028.j8QAScrA005667@cvs-int.fedora.redhat.com> Author: buc Update of /cvs/extras/rpms/nail/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5623/devel Modified Files: .cvsignore sources Added Files: nail-11.25-config.patch nail.html nail.spec Log Message: auto-import nail-11.25-3 on branch devel from nail-11.25-3.src.rpm nail-11.25-config.patch: --- NEW FILE nail-11.25-config.patch --- diff -Nrbu nail-11.25/nail.rc nail-11.25-OK/nail.rc --- nail-11.25/nail.rc 2005-01-15 17:33:16.000000000 +0300 +++ nail-11.25-OK/nail.rc 2005-08-19 16:55:09.000000000 +0400 @@ -60,3 +60,7 @@ # Only include selected header fields when forwarding messages. fwdretain subject date from to + +# For Linux and BSD, this should be set. +set bsdcompat + --- NEW FILE nail.html --- nail, an enhanced mailx command

        nail, an enhanced mailx command

        Nail is a mail user agent for Unix systems. Highlights are:

        • Derived from Berkeley Mail 8.1. An interface like the original Berkeley one is still optionally available.
        • Is a free implementation of the System V mailx command and features an interface like that by default.
        • Is intended to comply to the mailx command specifications of IEEE Std 1003.2-1992 (POSIX.2) and IEEE Std 1003.1-2004 with XSI extensions (SUSv3).
        • Supports the MIME specifications. Nail can send and receive attachments and code and decode international character strings. If the system libraries provide appropriate support, conversion between different character encodings is performed. In combination with a UTF-8 terminal, nearly all international languages are supported. External converter programs can be automatically invoked e. g. to view messages in HTML format.
        • Supports IMAP. In combination with either OpenSSL or Mozilla NSS, IMAPS can also be used. With IMAP, folder hierarchies can be stored and managed on remote servers. This is particularly useful for people who use more than one computer to access their mail. Of course, it is also possible to use IMAP just for fetching mails and storing them locally.
        • Supports caching and disconnected operation of IMAP folders. This speeds up operation while in online mode. It also makes it possible to transparently view and edit IMAP mailboxes without an active connection to the server.
        • Supports POP3 to read messages on a remove server. In combination with OpenSSL or NSS, POP3S can also be used. Nail can read and delete individual messages, thus POP3 accounts can almost be accessed like local mail folders.
        • Supports SMTP to send messages directly to a remote server. A local sendmail interface setup is thus not necessary. In combination with OpenSSL or NSS, both the STARTTLS method and SMTPS can be used. SMTP AUTH is also supported.
        • Supports S/MIME for signed and encrypted email (in combination with OpenSSL or NSS).
        • In combination with NSS, certificates for S/MIME and SSL/TLS can be shared with Mozilla applications, and can be managed using them.
        • Can display message threads and supports operations on them. This is especially useful for handling mailing lists. It is also possible to sort messages by various other criteria.
        • Provides a Bayesian junk mail filter mostly according to Paul Graham's article “Better Bayesian Filtering”. Chained tokens according to Jonathan A. Zdziarski's “Advanced Language Classification using Chained Tokens” can optionally be used.
        • Features a lot of detail improvements over Mail/mailx, such as IMAP-style search methods and flags for any types of folders, killing and scoring of messages, maildir folder support, an option to set the From: address directly, and the generation of References: header fields to avoid annoyances on mailing lists.
        • Can be used as a mail batch language in nearly the same way as it is used interactively. So it is possible to use nail as a mailbox filter, for fetching mails, or for sending files as attachments.
        • Is extensively described in its manual page nail(1), which provides both introductory material and complete reference documentation.

        For installation instructions, see the README.

        The ChangeLog keeps track of modifications.

        New releases of this project are announced on freshmeat.net. You can use their subscription service to get an email when a new version is available.

        Nail development is discussed on the nail-devel mailing list. All people interested in discussing or coding features for future releases are invited to participate. Bug reports should also be sent to the list. To subscribe to the list or look at the archives, visit <https://lists.sourceforge.net/lists/listinfo/nail-devel>. If you do not want to subscribe, you can directly mail to the list using the address <nail-devel at lists.sourceforge.net>.

        Download the source code

        Release 11.25 (current)

        All releases

        Browse the CVS repository

        The most recent results of development are sometimes made available in the public CVS repository. Use 

        $ cvs -d:pserver:anonymous at cvs.sourceforge.net:/cvsroot/nail login
CVS password:<just type return>
$ cvs -d:pserver:anonymous at cvs.sourceforge.net:/cvsroot/nail co nail
        to retrieve a copy. Follow these instructions for more information. If you want to report a problem, please look at the ChangeLog in CVS to see if it has already been resolved, and if so, try if the fix works for you. Do not use the code from CVS unless you have a special reason to do so. It may be incorrect, not well tested, and might not even compile.

        mail, Mail, mailx, nail - history notes

        There has since long been confusion about the names of mail commands on Unix systems. Here is some clarification:

        The most ancient command is mail, which was included in Unix 1st Edition in 1971 according to the manuals. At this time, Unix had no remote communication facility at all, so mail would simply write to other users' files on a single machine.

        mail has since been updated a bit in following Unix versions; it could invoke uux and later sendmail for sending remote messages and got at least some interactive commands for navigating in a mailbox. A mail command like this was standardized with the System V Interface Definition (SVID) and the Single Unix Specification (up to the 1998 edition).

        With later versions of System V, mail still got some more features, e. g. a facility to print header summaries. An Open Source version of such a mail command is available from the Heirloom Project; see its manual page for an overview of its features. Yet all derivatives of the original mail remained somewhat primitive; since they neither invoke a pager for viewing messages longer than a CRT screen, nor offer a method to set Subject lines, they are not well suited for use with Internet mail. They are still appropriate to send short messages, though.

        What one should learn from this is, however, that any use of a mail command with the -s option to set a subject line in a shell script is unportable and will not work on some Unix implementations.

        In 1978, Kurt Shoens wrote another mail user agent for Unix: Berkeley Mail. It was not a derivative of the original mail command. At the time it was included in the 2BSD release (which still was just an add-on for Unix 6th or 7th Edition systems), its user interface was already complete (so if the bsdcompat option is set in nail, it practically looks and feels the same). After installation, Berkeley Mail was found as /usr/ucb/Mail, but Unix mail was still available as /bin/mail.

        Confusion really began with the 3BSD release (a complete system, not an add-on), as it also provided a /usr/ucb/mail command which was just a link to Mail. So, depending on the PATH setting, typing mail could either invoke Unix mail or Berkeley Mail. This remained the same with all Berkeley releases up to 4.3BSD-Tahoe and derivatives; in the end, Unix mail was removed entirely, but the name remained as a link to Mail in all places.

        For System V Release 3, a derivative of Berkeley Mail was created: mailx. It remained mostly compatible with Mail, but there were some add-ons and the user interface was slightly changed (nail uses a similar interface if none of the bsd... compatibility variables is set).

        This System V mailx command was then also standardized with POSIX.2 in 1992, including many of the extensions.

        Linux distributions made the situation even more confusing. They could only use the original Berkeley Mail (System V mailx was closed source until the OpenSolaris release in 2005). Yet because Mail and mailx were sufficiently similar for most applications, it seemed appropriate for many to also feature a mailx command which was just Mail, thus not sufficient for formal POSIX.2 conformance. Most distributions also made mail invoke Mail, since Unix mail was also closed source until January 2002.

        To complete the confusion, some commercial Unix vendors dropped support for the original mail over the time and made it invoke mailx.

        nail is derived from Berkeley Mail. It got its name because the m and n keys are located next to one another on the keyboard, and the resulting word was easy to remember. Since version 10, nail also features independent implementations of the System V and POSIX mailx additions.

        Thus it is appropriate to call nail as mailx. If it is called as Mail, a short shell script should be created which sets the bsdcompat variable before invoking nail. mail however is an entirely different command and should be taken from the Heirloom Toolchest if an Open Source version is desired.

        Portable scripts should either invoke mail without any options or should use the standardized mailx interface. In any case, they should set the MAILRC variable to /dev/null to bypass the user's configuration. As this variable is present in mailx, but not in Mail, using Mail for scripts does not work reliably anyway and should be avoided. (In effect, this means that there is no reliable way to send mail from a script on many BSD derivatives and Linux distributions. But that is a fact one has to live with.)

        Gunnar Ritter <gunnarr at acm.org> 2005-07-29

        More software by Gunnar Ritter

        SourceForge.net Logo --- NEW FILE nail.spec --- %define use_nss 0 Summary: Enhanced implementation of the mailx command Name: nail Version: 11.25 Release: 3%{?dist} Group: Applications/Internet License: BSD URL: http://nail.sourceforge.net Source0: http://surfnet.dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.bz2 # Note: it is just "lynx -source http://nail.sourceforge.net > nail.html" Source1: nail.html BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Patch0: nail-11.25-config.patch %if %{use_nss} BuildRequires: mozilla-nss-devel, mozilla-nspr-devel, pkgconfig %else BuildRequires: krb5-devel, openssl-devel %endif %description Nail is an enhanced mail command, which provides the functionality of the POSIX mailx command. It is derived from Berkeley Mail. Additionally to the POSIX features, nail can work with Maildir/ e-mail storage format (as well as mailboxes), supports IMAP, POP3 and SMTP procotols (including over SSL) to operate with remote hosts, handles mime types and different charsets. There are a lot of other useful features, see %{name}.html in the documentation. And as its ancient analogues, nail can be used as a mail script language, both for sending and receiving mail. %prep %setup -q %patch0 -p1 cp %{SOURCE1} %{name}.html %build rm -rf $RPM_BUILD_ROOT %if %{use_nss} INCLUDES="$INCLUDES `pkg-config --cflags-only-I mozilla-nspr`" INCLUDES="$INCLUDES `pkg-config --cflags-only-I mozilla-nss`" export INCLUDES %endif echo PREFIX=%{_prefix} \ BINDIR=%{_bindir} \ MANDIR=%{_mandir} \ SYSCONFDIR=%{_sysconfdir} \ MAILRC=%{_sysconfdir}/nail.rc \ MAILSPOOL=%{_localstatedir}/mail \ SENDMAIL=%{_sbindir}/sendmail \ UCBINSTALL=install \ > makeflags make %{?_smp_mflags} `cat makeflags` CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE" %install make DESTDIR=$RPM_BUILD_ROOT `cat makeflags` install %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) %doc COPYING AUTHORS README %{name}.html %config(noreplace) %{_sysconfdir}/nail.rc %{_bindir}/nail %{_mandir}/man1/nail* %changelog * Mon Sep 26 2005 Dmitry Butskoy - 11.25-3 - more spec file cleanups - accepted for Fedora Extra (review by Aurelien Bompard ) * Mon Aug 22 2005 Dmitry Butskoy - 11.25-2 - spec file cleanups (#166343) * Fri Aug 19 2005 Dmitry Butskoy - 11.25-1 - initial release - add "set bsdcompat" to nail.rc as default - copy nail web page to doc Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/nail/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 26 Sep 2005 10:27:40 -0000 1.1 +++ .cvsignore 26 Sep 2005 10:28:36 -0000 1.2 @@ -0,0 +1 @@ +nail-11.25.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/nail/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 26 Sep 2005 10:27:40 -0000 1.1 +++ sources 26 Sep 2005 10:28:36 -0000 1.2 @@ -0,0 +1 @@ +54f42db31911d734fcf37a89b72d4df7 nail-11.25.tar.bz2 From fedora-extras-commits at redhat.com Mon Sep 26 10:34:55 2005 From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc)) Date: Mon, 26 Sep 2005 06:34:55 -0400 Subject: owners owners.list,1.250,1.251 Message-ID: <200509261034.j8QAYtQs005773@cvs-int.fedora.redhat.com> Author: buc Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5754 Modified Files: owners.list Log Message: Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.250 retrieving revision 1.251 diff -u -r1.250 -r1.251 --- owners.list 26 Sep 2005 09:42:33 -0000 1.250 +++ owners.list 26 Sep 2005 10:34:53 -0000 1.251 @@ -516,6 +516,7 @@ Fedora Extras|most|more, less, most|adrian at lisas.de|extras-qa at fedoraproject.org| Fedora Extras|mpc|Command-line client for MPD|gauret at free.fr|extras-qa at fedoraproject.org| Fedora Extras|nabi|Simple Hangul X Input Method|djoo at redhat.com|extras-qa at fedoraproject.org|wtogami at redhat.com +Fedora Extras|nail|Enhanced implementation of the mailx command|dmitry at butskoy.name|extras-qa at fedoraproject.org| Fedora Extras|naim|An ncurses-based console AIM, ICQ, IRC, and Lily client|lmacken at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|namazu|A full-text search engine|tagoh at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|nautilus-open-terminal|Nautilus extension for an open terminal shortcut|stickster at gmail.com|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Mon Sep 26 10:45:36 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Mon, 26 Sep 2005 06:45:36 -0400 Subject: rpms/wmCalClock - New directory Message-ID: <200509261045.j8QAjaYY005914@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/wmCalClock In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5890/wmCalClock Log Message: Directory /cvs/extras/rpms/wmCalClock added to the repository From fedora-extras-commits at redhat.com Mon Sep 26 10:45:37 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Mon, 26 Sep 2005 06:45:37 -0400 Subject: rpms/wmCalClock/devel - New directory Message-ID: <200509261045.j8QAjbA3005919@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/wmCalClock/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5890/wmCalClock/devel Log Message: Directory /cvs/extras/rpms/wmCalClock/devel added to the repository From fedora-extras-commits at redhat.com Mon Sep 26 10:45:53 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Mon, 26 Sep 2005 06:45:53 -0400 Subject: rpms/wmCalClock Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200509261045.j8QAjrKT005964@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/wmCalClock In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5935 Added Files: Makefile import.log Log Message: Setup of module wmCalClock --- NEW FILE Makefile --- # Top level Makefile for module wmCalClock all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Mon Sep 26 10:45:53 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Mon, 26 Sep 2005 06:45:53 -0400 Subject: rpms/wmCalClock/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200509261045.j8QAjrT3005967@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/wmCalClock/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5935/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module wmCalClock --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Mon Sep 26 10:46:33 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Mon, 26 Sep 2005 06:46:33 -0400 Subject: rpms/wmCalClock import.log,1.1,1.2 Message-ID: <200509261046.j8QAkXhd006038@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/wmCalClock In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6003 Modified Files: import.log Log Message: auto-import wmCalClock-1.25-2 on branch devel from wmCalClock-1.25-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/wmCalClock/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 26 Sep 2005 10:45:51 -0000 1.1 +++ import.log 26 Sep 2005 10:46:31 -0000 1.2 @@ -0,0 +1 @@ +wmCalClock-1_25-2:HEAD:wmCalClock-1.25-2.src.rpm:1127731583 From fedora-extras-commits at redhat.com Mon Sep 26 10:46:34 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Mon, 26 Sep 2005 06:46:34 -0400 Subject: rpms/wmCalClock/devel wmCalClock.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200509261046.j8QAkY5g006045@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/wmCalClock/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6003/devel Modified Files: .cvsignore sources Added Files: wmCalClock.spec Log Message: auto-import wmCalClock-1.25-2 on branch devel from wmCalClock-1.25-2.src.rpm --- NEW FILE wmCalClock.spec --- Name: wmCalClock Version: 1.25 Release: 2 Summary: A Calendar clock with antialiased text Group: User Interface/X License: GPL URL: http://www.dockapps.org/file.php/id/9 Source0: http://www.dockapps.org/download.php/id/16/wmCalClock-1.25.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: xorg-x11-devel %description %{summary} %prep %setup -q %build cd Src make CFLAGS="${RPM_OPT_FLAGS}" %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT %{__mkdir_p} ${RPM_BUILD_ROOT}%{_bindir} %{__mkdir_p} ${RPM_BUILD_ROOT}%{_mandir} %{__install} -p %{_builddir}/%{name}-%{version}/Src/wmCalClock \ ${RPM_BUILD_ROOT}%{_bindir} %{__install} -p -m644 %{_builddir}/%{name}-%{version}/Src/wmCalClock.1 \ ${RPM_BUILD_ROOT}%{_mandir} %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc BUGS CHANGES COPYING HINTS README TODO %{_bindir}/wmCalClock %{_mandir}/wmCalClock.1 %changelog * Mon Sep 26 2005 Andreas Bierfert 1.25-2 - add -p and to install - man page should be 644 * Fri Jun 03 2005 Andreas Bierfert 1.25-1 - Initial Release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/wmCalClock/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 26 Sep 2005 10:45:51 -0000 1.1 +++ .cvsignore 26 Sep 2005 10:46:32 -0000 1.2 @@ -0,0 +1 @@ +wmCalClock-1.25.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/wmCalClock/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 26 Sep 2005 10:45:51 -0000 1.1 +++ sources 26 Sep 2005 10:46:32 -0000 1.2 @@ -0,0 +1 @@ +70c47ec1d8f8ec7e3ed7eb2d3105d371 wmCalClock-1.25.tar.gz From fedora-extras-commits at redhat.com Mon Sep 26 10:53:31 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Mon, 26 Sep 2005 06:53:31 -0400 Subject: rpms/wmCalClock/devel wmCalClock.spec,1.1,1.2 Message-ID: <200509261053.j8QArVpx006103@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/wmCalClock/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6084 Modified Files: wmCalClock.spec Log Message: - add dist Index: wmCalClock.spec =================================================================== RCS file: /cvs/extras/rpms/wmCalClock/devel/wmCalClock.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- wmCalClock.spec 26 Sep 2005 10:46:32 -0000 1.1 +++ wmCalClock.spec 26 Sep 2005 10:53:29 -0000 1.2 @@ -1,6 +1,6 @@ Name: wmCalClock Version: 1.25 -Release: 2 +Release: 3%{?dist} Summary: A Calendar clock with antialiased text Group: User Interface/X @@ -45,6 +45,10 @@ %changelog * Mon Sep 26 2005 Andreas Bierfert +1.25-3 +- add dist + +* Mon Sep 26 2005 Andreas Bierfert 1.25-2 - add -p and to install - man page should be 644 From fedora-extras-commits at redhat.com Mon Sep 26 11:11:55 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Mon, 26 Sep 2005 07:11:55 -0400 Subject: rpms/wmCalClock/devel wmCalClock.spec,1.2,1.3 Message-ID: <200509261111.j8QBBtAn007546@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/wmCalClock/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7527 Modified Files: wmCalClock.spec Log Message: - try to fix x86_64 build (libdir) Index: wmCalClock.spec =================================================================== RCS file: /cvs/extras/rpms/wmCalClock/devel/wmCalClock.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- wmCalClock.spec 26 Sep 2005 10:53:29 -0000 1.2 +++ wmCalClock.spec 26 Sep 2005 11:11:53 -0000 1.3 @@ -1,6 +1,6 @@ Name: wmCalClock Version: 1.25 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A Calendar clock with antialiased text Group: User Interface/X @@ -20,9 +20,8 @@ %build cd Src -make CFLAGS="${RPM_OPT_FLAGS}" %{?_smp_mflags} - - +make CFLAGS="${RPM_OPT_FLAGS}" LIBDIR="-L%{_usr}/X11R6/%{_lib}" %{?_smp_mflags} + %install rm -rf $RPM_BUILD_ROOT @@ -45,6 +44,10 @@ %changelog * Mon Sep 26 2005 Andreas Bierfert +1.25-4 +- try to fix x86_64 build (libdir) + +* Mon Sep 26 2005 Andreas Bierfert 1.25-3 - add dist From fedora-extras-commits at redhat.com Mon Sep 26 11:40:18 2005 From: fedora-extras-commits at redhat.com (Marc Maurer (uwog)) Date: Mon, 26 Sep 2005 07:40:18 -0400 Subject: rpms/gtkmathview/FC-4 gtkmathview.spec,1.5,1.6 Message-ID: <200509261140.j8QBeI6X007629@cvs-int.fedora.redhat.com> Author: uwog Update of /cvs/extras/rpms/gtkmathview/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7610 Modified Files: gtkmathview.spec Log Message: Escape the dist macro in the changelog Index: gtkmathview.spec =================================================================== RCS file: /cvs/extras/rpms/gtkmathview/FC-4/gtkmathview.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- gtkmathview.spec 25 Sep 2005 21:56:53 -0000 1.5 +++ gtkmathview.spec 26 Sep 2005 11:40:16 -0000 1.6 @@ -1,7 +1,7 @@ Summary: A MathML rendering library Name: gtkmathview Version: 0.7.5 -Release: 2%{?dist} +Release: 3%{?dist} Group: System Environment/Libraries License: GPL Source: http://helm.cs.unibo.it/mml-widget/sources/gtkmathview-%{version}.tar.gz @@ -75,8 +75,11 @@ rm -r $RPM_BUILD_ROOT %changelog +* Mon Sep 25 2005 Marc Maurer - 0.7.5-3.fc4 +- Escape the dist macro in the changelog + * Sun Sep 25 2005 Marc Maurer - 0.7.5-2.fc4 -- Add %{?dist} to the release field, not the version field +- Add %%{?dist} to the release field, not the version field * Sun Sep 25 2005 Marc Maurer - 0.7.5-1.fc4 - Initial release into FC-4 From fedora-extras-commits at redhat.com Mon Sep 26 11:43:09 2005 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Mon, 26 Sep 2005 07:43:09 -0400 Subject: rpms/libcdio/FC-4 libcdio.spec,1.12,1.13 sources,1.6,1.7 Message-ID: <200509261143.j8QBh9KJ007696@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/rpms/libcdio/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7675 Modified Files: libcdio.spec sources Log Message: * Mon Sep 26 2005 Adrian Reber - 0.76-1 - Updated to 0.76. - Included doxygen generated documentation into -devel - Included examples into -devel Index: libcdio.spec =================================================================== RCS file: /cvs/extras/rpms/libcdio/FC-4/libcdio.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- libcdio.spec 23 Aug 2005 15:13:08 -0000 1.12 +++ libcdio.spec 26 Sep 2005 11:43:07 -0000 1.13 @@ -1,17 +1,17 @@ Name: libcdio -Version: 0.75 -Release: 3%{?dist} +Version: 0.76 +Release: 1%{?dist} Summary: CD-ROM input and control library Group: Applications/Multimedia License: GPL URL: http://www.gnu.org/software/libcdio/ -Source0: http://ftp.gnu.org/gnu/libcdio/libcdio-0.75.tar.gz -Source1: http://ftp.gnu.org/gnu/libcdio/libcdio-0.75.tar.gz.sig +Source0: http://ftp.gnu.org/gnu/libcdio/libcdio-0.76.tar.gz +Source1: http://ftp.gnu.org/gnu/libcdio/libcdio-0.76.tar.gz.sig BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) #BuildRequires: libcddb-devel >= 0.9.4 -BuildRequires: pkgconfig +BuildRequires: pkgconfig doxygen BuildRequires: ncurses-devel Requires(post): /sbin/ldconfig Requires(post): /sbin/install-info @@ -39,8 +39,14 @@ %build -%configure --disable-vcd-info --disable-dependency-tracking +%configure \ + --disable-vcd-info \ + --disable-dependency-tracking \ + --disable-cddb \ + --disable-rpath make %{?_smp_mflags} +cd doc/doxygen +./run_doxygen %install @@ -52,8 +58,15 @@ mv $RPM_BUILD_ROOT%{_mandir}/{jp,ja} +rm -rf examples +mkdir -p examples/C++ +cp -a example/{*.c,README} examples +cp -a example/C++/{*.cpp,README} examples/C++ + %check || : +# disable test using local CDROM +%{__sed} -i -e "s/am__EXEEXT_1 =.*$/am__EXEEXT_1 =/g" test/Makefile make check @@ -67,8 +80,8 @@ %preun if [ $1 = 0 ]; then - /sbin/install-info --delete %{_infodir}/%{name}.info \ - %{_infodir}/dir 2>/dev/null || : + /sbin/install-info --delete %{_infodir}/%{name}.info \ + %{_infodir}/dir 2>/dev/null || : fi %postun -p /sbin/ldconfig @@ -86,6 +99,7 @@ %files devel %defattr(-,root,root,-) +%doc doc/doxygen/html examples %{_includedir}/cdio %{_libdir}/*.a %{_libdir}/*.so @@ -93,6 +107,14 @@ %changelog +* Mon Sep 26 2005 Adrian Reber - 0.76-1 +- Updated to 0.76. +- Included doxygen generated documentation into -devel +- Included examples into -devel + +* Mon Aug 01 2005 Adrian Reber - 0.75-4 +- disable test accessing local CDROM drive (#164266) + * Wed Jul 27 2005 Adrian Reber - 0.75-3 - Rebuilt without libcddb dependency (#164270) Index: sources =================================================================== RCS file: /cvs/extras/rpms/libcdio/FC-4/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 26 Jul 2005 11:58:19 -0000 1.6 +++ sources 26 Sep 2005 11:43:07 -0000 1.7 @@ -1,2 +1,2 @@ -628bd9e6d62747ff6a2b14f976673ea0 libcdio-0.75.tar.gz -3a861ce2e430451107d923127c64cf77 libcdio-0.75.tar.gz.sig +6d5f97847c8be003f4018dd2b5afe23d libcdio-0.76.tar.gz +99dec4b805556a5a6cccaa3539707422 libcdio-0.76.tar.gz.sig From fedora-extras-commits at redhat.com Mon Sep 26 12:09:38 2005 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Mon, 26 Sep 2005 08:09:38 -0400 Subject: rpms/libcdio/FC-3 .cvsignore, 1.5, 1.6 libcdio.spec, 1.7, 1.8 sources, 1.5, 1.6 Message-ID: <200509261209.j8QC9dhQ009159@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/rpms/libcdio/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9120 Modified Files: .cvsignore libcdio.spec sources Log Message: * Mon Sep 26 2005 Adrian Reber - 0.76-1 - Updated to 0.76. - Included doxygen generated documentation into -devel - Included examples into -devel Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libcdio/FC-3/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 28 Jul 2005 07:39:13 -0000 1.5 +++ .cvsignore 26 Sep 2005 12:09:15 -0000 1.6 @@ -1,2 +1,2 @@ -libcdio-0.75.tar.gz -libcdio-0.75.tar.gz.sig +libcdio-0.76.tar.gz +libcdio-0.76.tar.gz.sig Index: libcdio.spec =================================================================== RCS file: /cvs/extras/rpms/libcdio/FC-3/libcdio.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- libcdio.spec 23 Aug 2005 15:13:09 -0000 1.7 +++ libcdio.spec 26 Sep 2005 12:09:15 -0000 1.8 @@ -1,17 +1,17 @@ Name: libcdio -Version: 0.75 -Release: 3%{?dist} +Version: 0.76 +Release: 1%{?dist} Summary: CD-ROM input and control library Group: Applications/Multimedia License: GPL URL: http://www.gnu.org/software/libcdio/ -Source0: http://ftp.gnu.org/gnu/libcdio/libcdio-0.75.tar.gz -Source1: http://ftp.gnu.org/gnu/libcdio/libcdio-0.75.tar.gz.sig +Source0: http://ftp.gnu.org/gnu/libcdio/libcdio-0.76.tar.gz +Source1: http://ftp.gnu.org/gnu/libcdio/libcdio-0.76.tar.gz.sig BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) #BuildRequires: libcddb-devel >= 0.9.4 -BuildRequires: pkgconfig +BuildRequires: pkgconfig doxygen BuildRequires: ncurses-devel Requires(post): /sbin/ldconfig Requires(post): /sbin/install-info @@ -39,8 +39,14 @@ %build -%configure --disable-vcd-info --disable-dependency-tracking +%configure \ + --disable-vcd-info \ + --disable-dependency-tracking \ + --disable-cddb \ + --disable-rpath make %{?_smp_mflags} +cd doc/doxygen +./run_doxygen %install @@ -52,8 +58,15 @@ mv $RPM_BUILD_ROOT%{_mandir}/{jp,ja} +rm -rf examples +mkdir -p examples/C++ +cp -a example/{*.c,README} examples +cp -a example/C++/{*.cpp,README} examples/C++ + %check || : +# disable test using local CDROM +%{__sed} -i -e "s/am__EXEEXT_1 =.*$/am__EXEEXT_1 =/g" test/Makefile make check @@ -67,8 +80,8 @@ %preun if [ $1 = 0 ]; then - /sbin/install-info --delete %{_infodir}/%{name}.info \ - %{_infodir}/dir 2>/dev/null || : + /sbin/install-info --delete %{_infodir}/%{name}.info \ + %{_infodir}/dir 2>/dev/null || : fi %postun -p /sbin/ldconfig @@ -86,6 +99,7 @@ %files devel %defattr(-,root,root,-) +%doc doc/doxygen/html examples %{_includedir}/cdio %{_libdir}/*.a %{_libdir}/*.so @@ -93,6 +107,14 @@ %changelog +* Mon Sep 26 2005 Adrian Reber - 0.76-1 +- Updated to 0.76. +- Included doxygen generated documentation into -devel +- Included examples into -devel + +* Mon Aug 01 2005 Adrian Reber - 0.75-4 +- disable test accessing local CDROM drive (#164266) + * Wed Jul 27 2005 Adrian Reber - 0.75-3 - Rebuilt without libcddb dependency (#164270) Index: sources =================================================================== RCS file: /cvs/extras/rpms/libcdio/FC-3/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 28 Jul 2005 07:39:13 -0000 1.5 +++ sources 26 Sep 2005 12:09:15 -0000 1.6 @@ -1,2 +1,2 @@ -628bd9e6d62747ff6a2b14f976673ea0 libcdio-0.75.tar.gz -3a861ce2e430451107d923127c64cf77 libcdio-0.75.tar.gz.sig +6d5f97847c8be003f4018dd2b5afe23d libcdio-0.76.tar.gz +99dec4b805556a5a6cccaa3539707422 libcdio-0.76.tar.gz.sig From fedora-extras-commits at redhat.com Mon Sep 26 12:20:59 2005 From: fedora-extras-commits at redhat.com (Gijs Hollestelle (gijs)) Date: Mon, 26 Sep 2005 08:20:59 -0400 Subject: rpms/yum-utils/devel .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 yum-utils.spec, 1.2, 1.3 Message-ID: <200509261220.j8QCKx3q009270@cvs-int.fedora.redhat.com> Author: gijs Update of /cvs/extras/rpms/yum-utils/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9238 Modified Files: .cvsignore sources yum-utils.spec Log Message: * Mon Sep 26 2005 Gijs Hollestelle - 0.3.1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/yum-utils/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 11 Jun 2005 19:28:20 -0000 1.2 +++ .cvsignore 26 Sep 2005 12:20:57 -0000 1.3 @@ -1 +1 @@ -yum-utils-0.2.tar.gz +yum-utils-0.3.1.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/yum-utils/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 11 Jun 2005 19:28:20 -0000 1.2 +++ sources 26 Sep 2005 12:20:57 -0000 1.3 @@ -1 +1 @@ -4e7a416d040c194c1cb9e77651f0c86f yum-utils-0.2.tar.gz +e4dfc68f3a8fa9c6f107d865763eea81 yum-utils-0.3.1.tar.gz Index: yum-utils.spec =================================================================== RCS file: /cvs/extras/rpms/yum-utils/devel/yum-utils.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- yum-utils.spec 11 Jun 2005 19:40:27 -0000 1.2 +++ yum-utils.spec 26 Sep 2005 12:20:57 -0000 1.3 @@ -1,7 +1,7 @@ Summary: Utilities based around the yum package manager Name: yum-utils -Version: 0.2 -Release: 2%{?dist} +Version: 0.3.1 +Release: 1%{?dist} License: GPL Group: Development/Tools Source: http://linux.duke.edu/yum/download/yum-utils/%{name}-%{version}.tar.gz @@ -65,6 +65,9 @@ %{_initrddir}/yum-updateonboot %changelog +* Mon Sep 26 2005 Gijs Hollestelle +- 0.3.1 + * Wed Jun 1 2005 Seth Vidal - 0.2 From fedora-extras-commits at redhat.com Mon Sep 26 12:26:03 2005 From: fedora-extras-commits at redhat.com (Gijs Hollestelle (gijs)) Date: Mon, 26 Sep 2005 08:26:03 -0400 Subject: rpms/yum-utils/FC-4 sources,1.2,1.3 yum-utils.spec,1.2,1.3 Message-ID: <200509261226.j8QCQ31L009308@cvs-int.fedora.redhat.com> Author: gijs Update of /cvs/extras/rpms/yum-utils/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9287 Modified Files: sources yum-utils.spec Log Message: * Mon Sep 26 2005 Gijs Hollestelle - 0.3.1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/yum-utils/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 11 Jun 2005 19:28:20 -0000 1.2 +++ sources 26 Sep 2005 12:26:00 -0000 1.3 @@ -1 +1 @@ -4e7a416d040c194c1cb9e77651f0c86f yum-utils-0.2.tar.gz +e4dfc68f3a8fa9c6f107d865763eea81 yum-utils-0.3.1.tar.gz Index: yum-utils.spec =================================================================== RCS file: /cvs/extras/rpms/yum-utils/FC-4/yum-utils.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- yum-utils.spec 11 Jun 2005 19:40:27 -0000 1.2 +++ yum-utils.spec 26 Sep 2005 12:26:00 -0000 1.3 @@ -1,7 +1,7 @@ Summary: Utilities based around the yum package manager Name: yum-utils -Version: 0.2 -Release: 2%{?dist} +Version: 0.3.1 +Release: 1%{?dist} License: GPL Group: Development/Tools Source: http://linux.duke.edu/yum/download/yum-utils/%{name}-%{version}.tar.gz @@ -65,6 +65,9 @@ %{_initrddir}/yum-updateonboot %changelog +* Mon Sep 26 2005 Gijs Hollestelle +- 0.3.1 + * Wed Jun 1 2005 Seth Vidal - 0.2 From fedora-extras-commits at redhat.com Mon Sep 26 16:27:01 2005 From: fedora-extras-commits at redhat.com (Marc Maurer (uwog)) Date: Mon, 26 Sep 2005 12:27:01 -0400 Subject: rpms/abiword/devel abiword.spec,1.19,1.20 Message-ID: <200509261627.j8QGR10q015847@cvs-int.fedora.redhat.com> Author: uwog Update of /cvs/extras/rpms/abiword/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15828 Modified Files: abiword.spec Log Message: Fix gtkmathview BuildRequires Index: abiword.spec =================================================================== RCS file: /cvs/extras/rpms/abiword/devel/abiword.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- abiword.spec 22 Sep 2005 15:21:24 -0000 1.19 +++ abiword.spec 26 Sep 2005 16:26:58 -0000 1.20 @@ -3,7 +3,7 @@ Summary: The AbiWord word processor Name: abiword Version: 2.3.99 -Release: 1 +Release: 2 Epoch: 1 Group: Applications/Editors License: GPL @@ -32,7 +32,7 @@ BuildRequires: libwmf-devel BuildRequires: aiksaurus-gtk-devel >= 1.2.1 BuildRequires: link-grammar-devel >= 4.1.3 -BuildRequires: gtkmathview >= 0.7.3 +BuildRequires: gtkmathview-devel >= 0.7.3 # gnome build deps BuildRequires: libbonobo-devel @@ -131,6 +131,9 @@ %{_datadir}/icons/*png %changelog +* Mon Sep 26 2005 Marc Maurer - 1:2.3.99-2 +- Fix gtkmathview BuildRequires + * Thu Sep 22 2005 Marc Maurer - 1:2.3.99-1 - Update to 2.3.99 From fedora-extras-commits at redhat.com Mon Sep 26 17:17:11 2005 From: fedora-extras-commits at redhat.com (Dan Kenigsberg (danken)) Date: Mon, 26 Sep 2005 13:17:11 -0400 Subject: rpms/hspell - New directory Message-ID: <200509261717.j8QHHBwZ017384@cvs-int.fedora.redhat.com> Author: danken Update of /cvs/extras/rpms/hspell In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17360/hspell Log Message: Directory /cvs/extras/rpms/hspell added to the repository From fedora-extras-commits at redhat.com Mon Sep 26 17:17:11 2005 From: fedora-extras-commits at redhat.com (Dan Kenigsberg (danken)) Date: Mon, 26 Sep 2005 13:17:11 -0400 Subject: rpms/hspell/devel - New directory Message-ID: <200509261717.j8QHHBPc017389@cvs-int.fedora.redhat.com> Author: danken Update of /cvs/extras/rpms/hspell/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17360/hspell/devel Log Message: Directory /cvs/extras/rpms/hspell/devel added to the repository From fedora-extras-commits at redhat.com Mon Sep 26 17:17:41 2005 From: fedora-extras-commits at redhat.com (Dan Kenigsberg (danken)) Date: Mon, 26 Sep 2005 13:17:41 -0400 Subject: rpms/hspell Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200509261717.j8QHHfmC017440@cvs-int.fedora.redhat.com> Author: danken Update of /cvs/extras/rpms/hspell In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17405 Added Files: Makefile import.log Log Message: Setup of module hspell --- NEW FILE Makefile --- # Top level Makefile for module hspell all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Mon Sep 26 17:17:41 2005 From: fedora-extras-commits at redhat.com (Dan Kenigsberg (danken)) Date: Mon, 26 Sep 2005 13:17:41 -0400 Subject: rpms/hspell/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200509261717.j8QHHfXa017445@cvs-int.fedora.redhat.com> Author: danken Update of /cvs/extras/rpms/hspell/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17405/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module hspell --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Mon Sep 26 17:18:55 2005 From: fedora-extras-commits at redhat.com (Dan Kenigsberg (danken)) Date: Mon, 26 Sep 2005 13:18:55 -0400 Subject: rpms/hspell import.log,1.1,1.2 Message-ID: <200509261718.j8QHItdI017508@cvs-int.fedora.redhat.com> Author: danken Update of /cvs/extras/rpms/hspell In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17473 Modified Files: import.log Log Message: auto-import hspell-0.9-6 on branch devel from hspell-0.9-6.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/hspell/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 26 Sep 2005 17:17:39 -0000 1.1 +++ import.log 26 Sep 2005 17:18:53 -0000 1.2 @@ -0,0 +1 @@ +hspell-0_9-6:HEAD:hspell-0.9-6.src.rpm:1127755119 From fedora-extras-commits at redhat.com Mon Sep 26 17:18:56 2005 From: fedora-extras-commits at redhat.com (Dan Kenigsberg (danken)) Date: Mon, 26 Sep 2005 13:18:56 -0400 Subject: rpms/hspell/devel hspell.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200509261719.j8QHIuXO017514@cvs-int.fedora.redhat.com> Author: danken Update of /cvs/extras/rpms/hspell/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17473/devel Modified Files: .cvsignore sources Added Files: hspell.spec Log Message: auto-import hspell-0.9-6 on branch devel from hspell-0.9-6.src.rpm --- NEW FILE hspell.spec --- Summary: A Hebrew spell checker Name: hspell Version: 0.9 Release: 6 URL: http://ivrix.org.il/projects/spell-checker/ Source: http://ivrix.org.il/projects/spell-checker/hspell-%{version}.tar.gz License: GPL Group: Applications/Text BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: zlib-devel Obsoletes: hspell-fat Provides: hspell-fat = %{version}-%{release} %description Hspell is a Hebrew SPELLer . It currently provides a mostly spell-like interface (gives the list of wrong words in the input text), but can also suggest corrections (-c). It also provides a true (yet incomplete) morphological analizer (-l), that prints all known meanings of a Hebrew string. Note: it is a fully working Hebrew spellchecker, not a toy release. On typical documents it should recognize the majority of correct words. However, users of this release must take into account that it still will not recognize *all* the correct words; The dictionary is still admittedly not complete, and this situation will continue to improve in the next releases. On the other hand, barring bugs Hspell should not recognize incorrect words - extreme attention has been given to the correctness and consistency of the dictionary. %description -l he Hspell ??? ????? ????, ????? (???????) ???? ????-spell - ???? ????? ?? ?????? ??????? ???????? ????. ?? ???? ?????, ???? ??? ????? ???? ????? - ????? ?????? ???? ???? ?????? ??? ??????? ???????. ?????? ???? ??-??? ?????? ???? *??* ????? ?????? ????? ??-?? ???? ??????? ?????? ????? ??? ????? )"???? ???"(. ??? ??, Hspell ???? (-l) ???? ????????? ???? (??-?? ?? ???) ??? ????? ?? ?? ????????? ???????? ?? ?????? ?????? ?????. %package devel Summary: Library and include files for Hspell, the hebrew spell checker Group: Applications/Text Requires: %{name} = %{version}-%{release} %description devel Library and include files for applications that want to use Hspell. %description -l he devel ?????? ?????? ????? ???? ??????? ?????? ?????? ?-Hspell. %prep %setup -q %build %configure --enable-fatverb --enable-linginfo make CFLAGS="$RPM_OPT_FLAGS" %install rm -rf %{buildroot} make DESTDIR=%{buildroot} install %clean rm -rf %{buildroot} %files %defattr(-,root,root) %doc LICENSE README WHATSNEW COPYING %{_bindir}/hspell %{_bindir}/hspell-i %{_bindir}/multispell %{_mandir}/man1/hspell.1* %{_datadir}/hspell/ %files devel %defattr(-,root,root) %{_includedir}/*.h %{_libdir}/libhspell.a %{_mandir}/man3/hspell.3* %changelog * Mon Sep 26 2005 Dan Kenigsberg 0.9-6 - Add the text of the GPL to the binary package. It seems that I'll do anything to make my sponsor Tom happy. * Thu Sep 23 2005 Dan Kenigsberg 0.9-5 - According to Tom's request, distribute the fat version. - Add short Hebrew description to the devel package. * Thu Sep 20 2005 Dan Kenigsberg 0.9-4 - Distribute the "slim" flavor, as I suspect it is better suited for the casual user (even though I personally enjoy the chubby morphological analizer). * Mon Sep 19 2005 Tom "spot" Callaway 0.9-3 - minor spec file cleanups, eliminate "fat" variant * Thu Sep 15 2005 Dan Kenigsberg 0.9-2 - version 0.9, some magic to silence rpmlint * Fri Jun 4 2004 Dan Kenigsberg 0.8-1 - Some cleanups, and a devel package * Fri Dec 20 2003 Dan Kenigsberg 0.7-1 - Changes for version 0.7 * Tue Jul 29 2003 Dan Kenigsberg 0.6-1 - Tiny changes for the C frontend * Fri May 2 2003 Dan Kenigsberg 0.5-1 - create the "fat" variant * Mon Feb 17 2003 Dan Kenigsberg 0.3-2 - The release includes only the compressed database. - Added signature, and some other minor changes. * Sun Jan 5 2003 Tzafrir Cohen 0.2-1 - Initial build. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/hspell/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 26 Sep 2005 17:17:39 -0000 1.1 +++ .cvsignore 26 Sep 2005 17:18:54 -0000 1.2 @@ -0,0 +1 @@ +hspell-0.9.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/hspell/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 26 Sep 2005 17:17:39 -0000 1.1 +++ sources 26 Sep 2005 17:18:54 -0000 1.2 @@ -0,0 +1 @@ +6ebae9cfe721c6563075095fa73f69ac hspell-0.9.tar.gz From fedora-extras-commits at redhat.com Mon Sep 26 17:33:19 2005 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Mon, 26 Sep 2005 13:33:19 -0400 Subject: rpms/gl-117/devel .cvsignore, 1.3, 1.4 gl-117.spec, 1.5, 1.6 sources, 1.3, 1.4 Message-ID: <200509261733.j8QHXJA2017695@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/gl-117/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17628/devel Modified Files: .cvsignore gl-117.spec sources Log Message: Update to 1.3.2. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gl-117/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 13 Jan 2005 11:14:36 -0000 1.3 +++ .cvsignore 26 Sep 2005 17:33:17 -0000 1.4 @@ -1 +1 @@ -gl-117-1.3.1-src.tar.bz2 +gl-117-1.3.2-src.tar.bz2 Index: gl-117.spec =================================================================== RCS file: /cvs/extras/rpms/gl-117/devel/gl-117.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- gl-117.spec 6 Apr 2005 22:11:38 -0000 1.5 +++ gl-117.spec 26 Sep 2005 17:33:17 -0000 1.6 @@ -1,19 +1,19 @@ Name: gl-117 -Version: 1.3.1 -Release: 2 +Version: 1.3.2 +Release: 1%{?dist} Summary: Action flight simulator Group: Amusements/Games License: GPL -URL: http://www.heptargon.de/ +URL: http://www.heptargon.de/gl-117/gl-117.htm Source0: http://dl.sf.net/sourceforge/gl-117/gl-117-%{version}-src.tar.bz2 Source1: gl-117.desktop Source2: gl-117.png BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: SDL-devel, SDL_mixer-devel -BuildRequires: XFree86-devel, freeglut-devel +BuildRequires: xorg-x11-devel, freeglut-devel BuildRequires: desktop-file-utils %description @@ -55,7 +55,12 @@ %{_mandir}/man6/* %changelog -* Fri Apr 7 2005 Michael Schwendt +* Mon Sep 26 2005 Steven Pritchard 1.3.2-1 +- Update to 1.3.2 (#169275) +- BR xorg-x11-devel instead of XFree86-devel +- Change URL to the gl-117 home page + +* Fri Apr 7 2005 Michael Schwendt 1.3.1-2 - rebuilt * Tue Dec 21 2004 Panu Matilainen 0:1.3.1-1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/gl-117/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 13 Jan 2005 11:14:36 -0000 1.3 +++ sources 26 Sep 2005 17:33:17 -0000 1.4 @@ -1 +1 @@ -c9bf8573ebb60fd77dc18de7eda006ec gl-117-1.3.1-src.tar.bz2 +aad53c5531943529fd769fae4efeae02 gl-117-1.3.2-src.tar.bz2 From fedora-extras-commits at redhat.com Mon Sep 26 17:33:13 2005 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Mon, 26 Sep 2005 13:33:13 -0400 Subject: rpms/gl-117/FC-3 .cvsignore, 1.3, 1.4 gl-117.spec, 1.3, 1.4 sources, 1.3, 1.4 Message-ID: <200509261733.j8QHXher017717@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/gl-117/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17628/FC-3 Modified Files: .cvsignore gl-117.spec sources Log Message: Update to 1.3.2. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gl-117/FC-3/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 13 Jan 2005 11:14:36 -0000 1.3 +++ .cvsignore 26 Sep 2005 17:33:11 -0000 1.4 @@ -1 +1 @@ -gl-117-1.3.1-src.tar.bz2 +gl-117-1.3.2-src.tar.bz2 Index: gl-117.spec =================================================================== RCS file: /cvs/extras/rpms/gl-117/FC-3/gl-117.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- gl-117.spec 13 Jan 2005 11:14:36 -0000 1.3 +++ gl-117.spec 26 Sep 2005 17:33:11 -0000 1.4 @@ -1,26 +1,26 @@ Name: gl-117 -Version: 1.3.1 -Release: 1 -Epoch: 0 -Summary: An action flight simulator +Version: 1.3.2 +Release: 1%{?dist} + +Summary: Action flight simulator Group: Amusements/Games License: GPL -URL: http://www.heptargon.de/ +URL: http://www.heptargon.de/gl-117/gl-117.htm Source0: http://dl.sf.net/sourceforge/gl-117/gl-117-%{version}-src.tar.bz2 -Source1: gl-117.desktop -Source2: gl-117.png +Source1: gl-117.desktop +Source2: gl-117.png BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: SDL-devel, SDL_mixer-devel -BuildRequires: XFree86-devel, freeglut-devel -BuildRequires: desktop-file-utils +BuildRequires: xorg-x11-devel, freeglut-devel +BuildRequires: desktop-file-utils %description -GL-117 is an action flight simulator for Linux/Unix and MSWindows. Enter the -Eagle Squadron and succeed in several challanging missions leading though -different landscapes. Five predefined levels of video quality and an amount of -viewing ranges let you perfectly adjust the game to the performance of your +GL-117 is an action flight simulator for Linux/Unix and MSWindows. Enter the +Eagle Squadron and succeed in several challanging missions leading though +different landscapes. Five predefined levels of video quality and an amount of +viewing ranges let you perfectly adjust the game to the performance of your system. Joystick, mouse, sound effects, music... %prep @@ -39,8 +39,8 @@ install -m 644 doc/%{name}.6 $RPM_BUILD_ROOT/%{_mandir}/man6/ install -m 644 %{SOURCE2} $RPM_BUILD_ROOT/%{_datadir}/pixmaps/ desktop-file-install --dir $RPM_BUILD_ROOT/%{_datadir}/applications \ - --add-category X-Fedora \ - --vendor fedora %{SOURCE1} + --add-category X-Fedora \ + --vendor fedora %{SOURCE1} %clean rm -rf $RPM_BUILD_ROOT @@ -55,6 +55,14 @@ %{_mandir}/man6/* %changelog +* Mon Sep 26 2005 Steven Pritchard 1.3.2-1 +- Update to 1.3.2 (#169275) +- BR xorg-x11-devel instead of XFree86-devel +- Change URL to the gl-117 home page + +* Fri Apr 7 2005 Michael Schwendt 1.3.1-2 +- rebuilt + * Tue Dec 21 2004 Panu Matilainen 0:1.3.1-1 - update to 1.3.1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/gl-117/FC-3/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 13 Jan 2005 11:14:36 -0000 1.3 +++ sources 26 Sep 2005 17:33:11 -0000 1.4 @@ -1 +1 @@ -c9bf8573ebb60fd77dc18de7eda006ec gl-117-1.3.1-src.tar.bz2 +aad53c5531943529fd769fae4efeae02 gl-117-1.3.2-src.tar.bz2 From fedora-extras-commits at redhat.com Mon Sep 26 17:33:14 2005 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Mon, 26 Sep 2005 13:33:14 -0400 Subject: rpms/gl-117/FC-4 .cvsignore, 1.3, 1.4 gl-117.spec, 1.5, 1.6 sources, 1.3, 1.4 Message-ID: <200509261733.j8QHXiE8017722@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/gl-117/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17628/FC-4 Modified Files: .cvsignore gl-117.spec sources Log Message: Update to 1.3.2. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gl-117/FC-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 13 Jan 2005 11:14:36 -0000 1.3 +++ .cvsignore 26 Sep 2005 17:33:11 -0000 1.4 @@ -1 +1 @@ -gl-117-1.3.1-src.tar.bz2 +gl-117-1.3.2-src.tar.bz2 Index: gl-117.spec =================================================================== RCS file: /cvs/extras/rpms/gl-117/FC-4/gl-117.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- gl-117.spec 6 Apr 2005 22:11:38 -0000 1.5 +++ gl-117.spec 26 Sep 2005 17:33:11 -0000 1.6 @@ -1,19 +1,19 @@ Name: gl-117 -Version: 1.3.1 -Release: 2 +Version: 1.3.2 +Release: 1%{?dist} Summary: Action flight simulator Group: Amusements/Games License: GPL -URL: http://www.heptargon.de/ +URL: http://www.heptargon.de/gl-117/gl-117.htm Source0: http://dl.sf.net/sourceforge/gl-117/gl-117-%{version}-src.tar.bz2 Source1: gl-117.desktop Source2: gl-117.png BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: SDL-devel, SDL_mixer-devel -BuildRequires: XFree86-devel, freeglut-devel +BuildRequires: xorg-x11-devel, freeglut-devel BuildRequires: desktop-file-utils %description @@ -55,7 +55,12 @@ %{_mandir}/man6/* %changelog -* Fri Apr 7 2005 Michael Schwendt +* Mon Sep 26 2005 Steven Pritchard 1.3.2-1 +- Update to 1.3.2 (#169275) +- BR xorg-x11-devel instead of XFree86-devel +- Change URL to the gl-117 home page + +* Fri Apr 7 2005 Michael Schwendt 1.3.1-2 - rebuilt * Tue Dec 21 2004 Panu Matilainen 0:1.3.1-1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/gl-117/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 13 Jan 2005 11:14:36 -0000 1.3 +++ sources 26 Sep 2005 17:33:11 -0000 1.4 @@ -1 +1 @@ -c9bf8573ebb60fd77dc18de7eda006ec gl-117-1.3.1-src.tar.bz2 +aad53c5531943529fd769fae4efeae02 gl-117-1.3.2-src.tar.bz2 From fedora-extras-commits at redhat.com Mon Sep 26 17:34:05 2005 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Mon, 26 Sep 2005 13:34:05 -0400 Subject: rpms/abcm2ps - New directory Message-ID: <200509261734.j8QHY5PO017808@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/abcm2ps In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17785/abcm2ps Log Message: Directory /cvs/extras/rpms/abcm2ps added to the repository From fedora-extras-commits at redhat.com Mon Sep 26 17:34:05 2005 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Mon, 26 Sep 2005 13:34:05 -0400 Subject: rpms/abcm2ps/devel - New directory Message-ID: <200509261734.j8QHY5Vo017813@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/abcm2ps/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17785/abcm2ps/devel Log Message: Directory /cvs/extras/rpms/abcm2ps/devel added to the repository From fedora-extras-commits at redhat.com Mon Sep 26 17:34:27 2005 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Mon, 26 Sep 2005 13:34:27 -0400 Subject: rpms/abcm2ps Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200509261734.j8QHYRV8017917@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/abcm2ps In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17886 Added Files: Makefile import.log Log Message: Setup of module abcm2ps --- NEW FILE Makefile --- # Top level Makefile for module abcm2ps all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Mon Sep 26 17:34:28 2005 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Mon, 26 Sep 2005 13:34:28 -0400 Subject: rpms/abcm2ps/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200509261734.j8QHYSAe017922@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/abcm2ps/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17886/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module abcm2ps --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Mon Sep 26 17:36:05 2005 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Mon, 26 Sep 2005 13:36:05 -0400 Subject: rpms/abcm2ps import.log,1.1,1.2 Message-ID: <200509261736.j8QHaacw018076@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/abcm2ps In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18004 Modified Files: import.log Log Message: auto-import abcm2ps-4.11.4-2 on branch devel from abcm2ps-4.11.4-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/abcm2ps/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 26 Sep 2005 17:34:25 -0000 1.1 +++ import.log 26 Sep 2005 17:36:03 -0000 1.2 @@ -0,0 +1 @@ +abcm2ps-4_11_4-2:HEAD:abcm2ps-4.11.4-2.src.rpm:1127756153 From fedora-extras-commits at redhat.com Mon Sep 26 17:36:43 2005 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Mon, 26 Sep 2005 13:36:43 -0400 Subject: rpms/fwrestart - New directory Message-ID: <200509261736.j8QHahRG018118@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/fwrestart In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18095/fwrestart Log Message: Directory /cvs/extras/rpms/fwrestart added to the repository From fedora-extras-commits at redhat.com Mon Sep 26 17:36:06 2005 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Mon, 26 Sep 2005 13:36:06 -0400 Subject: rpms/abcm2ps/devel abcm2ps.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200509261736.j8QHaa9T018080@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/abcm2ps/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18004/devel Modified Files: .cvsignore sources Added Files: abcm2ps.spec Log Message: auto-import abcm2ps-4.11.4-2 on branch devel from abcm2ps-4.11.4-2.src.rpm --- NEW FILE abcm2ps.spec --- Name: abcm2ps Version: 4.11.4 Release: 2 Summary: A program to typeset ABC tunes into Postscript Group: Applications/Multimedia License: GPL URL: http://moinejf.free.fr Source0: http://moinejf.free.fr/abcm2ps-4.11.4.tar.gz Source1: http://abcplus.sourceforge.net/abcplus_en-1.0.3.zip BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description Abcm2ps is a package which converts music tunes from ABC format to Postscript. Based on abc2ps version 1.2.5, it was developed mainly to print Baroque organ scores which have independent voices played on one or many keyboards and a pedal-board. Abcm2ps introduces many extensions to the ABC language that make it suitable for classical music. %prep %setup -q unzip %{SOURCE1} %build %configure --enable-a4 make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install \ prefix=$RPM_BUILD_ROOT%{_prefix} \ bindir=$RPM_BUILD_ROOT%{_bindir} \ libdir=$RPM_BUILD_ROOT%{_libdir} \ datadir=$RPM_BUILD_ROOT%{_datadir} \ docdir=$RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc abcplus*/abcplus_en.pdf %doc *.abc License README features.txt format.txt options.txt Changes %{_bindir}/abcm2ps %{_datadir}/abcm2ps %changelog * Thu Sep 8 2005 Gerard Milmeister - 4.11.4-2 - Updated description * Wed Sep 7 2005 Gerard Milmeister - 4.11.4-1 - New Version 4.11.4 * Sun Aug 21 2005 Gerard Milmeister - 4.11.3-1 - New Version 4.11.3 * Fri Jun 24 2005 Gerard Milmeister - 4.11.0-1 - New Version 4.11.0 * Sun May 29 2005 Gerard Milmeister - 4.10.0-1 - New Version 4.10.0 * Mon May 9 2005 Gerard Milmeister - 4.9.7-1 - New Version 4.9.7 * Thu Apr 14 2005 Gerard Milmeister - 4.9.5-1 - New Version 4.9.5 * Thu Mar 24 2005 Gerard Milmeister - 4.9.2-1 - New Version 4.9.2 * Thu Mar 17 2005 Gerard Milmeister - 4.9.1-1 - New Version 4.9.1 * Tue Feb 22 2005 Gerard Milmeister - 4.8.11-1 - First Fedora release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/abcm2ps/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 26 Sep 2005 17:34:26 -0000 1.1 +++ .cvsignore 26 Sep 2005 17:36:04 -0000 1.2 @@ -0,0 +1,2 @@ +abcm2ps-4.11.4.tar.gz +abcplus_en-1.0.3.zip Index: sources =================================================================== RCS file: /cvs/extras/rpms/abcm2ps/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 26 Sep 2005 17:34:26 -0000 1.1 +++ sources 26 Sep 2005 17:36:04 -0000 1.2 @@ -0,0 +1,2 @@ +296c0ff7527234a1b9bbf44b70731fb4 abcm2ps-4.11.4.tar.gz +221c256a7102244d1509be209601586e abcplus_en-1.0.3.zip From fedora-extras-commits at redhat.com Mon Sep 26 17:36:43 2005 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Mon, 26 Sep 2005 13:36:43 -0400 Subject: rpms/fwrestart/devel - New directory Message-ID: <200509261736.j8QHahSU018124@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/fwrestart/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18095/fwrestart/devel Log Message: Directory /cvs/extras/rpms/fwrestart/devel added to the repository From fedora-extras-commits at redhat.com Mon Sep 26 17:37:00 2005 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Mon, 26 Sep 2005 13:37:00 -0400 Subject: rpms/fwrestart Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200509261737.j8QHb0su018197@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/fwrestart In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18168 Added Files: Makefile import.log Log Message: Setup of module fwrestart --- NEW FILE Makefile --- # Top level Makefile for module fwrestart all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Mon Sep 26 17:37:00 2005 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Mon, 26 Sep 2005 13:37:00 -0400 Subject: rpms/fwrestart/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200509261737.j8QHb0f9018202@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/fwrestart/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18168/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module fwrestart --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Mon Sep 26 17:37:21 2005 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Mon, 26 Sep 2005 13:37:21 -0400 Subject: rpms/fwrestart import.log,1.1,1.2 Message-ID: <200509261737.j8QHbLf7018276@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/fwrestart In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18241 Modified Files: import.log Log Message: auto-import fwrestart-1.01-3 on branch devel from fwrestart-1.01-3.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/fwrestart/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 26 Sep 2005 17:36:57 -0000 1.1 +++ import.log 26 Sep 2005 17:37:19 -0000 1.2 @@ -0,0 +1 @@ +fwrestart-1_01-3:HEAD:fwrestart-1.01-3.src.rpm:1127756235 From fedora-extras-commits at redhat.com Mon Sep 26 17:37:22 2005 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Mon, 26 Sep 2005 13:37:22 -0400 Subject: rpms/fwrestart/devel fwrestart.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200509261737.j8QHbMEE018283@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/fwrestart/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18241/devel Modified Files: .cvsignore sources Added Files: fwrestart.spec Log Message: auto-import fwrestart-1.01-3 on branch devel from fwrestart-1.01-3.src.rpm --- NEW FILE fwrestart.spec --- Summary: A way to more safely re-load firewall rules remotely Name: fwrestart Version: 1.01 Release: 3 License: GPL Group: Applications/System URL: http://www.tummy.com/Community/software/ Source: ftp://ftp.tummy.com/pub/tummy/fwrestart/fwrestart-1.01.tar.gz BuildRequires: python BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch %description This program can automatically detect when changes to the firewall block the administrative shell session, and to take corrective action fwrestart uses terminal auto-response codes to safely re-start firewall rules over a remote shell session. It sends a request to your terminal (xterm, for example), which responds back automatically. When that response is received, ensuring that fwrestart can communicate with the terminal, fwrestart then issues a command to restart the firewall. It then tries another request to the terminal, and if that is not received within 5 seconds, a command is run to clear the firewall and an appropriate error is generated. %prep %setup %build %install rm -rf "$RPM_BUILD_ROOT" mkdir -p "$RPM_BUILD_ROOT"/usr/sbin mkdir -p "$RPM_BUILD_ROOT"/usr/share/man/man8 # copy over files cp fwrestart "$RPM_BUILD_ROOT"/usr/sbin cp fwrestart.man "$RPM_BUILD_ROOT"/usr/share/man/man8/fwrestart.8 %clean rm -rf "$RPM_BUILD_ROOT" %files %doc README LICENSE %{_mandir}/man8/fwrestart.8.gz %defattr(755,root,root) %{_sbindir}/fwrestart %changelog * Thu Sep 22 2005 Kevin Fenzi - 1.01-3 - A few more tweaks to clean up issues and re-submit to extras * Thu May 26 2005 Kevin Fenzi - 1.01-2 - Changed a number of items to match Fedora extras guidelines Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/fwrestart/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 26 Sep 2005 17:36:58 -0000 1.1 +++ .cvsignore 26 Sep 2005 17:37:20 -0000 1.2 @@ -0,0 +1 @@ +fwrestart-1.01.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/fwrestart/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 26 Sep 2005 17:36:58 -0000 1.1 +++ sources 26 Sep 2005 17:37:20 -0000 1.2 @@ -0,0 +1 @@ +c0997c048c1c01a43b169ecc1e0dc479 fwrestart-1.01.tar.gz From fedora-extras-commits at redhat.com Mon Sep 26 17:40:25 2005 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Mon, 26 Sep 2005 13:40:25 -0400 Subject: owners owners.list,1.251,1.252 Message-ID: <200509261740.j8QHePVE018356@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18337 Modified Files: owners.list Log Message: add fwrestart Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.251 retrieving revision 1.252 diff -u -r1.251 -r1.252 --- owners.list 26 Sep 2005 10:34:53 -0000 1.251 +++ owners.list 26 Sep 2005 17:40:22 -0000 1.252 @@ -200,6 +200,7 @@ Fedora Extras|frotz|Interpreter for Infocom and other Z-machine games|chris at chrisgrau.com|extras-qa at fedoraproject.org| Fedora Extras|fslint|FSlint - a utility to find and clean "lint" on a filesystem|P at draigBrady.com|extras-qa at fedoraproject.org| Fedora Extras|fwbuilder|Firewall Builder|sgrubb at redhat.com|extras-qa at fedoraproject.org| +Fedora Extras|fwrestart|A way to more safely re-load firewall rules remotely|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org| Fedora Extras|fyre|A tool for creating artwork from chaotic functions|ivazquez at ivazquez.net|extras-qa at fedoraproject.org| Fedora Extras|gai|Generic Applet Interface|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|bugs.michael at gmx.net Fedora Extras|gaim-guifications|Guifications plugin for GAIM|colin at fedoraproject.org|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Mon Sep 26 18:00:40 2005 From: fedora-extras-commits at redhat.com (Dan Kenigsberg (danken)) Date: Mon, 26 Sep 2005 14:00:40 -0400 Subject: owners owners.list,1.252,1.253 Message-ID: <200509261800.j8QI0eFE018465@cvs-int.fedora.redhat.com> Author: danken Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18438 Modified Files: owners.list Log Message: add an entry for Hspell, a Hebrew spell checker Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.252 retrieving revision 1.253 diff -u -r1.252 -r1.253 --- owners.list 26 Sep 2005 17:40:22 -0000 1.252 +++ owners.list 26 Sep 2005 18:00:38 -0000 1.253 @@ -325,6 +325,7 @@ Fedora Extras|highlight|Universal source code to formatted text converter|Jochen at herr-schmitt.de|extras-qa at fedoraproject.org| Fedora Extras|hmmer|Profile HMM software for protein sequence analysis|Christian.Iseli at licr.org|extras-qa at fedoraproject.org| Fedora Extras|hping2|A software to do TCP/IP stack auditing and much more|kuko at maarmas.com|extras-qa at fedoraproject.org| +Fedora Extras|hspell|A Hebrew spell checker|danken at cs.technion.ac.il|extras-qa at fedoraproject.org| Fedora Extras|htb-util|Another tool to make your life easier with HTB|mihai at xcyb.org|extras-qa at fedoraproject.org| Fedora Extras|htmltmpl|Templating engine for separation of code and HTML|ville.skytta at iki.fi|extras-qa at fedoraproject.org| Fedora Extras|http_ping|HTTP latency measuring utility|ville.skytta at iki.fi|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Mon Sep 26 19:24:51 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Mon, 26 Sep 2005 15:24:51 -0400 Subject: owners owners.list,1.253,1.254 Message-ID: <200509261924.j8QJOpkc021826@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21801 Modified Files: owners.list Log Message: - add wmCalClock Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.253 retrieving revision 1.254 diff -u -r1.253 -r1.254 --- owners.list 26 Sep 2005 18:00:38 -0000 1.253 +++ owners.list 26 Sep 2005 19:24:49 -0000 1.254 @@ -1046,6 +1046,7 @@ Fedora Extras|WindowMaker|A fast, feature rich Window manager|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org| Fedora Extras|wine|A Windows 16/32 bit emulator|pmatilai at laiskiainen.org|extras-qa at fedoraproject.org| Fedora Extras|wlassistant|Wireless network management tool|tcallawa at redhat.com|extras-qa at fedoraproject.org| +Fedora Extras|wmCalClock|A Calendar clock with antialiased text|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org| Fedora Extras|wmapmload|Wmapmload monitors your apm status in an lcd display fashion|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org| Fedora Extras|wmweather+|Weather status dockapp|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org| Fedora Extras|wv2|A library which allows access to Microsoft?? Word files|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Mon Sep 26 20:22:16 2005 From: fedora-extras-commits at redhat.com (Denis Leroy (denis)) Date: Mon, 26 Sep 2005 16:22:16 -0400 Subject: devel/inkscape inkscape.spec,1.22,1.23 Message-ID: <200509262022.j8QKMGVM024313@cvs-int.fedora.redhat.com> Author: denis Update of /cvs/extras/devel/inkscape In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24294 Modified Files: inkscape.spec Log Message: Rebuilt with newer glibmm Index: inkscape.spec =================================================================== RCS file: /cvs/extras/devel/inkscape/inkscape.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- inkscape.spec 2 Sep 2005 10:46:13 -0000 1.22 +++ inkscape.spec 26 Sep 2005 20:22:14 -0000 1.23 @@ -1,6 +1,6 @@ Name: inkscape Version: 0.42.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Vector-based drawing program using SVG Group: Applications/Productivity @@ -104,6 +104,9 @@ %changelog +* Mon Sep 26 2005 Denis Leroy - 0.42.2-2 +- rebuilt with newer glibmm + * Thu Sep 1 2005 Michael Schwendt - 0.42.2-1 - update to 0.42.2 From fedora-extras-commits at redhat.com Mon Sep 26 20:24:05 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Mon, 26 Sep 2005 16:24:05 -0400 Subject: rpms/uw-imap - New directory Message-ID: <200509262024.j8QKO50G024447@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/uw-imap In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24425/uw-imap Log Message: Directory /cvs/extras/rpms/uw-imap added to the repository From fedora-extras-commits at redhat.com Mon Sep 26 20:24:06 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Mon, 26 Sep 2005 16:24:06 -0400 Subject: rpms/uw-imap/devel - New directory Message-ID: <200509262024.j8QKO6TD024452@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/uw-imap/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24425/uw-imap/devel Log Message: Directory /cvs/extras/rpms/uw-imap/devel added to the repository From fedora-extras-commits at redhat.com Mon Sep 26 20:24:19 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Mon, 26 Sep 2005 16:24:19 -0400 Subject: rpms/uw-imap Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200509262024.j8QKOJ5H024502@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/uw-imap In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24473 Added Files: Makefile import.log Log Message: Setup of module uw-imap --- NEW FILE Makefile --- # Top level Makefile for module uw-imap all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Mon Sep 26 20:24:19 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Mon, 26 Sep 2005 16:24:19 -0400 Subject: rpms/uw-imap/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200509262024.j8QKOJY9024507@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/uw-imap/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24473/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module uw-imap --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Mon Sep 26 20:26:25 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Mon, 26 Sep 2005 16:26:25 -0400 Subject: rpms/uw-imap import.log,1.1,1.2 Message-ID: <200509262026.j8QKQPiw024660@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/uw-imap In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24611 Modified Files: import.log Log Message: auto-import uw-imap-2004g-1 on branch devel from uw-imap-2004g-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/uw-imap/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 26 Sep 2005 20:24:17 -0000 1.1 +++ import.log 26 Sep 2005 20:26:22 -0000 1.2 @@ -0,0 +1 @@ +uw-imap-2004g-1:HEAD:uw-imap-2004g-1.src.rpm:1127766317 From fedora-extras-commits at redhat.com Mon Sep 26 20:26:25 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Mon, 26 Sep 2005 16:26:25 -0400 Subject: rpms/uw-imap/devel README.IMAPS, NONE, 1.1 imap-2001a-overflow.patch, NONE, 1.1 imap-2002d-ssltype.patch, NONE, 1.1 imap-2002e-authmd5.patch, NONE, 1.1 imap-2002e-shared.patch, NONE, 1.1 imap-2004-paths.patch, NONE, 1.1 imap-2004c1-mbxproto.patch, NONE, 1.1 imap-2004d-optflags.patch, NONE, 1.1 imap-xinetd, NONE, 1.1 imap.pamd, NONE, 1.1 imaps-xinetd, NONE, 1.1 ipop2-xinetd, NONE, 1.1 ipop3-xinetd, NONE, 1.1 pop3s-xinetd, NONE, 1.1 uw-imap.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200509262026.j8QKQPCG024672@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/uw-imap/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24611/devel Modified Files: .cvsignore sources Added Files: README.IMAPS imap-2001a-overflow.patch imap-2002d-ssltype.patch imap-2002e-authmd5.patch imap-2002e-shared.patch imap-2004-paths.patch imap-2004c1-mbxproto.patch imap-2004d-optflags.patch imap-xinetd imap.pamd imaps-xinetd ipop2-xinetd ipop3-xinetd pop3s-xinetd uw-imap.spec Log Message: auto-import uw-imap-2004g-1 on branch devel from uw-imap-2004g-1.src.rpm --- NEW FILE README.IMAPS --- The IMAP server is now configured by default to use its built-in SSL support instead of using stunnel. Accordingly, the name of the certificate file in @@SSLCERTS@@ has changed from stunnel.pem to imapd.pem. Users upgrading from previous releases will need to rename, copy, or create a symbolic link to their existing certificate. imap-2001a-overflow.patch: --- NEW FILE imap-2001a-overflow.patch --- --- imap-2001a/src/c-client/rfc822.c.overflow Wed Apr 17 22:39:13 2002 +++ imap-2001a/src/c-client/rfc822.c Wed Apr 17 22:40:25 2002 @@ -610,6 +610,9 @@ if (CHR (bs) == '\012'){/* following LF? */ c = SNX (bs); i--; /* yes, slurp it */ } + if (!i) /* Make sure we don't get an overflow for */ + break; /* messages ending on \015 (or the following */ + /* i-- will cause i to be MAXINT. Not good.) */ case '\012': /* at start of a line, start with -- ? */ if (i-- && ((c = SNX (bs)) == '-') && i-- && ((c = SNX (bs)) == '-')) { /* see if cookie matches */ imap-2002d-ssltype.patch: --- NEW FILE imap-2002d-ssltype.patch --- *** imap-2002d.orig/Makefile 2003-04-16 20:32:42.000000000 -0400 --- imap-2002d/Makefile 2003-07-11 15:47:30.000000000 -0400 *************** *** 419,427 **** @echo + In order to rectify this problem, you MUST build with: @echo ++ SSLTYPE=$(SSLTYPE).nopwd @echo +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - @echo - @echo Do you want to continue this build anyway? Type y or n please: - @$(SH) -c 'read x; case "$$x" in y) exit 0;; *) exit 1;; esac' sslnone: @echo +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ --- 419,424 ---- *************** *** 434,442 **** @echo ++ SSLTYPE=nopwd @echo + You must also have OpenSSL or equivalent installed. @echo +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - @echo - @echo Do you want to continue this build anyway? Type y or n please: - @$(SH) -c 'read x; case "$$x" in y) exit 0;; *) exit 1;; esac' # C compiler types --- 431,436 ---- imap-2002e-authmd5.patch: --- NEW FILE imap-2002e-authmd5.patch --- Make some more functions static to prevent such horrible namespace pollution. --- imap-2002e/src/c-client/auth_md5.c.authmd5 2004-03-02 17:25:43.000000000 +0000 +++ imap-2002e/src/c-client/auth_md5.c 2004-03-02 17:25:51.000000000 +0000 @@ -34,17 +34,17 @@ /* Prototypes */ -long auth_md5_valid (void); -long auth_md5_client (authchallenge_t challenger,authrespond_t responder, +static long auth_md5_valid (void); +static long auth_md5_client (authchallenge_t challenger,authrespond_t responder, char *service,NETMBX *mb,void *stream, unsigned long *trial,char *user); -char *auth_md5_server (authresponse_t responder,int argc,char *argv[]); -char *auth_md5_pwd (char *user); +static char *auth_md5_server (authresponse_t responder,int argc,char *argv[]); +static char *auth_md5_pwd (char *user); char *apop_login (char *chal,char *user,char *md5,int argc,char *argv[]); -char *hmac_md5 (char *text,unsigned long tl,char *key,unsigned long kl); -void md5_init (MD5CONTEXT *ctx); -void md5_update (MD5CONTEXT *ctx,unsigned char *data,unsigned long len); -void md5_final (unsigned char *digest,MD5CONTEXT *ctx); +static char *hmac_md5 (char *text,unsigned long tl,char *key,unsigned long kl); +static void md5_init (MD5CONTEXT *ctx); +static void md5_update (MD5CONTEXT *ctx,unsigned char *data,unsigned long len); +static void md5_final (unsigned char *digest,MD5CONTEXT *ctx); static void md5_transform (unsigned long *state,unsigned char *block); static void md5_encode (unsigned char *dst,unsigned long *src,int len); static void md5_decode (unsigned long *dst,unsigned char *src,int len); imap-2002e-shared.patch: --- NEW FILE imap-2002e-shared.patch --- --- imap-2002e/src/osdep/unix/Makefile.shared 2004-04-07 00:16:48.370334040 +0300 +++ imap-2002e/src/osdep/unix/Makefile 2004-04-07 00:18:31.458379840 +0300 @@ -131,6 +131,10 @@ EXTRADRIVERS='$(EXTRADRIVERS)' EXTRAAUTHENTICATORS='$(EXTRAAUTHENTICATORS)'\ PASSWDTYPE=$(PASSWDTYPE) SSLTYPE=$(SSLTYPE) +# Need this for the shared library rule to work correctly +.SUFFIXES: .o .so +SOFILES=${BINARIES:.o=.so} + # Here if no make argument established @@ -762,18 +766,24 @@ # Build it! -build: clean once $(ARCHIVE) +build: clean once $(ARCHIVE) $(SHLIBNAME) -all: $(ARCHIVE) +all: $(ARCHIVE) $(SHLIBNAME) $(ARCHIVE): $(BINARIES) sh -c '$(RM) $(ARCHIVE) || true' @$(CAT) ARCHIVE @$(SH) ARCHIVE -.c.o: - `$(CAT) CCTYPE` -c `$(CAT) CFLAGS` $*.c +$(SHLIBNAME): $(SOFILES) + gcc -shared -Wl,-soname,$(SHLIBNAME) -o $(SHLIBNAME) $(SOFILES) `cat LDFLAGS` + ln -s $(SHLIBNAME) lib$(SHLIBBASE).so + +.c.so: osdep.h + $(CC) -fPIC -DPIC -D_REENTRANT -c `$(CAT) CFLAGS` ${@:.so=.c} -o $@ +.c.o: + $(CC) -c `$(CAT) CFLAGS` $*.c # Cleanup @@ -812,7 +822,7 @@ # OS-dependent -osdep.o:mail.h misc.h env.h fs.h ftl.h nl.h tcp.h \ +OSDEPS= mail.h misc.h env.h fs.h ftl.h nl.h tcp.h \ osdep.h env_unix.h tcp_unix.h \ osdep.c env_unix.c fs_unix.c ftl_unix.c nl_unix.c tcp_unix.c \ auths.c crexcl.c flocksim.c nfstest.c flcksafe.c fsync.c gethstid.c \ @@ -825,12 +835,19 @@ write.c sslstdio.c \ strerror.c strpbrk.c strstr.c strtok.c strtoul.c \ OSCFLAGS + +osdep.o: $(OSDEPS) + $(CC) $(CFLAGS) `$(CAT) OSCFLAGS` -c osdep.c + @echo ======================================================================== @echo Building OS-dependent module @echo If you get No such file error messages for files x509.h, ssl.h, @echo pem.h, buffer.h, bio.h, and crypto.h, that means that OpenSSL @echo is not installed on your system. Either install OpenSSL first @echo or build with command: make `$(CAT) OSTYPE` SSLTYPE=none - `$(CAT) CCTYPE` -c `$(CAT) CFLAGS` `$(CAT) OSCFLAGS` -c osdep.c + @echo ======================================================================== + +osdep.so: $(OSDEPS) + $(CC) -fPIC -DPIC -D_REENTRANT -c $(CFLAGS) `cat OSCFLAGS` osdep.c -o $@ osdep.c: osdepbas.c osdepckp.c osdeplog.c osdepssl.c $(CAT) osdepbas.c osdepckp.c osdeplog.c osdepssl.c > osdep.c imap-2004-paths.patch: --- NEW FILE imap-2004-paths.patch --- --- imap-2004/src/osdep/unix/Makefile.linux-patch 2004-07-07 09:33:00.000000000 -0500 +++ imap-2004/src/osdep/unix/Makefile 2004-07-07 09:33:00.000000000 -0500 @@ -71,14 +71,13 @@ LOGINPW=std SIGTYPE=bsd CRXTYPE=std -ACTIVEFILE=/usr/lib/news/active -SPOOLDIR=/usr/spool +ACTIVEFILE=/var/lib/news/active +SPOOLDIR=/var/spool MAILSPOOL=$(SPOOLDIR)/mail NEWSSPOOL=$(SPOOLDIR)/news -RSHPATH=/usr/ucb/rsh +RSHPATH=/usr/bin/rsh LOCKPGM=/etc/mlock - # Default formats for creating new mailboxes and for empty mailboxes in the # default namespace; must be set to the associated driver's prototype. # imap-2004c1-mbxproto.patch: --- NEW FILE imap-2004c1-mbxproto.patch --- --- imap-2004c1/src/osdep/unix/Makefile.mbxproto 2005-04-28 12:44:53.000000000 -0500 +++ imap-2004c1/src/osdep/unix/Makefile 2005-04-28 12:59:29.000000000 -0500 @@ -91,7 +91,7 @@ # set certain other formats (e.g. mbx and mx) as the EMPTYPROTO since these # formats can never be empty files. -CREATEPROTO=unixproto +CREATEPROTO=mbxproto EMPTYPROTO=unixproto imap-2004d-optflags.patch: --- NEW FILE imap-2004d-optflags.patch --- --- imap-2004d/src/osdep/unix/Makefile.optflags 2005-04-29 12:53:09.000000000 -0500 +++ imap-2004d/src/osdep/unix/Makefile 2005-04-29 12:55:16.000000000 -0500 @@ -36,7 +36,7 @@ # -O3 seems to be safe, but empirical observation from our local expert # indicates that in some (many?) cases -O3 code runs slower than -O2. -GCCOPTLEVEL= -O2 +GCCOPTLEVEL= -O2 $(RPM_OPT_FLAGS) # Extended flags needed for SSL. You may need to modify. @@ -454,7 +454,7 @@ SPOOLDIR=/var/spool \ ACTIVEFILE=/var/lib/news/active \ RSHPATH=/usr/bin/rsh \ - BASECFLAGS="-g -fno-omit-frame-pointer $(GCCOPTLEVEL)" \ + BASECFLAGS="$(GCCOPTLEVEL)" \ BASELDFLAGS="$(PAMLDFLAGS)" lnx: # Linux non-shadow passwords --- NEW FILE imap-xinetd --- # default: off # description: The IMAP service allows remote users to access their mail using \ # an IMAP client such as Mutt, Pine, fetchmail, or Netscape \ # Communicator. service imap { socket_type = stream wait = no user = root server = /usr/sbin/imapd log_on_success += HOST DURATION log_on_failure += HOST disable = yes } --- NEW FILE imap.pamd --- #%PAM-1.0 auth required pam_stack.so service=system-auth account required pam_stack.so service=system-auth --- NEW FILE imaps-xinetd --- # default: off # description: The IMAPS service allows remote users to access their mail \ # using an IMAP client with SSL support such as Netscape \ # Communicator or fetchmail. service imaps { socket_type = stream wait = no user = root server = /usr/sbin/imapd log_on_success += HOST DURATION log_on_failure += HOST disable = yes } --- NEW FILE ipop2-xinetd --- # default: off # description: The POP2 service allows remote users to access their mail \ # using an POP2 client such as fetchmail. In most cases, clients \ # support POP3 instead of POP2, so enabling this service is rarely \ # necessary. service pop2 { socket_type = stream wait = no user = root server = /usr/sbin/ipop2d log_on_success += HOST DURATION log_on_failure += HOST disable = yes } --- NEW FILE ipop3-xinetd --- # default: off # description: The POP3 service allows remote users to access their mail \ # using an POP3 client such as Netscape Communicator, mutt, \ # or fetchmail. service pop3 { socket_type = stream wait = no user = root server = /usr/sbin/ipop3d log_on_success += HOST DURATION log_on_failure += HOST disable = yes } --- NEW FILE pop3s-xinetd --- # default: off # description: The POP3S service allows remote users to access their mail \ # using an POP3 client with SSL support such as fetchmail. service pop3s { socket_type = stream wait = no user = root server = /usr/sbin/ipop3d log_on_success += HOST DURATION log_on_failure += HOST disable = yes } --- NEW FILE uw-imap.spec --- # $Id: imap.spec,v 1.4 2004/07/23 14:41:13 rexdieter Exp $ # Change the default connected directory from the user's home directory # to the named subdirectory of the user's home directory %define mail_subdirectory Mail Summary: UW Server daemons for IMAP and POP network mail protocols Name: uw-imap #Epoch: 1 Version: 2004g Release: 1%{?dist} License: University of Washington Free-Fork License Group: System Environment/Daemons URL: http://www.washington.edu/imap/ # Old (non-latest) releases live at ftp://ftp.cac.washington.edu/imap/old/ Source: ftp://ftp.cac.washington.edu/imap/imap-2004g.tar.Z BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %define soname c-client %define somajver %{version} %define shlibname lib%{soname}.so.%{somajver} %define imap_libs lib%{soname}%{somajver} #Old naming #define imap_libs imap-libs # FC4 uses %%_sysconfdir/pki/tls/certs, previous releases used %%_datadir/ssl/certs %define sslcerts %{expand:%(if [ -d %{_sysconfdir}/pki/tls/certs ]; then echo "%{_sysconfdir}/pki/tls/certs"; else echo "%{_datadir}/ssl/certs"; fi)} # imap -> uw-imap rename Obsoletes: imap < 1:%{version} Source1: imap.pamd Source3: imap-xinetd Source4: ipop2-xinetd Source5: ipop3-xinetd Source6: imaps-xinetd Source7: pop3s-xinetd Source9: README.IMAPS Patch1: imap-2004-paths.patch Patch2: imap-2004d-optflags.patch Patch5: imap-2001a-overflow.patch Patch7: imap-2002d-ssltype.patch Patch9: imap-2002e-shared.patch Patch10: imap-2002e-authmd5.patch Patch11: imap-2004c1-mbxproto.patch # for legacy machines BuildRequires: krb5-devel BuildRequires: openssl-devel BuildRequires: pam-devel # Prereq is shorter than separate Requires, Requires(post), Requires(postun) Prereq: xinetd Requires(post): openssl Requires(triggerpostun): sed >= 4.0 %description The %{name} package provides UW server daemons for both the IMAP (Internet Message Access Protocol) and POP (Post Office Protocol) mail access protocols. The POP protocol uses a "post office" machine to collect mail for users and allows users to download their mail to their local machine for reading. The IMAP protocol allows a user to read mail on a remote machine without downloading it to their local machine. %package -n %{imap_libs} Summary: UW C-client mail library Group: System Environment/Libraries %description -n %{imap_libs} Provides a common API for accessing mailboxes. %package devel Summary: Development tools for programs which will use the UW IMAP library Group: Development/Libraries Requires: %{imap_libs} = %{version}-%{release} # imap -> uw-imap rename Obsoletes: imap-devel < 1:%{version} Conflicts: libc-client-devel %description devel Contains the header files and static libraries for developing programs which will use the UW C-client common API. %package utils Summary: UW IMAP Utilities to make managing your email simpler Group: Applications/System # imap -> uw-imap rename Obsoletes: imap-utils < 1:%{version} %description utils This package contains some utilities for managing UW IMAP email. %prep %setup -q -n imap-%{version} %patch1 -p1 -b .paths %patch2 -p1 -b .optflags %patch5 -p1 -b .overflow %patch7 -p1 -b .ssltype %patch9 -p1 -b .shared %patch10 -p1 -b .authmd5 # use mbx (instead of unix/mbox) folder format by default %patch11 -p1 -b .mbxproto install -m644 %{SOURCE9} README.IMAPS sed -i -e "s|@@SSLCERTS@@|%{sslcerts}|" README.IMAPS %build # Not sure why this is included, omitting for now -- Rex #EXTRACFLAGS="$EXTRACFLAGS -DDISABLE_POP_PROXY=1" # Kerberos setup (proabably legacy-only -- Rex) if [ -x %{_sysconfdir}/profile.d/krb5.sh ]; then . %{_sysconfdir}/profile.d/krb5.sh elif ! echo ${PATH} | grep -q %{_prefix}kerberos/bin ; then export PATH=%{_prefix}/kerberos/bin:${PATH} fi GSSDIR=$(krb5-config --prefix) # SSL setup (probably legacy-only -- Rex) export EXTRACFLAGS="$EXTRACFLAGS $(pkg-config --cflags openssl 2>/dev/null)" make %{?_smp_mflags} lnp \ EXTRACFLAGS="$EXTRACFLAGS" \ EXTRALDFLAGS="$EXTRALDFLAGS" \ EXTRAAUTHENTICATORS=gss \ SPECIALS="GSSDIR=${GSSDIR} LOCKPGM=%{_sbindir}/mlock SSLCERTS=%{sslcerts} SSLDIR=%{_datadir}/ssl SSLINCLUDE=%{_includedir}/openssl SSLLIB=%{_libdir}" \ SSLTYPE=unix \ CCLIENTLIB=$(pwd)/c-client/%{shlibname} \ SHLIBBASE=%{soname} \ SHLIBNAME=%{shlibname} # Blank line %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT%{_libdir} install -p -m644 ./c-client/c-client.a $RPM_BUILD_ROOT%{_libdir}/ ln -s c-client.a $RPM_BUILD_ROOT%{_libdir}/libc-client.a install -p -m755 ./c-client/%{shlibname} $RPM_BUILD_ROOT%{_libdir}/ ln -s %{shlibname} $RPM_BUILD_ROOT%{_libdir}/lib%{soname}.so mkdir -p $RPM_BUILD_ROOT%{_includedir}/imap install -m644 ./c-client/*.h $RPM_BUILD_ROOT%{_includedir}/imap # Added linkage.c to fix (#34658) install -m644 ./c-client/linkage.c $RPM_BUILD_ROOT%{_includedir}/imap install -m644 ./src/osdep/tops-20/shortsym.h $RPM_BUILD_ROOT%{_includedir}/imap mkdir -p $RPM_BUILD_ROOT%{_mandir}/man8 install -p -m644 src/{ipopd/ipopd,imapd/imapd}.8 $RPM_BUILD_ROOT%{_mandir}/man8/ mkdir -p $RPM_BUILD_ROOT%{_sbindir} install -p -m755 ipopd/ipop{2d,3d} $RPM_BUILD_ROOT%{_sbindir}/ install -p -m755 imapd/imapd $RPM_BUILD_ROOT%{_sbindir}/ install -p -m755 mlock/mlock $RPM_BUILD_ROOT%{_sbindir}/ mkdir -p $RPM_BUILD_ROOT%{_bindir} install -p -m755 dmail/dmail mailutil/mailutil mtest/mtest tmail/tmail $RPM_BUILD_ROOT%{_bindir}/ mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1 install -p -m644 src/{dmail/dmail,mailutil/mailutil,tmail/tmail}.1 $RPM_BUILD_ROOT%{_mandir}/man1/ mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/pam.d install -p -m644 -D ${RPM_SOURCE_DIR}/imap.pamd $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/imap install -p -m644 -D ${RPM_SOURCE_DIR}/imap.pamd $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/pop mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d/ install -p -m644 -D %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d/imap install -p -m644 -D %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d/imaps install -p -m644 -D %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d/ipop2 install -p -m644 -D %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d/ipop3 install -p -m644 -D %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d/pop3s # Generate ghost *.pem files mkdir -p $RPM_BUILD_ROOT%{sslcerts} touch $RPM_BUILD_ROOT%{sslcerts}/{imapd,ipop3d}.pem # c-client.cf: mail_subdirectory cat > c-client.cf < /dev/null || : for CERT in imapd.pem ipop3d.pem ;do if [ ! -e $CERT ];then if [ -e stunnel.pem ];then cp stunnel.pem $CERT &> /dev/null || : elif [ -e Makefile ];then make $CERT << EOF &> /dev/null || : -- SomeState SomeCity SomeOrganization SomeOrganizationalUnit localhost.localdomain root at localhost.localdomain EOF fi fi done } || : /sbin/service xinetd reload > /dev/null 2>&1 || : %postun /sbin/service xinetd reload > /dev/null 2>&1 || : %post -n %{imap_libs} -p /sbin/ldconfig %postun -n %{imap_libs} -p /sbin/ldconfig %triggerpostun -- imap < 1:2004 #if upgrading from old version, don't change/set (default) MailDir if [ -r %{_sysconfdir}/c-client.cf ]; then if grep -q "^set mail-subdirectory %{mail_subdirectory}" %{_sysconfdir}/c-client.cf; then sed -i -e 's/^set mail-subdirectory/\#set mail-subdirectory/g' \ %{_sysconfdir}/c-client.cf fi fi %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) %doc README.IMAPS docs/CONFIG %config %{_sysconfdir}/pam.d/imap %config %{_sysconfdir}/pam.d/pop %config(noreplace) %{_sysconfdir}/xinetd.d/imap %config(noreplace) %{_sysconfdir}/xinetd.d/ipop2 %config(noreplace) %{_sysconfdir}/xinetd.d/ipop3 # These need to be replaced (ie, can't use %%noreplace), or imaps/pop3s will fail after an upgrade %config %{_sysconfdir}/xinetd.d/imaps %config %{_sysconfdir}/xinetd.d/pop3s %attr(0600,root,root) %ghost %config(missingok,noreplace) %verify(not md5 size mtime) %{sslcerts}/imapd.pem %attr(0600,root,root) %ghost %config(missingok,noreplace) %verify(not md5 size mtime) %{sslcerts}/ipop3d.pem %config(noreplace) %{_sysconfdir}/c-client.cf %{_mandir}/man8/* %{_sbindir}/ipop2d %{_sbindir}/ipop3d %{_sbindir}/imapd %files utils %defattr(-,root,root) %{_bindir}/* %attr(2755, root, mail) %{_sbindir}/mlock %{_mandir}/man1/* %files -n lib%{soname}%{version} %defattr(-,root,root) %doc docs/RELNOTES docs/*.txt %doc docs/CONFIG %{_libdir}/lib%{soname}.so.* %files devel %defattr(-,root,root) %doc docs/SSLBUILD %{_includedir}/imap %{_libdir}/c-client.a %{_libdir}/libc-client.a %{_libdir}/lib%{soname}.so %changelog * Mon Sep 26 2005 Rex Dieter 2004g-1 - imap-2004g - /etc -> %%_sysconfdir - use %%{?_smp_mflags} * Mon Aug 15 2005 Rex Dieter 2004e-1 - imap-2004e - rename: imap -> uw-imap (yay, we get to drop the Epoch) - sslcerts=%{_sysconfdir}/pki/tls/certs if exists, else /usr/share/ssl/certs * Fri Apr 29 2005 Rex Dieter 1:2004d-1 - 2004d - imap-libs -> lib%%{soname}%%{version} (ie, libc-client2004d), so we can have multiple versions (shared-lib only) installed - move mlock to -utils. - revert RFC2301, locks out too many folks where SSL is unavailable * Thu Apr 28 2005 Rex Dieter 1:2004-0.fdr.11.c1 - change default driver from mbox to mbx - comply with RFC 3501 security: Unencrypted plaintext passwords are prohibited * Fri Jan 28 2005 Rex Dieter 1:2004-0.fdr.10.c1 - imap-2004c1 security release: http://www.kb.cert.org/vuls/id/702777 * Thu Jan 20 2005 Rex Dieter 1:2004-0.fdr.9.c - imap2004c - -utils: dmail,mailutil,tmail - -libs: include mlock (so it's available for other imap clients, like pine) - remove extraneous patches - %%_sysconfigdir/c-client.cf: use to set MailDir (but don't if upgrading from an older version (ie, if folks don't want/expect a change in behavior) * Mon Sep 13 2004 Rex Dieter 1:2004-0.fdr.7.a - mailsubdir patch (default to ~/Mail instead of ~) * Fri Jul 23 2004 Rex Dieter 1:2004-0.fdr.6.a - remove Obsoletes/Provides: libc-client (they can, in fact, co-xist) - -devel: remove O/P: libc-client-devel -> Conflicts: libc-client-devel * Thu Jul 16 2004 Rex Dieter 1:2004-0.fdr.5.a - imap2004a * Tue Jul 13 2004 Rex Dieter 1:2004-0.fdr.4 - -devel: Req: %%{name}-libs * Tue Jul 13 2004 Rex Dieter 1:2004-0.fdr.3 - previous imap pkgs had Epoch: 1, we need it too. * Wed Jul 07 2004 Rex Dieter 2004-0.fdr.2 - use %%version as %%somajver (like how openssl does it) * Wed Jul 07 2004 Rex Dieter 2004-0.fdr.1 - imap-2004 - use mlock, if available. - Since libc-client is an attrocious name choice, we'll trump it, and provide imap, imap-libs, imap-devel instead (redhat bug #120873) * Wed Apr 07 2004 Kaj J. Niemi 2002e-4 - Use CFLAGS (and RPM_OPT_FLAGS) during the compilation - Build the .so through gcc instead of directly calling ld * Fri Mar 5 2004 Joe Orton 2002e-3 - install .so with permissions 0755 - make auth_md5.c functions static to avoid symbol conflicts - remove Epoch: 0 * Tue Mar 02 2004 Kaj J. Niemi 0:2002e-2 - "lnp" already uses RPM_OPT_FLAGS - have us conflict with imap, imap-devel * Tue Mar 2 2004 Joe Orton 0:2002e-1 - add post/postun, always use -fPIC * Tue Feb 24 2004 Kaj J. Niemi - Name change from c-client to libc-client * Sat Feb 14 2004 Kaj J. Niemi 0:2002e-0.1 - c-client 2002e is based on imap-2002d - Build shared version, build logic is copied from FreeBSD net/cclient Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/uw-imap/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 26 Sep 2005 20:24:17 -0000 1.1 +++ .cvsignore 26 Sep 2005 20:26:23 -0000 1.2 @@ -0,0 +1 @@ +imap-2004g.tar.Z Index: sources =================================================================== RCS file: /cvs/extras/rpms/uw-imap/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 26 Sep 2005 20:24:17 -0000 1.1 +++ sources 26 Sep 2005 20:26:23 -0000 1.2 @@ -0,0 +1 @@ +9a80f58d8d6a0979c13714ae69050020 imap-2004g.tar.Z From fedora-extras-commits at redhat.com Mon Sep 26 20:28:45 2005 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Mon, 26 Sep 2005 16:28:45 -0400 Subject: rpms/freeciv/devel .cvsignore, 1.8, 1.9 freeciv.spec, 1.15, 1.16 sources, 1.8, 1.9 Message-ID: <200509262028.j8QKSjrB024754@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/freeciv/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24731 Modified Files: .cvsignore freeciv.spec sources Log Message: * Mon Sep 26 2005 Brian Pepple - 2.0.6-3 - Update to 2.0.6. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/freeciv/devel/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 2 Sep 2005 14:35:12 -0000 1.8 +++ .cvsignore 26 Sep 2005 20:28:43 -0000 1.9 @@ -1,2 +1,2 @@ -freeciv-2.0.5.tar.bz2 +freeciv-2.0.6.tar.bz2 stdsounds3.tar.gz Index: freeciv.spec =================================================================== RCS file: /cvs/extras/rpms/freeciv/devel/freeciv.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- freeciv.spec 2 Sep 2005 14:35:12 -0000 1.15 +++ freeciv.spec 26 Sep 2005 20:28:43 -0000 1.16 @@ -1,5 +1,5 @@ Name: freeciv -Version: 2.0.5 +Version: 2.0.6 Release: 3%{?dist} Summary: The Freeciv multi-player strategy game @@ -90,6 +90,9 @@ %{_mandir}/man6/civclient.6.gz %changelog +* Mon Sep 26 2005 Brian Pepple - 2.0.6-3 +- Update to 2.0.6. + * Fri Sep 2 2005 Brian Pepple - 2.0.5-3 - Update to 2.0.5. - Enable debug info. Index: sources =================================================================== RCS file: /cvs/extras/rpms/freeciv/devel/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 2 Sep 2005 14:35:12 -0000 1.8 +++ sources 26 Sep 2005 20:28:43 -0000 1.9 @@ -1,2 +1,2 @@ -cc224a166f914b3404291c6fe997f90a freeciv-2.0.5.tar.bz2 +ba694b804beee7b9c09b5be1f303f7aa freeciv-2.0.6.tar.bz2 77215914712f2f351092918f5e41e39e stdsounds3.tar.gz From fedora-extras-commits at redhat.com Mon Sep 26 20:30:53 2005 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Mon, 26 Sep 2005 16:30:53 -0400 Subject: rpms/freeciv/FC-4 .cvsignore, 1.8, 1.9 freeciv.spec, 1.13, 1.14 sources, 1.8, 1.9 Message-ID: <200509262030.j8QKUrb0024839@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/freeciv/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24816 Modified Files: .cvsignore freeciv.spec sources Log Message: * Mon Sep 26 2005 Brian Pepple - 2.0.6-2 - Update to 2.0.6. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/freeciv/FC-4/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 2 Sep 2005 14:36:47 -0000 1.8 +++ .cvsignore 26 Sep 2005 20:30:51 -0000 1.9 @@ -1,2 +1,2 @@ -freeciv-2.0.5.tar.bz2 +freeciv-2.0.6.tar.bz2 stdsounds3.tar.gz Index: freeciv.spec =================================================================== RCS file: /cvs/extras/rpms/freeciv/FC-4/freeciv.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- freeciv.spec 2 Sep 2005 14:36:47 -0000 1.13 +++ freeciv.spec 26 Sep 2005 20:30:51 -0000 1.14 @@ -1,5 +1,5 @@ Name: freeciv -Version: 2.0.5 +Version: 2.0.6 Release: 2%{?dist} Summary: The Freeciv multi-player strategy game @@ -90,6 +90,9 @@ %{_mandir}/man6/civclient.6.gz %changelog +* Mon Sep 26 2005 Brian Pepple - 2.0.6-2 +- Update to 2.0.6. + * Fri Sep 2 2005 Brian Pepple - 2.0.5-2 - Updateto 2.0.5. - Enable debug info. Index: sources =================================================================== RCS file: /cvs/extras/rpms/freeciv/FC-4/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 2 Sep 2005 14:36:48 -0000 1.8 +++ sources 26 Sep 2005 20:30:51 -0000 1.9 @@ -1,2 +1,2 @@ -cc224a166f914b3404291c6fe997f90a freeciv-2.0.5.tar.bz2 +ba694b804beee7b9c09b5be1f303f7aa freeciv-2.0.6.tar.bz2 77215914712f2f351092918f5e41e39e stdsounds3.tar.gz From fedora-extras-commits at redhat.com Mon Sep 26 21:49:40 2005 From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc)) Date: Mon, 26 Sep 2005 17:49:40 -0400 Subject: rpms/phpldapadmin - New directory Message-ID: <200509262149.j8QLneLd028183@cvs-int.fedora.redhat.com> Author: buc Update of /cvs/extras/rpms/phpldapadmin In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28163/phpldapadmin Log Message: Directory /cvs/extras/rpms/phpldapadmin added to the repository From fedora-extras-commits at redhat.com Mon Sep 26 21:49:40 2005 From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc)) Date: Mon, 26 Sep 2005 17:49:40 -0400 Subject: rpms/phpldapadmin/devel - New directory Message-ID: <200509262149.j8QLne75028188@cvs-int.fedora.redhat.com> Author: buc Update of /cvs/extras/rpms/phpldapadmin/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28163/phpldapadmin/devel Log Message: Directory /cvs/extras/rpms/phpldapadmin/devel added to the repository From fedora-extras-commits at redhat.com Mon Sep 26 21:50:16 2005 From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc)) Date: Mon, 26 Sep 2005 17:50:16 -0400 Subject: rpms/phpldapadmin Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200509262150.j8QLoG0f028244@cvs-int.fedora.redhat.com> Author: buc Update of /cvs/extras/rpms/phpldapadmin In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28213 Added Files: Makefile import.log Log Message: Setup of module phpldapadmin --- NEW FILE Makefile --- # Top level Makefile for module phpldapadmin all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Mon Sep 26 21:50:16 2005 From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc)) Date: Mon, 26 Sep 2005 17:50:16 -0400 Subject: rpms/phpldapadmin/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200509262150.j8QLoGFn028245@cvs-int.fedora.redhat.com> Author: buc Update of /cvs/extras/rpms/phpldapadmin/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28213/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module phpldapadmin --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Mon Sep 26 21:52:09 2005 From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc)) Date: Mon, 26 Sep 2005 17:52:09 -0400 Subject: rpms/phpldapadmin import.log,1.1,1.2 Message-ID: <200509262152.j8QLq9Du028346@cvs-int.fedora.redhat.com> Author: buc Update of /cvs/extras/rpms/phpldapadmin In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28306 Modified Files: import.log Log Message: auto-import phpldapadmin-0.9.7-1 on branch devel from phpldapadmin-0.9.7-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/phpldapadmin/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 26 Sep 2005 21:50:13 -0000 1.1 +++ import.log 26 Sep 2005 21:52:07 -0000 1.2 @@ -0,0 +1 @@ +phpldapadmin-0_9_7-1:HEAD:phpldapadmin-0.9.7-1.src.rpm:1127771506 From fedora-extras-commits at redhat.com Mon Sep 26 21:52:09 2005 From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc)) Date: Mon, 26 Sep 2005 17:52:09 -0400 Subject: rpms/phpldapadmin/devel phpldapadmin-0.9.7-config.patch, NONE, 1.1 phpldapadmin-0.9.7-namingcontexts.patch, NONE, 1.1 phpldapadmin-0.9.7-obfuscate.patch, NONE, 1.1 phpldapadmin-0.9.7-session_opt_secret.patch, NONE, 1.1 phpldapadmin-strip-debug.sh, NONE, 1.1 phpldapadmin.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200509262152.j8QLq9Ms028356@cvs-int.fedora.redhat.com> Author: buc Update of /cvs/extras/rpms/phpldapadmin/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28306/devel Modified Files: .cvsignore sources Added Files: phpldapadmin-0.9.7-config.patch phpldapadmin-0.9.7-namingcontexts.patch phpldapadmin-0.9.7-obfuscate.patch phpldapadmin-0.9.7-session_opt_secret.patch phpldapadmin-strip-debug.sh phpldapadmin.spec Log Message: auto-import phpldapadmin-0.9.7-1 on branch devel from phpldapadmin-0.9.7-1.src.rpm phpldapadmin-0.9.7-config.patch: --- NEW FILE phpldapadmin-0.9.7-config.patch --- diff -Nrbu phpldapadmin-20050912/config.php phpldapadmin.NEW/config.php --- phpldapadmin-20050912/config.php 2005-09-13 17:23:18.000000000 +0400 +++ phpldapadmin.NEW/config.php 2005-09-12 20:14:38.000000000 +0400 @@ -21,6 +21,8 @@ * as many as you like. You can also specify your language, and * many other options. */ +// $config->custom->appearance['language'] = 'en'; +// $config->custom->appearance['show_clear_password'] = true; /** **/ /** Miscellaneous Configuration overrides **/ @@ -55,16 +57,16 @@ /* A convenient name that will appear in the tree viewer and throughout phpLDAPadmin to identify this LDAP server to users. */ -$ldapservers->SetValue($i,'server','name','My LDAP Server'); +$ldapservers->SetValue($i,'server','name','Local LDAP Server'); /* Examples: 'ldap.example.com', 'ldaps://ldap.example.com/', 'ldapi://%2fusr%local%2fvar%2frun%2fldapi' (Unix socket at /usr/local/var/run/ldap) */ -// $ldapservers->SetValue($i,'server','host','127.0.0.1'); +$ldapservers->SetValue($i,'server','host','localhost'); /* The port your LDAP server listens on (no quotes). 389 is standard. */ -// $ldapservers->SetValue($i,'server','port','389'); +$ldapservers->SetValue($i,'server','port','389'); /* Array of base DNs of your LDAP server. Leave this blank to have phpLDAPadmin auto-detect it for you. */ // $ldapservers->SetValue($i,'server','base',array('')); @@ -80,7 +82,7 @@ Choose wisely to protect your authentication information appropriately for your situation. If you choose 'cookie', your cookie contents will be encrypted using blowfish and the secret your specify above as session['blowfish']. */ -// $ldapservers->SetValue($i,'server','auth_type','cookie'); +$ldapservers->SetValue($i,'server','auth_type','session'); /* The DN of the user for phpLDAPadmin to bind with. For anonymous binds or 'cookie' or 'session' auth_types, leave the login_dn and login_pass blank. If you specify a login_attr in conjunction with a cookie or @@ -100,7 +102,7 @@ /* Default password hashing algorithm. One of md5, ssha, sha, md5crpyt, smd5, blowfish, crypt or leave blank for now default algorithm. */ -// $ldapservers->SetValue($i,'appearance','password_hash','md5'); +$ldapservers->SetValue($i,'appearance','password_hash',''); /* If you specified 'cookie' or 'session' as the auth_type above, you can optionally specify here an attribute to use when logging in. If you enter 'uid' and login as 'dsmith', phpLDAPadmin will search for (uid=dsmith) @@ -108,7 +110,7 @@ LDAP server requires you to login to perform searches, you can enter the DN to use when searching in 'login_dn' and 'login_pass' above. You may also specify 'string', in which case you can provide a string to use for logging users in. See 'login_string' directly below. */ -// $ldapservers->SetValue($i,'login','attr','uid'); +$ldapservers->SetValue($i,'login','attr','uid'); /* If you specified 'cookie' or 'session' as the auth_type above, and you specified 'string' for 'login_attr' above, you must provide a string here for logging users in. If, for example, I have a lot of user entries with @@ -192,7 +194,7 @@ $i++; $ldapservers->SetValue($i,'server','name','LDAP Server'); -$ldapservers->SetValue($i,'server','host','127.0.0.1'); +$ldapservers->SetValue($i,'server','host',''); $ldapservers->SetValue($i,'server','port','389'); $ldapservers->SetValue($i,'server','base',array('')); $ldapservers->SetValue($i,'server','auth_type','cookie'); phpldapadmin-0.9.7-namingcontexts.patch: --- NEW FILE phpldapadmin-0.9.7-namingcontexts.patch --- diff -Nrbu phpldapadmin-20050912/server_functions.php phpldapadmin.NEW/server_functions.php --- phpldapadmin-20050912/server_functions.php 2005-09-11 09:23:19.000000000 +0400 +++ phpldapadmin.NEW/server_functions.php 2005-09-12 19:57:28.000000000 +0400 @@ -339,6 +339,16 @@ return $this->_baseDN; + } + /* May be there is a bug in php-ldap module -- it cannot handle + empty `dn' value (as returned here at least by OpenLdap servers), + and fill it by the next attribute value (i.e., `namingcontexts'), + and the next attribute disappears... + Therefore ugly hacking here. + */ + else if( isset( $r[0]['dn'] ) ) { + $this->_baseDN = array ($r[0]['dn']); + return $this->_baseDN; } else { return array(''); } phpldapadmin-0.9.7-obfuscate.patch: --- NEW FILE phpldapadmin-0.9.7-obfuscate.patch --- diff -Nru phpldapadmin.OLD/compare.php phpldapadmin.NEW/compare.php --- phpldapadmin.OLD/compare.php 2005-09-04 22:41:54.000000000 +0400 +++ phpldapadmin.NEW/compare.php 2005-09-23 20:18:48.000000000 +0400 @@ -348,7 +348,7 @@ GetValue('appearance','obfuscate_password_display') || is_null( $enc_type ) ) { + if( obfuscate_password_display( $enc_type ) ) { echo htmlspecialchars( preg_replace( "/./", "*", $user_password ) ); } else { echo htmlspecialchars( $user_password ); diff -Nru phpldapadmin.OLD/template_engine.php phpldapadmin.NEW/template_engine.php --- phpldapadmin.OLD/template_engine.php 2005-09-18 00:43:17.000000000 +0400 +++ phpldapadmin.NEW/template_engine.php 2005-09-23 21:00:50.000000000 +0400 @@ -793,7 +793,12 @@ } ?>
        - + " name="new_values[userpassword]" value="" /> diff -Nru phpldapadmin.OLD/templates/modification/default.php phpldapadmin.NEW/templates/modification/default.php --- phpldapadmin.OLD/templates/modification/default.php 2005-04-26 13:48:56.000000000 +0400 +++ phpldapadmin.NEW/templates/modification/default.php 2005-09-23 20:55:43.000000000 +0400 @@ -472,7 +472,7 @@ name="old_enc_type" value="" /> -
        diff -Nru phpldapadmin.OLD/update_confirm.php phpldapadmin.NEW/update_confirm.php --- phpldapadmin.OLD/update_confirm.php 2005-08-27 20:18:52.000000000 +0400 +++ phpldapadmin.NEW/update_confirm.php 2005-09-23 20:45:37.000000000 +0400 @@ -143,7 +143,7 @@ echo nl2br( htmlspecialchars( $v ) ) . "
        "; else if( 0 == strcasecmp( $attr, 'userPassword' ) - && ( $config->GetValue('appearance','obfuscate_password_display') || is_null( get_enc_type( $old_values[ $attr ] ) ) ) ) + && obfuscate_password_display( get_enc_type( $old_values[ $attr ] ) ) ) echo preg_replace( '/./', '*', $old_values[ $attr ] ) . "
        "; @@ -174,9 +174,9 @@ } } - elseif( $new_val != '' ) + elseif( $new_val != '' ) if( 0 == strcasecmp( $attr, 'userPassword' ) && - ( $config->GetValue('appearance','obfuscate_password_display') || is_null( get_enc_type( $new_values[ $attr ] ) ) ) ) + obfuscate_password_display( get_enc_type( $new_values[ $attr ] ) ) ) echo preg_replace( '/./', '*', $new_val ) . "
        "; phpldapadmin-0.9.7-session_opt_secret.patch: --- NEW FILE phpldapadmin-0.9.7-session_opt_secret.patch --- diff -Nrbu phpldapadmin-0.9.7/functions.php phpldapadmin-0.9.7-OK/functions.php --- phpldapadmin-0.9.7/functions.php 2005-09-25 20:11:44.000000000 +0400 +++ phpldapadmin-0.9.7-OK/functions.php 2005-09-26 17:50:07.000000000 +0400 @@ -386,8 +386,13 @@ $password = '0'; } + if( no_blowfish_secret() ) { + $_SESSION[ $sess_var_dn_name ] = $dn; + $_SESSION[ $sess_var_pass_name ] = $password; + } else { $_SESSION[ $sess_var_dn_name ] = pla_blowfish_encrypt( $dn ); $_SESSION[ $sess_var_pass_name ] = pla_blowfish_encrypt ( $password ); + } return true; break; default: @@ -1385,6 +1390,8 @@ if( $pass == '0' ) return null; + else if( no_blowfish_secret() ) + return $pass; else return pla_blowfish_decrypt ( $pass ); break; @@ -1434,9 +1441,12 @@ case 'session': $session_var_name = sprintf('pla_login_dn_%s',$ldapserver->server_id); - if (isset($_SESSION[$session_var_name])) - $return = pla_blowfish_decrypt($_SESSION[$session_var_name]); + if (isset($_SESSION[$session_var_name])) { + if (no_blowfish_secret() ) + $return = $_SESSION[$session_var_name]; else + $return = pla_blowfish_decrypt($_SESSION[$session_var_name]); + } else $return = false; break; @@ -3629,6 +3639,17 @@ return $return; } +function no_blowfish_secret() { + global $config; + + $return = $config->GetValue('session','blowfish'); + + if (! trim($return)) + return true; + + return false; +} + /** * Encryption using blowfish algorithm * --- NEW FILE phpldapadmin-strip-debug.sh --- #!/bin/sh [ $# -lt 1 ] && exit 1 awk '{ if (cont) { if ($0 ~ ";") { sub ("^[^;]*;", "") cont = 0 if ($0 ~ "^[ ]*$") next } else next } if ($0 ~ "debug_log[ ]*\\(.*;") { sub ("debug_log[^;]*;", "") if ($0 ~ "^[ ]*$") next } if ($0 ~ "debug_log[ ]*\\(.*") { if ($0 ~ "function[ ]*debug_log") { print $0 next } sub ("debug_log.*$", "") cont = 1 if ($0 ~ "^[ ]*$") next } print $0 }' $1 >$1.tmp && mv -f $1.tmp $1 --- NEW FILE phpldapadmin.spec --- Name: phpldapadmin Summary: Web-based tool for managing LDAP servers Version: 0.9.7 Release: 1 Group: Applications/Internet License: GPL URL: http://phpldapadmin.sourceforge.net Source: http://dl.sourceforge.net/sourceforge/phpldapadmin/phpldapadmin-%{version}.tar.gz Source1: phpldapadmin-strip-debug.sh # cvs -d:pserver:anonymous at cvs.sourceforge.net:/cvsroot/phpldapadmin login ##Just type Enter as password # cvs -z3 -d:pserver:anonymous at cvs.sourceforge.net:/cvsroot/phpldapadmin co -P phpldapadmin # mv phpldapadmin phpldapadmin-YYYYMMDD # tar -cvf - phpldapadmiin-YYYYMMDD | gzip -c -9 >phpldapadmin-YYYYMMDD.tar.gz # #Source: %{name}-%{cvs}.tar.gz Patch1: phpldapadmin-0.9.7-namingcontexts.patch Patch2: phpldapadmin-0.9.7-config.patch Patch3: phpldapadmin-0.9.7-session_opt_secret.patch Patch4: phpldapadmin-0.9.7-obfuscate.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch Requires: httpd, php >= 4.1.0, php-ldap %description PhpLDAPadmin is a web-based LDAP client. It provides easy, anywhere-accessible, multi-language administration for your LDAP server. Its hierarchical tree-viewer and advanced search functionality make it intuitive to browse and administer your LDAP directory. Since it is a web application, this LDAP browser works on many platforms, making your LDAP server easily manageable from any location. PhpLDAPadmin is the perfect LDAP browser for the LDAP professional and novice alike. Its user base consists mostly of LDAP administration professionals. Edit %{_sysconfdir}/%{name}/config.php to change default (localhost) LDAP server location and other things. Edit %{_sysconfdir}/httpd/conf.d/%{name}.conf to allow access by remote web-clients. %prep %setup -q -n %{name}-%{version} cp config.php.example config.php %patch1 -p1 %patch2 -p1 %patch3 -p1 %patch4 -p1 %build # remove all "debug_log()" calls find . -name "*.php" -exec sh %{SOURCE1} {} \; -print find . \( -name "*.orig" -o -name "*~" \) -print0 | xargs -0 rm -f %install rm -rf $RPM_BUILD_ROOT install -d -m755 $RPM_BUILD_ROOT/%{_datadir}/%{name} cp -a * $RPM_BUILD_ROOT/%{_datadir}/%{name} pushd $RPM_BUILD_ROOT/%{_datadir}/%{name} rm -rf doc/ INSTALL LICENSE VERSION .cvsignore popd install -d -m755 $RPM_BUILD_ROOT/%{_sysconfdir}/%{name} mv $RPM_BUILD_ROOT/%{_datadir}/%{name}/config.php \ $RPM_BUILD_ROOT/%{_sysconfdir}/%{name} ln -s ../../../..%{_sysconfdir}/%{name}/config.php \ $RPM_BUILD_ROOT/%{_datadir}/%{name}/config.php mv $RPM_BUILD_ROOT/%{_datadir}/%{name}/config.php.example \ $RPM_BUILD_ROOT/%{_sysconfdir}/%{name} mv $RPM_BUILD_ROOT/%{_datadir}/%{name}/templates/template_config.php \ $RPM_BUILD_ROOT/%{_sysconfdir}/%{name} ln -s ../../../..%{_sysconfdir}/%{name}/template_config.php \ $RPM_BUILD_ROOT/%{_datadir}/%{name}/templates/template_config.php cat <%{name}.conf # # %{summary} # Alias /%{name} %{_datadir}/%{name} Alias /ldapadmin %{_datadir}/%{name} Order Deny,Allow Deny from all Allow from 127.0.0.1 EOF install -d $RPM_BUILD_ROOT/%{_sysconfdir}/httpd/conf.d install -m644 %{name}.conf $RPM_BUILD_ROOT/%{_sysconfdir}/httpd/conf.d %clean rm -rf $RPM_BUILD_ROOT %post if [ $1 -eq 1 ]; then set @@@ `dd bs=128 count=1 /dev/null | md5sum` sed -i -e "/session\['blowfish'\] = '';/ s/'';/'$2'; # Autogenerated for `uname -n`/" %{_sysconfdir}/%{name}/config.php fi %files %defattr(-,root,root) %config %dir %{_sysconfdir}/%{name} %attr(640,root,apache) %config(noreplace) %{_sysconfdir}/%{name}/*.php %attr(640,root,apache) %{_sysconfdir}/%{name}/*.example %config(noreplace) %{_sysconfdir}/httpd/conf.d/*.conf %{_datadir}/%{name} %doc INSTALL LICENSE doc/CREDITS doc/ChangeLog %changelog * Tue Sep 27 2005 Dmitry Butskoy - accepted for Fedora Extras devel (review by Aurelien Bompard ) * Mon Sep 26 2005 Dmitry Butskoy - 0.9.7-1 - upgrade to final 0.9.7 - strip debug stuff completely. It gives essential speedup of work. - Blowfish encryption is considered optional for "session" auth type. Add patch to allow user to disable it for performance reason (just specifying the empty key). It was a default behaviour in previous versions of phpldapadmin. - add "obfuscate" patch to better handle show_clear_password feature. - initial install allow connects from localhost only (security reasons). * Tue Sep 20 2005 Dmitry Butskoy - 0.9.7-0.3.rc3 - upgrade to 0.9.7-rc3 - add post script to generate blowfish secret on initial installations. * Thu Sep 15 2005 Dmitry Butskoy - 0.9.7-0.2.rc2 - upgrade to 0.9.7-rc2, cvs snapshot no more needed. * Tue Sep 13 2005 Dmitry Butskoy - 0.9.7-0.1.20050912 - initial release. CVS snapshot is one week later than 0.9.7-rc1 release. - add namingcontexts patch and config patch Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/phpldapadmin/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 26 Sep 2005 21:50:14 -0000 1.1 +++ .cvsignore 26 Sep 2005 21:52:07 -0000 1.2 @@ -0,0 +1 @@ +phpldapadmin-0.9.7.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/phpldapadmin/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 26 Sep 2005 21:50:14 -0000 1.1 +++ sources 26 Sep 2005 21:52:07 -0000 1.2 @@ -0,0 +1 @@ +a9a6f8dd289210a3d732552d38eb2d25 phpldapadmin-0.9.7.tar.gz From fedora-extras-commits at redhat.com Mon Sep 26 22:01:02 2005 From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc)) Date: Mon, 26 Sep 2005 18:01:02 -0400 Subject: owners owners.list,1.254,1.255 Message-ID: <200509262201.j8QM12ri029650@cvs-int.fedora.redhat.com> Author: buc Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28461 Modified Files: owners.list Log Message: Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.254 retrieving revision 1.255 diff -u -r1.254 -r1.255 --- owners.list 26 Sep 2005 19:24:49 -0000 1.254 +++ owners.list 26 Sep 2005 22:01:00 -0000 1.255 @@ -806,6 +806,7 @@ Fedora Extras|php-pecl-pdo|PECL package for PHP Data Objects Interface|matthias at rpmforge.net|extras-qa at fedoraproject.org| Fedora Extras|php-pecl-pdo-sqlite|PECL package for PHP Data Objects Interface to SQLite v3|matthias at rpmforge.net|extras-qa at fedoraproject.org| Fedora Extras|php-pecl-sqlite|PECL package for accessing SQLite databases|matthias at rpmforge.net|extras-qa at fedoraproject.org| +Fedora Extras|phpldapadmin|Web-based tool for managing LDAP servers|dmitry at butskoy.name|extras-qa at fedoraproject.org| Fedora Extras|physfs|Library to provide abstract access to various archives|tcallawa at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|pinentry|Collection of simple PIN or passphrase entry dialogs|ville.skytta at iki.fi|extras-qa at fedoraproject.org| Fedora Extras|plague|Distributed build system for RPMs|dcbw at redhat.com|extras-qa at fedoraproject.org From fedora-extras-commits at redhat.com Mon Sep 26 22:04:07 2005 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Mon, 26 Sep 2005 18:04:07 -0400 Subject: owners owners.list,1.255,1.256 Message-ID: <200509262204.j8QM4ctM029850@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29836 Modified Files: owners.list Log Message: Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.255 retrieving revision 1.256 diff -u -r1.255 -r1.256 --- owners.list 26 Sep 2005 22:01:00 -0000 1.255 +++ owners.list 26 Sep 2005 22:04:05 -0000 1.256 @@ -10,6 +10,7 @@ Fedora Extras|aalib|An ASCII art library|anvil at livna.org|extras-qa at fedoraproject.org| Fedora Extras|abcde|A Better CD Encoder|ville.skytta at iki.fi|extras-qa at fedoraproject.org| +Fedora Extras|abcm2ps|A program to typeset ABC tunes into Postscript|gemi at bluewin.ch|extras-qa at fedoraproject.org| Fedora Extras|abe|A scrolling, platform-jumping, ancient pyramid exploring game|pmatilai at laiskiainen.org|extras-qa at fedoraproject.org| Fedora Extras|abicheck|ABI checking tool|bugs.michael at gmx.net|extras-qa at fedoraproject.org| Fedora Extras|abiword|The AbiWord word processor|uwog at uwog.net|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Tue Sep 27 09:36:53 2005 From: fedora-extras-commits at redhat.com (Mark Cox (mjc)) Date: Tue, 27 Sep 2005 05:36:53 -0400 Subject: fedora-security/audit fc4,1.63,1.64 Message-ID: <200509270936.j8R9arm4014175@cvs-int.fedora.redhat.com> Author: mjc Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14156 Modified Files: fc4 Log Message: Deal with the release of firefox, mozilla, and others Index: fc4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc4,v retrieving revision 1.63 retrieving revision 1.64 diff -u -r1.63 -r1.64 --- fc4 26 Sep 2005 08:19:41 -0000 1.63 +++ fc4 27 Sep 2005 09:36:51 -0000 1.64 @@ -1,22 +1,25 @@ -Up to date CVE as of CVE email 20050925 -Up to date FC4 as of 20050925 +Up to date CVE as of CVE email 20050926 +Up to date FC4 as of 20050926 ** are items that need attention +2005-3055 VULNERABLE (kernel) +2005-3054 ** php +2005-3053 backport (kernel) [since FEDORA-2005-820] patch-2.6.12.5 2005-3044 VULNERABLE (kernel, fixed 2.6.13.2) 2005-3011 ** texinfo 2005-2991 ignore (ncompress) don't ship zdiff or zcmp scripts 2005-2968 version (mozilla, not 1.7.10) +we include a different mozilla sh -2005-2968 VULNERABLE (firefox) +2005-2968 version (firefox) [since FEDORA-2005-926] 2005-2946 VULNERABLE (openssl, fixed 0.9.8) (as it uses md5 md) 2005-2876 backport (util-linux) [since FEDORA-2005-887] 2005-2874 version (cups, fixed 1.1.23) -2005-2873 ** kernel +2005-2873 VULNERABLE (kernel) not upstream fixed 2005-2872 version (kernel, fixed 2.6.12) [since FEDORA-2005-510] -2005-2871 backport (firefox) [since FEDORA-2005-871] -2005-2871 backport (mozilla) [since FEDORA-2005-873] +2005-2871 ** backport (firefox) [since FEDORA-2005-871] +2005-2871 ** backport (mozilla) [since FEDORA-2005-873] 2005-2871 VULNERABLE (thunderbird) (moderate only) -2005-2811 version (net-snmp, not upstream gentoo only) +2005-2811 version (net-snmp, not upstream) gentoo only 2005-2801 version (kernel, fixed 2.6.11) 2005-2800 backport (kernel, fixed 2.6.12.6) [since FEDORA-2005-906] 2005-2798 version (openssh, fixed 4.2) [since FEDORA-2005-860] @@ -25,25 +28,25 @@ 2005-2794 version (squid, fixed 2.5.STABLE11) [since FEDORA-2005-913] was backport since FEDORA-2005-851 2005-2728 backport (httpd, fixed 2.0.55-dev) [since FEDORA-2005-849] 2005-2707 VULNERABLE (thunderbird) -2005-2707 VULNERABLE (firefox, fixed 1.0.7) -2005-2707 VULNERABLE (mozilla, fixed 1.7.12) +2005-2707 version (firefox, fixed 1.0.7) [since FEDORA-2005-926] +2005-2707 version (mozilla, fixed 1.7.12) [since FEDORA-2005-927] 2005-2706 VULNERABLE (thunderbird) -2005-2706 VULNERABLE (firefox, fixed 1.0.7) -2005-2706 VULNERABLE (mozilla, fixed 1.7.12) +2005-2706 version (firefox, fixed 1.0.7) [since FEDORA-2005-926] +2005-2706 version (mozilla, fixed 1.7.12) [since FEDORA-2005-927] 2005-2705 VULNERABLE (thunderbird) -2005-2705 VULNERABLE (firefox, fixed 1.0.7) -2005-2705 VULNERABLE (mozilla, fixed 1.7.12) +2005-2705 version (firefox, fixed 1.0.7) [since FEDORA-2005-926] +2005-2705 version (mozilla, fixed 1.7.12) [since FEDORA-2005-927] 2005-2704 VULNERABLE (thunderbird) -2005-2704 VULNERABLE (firefox, fixed 1.0.7) -2005-2704 VULNERABLE (mozilla, fixed 1.7.12) +2005-2704 version (firefox, fixed 1.0.7) [since FEDORA-2005-926] +2005-2704 version (mozilla, fixed 1.7.12) [since FEDORA-2005-927] 2005-2703 VULNERABLE (thunderbird) -2005-2703 VULNERABLE (firefox, fixed 1.0.7) -2005-2703 VULNERABLE (mozilla, fixed 1.7.12) +2005-2703 version (firefox, fixed 1.0.7) [since FEDORA-2005-926] +2005-2703 version (mozilla, fixed 1.7.12) [since FEDORA-2005-927] 2005-2702 VULNERABLE (thunderbird) -2005-2702 VULNERABLE (firefox, fixed 1.0.7) -2005-2702 VULNERABLE (mozilla, fixed 1.7.12) -2005-2701 VULNERABLE (firefox, fixed 1.0.7) -2005-2701 VULNERABLE (mozilla, fixed 1.7.12) +2005-2702 version (firefox, fixed 1.0.7) [since FEDORA-2005-926] +2005-2702 version (mozilla, fixed 1.7.12) [since FEDORA-2005-927] +2005-2701 version (firefox, fixed 1.0.7) [since FEDORA-2005-926] +2005-2701 version (mozilla, fixed 1.7.12) [since FEDORA-2005-927] 2005-2700 backport (httpd, fixed 2.0.55-dev) [since FEDORA-2005-849] 2005-2693 backport (cvs) [since FEDORA-2005-790] 2005-2672 VULNERABLE (lm_sensors) bz#166673 @@ -51,8 +54,8 @@ 2005-2642 version (mutt, openbsd only) 2005-2641 VULNERABLE (pam_ldap) bz#166164 2005-2617 version (kernel, fixed 2.6.12.5) [since FEDORA-2005-820] -2005-2602 VULNERABLE (firefox) probably -2005-2602 VULNERABLE (thunderbird) probably +2005-2602 ** VULNERABLE (firefox) probably +2005-2602 ** VULNERABLE (thunderbird) probably 2005-2558 ignore (mysql) not an issue 2005-2558 VULNERABLE (mysql, fixed 4.1.13) probably 2005-2555 backport (kernel, fixed 2.6.12.6pre) [since FEDORA-2005-820] patch-2.6.12.6pre.patch @@ -141,7 +144,7 @@ 2005-2069 VULNERABLE (nss_ldap) http://bugzilla.padl.com/attachment.cgi?id=10&action=view 2005-2023 version (gnupg, fixed 1.9.15) 2005-1993 backport (sudo, fixed 1.6.8p9) [since FEDORA-2005-472] -2005-1992 backport (ruby) [since FEDORA-2005-475] +2005-1992 version (ruby, fixed 1.8.3 at least) [since FEDORA-2005-936] was backport since FEDORA-2005-475 2005-1937 version (firefox, fixed 1.0.5) [since FEDORA-2005-605] 2005-1937 version (mozilla, fixed 1.7.9) [since FEDORA-2005-619] 2005-1934 version (gaim, fixed 1.3.1) [since FEDORA-2005-411] @@ -872,6 +875,7 @@ 2004-0005 version (gaim, fixed 0.76) 2004-0003 version (kernel, not 2.6) 2004-0001 version (kernel, not 2.6) +2003-1232 version (emacs, fixed 21.3) 2003-1201 version (openldap, not 2.2) 2003-1161 version (kernel, not released version) 2003-1138 backport (httpd, Red Hat only) contains /+ now From fedora-extras-commits at redhat.com Tue Sep 27 10:16:27 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Tue, 27 Sep 2005 06:16:27 -0400 Subject: rpms/shorewall/FC-3 shorewall.spec,1.5,1.6 Message-ID: <200509271016.j8RAGvjJ015661@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/shorewall/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15624/FC-3 Modified Files: shorewall.spec Log Message: shorewall is orphaned Index: shorewall.spec =================================================================== RCS file: /cvs/extras/rpms/shorewall/FC-3/shorewall.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- shorewall.spec 10 Dec 2004 22:03:11 -0000 1.5 +++ shorewall.spec 27 Sep 2005 10:16:24 -0000 1.6 @@ -31,6 +31,12 @@ http://www.shorewall.net/ %prep +echo " +-------------------------------------------------------------- +Build disabled. Binary packages removed from the repository. +Package is without maintainer and has been declared orphaned. +--------------------------------------------------------------" > /dev/null +exit 1 %setup -q From fedora-extras-commits at redhat.com Tue Sep 27 10:16:27 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Tue, 27 Sep 2005 06:16:27 -0400 Subject: rpms/shorewall/FC-4 shorewall.spec,1.7,1.8 Message-ID: <200509271017.j8RAGvBT015662@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/shorewall/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15624/FC-4 Modified Files: shorewall.spec Log Message: shorewall is orphaned Index: shorewall.spec =================================================================== RCS file: /cvs/extras/rpms/shorewall/FC-4/shorewall.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- shorewall.spec 6 Apr 2005 22:13:31 -0000 1.7 +++ shorewall.spec 27 Sep 2005 10:16:25 -0000 1.8 @@ -31,6 +31,13 @@ http://www.shorewall.net/ %prep +echo " +-------------------------------------------------------------- +Build disabled. Binary packages removed from the repository. +Package is without maintainer and has been declared orphaned. +--------------------------------------------------------------" > /dev/null +exit 1 + %setup -q From fedora-extras-commits at redhat.com Tue Sep 27 11:38:18 2005 From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc)) Date: Tue, 27 Sep 2005 07:38:18 -0400 Subject: rpms/phpldapadmin/devel phpldapadmin.spec,1.1,1.2 Message-ID: <200509271138.j8RBcI4R017221@cvs-int.fedora.redhat.com> Author: buc Update of /cvs/extras/rpms/phpldapadmin/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17202 Modified Files: phpldapadmin.spec Log Message: Index: phpldapadmin.spec =================================================================== RCS file: /cvs/extras/rpms/phpldapadmin/devel/phpldapadmin.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- phpldapadmin.spec 26 Sep 2005 21:52:07 -0000 1.1 +++ phpldapadmin.spec 27 Sep 2005 11:38:16 -0000 1.2 @@ -52,8 +52,8 @@ %patch1 -p1 %patch2 -p1 -%patch3 -p1 -%patch4 -p1 +#%patch3 -p1 +#%patch4 -p1 %build @@ -132,6 +132,7 @@ %changelog * Tue Sep 27 2005 Dmitry Butskoy +- comment out patch3 and patch4 -- better to wait for upstream decision... - accepted for Fedora Extras devel (review by Aurelien Bompard ) From fedora-extras-commits at redhat.com Tue Sep 27 12:24:03 2005 From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc)) Date: Tue, 27 Sep 2005 08:24:03 -0400 Subject: rpms/phpldapadmin/devel phpldapadmin.spec, 1.2, 1.3 phpldapadmin-0.9.7-obfuscate.patch, 1.1, NONE phpldapadmin-0.9.7-session_opt_secret.patch, 1.1, NONE Message-ID: <200509271224.j8RCO3ve018683@cvs-int.fedora.redhat.com> Author: buc Update of /cvs/extras/rpms/phpldapadmin/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18664 Modified Files: phpldapadmin.spec Removed Files: phpldapadmin-0.9.7-obfuscate.patch phpldapadmin-0.9.7-session_opt_secret.patch Log Message: Index: phpldapadmin.spec =================================================================== RCS file: /cvs/extras/rpms/phpldapadmin/devel/phpldapadmin.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- phpldapadmin.spec 27 Sep 2005 11:38:16 -0000 1.2 +++ phpldapadmin.spec 27 Sep 2005 12:23:44 -0000 1.3 @@ -2,7 +2,7 @@ Name: phpldapadmin Summary: Web-based tool for managing LDAP servers Version: 0.9.7 -Release: 1 +Release: 2 Group: Applications/Internet License: GPL URL: http://phpldapadmin.sourceforge.net @@ -19,8 +19,6 @@ Patch1: phpldapadmin-0.9.7-namingcontexts.patch Patch2: phpldapadmin-0.9.7-config.patch -Patch3: phpldapadmin-0.9.7-session_opt_secret.patch -Patch4: phpldapadmin-0.9.7-obfuscate.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -131,19 +129,14 @@ %changelog -* Tue Sep 27 2005 Dmitry Butskoy -- comment out patch3 and patch4 -- better to wait for upstream decision... +* Tue Sep 27 2005 Dmitry Butskoy - 0.9.7-2 +- patch cleanups. - accepted for Fedora Extras devel (review by Aurelien Bompard ) * Mon Sep 26 2005 Dmitry Butskoy - 0.9.7-1 - upgrade to final 0.9.7 - strip debug stuff completely. It gives essential speedup of work. -- Blowfish encryption is considered optional for "session" auth type. - Add patch to allow user to disable it for performance reason - (just specifying the empty key). It was a default behaviour in - previous versions of phpldapadmin. -- add "obfuscate" patch to better handle show_clear_password feature. - initial install allow connects from localhost only (security reasons). * Tue Sep 20 2005 Dmitry Butskoy - 0.9.7-0.3.rc3 --- phpldapadmin-0.9.7-obfuscate.patch DELETED --- --- phpldapadmin-0.9.7-session_opt_secret.patch DELETED --- From fedora-extras-commits at redhat.com Tue Sep 27 12:26:29 2005 From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc)) Date: Tue, 27 Sep 2005 08:26:29 -0400 Subject: rpms/phpldapadmin/devel phpldapadmin.spec,1.3,1.4 Message-ID: <200509271226.j8RCQTxM018737@cvs-int.fedora.redhat.com> Author: buc Update of /cvs/extras/rpms/phpldapadmin/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18718 Modified Files: phpldapadmin.spec Log Message: Index: phpldapadmin.spec =================================================================== RCS file: /cvs/extras/rpms/phpldapadmin/devel/phpldapadmin.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- phpldapadmin.spec 27 Sep 2005 12:23:44 -0000 1.3 +++ phpldapadmin.spec 27 Sep 2005 12:26:27 -0000 1.4 @@ -50,8 +50,6 @@ %patch1 -p1 %patch2 -p1 -#%patch3 -p1 -#%patch4 -p1 %build From fedora-extras-commits at redhat.com Tue Sep 27 13:43:45 2005 From: fedora-extras-commits at redhat.com (Alain Portal (Dionysos)) Date: Tue, 27 Sep 2005 09:43:45 -0400 Subject: rpms/utrac - New directory Message-ID: <200509271343.j8RDhjZo020331@cvs-int.fedora.redhat.com> Author: Dionysos Update of /cvs/extras/rpms/utrac In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20307/utrac Log Message: Directory /cvs/extras/rpms/utrac added to the repository From fedora-extras-commits at redhat.com Tue Sep 27 13:43:46 2005 From: fedora-extras-commits at redhat.com (Alain Portal (Dionysos)) Date: Tue, 27 Sep 2005 09:43:46 -0400 Subject: rpms/utrac/devel - New directory Message-ID: <200509271343.j8RDhksh020336@cvs-int.fedora.redhat.com> Author: Dionysos Update of /cvs/extras/rpms/utrac/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20307/utrac/devel Log Message: Directory /cvs/extras/rpms/utrac/devel added to the repository From fedora-extras-commits at redhat.com Tue Sep 27 13:43:59 2005 From: fedora-extras-commits at redhat.com (Alain Portal (Dionysos)) Date: Tue, 27 Sep 2005 09:43:59 -0400 Subject: rpms/utrac Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200509271343.j8RDhxjJ020387@cvs-int.fedora.redhat.com> Author: Dionysos Update of /cvs/extras/rpms/utrac In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20352 Added Files: Makefile import.log Log Message: Setup of module utrac --- NEW FILE Makefile --- # Top level Makefile for module utrac all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Tue Sep 27 13:43:59 2005 From: fedora-extras-commits at redhat.com (Alain Portal (Dionysos)) Date: Tue, 27 Sep 2005 09:43:59 -0400 Subject: rpms/utrac/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200509271344.j8RDhxkN020392@cvs-int.fedora.redhat.com> Author: Dionysos Update of /cvs/extras/rpms/utrac/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20352/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module utrac --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Tue Sep 27 13:44:36 2005 From: fedora-extras-commits at redhat.com (Alain Portal (Dionysos)) Date: Tue, 27 Sep 2005 09:44:36 -0400 Subject: rpms/utrac import.log,1.1,1.2 Message-ID: <200509271344.j8RDiaZa020467@cvs-int.fedora.redhat.com> Author: Dionysos Update of /cvs/extras/rpms/utrac In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20430 Modified Files: import.log Log Message: auto-import utrac-0.3.0-4 on branch devel from utrac-0.3.0-4.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/utrac/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 27 Sep 2005 13:43:57 -0000 1.1 +++ import.log 27 Sep 2005 13:44:34 -0000 1.2 @@ -0,0 +1 @@ +utrac-0_3_0-4:HEAD:utrac-0.3.0-4.src.rpm:1127828662 From fedora-extras-commits at redhat.com Tue Sep 27 13:44:37 2005 From: fedora-extras-commits at redhat.com (Alain Portal (Dionysos)) Date: Tue, 27 Sep 2005 09:44:37 -0400 Subject: rpms/utrac/devel utrac-destdir.patch, NONE, 1.1 utrac.h.utf8, NONE, 1.1 utrac.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200509271344.j8RDib6E020476@cvs-int.fedora.redhat.com> Author: Dionysos Update of /cvs/extras/rpms/utrac/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20430/devel Modified Files: .cvsignore sources Added Files: utrac-destdir.patch utrac.h.utf8 utrac.spec Log Message: auto-import utrac-0.3.0-4 on branch devel from utrac-0.3.0-4.src.rpm utrac-destdir.patch: --- NEW FILE utrac-destdir.patch --- --- Makefile 2005-02-25 18:07:49.000000000 +0100 +++ Makefile.Fedora 2005-09-27 10:35:42.000000000 +0200 @@ -49,23 +49,26 @@ #### INSTALL / UNINSTALL ###### install: utrac strip ./utrac - mkdir -p ${BIN_PATH} - cp ./utrac ${BIN_PATH} - mkdir -p ${SHARE_PATH} - cp -f ${CHARMAPS_FILE} ${SHARE_PATH} - cp -f utrac.1 ${MAN_PATH} + mkdir -p $(DESTDIR)${BIN_PATH} + cp ./utrac $(DESTDIR)${BIN_PATH} + mkdir -p $(DESTDIR)${SHARE_PATH} + cp -f ${CHARMAPS_FILE} $(DESTDIR)${SHARE_PATH} + mkdir -p $(DESTDIR)${MAN_PATH} + cp -f utrac.1 $(DESTDIR)${MAN_PATH} install-lib: lib - mkdir -p ${LIB_PATH} - cp libutrac.a ${LIB_PATH} - mkdir -p ${LIB_PATH} - cp libutrac.a ${LIB_PATH} - + mkdir -p $(DESTDIR)${LIB_PATH} + cp libutrac.a $(DESTDIR)${LIB_PATH} + mkdir -p $(DESTDIR)${LIB_PATH} + cp libutrac.a $(DESTDIR)${LIB_PATH} + mkdir -p $(DESTDIR)${INC_PATH} + cp -f utrac.h $(DESTDIR)${INC_PATH} + uninstall: - rm -f ${BIN_PATH}/utrac - rm -f ${LIB_PATH}/libutrac.a - rm -f ${SHARE_PATH}/${CHARMAPS_FILE} - rmdir ${SHARE_PATH} + rm -f $(DESTDIR)${BIN_PATH}/utrac + rm -f $(DESTDIR)${LIB_PATH}/libutrac.a + rm -f $(DESTDIR)${SHARE_PATH}/${CHARMAPS_FILE} + rmdir $(DESTDIR)${SHARE_PATH} ###### OBJECT FILES ######### utrac_cmd.o: utrac_cmd.c utrac.h ut_charset.h ut_error.h ut_text.h @@ -85,7 +88,7 @@ #option -Wno-multichar has no effect! (gcc 3.3.4) so we use -w... ut_charset.o: ut_charset.c utrac.h ut_charset.h ut_error.h - $(CC) -w -Wno-multichar -c $(CFLAGS) -DUT_CHARMAPS_FILENAME='"${SHARE_PATH}/${CHARMAPS_FILE}"' $< -o $@ + $(CC) -w -Wno-multichar -c $(CFLAGS) -DUT_CHARMAPS_FILENAME='"$(DESTDIR)${SHARE_PATH}/${CHARMAPS_FILE}"' $< -o $@ ut_utils.o: ut_utils.c ut_error.h utrac.h $(CC) -c $(CFLAGS) $< -o $@ --- NEW FILE utrac.h.utf8 --- --- utrac-0.2/utrac.h.old 2004-12-02 17:56:01.000000000 +0100 +++ utrac-0.2/utrac.h 2004-12-15 15:45:40.415374016 +0100 @@ -71,7 +71,7 @@ //const char * UT_CHARMAPS_FILENAME2 = "/home/antoine/dev/utrac/charsets.dat"; //UT_CHARMAPS_FILENAME should be set with "gcc -D ..." const char * UT_CHARMAPS_FILENAME2 = "charsets.dat"; -const char * UT_DEFAULT_ENCODING_UNIX = "ISO-8859-1"; +const char * UT_DEFAULT_ENCODING_UNIX = "UTF-8"; #else //! Language and system coeficients applied to charset rating, depending on language or system selected. extern const float UT_LANG_SYS_COEF []; --- NEW FILE utrac.spec --- Name: utrac Version: 0.3.0 Release: 4%{?dist} Summary: Universal Text Recognizer and Converter Summary(fr): Reconnaisseur et convertisseur universel de texte Group: Applications/File License: GPL Url: http://utrac.sourceforge.net Source: http://utrac.sourceforge.net/download/utrac-0.3.0.tar.gz Patch0: utrac-destdir.patch Patch1: utrac.h.utf8 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description Utrac is a command line tool and a library that recognize the encoding of an input file (ex: UTF-8, ISO-8859-1, CP437...) and its end-of-line type (CR, LF, CRLF). It has three main features: - Automatic recognition (depending on the file and on the system's locale), reliable in most cases; - Assistance for verification or manual recognition; - Conversion to an other charset and/or end-of-line type. %description -l fr Utrac est un outil en ligne de commande et une biblioth??que qui reconnait l'encodage d'un fichier d'entr??e (par ex: UTF-8, ISO-8859-1, CP437...) et son type de fin de ligne (CR, LF, CRLF). Ses trois fonctionnalit??s principales sont : - reconnaissance automatique (suivant le fichier et la localisation du syst??me) fiable dans la plupart des cas ; - assistance ?? la v??rification ou ?? la reconnaissance manuelle ; - conversion dans un autre jeu de caract??res et/ou type de fin de ligne. %package devel Summary: Library and file header for utrac Summary(fr): Biblioth??que et fichier d'en-t??tes pour utrac Group: Development/Libraries Requires: %{name} = %{version}-%{release} %description devel The %{name}-devel package includes the static library and the header files for compiling programs that use the utrac library. %description -l fr devel Le paquetage %{name}-devel contient la biblioth??que statique et le fichier d'en-t??tes n??cessaires ?? la compilation des programmes qui utilisent la biblioth??que utrac. %prep %setup -q %patch0 %patch1 -p1 %build make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT \ PREFIX_PATH=%{_prefix} \ BIN_PATH=%{_bindir} \ LIB_PATH=%{_libdir} \ INC_PATH=%{_includedir} \ MAN_PATH=%{_mandir}/man1 \ SHARE_PATH=%{_datadir}/%{name} make install-lib DESTDIR=$RPM_BUILD_ROOT \ PREFIX_PATH=%{_prefix} \ BIN_PATH=%{_bindir} \ LIB_PATH=%{_libdir} \ INC_PATH=%{_includedir} \ MAN_PATH=%{_mandir}/man1 \ SHARE_PATH=%{_datadir}/%{name} %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) %doc CHANGES COPYING README TODO %{_bindir}/* %dir %{_datadir}/%{name} %{_datadir}/%{name}/* %{_mandir}/man1/* %files devel %defattr(-,root,root,-) %{_libdir}/*.a %{_includedir}/* %changelog * Tue Sep 27 2005 Alain Portal 0.3.0-4 - Change Source tag to allow direct download * Tue Sep 27 2005 Alain Portal 0.3.0-3 - Change Source tag to allow direct download - Update and rename Makefile patch - Override utrac variables in install section - Add "-l fr" forgotten option in french description - Remove "rm -rf $RPM_BUILD_DIR/%{name}-%{version}" statement in %clean section - Remove useless INSTALL file - Package don't own /usr/share/man/man1 - Contribution of Aur??lien Bompard Thanks to him * Tue Sep 13 2005 Alain Portal 0.3.0-2 - Add french summary and description * Mon Sep 12 2005 Alain Portal 0.3.0-1 - New version - Patch0 to easy installation - Patch1 to set default encoding recognition as utf8 * Thu Jan 20 2005 Alain Portal 0:0.2-0.fdr.1 - Initial Fedora RPM Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/utrac/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 27 Sep 2005 13:43:57 -0000 1.1 +++ .cvsignore 27 Sep 2005 13:44:34 -0000 1.2 @@ -0,0 +1 @@ +utrac-0.3.0.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/utrac/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 27 Sep 2005 13:43:57 -0000 1.1 +++ sources 27 Sep 2005 13:44:34 -0000 1.2 @@ -0,0 +1 @@ +0b70a94e450d428bc49d499110052ae6 utrac-0.3.0.tar.gz From fedora-extras-commits at redhat.com Tue Sep 27 13:48:26 2005 From: fedora-extras-commits at redhat.com (Alain Portal (Dionysos)) Date: Tue, 27 Sep 2005 09:48:26 -0400 Subject: owners owners.list,1.256,1.257 Message-ID: <200509271348.j8RDmQiv020534@cvs-int.fedora.redhat.com> Author: Dionysos Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20515/owners Modified Files: owners.list Log Message: Add utrac entry. Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.256 retrieving revision 1.257 diff -u -r1.256 -r1.257 --- owners.list 26 Sep 2005 22:04:05 -0000 1.256 +++ owners.list 27 Sep 2005 13:48:24 -0000 1.257 @@ -1033,6 +1033,7 @@ Fedora Extras|uqm-content|Base content files for The Ur-Quan Masters|ville.skytta at iki.fi|extras-qa at fedoraproject.org| Fedora Extras|uqm|The Ur-Quan Masters|ville.skytta at iki.fi|extras-qa at fedoraproject.org| Fedora Extras|util-vserver|Linux virtual server utilities|enrico.scholz at informatik.tu-chemnitz.de|extras-qa at fedoraproject.org|wtogami at redhat.com +Fedora Extras|utrac|Universal Text Recognizer and Converter|aportal at univ-montp2.fr|extras-qa at fedoraproject.org| Fedora Extras|uudeview|Applications for uuencoding, uudecoding, ..|adrian at lisas.de|extras-qa at fedoraproject.org| Fedora Extras|verbiste|French conjugation system|icon at linux.duke.edu|extras-qa at fedoraproject.org| Fedora Extras|vice|Versatile Commodore Emulator|pmatilai at laiskiainen.org|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Tue Sep 27 14:52:59 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Tue, 27 Sep 2005 10:52:59 -0400 Subject: rpms/lft/devel .cvsignore, 1.4, 1.5 lft-install.patch, 1.1, 1.2 lft.spec, 1.16, 1.17 sources, 1.4, 1.5 Message-ID: <200509271452.j8REqxET022852@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/lft/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22824 Modified Files: .cvsignore lft-install.patch lft.spec sources Log Message: * Thu Aug 25 2005 Ville Skytt?? - 1:2.5-1 - 2.5. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/lft/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 19 May 2005 18:38:28 -0000 1.4 +++ .cvsignore 27 Sep 2005 14:52:57 -0000 1.5 @@ -1 +1 @@ -lft-2.31.tar.gz +lft-2.5.tar.gz lft-install.patch: Index: lft-install.patch =================================================================== RCS file: /cvs/extras/rpms/lft/devel/lft-install.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- lft-install.patch 8 Nov 2004 04:40:48 -0000 1.1 +++ lft-install.patch 27 Sep 2005 14:52:57 -0000 1.2 @@ -1,10 +1,16 @@ ---- Makefile.in~ 2003-05-07 21:57:58.000000000 +0300 -+++ Makefile.in 2003-07-12 13:34:15.000000000 +0300 -@@ -60,7 +60,6 @@ - install: lft lft.8 +--- Makefile.in~ ++++ Makefile.in +@@ -51,11 +51,10 @@ test -d $(bindir)/. || $(MKDIR) $(bindir) $(INSTALL) lft $(bindir)/lft + $(INSTALL) whob $(bindir)/whob - @ ( echo chown root $(bindir)/lft && chown root $(bindir)/lft && echo chmod u+s $(bindir)/lft && chmod u+s $(bindir)/lft ) || echo "***" WARNING: could not set $(bindir) suid to root test -d $(mandir)/man8/. || $(MKDIR) $(mandir)/man8 - $(INSTALL) lft.8 $(mandir)/man8/lft.8 + @echo "Installing LFT and WhoB manual pages" +- $(INSTALL) lft.8 $(mandir)/man8/lft.8 +- $(INSTALL) whob.8 $(mandir)/man8/whob.8 ++ $(INSTALL) -pm 644 lft.8 $(mandir)/man8/lft.8 ++ $(INSTALL) -pm 644 whob.8 $(mandir)/man8/whob.8 + clean: + $(RM) *.o core* lft whob *~ Index: lft.spec =================================================================== RCS file: /cvs/extras/rpms/lft/devel/lft.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- lft.spec 21 Jul 2005 19:02:08 -0000 1.16 +++ lft.spec 27 Sep 2005 14:52:57 -0000 1.17 @@ -1,12 +1,13 @@ Name: lft -Version: 2.31 -Release: 3 +Version: 2.5 +Release: 1%{?dist} +Epoch: 1 Summary: Alternate traceroute tool Group: Applications/Internet License: VOSTROM Public License -URL: http://oppleman.com/lft/ -# http://oppleman.com/dl/?file=lft-2.31.tar.gz +URL: http://pwhois.org/lft/ +# http://pwhois.org/dl/?file=lft-2.5.tar.gz Source0: %{name}-%{version}.tar.gz Patch0: %{name}-install.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -43,13 +44,18 @@ %files -%defattr(0644,root,root,0755) -%doc CHANGELOG COPYING README TODO lft-manpage.html +%defattr(-,root,root,-) +%doc CHANGELOG COPYING README TODO %attr(4755,root,root) %{_bindir}/lft +%{_bindir}/whob %{_mandir}/man8/lft.8* +%{_mandir}/man8/whob.8* %changelog +* Thu Aug 25 2005 Ville Skytt?? - 1:2.5-1 +- 2.5. + * Thu Jul 21 2005 Ville Skytt?? - 2.31-3 - Rebuild against new libpcap. Index: sources =================================================================== RCS file: /cvs/extras/rpms/lft/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 19 May 2005 18:38:28 -0000 1.4 +++ sources 27 Sep 2005 14:52:57 -0000 1.5 @@ -1 +1 @@ -5b8b16c061528c1ace9550a47255906d lft-2.31.tar.gz +5b0f45addbb371cc076fe6d9d9694546 lft-2.5.tar.gz From fedora-extras-commits at redhat.com Tue Sep 27 15:14:33 2005 From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert)) Date: Tue, 27 Sep 2005 11:14:33 -0400 Subject: rpms/emelfm2 - New directory Message-ID: <200509271514.j8RFEXj7024426@cvs-int.fedora.redhat.com> Author: cwickert Update of /cvs/extras/rpms/emelfm2 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24402/emelfm2 Log Message: Directory /cvs/extras/rpms/emelfm2 added to the repository From fedora-extras-commits at redhat.com Tue Sep 27 15:14:34 2005 From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert)) Date: Tue, 27 Sep 2005 11:14:34 -0400 Subject: rpms/emelfm2/devel - New directory Message-ID: <200509271514.j8RFEYxj024431@cvs-int.fedora.redhat.com> Author: cwickert Update of /cvs/extras/rpms/emelfm2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24402/emelfm2/devel Log Message: Directory /cvs/extras/rpms/emelfm2/devel added to the repository From fedora-extras-commits at redhat.com Tue Sep 27 15:14:51 2005 From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert)) Date: Tue, 27 Sep 2005 11:14:51 -0400 Subject: rpms/emelfm2 Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200509271514.j8RFEp7Z024482@cvs-int.fedora.redhat.com> Author: cwickert Update of /cvs/extras/rpms/emelfm2 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24447 Added Files: Makefile import.log Log Message: Setup of module emelfm2 --- NEW FILE Makefile --- # Top level Makefile for module emelfm2 all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Tue Sep 27 15:14:51 2005 From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert)) Date: Tue, 27 Sep 2005 11:14:51 -0400 Subject: rpms/emelfm2/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200509271514.j8RFEpQp024487@cvs-int.fedora.redhat.com> Author: cwickert Update of /cvs/extras/rpms/emelfm2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24447/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module emelfm2 --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Tue Sep 27 15:16:18 2005 From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert)) Date: Tue, 27 Sep 2005 11:16:18 -0400 Subject: rpms/emelfm2 import.log,1.1,1.2 Message-ID: <200509271516.j8RFGIJp024593@cvs-int.fedora.redhat.com> Author: cwickert Update of /cvs/extras/rpms/emelfm2 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24557 Modified Files: import.log Log Message: auto-import emelfm2-0.1.2-2.fc4 on branch devel from emelfm2-0.1.2-2.fc4.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/emelfm2/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 27 Sep 2005 15:14:49 -0000 1.1 +++ import.log 27 Sep 2005 15:16:16 -0000 1.2 @@ -0,0 +1 @@ +emelfm2-0_1_2-2_fc4:HEAD:emelfm2-0.1.2-2.fc4.src.rpm:1127834166 From fedora-extras-commits at redhat.com Tue Sep 27 15:16:18 2005 From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert)) Date: Tue, 27 Sep 2005 11:16:18 -0400 Subject: rpms/emelfm2/devel emelfm2-0.1.2-makefile.config.patch, NONE, 1.1 emelfm2.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200509271516.j8RFGIv3024601@cvs-int.fedora.redhat.com> Author: cwickert Update of /cvs/extras/rpms/emelfm2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24557/devel Modified Files: .cvsignore sources Added Files: emelfm2-0.1.2-makefile.config.patch emelfm2.spec Log Message: auto-import emelfm2-0.1.2-2.fc4 on branch devel from emelfm2-0.1.2-2.fc4.src.rpm emelfm2-0.1.2-makefile.config.patch: --- NEW FILE emelfm2-0.1.2-makefile.config.patch --- --- Makefile.config.orig 2005-09-13 02:06:53.000000000 +0200 +++ Makefile.config 2005-09-22 04:01:53.000000000 +0200 @@ -2,7 +2,7 @@ ### installation (where) ### ############################ -PREFIX ?= /usr/local +PREFIX ?= %PREFIX% #on debian systems, install to X11R6/bin by default ifeq ($(shell ls /etc/debian_version 2>/dev/null), /etc/debian_version) @@ -12,7 +12,7 @@ endif # setting this to 1 makes the default docs dir include the current version no. -DOCS_VERSION ?= 0 +DOCS_VERSION ?= 1 #defaults for PLUGINS_DIR, DOC_DIR, ICON_DIR, LOCALE_DIR are set in Makefile @@ -82,7 +82,7 @@ # setting this to 1 includes code (not much) that is applicable # only to Gtk versions > 2.4 -USE_LATEST ?= 0 +USE_LATEST ?= 1 ######################### ### documentation ### --- NEW FILE emelfm2.spec --- Name: emelfm2 Version: 0.1.2 Release: 2%{?dist} Summary: A file manager that implements the popular two-pane design Group: Applications/File License: GPL URL: http://emelfm2.org/ Source0: http://emelfm2.org/rel/emelfm2-%{version}.tar.gz Patch0: %{name}-0.1.2-makefile.config.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gtk2-devel >= 2.4.0, gettext, desktop-file-utils %description emelFM2 is the GTK+2 port of emelFM. emelFM2 is a file manager that implements the popular two-pane design. It features a simple GTK+2 interface, a flexible file typing scheme, and a built-in command line for executing commands without opening an xterm. %prep %setup -q %patch0 -p0 -b .orig sed -i 's!%PREFIX%'!'%{_prefix}!' Makefile.config # fix broken icon in emelfm2.desktop sed -i 's!emelfm2/icon_emelfm2_48.png!%{_datadir}/pixmaps/emelfm2/emelfm2_48.png!' docs/desktop_environment/%{name}.desktop %build make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install PREFIX=$RPM_BUILD_ROOT%{_prefix} make install_i18n PREFIX=$RPM_BUILD_ROOT%{_prefix} %find_lang %{name} desktop-file-install --vendor fedora \ --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ --add-category X-Fedora \ --add-category Application \ --add-category Utility \ --delete-original \ ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop %clean rm -rf $RPM_BUILD_ROOT %files -f %{name}.lang %defattr(-,root,root,-) %doc docs/ACTIONS docs/CHANGELOG docs/CONFIGURATION docs/CREDITS docs/HACKING %doc docs/PLUGINS docs/README docs/ROADMAP docs/TODO docs/USAGE docs/WARNING %doc docs/help.txt docs/GPL docs/LGPL %{_bindir}/%{name} %{_libdir}/%{name} %{_datadir}/applications/fedora-%{name}.desktop %{_datadir}/application-registry/%{name}.applications %{_datadir}/pixmaps/%{name} %changelog * Mon Sep 26 2005 Christoph Wickert - 0.1.2-2 - removed broken-icon.patch (using sed instead). - removed hardcoded /usr from makefile.config-patch. - Minor specfile changes (#168608). * Sun Sep 18 2005 Christoph Wickert - 0.1.2-1 - Update to 0.1.2. * Sun Sep 11 2005 Christoph Wickert - 0.1.1-2 - Using destop-file-install. - Several fixes for FE. * Sun Aug 21 2005 Christoph Wickert - 0.1.1-1.fc4.cw - Initial RPM release. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/emelfm2/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 27 Sep 2005 15:14:49 -0000 1.1 +++ .cvsignore 27 Sep 2005 15:16:16 -0000 1.2 @@ -0,0 +1 @@ +emelfm2-0.1.2.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/emelfm2/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 27 Sep 2005 15:14:49 -0000 1.1 +++ sources 27 Sep 2005 15:16:16 -0000 1.2 @@ -0,0 +1 @@ +33b0f1bd8f0119c9a6122f39d6073710 emelfm2-0.1.2.tar.gz From fedora-extras-commits at redhat.com Tue Sep 27 15:33:27 2005 From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert)) Date: Tue, 27 Sep 2005 11:33:27 -0400 Subject: owners owners.list,1.257,1.258 Message-ID: <200509271533.j8RFXRSt024801@cvs-int.fedora.redhat.com> Author: cwickert Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24770 Modified Files: owners.list Log Message: added emelfm2 Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.257 retrieving revision 1.258 diff -u -r1.257 -r1.258 --- owners.list 27 Sep 2005 13:48:24 -0000 1.257 +++ owners.list 27 Sep 2005 15:33:25 -0000 1.258 @@ -152,6 +152,7 @@ Fedora Extras|eet|A library designed to write an arbitary set of chunks of data to a file|ivazquez at ivazquez.net|extras-qa at fedoraproject.org| Fedora Extras|elmo|Terminal-based mail client|gauret at free.fr|extras-qa at fedoraproject.org| Fedora Extras|emacs-auctex|Enhanced TeX modes for Emacsen|ed at eh3.com|extras-qa at fedoraproject.org| +Fedora Extras|emelfm2|A file manager that implements the popular two-pane design|wickerpms at arcor.de|extras-qa at fedoraproject.org| Fedora Extras|enca|Character set analyzer and detector|dmitry at butskoy.name|extras-qa at fedoraproject.org| Fedora Extras|enchant|An Enchanting Spell Checking Library|uwog at uwog.net|extras-qa at fedoraproject.org| Fedora Extras|enemies-of-carlotta|A simple mailing list manager|redhat-bugzilla at camperquake.de|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Tue Sep 27 15:39:52 2005 From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters)) Date: Tue, 27 Sep 2005 11:39:52 -0400 Subject: rpms/lcdf-typetools/devel - New directory Message-ID: <200509271539.j8RFdqqV025274@cvs-int.fedora.redhat.com> Author: mpeters Update of /cvs/extras/rpms/lcdf-typetools/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25247/lcdf-typetools/devel Log Message: Directory /cvs/extras/rpms/lcdf-typetools/devel added to the repository From fedora-extras-commits at redhat.com Tue Sep 27 15:39:52 2005 From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters)) Date: Tue, 27 Sep 2005 11:39:52 -0400 Subject: rpms/lcdf-typetools - New directory Message-ID: <200509271539.j8RFdqC5025269@cvs-int.fedora.redhat.com> Author: mpeters Update of /cvs/extras/rpms/lcdf-typetools In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25247/lcdf-typetools Log Message: Directory /cvs/extras/rpms/lcdf-typetools added to the repository From fedora-extras-commits at redhat.com Tue Sep 27 15:40:29 2005 From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters)) Date: Tue, 27 Sep 2005 11:40:29 -0400 Subject: rpms/lcdf-typetools Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200509271540.j8RFeTWA025372@cvs-int.fedora.redhat.com> Author: mpeters Update of /cvs/extras/rpms/lcdf-typetools In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25341 Added Files: Makefile import.log Log Message: Setup of module lcdf-typetools --- NEW FILE Makefile --- # Top level Makefile for module lcdf-typetools all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Tue Sep 27 15:40:30 2005 From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters)) Date: Tue, 27 Sep 2005 11:40:30 -0400 Subject: rpms/lcdf-typetools/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200509271540.j8RFeUX1025377@cvs-int.fedora.redhat.com> Author: mpeters Update of /cvs/extras/rpms/lcdf-typetools/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25341/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module lcdf-typetools --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Tue Sep 27 15:41:50 2005 From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters)) Date: Tue, 27 Sep 2005 11:41:50 -0400 Subject: rpms/lcdf-typetools import.log,1.1,1.2 Message-ID: <200509271542.j8RFgK1j025553@cvs-int.fedora.redhat.com> Author: mpeters Update of /cvs/extras/rpms/lcdf-typetools In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25485 Modified Files: import.log Log Message: auto-import lcdf-typetools-2.34-1.fc5 on branch devel from lcdf-typetools-2.34-1.fc5.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/lcdf-typetools/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 27 Sep 2005 15:40:27 -0000 1.1 +++ import.log 27 Sep 2005 15:41:48 -0000 1.2 @@ -0,0 +1 @@ +lcdf-typetools-2_34-1_fc5:HEAD:lcdf-typetools-2.34-1.fc5.src.rpm:1127835611 From fedora-extras-commits at redhat.com Tue Sep 27 15:41:50 2005 From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters)) Date: Tue, 27 Sep 2005 11:41:50 -0400 Subject: rpms/lcdf-typetools/devel lcdf-typetools.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200509271542.j8RFgKbf025557@cvs-int.fedora.redhat.com> Author: mpeters Update of /cvs/extras/rpms/lcdf-typetools/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25485/devel Modified Files: .cvsignore sources Added Files: lcdf-typetools.spec Log Message: auto-import lcdf-typetools-2.34-1.fc5 on branch devel from lcdf-typetools-2.34-1.fc5.src.rpm --- NEW FILE lcdf-typetools.spec --- Name: lcdf-typetools Version: 2.34 Release: 1%{?dist} Summary: Tools for manipulating Postscript fonts Group: Applications/Publishing License: GPL URL: http://www.lcdf.org/~eddietwo/type/index.html Source0: http://www.lcdf.org/~eddietwo/type/lcdf-typetools-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: tetex-fonts %description The LCDF Typetools package contains several programs for manipulating PostScript Type 1, Type 1 multiple master, and PostScript-flavored OpenType fonts. LCDF Typetools includes the mmafm and mmpfb programs, which were formerly distributed as part of a different package (mminstance). %prep %setup -q %build %configure make %{?_smp_mflags} %install rm -rf %buildroot make install DESTDIR=%buildroot %clean rm -rf %buildroot %files %defattr(-,root,root,-) %doc README COPYING NEWS ONEWS %_bindir/* %_datadir/%{name} %_mandir/man1/* %changelog * Sun Sep 25 2005 Michael A. Peters - 2.34-1 Initial Packaging for Fedora Extras Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/lcdf-typetools/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 27 Sep 2005 15:40:28 -0000 1.1 +++ .cvsignore 27 Sep 2005 15:41:48 -0000 1.2 @@ -0,0 +1 @@ +lcdf-typetools-2.34.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/lcdf-typetools/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 27 Sep 2005 15:40:28 -0000 1.1 +++ sources 27 Sep 2005 15:41:48 -0000 1.2 @@ -0,0 +1 @@ +027019eff3de4cd322f727f29cc8cdda lcdf-typetools-2.34.tar.gz From fedora-extras-commits at redhat.com Tue Sep 27 15:50:44 2005 From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters)) Date: Tue, 27 Sep 2005 11:50:44 -0400 Subject: owners owners.list,1.258,1.259 Message-ID: <200509271550.j8RFoiVS026312@cvs-int.fedora.redhat.com> Author: mpeters Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26232 Modified Files: owners.list Log Message: added lcdf-typetools, approved by Aurelien Bompard (gauret at free.fr) Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.258 retrieving revision 1.259 diff -u -r1.258 -r1.259 --- owners.list 27 Sep 2005 15:33:25 -0000 1.258 +++ owners.list 27 Sep 2005 15:50:42 -0000 1.259 @@ -392,6 +392,7 @@ Fedora Extras|lablgtk|An Objective Caml interface to gtk+|gemi at bluewin.ch|extras-qa at fedoraproject.org| Fedora Extras|ladspa|LADSPA SDK, example plug-ins and tools|thomas at apestaart.org|extras-qa at fedoraproject.org| Fedora Extras|lapack|The LAPACK libraries for numerical linear algebra.|tcallawa at redhat.com|extras-qa at fedoraproject.org| +Fedora Extras|lcdf-typetools|Tools for manipulating Postscript fonts|mpeters at mac.com|extras-qa at fedoraproject.org| Fedora Extras|lcms|Color Management System|compton at pcompton.com|extras-qa at fedoraproject.org| Fedora Extras|leafnode|A leafsite NNTP server|davidhart at tqmcube.com|extras-qa at fedoraproject.org| Fedora Extras|leafpad|GTK+ based simple text editor|ivazquez at ivazquez.net|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Tue Sep 27 15:55:00 2005 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Tue, 27 Sep 2005 11:55:00 -0400 Subject: rpms/nautilus-image-converter - New directory Message-ID: <200509271555.j8RFt0Xf026621@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/nautilus-image-converter In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26597/nautilus-image-converter Log Message: Directory /cvs/extras/rpms/nautilus-image-converter added to the repository From fedora-extras-commits at redhat.com Tue Sep 27 15:55:00 2005 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Tue, 27 Sep 2005 11:55:00 -0400 Subject: rpms/nautilus-image-converter/devel - New directory Message-ID: <200509271555.j8RFt0NY026626@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/nautilus-image-converter/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26597/nautilus-image-converter/devel Log Message: Directory /cvs/extras/rpms/nautilus-image-converter/devel added to the repository From fedora-extras-commits at redhat.com Tue Sep 27 15:55:09 2005 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Tue, 27 Sep 2005 11:55:09 -0400 Subject: rpms/nautilus-image-converter Makefile, NONE, 1.1 import.log, NONE, 1.1 Message-ID: <200509271555.j8RFt94u026671@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/nautilus-image-converter In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26642 Added Files: Makefile import.log Log Message: Setup of module nautilus-image-converter --- NEW FILE Makefile --- # Top level Makefile for module nautilus-image-converter all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Tue Sep 27 15:55:09 2005 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Tue, 27 Sep 2005 11:55:09 -0400 Subject: rpms/nautilus-image-converter/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200509271555.j8RFt93x026676@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/nautilus-image-converter/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26642/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module nautilus-image-converter --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Tue Sep 27 15:55:36 2005 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Tue, 27 Sep 2005 11:55:36 -0400 Subject: rpms/nautilus-image-converter import.log,1.1,1.2 Message-ID: <200509271555.j8RFtavH026745@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/nautilus-image-converter In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26710 Modified Files: import.log Log Message: auto-import nautilus-image-converter-0.0.3-2 on branch devel from nautilus-image-converter-0.0.3-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/nautilus-image-converter/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 27 Sep 2005 15:55:07 -0000 1.1 +++ import.log 27 Sep 2005 15:55:34 -0000 1.2 @@ -0,0 +1 @@ +nautilus-image-converter-0_0_3-2:HEAD:nautilus-image-converter-0.0.3-2.src.rpm:1127836530 From fedora-extras-commits at redhat.com Tue Sep 27 15:55:36 2005 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Tue, 27 Sep 2005 11:55:36 -0400 Subject: rpms/nautilus-image-converter/devel nautilus-image-converter.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200509271555.j8RFtaqw026752@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/nautilus-image-converter/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26710/devel Modified Files: .cvsignore sources Added Files: nautilus-image-converter.spec Log Message: auto-import nautilus-image-converter-0.0.3-2 on branch devel from nautilus-image-converter-0.0.3-2.src.rpm --- NEW FILE nautilus-image-converter.spec --- Name: nautilus-image-converter Version: 0.0.3 Release: 2%{?dist} Summary: Nautilus extension to mass resize images Group: System Environment/Shells License: GPL URL: http://www.bitron.ch/software/nautilus-image-converter.php Source0: http://www.bitron.ch/downloads/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libglade2-devel >= 2.4.0 BuildRequires: gnome-vfs2-devel >= 2.6.0 BuildRequires: nautilus >= 2.6.0 Requires: ImageMagick %description Adds a "Resize Images..." menu item to the context menu of all images. This opens a dialog where you set the desired image size and file name. A click on "Resize" finally resizes the image(s) using ImageMagick's convert tool. %prep %setup -q %build %configure --disable-static make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -name \*.la -exec rm {} \; %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc AUTHORS COPYING %{_datadir}/%{name}/ %{_libdir}/nautilus/extensions-1.0/*.so %changelog * Tue Sep 27 2005 Brian Pepple - 0.0.3-2 - Fix ownership of data directory. - Add dist tag. * Tue Sep 27 2005 Brian Pepple - 0.0.3-1 - Initial Fedora Extras release. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/nautilus-image-converter/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 27 Sep 2005 15:55:07 -0000 1.1 +++ .cvsignore 27 Sep 2005 15:55:34 -0000 1.2 @@ -0,0 +1 @@ +nautilus-image-converter-0.0.3.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/nautilus-image-converter/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 27 Sep 2005 15:55:07 -0000 1.1 +++ sources 27 Sep 2005 15:55:34 -0000 1.2 @@ -0,0 +1 @@ +4f6d178acecdbbf7671066845f3c704e nautilus-image-converter-0.0.3.tar.bz2 From fedora-extras-commits at redhat.com Tue Sep 27 15:58:07 2005 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Tue, 27 Sep 2005 11:58:07 -0400 Subject: owners owners.list,1.259,1.260 Message-ID: <200509271558.j8RFw7Ud026813@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26794 Modified Files: owners.list Log Message: Add nautilus-image-converter Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.259 retrieving revision 1.260 diff -u -r1.259 -r1.260 --- owners.list 27 Sep 2005 15:50:42 -0000 1.259 +++ owners.list 27 Sep 2005 15:58:04 -0000 1.260 @@ -524,6 +524,7 @@ Fedora Extras|nail|Enhanced implementation of the mailx command|dmitry at butskoy.name|extras-qa at fedoraproject.org| Fedora Extras|naim|An ncurses-based console AIM, ICQ, IRC, and Lily client|lmacken at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|namazu|A full-text search engine|tagoh at redhat.com|extras-qa at fedoraproject.org| +Fedora Extras|nautilus-image-converter|Nautilus extension to mass resize images|bdpepple at ameritech.net|extras-qa at fedoraproject.org| Fedora Extras|nautilus-open-terminal|Nautilus extension for an open terminal shortcut|stickster at gmail.com|extras-qa at fedoraproject.org| Fedora Extras|nautilus-search-tool|A Nautilus extension to put "Search for Files" on the context menu of folders|ivazquez at ivazquez.net|extras-qa at fedoraproject.org| Fedora Extras|ncftp|Improved console FTP client|matthias at rpmforge.net|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Tue Sep 27 16:20:02 2005 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Tue, 27 Sep 2005 12:20:02 -0400 Subject: rpms/abcm2ps/devel abcm2ps.spec,1.1,1.2 Message-ID: <200509271620.j8RGK234028364@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/abcm2ps/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28311/devel Modified Files: abcm2ps.spec Log Message: Index: abcm2ps.spec =================================================================== RCS file: /cvs/extras/rpms/abcm2ps/devel/abcm2ps.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- abcm2ps.spec 26 Sep 2005 17:36:04 -0000 1.1 +++ abcm2ps.spec 27 Sep 2005 16:20:00 -0000 1.2 @@ -1,6 +1,6 @@ Name: abcm2ps Version: 4.11.4 -Release: 2 +Release: 2%{?dist} Summary: A program to typeset ABC tunes into Postscript Group: Applications/Multimedia From fedora-extras-commits at redhat.com Tue Sep 27 16:19:56 2005 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Tue, 27 Sep 2005 12:19:56 -0400 Subject: rpms/abcm2ps/FC-3 abcm2ps.spec,1.1,1.2 Message-ID: <200509271620.j8RGKQdH028367@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/abcm2ps/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28311/FC-3 Modified Files: abcm2ps.spec Log Message: Index: abcm2ps.spec =================================================================== RCS file: /cvs/extras/rpms/abcm2ps/FC-3/abcm2ps.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- abcm2ps.spec 26 Sep 2005 17:36:04 -0000 1.1 +++ abcm2ps.spec 27 Sep 2005 16:19:54 -0000 1.2 @@ -1,6 +1,6 @@ Name: abcm2ps Version: 4.11.4 -Release: 2 +Release: 2%{?dist} Summary: A program to typeset ABC tunes into Postscript Group: Applications/Multimedia From fedora-extras-commits at redhat.com Tue Sep 27 16:19:56 2005 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Tue, 27 Sep 2005 12:19:56 -0400 Subject: rpms/abcm2ps/FC-4 abcm2ps.spec,1.1,1.2 Message-ID: <200509271620.j8RGKRRo028370@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/abcm2ps/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28311/FC-4 Modified Files: abcm2ps.spec Log Message: Index: abcm2ps.spec =================================================================== RCS file: /cvs/extras/rpms/abcm2ps/FC-4/abcm2ps.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- abcm2ps.spec 26 Sep 2005 17:36:04 -0000 1.1 +++ abcm2ps.spec 27 Sep 2005 16:19:54 -0000 1.2 @@ -1,6 +1,6 @@ Name: abcm2ps Version: 4.11.4 -Release: 2 +Release: 2%{?dist} Summary: A program to typeset ABC tunes into Postscript Group: Applications/Multimedia From fedora-extras-commits at redhat.com Tue Sep 27 16:34:41 2005 From: fedora-extras-commits at redhat.com (Dan Kenigsberg (danken)) Date: Tue, 27 Sep 2005 12:34:41 -0400 Subject: rpms/hspell/FC-4 hspell.spec,1.1,1.2 Message-ID: <200509271634.j8RGYfe9028558@cvs-int.fedora.redhat.com> Author: danken Update of /cvs/extras/rpms/hspell/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28537 Modified Files: hspell.spec Log Message: change release version to merit a rebuild in the FC4 branch. Is it really required? Index: hspell.spec =================================================================== RCS file: /cvs/extras/rpms/hspell/FC-4/hspell.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- hspell.spec 26 Sep 2005 17:18:54 -0000 1.1 +++ hspell.spec 27 Sep 2005 16:34:38 -0000 1.2 @@ -1,7 +1,7 @@ Summary: A Hebrew spell checker Name: hspell Version: 0.9 -Release: 6 +Release: 6.fc4 URL: http://ivrix.org.il/projects/spell-checker/ Source: http://ivrix.org.il/projects/spell-checker/hspell-%{version}.tar.gz License: GPL @@ -75,7 +75,7 @@ %{_mandir}/man3/hspell.3* %changelog -* Mon Sep 26 2005 Dan Kenigsberg 0.9-6 +* Mon Sep 26 2005 Dan Kenigsberg 0.9-6.fc4 - Add the text of the GPL to the binary package. It seems that I'll do anything to make my sponsor Tom happy. * Thu Sep 23 2005 Dan Kenigsberg 0.9-5 From fedora-extras-commits at redhat.com Tue Sep 27 16:52:32 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Tue, 27 Sep 2005 12:52:32 -0400 Subject: rpms/sbcl/devel sbcl-0.9.5-personality.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 sbcl.spec, 1.14, 1.15 sources, 1.2, 1.3 sbcl-0.9.4-personality.patch, 1.1, NONE Message-ID: <200509271652.j8RGqWaH028951@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/sbcl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28925 Modified Files: .cvsignore sbcl.spec sources Added Files: sbcl-0.9.5-personality.patch Removed Files: sbcl-0.9.4-personality.patch Log Message: * Tue Sep 27 2005 Rex Dieter 0.9.5-1 - 0.9.5 - use native sbcl bootstraps, when available (ie, %{ix86},x86_64) - try ppc again sbcl-0.9.5-personality.patch: --- NEW FILE sbcl-0.9.5-personality.patch --- --- sbcl-0.9.5/src/runtime/linux-os.c.pers 2005-09-24 09:29:54.000000000 -0500 +++ sbcl-0.9.5/src/runtime/linux-os.c 2005-09-27 09:37:33.463478519 -0500 @@ -177,6 +177,10 @@ if (i != -1) { runtime[i] = '\0'; execve(runtime, argv, envp); + } else { + /* if /proc isn't available (like in chroot builds, like mock), + * try using execvp with argv[0] instead */ + execvp(argv[0], argv); } } /* Either changing the personality or execve() failed. Either Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/sbcl/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 12 Sep 2005 12:36:44 -0000 1.2 +++ .cvsignore 27 Sep 2005 16:52:30 -0000 1.3 @@ -1,4 +1,2 @@ +sbcl-0.9.5-source.tar.bz2 sbcl-0.8.15-powerpc-linux-binary.tar.bz2 -sbcl-0.9.4-source.tar.bz2 -sbcl-0.9.4-x86-64-linux-binary.tar.bz2 -sbcl-0.9.4-x86-linux-binary.tar.bz2 Index: sbcl.spec =================================================================== RCS file: /cvs/extras/rpms/sbcl/devel/sbcl.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- sbcl.spec 22 Sep 2005 14:10:29 -0000 1.14 +++ sbcl.spec 27 Sep 2005 16:52:30 -0000 1.15 @@ -9,29 +9,33 @@ Name: sbcl Summary: Steel Bank Common Lisp -Version: 0.9.4 -Release: 19%{?dist} +Version: 0.9.5 +Release: 1%{?dist} License: BSD/MIT Group: Development/Languages URL: http://sbcl.sourceforge.net/ Source0: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-%{version}-source.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -ExclusiveArch: %{ix86} x86_64 +ExclusiveArch: %{ix86} x86_64 ppc %if "%{?sbcl_bootstrap}" == "%{nil}" # local Bootstrap binaries -Source10: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-%{version}-x86-linux-binary.tar.bz2 +Source10: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.4-x86-linux-binary.tar.bz2 %ifarch %{ix86} -%define sbcl_bootstrap_src -a 10 +%define sbcl_bootstrap sbcl +#define sbcl_bootstrap_src -a 10 %endif -Source11: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-%{version}-x86-64-linux-binary.tar.bz2 +Source11: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.4-x86-64-linux-binary.tar.bz2 %ifarch x86_64 -%define sbcl_bootstrap_src -a 11 +%define sbcl_bootstrap sbcl +#define sbcl_bootstrap_src -a 11 %endif -# Latest powerpc-linux bootstrap (untested) +# Latest powerpc-linux bootstrap, busted: +# buildsys.fedoraproject.org/logs/development/1131-sbcl-0.9.4-14.fc5/ppc/build.log Source12: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.8.15-powerpc-linux-binary.tar.bz2 %ifarch ppc +%undefine sbcl_bootstrap %define sbcl_bootstrap_src -a 12 %endif %endif @@ -39,7 +43,7 @@ Source100: my_setarch.c Patch1: sbcl-0.8.18-default-sbcl-home.patch -Patch2: sbcl-0.9.4-personality.patch +Patch2: sbcl-0.9.5-personality.patch Patch3: sbcl-0.9.4-optflags.patch Patch4: sbcl-0.9.4-LIB_DIR.patch @@ -161,6 +165,11 @@ %changelog +* Tue Sep 27 2005 Rex Dieter 0.9.5-1 +- 0.9.5 +- use native sbcl bootstraps, when available (ie, %%{ix86},x86_64) +- try ppc again + * Thu Sep 22 2005 Rex Dieter 0.9.4-19 - drop use of setarch, use my_setarch.c Index: sources =================================================================== RCS file: /cvs/extras/rpms/sbcl/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 12 Sep 2005 12:36:44 -0000 1.2 +++ sources 27 Sep 2005 16:52:30 -0000 1.3 @@ -1,4 +1,2 @@ +f594f18813c08f262a6df9a36288adcb sbcl-0.9.5-source.tar.bz2 3a72d0785ce0a8e02f9af632c2a4f217 sbcl-0.8.15-powerpc-linux-binary.tar.bz2 -a0420dc6236efece72c1c80ee15873c9 sbcl-0.9.4-source.tar.bz2 -67ec41e624a3f2ad7f6f3cde1bd001d3 sbcl-0.9.4-x86-64-linux-binary.tar.bz2 -947d1cde2c1c80416b5f9fb4e4c81383 sbcl-0.9.4-x86-linux-binary.tar.bz2 --- sbcl-0.9.4-personality.patch DELETED --- From fedora-extras-commits at redhat.com Tue Sep 27 17:44:28 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 27 Sep 2005 13:44:28 -0400 Subject: owners owners.list,1.260,1.261 Message-ID: <200509271744.j8RHiSxG030489@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30470 Modified Files: owners.list Log Message: transfer ownership of tinyerp to Dan Hor??k Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.260 retrieving revision 1.261 diff -u -r1.260 -r1.261 --- owners.list 27 Sep 2005 15:58:04 -0000 1.260 +++ owners.list 27 Sep 2005 17:44:26 -0000 1.261 @@ -1006,7 +1006,7 @@ Fedora Extras|thunderbird|thunderbird mail|wtogami at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|tidy|Utility to clean up and pretty print HTML/XHTML/XML|rdieter at math.unl.edu|extras-qa at fedoraproject.org| Fedora Extras|tin|A basic Internet news reader|adrian at lisas.de|extras-qa at fedoraproject.org| -Fedora Extras|tinyerp|Open Source ERP Client|tcallawa at redhat.com|extras-qa at fedoraproject.org| +Fedora Extras|tinyerp|Open Source ERP Client|dan at danny.cz|extras-qa at fedoraproject.org|tcallawa at redhat.com Fedora Extras|tkcvs|TkCVS and TkDiff|gemi at bluewin.ch|extras-qa at fedoraproject.org| Fedora Extras|tktable|Table/matrix widget extension to Tcl/Tk|jfontain at free.fr|extras-qa at fedoraproject.org| Fedora Extras|tla|The Low-Budget arch Revision Control System|shahms at shahms.com|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Tue Sep 27 17:57:59 2005 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Tue, 27 Sep 2005 13:57:59 -0400 Subject: owners owners.list,1.261,1.262 Message-ID: <200509271757.j8RHvxgP030534@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30513 Modified Files: owners.list Log Message: Taking over celestia. Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.261 retrieving revision 1.262 diff -u -r1.261 -r1.262 --- owners.list 27 Sep 2005 17:44:26 -0000 1.261 +++ owners.list 27 Sep 2005 17:57:57 -0000 1.262 @@ -79,7 +79,7 @@ Fedora Extras|cdiff|Diff readability enhancer for color terminals|ville.skytta at iki.fi|extras-qa at fedoraproject.org| Fedora Extras|cdlabelgen|Generates frontcards and traycards for inserting in CD jewelcases.|harald at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|cdo|A program for manipulating GRIB/NetCDF/SERVICE/EXTRA files|ed at eh3.com|extras-qa at fedoraproject.org| -Fedora Extras|celestia|An OpenGL real-time visual space simulation|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| +Fedora Extras|celestia|An OpenGL real-time visual space simulation|steve at silug.org|extras-qa at fedoraproject.org| Fedora Extras|centericq|Text mode menu- and window-driven IM|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org| Fedora Extras|cfengine|GNU cfengine - a systems administration tool for networks|sheltren at cs.ucsb.edu|extras-qa at fedoraproject.org| Fedora Extras|cfs|An userspace crypto-filesystem|enrico.scholz at informatik.tu-chemnitz.de|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Tue Sep 27 18:02:28 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Tue, 27 Sep 2005 14:02:28 -0400 Subject: rpms/sbcl/devel .cvsignore,1.3,1.4 sources,1.3,1.4 Message-ID: <200509271803.j8RI34RK032050@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/sbcl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32029 Modified Files: .cvsignore sources Log Message: Add sources (even though they're not used?) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/sbcl/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 27 Sep 2005 16:52:30 -0000 1.3 +++ .cvsignore 27 Sep 2005 18:02:25 -0000 1.4 @@ -1,2 +1,4 @@ sbcl-0.9.5-source.tar.bz2 sbcl-0.8.15-powerpc-linux-binary.tar.bz2 +sbcl-0.9.4-x86-64-linux-binary.tar.bz2 +sbcl-0.9.4-x86-linux-binary.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/sbcl/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 27 Sep 2005 16:52:30 -0000 1.3 +++ sources 27 Sep 2005 18:02:25 -0000 1.4 @@ -1,2 +1,4 @@ f594f18813c08f262a6df9a36288adcb sbcl-0.9.5-source.tar.bz2 3a72d0785ce0a8e02f9af632c2a4f217 sbcl-0.8.15-powerpc-linux-binary.tar.bz2 +67ec41e624a3f2ad7f6f3cde1bd001d3 sbcl-0.9.4-x86-64-linux-binary.tar.bz2 +947d1cde2c1c80416b5f9fb4e4c81383 sbcl-0.9.4-x86-linux-binary.tar.bz2 From fedora-extras-commits at redhat.com Tue Sep 27 18:05:03 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Tue, 27 Sep 2005 14:05:03 -0400 Subject: rpms/sbcl/devel sbcl.spec,1.15,1.16 Message-ID: <200509271805.j8RI5X4R032087@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/sbcl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32068 Modified Files: sbcl.spec Log Message: remove unused Source's, Release++ Index: sbcl.spec =================================================================== RCS file: /cvs/extras/rpms/sbcl/devel/sbcl.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- sbcl.spec 27 Sep 2005 16:52:30 -0000 1.15 +++ sbcl.spec 27 Sep 2005 18:04:55 -0000 1.16 @@ -10,7 +10,7 @@ Name: sbcl Summary: Steel Bank Common Lisp Version: 0.9.5 -Release: 1%{?dist} +Release: 2%{?dist} License: BSD/MIT Group: Development/Languages @@ -21,12 +21,12 @@ %if "%{?sbcl_bootstrap}" == "%{nil}" # local Bootstrap binaries -Source10: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.4-x86-linux-binary.tar.bz2 +#Source10: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.4-x86-linux-binary.tar.bz2 %ifarch %{ix86} %define sbcl_bootstrap sbcl #define sbcl_bootstrap_src -a 10 %endif -Source11: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.4-x86-64-linux-binary.tar.bz2 +#Source11: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.4-x86-64-linux-binary.tar.bz2 %ifarch x86_64 %define sbcl_bootstrap sbcl #define sbcl_bootstrap_src -a 11 @@ -165,7 +165,7 @@ %changelog -* Tue Sep 27 2005 Rex Dieter 0.9.5-1 +* Tue Sep 27 2005 Rex Dieter 0.9.5-2 - 0.9.5 - use native sbcl bootstraps, when available (ie, %%{ix86},x86_64) - try ppc again From fedora-extras-commits at redhat.com Tue Sep 27 18:15:46 2005 From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert)) Date: Tue, 27 Sep 2005 14:15:46 -0400 Subject: rpms/emelfm2/devel emelfm2.spec,1.1,1.2 Message-ID: <200509271815.j8RIFkSw032337@cvs-int.fedora.redhat.com> Author: cwickert Update of /cvs/extras/rpms/emelfm2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32318 Modified Files: emelfm2.spec Log Message: release 0.3, fix for x86_64 Index: emelfm2.spec =================================================================== RCS file: /cvs/extras/rpms/emelfm2/devel/emelfm2.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- emelfm2.spec 27 Sep 2005 15:16:16 -0000 1.1 +++ emelfm2.spec 27 Sep 2005 18:15:44 -0000 1.2 @@ -1,6 +1,6 @@ Name: emelfm2 Version: 0.1.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A file manager that implements the popular two-pane design Group: Applications/File @@ -22,6 +22,8 @@ %setup -q %patch0 -p0 -b .orig sed -i 's!%PREFIX%'!'%{_prefix}!' Makefile.config +# 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!emelfm2/icon_emelfm2_48.png!%{_datadir}/pixmaps/emelfm2/emelfm2_48.png!' docs/desktop_environment/%{name}.desktop @@ -61,9 +63,12 @@ %changelog +* Tue Sep 27 2005 Christoph Wickert - 0.1.2-3 +- Fix for x86_64. + * Mon Sep 26 2005 Christoph Wickert - 0.1.2-2 -- removed broken-icon.patch (using sed instead). -- removed hardcoded /usr from makefile.config-patch. +- Removed broken-icon.patch (using sed instead). +- Removed hardcoded /usr from makefile.config-patch. - Minor specfile changes (#168608). * Sun Sep 18 2005 Christoph Wickert - 0.1.2-1 From fedora-extras-commits at redhat.com Tue Sep 27 18:43:16 2005 From: fedora-extras-commits at redhat.com (Dan Kenigsberg (danken)) Date: Tue, 27 Sep 2005 14:43:16 -0400 Subject: rpms/hspell/FC-3 hspell.spec,1.1,1.2 Message-ID: <200509271843.j8RIhG8G032524@cvs-int.fedora.redhat.com> Author: danken Update of /cvs/extras/rpms/hspell/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32505 Modified Files: hspell.spec Log Message: add %?dist to release version Index: hspell.spec =================================================================== RCS file: /cvs/extras/rpms/hspell/FC-3/hspell.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- hspell.spec 26 Sep 2005 17:18:54 -0000 1.1 +++ hspell.spec 27 Sep 2005 18:43:13 -0000 1.2 @@ -1,7 +1,7 @@ Summary: A Hebrew spell checker Name: hspell Version: 0.9 -Release: 6 +Release: 6%{?dist} URL: http://ivrix.org.il/projects/spell-checker/ Source: http://ivrix.org.il/projects/spell-checker/hspell-%{version}.tar.gz License: GPL From fedora-extras-commits at redhat.com Tue Sep 27 18:43:43 2005 From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert)) Date: Tue, 27 Sep 2005 14:43:43 -0400 Subject: rpms/emelfm2/FC-4 emelfm2.spec,1.1,1.2 Message-ID: <200509271843.j8RIhhDW032578@cvs-int.fedora.redhat.com> Author: cwickert Update of /cvs/extras/rpms/emelfm2/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32559 Modified Files: emelfm2.spec Log Message: release 0.3, fix for x86_64 Index: emelfm2.spec =================================================================== RCS file: /cvs/extras/rpms/emelfm2/FC-4/emelfm2.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- emelfm2.spec 27 Sep 2005 15:16:16 -0000 1.1 +++ emelfm2.spec 27 Sep 2005 18:43:40 -0000 1.2 @@ -1,6 +1,6 @@ Name: emelfm2 Version: 0.1.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A file manager that implements the popular two-pane design Group: Applications/File @@ -22,6 +22,8 @@ %setup -q %patch0 -p0 -b .orig sed -i 's!%PREFIX%'!'%{_prefix}!' Makefile.config +# 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!emelfm2/icon_emelfm2_48.png!%{_datadir}/pixmaps/emelfm2/emelfm2_48.png!' docs/desktop_environment/%{name}.desktop @@ -61,9 +63,12 @@ %changelog +* Tue Sep 27 2005 Christoph Wickert - 0.1.2-3 +- Fix for x86_64. + * Mon Sep 26 2005 Christoph Wickert - 0.1.2-2 -- removed broken-icon.patch (using sed instead). -- removed hardcoded /usr from makefile.config-patch. +- Removed broken-icon.patch (using sed instead). +- Removed hardcoded /usr from makefile.config-patch. - Minor specfile changes (#168608). * Sun Sep 18 2005 Christoph Wickert - 0.1.2-1 From fedora-extras-commits at redhat.com Tue Sep 27 18:44:26 2005 From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert)) Date: Tue, 27 Sep 2005 14:44:26 -0400 Subject: rpms/emelfm2/FC-3 emelfm2.spec,1.1,1.2 Message-ID: <200509271844.j8RIiQmd032613@cvs-int.fedora.redhat.com> Author: cwickert Update of /cvs/extras/rpms/emelfm2/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32592 Modified Files: emelfm2.spec Log Message: release 0.3, fix for x86_64 Index: emelfm2.spec =================================================================== RCS file: /cvs/extras/rpms/emelfm2/FC-3/emelfm2.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- emelfm2.spec 27 Sep 2005 15:16:16 -0000 1.1 +++ emelfm2.spec 27 Sep 2005 18:44:24 -0000 1.2 @@ -1,6 +1,6 @@ Name: emelfm2 Version: 0.1.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A file manager that implements the popular two-pane design Group: Applications/File @@ -22,6 +22,8 @@ %setup -q %patch0 -p0 -b .orig sed -i 's!%PREFIX%'!'%{_prefix}!' Makefile.config +# 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!emelfm2/icon_emelfm2_48.png!%{_datadir}/pixmaps/emelfm2/emelfm2_48.png!' docs/desktop_environment/%{name}.desktop @@ -61,9 +63,12 @@ %changelog +* Tue Sep 27 2005 Christoph Wickert - 0.1.2-3 +- Fix for x86_64. + * Mon Sep 26 2005 Christoph Wickert - 0.1.2-2 -- removed broken-icon.patch (using sed instead). -- removed hardcoded /usr from makefile.config-patch. +- Removed broken-icon.patch (using sed instead). +- Removed hardcoded /usr from makefile.config-patch. - Minor specfile changes (#168608). * Sun Sep 18 2005 Christoph Wickert - 0.1.2-1 From fedora-extras-commits at redhat.com Tue Sep 27 18:54:22 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Tue, 27 Sep 2005 14:54:22 -0400 Subject: rpms/sbcl/devel sbcl.spec,1.16,1.17 Message-ID: <200509271854.j8RIsMFR032735@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/sbcl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32716 Modified Files: sbcl.spec Log Message: * Tue Sep 27 2005 Rex Dieter 0.9.5-3 - ppc needs SBCL_ARCH and(or?) setarch Index: sbcl.spec =================================================================== RCS file: /cvs/extras/rpms/sbcl/devel/sbcl.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- sbcl.spec 27 Sep 2005 18:04:55 -0000 1.16 +++ sbcl.spec 27 Sep 2005 18:54:20 -0000 1.17 @@ -10,7 +10,7 @@ Name: sbcl Summary: Steel Bank Common Lisp Version: 0.9.5 -Release: 2%{?dist} +Release: 3%{?dist} License: BSD/MIT Group: Development/Languages @@ -26,17 +26,21 @@ %define sbcl_bootstrap sbcl #define sbcl_bootstrap_src -a 10 %endif -#Source11: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.4-x86-64-linux-binary.tar.bz2 +#Source20: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.4-x86-64-linux-binary.tar.bz2 %ifarch x86_64 %define sbcl_bootstrap sbcl -#define sbcl_bootstrap_src -a 11 +#define sbcl_bootstrap_src -a 20 %endif # Latest powerpc-linux bootstrap, busted: # buildsys.fedoraproject.org/logs/development/1131-sbcl-0.9.4-14.fc5/ppc/build.log -Source12: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.8.15-powerpc-linux-binary.tar.bz2 +Source30: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.8.15-powerpc-linux-binary.tar.bz2 +# another possible ppc bootstrap to try +#Source31: http://clozure.com/openmcl/ftp/openmcl-linuxppc-all-0.14.3.tar.gz %ifarch ppc +BuildRequires: setarch +%define setarch setarch %{_target_cpu} %undefine sbcl_bootstrap -%define sbcl_bootstrap_src -a 12 +%define sbcl_bootstrap_src -a 30 %endif %endif @@ -47,6 +51,7 @@ Patch3: sbcl-0.9.4-optflags.patch Patch4: sbcl-0.9.4-LIB_DIR.patch +BuildRequires: setarch %{?sbcl_bootstrap:BuildRequires: %{?sbcl_bootstrap}} Requires(post): /sbin/install-info @@ -105,10 +110,12 @@ export PATH=`pwd`/sbcl-bootstrap/bin:${PATH} %{__cc} -o my_setarch %{optflags} %{SOURCE100} -%define setarch ./my_setarch +%define my_setarch ./my_setarch %endif -%{?setarch} ./make.sh %{?bootstrap} +# setting SBCL_ARCH couldn't hurt, esp for ppc, might avoid the need for the setarch call +export SBCL_ARCH=%{_target_cpu} +%{?setarch} %{?my_setarch} ./make.sh %{?bootstrap} # docs make -C doc/manual html info @@ -165,6 +172,9 @@ %changelog +* Tue Sep 27 2005 Rex Dieter 0.9.5-3 +- ppc needs SBCL_ARCH and(or?) setarch + * Tue Sep 27 2005 Rex Dieter 0.9.5-2 - 0.9.5 - use native sbcl bootstraps, when available (ie, %%{ix86},x86_64) From fedora-extras-commits at redhat.com Tue Sep 27 19:09:07 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Tue, 27 Sep 2005 15:09:07 -0400 Subject: rpms/sbcl/devel sbcl.spec,1.17,1.18 Message-ID: <200509271909.j8RJ9cAk001726@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/sbcl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1676 Modified Files: sbcl.spec Log Message: SBCL_ARCH only on ppc, since it breaks on others (ie x86_86 != x86-64) Index: sbcl.spec =================================================================== RCS file: /cvs/extras/rpms/sbcl/devel/sbcl.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- sbcl.spec 27 Sep 2005 18:54:20 -0000 1.17 +++ sbcl.spec 27 Sep 2005 19:09:05 -0000 1.18 @@ -10,7 +10,7 @@ Name: sbcl Summary: Steel Bank Common Lisp Version: 0.9.5 -Release: 3%{?dist} +Release: 4%{?dist} License: BSD/MIT Group: Development/Languages @@ -113,8 +113,9 @@ %define my_setarch ./my_setarch %endif -# setting SBCL_ARCH couldn't hurt, esp for ppc, might avoid the need for the setarch call +%ifarch ppc export SBCL_ARCH=%{_target_cpu} +%endif %{?setarch} %{?my_setarch} ./make.sh %{?bootstrap} # docs @@ -172,7 +173,7 @@ %changelog -* Tue Sep 27 2005 Rex Dieter 0.9.5-3 +* Tue Sep 27 2005 Rex Dieter 0.9.5-4 - ppc needs SBCL_ARCH and(or?) setarch * Tue Sep 27 2005 Rex Dieter 0.9.5-2 From fedora-extras-commits at redhat.com Tue Sep 27 19:12:23 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Tue, 27 Sep 2005 15:12:23 -0400 Subject: rpms/sbcl/devel sbcl.spec,1.18,1.19 Message-ID: <200509271912.j8RJCNJ7001763@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/sbcl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1744 Modified Files: sbcl.spec Log Message: cleanup sbcl_arch handling, with x86_64 exception Index: sbcl.spec =================================================================== RCS file: /cvs/extras/rpms/sbcl/devel/sbcl.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- sbcl.spec 27 Sep 2005 19:09:05 -0000 1.18 +++ sbcl.spec 27 Sep 2005 19:12:21 -0000 1.19 @@ -19,6 +19,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) ExclusiveArch: %{ix86} x86_64 ppc +%define sbcl_arch %{_target_cpu} + %if "%{?sbcl_bootstrap}" == "%{nil}" # local Bootstrap binaries #Source10: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.4-x86-linux-binary.tar.bz2 @@ -28,6 +30,7 @@ %endif #Source20: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.4-x86-64-linux-binary.tar.bz2 %ifarch x86_64 +%define sbcl_arch x86-64 %define sbcl_bootstrap sbcl #define sbcl_bootstrap_src -a 20 %endif @@ -113,9 +116,7 @@ %define my_setarch ./my_setarch %endif -%ifarch ppc -export SBCL_ARCH=%{_target_cpu} -%endif +%{?sbcl_arch:export SBCL_ARCH=%{sbcl_arch}} %{?setarch} %{?my_setarch} ./make.sh %{?bootstrap} # docs From fedora-extras-commits at redhat.com Tue Sep 27 19:31:53 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Tue, 27 Sep 2005 15:31:53 -0400 Subject: rpms/sbcl/devel sbcl.spec,1.19,1.20 Message-ID: <200509271932.j8RJWNgJ001864@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/sbcl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1843 Modified Files: sbcl.spec Log Message: cleanup/allow-for arch-specific build options Index: sbcl.spec =================================================================== RCS file: /cvs/extras/rpms/sbcl/devel/sbcl.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- sbcl.spec 27 Sep 2005 19:12:21 -0000 1.19 +++ sbcl.spec 27 Sep 2005 19:31:50 -0000 1.20 @@ -1,16 +1,9 @@ # $Id$ -## Default to using a local bootstrap, -## define one of the following to override -## (non sbcl bootstraps untested) -#define sbcl_bootstrap sbcl -#define sbcl_bootstrap cmucl -#define sbcl_bootstrap clisp - Name: sbcl Summary: Steel Bank Common Lisp Version: 0.9.5 -Release: 4%{?dist} +Release: 5%{?dist} License: BSD/MIT Group: Development/Languages @@ -19,32 +12,33 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) ExclusiveArch: %{ix86} x86_64 ppc -%define sbcl_arch %{_target_cpu} - -%if "%{?sbcl_bootstrap}" == "%{nil}" -# local Bootstrap binaries +## x86 section #Source10: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.4-x86-linux-binary.tar.bz2 %ifarch %{ix86} -%define sbcl_bootstrap sbcl +%define sbcl_arch x86 +BuildRequires: sbcl #define sbcl_bootstrap_src -a 10 %endif + +## x86_64 section #Source20: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.4-x86-64-linux-binary.tar.bz2 %ifarch x86_64 %define sbcl_arch x86-64 -%define sbcl_bootstrap sbcl +BuildRequires: sbcl #define sbcl_bootstrap_src -a 20 %endif + +## ppc section # Latest powerpc-linux bootstrap, busted: # buildsys.fedoraproject.org/logs/development/1131-sbcl-0.9.4-14.fc5/ppc/build.log Source30: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.8.15-powerpc-linux-binary.tar.bz2 # another possible ppc bootstrap to try #Source31: http://clozure.com/openmcl/ftp/openmcl-linuxppc-all-0.14.3.tar.gz %ifarch ppc +%define sbcl_arch ppc +%define sbcl_bootstrap_src -a 30 BuildRequires: setarch %define setarch setarch %{_target_cpu} -%undefine sbcl_bootstrap -%define sbcl_bootstrap_src -a 30 -%endif %endif Source100: my_setarch.c @@ -54,9 +48,6 @@ Patch3: sbcl-0.9.4-optflags.patch Patch4: sbcl-0.9.4-LIB_DIR.patch -BuildRequires: setarch -%{?sbcl_bootstrap:BuildRequires: %{?sbcl_bootstrap}} - Requires(post): /sbin/install-info Requires(preun): /sbin/install-info # doc generation @@ -90,7 +81,7 @@ %endif #endif -%if "%{?sbcl_bootstrap}" == "%{nil}" +%if "%{?sbcl_bootstrap_src}" != "%{nil}" mkdir sbcl-bootstrap pushd sbcl-*-linux chmod +x install.sh @@ -108,7 +99,7 @@ %build export DEFAULT_SBCL_HOME=%{_libdir}/sbcl -%if "%{?sbcl_bootstrap}" == "%{nil}" +%if "%{?sbcl_bootstrap_src}" != "%{nil}" export SBCL_HOME=`pwd`/sbcl-bootstrap/lib/sbcl export PATH=`pwd`/sbcl-bootstrap/bin:${PATH} @@ -174,8 +165,9 @@ %changelog -* Tue Sep 27 2005 Rex Dieter 0.9.5-4 -- ppc needs SBCL_ARCH and(or?) setarch +* Tue Sep 27 2005 Rex Dieter 0.9.5-5 +- set/use SBCL_ARCH/setarch (esp on ppc) +- allow arch-specific build-options * Tue Sep 27 2005 Rex Dieter 0.9.5-2 - 0.9.5 From fedora-extras-commits at redhat.com Tue Sep 27 20:07:30 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Tue, 27 Sep 2005 16:07:30 -0400 Subject: rpms/sbcl/devel sbcl-0.9.5-optflags.patch, NONE, 1.1 sbcl.spec, 1.20, 1.21 sbcl-0.9.4-optflags.patch, 1.1, NONE Message-ID: <200509272008.j8RK83ZB003392@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/sbcl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3367 Modified Files: sbcl.spec Added Files: sbcl-0.9.5-optflags.patch Removed Files: sbcl-0.9.4-optflags.patch Log Message: * Tue Sep 27 2005 Rex Dieter 0.9.5-6 - drop ppc - cleaner optflags patch sbcl-0.9.5-optflags.patch: --- NEW FILE sbcl-0.9.5-optflags.patch --- --- sbcl-0.9.5/src/runtime/Config.ppc-linux.optflags 2005-09-21 10:01:15.000000000 -0500 +++ sbcl-0.9.5/src/runtime/Config.ppc-linux 2005-09-27 15:03:06.295658344 -0500 @@ -9,7 +9,7 @@ # provided with absolutely no warranty. See the COPYING and CREDITS # files for more information. -CFLAGS = -g +CFLAGS += $(RPM_OPT_FLAGS) LINKFLAGS += -v -rdynamic NM = ./linux-nm --- sbcl-0.9.5/src/runtime/Config.x86_64-linux.optflags 2005-09-21 10:01:15.000000000 -0500 +++ sbcl-0.9.5/src/runtime/Config.x86_64-linux 2005-09-27 15:04:31.690676328 -0500 @@ -34,7 +34,7 @@ > /dev/null 2>&1; \ then echo "-lpthread"; fi) -CFLAGS += -fno-omit-frame-pointer +CFLAGS += -fno-omit-frame-pointer $(RPM_OPT_FLAGS) GC_SRC = gencgc.c --- sbcl-0.9.5/src/runtime/Config.x86-linux.optflags 2005-09-21 10:01:15.000000000 -0500 +++ sbcl-0.9.5/src/runtime/Config.x86-linux 2005-09-27 15:05:03.562831024 -0500 @@ -34,6 +34,8 @@ > /dev/null 2>&1; \ then echo "-lpthread"; fi) +CFLAGS += $(RPM_OPT_FLAGS) + GC_SRC = gencgc.c # Nothing to do for after-grovel-headers. Index: sbcl.spec =================================================================== RCS file: /cvs/extras/rpms/sbcl/devel/sbcl.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- sbcl.spec 27 Sep 2005 19:31:50 -0000 1.20 +++ sbcl.spec 27 Sep 2005 20:07:27 -0000 1.21 @@ -3,14 +3,14 @@ Name: sbcl Summary: Steel Bank Common Lisp Version: 0.9.5 -Release: 5%{?dist} +Release: 6%{?dist} License: BSD/MIT Group: Development/Languages URL: http://sbcl.sourceforge.net/ Source0: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-%{version}-source.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -ExclusiveArch: %{ix86} x86_64 ppc +ExclusiveArch: %{ix86} x86_64 ## x86 section #Source10: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.4-x86-linux-binary.tar.bz2 @@ -45,7 +45,7 @@ Patch1: sbcl-0.8.18-default-sbcl-home.patch Patch2: sbcl-0.9.5-personality.patch -Patch3: sbcl-0.9.4-optflags.patch +Patch3: sbcl-0.9.5-optflags.patch Patch4: sbcl-0.9.4-LIB_DIR.patch Requires(post): /sbin/install-info @@ -116,7 +116,7 @@ %check || : pushd tests -sh ./run-tests.sh +%{?setarch} sh ./run-tests.sh popd @@ -165,6 +165,10 @@ %changelog +* Tue Sep 27 2005 Rex Dieter 0.9.5-6 +- drop ppc +- cleaner optflags patch + * Tue Sep 27 2005 Rex Dieter 0.9.5-5 - set/use SBCL_ARCH/setarch (esp on ppc) - allow arch-specific build-options --- sbcl-0.9.4-optflags.patch DELETED --- From fedora-extras-commits at redhat.com Tue Sep 27 20:10:06 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Tue, 27 Sep 2005 16:10:06 -0400 Subject: rpms/sbcl/devel sbcl.spec,1.21,1.22 Message-ID: <200509272010.j8RKA6PE003465@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/sbcl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3445 Modified Files: sbcl.spec Log Message: Since we're omitting ppc, omit the ppc bootstrap source too (for now) Index: sbcl.spec =================================================================== RCS file: /cvs/extras/rpms/sbcl/devel/sbcl.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- sbcl.spec 27 Sep 2005 20:07:27 -0000 1.21 +++ sbcl.spec 27 Sep 2005 20:10:04 -0000 1.22 @@ -3,7 +3,7 @@ Name: sbcl Summary: Steel Bank Common Lisp Version: 0.9.5 -Release: 6%{?dist} +Release: 7%{?dist} License: BSD/MIT Group: Development/Languages @@ -31,7 +31,7 @@ ## ppc section # Latest powerpc-linux bootstrap, busted: # buildsys.fedoraproject.org/logs/development/1131-sbcl-0.9.4-14.fc5/ppc/build.log -Source30: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.8.15-powerpc-linux-binary.tar.bz2 +#Source30: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.8.15-powerpc-linux-binary.tar.bz2 # another possible ppc bootstrap to try #Source31: http://clozure.com/openmcl/ftp/openmcl-linuxppc-all-0.14.3.tar.gz %ifarch ppc @@ -165,7 +165,7 @@ %changelog -* Tue Sep 27 2005 Rex Dieter 0.9.5-6 +* Tue Sep 27 2005 Rex Dieter 0.9.5-7 - drop ppc - cleaner optflags patch From fedora-extras-commits at redhat.com Tue Sep 27 20:19:34 2005 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Tue, 27 Sep 2005 16:19:34 -0400 Subject: owners owners.list,1.262,1.263 Message-ID: <200509272019.j8RKJYWk003585@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3566 Modified Files: owners.list Log Message: Take ownership of SDL_* orphaned packages Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.262 retrieving revision 1.263 diff -u -r1.262 -r1.263 --- owners.list 27 Sep 2005 17:57:57 -0000 1.262 +++ owners.list 27 Sep 2005 20:19:32 -0000 1.263 @@ -933,9 +933,9 @@ Fedora Extras|scribus-templates|This package includes additional templates for Scribus|compton at pcompton.com|extras-qa at fedoraproject.org| Fedora Extras|scrub|Disk scrubbing program|tcallawa at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|SDL_gfx|Graphic primitives, rotozoomer, framerate control and image filters|matthias at rpmforge.net|extras-qa at fedoraproject.org| -Fedora Extras|SDL_image|A sample image loading library for SDL.|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| -Fedora Extras|SDL_mixer|Simple DirectMedia Layer - Sample Mixer Library|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| -Fedora Extras|SDL_net|SDL portable network library|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| +Fedora Extras|SDL_image|A sample image loading library for SDL.|bdpepple at ameritech.net|extras-qa at fedoraproject.org| +Fedora Extras|SDL_mixer|Simple DirectMedia Layer - Sample Mixer Library|bdpepple at ameritech.net|extras-qa at fedoraproject.org| +Fedora Extras|SDL_net|SDL portable network library|bdpepple at ameritech.net|extras-qa at fedoraproject.org| Fedora Extras|SDL_ttf|Simple DirectMedia Layer - Sample TrueType Font Library|pmatilai at laiskiainen.org|extras-qa at fedoraproject.org| Fedora Extras|seahorse|GNOME2 interface for gnupg|skvidal at phy.duke.edu|extras-qa at fedoraproject.org| Fedora Extras|shapelib|API in "C" for Shapefile handling|mccann0011 at hotmail.com|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Tue Sep 27 20:44:51 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Tue, 27 Sep 2005 16:44:51 -0400 Subject: rpms/sbcl/FC-3 sbcl-0.9.5-optflags.patch, NONE, 1.1 sbcl-0.9.5-personality.patch, NONE, 1.1 sbcl.spec, 1.14, 1.15 sbcl-0.9.4-optflags.patch, 1.1, NONE sbcl-0.9.4-personality.patch, 1.1, NONE Message-ID: <200509272045.j8RKjM16003728@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/sbcl/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3678/FC-3 Modified Files: sbcl.spec Added Files: sbcl-0.9.5-optflags.patch sbcl-0.9.5-personality.patch Removed Files: sbcl-0.9.4-optflags.patch sbcl-0.9.4-personality.patch Log Message: * Tue Sep 27 2005 Rex Dieter 0.9.5-7 - drop ppc - cleaner optflags patch * Tue Sep 27 2005 Rex Dieter 0.9.5-5 - set/use SBCL_ARCH/setarch (esp on ppc) - allow arch-specific build-options * Tue Sep 27 2005 Rex Dieter 0.9.5-2 - 0.9.5 - use native sbcl bootstraps, when available (ie, %%{ix86},x86_64) - try ppc again sbcl-0.9.5-optflags.patch: --- NEW FILE sbcl-0.9.5-optflags.patch --- --- sbcl-0.9.5/src/runtime/Config.ppc-linux.optflags 2005-09-21 10:01:15.000000000 -0500 +++ sbcl-0.9.5/src/runtime/Config.ppc-linux 2005-09-27 15:03:06.295658344 -0500 @@ -9,7 +9,7 @@ # provided with absolutely no warranty. See the COPYING and CREDITS # files for more information. -CFLAGS = -g +CFLAGS += $(RPM_OPT_FLAGS) LINKFLAGS += -v -rdynamic NM = ./linux-nm --- sbcl-0.9.5/src/runtime/Config.x86_64-linux.optflags 2005-09-21 10:01:15.000000000 -0500 +++ sbcl-0.9.5/src/runtime/Config.x86_64-linux 2005-09-27 15:04:31.690676328 -0500 @@ -34,7 +34,7 @@ > /dev/null 2>&1; \ then echo "-lpthread"; fi) -CFLAGS += -fno-omit-frame-pointer +CFLAGS += -fno-omit-frame-pointer $(RPM_OPT_FLAGS) GC_SRC = gencgc.c --- sbcl-0.9.5/src/runtime/Config.x86-linux.optflags 2005-09-21 10:01:15.000000000 -0500 +++ sbcl-0.9.5/src/runtime/Config.x86-linux 2005-09-27 15:05:03.562831024 -0500 @@ -34,6 +34,8 @@ > /dev/null 2>&1; \ then echo "-lpthread"; fi) +CFLAGS += $(RPM_OPT_FLAGS) + GC_SRC = gencgc.c # Nothing to do for after-grovel-headers. sbcl-0.9.5-personality.patch: --- NEW FILE sbcl-0.9.5-personality.patch --- --- sbcl-0.9.5/src/runtime/linux-os.c.pers 2005-09-24 09:29:54.000000000 -0500 +++ sbcl-0.9.5/src/runtime/linux-os.c 2005-09-27 09:37:33.463478519 -0500 @@ -177,6 +177,10 @@ if (i != -1) { runtime[i] = '\0'; execve(runtime, argv, envp); + } else { + /* if /proc isn't available (like in chroot builds, like mock), + * try using execvp with argv[0] instead */ + execvp(argv[0], argv); } } /* Either changing the personality or execve() failed. Either Index: sbcl.spec =================================================================== RCS file: /cvs/extras/rpms/sbcl/FC-3/sbcl.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- sbcl.spec 22 Sep 2005 14:10:52 -0000 1.14 +++ sbcl.spec 27 Sep 2005 20:44:49 -0000 1.15 @@ -1,16 +1,9 @@ # $Id$ -## Default to using a local bootstrap, -## define one of the following to override -## (non sbcl bootstraps untested) -#define sbcl_bootstrap sbcl -#define sbcl_bootstrap cmucl -#define sbcl_bootstrap clisp - Name: sbcl Summary: Steel Bank Common Lisp -Version: 0.9.4 -Release: 19%{?dist} +Version: 0.9.5 +Release: 7%{?dist} License: BSD/MIT Group: Development/Languages @@ -19,32 +12,42 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) ExclusiveArch: %{ix86} x86_64 -%if "%{?sbcl_bootstrap}" == "%{nil}" -# local Bootstrap binaries -Source10: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-%{version}-x86-linux-binary.tar.bz2 +## x86 section +#Source10: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.4-x86-linux-binary.tar.bz2 %ifarch %{ix86} -%define sbcl_bootstrap_src -a 10 +%define sbcl_arch x86 +BuildRequires: sbcl +#define sbcl_bootstrap_src -a 10 %endif -Source11: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-%{version}-x86-64-linux-binary.tar.bz2 + +## x86_64 section +#Source20: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.4-x86-64-linux-binary.tar.bz2 %ifarch x86_64 -%define sbcl_bootstrap_src -a 11 +%define sbcl_arch x86-64 +BuildRequires: sbcl +#define sbcl_bootstrap_src -a 20 %endif -# Latest powerpc-linux bootstrap (untested) -Source12: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.8.15-powerpc-linux-binary.tar.bz2 + +## ppc section +# Latest powerpc-linux bootstrap, busted: +# buildsys.fedoraproject.org/logs/development/1131-sbcl-0.9.4-14.fc5/ppc/build.log +#Source30: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.8.15-powerpc-linux-binary.tar.bz2 +# another possible ppc bootstrap to try +#Source31: http://clozure.com/openmcl/ftp/openmcl-linuxppc-all-0.14.3.tar.gz %ifarch ppc -%define sbcl_bootstrap_src -a 12 -%endif +%define sbcl_arch ppc +%define sbcl_bootstrap_src -a 30 +BuildRequires: setarch +%define setarch setarch %{_target_cpu} %endif Source100: my_setarch.c Patch1: sbcl-0.8.18-default-sbcl-home.patch -Patch2: sbcl-0.9.4-personality.patch -Patch3: sbcl-0.9.4-optflags.patch +Patch2: sbcl-0.9.5-personality.patch +Patch3: sbcl-0.9.5-optflags.patch Patch4: sbcl-0.9.4-LIB_DIR.patch -%{?sbcl_bootstrap:BuildRequires: %{?sbcl_bootstrap}} - Requires(post): /sbin/install-info Requires(preun): /sbin/install-info # doc generation @@ -78,7 +81,7 @@ %endif #endif -%if "%{?sbcl_bootstrap}" == "%{nil}" +%if "%{?sbcl_bootstrap_src}" != "%{nil}" mkdir sbcl-bootstrap pushd sbcl-*-linux chmod +x install.sh @@ -96,15 +99,16 @@ %build export DEFAULT_SBCL_HOME=%{_libdir}/sbcl -%if "%{?sbcl_bootstrap}" == "%{nil}" +%if "%{?sbcl_bootstrap_src}" != "%{nil}" export SBCL_HOME=`pwd`/sbcl-bootstrap/lib/sbcl export PATH=`pwd`/sbcl-bootstrap/bin:${PATH} %{__cc} -o my_setarch %{optflags} %{SOURCE100} -%define setarch ./my_setarch +%define my_setarch ./my_setarch %endif -%{?setarch} ./make.sh %{?bootstrap} +%{?sbcl_arch:export SBCL_ARCH=%{sbcl_arch}} +%{?setarch} %{?my_setarch} ./make.sh %{?bootstrap} # docs make -C doc/manual html info @@ -112,7 +116,7 @@ %check || : pushd tests -sh ./run-tests.sh +%{?setarch} sh ./run-tests.sh popd @@ -161,6 +165,19 @@ %changelog +* Tue Sep 27 2005 Rex Dieter 0.9.5-7 +- drop ppc +- cleaner optflags patch + +* Tue Sep 27 2005 Rex Dieter 0.9.5-5 +- set/use SBCL_ARCH/setarch (esp on ppc) +- allow arch-specific build-options + +* Tue Sep 27 2005 Rex Dieter 0.9.5-2 +- 0.9.5 +- use native sbcl bootstraps, when available (ie, %%{ix86},x86_64) +- try ppc again + * Thu Sep 22 2005 Rex Dieter 0.9.4-19 - drop use of setarch, use my_setarch.c --- sbcl-0.9.4-optflags.patch DELETED --- --- sbcl-0.9.4-personality.patch DELETED --- From fedora-extras-commits at redhat.com Tue Sep 27 20:44:52 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Tue, 27 Sep 2005 16:44:52 -0400 Subject: rpms/sbcl/FC-4 sbcl-0.9.5-optflags.patch, NONE, 1.1 sbcl-0.9.5-personality.patch, NONE, 1.1 sbcl.spec, 1.14, 1.15 sbcl-0.9.4-optflags.patch, 1.1, NONE sbcl-0.9.4-personality.patch, 1.1, NONE Message-ID: <200509272045.j8RKjNT8003731@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/sbcl/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3678/FC-4 Modified Files: sbcl.spec Added Files: sbcl-0.9.5-optflags.patch sbcl-0.9.5-personality.patch Removed Files: sbcl-0.9.4-optflags.patch sbcl-0.9.4-personality.patch Log Message: * Tue Sep 27 2005 Rex Dieter 0.9.5-7 - drop ppc - cleaner optflags patch * Tue Sep 27 2005 Rex Dieter 0.9.5-5 - set/use SBCL_ARCH/setarch (esp on ppc) - allow arch-specific build-options * Tue Sep 27 2005 Rex Dieter 0.9.5-2 - 0.9.5 - use native sbcl bootstraps, when available (ie, %%{ix86},x86_64) - try ppc again sbcl-0.9.5-optflags.patch: --- NEW FILE sbcl-0.9.5-optflags.patch --- --- sbcl-0.9.5/src/runtime/Config.ppc-linux.optflags 2005-09-21 10:01:15.000000000 -0500 +++ sbcl-0.9.5/src/runtime/Config.ppc-linux 2005-09-27 15:03:06.295658344 -0500 @@ -9,7 +9,7 @@ # provided with absolutely no warranty. See the COPYING and CREDITS # files for more information. -CFLAGS = -g +CFLAGS += $(RPM_OPT_FLAGS) LINKFLAGS += -v -rdynamic NM = ./linux-nm --- sbcl-0.9.5/src/runtime/Config.x86_64-linux.optflags 2005-09-21 10:01:15.000000000 -0500 +++ sbcl-0.9.5/src/runtime/Config.x86_64-linux 2005-09-27 15:04:31.690676328 -0500 @@ -34,7 +34,7 @@ > /dev/null 2>&1; \ then echo "-lpthread"; fi) -CFLAGS += -fno-omit-frame-pointer +CFLAGS += -fno-omit-frame-pointer $(RPM_OPT_FLAGS) GC_SRC = gencgc.c --- sbcl-0.9.5/src/runtime/Config.x86-linux.optflags 2005-09-21 10:01:15.000000000 -0500 +++ sbcl-0.9.5/src/runtime/Config.x86-linux 2005-09-27 15:05:03.562831024 -0500 @@ -34,6 +34,8 @@ > /dev/null 2>&1; \ then echo "-lpthread"; fi) +CFLAGS += $(RPM_OPT_FLAGS) + GC_SRC = gencgc.c # Nothing to do for after-grovel-headers. sbcl-0.9.5-personality.patch: --- NEW FILE sbcl-0.9.5-personality.patch --- --- sbcl-0.9.5/src/runtime/linux-os.c.pers 2005-09-24 09:29:54.000000000 -0500 +++ sbcl-0.9.5/src/runtime/linux-os.c 2005-09-27 09:37:33.463478519 -0500 @@ -177,6 +177,10 @@ if (i != -1) { runtime[i] = '\0'; execve(runtime, argv, envp); + } else { + /* if /proc isn't available (like in chroot builds, like mock), + * try using execvp with argv[0] instead */ + execvp(argv[0], argv); } } /* Either changing the personality or execve() failed. Either Index: sbcl.spec =================================================================== RCS file: /cvs/extras/rpms/sbcl/FC-4/sbcl.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- sbcl.spec 22 Sep 2005 14:10:11 -0000 1.14 +++ sbcl.spec 27 Sep 2005 20:44:50 -0000 1.15 @@ -1,16 +1,9 @@ # $Id$ -## Default to using a local bootstrap, -## define one of the following to override -## (non sbcl bootstraps untested) -#define sbcl_bootstrap sbcl -#define sbcl_bootstrap cmucl -#define sbcl_bootstrap clisp - Name: sbcl Summary: Steel Bank Common Lisp -Version: 0.9.4 -Release: 19%{?dist} +Version: 0.9.5 +Release: 7%{?dist} License: BSD/MIT Group: Development/Languages @@ -19,32 +12,42 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) ExclusiveArch: %{ix86} x86_64 -%if "%{?sbcl_bootstrap}" == "%{nil}" -# local Bootstrap binaries -Source10: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-%{version}-x86-linux-binary.tar.bz2 +## x86 section +#Source10: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.4-x86-linux-binary.tar.bz2 %ifarch %{ix86} -%define sbcl_bootstrap_src -a 10 +%define sbcl_arch x86 +BuildRequires: sbcl +#define sbcl_bootstrap_src -a 10 %endif -Source11: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-%{version}-x86-64-linux-binary.tar.bz2 + +## x86_64 section +#Source20: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.4-x86-64-linux-binary.tar.bz2 %ifarch x86_64 -%define sbcl_bootstrap_src -a 11 +%define sbcl_arch x86-64 +BuildRequires: sbcl +#define sbcl_bootstrap_src -a 20 %endif -# Latest powerpc-linux bootstrap (untested) -Source12: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.8.15-powerpc-linux-binary.tar.bz2 + +## ppc section +# Latest powerpc-linux bootstrap, busted: +# buildsys.fedoraproject.org/logs/development/1131-sbcl-0.9.4-14.fc5/ppc/build.log +#Source30: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.8.15-powerpc-linux-binary.tar.bz2 +# another possible ppc bootstrap to try +#Source31: http://clozure.com/openmcl/ftp/openmcl-linuxppc-all-0.14.3.tar.gz %ifarch ppc -%define sbcl_bootstrap_src -a 12 -%endif +%define sbcl_arch ppc +%define sbcl_bootstrap_src -a 30 +BuildRequires: setarch +%define setarch setarch %{_target_cpu} %endif Source100: my_setarch.c Patch1: sbcl-0.8.18-default-sbcl-home.patch -Patch2: sbcl-0.9.4-personality.patch -Patch3: sbcl-0.9.4-optflags.patch +Patch2: sbcl-0.9.5-personality.patch +Patch3: sbcl-0.9.5-optflags.patch Patch4: sbcl-0.9.4-LIB_DIR.patch -%{?sbcl_bootstrap:BuildRequires: %{?sbcl_bootstrap}} - Requires(post): /sbin/install-info Requires(preun): /sbin/install-info # doc generation @@ -78,7 +81,7 @@ %endif #endif -%if "%{?sbcl_bootstrap}" == "%{nil}" +%if "%{?sbcl_bootstrap_src}" != "%{nil}" mkdir sbcl-bootstrap pushd sbcl-*-linux chmod +x install.sh @@ -96,15 +99,16 @@ %build export DEFAULT_SBCL_HOME=%{_libdir}/sbcl -%if "%{?sbcl_bootstrap}" == "%{nil}" +%if "%{?sbcl_bootstrap_src}" != "%{nil}" export SBCL_HOME=`pwd`/sbcl-bootstrap/lib/sbcl export PATH=`pwd`/sbcl-bootstrap/bin:${PATH} %{__cc} -o my_setarch %{optflags} %{SOURCE100} -%define setarch ./my_setarch +%define my_setarch ./my_setarch %endif -%{?setarch} ./make.sh %{?bootstrap} +%{?sbcl_arch:export SBCL_ARCH=%{sbcl_arch}} +%{?setarch} %{?my_setarch} ./make.sh %{?bootstrap} # docs make -C doc/manual html info @@ -112,7 +116,7 @@ %check || : pushd tests -sh ./run-tests.sh +%{?setarch} sh ./run-tests.sh popd @@ -161,6 +165,19 @@ %changelog +* Tue Sep 27 2005 Rex Dieter 0.9.5-7 +- drop ppc +- cleaner optflags patch + +* Tue Sep 27 2005 Rex Dieter 0.9.5-5 +- set/use SBCL_ARCH/setarch (esp on ppc) +- allow arch-specific build-options + +* Tue Sep 27 2005 Rex Dieter 0.9.5-2 +- 0.9.5 +- use native sbcl bootstraps, when available (ie, %%{ix86},x86_64) +- try ppc again + * Thu Sep 22 2005 Rex Dieter 0.9.4-19 - drop use of setarch, use my_setarch.c --- sbcl-0.9.4-optflags.patch DELETED --- --- sbcl-0.9.4-personality.patch DELETED --- From fedora-extras-commits at redhat.com Tue Sep 27 20:47:30 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Tue, 27 Sep 2005 16:47:30 -0400 Subject: rpms/centericq/FC-4 .cvsignore, 1.3, 1.4 centericq.spec, 1.17, 1.18 sources, 1.3, 1.4 Message-ID: <200509272048.j8RKm07J003856@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/centericq/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3814/FC-4 Modified Files: .cvsignore centericq.spec sources Log Message: - version upgrade Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/centericq/FC-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 13 Feb 2005 11:43:46 -0000 1.3 +++ .cvsignore 27 Sep 2005 20:47:28 -0000 1.4 @@ -1 +1 @@ -centericq-4.20.0.tar.bz2 +centericq-4.21.0.tar.bz2 Index: centericq.spec =================================================================== RCS file: /cvs/extras/rpms/centericq/FC-4/centericq.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- centericq.spec 30 May 2005 08:24:38 -0000 1.17 +++ centericq.spec 27 Sep 2005 20:47:28 -0000 1.18 @@ -1,13 +1,13 @@ Name: centericq -Version: 4.20.0 -Release: 10 +Version: 4.21.0 +Release: 1%{?dist} Summary: Text mode menu- and window-driven IM Group: Applications/Internet License: GPL URL: http://konst.org.ua/centericq/ -Source0: http://konst.org.ua/download/centericq-4.20.0.tar.bz2 +Source0: http://konst.org.ua/download/centericq-4.21.0.tar.bz2 Patch0: centericq-libyahoo.patch Patch1: centericq-kkconsui.patch Patch2: centericq-kkstrtext.patch @@ -33,8 +33,8 @@ %patch3 %build -CFLAGS="-I/usr/include/openssl -I/usr/kerberos/include -I/usr/include ${RPM_OPT_FLAGS}" \ -%configure --with-ssl +CFLAGS="$RPM_OPT_FLAGS" \ +./configure --with-ssl %{__make} %{?_smp_flags} @@ -60,6 +60,10 @@ %{_mandir}/man1/* %changelog +* Tue Sep 27 2005 Andreas Bierfert +4.21.0-1 +- version upgrade (#168425) + * Mon May 30 2005 Andreas Bierfert 4.20.0-10 - cleanup the x86_64 build fixes... Index: sources =================================================================== RCS file: /cvs/extras/rpms/centericq/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 13 Feb 2005 11:43:46 -0000 1.3 +++ sources 27 Sep 2005 20:47:28 -0000 1.4 @@ -1 +1 @@ -bbb81f87b4ecb703dec31a8092303914 centericq-4.20.0.tar.bz2 +82e426f2b4f6f2ab799c28807f36ade6 centericq-4.21.0.tar.bz2 From fedora-extras-commits at redhat.com Tue Sep 27 20:47:31 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Tue, 27 Sep 2005 16:47:31 -0400 Subject: rpms/centericq/devel .cvsignore, 1.3, 1.4 centericq.spec, 1.17, 1.18 sources, 1.3, 1.4 Message-ID: <200509272048.j8RKm17i003861@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/centericq/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3814/devel Modified Files: .cvsignore centericq.spec sources Log Message: - version upgrade Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/centericq/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 13 Feb 2005 11:43:46 -0000 1.3 +++ .cvsignore 27 Sep 2005 20:47:29 -0000 1.4 @@ -1 +1 @@ -centericq-4.20.0.tar.bz2 +centericq-4.21.0.tar.bz2 Index: centericq.spec =================================================================== RCS file: /cvs/extras/rpms/centericq/devel/centericq.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- centericq.spec 30 May 2005 08:24:38 -0000 1.17 +++ centericq.spec 27 Sep 2005 20:47:29 -0000 1.18 @@ -1,13 +1,13 @@ Name: centericq -Version: 4.20.0 -Release: 10 +Version: 4.21.0 +Release: 1%{?dist} Summary: Text mode menu- and window-driven IM Group: Applications/Internet License: GPL URL: http://konst.org.ua/centericq/ -Source0: http://konst.org.ua/download/centericq-4.20.0.tar.bz2 +Source0: http://konst.org.ua/download/centericq-4.21.0.tar.bz2 Patch0: centericq-libyahoo.patch Patch1: centericq-kkconsui.patch Patch2: centericq-kkstrtext.patch @@ -33,8 +33,8 @@ %patch3 %build -CFLAGS="-I/usr/include/openssl -I/usr/kerberos/include -I/usr/include ${RPM_OPT_FLAGS}" \ -%configure --with-ssl +CFLAGS="$RPM_OPT_FLAGS" \ +./configure --with-ssl %{__make} %{?_smp_flags} @@ -60,6 +60,10 @@ %{_mandir}/man1/* %changelog +* Tue Sep 27 2005 Andreas Bierfert +4.21.0-1 +- version upgrade (#168425) + * Mon May 30 2005 Andreas Bierfert 4.20.0-10 - cleanup the x86_64 build fixes... Index: sources =================================================================== RCS file: /cvs/extras/rpms/centericq/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 13 Feb 2005 11:43:46 -0000 1.3 +++ sources 27 Sep 2005 20:47:29 -0000 1.4 @@ -1 +1 @@ -bbb81f87b4ecb703dec31a8092303914 centericq-4.20.0.tar.bz2 +82e426f2b4f6f2ab799c28807f36ade6 centericq-4.21.0.tar.bz2 From fedora-extras-commits at redhat.com Tue Sep 27 20:52:20 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Tue, 27 Sep 2005 16:52:20 -0400 Subject: rpms/centericq/FC-3 .cvsignore, 1.3, 1.4 centericq.spec, 1.7, 1.8 sources, 1.3, 1.4 Message-ID: <200509272052.j8RKqKQ6003973@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/centericq/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3950 Modified Files: .cvsignore centericq.spec sources Log Message: - version upgrade Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/centericq/FC-3/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 13 Feb 2005 11:43:46 -0000 1.3 +++ .cvsignore 27 Sep 2005 20:52:18 -0000 1.4 @@ -1 +1 @@ -centericq-4.20.0.tar.bz2 +centericq-4.21.0.tar.bz2 Index: centericq.spec =================================================================== RCS file: /cvs/extras/rpms/centericq/FC-3/centericq.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- centericq.spec 25 Feb 2005 19:40:27 -0000 1.7 +++ centericq.spec 27 Sep 2005 20:52:18 -0000 1.8 @@ -1,12 +1,17 @@ Name: centericq -Version: 4.20.0 -Release: 1 +Version: 4.21.0 +Release: 1%{?dist} + Summary: Text mode menu- and window-driven IM -Group: Applications/Internet +Group: Applications/Internet License: GPL URL: http://konst.org.ua/centericq/ -Source0: http://konst.org.ua/download/centericq-4.20.0.tar.bz2 +Source0: http://konst.org.ua/download/centericq-4.21.0.tar.bz2 +Patch0: centericq-libyahoo.patch +Patch1: centericq-kkconsui.patch +Patch2: centericq-kkstrtext.patch +Patch3: centericq-src.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: krb5-devel @@ -14,6 +19,7 @@ BuildRequires: curl-devel BuildRequires: ncurses-devel BuildRequires: gettext +BuildRequires: gpgme-devel %description Centericq is a text mode menu- and window-driven IM interface that supports the @@ -21,10 +27,14 @@ %prep %setup -q -n %{name}-%{version} +%patch0 +%patch1 +%patch2 +%patch3 %build -CFLAGS="-I/usr/include/openssl -I/usr/kerberos/include -I/usr/include ${RPM_OPT_FLAGS}" \ -%configure --with-ssl +CFLAGS="$RPM_OPT_FLAGS" \ +./configure --with-ssl %{__make} %{?_smp_flags} @@ -50,6 +60,46 @@ %{_mandir}/man1/* %changelog +* Tue Sep 27 2005 Andreas Bierfert +4.21.0-1 +- version upgrade (#168425) + +* Mon May 30 2005 Andreas Bierfert +4.20.0-10 +- cleanup the x86_64 build fixes... + +* Sun May 29 2005 Andreas Bierfert +4.20.0-9 +- hopefully the last x86_64 build fixes... + +* Sun May 29 2005 Andreas Bierfert +4.20.0-8 +- and again more size_t fixes in src + +* Sun May 29 2005 Andreas Bierfert +4.20.0-7 +- even more size_t build fixes in kkstrtext + +* Thu May 26 2005 Andreas Bierfert +4.20.0-6 +- renew -5 buildfix and drop ifarch +- add another x86_64 buildfix + +* Thu May 26 2005 Andreas Bierfert +4.20.0-5 +- x86_64 buildfix + +* Mon May 23 2005 Andreas Bierfert +4.20.0-4 +- enable jabber encryption support via gpgme +- fix build (#156202) + +* Sun May 22 2005 Jeremy Katz - 4.20.0-3 +- rebuild on all arches + +* Fri Apr 7 2005 Michael Schwendt +- rebuilt + * Tue Feb 08 2005 Andreas Bierfert 4.20.0-1 - version upgrade Index: sources =================================================================== RCS file: /cvs/extras/rpms/centericq/FC-3/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 13 Feb 2005 11:43:46 -0000 1.3 +++ sources 27 Sep 2005 20:52:18 -0000 1.4 @@ -1 +1 @@ -bbb81f87b4ecb703dec31a8092303914 centericq-4.20.0.tar.bz2 +82e426f2b4f6f2ab799c28807f36ade6 centericq-4.21.0.tar.bz2 From fedora-extras-commits at redhat.com Tue Sep 27 20:54:45 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Tue, 27 Sep 2005 16:54:45 -0400 Subject: rpms/libpqxx/FC-4 .cvsignore, 1.2, 1.3 libpqxx.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200509272055.j8RKtFJf004064@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/libpqxx/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4020/FC-4 Modified Files: .cvsignore libpqxx.spec sources Log Message: - version upgrade Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libpqxx/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 1 Jul 2005 22:34:14 -0000 1.2 +++ .cvsignore 27 Sep 2005 20:54:43 -0000 1.3 @@ -1 +1 @@ -libpqxx-2.5.4.tar.gz +libpqxx-2.5.5.tar.gz Index: libpqxx.spec =================================================================== RCS file: /cvs/extras/rpms/libpqxx/FC-4/libpqxx.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- libpqxx.spec 5 Jul 2005 10:49:32 -0000 1.2 +++ libpqxx.spec 27 Sep 2005 20:54:43 -0000 1.3 @@ -1,12 +1,12 @@ Name: libpqxx -Version: 2.5.4 +Version: 2.5.5 Release: 4%{?dist} Summary: C++ client API for PostgreSQL Group: System Environment/Libraries License: BSD URL: http://gborg.postgresql.org/project/libpqxx/projdisplay.php -Source0: ftp://gborg.postgresql.org/pub/libpqxx/stable/libpqxx-2.5.4.tar.gz +Source0: ftp://gborg.postgresql.org/pub/libpqxx/stable/libpqxx-2.5.5.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: postgresql-devel @@ -55,7 +55,7 @@ %files %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING NEWS README TODO VERSION -%{_libdir}/libpqxx-2.5.4.so +%{_libdir}/libpqxx-2.5.5.so %files devel %doc README-UPGRADE @@ -66,6 +66,9 @@ %{_libdir}/pkgconfig/libpqxx.pc %changelog +* Tue Sep 27 2005 Andreas Bierfert 2.5.5-1 +- version upgrade + * Tue Jul 05 2005 Andreas Bierfert 2.5.4-4 - add dist tag Index: sources =================================================================== RCS file: /cvs/extras/rpms/libpqxx/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 1 Jul 2005 22:34:14 -0000 1.2 +++ sources 27 Sep 2005 20:54:43 -0000 1.3 @@ -1 +1 @@ -b0951e530dc9b35171f8ff015ab43920 libpqxx-2.5.4.tar.gz +db71975570ee31ecd0a11380dbaa8634 libpqxx-2.5.5.tar.gz From fedora-extras-commits at redhat.com Tue Sep 27 20:54:45 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Tue, 27 Sep 2005 16:54:45 -0400 Subject: rpms/libpqxx/devel .cvsignore, 1.2, 1.3 libpqxx.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200509272055.j8RKtGR6004069@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/libpqxx/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4020/devel Modified Files: .cvsignore libpqxx.spec sources Log Message: - version upgrade Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libpqxx/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 1 Jul 2005 22:34:14 -0000 1.2 +++ .cvsignore 27 Sep 2005 20:54:43 -0000 1.3 @@ -1 +1 @@ -libpqxx-2.5.4.tar.gz +libpqxx-2.5.5.tar.gz Index: libpqxx.spec =================================================================== RCS file: /cvs/extras/rpms/libpqxx/devel/libpqxx.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- libpqxx.spec 5 Jul 2005 10:50:26 -0000 1.2 +++ libpqxx.spec 27 Sep 2005 20:54:43 -0000 1.3 @@ -1,12 +1,12 @@ Name: libpqxx -Version: 2.5.4 +Version: 2.5.5 Release: 4%{?dist} Summary: C++ client API for PostgreSQL Group: System Environment/Libraries License: BSD URL: http://gborg.postgresql.org/project/libpqxx/projdisplay.php -Source0: ftp://gborg.postgresql.org/pub/libpqxx/stable/libpqxx-2.5.4.tar.gz +Source0: ftp://gborg.postgresql.org/pub/libpqxx/stable/libpqxx-2.5.5.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: postgresql-devel @@ -55,7 +55,7 @@ %files %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING NEWS README TODO VERSION -%{_libdir}/libpqxx-2.5.4.so +%{_libdir}/libpqxx-2.5.5.so %files devel %doc README-UPGRADE @@ -66,6 +66,9 @@ %{_libdir}/pkgconfig/libpqxx.pc %changelog +* Tue Sep 27 2005 Andreas Bierfert 2.5.5-1 +- version upgrade + * Tue Jul 05 2005 Andreas Bierfert 2.5.4-4 - add dist tag Index: sources =================================================================== RCS file: /cvs/extras/rpms/libpqxx/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 1 Jul 2005 22:34:14 -0000 1.2 +++ sources 27 Sep 2005 20:54:43 -0000 1.3 @@ -1 +1 @@ -b0951e530dc9b35171f8ff015ab43920 libpqxx-2.5.4.tar.gz +db71975570ee31ecd0a11380dbaa8634 libpqxx-2.5.5.tar.gz From fedora-extras-commits at redhat.com Tue Sep 27 20:59:44 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Tue, 27 Sep 2005 16:59:44 -0400 Subject: rpms/centericq/FC-3 centericq-kkconsui.patch, NONE, 1.1 centericq-kkstrtext.patch, NONE, 1.1 centericq-libyahoo.patch, NONE, 1.1 centericq-src.patch, NONE, 1.1 Message-ID: <200509272059.j8RKxiPZ004143@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/centericq/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4114 Added Files: centericq-kkconsui.patch centericq-kkstrtext.patch centericq-libyahoo.patch centericq-src.patch Log Message: - forgot about patches centericq-kkconsui.patch: --- NEW FILE centericq-kkconsui.patch --- --- kkconsui-0.1/src/texteditor.cc.orig 2005-05-30 10:07:58.000000000 +0200 +++ kkconsui-0.1/src/texteditor.cc 2005-05-30 10:09:38.000000000 +0200 @@ -1940,11 +1940,11 @@ } int texteditor::findint(void *p1, void *p2) { - return *(int *) p1 != (int) p2; + return *(intptr_t *) p1 != (intptr_t) p2; } int texteditor::findhighline(void *p1, void *p2) { - return *(int *) p1 != ((highline *) p2)->line; + return *(intptr_t *) p1 != ((highline *) p2)->line; } void texteditor::shiftmarkedblock(int delta) { centericq-kkstrtext.patch: --- NEW FILE centericq-kkstrtext.patch --- --- kkstrtext-0.1/kkstrtext.cc.orig 2005-05-29 09:23:07.000000000 +0200 +++ kkstrtext-0.1/kkstrtext.cc 2005-05-29 09:27:51.000000000 +0200 @@ -431,7 +431,7 @@ } int intcompare(void *s1, void *s2) { - return (int) s1 != (int) s2; + return (size_t) s1 != (size_t) s2; } string i2str(int i) { @@ -885,7 +885,7 @@ #ifdef HAVE_ICONV iconv_t cd = iconv_open(tocs.c_str(), fromcs.c_str()); - if(((int) cd) != -1) { + if(((size_t) cd) != -1) { string r, text(atext); size_t inleft, outleft, soutleft; char *inbuf, *outbuf, *sinbuf, *soutbuf; centericq-libyahoo.patch: --- NEW FILE centericq-libyahoo.patch --- --- libyahoo2-0.1/yahoo_util.h.orig 2005-05-23 21:07:43.000000000 +0200 +++ libyahoo2-0.1/yahoo_util.h 2005-05-23 21:30:10.000000000 +0200 @@ -68,10 +68,6 @@ int strcasecmp(const char * s1, const char * s2); //char * strdup(const char *s); - -int snprintf(char *str, size_t size, const char *format, ...); -int vsnprintf(char *str, size_t size, const char *format, va_list ap); - #endif #ifndef TRUE centericq-src.patch: --- NEW FILE centericq-src.patch --- --- src/icqdialogs.cc.orig 2005-05-30 10:16:12.000000000 +0200 +++ src/icqdialogs.cc 2005-05-30 10:18:08.000000000 +0200 @@ -894,7 +894,7 @@ i = m.open(); m.close(); - if(i) f = (unsigned short) ((int) m.getref(i-1)); + if(i) f = (unsigned short) ((intptr_t) m.getref(i-1)); } void icqface::selectlanguage(unsigned short &f) { @@ -946,7 +946,7 @@ int i = m.open(); m.close(); - if(i) f = (imgender) ((int) m.getref(i-1)); + if(i) f = (imgender) ((intptr_t) m.getref(i-1)); } void icqface::selectagerange(ICQ2000::AgeRange &r) { @@ -967,7 +967,7 @@ int i = m.open(); m.close(); - if(i) r = (ICQ2000::AgeRange) ((int) m.getref(i-1)); + if(i) r = (ICQ2000::AgeRange) ((intptr_t) m.getref(i-1)); } bool icqface::edit(string &txt, const string &header) { @@ -1254,7 +1254,7 @@ void *p; finished = !db.open(n, b, &p); - i = (int) p; + i = (intptr_t) p; if(!finished) switch(b) { @@ -1745,7 +1745,7 @@ it = transfers.end(); if(!db.gettree()->isnode(db.gettree()->getid(np-1))) - it = transfers.begin() + (int) db.getmenu()->getref(n-1); + it = transfers.begin() + (intptr_t) db.getmenu()->getref(n-1); switch(b) { case 0: --- src/icqface.cc.orig 2005-05-30 10:18:23.000000000 +0200 +++ src/icqface.cc 2005-05-30 10:22:18.000000000 +0200 @@ -392,7 +392,7 @@ m.scale(); m.idle = &menuidle; - i = (int) m.getref(m.open()-1); + i = (intptr_t) m.getref(m.open()-1); m.close(); if(i) lastr = i; @@ -441,7 +441,7 @@ if(i) { lastitem = i-1; - r = (int) m.getref(lastitem); + r = (intptr_t) m.getref(lastitem); } return r; @@ -467,7 +467,7 @@ g = 0; } - if((unsigned int) c < 100) c = 0; + if((uintptr_t)c < 100) c = 0; if(i) { switch(action = extk) { @@ -1430,7 +1430,7 @@ m.scale(); i = m.open(); - choice = (int) m.getref(i-1); + choice = (intptr_t) m.getref(i-1); m.close(); } @@ -1485,7 +1485,7 @@ m.close(); if(r = i) { - st = (imstatus) ((int) m.getref(i-1)); + st = (imstatus) ((intptr_t) m.getref(i-1)); } } @@ -2078,7 +2078,7 @@ c = (icqcontact *) cm->getref(i); } - if((unsigned int) c > 100) { + if((uintptr_t)c > 100) { string current = c->getdispnick(); len = current.size(); if(len > nick.size()) len = nick.size(); From fedora-extras-commits at redhat.com Tue Sep 27 21:21:20 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Tue, 27 Sep 2005 17:21:20 -0400 Subject: rpms/libpqxx/devel libpqxx.spec,1.3,1.4 Message-ID: <200509272121.j8RLLKfb005718@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/libpqxx/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5699 Modified Files: libpqxx.spec Log Message: - try fc5 build Index: libpqxx.spec =================================================================== RCS file: /cvs/extras/rpms/libpqxx/devel/libpqxx.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- libpqxx.spec 27 Sep 2005 20:54:43 -0000 1.3 +++ libpqxx.spec 27 Sep 2005 21:21:18 -0000 1.4 @@ -1,6 +1,6 @@ Name: libpqxx Version: 2.5.5 -Release: 4%{?dist} +Release: 5%{?dist} Summary: C++ client API for PostgreSQL Group: System Environment/Libraries @@ -32,7 +32,7 @@ %setup -q %build -%configure --enable-shared +%configure --enable-shared --disable-thread-safety # I hate rpath... ;) %{__perl} -pi -e 's/hardcode_into_libs=yes/hardcode_into_libs=no/;' \ libtool @@ -66,7 +66,10 @@ %{_libdir}/pkgconfig/libpqxx.pc %changelog -* Tue Sep 27 2005 Andreas Bierfert 2.5.5-1 +* Tue Sep 27 2005 Andreas Bierfert 2.5.5-5 +- try fc5 build + +* Tue Sep 27 2005 Andreas Bierfert 2.5.5-4 - version upgrade * Tue Jul 05 2005 Andreas Bierfert 2.5.4-4 From fedora-extras-commits at redhat.com Tue Sep 27 21:25:14 2005 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Tue, 27 Sep 2005 17:25:14 -0400 Subject: rpms/SDL_image/devel SDL_image.spec,1.5,1.6 Message-ID: <200509272125.j8RLPEu5005796@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/SDL_image/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5777 Modified Files: SDL_image.spec Log Message: * Tue Sep 27 2005 Brian Pepple - 1.2.4-4 - Bump release so it upgrades from FC4. - General spec formatting cleanup. Index: SDL_image.spec =================================================================== RCS file: /cvs/extras/rpms/SDL_image/devel/SDL_image.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- SDL_image.spec 25 Jun 2005 17:55:03 -0000 1.5 +++ SDL_image.spec 27 Sep 2005 21:25:12 -0000 1.6 @@ -1,13 +1,19 @@ -Summary: Image loading library for SDL -Name: SDL_image -Version: 1.2.4 -Release: 2%{?dist} -Source: http://www.libsdl.org/projects/SDL_image/release/%{name}-%{version}.tar.gz -URL: http://www.libsdl.org/projects/SDL_image/ -License: LGPL -Group: System Environment/Libraries -BuildRoot: %{_tmppath}/%{name}-buildroot -BuildRequires: SDL-devel >= 1.2.4-1, libjpeg-devel, libpng-devel, libtiff-devel +Name: SDL_image +Version: 1.2.4 +Release: 4%{?dist} +Summary: Image loading library for SDL + +Group: System Environment/Libraries +License: LGPL +URL: http://www.libsdl.org/projects/SDL_image/ +Source0: http://www.libsdl.org/projects/%{name}/release/%{name}-%{version}.tar.gz +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +BuildRequires: SDL-devel >= 1.2.4-1 +BuildRequires: libjpeg-devel +BuildRequires: libpng-devel +BuildRequires: libtiff-devel + %description Simple DirectMedia Layer (SDL) is a cross-platform multimedia library @@ -15,11 +21,13 @@ device. This package contains a simple library for loading images of various formats (BMP, PPM, PCX, GIF, JPEG, PNG) as SDL surfaces. + %package devel -Summary: Development files for the SDL image loading library -Group: Development/Libraries -Requires: %{name} = %{version}-%{release} -Requires: SDL-devel >= 1.2.4-1 +Summary: Development files for the SDL image loading library +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} +Requires: SDL-devel >= 1.2.4-1 + %description devel Simple DirectMedia Layer (SDL) is a cross-platform multimedia library @@ -27,44 +35,55 @@ device. This package contains the files needed for development using the SDL image loading library contained in the SDL_image package. -%prep +%prep %setup -q + %build # XCF support is crashy in 1.2.4 %configure --disable-dependency-tracking --enable-tif make %{?_smp_mflags} + %install rm -rf $RPM_BUILD_ROOT - %makeinstall mkdir -p $RPM_BUILD_ROOT%{_bindir} ./libtool --mode=install /usr/bin/install showimage $RPM_BUILD_ROOT%{_bindir} rm -f $RPM_BUILD_ROOT%{_libdir}/*.la + %clean rm -rf $RPM_BUILD_ROOT + %post -p /sbin/ldconfig + %postun -p /sbin/ldconfig + %files %defattr(-,root,root) %doc README CHANGES COPYING %{_bindir}/showimage %{_libdir}/lib*.so.* + %files devel %defattr(-,root,root) %{_libdir}/*.a %{_libdir}/lib*.so %{_includedir}/SDL/* + %changelog +* Tue Sep 27 2005 Brian Pepple - 1.2.4-4 +- Bump release so it upgrades from FC4. +- General spec formatting cleanup. + * Sat Jun 25 2005 Ville Skytt?? - 1.2.4-2 - Rebuild. From fedora-extras-commits at redhat.com Tue Sep 27 21:33:32 2005 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Tue, 27 Sep 2005 17:33:32 -0400 Subject: rpms/SDL_image/FC-4 .cvsignore, 1.2, 1.3 SDL_image.spec, 1.3, 1.4 sources, 1.2, 1.3 SDL_image-1.2.3-autofoo.patch, 1.1, NONE SDL_image-ppc64.patch, 1.1, NONE Message-ID: <200509272133.j8RLXWY5005882@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/SDL_image/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5859 Modified Files: .cvsignore SDL_image.spec sources Removed Files: SDL_image-1.2.3-autofoo.patch SDL_image-ppc64.patch Log Message: * Tue Sep 27 2005 Brian Pepple - 1.2.4-1 - Bump release so it upgrades from FC4. - General spec formatting cleanup. - 1.2.4, patches obsolete. - Bring back TIFF support (BuildRequire libtiff-devel). - Build with dependency tracking disabled. - Require exact EVR of main package in -devel. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/SDL_image/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 26 May 2005 18:02:32 -0000 1.2 +++ .cvsignore 27 Sep 2005 21:33:30 -0000 1.3 @@ -1 +1 @@ -SDL_image-1.2.3.tar.gz +SDL_image-1.2.4.tar.gz Index: SDL_image.spec =================================================================== RCS file: /cvs/extras/rpms/SDL_image/FC-4/SDL_image.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- SDL_image.spec 27 May 2005 20:04:38 -0000 1.3 +++ SDL_image.spec 27 Sep 2005 21:33:30 -0000 1.4 @@ -1,15 +1,19 @@ -Summary: A sample image loading library for SDL. -Name: SDL_image -Version: 1.2.3 -Release: 9 -Source: http://www.libsdl.org/projects/SDL_image/src/%{name}-%{version}.tar.gz -Patch: SDL_image-ppc64.patch -Patch2: SDL_image-1.2.3-autofoo.patch -URL: http://www.libsdl.org/projects/SDL_image/index.html -License: LGPL -Group: System Environment/Libraries -BuildRoot: %{_tmppath}/%{name}-buildroot -BuildRequires: SDL-devel >= 1.2.4-1, libjpeg-devel, libpng-devel +Name: SDL_image +Version: 1.2.4 +Release: 1%{?dist} +Summary: Image loading library for SDL + +Group: System Environment/Libraries +License: LGPL +URL: http://www.libsdl.org/projects/SDL_image/ +Source0: http://www.libsdl.org/projects/%{name}/release/%{name}-%{version}.tar.gz +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +BuildRequires: SDL-devel >= 1.2.4-1 +BuildRequires: libjpeg-devel +BuildRequires: libpng-devel +BuildRequires: libtiff-devel + %description Simple DirectMedia Layer (SDL) is a cross-platform multimedia library @@ -17,11 +21,13 @@ device. This package contains a simple library for loading images of various formats (BMP, PPM, PCX, GIF, JPEG, PNG) as SDL surfaces. + %package devel -Summary: Development files for the SDL image loading library. -Group: Development/Libraries -Requires: %{name} = %{version} -Requires: SDL-devel >= 1.2.3-5 +Summary: Development files for the SDL image loading library +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} +Requires: SDL-devel >= 1.2.4-1 + %description devel Simple DirectMedia Layer (SDL) is a cross-platform multimedia library @@ -29,50 +35,59 @@ device. This package contains the files needed for development using the SDL image loading library contained in the SDL_image package. -%prep +%prep %setup -q -%patch -p1 -b .ppc64 -%patch2 -p1 -b .autofoo + %build -# replaced by patch -#libtoolize --copy --force -#aclocal -#autoconf -#automake --foreign --include-deps --add-missing --force-missing --copy -a -%configure --enable-tif +# XCF support is crashy in 1.2.4 +%configure --disable-dependency-tracking --enable-tif make %{?_smp_mflags} + %install rm -rf $RPM_BUILD_ROOT - %makeinstall mkdir -p $RPM_BUILD_ROOT%{_bindir} ./libtool --mode=install /usr/bin/install showimage $RPM_BUILD_ROOT%{_bindir} rm -f $RPM_BUILD_ROOT%{_libdir}/*.la + %clean rm -rf $RPM_BUILD_ROOT + %post -p /sbin/ldconfig + %postun -p /sbin/ldconfig + %files %defattr(-,root,root) %doc README CHANGES COPYING %{_bindir}/showimage %{_libdir}/lib*.so.* + %files devel %defattr(-,root,root) %{_libdir}/*.a %{_libdir}/lib*.so %{_includedir}/SDL/* + %changelog +* Tue Sep 27 2005 Brian Pepple - 1.2.4-1 +- Bump release so it upgrades from FC4. +- General spec formatting cleanup. +- 1.2.4, patches obsolete. +- Bring back TIFF support (BuildRequire libtiff-devel). +- Build with dependency tracking disabled. +- Require exact EVR of main package in -devel. + * Thu May 26 2005 Bill Nottingham 1.2.3-9 - rebuild Index: sources =================================================================== RCS file: /cvs/extras/rpms/SDL_image/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 26 May 2005 18:02:32 -0000 1.2 +++ sources 27 Sep 2005 21:33:30 -0000 1.3 @@ -1 +1 @@ -d55826ffbd2bdc48b09cc64a9ed9e59e SDL_image-1.2.3.tar.gz +70bf617f99e51a2c94550fc79d542f0b SDL_image-1.2.4.tar.gz --- SDL_image-1.2.3-autofoo.patch DELETED --- --- SDL_image-ppc64.patch DELETED --- From fedora-extras-commits at redhat.com Tue Sep 27 21:40:59 2005 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Tue, 27 Sep 2005 17:40:59 -0400 Subject: rpms/SDL_mixer/devel SDL_mixer.spec,1.8,1.9 Message-ID: <200509272140.j8RLexL3005957@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/SDL_mixer/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5938 Modified Files: SDL_mixer.spec Log Message: * Tue Sep 27 2005 Brian Pepple - 1.2.6-3 - Cleanup up spec formatting. Index: SDL_mixer.spec =================================================================== RCS file: /cvs/extras/rpms/SDL_mixer/devel/SDL_mixer.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- SDL_mixer.spec 25 Jun 2005 16:26:32 -0000 1.8 +++ SDL_mixer.spec 27 Sep 2005 21:40:57 -0000 1.9 @@ -1,19 +1,22 @@ -Summary: Simple DirectMedia Layer - Sample Mixer Library -Name: SDL_mixer -Version: 1.2.6 -Release: 2%{?dist} -Source: http://www.libsdl.org/projects/SDL_mixer/release/%{name}-%{version}.tar.gz -Patch1: SDL_mixer-1.0.6-redhat.patch -Patch4: SDL_mixer-1.2.5-bad_code.patch -License: LGPL -Group: System Environment/Libraries -BuildRoot: %{_tmppath}/%{name}-buildroot -URL: http://www.libsdl.org/projects/SDL_mixer/ -Prefix: %{_prefix} -BuildRequires: SDL-devel >= 1.2.4-1 -BuildRequires: libvorbis-devel -BuildRequires: mikmod-devel >= 3.1.6-26 -Requires: SDL >= 1.2.4-1 +Name: SDL_mixer +Version: 1.2.6 +Release: 3%{?dist} +Summary: Simple DirectMedia Layer - Sample Mixer Library + +Group: System Environment/Libraries +License: LGPL +URL: http://www.libsdl.org/projects/SDL_mixer/ +Source0: http://www.libsdl.org/projects/%{name}/release/%{name}-%{version}.tar.gz +Patch1: SDL_mixer-1.0.6-redhat.patch +Patch4: SDL_mixer-1.2.5-bad_code.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Prefix: %{_prefix} +BuildRequires: SDL-devel >= 1.2.4-1 +BuildRequires: libvorbis-devel +BuildRequires: mikmod-devel >= 3.1.6-26 +Requires: SDL >= 1.2.4-1 + %description A simple multi-channel audio mixer for SDL. @@ -21,11 +24,13 @@ of music, mixed by the popular MikMod MOD, Timidity MIDI and Ogg Vorbis libraries. + %package devel -Summary: Libraries, includes and more to develop SDL applications using the SDL mixer -Group: Development/Libraries -Requires: %{name} = %{version}-%{release} -Requires: SDL-devel >= 1.2.4-1 +Summary: Libraries, includes and more to develop SDL applications using the SDL mixer +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} +Requires: SDL-devel >= 1.2.4-1 + %description devel Development files for SDL_mixer, a simple multi-channel audio mixer for SDL. @@ -35,15 +40,18 @@ You need SDL_mixer-devel if you want to compile an application using SDL_mixer. + %prep %setup -q %patch1 -p1 -b .redhat %patch4 -p1 -b .bad_code + %build %configure --disable-dependency-tracking make %{?_smp_mflags} + %install rm -rf $RPM_BUILD_ROOT %makeinstall @@ -52,13 +60,17 @@ ./libtool --mode=install /usr/bin/install -c playwave $RPM_BUILD_ROOT/usr/bin rm -f $RPM_BUILD_ROOT%{_libdir}/*.la + %clean rm -rf $RPM_BUILD_ROOT + %post -p /sbin/ldconfig + %postun -p /sbin/ldconfig + %files %defattr(-,root,root) %doc README CHANGES COPYING @@ -66,13 +78,18 @@ %{_bindir}/playwave %{_libdir}/lib*.so.* + %files devel %defattr(-,root,root) %{_libdir}/lib*.a %{_libdir}/lib*.so %{_includedir}/SDL + %changelog +* Tue Sep 27 2005 Brian Pepple - 1.2.6-3 +- Cleanup up spec formatting. + * Sat Jun 25 2005 Ville Skytt?? - 1.2.6-2 - Rebuild. From fedora-extras-commits at redhat.com Tue Sep 27 21:46:56 2005 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Tue, 27 Sep 2005 17:46:56 -0400 Subject: rpms/SDL_mixer/FC-4 .cvsignore, 1.2, 1.3 SDL_mixer.spec, 1.4, 1.5 sources, 1.2, 1.3 SDL_mixer-1.2.4-64bit.patch, 1.1, NONE SDL_mixer-1.2.5-autofoo.patch, 1.1, NONE SDL_mixer-ppc64.patch, 1.1, NONE Message-ID: <200509272146.j8RLkuPP006031@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/SDL_mixer/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6008 Modified Files: .cvsignore SDL_mixer.spec sources Removed Files: SDL_mixer-1.2.4-64bit.patch SDL_mixer-1.2.5-autofoo.patch SDL_mixer-ppc64.patch Log Message: * Tue Sep 27 2005 Brian Pepple - 1.2.6-1 - Cleanup up spec formatting. - 1.2.6, use system libmikmod. - Drop obsolete patches, *.la and over-eager cleanup from %clean. - Build with dependency tracking disabled. - Make -devel package require exact release of main package (this is particularly important for API changes such as in 1.2.5-9). Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/SDL_mixer/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 26 May 2005 18:04:16 -0000 1.2 +++ .cvsignore 27 Sep 2005 21:46:53 -0000 1.3 @@ -1 +1 @@ -SDL_mixer-1.2.5.tar.gz +SDL_mixer-1.2.6.tar.gz Index: SDL_mixer.spec =================================================================== RCS file: /cvs/extras/rpms/SDL_mixer/FC-4/SDL_mixer.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- SDL_mixer.spec 9 Jun 2005 21:00:54 -0000 1.4 +++ SDL_mixer.spec 27 Sep 2005 21:46:54 -0000 1.5 @@ -1,21 +1,22 @@ -Summary: Simple DirectMedia Layer - Sample Mixer Library -Name: SDL_mixer -Version: 1.2.5 -Release: 8 -Source: %{name}-%{version}.tar.gz -Patch1: SDL_mixer-1.0.6-redhat.patch -Patch2: SDL_mixer-1.2.4-64bit.patch -Patch3: SDL_mixer-ppc64.patch -Patch4: SDL_mixer-1.2.5-bad_code.patch -Patch5: SDL_mixer-1.2.5-autofoo.patch -License: LGPL -Group: System Environment/Libraries -BuildRoot: %{_tmppath}/%{name}-buildroot -URL: http://www.libsdl.org/projects/SDL_mixer/ -Prefix: %{_prefix} -BuildRequires: SDL-devel >= 1.2.4-1 -BuildRequires: libvorbis-devel -Requires: SDL >= 1.2.4-1 +Name: SDL_mixer +Version: 1.2.6 +Release: 1%{?dist} +Summary: Simple DirectMedia Layer - Sample Mixer Library + +Group: System Environment/Libraries +License: LGPL +URL: http://www.libsdl.org/projects/SDL_mixer/ +Source0: http://www.libsdl.org/projects/%{name}/release/%{name}-%{version}.tar.gz +Patch1: SDL_mixer-1.0.6-redhat.patch +Patch4: SDL_mixer-1.2.5-bad_code.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Prefix: %{_prefix} +BuildRequires: SDL-devel >= 1.2.4-1 +BuildRequires: libvorbis-devel +BuildRequires: mikmod-devel >= 3.1.6-26 +Requires: SDL >= 1.2.4-1 + %description A simple multi-channel audio mixer for SDL. @@ -23,11 +24,13 @@ of music, mixed by the popular MikMod MOD, Timidity MIDI and Ogg Vorbis libraries. + %package devel -Summary: Libraries, includes and more to develop SDL applications using the SDL mixer. -Group: Development/Libraries -Requires: %{name} = %{version} -Requires: SDL-devel >= 1.2.4-1 +Summary: Libraries, includes and more to develop SDL applications using the SDL mixer +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} +Requires: SDL-devel >= 1.2.4-1 + %description devel Development files for SDL_mixer, a simple multi-channel audio mixer for SDL. @@ -37,37 +40,37 @@ You need SDL_mixer-devel if you want to compile an application using SDL_mixer. + %prep %setup -q %patch1 -p1 -b .redhat -%patch2 -p1 -b .64bit -%patch3 -p1 -b .ppc64 %patch4 -p1 -b .bad_code -%patch5 -p1 -b .autofoo + %build -# replaced by patch -#libtoolize --copy --force -#aclocal -#autoconf -#automake --foreign --include-deps --add-missing --force-missing --copy -a -%configure +%configure --disable-dependency-tracking make %{?_smp_mflags} + %install rm -rf $RPM_BUILD_ROOT %makeinstall /usr/bin/install -d $RPM_BUILD_ROOT/usr/bin ./libtool --mode=install /usr/bin/install -c playmus $RPM_BUILD_ROOT/usr/bin ./libtool --mode=install /usr/bin/install -c playwave $RPM_BUILD_ROOT/usr/bin +rm -f $RPM_BUILD_ROOT%{_libdir}/*.la + %clean -rm -rf $RPM_BUILD_ROOT $RPM_BUILD_DIR/%{name}-%{version} +rm -rf $RPM_BUILD_ROOT + %post -p /sbin/ldconfig + %postun -p /sbin/ldconfig + %files %defattr(-,root,root) %doc README CHANGES COPYING @@ -75,14 +78,24 @@ %{_bindir}/playwave %{_libdir}/lib*.so.* + %files devel %defattr(-,root,root) -%{_libdir}/*a +%{_libdir}/lib*.a %{_libdir}/lib*.so %{_includedir}/SDL + %changelog -* Thu Jun 9 2005 Ville Skytt?? - 1.2.5-8 +* Tue Sep 27 2005 Brian Pepple - 1.2.6-1 +- Cleanup up spec formatting. +- 1.2.6, use system libmikmod. +- Drop obsolete patches, *.la and over-eager cleanup from %%clean. +- Build with dependency tracking disabled. +- Make -devel package require exact release of main package (this + is particularly important for API changes such as in 1.2.5-9). + +* Thu Jun 9 2005 Ville Skytt?? - 1.2.5-9 - Bring back Ogg support (BuildRequire libvorbis-devel). - Add SDL-devel dependency to -devel. - Improve description. Index: sources =================================================================== RCS file: /cvs/extras/rpms/SDL_mixer/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 26 May 2005 18:04:16 -0000 1.2 +++ sources 27 Sep 2005 21:46:54 -0000 1.3 @@ -1 +1 @@ -f26d4e4625f00517203e32bd06fbc5d8 SDL_mixer-1.2.5.tar.gz +2b8beffad9179d80e598c22c80efb135 SDL_mixer-1.2.6.tar.gz --- SDL_mixer-1.2.4-64bit.patch DELETED --- --- SDL_mixer-1.2.5-autofoo.patch DELETED --- --- SDL_mixer-ppc64.patch DELETED --- From fedora-extras-commits at redhat.com Tue Sep 27 21:47:02 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Tue, 27 Sep 2005 17:47:02 -0400 Subject: rpms/synce/devel synce-rra-devel.patch,NONE,1.1 synce.spec,1.7,1.8 Message-ID: <200509272147.j8RLl2Ia006055@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/synce/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6004 Modified Files: synce.spec Added Files: synce-rra-devel.patch Log Message: - workaround libmimedir problem on devel synce-rra-devel.patch: --- NEW FILE synce-rra-devel.patch --- --- synce-rra-0.9.1/configure.ac.in.orig 2005-09-27 23:40:16.000000000 +0200 +++ synce-rra-0.9.1/configure.ac.in 2005-09-27 23:40:34.000000000 +0200 @@ -48,13 +48,6 @@ ) - AC_CHECK_LIB(mimedir,mdir_parse,,[ - AC_MSG_ERROR([Can't find libmimedir (http://sourceforge.net/projects/libmimedir/)]) - ]) - AC_CHECK_HEADERS(libmimedir.h,,[ - AC_MSG_ERROR([Can't find libmimedir.h (http://sourceforge.net/projects/libmimedir/)]) - ]) - enable_recurrence=1 AC_ARG_ENABLE(recurrence, AC_HELP_STRING( --- synce-rra-0.9.1/src/Makefile.am.orig 2005-09-27 23:40:45.000000000 +0200 +++ synce-rra-0.9.1/src/Makefile.am 2005-09-27 23:41:46.000000000 +0200 @@ -1,6 +1,6 @@ ## useful flags AM_CFLAGS = -ansi @CFLAGS@ -I../lib -LDADD = -L../lib ../lib/librra.la +LDADD = -L../lib ../lib/librra.la -L../../libmimedir-0.4 -lmimedir bin_PROGRAMS = synce-matchmaker Index: synce.spec =================================================================== RCS file: /cvs/extras/rpms/synce/devel/synce.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- synce.spec 21 Aug 2005 00:39:14 -0000 1.7 +++ synce.spec 27 Sep 2005 21:47:00 -0000 1.8 @@ -1,6 +1,6 @@ Name: synce Version: 0.9.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Serial connection support for Pocket PC devices Group: Applications/Communications @@ -13,6 +13,7 @@ Source4: http://dl.sf.net/synce/synce-librapi2-%{version}.tar.gz Source5: http://dl.sf.net/synce/libmimedir-0.4.tar.gz Patch0: synce-rra-Makefile.patch +Patch1: synce-rra-devel.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: ppp @@ -39,6 +40,7 @@ %prep %setup -q -c -a 1 -a 2 -a 3 -a 4 -a 5 %patch0 +%patch1 %build # build libsynce @@ -78,6 +80,7 @@ cd .. # build rra cd synce-rra-%{version} +./bootstrap %configure \ --with-libsynce-include="${SYNCEINC}" \ --with-libsynce-lib="${SYNCELIB}" \ @@ -170,6 +173,10 @@ %{_datadir}/aclocal/*.m4 %changelog +* Tue Sep 27 2005 Andreas Bierfert +0.9.1-4 +- workaround for libmimedir problem an devel + * Sun Aug 21 2005 Andreas Bierfert 0.9.1-3 - fix dep problem From fedora-extras-commits at redhat.com Tue Sep 27 21:55:26 2005 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Tue, 27 Sep 2005 17:55:26 -0400 Subject: rpms/SDL_net/devel SDL_net.spec,1.3,1.4 Message-ID: <200509272155.j8RLtQk6006176@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/SDL_net/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6157 Modified Files: SDL_net.spec Log Message: * Tue Sep 27 2005 Brian Pepple - 1.2.5-7 - General spec formatting cleanup. - Add dist tag. Index: SDL_net.spec =================================================================== RCS file: /cvs/extras/rpms/SDL_net/devel/SDL_net.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- SDL_net.spec 9 Jun 2005 20:49:08 -0000 1.3 +++ SDL_net.spec 27 Sep 2005 21:55:24 -0000 1.4 @@ -1,26 +1,31 @@ -Summary: SDL portable network library -Name: SDL_net -Version: 1.2.5 -Release: 6 -Source0: %{name}-%{version}.tar.gz -URL: http://www.libsdl.org/projects/SDL_net/ -License: LGPL -Group: System Environment/Libraries -BuildRoot: /var/tmp/%{name}-buildroot -Requires: SDL >= 1.2.4-1 -BuildRequires: SDL-devel >= 1.2.4-1 -BuildRequires: automake autoconf libtool -Patch: SDL_net-ppc64.patch -Patch1: SDL_net-137525.patch +Name: SDL_net +Version: 1.2.5 +Release: 7%{?dist} +Summary: SDL portable network library + +Group: System Environment/Libraries +License: LGPL +URL: http://www.libsdl.org/projects/SDL_net/ +Source0: http://www.libsdl.org/projects/%{name}/release/%{name}-%{version}.tar.gz +Patch0: %{name}-ppc64.patch +Patch1: %{name}-137525.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +BuildRequires: SDL-devel >= 1.2.4-1 +BuildRequires: automake autoconf libtool +Requires: SDL >= 1.2.4-1 + %description This is a portable network library for use with SDL. + %package devel -Summary: Libraries and includes to develop SDL networked applications. -Group: Development/Libraries -Requires: %{name} = %{version}-%{release} -Requires: SDL-devel >= 1.2.4-1 +Summary: Libraries and includes to develop SDL networked applications. +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} +Requires: SDL-devel >= 1.2.4-1 + %description devel This is a portable network library for use with SDL. @@ -28,9 +33,10 @@ This is the libraries and include files you can use to develop SDL networked applications. + %prep %setup -q -%patch -p1 +%patch0 -p1 %patch1 touch NEWS AUTHORS ChangeLog # Quiet automake @@ -40,35 +46,47 @@ automake --add-missing autoconf + %build %configure --prefix=%{_prefix} make %{?_smp_mflags} + %install rm -rf $RPM_BUILD_ROOT %makeinstall rm -f $RPM_BUILD_ROOT%{_libdir}/*.la + %clean rm -rf $RPM_BUILD_ROOT + %post -p /sbin/ldconfig + %postun -p /sbin/ldconfig + %files %defattr(-,root,root) %doc README CHANGES COPYING %{_libdir}/lib*.so.* + %files devel %defattr(-,root,root) %{_libdir}/lib*.a %{_libdir}/lib*.so %{_includedir}/SDL/ + %changelog +* Tue Sep 27 2005 Brian Pepple - 1.2.5-7 +- General spec formatting cleanup. +- Add dist tag. + * Thu Jun 9 2005 Ville Skytt?? - 1.2.5-6 - Add SDL-devel dependency to -devel, remove duplicate docs. - Remove trailing semicolon from "extern C" block in SDL_net.h (#137525, Kees). From fedora-extras-commits at redhat.com Tue Sep 27 21:56:14 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Tue, 27 Sep 2005 17:56:14 -0400 Subject: rpms/koffice/devel koffice.spec,1.6,1.7 Message-ID: <200509272156.j8RLuEA4006202@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/koffice/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6150 Modified Files: koffice.spec Log Message: - try to fix devel Index: koffice.spec =================================================================== RCS file: /cvs/extras/rpms/koffice/devel/koffice.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- koffice.spec 16 Aug 2005 08:51:03 -0000 1.6 +++ koffice.spec 27 Sep 2005 21:56:12 -0000 1.7 @@ -206,7 +206,7 @@ --with-pgsqllibdir=%{_libdir} --with-pgsqlincdir=%{_includedir} \ --with-pqxxlibdir=%{_libdir} --with-pqxxincdir=%{_includedir} -make %{?_smp_mflags} +make %install rm -rf $RPM_BUILD_ROOT @@ -738,6 +738,10 @@ %{_datadir}/servicetypes/kofilter*.desktop %changelog +* Tue Sep 27 2005 Andreas Bierfert +1.4.1-5 +- try to fix devel build + * Tue Aug 16 2005 Andreas Bierfert 1.4.1-4 - fix libpqxx detection on x86_64 From fedora-extras-commits at redhat.com Tue Sep 27 21:57:05 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Tue, 27 Sep 2005 17:57:05 -0400 Subject: rpms/koffice/devel koffice.spec,1.7,1.8 Message-ID: <200509272157.j8RLv5Tj006259@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/koffice/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6240 Modified Files: koffice.spec Log Message: - bump release Index: koffice.spec =================================================================== RCS file: /cvs/extras/rpms/koffice/devel/koffice.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- koffice.spec 27 Sep 2005 21:56:12 -0000 1.7 +++ koffice.spec 27 Sep 2005 21:57:03 -0000 1.8 @@ -1,6 +1,6 @@ Name: koffice Version: 1.4.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: A free, integrated office suite for KDE Group: Applications/Productivity From fedora-extras-commits at redhat.com Tue Sep 27 21:57:41 2005 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Tue, 27 Sep 2005 17:57:41 -0400 Subject: rpms/SDL_net/FC-4 SDL_net.spec,1.3,1.4 Message-ID: <200509272157.j8RLvfDR006327@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/SDL_net/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6308 Modified Files: SDL_net.spec Log Message: * Tue Sep 27 2005 Brian Pepple - 1.2.5-6 - General spec formatting cleanup. - Add dist tag. Index: SDL_net.spec =================================================================== RCS file: /cvs/extras/rpms/SDL_net/FC-4/SDL_net.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- SDL_net.spec 9 Jun 2005 20:49:08 -0000 1.3 +++ SDL_net.spec 27 Sep 2005 21:57:39 -0000 1.4 @@ -1,26 +1,31 @@ -Summary: SDL portable network library -Name: SDL_net -Version: 1.2.5 -Release: 5 -Source0: %{name}-%{version}.tar.gz -URL: http://www.libsdl.org/projects/SDL_net/ -License: LGPL -Group: System Environment/Libraries -BuildRoot: /var/tmp/%{name}-buildroot -Requires: SDL >= 1.2.4-1 -BuildRequires: SDL-devel >= 1.2.4-1 -BuildRequires: automake autoconf libtool -Patch: SDL_net-ppc64.patch -Patch1: SDL_net-137525.patch +Name: SDL_net +Version: 1.2.5 +Release: 6%{?dist} +Summary: SDL portable network library + +Group: System Environment/Libraries +License: LGPL +URL: http://www.libsdl.org/projects/SDL_net/ +Source0: http://www.libsdl.org/projects/%{name}/release/%{name}-%{version}.tar.gz +Patch0: %{name}-ppc64.patch +Patch1: %{name}-137525.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +BuildRequires: SDL-devel >= 1.2.4-1 +BuildRequires: automake autoconf libtool +Requires: SDL >= 1.2.4-1 + %description This is a portable network library for use with SDL. + %package devel -Summary: Libraries and includes to develop SDL networked applications. -Group: Development/Libraries -Requires: %{name} = %{version}-%{release} -Requires: SDL-devel >= 1.2.4-1 +Summary: Libraries and includes to develop SDL networked applications. +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} +Requires: SDL-devel >= 1.2.4-1 + %description devel This is a portable network library for use with SDL. @@ -28,9 +33,10 @@ This is the libraries and include files you can use to develop SDL networked applications. + %prep %setup -q -%patch -p1 +%patch0 -p1 %patch1 touch NEWS AUTHORS ChangeLog # Quiet automake @@ -40,35 +46,47 @@ automake --add-missing autoconf + %build %configure --prefix=%{_prefix} make %{?_smp_mflags} + %install rm -rf $RPM_BUILD_ROOT %makeinstall rm -f $RPM_BUILD_ROOT%{_libdir}/*.la + %clean rm -rf $RPM_BUILD_ROOT + %post -p /sbin/ldconfig + %postun -p /sbin/ldconfig + %files %defattr(-,root,root) %doc README CHANGES COPYING %{_libdir}/lib*.so.* + %files devel %defattr(-,root,root) %{_libdir}/lib*.a %{_libdir}/lib*.so %{_includedir}/SDL/ + %changelog +* Tue Sep 27 2005 Brian Pepple - 1.2.5-6 +- General spec formatting cleanup. +- Add dist tag. + * Thu Jun 9 2005 Ville Skytt?? - 1.2.5-5 - Add SDL-devel dependency to -devel, remove duplicate docs. - Remove trailing semicolon from "extern C" block in SDL_net.h (#137525, Kees). From fedora-extras-commits at redhat.com Tue Sep 27 22:07:55 2005 From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez)) Date: Tue, 27 Sep 2005 18:07:55 -0400 Subject: rpms/mod_auth_pam - New directory Message-ID: <200509272207.j8RM7t5F007758@cvs-int.fedora.redhat.com> Author: ivazquez Update of /cvs/extras/rpms/mod_auth_pam In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7748/mod_auth_pam Log Message: Directory /cvs/extras/rpms/mod_auth_pam added to the repository From fedora-extras-commits at redhat.com Tue Sep 27 22:08:00 2005 From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez)) Date: Tue, 27 Sep 2005 18:08:00 -0400 Subject: rpms/mod_auth_pam/devel - New directory Message-ID: <200509272208.j8RM80Wd007773@cvs-int.fedora.redhat.com> Author: ivazquez Update of /cvs/extras/rpms/mod_auth_pam/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7748/mod_auth_pam/devel Log Message: Directory /cvs/extras/rpms/mod_auth_pam/devel added to the repository From fedora-extras-commits at redhat.com Tue Sep 27 22:08:33 2005 From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez)) Date: Tue, 27 Sep 2005 18:08:33 -0400 Subject: rpms/mod_auth_pam Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200509272208.j8RM8XIw007807@cvs-int.fedora.redhat.com> Author: ivazquez Update of /cvs/extras/rpms/mod_auth_pam In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7793 Added Files: Makefile import.log Log Message: Setup of module mod_auth_pam --- NEW FILE Makefile --- # Top level Makefile for module mod_auth_pam all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Tue Sep 27 22:08:35 2005 From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez)) Date: Tue, 27 Sep 2005 18:08:35 -0400 Subject: rpms/mod_auth_pam/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200509272208.j8RM8ZNb007827@cvs-int.fedora.redhat.com> Author: ivazquez Update of /cvs/extras/rpms/mod_auth_pam/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7793/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module mod_auth_pam --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Tue Sep 27 22:10:18 2005 From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez)) Date: Tue, 27 Sep 2005 18:10:18 -0400 Subject: rpms/mod_auth_pam import.log,1.1,1.2 Message-ID: <200509272210.j8RMAvQs007919@cvs-int.fedora.redhat.com> Author: ivazquez Update of /cvs/extras/rpms/mod_auth_pam In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7876 Modified Files: import.log Log Message: auto-import mod_auth_pam-1.1.1-1 on branch devel from mod_auth_pam-1.1.1-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/mod_auth_pam/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 27 Sep 2005 22:08:25 -0000 1.1 +++ import.log 27 Sep 2005 22:10:15 -0000 1.2 @@ -0,0 +1 @@ +mod_auth_pam-1_1_1-1:HEAD:mod_auth_pam-1.1.1-1.src.rpm:1127858992 From fedora-extras-commits at redhat.com Tue Sep 27 22:10:36 2005 From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez)) Date: Tue, 27 Sep 2005 18:10:36 -0400 Subject: rpms/mod_auth_pam/devel COPYING-mod_auth_pam, NONE, 1.1 mod_auth_pam-auth_pam.conf, NONE, 1.1 mod_auth_pam-httpd.pam, NONE, 1.1 mod_auth_pam.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200509272210.j8RMAaL7007906@cvs-int.fedora.redhat.com> Author: ivazquez Update of /cvs/extras/rpms/mod_auth_pam/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7876/devel Modified Files: .cvsignore sources Added Files: COPYING-mod_auth_pam mod_auth_pam-auth_pam.conf mod_auth_pam-httpd.pam mod_auth_pam.spec Log Message: auto-import mod_auth_pam-1.1.1-1 on branch devel from mod_auth_pam-1.1.1-1.src.rpm --- NEW FILE COPYING-mod_auth_pam --- /* Copyright (c) 2000 Ingo Luetkebohle, 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 ``AS IS'' AND ANY EXPRESSED OR IMPLIED * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE * DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR OTHER CODE 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. */ --- NEW FILE mod_auth_pam-auth_pam.conf --- LoadModule auth_pam_module modules/mod_auth_pam.so LoadModule auth_sys_group_module modules/mod_auth_sys_group.so --- NEW FILE mod_auth_pam-httpd.pam --- #%PAM-1.0 auth required pam_stack.so service=system-auth account required pam_stack.so service=system-auth # Comment out the previous account line and uncomment the following line if # you wish to allow logins that don't have a system account #account required pam_permit.so --- NEW FILE mod_auth_pam.spec --- Name: mod_auth_pam Version: 1.1.1 Release: 1 Summary: PAM authentication module for Apache Group: System Environment/Daemons License: Distributable URL: http://pam.sourceforge.net/mod_auth_pam/ Source0: http://pam.sourceforge.net/mod_auth_pam/dist/%{name}-2.0-%{version}.tar.gz Source1: mod_auth_pam-auth_pam.conf Source2: COPYING-mod_auth_pam Source3: mod_auth_pam-httpd.pam BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: httpd-devel pam-devel Requires: httpd-mmn = %(cat %{_includedir}/httpd/.mmn || echo missing-httpd-devel) %description The PAM authentication module implements Basic authentication on top of the Pluggable Authentication Module library. Thereby it supports standard unix passwd, shadow, NIS, SMB auth and radius authentication transparently and easily interchangeable, wherever the HTTP protocol allows it. %prep %setup -q -n %{name} find -name CVS -type d | xargs rm -r install -p -m 644 %{SOURCE2} COPYING %build make %{?_smp_mflags} APXS=%{_sbindir}/apxs %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT%{_libdir}/httpd/modules install -m 755 .libs/%{name}.so $RPM_BUILD_ROOT%{_libdir}/httpd/modules install -m 755 .libs/mod_auth_sys_group.so $RPM_BUILD_ROOT%{_libdir}/httpd/modules mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d install -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/auth_pam.conf mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/pam.d install -p -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/httpd %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) %doc COPYING README doc samples %{_libdir}/httpd/modules/*.so %config(noreplace) %{_sysconfdir}/pam.d/* %config(noreplace) %{_sysconfdir}/httpd/conf.d/*.conf %changelog * Sat Sep 27 2005 Ignacio Vazquez-Abrams 1.1.1-1 - Initial RPM release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/mod_auth_pam/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 27 Sep 2005 22:08:33 -0000 1.1 +++ .cvsignore 27 Sep 2005 22:10:17 -0000 1.2 @@ -0,0 +1 @@ +mod_auth_pam-2.0-1.1.1.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/mod_auth_pam/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 27 Sep 2005 22:08:33 -0000 1.1 +++ sources 27 Sep 2005 22:10:18 -0000 1.2 @@ -0,0 +1 @@ +ab873520ddd2fee7d480dfd53e464e0a mod_auth_pam-2.0-1.1.1.tar.gz From fedora-extras-commits at redhat.com Tue Sep 27 22:47:37 2005 From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields)) Date: Tue, 27 Sep 2005 18:47:37 -0400 Subject: rpms/blogtk - New directory Message-ID: <200509272247.j8RMlbEa008133@cvs-int.fedora.redhat.com> Author: pfrields Update of /cvs/extras/rpms/blogtk In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8109/blogtk Log Message: Directory /cvs/extras/rpms/blogtk added to the repository From fedora-extras-commits at redhat.com Tue Sep 27 22:47:37 2005 From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields)) Date: Tue, 27 Sep 2005 18:47:37 -0400 Subject: rpms/blogtk/devel - New directory Message-ID: <200509272247.j8RMlbPF008138@cvs-int.fedora.redhat.com> Author: pfrields Update of /cvs/extras/rpms/blogtk/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8109/blogtk/devel Log Message: Directory /cvs/extras/rpms/blogtk/devel added to the repository From fedora-extras-commits at redhat.com Tue Sep 27 22:47:48 2005 From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields)) Date: Tue, 27 Sep 2005 18:47:48 -0400 Subject: rpms/blogtk Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200509272247.j8RMlmiF008183@cvs-int.fedora.redhat.com> Author: pfrields Update of /cvs/extras/rpms/blogtk In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8154 Added Files: Makefile import.log Log Message: Setup of module blogtk --- NEW FILE Makefile --- # Top level Makefile for module blogtk all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Tue Sep 27 22:47:49 2005 From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields)) Date: Tue, 27 Sep 2005 18:47:49 -0400 Subject: rpms/blogtk/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200509272247.j8RMlnu4008188@cvs-int.fedora.redhat.com> Author: pfrields Update of /cvs/extras/rpms/blogtk/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8154/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module blogtk --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Tue Sep 27 22:48:17 2005 From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields)) Date: Tue, 27 Sep 2005 18:48:17 -0400 Subject: rpms/blogtk import.log,1.1,1.2 Message-ID: <200509272248.j8RMmlsN008267@cvs-int.fedora.redhat.com> Author: pfrields Update of /cvs/extras/rpms/blogtk In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8227 Modified Files: import.log Log Message: auto-import blogtk-1.1-4 on branch devel from blogtk-1.1-4.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/blogtk/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 27 Sep 2005 22:47:46 -0000 1.1 +++ import.log 27 Sep 2005 22:48:15 -0000 1.2 @@ -0,0 +1 @@ +blogtk-1_1-4:HEAD:blogtk-1.1-4.src.rpm:1127861303 From fedora-extras-commits at redhat.com Tue Sep 27 22:48:17 2005 From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields)) Date: Tue, 27 Sep 2005 18:48:17 -0400 Subject: rpms/blogtk/devel BSD, NONE, 1.1 blogtk.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200509272248.j8RMmHdN008260@cvs-int.fedora.redhat.com> Author: pfrields Update of /cvs/extras/rpms/blogtk/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8227/devel Modified Files: .cvsignore sources Added Files: BSD blogtk.spec Log Message: auto-import blogtk-1.1-4 on branch devel from blogtk-1.1-4.src.rpm --- NEW FILE BSD --- Copyright (c) 2005, Jay Reding. 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 the author nor the names of 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 HOLDER 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. --- NEW FILE blogtk.spec --- # Note to Fedora Extras reviewers: The developer is very inconsistent # about the capitalization of the program name. I have erred on the # conservative side. Name: blogtk Version: 1.1 Release: 4%{?dist} Summary: Gnome application for editing/maintaining blogs Group: Applications/Internet License: BSD URL: http://blogtk.sourceforge.net Source0: http://dl.sf.net/blogtk/blogtk_%{version}.tar.bz2 Source1: BSD BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch Requires: gnome-python2 >= 2.00 Requires: pygtk2 >= 2.00 Requires: aspell BuildRequires: pygtk2-devel >= 2.00 BuildRequires: glib2-devel BuildRequires: desktop-file-utils # To make sure this doesn't inflict pain on CapNames users Provides: BloGTK = %{version}-%{release} %description BloGTK is a weblog posting client written in Python for any platform that supports Python and the GTK widget set. BloGTK allows you to connect to your weblog with XML-RPC and create new posts. %prep %setup -q -n BloGTK-%{version} cp %{SOURCE1} $RPM_BUILD_DIR/BloGTK-%{version} %build %install rm -rf $RPM_BUILD_ROOT # Cope with developer's Makefile and Fedora standards %define pyver %(python -c "import sys; x = sys.version_info; print '%%s.%%s' %% (x[0], x[1])") install -m 755 -d $RPM_BUILD_ROOT/%{_bindir} install -m 755 -d $RPM_BUILD_ROOT/%{_libdir}/python%{pyver}/site-packages/%{name} install -m 755 -d $RPM_BUILD_ROOT/%{_datadir}/{%{name},pixmaps/%{name}} install -m 755 src/* \ $RPM_BUILD_ROOT/%{_libdir}/python%{pyver}/site-packages/%{name} install -m 644 pixmaps/blogtk.glade \ $RPM_BUILD_ROOT/%{_datadir}/%{name} install -m 644 pixmaps/*.png $RPM_BUILD_ROOT/%{_datadir}/%{name} install -m 644 -D data/blogtk-icon.png \ $RPM_BUILD_ROOT/%{_datadir}/pixmaps/blogtk-icon.png %{__sed} -i 's/Exec=BloGTK/Exec=blogtk/' data/blogtk.desktop install -m 644 -D data/blogtk.desktop \ $RPM_BUILD_ROOT/%{_datadir}/applications/blogtk.desktop cat << EOF > $RPM_BUILD_ROOT/%{_bindir}/blogtk #!/bin/sh exec %{_libdir}/python%{pyver}/site-packages/%{name}/BloGTK.py EOF chmod 755 $RPM_BUILD_ROOT/%{_bindir}/blogtk desktop-file-install --vendor=fedora \ --dir=$RPM_BUILD_ROOT%{_datadir}/applications \ --add-category=X-Fedora \ --delete-original \ --add-category=Network \ $RPM_BUILD_ROOT/%{_datadir}/applications/blogtk.desktop %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc AUTHORS ChangeLog README BSD %{_bindir}/* %dir %{_libdir}/python%{pyver}/site-packages/%{name} %{_libdir}/python%{pyver}/site-packages/%{name}/* %dir %{_datadir}/%{name} %{_datadir}/%{name}/* %{_datadir}/applications/fedora-blogtk.desktop %{_datadir}/pixmaps/blogtk-icon.png %changelog * Mon Aug 29 2005 Paul W. Frields - 1.1-4 - Add BSD license file * Sat Aug 20 2005 Paul W. Frields - 1.1-3 - Revised packaging to match current Fedora Extras guidelines * Mon Mar 21 2005 Seth Vidal 1.1-2 - fixes for fedora extras compliance * Thu Mar 17 2005 Seth Vidal 1.1-1 - initial package Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/blogtk/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 27 Sep 2005 22:47:47 -0000 1.1 +++ .cvsignore 27 Sep 2005 22:48:15 -0000 1.2 @@ -0,0 +1 @@ +blogtk_1.1.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/blogtk/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 27 Sep 2005 22:47:47 -0000 1.1 +++ sources 27 Sep 2005 22:48:15 -0000 1.2 @@ -0,0 +1 @@ +cd2d2521a261867cd9c830a81d3d4408 blogtk_1.1.tar.bz2 From fedora-extras-commits at redhat.com Tue Sep 27 23:30:29 2005 From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez)) Date: Tue, 27 Sep 2005 19:30:29 -0400 Subject: owners owners.list,1.263,1.264 Message-ID: <200509272330.j8RNUTkN009791@cvs-int.fedora.redhat.com> Author: ivazquez Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9772 Modified Files: owners.list Log Message: mod_auth_pam Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.263 retrieving revision 1.264 diff -u -r1.263 -r1.264 --- owners.list 27 Sep 2005 20:19:32 -0000 1.263 +++ owners.list 27 Sep 2005 23:30:27 -0000 1.264 @@ -511,6 +511,7 @@ Fedora Extras|mlmmj|Mailserver-independent ezmlm-like mailing list manager|mfleming+rpm at enlartenment.com|extras-qa at fedoraproject.org| Fedora Extras|mock|Builds packages inside chroots|skvidal at phy.duke.edu|extras-qa at fedoraproject.org| Fedora Extras|mod_annodex|Apache module for server-side support of annodex media|thomas at apestaart.org|extras-qa at fedoraproject.org| +Fedora Extras|mod_auth_pam|PAM authentication module for Apache|ivazquez at ivazquez.net|extras-qa at fedoraproject.org| Fedora Extras|mod_security|Security module for the Apache HTTP Server|mfleming+rpm at enlartenment.com|extras-qa at fedoraproject.org| Fedora Extras|mod_suphp|An apache2 module for executing PHP scripts with the permissions of their owners|andreas at bawue.net|extras-qa at fedoraproject.org| Fedora Extras|moin|MoinMoin is a Python clone of WikiWiki|matthias at rpmforge.net|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Tue Sep 27 23:31:15 2005 From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez)) Date: Tue, 27 Sep 2005 19:31:15 -0400 Subject: rpms/mod_auth_pam/devel mod_auth_pam.spec,1.1,1.2 Message-ID: <200509272331.j8RNVFkq009821@cvs-int.fedora.redhat.com> Author: ivazquez Update of /cvs/extras/rpms/mod_auth_pam/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9802 Modified Files: mod_auth_pam.spec Log Message: Add disttag Index: mod_auth_pam.spec =================================================================== RCS file: /cvs/extras/rpms/mod_auth_pam/devel/mod_auth_pam.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- mod_auth_pam.spec 27 Sep 2005 22:10:18 -0000 1.1 +++ mod_auth_pam.spec 27 Sep 2005 23:31:13 -0000 1.2 @@ -1,6 +1,6 @@ Name: mod_auth_pam Version: 1.1.1 -Release: 1 +Release: 1%{?dist} Summary: PAM authentication module for Apache Group: System Environment/Daemons From fedora-extras-commits at redhat.com Tue Sep 27 23:34:08 2005 From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields)) Date: Tue, 27 Sep 2005 19:34:08 -0400 Subject: owners owners.list,1.264,1.265 Message-ID: <200509272334.j8RNY8ZH009856@cvs-int.fedora.redhat.com> Author: pfrields Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9837 Modified Files: owners.list Log Message: Add blogtk Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.264 retrieving revision 1.265 diff -u -r1.264 -r1.265 --- owners.list 27 Sep 2005 23:30:27 -0000 1.264 +++ owners.list 27 Sep 2005 23:34:06 -0000 1.265 @@ -56,6 +56,7 @@ Fedora Extras|blackbox|Very small and fast Window Manager|matthias at rpmforge.net|extras-qa at fedoraproject.org| Fedora Extras|blacs|Basic Linear Algebra Communication Subprograms|tcallawa at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|blender|3D modeling, animation, rendering and post-production|compton at pcompton.com|extras-qa at fedoraproject.org| +Fedora Extras|blogtk|Gnome application for editing/maintaining blogs|stickster at gmail.com|extras-qa at fedoraproject.org| Fedora Extras|blt|BLT widget extension to Tcl/Tk scripting language development|jfontain at free.fr|extras-qa at fedoraproject.org| Fedora Extras|bluefish|A GTK2 web development application for experienced users|compton at pcompton.com|extras-qa at fedoraproject.org| Fedora Extras|bmp|GTK2 based fork of the XMMS media player|redhat-bugzilla at camperquake.de|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Wed Sep 28 00:17:29 2005 From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert)) Date: Tue, 27 Sep 2005 20:17:29 -0400 Subject: rpms/regexxer - New directory Message-ID: <200509280017.j8S0HTLo011466@cvs-int.fedora.redhat.com> Author: cwickert Update of /cvs/extras/rpms/regexxer In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11442/regexxer Log Message: Directory /cvs/extras/rpms/regexxer added to the repository From fedora-extras-commits at redhat.com Wed Sep 28 00:17:29 2005 From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert)) Date: Tue, 27 Sep 2005 20:17:29 -0400 Subject: rpms/regexxer/devel - New directory Message-ID: <200509280017.j8S0HTuA011471@cvs-int.fedora.redhat.com> Author: cwickert Update of /cvs/extras/rpms/regexxer/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11442/regexxer/devel Log Message: Directory /cvs/extras/rpms/regexxer/devel added to the repository From fedora-extras-commits at redhat.com Wed Sep 28 00:17:46 2005 From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert)) Date: Tue, 27 Sep 2005 20:17:46 -0400 Subject: rpms/regexxer Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200509280017.j8S0Hk1H011516@cvs-int.fedora.redhat.com> Author: cwickert Update of /cvs/extras/rpms/regexxer In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11487 Added Files: Makefile import.log Log Message: Setup of module regexxer --- NEW FILE Makefile --- # Top level Makefile for module regexxer all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Wed Sep 28 00:17:46 2005 From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert)) Date: Tue, 27 Sep 2005 20:17:46 -0400 Subject: rpms/regexxer/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200509280017.j8S0HkYs011521@cvs-int.fedora.redhat.com> Author: cwickert Update of /cvs/extras/rpms/regexxer/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11487/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module regexxer --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Wed Sep 28 00:18:37 2005 From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert)) Date: Tue, 27 Sep 2005 20:18:37 -0400 Subject: rpms/regexxer import.log,1.1,1.2 Message-ID: <200509280019.j8S0J7U0011594@cvs-int.fedora.redhat.com> Author: cwickert Update of /cvs/extras/rpms/regexxer In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11556 Modified Files: import.log Log Message: auto-import regexxer-0.8-1.fc4 on branch devel from regexxer-0.8-1.fc4.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/regexxer/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 28 Sep 2005 00:17:43 -0000 1.1 +++ import.log 28 Sep 2005 00:18:35 -0000 1.2 @@ -0,0 +1 @@ +regexxer-0_8-1_fc4:HEAD:regexxer-0.8-1.fc4.src.rpm:1127866707 From fedora-extras-commits at redhat.com Wed Sep 28 00:18:37 2005 From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert)) Date: Tue, 27 Sep 2005 20:18:37 -0400 Subject: rpms/regexxer/devel regexxer.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200509280019.j8S0J820011596@cvs-int.fedora.redhat.com> Author: cwickert Update of /cvs/extras/rpms/regexxer/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11556/devel Modified Files: .cvsignore sources Added Files: regexxer.spec Log Message: auto-import regexxer-0.8-1.fc4 on branch devel from regexxer-0.8-1.fc4.src.rpm --- NEW FILE regexxer.spec --- Name: regexxer Version: 0.8 Release: 1%{?dist} Summary: A nifty GUI search/replace tool Group: Applications/Text License: GPL URL: http://regexxer.sourceforge.net/ Source0: http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libsigc++20-devel, libglademm24-devel BuildRequires: gconfmm26-devel >= 2.6.1, pcre-devel >= 4.0.0 BuildRequires: desktop-file-utils, gettext Requires(pre): GConf2 Requires(post): GConf2 Requires(preun): GConf2 %description Regexxer is a nifty GUI search/replace tool featuring Perl-style regular expressions. If you need project-wide substitution and you???re tired of hacking sed command lines together, then you should definitely give it a try. %prep %setup -q %build %configure make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 make install DESTDIR=$RPM_BUILD_ROOT desktop-file-install --vendor fedora \ --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ --add-category X-Fedora \ --delete-original \ ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop %find_lang %{name} %clean rm -rf $RPM_BUILD_ROOT %pre if [ "$1" -gt 1 ]; then export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` gconftool-2 --makefile-uninstall-rule \ %{_sysconfdir}/gconf/schemas/%{name}.schemas >/dev/null || : killall -HUP gconfd-2 || : fi %post export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` gconftool-2 --makefile-install-rule \ %{_sysconfdir}/gconf/schemas/%{name}.schemas >/dev/null || : killall -HUP gconfd-2 || : %preun if [ "$1" -eq 0 ]; then export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` gconftool-2 --makefile-uninstall-rule \ %{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null || : killall -HUP gconfd-2 || : fi %files -f %{name}.lang %defattr(-,root,root,-) %doc AUTHORS COPYING ChangeLog NEWS README %{_bindir}/%{name} %{_sysconfdir}/gconf/schemas/%{name}.schemas %{_datadir}/applications/fedora-%{name}.desktop %{_datadir}/%{name} %{_datadir}/pixmaps/%{name}.png %changelog * Thu Sep 22 2005 Christoph Wickert - 0.8-1 - Initial RPM release. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/regexxer/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 28 Sep 2005 00:17:44 -0000 1.1 +++ .cvsignore 28 Sep 2005 00:18:35 -0000 1.2 @@ -0,0 +1 @@ +regexxer-0.8.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/regexxer/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 28 Sep 2005 00:17:44 -0000 1.1 +++ sources 28 Sep 2005 00:18:35 -0000 1.2 @@ -0,0 +1 @@ +acaa19b119cc7159c42b7f93e02f9fbd regexxer-0.8.tar.gz From fedora-extras-commits at redhat.com Wed Sep 28 00:28:56 2005 From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert)) Date: Tue, 27 Sep 2005 20:28:56 -0400 Subject: owners owners.list,1.265,1.266 Message-ID: <200509280028.j8S0Sue0011663@cvs-int.fedora.redhat.com> Author: cwickert Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11644 Modified Files: owners.list Log Message: added regexxer Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.265 retrieving revision 1.266 diff -u -r1.265 -r1.266 --- owners.list 27 Sep 2005 23:34:06 -0000 1.265 +++ owners.list 28 Sep 2005 00:28:54 -0000 1.266 @@ -893,6 +893,7 @@ Fedora Extras|rbldnsd|Small, fast daemon to serve DNSBLs|paul at city-fan.org|extras-qa at fedoraproject.org| Fedora Extras|rdiff-backup|Convenient and transparent local/remote incremental mirror/backup|ghenry at suretecsystems.com|extras-qa at fedoraproject.org| Fedora Extras|recode|Conversion between character sets and surfaces|z.kota at gmx.net|extras-qa at fedoraproject.org| +Fedora Extras|regexxer|A nifty GUI search/replace tool|wickerpms at arcor.de|extras-qa at fedoraproject.org| Fedora Extras|rekall|A KDE database front-end application|tcallawa at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|repoml|Tools and data for working with RepoML files|ivazquez at ivazquez.net|extras-qa at fedoraproject.org| Fedora Extras|repoview|Creates a set of static HTML pages in a yum repository|icon at linux.duke.edu|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Wed Sep 28 01:23:46 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Tue, 27 Sep 2005 21:23:46 -0400 Subject: rpms/sbcl/FC-3 .cvsignore, 1.2, 1.3 sbcl.spec, 1.15, 1.16 sources, 1.2, 1.3 Message-ID: <200509280123.j8S1NlIq013230@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/sbcl/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13177/FC-3 Modified Files: .cvsignore sbcl.spec sources Log Message: * Tue Sep 27 2005 Rex Dieter 0.9.5-8 - respin (fc3/fc4) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/sbcl/FC-3/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 12 Sep 2005 12:36:44 -0000 1.2 +++ .cvsignore 28 Sep 2005 01:23:44 -0000 1.3 @@ -1,4 +1,4 @@ +sbcl-0.9.5-source.tar.bz2 sbcl-0.8.15-powerpc-linux-binary.tar.bz2 -sbcl-0.9.4-source.tar.bz2 sbcl-0.9.4-x86-64-linux-binary.tar.bz2 sbcl-0.9.4-x86-linux-binary.tar.bz2 Index: sbcl.spec =================================================================== RCS file: /cvs/extras/rpms/sbcl/FC-3/sbcl.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- sbcl.spec 27 Sep 2005 20:44:49 -0000 1.15 +++ sbcl.spec 28 Sep 2005 01:23:44 -0000 1.16 @@ -3,7 +3,7 @@ Name: sbcl Summary: Steel Bank Common Lisp Version: 0.9.5 -Release: 7%{?dist} +Release: 8%{?dist} License: BSD/MIT Group: Development/Languages @@ -165,6 +165,9 @@ %changelog +* Tue Sep 27 2005 Rex Dieter 0.9.5-8 +- respin (fc3/fc4) + * Tue Sep 27 2005 Rex Dieter 0.9.5-7 - drop ppc - cleaner optflags patch Index: sources =================================================================== RCS file: /cvs/extras/rpms/sbcl/FC-3/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 12 Sep 2005 12:36:44 -0000 1.2 +++ sources 28 Sep 2005 01:23:44 -0000 1.3 @@ -1,4 +1,4 @@ +f594f18813c08f262a6df9a36288adcb sbcl-0.9.5-source.tar.bz2 3a72d0785ce0a8e02f9af632c2a4f217 sbcl-0.8.15-powerpc-linux-binary.tar.bz2 -a0420dc6236efece72c1c80ee15873c9 sbcl-0.9.4-source.tar.bz2 67ec41e624a3f2ad7f6f3cde1bd001d3 sbcl-0.9.4-x86-64-linux-binary.tar.bz2 947d1cde2c1c80416b5f9fb4e4c81383 sbcl-0.9.4-x86-linux-binary.tar.bz2 From fedora-extras-commits at redhat.com Wed Sep 28 01:23:47 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Tue, 27 Sep 2005 21:23:47 -0400 Subject: rpms/sbcl/devel sbcl.spec,1.22,1.23 Message-ID: <200509280123.j8S1NlFH013244@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/sbcl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13177/devel Modified Files: sbcl.spec Log Message: * Tue Sep 27 2005 Rex Dieter 0.9.5-8 - respin (fc3/fc4) Index: sbcl.spec =================================================================== RCS file: /cvs/extras/rpms/sbcl/devel/sbcl.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- sbcl.spec 27 Sep 2005 20:10:04 -0000 1.22 +++ sbcl.spec 28 Sep 2005 01:23:45 -0000 1.23 @@ -3,7 +3,7 @@ Name: sbcl Summary: Steel Bank Common Lisp Version: 0.9.5 -Release: 7%{?dist} +Release: 8%{?dist} License: BSD/MIT Group: Development/Languages @@ -165,6 +165,9 @@ %changelog +* Tue Sep 27 2005 Rex Dieter 0.9.5-8 +- respin (fc3/fc4) + * Tue Sep 27 2005 Rex Dieter 0.9.5-7 - drop ppc - cleaner optflags patch From fedora-extras-commits at redhat.com Wed Sep 28 01:23:47 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Tue, 27 Sep 2005 21:23:47 -0400 Subject: rpms/sbcl/FC-4 .cvsignore, 1.2, 1.3 sbcl.spec, 1.15, 1.16 sources, 1.2, 1.3 Message-ID: <200509280123.j8S1NlTh013238@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/sbcl/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13177/FC-4 Modified Files: .cvsignore sbcl.spec sources Log Message: * Tue Sep 27 2005 Rex Dieter 0.9.5-8 - respin (fc3/fc4) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/sbcl/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 12 Sep 2005 12:36:44 -0000 1.2 +++ .cvsignore 28 Sep 2005 01:23:45 -0000 1.3 @@ -1,4 +1,4 @@ +sbcl-0.9.5-source.tar.bz2 sbcl-0.8.15-powerpc-linux-binary.tar.bz2 -sbcl-0.9.4-source.tar.bz2 sbcl-0.9.4-x86-64-linux-binary.tar.bz2 sbcl-0.9.4-x86-linux-binary.tar.bz2 Index: sbcl.spec =================================================================== RCS file: /cvs/extras/rpms/sbcl/FC-4/sbcl.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- sbcl.spec 27 Sep 2005 20:44:50 -0000 1.15 +++ sbcl.spec 28 Sep 2005 01:23:45 -0000 1.16 @@ -3,7 +3,7 @@ Name: sbcl Summary: Steel Bank Common Lisp Version: 0.9.5 -Release: 7%{?dist} +Release: 8%{?dist} License: BSD/MIT Group: Development/Languages @@ -165,6 +165,9 @@ %changelog +* Tue Sep 27 2005 Rex Dieter 0.9.5-8 +- respin (fc3/fc4) + * Tue Sep 27 2005 Rex Dieter 0.9.5-7 - drop ppc - cleaner optflags patch Index: sources =================================================================== RCS file: /cvs/extras/rpms/sbcl/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 12 Sep 2005 12:36:44 -0000 1.2 +++ sources 28 Sep 2005 01:23:45 -0000 1.3 @@ -1,4 +1,4 @@ +f594f18813c08f262a6df9a36288adcb sbcl-0.9.5-source.tar.bz2 3a72d0785ce0a8e02f9af632c2a4f217 sbcl-0.8.15-powerpc-linux-binary.tar.bz2 -a0420dc6236efece72c1c80ee15873c9 sbcl-0.9.4-source.tar.bz2 67ec41e624a3f2ad7f6f3cde1bd001d3 sbcl-0.9.4-x86-64-linux-binary.tar.bz2 947d1cde2c1c80416b5f9fb4e4c81383 sbcl-0.9.4-x86-linux-binary.tar.bz2 From fedora-extras-commits at redhat.com Wed Sep 28 02:59:15 2005 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Tue, 27 Sep 2005 22:59:15 -0400 Subject: rpms/haddock - New directory Message-ID: <200509280259.j8S2xF5f014943@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/haddock In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14921/haddock Log Message: Directory /cvs/extras/rpms/haddock added to the repository From fedora-extras-commits at redhat.com Wed Sep 28 02:59:15 2005 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Tue, 27 Sep 2005 22:59:15 -0400 Subject: rpms/haddock/devel - New directory Message-ID: <200509280259.j8S2xFK6014948@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/haddock/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14921/haddock/devel Log Message: Directory /cvs/extras/rpms/haddock/devel added to the repository From fedora-extras-commits at redhat.com Wed Sep 28 02:59:36 2005 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Tue, 27 Sep 2005 22:59:36 -0400 Subject: rpms/haddock Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200509280259.j8S2xagB014999@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/haddock In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14970 Added Files: Makefile import.log Log Message: Setup of module haddock --- NEW FILE Makefile --- # Top level Makefile for module haddock all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Wed Sep 28 02:59:36 2005 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Tue, 27 Sep 2005 22:59:36 -0400 Subject: rpms/haddock/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200509280259.j8S2xaxV015004@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/haddock/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14970/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module haddock --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Wed Sep 28 03:00:16 2005 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Tue, 27 Sep 2005 23:00:16 -0400 Subject: rpms/haddock import.log,1.1,1.2 Message-ID: <200509280300.j8S30Gop015081@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/haddock In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15046 Modified Files: import.log Log Message: auto-import haddock-0.7-1 on branch devel from haddock-0.7-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/haddock/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 28 Sep 2005 02:59:34 -0000 1.1 +++ import.log 28 Sep 2005 03:00:14 -0000 1.2 @@ -0,0 +1 @@ +haddock-0_7-1:HEAD:haddock-0.7-1.src.rpm:1127876405 From fedora-extras-commits at redhat.com Wed Sep 28 03:00:17 2005 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Tue, 27 Sep 2005 23:00:17 -0400 Subject: rpms/haddock/devel haddock.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200509280300.j8S30HS0015088@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/haddock/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15046/devel Modified Files: .cvsignore sources Added Files: haddock.spec Log Message: auto-import haddock-0.7-1 on branch devel from haddock-0.7-1.src.rpm --- NEW FILE haddock.spec --- Name: haddock Version: 0.7 Release: 1%{?dist} Summary: Haddock documentation tool for annotated Haskell source code Group: Development/Tools License: BSD-like URL: http://www.haskell.org/haddock/ Source0: http://www.haskell.org/haddock/%{name}-%{version}-src.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ghc libxslt docbook-style-xsl %description Haddock is a tool for automatically generating hyperlinked documentation from annotated Haskell source code. It is primary intended for documenting libraries, but it is useful for any kind of Haskell code. Haddock lets you write documentation annotations next to the definitions of functions and types in the source code in a lightweight syntax. # don't generate an empty debuginfo subpackage %define debug_package %{nil} %define __spec_install_post /usr/lib/rpm/brp-compress %prep %setup -q %build ./configure --prefix=%{_prefix} --libdir=%{_libdir} make %{?_smp_mflags} (cd haddock/doc ; make html ) %install rm -rf ${RPM_BUILD_ROOT} %makeinstall # move datafiles into their expected location mkdir ${RPM_BUILD_ROOT}%{_datadir}/%{name}-%{version} find ${RPM_BUILD_ROOT}%{_datadir} -type f | xargs mv --target-directory=${RPM_BUILD_ROOT}%{_datadir}/%{name}-%{version} sed -i -e "s!%{_libdir}/%{name}-%{version}!%{_libexecdir}!" ${RPM_BUILD_ROOT}%{_bindir}/%{name}-%{version} # drop versioned binary wrapper rm ${RPM_BUILD_ROOT}%{_bindir}/%{name} mv ${RPM_BUILD_ROOT}%{_bindir}/%{name}{-%{version},} %clean rm -rf ${RPM_BUILD_ROOT} %files %defattr(-,root,root) %doc haddock/README %doc haddock/doc/haddock %{_bindir}/haddock %{_libexecdir}/haddock.bin %{_datadir}/haddock-%{version} %changelog * Tue Sep 27 2005 Jens Petersen - 0.7-1 - cleanup for Fedora Extras (G??rard Milmeister) - drop versioned binary - set standard buildroot - do not create debuginfo - improve the description * Mon Aug 22 2005 Jens Petersen - 0.7 release * Tue Jul 5 2005 Jens Petersen - 0.7-0.20050705 - update to cvs snapshot - update filelist - install data files in a subdir * Wed Dec 15 2004 Jens Petersen - spec file cleanup - only generate docs in html * Sat Oct 11 2003 Sven Panne - Include architecture-independent files in file list * Tue Aug 26 2003 Sven Panne - Use autoreconf instead of autoconf * Mon Jul 28 2003 Sven Panne - Updated to version 0.5 - Automagically generate configure if it is not there * Tue Jul 23 2002 Simon Marlow - Updated to version 0.4 * Sun Jun 23 2002 Sven Panne - Cleaned up build root handling and added more docs * Wed May 01 2002 Tom Moertel - Created spec file Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/haddock/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 28 Sep 2005 02:59:34 -0000 1.1 +++ .cvsignore 28 Sep 2005 03:00:15 -0000 1.2 @@ -0,0 +1 @@ +haddock-0.7-src.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/haddock/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 28 Sep 2005 02:59:34 -0000 1.1 +++ sources 28 Sep 2005 03:00:15 -0000 1.2 @@ -0,0 +1 @@ +759419e78416d5f093190968a4dc18f5 haddock-0.7-src.tar.gz From fedora-extras-commits at redhat.com Wed Sep 28 03:18:47 2005 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Tue, 27 Sep 2005 23:18:47 -0400 Subject: owners owners.list,1.266,1.267 Message-ID: <200509280318.j8S3IlIX016597@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16578 Modified Files: owners.list Log Message: add haddock Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.266 retrieving revision 1.267 diff -u -r1.266 -r1.267 --- owners.list 28 Sep 2005 00:28:54 -0000 1.266 +++ owners.list 28 Sep 2005 03:18:45 -0000 1.267 @@ -317,6 +317,7 @@ Fedora Extras|gwget|GUI Download manager using wget|fedora at leemhuis.info|extras-qa at fedoraproject.org| Fedora Extras|gxemul|Instruction-level machine emulator|tcallawa at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|hackedbox|The bastard son of Blackbox, a small and fast Window Manager|matthias at rpmforge.net|extras-qa at fedoraproject.org| +Fedora Extras|haddock|Documentation tool for annotated Haskell source code|petersen at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|hamlib|Run-time library to control radio transceivers and receivers|ivazquez at ivazquez.net|extras-qa at fedoraproject.org| Fedora Extras|hddtemp|Hard disk temperature tool|ville.skytta at iki.fi|extras-qa at fedoraproject.org| Fedora Extras|hdf|A general purpose library and file format for storing scientific data|orion at cora.nwra.com|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Wed Sep 28 03:28:17 2005 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Tue, 27 Sep 2005 23:28:17 -0400 Subject: owners owners.list,1.267,1.268 Message-ID: <200509280328.j8S3SHMI016645@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16612 Modified Files: owners.list Log Message: reassign scim-pinyin Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.267 retrieving revision 1.268 diff -u -r1.267 -r1.268 --- owners.list 28 Sep 2005 03:18:45 -0000 1.267 +++ owners.list 28 Sep 2005 03:28:15 -0000 1.268 @@ -924,7 +924,7 @@ Fedora Extras|scim-anthy|SCIM IMEngine for Japanese input with anthy|tagoh at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|scim-chewing|SCIM IMEngine for Traditional Chinese|petersen at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|scim-hangul|SCIM IMEngine for Korean Hangul|tagoh at redhat.com|extras-qa at fedoraproject.org| -Fedora Extras|scim-pinyin|Chinese input method for SCIM|ryo-dairiki at users.sourceforge.net|extras-qa at fedoraproject.org|petersen at redhat.com +Fedora Extras|scim-pinyin|Chinese input method for SCIM|petersen at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|scim-qtimm|SCIM Qt Input Method module|petersen at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|scim-skk|Scim-skk is a SCIM IMEngine module for skk to support Japanese input|ryo-dairiki at users.sourceforge.net|extras-qa at fedoraproject.org| Fedora Extras|scim-tables|SCIM Generic Table IMEngine and its data files|ryo-dairiki at users.sourceforge.net|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Wed Sep 28 03:41:21 2005 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Tue, 27 Sep 2005 23:41:21 -0400 Subject: rpms/fwrestart/devel fwrestart.spec,1.1,1.2 Message-ID: <200509280341.j8S3fLq1016692@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/fwrestart/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16673 Modified Files: fwrestart.spec Log Message: add dist tag Index: fwrestart.spec =================================================================== RCS file: /cvs/extras/rpms/fwrestart/devel/fwrestart.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- fwrestart.spec 26 Sep 2005 17:37:20 -0000 1.1 +++ fwrestart.spec 28 Sep 2005 03:41:19 -0000 1.2 @@ -1,7 +1,7 @@ Summary: A way to more safely re-load firewall rules remotely Name: fwrestart Version: 1.01 -Release: 3 +Release: 4%{?dist} License: GPL Group: Applications/System URL: http://www.tummy.com/Community/software/ @@ -45,6 +45,9 @@ %{_sbindir}/fwrestart %changelog +* Tue Sep 27 2005 Kevin Fenzi - 1.01-4.fc5 +- add dist to release + * Thu Sep 22 2005 Kevin Fenzi - 1.01-3 - A few more tweaks to clean up issues and re-submit to extras From fedora-extras-commits at redhat.com Wed Sep 28 03:42:38 2005 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Tue, 27 Sep 2005 23:42:38 -0400 Subject: rpms/fwrestart/FC-4 fwrestart.spec,1.1,1.2 Message-ID: <200509280342.j8S3gcv3016760@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/fwrestart/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16741 Modified Files: fwrestart.spec Log Message: add dist tag Index: fwrestart.spec =================================================================== RCS file: /cvs/extras/rpms/fwrestart/FC-4/fwrestart.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- fwrestart.spec 26 Sep 2005 17:37:20 -0000 1.1 +++ fwrestart.spec 28 Sep 2005 03:42:36 -0000 1.2 @@ -1,7 +1,7 @@ Summary: A way to more safely re-load firewall rules remotely Name: fwrestart Version: 1.01 -Release: 3 +Release: 4%{?dist} License: GPL Group: Applications/System URL: http://www.tummy.com/Community/software/ @@ -45,6 +45,9 @@ %{_sbindir}/fwrestart %changelog +* Tue Sep 27 2005 Kevin Fenzi - 1.01-4.fc4 +- add dist to release + * Thu Sep 22 2005 Kevin Fenzi - 1.01-3 - A few more tweaks to clean up issues and re-submit to extras From fedora-extras-commits at redhat.com Wed Sep 28 03:44:01 2005 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Tue, 27 Sep 2005 23:44:01 -0400 Subject: rpms/fwrestart/FC-3 fwrestart.spec,1.1,1.2 Message-ID: <200509280344.j8S3i1nl016828@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/fwrestart/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16809 Modified Files: fwrestart.spec Log Message: add dist tag Index: fwrestart.spec =================================================================== RCS file: /cvs/extras/rpms/fwrestart/FC-3/fwrestart.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- fwrestart.spec 26 Sep 2005 17:37:20 -0000 1.1 +++ fwrestart.spec 28 Sep 2005 03:43:59 -0000 1.2 @@ -1,7 +1,7 @@ Summary: A way to more safely re-load firewall rules remotely Name: fwrestart Version: 1.01 -Release: 3 +Release: 4%{?dist} License: GPL Group: Applications/System URL: http://www.tummy.com/Community/software/ @@ -45,6 +45,9 @@ %{_sbindir}/fwrestart %changelog +* Tue Sep 27 2005 Kevin Fenzi - 1.01-4.fc3 +- add dist to release + * Thu Sep 22 2005 Kevin Fenzi - 1.01-3 - A few more tweaks to clean up issues and re-submit to extras From fedora-extras-commits at redhat.com Wed Sep 28 06:30:06 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Wed, 28 Sep 2005 02:30:06 -0400 Subject: rpms/synce/devel synce.spec,1.8,1.9 Message-ID: <200509280630.j8S6U6tS021244@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/synce/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21225 Modified Files: synce.spec Log Message: - disable stack protector Index: synce.spec =================================================================== RCS file: /cvs/extras/rpms/synce/devel/synce.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- synce.spec 27 Sep 2005 21:47:00 -0000 1.8 +++ synce.spec 28 Sep 2005 06:30:04 -0000 1.9 @@ -89,6 +89,10 @@ --with-libmimedir-include="${MIMEDIRINC}" \ --with-libmimedir-lib="${MIMEDIRLIB}" \ --disable-static +# don't want stack protector on this one +%{__perl} -pi -e 's/-fstack-protector/-fno-stack-protector/;' \ +Makefile src/Makefile lib/Makefile man/Makefile + make LDFLAGS="-L${SYNCEINC} -L${RAPI2INC} -L${MIMEDIRLIB}" cd .. # build the serial support From fedora-extras-commits at redhat.com Wed Sep 28 06:37:06 2005 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Wed, 28 Sep 2005 02:37:06 -0400 Subject: owners owners.list,1.268,1.269 Message-ID: <200509280637.j8S6b6pM021351@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21330 Modified Files: owners.list Log Message: Add cppunit Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.268 retrieving revision 1.269 diff -u -r1.268 -r1.269 --- owners.list 28 Sep 2005 03:28:15 -0000 1.268 +++ owners.list 28 Sep 2005 06:37:04 -0000 1.269 @@ -105,6 +105,7 @@ Fedora Extras|convmv|Convert filename encodings.|nphilipp at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|cook|A file construction tool|gemi at bluewin.ch|extras-qa at fedoraproject.org| Fedora Extras|cpan2rpm|Perl module packager|ghenry at suretecsystems.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|cppunit|C++ unit testing framework|pertusus at free.fr|extras-qa at fedoraproject.org| Fedora Extras|cproto|Generates function prototypes and variable declarations from C code|jnovy at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|crack|Password cracker|Christian.Iseli at licr.org|extras-qa at fedoraproject.org| Fedora Extras|cryptplug|Cryptography plugin for mutt & kmail|dennis at dgilmore.net|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Wed Sep 28 09:20:03 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Wed, 28 Sep 2005 05:20:03 -0400 Subject: rpms/koffice/FC-4 koffice.spec,1.6,1.7 Message-ID: <200509280920.j8S9K3Hu026370@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/koffice/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26351 Modified Files: koffice.spec Log Message: - rebuild Index: koffice.spec =================================================================== RCS file: /cvs/extras/rpms/koffice/FC-4/koffice.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- koffice.spec 16 Aug 2005 07:34:20 -0000 1.6 +++ koffice.spec 28 Sep 2005 09:20:00 -0000 1.7 @@ -1,6 +1,6 @@ Name: koffice Version: 1.4.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: A free, integrated office suite for KDE Group: Applications/Productivity @@ -738,6 +738,10 @@ %{_datadir}/servicetypes/kofilter*.desktop %changelog +* Wed Sep 28 2005 Andreas Bierfert +1.4.1-5 +- rebuild + * Tue Aug 16 2005 Andreas Bierfert 1.4.1-4 - fix libpqxx detection on x86_64 From fedora-extras-commits at redhat.com Wed Sep 28 09:37:58 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Wed, 28 Sep 2005 05:37:58 -0400 Subject: rpms/koffice/devel koffice-qt3.3.5.patch, NONE, 1.1 koffice.spec, 1.8, 1.9 Message-ID: <200509280937.j8S9bwlS026514@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/koffice/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26492 Modified Files: koffice.spec Added Files: koffice-qt3.3.5.patch Log Message: - add patch for qt-3.3.5 problem koffice-qt3.3.5.patch: --- NEW FILE koffice-qt3.3.5.patch --- --- kpresenter/imageEffectBase.ui.orig 2005-09-28 11:33:34.000000000 +0200 +++ kpresenter/imageEffectBase.ui 2005-09-28 11:34:08.000000000 +0200 @@ -1461,20 +1461,5 @@ kcolorbutton.h - kdoublenuminput.h - kcolorbutton.h - kcolorbutton.h - kdoublenuminput.h - kdoublenuminput.h - kdoublenuminput.h - kdoublenuminput.h - kdoublenuminput.h - kdoublenuminput.h - kdoublenuminput.h - kdoublenuminput.h - kdoublenuminput.h - kdoublenuminput.h - kdoublenuminput.h - kdoublenuminput.h Index: koffice.spec =================================================================== RCS file: /cvs/extras/rpms/koffice/devel/koffice.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- koffice.spec 27 Sep 2005 21:57:03 -0000 1.8 +++ koffice.spec 28 Sep 2005 09:37:56 -0000 1.9 @@ -1,6 +1,6 @@ Name: koffice Version: 1.4.1 -Release: 5%{?dist} +Release: 6%{?dist} Summary: A free, integrated office suite for KDE Group: Applications/Productivity @@ -12,6 +12,7 @@ # stuff for the build configuration Patch0: koffice-admin-gcc4isok.patch Patch1: koffice-admin-disable-fvisibility.patch +Patch2: koffice-qt3.3.5.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -193,6 +194,7 @@ %setup -q %patch0 -p1 %patch1 -p1 +%patch2 # this will make sure that patch0 and patch1 are considered make -f admin/Makefile.common @@ -738,6 +740,10 @@ %{_datadir}/servicetypes/kofilter*.desktop %changelog +* Wed Sep 28 2005 Andreas Bierfert +1.4.1-6 +- add patch for qt-3.3.5 problem + * Tue Sep 27 2005 Andreas Bierfert 1.4.1-5 - try to fix devel build From fedora-extras-commits at redhat.com Wed Sep 28 09:43:35 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Wed, 28 Sep 2005 05:43:35 -0400 Subject: rpms/synce/devel synce.spec,1.9,1.10 Message-ID: <200509280943.j8S9hZ1K026600@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/synce/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26581 Modified Files: synce.spec Log Message: - add nother fix Index: synce.spec =================================================================== RCS file: /cvs/extras/rpms/synce/devel/synce.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- synce.spec 28 Sep 2005 06:30:04 -0000 1.9 +++ synce.spec 28 Sep 2005 09:43:33 -0000 1.10 @@ -90,7 +90,7 @@ --with-libmimedir-lib="${MIMEDIRLIB}" \ --disable-static # don't want stack protector on this one -%{__perl} -pi -e 's/-fstack-protector/-fno-stack-protector/;' \ +%{__perl} -pi -e 's/-fstack-protector/-fno-stack-protector -lgcc/;' \ Makefile src/Makefile lib/Makefile man/Makefile make LDFLAGS="-L${SYNCEINC} -L${RAPI2INC} -L${MIMEDIRLIB}" From fedora-extras-commits at redhat.com Wed Sep 28 09:50:10 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Wed, 28 Sep 2005 05:50:10 -0400 Subject: rpms/synce/devel synce.spec,1.10,1.11 Message-ID: <200509280950.j8S9oAJr026691@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/synce/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26672 Modified Files: synce.spec Log Message: - see if this works Index: synce.spec =================================================================== RCS file: /cvs/extras/rpms/synce/devel/synce.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- synce.spec 28 Sep 2005 09:43:33 -0000 1.10 +++ synce.spec 28 Sep 2005 09:50:07 -0000 1.11 @@ -90,10 +90,10 @@ --with-libmimedir-lib="${MIMEDIRLIB}" \ --disable-static # don't want stack protector on this one -%{__perl} -pi -e 's/-fstack-protector/-fno-stack-protector -lgcc/;' \ +%{__perl} -pi -e 's/-fstack-protector/-fno-stack-protector/;' \ Makefile src/Makefile lib/Makefile man/Makefile -make LDFLAGS="-L${SYNCEINC} -L${RAPI2INC} -L${MIMEDIRLIB}" +make LDFLAGS="-L${SYNCEINC} -L${RAPI2INC} -L${MIMEDIRLIB} -lgcc" cd .. # build the serial support cd synce-serial-%{version} From fedora-extras-commits at redhat.com Wed Sep 28 10:09:29 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Wed, 28 Sep 2005 06:09:29 -0400 Subject: rpms/koffice/devel koffice-qt3.3.5.patch,1.1,1.2 Message-ID: <200509281009.j8SA9ggB028186@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/koffice/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28133 Modified Files: koffice-qt3.3.5.patch Log Message: - more qt fixes koffice-qt3.3.5.patch: Index: koffice-qt3.3.5.patch =================================================================== RCS file: /cvs/extras/rpms/koffice/devel/koffice-qt3.3.5.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- koffice-qt3.3.5.patch 28 Sep 2005 09:37:56 -0000 1.1 +++ koffice-qt3.3.5.patch 28 Sep 2005 10:09:27 -0000 1.2 @@ -21,3 +21,13 @@ - kdoublenuminput.h +--- krita/ui/widgets/kis_wdg_autogradient.ui.orig 2005-09-28 12:07:25.000000000 +0200 ++++ krita/ui/widgets/kis_wdg_autogradient.ui 2005-09-28 12:07:44.000000000 +0200 +@@ -406,7 +406,6 @@ + + + +- kisgradientsliderwidget.h + kcolorbutton.h + kcolorbutton.h + From fedora-extras-commits at redhat.com Wed Sep 28 10:22:27 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Wed, 28 Sep 2005 06:22:27 -0400 Subject: rpms/synce/devel synce.spec,1.11,1.12 Message-ID: <200509281022.j8SAMRK4028312@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/synce/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28293 Modified Files: synce.spec Log Message: - try to fix hidden symbol error Index: synce.spec =================================================================== RCS file: /cvs/extras/rpms/synce/devel/synce.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- synce.spec 28 Sep 2005 09:50:07 -0000 1.11 +++ synce.spec 28 Sep 2005 10:22:24 -0000 1.12 @@ -46,7 +46,7 @@ # build libsynce cd synce-libsynce-%{version} %configure --disable-static -make +make LDFLAGS="-lgcc" SYNCEINC="$(pwd)/lib" SYNCELIB="$(pwd)/lib/.libs" cd .. @@ -56,7 +56,7 @@ --with-libsynce-include="${SYNCEINC}" \ --with-libsynce-lib="${SYNCELIB}" \ --disable-static -make LDFLAGS="-L${SYNCEINC}" +make LDFLAGS="-L${SYNCEINC} -lgcc" cd .. # build librapi2 cd synce-librapi2-%{version} @@ -64,7 +64,7 @@ --with-libsynce-include="${SYNCEINC}" \ --with-libsynce-lib="${SYNCELIB}" \ --disable-static -make LDFLAGS="-L${SYNCEINC}" +make LDFLAGS="-L${SYNCEINC} -lgcc" RAPI2INC="$(pwd)/src" RAPI2LIB="$(pwd)/src/.libs" cd .. From rc040203 at freenet.de Wed Sep 28 11:16:01 2005 From: rc040203 at freenet.de (Ralf Corsepius) Date: Wed, 28 Sep 2005 13:16:01 +0200 Subject: rpms/synce/devel synce.spec,1.11,1.12 In-Reply-To: <200509281022.j8SAMRK4028312@cvs-int.fedora.redhat.com> References: <200509281022.j8SAMRK4028312@cvs-int.fedora.redhat.com> Message-ID: <1127906161.25763.196.camel@mccallum.corsepiu.local> On Wed, 2005-09-28 at 06:22 -0400, Andreas Bierfert wrote: > Author: awjb > > Update of /cvs/extras/rpms/synce/devel > In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28293 > > Modified Files: > synce.spec > Log Message: > - try to fix hidden symbol error > > > > Index: synce.spec > =================================================================== > RCS file: /cvs/extras/rpms/synce/devel/synce.spec,v > retrieving revision 1.11 > retrieving revision 1.12 > diff -u -r1.11 -r1.12 > --- synce.spec 28 Sep 2005 09:50:07 -0000 1.11 > +++ synce.spec 28 Sep 2005 10:22:24 -0000 1.12 > @@ -46,7 +46,7 @@ > # build libsynce > cd synce-libsynce-%{version} > %configure --disable-static > -make > +make LDFLAGS="-lgcc" Urgh - Are you serious about this? I don't know why this package needs this, but in general -lgcc is _never_ correct and indicates very serious problems inside of the package. Ralf From fedora-extras-commits at redhat.com Wed Sep 28 11:24:44 2005 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Wed, 28 Sep 2005 07:24:44 -0400 Subject: rpms/fish/devel .cvsignore, 1.3, 1.4 fish.spec, 1.4, 1.5 sources, 1.3, 1.4 Message-ID: <200509281124.j8SBOi2x029933@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/rpms/fish/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29910 Modified Files: .cvsignore fish.spec sources Log Message: * Import new fish release. Axel wanted me to do so... Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/fish/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 16 Jul 2005 05:08:26 -0000 1.3 +++ .cvsignore 28 Sep 2005 11:24:42 -0000 1.4 @@ -1 +1 @@ -fish-1.12.0.tar.bz2 +fish-1.14.0.tar.bz2 Index: fish.spec =================================================================== RCS file: /cvs/extras/rpms/fish/devel/fish.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- fish.spec 16 Jul 2005 05:08:26 -0000 1.4 +++ fish.spec 28 Sep 2005 11:24:42 -0000 1.5 @@ -1,7 +1,7 @@ Summary: A friendly interactive shell Name: fish -Version: 1.12.0 +Version: 1.14.0 Release: 1%{?dist} License: GPL @@ -54,6 +54,8 @@ %_mandir/man1/tokenize.1* %_mandir/man1/count.1* %attr(0755,root,root) %_bindir/fish +%attr(0755,root,root) %_bindir/fishd +%attr(0755,root,root) %_bindir/fish_pager %attr(0755,root,root) %_bindir/xsel %attr(0755,root,root) %_bindir/set_color %attr(0755,root,root) %_bindir/tokenize @@ -63,8 +65,34 @@ %config %_sysconfdir/fish_inputrc %dir %_sysconfdir/fish.d %config %_sysconfdir/fish.d/fish_*.fish +%dir %_sysconfdir/fish.d/completions +%config %_sysconfdir/fish.d/completions/*.fish %changelog +* Sat Sep 24 2005 Axel Liljencrantz 1.14.0-0 +- 1.14.0 + +* Mon Sep 12 2005 Axel Liljencrantz 1.13.4-0 +- 1.13.4 + +* Wed Sep 07 2005 Axel Liljencrantz 1.13.3-0 +- 1.13.3 + +* Tue Sep 06 2005 Axel Liljencrantz 1.13.2-0 +- 1.13.2 + +* Fri Aug 30 2005 Axel Liljencrantz 1.13.1-0 +- 1.13.1 + +* Sun Aug 28 2005 Axel Liljencrantz 1.13.0-0 +- 1.13.0 + +* Sat Aug 13 2005 Axel Liljencrantz 1.13.0-0 +- Add completions subdirectory + +* Thu Jul 28 2005 Axel Liljencrantz 1.12.1-0 +- 1.12.1 + * Fri Jul 15 2005 Axel Liljencrantz 1.12.0-1 - 1.12.0 Index: sources =================================================================== RCS file: /cvs/extras/rpms/fish/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 16 Jul 2005 05:08:26 -0000 1.3 +++ sources 28 Sep 2005 11:24:42 -0000 1.4 @@ -1 +1 @@ -8980e6dd1a41d699a44c2579c9b1e36c fish-1.12.0.tar.bz2 +c1a1fd6b6a31e9ff93aa916f910d1692 fish-1.14.0.tar.bz2 From fedora-extras-commits at redhat.com Wed Sep 28 11:26:38 2005 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Wed, 28 Sep 2005 07:26:38 -0400 Subject: rpms/fish/FC-4 .cvsignore, 1.3, 1.4 fish.spec, 1.4, 1.5 sources, 1.3, 1.4 Message-ID: <200509281126.j8SBQcqk030015@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/rpms/fish/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29992 Modified Files: .cvsignore fish.spec sources Log Message: * Import new fish release. Axel wanted me to do so... Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/fish/FC-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 26 Jul 2005 17:23:45 -0000 1.3 +++ .cvsignore 28 Sep 2005 11:26:36 -0000 1.4 @@ -1 +1 @@ -fish-1.12.0.tar.bz2 +fish-1.14.0.tar.bz2 Index: fish.spec =================================================================== RCS file: /cvs/extras/rpms/fish/FC-4/fish.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- fish.spec 26 Jul 2005 17:23:45 -0000 1.4 +++ fish.spec 28 Sep 2005 11:26:36 -0000 1.5 @@ -1,7 +1,7 @@ Summary: A friendly interactive shell Name: fish -Version: 1.12.0 +Version: 1.14.0 Release: 1%{?dist} License: GPL @@ -54,6 +54,8 @@ %_mandir/man1/tokenize.1* %_mandir/man1/count.1* %attr(0755,root,root) %_bindir/fish +%attr(0755,root,root) %_bindir/fishd +%attr(0755,root,root) %_bindir/fish_pager %attr(0755,root,root) %_bindir/xsel %attr(0755,root,root) %_bindir/set_color %attr(0755,root,root) %_bindir/tokenize @@ -63,11 +65,41 @@ %config %_sysconfdir/fish_inputrc %dir %_sysconfdir/fish.d %config %_sysconfdir/fish.d/fish_*.fish +%dir %_sysconfdir/fish.d/completions +%config %_sysconfdir/fish.d/completions/*.fish %changelog +* Sat Sep 24 2005 Axel Liljencrantz 1.14.0-0 +- 1.14.0 + +* Mon Sep 12 2005 Axel Liljencrantz 1.13.4-0 +- 1.13.4 + +* Wed Sep 07 2005 Axel Liljencrantz 1.13.3-0 +- 1.13.3 + +* Tue Sep 06 2005 Axel Liljencrantz 1.13.2-0 +- 1.13.2 + +* Fri Aug 30 2005 Axel Liljencrantz 1.13.1-0 +- 1.13.1 + +* Sun Aug 28 2005 Axel Liljencrantz 1.13.0-0 +- 1.13.0 + +* Sat Aug 13 2005 Axel Liljencrantz 1.13.0-0 +- Add completions subdirectory + +* Thu Jul 28 2005 Axel Liljencrantz 1.12.1-0 +- 1.12.1 + * Fri Jul 15 2005 Axel Liljencrantz 1.12.0-1 - 1.12.0 +* Fri Jul 01 2005 Oliver Falk - 1.11.1-10 +- Added dist macro to the release +- Small spec beautifying + * Thu Jun 30 2005 Michael Schwendt 1.11.1-9 - Set CFLAGS the proper way Index: sources =================================================================== RCS file: /cvs/extras/rpms/fish/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 26 Jul 2005 17:23:45 -0000 1.3 +++ sources 28 Sep 2005 11:26:36 -0000 1.4 @@ -1 +1 @@ -8980e6dd1a41d699a44c2579c9b1e36c fish-1.12.0.tar.bz2 +c1a1fd6b6a31e9ff93aa916f910d1692 fish-1.14.0.tar.bz2 From fedora-extras-commits at redhat.com Wed Sep 28 11:27:24 2005 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Wed, 28 Sep 2005 07:27:24 -0400 Subject: rpms/fish/FC-3 .cvsignore, 1.3, 1.4 fish.spec, 1.4, 1.5 sources, 1.3, 1.4 Message-ID: <200509281127.j8SBROmE030087@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/rpms/fish/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30064 Modified Files: .cvsignore fish.spec sources Log Message: * Import new fish release. Axel wanted me to do so... Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/fish/FC-3/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 26 Jul 2005 17:22:46 -0000 1.3 +++ .cvsignore 28 Sep 2005 11:27:22 -0000 1.4 @@ -1 +1 @@ -fish-1.12.0.tar.bz2 +fish-1.14.0.tar.bz2 Index: fish.spec =================================================================== RCS file: /cvs/extras/rpms/fish/FC-3/fish.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- fish.spec 26 Jul 2005 17:22:46 -0000 1.4 +++ fish.spec 28 Sep 2005 11:27:22 -0000 1.5 @@ -1,7 +1,7 @@ Summary: A friendly interactive shell Name: fish -Version: 1.12.0 +Version: 1.14.0 Release: 1%{?dist} License: GPL @@ -54,6 +54,8 @@ %_mandir/man1/tokenize.1* %_mandir/man1/count.1* %attr(0755,root,root) %_bindir/fish +%attr(0755,root,root) %_bindir/fishd +%attr(0755,root,root) %_bindir/fish_pager %attr(0755,root,root) %_bindir/xsel %attr(0755,root,root) %_bindir/set_color %attr(0755,root,root) %_bindir/tokenize @@ -63,11 +65,41 @@ %config %_sysconfdir/fish_inputrc %dir %_sysconfdir/fish.d %config %_sysconfdir/fish.d/fish_*.fish +%dir %_sysconfdir/fish.d/completions +%config %_sysconfdir/fish.d/completions/*.fish %changelog +* Sat Sep 24 2005 Axel Liljencrantz 1.14.0-0 +- 1.14.0 + +* Mon Sep 12 2005 Axel Liljencrantz 1.13.4-0 +- 1.13.4 + +* Wed Sep 07 2005 Axel Liljencrantz 1.13.3-0 +- 1.13.3 + +* Tue Sep 06 2005 Axel Liljencrantz 1.13.2-0 +- 1.13.2 + +* Fri Aug 30 2005 Axel Liljencrantz 1.13.1-0 +- 1.13.1 + +* Sun Aug 28 2005 Axel Liljencrantz 1.13.0-0 +- 1.13.0 + +* Sat Aug 13 2005 Axel Liljencrantz 1.13.0-0 +- Add completions subdirectory + +* Thu Jul 28 2005 Axel Liljencrantz 1.12.1-0 +- 1.12.1 + * Fri Jul 15 2005 Axel Liljencrantz 1.12.0-1 - 1.12.0 +* Fri Jul 01 2005 Oliver Falk - 1.11.1-10 +- Added dist macro to the release +- Small spec beautifying + * Thu Jun 30 2005 Michael Schwendt 1.11.1-9 - Set CFLAGS the proper way Index: sources =================================================================== RCS file: /cvs/extras/rpms/fish/FC-3/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 26 Jul 2005 17:22:46 -0000 1.3 +++ sources 28 Sep 2005 11:27:22 -0000 1.4 @@ -1 +1 @@ -8980e6dd1a41d699a44c2579c9b1e36c fish-1.12.0.tar.bz2 +c1a1fd6b6a31e9ff93aa916f910d1692 fish-1.14.0.tar.bz2 From fedora-extras-commits at redhat.com Wed Sep 28 11:34:17 2005 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Wed, 28 Sep 2005 07:34:17 -0400 Subject: rpms/bigloo - New directory Message-ID: <200509281134.j8SBYHVT030227@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/bigloo In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30203/bigloo Log Message: Directory /cvs/extras/rpms/bigloo added to the repository From fedora-extras-commits at redhat.com Wed Sep 28 11:34:17 2005 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Wed, 28 Sep 2005 07:34:17 -0400 Subject: rpms/bigloo/devel - New directory Message-ID: <200509281134.j8SBYHGZ030232@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/bigloo/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30203/bigloo/devel Log Message: Directory /cvs/extras/rpms/bigloo/devel added to the repository From fedora-extras-commits at redhat.com Wed Sep 28 11:34:49 2005 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Wed, 28 Sep 2005 07:34:49 -0400 Subject: rpms/bigloo Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200509281134.j8SBYn2A030277@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/bigloo In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30248 Added Files: Makefile import.log Log Message: Setup of module bigloo --- NEW FILE Makefile --- # Top level Makefile for module bigloo all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Wed Sep 28 11:34:49 2005 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Wed, 28 Sep 2005 07:34:49 -0400 Subject: rpms/bigloo/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200509281134.j8SBYnHT030282@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/bigloo/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30248/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module bigloo --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Wed Sep 28 11:52:57 2005 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Wed, 28 Sep 2005 07:52:57 -0400 Subject: rpms/bigloo import.log,1.1,1.2 Message-ID: <200509281153.j8SBrRsm030488@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/bigloo In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30449 Modified Files: import.log Log Message: auto-import bigloo-2.6f-1 on branch devel from bigloo-2.6f-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/bigloo/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 28 Sep 2005 11:34:46 -0000 1.1 +++ import.log 28 Sep 2005 11:52:55 -0000 1.2 @@ -0,0 +1 @@ +bigloo-2_6f-1:HEAD:bigloo-2.6f-1.src.rpm:1127908365 From fedora-extras-commits at redhat.com Wed Sep 28 11:52:57 2005 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Wed, 28 Sep 2005 07:52:57 -0400 Subject: rpms/bigloo/devel bigloo.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200509281152.j8SBqv9b030481@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/bigloo/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30449/devel Modified Files: .cvsignore sources Added Files: bigloo.spec Log Message: auto-import bigloo-2.6f-1 on branch devel from bigloo-2.6f-1.src.rpm --- NEW FILE bigloo.spec --- Name: bigloo Version: 2.6f Release: 1%{?dist} Summary: Bigloo is compiler for the Scheme programming language Group: Development/Languages License: GPL URL: http://www-sop.inria.fr/mimosa/fp/Bigloo Source: ftp://ftp-sop.inria.fr/mimosa/fp/Bigloo/bigloo2.6f.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: emacs, emacs-el, xemacs, xemacs-el, /sbin/install-info Requires: bigloo-libs = %{version}-%{release} Requires(post): /sbin/install-info Requires(postun): /sbin/install-info %description Bigloo is a Scheme implementation devoted to one goal: enabling Scheme based programming style where C(++) is usually required. Bigloo attempts to make Scheme practical by offering features usually presented by traditional programming languages but ot offered by Scheme and functional programming. Bigloo compiles Scheme modules. It delivers small and fast stand alone binary executables. Bigloo enables full connections between Scheme and C programs. %package libs Summary: Bigloo runtime libraries Group: System Environment/Libraries %description libs Runtime libraries for Bigloo compiled programs. %package doc Summary: Bigloo documentation Group: Development/Languages %description doc Documentation for the Bigloo compiler and integrated development environment. %package emacs Summary: Bigloo Emacs environment Group: Development/Languages Requires: emacs-common %description emacs Emacs development environment for Bigloo %package xemacs Summary: Bigloo XEmacs environment Group: Development/Languages Requires: xemacs-common %description xemacs XEmacs development environment for Bigloo %prep %setup -q -n %{name}%{version} perl -pi -e 's|bmask=755|bmask=644|' configure %build %define emacslisppath %{_datadir}/emacs/site-lisp %define xemacslisppath %{_datadir}/xemacs/site-packages/lisp %define inplace `pwd`/inplace ./configure \ --prefix=%{_prefix} \ --bindir=%{_bindir} \ --libdir=%{_libdir} \ --mandir=%{_mandir}/man1 \ --infodir=%{_infodir} \ --docdir=%{_docdir} \ --lispdir=%{emacslisppath}/bigloo \ --bee=full \ --native-default-backend \ --emacs=emacs \ %{?_with_java: --jvm=yes} %{!?_with_java: --jvm=no} \ %{?_with_mono: --dotnet=yes --mono} \ %{?_with_pnet: --dotnet=yes --pnet} \ --sharedbde=yes \ --sharedcompiler=yes \ --coflags="$RPM_OPT_FLAGS" perl -pi -e 's|EMACSBRAND=.*|EMACSBRAND=emacs21|' Makefile.config # _smp_mflags breaks the build make env LD_LIBRARY_PATH=`pwd`/lib/%{version} \ make DESTDIR=%{inplace} install env LD_LIBRARY_PATH=%{inplace}%{_libdir} \ BIGLOOLIB=%{inplace}%{_libdir}/bigloo/%{version} \ make compile-bee %install rm -rf $RPM_BUILD_ROOT env LD_LIBRARY_PATH=`pwd`/lib/%{version} \ make DESTDIR=$RPM_BUILD_ROOT install env LD_LIBRARY_PATH=`pwd`/lib/%{version} \ make DESTDIR=$RPM_BUILD_ROOT EMACSDIR=$RPM_BUILD_ROOT%{emacslisppath}/bigloo install-bee make -C manuals DESTDIR=$RPM_BUILD_ROOT install-bee chmod 755 $RPM_BUILD_ROOT%{_bindir}/* ( cd $RPM_BUILD_ROOT%{_libdir} chmod 755 bigloo/%{version}/*.so rm -f *.so mv bigloo/%{version}/*.so . (cd bigloo/%{version}; ln -sf ../../*.so .) ) rm -fr $RPM_BUILD_ROOT%{_infodir}/dir rm -fr $RPM_BUILD_ROOT%{_datadir}/doc perl -pi -e 's|^BOOTBINDIR=.*|BOOTBINDIR=%{_bindir}|' Makefile.config mkdir -p $RPM_BUILD_ROOT%{emacslisppath}/site-start.d cat > $RPM_BUILD_ROOT%{emacslisppath}/site-start.d/bigloo.el < $RPM_BUILD_ROOT%{xemacslisppath}/site-start.d/bigloo.el </dev/null || : %postun if [ $1 = 0 ]; then /sbin/install-info --delete %{_infodir}/bigloo.info %{_infodir}/dir 2>/dev/null || : fi %post libs -p /sbin/ldconfig %postun libs -p /sbin/ldconfig %files %defattr(-,root,root,-) %{_bindir}/* %{_libdir}/bigloo %{_infodir}/* %{_mandir}/man*/* %doc Makefile.config examples LICENSE COPYING %doc README* %doc tutorial %files emacs %defattr(-,root,root,-) %{emacslisppath}/bigloo %{emacslisppath}/site-start.d/bigloo.el %files xemacs %defattr(-,root,root,-) %{xemacslisppath}/bigloo %{xemacslisppath}/site-start.d/bigloo.el %files libs %defattr(-,root,root,-) %{_libdir}/lib*.so %files doc %defattr(-,root,root,-) %doc manuals/*.html %changelog * Tue Sep 27 2005 Gerard Milmeister - 2.6f-3 - Removed --arch * Fri Feb 18 2005 Gerard Milmeister - 0:2.6f-1 - New Version 2.6f * Sun Feb 13 2005 Gerard Milmeister - 0:2.6e-1 - New Version 2.6e * Tue Mar 16 2004 Gerard Milmeister - 0:2.6-0.fdr.1.c - New Version 2.6c - Separated Emacs and XEmacs packages * Tue Dec 16 2003 Gerard Milmeister - 0:2.6-0.fdr.1.b - New Version 2.6b * Thu Nov 27 2003 Gerard Milmeister - 0:2.6-0.fdr.1.a - First Fedora release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/bigloo/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 28 Sep 2005 11:34:47 -0000 1.1 +++ .cvsignore 28 Sep 2005 11:52:55 -0000 1.2 @@ -0,0 +1 @@ +bigloo2.6f.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/bigloo/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 28 Sep 2005 11:34:47 -0000 1.1 +++ sources 28 Sep 2005 11:52:55 -0000 1.2 @@ -0,0 +1 @@ +bc99b1919adee864dd371aeebc36862c bigloo2.6f.tar.gz From fedora-extras-commits at redhat.com Wed Sep 28 12:29:42 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Wed, 28 Sep 2005 08:29:42 -0400 Subject: rpms/perl-Class-Autouse/devel .cvsignore, 1.2, 1.3 perl-Class-Autouse.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200509281229.j8SCTg9H032089@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-Class-Autouse/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32066 Modified Files: .cvsignore perl-Class-Autouse.spec sources Log Message: Update Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Class-Autouse/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 15 Sep 2005 03:49:33 -0000 1.2 +++ .cvsignore 28 Sep 2005 12:29:40 -0000 1.3 @@ -1 +1 @@ -Class-Autouse-1.20.tar.gz +Class-Autouse-1.21.tar.gz Index: perl-Class-Autouse.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Class-Autouse/devel/perl-Class-Autouse.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-Class-Autouse.spec 15 Sep 2005 03:54:30 -0000 1.2 +++ perl-Class-Autouse.spec 28 Sep 2005 12:29:40 -0000 1.3 @@ -1,6 +1,6 @@ Name: perl-Class-Autouse -Version: 1.20 -Release: 2%{?dist} +Version: 1.21 +Release: 1%{?dist} Summary: Run-time class loading on first method call License: GPL or Artistic Group: Development/Libraries @@ -12,7 +12,7 @@ BuildArch: noarch BuildRequires: perl(Test::More) >= 0.47 -BuildRequires: perl(Carp) >= 1.03 +BuildRequires: perl(Carp) BuildRequires: perl(File::Spec) >= 0.82 BuildRequires: perl(List::Util) >= 1.11 @@ -53,6 +53,10 @@ %{_mandir}/man3/* %changelog +* Wed Sep 28 2005 Ralf Corsepius - 1.21-1 +- Upstream update. +- Fix bogus dep on perl(Carp). + * Thu Sep 15 2005 Ralf Corsepius - 1.20-2 - Spec cleanup. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Class-Autouse/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 15 Sep 2005 03:49:33 -0000 1.2 +++ sources 28 Sep 2005 12:29:40 -0000 1.3 @@ -1 +1 @@ -746a4f415dd8c7267bcec07841022275 Class-Autouse-1.20.tar.gz +3bf4fadd8349e57d6af0961b6565c74f Class-Autouse-1.21.tar.gz From fedora-extras-commits at redhat.com Wed Sep 28 13:02:00 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 28 Sep 2005 09:02:00 -0400 Subject: rpms/sbcl/FC-4 sbcl.spec,1.16,1.17 Message-ID: <200509281302.j8SD20YW001115@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/sbcl/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1096 Modified Files: sbcl.spec Log Message: * Wed Sep 28 2005 Rex Dieter 0.9.5-9 - more ppc work Index: sbcl.spec =================================================================== RCS file: /cvs/extras/rpms/sbcl/FC-4/sbcl.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- sbcl.spec 28 Sep 2005 01:23:45 -0000 1.16 +++ sbcl.spec 28 Sep 2005 13:01:58 -0000 1.17 @@ -3,14 +3,15 @@ Name: sbcl Summary: Steel Bank Common Lisp Version: 0.9.5 -Release: 8%{?dist} +Release: 9%{?dist} License: BSD/MIT Group: Development/Languages URL: http://sbcl.sourceforge.net/ Source0: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-%{version}-source.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -ExclusiveArch: %{ix86} x86_64 +#ExclusiveArch: %{ix86} x86_64 +ExclusiveArch: ppc ## x86 section #Source10: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.4-x86-linux-binary.tar.bz2 @@ -31,7 +32,7 @@ ## ppc section # Latest powerpc-linux bootstrap, busted: # buildsys.fedoraproject.org/logs/development/1131-sbcl-0.9.4-14.fc5/ppc/build.log -#Source30: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.8.15-powerpc-linux-binary.tar.bz2 +Source30: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.8.15-powerpc-linux-binary.tar.bz2 # another possible ppc bootstrap to try #Source31: http://clozure.com/openmcl/ftp/openmcl-linuxppc-all-0.14.3.tar.gz %ifarch ppc @@ -165,6 +166,9 @@ %changelog +* Wed Sep 28 2005 Rex Dieter 0.9.5-9 +- more ppc work + * Tue Sep 27 2005 Rex Dieter 0.9.5-8 - respin (fc3/fc4) From fedora-extras-commits at redhat.com Wed Sep 28 14:16:50 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 28 Sep 2005 10:16:50 -0400 Subject: rpms/sbcl/FC-4 customize-target-features.lisp, NONE, 1.1 sbcl-0.9.5-make-config-fix.patch, NONE, 1.1 sbcl.spec, 1.17, 1.18 Message-ID: <200509281416.j8SEGoGd002776@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/sbcl/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2753 Modified Files: sbcl.spec Added Files: customize-target-features.lisp sbcl-0.9.5-make-config-fix.patch Log Message: customize-target-features.lisp (for :sb-thread) make-config.sh patch to properly find Config --- NEW FILE customize-target-features.lisp --- (lambda (features) (flet ((enable (x) (pushnew x features)) (disable (x) (setf features (remove x features)))) ;; Threading support, available on x86/x86-64 Linux only. (enable :sb-thread))) sbcl-0.9.5-make-config-fix.patch: --- NEW FILE sbcl-0.9.5-make-config-fix.patch --- --- sbcl-0.9.5/make-config.sh.fix 2005-09-21 10:00:33.000000000 -0500 +++ sbcl-0.9.5/make-config.sh 2005-09-28 09:00:48.000000000 -0500 @@ -208,7 +208,7 @@ # cross-compilers! # # FIXME: integrate to grovel-features, mayhaps - $GNUMAKE -C tools-for-build determine-endianness -I src/runtime + $GNUMAKE -C tools-for-build determine-endianness -I ../src/runtime tools-for-build/determine-endianness >> $ltf elif [ "$sbcl_arch" = "ppc" -a "$sbcl_os" = "linux" ]; then # Use a C program to detect which kind of glibc we're building on, @@ -217,7 +217,7 @@ # # FIXME: integrate to grovel-features., maypahps printf ' :stack-allocatable-closures' >> $ltf - $GNUMAKE -C tools-for-build where-is-mcontext -I src/runtime + $GNUMAKE -C tools-for-build where-is-mcontext -I ../src/runtime tools-for-build/where-is-mcontext > src/runtime/ppc-linux-mcontext.h elif [ "$sbcl_arch" = "ppc" -a "$sbcl_os" = "darwin" ]; then printf ' :stack-allocatable-closures' >> $ltf Index: sbcl.spec =================================================================== RCS file: /cvs/extras/rpms/sbcl/FC-4/sbcl.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- sbcl.spec 28 Sep 2005 13:01:58 -0000 1.17 +++ sbcl.spec 28 Sep 2005 14:16:48 -0000 1.18 @@ -3,7 +3,7 @@ Name: sbcl Summary: Steel Bank Common Lisp Version: 0.9.5 -Release: 9%{?dist} +Release: 10%{?dist} License: BSD/MIT Group: Development/Languages @@ -13,6 +13,8 @@ #ExclusiveArch: %{ix86} x86_64 ExclusiveArch: ppc +Source1: customize-target-features.lisp + ## x86 section #Source10: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.4-x86-linux-binary.tar.bz2 %ifarch %{ix86} @@ -48,6 +50,7 @@ Patch2: sbcl-0.9.5-personality.patch Patch3: sbcl-0.9.5-optflags.patch Patch4: sbcl-0.9.4-LIB_DIR.patch +Patch5: sbcl-0.9.5-make-config-fix.patch Requires(post): /sbin/install-info Requires(preun): /sbin/install-info @@ -70,17 +73,12 @@ %patch2 -p1 -b .personality %patch3 -p1 -b .optflags %patch4 -p1 -b .LIB_DIR +%patch5 -p1 -b .make-config-fix -# http://article.gmane.org/gmane.lisp.steel-bank.general/340 -# enable threads (was only for >= 2.6, but code has checks to disable for <= 2.4) -## FIXME(?): per section 2.2 of INSTALL, should create/use customize-target-features.lisp -## to customize features -- Rex -#define kernel_ver %(uname -r | cut -d- -f1 | cut -d. -f-2 ) -#if "%{?kernel_ver}" >= "2.6" %ifarch %{ix86} x86_64 #sed -i -e "s|; :sb-thread|:sb-thread|" base-target-features.lisp-expr +#cp %{SOURCE1} ./customize-target-features.lisp %endif -#endif %if "%{?sbcl_bootstrap_src}" != "%{nil}" mkdir sbcl-bootstrap @@ -166,7 +164,7 @@ %changelog -* Wed Sep 28 2005 Rex Dieter 0.9.5-9 +* Wed Sep 28 2005 Rex Dieter 0.9.5-10 - more ppc work * Tue Sep 27 2005 Rex Dieter 0.9.5-8 From fedora-extras-commits at redhat.com Wed Sep 28 14:21:56 2005 From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert)) Date: Wed, 28 Sep 2005 10:21:56 -0400 Subject: rpms/regexxer/devel regexxer.spec,1.1,1.2 Message-ID: <200509281421.j8SELuQZ002858@cvs-int.fedora.redhat.com> Author: cwickert Update of /cvs/extras/rpms/regexxer/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2839 Modified Files: regexxer.spec Log Message: rel 0.2 with additional changelog info Index: regexxer.spec =================================================================== RCS file: /cvs/extras/rpms/regexxer/devel/regexxer.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- regexxer.spec 28 Sep 2005 00:18:35 -0000 1.1 +++ regexxer.spec 28 Sep 2005 14:21:54 -0000 1.2 @@ -1,6 +1,6 @@ Name: regexxer Version: 0.8 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A nifty GUI search/replace tool Group: Applications/Text @@ -84,5 +84,9 @@ %changelog +* Wed Sep 23 2005 Christoph Wickert - 0.8-2 +- Removed hardcoded dependency on gconfmm26. +- Remoded duplicate BuildRequires gtkmm24-devel. + * Thu Sep 22 2005 Christoph Wickert - 0.8-1 - Initial RPM release. From fedora-extras-commits at redhat.com Wed Sep 28 14:47:50 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Wed, 28 Sep 2005 10:47:50 -0400 Subject: rpms/koffice/devel koffice-qt3.3.5.patch,1.2,1.3 Message-ID: <200509281447.j8SEloo8002981@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/koffice/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2958 Modified Files: koffice-qt3.3.5.patch Log Message: - more fixes koffice-qt3.3.5.patch: Index: koffice-qt3.3.5.patch =================================================================== RCS file: /cvs/extras/rpms/koffice/devel/koffice-qt3.3.5.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- koffice-qt3.3.5.patch 28 Sep 2005 10:09:27 -0000 1.2 +++ koffice-qt3.3.5.patch 28 Sep 2005 14:47:48 -0000 1.3 @@ -31,3 +31,14 @@ kcolorbutton.h kcolorbutton.h +--- krita/ui/kis_previewwidgetbase.ui.orig 2005-09-28 16:46:19.000000000 +0200 ++++ krita/ui/kis_previewwidgetbase.ui 2005-09-28 16:46:38.000000000 +0200 +@@ -201,8 +201,4 @@ + + + +- +- kispreviewview.h +- kispreviewview.h +- + From fedora-extras-commits at redhat.com Wed Sep 28 14:51:27 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Wed, 28 Sep 2005 10:51:27 -0400 Subject: rpms/libpqxx/FC-4 libpqxx.spec,1.3,1.4 Message-ID: <200509281451.j8SEpRLb003070@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/libpqxx/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3051 Modified Files: libpqxx.spec Log Message: - fix #169441 Index: libpqxx.spec =================================================================== RCS file: /cvs/extras/rpms/libpqxx/FC-4/libpqxx.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- libpqxx.spec 27 Sep 2005 20:54:43 -0000 1.3 +++ libpqxx.spec 28 Sep 2005 14:51:25 -0000 1.4 @@ -1,6 +1,6 @@ Name: libpqxx Version: 2.5.5 -Release: 4%{?dist} +Release: 5%{?dist} Summary: C++ client API for PostgreSQL Group: System Environment/Libraries @@ -30,9 +30,11 @@ %prep %setup -q +# Don't pull in extra crud when clients link +perl -pi.no-pqlibs -e 's|@POSTGRES_LIB@||' pqxx-config.in %build -%configure --enable-shared +%configure --enable-shared --disable-static # I hate rpath... ;) %{__perl} -pi -e 's/hardcode_into_libs=yes/hardcode_into_libs=no/;' \ libtool @@ -60,13 +62,15 @@ %files devel %doc README-UPGRADE %{_bindir}/pqxx-config -%{_libdir}/libpqxx.a %{_libdir}/libpqxx.so %{_includedir}/pqxx %{_libdir}/pkgconfig/libpqxx.pc %changelog -* Tue Sep 27 2005 Andreas Bierfert 2.5.5-1 +* Wed Sep 28 2005 Andreas Bierfert 2.5.5-5 +- fix #169441 + +* Tue Sep 27 2005 Andreas Bierfert 2.5.5-4 - version upgrade * Tue Jul 05 2005 Andreas Bierfert 2.5.4-4 From fedora-extras-commits at redhat.com Wed Sep 28 14:55:07 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Wed, 28 Sep 2005 10:55:07 -0400 Subject: rpms/libpqxx/devel libpqxx.spec,1.4,1.5 Message-ID: <200509281455.j8SEt7hD003137@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/libpqxx/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3118 Modified Files: libpqxx.spec Log Message: - fix #169441 Index: libpqxx.spec =================================================================== RCS file: /cvs/extras/rpms/libpqxx/devel/libpqxx.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- libpqxx.spec 27 Sep 2005 21:21:18 -0000 1.4 +++ libpqxx.spec 28 Sep 2005 14:55:05 -0000 1.5 @@ -1,6 +1,6 @@ Name: libpqxx Version: 2.5.5 -Release: 5%{?dist} +Release: 6%{?dist} Summary: C++ client API for PostgreSQL Group: System Environment/Libraries @@ -30,9 +30,11 @@ %prep %setup -q +# Don't pull in extra crud when clients link +perl -pi.no-pqlibs -e 's|@POSTGRES_LIB@||' pqxx-config.in %build -%configure --enable-shared --disable-thread-safety +%configure --enable-shared --disable-thread-safety --disable-static # I hate rpath... ;) %{__perl} -pi -e 's/hardcode_into_libs=yes/hardcode_into_libs=no/;' \ libtool @@ -60,12 +62,14 @@ %files devel %doc README-UPGRADE %{_bindir}/pqxx-config -%{_libdir}/libpqxx.a %{_libdir}/libpqxx.so %{_includedir}/pqxx %{_libdir}/pkgconfig/libpqxx.pc %changelog +* Wed Sep 28 2005 Andreas Bierfert 2.5.5-6 +- fix #169441 + * Tue Sep 27 2005 Andreas Bierfert 2.5.5-5 - try fc5 build From fedora-extras-commits at redhat.com Wed Sep 28 15:10:56 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 28 Sep 2005 11:10:56 -0400 Subject: rpms/sbcl/FC-4 sbcl-0.9.5-verbose-build.patch, NONE, 1.1 sbcl-0.9.4-LIB_DIR.patch, 1.2, 1.3 sbcl.spec, 1.18, 1.19 Message-ID: <200509281510.j8SFAujN004647@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/sbcl/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4618 Modified Files: sbcl-0.9.4-LIB_DIR.patch sbcl.spec Added Files: sbcl-0.9.5-verbose-build.patch Log Message: make build verbose, try to determine where failure(s) occur touchup LIB_DIR patch sbcl-0.9.5-verbose-build.patch: --- NEW FILE sbcl-0.9.5-verbose-build.patch --- --- sbcl-0.9.5/make.sh.verbose 2005-09-21 10:00:33.000000000 -0500 +++ sbcl-0.9.5/make.sh 2005-09-28 10:08:15.560262424 -0500 @@ -70,7 +70,7 @@ # If you're cross-compiling, you should probably just walk through the # make-config.sh script by hand doing the right thing on both the host # and target machines. -sh make-config.sh +sh -x make-config.sh # Enforce the source policy for no bogus whitespace tools-for-build/canonicalize-whitespace @@ -102,11 +102,11 @@ # Or, if you can set up the files somewhere shared (with NFS, AFS, or # whatever) between the host machine and the target machine, the basic # procedure above should still work, but you can skip the "copy" steps. -time sh make-host-1.sh -time sh make-target-1.sh -time sh make-host-2.sh -time sh make-target-2.sh -time sh make-target-contrib.sh +time sh -x make-host-1.sh +time sh -x make-target-1.sh +time sh -x make-host-2.sh +time sh -x make-target-2.sh +time sh -x make-target-contrib.sh NCONTRIBS=`find contrib -name Makefile -print | wc -l` NPASSED=`find contrib -name test-passed -print | wc -l` sbcl-0.9.4-LIB_DIR.patch: Index: sbcl-0.9.4-LIB_DIR.patch =================================================================== RCS file: /cvs/extras/rpms/sbcl/FC-4/sbcl-0.9.4-LIB_DIR.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sbcl-0.9.4-LIB_DIR.patch 13 Sep 2005 16:50:44 -0000 1.2 +++ sbcl-0.9.4-LIB_DIR.patch 28 Sep 2005 15:10:54 -0000 1.3 @@ -31,7 +31,7 @@ echo "SBCL has been installed:" echo " binary $BUILD_ROOT$INSTALL_ROOT/bin/sbcl" -echo " core and contribs in $BUILD_ROOT$INSTALL_ROOT/lib/sbcl/" -+echo " core and contribs in $BUILD_ROOT$LIB_DIR" ++echo " core and contribs in $BUILD_ROOT$LIB_DIR/sbcl" # Installing manual & misc bits of documentation # Index: sbcl.spec =================================================================== RCS file: /cvs/extras/rpms/sbcl/FC-4/sbcl.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- sbcl.spec 28 Sep 2005 14:16:48 -0000 1.18 +++ sbcl.spec 28 Sep 2005 15:10:54 -0000 1.19 @@ -3,7 +3,7 @@ Name: sbcl Summary: Steel Bank Common Lisp Version: 0.9.5 -Release: 10%{?dist} +Release: 11%{?dist} License: BSD/MIT Group: Development/Languages @@ -51,6 +51,7 @@ Patch3: sbcl-0.9.5-optflags.patch Patch4: sbcl-0.9.4-LIB_DIR.patch Patch5: sbcl-0.9.5-make-config-fix.patch +Patch6: sbcl-0.9.5-verbose-build.patch Requires(post): /sbin/install-info Requires(preun): /sbin/install-info @@ -74,6 +75,7 @@ %patch3 -p1 -b .optflags %patch4 -p1 -b .LIB_DIR %patch5 -p1 -b .make-config-fix +%patch6 -p1 -b .verbose-build %ifarch %{ix86} x86_64 #sed -i -e "s|; :sb-thread|:sb-thread|" base-target-features.lisp-expr @@ -164,7 +166,7 @@ %changelog -* Wed Sep 28 2005 Rex Dieter 0.9.5-10 +* Wed Sep 28 2005 Rex Dieter 0.9.5-11 - more ppc work * Tue Sep 27 2005 Rex Dieter 0.9.5-8 From fedora-extras-commits at redhat.com Wed Sep 28 15:59:02 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 28 Sep 2005 11:59:02 -0400 Subject: rpms/sbcl/FC-4 sbcl-0.9.5-stdlib_h.patch, NONE, 1.1 sbcl.spec, 1.19, 1.20 Message-ID: <200509281559.j8SFx246004791@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/sbcl/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4769 Modified Files: sbcl.spec Added Files: sbcl-0.9.5-stdlib_h.patch Log Message: try setarch -R, quiet gcc warnings. Last try for ppc sbcl-0.9.5-stdlib_h.patch: --- NEW FILE sbcl-0.9.5-stdlib_h.patch --- --- sbcl-0.9.5/tools-for-build/where-is-mcontext.c.stdlib_h 2005-07-14 15:24:19.000000000 -0500 +++ sbcl-0.9.5/tools-for-build/where-is-mcontext.c 2005-09-28 10:36:32.090350648 -0500 @@ -20,6 +20,7 @@ #include #include +#include #include int main (int argc, char *argv[]) { Index: sbcl.spec =================================================================== RCS file: /cvs/extras/rpms/sbcl/FC-4/sbcl.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- sbcl.spec 28 Sep 2005 15:10:54 -0000 1.19 +++ sbcl.spec 28 Sep 2005 15:59:00 -0000 1.20 @@ -3,7 +3,7 @@ Name: sbcl Summary: Steel Bank Common Lisp Version: 0.9.5 -Release: 11%{?dist} +Release: 12%{?dist} License: BSD/MIT Group: Development/Languages @@ -41,7 +41,7 @@ %define sbcl_arch ppc %define sbcl_bootstrap_src -a 30 BuildRequires: setarch -%define setarch setarch %{_target_cpu} +%define setarch setarch %{_target_cpu} -R %endif Source100: my_setarch.c @@ -52,12 +52,14 @@ Patch4: sbcl-0.9.4-LIB_DIR.patch Patch5: sbcl-0.9.5-make-config-fix.patch Patch6: sbcl-0.9.5-verbose-build.patch +Patch7: sbcl-0.9.5-stdlib_h.patch Requires(post): /sbin/install-info Requires(preun): /sbin/install-info # doc generation BuildRequires: ghostscript BuildRequires: texinfo +BuildRequires: time %description Steel Bank Common Lisp (SBCL) is a Open Source development environment @@ -76,6 +78,7 @@ %patch4 -p1 -b .LIB_DIR %patch5 -p1 -b .make-config-fix %patch6 -p1 -b .verbose-build +%patch7 -p1 -b .stdlib_h %ifarch %{ix86} x86_64 #sed -i -e "s|; :sb-thread|:sb-thread|" base-target-features.lisp-expr @@ -117,7 +120,12 @@ %check || : pushd tests +# Only x86 builds are expected to pass all +%ifarch %{ix86} x86_64 %{?setarch} sh ./run-tests.sh +%else +%{?setarch} sh ./run-tests.sh ||: +%endif popd @@ -166,7 +174,7 @@ %changelog -* Wed Sep 28 2005 Rex Dieter 0.9.5-11 +* Wed Sep 28 2005 Rex Dieter 0.9.5-12 - more ppc work * Tue Sep 27 2005 Rex Dieter 0.9.5-8 From fedora-extras-commits at redhat.com Wed Sep 28 16:23:19 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 28 Sep 2005 12:23:19 -0400 Subject: rpms/sbcl/FC-4 sbcl-0.9.5-verbose-build.patch, 1.1, 1.2 sbcl.spec, 1.20, 1.21 Message-ID: <200509281623.j8SGNJxZ006360@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/sbcl/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6336 Modified Files: sbcl-0.9.5-verbose-build.patch sbcl.spec Log Message: increase verbosity, try again sbcl-0.9.5-verbose-build.patch: Index: sbcl-0.9.5-verbose-build.patch =================================================================== RCS file: /cvs/extras/rpms/sbcl/FC-4/sbcl-0.9.5-verbose-build.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sbcl-0.9.5-verbose-build.patch 28 Sep 2005 15:10:54 -0000 1.1 +++ sbcl-0.9.5-verbose-build.patch 28 Sep 2005 16:23:17 -0000 1.2 @@ -1,11 +1,22 @@ +--- sbcl-0.9.5/make-config.sh.verbose 2005-09-21 10:00:33.000000000 -0500 ++++ sbcl-0.9.5/make-config.sh 2005-09-28 10:39:30.540222144 -0500 +@@ -218,7 +218,7 @@ + # FIXME: integrate to grovel-features., maypahps + printf ' :stack-allocatable-closures' >> $ltf + $GNUMAKE -C tools-for-build where-is-mcontext -I src/runtime +- tools-for-build/where-is-mcontext > src/runtime/ppc-linux-mcontext.h ++ tools-for-build/where-is-mcontext > src/runtime/ppc-linux-mcontext.h || echo "error running where-is-mcontext" + elif [ "$sbcl_arch" = "ppc" -a "$sbcl_os" = "darwin" ]; then + printf ' :stack-allocatable-closures' >> $ltf + # We provide a dlopen shim, so a little lie won't hurt --- sbcl-0.9.5/make.sh.verbose 2005-09-21 10:00:33.000000000 -0500 -+++ sbcl-0.9.5/make.sh 2005-09-28 10:08:15.560262424 -0500 ++++ sbcl-0.9.5/make.sh 2005-09-28 11:21:54.305511040 -0500 @@ -70,7 +70,7 @@ # If you're cross-compiling, you should probably just walk through the # make-config.sh script by hand doing the right thing on both the host # and target machines. -sh make-config.sh -+sh -x make-config.sh ++sh -x make-config.sh ||: # Enforce the source policy for no bogus whitespace tools-for-build/canonicalize-whitespace Index: sbcl.spec =================================================================== RCS file: /cvs/extras/rpms/sbcl/FC-4/sbcl.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- sbcl.spec 28 Sep 2005 15:59:00 -0000 1.20 +++ sbcl.spec 28 Sep 2005 16:23:17 -0000 1.21 @@ -3,7 +3,7 @@ Name: sbcl Summary: Steel Bank Common Lisp Version: 0.9.5 -Release: 12%{?dist} +Release: 13%{?dist} License: BSD/MIT Group: Development/Languages @@ -174,7 +174,7 @@ %changelog -* Wed Sep 28 2005 Rex Dieter 0.9.5-12 +* Wed Sep 28 2005 Rex Dieter 0.9.5-13 - more ppc work * Tue Sep 27 2005 Rex Dieter 0.9.5-8 From fedora-extras-commits at redhat.com Wed Sep 28 16:27:36 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 28 Sep 2005 12:27:36 -0400 Subject: rpms/libmcrypt - New directory Message-ID: <200509281627.j8SGRaUo006470@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/libmcrypt In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6450/libmcrypt Log Message: Directory /cvs/extras/rpms/libmcrypt added to the repository From fedora-extras-commits at redhat.com Wed Sep 28 16:27:36 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 28 Sep 2005 12:27:36 -0400 Subject: rpms/libmcrypt/devel - New directory Message-ID: <200509281627.j8SGRa0B006475@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/libmcrypt/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6450/libmcrypt/devel Log Message: Directory /cvs/extras/rpms/libmcrypt/devel added to the repository From fedora-extras-commits at redhat.com Wed Sep 28 16:27:56 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 28 Sep 2005 12:27:56 -0400 Subject: rpms/libmcrypt Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200509281627.j8SGRuoN006531@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/libmcrypt In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6496 Added Files: Makefile import.log Log Message: Setup of module libmcrypt --- NEW FILE Makefile --- # Top level Makefile for module libmcrypt all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Wed Sep 28 16:27:56 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 28 Sep 2005 12:27:56 -0400 Subject: rpms/libmcrypt/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200509281627.j8SGRuT7006536@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/libmcrypt/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6496/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module libmcrypt --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Wed Sep 28 16:28:33 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 28 Sep 2005 12:28:33 -0400 Subject: rpms/libmcrypt import.log,1.1,1.2 Message-ID: <200509281629.j8SGT37d006615@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/libmcrypt In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6569 Modified Files: import.log Log Message: auto-import libmcrypt-2.5.7-1 on branch devel from libmcrypt-2.5.7-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/libmcrypt/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 28 Sep 2005 16:27:54 -0000 1.1 +++ import.log 28 Sep 2005 16:28:31 -0000 1.2 @@ -0,0 +1 @@ +libmcrypt-2_5_7-1:HEAD:libmcrypt-2.5.7-1.src.rpm:1127924885 From fedora-extras-commits at redhat.com Wed Sep 28 16:28:33 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 28 Sep 2005 12:28:33 -0400 Subject: rpms/libmcrypt/devel libmcrypt-2.5.7-nolibltdl.patch, NONE, 1.1 libmcrypt.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200509281629.j8SGT3a4006619@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/libmcrypt/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6569/devel Modified Files: .cvsignore sources Added Files: libmcrypt-2.5.7-nolibltdl.patch libmcrypt.spec Log Message: auto-import libmcrypt-2.5.7-1 on branch devel from libmcrypt-2.5.7-1.src.rpm libmcrypt-2.5.7-nolibltdl.patch: --- NEW FILE libmcrypt-2.5.7-nolibltdl.patch --- --- libmcrypt-2.5.7/configure.BAD 2005-09-22 17:04:51.000000000 -0500 +++ libmcrypt-2.5.7/configure 2005-09-22 17:05:19.000000000 -0500 @@ -430,7 +430,7 @@ PACKAGE_BUGREPORT= ac_unique_file="lib/mcrypt.c" -ac_subdirs_all="$ac_subdirs_all libltdl" +ac_subdirs_all="$ac_subdirs_all" # Factoring default headers for most tests. ac_includes_default="\ #include @@ -3356,7 +3356,7 @@ -subdirs="$subdirs libltdl" +subdirs="$subdirs" # Check whether --enable-static or --disable-static was given. if test "${enable_static+set}" = set; then --- libmcrypt-2.5.7/Makefile.in.BAD 2005-09-22 17:06:35.000000000 -0500 +++ libmcrypt-2.5.7/Makefile.in 2005-09-22 17:06:47.000000000 -0500 @@ -148,8 +148,8 @@ INCLUDES = $(INCLTDL) EXTRA_DIST = KNOWN-BUGS THANKS NEWS libmcrypt.spec.in libmcrypt.spec COPYING.LIB -DIST_SUBDIRS = libltdl modules lib src doc -SUBDIRS = $(LIBLTDL_DIR) modules lib src doc +DIST_SUBDIRS = modules lib src doc +SUBDIRS = modules lib src doc subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --- NEW FILE libmcrypt.spec --- Name: libmcrypt Version: 2.5.7 Release: 1%{?dist} License: LGPL Group: System Environment/Libraries Summary: Encryption algorithms library URL: http://mcrypt.sourceforge.net/ Source0: http://download.sourceforge.net/mcrypt/libmcrypt-%{version}.tar.gz Patch0: libmcrypt-2.5.7-nolibltdl.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libtool-ltdl-devel %description Libmcrypt is a thread-safe library providing a uniform interface to access several block and stream encryption algorithms. %package devel Group: Development/Libraries Summary: Development libraries and headers for libmcrypt Requires: %{name} = %{version}-%{release} %description devel Development libraries and headers for use in building applications that use libmcrypt. %prep %setup -q %patch0 -p1 %build %configure --enable-static=yes make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT install find $RPM_BUILD_ROOT -type f -name '*.la' -exec rm -f {} \; %clean rm -rf $RPM_BUILD_ROOT %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files %defattr(-,root,root,-) %doc AUTHORS COPYING.LIB ChangeLog KNOWN-BUGS README NEWS THANKS TODO %{_libdir}/*.so.* %{_datadir}/aclocal/libmcrypt.m4 %{_mandir}/man3/* %files devel %defattr(-,root,root,-) %doc doc/README.key doc/README.xtea doc/example.c %{_bindir}/libmcrypt-config %{_includedir}/mcrypt.h %{_libdir}/*.a %{_libdir}/*.so %changelog * Thu Sep 22 2005 Tom "spot" Callaway 2.5.7-1 - initial package for Fedora Extras Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libmcrypt/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 28 Sep 2005 16:27:54 -0000 1.1 +++ .cvsignore 28 Sep 2005 16:28:31 -0000 1.2 @@ -0,0 +1 @@ +libmcrypt-2.5.7.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/libmcrypt/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 28 Sep 2005 16:27:54 -0000 1.1 +++ sources 28 Sep 2005 16:28:31 -0000 1.2 @@ -0,0 +1 @@ +b1be163143f8e8ed0474beeb642b3bad libmcrypt-2.5.7.tar.gz From fedora-extras-commits at redhat.com Wed Sep 28 16:30:52 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 28 Sep 2005 12:30:52 -0400 Subject: owners owners.list,1.269,1.270 Message-ID: <200509281630.j8SGUqdM006670@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6651 Modified Files: owners.list Log Message: libmcrypt, mcrypt Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.269 retrieving revision 1.270 diff -u -r1.269 -r1.270 --- owners.list 28 Sep 2005 06:37:04 -0000 1.269 +++ owners.list 28 Sep 2005 16:30:50 -0000 1.270 @@ -437,6 +437,7 @@ Fedora Extras|libksba|X.509 library|rdieter at math.unl.edu|extras-qa at fedoraproject.org| Fedora Extras|libmatchbox|All font and image operations are provided to other Matchbox packages via libmatchbox|toniw at iki.fi|extras-qa at fedoraproject.org| Fedora Extras|libmatroska|An open Audio/Video container format|anvil at livna.org|extras-qa at fedoraproject.org| +Fedora Extras|libmcrypt|Encryption algorithms library|tcallawa at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|libmodplug|Modplug mod music file format library|ville.skytta at iki.fi|extras-qa at fedoraproject.org| Fedora Extras|libnet10|High-level API (toolkit) allowing the application programmer to construct and inject network packets|compton at pcompton.com|extras-qa at fedoraproject.org| Fedora Extras|libnet|C library for portable packet creation and injection|pertusus at free.fr|extras-qa at fedoraproject.org| @@ -500,6 +501,7 @@ Fedora Extras|mantis|A web-based bugtracking system|enrico.scholz at informatik.tu-chemnitz.de|extras-qa at fedoraproject.org| Fedora Extras|mathml-fonts|Mathematical symbol fonts|rdieter at math.unl.edu|extras-qa at fedoraproject.org| Fedora Extras|maxima|Symbolic Computation Program|rdieter at math.unl.edu|extras-qa at fedoraproject.org| +Fedora Extras|mcrypt|Replacement for crypt()|tcallawa at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|meanwhile| Lotus Sametime Community Client library|jwboyer at jdub.homelinux.org|extras-qa at fedoraproject.org| Fedora Extras|meld|Visual diff and merge tool|compton at pcompton.com|extras-qa at fedoraproject.org| Fedora Extras|mercurial|A fast, lightweight distributed source control management system|katzj at redhat.com|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Wed Sep 28 16:31:36 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 28 Sep 2005 12:31:36 -0400 Subject: rpms/mcrypt - New directory Message-ID: <200509281631.j8SGVa4m006801@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/mcrypt In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6781/mcrypt Log Message: Directory /cvs/extras/rpms/mcrypt added to the repository From fedora-extras-commits at redhat.com Wed Sep 28 16:31:36 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 28 Sep 2005 12:31:36 -0400 Subject: rpms/mcrypt/devel - New directory Message-ID: <200509281631.j8SGVaA4006806@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/mcrypt/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6781/mcrypt/devel Log Message: Directory /cvs/extras/rpms/mcrypt/devel added to the repository From fedora-extras-commits at redhat.com Wed Sep 28 16:32:02 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 28 Sep 2005 12:32:02 -0400 Subject: rpms/mcrypt Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200509281632.j8SGW2Xi007016@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/mcrypt In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6983 Added Files: Makefile import.log Log Message: Setup of module mcrypt --- NEW FILE Makefile --- # Top level Makefile for module mcrypt all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Wed Sep 28 16:32:02 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 28 Sep 2005 12:32:02 -0400 Subject: rpms/mcrypt/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200509281632.j8SGW22Y007021@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/mcrypt/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6983/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module mcrypt --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Wed Sep 28 16:33:21 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 28 Sep 2005 12:33:21 -0400 Subject: rpms/mcrypt import.log,1.1,1.2 Message-ID: <200509281633.j8SGXqhe007149@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/mcrypt In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7108 Modified Files: import.log Log Message: auto-import mcrypt-2.6.4-1 on branch devel from mcrypt-2.6.4-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/mcrypt/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 28 Sep 2005 16:32:00 -0000 1.1 +++ import.log 28 Sep 2005 16:33:19 -0000 1.2 @@ -0,0 +1 @@ +mcrypt-2_6_4-1:HEAD:mcrypt-2.6.4-1.src.rpm:1127925135 From fedora-extras-commits at redhat.com Wed Sep 28 16:33:22 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 28 Sep 2005 12:33:22 -0400 Subject: rpms/mcrypt/devel mcrypt-2.6.4-destdirfix.patch, NONE, 1.1 mcrypt.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200509281633.j8SGXqQx007151@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/mcrypt/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7108/devel Modified Files: .cvsignore sources Added Files: mcrypt-2.6.4-destdirfix.patch mcrypt.spec Log Message: auto-import mcrypt-2.6.4-1 on branch devel from mcrypt-2.6.4-1.src.rpm mcrypt-2.6.4-destdirfix.patch: --- NEW FILE mcrypt-2.6.4-destdirfix.patch --- --- mcrypt-2.6.4/Makefile.in.BAD 2005-09-22 17:58:15.000000000 -0500 +++ mcrypt-2.6.4/Makefile.in 2005-09-22 17:58:25.000000000 -0500 @@ -552,7 +552,7 @@ install-exec-hook: -$(RM) -f $(bindir)/mdecrypt - $(LN_S) mcrypt $(bindir)/mdecrypt + $(LN_S) mcrypt $(DESTDIR)$(bindir)/mdecrypt uninstall-local: -$(RM) -f $(bindir)/mdecrypt --- NEW FILE mcrypt.spec --- Name: mcrypt Version: 2.6.4 Release: 1%{?dist} License: GPL Group: Applications/System Summary: Replacement for crypt() URL: http://mcrypt.sourceforge.net/ Source0: http://download.sourceforge.net/mcrypt/mcrypt-%{version}.tar.gz Patch0: mcrypt-2.6.4-destdirfix.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libmcrypt-devel, mhash-devel, gettext, zlib-devel %description MCrypt is a replacement for the old crypt() package and crypt(1) command, with extensions. It allows developers to use a wide range of encryption functions, without making drastic changes to their code. It allows users to encrypt files or data streams without having to be cryptographers. %prep %setup -q %patch0 -p1 %build %configure make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT install %find_lang %{name} %clean rm -rf $RPM_BUILD_ROOT %files -f %{name}.lang %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING NEWS README THANKS TODO %{_bindir}/* %{_mandir}/man1/* %changelog * Thu Sep 22 2005 Tom "spot" Callaway 2.6.4-1 - initial package for Fedora Extras Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/mcrypt/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 28 Sep 2005 16:32:00 -0000 1.1 +++ .cvsignore 28 Sep 2005 16:33:20 -0000 1.2 @@ -0,0 +1 @@ +mcrypt-2.6.4.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/mcrypt/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 28 Sep 2005 16:32:00 -0000 1.1 +++ sources 28 Sep 2005 16:33:20 -0000 1.2 @@ -0,0 +1 @@ +5a011846fd0f166428c8d97359aaa6b3 mcrypt-2.6.4.tar.gz From fedora-extras-commits at redhat.com Wed Sep 28 16:43:31 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 28 Sep 2005 12:43:31 -0400 Subject: rpms/sbcl/FC-4 sbcl-0.9.5-make-config-fix.patch, 1.1, 1.2 sbcl-0.9.5-verbose-build.patch, 1.2, 1.3 sbcl.spec, 1.21, 1.22 Message-ID: <200509281643.j8SGhVeH007510@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/sbcl/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7481 Modified Files: sbcl-0.9.5-make-config-fix.patch sbcl-0.9.5-verbose-build.patch sbcl.spec Log Message: fix patches so they actually apply sbcl-0.9.5-make-config-fix.patch: Index: sbcl-0.9.5-make-config-fix.patch =================================================================== RCS file: /cvs/extras/rpms/sbcl/FC-4/sbcl-0.9.5-make-config-fix.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sbcl-0.9.5-make-config-fix.patch 28 Sep 2005 14:16:48 -0000 1.1 +++ sbcl-0.9.5-make-config-fix.patch 28 Sep 2005 16:43:29 -0000 1.2 @@ -1,5 +1,5 @@ ---- sbcl-0.9.5/make-config.sh.fix 2005-09-21 10:00:33.000000000 -0500 -+++ sbcl-0.9.5/make-config.sh 2005-09-28 09:00:48.000000000 -0500 +--- sbcl-0.9.5/make-config.sh.make-config-fix 2005-09-21 10:00:33.000000000 -0500 ++++ sbcl-0.9.5/make-config.sh 2005-09-28 11:42:29.135788304 -0500 @@ -208,7 +208,7 @@ # cross-compilers! # @@ -9,12 +9,14 @@ tools-for-build/determine-endianness >> $ltf elif [ "$sbcl_arch" = "ppc" -a "$sbcl_os" = "linux" ]; then # Use a C program to detect which kind of glibc we're building on, -@@ -217,7 +217,7 @@ +@@ -217,8 +217,8 @@ # # FIXME: integrate to grovel-features., maypahps printf ' :stack-allocatable-closures' >> $ltf - $GNUMAKE -C tools-for-build where-is-mcontext -I src/runtime +- tools-for-build/where-is-mcontext > src/runtime/ppc-linux-mcontext.h + $GNUMAKE -C tools-for-build where-is-mcontext -I ../src/runtime - tools-for-build/where-is-mcontext > src/runtime/ppc-linux-mcontext.h ++ tools-for-build/where-is-mcontext > src/runtime/ppc-linux-mcontext.h || echo "error running where-is-mcontext" elif [ "$sbcl_arch" = "ppc" -a "$sbcl_os" = "darwin" ]; then printf ' :stack-allocatable-closures' >> $ltf + # We provide a dlopen shim, so a little lie won't hurt sbcl-0.9.5-verbose-build.patch: Index: sbcl-0.9.5-verbose-build.patch =================================================================== RCS file: /cvs/extras/rpms/sbcl/FC-4/sbcl-0.9.5-verbose-build.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sbcl-0.9.5-verbose-build.patch 28 Sep 2005 16:23:17 -0000 1.2 +++ sbcl-0.9.5-verbose-build.patch 28 Sep 2005 16:43:29 -0000 1.3 @@ -1,16 +1,5 @@ ---- sbcl-0.9.5/make-config.sh.verbose 2005-09-21 10:00:33.000000000 -0500 -+++ sbcl-0.9.5/make-config.sh 2005-09-28 10:39:30.540222144 -0500 -@@ -218,7 +218,7 @@ - # FIXME: integrate to grovel-features., maypahps - printf ' :stack-allocatable-closures' >> $ltf - $GNUMAKE -C tools-for-build where-is-mcontext -I src/runtime -- tools-for-build/where-is-mcontext > src/runtime/ppc-linux-mcontext.h -+ tools-for-build/where-is-mcontext > src/runtime/ppc-linux-mcontext.h || echo "error running where-is-mcontext" - elif [ "$sbcl_arch" = "ppc" -a "$sbcl_os" = "darwin" ]; then - printf ' :stack-allocatable-closures' >> $ltf - # We provide a dlopen shim, so a little lie won't hurt ---- sbcl-0.9.5/make.sh.verbose 2005-09-21 10:00:33.000000000 -0500 -+++ sbcl-0.9.5/make.sh 2005-09-28 11:21:54.305511040 -0500 +--- sbcl-0.9.5/make.sh.verbose-build 2005-09-21 10:00:33.000000000 -0500 ++++ sbcl-0.9.5/make.sh 2005-09-28 11:42:06.353251776 -0500 @@ -70,7 +70,7 @@ # If you're cross-compiling, you should probably just walk through the # make-config.sh script by hand doing the right thing on both the host Index: sbcl.spec =================================================================== RCS file: /cvs/extras/rpms/sbcl/FC-4/sbcl.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- sbcl.spec 28 Sep 2005 16:23:17 -0000 1.21 +++ sbcl.spec 28 Sep 2005 16:43:29 -0000 1.22 @@ -3,7 +3,7 @@ Name: sbcl Summary: Steel Bank Common Lisp Version: 0.9.5 -Release: 13%{?dist} +Release: 14%{?dist} License: BSD/MIT Group: Development/Languages @@ -174,7 +174,7 @@ %changelog -* Wed Sep 28 2005 Rex Dieter 0.9.5-13 +* Wed Sep 28 2005 Rex Dieter 0.9.5-14 - more ppc work * Tue Sep 27 2005 Rex Dieter 0.9.5-8 From fedora-extras-commits at redhat.com Wed Sep 28 16:44:19 2005 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Wed, 28 Sep 2005 12:44:19 -0400 Subject: rpms/graphviz/devel graphviz.spec,1.17,1.18 Message-ID: <200509281644.j8SGiJ7u007641@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/rpms/graphviz/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7554/devel Modified Files: graphviz.spec Log Message: * Requires urw-fonts. Index: graphviz.spec =================================================================== RCS file: /cvs/extras/rpms/graphviz/devel/graphviz.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- graphviz.spec 29 Aug 2005 12:53:11 -0000 1.17 +++ graphviz.spec 28 Sep 2005 16:44:17 -0000 1.18 @@ -21,6 +21,7 @@ BuildRequires: fontconfig-devel xorg-x11-devel libtool-ltdl-devel Requires(post): %{_bindir}/dot Requires(postun): %{_bindir}/dot +Requires: urw-fonts %package tcl Summary: Tcl extension tools for %{name} From fedora-extras-commits at redhat.com Wed Sep 28 16:44:07 2005 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Wed, 28 Sep 2005 12:44:07 -0400 Subject: rpms/graphviz/FC-1 graphviz.spec,1.3,1.4 Message-ID: <200509281644.j8SGibhM007644@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/rpms/graphviz/FC-1 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7554/FC-1 Modified Files: graphviz.spec Log Message: * Requires urw-fonts. Index: graphviz.spec =================================================================== RCS file: /cvs/extras/rpms/graphviz/FC-1/graphviz.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- graphviz.spec 8 Nov 2004 04:31:13 -0000 1.3 +++ graphviz.spec 28 Sep 2005 16:44:05 -0000 1.4 @@ -13,6 +13,7 @@ BuildRequires: zlib-devel libpng-devel libjpeg-devel XFree86-devel expat-devel BuildRequires: bison m4 flex tk tcl >= 0:8.3 BuildRequires: /usr/include/tcl.h /usr/include/tk.h +Requires: urw-fonts %package devel Summary: Development package for %{name} From fedora-extras-commits at redhat.com Wed Sep 28 16:44:08 2005 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Wed, 28 Sep 2005 12:44:08 -0400 Subject: rpms/graphviz/FC-2 graphviz.spec,1.4,1.5 Message-ID: <200509281644.j8SGicm0007647@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/rpms/graphviz/FC-2 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7554/FC-2 Modified Files: graphviz.spec Log Message: * Requires urw-fonts. Index: graphviz.spec =================================================================== RCS file: /cvs/extras/rpms/graphviz/FC-2/graphviz.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- graphviz.spec 8 Nov 2004 04:32:07 -0000 1.4 +++ graphviz.spec 28 Sep 2005 16:44:05 -0000 1.5 @@ -13,6 +13,7 @@ BuildRequires: zlib-devel libpng-devel libjpeg-devel XFree86-devel expat-devel BuildRequires: bison m4 flex tk tcl >= 0:8.3 BuildRequires: /usr/include/tcl.h /usr/include/tk.h +Requires: urw-fonts %package devel Summary: Development package for %{name} From fedora-extras-commits at redhat.com Wed Sep 28 16:44:13 2005 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Wed, 28 Sep 2005 12:44:13 -0400 Subject: rpms/graphviz/FC-3 graphviz.spec,1.6,1.7 Message-ID: <200509281644.j8SGihnf007650@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/rpms/graphviz/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7554/FC-3 Modified Files: graphviz.spec Log Message: * Requires urw-fonts. Index: graphviz.spec =================================================================== RCS file: /cvs/extras/rpms/graphviz/FC-3/graphviz.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- graphviz.spec 23 Jan 2005 16:27:43 -0000 1.6 +++ graphviz.spec 28 Sep 2005 16:44:11 -0000 1.7 @@ -14,6 +14,7 @@ BuildRequires: zlib-devel libpng-devel libjpeg-devel XFree86-devel expat-devel BuildRequires: /bin/ksh bison m4 flex tk tcl >= 0:8.3 BuildRequires: /usr/include/tcl.h /usr/include/tk.h +Requires: urw-fonts %package tcl Group: Applications/Multimedia From fedora-extras-commits at redhat.com Wed Sep 28 16:44:13 2005 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Wed, 28 Sep 2005 12:44:13 -0400 Subject: rpms/graphviz/FC-4 graphviz.spec,1.10,1.11 Message-ID: <200509281644.j8SGii5a007653@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/rpms/graphviz/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7554/FC-4 Modified Files: graphviz.spec Log Message: * Requires urw-fonts. Index: graphviz.spec =================================================================== RCS file: /cvs/extras/rpms/graphviz/FC-4/graphviz.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- graphviz.spec 22 May 2005 22:59:38 -0000 1.10 +++ graphviz.spec 28 Sep 2005 16:44:11 -0000 1.11 @@ -14,6 +14,7 @@ BuildRequires: zlib-devel libpng-devel libjpeg-devel XFree86-devel expat-devel BuildRequires: /bin/ksh bison m4 flex tk tcl >= 8.3 BuildRequires: /usr/include/tcl.h /usr/include/tk.h +Requires: urw-fonts %package tcl Group: Applications/Multimedia From fedora-extras-commits at redhat.com Wed Sep 28 16:45:59 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 28 Sep 2005 12:45:59 -0400 Subject: rpms/libmcrypt/FC-3 libmcrypt.spec,1.1,1.2 Message-ID: <200509281645.j8SGjxJM007708@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/libmcrypt/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7661/FC-3 Modified Files: libmcrypt.spec Log Message: Fix FC-3 Index: libmcrypt.spec =================================================================== RCS file: /cvs/extras/rpms/libmcrypt/FC-3/libmcrypt.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- libmcrypt.spec 28 Sep 2005 16:28:31 -0000 1.1 +++ libmcrypt.spec 28 Sep 2005 16:45:57 -0000 1.2 @@ -1,6 +1,6 @@ Name: libmcrypt Version: 2.5.7 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPL Group: System Environment/Libraries Summary: Encryption algorithms library @@ -8,7 +8,8 @@ Source0: http://download.sourceforge.net/mcrypt/libmcrypt-%{version}.tar.gz Patch0: libmcrypt-2.5.7-nolibltdl.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: libtool-ltdl-devel +# FC-3 +BuildRequires: libtool %description Libmcrypt is a thread-safe library providing a uniform interface @@ -58,5 +59,8 @@ %{_libdir}/*.so %changelog +* Wed Sep 28 2005 Tom "spot" Callaway 2.5.7-2 +- fix for FC-3 + * Thu Sep 22 2005 Tom "spot" Callaway 2.5.7-1 - initial package for Fedora Extras From fedora-extras-commits at redhat.com Wed Sep 28 16:46:00 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 28 Sep 2005 12:46:00 -0400 Subject: rpms/libmcrypt/devel libmcrypt.spec,1.1,1.2 Message-ID: <200509281646.j8SGk0jN007718@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/libmcrypt/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7661/devel Modified Files: libmcrypt.spec Log Message: Fix FC-3 Index: libmcrypt.spec =================================================================== RCS file: /cvs/extras/rpms/libmcrypt/devel/libmcrypt.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- libmcrypt.spec 28 Sep 2005 16:28:31 -0000 1.1 +++ libmcrypt.spec 28 Sep 2005 16:45:58 -0000 1.2 @@ -1,6 +1,6 @@ Name: libmcrypt Version: 2.5.7 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPL Group: System Environment/Libraries Summary: Encryption algorithms library @@ -58,5 +58,8 @@ %{_libdir}/*.so %changelog +* Wed Sep 28 2005 Tom "spot" Callaway 2.5.7-2 +- fix for FC-3 + * Thu Sep 22 2005 Tom "spot" Callaway 2.5.7-1 - initial package for Fedora Extras From fedora-extras-commits at redhat.com Wed Sep 28 16:45:59 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 28 Sep 2005 12:45:59 -0400 Subject: rpms/libmcrypt/FC-4 libmcrypt.spec,1.1,1.2 Message-ID: <200509281646.j8SGjx0b007714@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/libmcrypt/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7661/FC-4 Modified Files: libmcrypt.spec Log Message: Fix FC-3 Index: libmcrypt.spec =================================================================== RCS file: /cvs/extras/rpms/libmcrypt/FC-4/libmcrypt.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- libmcrypt.spec 28 Sep 2005 16:28:31 -0000 1.1 +++ libmcrypt.spec 28 Sep 2005 16:45:57 -0000 1.2 @@ -1,6 +1,6 @@ Name: libmcrypt Version: 2.5.7 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPL Group: System Environment/Libraries Summary: Encryption algorithms library @@ -58,5 +58,8 @@ %{_libdir}/*.so %changelog +* Wed Sep 28 2005 Tom "spot" Callaway 2.5.7-2 +- fix for FC-3 + * Thu Sep 22 2005 Tom "spot" Callaway 2.5.7-1 - initial package for Fedora Extras From fedora-extras-commits at redhat.com Wed Sep 28 18:49:49 2005 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Wed, 28 Sep 2005 14:49:49 -0400 Subject: rpms/TeXmacs/devel .cvsignore, 1.13, 1.14 TeXmacs.spec, 1.19, 1.20 sources, 1.14, 1.15 Message-ID: <200509281849.j8SInnig011996@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/TeXmacs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11973 Modified Files: .cvsignore TeXmacs.spec sources Log Message: new version 1.0.5.9 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/TeXmacs/devel/.cvsignore,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- .cvsignore 20 Sep 2005 18:22:48 -0000 1.13 +++ .cvsignore 28 Sep 2005 18:49:46 -0000 1.14 @@ -1 +1 @@ -TeXmacs-1.0.5.8-src.tar.gz +TeXmacs-1.0.5.9-src.tar.gz Index: TeXmacs.spec =================================================================== RCS file: /cvs/extras/rpms/TeXmacs/devel/TeXmacs.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- TeXmacs.spec 20 Sep 2005 18:22:48 -0000 1.19 +++ TeXmacs.spec 28 Sep 2005 18:49:46 -0000 1.20 @@ -1,12 +1,12 @@ Name: TeXmacs -Version: 1.0.5.8 +Version: 1.0.5.9 Release: 1%{?dist} Summary: Structured wysiwyg scientific text editor Group: Applications/Editors License: GPL URL: http://www.texmacs.org -Source: ftp://ftp.texmacs.org/pub/TeXmacs/targz/TeXmacs-1.0.5.8-src.tar.gz +Source: ftp://ftp.texmacs.org/pub/TeXmacs/targz/TeXmacs-1.0.5.9-src.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: tetex, tetex-fonts, ghostscript Buildrequires: guile-devel, desktop-file-utils, tetex, freetype-devel, XFree86-devel @@ -124,6 +124,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Sep 28 2005 Gerard Milmeister - 1.0.5.9 +- New Version 1.0.5.9 + * Tue Sep 20 2005 Gerard Milmeister - 1.0.5.8 - New Version 1.0.5.8 Index: sources =================================================================== RCS file: /cvs/extras/rpms/TeXmacs/devel/sources,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- sources 20 Sep 2005 18:22:48 -0000 1.14 +++ sources 28 Sep 2005 18:49:46 -0000 1.15 @@ -1 +1 @@ -3ebeed05713a410ce57fbddb3a540244 TeXmacs-1.0.5.8-src.tar.gz +90d04fa951e87e854ab8e51687459f30 TeXmacs-1.0.5.9-src.tar.gz From fedora-extras-commits at redhat.com Wed Sep 28 19:02:08 2005 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Wed, 28 Sep 2005 15:02:08 -0400 Subject: rpms/TeXmacs/FC-4 TeXmacs.spec,1.20,1.21 sources,1.14,1.15 Message-ID: <200509281902.j8SJ28Hv013453@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/TeXmacs/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13414/FC-4 Modified Files: TeXmacs.spec sources Log Message: new version 1.0.5.9 Index: TeXmacs.spec =================================================================== RCS file: /cvs/extras/rpms/TeXmacs/FC-4/TeXmacs.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- TeXmacs.spec 20 Sep 2005 18:27:42 -0000 1.20 +++ TeXmacs.spec 28 Sep 2005 19:02:06 -0000 1.21 @@ -1,12 +1,12 @@ Name: TeXmacs -Version: 1.0.5.8 +Version: 1.0.5.9 Release: 1%{?dist} Summary: Structured wysiwyg scientific text editor Group: Applications/Editors License: GPL URL: http://www.texmacs.org -Source: ftp://ftp.texmacs.org/pub/TeXmacs/targz/TeXmacs-1.0.5.8-src.tar.gz +Source: ftp://ftp.texmacs.org/pub/TeXmacs/targz/TeXmacs-1.0.5.9-src.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: tetex, tetex-fonts, ghostscript Buildrequires: guile-devel, desktop-file-utils, tetex, freetype-devel, XFree86-devel @@ -124,6 +124,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Sep 28 2005 Gerard Milmeister - 1.0.5.9 +- New Version 1.0.5.9 + * Tue Sep 20 2005 Gerard Milmeister - 1.0.5.8 - New Version 1.0.5.8 Index: sources =================================================================== RCS file: /cvs/extras/rpms/TeXmacs/FC-4/sources,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- sources 20 Sep 2005 18:27:43 -0000 1.14 +++ sources 28 Sep 2005 19:02:06 -0000 1.15 @@ -1 +1 @@ -3ebeed05713a410ce57fbddb3a540244 TeXmacs-1.0.5.8-src.tar.gz +90d04fa951e87e854ab8e51687459f30 TeXmacs-1.0.5.9-src.tar.gz From fedora-extras-commits at redhat.com Wed Sep 28 19:02:01 2005 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Wed, 28 Sep 2005 15:02:01 -0400 Subject: rpms/TeXmacs/FC-3 TeXmacs.spec,1.10,1.11 sources,1.10,1.11 Message-ID: <200509281902.j8SJ2Vrs013457@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/TeXmacs/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13414/FC-3 Modified Files: TeXmacs.spec sources Log Message: new version 1.0.5.9 Index: TeXmacs.spec =================================================================== RCS file: /cvs/extras/rpms/TeXmacs/FC-3/TeXmacs.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- TeXmacs.spec 20 Sep 2005 18:27:59 -0000 1.10 +++ TeXmacs.spec 28 Sep 2005 19:01:39 -0000 1.11 @@ -1,12 +1,12 @@ Name: TeXmacs -Version: 1.0.5.8 +Version: 1.0.5.9 Release: 1%{?dist} Summary: Structured wysiwyg scientific text editor Group: Applications/Editors License: GPL URL: http://www.texmacs.org -Source: ftp://ftp.texmacs.org/pub/TeXmacs/targz/TeXmacs-1.0.5.8-src.tar.gz +Source: ftp://ftp.texmacs.org/pub/TeXmacs/targz/TeXmacs-1.0.5.9-src.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: tetex, tetex-fonts, ghostscript Buildrequires: guile-devel, desktop-file-utils, tetex, freetype-devel, XFree86-devel @@ -124,6 +124,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Sep 28 2005 Gerard Milmeister - 1.0.5.9 +- New Version 1.0.5.9 + * Tue Sep 20 2005 Gerard Milmeister - 1.0.5.8 - New Version 1.0.5.8 Index: sources =================================================================== RCS file: /cvs/extras/rpms/TeXmacs/FC-3/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 20 Sep 2005 18:27:59 -0000 1.10 +++ sources 28 Sep 2005 19:01:59 -0000 1.11 @@ -1 +1 @@ -3ebeed05713a410ce57fbddb3a540244 TeXmacs-1.0.5.8-src.tar.gz +90d04fa951e87e854ab8e51687459f30 TeXmacs-1.0.5.9-src.tar.gz From fedora-extras-commits at redhat.com Wed Sep 28 19:16:07 2005 From: fedora-extras-commits at redhat.com (Shahms King (shahms)) Date: Wed, 28 Sep 2005 15:16:07 -0400 Subject: rpms/python-quixote/FC-4 .cvsignore, 1.4, 1.5 python-quixote.spec, 1.5, 1.6 sources, 1.4, 1.5 Message-ID: <200509281916.j8SJG7eN013621@cvs-int.fedora.redhat.com> Author: shahms Update of /cvs/extras/rpms/python-quixote/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13598 Modified Files: .cvsignore python-quixote.spec sources Log Message: Update to new upstream version 2.2 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/python-quixote/FC-4/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 8 Sep 2005 23:14:10 -0000 1.4 +++ .cvsignore 28 Sep 2005 19:16:05 -0000 1.5 @@ -1 +1 @@ -Quixote-2.1.tar.gz +Quixote-2.2.tar.gz Index: python-quixote.spec =================================================================== RCS file: /cvs/extras/rpms/python-quixote/FC-4/python-quixote.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- python-quixote.spec 8 Sep 2005 23:14:10 -0000 1.5 +++ python-quixote.spec 28 Sep 2005 19:16:05 -0000 1.6 @@ -3,7 +3,7 @@ %define srcname Quixote Name: python-quixote -Version: 2.1 +Version: 2.2 Release: 1%{?dist} Summary: A highly Pythonic Web application framework @@ -70,6 +70,9 @@ %ghost %{python_sitearch}/quixote/html/*.pyo %changelog +* Wed Sep 28 2005 Shahms E. King 2.2-1 +- update to new upstream 2.2 + * Thu Sep 08 2005 Shahms E. King 2.1-1 - update to new upstream 2.1 - add dist tag Index: sources =================================================================== RCS file: /cvs/extras/rpms/python-quixote/FC-4/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 8 Sep 2005 23:14:10 -0000 1.4 +++ sources 28 Sep 2005 19:16:05 -0000 1.5 @@ -1 +1 @@ -21134661449e3b2e26139a0acc4d3b52 Quixote-2.1.tar.gz +58b2db7d7e377fbcb834fccc7fcf50cf Quixote-2.2.tar.gz From fedora-extras-commits at redhat.com Wed Sep 28 19:16:43 2005 From: fedora-extras-commits at redhat.com (Shahms King (shahms)) Date: Wed, 28 Sep 2005 15:16:43 -0400 Subject: rpms/python-quixote/devel .cvsignore, 1.4, 1.5 python-quixote.spec, 1.5, 1.6 sources, 1.4, 1.5 Message-ID: <200509281916.j8SJGhIC013698@cvs-int.fedora.redhat.com> Author: shahms Update of /cvs/extras/rpms/python-quixote/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13673 Modified Files: .cvsignore python-quixote.spec sources Log Message: Update to new upstream version 2.2 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/python-quixote/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 8 Sep 2005 23:14:11 -0000 1.4 +++ .cvsignore 28 Sep 2005 19:16:41 -0000 1.5 @@ -1 +1 @@ -Quixote-2.1.tar.gz +Quixote-2.2.tar.gz Index: python-quixote.spec =================================================================== RCS file: /cvs/extras/rpms/python-quixote/devel/python-quixote.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- python-quixote.spec 8 Sep 2005 23:14:11 -0000 1.5 +++ python-quixote.spec 28 Sep 2005 19:16:41 -0000 1.6 @@ -3,7 +3,7 @@ %define srcname Quixote Name: python-quixote -Version: 2.1 +Version: 2.2 Release: 1%{?dist} Summary: A highly Pythonic Web application framework @@ -70,6 +70,9 @@ %ghost %{python_sitearch}/quixote/html/*.pyo %changelog +* Wed Sep 28 2005 Shahms E. King 2.2-1 +- update to new upstream 2.2 + * Thu Sep 08 2005 Shahms E. King 2.1-1 - update to new upstream 2.1 - add dist tag Index: sources =================================================================== RCS file: /cvs/extras/rpms/python-quixote/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 8 Sep 2005 23:14:11 -0000 1.4 +++ sources 28 Sep 2005 19:16:41 -0000 1.5 @@ -1 +1 @@ -21134661449e3b2e26139a0acc4d3b52 Quixote-2.1.tar.gz +58b2db7d7e377fbcb834fccc7fcf50cf Quixote-2.2.tar.gz From fedora-extras-commits at redhat.com Wed Sep 28 19:58:45 2005 From: fedora-extras-commits at redhat.com (Elliot Lee (sopwith)) Date: Wed, 28 Sep 2005 15:58:45 -0400 Subject: fedora-release fedora-release.spec,1.13,1.14 Message-ID: <200509281958.j8SJwjar013907@cvs-int.fedora.redhat.com> Author: sopwith Update of /cvs/fedora/fedora-release In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13888 Modified Files: fedora-release.spec Log Message: catch compiled python files, etc. Index: fedora-release.spec =================================================================== RCS file: /cvs/fedora/fedora-release/fedora-release.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- fedora-release.spec 3 Jun 2005 16:29:44 -0000 1.13 +++ fedora-release.spec 28 Sep 2005 19:58:43 -0000 1.14 @@ -28,7 +28,6 @@ %setup -q -n fedora-release-%{version} -a 1 %build -python -c "import py_compile; py_compile.compile('eula.py')" make -C release-notes/FC4 MAINDIR=`pwd` pushd release-notes/FC4 @@ -61,7 +60,7 @@ mkdir -p -m 755 $RPM_BUILD_ROOT/%{_defaultdocdir}/HTML cp -ap figs *.css *.html img css stylesheet-images \ $RPM_BUILD_ROOT/%{_defaultdocdir}/HTML -install -m 644 RELEASE-NOTES-en.html $RPM_BUILD_ROOT/%{_defaultdocdir}/HTML/index.html +install -m 644 index.html $RPM_BUILD_ROOT/%{_defaultdocdir}/HTML/index.html mkdir -p -m 755 $RPM_BUILD_ROOT/etc/sysconfig/rhn mkdir -p -m 755 $RPM_BUILD_ROOT/etc/yum.repos.d @@ -98,7 +97,7 @@ %doc eula.txt GPL autorun-template %config %attr(0644,root,root) /etc/issue %config %attr(0644,root,root) /etc/issue.net -/usr/share/firstboot/modules/eula.py +/usr/share/firstboot/modules/eula.py* /usr/share/eula/eula.en_US %{_defaultdocdir}/HTML /etc/pki/rpm-gpg/* From fedora-extras-commits at redhat.com Wed Sep 28 20:26:58 2005 From: fedora-extras-commits at redhat.com (Elliot Lee (sopwith)) Date: Wed, 28 Sep 2005 16:26:58 -0400 Subject: owners owners.list,1.270,1.271 Message-ID: <200509282026.j8SKQwN4015495@cvs-int.fedora.redhat.com> Author: sopwith Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15473 Modified Files: owners.list Log Message: Remove ownership of packages that have bouncing e-mail addresses AND no bugzilla accounts... Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.270 retrieving revision 1.271 diff -u -r1.270 -r1.271 --- owners.list 28 Sep 2005 16:30:50 -0000 1.270 +++ owners.list 28 Sep 2005 20:26:55 -0000 1.271 @@ -173,7 +173,7 @@ Fedora Extras|fbida|FrameBuffer Imageviewer|adrian at lisas.de|extras-qa at fedoraproject.org| Fedora Extras|fedora-rpmdevtools|Fedora RPM Development Tools|ville.skytta at iki.fi|extras-qa at fedoraproject.org| Fedora Extras|fedora-usermgmt|Fedora tools for user management|enrico.scholz at informatik.tu-chemnitz.de|extras-qa at fedoraproject.org| -Fedora Extras|feh|Fast command line image viewer using Imlib2|a.kurtz at hardsun.net|extras-qa at fedoraproject.org| +Fedora Extras|feh|Fast command line image viewer using Imlib2|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| Fedora Extras|fftw3|Fast Fourier Transform library|qspencer at ieee.org|extras-qa at fedoraproject.org| Fedora Extras|fftw|Fast Fourier Transform library|compton at pcompton.com|extras-qa at fedoraproject.org| Fedora Extras|fig2ps|Utility for converting xfig pictures to PS/PDF|qspencer at ieee.org|extras-qa at fedoraproject.org| @@ -259,9 +259,9 @@ Fedora Extras|gnofract4d|Gnofract 4D is a Gnome-based program to draw fractals|pmatilai at laiskiainen.org|extras-qa at fedoraproject.org| Fedora Extras|gnomad2|Manager for digital audio players|triad at df.lth.se|extras-qa at fedoraproject.org| Fedora Extras|gnome-applet-netmon|GNOME Network Load Applet|ghenry at suretecsystems.com|extras-qa at fedoraproject.org| -Fedora Extras|gnome-applet-netspeed|GNOME applet that shows traffic on a network device|a.kurtz at hardsun.net|extras-qa at fedoraproject.org| +Fedora Extras|gnome-applet-netspeed|GNOME applet that shows traffic on a network device|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| Fedora Extras|gnome-applet-rhythmbox|A GNOME panel applet to control Rhythmbox's playback|ivazquez at ivazquez.net|extras-qa at fedoraproject.org| -Fedora Extras|gnome-applet-sensors|Gnome panel applet for hardware sensors|a.kurtz at hardsun.net|extras-qa at fedoraproject.org| +Fedora Extras|gnome-applet-sensors|Gnome panel applet for hardware sensors|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| Fedora Extras|gnome-applet-timer|A countdown timer applet for the GNOME panel|wickerpms at arcor.de|extras-qa at fedoraproject.org| Fedora Extras|gnome-blog|GNOME panel object for posting blog entries|bdpepple at ameritech.net|extras-qa at fedoraproject.org| Fedora Extras|gnome-common|Useful things common to building gnome packages from scratch|toshio at tiki-lounge.com|extras-qa at fedoraproject.org| @@ -410,7 +410,7 @@ Fedora Extras|libcdio|A CD-ROM input and control library|adrian at lisas.de|extras-qa at fedoraproject.org| Fedora Extras|libchewing|Traditional Chinese phonetic input method library|petersen at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|libcmml|Library for handling Continuous Media Markup Language|thomas at apestaart.org|extras-qa at fedoraproject.org| -Fedora Extras|libdaemon|libdaemon is a lightweight C library that eases the writing of UNIX daemons|a.kurtz at hardsun.net|extras-qa at fedoraproject.org| +Fedora Extras|libdaemon|libdaemon is a lightweight C library that eases the writing of UNIX daemons|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| Fedora Extras|libdnet|Simple portable interface to lowlevel networking routines|oliver at linux-kernel.at|extras-qa at fedoraproject.org| Fedora Extras|libebml|The Extensible Binary Meta Language library|anvil at livna.org|extras-qa at fedoraproject.org| Fedora Extras|libesmtp|SMTP client library|pawsa at theochem.kth.se|extras-qa at fedoraproject.org| @@ -1104,7 +1104,7 @@ Fedora Extras|xmms-acme|XMMS plugin to use special multimedia keys in GNOME or through acme|matthias at rpmforge.net|extras-qa at fedoraproject.org| Fedora Extras|xmms-alarm|xmms General plugin for using xmms as an alarm clock|ville.skytta at iki.fi|extras-qa at fedoraproject.org| Fedora Extras|xmms-arts|X MultiMedia System output plugin for the aRts sound system|matthias at rpmforge.net|extras-qa at fedoraproject.org| -Fedora Extras|xmms-cdread|Digital audio CD input plugin for XMMS|msalim at cs.indiana.edu|extras-qa at fedoraproject.org| +Fedora Extras|xmms-cdread|Digital audio CD input plugin for XMMS|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| Fedora Extras|xmms-crossfade|A crossfade output plugin for XMMS|matthias at rpmforge.net|extras-qa at fedoraproject.org| Fedora Extras|xmms-flac|XMMS plugin needed to play FLAC (Free Lossless Audio Codec) files|matthias at rpmforge.net|extras-qa at fedoraproject.org| Fedora Extras|xmms-lirc|Plugin to use LIRC supported infrared devices in XMMS|matthias at rpmforge.net|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Wed Sep 28 21:31:25 2005 From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields)) Date: Wed, 28 Sep 2005 17:31:25 -0400 Subject: web/html/docs/mirror - New directory Message-ID: <200509282131.j8SLVPuS017083@cvs-int.fedora.redhat.com> Author: pfrields Update of /cvs/fedora/web/html/docs/mirror In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17069/mirror Log Message: Directory /cvs/fedora/web/html/docs/mirror added to the repository From fedora-extras-commits at redhat.com Wed Sep 28 21:32:28 2005 From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields)) Date: Wed, 28 Sep 2005 17:32:28 -0400 Subject: web/html/docs/mirror/stylesheet-images - New directory Message-ID: <200509282132.j8SLWSwu017108@cvs-int.fedora.redhat.com> Author: pfrields Update of /cvs/fedora/web/html/docs/mirror/stylesheet-images In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17094/stylesheet-images Log Message: Directory /cvs/fedora/web/html/docs/mirror/stylesheet-images added to the repository From fedora-extras-commits at redhat.com Wed Sep 28 21:35:16 2005 From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields)) Date: Wed, 28 Sep 2005 17:35:16 -0400 Subject: web/html/docs/beta/mirror-tutorial - New directory Message-ID: <200509282135.j8SLZG2j017168@cvs-int.fedora.redhat.com> Author: pfrields Update of /cvs/fedora/web/html/docs/beta/mirror-tutorial In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17154/mirror-tutorial Log Message: Directory /cvs/fedora/web/html/docs/beta/mirror-tutorial added to the repository From fedora-extras-commits at redhat.com Wed Sep 28 21:36:12 2005 From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields)) Date: Wed, 28 Sep 2005 17:36:12 -0400 Subject: web/html/docs/beta/mirror-tutorial/stylesheet-images - New directory Message-ID: <200509282136.j8SLaCPu017207@cvs-int.fedora.redhat.com> Author: pfrields Update of /cvs/fedora/web/html/docs/beta/mirror-tutorial/stylesheet-images In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17183/stylesheet-images Log Message: Directory /cvs/fedora/web/html/docs/beta/mirror-tutorial/stylesheet-images added to the repository From fedora-extras-commits at redhat.com Wed Sep 28 21:37:04 2005 From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields)) Date: Wed, 28 Sep 2005 17:37:04 -0400 Subject: web/html/docs/beta/mirror-tutorial fedora.css, NONE, 1.1 generated-index.html, NONE, 1.1 index.html, NONE, 1.1 ln-legalnotice.html, NONE, 1.1 rv-revhistory.html, NONE, 1.1 sn-client-config.html, NONE, 1.1 sn-planning-and-setup.html, NONE, 1.1 sn-server-config.html, NONE, 1.1 Message-ID: <200509282137.j8SLb44w017291@cvs-int.fedora.redhat.com> Author: pfrields Update of /cvs/fedora/web/html/docs/beta/mirror-tutorial In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17233/mirror-tutorial Added Files: fedora.css generated-index.html index.html ln-legalnotice.html rv-revhistory.html sn-client-config.html sn-planning-and-setup.html sn-server-config.html Log Message: Added mirror tutorial BETA --- NEW FILE fedora.css --- /* CSS for Red Hat Linux Project docs from the Documentation Project Written by Tammy Fox and Garrett LeSage Copyright 2003 Tammy Fox, Garrett LeSage, and Red Hat, Inc. License: GPL */ li p { display: inline; } div.table table { width: 95%; background-color: #DCDCDC; color: #000000; border-spacing: 0; } div.table table th { border: 1px solid #A9A9A9; background-color: #A9A9A9; color: #000000; } div.table table td { border: 1px solid #A9A9A9; background-color: #DCDCDC; color: #000000; padding: 0.5em; margin-bottom: 0.5em; margin-top: 2px; } div.note table, div.tip table, div.important table, div.caution table, div.warning table { width: 95%; border: 2px solid #D0D0B0; background-color: #FAF9E0; color: #000000; /* padding inside table area */ padding: 0.5em; margin-bottom: 0.5em; margin-top: 0.5em; } .qandaset table { border-collapse: collapse; } .qandaset { } .qandaset tr.question { } .qandaset tr.question td { font-weight: bold; padding: 1em 1em 0; } .qandaset tr.answer td { padding: 0.25em 1em 1.5em; } .qandaset tr.question td, .qandaset tr.answer td { } hr { border: 0; border-bottom: 1px solid #ccc; } h1, h2, h3, h4 { font-family: luxi sans,sans-serif; color: #22437f; font-weight: bold; } h1 { font-size: 1.75em; } h2 { font-size: 1.25em; } h3 { font-size: 1.1em; } a:link { color: #900; } a:visited { color: #48468f; } a:hover { color: #f20; } code.screen, pre.screen { font-family: monospace; font-size: 1em; display: block; padding: 10px; border: 1px solid #bbb; background-color: #eee; color: #000; overflow: auto; border-radius: 2.5px; -moz-border-radius: 2.5px; margin: 0.5em 2em; } div.example { padding: 10px; border: 1px solid #bbb; margin: 0.5em 2em; } .procedure ol li { margin-bottom: 0.5em; } .procedure ol li li { /* prevent inheritance */ margin-bottom: 0em; } .itemizedlist ul li { margin-bottom: 0.5em; } .itemizedlist ul li li { /* prevent inheritance */ margin-bottom: 0em; } --- NEW FILE generated-index.html --- Index
        Index
        Prev   

        Index

        A

        anaconda, Copying the Original Distribution
        autofs, Setting Up autofs
        automounter map, Setting Up autofs

        D

        dependencies, How to Solve Dependencies
        distribution, The Distribution Structure

        E

        exploded tree, Copying the Original Distribution

        M

        map
        automounter (see automounter map)
        mirror, About Mirrors
        up! stream, About Mirrors
        l>

        R

        repository
        yum, Configuring Repositories
        RPM, The Distribution Structure

        Y

        yum, How to Solve Dependencies
      Prev   
      4. Client Configuration Home 
      --- NEW FILE index.html --- Mirror Tutorial - BETA
      Mirror Tutorial - BETA
         Next

      Mi! rror Tutorial - BETA

      Paul W. Frields

      Copyright © 2004 Paul W. Frields

      1. Introduction
      1.1. Purpose
      1.2. Audience
      1.3. About Mirrors
      1.4. Additional Resources
      1.5. Acknowledgements
      2. Planning and Setup
      2.1. The Distribution Structure!
      2.2. Copying the Original Distribution
      2.3. Trimming Branches
      2.4. Downloading the Files
      2.4.1. Download Using HTTP or FTP
      2.4.2. The rsync Command
      2.4.3. Downloading Using rsync
      2.5. Maintaining Your Mirror
      3. Se! rver C iguration Planning
      3.1. How to Solve Dependencies
      3.2. Configuring Repositories
      3.2.1. yum-arch
      3.2.2. createrepo
      3.2.3. Repository Locations
      3.3. Configuring NFS
      4. Client Configuration
      4.1. Configuring system-config-packages
      4.1.1. Setting Up autofs
      4.1.2. /usr/share/applications/system-config-packages
      4.1.3. The rpm --aid Switch
      Index

      1. Introduction

      1.1. Pur! pose

      This tutorial presents a number of related topics that allow an administrator to seamlessly integrate mirroring and update services for Fedora Core. You can use these services to provision a classroom, laboratory, or office. These service provisions also increase ease of use and enhance user experience, adding to the perceived value of non-proprietary operating systems and software.

      [Tip]Reporting Document Errors

      To report an error or omission in this document, file a bug report in Bugzilla at http://bugzilla.redhat.com/. When you file your bug, select "Fedora Documentation" as the Product, and select the title of this document as the Component. The version of this document is mirror-tutorial-0.31 (2005-08-29).

      The maintainers of this document will automatically receive your bug report. On behalf of the entire Fedora community, thank you for helping us make improvements.

      1.2. Audience

      You will find this tutorial more useful if you are a system administrator, or a Fedora Core “power user” familiar with the following topics:

      • Fedora Core system installation

      • Basic Internet protocols (HTTP/Web, FTP)

      • Using a command line interface

      1.3. About Mirrors

      A mirror is a server that provides a copy of one or more collections of files. Mirroring a site reduces traffic to the original source site, thus spreading the stress and bandwidth costs of many users across many sites. Side benefits of running a local mirror include very fast access through the local network, providing custom services to local users, and increasing your skills in managing Internet services.

      The site from which you retrieve files to build your mirror is called an upstream mirror. If possible, choose an upstream mirror that is located close to you geographically. This reduces unnecessary traffic across transcontinental sections of the Internet, where bandwidth is limited and expensive. Use only upstream mirrors that are intended for public access, unless you have permission from the upstream mirror site administrator.

      1.4. Additional Resources

      For more information on installing Fedora Core see the Fedora Core Installation Guide at http://fedora.redhat.com/docs/fedora-install-guide-en/. For more information on basic Internet protocols, see http://library.albany.edu/internet/internet.html, or search Google at http://www.google.com/. For more general information about mirrors, see http://en.wikipedia.org/wiki/Mirror_(computing).

      1.5. Acknowledgements

      Karsten Wade provided editorial services, keeping the style crisp and consistent.

         Next
         2. Planning and Setup
      --- NEW FILE ln-legalnotice.html --- Legal Notice

      Permission is granted to copy, distribute, and/or modify this document under the terms of the GNU Free Documentation License, Version 1.2 or any later version published by the Free Software Foundation; with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts. A copy of the license is available at http://www.gnu.org/licenses/fdl.html.

      This document may be copied and distributed in any medium, either commercially or noncommercially, provided that the GNU Free Documentation License (FDL), the copyright notices, and the license notice saying the GNU FDL applies to the document are reproduced in all copies, and that you add no other conditions whatsoever to those of the GNU FDL.

      Garrett LeSage created the admonition graphics (note, tip, important, caution, and warning). Tommy Reynolds created the callout graphics. They all may be freely redistributed with documentation produced for the Fedora Project.

      mirror-tutorial-0.31 (2005-08-29)

      Red Hat, Red Hat Network, the Red Hat "Shadow Man" logo, RPM, Maximum RPM, the RPM logo, Linux Library, PowerTools, Linux Undercover, RHmember, RHmember More, Rough Cuts, Rawhide and all Red Hat-based trademarks and logos are trademarks or registered trademarks of Red Hat, Inc. in the United States and other countries.

      Linux is a registered trademark of Linus Torvalds.

      Motif and UNIX are registered trademarks of The Open Group.

      Intel and Pentium are registered trademarks of Intel Corporation. Itanium and Celeron are trademarks of Intel Corporation.

      AMD, AMD Athlon, AMD Duron, and AMD K6 are trademarks of Advanced Micro Devices, Inc.

      Windows is a registered trademark of Microsoft Corporation.

      SSH and Secure Shell are trademarks of SSH Communications Security, Inc.

      FireWire is a trademark of Apple Computer Corporation.

      All other trademarks and copyrights referred to are the property of their respective owners.

      --- NEW FILE rv-revhistory.html ---
      Revision History
      Revision 0.22004-08-31PaulWFrields

      Initial version for editorial process.

      Revision 0.212004-09-02PaulWFrields

      Revised screen sections to use inline tags as discussed on fedora-docs-list; minor error corrections.

      Revision 0.222004-09-06PaulWFrields

      Style editing.

      Revision 0.232004-09-08PaulWFrields

      Additional style editing.

      Revision 0.242004-09-09PaulWFrields

      Brought introduction section in line with Fedora Documentation Project standards.

      Revision 0.252004-10-13PaulWFrields

      Incorporated all suggested changes by KWade.

      Revision 0.262004-12-01PaulWFrields

      Updated repository setup to include createrepo.

      Revision 0.272004-12-01PaulWFrields

      Minor corrections.

      Revision 0.282005-01-30PaulWFrields

      Minor corrections.

      Revision 0.292005-07-22PaulWFrields

      Minor note on yum versioning for repodata; fixed entities ref.

      Revision 0.302005-08-01PaulWFrields

      Add entities and draft notice.

      Revision 0.312005-08-29PaulWFrields

      Use bug reporting entity, add BETA classification.

      --- NEW FILE sn-client-config.html --- 4. Client Configuration
      4. Client Configuration
      Prev   ! Next

      4. Client Configuration

      You must also correctly configure the client workstations that use your mirror. Using the mirror as a source for RPM packages, clients may have seamless access for installing basic software through system-config-packages, solving RPM package installations at the command line, and pulling bug fix and security errata updates.

      4.1. Configuring system-config-packages

      Users typically run the system-config-packages application from the GUI menu, by choosing System Settings, Add/Remove Applications. This program allows the user to change the stock installation, provided no updates have taken place yet that interfere.

      Often, system-config-packages stops functioning optimally after certain updates are installed. This is because system-config-packages solves dependencies based on the stock distribution. It is impossible for system-config-packages to predict version numbers of updates. If you intend to carry updates on your mirror, you should be aware that installing certain updates causes system-config-packages to lose its effectiveness. Some sites do not mirror all updates due to configuration management concerns. The guidance in this section is especially useful in those scenarios.

      [Tip]yum and system-config-packages

      If you plan to carry updates on your mirror, as most administrators do, you will probably not use system-config-packages much. Once the installed package versions become out of sync with the original distribution versions, yum becomes much more useful. The preferred method for installing a package in that case would be yum install package_name. See Section 3.1, “How to Solve Dependencies” for more information.

      4.1.1. Setting Up autofs

      The autofs facility allows a Fedora Core system to mount file systems on demand. The /etc/auto.master file contains an automounter map . On Fedora Core, the automounter map is a list of additional definition files that should be loaded, one for each directory in the map. An example line from /etc/auto.master is shown below: 

      /misc  /etc/auto.misc  --timeout=60

      The first term in the line is the directory which is reserved for automounting. The second term is the automount file which should be consulted to determine any maps for that directory. The third term in the example indicates that if a map under /misc is not busy for 60 seconds, it is unmounted.

      The /etc/auto.misc file contains entries similar to the following example. 

      remote  -ro,soft,intr  host.foobar.org:/pub

      This line is contained in the automounter map file for the /misc directory. The first term is a key which is the name of a directory that appears upon demand. The second term is actually a list of options, identical to those that would be used for a real mount command. The final term is the file system (local or remote) to mount. In the above example, if the user of this station accesses the directory /misc/remote, an NFS mount is automatically performed. The user's command appears to hesitate, depending on how fast the NFS server responds. Then /misc/remote appears to be full of whatever content is on host.foobar.org in the /pub NFS share.

      You can use this function to provide NFS access to the stock distribution for Fedora Core. Choose a directory to map in the /etc/auto.master file, and match it to a corresponding automounter map file. The easiest way to do this is to simply remove the comment # from the front of the line attaching /misc to /etc/auto.misc. The default timeout should be sufficient.

      Make an entry in /etc/auto.misc similar to this. You can have multiple entries, each one with a different key. For instance, each key could be mapped to a different version of Fedora Core that you have available on the local mirror. 

      fc4  -ro,soft,intr  mirror.mydomain.org:/var/ftp/pub/linux/fedora/core/4

      Now restart the autofs service: 

      /sbin/service autofs restart

      To access the stock distribution for Fedora Core 4 the user can simply type cd /misc/fc4. The share is automatically mounted and the files simply appear in that local directory.

      4.1.2. /usr/share/applications/system-config-packages

      Now that autofs has been configured, your client workstations need to be configured so that system-config-packages points to the mirror's NFS share. Edit the /usr/share/applications/system-config-packages file's Exec= line to add a switch pointing to the share: 

      Exec=/usr/bin/system-config-packages --tree=/misc/fc4/i386/os

      When users choose System Settings, Add/Remove Applications from the GUI main menu, the system now automatically resolves package dependencies from the mirror. The restrictions stated above in yum and system-config-packages apply.

      4.1.3. The rpm --aid Switch

      The --aid switch for the rpm command also automatically solves dependencies. It performs this function based on the rpmdb-fedora package. That package is a preset database for a system that has every RPM package in the Fedora Core distribution installed. Even if a system does not itself have every package installed, it can consult the rpmdb-fedora package database to see what such a system would look like. By using the --aid switch, clients can issue a single rpm --install --aid command against an original Fedora Core package, and have all dependencies automatically installed as well.

      Two steps are required for this process. First, install the rpmdb-fedora package: 

      rpm --install /misc/fc4/i386/os/Fedora/RPMS/rpmdb-fedora-*.rpm

      Then, edit the file /etc/rpm/macros.solve, which is part of the rpmdb-fedora package. Change the following lines to enable package resolution: 

      %_solve_pkgsdir  /misc/fc4/i386/os/Fedora/RPMS/
%_solve_name_fmt  %{?_solve_pkgsdir}%%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm

      Users now issue a single command to install any package from the stock distribution, and all dependencies are solved for them. For example: 

      rpm --install --aid /misc/fc4/i386/os/Fedora/RPMS/kdeutils-*.rpm

      If a user forgets the --aid switch, they still receive hints. Normally rpm displays a slightly cryptic list of capability requirements, instead of straightforward package names. If you edit /etc/rpm/macros.solve as shown, rpm displays a list of required package names instead.

      Package dependency solutions using --aid are also restricted as shown above in yum and system-config-packages.

      Prev   Next
      3. Server Configuration Planning Home Index
      --- NEW FILE sn-planning-and-setup.html --- 2. Planning and Setup
      2. Planning and Setup
      Prev   Next

      2. Planning and Setup

      2.1. The Distribution Structure

      The Fedora distribution, which is the collection of all Fedora-related files, uses the directory tree in Example 1, “Fedora directory tree”. It may include multiple versions of Fedora Core. The tree design makes "trimming" of unnecessary or undesired files easier. When setting up a mirror, duplicate this tree exactly, or as closely as possible. Doing so makes automating nightly updates easier. 

      fedora
+-- linux
    +-- core
        |-- 1 
        |   ... 
        +-- 4 
        |   +-- SRPMS 
        |   +-- i386 
        |   |   +-- debug 
        |   |   +-- iso 
        |   |   +-- os 
        |   |       +-- Fedora 
        |   |       +-- SRPMS 
        |   |       +-- images 
        |   |       +-- isolinux 
        |   +-- x86_64 
        +-- development 
        |      ...
        +-- test 
        |      ...
        +-- updates 
            +-- 1 
            |   ... 
            +-- 4 
            |   +-- SRPMS 
            |   +-- i386 
            |   +-- x86_64 
            +-- testing 
                +-- 1 
                |   ... 
                +-- 4 
                    +-- SRPMS 
                    +-- i386 
                    +-- x86_64

      Example 1. Fedora directory tree

      [Note]Naming conventions

      Throughout the rest of the document, /var/ftp/pub/mirror represents the folder where all your mirrored files are stored. You may substitute a different location. This location simplifies sharing your mirror, due to the shipping configuration of Fedora Core. See Section 3, “Server Configuration Planning” for more information. The site name mirror.example.com represents the upstream mirror.

      The fedora/linux/core/4/arch/os directory contains a copy of all the original distribution files for Fedora Core 4. They are the same files found on the DVD and CD-ROM version of the distribution. The Fedora subfolder contains all the files that are necessary for installation, including the entire collection of Fedora Core RPM packages. The images folder contains copies of any floppy diskette or CD-ROM images that boot a system into installation or rescue modes. The fedora/linux/core/4/arch/iso folder contains images of the CD-ROM version of the distribution.

      [Note]RPM packages

      RPM, originally the Red Hat Package Manager and now the RPM Package Manager, is not just a file format. RPM is also a system which tracks and interconnects software and version information. The RPM system is quite popular, and many other Linux distributions use RPM as well. Read more information on RPM at http://www.rpm.org/. This document contains helpful hints on making the most of RPM, in Section 3, “Server Configuration Planning” and Section 4, “Client Configuration”.

      The SRPMS folders under architecture-specific branches are links which point to the main SRPMS folder for that distribution. For example, fedora/linux/core/2/i386/os/SRPMS is a link which points to fedora/linux/core/2/SRPMS.

      A Fedora mirror consists of at least the original ISO images or the distribution files. If possible, include both, provided you have sufficient disk space and/or bandwidth.

      2.2. Copying the Original Distribution

      If you already have reliable CD-ROM installation discs of a distribution, reduce your initial bandwidth and time spent mirroring by copying the files from the discs to your server. Copy all files from Installation Disc 1 into the fedora/linux/core/4/arch/os folder. Then copy all files from the Fedora folder of each of the remaining Installation discs into the fedora/linux/core/4/arch/os/Fedora folder on the server.

      Copy all the files from the SRPMS folder on each of the “Sources” discs to the fedora/linux/core/4/SRPMS folder on the server. Make a link in the os folder that occurs under each architecture. Follow this example: 

      cd /var/ftp/pub/mirror/fedora/linux/core/4/i386/os/Fedora
ln ../../SRPMS SRPMS

      The documentation for anaconda, the Fedora Core installation program, calls this directory structure an exploded tree. This is because the package data on each CD is extracted, or exploded, to a large directory tree with a predetermined structure. The anaconda installer expects this structure to some extent.

      If you only include CD images, create a mirror suitable for installation services by mounting each CD image under the arch/os/ directory. Make a directory for each disc, naming them disc1, disc2, and so on. Mount each disc on the appropriate folder, and add entries to /etc/fstab to perform this mount automatically in case of a reboot. Each entry looks like this: 

      /path/i386/iso/FC4-i386-disc1.iso  /path/i386/os/disc1  iso9660  defaults  0 0

      The anaconda application automatically detects these folders and uses them properly. In addition, system configuration tools such as system-config-packages also continue to work properly when pointed at the parent of the ISO image mount points.

      There are drawbacks to using CD ISO images in this fashion. For instance, no one directory contains the entire distribution of RPM packages. Soft links circumvent this problem, but your server security policies may not permit them. Fedora Core also comes in a ISO format DVD image, which alleviates this problem. Users who do not have DVD burning hardware, however, cannot use this image to make discs for their own use.

      You only need a single line in /etc/fstab for mounting the Fedora Core DVD ISO image. The entry looks like this: 

      /path/i386/iso/FC4-i386-DVD.iso  /path/i386/os  iso9660  defaults  0 0

      2.3. Trimming Branches

      You may omit almost any branch of the tree that you do not plan to use. Consider carefully the impact of excluding that folder. Branches you might trim from your mirror include:

      Older versions of Fedora Core (any numbered directory).

      Before you exclude an old version, ensure this does not adversely affect any of your users. These adverse affects can come in many forms. For example, the level of support for certain hardware sometimes changes between releases of Fedora Core. Users who cannot install a previous version may not be able to use Fedora Core. Your users might need to perform software-related tasks such as building packages for different Fedora Core releases. Always remain aware of the needs of your users during the planning stage.

      Folders for architectures your site does not support.

      If you do not have any x86-64 hosts to support, trimming these folders eliminates several gigabytes of extra files. If you support x86-64 hosts later, though, you must restore mirroring of these branches.

      The development folder (formerly “Rawhide”).

      This folder contains all the latest “bleeding-edge” packages from the Fedora Project. If you participate in active Fedora development, you should not trim this branch. Fedora development moves at a rapid pace and requires frequent updates to the latest development package versions. However, the frequent updates cause your mirror to download significant amounts of material during the regular update cycle.

      The testing folders.

      These branches contain updates that are being subjected to quality assurance through public testing, as well as the test or “pre-release” versions of the Fedora Core distribution. The testing folder under the main core tree is where test versions of the distribution, such as Fedora Core 4 test1, are kept. (Users of Fedora Core test distributions are often directed to use the development branch to update packages.) The testing folder, under updates, contains package updates that have not yet passed the public testing phase.

      The debug folders.

      These folders contain packages that enable developers and skilled users to interpret data created when a program crashes or encounters a bug. If you participate actively in Fedora development, you should not trim these folders. If you trim this branch, you may still download individual packages as needed from a nearby public mirror site.

      The SRPMS folders (and links thereto).

      These folders contain the original source for all the binary RPM packages in the distribution. You may download these packages individually as needed to save space on your local mirror.

      Unless your site closely manages workstation configuration, you should probably not trim any of the updates branches for the distributions you support. These locations contain packages handling bug fixes, security patches, and errata updates which your users probably want.

      2.4. Downloading the Files

      Locate a public mirror site for Fedora Core by referring to the main project site's mirror page, http://fedora.redhat.com/projects/docs/. Once you have selected a nearby mirror site, note what services it offers (FTP, HTTP, and/or rsync). A mirror is usually servicing a large number of users. Choose off-peak hours, when possible, to download a large set of files. Be aware of any timezone differences when estimating off-peak hours.

      2.4.1. Download Using HTTP or FTP

      To download via HTTP or FTP, use the wget command. wget recurses subdirectories automatically and pulls down entire trees of data with a single command. If you are not careful, however, it is possible to pull down much more data than you intended. The following commands mirror the entire current Fedora Core distribution: 

      cd /var/ftp/pub/mirror 
wget --mirror -np -nH --cut-dirs=2 http://mirror.example.com/pub/mirror/fedora/linux/core/4/

      Note the options used above:

      • --mirror turns on recursion (descends into all subdirectories), and duplicates file timestamps;

      • -np prevents wget from ascending into the parent directory;

      • -nH prevents wget from writing a directory named after the host (in this case, mirror.example.com);

      • --cut-dirs=n truncates the first n directories in the path. In the example above, --cut-dirs=2 prevents wget from writing the /pub/mirror portion of the path into your mirror.

      The same syntax works for both HTTP and FTP mirrors. It is possible that you may download some extraneous files if the HTTP site formats its pages for browser viewing. These files can be safely deleted, but return each time the mirror updates unless you exclude them using special options. See the wget man pages for more information.

      2.4.2. The rsync Command

      Use the rsync command to synchronize a set of files and/or directories with a remote host. It operates in much the same way as rcp, but it is usually faster. One reason for the speed is that rsync has a special protocol that evaluates and skips files (or portions of files) that are already downloaded.

      Begin by identifying the modules available on the upstream mirror site you have chosen. Note that the double colon “::” is always used after the host name to separate it from the rest of the rsync path. The following command generates a list of “modules” on the upstream mirror. 

      rsync mirror.example.org::

      These modules are roughly equivalent to top-level directories, and they follow the same rules. To list any subdirectory of the upstream mirror, add the directory path to the command above. For example, on many mirrors, the fedora-linux-core module is equivalent to the fedora/linux/core path found at the Fedora Project main download server. To list the contents of the Fedora Core 4 distribution folder on the upstream server, issue the following command. Do not forget the trailing slash “/”. Without it, you only receive a listing of a folder name that matches the last component of the remote path. 

      rsync mirror.example.org::fedora-linux-core/4/

      2.4.3. Downloading Using rsync

      To download via rsync, add a destination path on your system to the end of the command line. The resulting tree of files from the listing you perform are downloaded to the local path you specify. Remember, if you leave off the trailing slash on the remote path, then the last component of that path is created as a folder, and its contents are copied. 

      rsync filehouse.example.org::files/misc/ /var/ftp/pub/misc/

      When downloading using rsync for mirror purposes, use some of the command line switches to improve performance and feedback. The switches -PHav enable the following rsync features:

      • -P — recover partially-downloaded files, and show a progress meter

      • -H — preserve hard links

      • -a — recurse all directories, and preserve as much file information as possible, including timestamps, ownership, permissions, device files (if you are running as root), and soft links

      • -v — give verbose feedback to the screen

      Remove the -v switch if you run this mirroring process as part of a script, or have no need to monitor progress. The following example mirrors all available versions of Fedora Core from an upstream site.

      [Caution]Example command downloads many gigabytes of files

      This command downloads many gigabytes of files, and is intended for use as an example only. Do not run this command if you do not understand the consequences. 

      rsync -PHav mirror.example.org::fedora-linux-core/4/ /var/ftp/pub/mirror/fedora/core/4

      The -n switch performs a “dry run” using the other given parameters. Use this switch to test any rsync command if you are unsure what files you will receive. See also Possible data loss.

      The -z switch enables compression during the rsync process. The server compresses data before transmission, and the client decompresses the data before writing it to disk.

      [Tip]Compression using rsync

      The vast majority of the Fedora Core distribution consists of RPM files, which are already compressed data. Therefore, additional compression does not save time, and instead induces an unnecessary load on the upstream mirror CPU. As a courtesy, do not use the -z switch for this purpose.

      The next section features some additional switches that can be used to automatically trim branches from the tree of downloaded folders. With proper usage, they result in a mirror that is exactly as organized and full-featured as any high-volume public upstream site.

      [Warning]Possible data loss

      If you are not exceedingly careful in using these switches, it is possible to delete large portions of your mirrored data. Fixing this problem might simply require performing the copying steps outlined in Section 2.2, “Copying the Original Distribution” above. On the other hand, if you are also careless about your destination path, and you are running as root, you could put your entire system at risk. Know your environment before using these switches:

      • What is your current working directory? Use pwd to find out, if you are unsure.

      • Are you logged in as root? If you are using SELinux extensions, what is your current security context?

      • Have you tested this command using the -n switch (see Section 2.4.3, “Downloading Using rsync”)?

      Use the --exclude switch, along with a simple pattern, to disallow download of certain files and/or folders. For instance, --exclude "*.iso" excludes the download of any file whose name ends with the string ".iso".

      Use the --delete switch, again with a pattern, to remove any file from the local system which does not have a match on the upstream mirror. This switch prevents unwanted file debris from cropping up in your mirror. You can also use it to retroactively trim branches of the tree which you no longer wish to maintain or download.

      Wildcards are permitted with rsync commands, including the asterisk *, question mark ?, and brackets [ ]. The question mark and brackets work as in the shell; the former matches any single character, while the brackets define a set of characters to be matched. Asterisks are especially powerful when combined with a portion of a file name. The double asterisk ** pattern matches any character, including slashes; a single asterisk * matches any character, but stops at a slash. Therefore, be judicious about using either. The double asterisk is very useful for mirroring a tree that includes multiple instances of directories and files that contain a pattern. A good example is mirroring several versions of Fedora Core, where certain folder names appear in every version.

      [Tip]Pattern matching wildcards

      Use double asterisks to trim out directories that repeat throughout a mirrored tree. For example, when mirroring for a site that only uses i386 architecture machines, you may trim all files and folders marked for x86_64 architecture, using the switch --exclude "**x86_64**". This matches not only folders marked x86_64, but also files such as ISO images for x86_64, which are indicated by file names such as FC4-x86_64-disc1.iso.

      Process a long list of exclusions and deletions with the --exclude-from and --delete-from options. Follow each tag with a file name that includes a list of patterns, one per line, to be matched by the appropriate option.

      These syntax hints only scratch the surface of rsync, but suffice to make your first mirror. Once you have selected your site and formulated your excludes and deletes, run your rsync command with the -n option. Redirect output to a file so you can examine the resulting list of files in the editor or pager of your choice.

      The following example mirrors the entire Fedora Core 4 distribution, with --exclude options that avoid downloading:

      The -n switch is included for testing purposes. Backslashes at the ends of lines indicate this example is a single command line. 

      rsync -Pan --delete --exclude "**x86_64**" --exclude "**headers**" \
  --exclude "**debug**" --exclude "**iso**" \
  mirror.example.com::fedora-linux-core/4/ \
  /var/ftp/pub/mirror/fedora/core/4

      2.5. Maintaining Your Mirror

      Fedora mirrors are even more useful when they are more than just a snapshot of the distribution at release time. Most mirror administrators also choose to carry updates and errata packages. Repositories of updates or development trees change daily, and your mirror should reflect these changes.

      [Important]rsync etiquette

      If you plan to do regular updates of your mirror that include large amounts of data, you should ask permission from the administrator of the upstream mirror. Downloading nightly package updates for the official releases of Fedora Core 4 should not require notification, as they are rarely more than a few megabytes. However, the development tree routinely turns over several hundred megabytes nightly. Take these factors into consideration before putting any maintenance scripts into effect.

      Once your rsync command is working as desire, you may want to place it in a nightly cron script. The cron system allows you to schedule regularly-occurring jobs on your system. The intervals are highly configurable, but a nightly run keeps your mirror synchronized with updates and errata. Make sure your nightly cron job follows some simple guidelines:

      • If your upstream mirror only synchronizes once or twice daily, run your job after the upstream mirror completes its update. This insures your mirror not only gets the freshest material, but also does not interfere with the upstream server's bandwidth while it runs its job. If you do not know this time, it is usually safe to plan your downloads for pre-dawn hours.

      • Be sure you have sufficient disk space for additional packages. The updates tree in particular grows over time as more errata packages are released.

      • Always test your script thoroughly before allowing it to run automatically. Use a -n or -v switch in the rsync command line for testing, and then remove it once you have completed testing. Remember that the results are e-mailed to your account on your system unless you specify differently. Read the crontab(5) man pages for additional information, with the command man 5 crontab.

      Prev   Next
      Mirror Tutorial - BETA Home 3. Server Configuration Planning
      --- NEW FILE sn-server-config.html --- 3. Server Configuration Planning
      3. Server Configuration Planning
      Prev   Next

      3. Server Configuration Planning

      Decide what services your mirror will offer to clients. There are at least three services useful for providing Fedora installation and update services: HTTP, FTP, and NFS. Some or all of these services can be used for offering post-installation functions such as updates or installing additional packages.

      Install the vsftpd package for FTP services. Install the httpd package to use the Apache HTTP server. Most Fedora Core systems already have the nfs-utils package installed, which contains the NFS server.

      To start a service, use the /sbin/service service start command. To enable that server by default at boot time, use the chkconfig service on command.

      One recommended method is to download all mirrored files into /var/ftp/pub, add a link in /var/www/html that points to /var/ftp/pub, and share out /var/ftp/pub via NFS as well. FTP and HTTP services do not require any further configuration to work properly. However, you should evaluate your site's security needs before enabling them. NFS service configuration is explained below in Section 3.3, “Configuring NFS”.

      To share out the public FTP area via HTTP, issue the following command: 

      ln -s /var/ftp/pub /var/www/html/pub

      Your clients may now visit any area of your mirror by using the URL http://server.mydomain.org/pub/path. To create an NFS share, add a line to /etc/exports. This example shares out the Fedora Core 4 i386 stock distribution with read-only access for any host in the mydomain.org domain. 

      /var/ftp/pub/linux/fedora/core/4/i386/os  *.mydomain.org(ro,sync,root_squash)

      To reread the NFS server configuration files and export the new share, use the following command: 

      exportfs -ar

      Refer to Section 3.3, “Configuring NFS” for a list of commands for starting services both on demand and at boot time.

      3.1. How to Solve Dependencies

      Every RPM package has a header that contains all the vital information about that package. This information includes name, version and release, contents, the capabilities provided by the package, and any prerequisites. These prerequisites may include dependencies. A dependency is a requirement for one or more additional packages.

      Packages installed without satisfying their dependencies may not work correctly. Dependencies may create a problem for users who are trying to install a single package. Manually determining and resolving dependencies is difficult. Fedora Core provides the yum utility for solving these dependencies automatically, providing an improved user experience.

      The Yellow Dog Updater Modified, or yum, is a Python-based system for computing and solving RPM dependencies. A yum client retrieves a cache of headers from its repository server, as well as a list of available RPM packages and their exact locations on the server. It can do this via HTTP or FTP, as well as using standard file system calls (either local or remote via NFS). The client computes solutions to any package dependencies using the downloaded header information, and simply requests all necessary RPM packages once it has finished. The yum command relies on rpm functions to perform many of the computations involved in the process.

      A drawback to yum is that the first time it is run, it must download a header for every package installed on the system in order to determine available updates. However, running a local mirror nullifies this drawback. The yum command can, of course, download many megabytes of headers almost instantly on a standard Ethernet LAN. The yum utility is the most popular update method for Fedora Core.

      For more information about using yum, refer to http://fedora.redhat.com/docs/yum/.

      3.2. Configuring Repositories

      A yum repository is a collection of packages on a server which supports yum clients. Repositories can serve both types of clients if desired.

      To set up a yum repository, you must write a directory that contains information which the clients require to resolve RPM dependencies. The directory's name depends on the version of yum it supports. It is permissible to have both kinds of repository information in a single repository.

      To support older yum clients, use the yum-arch command. To support current yum clients, use the createrepo command.

      [Important]Supporting Fedora Core 3 and beyond

      Fedora Core 3 ships with a newer version of yum. To support Fedora Core 3 yum clients, you must use createrepo on your server's repositories.

      3.2.1. yum-arch

      A directory which supports older versions of yum (before 2.2) is named headers. It is created by using the command yum-arch, which is run against the directory under which you want the headers directory to appear. The yum-arch program searches recursively through that directory and any subdirectories for RPM packages, and includes them in the header data. 

      yum-arch -l -s /var/ftp/pub/linux/fedora/core/4/i386/os

      The -l switch follows symbolic links. The -s switch includes SRPMS (source RPM packages) in the header list. The command above creates the yum header cache in the directory /var/ftp/pub/linux/fedora/core/4/i386/os/headers.

      3.2.2. createrepo

      The createrepo command creates repository information to support newer versions of yum (and possibly other repository client programs). The createrepo command stores this data in a folder named repodata. Just as with yum-arch, run createrepo against the directory under which you want the repodata directory to appear. The createrepo program also searches recursively for RPM packages to include in the repository data.

      The following command creates the repository data in the directory /var/ftp/pub/linux/fedora/core/4/i386/os/repodata. 

      createrepo /var/ftp/pub/linux/fedora/core/4/i386/os

      You may not be able to foresee all the possible uses for your server's repositories. To minimize problems for your clients, create both kinds of repository data for any repositories.

      3.2.3. Repository Locations

      Typically yum-arch or createrepo is run against at least the following locations:

      • The stock distribution; for example, /var/ftp/pub/linux/fedora/core/4/i386/os/. For yum-arch use the -l and -s options to follow the linked directory SRPMS and include the source packages therein.

      • Official updates to the distribution; for example, /var/ftp/pub/linux/fedora/core/updates/4/. Once again, for yum-arch use -l and/or -s if appropriate.

      3.3. Configuring NFS

      Some client-side utilities also resolve dependencies automatically. These utilities require more detailed configuration of the client workstation. For more information, see Section 4, “Client Configuration” below. These utilities, however, require standard file system access to package collections. For this reason, you may require NFS on your mirror. Configuration of the client depends in large part on how you decide to implement NFS sharing on the mirror.

      It is difficult to share subdirectories of other shared directories. Therefore, think of your mirror as offering many services, each one to be considered for NFS sharing. For example, share both the stock distribution of Fedora Core 2 and the stock distribution of Fedora Core 3.

      The client side tools discussed later can use a directory of ISO images or an exploded tree of package data (see Section 2.2, “Copying the Original Distribution”). You may share out any or all of these, provided your shares do not clash as described above.

      To share via NFS, edit the /etc/exports file. A typical share, exported with read-only access for any host on any network, looks like this: 

      /mnt/media *(ro,all_squash,async)

      The all_squash option ensures that no users accessing the share using their local root account receive equivalent access on the share. This feature keeps some small measure of security even on a public share, since a file readable only by root on the server is not readable by an NFS client. The async option allows asynchronous read/writes, which is not dangerous in this case because the share is read-only. The * is a host designator, in this case matching any host name or IP address. You may wish to restrict this share to your internal network. You may declare either a matching name or IP address specification. You can find more detailed information by reading the man pages for the /etc/exports file by using the command man 5 exports.

      [Important]Access control format

      Be certain that you do not have a space between the host specification and the option listing in parentheses ( ). A space causes the NFS daemon to consider that entry as two separate access controls. In the example above, a space causes the first access control to match all hosts and allow write access, which is the default! The second access control is never reached because the first matches any host first.

      To share the proper directories from your mirror, use one of the following forms. To share your exploded tree, export the directory that contains the Fedora folder (note the capitalization). For i386 architectures: 

      /var/ftp/pub/linux/fedora/core/4/i386/os *(ro,all_squash,async)

      To share a directory full of ISO images, export that directory: 

      /var/ftp/pub/linux/fedora/core/4/i386/iso *(ro,all_squash,async)

      Once you have edited the /etc/exports file, make sure that the NFS server is installed and started properly on the mirror. The portmap and nfs-utils packages must be installed. Configure them to be turned on at boot time by default. 

      /sbin/chkconfig portmap on
/sbin/chkconfig nfslock on
/sbin/chkconfig nfs on

      To check if any of these services are currently running, use the /sbin/service service_name status command: 

      /sbin/service portmap status
/sbin/service nfslock status
/sbin/service nfs status

      To restart a service, use the /sbin/service service_name restart command: 

      /sbin/service portmap restart
/sbin/service nfslock restart
/sbin/service nfs restart

      If any service is not started, use the command /sbin/service service_name start to start it, as in the following examples: 

      /sbin/service portmap start
/sbin/service nfslock start
/sbin/service nfs start

      To change your exports when the NFS service is already running, use the command /usr/sbin/exportfs -ar. The command /usr/sbin/showmount -e displays a list of the current NFS exports on the local host machine.

      Prev   Next
      2. Planning and Setup Home 4. Client Configuration
      From fedora-extras-commits at redhat.com Wed Sep 28 21:37:05 2005 From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields)) Date: Wed, 28 Sep 2005 17:37:05 -0400 Subject: web/html/docs/beta/mirror-tutorial/stylesheet-images 1.png, NONE, 1.1 10.png, NONE, 1.1 11.png, NONE, 1.1 12.png, NONE, 1.1 13.png, NONE, 1.1 14.png, NONE, 1.1 15.png, NONE, 1.1 2.png, NONE, 1.1 3.png, NONE, 1.1 4.png, NONE, 1.1 5.png, NONE, 1.1 6.png, NONE, 1.1 7.png, NONE, 1.1 8.png, NONE, 1.1 9.png, NONE, 1.1 caution.png, NONE, 1.1 important.png, NONE, 1.1 note.png, NONE, 1.1 tip.png, NONE, 1.1 warning.png, NONE, 1.1 Message-ID: <200509282137.j8SLb5ee017296@cvs-int.fedora.redhat.com> Author: pfrields Update of /cvs/fedora/web/html/docs/beta/mirror-tutorial/stylesheet-images In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17233/mirror-tutorial/stylesheet-images Added Files: 1.png 10.png 11.png 12.png 13.png 14.png 15.png 2.png 3.png 4.png 5.png 6.png 7.png 8.png 9.png caution.png important.png note.png tip.png warning.png Log Message: Added mirror tutorial BETA From fedora-extras-commits at redhat.com Wed Sep 28 21:56:43 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Wed, 28 Sep 2005 17:56:43 -0400 Subject: rpms/koffice/devel koffice-qt3.3.5.patch,1.3,1.4 Message-ID: <200509282156.j8SLuiZp017417@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/koffice/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17395 Modified Files: koffice-qt3.3.5.patch Log Message: - even more qt fixes koffice-qt3.3.5.patch: Index: koffice-qt3.3.5.patch =================================================================== RCS file: /cvs/extras/rpms/koffice/devel/koffice-qt3.3.5.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- koffice-qt3.3.5.patch 28 Sep 2005 14:47:48 -0000 1.3 +++ koffice-qt3.3.5.patch 28 Sep 2005 21:56:41 -0000 1.4 @@ -42,3 +42,13 @@ - kispreviewview.h - +--- krita/ui/wdgnewimage.ui.orig 2005-09-28 23:53:58.000000000 +0200 ++++ krita/ui/wdgnewimage.ui 2005-09-28 23:54:20.000000000 +0200 +@@ -320,7 +320,6 @@ + + knuminput.h + knuminput.h +- kiscmbidlist.h + kcolorcombo.h + + From fedora-extras-commits at redhat.com Wed Sep 28 22:21:34 2005 From: fedora-extras-commits at redhat.com (Karsten Wade (kwade)) Date: Wed, 28 Sep 2005 18:21:34 -0400 Subject: CVSROOT avail,1.13,1.14 Message-ID: <200509282221.j8SMLYIP018948@cvs-int.fedora.redhat.com> Author: kwade Update of /cvs/fedora/CVSROOT In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18929 Modified Files: avail Log Message: Some traction on this guide? Index: avail =================================================================== RCS file: /cvs/fedora/CVSROOT/avail,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- avail 19 Sep 2005 22:45:16 -0000 1.13 +++ avail 28 Sep 2005 22:21:32 -0000 1.14 @@ -51,5 +51,6 @@ avail | pfrields | web/html/participate/documentation-faq/ avail | pfrields | web/html/participate/documentation-guide/ avail | pfrields,mjohnson | web/html/participate/documentation-quick-start/ +avail | pfrields | web/html/participate/developers-guide/ From fedora-extras-commits at redhat.com Thu Sep 29 04:21:49 2005 From: fedora-extras-commits at redhat.com (Aaron Kurtz (dragoon)) Date: Thu, 29 Sep 2005 00:21:49 -0400 Subject: owners owners.list,1.271,1.272 Message-ID: <200509290421.j8T4LniV027750@cvs-int.fedora.redhat.com> Author: dragoon Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27731 Modified Files: owners.list Log Message: Changing back projects now that bugzilla account is proper Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.271 retrieving revision 1.272 diff -u -r1.271 -r1.272 --- owners.list 28 Sep 2005 20:26:55 -0000 1.271 +++ owners.list 29 Sep 2005 04:21:47 -0000 1.272 @@ -173,7 +173,7 @@ Fedora Extras|fbida|FrameBuffer Imageviewer|adrian at lisas.de|extras-qa at fedoraproject.org| Fedora Extras|fedora-rpmdevtools|Fedora RPM Development Tools|ville.skytta at iki.fi|extras-qa at fedoraproject.org| Fedora Extras|fedora-usermgmt|Fedora tools for user management|enrico.scholz at informatik.tu-chemnitz.de|extras-qa at fedoraproject.org| -Fedora Extras|feh|Fast command line image viewer using Imlib2|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| +Fedora Extras|feh|Fast command line image viewer using Imlib2|a.kurtz at hardsun.net|extras-qa at fedoraproject.org| Fedora Extras|fftw3|Fast Fourier Transform library|qspencer at ieee.org|extras-qa at fedoraproject.org| Fedora Extras|fftw|Fast Fourier Transform library|compton at pcompton.com|extras-qa at fedoraproject.org| Fedora Extras|fig2ps|Utility for converting xfig pictures to PS/PDF|qspencer at ieee.org|extras-qa at fedoraproject.org| @@ -259,9 +259,9 @@ Fedora Extras|gnofract4d|Gnofract 4D is a Gnome-based program to draw fractals|pmatilai at laiskiainen.org|extras-qa at fedoraproject.org| Fedora Extras|gnomad2|Manager for digital audio players|triad at df.lth.se|extras-qa at fedoraproject.org| Fedora Extras|gnome-applet-netmon|GNOME Network Load Applet|ghenry at suretecsystems.com|extras-qa at fedoraproject.org| -Fedora Extras|gnome-applet-netspeed|GNOME applet that shows traffic on a network device|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| +Fedora Extras|gnome-applet-netspeed|GNOME applet that shows traffic on a network device|a.kurtz at hardsun.net|extras-qa at fedoraproject.org| Fedora Extras|gnome-applet-rhythmbox|A GNOME panel applet to control Rhythmbox's playback|ivazquez at ivazquez.net|extras-qa at fedoraproject.org| -Fedora Extras|gnome-applet-sensors|Gnome panel applet for hardware sensors|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| +Fedora Extras|gnome-applet-sensors|Gnome panel applet for hardware sensors|a.kurtz at hardsun.net|extras-qa at fedoraproject.org| Fedora Extras|gnome-applet-timer|A countdown timer applet for the GNOME panel|wickerpms at arcor.de|extras-qa at fedoraproject.org| Fedora Extras|gnome-blog|GNOME panel object for posting blog entries|bdpepple at ameritech.net|extras-qa at fedoraproject.org| Fedora Extras|gnome-common|Useful things common to building gnome packages from scratch|toshio at tiki-lounge.com|extras-qa at fedoraproject.org| @@ -410,7 +410,7 @@ Fedora Extras|libcdio|A CD-ROM input and control library|adrian at lisas.de|extras-qa at fedoraproject.org| Fedora Extras|libchewing|Traditional Chinese phonetic input method library|petersen at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|libcmml|Library for handling Continuous Media Markup Language|thomas at apestaart.org|extras-qa at fedoraproject.org| -Fedora Extras|libdaemon|libdaemon is a lightweight C library that eases the writing of UNIX daemons|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| +Fedora Extras|libdaemon|libdaemon is a lightweight C library that eases the writing of UNIX daemons|a.kurtz at hardsun.net|extras-qa at fedoraproject.org| Fedora Extras|libdnet|Simple portable interface to lowlevel networking routines|oliver at linux-kernel.at|extras-qa at fedoraproject.org| Fedora Extras|libebml|The Extensible Binary Meta Language library|anvil at livna.org|extras-qa at fedoraproject.org| Fedora Extras|libesmtp|SMTP client library|pawsa at theochem.kth.se|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Thu Sep 29 09:32:29 2005 From: fedora-extras-commits at redhat.com (Mark Cox (mjc)) Date: Thu, 29 Sep 2005 05:32:29 -0400 Subject: fedora-security/audit fc4,1.64,1.65 Message-ID: <200509290932.j8T9WTaa003524@cvs-int.fedora.redhat.com> Author: mjc Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3503 Modified Files: fc4 Log Message: Away yesterday, so catch up on fc4 issues Index: fc4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc4,v retrieving revision 1.64 retrieving revision 1.65 diff -u -r1.64 -r1.65 --- fc4 27 Sep 2005 09:36:51 -0000 1.64 +++ fc4 29 Sep 2005 09:32:27 -0000 1.65 @@ -1,8 +1,9 @@ -Up to date CVE as of CVE email 20050926 -Up to date FC4 as of 20050926 +Up to date CVE as of CVE email 20050928 +Up to date FC4 as of 20050928 ** are items that need attention +2005-3089 ** firefox 2005-3055 VULNERABLE (kernel) 2005-3054 ** php 2005-3053 backport (kernel) [since FEDORA-2005-820] patch-2.6.12.5 @@ -27,6 +28,7 @@ 2005-2796 version (squid, fixed 2.5.STABLE11) [since FEDORA-2005-913] was backport since FEDORA-2005-851 2005-2794 version (squid, fixed 2.5.STABLE11) [since FEDORA-2005-913] was backport since FEDORA-2005-851 2005-2728 backport (httpd, fixed 2.0.55-dev) [since FEDORA-2005-849] +2005-2710 version (helixplayer, fixed 1.0.6) [since FEDORA-2005-940] 2005-2707 VULNERABLE (thunderbird) 2005-2707 version (firefox, fixed 1.0.7) [since FEDORA-2005-926] 2005-2707 version (mozilla, fixed 1.7.12) [since FEDORA-2005-927] From fedora-extras-commits at redhat.com Thu Sep 29 12:43:09 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 29 Sep 2005 08:43:09 -0400 Subject: rpms/sbcl/FC-4 sources,1.3,1.4 .cvsignore,1.3,1.4 Message-ID: <200509291243.j8TCh92W008198@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/sbcl/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8177 Modified Files: sources .cvsignore Log Message: update x86 (local) bootstrap Index: sources =================================================================== RCS file: /cvs/extras/rpms/sbcl/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 28 Sep 2005 01:23:45 -0000 1.3 +++ sources 29 Sep 2005 12:43:06 -0000 1.4 @@ -1,4 +1,4 @@ f594f18813c08f262a6df9a36288adcb sbcl-0.9.5-source.tar.bz2 3a72d0785ce0a8e02f9af632c2a4f217 sbcl-0.8.15-powerpc-linux-binary.tar.bz2 67ec41e624a3f2ad7f6f3cde1bd001d3 sbcl-0.9.4-x86-64-linux-binary.tar.bz2 -947d1cde2c1c80416b5f9fb4e4c81383 sbcl-0.9.4-x86-linux-binary.tar.bz2 +cb01b462b517889723eeaf63b5474c70 sbcl-0.9.5-x86-linux-binary.tar.bz2 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/sbcl/FC-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 28 Sep 2005 01:23:45 -0000 1.3 +++ .cvsignore 29 Sep 2005 12:43:06 -0000 1.4 @@ -1,4 +1,4 @@ sbcl-0.9.5-source.tar.bz2 sbcl-0.8.15-powerpc-linux-binary.tar.bz2 sbcl-0.9.4-x86-64-linux-binary.tar.bz2 -sbcl-0.9.4-x86-linux-binary.tar.bz2 +sbcl-0.9.5-x86-linux-binary.tar.bz2 From fedora-extras-commits at redhat.com Thu Sep 29 13:06:38 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Thu, 29 Sep 2005 09:06:38 -0400 Subject: rpms/perl-Class-Inspector/devel .cvsignore, 1.2, 1.3 perl-Class-Inspector.spec, 1.3, 1.4 sources, 1.2, 1.3 Message-ID: <200509291306.j8TD6c4F009648@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-Class-Inspector/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9630 Modified Files: .cvsignore perl-Class-Inspector.spec sources Log Message: Upstream update. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Class-Inspector/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 13 Sep 2005 15:29:10 -0000 1.2 +++ .cvsignore 29 Sep 2005 13:06:13 -0000 1.3 @@ -1 +1 @@ -Class-Inspector-1.12.tar.gz +Class-Inspector-1.13.tar.gz Index: perl-Class-Inspector.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Class-Inspector/devel/perl-Class-Inspector.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- perl-Class-Inspector.spec 13 Sep 2005 16:20:43 -0000 1.3 +++ perl-Class-Inspector.spec 29 Sep 2005 13:06:13 -0000 1.4 @@ -1,6 +1,6 @@ Name: perl-Class-Inspector -Version: 1.12 -Release: 2%{?dist} +Version: 1.13 +Release: 1%{?dist} Summary: Get information about a class and its structure License: GPL or Artistic Group: Development/Libraries @@ -48,6 +48,9 @@ %{_mandir}/man3/* %changelog +* Thu Sep 29 2005 Ralf Corsepius - 1.13-1 +- Upstream update. + * Tue Sep 13 2005 Ralf Corsepius - Fix another typo in %%summary. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Class-Inspector/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 13 Sep 2005 15:29:10 -0000 1.2 +++ sources 29 Sep 2005 13:06:13 -0000 1.3 @@ -1 +1 @@ -c49feb019c32a720d64c887b05022a4b Class-Inspector-1.12.tar.gz +ffce59a030a0c2d3234d285be96530e0 Class-Inspector-1.13.tar.gz From fedora-extras-commits at redhat.com Thu Sep 29 13:11:41 2005 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Thu, 29 Sep 2005 09:11:41 -0400 Subject: rpms/abcm2ps/devel .cvsignore, 1.2, 1.3 abcm2ps.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200509291311.j8TDBfit009784@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/abcm2ps/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9759 Modified Files: .cvsignore abcm2ps.spec sources Log Message: new version 4.11.6 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/abcm2ps/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 26 Sep 2005 17:36:04 -0000 1.2 +++ .cvsignore 29 Sep 2005 13:11:39 -0000 1.3 @@ -1,2 +1,2 @@ -abcm2ps-4.11.4.tar.gz -abcplus_en-1.0.3.zip +abcm2ps-4.11.6.tar.gz +abcplus_en-1.0.4-beta1.zip Index: abcm2ps.spec =================================================================== RCS file: /cvs/extras/rpms/abcm2ps/devel/abcm2ps.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- abcm2ps.spec 27 Sep 2005 16:20:00 -0000 1.2 +++ abcm2ps.spec 29 Sep 2005 13:11:39 -0000 1.3 @@ -1,13 +1,13 @@ Name: abcm2ps -Version: 4.11.4 -Release: 2%{?dist} +Version: 4.11.6 +Release: 1%{?dist} Summary: A program to typeset ABC tunes into Postscript Group: Applications/Multimedia License: GPL URL: http://moinejf.free.fr -Source0: http://moinejf.free.fr/abcm2ps-4.11.4.tar.gz -Source1: http://abcplus.sourceforge.net/abcplus_en-1.0.3.zip +Source0: http://moinejf.free.fr/abcm2ps-4.11.6.tar.gz +Source1: http://abcplus.sourceforge.net/abcplus_en-1.0.4-beta1.zip BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description @@ -52,6 +52,9 @@ %changelog +* Thu Sep 29 2005 Gerard Milmeister - 4.11.6 +- New Version 4.11.6 + * Thu Sep 8 2005 Gerard Milmeister - 4.11.4-2 - Updated description Index: sources =================================================================== RCS file: /cvs/extras/rpms/abcm2ps/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 26 Sep 2005 17:36:04 -0000 1.2 +++ sources 29 Sep 2005 13:11:39 -0000 1.3 @@ -1,2 +1,2 @@ -296c0ff7527234a1b9bbf44b70731fb4 abcm2ps-4.11.4.tar.gz -221c256a7102244d1509be209601586e abcplus_en-1.0.3.zip +bc4065da488b2bd208044bdfddedbb6e abcm2ps-4.11.6.tar.gz +f1c1c75c690452d4dfb80f4046898cf4 abcplus_en-1.0.4-beta1.zip From fedora-extras-commits at redhat.com Thu Sep 29 13:11:48 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Thu, 29 Sep 2005 09:11:48 -0400 Subject: rpms/perl-Class-Inspector/FC-4 .cvsignore, 1.2, 1.3 perl-Class-Inspector.spec, 1.3, 1.4 sources, 1.2, 1.3 Message-ID: <200509291311.j8TDBmbK009811@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-Class-Inspector/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9788 Modified Files: .cvsignore perl-Class-Inspector.spec sources Log Message: Upstream update. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Class-Inspector/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 13 Sep 2005 15:29:10 -0000 1.2 +++ .cvsignore 29 Sep 2005 13:11:46 -0000 1.3 @@ -1 +1 @@ -Class-Inspector-1.12.tar.gz +Class-Inspector-1.13.tar.gz Index: perl-Class-Inspector.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Class-Inspector/FC-4/perl-Class-Inspector.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- perl-Class-Inspector.spec 13 Sep 2005 16:20:43 -0000 1.3 +++ perl-Class-Inspector.spec 29 Sep 2005 13:11:46 -0000 1.4 @@ -1,6 +1,6 @@ Name: perl-Class-Inspector -Version: 1.12 -Release: 2%{?dist} +Version: 1.13 +Release: 1%{?dist} Summary: Get information about a class and its structure License: GPL or Artistic Group: Development/Libraries @@ -48,6 +48,9 @@ %{_mandir}/man3/* %changelog +* Thu Sep 29 2005 Ralf Corsepius - 1.13-1 +- Upstream update. + * Tue Sep 13 2005 Ralf Corsepius - Fix another typo in %%summary. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Class-Inspector/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 13 Sep 2005 15:29:10 -0000 1.2 +++ sources 29 Sep 2005 13:11:46 -0000 1.3 @@ -1 +1 @@ -c49feb019c32a720d64c887b05022a4b Class-Inspector-1.12.tar.gz +ffce59a030a0c2d3234d285be96530e0 Class-Inspector-1.13.tar.gz From fedora-extras-commits at redhat.com Thu Sep 29 13:12:19 2005 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Thu, 29 Sep 2005 09:12:19 -0400 Subject: rpms/abcm2ps/FC-3 .cvsignore, 1.2, 1.3 abcm2ps.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200509291312.j8TDCn2L009897@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/abcm2ps/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9850/FC-3 Modified Files: .cvsignore abcm2ps.spec sources Log Message: new version 4.11.6 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/abcm2ps/FC-3/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 26 Sep 2005 17:36:04 -0000 1.2 +++ .cvsignore 29 Sep 2005 13:12:17 -0000 1.3 @@ -1,2 +1,2 @@ -abcm2ps-4.11.4.tar.gz -abcplus_en-1.0.3.zip +abcm2ps-4.11.6.tar.gz +abcplus_en-1.0.4-beta1.zip Index: abcm2ps.spec =================================================================== RCS file: /cvs/extras/rpms/abcm2ps/FC-3/abcm2ps.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- abcm2ps.spec 27 Sep 2005 16:19:54 -0000 1.2 +++ abcm2ps.spec 29 Sep 2005 13:12:17 -0000 1.3 @@ -1,13 +1,13 @@ Name: abcm2ps -Version: 4.11.4 -Release: 2%{?dist} +Version: 4.11.6 +Release: 1%{?dist} Summary: A program to typeset ABC tunes into Postscript Group: Applications/Multimedia License: GPL URL: http://moinejf.free.fr -Source0: http://moinejf.free.fr/abcm2ps-4.11.4.tar.gz -Source1: http://abcplus.sourceforge.net/abcplus_en-1.0.3.zip +Source0: http://moinejf.free.fr/abcm2ps-4.11.6.tar.gz +Source1: http://abcplus.sourceforge.net/abcplus_en-1.0.4-beta1.zip BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description @@ -52,6 +52,9 @@ %changelog +* Thu Sep 29 2005 Gerard Milmeister - 4.11.6 +- New Version 4.11.6 + * Thu Sep 8 2005 Gerard Milmeister - 4.11.4-2 - Updated description Index: sources =================================================================== RCS file: /cvs/extras/rpms/abcm2ps/FC-3/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 26 Sep 2005 17:36:04 -0000 1.2 +++ sources 29 Sep 2005 13:12:17 -0000 1.3 @@ -1,2 +1,2 @@ -296c0ff7527234a1b9bbf44b70731fb4 abcm2ps-4.11.4.tar.gz -221c256a7102244d1509be209601586e abcplus_en-1.0.3.zip +bc4065da488b2bd208044bdfddedbb6e abcm2ps-4.11.6.tar.gz +f1c1c75c690452d4dfb80f4046898cf4 abcplus_en-1.0.4-beta1.zip From fedora-extras-commits at redhat.com Thu Sep 29 13:12:19 2005 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Thu, 29 Sep 2005 09:12:19 -0400 Subject: rpms/abcm2ps/FC-4 .cvsignore, 1.2, 1.3 abcm2ps.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200509291312.j8TDCnHT009902@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/abcm2ps/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9850/FC-4 Modified Files: .cvsignore abcm2ps.spec sources Log Message: new version 4.11.6 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/abcm2ps/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 26 Sep 2005 17:36:04 -0000 1.2 +++ .cvsignore 29 Sep 2005 13:12:17 -0000 1.3 @@ -1,2 +1,2 @@ -abcm2ps-4.11.4.tar.gz -abcplus_en-1.0.3.zip +abcm2ps-4.11.6.tar.gz +abcplus_en-1.0.4-beta1.zip Index: abcm2ps.spec =================================================================== RCS file: /cvs/extras/rpms/abcm2ps/FC-4/abcm2ps.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- abcm2ps.spec 27 Sep 2005 16:19:54 -0000 1.2 +++ abcm2ps.spec 29 Sep 2005 13:12:17 -0000 1.3 @@ -1,13 +1,13 @@ Name: abcm2ps -Version: 4.11.4 -Release: 2%{?dist} +Version: 4.11.6 +Release: 1%{?dist} Summary: A program to typeset ABC tunes into Postscript Group: Applications/Multimedia License: GPL URL: http://moinejf.free.fr -Source0: http://moinejf.free.fr/abcm2ps-4.11.4.tar.gz -Source1: http://abcplus.sourceforge.net/abcplus_en-1.0.3.zip +Source0: http://moinejf.free.fr/abcm2ps-4.11.6.tar.gz +Source1: http://abcplus.sourceforge.net/abcplus_en-1.0.4-beta1.zip BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description @@ -52,6 +52,9 @@ %changelog +* Thu Sep 29 2005 Gerard Milmeister - 4.11.6 +- New Version 4.11.6 + * Thu Sep 8 2005 Gerard Milmeister - 4.11.4-2 - Updated description Index: sources =================================================================== RCS file: /cvs/extras/rpms/abcm2ps/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 26 Sep 2005 17:36:04 -0000 1.2 +++ sources 29 Sep 2005 13:12:17 -0000 1.3 @@ -1,2 +1,2 @@ -296c0ff7527234a1b9bbf44b70731fb4 abcm2ps-4.11.4.tar.gz -221c256a7102244d1509be209601586e abcplus_en-1.0.3.zip +bc4065da488b2bd208044bdfddedbb6e abcm2ps-4.11.6.tar.gz +f1c1c75c690452d4dfb80f4046898cf4 abcplus_en-1.0.4-beta1.zip From fedora-extras-commits at redhat.com Thu Sep 29 13:21:40 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Thu, 29 Sep 2005 09:21:40 -0400 Subject: rpms/perl-Class-Autouse/FC-4 .cvsignore, 1.2, 1.3 perl-Class-Autouse.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200509291321.j8TDLeOm010049@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-Class-Autouse/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10026 Modified Files: .cvsignore perl-Class-Autouse.spec sources Log Message: Upstream update. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Class-Autouse/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 15 Sep 2005 03:49:33 -0000 1.2 +++ .cvsignore 29 Sep 2005 13:21:38 -0000 1.3 @@ -1 +1 @@ -Class-Autouse-1.20.tar.gz +Class-Autouse-1.21.tar.gz Index: perl-Class-Autouse.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Class-Autouse/FC-4/perl-Class-Autouse.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-Class-Autouse.spec 15 Sep 2005 03:54:30 -0000 1.2 +++ perl-Class-Autouse.spec 29 Sep 2005 13:21:38 -0000 1.3 @@ -1,6 +1,6 @@ Name: perl-Class-Autouse -Version: 1.20 -Release: 2%{?dist} +Version: 1.21 +Release: 1%{?dist} Summary: Run-time class loading on first method call License: GPL or Artistic Group: Development/Libraries @@ -12,7 +12,7 @@ BuildArch: noarch BuildRequires: perl(Test::More) >= 0.47 -BuildRequires: perl(Carp) >= 1.03 +BuildRequires: perl(Carp) BuildRequires: perl(File::Spec) >= 0.82 BuildRequires: perl(List::Util) >= 1.11 @@ -53,6 +53,10 @@ %{_mandir}/man3/* %changelog +* Wed Sep 28 2005 Ralf Corsepius - 1.21-1 +- Upstream update. +- Fix bogus dep on perl(Carp). + * Thu Sep 15 2005 Ralf Corsepius - 1.20-2 - Spec cleanup. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Class-Autouse/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 15 Sep 2005 03:49:33 -0000 1.2 +++ sources 29 Sep 2005 13:21:38 -0000 1.3 @@ -1 +1 @@ -746a4f415dd8c7267bcec07841022275 Class-Autouse-1.20.tar.gz +3bf4fadd8349e57d6af0961b6565c74f Class-Autouse-1.21.tar.gz From fedora-extras-commits at redhat.com Thu Sep 29 13:26:12 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Thu, 29 Sep 2005 09:26:12 -0400 Subject: rpms/koffice/devel koffice.spec,1.9,1.10 Message-ID: <200509291326.j8TDQCr4010116@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/koffice/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10097 Modified Files: koffice.spec Log Message: - get devel working Index: koffice.spec =================================================================== RCS file: /cvs/extras/rpms/koffice/devel/koffice.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- koffice.spec 28 Sep 2005 09:37:56 -0000 1.9 +++ koffice.spec 29 Sep 2005 13:26:10 -0000 1.10 @@ -54,6 +54,7 @@ BuildRequires: doxygen BuildRequires: graphviz-devel BuildRequires: aspell-devel +BuildRequireS: libacl-devel %description KOffice - Integrated Office Suite @@ -743,6 +744,7 @@ * Wed Sep 28 2005 Andreas Bierfert 1.4.1-6 - add patch for qt-3.3.5 problem +- get devel working * Tue Sep 27 2005 Andreas Bierfert 1.4.1-5 From fedora-extras-commits at redhat.com Thu Sep 29 14:00:47 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Thu, 29 Sep 2005 10:00:47 -0400 Subject: rpms/koffice/devel koffice-qt3.3.5.patch,1.4,1.5 Message-ID: <200509291400.j8TE0lNS010266@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/koffice/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10233 Modified Files: koffice-qt3.3.5.patch Log Message: - more qt3.3.5 fixes koffice-qt3.3.5.patch: Index: koffice-qt3.3.5.patch =================================================================== RCS file: /cvs/extras/rpms/koffice/devel/koffice-qt3.3.5.patch,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- koffice-qt3.3.5.patch 28 Sep 2005 21:56:41 -0000 1.4 +++ koffice-qt3.3.5.patch 29 Sep 2005 14:00:45 -0000 1.5 @@ -52,3 +52,14 @@ kcolorcombo.h +--- krita/ui/wdgcolorsettings.ui.orig 2005-09-29 15:58:11.000000000 +0200 ++++ krita/ui/wdgcolorsettings.ui 2005-09-29 15:58:38.000000000 +0200 +@@ -361,8 +361,4 @@ + radioPerceptual + + +- +- kiscmbidlist.h +- kiscmbidlist.h +- + From fedora-extras-commits at redhat.com Thu Sep 29 14:39:53 2005 From: fedora-extras-commits at redhat.com (Gavin Henry (ghenry)) Date: Thu, 29 Sep 2005 10:39:53 -0400 Subject: rpms/perl-Apache-LogRegex/devel Makefile,1.1,1.2 Message-ID: <200509291439.j8TEdr9r011813@cvs-int.fedora.redhat.com> Author: ghenry Update of /cvs/extras/rpms/perl-Apache-LogRegex/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11794 Modified Files: Makefile Log Message: Still had meld in the Makefile. Index: Makefile =================================================================== RCS file: /cvs/extras/rpms/perl-Apache-LogRegex/devel/Makefile,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- Makefile 21 Aug 2005 00:09:41 -0000 1.1 +++ Makefile 29 Sep 2005 14:39:50 -0000 1.2 @@ -1,6 +1,6 @@ # Makefile for source rpm: perl-Apache-LogRegex # $Id$ -NAME := meld +NAME := perl-Apache-LogRegex SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common From fedora-extras-commits at redhat.com Thu Sep 29 17:06:01 2005 From: fedora-extras-commits at redhat.com (Karsten Wade (kwade)) Date: Thu, 29 Sep 2005 13:06:01 -0400 Subject: CVSROOT avail,1.14,1.15 Message-ID: <200509291706.j8TH6u2F016456@cvs-int.fedora.redhat.com> Author: kwade Update of /cvs/fedora/CVSROOT In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16432 Modified Files: avail Log Message: Final slashes are evil? Index: avail =================================================================== RCS file: /cvs/fedora/CVSROOT/avail,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- avail 28 Sep 2005 22:21:32 -0000 1.14 +++ avail 29 Sep 2005 17:05:58 -0000 1.15 @@ -48,9 +48,9 @@ avail | mjc,bressers,jorton,notting,sopwith,katzj | fedora-security avail | pfrields | web/html/projects/docs -avail | pfrields | web/html/participate/documentation-faq/ -avail | pfrields | web/html/participate/documentation-guide/ -avail | pfrields,mjohnson | web/html/participate/documentation-quick-start/ -avail | pfrields | web/html/participate/developers-guide/ +avail | pfrields | web/html/participate/documentation-faq +avail | pfrields | web/html/participate/documentation-guide +avail | pfrields,mjohnson | web/html/participate/documentation-quick-start +avail | pfrields | web/html/participate/developers-guide From fedora-extras-commits at redhat.com Thu Sep 29 17:08:36 2005 From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields)) Date: Thu, 29 Sep 2005 13:08:36 -0400 Subject: web/html/participate/developers-guide sn-cvs-config.php, NONE, 1.1 sn-cvs-cvscommands.php, NONE, 1.1 sn-cvs-preparation.php, NONE, 1.1 ch-console-access.php, 1.1.1.1, 1.2 ch-cvs.php, 1.1.1.1, 1.2 ch-guidelines.php, 1.1.1.1, 1.2 ch-menus.php, 1.1.1.1, 1.2 ch-package-versions.php, 1.1.1.1, 1.2 ch-rpm-building.php, 1.1.1.1, 1.2 ch-ui-guidelines.php, 1.1.1.1, 1.2 index.php, 1.1.1.1, 1.2 ln-legalnotice.php, 1.1.1.1, 1.2 s1-rpm-guidelines.php, 1.1.1.1, 1.2 s1-rpm-more-guidelines.php, 1.1.1.1, 1.2 s1-ui-get-details.php, 1.1.1.1, 1.2 s1-ui-get-religion.php, 1.1.1.1, 1.2 s1-ui-gnome-guidelines.php, 1.1.1.1, 1.2 s1-ui-more-suggestions.php, 1.1.1.1, 1.2 s1-ui-scaling.php, 1.1.1.1, 1.2 Message-ID: <200509291709.j8TH9Bnx016513@cvs-int.fedora.redhat.com> Author: pfrields Update of /cvs/fedora/web/html/participate/developers-guide In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16475 Modified Files: ch-console-access.php ch-cvs.php ch-guidelines.php ch-menus.php ch-package-versions.php ch-rpm-building.php ch-ui-guidelines.php index.php ln-legalnotice.php s1-rpm-guidelines.php s1-rpm-more-guidelines.php s1-ui-get-details.php s1-ui-get-religion.php s1-ui-gnome-guidelines.php s1-ui-more-suggestions.php s1-ui-scaling.php Added Files: sn-cvs-config.php sn-cvs-cvscommands.php sn-cvs-preparation.php Log Message: Update to UTF-8, adding new CVS sections ***** Error reading new file: [Errno 2] No such file or directory: 'sn-cvs-config.php' ***** Error reading new file: [Errno 2] No such file or directory: 'sn-cvs-cvscommands.php' ***** Error reading new file: [Errno 2] No such file or directory: 'sn-cvs-preparation.php' Index: ch-console-access.php =================================================================== RCS file: /cvs/fedora/web/html/participate/developers-guide/ch-console-access.php,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- ch-console-access.php 30 Mar 2005 17:47:23 -0000 1.1.1.1 +++ ch-console-access.php 29 Sep 2005 17:08:19 -0000 1.2 @@ -7,29 +7,29 @@ ?> -
      Chapter?6.?Enabling Console Access
      Prev???Next

      Chapter?6.?Enabling Console Access

      - Some applications, such as Log Viewer and other +

      Chapter 6. Enabling Console Access
      Prev   Next

      Chapter 6. Enabling Console Access

      + Some applications, such as Log Viewer and other applications in the Configuration Tools Project need root privileges to run. To prompt the user for the root password, configure the correct PAM - files to use consolehelper. This example uses the - program redhat-logviewer as an example. Replace it with + files to use consolehelper. This example uses the + program redhat-logviewer as an example. Replace it with the name of your program. -

      1. At a shell prompt, change to the /usr/bin/ +

        1. At a shell prompt, change to the /usr/bin/ directory, and make a symbolic link from the name of the application - to /usr/bin/consolehelper. For example:

          -ln -s consolehelper redhat-logviewer
+	  to /usr/bin/consolehelper. For example:
          +ln -s consolehelper redhat-logviewer

        2. As root, create the file - /etc/security/console.apps/app-name, + /etc/security/console.apps/app-name, such as - /etc/security/console.apps/redhat-logviewer, + /etc/security/console.apps/redhat-logviewer, with the following lines:

          -USER=root
+USER=root
 PROGRAM=/usr/share/redhat-logviewer/redhat-logviewer.py
-SESSION=true
+SESSION=true

        3. Create the PAM configuration file - /etc/pam.d/redhat-logviewer with the following + /etc/pam.d/redhat-logviewer with the following lines:

          -#%PAM-1.0
+#%PAM-1.0
 auth       sufficient   /lib/security/pam_rootok.so
 auth       sufficient   /lib/security/pam_timestamp.so
 auth       required     /lib/security/pam_stack.so service=system-auth
@@ -37,40 +37,40 @@
 session    optional     /lib/security/pam_xauth.so
 session    optional     /lib/security/pam_timestamp.so
 account    required     /lib/security/pam_permit.so
-

        - When a user executes the command redhat-logviewer, it - calls consolehelper, which in turn calls - userhelper to authenticate the user with PAM. If the +

      + When a user executes the command redhat-logviewer, it + calls consolehelper, which in turn calls + userhelper to authenticate the user with PAM. If the user enters the correct root password, the user is authenticated, and authentication is remember for the user on the same tty for five minutes.

      When using Make to install the package and when configuring the files to build the RPM package, to make sure these files are installed in the correct location, create the - /etc/security/console.apps/redhat-logviewer file as - redhat-logviewer.console and the - /etc/pam.d/redhat-logviewer file as - redhat-logviewer.pam. In the - Makefile, add the following variables declarations: + /etc/security/console.apps/redhat-logviewer file as + redhat-logviewer.console and the + /etc/pam.d/redhat-logviewer file as + redhat-logviewer.pam. In the + Makefile, add the following variables declarations: 

      -PAMD_DIR        =    /etc/pam.d
+PAMD_DIR        =    /etc/pam.d
 SECURITY_DIR    =    /etc/security/console.apps
-PKGNAME         =    redhat-logviewer
+PKGNAME         =    redhat-logviewer

      - In the install section of the - Makefile, add the following lines: + In the install section of the + Makefile, add the following lines: 

      -install ${PKGNAME}.pam $(INSTROOT)$(PAMD_DIR)/${PKGNAME}
-install ${PKGNAME}.console $(INSTROOT)$(SECURITY_DIR)/${PKGNAME}
+install ${PKGNAME}.pam $(INSTROOT)$(PAMD_DIR)/${PKGNAME}
+install ${PKGNAME}.console $(INSTROOT)$(SECURITY_DIR)/${PKGNAME}

      - Finally, in the redhat-logviewer.spec file, add the - following lines under the %files section + Finally, in the redhat-logviewer.spec file, add the + following lines under the %files section so that the files are installed with the RPM and are in the file list for the package: 

      -%attr(0644,root,root) %config(noreplace) /etc/security/console.apps/%{name}
-%attr(0644,root,root) %config(noreplace) /etc/pam.d/%{name}
-
      Prev?Up?Next
      5.6.?Scaling It Down?Home?Chapter?7.?Adding Applications to the Menus
      +%attr(0644,root,root) %config(noreplace) /etc/security/console.apps/%{name} +%attr(0644,root,root) %config(noreplace) /etc/pam.d/%{name} +
      Prev   Next
      5.6. Scaling It Down Home Chapter 7. Adding Applications to the Menus
      -
      Chapter?3.?CVS
      Prev???Next

      Chapter?3.?CVS

      - CVS, or Concurrent Versions System, provides a framework for multiple - users to edit the same files. As you can imagine, if a group of users - edits the files in a single directory, chaos would reign. Using CVS, - however, a group of people can safely work on the same set of files. CVS - keeps the master copy of the files, and it records who changed what and - when in a central repository. If conflicts arise, CVS lets you know. CVS - is usually used so that programmers can share code, but it also works well - for documentation. -

      3.1.?How CVS Works

      - In most cases, each set of files that make up a package or project is - stored as a module on the CVS server. -

      - When working with files from CVS, you checkout a - copy of the module on your local file system. After modifying one or - more files, you commit them back to the central - CVS repository server. -

      - When you commit changes, only changes to files the server knows about - are committed. In other words, if you created a file in your local - checkout of a module, the new file is not automatically uploaded to the - server. You must add the file to the repository - and then commit it. If you remove a file from your local checkout of a - module, you must specify that you want to remove it from the repository - on the CVS server and then commit the removal of the file. -

      - The specific commands to perform these actions are discussed in Section?3.3, “Basic CVS Commands”. -

      - If someone has modified the file between the last time you grabbed the - file from CVS and when you try to commit a change, it tried to merge the - changes into the master copy of the CVS server. If the content you - changed is in a different location in the file than the content changed - by someone else, chances are, the commit action will go through without - a conflict. If someone modified the same content - as the content you just changed and tried to commit, you will see a - message that a file conflict has occurred. Thus, you need to - update your files frequently. It is a good - practice to update them right before you start modifying a file. Refer - to Section?3.3.7, “Resolving Conflicts” for instructions - on resolving conflicts. -

      Prev?Up?Next
      Chapter?2.?Package Versions?Home?3.2.?Configuring CVS on Your System
      +
      Chapter 3. CVS
      Prev   Next

      Chapter 3. CVS

      + The Concurrent Versions System (CVS) + provides a framework where multiple users can edit the same files. + As you can imagine, if a group of users edits the files in a single + directory, chaos would reign. Using CVS, + however, a group of people can safely work on the same set of files. + CVS keeps the master copy of the files, + and it records who changed what and when in a central repository. If + conflicts arise, CVS lets you know. + CVS is often used so that programmers can + share code, but it also works well for documentation. +

      3.1. How CVS Works

      + In most cases, each set of files that make up a package or project + is stored as a module on the CVS server. +

      + When working with files from CVS, you + checkout a copy of the module on your local + file system. After modifying one or more files, you + commit them back to the central + CVS repository server. +

      + With CVS you may edit a file without + first getting permission or locking the file. The + concurrent part of the + CVS name comes from its ability to + allow several different people to edit different parts of the same + file. As long as none of the changes overlap, + CVS can correctly record their changes. + In case of duplicate changes, they are clearly marked in the files + and the authors must resolve the issue among themselves. +

      + When you commit changes, only changes to files the server knows + about are committed. In other words, if you created a file in your + local checkout of a module, the new file is not automatically + uploaded to the server. You must add the + file to the repository and then commit it. If you remove a file + from your local checkout of a module, you must specify that you + want to remove it from the repository on the CVS server and then + commit the removal of the file. +

      + The specific commands to perform these actions are discussed in + Section 3.4, “Basic CVS Commands”. +

      + If someone has modified the file between the last time you grabbed + the file from CVS and when you try to commit a change, + CVS will try to merge the changes into + the master copy of the CVS server. If + the content you changed is in a different location in the file + than the content changed by someone else, chances are, the commit + action will go through without a conflict. + If someone modified the same content as the content you just + changed and tried to commit, you will see a message that a file + conflict has occurred. Thus, you need to + update your files frequently. It is a good + practice to update them right before you start modifying a file. + Refer to Section 3.4.8, “Resolving Conflicts” for + instructions on resolving conflicts. +

      Prev   Next
      Chapter 2. Package Versions Home 3.2. Preparing For CVS Use
      -
      Chapter?1.?General Guidelines
      Prev???Next

      Chapter?1.?General Guidelines

      - Developers for the Fedora project must adhere to the following rules: +

      Chapter 1. General Guidelines
      Prev   Next

      Chapter 1. General Guidelines

      + Developers for the Fedora Project must adhere to the following rules:

      1. If you are not the owner of a package, email the owner before making any changes.

      2. Never rebuild a package with the exact same name-epoch-version-release number. Mnemonic: Never say - n-e-v-r again.

      Prev?Up?Next
      Fedora Project Developer's Guide?Home?Chapter?2.?Package Versions
      + n-e-v-r again.

    Prev   Next
    Fedora Core Developer's Guide Home Chapter 2. Package Versions
    -
    Chapter?7.?Adding Applications to the Menus
    Prev???

    Chapter?7.?Adding Applications to the Menus

    +

    Chapter 7. Adding Applications to the Menus
    Prev   

    Chapter 7. Adding Applications to the Menus

    If you want users to be able to find your application, you need to add it - to the Main Menu. The Main Menu in + to the Main Menu. The Main Menu in GNOME and KDE are generated from the same desktop files so that they have the same menus. This feature is useful because only one desktop file needs to be installed. The desktop file must be installed in the - /usr/share/applications/ directory, must have a + /usr/share/applications/ directory, must have a specific format, and must be in UTF-8 format. For example: 

    -[Desktop Entry]
+[Desktop Entry]
 Name=System Logs
 Name[it]=Log di sistema
 Comment=Examine system log files
@@ -27,100 +27,100 @@
 Type=Application
 Terminal=false
 Encoding=UTF-8
-
+

    This example does not show all translations of the name and comment, but you can see the format of the file and translations from it. The - Categories field specifies which menu + Categories field specifies which menu group the application should appear under. In this example, the entry is - under System Tools. + under System Tools.

    The file should follow the specification outlined at http://www.freedesktop.org/standards/desktop-entry-spec/. The - Categories field is used as described + Categories field is used as described in the specification at http://www.freedesktop.org/standards/menu-spec/, though Fedora Core doesn't yet use the XML format described in that spec.

    If you are not sure your desktop file is written correctly, - install the desktop-file-utils package. This + install the desktop-file-utils package. This package contains the command - desktop-file-validate. To use it, execute the command + desktop-file-validate. To use it, execute the command followed by the location of your desktop file. If the file contains all the required fields, the command will return nothing; otherwise, it will return an error message. For example, the following error message is displayed if the Encoding field is missing: 

    -Error, file /tmp/redhat-logviewer.desktop does not contain the "Encoding"
+Error, file /tmp/redhat-logviewer.desktop does not contain the "Encoding"
 key. This is a required field for all desktop files.
-

    +

    Save the file as - application-name.desktop, - such as redhat-logviewer.desktop, and the following - to the spec file under the %files + application-name.desktop, + such as redhat-logviewer.desktop, and the following + to the spec file under the %files section: 

    -%attr(0644,root,root) %{_datadir}/applications/%{name}.desktop
+%attr(0644,root,root) %{_datadir}/applications/%{name}.desktop

    Also add the following line to the install section of the - Makefile to to make sure it is installed in the + Makefile to to make sure it is installed in the correct place: 

    -install ${PKGNAME}.desktop $(INSTROOT)/usr/share/applications/${PKGNAME}.desktop
+install ${PKGNAME}.desktop $(INSTROOT)/usr/share/applications/${PKGNAME}.desktop

    - If an upstream package already comes with a .desktop - file that installs to /usr/share/applications/, you + If an upstream package already comes with a .desktop + file that installs to /usr/share/applications/, you may not need to do anything (especially because Fedora Core uses mostly the same menu layout as upstream GNOME). However, if you need to modify the - upstream .desktop file, the - desktop-file-utils package contains a tool called - desktop-file-install. This tool can be used in the - %install section of an RPM to munge the - upstream .desktop file in various ways. Here is an example from - gnome-system-monitor: + upstream .desktop file, the + desktop-file-utils package contains a tool called + desktop-file-install. This tool can be used in the + %install section of an RPM to munge the + upstream .desktop file in various ways. Here is an example from + gnome-system-monitor: 

    -      
+      
         desktop-file-install --vendor gnome --delete-original       \
           --dir $RPM_BUILD_ROOT%{_datadir}/applications             \
           --add-category X-Red-Hat-Base                             \
           $RPM_BUILD_ROOT%{_datadir}/applications/*
-       
+

    In the above example, the following changes are made:

    • - The .desktop file is renamed to have the vendor "gnome" prefixed - to its filename. .desktop files should have a namespace prefix + The .desktop file is renamed to have the vendor "gnome" prefixed + to its filename. .desktop files should have a namespace prefix to avoid collisions.

    • - The --delete-original option - means that in addition to creating a new .desktop file, + The --delete-original option + means that in addition to creating a new .desktop file, the original file is removed.

    • - The category X-Red-Hat-Base is - added to the Categories field. + The category X-Red-Hat-Base is + added to the Categories field.

    In addition to letting you add/remove categories and so forth, - desktop-file-install will automatically validate the - .desktop file. -

    7.1.?Red Hat Categories

    + desktop-file-install will automatically validate the + .desktop file. +

    7.1. Red Hat Categories

    There are two special categories, - X-Red-Hat-Base and - X-Red-Hat-Extra. These distinguish + X-Red-Hat-Base and + X-Red-Hat-Extra. These distinguish between menu items that appear in the base menus, and those that appear - in the "More Foo" menus. For example, the "Internet" and "More Internet - Applications" menus. The rule is that only one application of a given + in the "More Foo" menus. For example, the "Internet" and "More Internet + Applications" menus. The rule is that only one application of a given class of application may have the - X-Red-Hat-Base category. For example, - one and only one web browser may be in "Internet", - other web browsers must be in "More Internet Applications." As a - secondary rule, "geeky" or obscure applications may always be in the - X-Red-Hat-Extra category. Essentially, - the X-Red-Hat-Base should be reserved + X-Red-Hat-Base category. For example, + one and only one web browser may be in "Internet", + other web browsers must be in "More Internet Applications." As a + secondary rule, "geeky" or obscure applications may always be in the + X-Red-Hat-Extra category. Essentially, + the X-Red-Hat-Base should be reserved for a nice set of default applications for nontechnical end users.

    - The best guideline: use X-Red-Hat-Extra + The best guideline: use X-Red-Hat-Extra by default, and if you want to use - X-Red-Hat-Base, make your case on - . -

    Prev?Up?
    Chapter?6.?Enabling Console Access?Home?
    + X-Red-Hat-Base, make your case on + . +

    Prev   
    Chapter 6. Enabling Console Access Home 
    -
    Chapter?2.?Package Versions
    Prev???Next

    Chapter?2.?Package Versions

    +

    Chapter 2. Package Versions
    Prev   Next

    Chapter 2. Package Versions

    The following rules apply:

    1. Stable releases are allowed until the feature freeze date.

    2. Stable snapshots are generally OK, but there has to be a good reason why you want to use the stable snapshot instead of the stable release plus patches. This is generally more acceptable for larger, - well-maintained projects such as gcc, - gdb).

    3. Alpha releases are usually not OK. Obviously, there are some + well-maintained projects such as gcc, + gdb).

    4. Alpha releases are usually not OK. Obviously, there are some packages whose upstream maintainers have never changed their - versions from -alpha. Basically, + versions from -alpha. Basically, this guideline applies when there is a previous stable version available. -

    5. Beta releases are generally not OK. Refer to Section?2.1, “Beta Exceptions”.

    6. Development/beta snapshots are generally not OK.

    2.1.?Beta Exceptions

    +

  • Beta releases are generally not OK. Refer to Section 2.1, “Beta Exceptions”.

  • Development/beta snapshots are generally not OK.

    • 2.1. Beta Exceptions

    For large important packages with a maintained developer base, shipping beta/pre-release versions is OK during a development cycle, provided all of the following are met: @@ -39,7 +39,7 @@ new things to our users not just because they are newer, but because they provide either feature enhancements or better stability (bug fixes). -

    Prev?Up?Next
    Chapter?1.?General Guidelines?Home?Chapter?3.?CVS
    +

    Prev   Next
    Chapter 1. General Guidelines Home Chapter 3. CVS
    -
    Chapter?4.?Building RPM Packages
    Prev???Next

    Chapter?4.?Building RPM Packages

    +

    Chapter 4. Building RPM Packages
    Prev   Next

    Chapter 4. Building RPM Packages

    This chapter attempts to discuss how to build RPMs so that the package - conforms to Fedora project standards. It does not attempt to explain everything + conforms to Fedora Project standards. It does not attempt to explain everything there is to know about RPM or building RPMs.

    - A good source for learning more about RPM is the Red Hat RPM - Guide by Eric Foster-Johnson; Red Hat Press. -

    4.1.?Spec File

    + A good source for learning more about RPM is the Red Hat RPM + Guide by Eric Foster-Johnson; Red Hat Press. +

    4.1. Spec File

    This section describes how the spec file should be written. 

    -Name: foo
+Name: foo
 Summary:  The foo package does foo
 Version: 1.0
 Release: 1
@@ -54,13 +54,13 @@
 /sbin/ldconfig
 
 %preun 
-if [ "$1" = 0 ]; then 
+if [ "$1" = 0 ]; then 
   /sbin/service foo stop > /dev/null 2>&1 
   /sbin/chkconfig --del foo 
 fi
 
 %postun 
-if [ "$1" -ge "1" ]; then 
+if [ "$1" -ge "1" ]; then 
   /sbin/service foo condrestart > /dev/null 2>&1 
   /sbin/ldconfig 
 fi
@@ -75,42 +75,42 @@
 %changelog 
 
 * Mon Jun 16 2003 Some One <one at example.com>
-— fixed the broken frobber (#86434)
-
    Name

    The name of the package.

    Summary

    A short summary of the purpose of the package, should not +— fixed the broken frobber (#86434) +

    Name

    The name of the package.

    Summary

    A short summary of the purpose of the package, should not include the name of the package in the summary as this is - redundant information.

    Version

    The version of the package. Should match the version of the - (main) tarball of the source. If the "real" version has dashes in - it, replace them with underscores.

    Release

    This is the Fedora project release count for the package. Each time it - is modified for the Fedora project (sent through the build system) this number + redundant information.

    Version

    The version of the package. Should match the version of the + (main) tarball of the source. If the "real" version has dashes in + it, replace them with underscores.

    Release

    This is the Fedora Project release count for the package. Each time it + is modified for the Fedora Project (sent through the build system) this number must be incremented. NEVER rebuild a package without incrementing this number, as this gives a totally false impression to the user — that the package has not changed at all. Whenever a package is rebuilt, it changes, even if the source - code was not updated.

    License

    One of GPL, LGPL, BSD(-like), Artistic, etc. Most old packages - erroneously call this the "Copyright" field. This is incorrect but + code was not updated.

    License

    One of GPL, LGPL, BSD(-like), Artistic, etc. Most old packages + erroneously call this the "Copyright" field. This is incorrect but the two are synonyms for each other. Fix old packages to have the - correct tag if found.

    Group

    This must be one of the canonical groups from the - /usr/share/doc/rpm-<version>/GROUPS - file. Do not make up group names.

    URL

    The Web address for the package, if one exists.

    Source

    Start numbering the sources at 0 - (Source0 , - Source1, etc.). A tag of - Source is implicitly source + correct tag if found.

    Group

    This must be one of the canonical groups from the + /usr/share/doc/rpm-<version>/GROUPS + file. Do not make up group names.

    URL

    The Web address for the package, if one exists.

    Source

    Start numbering the sources at 0 + (Source0 , + Source1, etc.). A tag of + Source is implicitly source 0. Include the full URL or path to the source package if necessary. If a filename without a URL or path is given as the - source, the file should be in the SOURCES + source, the file should be in the SOURCES directory under your top level directory — - /usr/src/redhat/SOURCES/ by default or define - the top level directory in your ~/.rpmmacros - file.

    Use the special macros %name - and %version where possible so + /usr/src/redhat/SOURCES/ by default or define + the top level directory in your ~/.rpmmacros + file.

    Use the special macros %name + and %version where possible so that updating these particular fields automatically update the - source field.

    Patch

    Start numbering patch files with 0 - (Patch0, - Patch1, etc.). To make patches, + source field.

    Patch

    Start numbering patch files with 0 + (Patch0, + Patch1, etc.). To make patches, name them in the format - <name>-<version>-<whatisfixed>.patch. - Do not use the %name and - %version macros here; chances are + <name>-<version>-<whatisfixed>.patch. + Do not use the %name and + %version macros here; chances are these patches may be needed even when you upgrade the package source code after generating the initial patch, and it will probably apply without modifications. If you use the macros, you @@ -122,100 +122,100 @@ this will the tons of little changes we have to make in our own packages be integrated upstream over time.

    To create a patch, follow this process:

    1. Enter the directory where the source code for the package is, and copy the original file to the same name as the file - with the <whatisfixed> string + with the <whatisfixed> string appended to it. For example, if the the old file was called - sourcecode.c, copy it to - sourcecode.c.iconfix.

    2. Then, make your edits/changes/fixes to the file - sourcecode.c.

    3. Go into the directory one level above the sourcecode, - usually the directory ../BUILD. Use the - gendiff command from the - rpm package to generate the patch + sourcecode.c, copy it to + sourcecode.c.iconfix.

    4. Then, make your edits/changes/fixes to the file + sourcecode.c.

    5. Go into the directory one level above the sourcecode, + usually the directory ../BUILD. Use the + gendiff command from the + rpm package to generate the patch file:

      -gendiff <source-dir> <fixed-extension> > ../SOURCES/<source-dir>-<fixed-extension>.patch
+gendiff <source-dir> <fixed-extension> > ../SOURCES/<source-dir>-<fixed-extension>.patch

      For example, if the source code is in the directory - program-1.0/, and the backup file was - appended with the string iconfix, the + program-1.0/, and the backup file was + appended with the string iconfix, the command would be as follows: 

      -gendiff sourcecode-1.0 .iconfix > ../SOURCES/sourcecode-1.0-iconfix.patch
-
    Buildroot

    Make sure you use the special - %{_tmppath} macro. Do not - hard code /tmp/ or - /var/tmp/ because users or the build system +gendiff sourcecode-1.0 .iconfix > ../SOURCES/sourcecode-1.0-iconfix.patch +

    Buildroot

    Make sure you use the special + %{_tmppath} macro. Do not + hard code /tmp/ or + /var/tmp/ because users or the build system may have configured RPM to put temporary files elsewhere or may declared a different location for temporary files. Use the name and version macros so that two different versions of the package - can be built at the same time without collisions.

    Requires

    If your package requires other packages to be on the system at + can be built at the same time without collisions.

    Requires

    If your package requires other packages to be on the system at the time of installation, list them here. Include versions if necessary (for example, somepackage >= 2.0). Multiple entries must be separated by a space or a comma. Explicit file dependencies may be listed rather than package dependencies by giving the full path - (for example, /sbin/chkconfig).

    Prereq

    Similar to Requires, except + (for example, /sbin/chkconfig).

    Prereq

    Similar to Requires, except that this tag lists packages or files that are required to be present before the package is actually installed. Very important if you are packaging something that needs to make use of other - programs in %pre or - %post sections.

    BuildPrereq

    If your package needs other packages installed to build, list + programs in %pre or + %post sections.

    BuildPrereq

    If your package needs other packages installed to build, list them after this tag. Examples include - gtk2-devel and - db3-devel.

    %description

    Make your description as complete as possible, but not more + gtk2-devel and + db3-devel.

    %description

    Make your description as complete as possible, but not more than 10-15 lines of text. If other packages are necessary, or this package works with others, it is probably wise to describe the - specifics of that operation here.

    %prep

    This phase should unpack the source code and apply any patches + specifics of that operation here.

    %prep

    This phase should unpack the source code and apply any patches necessary for the build. Additionally, if autoconf and/or automake needs to be rerun, do so here. You usually unpack source code with - the %setup macro, and usually - provide the -q flag so that it is quiet while + the %setup macro, and usually + provide the -q flag so that it is quiet while unpacking: 

    -%setup -q
-

    Other options to %setup - include:

    • -a - <num>, - where <num> is the number +%setup -q +

      Other options to %setup + include:

      • -a + <num>, + where <num> is the number given the source file such as 0 for source0, means that only the source files specifies should be unpacked. The files are unpacked after changing to the - directory.

      • -b - <num>, - where <num> is the number + directory.

      • -b + <num>, + where <num> is the number given the source file such as 0 for source0, means that only the source files specifies should be unpacked. The files are unpacked before changing to the - directory.

      • -c is used to create the - directory before unpacking the sources.

      • -n - <name> can be - used to specify the directory name

      • -D specifies that the + directory.

      • -c is used to create the + directory before unpacking the sources.

      • -n + <name> can be + used to specify the directory name

      • -D specifies that the directory should not be deleted before unpacking.

      While applying patches, be sure to provide the - -b argument followed by the string you used in + -b argument followed by the string you used in the name of the patch file: 

      -%patch0 -p1 -b .<fixupstring>
-
    %build

    Include the command necessary to build the program in this - section (for example, make). -

    Always use the %configure +%patch0 -p1 -b .<fixupstring> +

    %build

    Include the command necessary to build the program in this + section (for example, make). +

    Always use the %configure macro where possible. This macro expands to automatically configure properly packaged programs that use autoconf and automake. It sets up all the paths and optimized CFLAGS correctly for whatever version of Fedora Core you are building on. If you need to provide extra flags, do so after the - %configure entry. Example: + %configure entry. Example: 

    -%configure --extra-flag=yes
-
    %install

    Include all the command needed to install the package.

    Usually you want to clean out any old buildroots that might be +%configure --extra-flag=yes +

    %install

    Include all the command needed to install the package.

    Usually you want to clean out any old buildroots that might be lying around before actually installing files into it:

    -rm -fr %{buildroot}
-
    %makeinstall

    Like the %configure macro, - the %makeinstall macro correctly +rm -fr %{buildroot} +

    %makeinstall

    Like the %configure macro, + the %makeinstall macro correctly installs a autoconf/automake style package into your - buildroot. Use it where possible.

    %clean

    Supply a command to clean up your buildroot. Usually the - command rm -fr %{buildroot} - suffices.

    %post

    Include anything that needs to happen immediately after + buildroot. Use it where possible.

    %clean

    Supply a command to clean up your buildroot. Usually the + command rm -fr %{buildroot} + suffices.

    %post

    Include anything that needs to happen immediately after package installation. For example, if the package includes an initscript that needs to be run to start the service. Another - example is if the ldconfig command needs to be + example is if the ldconfig command needs to be run after installing or upgrading any system libraries. Provide - the full path to the commands.

    %preun

    Similar to the %post section, + the full path to the commands.

    %preun

    Similar to the %post section, but run right before a package is removed. For example, it can check what the package reference count is. This is important to know whether you are upgrading a package (which involves @@ -225,22 +225,22 @@ to the number of packages with that name still installed). When it is being uninstalled, it will return 0.

    If you are going to stop a service and remove it from use in your %preun section, you want to make sure you are really removing - the package, and not just upgrading.

    %postun

    Similar to the %preun + the package, and not just upgrading.

    %postun

    Similar to the %preun section, but run after a package is removed. In this example, the service is restarted if and only if it remains on the system. We - do this in the postuninstall phase of the "old" package. If the + do this in the postuninstall phase of the "old" package. If the reference count on the package name is greater than or equal to one, we know the package is still on the system (for example, it was upgraded, not removed), and the service is restarted if it was - already running with the condrestart - directive.

    [Warning]Warning

    + already running with the condrestart + directive.

    [Warning]Warning

    All script sections of an RPM, including - %pre, - %preun, - %post, - %postun should + %pre, + %preun, + %post, + %postun should never output to standard error or standard - out. Redirect those messages to /dev/null + out. Redirect those messages to /dev/null if they can not be avoided. If the package is installed in a batch fashion, via a graphical RPM tool, or via an automated system, the user never sees those messages. Do @@ -248,80 +248,80 @@ one of these sections for giving the user additional instructions after an RPM has been installed. For the same reasons, scripts should never be - interactive.

    %files

    List the files that should be included in the package. The - files listed here are displayed when the rpm - -ql command is issued for the package.

    A package should not put a file in a directory that it does + interactive.

    %files

    List the files that should be included in the package. The + files listed here are displayed when the rpm + -ql command is issued for the package.

    A package should not put a file in a directory that it does not own and that none of its dependencies own. If this happens, the file is removed when the package is removed, but the directory is not.

    Another common mistake is to put a file in a directory that another package owns without adding a dependency on that - package. For example, assume mypkg owns the - /foo/ directory and - yourpkg owns the - /foo/bar file. If both packages are installed - and then mypkg is removed, the - /foo directory is not removed because it is - not empty. And when yourpkg is removed, the + package. For example, assume mypkg owns the + /foo/ directory and + yourpkg owns the + /foo/bar file. If both packages are installed + and then mypkg is removed, the + /foo directory is not removed because it is + not empty. And when yourpkg is removed, the file is removed, but the directory is not.

    In summary, make sure the package owns all the directories it uses or you depend on packages that do.

    Use the FHS transparent macros that are defined on a per-platform basis so the package is portable back to older versions of Fedora Core if the locations for these special directories change.

    Other macros for directories include: -

    • %{_bindir} — - bin directory for the system

    • %{_mandir} — - the default directory for manual pages

    • %{_datadir} — - the default share directory location

    • %{_defaultdocdir} — - the default directory for documentation

    The %defattr macro +

    • %{_bindir} — + bin directory for the system

    • %{_mandir} — + the default directory for manual pages

    • %{_datadir} — + the default share directory location

    • %{_defaultdocdir} — + the default directory for documentation

    The %defattr macro specifies what the default permissions, user, and group are for files - found in the %files section. In + found in the %files section. In almost every case specify the following:

    -%defattr(-,root,root,-)
-

    It is is in the form (file - permissions, owner, - group, directory - permissions). If a dash (-) is +%defattr(-,root,root,-) +

    It is is in the form (file + permissions, owner, + group, directory + permissions). If a dash (-) is specified for any field, whatever the actual permissions/ownership of the file in the buildroot are at packaging time are used instead.

    If necessary, specify attributes on a particular file can also be specified to make sure they are correct. For instance, to make sure a file has the mode - 0400:

    -%attr(0400,root,root) /etc/readonlyrootfile
+	      0400:
    +%attr(0400,root,root) /etc/readonlyrootfile
 
    If the file is a directory, it can be marked as a directory
-	      with the %dir prefix.
-	      %dir is only required if the
+	      with the %dir prefix.
+	      %dir is only required if the
 	      directory only (and not the files under it) should be packaged
 	      (or package the files under it with different flags). 
 	      Listing a directory only includes the directory, not the file in
 	      it and not any of its subdirectories.
 	    
    -%dir %{_datadir}/%{name}
+%dir %{_datadir}/%{name}
 
    If the file is a documentation file, mark it with the
-	      %doc prefix. The paths are
+	      %doc prefix. The paths are
 	      relative to the RPM build directory. For example:
 	    
    -%doc doc/*
+%doc doc/*
 
    If it is a configuration file it should be marked as
 	      follows:
    -%config <filename>
+%config <filename>
 
    
 	      If the configuration file should not be replaced when the RPM is
 	      upgraded, mark it as follows:
 	    
    -%config(noreplace) <filename>
+%config(noreplace) <filename>
 
    
 	      For files that should be included in the list of files so that
 	      they are uninstalled when the package is removed but may not exist
 	      until they are created during post-install should be marked as
 	      follows:
 	    
    -%config(missingok) <filename>
-
    %changelog

    Supply a changelog entry whenever a change to a package is +%config(missingok) <filename> +

    %changelog

    Supply a changelog entry whenever a change to a package is made. It must be in proper format as shown in the example. Be as - descriptive as possible; sentences such as fixed - bug does not example what has been fixed. If the + descriptive as possible; sentences such as fixed + bug does not example what has been fixed. If the changes include a fix for a bug filed in Bugzilla, include the - Bugzilla number in the changelog entry.

    Prev?Up?Next
    3.3.?Basic CVS Commands?Home?4.2.?Guidelines
    + Bugzilla number in the changelog entry.

    Prev   Next
    3.4. Basic CVS Commands Home 4.2. Guidelines
    -
    Chapter?5.?User Interface Guidelines
    Prev???Next

    Chapter?5.?User Interface Guidelines

    +

    Chapter 5. User Interface Guidelines
    Prev   Next

    Chapter 5. User Interface Guidelines

    If you just start reading the reference manual for a GUI toolkit and typing in code, the result will be pretty sad. Imagine implementing a compiler without reading any papers or textbooks on the subject. UI design @@ -19,22 +19,22 @@ more thought up front about who's going to use it, for what tasks, and how the software could make their day more pleasant and efficient. There's no reason command line applications have to be cryptic and annoying; compare - "classic ftp" to lftp. + "classic ftp" to lftp.

    - Caring about good design isn't just for people who write the "pixels on - the screen" part of the software, either. The backend should be designed + Caring about good design isn't just for people who write the "pixels on + the screen" part of the software, either. The backend should be designed to support the frontend, rather than being designed in isolation.

    Finally, caring about good design isn't just for programmers. The whole development process should take it into account. -

    5.1.?Read the CliffNotes?

    +

    5.1. Read the CliffNotes®

    Start with User Interface Design for Programmers, by Joel Spolsky. This book is short, entertaining, and covers the main points. There's a sort of rough draft or abridged version online or you can buy it from your favorite bookstore. The printed book is worth it for the extra material, and just for ease of reading, but the online version is fine too. -

    Prev?Up?Next
    4.3.?More RPM Building Hints?Home?5.2.?The GNOME Guidelines
    +

    Prev   Next
    4.3. More RPM Building Hints Home 5.2. The GNOME Guidelines
    -
    Fedora Project Developer's Guide
    ???Next

    Fedora Project Developer's Guide

    Tammy Fox

    Havoc Pennington

    Copyright ? 2003 Red Hat, Inc., Tammy Fox, Havoc Pennington

    Table of Conte! nts

    1. General Guidelines
    2. Package Versions
    2.1. Beta Exceptions
    3. CVS
    3.1. How CVS Works
    3.2. Configuring CVS on Your System
    3.3. Basic CVS Commands
    3.3.1. Checking Out Modules
    3.3.1.1. Checking Out Branches of Modules
    3.3.2. Updating Files
    3.3.3. Committing Files
    3.3.4. Adding Files
    3.3.5. Removing Files
    3.3.6. Status of Files
    3.3.7. Resolving Conflicts
    3.3.8. Summary
    4. Building RPM Packages
    4.1. Spec File
    4.2. Guidelines
    4.3. More RPM Building Hints
    5. User Interface Guidelines
    5.1. Read the CliffNotes?
    5.2. The GNOME Guidelines
    5.3. Get Religion
    ! 5.4. Get Details
    5.5. More Suggestions
    5.6. Scaling It Down
    6. Enabling Console Access
    7. Adding Applications to the Menus
    7.1. Red Hat Categories
    ???Next
    ???Chapter?1.?General Guidelines
    +
    Fedora Core Developer's Guide
       Next

    Fedora Core Developer's Guide

    Tammy Fox

    Havoc Pennington

    Copyright © 2003 Red Hat, Inc., Tammy Fox, Havoc Pennington

    Table of Co! ntents

    1. General Guidelines
    2. Package Versions
    2.1. Beta Exceptions
    3. CVS
    3.1. How CVS Works
    3.2. Preparing For CVS Use
    3.2.1. Is CVS Installed On Your System
    3.2.2. Generating SSH Keys
    3.3. Configuring For CVS Access
    3.3.1. Avoiding Repetitive Typing
    3.3.2. Configuring for Read-Only CVS Access
    3.3.3. Configuring Read/Write CVS Access
    3.4. Basic CVS Commands
    3.4.1. Checking Out Modules
    3.4.1.1. Checking Out Branches of Modules
    3.4.2. Updating Files
    3.4.3. Committing Files
    3.4.4. Adding Files
    3.4.5. Managing Binary Files
    3.4.6. Removing Files
    3.4.7. Status of Files
    3.4.8. Resolving Conflicts
    3.4.9. Summary
    4. Building RPM Packages
    4.1. Spec File
    4.2! . Guidelines
    4.3. More RPM Building Hints
    5. User Interface Guidelines
    5.1. Read the CliffNotes®
    5.2. The GNOME Guidelines
    5.3. Get Religion
    5.4. Get Details
    5.5. More Suggestions
    5.6. Scaling It Down
    6. Enabling Console Access
    7. Adding Applications to the Men! us
    7.1. Red Hat Categories
       Next
       Chapter 1. General Guidelines

    Garrett LeSage created the admonition graphics (note, tip, important, - caution, and warning). They may be freely redistributed with documentation - produced for the Fedora project. + caution, and warning). + Tommy Reynolds created the callout graphics. + They all may be freely redistributed with documentation + produced for the Fedora Project.

    developers-guide-0.1.2 (2003-10-02)

    - Red Hat, Red Hat Network, the Red Hat "Shadow Man" logo, RPM, Maximum RPM, the RPM logo, Linux + Red Hat, Red Hat Network, the Red Hat "Shadow Man" logo, RPM, Maximum RPM, the RPM logo, Linux Library, PowerTools, Linux Undercover, RHmember, RHmember More, Rough Cuts, Rawhide and all Red Hat-based trademarks and logos are trademarks or registered trademarks of Red Hat, Inc. in the United States and other countries. @@ -35,7 +37,7 @@

    Motif and UNIX are registered trademarks of The Open Group.

    - Intel and Pentium are a registered trademarks of Intel Corporation. Itanium + Intel and Pentium are registered trademarks of Intel Corporation. Itanium and Celeron are trademarks of Intel Corporation.

    AMD, AMD Athlon, AMD Duron, and AMD K6 are trademarks of Advanced Micro Index: s1-rpm-guidelines.php =================================================================== RCS file: /cvs/fedora/web/html/participate/developers-guide/s1-rpm-guidelines.php,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- s1-rpm-guidelines.php 30 Mar 2005 17:47:23 -0000 1.1.1.1 +++ s1-rpm-guidelines.php 29 Sep 2005 17:08:19 -0000 1.2 @@ -7,21 +7,21 @@ ?> -

    4.2.?Guidelines
    Prev?Chapter?4.?Building RPM Packages?Next

    4.2.?Guidelines

    +

    4.2. Guidelines
    Prev Chapter 4. Building RPM Packages Next

    4.2. Guidelines

    Adhere to the follow rules to make sure the package is packaged properly. This should be used as a checklist:

    1. Every package must have a unique version number (per epoch)

    2. The RPM package filename must be in the n-v-r (name, version, release) format and must contain the architecture for the package. The proper format is - <name>-<version>-<release>.<arch>.rpm. - For example, pkgname-1.24-2.i386.rpm is a proper + <name>-<version>-<release>.<arch>.rpm. + For example, pkgname-1.24-2.i386.rpm is a proper RPM filename.

    3. The n-v-r in the filename must be the same as the n-v-r in the spec file.

    4. If the package is changed in any way, including changing the signature or recompiling, the version or release must be incremented.

    5. The package may obsolete itself.

    6. If a file from the package conflicts with a file from another - package in the Fedora project, the package must use - Conflicts: to specify it in the spec + package in the Fedora Project, the package must use + Conflicts: to specify it in the spec file.

    7. The file list for the package must contain all the files in the package so that all files are removed when the package is removed.

    8. The package may not use interactive pre-install, post-install, @@ -29,18 +29,18 @@ prompted at anytime during the install, upgrade, or removal — Everything must be completely automated.

    9. The package must not write anything to standard error or standard out. Redirect any messages to - /dev/null if they are not necessary, or write + /dev/null if they are not necessary, or write them to a log file.

    10. When specifying a group in the spec file, it must be one from - /usr/share/doc/rpm-<version>/GROUPS. It + /usr/share/doc/rpm-<version>/GROUPS. It there is not an exact match, use the closest match. Do not invent a new group name.

    11. The package can not just unarchive the files in the post-install script. This defeats the purpose of using RPM.

    12. If a file is moved from one binary package to another, the new package with the file must specified the old package in the spec file with the - Conflicts: option.

    13. If a newer RPM does not have a binary package that the older + Conflicts: option.

    14. If a newer RPM does not have a binary package that the older SRPMS produced, the binary package not produced anymore must be - specified with the Obsoletes: - option in the new spec file.

    Prev?Up?Next
    Chapter?4.?Building RPM Packages?Home?4.3.?More RPM Building Hints
    + specified with the Obsoletes: + option in the new spec file.

    Prev Up Next
    Chapter 4. Building RPM Packages Home 4.3. More RPM Building Hints
    -
    4.3.?More RPM Building Hints
    Prev?Chapter?4.?Building RPM Packages?Next

    4.3.?More RPM Building Hints

    +

    4.3. More RPM Building Hints
    Prev Chapter 4. Building RPM Packages Next

    4.3. More RPM Building Hints

    This section contains some additional troubleshooting tips:

    1. %{_libdir} is tricky.

      Use %{_prefix}/lib for data files, and %{_libdir} for libraries. There is a slew of non-trivial FHS issues here as well.

    2. Building as nobody with %files -f file.list

      Make sure you have a %defattr(-,root,root) in place, or - user/group will not be correct.

      A %defattr(-,root,root) will be - honored anywhere in a %files + user/group will not be correct.

      A %defattr(-,root,root) will be + honored anywhere in a %files list.

      The Principle of Least Surprise sez' put it at the beginning of file.list.

    3. * %{prefix} is not %{_prefix}

      The macro %{prefix} is a side effect macro, silently added when Prefix: whatever is parsed, while the macro %{_prefix} is what is used in configure prefix=%{_prefix} There's also extensive and conventional use of %prefix in Gnome and other packaging.

    4. Fix/mangle the file manifest in %install, not %files. Fixing the file manifest in %install will (eventually) permit constructs like:

      -%files
+%files
 %{_bindir}/*
-...
+...

      and eventually:

      -%files
-/
+%files
+/

      The risk, of course, is that packages will be polluted by unknown files which cause file conflicts down the road. I believe (but other opinions and traditional wisdom differ) that %files - should be made as compact as possible.

    Prev?Up?Next
    4.2.?Guidelines?Home?Chapter?5.?User Interface Guidelines
    + should be made as compact as possible.

    Prev Up Next
    4.2. Guidelines Home Chapter 5. User Interface Guidelines
    -
    5.4.?Get Details
    Prev?Chapter?5.?User Interface Guidelines?Next

    5.4.?Get Details

    - Designing from Both Sides of the Screen by Ellen - Isaacs and Alan Walendowski is a very practical "How To" book, similar +

    5.4. Get Details
    Prev Chapter 5. User Interface Guidelines Next

    5.4. Get Details

    + Designing from Both Sides of the Screen by Ellen + Isaacs and Alan Walendowski is a very practical "How To" book, similar in spirit to Joel's book but more detailed and not aimed exclusively at programmers.

    @@ -28,11 +28,11 @@ between the designer and programmer, and how to balance UI goals with time, resource, and engineering constraints.

    - Alan Cooper's About Face 2.0 is comparable to - Designing from Both Sides of the Screen in that - it's a practical "How To" and reference manual, so if you want more + Alan Cooper's About Face 2.0 is comparable to + Designing from Both Sides of the Screen in that + it's a practical "How To" and reference manual, so if you want more advice on concrete methodologies, have a look. -

    Prev?Up?Next
    5.3.?Get Religion?Home?5.5.?More Suggestions
    +

    Prev Up Next
    5.3. Get Religion Home 5.5. More Suggestions
    -
    5.3.?Get Religion
    Prev?Chapter?5.?User Interface Guidelines?Next

    5.3.?Get Religion

    +

    5.3. Get Religion
    Prev Chapter 5. User Interface Guidelines Next

    5.3. Get Religion

    For a less applied, more big-picture book, you might be interested in - Alan Cooper's The Inmates are Running the Asylum, + Alan Cooper's The Inmates are Running the Asylum, which is in part an extended (and fun to read) rant, but also contains some interesting case studies, examples, and practical suggestions.

    @@ -17,14 +17,14 @@ about development team organization, project management, etc. as well as technical suggestions.

    - Alan Cooper has a more practical, "how-to" style book as well, called - About Face 2.0 - be sure to get the brand-new 2.0 + Alan Cooper has a more practical, "how-to" style book as well, called + About Face 2.0 - be sure to get the brand-new 2.0 edition, rather than the now-somewhat-dated original.

    - Everyone on earth recommends The Design of Everyday - Things, by Donald Norman. This is another good book + Everyone on earth recommends The Design of Everyday + Things, by Donald Norman. This is another good book to check out. -

    Prev?Up?Next
    5.2.?The GNOME Guidelines?Home?5.4.?Get Details
    +

    Prev Up Next
    5.2. The GNOME Guidelines Home 5.4. Get Details
    -
    5.2.?The GNOME Guidelines
    Prev?Chapter?5.?User Interface Guidelines?Next

    5.2.?The GNOME Guidelines

    - Read the GNOME Human Interface Guidelines. These +

    5.2. The GNOME Guidelines
    Prev Chapter 5. User Interface Guidelines Next

    5.2. The GNOME Guidelines

    + Read the GNOME Human Interface Guidelines. These are pretty good guidelines developed by some interaction design professionals, and are the best guidelines to come from the open source - community so far. Until we have official Fedora project guidelines, + community so far. Until we have official Fedora Project guidelines, following the GNOME guidelines will probably result in a substantially better UI than making up your own. And our tools will be consistent with each other and at least one desktop environment. @@ -29,7 +29,7 @@ widgets properly, and such. Don't get too bogged down in this and neglect the big picture. You can be fully guideline-compliant and still have an application that doesn't make any sense. -

    Prev?Up?Next
    Chapter?5.?User Interface Guidelines?Home?5.3.?Get Religion
    +

    Prev Up Next
    Chapter 5. User Interface Guidelines Home 5.3. Get Religion
    -
    5.5.?More Suggestions
    Prev?Chapter?5.?User Interface Guidelines?Next

    5.5.?More Suggestions

    +

    5.5. More Suggestions
    Prev Chapter 5. User Interface Guidelines Next

    5.5. More Suggestions

    Some places to start:

    1. GNOME Usability Project

    2. Suggested readings from the Isaacs and Walendowski book

    3. Tog's - First Principles

    4. Maximizing - Human Performance

    5. Personas

    Prev?Up?Next
    5.4.?Get Details?Home?5.6.?Scaling It Down
    + First Principles

  • Maximizing + Human Performance

  • Personas

    • Prev Up Next
    5.4. Get Details Home 5.6. Scaling It Down
    -
    5.6.?Scaling It Down
    Prev?Chapter?5.?User Interface Guidelines?Next

    5.6.?Scaling It Down

    - These books talk about things like your development - team, your dedicated graphic - artist, and your professional interaction - designer. Since you may or may not have all of these available, +

    5.6. Scaling It Down
    Prev Chapter 5. User Interface Guidelines Next

    5.6. Scaling It Down

    + These books talk about things like your development + team, your dedicated graphic + artist, and your professional interaction + designer. Since you may or may not have all of these available, here are some simple tasks you can do on your own: -

    • Come up with what Joel calls "imaginary users"/"scenarios" and - Alan Cooper calls "personas" - describe the prototypical person who +

      • Come up with what Joel calls "imaginary users"/"scenarios" and + Alan Cooper calls "personas" - describe the prototypical person who will use the software. Or if there are several very different possible users, write that down too. Maybe you need to have two paths through the UI for different audiences.

      • Write down the goals of your target users; what are they trying to get done? Set some clear direction for your software. Create a - list of tasks the software will support.

      • Don't assume a priori that if you're writing the "XYZ tool" that + list of tasks the software will support.

      • Don't assume a priori that if you're writing the "XYZ tool" that the tool must be one window opened from one menu entry. Maybe supporting your list of tasks should involve file manager extensions, applets, web frontend, wizards, etc. Your goal should be - to support all the tasks appropriately somewhere in Fedora project, - not to "write an XYZ tool."

      • Do at least a quick and easy UI specification before you write + to support all the tasks appropriately somewhere in Fedora Project, + not to "write an XYZ tool."

      • Do at least a quick and easy UI specification before you write code. Joel's book, and the Isaacs and Walendowski, discuss how to write such a spec. It doesn't need to be lengthy. Refer to the following examples:

      • Post any or all of the above to the website and/or development mailing lists. @@ -32,18 +32,18 @@ you do or don't have a particular UI feature.

      • As you write code, try to stick to the guidelines that are just as easy to follow as not follow; get the pixel spacing right, use clear plain language in messages, and that sort of thing.

      • Be sure to use libraries when appropriate, such as GTK+ and Qt. Avoid - toolkits that don't properly fit in to Fedora project (such as Motif, Tk, or + toolkits that don't properly fit in to Fedora Project (such as Motif, Tk, or Swing). Libraries will handle some important details for you.

      • If you use a GUI builder to create resource files, tweaking UI details will be a whole lot less annoying. (With GTK+2 for example, load dialogs from .glade files at runtime, using libglade.) This way - you can rearrange the UI without changing all the code.

      • Don't be afraid to do some quick "user testing" on non-technical + you can rearrange the UI without changing all the code.

      • Don't be afraid to do some quick "user testing" on non-technical people. You can get useful information quickly, this need not be a high-overhead undertaking.

      • Categorizing your tasks using the 2x2 matrix in Chapter 6 of the Isaacs and Walendowski book is quick to do and very valuable; you - might think of this as the old API design rule, "make easy things - easy and hard things possible," applied to the user interface - instead of the application interface.

      • Feel free to email with - comments, questions, or proposals.

    Prev?Up?Next
    5.5.?More Suggestions?Home?Chapter?6.?Enabling Console Access
    + might think of this as the old API design rule, "make easy things + easy and hard things possible," applied to the user interface + instead of the application interface.

  • Feel free to email with + comments, questions, or proposals.

    • Prev Up Next
    5.5. More Suggestions Home Chapter 6. Enabling Console Access
    Author: rdieter Update of /cvs/extras/rpms/sbcl/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16599 Modified Files: sbcl.spec Log Message: * Thu Sep 29 2005 Rex Dieter 0.9.5-15 - enable sb-thread - set EXTRA_CFLAGS to so optflags are used for building contrib/ too - hope that a rebuild will include missing sb-posix (bz #169506) Index: sbcl.spec =================================================================== RCS file: /cvs/extras/rpms/sbcl/FC-4/sbcl.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- sbcl.spec 28 Sep 2005 16:43:29 -0000 1.22 +++ sbcl.spec 29 Sep 2005 17:10:35 -0000 1.23 @@ -3,20 +3,21 @@ Name: sbcl Summary: Steel Bank Common Lisp Version: 0.9.5 -Release: 14%{?dist} +Release: 15%{?dist} License: BSD/MIT Group: Development/Languages URL: http://sbcl.sourceforge.net/ Source0: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-%{version}-source.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -#ExclusiveArch: %{ix86} x86_64 -ExclusiveArch: ppc +ExclusiveArch: %{ix86} x86_64 -Source1: customize-target-features.lisp +# Pre-generated html docs (not used) +#Source1: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-%{version}-html.tar.bz2 +Source2: customize-target-features.lisp ## x86 section -#Source10: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.4-x86-linux-binary.tar.bz2 +#Source10: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.5-x86-linux-binary.tar.bz2 %ifarch %{ix86} %define sbcl_arch x86 BuildRequires: sbcl @@ -70,6 +71,11 @@ %prep %setup -q %{?sbcl_bootstrap_src} +# Handle pre-generated docs +if [ -d %{name}-%{version}/doc/manual ]; then + mv %{name}-%{version}/doc/manual/* doc/manual/ +fi + #sed -i -e "s|/usr/local/lib/sbcl/|%{_libdir}/sbcl/|" src/runtime/runtime.c #or patch to use SBCL_HOME env var %patch1 -p0 -b .default-sbcl-home @@ -80,11 +86,13 @@ %patch6 -p1 -b .verbose-build %patch7 -p1 -b .stdlib_h +# Enable sb-thread %ifarch %{ix86} x86_64 #sed -i -e "s|; :sb-thread|:sb-thread|" base-target-features.lisp-expr -#cp %{SOURCE1} ./customize-target-features.lisp +cp %{SOURCE2} ./customize-target-features.lisp %endif +# "install" local bootstrap %if "%{?sbcl_bootstrap_src}" != "%{nil}" mkdir sbcl-bootstrap pushd sbcl-*-linux @@ -93,24 +101,26 @@ popd %endif -# CVS crud -find . -name CVS -type d | xargs rm -rf -find . -name '.cvsignore' | xargs rm -f # fix permissions (some have eXecute bit set) find . -name '*.c' | xargs chmod 644 %build -export DEFAULT_SBCL_HOME=%{_libdir}/sbcl +# setup local bootstrap %if "%{?sbcl_bootstrap_src}" != "%{nil}" export SBCL_HOME=`pwd`/sbcl-bootstrap/lib/sbcl export PATH=`pwd`/sbcl-bootstrap/bin:${PATH} +%endif +# my_setarch, to set personality, (about) the same as setarch -R, +# but usable on fc3 too %{__cc} -o my_setarch %{optflags} %{SOURCE100} %define my_setarch ./my_setarch -%endif +# trick contrib/ modules to use optflags too +export EXTRA_CFLAGS="$RPM_OPT_FLAGS" +export DEFAULT_SBCL_HOME=%{_libdir}/sbcl %{?sbcl_arch:export SBCL_ARCH=%{sbcl_arch}} %{?setarch} %{?my_setarch} ./make.sh %{?bootstrap} @@ -133,16 +143,20 @@ rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT{%{_bindir},%{_libdir},%{_mandir}} -unset SBCL_HOME ||: -export INSTALL_ROOT=$RPM_BUILD_ROOT%{_prefix} -export LIB_DIR=$RPM_BUILD_ROOT%{_libdir} -sh ./install.sh + +unset SBCL_HOME +export INSTALL_ROOT=$RPM_BUILD_ROOT%{_prefix} +export LIB_DIR=$RPM_BUILD_ROOT%{_libdir} +sh ./install.sh ## Unpackaged files rm -rf $RPM_BUILD_ROOT%{_docdir}/sbcl rm -f $RPM_BUILD_ROOT%{_infodir}/dir -# from make check -find $RPM_BUILD_ROOT -name 'test-passed' | xargs rm -f +# CVS crud +find $RPM_BUILD_ROOT -name CVS -type d | xargs rm -rf +find $RPM_BUILD_ROOT -name .cvsignore | xargs rm -f +# 'test-passed' files from make check (leave these in, for now -- Rex) +# find $RPM_BUILD_ROOT -name 'test-passed' | xargs rm -f %post @@ -174,6 +188,11 @@ %changelog +* Thu Sep 29 2005 Rex Dieter 0.9.5-15 +- enable sb-thread +- set EXTRA_CFLAGS to so optflags are used for building contrib/ too +- hope that a rebuild will include missing sb-posix (bz #169506) + * Wed Sep 28 2005 Rex Dieter 0.9.5-14 - more ppc work From fedora-extras-commits at redhat.com Thu Sep 29 17:29:45 2005 From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields)) Date: Thu, 29 Sep 2005 13:29:45 -0400 Subject: web/html/docs/fedora-install-guide-en/fc4 ch-upgrading-system.php, NONE, 1.1 rv-revhistory.php, NONE, 1.1 sn-upgrading-bootloader.php, NONE, 1.1 ch-abouttoinstall.php, 1.2, 1.3 ch-acknowledgements.php, 1.2, 1.3 ch-beginninginstallation.php, 1.2, 1.3 ch-bootloader.php, 1.2, 1.3 ch-disk-partitioning.php, 1.2, 1.3 ch-firstboot.php, 1.2, 1.3 ch-installer-locale.php, 1.2, 1.3 ch-installing-packages.php, 1.2, 1.3 ch-installtypes.php, 1.2, 1.3 ch-intro.php, 1.2, 1.3 ch-networkconfig.php, 1.2, 1.3 ch-next-steps.php, 1.2, 1.3 ch-other-install-methods.php, 1.2, 1.3 ch-packageselection.php, 1.2, 1.3 ch-rootpassword.php, 1.3, 1.4 ch-security-config.php, 1.2, 1.3 ch-timezone.php, 1.3, 1.4 fedora-install-guide-en.tar.gz, 1.1, 1.2 generated-index.php, 1.2, 1.3 index.php, 1.2, 1.3 installtype-notes.php, 1.2, 1.3 ln-legalnotice.php, 1.2, 1.3 sn-before-begin.php, 1.2, 1.3 sn-booting-from-pxe.php, 1.2, 1.3 sn-bootloader-advanced.php, 1.2, 1.3 sn-bootloader-others.php, 1.2, 1.3 sn-bootloader-password.php, 1.2, 1.3 sn-community-help.php, 1.2, 1.3 ! sn-community.php, 1.2, 1.3 sn-computer-hostname.php, 1.2, 1.3 sn-disk-druid.php, 1.2, 1.3 sn-extreme-packagegroups.php, 1.2, 1.3 sn-firstboot-additional-cds.php, 1.2, 1.3 sn-firstboot-datetime.php, 1.2, 1.3 sn-firstboot-display.php, 1.2, 1.3 sn-firstboot-soundcard.php, 1.2, 1.3 sn-firstboot-systemuser.php, 1.2, 1.3 sn-installer-keyboard.php, 1.2, 1.3 sn-installing-from-harddrive.php, 1.2, 1.3 sn-lang-packages.php, 1.2, 1.3 sn-network-misc-settings.php, 1.2, 1.3 sn-packagegroups.php, 1.2, 1.3 sn-partitioning-general.php, 1.2, 1.3 sn-selinux.php, 1.2, 1.3 sn-using-otherbootmedia.php, 1.2, 1.3 sn-utc.php, 1.3, 1.4 Message-ID: <200509291729.j8THTjxQ016849@cvs-int.fedora.redhat.com> Author: pfrields Update of /cvs/fedora/web/html/docs/fedora-install-guide-en/fc4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16778 Modified Files: ch-abouttoinstall.php ch-acknowledgements.php ch-beginninginstallation.php ch-bootloader.php ch-disk-partitioning.php ch-firstboot.php ch-installer-locale.php ch-installing-packages.php ch-installtypes.php ch-intro.php ch-networkconfig.php ch-next-steps.php ch-other-install-methods.php ch-packageselection.php ch-rootpassword.php ch-security-config.php ch-timezone.php fedora-install-guide-en.tar.gz generated-index.php index.php installtype-notes.php ln-legalnotice.php sn-before-begin.php sn-booting-from-pxe.php sn-bootloader-advanced.php sn-bootloader-others.php sn-bootloader-password.php sn-community-help.php sn-community.php sn-computer-hostname.php sn-disk-druid.php sn-extreme-packagegroups.php sn-firstboot-additional-cds.php sn-firstboot-datetime.php sn-firstboot-display.php sn-firstboot-soundcard.php sn-firstboot-systemuser.php sn-installer-keyboard.php sn-installing-from-harddrive.php sn-lang-packages.php sn-network-misc-settings.php sn-packagegroups.php sn-partitioning-general.php sn-selinux.php sn-using-otherbootmedia.php sn-utc.php Added Files: ch-upgrading-system.php rv-revhistory.php sn-upgrading-bootloader.php Log Message: Republish to export revision history pursuant to new XSL ***** Error reading new file: [Errno 2] No such file or directory: 'ch-upgrading-system.php' ***** Error reading new file: [Errno 2] No such file or directory: 'rv-revhistory.php' ***** Error reading new file: [Errno 2] No such file or directory: 'sn-upgrading-bootloader.php' Index: ch-abouttoinstall.php =================================================================== RCS file: /cvs/fedora/web/html/docs/fedora-install-guide-en/fc4/ch-abouttoinstall.php,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ch-abouttoinstall.php 12 Jun 2005 08:52:19 -0000 1.2 +++ ch-abouttoinstall.php 29 Sep 2005 17:29:43 -0000 1.3 @@ -7,14 +7,14 @@ ?> -
    Chapter 13. About to Install
    Prev   Next

    Chapter 13. About to Install

    +

    Chapter 13. About to Install
    Prev   Next

    Chapter 13. About to Install

    No changes are made to your computer until you click the - Next button. If you abort the installation + Next button. If you abort the installation process after that point, the Fedora Core system will be incomplete and unusable. To return to previous screens to make different choices, - select Back. To abort the installation, turn + select Back. To abort the installation, turn off the computer. -

    [Important]Aborting Installation

    +

    [Important]Aborting Installation

    In certain situations, you may be unable to return to previous screens. Fedora Core notifies you of this restriction and allows you to abort the installation program. You may reboot with the @@ -22,15 +22,15 @@

    About to install screen.

    Figure 13.1. About to Install Screen

    - Click Next to begin the installation. + Click Next to begin the installation.

    If your installation requires more than one disc, Fedora Core displays a list of all discs required to complete the process. If you do not have all of the necessary discs, select - Reboot to abort the installation. Otherwise, - choose Continue to proceed with installation. -

    Prev Up Next
    12.4. Everything or - Minimal Installations Home Chapter 14. Installing Packages
    + Reboot to abort the installation. Otherwise, + choose Continue to proceed with installation. +

    Prev   Next
    12.4. Everything or + Minimal Installations Home Chapter 14. Installing Packages
    -
    Chapter 17. Acknowledgements
    Prev   Next

    Chapter 17. Acknowledgements

    +

    Chapter 17. Acknowledgements
    Prev   Next

    Chapter 17. Acknowledgements

    Many useful comments and suggestions were provided by Rahul Sundaram and the Anaconda team. -

    Prev Up Next
    16.3. Joining The Fedora Community Home Index
    +

    Prev   Next
    16.3. Joining The Fedora Community Home Index
    -
    Chapter 1. Beginning the Installation
    Prev   Next

    Chapter 1. Beginning the Installation

    +

    Chapter 1. Beginning the Installation
    Prev   Next

    Chapter 1. Beginning the Installation

    To begin installation of Fedora Core, boot the computer from the boot media. You may install from CD or DVD discs, USB pen drives, hard drives, or network servers. -

    [Note]Installation from Diskettes

    +

    [Note]Installation from Diskettes

    There is no option to install Fedora Core from diskettes.

    - The BIOS (Basic Input/Output System) + The BIOS (Basic Input/Output System) on your computer must support the type of boot media you select. The BIOS controls access to some hardware devices during boot time. Any computer that meets the minimum recommended specification for Fedora Core @@ -22,7 +22,7 @@ flash media are newer technologies, but many computers can use them as boot media. Some network cards and chipsets include support for network booting with - PXE. PXE (pronounced "pixie") + PXE. PXE (pronounced "pixie") allows a computer to load boot files from a network server instead of directly-connected hardware.

    @@ -30,49 +30,49 @@ configure the BIOS, consult the documentation provided by the manufacturer. Detailed information on hardware specifications and configuration is beyond the scope of this document. -

    [Note]Aborting the Installation

    +

    [Note]Aborting the Installation

    To abort the installation process at any time before the - Installing Packages screen, either press - Ctrl-Alt-Del + Installing Packages screen, either press + Ctrl-Alt-Del or power off the computer with the power switch. Fedora makes no changes to your computer until package installation begins. -

    1.1. Booting from Disc

    +

    1.1. Booting from Disc

    To boot your computer from disc: -

    1. Switch on the computer.

    2. Insert the first disc into the CD or DVD drive.

    3. A boot screen appears, with a boot: +

      1. Switch on the computer.

      2. Insert the first disc into the CD or DVD drive.

      3. A boot screen appears, with a boot: prompt at the bottom.

      Fedora Core boot screen.

      Figure 1.1. Boot Screen

      - If you hit Enter, the installation runs in + If you hit Enter, the installation runs in default mode. In the default mode, the installation runs from CD or DVD discs, and uses a graphical interface if possible. To - change the installation mode, at the boot: - prompt, type linux followed by one or more + change the installation mode, at the boot: + prompt, type linux followed by one or more of the following options:

      • To install from a hard drive or network server, add the - directive askmethod. + directive askmethod.

      • To use a text interface, add the directive - text. + text.

      • To retry installation because the installation aborted at an early stage, add the directive - acpi=off. + acpi=off.

      Refer to the Release Notes for additional options that may help if you encounter problems with the installation program. A current copy of the Release Notes is always available at http://fedora.redhat.com/docs/.

      - When you issue a command at the boot: prompt, the + When you issue a command at the boot: prompt, the first stage of the installation program starts. After it loads, the following screen appears:

      Media test screen.

      Figure 1.2. Media Test Screen

      - Select OK to test the disc, or select - Skip to proceed with the installation + Select OK to test the disc, or select + Skip to proceed with the installation without testing the disc. -

      [Caution]Testing Discs

      +

      [Caution]Testing Discs

      Test any discs which you have not previously tested. A disc error during the installation process may force you to restart the entire procedure. @@ -82,24 +82,24 @@

      Media check result.

      Figure 1.3. Media Check Result

      - Select OK. The following screen appears: + Select OK. The following screen appears:

      Next disc or continue.

      Figure 1.4. Next Disc Screen

      - Select Test to test the next disc in the - set, or Continue to proceed with the + Select Test to test the next disc in the + set, or Continue to proceed with the installation.

      After you test your discs and select - Continue, or if you choose to skip testing, + Continue, or if you choose to skip testing, the main graphical installation program loads.

      To boot from the disc, but install from another device or a - network server, use the linux askmethod - command at the boot: prompt. Fedora Core also includes + network server, use the linux askmethod + command at the boot: prompt. Fedora Core also includes a boot-only CD for this purpose, which is stored on the first Fedora Core installation disc as an ISO file, - images/boot.iso. + images/boot.iso.

      To convert the ISO file into a physical CD, use the option in your CD-writing program that burns a CD image file to a CD. If you @@ -108,12 +108,12 @@ for instructions. If you are using Linux, use the following command to burn a CD image file to a blank recordable CD: 

      -cdrecord --device=cdwriter-device -tao -eject image-file.iso
-
      [Note]BIOS Boot Order

      +cdrecord --device=cdwriter-device -tao -eject image-file.iso +

      [Note]BIOS Boot Order

      The BIOS contains settings that control the order of boot devices. If your PC boots from a device other than the Fedora Core boot media, check the BIOS boot configuration. -

      Prev Up Next
      2. Before You Begin Home 1.2. Using Other Removable Media
      +

      Prev   Next
      2. Before You Begin Home 1.2. Using Other Removable Media
      -
      Chapter 7. Boot Loader
      Prev   Next

      Chapter 7. Boot Loader

      - A boot loader is a small program that reads +

      Chapter 7. Boot Loader
      Prev   Next

      Chapter 7. Boot Loader

      + A boot loader is a small program that reads and launches the operating system. Fedora Core uses the - GRUB boot loader by default. If you have + GRUB boot loader by default. If you have multiple operating systems, the boot loader determines which one to boot, usually by offering a menu.

      @@ -18,28 +18,28 @@ operating system may install its own preferred boot loader, or you may have installed a third-party boot loader.If your boot loader does not recognize Linux partitions, you may not be able to boot - Fedora Core. Use GRUB as your boot loader to + Fedora Core. Use GRUB as your boot loader to boot Linux and most other operating systems. Follow the directions - in this section to install GRUB. -

      [Warning]Installing GRUB

      + in this section to install GRUB. +

      [Warning]Installing GRUB

      If you install GRUB, it may overwrite your existing boot loader.

      The following screen displays boot loader configuration options.

      Boot loader configuration screen

      Figure 7.1.  Boot Loader Configuration Screen -

      7.1. Keeping Your Existing Boot Loader Settings

      +

      7.1. Keeping Your Existing Boot Loader Settings

      By default, the installation program installs GRUB in the - master boot record, or MBR, of the device for the root + master boot record, or MBR, of the device for the root file system. To change or decline installation of a new boot - loader, select the Change boot loader + loader, select the Change boot loader button. The dialog shown in Figure 7.2, “Change Boot Loader” allows you to avoid installing or changing your existing boot loader settings. -

      Change boot loader dialog

      Figure 7.2. Change Boot Loader

      [Important]Boot Loader Required

      - Your computer must have GRUB or another boot loader installed +

      Change boot loader dialog

      Figure 7.2. Change Boot Loader

      [Important]Boot Loader Required

      + Your computer must have GRUB or another boot loader installed in order to start, unless you create a separate startup disk to boot from. -

      Prev Up Next
      6.3. Disk Druid Home 7.2.  +

      Prev   Next
      6.3. Disk Druid Home 7.2.  Booting Additional Operating Systems
      Index: ch-disk-partitioning.php =================================================================== RCS file: /cvs/fedora/web/html/docs/fedora-install-guide-en/fc4/ch-disk-partitioning.php,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ch-disk-partitioning.php 12 Jun 2005 08:52:19 -0000 1.2 +++ ch-disk-partitioning.php 29 Sep 2005 17:29:43 -0000 1.3 @@ -7,7 +7,7 @@ ?> -
      Chapter 6. Disk Partitioning
      Prev   Next

      Chapter 6. Disk Partitioning

      +

      Chapter 6. Disk Partitioning
      Prev   Next

      Chapter 6. Disk Partitioning

      If you are new to Linux, you may want to use the automatic partitioning method. If you are a more experienced Linux user, use the manual partitioning method for more control over your system @@ -15,24 +15,24 @@ partitions.

      disk partitioning setup screen

      Figure 6.1.  Disk Partitioning Setup Screen -

      6.1. Choosing a Partitioning Method

      6.1.1. Setting Up Partitions Automatically

      - Choose Automatic partitioning at the +

      6.1. Choosing a Partitioning Method

      6.1.1. Setting Up Partitions Automatically

      + Choose Automatic partitioning at the partitioning menu to use a preset partitioning layout. - Disk Druid then displays additional + Disk Druid then displays additional options:

      automatic partitioning screen

      Figure 6.2.  Automatic Partitioning Setup Screen -

      Remove all Linux partitions on this - system

      - Removes all ext2, - ext3, and Linux - swap partitions from all hard disks -

      Remove all partitions on this - system

      +

      Remove all Linux partitions on this + system

      + Removes all ext2, + ext3, and Linux + swap partitions from all hard disks +

      Remove all partitions on this + system

      Removes all partitions from all hard disks -

      Keep all partitions and use only existing free - space

      +

      Keep all partitions and use only existing free + space

      Uses only the unpartitioned space on the hard disk(s) to install Fedora Core

      @@ -43,25 +43,25 @@ selected. Any disks you select are used for Linux partitions according to the option selected above. The option selection is global, and you may not select a different option for each disk. -

      [Note]Device Names

      +

      [Note]Device Names

      If you are confused about the device names used in this box, consult the Linux Partition-HOWTO at http://www.tldp.org/HOWTO/Partition/partition-2.html.

      To review the automatic partition configuration, select the - Review checkbox. + Review checkbox.

      If you remove any existing partitions, the installation program asks you to confirm this choice. After you review and approve - the partition configuration, select Next + the partition configuration, select Next to continue to the next installation step. Proceed with Chapter 7, Boot Loader. -

      6.1.2. Setting Up Partitions Manually

      +

      6.1.2. Setting Up Partitions Manually

      To manually set up all disk partitions, choose - Manually partition with Disk Druid. Choose + Manually partition with Disk Druid. Choose this method if you require a special partition configuration. If you are familiar with how disk partitions and the Linux file system work, move on to Section 6.3, “Disk Druid”. Otherwise, read Section 6.2, “General Information on Partitions”. -

      Prev Up Next
      5.2. Special Considerations Home 6.2. General Information on Partitions
      +

      Prev   Next
      5.2. Special Considerations Home 6.2. General Information on Partitions
      -
      Chapter 15. First Boot
      Prev   Next

      Chapter 15. First Boot

      - The Setup Agent launches the first time - that you start a new Fedora Core system. Use Setup - Agent to configure the system for use before you log +

      Chapter 15. First Boot
      Prev   Next

      Chapter 15. First Boot

      + The Setup Agent launches the first time + that you start a new Fedora Core system. Use Setup + Agent to configure the system for use before you log in.

      Welcome screen.

      Figure 15.1. Welcome Screen

      - Select Next to start the Setup - Agent. -

      [Note]GUI Required

      - Setup Agent requires a graphical + Select Next to start the Setup + Agent. +

      [Note]GUI Required

      + Setup Agent requires a graphical interface. If none is available, configure these options manually after you log in. -

      15.1. License Agreement

      +

      15.1. License Agreement

      This screen displays the overall licensing terms for Fedora Core. Each software package in Fedora Core is covered by its own license which has - been approved by the Open Source Initiative (OSI). For more information + been approved by the Open Source Initiative (OSI). For more information about the OSI, refer to http://www.opensource.org/.

      License agreement screen.

      Figure 15.2. License Agreement Screen

      - To proceed, select Yes, I agree to the License - Agreement and then select - Next. -

      Prev Up Next
      Chapter 14. Installing Packages Home 15.2. Date and Time
      + To proceed, select Yes, I agree to the License + Agreement and then select + Next. +

      Prev   Next
      Chapter 14. Installing Packages Home 15.2. Date and Time
      -
      Chapter 3. Identifying Your Locale
      Prev   Next

      Chapter 3. Identifying Your Locale

      +

      Chapter 3. Identifying Your Locale
      Prev   Next

      Chapter 3. Identifying Your Locale

      If the installation system fails to identify the display hardware on your computer, it displays text screens rather than the default graphical interface. The text screens provide the same functions as the standard screens. Later in the installation process you can manually specify your display hardware. -

      [Important]Important

      +

      [Important]Important

      Network installations with HTTP and FTP always use text screens on systems with less than 128Mb of memory. -

      3.1. Language Selection

      +

      3.1. Language Selection

      The installation program displays a list of languages supported by Fedora.

      Language selection screen.

      Figure 3.1. Language Selection Screen

      Highlight the correct language on the list and select - Next. -

      [Note]Installing Support For Additional Languages

      + Next. +

      [Note]Installing Support For Additional Languages

      To select support for additional languages, customize the installation at the package selection stage. For more information, refer to Section 12.3, “Additional Language Support”. -

      Prev Up Next
      2.2. Installation from a Hard Drive Home 3.2. Keyboard Configuration
      +

      Prev   Next
      2.2. Installation from a Hard Drive Home 3.2. Keyboard Configuration
      -
      Chapter 14. Installing Packages
      Prev   Next

      Chapter 14. Installing Packages

      +

      Chapter 14. Installing Packages
      Prev   Next

      Chapter 14. Installing Packages

      Fedora Core reports the installation progress on the screen as it writes the selected packages to your system. Network and DVD installations require no further action. If you are using CDs to install, Fedora Core prompts you to change discs periodically. After you insert a disc, - select OK to resume the installation. + select OK to resume the installation.

      Installing packages screen.

      Figure 14.1. Installing Packages Screen

      - After installation completes, select Reboot + After installation completes, select Reboot to restart your computer. Fedora Core ejects any loaded discs before the computer reboots. -

      Prev Up Next
      Chapter 13. About to Install Home Chapter 15. First Boot
      +

      Prev   Next
      Chapter 13. About to Install Home Chapter 15. First Boot
      -
      Chapter 5. Installation Types
      Prev   Next

      Chapter 5. Installation Types

      - An installation type is a label +

      Chapter 5. Installation Types
      Prev   Next

      Chapter 5. Installation Types

      + An installation type is a label that roughly describes how you will use your Fedora system. Several installation types are already defined in the Fedora Core installation program. Choose the appropriate installation type to streamline the @@ -17,34 +17,34 @@ These choices include partitioning of your hard disks, and software packages to be installed. All installation types allow you to customize these selections. -

      5.1. Choosing an Installation Type

      + </p><div class=

      5.1. Choosing an Installation Type

      Installation type screen. -

      Figure 5.1. Installation Type Screen

      Personal Desktop

      + ">

      Figure 5.1. Installation Type Screen

      Personal Desktop

      This is the default installation type. It provides a graphical working environment with an office suite, Internet applications and multimedia software. -

      Workstation

      +

      Workstation

      This installation type includes the software installed on a - Personal Desktop, and adds software for + Personal Desktop, and adds software for development and systems administration. Choose this installation type if you plan to compile software from source code. -

      Server

      +

      Server

      This installation type provides network servers such as the Apache Web server and the Samba suite of services, and administration tools. This installation type provides no graphical environment by default. -

      Custom

      +

      Custom

      This installation type does not provide any disk partitioning layout for you. It also does not include any - additional software beyond a Personal - Desktop. If you perform a - Custom installation, the installation + additional software beyond a Personal + Desktop. If you perform a + Custom installation, the installation program will present dialogs for these selections during the installation process.

      - Click Next once you have made a selection. -

      Prev Up Next
      4.2. Upgrading Boot Loader Configuration Home 5.2. Special Considerations
      + Click Next once you have made a selection. +

      Prev   Next
      4.2. Upgrading Boot Loader Configuration Home 5.2. Special Considerations
      -
      Introduction
      Prev   Next

      Introduction

      +

      Introduction
      Prev   Next

      Introduction

      Fedora Core is a complete desktop and server operating system created entirely with open source software. -

      [Caution]Fedora Core Lifecycle

      +

      [Caution]Fedora Core Lifecycle

      Fedora Core is a rapidly evolving system which follows the latest technical developments. Fedora Core may not be appropriate for use in critical applications in your organization. @@ -24,10 +24,10 @@

      This document does not detail all of the features of the installation system. -

      1. Background

      +

      1. Background

      The Fedora Project, which produces and maintains Fedora Core, is a collaboration - between Red Hat, Inc. and the - free and open source software + between Red Hat, Inc. and the + free and open source software (FOSS) community. The Fedora Project also provides Fedora Extras, additional software packaged for installation on a Fedora Core system.

      @@ -35,7 +35,7 @@ http://www.opensource.org/ and http://www.gnu.org/philosophy/free-sw.html for more information about open source software. -

      Prev Up Next
      Fedora Core 4 Installation Guide Home 2. Before You Begin
      +

      Prev   Next
      Fedora Core 4 Installation Guide Home 2. Before You Begin
      -
      Chapter 8. Network Configuration
      Prev   Next

      Chapter 8. Network Configuration

      +

      Chapter 8. Network Configuration
      Prev   Next

      Chapter 8. Network Configuration

      Use this screen to customize the network settings of your Fedora system.

      Manual network configuration of a Fedora system is often not - required. Many networks have a DHCP (Dynamic Host Configuration + required. Many networks have a DHCP (Dynamic Host Configuration Protocol) service that automatically supplies connected systems with configuration data. By default, Fedora Core activates all network interfaces on your computer and configures them to use DHCP. @@ -22,20 +22,20 @@ only accept systems which have the correct security credentials.

      Network configuration screen. -

      Figure 8.1. Network Configuration Screen

      8.1. Network Devices

      + ">

      Figure 8.1. Network Configuration Screen

      8.1. Network Devices

      Fedora displays a list of network interfaces detected on your - computer. Each interface must have a unique IP - address on the network to which it is attached. The interface - may receive this address from the network DHCP service. + computer. Each interface must have a unique IP + address on the network to which it is attached. The interface + may receive this address from the network DHCP service.

      To manually assign an IP address, highlight the interface on the - Network Device list and select - Edit. Fedora then displays a network + Network Device list and select + Edit. Fedora then displays a network configuration dialog. Deselect the - Configure using DHCP checkbox, so that it is - empty. Enter the IP Address and the - appropriate Netmask for the interface. Then - select OK. + Configure using DHCP checkbox, so that it is + empty. Enter the IP Address and the + appropriate Netmask for the interface. Then + select OK.

      If your computer will be a server, do not use DHCP. Manually configure networking instead. Manual network configuration allows @@ -43,18 +43,18 @@ down.

      Specify whether an interface should be automatically activated at - boot time with the Active on Boot checkbox + boot time with the Active on Boot checkbox for that device. You may manually activate a network interface at any time after the system has booted. -

      [Note]Modem Configuration

      - The Network Configuration screen does not - list modems. Configure these devices after installation - with either the Internet Configuration - Wizard or Network - Cnfiguration utility. The settings for your +

      [Note]Modem Configuration

      + The Network Configuration screen does not + list modems. Configure these devices after installation + with either the Internet Configuration + Wizard or Network + Cnfiguration utility. The settings for your modem are specific to your particular Internet Service Provider (ISP). -

      Prev Up Next
      7.4.  +

      Prev   Next
      7.4.  Advanced Boot loader Options  Home 8.2. Computer Hostname
      Index: ch-next-steps.php =================================================================== RCS file: /cvs/fedora/web/html/docs/fedora-install-guide-en/fc4/ch-next-steps.php,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ch-next-steps.php 12 Jun 2005 08:52:19 -0000 1.2 +++ ch-next-steps.php 29 Sep 2005 17:29:43 -0000 1.3 @@ -7,10 +7,10 @@ ?> -
      Chapter 16. Your Next Steps
      Prev   Next

      Chapter 16. Your Next Steps

      +

      Chapter 16. Your Next Steps
      Prev   Next

      Chapter 16. Your Next Steps

      Fedora Core provides you with a complete operating system with a vast range of capabilities, supported by a large community. -

      16.1. Documentation on the Web

      +

      16.1. Documentation on the Web

      Documentation for Fedora Core is available from the Fedora Project Website:

      @@ -30,7 +30,7 @@ information on any topic by using Google:

      http://www.google.com/linux/ -

      Prev Up Next
      15.6. Additional CDs Home 16.2. Community Support
      +

      Prev   Next
      15.6. Additional CDs Home 16.2. Community Support
      -
      Chapter 2. Other Installation Methods
      Prev   Next

      Chapter 2. Other Installation Methods

      +

      Chapter 2. Other Installation Methods
      Prev   Next

      Chapter 2. Other Installation Methods

      The installation method screen below appears if one of the following is true:

      1. You booted with PXE, or USB media.

      2. - You entered the askmethod option at the - boot: prompt. + You entered the askmethod option at the + boot: prompt.

      Installation method screen.

      Figure 2.1. Installation Method Screen

      Highlight the appropriate installation method on the list, and - select OK. -

      [Note]CD/DVD Activity

      + select OK. +

      [Note]CD/DVD Activity

      If a Fedora disc is in your computer's CD or DVD drive, the installation program loads its next stage from that disc. The installation program downloads package data from the source you choose. -

      2.1. Installation from a Network Server

      +

      2.1. Installation from a Network Server

      You may install Fedora Core from a network server using FTP, HTTP, or - NFS protocols. -

      2.1.1. TCP/IP Configuration

      + NFS protocols. +

      2.1.1. TCP/IP Configuration

      By default, the installation program uses DHCP to automatically provide the network settings. If your network has no DHCP - server, clear the checkbox labeled Use dynamic IP - configuration and enter the settings manually. - Select OK to continue. + server, clear the checkbox labeled Use dynamic IP + configuration and enter the settings manually. + Select OK to continue.

      TCP/IP configuration dialog.

      Figure 2.2. Configure TCP/IP Dialog

      These settings apply only during the installation process. The installation program allows you to configure the final network configuration later. -

      2.1.2. Network Service Setup

      +

      2.1.2. Network Service Setup

      The FTP, HTTP, and NFS service setup dialogs are very similar. Each requires the name or IP address of the server, and a directory where the installation tree resides. @@ -48,13 +48,13 @@ FTP setup dialog. ">

      Figure 2.3. FTP Setup Dialog

      The FTP service setup dialog also has an option for - non-anonymous FTP. If your FTP server does + non-anonymous FTP. If your FTP server does not provide anonymous access, select this check box, and provide an account name and password in the following dialog. Select - OK to continue. + OK to continue.

      Non-anonymous FTP account dialog. -

      Figure 2.4. Non-anonymous FTP Account Dialog

      Prev Up Next
      1.3. Booting from the Network using PXE Home 2.2. Installation from a Hard Drive
      + ">

      Figure 2.4. Non-anonymous FTP Account Dialog

      Prev   Next
      1.3. Booting from the Network using PXE Home 2.2. Installation from a Hard Drive
      -
      Chapter 12. Package Selection
      Prev   Next

      Chapter 12. Package Selection

      +

      Chapter 12. Package Selection
      Prev   Next

      Chapter 12. Package Selection

      Fedora uses the installation type to select a set of software packages for your system. Refer to Chapter 5, Installation Types for more information. You can accept this default set of packages, or customize it to fit your preferences. If you choose - the Custom installation type, Fedora displays - the screen for Package Group Selection + the Custom installation type, Fedora displays + the screen for Package Group Selection automatically. -

      [Tip]Changing Your Mind

      +

      [Tip]Changing Your Mind

      The installation type and packages that you select are not permanent. After you boot your system, use the - Package Management tool to make + Package Management tool to make different software selections for your system. To run this tool, - from the main menu, select Desktop->System Settings->Add/Remove Applications. -

      12.1. Package Installation Defaults

      + from the main menu, select Desktop->System Settings->Add/Remove Applications. +

      12.1. Package Installation Defaults

      A summary of the default package selection is displayed.

      Package installation defaults screen.

      Figure 12.1. Package Installation Defaults Screen

      - To accept the default package selection, select Install - the default software packages. Select - Next to continue, and proceed to Chapter 13, About to Install. + To accept the default package selection, select Install + the default software packages. Select + Next to continue, and proceed to Chapter 13, About to Install.

      - To view or change the packages, select Customize - software packages to be installed. Select - Next to continue, and proceed to Section 12.2, “Package Group Selection”. -

      Prev Up Next
      Chapter 11. Set the Root Password Home 12.2. Package Group Selection
      + To view or change the packages, select Customize + software packages to be installed. Select + Next to continue, and proceed to Section 12.2, “Package Group Selection”. +

      Prev   Next
      Chapter 11. Set the Root Password Home 12.2. Package Group Selection
      initCommon(); -$template->displayHeader(); - -?> - -
      Chapter 11. Set the Root Password
      Prev   Next

      Chapter 11. Set the Root Password

      - Fedora uses a special account named root for system - administration. The root +Chapter 11. Set the Root Password

      Chapter 11. Set the Root Password
      Prev   Next

      Chapter 11. Set the Root Password

      + Fedora uses a special account named root for system + administration. The root account on every Linux system is only limited by SELinux. It is not subject to any other normal account restrictions. As the system owner or administrator, you may sometimes require unrestricted access to configure or modify the system. In those cases, use the - root account. + root account.

      [Important]Using the root - Account

      - Avoid logging in to Fedora Core as root when possible. Any - administration tools which require root privileges will prompt you + Account">

      [Important]Using the root + Account

      + Avoid logging in to Fedora Core as root when possible. Any + administration tools which require root privileges will prompt you for the password.

      - The Fedora installation program requires the root password to be at least six characters - long. Because the root + The Fedora installation program requires the root password to be at least six characters + long. Because the root account may potentially control any part of the system, use the following guidelines to create a good password:

      • @@ -37,23 +28,23 @@

      The following are examples of good passwords:

      • - f9*@1Ls99A + f9*@1Ls99A

      • - HL8$391%%rb + HL8$391%%rb

      • - Iwtb,10^th + Iwtb,10^th

      - Enter the root password - into the Root Password field. Fedora displays + Enter the root password + into the Root Password field. Fedora displays the characters as asterisks for security. Type the same password - into the Confirm field to ensure it is set + into the Confirm field to ensure it is set correctly.

      Set root password screen.

      Figure 11.1. Set Root Password Screen

      - After you set the root password, select Next + After you set the root password, select Next to proceed. -

      Prev Up Next
      10.2. Universal Co-ordinated Time (UTC) Home Chapter 12. Package Selection
      +

      Prev   Next
      10.2. Universal Co-ordinated Time (UTC) Home Chapter 12. Package Selection
      -
      Chapter 9. Security Configuration
      Prev   Next

      Chapter 9. Security Configuration

      +

      Chapter 9. Security Configuration
      Prev   Next

      Chapter 9. Security Configuration

      The default security configuration for Fedora Core protects your system without restricting any of the functions of a desktop or laptop computer. If you are installing a server, you may need to alter @@ -15,10 +15,10 @@

      Security configuration screen.

      Figure 9.1. Security Configuration Screen

      - Select Next to proceed after you review the + Select Next to proceed after you review the security configuration and make any necessary changes. -

      9.1. Firewall

      - The firewall built into Fedora Core +

      9.1. Firewall

      + The firewall built into Fedora Core checks every incoming and outgoing network connection on your machine against a set of rules. These rules specify which types of connections are permitted and which are denied. @@ -34,12 +34,12 @@ complete, you can enable access to other services as well.

      Avoid disabling the firewall. If you believe it is necessary to - do so, select No firewall. -

      [Tip]Changing the Firewall Settings

      + do so, select No firewall. +

      [Tip]Changing the Firewall Settings

      To change these settings later, from the main menu, choose - Desktop->System Settings->Security - Level and Firewall. -

      Prev Up Next
      8.3. Miscellaneous Settings Home 9.2. SELinux
      + Desktop->System Settings->Security + Level and Firewall. +

      Prev   Next
      8.3. Miscellaneous Settings Home 9.2. SELinux
      initCommon(); -$template->displayHeader(); - -?> - -
      Chapter 10. Time Zone Selection
      Prev   Next

      Chapter 10. Time Zone Selection

      +Chapter 10. Time Zone Selection

      Chapter 10. Time Zone Selection
      Prev   Next

      Chapter 10. Time Zone Selection

      This screen allows you to specify the correct time zone for the location of your computer. Specify a time zone even if you plan to - use NTP (Network Time Protocol) to maintain the accuracy of + use NTP (Network Time Protocol) to maintain the accuracy of the system clock. -

      10.1. Selecting a Time Zone

      +

      10.1. Selecting a Time Zone

      Fedora displays on the screen two methods for selecting the time zone.

      @@ -21,13 +12,13 @@ To select a time zone using the map, select the yellow dot that represents the city nearest to your location. When you place the arrow on a dot, Fedora displays the name of the city below the map. - Once you select a dot, it becomes a red <span><b class=X to + Once you select a dot, it becomes a red X to indicate your selection.

      To select a time zone using the list, select the name of the city nearest to your location. The cities are listed in alphabetical order. -

      Prev Up Next
      9.2. SELinux Home 10.2. Universal Co-ordinated Time (UTC)
      +

      Prev   Next
      9.2. SELinux Home 10.2. Universal Co-ordinated Time (UTC)
      -
      Index
      Prev   

      Index

      B

      BIOS (Basic Input/Output System), Beginning the Installation
      boot loader, Upgrading Boot Loader Configuration
      (see also GRUB)
      upgrading, Upgrading Boot Loader Configuration

      C

      CUPS (Common UNIX Printing System), Special Considerations

      D

      DHCP (Dynamic Host Configuration Protocol), Networking, Network Configuration, Network Devices
      Disk Druid, Disk Druid
      DNS (Domain Name Service), Miscellaneous Settings
      domain name, Computer Hostname

      E

      ext2 (see file systems)
      ext3 (see file system) (see file systems)

      F

      file system, Partition Types
      ext3, Partition Types
      NTFS, Disk Druid
      vfat, Disk Druid
      >file systems
      ext2, Installation from a Hard Drive
      ext3, Installation from a Hard Drive
      vfat, Installation from a Hard Drive
      firewall, Firewall
      FOSS (free and open source software), Background
      free software (see FOSS)

      G

      gateway, Miscellaneous Settings
      GMT (Greenwich Mean Time) (see UTC)

      H

      hostname, Computer Hostname

      I

      installation type, Installation Types
      IP address, Network Devices

      L

      LVM, Understanding LVM, Disk Druid
      physical volume, Understanding LVM
      understanding, Understanding LVM
      volume group, Understanding LVM

      M

      master boot record, Keeping Your Existing Boot Loader Settings, +
      Index
      Prev   

      Index

      B

      BIOS (Basic Input/Output System), Beginning the Installation
      boot loader, Upgrading Boot Loader Configuration
      (see also GRUB)
      upgrading, Upgrading Boot Loader Configuration

      C

      CUPS (Common UNIX Printing System), Special C! onsiderations

      D

      DHCP (Dynamic Host Configuration Protocol), Networking, Network Configuration, Network Devices
      Disk Druid, Disk Druid
      DNS (Domain Name Service), Miscellaneous Settings
      domain name, Computer Hostname

      E

      ext2 (see file systems)
      ext3 (see file system) (see file systems)

      F

      file system, Partition Types
      ext3, Partition Types
      NTFS, Disk Druid
      vfat, Di! sk Dru /a>
      file systems
      ext2, Installation from a Hard Drive
      ext3, Installation from a Hard Drive
      vfat, Installation from a Hard Drive
      firewall, Firewall
      FOSS (free and open source software), Background
      free software (see FOSS)

      G

      gateway, Miscellaneous Settings
      GMT (Greenwich Mean Time) (see UTC)

      H

      hostname, Computer Hostname

      I

      installation type, Installation Types
      IP address, Network Devices

      L

      LVM, Understanding LVM, Disk Druid
      physical volume, Understanding LVM
      understanding, Understanding LVM
      volume group, Understanding LVM

      M

      master boot record, Keeping Your Existing Boot Loader Settings, Advanced Boot loader Options -
      modem, Network Devices
      mount point, General Information on Partitions

      N

      NFS (Network File System)
      install from, Installation from a Network Server
      service installed, Special Considerations
      NTFS (see file system)
      NTP (Network Time Protocol), Time Zone Selection, Date and Time

      O

      open source (see FOSS)
      OSI (Open Source Initiative), License Agreement

      P

      package groups, Package Group Selection
      partition
      /home, Disk Druid
      /root, General Information on Partitions
      adding, Disk Druid
      deleting, Disk Druid
      editing, Disk Druid
      illegal, Disk Druid
      root, General Information on Partitions, Disk Druid
      type, Partition Types
      (see also file system)
      PXE (Pre-boot eXecution Environment), Beginning the Installation, Booting from the Network using PXE

      R

      RAID, Disk ! Druid
      root account, ! Set th oot Password
      router (see gateway)

      S

      SELinux, SELinux
      SMTP (Simple Mail Transfer Protocol), Special Considerations
      SSH (Secure SHell), Special Considerations

      U

      UTC (Universal Co-ordinated time), Universal Co-ordinated Time (UTC)

      V

      vfat (see file system) (see file systems)
      Prev Up 
      Chapter 17. Acknowledgem! ents Home 
      +
      modem, Network Devices
      mount point, General Information on Partitions

      N

      NFS (Network File System)
      install from, Installation from a Network Server
      service installed, Special Considerations
      NTFS (see file system)
      NTP (Network Time Protocol), Time Zone Selection, Date and Time

      O

      open source (see FOSS)
      OSI (Open Source Initiative), License Agreement

      P

      package groups, Package Group Selection
      partition
      /home, Disk Druid
      /root, General Information on Partitions
      adding, Disk Druid
      deleting, Disk Druid
      editing, Disk Druid
      illegal, Disk Druid
      root, General Information on Partitions, Disk Druid
      type, Partition Types
      (see also file system)
      PXE (Pre-boot eXecution Environment), Beginning the Installation, Booting from the Network using PXE

      R

      RAID, Disk ! Druid
      root account, ! Set th oot Password
      router (see gateway)

      S

      SELinux, SELinux
      SMTP (Simple Mail Transfer Protocol), Special Considerations
      SSH (Secure SHell), Special Considerations

      U

      UTC (Universal Co-ordinated time), Universal Co-ordinated Time (UTC)

      V

      vfat (see file system) (see file systems)
      Prev   
      Chapter 17. Acknowledgements Home 
      -
      Fedora Core 4 Installation Guide
         Next

      Fedora Core 4 Installation Guide

      Stuart Ellis

      Paul W. Frields

      Copyright © 2005 Red Hat, Inc., Stuart Ellis, Paul W. Frields

      Revision History
      Revision 0.6.22005-04-30StuartEllis
      -

      - First commission to CVS, plus very minor parent file edits -

      -
      Revision 0.6.32005-05-10PaulWFrields
      -

      - Style editing, removed "nextsteps" from build -

      -
      Revision 0.72005-05-15StuartEllis
      -

      - Additional style editing and indexing -

      -
      Revision 1.0rc12005-06-08KarstenWade
      -

      - Publication edit and declaration of release candidate -

      -
      Revision 1.02005-06-10KarstenWade
      -

      - Release version -

      -

      Table of Contents

      Introduction
      1. Background
      2. Before You Begin
      2.1. Networking
      2.2. Installing Fedora Core as a Server
      2.3. Installing from a Network Server
      2.4. Installing Fedora Core on a Managed Network
      1. Beginning the Installation
      1.1. Booting from Disc
      1.2. Using Other Removable Media
      1.2.1. Preparing the Boot Media
      1.2.2. Booting from the Media
      1.3. Booting from the Network using PXE
      2. Other Installation Methods
      2.1. Installation from a Network S! erver
      2.1.1. TCP/IP Configuration
      2.1.2. Network Service Setup
      2.2. Installation from a Hard Drive
      3. Identifying Your Locale
      3.1. Language Selection
      3.2. Keyboard Configuration
      4. Upgrading an Existing System
      4.1. Upgrade Examine
      4.2. Upgrading Boot Loader Conf! iguration
      5. Installation Types
      5.1. Choosing an Installation Type
      5.2. Special Considerations
      6. Disk Partitioning
      6.1. Choosing a Partitioning Method
      6.1.1. Setting Up Partitions Automatically
      6.1.2. Setting Up Partitions Manually
      6! .2. General Information on Partitions
      6.2.1. Partition Types
      6.2.2. Understanding LVM
      6.3. Disk Druid
      7. Boot Loader
      7.1. Keeping Your Existing Boot Loader Settings
      7.2. +
      Fedora Core 4 Installation Guide
         Next

      Fedora Core 4 Installation Guide

      Stuart Ellis

      Paul W. Frields

      Copyright © 2005 Red Hat, Inc., Stuart Ellis, Paul W. Frields

      Table of Contents

      Introduction
      1. Background
      2. Before You Begin
      2.1. Networking
      2.2. Installing Fedora Core as a Server
      2.3. Installing from a Network Server
      2.4. Installing Fedora Core on a Managed Network
      1. Beginning the Installation
      1.1. Booting from Disc
      1.2. Using Other Removable Media
      1.2.1. Preparing the Boot Media
      1.2.2. Booting from the Media
      1.3. Booting from the Network using PXE
      2. Other Installation Methods
      2.1. Installation from a Network Server
      2.1.1. TCP/IP Configuration
      2.1.2. Network Service Setup
      2.2. Installation from a Hard Drive
      3. Identifying Your Locale
      3.1. Language Selection
      3.2. Keyboard Configuration
      4. Upgrading an Existing System
      4.1. Upgrade Examine
      4.2. Upgrading Boot Loader Configuration
      !
      < >
      5. Installation Types
      5.1. Choosing an Installation Type
      5.2. Special Considerations
      6. Disk Partitioning
      6.1. Choosing a Partitioning Method
      6.1.1. Setting Up Partitions Automatically
      6.1.2. Setting Up Partitions Manually
      6.2. General Information on Partitio! ns
      6.2.1. Partition Types
      6.2.2. Understanding LVM
      6.3. Disk Druid
      7. Boot Loader
      7.1. Keeping Your Existing Boot Loader Settings
      7.2. Booting Additional Operating Systems
      7.3. Setting a Boot Loader Password
      7.4. Advanced Boot loader Options -
      8. Network Configuration
      8.1. Network Devices
      8.2. Computer Hostname
      8.3. Miscellaneous Settings
      9. Security Configuration
      9.1. Firewall
      9.2. SELinux
      10. Time Zone Selection
      10.1. Selecting a Time Zone
      10.2. Universal Co-ordinated Time (UTC)
      11. Set the Root Password
      12. Package Selection
      12.1. Package Installation Defaults
      12.2. Package Group Selection
      12.3. Additional Language Support
      12.4. Everything or - Minimal Installations
      13. About to Install
      14. Installing Packages
      15. First Boot
      15.1. License Agreement
      15.2. Date and Time
      15.3. Display
      15.4. System User
      15.5. Sound Card
      15.6. Additional CDs
      16. Your Next Steps
      16.1. Documentation on the Web
      16.2. Community Support
      16.3. Joining The Fedora Community
      17. Acknowledgements
      Index
      +
      8. Network Configuration
      8.1. Network Devices
      8.2. Computer Hostname
      8.3. Miscellaneous Settings
      9. Security Configuration
      9.1. Firewall
      9.2. SELinux
      10. Time Zone Selection
      10.1. Selecting a Time Zone
      10.2. Universal Co-ordinated Time (UTC)
      11. Set the Root Password
      12. Package Selection
      12.1. Package Installation Defaults
      12.2. Package Group Selection
      12.3. Additional Language Support
      12.4. Everything or + Minimal Installations
      13. About to Install
      14. Installing Packages
      15. First Boot
      15.1. License Agreement
      15.2. Date and Time
      15.3. Display
      15.4. System User
      15.5. Sound Card
      15.6. Additional CDs
      !
      16. Your Next Steps
      16.1. Documentation on the Web
      16.2. Community Support
      16.3. Joining The Fedora Community
      17. Acknowledgements
      Index
         Next
         Introduction
         Next
         Introduction
      -
      5.2. Special Considerations
      Prev Chapter 5. Installation Types Next

      5.2. Special Considerations

      +

      5.2. Special Considerations
      Prev Chapter 5. Installation Types Next

      5.2. Special Considerations

      All Fedora Core installations include the following network services:

      • - email through SMTP (Simple Mail Transfer + email through SMTP (Simple Mail Transfer Protocol)

      • - network file sharing through NFS (Network File + network file sharing through NFS (Network File System)

      • - printing through CUPS + printing through CUPS (Common UNIX Printing System)

      • - remote login through SSH + remote login through SSH (Secure SHell)

      Some automated processes on your Fedora system use the email @@ -30,12 +30,12 @@ component is disabled by default. You may configure your Fedora system after installation to offer email, NFS, or print services. The SSH service is enabled by default. -

      [Tip]Minimal installations

      +

      [Tip]Minimal installations

      To install a minimum of software, choose the - Custom installation type. On the - Package Group Selection screen, select the - Minimal package group. The only services - included in a Minimal installation are + Custom installation type. On the + Package Group Selection screen, select the + Minimal package group. The only services + included in a Minimal installation are email, printing, NFS, and SSH. This type of installation may be useful for firewalls or other specialized systems on which limited service is an advantage. Index: ln-legalnotice.php =================================================================== RCS file: /cvs/fedora/web/html/docs/fedora-install-guide-en/fc4/ln-legalnotice.php,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ln-legalnotice.php 12 Jun 2005 08:52:19 -0000 1.2 +++ ln-legalnotice.php 29 Sep 2005 17:29:43 -0000 1.3 @@ -22,7 +22,7 @@

      Garrett LeSage created the admonition graphics (note, tip, important, caution, and warning). - Tommy Reynolds created the callout graphics. + Tommy Reynolds created the callout graphics. They all may be freely redistributed with documentation produced for the Fedora Project.

      Index: sn-before-begin.php =================================================================== RCS file: /cvs/fedora/web/html/docs/fedora-install-guide-en/fc4/sn-before-begin.php,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sn-before-begin.php 12 Jun 2005 08:52:19 -0000 1.2 +++ sn-before-begin.php 29 Sep 2005 17:29:43 -0000 1.3 @@ -7,12 +7,12 @@ ?> -

      2. Before You Begin
      Prev Introduction Next

      2. Before You Begin

      +

      2. Before You Begin
      Prev Introduction Next

      2. Before You Begin

      To install Fedora Core from discs, you need four installation CDs, or the installation DVD. There are separate disc sets for each supported - architecture. Currently, Fedora Core supports the - i386, ppc, and - x86_64 architectures. These architectures + architecture. Currently, Fedora Core supports the + i386, ppc, and + x86_64 architectures. These architectures are described below:

      i386

      Intel x86-compatible processors, including Intel Pentium and @@ -40,9 +40,9 @@ The Release Notes are available on the first disc in HTML and plain text format. The latest versions of this Installation Guide and the Release Notes can always be found at http://fedora.redhat.com/docs/. -

      2.1. Networking

      +

      2.1. Networking

      By default, Fedora Core systems attempt to discover correct connection - settings for the attached network using DHCP (Dynamic Host Control + settings for the attached network using DHCP (Dynamic Host Control Protocol). Your network may include a DHCP provider which delivers settings to other systems on demand. The DHCP provider may be a router or wireless access point for the network, or a @@ -50,18 +50,18 @@

      In some circumstances you may need to provide information about your network during the installation process. Refer to Section 2.3, “Installing from a Network Server” and Section 2.4, “Installing Fedora Core on a Managed Network” for more information. -

      [Note]Modem Configuration

      +

      [Note]Modem Configuration

      The installation system for Fedora Core does not configure modems. If your computer has a modem, configure the dialing settings after you complete the installation and reboot. -

      2.2. Installing Fedora Core as a Server

      +

      2.2. Installing Fedora Core as a Server

      Fedora Core includes software for a complete range of network services. To install a system with the most common network services, - select the Server installation type during + select the Server installation type during the installation. Refer to Chapter 5, Installation Types for more information. You may also select individual software packages during installation, or install them later. -

      2.3. Installing from a Network Server

      +

      2.3. Installing from a Network Server

      To install Fedora Core using a network installation server you will need to know the following:

      • @@ -73,24 +73,24 @@ the path to the installation files

      A network installation requires boot media, unless you are using - PXE (Pre-boot eXecution Environment) to + PXE (Pre-boot eXecution Environment) to boot your computer. Boot your computer using either an installation DVD, the first installation CD, a boot CD, or a prepared USB storage device.

      - PXE (also referred to as netboot) is a + PXE (also referred to as netboot) is a standard that enables PCs to use files on a server as a boot device. Fedora Core includes utilities that allow it to function as a PXE server for other computers.

      Booting your computer is explained in the next section, Chapter 1, Beginning the Installation. -

      2.4. Installing Fedora Core on a Managed Network

      - Some corporate networks include a directory - service that manages user accounts for the +

      2.4. Installing Fedora Core on a Managed Network

      + Some corporate networks include a directory + service that manages user accounts for the organization. Fedora Core systems can join a Kerberos, NIS, Hesiod, or Microsoft® Windows® domain as part of the installation process. Fedora Core can also use LDAP directories. -

      [Caution]Consult Network Administrators

      +

      [Caution]Consult Network Administrators

      If you are installing outside of your home, always consult the administrators before installing a Fedora Core system on an existing network. They can provide correct network and authentication Index: sn-booting-from-pxe.php =================================================================== RCS file: /cvs/fedora/web/html/docs/fedora-install-guide-en/fc4/sn-booting-from-pxe.php,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sn-booting-from-pxe.php 12 Jun 2005 08:52:19 -0000 1.2 +++ sn-booting-from-pxe.php 29 Sep 2005 17:29:43 -0000 1.3 @@ -7,13 +7,13 @@ ?> -

      1.3. Booting from the Network using PXE
      Prev Chapter 1. Beginning the Installation Next

      1.3. Booting from the Network using PXE

      - To boot with PXE, you need a properly configured server, and a +

      1.3. Booting from the Network using PXE
      Prev Chapter 1. Beginning the Installation Next

      1.3. Booting from the Network using PXE

      + To boot with PXE, you need a properly configured server, and a network interface in your computer that supports PXE.

      Configure the computer to boot from the network interface. This - option is in the BIOS, and may be labeled Network - Boot or Boot Services. Once you + option is in the BIOS, and may be labeled Network + Boot or Boot Services. Once you properly configure PXE booting, the computer can boot the Fedora installation system without any other media.

      @@ -31,7 +31,7 @@ Red Hat Network Installer screen. ">

      Figure 1.5. Welcome to Red Hat Network Installer

      Choose a network installation option to continue. -

      [Note]PXE Troubleshooting

      +

      [Note]PXE Troubleshooting

      If your PC does not boot from the netboot server, ensure that the BIOS is configured to boot first from the correct network interface. Some BIOS systems specify the network interface as a Index: sn-bootloader-advanced.php =================================================================== RCS file: /cvs/fedora/web/html/docs/fedora-install-guide-en/fc4/sn-bootloader-advanced.php,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sn-bootloader-advanced.php 12 Jun 2005 08:52:19 -0000 1.2 +++ sn-bootloader-advanced.php 29 Sep 2005 17:29:43 -0000 1.3 @@ -11,15 +11,15 @@ Advanced Boot loader Options

      Prev Chapter 7. Boot Loader Next

      7.4.  Advanced Boot loader Options -

      +

      The default boot options are adequate for most situations. The - installation program writes the GRUB + installation program writes the GRUB boot loader in the - master boot record (MBR), + master boot record (MBR), overwriting any existing boot loader.

      Tto keep your current boot loader in the MBR, use - the advanced settings to place GRUB in + the advanced settings to place GRUB in the first sector of the partition holding the Linux root file system.

      @@ -28,22 +28,22 @@ than Fedora Core expects. On a few systems, Fedora Core may not configure the disk drive geometry for large disks correctly because of a broken BIOS. To work around this problem, mark the - Force LBA32 checkbox. + Force LBA32 checkbox.

      The Linux kernel usually auto-detects its environment correctly, and no additional kernel parameters are needed. However, you may provide any needed kernel parameter using the advanced boot loader options. -

      [Note]Kernel Parameters

      +

      [Note]Kernel Parameters

      For a partial list of the kernel command line parameters, type - the following command in a terminal window: man - bootparam. For a comprehensive and authoritative + the following command in a terminal window: man + bootparam. For a comprehensive and authoritative list, refer to the documentation provided in the kernel sources.

      - To alter any of these settings, mark the Configure - advanced boot loader options checkbox. Select - Next and the menu shown in Figure 7.5, “Advanced Boot Options” appears. -

      [Note]Optional Menu

      + To alter any of these settings, mark the Configure + advanced boot loader options checkbox. Select + Next and the menu shown in Figure 7.5, “Advanced Boot Options” appears. +

      [Note]Optional Menu

      Fedora Core displays the following advanced boot options menu only if the advanced configuration checkbox described above has been selected. Index: sn-bootloader-others.php =================================================================== RCS file: /cvs/fedora/web/html/docs/fedora-install-guide-en/fc4/sn-bootloader-others.php,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sn-bootloader-others.php 12 Jun 2005 08:52:19 -0000 1.2 +++ sn-bootloader-others.php 29 Sep 2005 17:29:43 -0000 1.3 @@ -11,35 +11,35 @@ Booting Additional Operating Systems

      Prev Chapter 7. Boot Loader Next

      7.2.  Booting Additional Operating Systems -

      +

      If you have other operating systems already installed, Fedora Core attempts to automatically detect and configure - GRUB to boot them. You may manually + GRUB to boot them. You may manually configure any additional operating systems if - GRUB does not detect them. To + GRUB does not detect them. To add, remove, or change the detected operating system settings, use the options provided.

      - Add + Add

      - Press the Add button to include an + Press the Add button to include an additional operating system in GRUB. Fedora Core displays the dialog shown in Figure 7.3, “Adding Operating Systems to the Boot Menu”.

      Select the disk partition which contains the bootable operating system from the drop-down list and give the entry - a label. GRUB displays this + a label. GRUB displays this label in its boot menu.

      - Edit + Edit

      To change an entry in the GRUB boot menu, select the entry - and then select Edit. + and then select Edit.

      - Delete + Delete

      To remove an entry from the GRUB boot menu, select the entry - and then select Delete. + and then select Delete.

      Adding entries to the GRUB boot menu.

      Figure 7.3. Adding Operating Systems to the Boot Menu

      Prev Up Next
      Chapter 7. Boot Loader Home 7.3.  Setting a Boot Loader Password
      Index: sn-bootloader-password.php =================================================================== RCS file: /cvs/fedora/web/html/docs/fedora-install-guide-en/fc4/sn-bootloader-password.php,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sn-bootloader-password.php 12 Jun 2005 08:52:19 -0000 1.2 +++ sn-bootloader-password.php 29 Sep 2005 17:29:43 -0000 1.3 @@ -11,47 +11,47 @@ Setting a Boot Loader Password
      Prev Chapter 7. Boot Loader Next

      7.3.  Setting a Boot Loader Password -

      - GRUB reads many file systems without +

      + GRUB reads many file systems without the help of an operating system. An operator can interrupt the booting sequence to choose a different operating system to boot, change boot options, or recover from a system error. However, these functions may introduce serious security risks in some environments. You can add a password to - GRUB so that the operator must enter + GRUB so that the operator must enter the password to interrupt the normal boot sequence. -

      [Tip]GRUB Passwords Not Required

      - You may not require a GRUB password +

      [Tip]GRUB Passwords Not Required

      + You may not require a GRUB password if your system only has trusted operators, or is physically secured with controlled console access.

      However, if there is a chance someone can get physical access to the keyboard and monitor of your computer, that person can - reboot the system and access GRUB. + reboot the system and access GRUB. This is where a password is helpful.

      - To set a boot password, select the Use a boot loader - password checkbox. The Change - password button will become active. Select - Change password to display the dialog + To set a boot password, select the Use a boot loader + password checkbox. The Change + password button will become active. Select + Change password to display the dialog below. Type the desired password, and then confirm it by typing it again in the spaces provided. -

      Entering and confirming a boot password

      Figure 7.4. Entering A Boot Password

      [Tip]Choose a Good Password

      +

      Entering and confirming a boot password

      Figure 7.4. Entering A Boot Password

      [Tip]Choose a Good Password

      Choose a password that is easy for you to remember but hard for others to guess. -

      [Warning]Forgotten GRUB Passwords

      - GRUB stores the password in encrypted +

      [Warning]Forgotten GRUB Passwords

      + GRUB stores the password in encrypted form, so it cannot be read or recovered. If you forget the boot password, boot the system normally and then change the password entry in the - /boot/grub/grub.conf file. If you cannot + /boot/grub/grub.conf file. If you cannot boot, you may be able to use the "rescue" mode on the first Fedora Core installation disc to reset the GRUB password.

      - If you do need to change the GRUB - password, use the grub-md5-crypt utility. For - information on using this utility, use the command man - grub-md5-crypt in a terminal window to read the manual + If you do need to change the GRUB + password, use the grub-md5-crypt utility. For + information on using this utility, use the command man + grub-md5-crypt in a terminal window to read the manual pages.

      Prev Up Next
      7.2.  Booting Additional Operating Systems Index: sn-community-help.php =================================================================== RCS file: /cvs/fedora/web/html/docs/fedora-install-guide-en/fc4/sn-community-help.php,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sn-community-help.php 12 Jun 2005 08:52:19 -0000 1.2 +++ sn-community-help.php 29 Sep 2005 17:29:43 -0000 1.3 @@ -7,7 +7,7 @@ ?> -
      16.2. Community Support
      Prev Chapter 16. Your Next Steps Next

      16.2. Community Support

      +

      16.2. Community Support
      Prev Chapter 16. Your Next Steps Next

      16.2. Community Support

      Members of the Fedora community provides support through mailing lists, web forums and Linux User Groups (LUGs) across the world.

      Index: sn-community.php =================================================================== RCS file: /cvs/fedora/web/html/docs/fedora-install-guide-en/fc4/sn-community.php,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sn-community.php 12 Jun 2005 08:52:19 -0000 1.2 +++ sn-community.php 29 Sep 2005 17:29:43 -0000 1.3 @@ -7,7 +7,7 @@ ?> -

      16.3. Joining The Fedora Community
      Prev Chapter 16. Your Next Steps Next

      16.3. Joining The Fedora Community

      +

      16.3. Joining The Fedora Community
      Prev Chapter 16. Your Next Steps Next

      16.3. Joining The Fedora Community

      The Fedora Project is driven by the individuals that contribute to it. Community members provide support and documentation to other users, help to improve the software included in Fedora Core by testing, and develop new software Index: sn-computer-hostname.php =================================================================== RCS file: /cvs/fedora/web/html/docs/fedora-install-guide-en/fc4/sn-computer-hostname.php,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sn-computer-hostname.php 12 Jun 2005 08:52:19 -0000 1.2 +++ sn-computer-hostname.php 29 Sep 2005 17:29:43 -0000 1.3 @@ -7,17 +7,17 @@ ?> -

      8.2. Computer Hostname
      Prev Chapter 8. Network Configuration Next

      8.2. Computer Hostname

      +

      8.2. Computer Hostname
      Prev Chapter 8. Network Configuration Next

      8.2. Computer Hostname

      On some networks, the DHCP provider also provides the name of the - computer, or hostname. To specify the - hostname, select Manual and type the complete + computer, or hostname. To specify the + hostname, select Manual and type the complete name in the box. The complete hostname includes both the name of the machine and the name of the domain of which it is a member, - such as machine1.example.com. The + such as machine1.example.com. The machine name (or "short hostname") is - machine1, and the domain name is - example.com. -

      [Tip]Valid Hostnames

      + machine1, and the domain name is + example.com. +

      [Tip]Valid Hostnames

      You may give your system any name provided that the full hostname is unique. The hostname may include letters, numbers and hyphens. Index: sn-disk-druid.php =================================================================== RCS file: /cvs/fedora/web/html/docs/fedora-install-guide-en/fc4/sn-disk-druid.php,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sn-disk-druid.php 12 Jun 2005 08:52:19 -0000 1.2 +++ sn-disk-druid.php 29 Sep 2005 17:29:43 -0000 1.3 @@ -7,63 +7,63 @@ ?> -

      6.3. Disk Druid
      Prev Chapter 6. Disk Partitioning Next

      6.3. Disk Druid

      - Disk - Druid is an interactive program for +

      6.3. Disk Druid
      Prev Chapter 6. Disk Partitioning Next

      6.3. Disk Druid

      + Disk + Druid is an interactive program for editing disk partitions. Users run it only within the Fedora Core - installation system. Disk Druid supports RAID and - LVM to provide more extensible + installation system. Disk Druid supports RAID and + LVM to provide more extensible and reliable data storage.

      disk setup screen

      Figure 6.3.  Disk Setup Screen

      - Disk Druid displays the following + Disk Druid displays the following actions in the installation program: -

      New

      - Select this option to add a partition or LVM physical volume to the disk. In the - Add partition dialog, choose a mount +

      New

      + Select this option to add a partition or LVM physical volume to the disk. In the + Add partition dialog, choose a mount point and a partition type. If you have more than one disk on the system, choose which disks the partition may inhabit. Indicate a size in megabytes for the partition. -

      [Important]Illegal Partitions

      - The /bin/, - /dev/, /etc/, - /lib/, /proc/, - /root/, and - /sbin/ directories may not be used - for separate partitions in Disk - Druid. These directories reside on the - / (root) partition. +

      [Important]Illegal Partitions

      + The /bin/, + /dev/, /etc/, + /lib/, /proc/, + /root/, and + /sbin/ directories may not be used + for separate partitions in Disk + Druid. These directories reside on the + / (root) partition.

      - The /boot partition may not reside on + The /boot partition may not reside on an LVM volume group. Create the - /boot partition before configuring + /boot partition before configuring any volume groups.

      You may also choose from three options for sizing your partition: -

      Fixed size

      +

      Fixed size

      Use a fixed size as close to your entry as possible. -

      Fill all space up to

      +

      Fill all space up to

      Grow the partition to a maximum size of your choice. -

      Fill to maximum allowable - size

      +

      Fill to maximum allowable + size

      Grow the partition until it fills the remainder of the selected disks. -

      [Note]Partition Sizes

      +

      [Note]Partition Sizes

      The actual partition on the disk may be slightly smaller or larger than your choice. Disk geometry issues cause this effect, not an error or bug.

      After you enter the details for your partition, select - OK to continue. -

      Edit

      + OK to continue. +

      Edit

      Select this option to edit an existing partition, - LVM volume group, or an LVM physical volume that + LVM volume group, or an LVM physical volume that is not yet part of a volume group. To change the size of a LVM physical volume partition, first remove it from any volume groups. -

      [Warning]Removing LVM Physical Volumes

      +

      [Warning]Removing LVM Physical Volumes

      If you remove an LVM physical volume from a volume group, you will erase any logical volumes it contains.

      @@ -77,15 +77,15 @@

    4. provide a mount point for non-Linux partitions such as those used on some Windows operating systems -

      5. [Note]Windows Partitions

      +

      [Note]Windows Partitions

      You may not label Windows partitions that use the - - NTFS file system with a + + NTFS file system with a mount point in the Fedora Core installer. You may label - - vfat - (FAT16 or - FAT32) + + vfat + (FAT16 or + FAT32) partitions with a mount point.

      If you need to make drastic changes to @@ -99,50 +99,50 @@ and user data, it is easier to upgrade your system. The installation program allows you to erase or retain data on specific partitions. If your user data is on a separate - /home partition, you may + /home partition, you may retain that data while erasing system partitions such as - /boot. -

      Delete

      + /boot. +

      Delete

      Select this option to erase an existing partition - or LVM physical volume. To delete an LVM + or LVM physical volume. To delete an LVM physical volume, first delete any volume groups of which that physical volume is a member.

      - If you make a mistake, use the Reset + If you make a mistake, use the Reset option to abandon all the changes you have made. -

      Reset

      - Select this option to force Disk - Druid to abandon all changes made to disk +

      Reset

      + Select this option to force Disk + Druid to abandon all changes made to disk partitions. -

      RAID

      - Select this button to set up software RAID on your Fedora system. -

      Create a software RAID - partition

      +

      RAID

      + Select this button to set up software RAID on your Fedora system. +

      Create a software RAID + partition

      Choose this option to add a partition for software RAID. This option is the only choice available if your disk contains no software RAID partitions. -

      Create a RAID device

      +

      Create a RAID device

      Choose this option to construct a RAID device from two or more existing software RAID partitions. This option is available if two or more software RAID partitions have been configured. -

      Clone a drive to create a RAID - device

      +

      Clone a drive to create a RAID + device

      Choose this option to set up a RAID - mirror of an existing disk. + mirror of an existing disk. This option is available if two or more disks are attached to the system. -

      LVM

      - Select this button to set up LVM on your Fedora system. First create at least one +

      LVM

      + Select this button to set up LVM on your Fedora system. First create at least one partition or software RAID device as an LVM physical volume, - using the New dialog. + using the New dialog.

      To assign one or more physical volumes to a volume group, first name the volume group. Then select the physical volumes to be used in the volume group. Finally, configure logical volumes on any volume groups using the - Add, Edit and - Delete options. + Add, Edit and + Delete options.

      You may not remove a physical volume from a volume group if doing so would leave insufficient space for that group's @@ -158,7 +158,7 @@ 5 GB physical volumes.

      After you finish setting up and reviewing your partition - configuration, select Next to continue the + configuration, select Next to continue the installation process.

      Prev Up Next
      6.2. General Information on Partitions Home Chapter 7. Boot Loader
      Index: sn-extreme-packagegroups.php =================================================================== RCS file: /cvs/fedora/web/html/docs/fedora-install-guide-en/fc4/sn-extreme-packagegroups.php,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sn-extreme-packagegroups.php 12 Jun 2005 08:52:19 -0000 1.2 +++ sn-extreme-packagegroups.php 29 Sep 2005 17:29:43 -0000 1.3 @@ -7,32 +7,32 @@ ?> -
      12.4. Everything or - Minimal Installations
      Prev Chapter 12. Package Selection Next

      12.4. Everything or - Minimal Installations

      +

      12.4. Everything or + Minimal Installations
      Prev Chapter 12. Package Selection Next

      12.4. Everything or + Minimal Installations

      Two of the groups under the heading of - Miscellaneous are incompatible with the + Miscellaneous are incompatible with the others. If you select either of these groups, your other group selections become invalid.

      - If you select Everything, Fedora Core installs + If you select Everything, Fedora Core installs all of the packages provided. Although Fedora Core installs many additional network services in this package group, some are not enabled after installation. This option may be useful for some testing and development purposes. -

      [Caution]Storage Requirements

      - The Everything installation fills +

      [Caution]Storage Requirements

      + The Everything installation fills approximately 6.9Gb of free disk space, and temporarily requires an additional 175Mb of disk space during the installation process. Refer to the Release Notes for more information about storage requirements.

      - The Minimal package group provides only the + The Minimal package group provides only the essential packages to create a bootable system. This package group provides no graphical interface.

      After you choose the desired packages, select - Next to proceed. Fedora Core checks your + Next to proceed. Fedora Core checks your selection, and automatically adds any extra packages required to use the software you select.

      Prev Up Next
      12.3. Additional Language Support Home Chapter 13. About to Install
      Index: sn-firstboot-additional-cds.php =================================================================== RCS file: /cvs/fedora/web/html/docs/fedora-install-guide-en/fc4/sn-firstboot-additional-cds.php,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sn-firstboot-additional-cds.php 12 Jun 2005 08:52:19 -0000 1.2 +++ sn-firstboot-additional-cds.php 29 Sep 2005 17:29:43 -0000 1.3 @@ -7,22 +7,22 @@ ?> -
      15.6. Additional CDs
      Prev Chapter 15. First Boot Next

      15.6. Additional CDs

      +

      15.6. Additional CDs
      Prev Chapter 15. First Boot Next

      15.6. Additional CDs

      This screen allows you to load prepared discs for installing third-party software. However, you cannot use it to install additional packages from the Fedora Core discs. -

      [Tip]Adding Software

      +

      [Tip]Adding Software

      To add software packages from the Fedora Core discs, use the - Package Manager utility after you log - in. From the main menu, select Desktop->System Settings->Add/Remove Applications. + Package Manager utility after you log + in. From the main menu, select Desktop->System Settings->Add/Remove Applications.

      Additional CDs screen.

      Figure 15.9. Additional CDs Screen

      - Click Next to proceed to the final screen. + Click Next to proceed to the final screen.

      Finish setup screen.

      Figure 15.10. Finish Setup Screen

      - Click Next to proceed to the login screen. + Click Next to proceed to the login screen. Your Fedora Core system is now ready for use.

      Prev Up Next
      15.5. Sound Card Home Chapter 16. Your Next Steps
      Index: sn-firstboot-datetime.php =================================================================== RCS file: /cvs/fedora/web/html/docs/fedora-install-guide-en/fc4/sn-firstboot-datetime.php,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sn-firstboot-datetime.php 12 Jun 2005 08:52:19 -0000 1.2 +++ sn-firstboot-datetime.php 29 Sep 2005 17:29:43 -0000 1.3 @@ -7,10 +7,10 @@ ?> -
      15.2. Date and Time
      Prev Chapter 15. First Boot Next

      15.2. Date and Time

      +

      15.2. Date and Time
      Prev Chapter 15. First Boot Next

      15.2. Date and Time

      If your system does not have Internet access or a network time server, manually set the date and time for your system on this - screen. Otherwise, use NTP (Network Time Protocol) + screen. Otherwise, use NTP (Network Time Protocol) servers to maintain the accuracy of the clock. NTP provides time synchronization service to computers on the same network. The Internet contains many computers that offer public NTP services. @@ -20,40 +20,40 @@

      Date and time screen.

      Figure 15.3. Date and Time Screen

      - Select the Network Time Protocol tab to + Select the Network Time Protocol tab to configure your system to use NTP servers instead. -

      [Tip]Setting the Clock

      +

      [Tip]Setting the Clock

      To change these settings later, from the main menu, choose - Desktop->System Settings->Date & Time. + Desktop->System Settings->Date & Time.

      To configure your system to use network time servers, select the - Enable Network Time Protocol option. This - option disables the settings on the Date and - Time tab and enables the other settings on this + Enable Network Time Protocol option. This + option disables the settings on the Date and + Time tab and enables the other settings on this screen.

      Date and time screen.

      Figure 15.4. Date and Time Screen

      By default, Fedora Core is configured to use three separate groups, or - pools, of time servers. Time server pools + pools, of time servers. Time server pools create redundancy, so if one time server is unavailable, your system will synchronize with another server.

      To use an additional time server, either select it from the - Server drop-down box, or type the DNS name in - the box, and select Add. To remove a server + Server drop-down box, or type the DNS name in + the box, and select Add. To remove a server or server pool from the list, select the name and click - Delete. The drop-down box already has two + Delete. The drop-down box already has two listings as examples, which are servers provided by Red Hat.

      If the hardware clock in your computer is highly inaccurate, you may turn off your local time source entirely. To turn off the - local time source, select Show advanced - options and then deselect the Use Local - Time Source option. If you turn off your local time + local time source, select Show advanced + options and then deselect the Use Local + Time Source option. If you turn off your local time source, the NTP servers take priority over the internal clock.

      - If you enable the Enable NTP Broadcast + If you enable the Enable NTP Broadcast advanced option, Fedora Core will attempt to automatically locate time servers on the network.

      Prev Up Next
      Chapter 15. First Boot Home 15.3. Display
      Index: sn-firstboot-display.php =================================================================== RCS file: /cvs/fedora/web/html/docs/fedora-install-guide-en/fc4/sn-firstboot-display.php,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sn-firstboot-display.php 12 Jun 2005 08:52:19 -0000 1.2 +++ sn-firstboot-display.php 29 Sep 2005 17:29:43 -0000 1.3 @@ -7,35 +7,35 @@ ?> -
      15.3. Display
      Prev Chapter 15. First Boot Next

      15.3. Display

      - The Setup Agent automatically attempts +

      15.3. Display
      Prev Chapter 15. First Boot Next

      15.3. Display

      + The Setup Agent automatically attempts to identify the graphics card and monitor for your computer. It uses this information to calculate the correct - Resolution and Color - Depth settings. + Resolution and Color + Depth settings.

      Display screen.

      Figure 15.5. Display Screen

      If you need to change the monitor, select - Configure to display a list of manufacturers. + Configure to display a list of manufacturers. Select the manufacturer of your monitor on the list, and hit the - + key or select the triangle next to the name to + + key or select the triangle next to the name to view supported models. Choose the correct model from the list and - select OK. If none of the listed models + select OK. If none of the listed models match your monitor, select the closest match from either the - Generic CRT Display list or the - Generic LCD Display list. + Generic CRT Display list or the + Generic LCD Display list.

      Monitor dialog.

      Figure 15.6. Monitor Dialog

      To change a display setting, select - Resolution or Color - Depth, and select a new value from the drop-down - list. The Setup Agent only shows the + Resolution or Color + Depth, and select a new value from the drop-down + list. The Setup Agent only shows the settings that are valid for your hardware. -

      [Tip]Resetting the display

      +

      [Tip]Resetting the display

      To reconfigure your system after the installation has completed, - from the main menu, choose Desktop->System Settings->Display. + from the main menu, choose Desktop->System Settings->Display.

      Prev Up Next
      15.2. Date and Time Home 15.4. System User
      -
      15.5. Sound Card
      Prev Chapter 15. First Boot Next

      15.5. Sound Card

      - The Setup Agent automatically attempts +

      15.5. Sound Card
      Prev Chapter 15. First Boot Next

      15.5. Sound Card

      + The Setup Agent automatically attempts to identify the sound card in your computer.

      Sound card screen.

      Figure 15.8. Sound Card Screen

      - Click Play Test Sound to check the sound + Click Play Test Sound to check the sound card configuration. If the configuration is correct, Fedora Core plays a sound sequence. If your sound card is identified, but you do not hear the sound, check your speakers and try again. @@ -22,10 +22,10 @@ cards after the installation process is complete. Manual sound hardware configuration is beyond the scope of this document. -

      [Tip]Changing the Sound Card

      +

      [Tip]Changing the Sound Card

      Fedora Core will automatically attempt to detect a new sound card if you add one to your system. If you need to launch the detection - process manually, from the main menu, choose Desktop->System Settings->Soundcard Detection. + process manually, from the main menu, choose Desktop->System Settings->Soundcard Detection.

      Prev Up Next
      15.4. System User Home 15.6. Additional CDs
      -
      15.4. System User
      Prev Chapter 15. First Boot Next

      15.4. System User

      +

      15.4. System User
      Prev Chapter 15. First Boot Next

      15.4. System User

      Create a user account for yourself with this screen. Always use this account to log in to your Fedora Core system, rather than using the - root account. + root account.

      System user screen.

      Figure 15.7. System User Screen

      Enter a user name and your full name, and then enter your chosen - password. Type your password once more in the Confirm - Password box to ensure that it is correct. Refer to + password. Type your password once more in the Confirm + Password box to ensure that it is correct. Refer to Chapter 11, Set the Root Password for guidelines on selecting a secure password. -

      [Tip]Creating extra user accounts

      +

      [Tip]Creating extra user accounts

      To add additional user accounts to your system after the installation is complete, from the main menu, choose - Desktop->System Settings->Users & Groups. + Desktop->System Settings->Users & Groups.

      To configure Fedora Core to use network services for authentication or - user information, select Use Network - Login.... + user information, select Use Network + Login....

      After you configure login services, select - Next to proceed. + Next to proceed.

      Prev Up Next
      15.3. Display Home 15.5. Sound Card
      -
      3.2. Keyboard Configuration
      Prev Chapter 3. Identifying Your Locale Next

      3.2. Keyboard Configuration

      +

      3.2. Keyboard Configuration
      Prev Chapter 3. Identifying Your Locale Next

      3.2. Keyboard Configuration

      The installation program display a list of the keyboard layouts supported by Fedora:

      Keyboard configuration screen.

      Figure 3.2. Keyboard Configuration Screen

      Highlight the correct layout on the list, and select - Next. -

      Prev Up Next
      Chapter 3. Identifying Your Locale Home Chapter 4. Upgrading an Existing System
      + Next. +

      Prev Up Next
      Chapter 3. Identifying Your Locale Home Chapter 4. Upgrading an Existing System
      -
      2.2. Installation from a Hard Drive
      Prev Chapter 2. Other Installation Methods Next

      2.2. Installation from a Hard Drive

      +

      2.2. Installation from a Hard Drive
      Prev Chapter 2. Other Installation Methods Next

      2.2. Installation from a Hard Drive

      You may install from a hard drive that contains the ISO image files for the Fedora discs. The hard drive may be internal to the computer or attached by USB. The partition on the hard drive - holding the ISO files must be formatted with the ext2, ext3 or vfat file system. In Fedora, - vfat includes a range + holding the ISO files must be formatted with the ext2, ext3 or vfat file system. In Fedora, + vfat includes a range of file systems, such as FAT-16 and FAT-32, found on most - removable media. External hard drives usually contain vfat (FAT-32) file systems. - Some Microsoft Windows systems also use vfat file systems on internal + removable media. External hard drives usually contain vfat (FAT-32) file systems. + Some Microsoft Windows systems also use vfat file systems on internal hard disk partitions. -

      [Note]FAT-16, FAT-32, and vfat

      +

      [Note]FAT-16, FAT-32, and vfat

      Before you begin installation from a hard drive, check the partition type to ensure that Fedora can read it. To check a - partition's file system under Windows, use the Disk - Management tool. To check a partition's file - system under Linux, use the fdisk utility. + partition's file system under Windows, use the Disk + Management tool. To check a partition's file + system under Linux, use the fdisk utility.

      You cannot use ISO files on partitions controlled by LVM (Logical Volume Management). Refer to Section 6.2, “General Information on Partitions” for more information about @@ -34,17 +34,17 @@ ">

      Figure 2.5. Select Partition Screen

      Select the partition containing the ISO files from the list of available partitions. Internal IDE drive device names begin with - /dev/hd. SCSI or USB drive device names - begin with /dev/sd. Each individual drive - has its own letter, for example /dev/hda. + /dev/hd. SCSI or USB drive device names + begin with /dev/sd. Each individual drive + has its own letter, for example /dev/hda. Each partition on a drive is numbered, for example - /dev/sda1. + /dev/sda1.

      - Also specify the Directory holding images. + Also specify the Directory holding images. Enter the full directory path from the drive that contains the ISO image files.

      - Select OK to continue. + Select OK to continue.

      Prev Up Next
      Chapter 2. Other Installation Methods Home Chapter 3. Identifying Your Locale
      -
      12.3. Additional Language Support
      Prev Chapter 12. Package Selection Next

      12.3. Additional Language Support

      +

      12.3. Additional Language Support
      Prev Chapter 12. Package Selection Next

      12.3. Additional Language Support

      Your Fedora Core system automatically supports the language that you selected at the start of the installation process. To include support for additional languages, select the packages for those - languages from the Language Support package + languages from the Language Support package group. -

      [Warning]Language Selection

      +

      [Warning]Language Selection

      Select every language that you need for your system. Adding support for a language after installation is difficult, and not recommended. -

      Prev Up Next
      12.2. Package Group Selection Home 12.4. Everything or - Minimal Installations
      +

      Prev Up Next
      12.2. Package Group Selection Home 12.4. Everything or + Minimal Installations
      -
      8.3. Miscellaneous Settings
      Prev Chapter 8. Network Configuration Next

      8.3. Miscellaneous Settings

      +

      8.3. Miscellaneous Settings
      Prev Chapter 8. Network Configuration Next

      8.3. Miscellaneous Settings

      To manually configure a network interface, you may also provide other network settings for your computer. All of these settings are the IP addresses of other systems on the network.

      - A gateway is the device that provides access to other networks. - Gateways are also referred to as routers. If your system + A gateway is the device that provides access to other networks. + Gateways are also referred to as routers. If your system connects to other networks through a gateway, enter its IP address - in the Gateway box. + in the Gateway box.

      - Most software relies on the DNS (Domain Name Service) + Most software relies on the DNS (Domain Name Service) provider to locate machines and services on the network. DNS converts hostnames to IP addresses and vice versa. A Fedora Core system may use more than one DNS server. If the primary DNS server does not respond, the computer sends any query to the secondary DNS server, and so on. To assign DNS servers, type their IP addresses - into the Primary, - Secondary, or Tertiary DNS - Server boxes. + into the Primary, + Secondary, or Tertiary DNS + Server boxes.

      - Click Next once you are satisfied with the + Click Next once you are satisfied with the network settings for your system.

      Prev Up Next
      8.2. Computer Hostname Home Chapter 9. Security Configuration
      Index: sn-packagegroups.php =================================================================== RCS file: /cvs/fedora/web/html/docs/fedora-install-guide-en/fc4/sn-packagegroups.php,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sn-packagegroups.php 12 Jun 2005 08:52:19 -0000 1.2 +++ sn-packagegroups.php 29 Sep 2005 17:29:43 -0000 1.3 @@ -7,8 +7,8 @@ ?> -
      12.2. Package Group Selection
      Prev Chapter 12. Package Selection Next

      12.2. Package Group Selection

      - Fedora Core divides included software into package groups that make +

      12.2. Package Group Selection
      Prev Chapter 12. Package Selection Next

      12.2. Package Group Selection

      + Fedora Core divides included software into package groups that make software selection easier.

      Package group selection screen. @@ -19,11 +19,11 @@ installed unless the checkbox next to the group is selected. </p><p> To change which packages within a selected group will be - installed, select the <span><b class=Details link next to + installed, select the Details link next to the name of the group. Fedora Core automatically installs - Base Packages of a group if the group is - selected. Change the selection of Optional - Packages by using the checkbox next to the name of + Base Packages of a group if the group is + selected. Change the selection of Optional + Packages by using the checkbox next to the name of the individual package.

      Fedora Core lists with each group the number of packages currently Index: sn-partitioning-general.php =================================================================== RCS file: /cvs/fedora/web/html/docs/fedora-install-guide-en/fc4/sn-partitioning-general.php,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sn-partitioning-general.php 12 Jun 2005 08:52:19 -0000 1.2 +++ sn-partitioning-general.php 29 Sep 2005 17:29:43 -0000 1.3 @@ -7,12 +7,12 @@ ?> -

      6.2. General Information on Partitions
      Prev Chapter 6. Disk Partitioning Next

      6.2. General Information on Partitions

      +

      6.2. General Information on Partitions
      Prev Chapter 6. Disk Partitioning Next

      6.2. General Information on Partitions

      A Fedora Core system has at least three partitions:

      • - A data partition mounted at /boot + A data partition mounted at /boot

      • - A data partition mounted at / + A data partition mounted at /

      • A swap partition

      @@ -21,71 +21,71 @@ are not sure what to choose, use the Automatic Partitioning method shown in Section 6.1, “Choosing a Partitioning Method”.

      - Data partitions have a mount point. The mount point + Data partitions have a mount point. The mount point indicates the directory whose contents reside on that partition. A partition with no mount point is not accessible by users. Data not located on any other partition resides in the - / (or root) partition. -

      [Important]Root and /root

      - The / (or - + / (or root) partition. +

      [Important]Root and /root

      + The / (or + root) partition is the top of the directory structure. The - - /root (sometimes pronounced + + /root (sometimes pronounced "slash-root") directory is the home directory of the user account for system administration.

      In the minimum configuration shown above:

      • - All data under the /boot/ directory - resides on the /boot partition. For - example, the file /boot/grub/grub.conf - resides on the /boot partition. + All data under the /boot/ directory + resides on the /boot partition. For + example, the file /boot/grub/grub.conf + resides on the /boot partition.

      • - Any file outside of the /boot partition, - such as /etc/passwd, resides on the - / partition. + Any file outside of the /boot partition, + such as /etc/passwd, resides on the + / partition.

      Subdirectories may be assigned to partitions as well. Some - administrators create both /usr and - /usr/local partitions. In that case, files - under /usr/local/, such as - /usr/local/bin/foo, will be on the - /usr/local partition. Any other files in - /usr/, such as - /usr/bin/foo, will be in the - /usr partition. + administrators create both /usr and + /usr/local partitions. In that case, files + under /usr/local/, such as + /usr/local/bin/foo, will be on the + /usr/local partition. Any other files in + /usr/, such as + /usr/bin/foo, will be in the + /usr partition.

      If you create many partitions instead of one large - / partition, upgrades become easier. Refer - to the description of Disk Druid's + / partition, upgrades become easier. Refer + to the description of Disk Druid's Edit option for more information. -

      6.2.1. Partition Types

      - Every partition has a partition type, to indicate the format of the file system on that +

      6.2.1. Partition Types

      + Every partition has a partition type, to indicate the format of the file system on that partition. The file system enables Linux to organize, search, and retrieve files stored on that partition. Use the - ext3 file + ext3 file system for data partitions, unless you have specific needs that require another type of file system. -

      6.2.2. Understanding LVM

      +

      6.2.2. Understanding LVM

      LVM (Logical Volume Management) partitions provide a number of advantages over standard partitions. LVM partitions are - formatted as - physical volumes. One or more physical - volumes are combined to form a volume group. Each volume + formatted as + physical volumes. One or more physical + volumes are combined to form a volume group. Each volume group's total storage is then divided into one or more - - logical volumes. The logical volumes + + logical volumes. The logical volumes function much like standard data partitions. They have a file - system type, such as ext3, and a mount point. + system type, such as ext3, and a mount point.

      An administrator may grow or shrink logical volumes without destroying data, unlike standard disk partitions. If the physical volumes in a volume group are on separate drives then administrators may also spread a logical volume across multiple disks and RAID arrays. -

      [Note]Automatic Partitioning and LVM

      +

      [Note]Automatic Partitioning and LVM

      The Automatic Partitioning option creates partitions as LVM volumes.

      Prev Up Next
      Chapter 6. Disk Partitioning Home 6.3. Disk Druid
      Index: sn-selinux.php =================================================================== RCS file: /cvs/fedora/web/html/docs/fedora-install-guide-en/fc4/sn-selinux.php,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sn-selinux.php 12 Jun 2005 08:52:19 -0000 1.2 +++ sn-selinux.php 29 Sep 2005 17:29:43 -0000 1.3 @@ -7,8 +7,8 @@ ?> -
      9.2. SELinux
      Prev Chapter 9. Security Configuration Next

      9.2. SELinux

      - The SELinux (Security Enhanced +

      9.2. SELinux
      Prev Chapter 9. Security Configuration Next

      9.2. SELinux

      + The SELinux (Security Enhanced Linux) framework is part of Fedora Core. SELinux limits the actions of both users and programs by enforcing security policies throughout the operating system. Without SELinux, software bugs or configuration @@ -23,27 +23,27 @@ functions. The targeted policies reduce or eliminate any inconvenience SELinux might cause users. Set the SELinux mode to one of the following: -

      Active

      +

      Active

      Select this mode to use the targeted SELinux policy on your Fedora system. This is the default mode for Fedora installations. -

      Warn

      +

      Warn

      Because SELinux is a new technology, this diagnostic mode is provided. In this mode, the system is configured with SELinux, but a breach of security policies only causes an error message to appear. No activities are actually prohibited when SELinux is installed in this mode. You may - change the SELinux mode to Active at any + change the SELinux mode to Active at any time after booting. -

      Disabled

      +

      Disabled

      If you choose this mode for SELinux, Fedora does not configure the access control system at all. To make SELinux active later, from the main menu, select - Desktop->System Settings->Security Level and Firewall. -

      [Tip]Changing the SELinux policy

      + Desktop->System Settings->Security Level and Firewall. +

      [Tip]Changing the SELinux policy

      SELinux is unique in that it cannot be bypassed, even by the system administrators. To change the behavior of SELinux after - installation, from the main menu, choose Desktop->System Settings->Security Level and Firewall. + installation, from the main menu, choose Desktop->System Settings->Security Level and Firewall.

      Prev Up Next
      Chapter 9. Security Configuration Home Chapter 10. Time Zone Selection
      -
      1.2. Using Other Removable Media
      Prev Chapter 1. Beginning the Installation Next

      1.2. Using Other Removable Media

      +

      1.2. Using Other Removable Media
      Prev Chapter 1. Beginning the Installation Next

      1.2. Using Other Removable Media

      To use a USB device such as a pen drive or Compact Flash card as boot media, write the supplied image file to the device. The media must be large enough to contain the image. -

      1.2.1. Preparing the Boot Media

      [Warning]Data Loss

      +

      1.2.1. Preparing the Boot Media

      [Warning]Data Loss

      This procedure destroys data on the media. Back up any important information before you begin. Some models of USB media use additional partitions @@ -19,14 +19,14 @@ procedure may make it difficult or impossible to access these special areas on your boot media.

      - The images/diskboot.img file on the first + The images/diskboot.img file on the first Fedora Core installation disc is a boot image designed for USB media. This file also appears on FTP and Web sites providing Fedora Core.

      Several software utilities are available for Windows and Linux that can write image files to a device. Linux includes the - dd command for this purpose. To write an - image file to boot media with dd on a current + dd command for this purpose. To write an + image file to boot media with dd on a current version of Fedora Core:

      1. Locate the image file. @@ -41,20 +41,20 @@ In the terminal window, type the following command: 

        -dd if=diskboot.img of=/dev/sda1
+dd if=diskboot.img of=/dev/sda1

        -

      1.2.2. Booting from the Media

      +

      1.2.2. Booting from the Media

      Boot your computer with the prepared media:

      1. Attach or insert the media.

      2. Switch on the computer.

      3. - A boot screen appears, with a boot: prompt + A boot screen appears, with a boot: prompt at the bottom. To begin, simply press the - Enter key. -

      [Note]BIOS Boot Order

      + Enter key. +

      [Note]BIOS Boot Order

      The BIOS contains settings that control the order of boot devices. If your PC boots from a device other than the Fedora Core boot media, check the BIOS boot configuration. Index: sn-utc.php =================================================================== RCS file: /cvs/fedora/web/html/docs/fedora-install-guide-en/fc4/sn-utc.php,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sn-utc.php 12 Jun 2005 16:49:32 -0000 1.3 +++ sn-utc.php 29 Sep 2005 17:29:43 -0000 1.4 @@ -1,29 +1,20 @@ -initCommon(); -$template->displayHeader(); - -?> - -

      10.2. Universal Co-ordinated Time (UTC)
      Prev Chapter 10. Time Zone Selection Next

      10.2. Universal Co-ordinated Time (UTC)

      - Universal Co-ordinated Time is also known as - Greenwich Mean Time (GMT). +10.2. Universal Co-ordinated Time (UTC)

      10.2. Universal Co-ordinated Time (UTC)
      Prev Chapter 10. Time Zone Selection Next

      10.2. Universal Co-ordinated Time (UTC)

      + Universal Co-ordinated Time is also known as + Greenwich Mean Time (GMT).

      If Fedora Core is the only operating system on your computer, select - System clock uses UTC. The system clock is a + System clock uses UTC. The system clock is a piece of hardware on your computer system. Fedora Core uses the timezone setting to determine the offset between the local time and UTC on the system clock. This behavior is standard for UNIX-like operating systems. -

      [Caution]Windows and the System Clock

      - Do not enable the System clock uses UTC +

      [Caution]Windows and the System Clock

      + Do not enable the System clock uses UTC option if your machine also runs Microsoft Windows. Microsoft operating systems change the BIOS clock to match local time rather than UTC. This may cause unexpected behavior under Fedora Core.

      - Select Next to proceed. + Select Next to proceed.

      Prev Up Next
      Chapter 10. Time Zone Selection Home Chapter 11. Set the Root Password
      Author: jpo Update of /cvs/extras/rpms/tetex-xcolor/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16946 Modified Files: .cvsignore sources tetex-xcolor.spec Log Message: Update to 2.04. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/tetex-xcolor/FC-3/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 8 Jun 2005 18:12:05 -0000 1.4 +++ .cvsignore 29 Sep 2005 17:41:52 -0000 1.5 @@ -1 +1 @@ -xcolor-2.03.zip +xcolor-2.04.zip Index: sources =================================================================== RCS file: /cvs/extras/rpms/tetex-xcolor/FC-3/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 8 Jun 2005 18:12:05 -0000 1.4 +++ sources 29 Sep 2005 17:41:52 -0000 1.5 @@ -1 +1 @@ -14dfb0f476ca9655d419ea2d91997117 xcolor-2.03.zip +12ab88d97912f9cc7e22a676af9b882e xcolor-2.04.zip Index: tetex-xcolor.spec =================================================================== RCS file: /cvs/extras/rpms/tetex-xcolor/FC-3/tetex-xcolor.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- tetex-xcolor.spec 8 Jun 2005 18:12:05 -0000 1.3 +++ tetex-xcolor.spec 29 Sep 2005 17:41:52 -0000 1.4 @@ -5,16 +5,16 @@ %define texpkgdoc %{_texmf}/doc/latex/%{texpkg} Name: tetex-%{texpkg} -Version: 2.03 +Version: 2.04 Release: 1%{?dist} Summary: Driver-independent color extensions for LaTeX and pdfLaTeX Group: Applications/Publishing License: LaTeX Project Public License URL: http://www.ctan.org/tex-archive/help/Catalogue/entries/xcolor.html -# DANTE generates CTAN packages tarballs on-the-fly +# DANTE generates CTAN packages zipfiles on-the-fly # ftp://ftp.dante.de/tex-archive/macros/latex/contrib/xcolor.zip -Source0: xcolor-2.03.zip +Source0: xcolor-2.04.zip BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -35,6 +35,7 @@ %prep %setup -q -n %{texpkg} +sed -i -e 's/\r$//' README ChangeLog %build latex xcolor.ins @@ -45,7 +46,7 @@ %install rm -rf $RPM_BUILD_ROOT - + install -d -m 755 $RPM_BUILD_ROOT{%{texpkgdir},%{texpkgdoc}} install -d -m 755 $RPM_BUILD_ROOT%{_texmf}/dvips/%{texpkg} install -p -m 644 *.sty *.def $RPM_BUILD_ROOT%{texpkgdir}/ @@ -72,6 +73,9 @@ %changelog +* Thu Sep 29 2005 Jose Pedro Oliveira - 2.04-1 +- Update to 2.04. + * Wed Jun 8 2005 Jose Pedro Oliveira - 2.03-1 - Update to 2.03. - Dist tag. From fedora-extras-commits at redhat.com Thu Sep 29 17:59:35 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 29 Sep 2005 13:59:35 -0400 Subject: rpms/sbcl/FC-3 .cvsignore, 1.3, 1.4 sbcl-0.9.4-LIB_DIR.patch, 1.2, 1.3 sbcl.spec, 1.16, 1.17 sources, 1.3, 1.4 Message-ID: <200509291759.j8THxZRG017121@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/sbcl/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17093 Modified Files: .cvsignore sbcl-0.9.4-LIB_DIR.patch sbcl.spec sources Log Message: * Thu Sep 29 2005 Rex Dieter 0.9.5-15 - enable sb-thread - set EXTRA_CFLAGS to so optflags are used for building contrib/ too - hope that a rebuild will include missing sb-posix (bz #169506) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/sbcl/FC-3/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 28 Sep 2005 01:23:44 -0000 1.3 +++ .cvsignore 29 Sep 2005 17:59:33 -0000 1.4 @@ -1,4 +1,4 @@ sbcl-0.9.5-source.tar.bz2 sbcl-0.8.15-powerpc-linux-binary.tar.bz2 sbcl-0.9.4-x86-64-linux-binary.tar.bz2 -sbcl-0.9.4-x86-linux-binary.tar.bz2 +sbcl-0.9.5-x86-linux-binary.tar.bz2 sbcl-0.9.4-LIB_DIR.patch: Index: sbcl-0.9.4-LIB_DIR.patch =================================================================== RCS file: /cvs/extras/rpms/sbcl/FC-3/sbcl-0.9.4-LIB_DIR.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sbcl-0.9.4-LIB_DIR.patch 13 Sep 2005 16:50:44 -0000 1.2 +++ sbcl-0.9.4-LIB_DIR.patch 29 Sep 2005 17:59:33 -0000 1.3 @@ -31,7 +31,7 @@ echo "SBCL has been installed:" echo " binary $BUILD_ROOT$INSTALL_ROOT/bin/sbcl" -echo " core and contribs in $BUILD_ROOT$INSTALL_ROOT/lib/sbcl/" -+echo " core and contribs in $BUILD_ROOT$LIB_DIR" ++echo " core and contribs in $BUILD_ROOT$LIB_DIR/sbcl" # Installing manual & misc bits of documentation # Index: sbcl.spec =================================================================== RCS file: /cvs/extras/rpms/sbcl/FC-3/sbcl.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- sbcl.spec 28 Sep 2005 01:23:44 -0000 1.16 +++ sbcl.spec 29 Sep 2005 17:59:33 -0000 1.17 @@ -3,7 +3,7 @@ Name: sbcl Summary: Steel Bank Common Lisp Version: 0.9.5 -Release: 8%{?dist} +Release: 15%{?dist} License: BSD/MIT Group: Development/Languages @@ -12,8 +12,12 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) ExclusiveArch: %{ix86} x86_64 +# Pre-generated html docs (not used) +#Source1: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-%{version}-html.tar.bz2 +Source2: customize-target-features.lisp + ## x86 section -#Source10: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.4-x86-linux-binary.tar.bz2 +#Source10: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.5-x86-linux-binary.tar.bz2 %ifarch %{ix86} %define sbcl_arch x86 BuildRequires: sbcl @@ -31,7 +35,7 @@ ## ppc section # Latest powerpc-linux bootstrap, busted: # buildsys.fedoraproject.org/logs/development/1131-sbcl-0.9.4-14.fc5/ppc/build.log -#Source30: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.8.15-powerpc-linux-binary.tar.bz2 +Source30: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.8.15-powerpc-linux-binary.tar.bz2 # another possible ppc bootstrap to try #Source31: http://clozure.com/openmcl/ftp/openmcl-linuxppc-all-0.14.3.tar.gz %ifarch ppc @@ -47,12 +51,16 @@ Patch2: sbcl-0.9.5-personality.patch Patch3: sbcl-0.9.5-optflags.patch Patch4: sbcl-0.9.4-LIB_DIR.patch +Patch5: sbcl-0.9.5-make-config-fix.patch +Patch6: sbcl-0.9.5-verbose-build.patch +Patch7: sbcl-0.9.5-stdlib_h.patch Requires(post): /sbin/install-info Requires(preun): /sbin/install-info # doc generation BuildRequires: ghostscript BuildRequires: texinfo +BuildRequires: time %description Steel Bank Common Lisp (SBCL) is a Open Source development environment @@ -63,24 +71,28 @@ %prep %setup -q %{?sbcl_bootstrap_src} +# Handle pre-generated docs +if [ -d %{name}-%{version}/doc/manual ]; then + mv %{name}-%{version}/doc/manual/* doc/manual/ +fi + #sed -i -e "s|/usr/local/lib/sbcl/|%{_libdir}/sbcl/|" src/runtime/runtime.c #or patch to use SBCL_HOME env var %patch1 -p0 -b .default-sbcl-home %patch2 -p1 -b .personality %patch3 -p1 -b .optflags %patch4 -p1 -b .LIB_DIR +%patch5 -p1 -b .make-config-fix +%patch6 -p1 -b .verbose-build +%patch7 -p1 -b .stdlib_h -# http://article.gmane.org/gmane.lisp.steel-bank.general/340 -# enable threads (was only for >= 2.6, but code has checks to disable for <= 2.4) -## FIXME(?): per section 2.2 of INSTALL, should create/use customize-target-features.lisp -## to customize features -- Rex -#define kernel_ver %(uname -r | cut -d- -f1 | cut -d. -f-2 ) -#if "%{?kernel_ver}" >= "2.6" +# Enable sb-thread %ifarch %{ix86} x86_64 #sed -i -e "s|; :sb-thread|:sb-thread|" base-target-features.lisp-expr +cp %{SOURCE2} ./customize-target-features.lisp %endif -#endif +# "install" local bootstrap %if "%{?sbcl_bootstrap_src}" != "%{nil}" mkdir sbcl-bootstrap pushd sbcl-*-linux @@ -89,26 +101,28 @@ popd %endif -# CVS crud -find . -name CVS -type d | xargs rm -rf -find . -name '.cvsignore' | xargs rm -f # fix permissions (some have eXecute bit set) find . -name '*.c' | xargs chmod 644 %build -export DEFAULT_SBCL_HOME=%{_libdir}/sbcl +# setup local bootstrap %if "%{?sbcl_bootstrap_src}" != "%{nil}" export SBCL_HOME=`pwd`/sbcl-bootstrap/lib/sbcl export PATH=`pwd`/sbcl-bootstrap/bin:${PATH} +%endif +# my_setarch, to set personality, (about) the same as setarch -R, +# but usable on fc3 too %{__cc} -o my_setarch %{optflags} %{SOURCE100} %define my_setarch ./my_setarch -%endif +# trick contrib/ modules to use optflags too +export EXTRA_CFLAGS="$RPM_OPT_FLAGS" +export DEFAULT_SBCL_HOME=%{_libdir}/sbcl %{?sbcl_arch:export SBCL_ARCH=%{sbcl_arch}} -%{?setarch} %{?my_setarch} ./make.sh %{?bootstrap} +%{?setarch} %{?my_setarch} sh -x ./make.sh %{?bootstrap} # docs make -C doc/manual html info @@ -116,7 +130,12 @@ %check || : pushd tests +# Only x86 builds are expected to pass all +%ifarch %{ix86} x86_64 %{?setarch} sh ./run-tests.sh +%else +%{?setarch} sh ./run-tests.sh ||: +%endif popd @@ -124,16 +143,20 @@ rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT{%{_bindir},%{_libdir},%{_mandir}} -unset SBCL_HOME ||: -export INSTALL_ROOT=$RPM_BUILD_ROOT%{_prefix} -export LIB_DIR=$RPM_BUILD_ROOT%{_libdir} -sh ./install.sh + +unset SBCL_HOME +export INSTALL_ROOT=$RPM_BUILD_ROOT%{_prefix} +export LIB_DIR=$RPM_BUILD_ROOT%{_libdir} +sh -x ./install.sh ## Unpackaged files rm -rf $RPM_BUILD_ROOT%{_docdir}/sbcl rm -f $RPM_BUILD_ROOT%{_infodir}/dir -# from make check -find $RPM_BUILD_ROOT -name 'test-passed' | xargs rm -f +# CVS crud +find $RPM_BUILD_ROOT -name CVS -type d | xargs rm -rf +find $RPM_BUILD_ROOT -name .cvsignore | xargs rm -f +# 'test-passed' files from make check (leave these in, for now -- Rex) +# find $RPM_BUILD_ROOT -name 'test-passed' | xargs rm -f %post @@ -165,6 +188,14 @@ %changelog +* Thu Sep 29 2005 Rex Dieter 0.9.5-15 +- enable sb-thread +- set EXTRA_CFLAGS to so optflags are used for building contrib/ too +- hope that a rebuild will include missing sb-posix (bz #169506) + +* Wed Sep 28 2005 Rex Dieter 0.9.5-14 +- more ppc work + * Tue Sep 27 2005 Rex Dieter 0.9.5-8 - respin (fc3/fc4) Index: sources =================================================================== RCS file: /cvs/extras/rpms/sbcl/FC-3/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 28 Sep 2005 01:23:44 -0000 1.3 +++ sources 29 Sep 2005 17:59:33 -0000 1.4 @@ -1,4 +1,4 @@ f594f18813c08f262a6df9a36288adcb sbcl-0.9.5-source.tar.bz2 3a72d0785ce0a8e02f9af632c2a4f217 sbcl-0.8.15-powerpc-linux-binary.tar.bz2 67ec41e624a3f2ad7f6f3cde1bd001d3 sbcl-0.9.4-x86-64-linux-binary.tar.bz2 -947d1cde2c1c80416b5f9fb4e4c81383 sbcl-0.9.4-x86-linux-binary.tar.bz2 +cb01b462b517889723eeaf63b5474c70 sbcl-0.9.5-x86-linux-binary.tar.bz2 From fedora-extras-commits at redhat.com Thu Sep 29 18:00:00 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 29 Sep 2005 14:00:00 -0400 Subject: rpms/sbcl/FC-3 sbcl-0.9.5-make-config-fix.patch, NONE, 1.1 sbcl-0.9.5-stdlib_h.patch, NONE, 1.1 sbcl-0.9.5-verbose-build.patch, NONE, 1.1 Message-ID: <200509291800.j8TI003M017158@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/sbcl/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17132 Added Files: sbcl-0.9.5-make-config-fix.patch sbcl-0.9.5-stdlib_h.patch sbcl-0.9.5-verbose-build.patch Log Message: import new patches sbcl-0.9.5-make-config-fix.patch: --- NEW FILE sbcl-0.9.5-make-config-fix.patch --- --- sbcl-0.9.5/make-config.sh.make-config-fix 2005-09-21 10:00:33.000000000 -0500 +++ sbcl-0.9.5/make-config.sh 2005-09-28 11:42:29.135788304 -0500 @@ -208,7 +208,7 @@ # cross-compilers! # # FIXME: integrate to grovel-features, mayhaps - $GNUMAKE -C tools-for-build determine-endianness -I src/runtime + $GNUMAKE -C tools-for-build determine-endianness -I ../src/runtime tools-for-build/determine-endianness >> $ltf elif [ "$sbcl_arch" = "ppc" -a "$sbcl_os" = "linux" ]; then # Use a C program to detect which kind of glibc we're building on, @@ -217,8 +217,8 @@ # # FIXME: integrate to grovel-features., maypahps printf ' :stack-allocatable-closures' >> $ltf - $GNUMAKE -C tools-for-build where-is-mcontext -I src/runtime - tools-for-build/where-is-mcontext > src/runtime/ppc-linux-mcontext.h + $GNUMAKE -C tools-for-build where-is-mcontext -I ../src/runtime + tools-for-build/where-is-mcontext > src/runtime/ppc-linux-mcontext.h || echo "error running where-is-mcontext" elif [ "$sbcl_arch" = "ppc" -a "$sbcl_os" = "darwin" ]; then printf ' :stack-allocatable-closures' >> $ltf # We provide a dlopen shim, so a little lie won't hurt sbcl-0.9.5-stdlib_h.patch: --- NEW FILE sbcl-0.9.5-stdlib_h.patch --- --- sbcl-0.9.5/tools-for-build/where-is-mcontext.c.stdlib_h 2005-07-14 15:24:19.000000000 -0500 +++ sbcl-0.9.5/tools-for-build/where-is-mcontext.c 2005-09-28 10:36:32.090350648 -0500 @@ -20,6 +20,7 @@ #include #include +#include #include int main (int argc, char *argv[]) { sbcl-0.9.5-verbose-build.patch: --- NEW FILE sbcl-0.9.5-verbose-build.patch --- --- sbcl-0.9.5/make.sh.verbose-build 2005-09-21 10:00:33.000000000 -0500 +++ sbcl-0.9.5/make.sh 2005-09-28 11:42:06.353251776 -0500 @@ -70,7 +70,7 @@ # If you're cross-compiling, you should probably just walk through the # make-config.sh script by hand doing the right thing on both the host # and target machines. -sh make-config.sh +sh -x make-config.sh ||: # Enforce the source policy for no bogus whitespace tools-for-build/canonicalize-whitespace @@ -102,11 +102,11 @@ # Or, if you can set up the files somewhere shared (with NFS, AFS, or # whatever) between the host machine and the target machine, the basic # procedure above should still work, but you can skip the "copy" steps. -time sh make-host-1.sh -time sh make-target-1.sh -time sh make-host-2.sh -time sh make-target-2.sh -time sh make-target-contrib.sh +time sh -x make-host-1.sh +time sh -x make-target-1.sh +time sh -x make-host-2.sh +time sh -x make-target-2.sh +time sh -x make-target-contrib.sh NCONTRIBS=`find contrib -name Makefile -print | wc -l` NPASSED=`find contrib -name test-passed -print | wc -l` From fedora-extras-commits at redhat.com Thu Sep 29 18:03:23 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 29 Sep 2005 14:03:23 -0400 Subject: rpms/sbcl/FC-3 customize-target-features.lisp,NONE,1.1 Message-ID: <200509291803.j8TI3NMH018608@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/sbcl/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18596 Added Files: customize-target-features.lisp Log Message: import --- NEW FILE customize-target-features.lisp --- (lambda (features) (flet ((enable (x) (pushnew x features)) (disable (x) (setf features (remove x features)))) ;; Threading support, available on x86/x86-64 Linux only. (enable :sb-thread))) From fedora-extras-commits at redhat.com Thu Sep 29 18:15:32 2005 From: fedora-extras-commits at redhat.com (Ed Hill (edhill)) Date: Thu, 29 Sep 2005 14:15:32 -0400 Subject: rpms/netcdf/FC-4 netcdf.spec,1.9,1.10 Message-ID: <200509291815.j8TIFWmC019082@cvs-int.fedora.redhat.com> Author: edhill Update of /cvs/extras/rpms/netcdf/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19027/rpms/netcdf/FC-4 Modified Files: netcdf.spec Log Message: add FFLAGS="-fPIC" so that the F90 parts of the static library can be used to create dynamic libs Index: netcdf.spec =================================================================== RCS file: /cvs/extras/rpms/netcdf/FC-4/netcdf.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- netcdf.spec 13 Jun 2005 18:41:13 -0000 1.9 +++ netcdf.spec 29 Sep 2005 18:15:30 -0000 1.10 @@ -1,6 +1,6 @@ Name: netcdf Version: 3.6.0 -Release: 6.p1%{?dist} +Release: 7.p1%{?dist} Summary: Libraries for the Unidata network Common Data Form (NetCDF v3) Group: Applications/Engineering @@ -60,6 +60,7 @@ cd src export FC="gfortran" export CPPFLAGS="-fPIC" +export FFLAGS="-fPIC" %configure # WARNING! # The parallel build was tested and it does NOT work. @@ -67,6 +68,7 @@ make unset FC unset CPPFLAGS +unset FFLAGS %install rm -rf ${RPM_BUILD_ROOT} @@ -102,6 +104,9 @@ %changelog +* Fri Sep 29 2005 Ed Hill - 3.6.0-7.p1 +- add FFLAGS="-fPIC" + * Fri Jun 13 2005 Ed Hill - 3.6.0-6.p1 - rebuild From fedora-extras-commits at redhat.com Thu Sep 29 18:15:32 2005 From: fedora-extras-commits at redhat.com (Ed Hill (edhill)) Date: Thu, 29 Sep 2005 14:15:32 -0400 Subject: rpms/netcdf/devel netcdf.spec,1.9,1.10 Message-ID: <200509291815.j8TIFW3a019088@cvs-int.fedora.redhat.com> Author: edhill Update of /cvs/extras/rpms/netcdf/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19027/rpms/netcdf/devel Modified Files: netcdf.spec Log Message: add FFLAGS="-fPIC" so that the F90 parts of the static library can be used to create dynamic libs Index: netcdf.spec =================================================================== RCS file: /cvs/extras/rpms/netcdf/devel/netcdf.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- netcdf.spec 13 Jun 2005 18:41:13 -0000 1.9 +++ netcdf.spec 29 Sep 2005 18:15:30 -0000 1.10 @@ -1,6 +1,6 @@ Name: netcdf Version: 3.6.0 -Release: 6.p1%{?dist} +Release: 7.p1%{?dist} Summary: Libraries for the Unidata network Common Data Form (NetCDF v3) Group: Applications/Engineering @@ -60,6 +60,7 @@ cd src export FC="gfortran" export CPPFLAGS="-fPIC" +export FFLAGS="-fPIC" %configure # WARNING! # The parallel build was tested and it does NOT work. @@ -67,6 +68,7 @@ make unset FC unset CPPFLAGS +unset FFLAGS %install rm -rf ${RPM_BUILD_ROOT} @@ -102,6 +104,9 @@ %changelog +* Fri Sep 29 2005 Ed Hill - 3.6.0-7.p1 +- add FFLAGS="-fPIC" + * Fri Jun 13 2005 Ed Hill - 3.6.0-6.p1 - rebuild From fedora-extras-commits at redhat.com Thu Sep 29 18:19:46 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 29 Sep 2005 14:19:46 -0400 Subject: rpms/sbcl/FC-3 sbcl.spec,1.17,1.18 Message-ID: <200509291819.j8TIJkXa019200@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/sbcl/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19181 Modified Files: sbcl.spec Log Message: rebuild with customize-target...lisp Index: sbcl.spec =================================================================== RCS file: /cvs/extras/rpms/sbcl/FC-3/sbcl.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- sbcl.spec 29 Sep 2005 17:59:33 -0000 1.17 +++ sbcl.spec 29 Sep 2005 18:19:44 -0000 1.18 @@ -3,7 +3,7 @@ Name: sbcl Summary: Steel Bank Common Lisp Version: 0.9.5 -Release: 15%{?dist} +Release: 15%{?dist}.1 License: BSD/MIT Group: Development/Languages From fedora-extras-commits at redhat.com Thu Sep 29 18:53:32 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 29 Sep 2005 14:53:32 -0400 Subject: rpms/sbcl/FC-3 sbcl.spec,1.18,1.19 Message-ID: <200509291853.j8TIrWPr019427@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/sbcl/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19408 Modified Files: sbcl.spec Log Message: workaround buildsystem quirk, allow fc3+sb-thread build despite seemingly false test results Index: sbcl.spec =================================================================== RCS file: /cvs/extras/rpms/sbcl/FC-3/sbcl.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- sbcl.spec 29 Sep 2005 18:19:44 -0000 1.18 +++ sbcl.spec 29 Sep 2005 18:53:30 -0000 1.19 @@ -3,7 +3,7 @@ Name: sbcl Summary: Steel Bank Common Lisp Version: 0.9.5 -Release: 15%{?dist}.1 +Release: 15%{?dist}.2 License: BSD/MIT Group: Development/Languages @@ -132,7 +132,7 @@ pushd tests # Only x86 builds are expected to pass all %ifarch %{ix86} x86_64 -%{?setarch} sh ./run-tests.sh +%{?setarch} sh ./run-tests.sh ||: %else %{?setarch} sh ./run-tests.sh ||: %endif From fedora-extras-commits at redhat.com Thu Sep 29 18:55:00 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Thu, 29 Sep 2005 14:55:00 -0400 Subject: extras-buildsys/server UserInterface.py,1.56,1.57 Message-ID: <200509291855.j8TIt0MS019495@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/server In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19476/server Modified Files: UserInterface.py Log Message: Fix traceback due to bad variable name Index: UserInterface.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/UserInterface.py,v retrieving revision 1.56 retrieving revision 1.57 diff -u -r1.56 -r1.57 --- UserInterface.py 9 Sep 2005 15:49:59 -0000 1.56 +++ UserInterface.py 29 Sep 2005 18:54:57 -0000 1.57 @@ -196,7 +196,7 @@ self._bm.requeue_job(uid) resutl = (0, "Success: Job %d has been requeued." % uid) - del cursor + del curs del dbcx return result From fedora-extras-commits at redhat.com Thu Sep 29 19:23:41 2005 From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields)) Date: Thu, 29 Sep 2005 15:23:41 -0400 Subject: web/html/docs/fedora-install-guide-en/fc4 ch-rootpassword.php, 1.4, 1.5 ch-timezone.php, 1.4, 1.5 sn-utc.php, 1.4, 1.5 Message-ID: <200509291923.j8TJNfit021015@cvs-int.fedora.redhat.com> Author: pfrields Update of /cvs/fedora/web/html/docs/fedora-install-guide-en/fc4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20992 Modified Files: ch-rootpassword.php ch-timezone.php sn-utc.php Log Message: Still can't figure out why docbookhtml2php.py doesn't work Index: ch-rootpassword.php =================================================================== RCS file: /cvs/fedora/web/html/docs/fedora-install-guide-en/fc4/ch-rootpassword.php,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- ch-rootpassword.php 29 Sep 2005 17:29:43 -0000 1.4 +++ ch-rootpassword.php 29 Sep 2005 19:23:39 -0000 1.5 @@ -1,4 +1,13 @@ -Chapter 11. Set the Root Password
      Chapter 11. Set the Root Password
      Prev   Next

      Chapter 11. Set the Root Password

      +initCommon(); +$template->displayHeader(); + +?> + +

      Chapter 11. Set the Root Password
      Prev   Next

      Chapter 11. Set the Root Password

      Fedora uses a special account named root for system administration. The root account on every Linux system is only limited by SELinux. It is not Index: ch-timezone.php =================================================================== RCS file: /cvs/fedora/web/html/docs/fedora-install-guide-en/fc4/ch-timezone.php,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- ch-timezone.php 29 Sep 2005 17:29:43 -0000 1.4 +++ ch-timezone.php 29 Sep 2005 19:23:39 -0000 1.5 @@ -1,4 +1,13 @@ -Chapter 10. Time Zone Selection

      Chapter 10. Time Zone Selection
      Prev   Next

      Chapter 10. Time Zone Selection

      +initCommon(); +$template->displayHeader(); + +?> + +

      Chapter 10. Time Zone Selection
      Prev   Next

      Chapter 10. Time Zone Selection

      This screen allows you to specify the correct time zone for the location of your computer. Specify a time zone even if you plan to use NTP (Network Time Protocol) to maintain the accuracy of Index: sn-utc.php =================================================================== RCS file: /cvs/fedora/web/html/docs/fedora-install-guide-en/fc4/sn-utc.php,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sn-utc.php 29 Sep 2005 17:29:43 -0000 1.4 +++ sn-utc.php 29 Sep 2005 19:23:39 -0000 1.5 @@ -1,4 +1,13 @@ -10.2. Universal Co-ordinated Time (UTC)

      10.2. Universal Co-ordinated Time (UTC)
      Prev Chapter 10. Time Zone Selection Next

      10.2. Universal Co-ordinated Time (UTC)

      +initCommon(); +$template->displayHeader(); + +?> + +

      10.2. Universal Co-ordinated Time (UTC)
      Prev Chapter 10. Time Zone Selection Next

      10.2. Universal Co-ordinated Time (UTC)

      Universal Co-ordinated Time is also known as Greenwich Mean Time (GMT).

      From fedora-extras-commits at redhat.com Thu Sep 29 19:45:07 2005 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Thu, 29 Sep 2005 15:45:07 -0400 Subject: owners owners.list,1.272,1.273 Message-ID: <200509291945.j8TJj7QZ021136@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21117 Modified Files: owners.list Log Message: Change ownership of SDL_ttf Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.272 retrieving revision 1.273 diff -u -r1.272 -r1.273 --- owners.list 29 Sep 2005 04:21:47 -0000 1.272 +++ owners.list 29 Sep 2005 19:45:05 -0000 1.273 @@ -943,7 +943,7 @@ Fedora Extras|SDL_image|A sample image loading library for SDL.|bdpepple at ameritech.net|extras-qa at fedoraproject.org| Fedora Extras|SDL_mixer|Simple DirectMedia Layer - Sample Mixer Library|bdpepple at ameritech.net|extras-qa at fedoraproject.org| Fedora Extras|SDL_net|SDL portable network library|bdpepple at ameritech.net|extras-qa at fedoraproject.org| -Fedora Extras|SDL_ttf|Simple DirectMedia Layer - Sample TrueType Font Library|pmatilai at laiskiainen.org|extras-qa at fedoraproject.org| +Fedora Extras|SDL_ttf|Simple DirectMedia Layer - Sample TrueType Font Library|bdpepple at ameritech.net|extras-qa at fedoraproject.org| Fedora Extras|seahorse|GNOME2 interface for gnupg|skvidal at phy.duke.edu|extras-qa at fedoraproject.org| Fedora Extras|shapelib|API in "C" for Shapefile handling|mccann0011 at hotmail.com|extras-qa at fedoraproject.org| Fedora Extras|shorewall|Shoreline Firewall is an iptables-based firewall for Linux systems|kuko at maarmas.com|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Thu Sep 29 19:57:20 2005 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Thu, 29 Sep 2005 15:57:20 -0400 Subject: rpms/SDL_ttf/devel SDL_ttf.spec,1.7,1.8 Message-ID: <200509291957.j8TJvK2l021185@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/SDL_ttf/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21166 Modified Files: SDL_ttf.spec Log Message: * Thu Sep 29 2005 Brian Pepple - 2.0.7-2 - General spec formatting changes. - Rebuild for FC4 upgrade path. Index: SDL_ttf.spec =================================================================== RCS file: /cvs/extras/rpms/SDL_ttf/devel/SDL_ttf.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- SDL_ttf.spec 19 Sep 2005 18:40:09 -0000 1.7 +++ SDL_ttf.spec 29 Sep 2005 19:57:18 -0000 1.8 @@ -1,61 +1,79 @@ -Summary: Simple DirectMedia Layer TrueType Font library -Name: SDL_ttf -Version: 2.0.7 -Release: 1%{?dist} -URL: http://www.libsdl.org/projects/SDL_ttf/ -Source0: http://www.libsdl.org/projects/SDL_ttf/release/%{name}-%{version}.tar.gz -License: LGPL -Group: System Environment/Libraries -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: SDL-devel >= 1.2.4 -BuildRequires: freetype-devel >= 2.0 -BuildRequires: zlib-devel +Name: SDL_ttf +Version: 2.0.7 +Release: 2%{?dist} +Summary: Simple DirectMedia Layer TrueType Font library + +Group: System Environment/Libraries +License: LGPL +URL: http://www.libsdl.org/projects/SDL_ttf/ +Source0: http://www.libsdl.org/projects/%{name}/release/%{name}-%{version}.tar.gz +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +BuildRequires: SDL-devel >= 1.2.4 +BuildRequires: freetype-devel >= 2.0 +BuildRequires: zlib-devel + %description This library allows you to use TrueType fonts to render text in SDL applications. + %package devel -Summary: Files to develop SDL applications which use TrueType fonts -Group: Development/Libraries -Requires: %{name} = %{version}-%{release} -Requires: SDL-devel >= 1.2.4 +Summary: Files to develop SDL applications which use TrueType fonts +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} +Requires: SDL-devel >= 1.2.4 + %description devel This library allows you to use TrueType fonts to render text in SDL applications. This package provides the libraries, include files and other resources needed for developing SDL_ttf applications. + %prep %setup -q + %build %configure --disable-dependency-tracking --disable-static make %{?_smp_mflags} + %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la + %clean rm -rf $RPM_BUILD_ROOT + %post -p /sbin/ldconfig + %postun -p /sbin/ldconfig + %files %defattr(-,root,root) %doc README CHANGES COPYING %{_libdir}/lib*.so.* + %files devel %defattr(-,root,root) %{_libdir}/*.so %{_includedir}/SDL/*.h + %changelog +* Thu Sep 29 2005 Brian Pepple - 2.0.7-2 +- General spec formatting changes. +- Rebuild for FC4 upgrade path. + * Sun Sep 18 2005 Ville Skytt?? - 2.0.7-1 - 2.0.7, patches applied upstream. - Require SDL-devel in -devel. From fedora-extras-commits at redhat.com Thu Sep 29 20:03:46 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 29 Sep 2005 16:03:46 -0400 Subject: rpms/sbcl/FC-4 sbcl-0.9.5-make-config-fix.patch, 1.2, 1.3 sbcl-0.9.5-verbose-build.patch, 1.3, 1.4 sbcl.spec, 1.23, 1.24 Message-ID: <200509292004.j8TK4Hap022683@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/sbcl/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22650 Modified Files: sbcl-0.9.5-make-config-fix.patch sbcl-0.9.5-verbose-build.patch sbcl.spec Log Message: * Thu Sep 29 2005 Rex Dieter 0.9.5-16 - more ppc work sbcl-0.9.5-make-config-fix.patch: Index: sbcl-0.9.5-make-config-fix.patch =================================================================== RCS file: /cvs/extras/rpms/sbcl/FC-4/sbcl-0.9.5-make-config-fix.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sbcl-0.9.5-make-config-fix.patch 28 Sep 2005 16:43:29 -0000 1.2 +++ sbcl-0.9.5-make-config-fix.patch 29 Sep 2005 20:03:43 -0000 1.3 @@ -16,7 +16,7 @@ - $GNUMAKE -C tools-for-build where-is-mcontext -I src/runtime - tools-for-build/where-is-mcontext > src/runtime/ppc-linux-mcontext.h + $GNUMAKE -C tools-for-build where-is-mcontext -I ../src/runtime -+ tools-for-build/where-is-mcontext > src/runtime/ppc-linux-mcontext.h || echo "error running where-is-mcontext" ++ tools-for-build/where-is-mcontext > src/runtime/ppc-linux-mcontext.h || echo "error running where-is-mcontext, using backup copy"; cp src/runtime/ppc-linux-mcontext.h.BAK src/runtime/ppc-linux-mcontext.h elif [ "$sbcl_arch" = "ppc" -a "$sbcl_os" = "darwin" ]; then printf ' :stack-allocatable-closures' >> $ltf # We provide a dlopen shim, so a little lie won't hurt sbcl-0.9.5-verbose-build.patch: Index: sbcl-0.9.5-verbose-build.patch =================================================================== RCS file: /cvs/extras/rpms/sbcl/FC-4/sbcl-0.9.5-verbose-build.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sbcl-0.9.5-verbose-build.patch 28 Sep 2005 16:43:29 -0000 1.3 +++ sbcl-0.9.5-verbose-build.patch 29 Sep 2005 20:03:43 -0000 1.4 @@ -5,7 +5,7 @@ # make-config.sh script by hand doing the right thing on both the host # and target machines. -sh make-config.sh -+sh -x make-config.sh ||: ++sh -x make-config.sh # Enforce the source policy for no bogus whitespace tools-for-build/canonicalize-whitespace Index: sbcl.spec =================================================================== RCS file: /cvs/extras/rpms/sbcl/FC-4/sbcl.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- sbcl.spec 29 Sep 2005 17:10:35 -0000 1.23 +++ sbcl.spec 29 Sep 2005 20:03:43 -0000 1.24 @@ -1,16 +1,21 @@ # $Id$ +# build only a minimal sbcl whose sole-purpose is to be bootstrap +# for a future sbcl build +%define min_bootstrap 1 + Name: sbcl Summary: Steel Bank Common Lisp Version: 0.9.5 -Release: 15%{?dist} +Release: 16%{?dist} License: BSD/MIT Group: Development/Languages URL: http://sbcl.sourceforge.net/ Source0: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-%{version}-source.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -ExclusiveArch: %{ix86} x86_64 +ExclusiveArch: ppc +#ExclusiveArch: %{ix86} x86_64 # Pre-generated html docs (not used) #Source1: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-%{version}-html.tar.bz2 @@ -38,11 +43,12 @@ Source30: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.8.15-powerpc-linux-binary.tar.bz2 # another possible ppc bootstrap to try #Source31: http://clozure.com/openmcl/ftp/openmcl-linuxppc-all-0.14.3.tar.gz +Source35: ppc-linux-mcontext.h %ifarch ppc %define sbcl_arch ppc %define sbcl_bootstrap_src -a 30 BuildRequires: setarch -%define setarch setarch %{_target_cpu} -R +%define setarch setarch %{_target_cpu} %endif Source100: my_setarch.c @@ -92,6 +98,10 @@ cp %{SOURCE2} ./customize-target-features.lisp %endif +%ifarch ppc +cp %{SOURCE35} src/runtime/ppc-linux-mcontext.h.BAK +%endif + # "install" local bootstrap %if "%{?sbcl_bootstrap_src}" != "%{nil}" mkdir sbcl-bootstrap @@ -122,17 +132,19 @@ export EXTRA_CFLAGS="$RPM_OPT_FLAGS" export DEFAULT_SBCL_HOME=%{_libdir}/sbcl %{?sbcl_arch:export SBCL_ARCH=%{sbcl_arch}} -%{?setarch} %{?my_setarch} ./make.sh %{?bootstrap} +%{?setarch} %{?my_setarch} sh -x ./make.sh %{?bootstrap} # docs +%if "%{?min_bootstrap}" == "%{nil}" make -C doc/manual html info +%endif %check || : pushd tests # Only x86 builds are expected to pass all %ifarch %{ix86} x86_64 -%{?setarch} sh ./run-tests.sh +%{?setarch} sh ./run-tests.sh ||: %else %{?setarch} sh ./run-tests.sh ||: %endif @@ -147,7 +159,7 @@ unset SBCL_HOME export INSTALL_ROOT=$RPM_BUILD_ROOT%{_prefix} export LIB_DIR=$RPM_BUILD_ROOT%{_libdir} -sh ./install.sh +sh -x ./install.sh ## Unpackaged files rm -rf $RPM_BUILD_ROOT%{_docdir}/sbcl @@ -159,16 +171,22 @@ # find $RPM_BUILD_ROOT -name 'test-passed' | xargs rm -f +%if "%{?min_bootstrap}" == "%{nil}" %post /sbin/install-info %{_infodir}/sbcl.info %{_infodir}/dir ||: /sbin/install-info %{_infodir}/asdf.info %{_infodir}/dir ||: - %postun if [ $1 -eq 0 ]; then /sbin/install-info --delete %{_infodir}/sbcl.info %{_infodir}/dir ||: /sbin/install-info --delete %{_infodir}/asdf.info %{_infodir}/dir ||: fi +%else +%pre +# We *could* check for only-on-upgrade, but why bother? (-: +/sbin/install-info --delete %{_infodir}/sbcl.info %{_infodir}/dir >& /dev/null ||: +/sbin/install-info --delete %{_infodir}/asdf.info %{_infodir}/dir >& /dev/null ||: +%endif %files @@ -180,7 +198,9 @@ %{_bindir}/* %{_libdir}/sbcl/ %{_mandir}/man?/* +%if "%{?min_bootstrap}" == "%{nil}" %{_infodir}/* +%endif %clean @@ -188,6 +208,9 @@ %changelog +* Thu Sep 29 2005 Rex Dieter 0.9.5-16 +- more ppc work + * Thu Sep 29 2005 Rex Dieter 0.9.5-15 - enable sb-thread - set EXTRA_CFLAGS to so optflags are used for building contrib/ too From fedora-extras-commits at redhat.com Thu Sep 29 20:07:44 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 29 Sep 2005 16:07:44 -0400 Subject: rpms/sbcl/FC-4 ppc-linux-mcontext.h,NONE,1.1 Message-ID: <200509292007.j8TK7iWq022726@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/sbcl/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22713 Added Files: ppc-linux-mcontext.h Log Message: import --- NEW FILE ppc-linux-mcontext.h --- /* This is an automatically-generated file; please do not edit it. See the program tools-for-build/where-is-mcontext.c. */ #ifndef PPC_LINUX_MCONTEXT_H #define PPC_LINUX_MCONTEXT_H #define GLIBC232_STYLE_UCONTEXT #endif /* PPC_LINUX_MCONTEXT_H */ From fedora-extras-commits at redhat.com Thu Sep 29 20:08:44 2005 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Thu, 29 Sep 2005 16:08:44 -0400 Subject: rpms/SDL_ttf/FC-4 .cvsignore, 1.2, 1.3 SDL_ttf.spec, 1.6, 1.7 sources, 1.2, 1.3 SDL_ttf-2.0.6-ft2-build.patch, 1.1, NONE SDL_ttf-2.0.6-openstream.patch, 1.1, NONE Message-ID: <200509292008.j8TK8ioT022798@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/SDL_ttf/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22746 Modified Files: .cvsignore SDL_ttf.spec sources Removed Files: SDL_ttf-2.0.6-ft2-build.patch SDL_ttf-2.0.6-openstream.patch Log Message: * Thu Sep 29 2005 Brian Pepple - 2.0.7-1 - General spec formatting changes. - 2.0.7, patches applied upstream. - Require SDL-devel in -devel. - Build with dependency tracking disabled. - Don't ship static libs. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/SDL_ttf/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Nov 2004 03:59:03 -0000 1.2 +++ .cvsignore 29 Sep 2005 20:08:25 -0000 1.3 @@ -1 +1 @@ -SDL_ttf-2.0.6.tar.gz +SDL_ttf-2.0.7.tar.gz Index: SDL_ttf.spec =================================================================== RCS file: /cvs/extras/rpms/SDL_ttf/FC-4/SDL_ttf.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- SDL_ttf.spec 6 Apr 2005 22:10:46 -0000 1.6 +++ SDL_ttf.spec 29 Sep 2005 20:08:25 -0000 1.7 @@ -1,68 +1,83 @@ -Summary: Simple DirectMedia Layer TrueType Font library -Name: SDL_ttf -Version: 2.0.6 -Release: 5 - -URL: http://www.libsdl.org/projects/SDL_ttf/ -Source0: http://www.libsdl.org/projects/SDL_ttf/release/SDL_ttf-2.0.6.tar.gz -Patch0: %{name}-%{version}-openstream.patch -Patch1: %{name}-%{version}-ft2-build.patch -License: LGPL -Group: System Environment/Libraries -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: SDL-devel >= 1.2.4 -BuildRequires: freetype-devel >= 2.0 -BuildRequires: zlib-devel +Name: SDL_ttf +Version: 2.0.7 +Release: 1%{?dist} +Summary: Simple DirectMedia Layer TrueType Font library + +Group: System Environment/Libraries +License: LGPL +URL: http://www.libsdl.org/projects/SDL_ttf/ +Source0: http://www.libsdl.org/projects/%{name}/release/%{name}-%{version}.tar.gz +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +BuildRequires: SDL-devel >= 1.2.4 +BuildRequires: freetype-devel >= 2.0 +BuildRequires: zlib-devel + %description This library allows you to use TrueType fonts to render text in SDL applications. + %package devel -Summary: Files to develop SDL applications which use TrueType fonts -Group: Development/Libraries -Requires: %{name} = %{version}-%{release} +Summary: Files to develop SDL applications which use TrueType fonts +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} +Requires: SDL-devel >= 1.2.4 + %description devel This library allows you to use TrueType fonts to render text in SDL applications. This package provides the libraries, include files and other resources needed for developing SDL_ttf applications. + %prep %setup -q -%patch -p1 -%patch1 -p1 -b .ft2 + %build -%configure +%configure --disable-dependency-tracking --disable-static make %{?_smp_mflags} + %install rm -rf $RPM_BUILD_ROOT -%makeinstall - +make install DESTDIR=$RPM_BUILD_ROOT rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la + %clean rm -rf $RPM_BUILD_ROOT + %post -p /sbin/ldconfig + %postun -p /sbin/ldconfig + %files %defattr(-,root,root) %doc README CHANGES COPYING %{_libdir}/lib*.so.* + %files devel %defattr(-,root,root) -%{_libdir}/*.a %{_libdir}/*.so -%{_includedir}/SDL/ +%{_includedir}/SDL/*.h + %changelog -* Fri Apr 7 2005 Michael Schwendt +* Thu Sep 29 2005 Brian Pepple - 2.0.7-1 +- General spec formatting changes. +- 2.0.7, patches applied upstream. +- Require SDL-devel in -devel. +- Build with dependency tracking disabled. +- Don't ship static libs. + +* Fri Apr 7 2005 Michael Schwendt - 2.0.6-5 - rebuilt * Wed Mar 21 2004 Panu Matilainen 0:2.0.6-0.fdr.4 Index: sources =================================================================== RCS file: /cvs/extras/rpms/SDL_ttf/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Nov 2004 03:59:03 -0000 1.2 +++ sources 29 Sep 2005 20:08:25 -0000 1.3 @@ -1 +1 @@ -880ca22ac3e8beb5cca2326cc8069733 SDL_ttf-2.0.6.tar.gz +0f6ee1a502e6913a412aac353dc75bbc SDL_ttf-2.0.7.tar.gz --- SDL_ttf-2.0.6-ft2-build.patch DELETED --- --- SDL_ttf-2.0.6-openstream.patch DELETED --- From fedora-extras-commits at redhat.com Thu Sep 29 20:10:11 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 29 Sep 2005 16:10:11 -0400 Subject: rpms/sbcl/FC-4 sbcl.spec,1.24,1.25 Message-ID: <200509292010.j8TKAB55022906@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/sbcl/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22887 Modified Files: sbcl.spec Log Message: don't include some docs min_bootstrap build Index: sbcl.spec =================================================================== RCS file: /cvs/extras/rpms/sbcl/FC-4/sbcl.spec,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- sbcl.spec 29 Sep 2005 20:03:43 -0000 1.24 +++ sbcl.spec 29 Sep 2005 20:10:09 -0000 1.25 @@ -7,7 +7,7 @@ Name: sbcl Summary: Steel Bank Common Lisp Version: 0.9.5 -Release: 16%{?dist} +Release: 16%{?dist}.1 License: BSD/MIT Group: Development/Languages @@ -193,12 +193,12 @@ %defattr(-,root,root) %doc BUGS COPYING README CREDITS NEWS TLA TODO %doc SUPPORT STYLE PRINCIPLES -%doc doc/manual/sbcl -%doc doc/manual/asdf %{_bindir}/* %{_libdir}/sbcl/ %{_mandir}/man?/* %if "%{?min_bootstrap}" == "%{nil}" +%doc doc/manual/sbcl +%doc doc/manual/asdf %{_infodir}/* %endif From fedora-extras-commits at redhat.com Thu Sep 29 20:32:53 2005 From: fedora-extras-commits at redhat.com (Robert Theisen (trobert)) Date: Thu, 29 Sep 2005 16:32:53 -0400 Subject: web/html/download mirrors.php,1.29,1.30 Message-ID: <200509292033.j8TKXQka023041@cvs-int.fedora.redhat.com> Author: trobert Update of /cvs/fedora/web/html/download In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23019 Modified Files: mirrors.php Log Message: Added new site http and ftp for ftp.port80.se Index: mirrors.php =================================================================== RCS file: /cvs/fedora/web/html/download/mirrors.php,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- mirrors.php 20 Sep 2005 16:04:25 -0000 1.29 +++ mirrors.php 29 Sep 2005 20:32:51 -0000 1.30 @@ -424,6 +424,8 @@

    5. Switzerland
        From fedora-extras-commits at redhat.com Fri Sep 30 00:39:33 2005 From: fedora-extras-commits at redhat.com (Zing Zing Shishak (shishz)) Date: Thu, 29 Sep 2005 20:39:33 -0400 Subject: rpms/mmv - New directory Message-ID: <200509300039.j8U0dXke029249@cvs-int.fedora.redhat.com> Author: shishz Update of /cvs/extras/rpms/mmv In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29229/mmv Log Message: Directory /cvs/extras/rpms/mmv added to the repository From fedora-extras-commits at redhat.com Fri Sep 30 00:39:33 2005 From: fedora-extras-commits at redhat.com (Zing Zing Shishak (shishz)) Date: Thu, 29 Sep 2005 20:39:33 -0400 Subject: rpms/mmv/devel - New directory Message-ID: <200509300039.j8U0dXo5029254@cvs-int.fedora.redhat.com> Author: shishz Update of /cvs/extras/rpms/mmv/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29229/mmv/devel Log Message: Directory /cvs/extras/rpms/mmv/devel added to the repository From fedora-extras-commits at redhat.com Fri Sep 30 00:39:48 2005 From: fedora-extras-commits at redhat.com (Zing Zing Shishak (shishz)) Date: Thu, 29 Sep 2005 20:39:48 -0400 Subject: rpms/mmv Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200509300039.j8U0dmfq029309@cvs-int.fedora.redhat.com> Author: shishz Update of /cvs/extras/rpms/mmv In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29274 Added Files: Makefile import.log Log Message: Setup of module mmv --- NEW FILE Makefile --- # Top level Makefile for module mmv all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Fri Sep 30 00:39:48 2005 From: fedora-extras-commits at redhat.com (Zing Zing Shishak (shishz)) Date: Thu, 29 Sep 2005 20:39:48 -0400 Subject: rpms/mmv/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200509300039.j8U0dmrg029314@cvs-int.fedora.redhat.com> Author: shishz Update of /cvs/extras/rpms/mmv/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29274/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module mmv --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Fri Sep 30 00:40:22 2005 From: fedora-extras-commits at redhat.com (Zing Zing Shishak (shishz)) Date: Thu, 29 Sep 2005 20:40:22 -0400 Subject: rpms/mmv import.log,1.1,1.2 Message-ID: <200509300040.j8U0eq3X029409@cvs-int.fedora.redhat.com> Author: shishz Update of /cvs/extras/rpms/mmv In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29362 Modified Files: import.log Log Message: auto-import mmv-1.01b-2 on branch devel from mmv-1.01b-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/mmv/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 30 Sep 2005 00:39:46 -0000 1.1 +++ import.log 30 Sep 2005 00:40:20 -0000 1.2 @@ -0,0 +1 @@ +mmv-1_01b-2:HEAD:mmv-1.01b-2.src.rpm:1128040815 From fedora-extras-commits at redhat.com Fri Sep 30 00:40:22 2005 From: fedora-extras-commits at redhat.com (Zing Zing Shishak (shishz)) Date: Thu, 29 Sep 2005 20:40:22 -0400 Subject: rpms/mmv/devel changelog, NONE, 1.1 copyright, NONE, 1.1 mmv-1.01b-debian.patch, NONE, 1.1 mmv-1.01b-makefile.patch, NONE, 1.1 mmv.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200509300040.j8U0eMIK029398@cvs-int.fedora.redhat.com> Author: shishz Update of /cvs/extras/rpms/mmv/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29362/devel Modified Files: .cvsignore sources Added Files: changelog copyright mmv-1.01b-debian.patch mmv-1.01b-makefile.patch mmv.spec Log Message: auto-import mmv-1.01b-2 on branch devel from mmv-1.01b-2.src.rpm --- NEW FILE changelog --- mmv (1.01b-12.2) unstable; urgency=low * NMU * Fix segfault at startup on amd64 (and possibly other architectures) due to implicit declaration of functions from stdlib.h. (Closes: #322541) -- Ari Pollak Sat, 13 Aug 2005 01:01:13 -0400 mmv (1.01b-12.1) unstable; urgency=low * Non-Maintainer Upload (BSP 2005-08-06). * Fixed FTBFS with gcc 3.4 / 4.0 by applying patch from Andreas Jochens (Closes: #260574). -- Uwe Hermann Sat, 6 Aug 2005 22:07:06 +0200 mmv (1.01b-12) unstable; urgency=low * LFS support! (not sure if this breaks something :) (Closes: Bug #106822) * support -- as option terminator (Closes: Bug #52417) -- Bernd Eckenfels Tue, 20 Nov 2001 19:03:24 +0100 mmv (1.01b-11) unstable; urgency=medium * added Build-Depends (Closes: Bug #105025) * bumped Standards Version from 3.0.1 to 3.6.5 * make strig/-g depending on environemnt variable * added a comment about quoting 'to' patter (Closes: Bug #106076) -- Bernd Eckenfels Sat, 10 Nov 2001 18:28:56 +0100 mmv (1.01b-10.1) unstable; urgency=LOW * reupload cause it was rejected -- Bernd Eckenfels Thu, 3 Aug 2000 02:38:20 +0200 mmv (1.01b-10) unstable; urgency=LOW * debian/rules clean will now kill *~ files -- Bernd Eckenfels Sun, 23 Jul 2000 04:28:46 +0200 mmv (1.01b-9) unstable; urgency=LOW * closes: #67605 (no special handling for char > 127 anymore) * clsoes: #60128 (i think it was fixed by hartmut already) * man page and doc now in /usr/share, new standards version -- Bernd Eckenfels Sun, 23 Jul 2000 04:08:19 +0200 mmv (1.01b-8.1) unstable; urgency=LOW * NMU * fixed the invalid initializer for glibc-2.1 * closes: #31929 * changed in debian/rules in the clean target: + /bin/rm -f into -rm -f + make into -make + added *~ -- Hartmut Koptein Fri, 9 Jul 1999 10:24:17 +0200 mmv (1.01b-8) unstable; urgency=LOW * should compile now with different headers (Bug#26955). -- Bernd Eckenfels Sun, 1 Nov 1998 05:36:36 +0100 mmv (1.01b-7) frozen unstable; urgency=LOW * Remove debian/files with make clean (Bug#21526). -- Michael Meskes Wed, 22 Apr 1998 16:19:30 +0200 mmv (1.01b-6) frozen unstable; urgency=LOW * Make lintian happy. -- Michael Meskes Fri, 17 Apr 1998 14:36:19 +0200 mmv (1.01b-5) unstable; urgency=LOW * Added new copyright notice and moved package back into main. My thanks go to Joost for getting into touch with the upstream author. -- Michael Meskes Thu, 5 Mar 1998 10:42:42 +0100 mmv (1.01b-4) unstable; urgency=LOW * Updated standard * Added man page links. -- Michael Meskes Fri, 27 Feb 1998 15:33:54 +0100 mmv (1.01b-3) unstable; urgency=LOW * Moved package to non-free. Sorry, I cannot reach the upstream author to clarify the problems with his copyright. (#14908). * Do not comress copyright file. (#14460) -- Michael Meskes Fri, 19 Dec 1997 10:47:37 +0100 mmv (1.01b-2) unstable; urgency=LOW * Put copyright file into /usr/doc/mmv/copyright (#10623) * Removed -m486 option in Makefile (#10780). * Corrected man page permission (#4913). * Compiled against libc6. -- Michael Meskes Tue, 5 Aug 1997 13:11:36 +0200 mmv (1.01b-1) unstable; urgency=LOW * Initial release -- Michael Meskes Tue, 15 Oct 1996 13:02:46 +0200 --- NEW FILE copyright --- This is the Debian GNU/Linux prepackaged version of mmv. This package was put together by Michael Meskes , from sources obtained from USENET. It is now maintained by Bernd Eckenfels with some enhancements (NLS Char Support, glibc compiles) from Bernd and kind contributions from Hartmut Koptein . Copyright (c) 1989 Vladimir Lanin Mmv is freeware. That means that the entire package of software and documentation is copyrighted, and may not be distributed with any modifications or for any charge (without the author's explicit written permission). Other than that, it may be used and distributed freely. Vladimir Lanin 330 Wadsworth Ave, Apt 6F New York, NY 10040 lanin at csd2.nyu.edu ...!cmcl2!csd2!lanin However, Vladimir told me: Michael, This message is to serve as an announcement that I am changing the copyright of mmv to GPL. If this message is in any way insufficient to do so, please tell me what I have to do. Please keep in mind that I do not have in hand either the full GPL text or the source code of the last mmv release (oops). If there is any other way that I can help out, please tell me. Thanks, Vladimir Lanin vlad at brm.com Thanks to Joost for getting into touch with him. mmv-1.01b-debian.patch: --- NEW FILE mmv-1.01b-debian.patch --- --- mmv-1.01b.orig/mmv.c 1993-10-25 06:29:39.000000000 -0400 +++ mmv-1.01b/mmv.c 2005-08-23 20:25:08.000000000 -0400 @@ -62,7 +62,8 @@ %s [-m|x%s|c|o|a|z] [-h] [-d|p] [-g|t] [-v|n] [from to]\n\ \n\ Use #N in the ``to'' pattern to get the string matched\n\ -by the N'th ``from'' pattern wildcard.\n"; +by the N'th ``from'' pattern wildcard.\n\ +Use -- as the end of options.\n"; #define OTHEROPT (_osmajor < 3 ? "" : "|r") @@ -75,7 +76,9 @@ string matched by the N'th ``from'' pattern wildcard.\n\ \n\ A ``from'' pattern containing wildcards should be quoted when given\n\ -on the command line.\n"; +on the command line. Also you may need to quote ``to'' pattern.\n\ +\n\ +Use -- as the end of options.\n"; #ifdef IS_SYSV #define OTHEROPT "" @@ -85,6 +88,7 @@ #endif +#include #include #include @@ -120,14 +124,11 @@ #else /* for various flavors of UN*X */ +#include #include #include #include -extern char *getenv(); -extern long lseek(); -extern char *malloc(); - #ifdef HAS_DIRENT #include typedef struct dirent DIRENTRY; @@ -390,7 +391,7 @@ static int snap(/* REP *first, REP *p */); static void showdone(/* REP *fin */); static void breakout(/* */); -static int breakrep(/* */); +static void breakrep(int); static void breakstat(/* */); static void quit(/* */); static int copymove(/* REP *p */); @@ -436,7 +437,7 @@ static SLICER slicer[2] = {{NULL, NULL, 0}, {NULL, NULL, 0}}; static int badreps = 0, paterr = 0, direrr, failed = 0, gotsig = 0, repbad; -static FILE *outfile = stdout; +static FILE *outfile; static char IDF[] = "$$mmvdid."; static char TEMP[] = "$$mmvtmp."; @@ -497,6 +498,8 @@ { char *frompat, *topat; + outfile = stdout; + init(); procargs(argc, argv, &frompat, &topat); domatch(frompat, topat); @@ -575,6 +578,11 @@ for (argc--, argv++; argc > 0 && **argv == '-'; argc--, argv++) for (p = *argv + 1; *p != '\0'; p++) { c = mylower(*p); + if (c == '-') { + argc--; + argv++; + goto endargs; + } if (c == 'v' && !noex) verbose = 1; else if (c == 'n' && !verbose) @@ -618,6 +626,7 @@ } } +endargs: if (op == DFLT) if (strcmp(cmdname, MOVENAME) == 0) op = XMOVE; @@ -999,20 +1008,16 @@ printf(TRAILESC, from, to, ESC); return(-1); } +#ifdef IS_MSDOS default: if ( -#ifdef IS_MSDOS c <= ' ' || c >= 127 || strchr(":/\\*?[]=+;,\"|<>", c) != NULL -#else - c & 0x80 -#endif ) { printf("%s -> %s : illegal character '%c' (0x%02X).\n", from, to, c, c); return(-1); } -#ifdef IS_MSDOS if (isupper(c)) *p = c + ('a' - 'A'); #endif @@ -2578,10 +2583,10 @@ } -static int breakrep() +static void breakrep(int signum) { gotsig = 1; - return(1); + return; } @@ -2624,7 +2629,7 @@ static int copy(ff, len) FILEINFO *ff; - long len; + off_t len; { char buf[BUFSIZE], c; int f, t, k, mode, perm; @@ -2672,7 +2677,7 @@ return(-1); } if (op & APPEND) - lseek(t, 0L, 2); + lseek(t, (off_t)0, SEEK_END); #ifdef IS_MSDOS if (op & ZAPPEND && filelength(t) != 0) { if (lseek(t, -1L, 1) == -1L || read(t, &c, 1) != 1) { @@ -2684,10 +2689,10 @@ lseek(t, -1L, 1); } #endif - if ((op & APPEND) && len != -1L) { + if ((op & APPEND) && len != (off_t)-1) { while ( len != 0 && - (k = read(f, buf, len > BUFSIZE ? BUFSIZE : (unsigned)len)) > 0 && + (k = read(f, buf, (len > BUFSIZE) ? BUFSIZE : (size_t)len)) > 0 && write(t, buf, k) == k ) len -= k; --- mmv-1.01b.orig/mmv.1 1990-09-11 15:59:24.000000000 -0400 +++ mmv-1.01b/mmv.1 2005-08-23 20:29:59.000000000 -0400 @@ -2,7 +2,7 @@ .\" To print the MS-DOS version, use option -rO2. .\" Under System V, take out the '.\" ' from the next line. .\" .nr O 1 -.TH MMV 1 "November 20, 1989 (v1.0)" +.TH MMV 1 "November 20, 2001 (v1.0lfs)" .ie !'\nO'2' \{\ .SH NAME mmv \- move/copy/append/link multiple files by wildcard patterns @@ -28,6 +28,7 @@ [\fB-d\fP|\fBp\fP] [\fB-g\fP|\fBt\fP] [\fB-v\fP|\fBn\fP] +[\fB--\fP] [\fBfrom to\fP] .if '\nO'2' \{\ .br @@ -56,7 +57,8 @@ and gives the user the choice of either proceeding by avoiding the offending parts or aborting. - +.I mmv does support large files (LFS) but it does *NOT* support +sparse files (i.e. it explodes them). .ce The Task Options .PP @@ -332,8 +334,9 @@ .IR mmv , it is usually necessary to enclose the command-line .I from -pattern -in quotes. +and +.I to +patterns in quotes. \} .ce mmv-1.01b-makefile.patch: --- NEW FILE mmv-1.01b-makefile.patch --- --- mmv-1.01b.orig/Makefile 1994-11-04 19:24:55.000000000 -0500 +++ mmv-1.01b/Makefile 2005-08-23 21:52:47.000000000 -0400 @@ -1,16 +1,16 @@ # Possible defines in CONF: # IS_MSDOS IS_SYSV IS_V7 IS_BSD HAS_DIRENT HAS_RENAME MV_DIR -CC =gcc -traditional +CC =gcc LD =$(CC) CONF =-DIS_SYSV -DHAS_DIRENT -DHAS_RENAME -CFLAGS =-O2 -m486 $(CONF) -LDFLAGS =-s -N +CFLAGS =-O2 $(CONF) +LDFLAGS =$(LDCONF) #IBIN =$(LOCAL)$(ARCH)/bin #IMAN =$(LOCAL)$(ANY)/man IBIN=$(DESTDIR)/usr/bin/ -IMAN=$(DESTDIR)/usr/man/ +IMAN=$(DESTDIR)/usr/share/man/ mmv: mmv.o @@ -20,5 +20,5 @@ install: $(DEST)$(IBIN)/mmv install: $(DEST)$(IMAN)/man1/mmv.1 -$(DEST)$(IBIN)/mmv: mmv; cp $? $@ -$(DEST)$(IMAN)/man1/mmv.1: mmv.1; cp $? $@ +$(DEST)$(IBIN)/mmv: mmv; install -D -p $? $@ +$(DEST)$(IMAN)/man1/mmv.1: mmv.1; install -D -p $? $@ --- NEW FILE mmv.spec --- Name: mmv Version: 1.01b Release: 2 Summary: Move/copy/append/link multiple files Group: Applications/File License: GPL URL: http://packages.qa.debian.org/m/mmv.html Source0: http://ftp.debian.org/debian/pool/main/m/mmv/mmv_1.01b.orig.tar.gz Source1: copyright Source2: changelog Patch0: mmv-1.01b-debian.patch Patch1: mmv-1.01b-makefile.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description This is mmv, a program to move/copy/append/link multiple files according to a set of wildcard patterns. This multiple action is performed safely, i.e. without any unexpected deletion of files due to collisions of target names with existing filenames or with other target names. Furthermore, before doing anything, mmv attempts to detect any errors that would result from the entire set of actions specified and gives the user the choice of either aborting before beginning, or proceeding by avoiding the offending parts. %prep %setup -q -n mmv-1.01b.orig %patch0 -p1 %patch1 -p1 cp -p %{SOURCE1} . cp -p %{SOURCE2} . %build make CONF="$RPM_OPT_FLAGS -fpie" LDCONF="-pie" %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT ln -s mmv $RPM_BUILD_ROOT/%{_bindir}/mcp ln -s mmv $RPM_BUILD_ROOT/%{_bindir}/mad ln -s mmv $RPM_BUILD_ROOT/%{_bindir}/mln %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc ANNOUNCE ARTICLE READ.ME copyright changelog %{_bindir}/mmv %{_bindir}/mcp %{_bindir}/mad %{_bindir}/mln %{_mandir}/man1/* %changelog * Wed Sep 28 2005 Zing - 1.01b-2 - QA from Aurelien Bompard - don't change source name - symlink mcp/mad/mln * Tue Aug 23 2005 Zing - 1.01b-1 - initial RPM release - pull from debian mmv_1.01b-12.2 - build executable as a PIE Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/mmv/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 30 Sep 2005 00:39:46 -0000 1.1 +++ .cvsignore 30 Sep 2005 00:40:20 -0000 1.2 @@ -0,0 +1 @@ +mmv_1.01b.orig.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/mmv/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 30 Sep 2005 00:39:46 -0000 1.1 +++ sources 30 Sep 2005 00:40:20 -0000 1.2 @@ -0,0 +1 @@ +1b2135ab2f17bdfa9e08debbb3c46ad8 mmv_1.01b.orig.tar.gz From fedora-extras-commits at redhat.com Fri Sep 30 00:46:48 2005 From: fedora-extras-commits at redhat.com (Zing Zing Shishak (shishz)) Date: Thu, 29 Sep 2005 20:46:48 -0400 Subject: owners owners.list,1.273,1.274 Message-ID: <200509300046.j8U0kmPG029475@cvs-int.fedora.redhat.com> Author: shishz Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29456 Modified Files: owners.list Log Message: add mmv Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.273 retrieving revision 1.274 diff -u -r1.273 -r1.274 --- owners.list 29 Sep 2005 19:45:05 -0000 1.273 +++ owners.list 30 Sep 2005 00:46:46 -0000 1.274 @@ -514,6 +514,7 @@ Fedora Extras|milter-greylist|Milter for greylisting, the next step in the spam control war|enrico.scholz at informatik.tu-chemnitz.de|extras-qa at fedoraproject.org| Fedora Extras|mknbi|Utility for creating network bootable images|anvil at livna.org|extras-qa at fedoraproject.org| Fedora Extras|mlmmj|Mailserver-independent ezmlm-like mailing list manager|mfleming+rpm at enlartenment.com|extras-qa at fedoraproject.org| +Fedora Extras|mmv|Move/copy/append/link multiple files|shishz at hotpop.com|extras-qa at fedoraproject.org| Fedora Extras|mock|Builds packages inside chroots|skvidal at phy.duke.edu|extras-qa at fedoraproject.org| Fedora Extras|mod_annodex|Apache module for server-side support of annodex media|thomas at apestaart.org|extras-qa at fedoraproject.org| Fedora Extras|mod_auth_pam|PAM authentication module for Apache|ivazquez at ivazquez.net|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Fri Sep 30 06:17:46 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Fri, 30 Sep 2005 02:17:46 -0400 Subject: owners owners.list,1.274,1.275 Message-ID: <200509300617.j8U6HkYg006104@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6085 Modified Files: owners.list Log Message: Assign Panu's packages to extras-orphan, remove vice and wine (never shipped). Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.274 retrieving revision 1.275 diff -u -r1.274 -r1.275 --- owners.list 30 Sep 2005 00:46:46 -0000 1.274 +++ owners.list 30 Sep 2005 06:17:43 -0000 1.275 @@ -11,7 +11,7 @@ Fedora Extras|aalib|An ASCII art library|anvil at livna.org|extras-qa at fedoraproject.org| Fedora Extras|abcde|A Better CD Encoder|ville.skytta at iki.fi|extras-qa at fedoraproject.org| Fedora Extras|abcm2ps|A program to typeset ABC tunes into Postscript|gemi at bluewin.ch|extras-qa at fedoraproject.org| -Fedora Extras|abe|A scrolling, platform-jumping, ancient pyramid exploring game|pmatilai at laiskiainen.org|extras-qa at fedoraproject.org| +Fedora Extras|abe|A scrolling, platform-jumping, ancient pyramid exploring game|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| Fedora Extras|abicheck|ABI checking tool|bugs.michael at gmx.net|extras-qa at fedoraproject.org| Fedora Extras|abiword|The AbiWord word processor|uwog at uwog.net|extras-qa at fedoraproject.org| Fedora Extras|adns|Advanced, easy to use, asynchronous-capable DNS client library|colin at fedoraproject.org|extras-qa at fedoraproject.org| @@ -31,7 +31,7 @@ Fedora Extras|apel|A Portable Emacs Library|tagoh at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|apg|Automated Password Generator for random password generation|compton at pcompton.com|extras-qa at fedoraproject.org| Fedora Extras|apmud|Power Management daemon for Apple laptops|dwmw2 at redhat.com|extras-qa at fedoraproject.org| -Fedora Extras|apt|Debian's Advanced Packaging Tool with RPM support|pmatilai at laiskiainen.org|extras-qa at fedoraproject.org| +Fedora Extras|apt|Debian's Advanced Packaging Tool with RPM support|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|pmatilai at laiskiainen.org Fedora Extras|aqhbci-qt-tools|Setup wizard and debugger for the HBCI backend for the Aqbanking library|notting at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|arc|Arc archiver|Nicolas.Mailhot at laPoste.net|extras-qa at fedoraproject.org| Fedora Extras|asciidoc|AsciiDoc text document fomatter|chrisw at osdl.org|extras-qa at fedoraproject.org| @@ -256,7 +256,7 @@ Fedora Extras|gmime|GMime library -- creation and parsing of MIME-messages|fedora at leemhuis.info|extras-qa at fedoraproject.org| Fedora Extras|gmpc|GNOME frontend for the MPD|gauret at free.fr|extras-qa at fedoraproject.org| Fedora Extras|gnet2|A simple network library built upon glib|ivazquez at ivazquez.net|extras-qa at fedoraproject.org| -Fedora Extras|gnofract4d|Gnofract 4D is a Gnome-based program to draw fractals|pmatilai at laiskiainen.org|extras-qa at fedoraproject.org| +Fedora Extras|gnofract4d|Gnofract 4D is a Gnome-based program to draw fractals|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| Fedora Extras|gnomad2|Manager for digital audio players|triad at df.lth.se|extras-qa at fedoraproject.org| Fedora Extras|gnome-applet-netmon|GNOME Network Load Applet|ghenry at suretecsystems.com|extras-qa at fedoraproject.org| Fedora Extras|gnome-applet-netspeed|GNOME applet that shows traffic on a network device|a.kurtz at hardsun.net|extras-qa at fedoraproject.org| @@ -487,7 +487,7 @@ Fedora Extras|loudmouth|Jabber programming library written in C|bdpepple at ameritech.net|extras-qa at fedoraproject.org| Fedora Extras|lout|A document formatting system|tcallawa at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|lrmi|Library for calling real mode BIOS routines|ville.skytta at iki.fi|extras-qa at fedoraproject.org| -Fedora Extras|lua|A powerful light-weight programming language|pmatilai at laiskiainen.org|extras-qa at fedoraproject.org| +Fedora Extras|lua|A powerful light-weight programming language|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| Fedora Extras|lvcool|Utility to cool Athlon processor during idle on Via KT133 or KX133 chipsets|wtogami at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|lyx|WYSIWYM (What You See Is What You Mean) document processor|rdieter at math.unl.edu|extras-qa at fedoraproject.org| Fedora Extras|lzo|A data compression library with very fast (de)compression|anvil at livna.org|extras-qa at fedoraproject.org| @@ -935,7 +935,7 @@ Fedora Extras|scim-tomoe|Tomoe module for SCIM for Japanese handwritten input|ryo-dairiki at users.sourceforge.net|extras-qa at fedoraproject.org| Fedora Extras|scmxx|Exchange data with Siemens mobile phones|andreas at bawue.net|extras-qa at fedoraproject.org| Fedora Extras|scons|An Open Source software construction tool|gemi at bluewin.ch|extras-qa at fedoraproject.org| -Fedora Extras|scorched3d|A game based loosely on the classic DOS game Scorched Earth|pmatilai at laiskiainen.org|extras-qa at fedoraproject.org| +Fedora Extras|scorched3d|A game based loosely on the classic DOS game Scorched Earth|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| Fedora Extras|screem|A website development enviroment|compton at pcompton.com|extras-qa at fedoraproject.org| Fedora Extras|scribus|DeskTop Publishing app in QT|compton at pcompton.com|extras-qa at fedoraproject.org| Fedora Extras|scribus-templates|This package includes additional templates for Scribus|compton at pcompton.com|extras-qa at fedoraproject.org| @@ -983,7 +983,7 @@ Fedora Extras|sylpheed-claws-plugins|Additional plugins for sylpheed-claws|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org| Fedora Extras|sylpheed|GTK+ based, lightweight, and fast email client|bugs.michael at gmx.net|extras-qa at fedoraproject.org| Fedora Extras|syck|YAML for C, Python, and PHP|oliver at linux-kernel.at|extras-qa at fedoraproject.org| -Fedora Extras|synaptic|Graphical frontend for APT package manager|pmatilai at laiskiainen.org|extras-qa at fedoraproject.org| +Fedora Extras|synaptic|Graphical frontend for APT package manager|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|pmatilai at laiskiainen.org Fedora Extras|synce|For bugs related to the synce component|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org| Fedora Extras|synergy|Mouse and keyboard sharing utility|matthias at rpmforge.net|extras-qa at fedoraproject.org| Fedora Extras|syslog-ng|Syslog replacement daemon|jpo at di.uminho.pt|extras-qa at fedoraproject.org| @@ -1047,18 +1047,16 @@ Fedora Extras|utrac|Universal Text Recognizer and Converter|aportal at univ-montp2.fr|extras-qa at fedoraproject.org| Fedora Extras|uudeview|Applications for uuencoding, uudecoding, ..|adrian at lisas.de|extras-qa at fedoraproject.org| Fedora Extras|verbiste|French conjugation system|icon at linux.duke.edu|extras-qa at fedoraproject.org| -Fedora Extras|vice|Versatile Commodore Emulator|pmatilai at laiskiainen.org|extras-qa at fedoraproject.org| Fedora Extras|viruskiller|Frantic shooting game where viruses invade your computer|matthias at rpmforge.net|extras-qa at fedoraproject.org| Fedora Extras|vnc-ltsp-config|Easy Enabler of VNC remote LTSP desktops|rdieter at math.unl.edu|extras-qa at fedoraproject.org| Fedora Extras|vnstat|Console-based network traffic monitor|adrian at lisas.de|extras-qa at fedoraproject.org| Fedora Extras|vpnc|IPSec VPN client compatible with Cisco equipment|tmraz at redhat.com|extras-qa at fedoraproject.org|wtogami at redhat.com Fedora Extras|w3c-markup-validator|W3C Markup Validator|ville.skytta at iki.fi|extras-qa at fedoraproject.org| Fedora Extras|w3m-el|W3m interface for Emacs|tagoh at redhat.com|extras-qa at fedoraproject.org| -Fedora Extras|wbxml2|Library and tools to parse, encode and handle WBXML documents|pmatilai at laiskiainen.org|extras-qa at fedoraproject.org| +Fedora Extras|wbxml2|Library and tools to parse, encode and handle WBXML documents|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| Fedora Extras|wesnoth|Battle for Wesnoth is a fantasy turn-based strategy game|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|bugs.michael at gmx.net Fedora Extras|whowatch|Displays informations about the users currently logged in|nos at utelsystems.com|extras-qa at fedoraproject.org| Fedora Extras|WindowMaker|A fast, feature rich Window manager|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org| -Fedora Extras|wine|A Windows 16/32 bit emulator|pmatilai at laiskiainen.org|extras-qa at fedoraproject.org| Fedora Extras|wlassistant|Wireless network management tool|tcallawa at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|wmCalClock|A Calendar clock with antialiased text|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org| Fedora Extras|wmapmload|Wmapmload monitors your apm status in an lcd display fashion|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org| @@ -1066,8 +1064,8 @@ Fedora Extras|wv2|A library which allows access to Microsoft?? Word files|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org| Fedora Extras|wv|MSWord 6/7/8/9 binary file format to HTML converter|gauret at free.fr|extras-qa at fedoraproject.org| Fedora Extras|wxGTK|GTK+ port of the wxWidgets GUI library|anvil at livna.org|extras-qa at fedoraproject.org| -Fedora Extras|wxPythonGTK2|wxPython is a GUI toolkit for the Python programming language|pmatilai at laiskiainen.org|extras-qa at fedoraproject.org| -Fedora Extras|wxPython|wxPython is a GUI toolkit for the Python programming language|pmatilai at laiskiainen.org|extras-qa at fedoraproject.org| +Fedora Extras|wxPythonGTK2|wxPython is a GUI toolkit for the Python programming language|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| +Fedora Extras|wxPython|wxPython is a GUI toolkit for the Python programming language|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| Fedora Extras|x3270|An X Window System based IBM 3278/3279 terminal emulator|karsten at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|xaliclock|A clock for the X Window System|kaboom at oobleck.net|extras-qa at fedoraproject.org| Fedora Extras|xbase|XBase compatible database library and tools|tcallawa at redhat.com|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Fri Sep 30 07:09:13 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Fri, 30 Sep 2005 03:09:13 -0400 Subject: rpms/koffice/devel koffice-qt3.3.5.patch,1.5,1.6 Message-ID: <200509300709.j8U79iRu007554@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/koffice/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7506 Modified Files: koffice-qt3.3.5.patch Log Message: - more qt... :( koffice-qt3.3.5.patch: Index: koffice-qt3.3.5.patch =================================================================== RCS file: /cvs/extras/rpms/koffice/devel/koffice-qt3.3.5.patch,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- koffice-qt3.3.5.patch 29 Sep 2005 14:00:45 -0000 1.5 +++ koffice-qt3.3.5.patch 30 Sep 2005 07:09:11 -0000 1.6 @@ -63,3 +63,13 @@ - kiscmbidlist.h - +--- krita/ui/wdglayerbox.ui.orig 2005-09-30 09:06:31.000000000 +0200 ++++ krita/ui/wdglayerbox.ui 2005-09-30 09:07:13.000000000 +0200 +@@ -250,7 +250,6 @@ + + + +- kiscmbcomposite.h + knuminput.h + knuminput.h + klistbox.h From fedora-extras-commits at redhat.com Fri Sep 30 08:07:29 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Fri, 30 Sep 2005 04:07:29 -0400 Subject: rpms/koffice/devel koffice-qt3.3.5.patch,1.6,1.7 Message-ID: <200509300808.j8U88DQZ009345@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/koffice/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9320 Modified Files: koffice-qt3.3.5.patch Log Message: - and even more qt koffice-qt3.3.5.patch: Index: koffice-qt3.3.5.patch =================================================================== RCS file: /cvs/extras/rpms/koffice/devel/koffice-qt3.3.5.patch,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- koffice-qt3.3.5.patch 30 Sep 2005 07:09:11 -0000 1.6 +++ koffice-qt3.3.5.patch 30 Sep 2005 08:07:27 -0000 1.7 @@ -73,3 +73,13 @@ knuminput.h knuminput.h klistbox.h +--- krita/plugins/screenshot/ksnapshotwidget.ui.orig 2005-09-30 10:05:38.000000000 +0200 ++++ krita/plugins/screenshot/ksnapshotwidget.ui 2005-09-30 10:05:55.000000000 +0200 +@@ -332,7 +332,4 @@ + SmallIconSet + + +- +- ksnapshotthumb.h +- + From fedora-extras-commits at redhat.com Fri Sep 30 08:40:54 2005 From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh)) Date: Fri, 30 Sep 2005 04:40:54 -0400 Subject: rpms/uim/devel .cvsignore, 1.9, 1.10 sources, 1.8, 1.9 uim.spec, 1.19, 1.20 Message-ID: <200509300840.j8U8es0Z009753@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/extras/rpms/uim/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9729 Modified Files: .cvsignore sources uim.spec Log Message: update Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/uim/devel/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 17 Aug 2005 09:08:58 -0000 1.9 +++ .cvsignore 30 Sep 2005 08:40:52 -0000 1.10 @@ -8,3 +8,4 @@ uim-0.4.7.tar.gz uim-0.4.7.1.tar.gz uim-0.4.8.tar.gz +uim-0.4.9.1.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/uim/devel/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 17 Aug 2005 09:08:58 -0000 1.8 +++ sources 30 Sep 2005 08:40:52 -0000 1.9 @@ -1 +1 @@ -f3e48b6ded979d029db9c342a0aa809a uim-0.4.8.tar.gz +0e2625cc926917d7864c4d0c341c535a uim-0.4.9.1.tar.gz Index: uim.spec =================================================================== RCS file: /cvs/extras/rpms/uim/devel/uim.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- uim.spec 17 Aug 2005 12:08:43 -0000 1.19 +++ uim.spec 30 Sep 2005 08:40:52 -0000 1.20 @@ -4,7 +4,7 @@ Summary: A multilingual input method library Name: uim -Version: 0.4.8 +Version: 0.4.9.1 Release: 1%{?dist} License: GPL/BSD Group: System Environment/Libraries @@ -290,17 +290,20 @@ %{_datadir}/uim/skk*.scm %changelog -* Wed Aug 17 2005 Akira TAGOH - 0.4.8-1.fc5 +* Fri Sep 30 2005 Akira TAGOH - 0.4.9.1-1 - New upstream release. -* Thu Aug 4 2005 Akira TAGOH - 0.4.7.1-2.fc5 +* Wed Aug 17 2005 Akira TAGOH - 0.4.8-1 +- New upstream release. + +* Thu Aug 4 2005 Akira TAGOH - 0.4.7.1-2 - removed Requires: Canna-devel from uim-canna. this is no longer needed since 0.4.6-4. (Warren Togami, #165088) -* Wed Aug 3 2005 Akira TAGOH - 0.4.7.1-1.fc5 +* Wed Aug 3 2005 Akira TAGOH - 0.4.7.1-1 - New upstream release. -* Tue Jul 12 2005 Akira TAGOH - 0.4.7-1.fc5 +* Tue Jul 12 2005 Akira TAGOH - 0.4.7-1 - New upstream release. - removed the patches. fixed in upstream. - uim-0.4.6-multilib.patch From fedora-extras-commits at redhat.com Fri Sep 30 08:42:12 2005 From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh)) Date: Fri, 30 Sep 2005 04:42:12 -0400 Subject: common tobuild,1.2223,1.2224 Message-ID: <200509300842.j8U8gCss009817@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9798 Modified Files: tobuild Log Message: request build of rpms/uim/devel uim-0_4_9_1-1_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2223 retrieving revision 1.2224 diff -u -r1.2223 -r1.2224 --- tobuild 22 Sep 2005 05:16:53 -0000 1.2223 +++ tobuild 30 Sep 2005 08:42:10 -0000 1.2224 @@ -38,3 +38,4 @@ gemi rpms/clisp/FC-3 clisp-2_34-5_fc3 fc3 katzj rpms/perl-Class-Trigger/devel perl-Class-Trigger-0_09-3_fc5 devel orion rpms/python-matplotlib/FC-4 python-matplotlib-0_84-1_fc4 fc4 +tagoh rpms/uim/devel uim-0_4_9_1-1_fc5 devel From fedora-extras-commits at redhat.com Fri Sep 30 08:44:57 2005 From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh)) Date: Fri, 30 Sep 2005 04:44:57 -0400 Subject: common tobuild,1.2224,1.2225 Message-ID: <200509300844.j8U8ivTs009850@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9828 Modified Files: tobuild Log Message: doh Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2224 retrieving revision 1.2225 diff -u -r1.2224 -r1.2225 --- tobuild 30 Sep 2005 08:42:10 -0000 1.2224 +++ tobuild 30 Sep 2005 08:44:55 -0000 1.2225 @@ -38,4 +38,3 @@ gemi rpms/clisp/FC-3 clisp-2_34-5_fc3 fc3 katzj rpms/perl-Class-Trigger/devel perl-Class-Trigger-0_09-3_fc5 devel orion rpms/python-matplotlib/FC-4 python-matplotlib-0_84-1_fc4 fc4 -tagoh rpms/uim/devel uim-0_4_9_1-1_fc5 devel From fedora-extras-commits at redhat.com Fri Sep 30 09:06:10 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Fri, 30 Sep 2005 05:06:10 -0400 Subject: rpms/koffice/devel koffice-qt3.3.5.patch,1.7,1.8 Message-ID: <200509300906.j8U96e7H011294@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/koffice/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11270 Modified Files: koffice-qt3.3.5.patch Log Message: - even more qt (how invented this filename ;) ?) koffice-qt3.3.5.patch: Index: koffice-qt3.3.5.patch =================================================================== RCS file: /cvs/extras/rpms/koffice/devel/koffice-qt3.3.5.patch,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- koffice-qt3.3.5.patch 30 Sep 2005 08:07:27 -0000 1.7 +++ koffice-qt3.3.5.patch 30 Sep 2005 09:06:08 -0000 1.8 @@ -83,3 +83,13 @@ - ksnapshotthumb.h - +--- krita/plugins/convolutionfilters/kis_custom_convolution_filter_configuration_base_widget.ui.orig 2005-09-30 11:04:10.000000000 +0200 ++++ krita/plugins/convolutionfilters/kis_custom_convolution_filter_configuration_base_widget.ui 2005-09-30 11:04:51.000000000 +0200 +@@ -186,7 +186,4 @@ + + + +- +- kismatrixwidget.h +- + From fedora-extras-commits at redhat.com Fri Sep 30 09:48:25 2005 From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh)) Date: Fri, 30 Sep 2005 05:48:25 -0400 Subject: rpms/uim/FC-4 .cvsignore, 1.9, 1.10 sources, 1.8, 1.9 uim.spec, 1.15, 1.16 Message-ID: <200509300948.j8U9mPMt011432@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/extras/rpms/uim/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11409 Modified Files: .cvsignore sources uim.spec Log Message: update Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/uim/FC-4/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 17 Aug 2005 12:13:01 -0000 1.9 +++ .cvsignore 30 Sep 2005 09:48:23 -0000 1.10 @@ -8,3 +8,4 @@ uim-0.4.7.tar.gz uim-0.4.7.1.tar.gz uim-0.4.8.tar.gz +uim-0.4.9.1.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/uim/FC-4/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 17 Aug 2005 12:13:01 -0000 1.8 +++ sources 30 Sep 2005 09:48:23 -0000 1.9 @@ -1 +1 @@ -f3e48b6ded979d029db9c342a0aa809a uim-0.4.8.tar.gz +0e2625cc926917d7864c4d0c341c535a uim-0.4.9.1.tar.gz Index: uim.spec =================================================================== RCS file: /cvs/extras/rpms/uim/FC-4/uim.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- uim.spec 17 Aug 2005 12:13:01 -0000 1.15 +++ uim.spec 30 Sep 2005 09:48:23 -0000 1.16 @@ -4,7 +4,7 @@ Summary: A multilingual input method library Name: uim -Version: 0.4.8 +Version: 0.4.9.1 Release: 1%{?dist} License: GPL/BSD Group: System Environment/Libraries @@ -290,17 +290,20 @@ %{_datadir}/uim/skk*.scm %changelog -* Wed Aug 17 2005 Akira TAGOH - 0.4.8-1.fc4 +* Fri Sep 30 2005 Akira TAGOH - 0.4.9.1-1 - New upstream release. -* Thu Aug 4 2005 Akira TAGOH - 0.4.7.1-2.fc4 +* Wed Aug 17 2005 Akira TAGOH - 0.4.8-1 +- New upstream release. + +* Thu Aug 4 2005 Akira TAGOH - 0.4.7.1-2 - removed Requires: Canna-devel from uim-canna. this is no longer needed since 0.4.6-4. (Warren Togami, #165088) -* Wed Aug 3 2005 Akira TAGOH - 0.4.7.1-1.fc4 +* Wed Aug 3 2005 Akira TAGOH - 0.4.7.1-1 - New upstream release. -* Tue Jul 12 2005 Akira TAGOH - 0.4.7-1.fc4 +* Tue Jul 12 2005 Akira TAGOH - 0.4.7-1 - New upstream release. - removed the patches. fixed in upstream. - uim-0.4.6-multilib.patch From fedora-extras-commits at redhat.com Fri Sep 30 10:11:31 2005 From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh)) Date: Fri, 30 Sep 2005 06:11:31 -0400 Subject: rpms/uim/FC-3 .cvsignore,1.8,1.9 sources,1.7,1.8 uim.spec,1.8,1.9 Message-ID: <200509301011.j8UABVUp012930@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/extras/rpms/uim/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12907 Modified Files: .cvsignore sources uim.spec Log Message: update Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/uim/FC-3/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 17 Aug 2005 12:20:51 -0000 1.8 +++ .cvsignore 30 Sep 2005 10:11:29 -0000 1.9 @@ -7,3 +7,4 @@ uim-0.4.7.tar.gz uim-0.4.7.1.tar.gz uim-0.4.8.tar.gz +uim-0.4.9.1.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/uim/FC-3/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 17 Aug 2005 12:20:51 -0000 1.7 +++ sources 30 Sep 2005 10:11:29 -0000 1.8 @@ -1 +1 @@ -f3e48b6ded979d029db9c342a0aa809a uim-0.4.8.tar.gz +0e2625cc926917d7864c4d0c341c535a uim-0.4.9.1.tar.gz Index: uim.spec =================================================================== RCS file: /cvs/extras/rpms/uim/FC-3/uim.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- uim.spec 17 Aug 2005 12:18:05 -0000 1.8 +++ uim.spec 30 Sep 2005 10:11:29 -0000 1.9 @@ -4,7 +4,7 @@ Summary: A multilingual input method library Name: uim -Version: 0.4.8 +Version: 0.4.9.1 Release: 1%{?dist} License: GPL/BSD Group: System Environment/Libraries @@ -290,17 +290,20 @@ %{_datadir}/uim/skk*.scm %changelog -* Wed Aug 17 2005 Akira TAGOH - 0.4.8-1.fc3 +* Fri Sep 30 2005 Akira TAGOH - 0.4.9.1-1 - New upstream release. -* Thu Aug 4 2005 Akira TAGOH - 0.4.7.1-2.fc3 +* Wed Aug 17 2005 Akira TAGOH - 0.4.8-1 +- New upstream release. + +* Thu Aug 4 2005 Akira TAGOH - 0.4.7.1-2 - removed Requires: Canna-devel from uim-canna. this is no longer needed since 0.4.6-4. (Warren Togami, #165088) -* Wed Aug 3 2005 Akira TAGOH - 0.4.7.1-1.fc3 +* Wed Aug 3 2005 Akira TAGOH - 0.4.7.1-1 - New upstream release. -* Tue Jul 12 2005 Akira TAGOH - 0.4.7-1.fc3 +* Tue Jul 12 2005 Akira TAGOH - 0.4.7-1 - New upstream release. - removed the patches. fixed in upstream. - uim-0.4.6-multilib.patch From fedora-extras-commits at redhat.com Fri Sep 30 10:54:42 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Fri, 30 Sep 2005 06:54:42 -0400 Subject: rpms/perl-Apache-LogRegex/FC-4 Makefile,1.2,1.3 Message-ID: <200509301054.j8UAsgJJ013087@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/perl-Apache-LogRegex/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13054/FC-4 Modified Files: Makefile Log Message: Fix broken CVS Makefiles. Index: Makefile =================================================================== RCS file: /cvs/extras/rpms/perl-Apache-LogRegex/FC-4/Makefile,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- Makefile 23 Sep 2005 08:56:12 -0000 1.2 +++ Makefile 30 Sep 2005 10:54:40 -0000 1.3 @@ -1,6 +1,6 @@ # Makefile for source rpm: perl-Apache-LogRegex # $Id$ -NAME := perl-Apache-LogRegex +NAME := perl-Apache-LogRegex SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common From fedora-extras-commits at redhat.com Fri Sep 30 10:54:42 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Fri, 30 Sep 2005 06:54:42 -0400 Subject: rpms/perl-Apache-LogRegex/devel Makefile,1.2,1.3 Message-ID: <200509301054.j8UAsgSX013093@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/perl-Apache-LogRegex/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13054/devel Modified Files: Makefile Log Message: Fix broken CVS Makefiles. Index: Makefile =================================================================== RCS file: /cvs/extras/rpms/perl-Apache-LogRegex/devel/Makefile,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- Makefile 29 Sep 2005 14:39:50 -0000 1.2 +++ Makefile 30 Sep 2005 10:54:40 -0000 1.3 @@ -1,6 +1,6 @@ # Makefile for source rpm: perl-Apache-LogRegex # $Id$ -NAME := perl-Apache-LogRegex +NAME := perl-Apache-LogRegex SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common From fedora-extras-commits at redhat.com Fri Sep 30 12:27:03 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Fri, 30 Sep 2005 08:27:03 -0400 Subject: rpms/koffice/devel koffice-qt3.3.5.patch,1.8,1.9 Message-ID: <200509301227.j8UCR3gM016175@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/koffice/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16153 Modified Files: koffice-qt3.3.5.patch Log Message: - more... koffice-qt3.3.5.patch: Index: koffice-qt3.3.5.patch =================================================================== RCS file: /cvs/extras/rpms/koffice/devel/koffice-qt3.3.5.patch,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- koffice-qt3.3.5.patch 30 Sep 2005 09:06:08 -0000 1.8 +++ koffice-qt3.3.5.patch 30 Sep 2005 12:27:00 -0000 1.9 @@ -93,3 +93,13 @@ - kismatrixwidget.h - +--- krita/plugins/colorspaceconversion/wdgconvertcolorspace.ui.orig 2005-09-30 14:25:16.000000000 +0200 ++++ krita/plugins/colorspaceconversion/wdgconvertcolorspace.ui 2005-09-30 14:25:47.000000000 +0200 +@@ -265,7 +265,4 @@ + radioPerceptual + + +- +- kiscmbidlist.h +- + From fedora-extras-commits at redhat.com Fri Sep 30 12:55:31 2005 From: fedora-extras-commits at redhat.com (Alain Portal (Dionysos)) Date: Fri, 30 Sep 2005 08:55:31 -0400 Subject: owners owners.list,1.275,1.276 Message-ID: <200509301255.j8UCtVBm016289@cvs-int.fedora.redhat.com> Author: Dionysos Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16270/owners Modified Files: owners.list Log Message: Add gpsim package. Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.275 retrieving revision 1.276 diff -u -r1.275 -r1.276 --- owners.list 30 Sep 2005 06:17:43 -0000 1.275 +++ owners.list 30 Sep 2005 12:55:29 -0000 1.276 @@ -286,6 +286,7 @@ Fedora Extras|gpgme03|GnuPG Made Easy interface library|dennis at dgilmore.net|extras-qa at fedoraproject.org| Fedora Extras|gpgme|GnuPG Made Easy|rdieter at math.unl.edu|extras-qa at fedoraproject.org| Fedora Extras|gpredict|Real-time satellite tracking and orbit prediction program|ivazquez at ivazquez.net|extras-qa at fedoraproject.org| +Fedora Extras|gpsim|A simulator for Microchip (TM) PIC (TM) microcontrollers|aportal at univ-montp2.fr|extras-qa at fedoraproject.org| Fedora Extras|gputils|Development utilities for Microchip (TM) PIC (TM) microcontrollers|aportal at univ-montp2.fr|extras-qa at fedoraproject.org| Fedora Extras|gquilt|A PyGTK wrapper for quilt|jwboyer at jdub.homelinux.org|extras-qa at fedoraproject.org| Fedora Extras|gqview|Image browser and viewer|bugs.michael at gmx.net|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Fri Sep 30 12:58:22 2005 From: fedora-extras-commits at redhat.com (Alain Portal (Dionysos)) Date: Fri, 30 Sep 2005 08:58:22 -0400 Subject: rpms/gpsim - New directory Message-ID: <200509301258.j8UCwMMF016370@cvs-int.fedora.redhat.com> Author: Dionysos Update of /cvs/extras/rpms/gpsim In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16346/gpsim Log Message: Directory /cvs/extras/rpms/gpsim added to the repository From fedora-extras-commits at redhat.com Fri Sep 30 12:58:23 2005 From: fedora-extras-commits at redhat.com (Alain Portal (Dionysos)) Date: Fri, 30 Sep 2005 08:58:23 -0400 Subject: rpms/gpsim/devel - New directory Message-ID: <200509301258.j8UCwNAE016375@cvs-int.fedora.redhat.com> Author: Dionysos Update of /cvs/extras/rpms/gpsim/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16346/gpsim/devel Log Message: Directory /cvs/extras/rpms/gpsim/devel added to the repository From fedora-extras-commits at redhat.com Fri Sep 30 12:58:35 2005 From: fedora-extras-commits at redhat.com (Alain Portal (Dionysos)) Date: Fri, 30 Sep 2005 08:58:35 -0400 Subject: rpms/gpsim Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200509301258.j8UCwZlK016426@cvs-int.fedora.redhat.com> Author: Dionysos Update of /cvs/extras/rpms/gpsim In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16391 Added Files: Makefile import.log Log Message: Setup of module gpsim --- NEW FILE Makefile --- # Top level Makefile for module gpsim all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Fri Sep 30 12:58:36 2005 From: fedora-extras-commits at redhat.com (Alain Portal (Dionysos)) Date: Fri, 30 Sep 2005 08:58:36 -0400 Subject: rpms/gpsim/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200509301258.j8UCwa57016431@cvs-int.fedora.redhat.com> Author: Dionysos Update of /cvs/extras/rpms/gpsim/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16391/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module gpsim --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Fri Sep 30 12:59:05 2005 From: fedora-extras-commits at redhat.com (Alain Portal (Dionysos)) Date: Fri, 30 Sep 2005 08:59:05 -0400 Subject: rpms/gpsim import.log,1.1,1.2 Message-ID: <200509301259.j8UCxZ9F016507@cvs-int.fedora.redhat.com> Author: Dionysos Update of /cvs/extras/rpms/gpsim In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16464 Modified Files: import.log Log Message: auto-import gpsim-0.21.4-5 on branch devel from gpsim-0.21.4-5.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/gpsim/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 30 Sep 2005 12:58:33 -0000 1.1 +++ import.log 30 Sep 2005 12:59:03 -0000 1.2 @@ -0,0 +1 @@ +gpsim-0_21_4-5:HEAD:gpsim-0.21.4-5.src.rpm:1128085108 From fedora-extras-commits at redhat.com Fri Sep 30 12:59:06 2005 From: fedora-extras-commits at redhat.com (Alain Portal (Dionysos)) Date: Fri, 30 Sep 2005 08:59:06 -0400 Subject: rpms/gpsim/devel gpsim.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200509301259.j8UCxa3J016511@cvs-int.fedora.redhat.com> Author: Dionysos Update of /cvs/extras/rpms/gpsim/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16464/devel Modified Files: .cvsignore sources Added Files: gpsim.spec Log Message: auto-import gpsim-0.21.4-5 on branch devel from gpsim-0.21.4-5.src.rpm --- NEW FILE gpsim.spec --- Name: gpsim Version: 0.21.4 Release: 5%{?dist} Summary: A simulator for Microchip (TM) PIC (TM) microcontrollers Summary(fr): Un simulateur pour les microcontr??leurs PIC (TM) Microchip (TM) Group: Development/Debuggers License: GPL URL: http://www.dattalo.com/gnupic/gpsim.html Source: http://www.dattalo.com/gnupic/gpsim-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: gtk+extra = 1.1.0 BuildRequires: gtk+extra-devel = 1.1.0, flex, readline-devel %description gpsim is a simulator for Microchip (TM) PIC (TM) microcontrollers. It supports most devices in Microchip's 12-bit, 14bit, and 16-bit core families. In addition, gpsim supports dynamically loadable modules such as LED's, LCD's, resistors, etc. to extend the simulation environment beyond the PIC. %description -l fr gpsim est un simulateur pour les microcontr??leurs PIC (TM) Microchip (TM). Il g??re la plupart des microcontr??leurs des familles 12, 14 et 16 bits. gpsim g??re ??galement les modules chargeables dynamiquement tels que les LED, afficheurs LCD, r??sistances, etc. afin d'??tendre l'environnement de simulation des PIC. %package devel Summary: Libraries and files headers for gpsim Summary(fr): Biblioth??ques et fichiers d'en-t??tes pour gpsim Group: Development/Libraries Requires: %{name} = %{version}-%{release} %description devel The %{name}-devel package includes the static libraries, header files, and documentation for compiling programs that use the gpsim library. %description -l fr devel Le paquetage %{name}-devel contient les biblioth??ques statiques, les fichiers d'en-t??tes et la documentation n??cessaires ?? la compilation des programmes qui utilisent la biblioth??que gpsim. %prep %setup -q %{__chmod} a-x examples/12bit/p12x.inc examples/14bit/sine.asm %{__sed} -i -e 's/\r$//' examples/14bit/sine.asm %build %configure make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT %clean rm -rf $RPM_BUILD_ROOT %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files %defattr(-,root,root,-) %doc ANNOUNCE AUTHORS COPYING ChangeLog HISTORY NEWS %doc README README.EXAMPLES README.MODULES TODO %doc doc/gpsim.lyx doc/gpsim.pdf %doc examples/ %{_bindir}/* %{_libdir}/*.so.* %files devel %defattr(-,root,root,-) %{_libdir}/*.a %{_libdir}/*.so %exclude %{_libdir}/*.la %{_includedir}/* %changelog * 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. * 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 * Tue Sep 13 2005 Alain Portal 0.21.4-2 - License is GPL - Add french summary and description * Mon Sep 12 2005 Alain Portal 0.21.4-1 - New version * Mon Nov 8 2004 Alain Portal 0:0.21.2-0.fdr.2 - Add BuildRequires flex, readline-devel * Wed Oct 27 2004 Alain Portal 0:0.21.2-0.fdr.1 - Initial Fedora RPM Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gpsim/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 30 Sep 2005 12:58:34 -0000 1.1 +++ .cvsignore 30 Sep 2005 12:59:03 -0000 1.2 @@ -0,0 +1 @@ +gpsim-0.21.4.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/gpsim/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 30 Sep 2005 12:58:34 -0000 1.1 +++ sources 30 Sep 2005 12:59:03 -0000 1.2 @@ -0,0 +1 @@ +42dafc3ce0b1dba8f9d2daa2a3708baf gpsim-0.21.4.tar.gz From fedora-extras-commits at redhat.com Fri Sep 30 13:28:56 2005 From: fedora-extras-commits at redhat.com (Joshua W. Boyer (jwboyer)) Date: Fri, 30 Sep 2005 09:28:56 -0400 Subject: rpms/gaim-meanwhile/devel gaim-meanwhile.spec,1.4,1.5 Message-ID: <200509301328.j8UDSuKM018048@cvs-int.fedora.redhat.com> Author: jwboyer Update of /cvs/extras/rpms/gaim-meanwhile/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17994/devel Modified Files: gaim-meanwhile.spec Log Message: Avoid upcomming API breakage with meanwhile package Index: gaim-meanwhile.spec =================================================================== RCS file: /cvs/extras/rpms/gaim-meanwhile/devel/gaim-meanwhile.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- gaim-meanwhile.spec 15 Jul 2005 18:24:37 -0000 1.4 +++ gaim-meanwhile.spec 30 Sep 2005 13:28:54 -0000 1.5 @@ -7,12 +7,12 @@ License: GPL Group: Applications/Internet Version: 1.2.4 -Release: 2%{?dist} +Release: 3%{?dist} Source: http://dl.sf.net/meanwhile/gaim-meanwhile-%{version}.tar.gz URL: http://meanwhile.sourceforge.net BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gaim >= 1.2.1, meanwhile-devel >= 0.4.2 -Requires: gaim >= 1.2.1 +Requires: gaim >= 1.2.1, meanwhile < 0.5.0 %description Gaim plugin to use the meanwhile Lotus Sametime library @@ -39,6 +39,9 @@ %{_datadir}/pixmaps/gaim/ %changelog +* Fri Sep 30 2005 - jwboyer at jdub.homelinux.org 1.2.4-3 +- Add dependency on meanwhile < 0.5.0 to avoid upcomming API breakage + * Fri Jul 15 2005 - jwboyer at jdub.homelinux.org 1.2.4-2 - Bump release for rebuild From fedora-extras-commits at redhat.com Fri Sep 30 13:28:50 2005 From: fedora-extras-commits at redhat.com (Joshua W. Boyer (jwboyer)) Date: Fri, 30 Sep 2005 09:28:50 -0400 Subject: rpms/gaim-meanwhile/FC-3 gaim-meanwhile.spec,1.4,1.5 Message-ID: <200509301329.j8UDTKs1018051@cvs-int.fedora.redhat.com> Author: jwboyer Update of /cvs/extras/rpms/gaim-meanwhile/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17994/FC-3 Modified Files: gaim-meanwhile.spec Log Message: Avoid upcomming API breakage with meanwhile package Index: gaim-meanwhile.spec =================================================================== RCS file: /cvs/extras/rpms/gaim-meanwhile/FC-3/gaim-meanwhile.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- gaim-meanwhile.spec 15 Jul 2005 18:24:37 -0000 1.4 +++ gaim-meanwhile.spec 30 Sep 2005 13:28:48 -0000 1.5 @@ -7,12 +7,12 @@ License: GPL Group: Applications/Internet Version: 1.2.4 -Release: 2%{?dist} +Release: 3%{?dist} Source: http://dl.sf.net/meanwhile/gaim-meanwhile-%{version}.tar.gz URL: http://meanwhile.sourceforge.net BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gaim >= 1.2.1, meanwhile-devel >= 0.4.2 -Requires: gaim >= 1.2.1 +Requires: gaim >= 1.2.1, meanwhile < 0.5.0 %description Gaim plugin to use the meanwhile Lotus Sametime library @@ -39,6 +39,9 @@ %{_datadir}/pixmaps/gaim/ %changelog +* Fri Sep 30 2005 - jwboyer at jdub.homelinux.org 1.2.4-3 +- Add dependency on meanwhile < 0.5.0 to avoid upcomming API breakage + * Fri Jul 15 2005 - jwboyer at jdub.homelinux.org 1.2.4-2 - Bump release for rebuild From fedora-extras-commits at redhat.com Fri Sep 30 13:28:51 2005 From: fedora-extras-commits at redhat.com (Joshua W. Boyer (jwboyer)) Date: Fri, 30 Sep 2005 09:28:51 -0400 Subject: rpms/gaim-meanwhile/FC-4 gaim-meanwhile.spec,1.4,1.5 Message-ID: <200509301329.j8UDTLeO018054@cvs-int.fedora.redhat.com> Author: jwboyer Update of /cvs/extras/rpms/gaim-meanwhile/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17994/FC-4 Modified Files: gaim-meanwhile.spec Log Message: Avoid upcomming API breakage with meanwhile package Index: gaim-meanwhile.spec =================================================================== RCS file: /cvs/extras/rpms/gaim-meanwhile/FC-4/gaim-meanwhile.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- gaim-meanwhile.spec 15 Jul 2005 18:24:37 -0000 1.4 +++ gaim-meanwhile.spec 30 Sep 2005 13:28:48 -0000 1.5 @@ -7,12 +7,12 @@ License: GPL Group: Applications/Internet Version: 1.2.4 -Release: 2%{?dist} +Release: 3%{?dist} Source: http://dl.sf.net/meanwhile/gaim-meanwhile-%{version}.tar.gz URL: http://meanwhile.sourceforge.net BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gaim >= 1.2.1, meanwhile-devel >= 0.4.2 -Requires: gaim >= 1.2.1 +Requires: gaim >= 1.2.1, meanwhile < 0.5.0 %description Gaim plugin to use the meanwhile Lotus Sametime library @@ -39,6 +39,9 @@ %{_datadir}/pixmaps/gaim/ %changelog +* Fri Sep 30 2005 - jwboyer at jdub.homelinux.org 1.2.4-3 +- Add dependency on meanwhile < 0.5.0 to avoid upcomming API breakage + * Fri Jul 15 2005 - jwboyer at jdub.homelinux.org 1.2.4-2 - Bump release for rebuild From fedora-extras-commits at redhat.com Fri Sep 30 14:03:14 2005 From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields)) Date: Fri, 30 Sep 2005 10:03:14 -0400 Subject: web/html/docs/jargon-buster fedora-glossary.php, 1.2, 1.3 index.php, 1.2, 1.3 ln-legalnotice.php, 1.2, 1.3 rv-revhistory.php, 1.1, 1.2 Message-ID: <200509301403.j8UE3EEp019577@cvs-int.fedora.redhat.com> Author: pfrields Update of /cvs/fedora/web/html/docs/jargon-buster In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19554 Modified Files: fedora-glossary.php index.php ln-legalnotice.php rv-revhistory.php Log Message: Updated to 1.9.4, some content fixes (#160265) Index: fedora-glossary.php =================================================================== RCS file: /cvs/fedora/web/html/docs/jargon-buster/fedora-glossary.php,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- fedora-glossary.php 7 Sep 2005 13:10:42 -0000 1.2 +++ fedora-glossary.php 30 Sep 2005 14:03:11 -0000 1.3 @@ -53,8 +53,8 @@

        Use BitTorrent to download Fedora Core by downloading and opening a torrent file. The official - Fedora Core torrent tracker is located at http://torrent.dulug.duke.edu/. Download a torrent - file there to begin downloading a release of Fedora Core. + Fedora Core torrent tracker is located at http://torrent.fedoraproject.org/. Download a + torrent file there to begin downloading a release of Fedora Core.

        Bluecurve

        Bluecurve™ is a theme which unifies the look and feel of the Fedora desktop. Bluecurve was @@ -443,13 +443,6 @@ by a Red Hat Network subscription and up to 24x7 support with one-hour response. Refer to http://www.redhat.com/software/rhel/ for more information about Red Hat Enterprise Linux. -

        redhat-config-packages

        - The redhat-config-packages - utility is a package installation for new Fedora Core systems which - have no software updates installed yet. Since most - administrators and users update their system software - regularly, redhat-config-packages - is not often used. Users should instead use the yum utility to install new software.

        rhgb

        Red Hat Graphical Boot, or rhgb, is an @@ -501,7 +494,14 @@ RPM package. If you want to read or modify a program's source, use its SRPM. You do not need any SRPMs to install or use software. -

        See Also RPM.

        up2date

        +

        See Also RPM.

        system-config-packages

        + The system-config-packages + utility is a package installation for new Fedora Core systems which + have no software updates installed yet. Since most + administrators and users update their system software + regularly, system-config-packages + is not often used. Users should instead use the yum utility to install new software. +

        up2date

        The up2date application is a complete system for managing and updating software on Red Hat Enterprise Linux and Fedora systems. It has both command line and gui Index: index.php =================================================================== RCS file: /cvs/fedora/web/html/docs/jargon-buster/index.php,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- index.php 7 Sep 2005 13:10:42 -0000 1.2 +++ index.php 30 Sep 2005 14:03:11 -0000 1.3 @@ -7,7 +7,7 @@ ?> -

        Fedora Jargon Buster
           Next

        Fedora Jargon Buster

        Dave Pawson

        Tammy Fox

        Paul W. Frields

        Copyright © 2003, 2004, 2005 Dave Pawson, Pa! ul W. Frields, Red Hat, Inc.

        Glossary

        +

        Fedora Jargon Buster
           Next

        Fedora Jargon Buster

        Dave Pawson

        Tammy Fox

        Paul W. Frields

        Copyright © 2003, 2004, 2005 Dave Pawson, Pa! ul W. Frields, Red Hat, Inc.

        Glossary

        This document clarifies some of the terms used on various lists, web pages, and IRC, when talking about Fedora. Many thanks to the people on the fedora-list and at Red Hat for their input. @@ -16,7 +16,7 @@ at http://bugzilla.redhat.com/. When you file your bug, select "Fedora Documentation" as the Product, and select the title of this document as the Component. The version of this document is - jargon-buster-1.9.3 (2005-09-07). + jargon-buster-1.9.4 (2005-09-30).

        The maintainers of this document will automatically receive your bug report. On behalf of the entire Fedora community, thank you for helping us make Index: ln-legalnotice.php =================================================================== RCS file: /cvs/fedora/web/html/docs/jargon-buster/ln-legalnotice.php,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ln-legalnotice.php 7 Sep 2005 13:10:42 -0000 1.2 +++ ln-legalnotice.php 30 Sep 2005 14:03:11 -0000 1.3 @@ -26,7 +26,7 @@ They all may be freely redistributed with documentation produced for the Fedora Project.

        - jargon-buster-1.9.3 (2005-09-07) + jargon-buster-1.9.4 (2005-09-30)

        Red Hat, Red Hat Network, the Red Hat "Shadow Man" logo, RPM, Maximum RPM, the RPM logo, Linux Library, PowerTools, Linux Undercover, RHmember, RHmember More, Rough Cuts, Index: rv-revhistory.php =================================================================== RCS file: /cvs/fedora/web/html/docs/jargon-buster/rv-revhistory.php,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- rv-revhistory.php 7 Sep 2005 13:10:42 -0000 1.1 +++ rv-revhistory.php 30 Sep 2005 14:03:11 -0000 1.2 @@ -66,6 +66,10 @@

        Style editing.

        +
      6. Revision 1.9.430 Sep 2005PaulWFrields
      +

      + Some term fixes (#160265). +

      Author: toshio Update of /cvs/extras/rpms/foremost In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27387/foremost Log Message: Directory /cvs/extras/rpms/foremost added to the repository From fedora-extras-commits at redhat.com Fri Sep 30 19:43:04 2005 From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio)) Date: Fri, 30 Sep 2005 15:43:04 -0400 Subject: rpms/foremost/devel - New directory Message-ID: <200509301943.j8UJh4Q1027412@cvs-int.fedora.redhat.com> Author: toshio Update of /cvs/extras/rpms/foremost/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27387/foremost/devel Log Message: Directory /cvs/extras/rpms/foremost/devel added to the repository From fedora-extras-commits at redhat.com Fri Sep 30 19:43:19 2005 From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio)) Date: Fri, 30 Sep 2005 15:43:19 -0400 Subject: rpms/foremost Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200509301943.j8UJhJ75027471@cvs-int.fedora.redhat.com> Author: toshio Update of /cvs/extras/rpms/foremost In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27436 Added Files: Makefile import.log Log Message: Setup of module foremost --- NEW FILE Makefile --- # Top level Makefile for module foremost all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Fri Sep 30 19:43:20 2005 From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio)) Date: Fri, 30 Sep 2005 15:43:20 -0400 Subject: rpms/foremost/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200509301943.j8UJhKNq027474@cvs-int.fedora.redhat.com> Author: toshio Update of /cvs/extras/rpms/foremost/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27436/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module foremost --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Fri Sep 30 19:43:52 2005 From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio)) Date: Fri, 30 Sep 2005 15:43:52 -0400 Subject: rpms/foremost import.log,1.1,1.2 Message-ID: <200509301944.j8UJiMAs027563@cvs-int.fedora.redhat.com> Author: toshio Update of /cvs/extras/rpms/foremost In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27515 Modified Files: import.log Log Message: auto-import foremost-1.0-4 on branch devel from foremost-1.0-4.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/foremost/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 30 Sep 2005 19:43:17 -0000 1.1 +++ import.log 30 Sep 2005 19:43:50 -0000 1.2 @@ -0,0 +1 @@ +foremost-1_0-4:HEAD:foremost-1.0-4.src.rpm:1128109424 From fedora-extras-commits at redhat.com Fri Sep 30 19:43:52 2005 From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio)) Date: Fri, 30 Sep 2005 15:43:52 -0400 Subject: rpms/foremost/devel COPYING, NONE, 1.1 foremost-config.patch, NONE, 1.1 foremost.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200509301943.j8UJhq0O027548@cvs-int.fedora.redhat.com> Author: toshio Update of /cvs/extras/rpms/foremost/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27515/devel Modified Files: .cvsignore sources Added Files: COPYING foremost-config.patch foremost.spec Log Message: auto-import foremost-1.0-4 on branch devel from foremost-1.0-4.src.rpm --- NEW FILE COPYING --- GNU GENERAL PUBLIC LICENSE Version 2, June 1991 Copyright (C) 1989, 1991 Free Software Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, 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. foremost-config.patch: --- NEW FILE foremost-config.patch --- --- foremost-1.0/Makefile.bak 2005-09-29 08:31:07.000000000 -0700 +++ foremost-1.0/Makefile 2005-09-29 08:48:31.000000000 -0700 @@ -44,7 +44,7 @@ # Definitions we'll need later (and that should rarely change) HEADER_FILES = main.h ole.h extract.h -SRC = main.c state.c helpers.c config.c cli.c engine.c dir.c extract.c api.c +SRC = main.c state.c helpers.c config.c.in cli.c engine.c dir.c extract.c api.c OBJ = main.o state.o helpers.o config.o cli.o engine.o dir.o extract.o api.o DOCS = Makefile README CHANGES $(MAN_PAGES) foremost.conf WINDOC = README.txt CHANGES.txt @@ -111,6 +111,9 @@ # This section must be updated each time you add an algorithm #--------------------------------------------------------------------- +config.c: config.c.in + sed "s?@CONFDIR@?$(CONF)?" < $< > $@ + foremost: $(OBJ) $(CC) $(OBJ) -o $(NAME) $(LINK_OPT) --- foremost-1.0/config.c.in.bak 2005-09-29 08:31:17.000000000 -0700 +++ foremost-1.0/config.c.in 2005-09-29 08:40:22.000000000 -0700 @@ -0,0 +1,302 @@ + +#include "main.h" + +int translate(char *str) +{ + char next; + char *rd=str,*wr=str,*bad; + char temp[1+3+1]; + char ch; + + if(!*rd) //If it's a null string just return + { + return 0; + } + + while (*rd) + { +/* Is it an escaped character ? */ + if (*rd=='\\') + { + rd++; + switch(*rd) + { + case '\\': + *rd++; + *wr++='\\'; + break; + case 'a': + *rd++; + *wr++='\a'; + break; + case 's': + *rd++; + *wr++=' '; + break; + case 'n': + *rd++; + *wr++='\n'; + break; + case 'r': + *rd++; + *wr++='\r'; + break; + case 't': + *rd++; + *wr++='\t'; + break; + case 'v': + *rd++; + *wr++='\v'; + break; +/* Hexadecimal/Octal values are treated in one place using strtoul() */ + case 'x': + case '0': case '1': case '2': case '3': + next = *(rd+1); + if (next < 48 || (57 < next && next < 65) || + (70 < next && next < 97) || next > 102) + break; //break if not a digit or a-f, A-F + next = *(rd+2); + if (next < 48 || (57 < next && next < 65) || + (70 < next && next < 97) || next > 102) + break; //break if not a digit or a-f, A-F + + temp[0]='0'; bad=temp; + strncpy(temp+1,rd,3); + temp[4] = '\0'; + ch=strtoul(temp,&bad,0); + if (*bad=='\0') + { + *wr++=ch; + rd+=3; + } /* else INVALID CHARACTER IN INPUT ('\\' followed by *rd) */ + break; + default: /* INVALID CHARACTER IN INPUT (*rd)*/ + *wr++='\\'; + break; + } + } +/* Unescaped characters go directly to the output */ + else *wr++=*rd++; + } + *wr = '\0'; //Null terminate the string that we just created... + return wr-str; +} + + +char* skipWhiteSpace(char* str) +{ + while (isspace(str[0])) + str++; + return str; +} + + +int extractSearchSpecData(f_state *state,char **tokenarray) +{ + +/* Process a normal line with 3-4 tokens on it + token[0] = suffix + token[1] = case sensitive + token[2] = size to snarf + token[3] = begintag + token[4] = endtag (optional) + token[5] = search for footer from back of buffer flag and other options (whew!) +*/ + +/* Allocate the memory for these lines.... */ + +s_spec *s=&search_spec[state->num_builtin]; + + s->suffix = malloc(MAX_SUFFIX_LENGTH*sizeof(char)); + s->header = malloc(MAX_STRING_LENGTH*sizeof(char)); + s->footer = malloc(MAX_STRING_LENGTH*sizeof(char)); + s->type= CONF; + if (!strncasecmp(tokenarray[0], + FOREMOST_NOEXTENSION_SUFFIX, + strlen(FOREMOST_NOEXTENSION_SUFFIX))) + { + s->suffix[0] = ' '; + s->suffix[1] = 0; + } + else + { + +/* Assign the current line to the SearchSpec object */ + memcpy(s->suffix,tokenarray[0],MAX_SUFFIX_LENGTH); + } + +/* Check for case sensitivity */ + s->case_sen = (!strncasecmp(tokenarray[1],"y",1) || + !strncasecmp(tokenarray[1],"yes",3)); + + s->max_len = atoi(tokenarray[2]); + +/* Determine which search type we want to use for this needle */ + s->searchtype = SEARCHTYPE_FORWARD; + if (!strncasecmp(tokenarray[5],"REVERSE",strlen("REVERSE"))) + { + + s->searchtype = SEARCHTYPE_REVERSE; + } + else if (!strncasecmp(tokenarray[5],"NEXT",strlen("NEXT"))) + { + s->searchtype = SEARCHTYPE_FORWARD_NEXT; + } +// this is the default, but just if someone wants to provide this value just to be sure + else if (!strncasecmp(tokenarray[5],"FORWARD",strlen("FORWARD"))) + { + s->searchtype = SEARCHTYPE_FORWARD; + } + +/* Done determining searchtype */ + +/* We copy the tokens and translate them from the file format. + The translate() function does the translation and returns + the length of the argument being translated */ + + s->header_len = translate(tokenarray[3]); + memcpy(s->header,tokenarray[3],s->header_len); + s->footer_len = translate(tokenarray[4]); + memcpy(s->footer,tokenarray[4],s->footer_len); + + + init_bm_table(s->header,s->header_bm_table,s->header_len, s->case_sen,s->searchtype); + init_bm_table(s->footer,s->footer_bm_table,s->footer_len,s->case_sen,s->searchtype); + + return TRUE; +} + +int process_line(f_state *s, char *buffer, int line_number) +{ + + char* buf = buffer; + char* token; + char** tokenarray = (char **) malloc(6*sizeof(char[MAX_STRING_LENGTH])); + int i = 0, len = strlen(buffer); + +/* Any line that ends with a CTRL-M (0x0d) has been processed + by a DOS editor. We will chop the CTRL-M to ignore it */ + if (buffer[len-2] == 0x0d && buffer[len-1] == 0x0a) + { + buffer[len-2] = buffer[len-1]; + buffer[len-1] = buffer[len]; + } + + buf = (char*) skipWhiteSpace(buf); + token = strtok(buf," \t\n"); + +/* Any line that starts with a '#' is a comment and can be skipped */ + if(token == NULL || token[0] == '#') + { + return TRUE; + } + +/* Check for the wildcard */ + if (!strncasecmp(token,"wildcard",9)) + { + if ((token = strtok(NULL," \t\n")) != NULL) + { + translate(token); + } + else + { + return TRUE; + } + + if (strlen(token) > 1) + { + fprintf(stderr,"Warning: Wildcard can only be one character," + " but you specified %zu characters.\n" + " Using the first character, \"%c\", as the wildcard.\n", + strlen(token),token[0]); + } + + wildcard = token[0]; + return TRUE; + } + + while (token && (i < NUM_SEARCH_SPEC_ELEMENTS)) + { + tokenarray[i] = token; + i++; + token = strtok(NULL," \t\n"); + } + + switch(NUM_SEARCH_SPEC_ELEMENTS-i) + { + case 2: + tokenarray[NUM_SEARCH_SPEC_ELEMENTS-1] = ""; + tokenarray[NUM_SEARCH_SPEC_ELEMENTS-2] = ""; + break; + case 1: + tokenarray[NUM_SEARCH_SPEC_ELEMENTS-1] = ""; + break; + case 0: + break; + default: + fprintf(stderr,"\nERROR: In line %d of the configuration file.\n",line_number); + return FALSE; + return TRUE; + + } + + if(!extractSearchSpecData(s,tokenarray)) + { + fprintf(stderr, + "\nERROR: Unknown error on line %d of the configuration file.\n",line_number); + } + s->num_builtin++; + + + + return TRUE; +} + + +int load_config_file(f_state *s) +{ + FILE *f; + char* buffer = (char *)malloc(MAX_STRING_LENGTH * sizeof(char)); + off_t line_number = 0; + +#ifdef __DEBUG + printf ("About to open config file %s%s", get_config_file(s), NEWLINE); +#endif + + if ((f = fopen(get_config_file(s),"r")) == NULL) + { + /*Can't find a conf in the current directory + * So lets try the /usr/local/etc*/ + + +#ifdef __WIN32 + set_config_file(s,"/Program Files/foremost/foremost.conf"); +#else + set_config_file(s,"@CONFDIR@/foremost.conf"); +#endif + if ((f = fopen(get_config_file(s),"r")) == NULL) + { + print_error(s,get_config_file(s),strerror(errno)); + free(buffer); + return TRUE; + } + + } + + while (fgets(buffer,MAX_STRING_LENGTH,f)) + { + ++line_number; + if (!process_line(s,buffer,line_number)) + { + free(buffer); + fclose(f); + return TRUE; + + } + } + + fclose(f); + free(buffer); + return FALSE; +} --- NEW FILE foremost.spec --- Name: foremost Version: 1.0 Release: 4%{?dist} Summary: Recover files by "carving" them from a raw disk Group: Applications/File License: GPL URL: http://foremost.sf.net # Upstream isn't versioning their tarballs! They list the md5sum of their # present tarball on the web page so this should make it easier to decide if # they've updated without me noticing. # MD5Sum: # 6e77f71e4003e06de394d500a1d972c7 foremost-1.0.tar.gz Source0: http://foremost.sourceforge.net/pkg/foremost-1.0.tar.gz Source1: COPYING Patch0: foremost-config.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description Foremost recovers files files based on their headers, footers, and internal data structures. This process is commonly referred to as data carving. Foremost can work on a raw disk drive or image file generated by dd. The headers and footers can be specified by a configuration file or you can use command line switches to specify built-in file types. These built-in types look at the data structures of a given file format allowing for a more reliable and faster recovery. %prep %setup -q %patch0 -p1 -b .config sed -i 's/^RAW_FLAGS =.*/RAW_FLAGS = %{optflags}/' Makefile cp %{SOURCE1} . %build # Binary files were left in the distributed tarball. make clean make %{?_smp_mflags} CONF=%{_sysconfdir} %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT%{_bindir} mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir} make install BIN=$RPM_BUILD_ROOT%{_bindir} MAN=$RPM_BUILD_ROOT%{_mandir}/man1 \ CONF=$RPM_BUILD_ROOT%{_sysconfdir} chmod 0644 $RPM_BUILD_ROOT%{_sysconfdir}/foremost.conf %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc README CHANGES COPYING %{_bindir}/* %{_mandir}/man1/* %config(noreplace) %{_sysconfdir}/* %changelog * Thu Sep 29 2005 Toshio Kuratomi 1.0-4 - Fix permissions on installed foremost.conf file. * Thu Sep 29 2005 Toshio Kuratomi 1.0-3 - Reenable the install of foremost.conf as the program complains without it. - Patch to fix the location of foremost.conf. * Tue Sep 13 2005 Toshio Kuratomi 1.0-2 - New foremost has been released with multi-disk image support and my gcc4 warning fixes. - Upstream isn't versioning their tarballs. Made a note of the present MD5Sum to make it easier to compare against upstream's and tell when they've updated their tarball. * Sat Aug 27 2005 Toshio Kuratomi 1.0-1 - Initial version for Fedora Extras. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/foremost/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 30 Sep 2005 19:43:17 -0000 1.1 +++ .cvsignore 30 Sep 2005 19:43:50 -0000 1.2 @@ -0,0 +1 @@ +foremost-1.0.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/foremost/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 30 Sep 2005 19:43:17 -0000 1.1 +++ sources 30 Sep 2005 19:43:50 -0000 1.2 @@ -0,0 +1 @@ +6e77f71e4003e06de394d500a1d972c7 foremost-1.0.tar.gz From fedora-extras-commits at redhat.com Fri Sep 30 19:48:52 2005 From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio)) Date: Fri, 30 Sep 2005 15:48:52 -0400 Subject: owners owners.list,1.276,1.277 Message-ID: <200509301948.j8UJmqHY027624@cvs-int.fedora.redhat.com> Author: toshio Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27605 Modified Files: owners.list Log Message: Add foremost Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.276 retrieving revision 1.277 diff -u -r1.276 -r1.277 --- owners.list 30 Sep 2005 12:55:29 -0000 1.276 +++ owners.list 30 Sep 2005 19:48:50 -0000 1.277 @@ -192,6 +192,7 @@ Fedora Extras|fnfx|Hotkey functions for Toshiba laptops|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org| Fedora Extras|fontforge|An outline and bitmap font editor|otaylor at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|foobillard|A free OpenGL game of playing billard|mitr at redhat.com|extras-qa at fedoraproject.org| +Fedora Extras|formost|Program that recovers files by carving them from a raw disk|toshio at tiki-lounge.com|extras-qa at fedoraproject.org| Fedora Extras|fortune-mod|A program which will display a fortune|sheltren at cs.ucsb.edu|extras-qa at fedoraproject.org| Fedora Extras|fpc|Free Pascal Compiler|joost at cnoc.nl|extras-qa at fedoraproject.org| Fedora Extras|fping|Scriptable, parallelized ping-like utility|kaboom at oobleck.net|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Thu Sep 1 02:33:38 2005 From: fedora-extras-commits at redhat.com (Aaron Kurtz (dragoon)) Date: Wed, 31 Aug 2005 22:33:38 -0400 Subject: rpms/feh/FC-4 feh.spec,1.5,1.6 sources,1.3,1.4 .cvsignore,1.3,1.4 Message-ID: <200509010233.j812XcUF029438@cvs-int.fedora.redhat.com> Author: dragoon Update of /cvs/extras/rpms/feh/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29369/FC-4 Modified Files: feh.spec sources .cvsignore Log Message: * Wed Aug 31 2005 Aaron Kurtz - 1.3.4-1 - bump to 1.3.4 Index: feh.spec =================================================================== RCS file: /cvs/extras/rpms/feh/FC-4/feh.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- feh.spec 16 Jun 2005 09:34:11 -0000 1.5 +++ feh.spec 1 Sep 2005 02:33:36 -0000 1.6 @@ -1,6 +1,9 @@ +# No desktop file for feh. It may be a GUI program, but it needs +# file names or it just spits out the help. + Name: feh -Version: 1.3.1 -Release: 3%{?dist} +Version: 1.3.4 +Release: 1%{?dist} Summary: Fast command line image viewer using Imlib2 Group: Applications/Multimedia @@ -44,6 +47,9 @@ %{_mandir}/man[^3]/* %changelog +* Wed Aug 31 2005 Aaron Kurtz - 1.3.4-1 +- bump to 1.3.4 + * Thu Jun 16 2005 Aaron Kurtz - 1.3.1-3 - do it right this time Index: sources =================================================================== RCS file: /cvs/extras/rpms/feh/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 3 May 2005 16:14:18 -0000 1.3 +++ sources 1 Sep 2005 02:33:36 -0000 1.4 @@ -1 +1 @@ -0a3dfe65b795fed29a9aa1bc250d92d1 feh-1.3.1.tar.gz +3d35ba3d2f0693b019800787f1103891 feh-1.3.4.tar.gz Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/feh/FC-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 3 May 2005 16:14:18 -0000 1.3 +++ .cvsignore 1 Sep 2005 02:33:36 -0000 1.4 @@ -1 +1 @@ -feh-1.3.1.tar.gz +feh-1.3.4.tar.gz From fedora-extras-commits at redhat.com Thu Sep 1 02:33:32 2005 From: fedora-extras-commits at redhat.com (Aaron Kurtz (dragoon)) Date: Wed, 31 Aug 2005 22:33:32 -0400 Subject: rpms/feh/devel feh.spec,1.5,1.6 sources,1.3,1.4 .cvsignore,1.3,1.4 Message-ID: <200509010234.j812Y3Jt029443@cvs-int.fedora.redhat.com> Author: dragoon Update of /cvs/extras/rpms/feh/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29369/devel Modified Files: feh.spec sources .cvsignore Log Message: * Wed Aug 31 2005 Aaron Kurtz - 1.3.4-1 - bump to 1.3.4 Index: feh.spec =================================================================== RCS file: /cvs/extras/rpms/feh/devel/feh.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- feh.spec 16 Jun 2005 09:34:11 -0000 1.5 +++ feh.spec 1 Sep 2005 02:33:30 -0000 1.6 @@ -1,6 +1,9 @@ +# No desktop file for feh. It may be a GUI program, but it needs +# file names or it just spits out the help. + Name: feh -Version: 1.3.1 -Release: 3%{?dist} +Version: 1.3.4 +Release: 1%{?dist} Summary: Fast command line image viewer using Imlib2 Group: Applications/Multimedia @@ -44,6 +47,9 @@ %{_mandir}/man[^3]/* %changelog +* Wed Aug 31 2005 Aaron Kurtz - 1.3.4-1 +- bump to 1.3.4 + * Thu Jun 16 2005 Aaron Kurtz - 1.3.1-3 - do it right this time Index: sources =================================================================== RCS file: /cvs/extras/rpms/feh/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 3 May 2005 16:14:18 -0000 1.3 +++ sources 1 Sep 2005 02:33:30 -0000 1.4 @@ -1 +1 @@ -0a3dfe65b795fed29a9aa1bc250d92d1 feh-1.3.1.tar.gz +3d35ba3d2f0693b019800787f1103891 feh-1.3.4.tar.gz Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/feh/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 3 May 2005 16:14:18 -0000 1.3 +++ .cvsignore 1 Sep 2005 02:33:30 -0000 1.4 @@ -1 +1 @@ -feh-1.3.1.tar.gz +feh-1.3.4.tar.gz From fedora-extras-commits at redhat.com Thu Sep 1 02:33:33 2005 From: fedora-extras-commits at redhat.com (Aaron Kurtz (dragoon)) Date: Wed, 31 Aug 2005 22:33:33 -0400 Subject: rpms/feh/FC-3 feh.spec,1.5,1.6 sources,1.3,1.4 .cvsignore,1.3,1.4 Message-ID: <200509010234.j812Y3Nu029448@cvs-int.fedora.redhat.com> Author: dragoon Update of /cvs/extras/rpms/feh/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29369/FC-3 Modified Files: feh.spec sources .cvsignore Log Message: * Wed Aug 31 2005 Aaron Kurtz - 1.3.4-1 - bump to 1.3.4 Index: feh.spec =================================================================== RCS file: /cvs/extras/rpms/feh/FC-3/feh.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- feh.spec 16 Jun 2005 09:34:11 -0000 1.5 +++ feh.spec 1 Sep 2005 02:33:31 -0000 1.6 @@ -1,6 +1,9 @@ +# No desktop file for feh. It may be a GUI program, but it needs +# file names or it just spits out the help. + Name: feh -Version: 1.3.1 -Release: 3%{?dist} +Version: 1.3.4 +Release: 1%{?dist} Summary: Fast command line image viewer using Imlib2 Group: Applications/Multimedia @@ -44,6 +47,9 @@ %{_mandir}/man[^3]/* %changelog +* Wed Aug 31 2005 Aaron Kurtz - 1.3.4-1 +- bump to 1.3.4 + * Thu Jun 16 2005 Aaron Kurtz - 1.3.1-3 - do it right this time Index: sources =================================================================== RCS file: /cvs/extras/rpms/feh/FC-3/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 3 May 2005 16:16:10 -0000 1.3 +++ sources 1 Sep 2005 02:33:31 -0000 1.4 @@ -1 +1 @@ -0a3dfe65b795fed29a9aa1bc250d92d1 feh-1.3.1.tar.gz +3d35ba3d2f0693b019800787f1103891 feh-1.3.4.tar.gz Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/feh/FC-3/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 3 May 2005 16:16:10 -0000 1.3 +++ .cvsignore 1 Sep 2005 02:33:31 -0000 1.4 @@ -1 +1 @@ -feh-1.3.1.tar.gz +feh-1.3.4.tar.gz From fedora-extras-commits at redhat.com Thu Sep 1 07:33:57 2005 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Thu, 1 Sep 2005 03:33:57 -0400 Subject: rpms/pam_ssh/FC-4 pam_ssh.spec,1.3,1.4 Message-ID: <200509010733.j817Xvne003718@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/pam_ssh/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3699 Modified Files: pam_ssh.spec Log Message: add a .1 to release to be able to make a new tag Index: pam_ssh.spec =================================================================== RCS file: /cvs/extras/rpms/pam_ssh/FC-4/pam_ssh.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- pam_ssh.spec 26 Aug 2005 21:44:42 -0000 1.3 +++ pam_ssh.spec 1 Sep 2005 07:33:54 -0000 1.4 @@ -1,6 +1,6 @@ Name: pam_ssh Version: 1.91 -Release: 8%{?dist} +Release: 8.1%{?dist} Summary: PAM module for use with SSH keys and ssh-agent Source: http://dl.sourceforge.net/sourceforge/pam-ssh/pam_ssh-%{version}.tar.bz2 URL: http://sourceforge.net/projects/pam-ssh/ From fedora-extras-commits at redhat.com Thu Sep 1 07:47:46 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Thu, 1 Sep 2005 03:47:46 -0400 Subject: rpms/moin/devel README-rpm,1.1,1.2 Message-ID: <200509010747.j817lk3R003802@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/moin/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3778 Modified Files: README-rpm Log Message: Change user/group separator in chown from "." to ":" (#167151). Index: README-rpm =================================================================== RCS file: /cvs/extras/rpms/moin/devel/README-rpm,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- README-rpm 15 Jun 2005 11:10:06 -0000 1.1 +++ README-rpm 1 Sep 2005 07:47:44 -0000 1.2 @@ -6,7 +6,7 @@ cp -a /usr/share/moin/{data,underlay} $DESTDIR cp -a /usr/share/moin/server/moin.cgi $DESTDIR/cgi-bin cp -a /usr/share/moin/config/wikiconfig.py $DESTDIR/cgi-bin -chown -R apache.apache $DESTDIR/{data,underlay} +chown -R apache:apache $DESTDIR/{data,underlay} cat > /etc/httpd/conf.d/mywiki.conf < From fedora-extras-commits at redhat.com Thu Sep 1 08:52:59 2005 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Thu, 1 Sep 2005 04:52:59 -0400 Subject: rpms/perl-HTML-Scrubber - New directory Message-ID: <200509010852.j818qx3S005899@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-HTML-Scrubber In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5875/perl-HTML-Scrubber Log Message: Directory /cvs/extras/rpms/perl-HTML-Scrubber added to the repository From fedora-extras-commits at redhat.com Thu Sep 1 08:53:00 2005 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Thu, 1 Sep 2005 04:53:00 -0400 Subject: rpms/perl-HTML-Scrubber/devel - New directory Message-ID: <200509010853.j818r073005904@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-HTML-Scrubber/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5875/perl-HTML-Scrubber/devel Log Message: Directory /cvs/extras/rpms/perl-HTML-Scrubber/devel added to the repository From fedora-extras-commits at redhat.com Thu Sep 1 08:53:16 2005 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Thu, 1 Sep 2005 04:53:16 -0400 Subject: rpms/perl-HTML-Scrubber Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200509010853.j818rGKT005951@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-HTML-Scrubber In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5922 Added Files: Makefile import.log Log Message: Setup of module perl-HTML-Scrubber --- NEW FILE Makefile --- # Top level Makefile for module perl-HTML-Scrubber all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Thu Sep 1 08:53:17 2005 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Thu, 1 Sep 2005 04:53:17 -0400 Subject: rpms/perl-HTML-Scrubber/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200509010853.j818rHpo005956@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-HTML-Scrubber/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5922/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-HTML-Scrubber --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Thu Sep 1 08:53:50 2005 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Thu, 1 Sep 2005 04:53:50 -0400 Subject: rpms/perl-HTML-Scrubber import.log,1.1,1.2 Message-ID: <200509010854.j818sLBg006037@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-HTML-Scrubber In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5990 Modified Files: import.log Log Message: auto-import perl-HTML-Scrubber-0.08-2 on branch devel from perl-HTML-Scrubber-0.08-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-HTML-Scrubber/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 1 Sep 2005 08:53:14 -0000 1.1 +++ import.log 1 Sep 2005 08:53:48 -0000 1.2 @@ -0,0 +1 @@ +perl-HTML-Scrubber-0_08-2:HEAD:perl-HTML-Scrubber-0.08-2.src.rpm:1125564820 From fedora-extras-commits at redhat.com Thu Sep 1 08:53:51 2005 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Thu, 1 Sep 2005 04:53:51 -0400 Subject: rpms/perl-HTML-Scrubber/devel perl-HTML-Scrubber.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200509010854.j818sLx9006041@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-HTML-Scrubber/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5990/devel Modified Files: .cvsignore sources Added Files: perl-HTML-Scrubber.spec Log Message: auto-import perl-HTML-Scrubber-0.08-2 on branch devel from perl-HTML-Scrubber-0.08-2.src.rpm --- NEW FILE perl-HTML-Scrubber.spec --- Name: perl-HTML-Scrubber Version: 0.08 Release: 2%{?dist} Summary: Library for scrubbing/sanitizing html Group: Development/Libraries License: GPL or Artistic URL: http://search.cpan.org/dist/HTML-Scrubber/ Source0: http://www.cpan.org/authors/id/P/PO/PODMASTER/HTML-Scrubber-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl BuildRequires: perl(HTML::Parser) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description If you wanna "scrub" or "sanitize" html input in a reliable an flexible fashion, then this module is for you. I wasn't satisfied with HTML::Sanitizer because it is based on HTML::TreeBuilder, so I thought I'd write something similar that works directly with HTML::Parser. %prep %setup -q -n HTML-Scrubber-%{version} %{__perl} -pi -e 's/\r\n/\n/' Changes LICENSE README Scrubber.pm %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' chmod -R u+w $RPM_BUILD_ROOT/* %check make test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc Changes LICENSE README %{perl_vendorlib}/* %{_mandir}/man3/*.3* %changelog * Thu Aug 11 2005 Jose Pedro Oliveira - 0.08-2 - Disttag. * Wed Mar 23 2005 Jose Pedro Oliveira - 0.08-1 - First build. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-HTML-Scrubber/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 1 Sep 2005 08:53:15 -0000 1.1 +++ .cvsignore 1 Sep 2005 08:53:49 -0000 1.2 @@ -0,0 +1 @@ +HTML-Scrubber-0.08.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-HTML-Scrubber/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 1 Sep 2005 08:53:15 -0000 1.1 +++ sources 1 Sep 2005 08:53:49 -0000 1.2 @@ -0,0 +1 @@ +abadf246e528f3e2d31717ef8a1d90f2 HTML-Scrubber-0.08.tar.gz From fedora-extras-commits at redhat.com Thu Sep 1 08:55:52 2005 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Thu, 1 Sep 2005 04:55:52 -0400 Subject: rpms/perl-Module-Versions-Report - New directory Message-ID: <200509010855.j818tqeK006146@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Module-Versions-Report In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6126/perl-Module-Versions-Report Log Message: Directory /cvs/extras/rpms/perl-Module-Versions-Report added to the repository From fedora-extras-commits at redhat.com Thu Sep 1 08:55:53 2005 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Thu, 1 Sep 2005 04:55:53 -0400 Subject: rpms/perl-Module-Versions-Report/devel - New directory Message-ID: <200509010855.j818trau006151@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Module-Versions-Report/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6126/perl-Module-Versions-Report/devel Log Message: Directory /cvs/extras/rpms/perl-Module-Versions-Report/devel added to the repository From fedora-extras-commits at redhat.com Thu Sep 1 08:56:23 2005 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Thu, 1 Sep 2005 04:56:23 -0400 Subject: rpms/perl-Module-Versions-Report Makefile, NONE, 1.1 import.log, NONE, 1.1 Message-ID: <200509010856.j818uNEd006203@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Module-Versions-Report In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6174 Added Files: Makefile import.log Log Message: Setup of module perl-Module-Versions-Report --- NEW FILE Makefile --- # Top level Makefile for module perl-Module-Versions-Report all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Thu Sep 1 08:56:23 2005 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Thu, 1 Sep 2005 04:56:23 -0400 Subject: rpms/perl-Module-Versions-Report/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200509010856.j818uNVe006208@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Module-Versions-Report/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6174/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-Module-Versions-Report --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Thu Sep 1 08:57:00 2005 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Thu, 1 Sep 2005 04:57:00 -0400 Subject: rpms/perl-Module-Versions-Report import.log,1.1,1.2 Message-ID: <200509010857.j818v0jD006277@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Module-Versions-Report In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6242 Modified Files: import.log Log Message: auto-import perl-Module-Versions-Report-1.02-2 on branch devel from perl-Module-Versions-Report-1.02-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-Module-Versions-Report/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 1 Sep 2005 08:56:21 -0000 1.1 +++ import.log 1 Sep 2005 08:56:58 -0000 1.2 @@ -0,0 +1 @@ +perl-Module-Versions-Report-1_02-2:HEAD:perl-Module-Versions-Report-1.02-2.src.rpm:1125565009 From fedora-extras-commits at redhat.com Thu Sep 1 08:57:01 2005 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Thu, 1 Sep 2005 04:57:01 -0400 Subject: rpms/perl-Module-Versions-Report/devel perl-Module-Versions-Report.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200509010857.j818v11P006284@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Module-Versions-Report/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6242/devel Modified Files: .cvsignore sources Added Files: perl-Module-Versions-Report.spec Log Message: auto-import perl-Module-Versions-Report-1.02-2 on branch devel from perl-Module-Versions-Report-1.02-2.src.rpm --- NEW FILE perl-Module-Versions-Report.spec --- Name: perl-Module-Versions-Report Version: 1.02 Release: 2%{?dist} Summary: Report versions of all modules in memory Group: Development/Libraries License: GPL or Artistic URL: http://search.cpan.org/dist/Module-Versions-Report/ Source0: http://www.cpan.org/authors/id/S/SB/SBURKE/Module-Versions-Report-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description If you add "use Module::Versions::Report;" to a program (especially handy if your program is one that demonstrates a bug in some module), then when the program has finished running, you well get a report detailing the all modules in memory, and noting the version of each (for modules that defined a $VERSION, at least). %prep %setup -q -n Module-Versions-Report-%{version} %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' chmod -R u+w $RPM_BUILD_ROOT/* %check make test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc ChangeLog README %{perl_vendorlib}/* %{_mandir}/man3/*.3* %changelog * Wed Aug 10 2005 Jose Pedro Oliveira - 1.02-2 - Disttag. * Tue Mar 22 2005 Jose Pedro Oliveira - 1.02-1 - First build. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Module-Versions-Report/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 1 Sep 2005 08:56:21 -0000 1.1 +++ .cvsignore 1 Sep 2005 08:56:59 -0000 1.2 @@ -0,0 +1 @@ +Module-Versions-Report-1.02.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Module-Versions-Report/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 1 Sep 2005 08:56:21 -0000 1.1 +++ sources 1 Sep 2005 08:56:59 -0000 1.2 @@ -0,0 +1 @@ +a2ef9353386df4c4e49c7e4031c45bd3 Module-Versions-Report-1.02.tar.gz From fedora-extras-commits at redhat.com Thu Sep 1 08:59:49 2005 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Thu, 1 Sep 2005 04:59:49 -0400 Subject: rpms/perl-Carp-Assert-More - New directory Message-ID: <200509010859.j818xnhD006402@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Carp-Assert-More In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6378/perl-Carp-Assert-More Log Message: Directory /cvs/extras/rpms/perl-Carp-Assert-More added to the repository From fedora-extras-commits at redhat.com Thu Sep 1 08:59:49 2005 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Thu, 1 Sep 2005 04:59:49 -0400 Subject: rpms/perl-Carp-Assert-More/devel - New directory Message-ID: <200509010859.j818xnF4006407@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Carp-Assert-More/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6378/perl-Carp-Assert-More/devel Log Message: Directory /cvs/extras/rpms/perl-Carp-Assert-More/devel added to the repository From fedora-extras-commits at redhat.com Thu Sep 1 09:00:10 2005 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Thu, 1 Sep 2005 05:00:10 -0400 Subject: rpms/perl-Carp-Assert-More Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200509010900.j8190A3m006459@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Carp-Assert-More In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6424 Added Files: Makefile import.log Log Message: Setup of module perl-Carp-Assert-More --- NEW FILE Makefile --- # Top level Makefile for module perl-Carp-Assert-More all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Thu Sep 1 09:00:10 2005 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Thu, 1 Sep 2005 05:00:10 -0400 Subject: rpms/perl-Carp-Assert-More/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200509010900.j8190Am8006464@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Carp-Assert-More/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6424/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-Carp-Assert-More --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Thu Sep 1 09:00:44 2005 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Thu, 1 Sep 2005 05:00:44 -0400 Subject: rpms/perl-Carp-Assert-More import.log,1.1,1.2 Message-ID: <200509010900.j8190iZT006527@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Carp-Assert-More In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6492 Modified Files: import.log Log Message: auto-import perl-Carp-Assert-More-1.10-1 on branch devel from perl-Carp-Assert-More-1.10-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-Carp-Assert-More/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 1 Sep 2005 09:00:08 -0000 1.1 +++ import.log 1 Sep 2005 09:00:42 -0000 1.2 @@ -0,0 +1 @@ +perl-Carp-Assert-More-1_10-1:HEAD:perl-Carp-Assert-More-1.10-1.src.rpm:1125565233 From fedora-extras-commits at redhat.com Thu Sep 1 09:00:44 2005 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Thu, 1 Sep 2005 05:00:44 -0400 Subject: rpms/perl-Carp-Assert-More/devel perl-Carp-Assert-More.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200509010900.j8190i5B006534@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Carp-Assert-More/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6492/devel Modified Files: .cvsignore sources Added Files: perl-Carp-Assert-More.spec Log Message: auto-import perl-Carp-Assert-More-1.10-1 on branch devel from perl-Carp-Assert-More-1.10-1.src.rpm --- NEW FILE perl-Carp-Assert-More.spec --- Name: perl-Carp-Assert-More Version: 1.10 Release: 1%{?dist} Summary: Convenience wrappers around Carp::Assert Group: Development/Libraries License: GPL or Artistic URL: http://search.cpan.org/dist/Carp-Assert-More/ Source0: http://www.cpan.org/authors/id/P/PE/PETDANCE/Carp-Assert-More-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl BuildRequires: perl(Carp::Assert), perl(Test::Exception) BuildRequires: perl(Test::Pod), perl(Test::Pod::Coverage) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description Carp::Assert::More is a set of wrappers around the Carp::Assert functions to make the habit of writing assertions even easier. %prep %setup -q -n Carp-Assert-More-%{version} %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' chmod -R u+w $RPM_BUILD_ROOT/* %check make test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc Changes %{perl_vendorlib}/Carp/Assert/ %{_mandir}/man3/*.3* %changelog * Thu Aug 11 2005 Jose Pedro Oliveira - 1.10-1 - First build. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Carp-Assert-More/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 1 Sep 2005 09:00:08 -0000 1.1 +++ .cvsignore 1 Sep 2005 09:00:42 -0000 1.2 @@ -0,0 +1 @@ +Carp-Assert-More-1.10.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Carp-Assert-More/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 1 Sep 2005 09:00:08 -0000 1.1 +++ sources 1 Sep 2005 09:00:42 -0000 1.2 @@ -0,0 +1 @@ +7a601c7ceab092a5010bf4dcda62c659 Carp-Assert-More-1.10.tar.gz From fedora-extras-commits at redhat.com Thu Sep 1 09:40:12 2005 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Thu, 1 Sep 2005 05:40:12 -0400 Subject: rpms/pam_ssh/FC-3 pam_ssh.spec,1.3,1.4 Message-ID: <200509010940.j819eCJo007966@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/pam_ssh/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7935 Modified Files: pam_ssh.spec Log Message: add .1 to the release as there is a .1 for the fc4 package Index: pam_ssh.spec =================================================================== RCS file: /cvs/extras/rpms/pam_ssh/FC-3/pam_ssh.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- pam_ssh.spec 26 Aug 2005 21:44:42 -0000 1.3 +++ pam_ssh.spec 1 Sep 2005 09:40:09 -0000 1.4 @@ -1,6 +1,6 @@ Name: pam_ssh Version: 1.91 -Release: 8%{?dist} +Release: 8.1%{?dist} Summary: PAM module for use with SSH keys and ssh-agent Source: http://dl.sourceforge.net/sourceforge/pam-ssh/pam_ssh-%{version}.tar.bz2 URL: http://sourceforge.net/projects/pam-ssh/ From fedora-extras-commits at redhat.com Thu Sep 1 12:08:48 2005 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Thu, 1 Sep 2005 08:08:48 -0400 Subject: rpms/perl-Text-WikiFormat - New directory Message-ID: <200509011208.j81C8mFB012578@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Text-WikiFormat In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12554/perl-Text-WikiFormat Log Message: Directory /cvs/extras/rpms/perl-Text-WikiFormat added to the repository From fedora-extras-commits at redhat.com Thu Sep 1 12:08:48 2005 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Thu, 1 Sep 2005 08:08:48 -0400 Subject: rpms/perl-Text-WikiFormat/devel - New directory Message-ID: <200509011208.j81C8mLr012583@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Text-WikiFormat/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12554/perl-Text-WikiFormat/devel Log Message: Directory /cvs/extras/rpms/perl-Text-WikiFormat/devel added to the repository From fedora-extras-commits at redhat.com Thu Sep 1 12:09:09 2005 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Thu, 1 Sep 2005 08:09:09 -0400 Subject: rpms/perl-Text-WikiFormat Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200509011209.j81C99kW012628@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Text-WikiFormat In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12599 Added Files: Makefile import.log Log Message: Setup of module perl-Text-WikiFormat --- NEW FILE Makefile --- # Top level Makefile for module perl-Text-WikiFormat all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Thu Sep 1 12:09:10 2005 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Thu, 1 Sep 2005 08:09:10 -0400 Subject: rpms/perl-Text-WikiFormat/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200509011209.j81C9Age012633@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Text-WikiFormat/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12599/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-Text-WikiFormat --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Thu Sep 1 12:09:44 2005 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Thu, 1 Sep 2005 08:09:44 -0400 Subject: rpms/perl-Text-WikiFormat import.log,1.1,1.2 Message-ID: <200509011210.j81CAEUr012705@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Text-WikiFormat In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12667 Modified Files: import.log Log Message: auto-import perl-Text-WikiFormat-0.76-2 on branch devel from perl-Text-WikiFormat-0.76-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-Text-WikiFormat/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 1 Sep 2005 12:09:07 -0000 1.1 +++ import.log 1 Sep 2005 12:09:41 -0000 1.2 @@ -0,0 +1 @@ +perl-Text-WikiFormat-0_76-2:HEAD:perl-Text-WikiFormat-0.76-2.src.rpm:1125576574 From fedora-extras-commits at redhat.com Thu Sep 1 12:09:44 2005 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Thu, 1 Sep 2005 08:09:44 -0400 Subject: rpms/perl-Text-WikiFormat/devel perl-Text-WikiFormat.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200509011210.j81CAEV1012709@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Text-WikiFormat/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12667/devel Modified Files: .cvsignore sources Added Files: perl-Text-WikiFormat.spec Log Message: auto-import perl-Text-WikiFormat-0.76-2 on branch devel from perl-Text-WikiFormat-0.76-2.src.rpm --- NEW FILE perl-Text-WikiFormat.spec --- Name: perl-Text-WikiFormat Version: 0.76 Release: 2%{?dist} Summary: Translate Wiki formatted text into other formats Group: Development/Libraries License: GPL or Artistic URL: http://search.cpan.org/dist/Text-WikiFormat/ Source0: http://www.cpan.org/authors/id/C/CH/CHROMATIC/Text-WikiFormat-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl BuildRequires: perl(Module::Build) BuildRequires: perl(URI::Escape) BuildRequires: perl(Test::Pod), perl(Test::Pod::Coverage) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description The original Wiki web site had a very simple interface to edit and to add pages. Its formatting rules are simple and easy to use. They are also easy to translate into other, more complicated markup languages with this module. It creates HTML by default, but can produce valid POD, DocBook, XML, or any other format imaginable. %prep %setup -q -n Text-WikiFormat-%{version} %build %{__perl} Build.PL installdirs=vendor ./Build %install rm -rf $RPM_BUILD_ROOT ./Build install destdir=$RPM_BUILD_ROOT create_packlist=0 chmod -R u+w $RPM_BUILD_ROOT/* %check mv t/0-signature.t t/0.signature.t.skip ./Build test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc ARTISTIC Changes GPL README %{perl_vendorlib}/Text/ %{_mandir}/man3/*.3* %changelog * Thu Sep 1 2005 Jose Pedro Oliveira - 0.76-2 - Disabled the signature test. * Fri Aug 26 2005 Jose Pedro Oliveira - 0.76-1 - First build. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Text-WikiFormat/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 1 Sep 2005 12:09:08 -0000 1.1 +++ .cvsignore 1 Sep 2005 12:09:42 -0000 1.2 @@ -0,0 +1 @@ +Text-WikiFormat-0.76.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Text-WikiFormat/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 1 Sep 2005 12:09:08 -0000 1.1 +++ sources 1 Sep 2005 12:09:42 -0000 1.2 @@ -0,0 +1 @@ +70bc20c8d058bf64df24e384d36748d1 Text-WikiFormat-0.76.tar.gz From fedora-extras-commits at redhat.com Thu Sep 1 18:23:47 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Thu, 1 Sep 2005 14:23:47 -0400 Subject: extras-buildsys/server UserInterface.py,1.52,1.53 Message-ID: <200509011823.j81INlF8021404@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/server In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21385/server Modified Files: UserInterface.py Log Message: Fix traceback Index: UserInterface.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/UserInterface.py,v retrieving revision 1.52 retrieving revision 1.53 diff -u -r1.52 -r1.53 --- UserInterface.py 31 Aug 2005 18:25:50 -0000 1.52 +++ UserInterface.py 1 Sep 2005 18:23:45 -0000 1.53 @@ -411,7 +411,7 @@ jobrec['epoch'] = job['epoch'] jobrec['version'] = job['version'] jobrec['release'] = job['release'] - base_url = self._server_cfg.get_str("UI", "log_url") + base_url = self._cfg.get_str("UI", "log_url") target_str = "%s-%s-%s" % (jobrec['target_distro'], jobrec['target_target'], jobrec['target_repo']) log_url = PackageJob.make_job_log_url(base_url, target_str, str(uid), jobrec['package'], jobrec['version'], From fedora-extras-commits at redhat.com Thu Sep 1 18:28:34 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Thu, 1 Sep 2005 14:28:34 -0400 Subject: extras-buildsys/www job.psp,1.11,1.12 Message-ID: <200509011828.j81ISYaT021441@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/www In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21422/www Modified Files: job.psp Log Message: Fix target usage Index: job.psp =================================================================== RCS file: /cvs/fedora/extras-buildsys/www/job.psp,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- job.psp 25 Aug 2005 18:15:14 -0000 1.11 +++ job.psp 1 Sep 2005 18:28:32 -0000 1.12 @@ -41,6 +41,11 @@ else: title = job['package'] # endif + + target_distro = job['target_distro'] + target_target = job['target_target'] + target_repo = job['target_repo'] + target_str = "%s-%s-%s" % (target_distro, target_target, target_repo) %> @@ -49,7 +54,7 @@
      - + From fedora-extras-commits at redhat.com Thu Sep 1 18:45:03 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Thu, 1 Sep 2005 14:45:03 -0400 Subject: extras-buildsys ChangeLog,1.113,1.114 Message-ID: <200509011845.j81Ij31t021685@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21650 Modified Files: ChangeLog Log Message: 2005-09-01 Dan Williams * www/builders.psp - Better unavailable builders display Index: ChangeLog =================================================================== RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v retrieving revision 1.113 retrieving revision 1.114 diff -u -r1.113 -r1.114 --- ChangeLog 31 Aug 2005 19:55:29 -0000 1.113 +++ ChangeLog 1 Sep 2005 18:45:01 -0000 1.114 @@ -1,3 +1,8 @@ +2005-09-01 Dan Williams + + * www/builders.psp + - Better unavailable builders display + 2005-08-31 Dan Williams * server/BuilderManager.py From fedora-extras-commits at redhat.com Thu Sep 1 18:45:03 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Thu, 1 Sep 2005 14:45:03 -0400 Subject: extras-buildsys/www builders.psp,1.9,1.10 Message-ID: <200509011845.j81Ij3J7021691@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/www In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21650/www Modified Files: builders.psp Log Message: 2005-09-01 Dan Williams * www/builders.psp - Better unavailable builders display Index: builders.psp =================================================================== RCS file: /cvs/fedora/extras-buildsys/www/builders.psp,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- builders.psp 31 Aug 2005 19:31:00 -0000 1.9 +++ builders.psp 1 Sep 2005 18:45:01 -0000 1.10 @@ -43,16 +43,18 @@ unavail_color = '' if builder['alive'] == False: unavail_color = 'color="#ff4444"' + slots_text = "unavailable" + else: + num_building = builder['num_slots'] - builder['free_slots'] + slots_text = "%s/%s" % (num_building, builder['num_slots']) # endif - - num_building = builder['num_slots'] - builder['free_slots'] %>
      <%=str(job['uid'])%>: <%=title%>  (<%=job['status']%>)
      Target:<%=str(job['target'])%>
      Target:<%=target_str%>
      Submitter:<%=despam_user(job['username'])%>
      Source:<%=str(job['source'])%>
      Started:<%=str(time.ctime(job['starttime']))%>
      From fedora-extras-commits at redhat.com Thu Sep 1 18:56:08 2005 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Thu, 1 Sep 2005 14:56:08 -0400 Subject: rpms/pam_ssh/devel pam_ssh.spec,1.3,1.4 Message-ID: <200509011856.j81Iu8Vn021749@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/pam_ssh/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21730 Modified Files: pam_ssh.spec Log Message: add a .1 to the release too Index: pam_ssh.spec =================================================================== RCS file: /cvs/extras/rpms/pam_ssh/devel/pam_ssh.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- pam_ssh.spec 26 Aug 2005 21:44:42 -0000 1.3 +++ pam_ssh.spec 1 Sep 2005 18:56:06 -0000 1.4 @@ -1,6 +1,6 @@ Name: pam_ssh Version: 1.91 -Release: 8%{?dist} +Release: 8.1%{?dist} Summary: PAM module for use with SSH keys and ssh-agent Source: http://dl.sourceforge.net/sourceforge/pam-ssh/pam_ssh-%{version}.tar.bz2 URL: http://sourceforge.net/projects/pam-ssh/ From fedora-extras-commits at redhat.com Thu Sep 1 19:54:51 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Thu, 1 Sep 2005 15:54:51 -0400 Subject: extras-buildsys/builder builder.py,1.40,1.41 Message-ID: <200509011954.j81Jspl1023230@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/builder In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23211/builder Modified Files: builder.py Log Message: Clean up more stuff Index: builder.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/builder/builder.py,v retrieving revision 1.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- builder.py 31 Aug 2005 18:29:17 -0000 1.40 +++ builder.py 1 Sep 2005 19:54:49 -0000 1.41 @@ -436,6 +436,11 @@ if self._mock_config.has_key('statedir'): shutil.rmtree(self._mock_config['statedir'], ignore_errors=True) + source_dir = os.path.abspath(os.path.join(self._mock_config['rootdir'], "../source")) + # Ensure we're actually deleteing the job's sourcedir + if source_dir.endswith(os.path.join(self._uniqid, "source")): + shutil.rmtree(source_dir, ignore_errors=True) + def run(self): while True: if self._die: From fedora-extras-commits at redhat.com Thu Sep 1 20:29:33 2005 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Thu, 1 Sep 2005 16:29:33 -0400 Subject: rpms/supertux/FC-3 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 supertux.spec, 1.4, 1.5 Message-ID: <200509012029.j81KTXSF024596@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/supertux/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24571 Modified Files: .cvsignore sources supertux.spec Log Message: Update to 0.1.3. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/supertux/FC-3/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 13 Jan 2005 13:30:45 -0000 1.3 +++ .cvsignore 1 Sep 2005 20:29:31 -0000 1.4 @@ -1 +1 @@ -supertux-0.1.2.tar.bz2 +supertux-0.1.3.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/supertux/FC-3/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 13 Jan 2005 13:30:45 -0000 1.3 +++ sources 1 Sep 2005 20:29:31 -0000 1.4 @@ -1 +1 @@ -7c10acf574f09ae5cb9eb2a4b9bf93ff supertux-0.1.2.tar.bz2 +f2fc288459f33d5cd8f645fbca737a63 supertux-0.1.3.tar.bz2 Index: supertux.spec =================================================================== RCS file: /cvs/extras/rpms/supertux/FC-3/supertux.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- supertux.spec 13 Jan 2005 13:30:45 -0000 1.4 +++ supertux.spec 1 Sep 2005 20:29:31 -0000 1.5 @@ -1,23 +1,23 @@ Name: supertux -Version: 0.1.2 -Release: 1 -Epoch: 0 -Summary: A jump'n run like game similar to Mario Bros +Version: 0.1.3 +Release: 1%{?dist} + +Summary: Jump'n run like game similar to Mario Bros Group: Amusements/Games License: GPL -URL: http://super-tux.sourceforge.net/ -Source0: http://dl.sf.net/super-tux/supertux-0.1.2.tar.bz2 -Source1: %{name}.desktop +URL: http://supertux.berlios.de/ +Source0: http://download.berlios.de/supertux/supertux-%{version}.tar.bz2 +Source1: %{name}.desktop BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: SDL-devel >= 0:1.2.4, SDL_image-devel, SDL_mixer-devel -BuildRequires: zlib-devel, desktop-file-utils +BuildRequires: SDL-devel >= 1.2.4, SDL_image-devel, SDL_mixer-devel +BuildRequires: zlib-devel, desktop-file-utils %description SuperTux is a jump'n run like game, with strong inspiration from the Super Mario Bros games for Nintendo. - + Run and jump through multiple worlds, fighting off enemies by jumping on them or bumping them from below. Grabbing power-ups and other stuff on the way. @@ -47,7 +47,7 @@ rm -rf $RPM_BUILD_ROOT -%files +%files %defattr(-,root,root,-) %doc AUTHORS COPYING ChangeLog NEWS README TODO LEVELDESIGN %{_bindir}/* @@ -56,6 +56,15 @@ %{_datadir}/pixmaps/* %changelog +* Thu Sep 01 2005 Steven Pritchard 0.1.3-1 +- Update to 0.1.3 + +* Sun May 22 2005 Jeremy Katz - 0.1.2-3 +- rebuild on all arches + +* Fri Apr 7 2005 Michael Schwendt +- rebuilt + * Sun Oct 03 2004 Panu Matilainen 0:0.1.2-1 - update to 0.1.2 From fedora-extras-commits at redhat.com Thu Sep 1 20:29:40 2005 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Thu, 1 Sep 2005 16:29:40 -0400 Subject: rpms/supertux/FC-4 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 supertux.spec, 1.7, 1.8 Message-ID: <200509012029.j81KTeEl024627@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/supertux/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24602 Modified Files: .cvsignore sources supertux.spec Log Message: Update to 0.1.3. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/supertux/FC-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 13 Jan 2005 13:30:45 -0000 1.3 +++ .cvsignore 1 Sep 2005 20:29:38 -0000 1.4 @@ -1 +1 @@ -supertux-0.1.2.tar.bz2 +supertux-0.1.3.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/supertux/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 13 Jan 2005 13:30:45 -0000 1.3 +++ sources 1 Sep 2005 20:29:38 -0000 1.4 @@ -1 +1 @@ -7c10acf574f09ae5cb9eb2a4b9bf93ff supertux-0.1.2.tar.bz2 +f2fc288459f33d5cd8f645fbca737a63 supertux-0.1.3.tar.bz2 Index: supertux.spec =================================================================== RCS file: /cvs/extras/rpms/supertux/FC-4/supertux.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- supertux.spec 22 May 2005 22:24:07 -0000 1.7 +++ supertux.spec 1 Sep 2005 20:29:38 -0000 1.8 @@ -1,13 +1,13 @@ Name: supertux -Version: 0.1.2 -Release: 3 +Version: 0.1.3 +Release: 1%{?dist} Summary: Jump'n run like game similar to Mario Bros Group: Amusements/Games License: GPL -URL: http://super-tux.sourceforge.net/ -Source0: http://dl.sf.net/super-tux/supertux-0.1.2.tar.bz2 +URL: http://supertux.berlios.de/ +Source0: http://download.berlios.de/supertux/supertux-%{version}.tar.bz2 Source1: %{name}.desktop BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -56,6 +56,9 @@ %{_datadir}/pixmaps/* %changelog +* Thu Sep 01 2005 Steven Pritchard 0.1.3-1 +- Update to 0.1.3 + * Sun May 22 2005 Jeremy Katz - 0.1.2-3 - rebuild on all arches From fedora-extras-commits at redhat.com Thu Sep 1 20:29:47 2005 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Thu, 1 Sep 2005 16:29:47 -0400 Subject: rpms/supertux/devel .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 supertux.spec, 1.7, 1.8 Message-ID: <200509012029.j81KTlpc024659@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/supertux/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24633 Modified Files: .cvsignore sources supertux.spec Log Message: Update to 0.1.3. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/supertux/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 13 Jan 2005 13:30:45 -0000 1.3 +++ .cvsignore 1 Sep 2005 20:29:45 -0000 1.4 @@ -1 +1 @@ -supertux-0.1.2.tar.bz2 +supertux-0.1.3.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/supertux/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 13 Jan 2005 13:30:45 -0000 1.3 +++ sources 1 Sep 2005 20:29:45 -0000 1.4 @@ -1 +1 @@ -7c10acf574f09ae5cb9eb2a4b9bf93ff supertux-0.1.2.tar.bz2 +f2fc288459f33d5cd8f645fbca737a63 supertux-0.1.3.tar.bz2 Index: supertux.spec =================================================================== RCS file: /cvs/extras/rpms/supertux/devel/supertux.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- supertux.spec 22 May 2005 22:24:07 -0000 1.7 +++ supertux.spec 1 Sep 2005 20:29:45 -0000 1.8 @@ -1,13 +1,13 @@ Name: supertux -Version: 0.1.2 -Release: 3 +Version: 0.1.3 +Release: 1%{?dist} Summary: Jump'n run like game similar to Mario Bros Group: Amusements/Games License: GPL -URL: http://super-tux.sourceforge.net/ -Source0: http://dl.sf.net/super-tux/supertux-0.1.2.tar.bz2 +URL: http://supertux.berlios.de/ +Source0: http://download.berlios.de/supertux/supertux-%{version}.tar.bz2 Source1: %{name}.desktop BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -56,6 +56,9 @@ %{_datadir}/pixmaps/* %changelog +* Thu Sep 01 2005 Steven Pritchard 0.1.3-1 +- Update to 0.1.3 + * Sun May 22 2005 Jeremy Katz - 0.1.2-3 - rebuild on all arches From fedora-extras-commits at redhat.com Thu Sep 1 20:36:14 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Thu, 1 Sep 2005 16:36:14 -0400 Subject: extras-buildsys ChangeLog,1.114,1.115 Message-ID: <200509012036.j81KaESP024856@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24808 Modified Files: ChangeLog Log Message: 2005-09-01 Dan Williams * client/client.py server/Repo.py server/UserInterface.py - Implement package upload functionality using 'scp' as part of the 'build' command Index: ChangeLog =================================================================== RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v retrieving revision 1.114 retrieving revision 1.115 diff -u -r1.114 -r1.115 --- ChangeLog 1 Sep 2005 18:45:01 -0000 1.114 +++ ChangeLog 1 Sep 2005 20:36:12 -0000 1.115 @@ -1,5 +1,13 @@ 2005-09-01 Dan Williams + * client/client.py + server/Repo.py + server/UserInterface.py + - Implement package upload functionality using 'scp' as + part of the 'build' command + +2005-09-01 Dan Williams + * www/builders.psp - Better unavailable builders display From fedora-extras-commits at redhat.com Thu Sep 1 20:36:15 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Thu, 1 Sep 2005 16:36:15 -0400 Subject: extras-buildsys/server Repo.py, 1.15, 1.16 UserInterface.py, 1.53, 1.54 Message-ID: <200509012036.j81KaFlZ024867@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/server In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24808/server Modified Files: Repo.py UserInterface.py Log Message: 2005-09-01 Dan Williams * client/client.py server/Repo.py server/UserInterface.py - Implement package upload functionality using 'scp' as part of the 'build' command Index: Repo.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/Repo.py,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- Repo.py 31 Aug 2005 15:58:52 -0000 1.15 +++ Repo.py 1 Sep 2005 20:36:12 -0000 1.16 @@ -21,6 +21,7 @@ import commands import popen2 import fcntl +import stat import EmailUtils @@ -34,12 +35,22 @@ if not os.path.exists(repodir): print "Error: Repository directory '%s' does not exist." % repodir os._exit(1) - self._repodir = os.path.join(repodir, self._target_cfg.target_string()) + + target_str = self._target_cfg.target_string() + self._repodir = os.path.join(repodir, target_str) if not os.path.exists(self._repodir): os.makedirs(self._repodir) - self._repo_cache_dir = os.path.join(repodir, "cache", self._target_cfg.target_string()) + + self._repo_cache_dir = os.path.join(repodir, "cache", target_str) if not os.path.exists(self._repo_cache_dir): os.makedirs(self._repo_cache_dir) + + parent_cfg = self._target_cfg.parent_cfg() + upload_dir = os.path.join(parent_cfg.get_str("Directories", "server_work_dir"), "srpm_upload_dir", target_str) + if not os.path.exists(upload_dir): + os.makedirs(upload_dir) + os.chmod(upload_dir, stat.S_IRWXU | stat.S_IRWXG | stat.S_IRWXO) + self._lock = threading.Lock() self._repo_additions = [] self._lock_count = 0 Index: UserInterface.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/UserInterface.py,v retrieving revision 1.53 retrieving revision 1.54 diff -u -r1.53 -r1.54 --- UserInterface.py 1 Sep 2005 18:23:45 -0000 1.53 +++ UserInterface.py 1 Sep 2005 20:36:12 -0000 1.54 @@ -499,6 +499,14 @@ dbcx.commit() return (0, "Success.") + def srpm_upload_dir(self, target_alias): + target_cfg = resolve_target(self._cfg, target_alias) + if not target_cfg: + return (-1, "") + target_str = target_cfg.target_string() + work_dir = self._cfg.get_str("Directories", "server_work_dir") + return (0, os.path.join(work_dir, "srpm_upload_dir", target_str)) + def api_version(self): return XMLRPC_API_VERSION @@ -639,6 +647,12 @@ return UserInterface.finish(self, final_uid_list) + def srpm_upload_dir(self, target_alias): + user = AuthedXMLRPCServer.get_authinfo() + if not user or not user.own_jobs: + return (-1, "Insufficient privileges.") + return UserInterface.srpm_upload_dir(self, target_alias) + class UserInterfaceNoAuth(UserInterface): """ From fedora-extras-commits at redhat.com Thu Sep 1 20:36:14 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Thu, 1 Sep 2005 16:36:14 -0400 Subject: extras-buildsys/client client.py,1.30,1.31 Message-ID: <200509012036.j81KaEA5024862@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/client In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24808/client Modified Files: client.py Log Message: 2005-09-01 Dan Williams * client/client.py server/Repo.py server/UserInterface.py - Implement package upload functionality using 'scp' as part of the 'build' command Index: client.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/client/client.py,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- client.py 29 Aug 2005 19:28:45 -0000 1.30 +++ client.py 1 Sep 2005 20:36:12 -0000 1.31 @@ -46,6 +46,8 @@ self.add_section("Server") self.set_option("Server", "use_ssl", "yes") self.set_option("Server", "address", "https://127.0.0.1:8887") + self.set_option("Server", "allow_uploads", "no") + self.set_option("Server", "upload_user", "me") self.add_section("User") self.set_option("User", "email", "foo at it.com") @@ -142,19 +144,69 @@ return cfg_email def _cmd_build(self, args): - if len(args) != 3: + if len(args) != 2 and len(args) != 3: raise CommandException("Invalid command. The 'build' command takes 3 arguments.") - package = args[0] - source = args[1] - target_alias = args[2] + + # Be smart about local SRPMs getting enqueued + if args[0].find('/') != -1 and os.path.exists(args[0]): + # We were given an RPM, find the package name + import rpmUtils + ts = rpmUtils.transaction.initReadOnlyTransaction() + hdr = rpmUtils.miscutils.hdrFromPackage(ts, args[0]) + package = hdr['name'] + source = args[0] + target_alias = args[1] + del hdr + del ts + else: + package = args[0] + source = args[1] + target_alias = args[2] + is_srpm = False if source.endswith(".src.rpm"): if not os.path.exists(source): raise CommandException("The SRPM %s does not exist." % source) - self._enqueue(package, source, target_alias) - - def _enqueue(self, package, source, target_alias): - """ Enqueue a package on the server by CVS tag """ + is_srpm = True + source = os.path.abspath(os.path.expanduser(source)) + self._enqueue(is_srpm, package, source, target_alias) + + def _upload_srpm(self, host, source, target_alias): + # Get the package upload directory from the server + (err, path) = self._server.srpm_upload_dir(target_alias) + if err != 0: + print "Error: Could not upload package %s. " \ + "reason: couldn't get upload dir for %s" % (source, target_alias) + return (-1, source) + + upload_file = os.path.join(path, os.path.basename(source)) + user = None + if self._cfg.has_option("Server", "upload_user"): + user = self._cfg.get_str("Server", "upload_user") + else: + import pwd + user = pwd.getpwuid(os.getuid())[0] + cmd = "/usr/bin/scp %s %s@%s:%s" % (source, user, host, upload_file) + print "Executing: %s" % cmd + os.system(cmd) + return (0, upload_file) + + def _enqueue(self, is_srpm, package, source, target_alias): + """ Enqueue a package on the server """ + + if self._cfg.get_bool("Server", "allow_uploads"): + import urllib + addr = self._cfg.get_str("Server", "address") + if addr.startswith("http") or addr.startswith("https"): + idx = addr.find('//') + addr = addr[idx:] + host_port, path = urllib.splithost(addr) + host, port = urllib.splitport(host_port) + # Don't upload if we're going to scp to the same machine we're on + if is_srpm and socket.gethostname() != host: + (err, source) = self._upload_srpm(host, source, target_alias) + if err == -1: + sys.exit(1) use_ssl = self._cfg.get_bool("Server", "use_ssl") if use_ssl: From fedora-extras-commits at redhat.com Thu Sep 1 20:49:24 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 1 Sep 2005 16:49:24 -0400 Subject: rpms/perl-Class-DBI-Plugin-Type/devel - New directory Message-ID: <200509012049.j81KnOk4024960@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Class-DBI-Plugin-Type/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24935/perl-Class-DBI-Plugin-Type/devel Log Message: Directory /cvs/extras/rpms/perl-Class-DBI-Plugin-Type/devel added to the repository From fedora-extras-commits at redhat.com Thu Sep 1 20:49:24 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 1 Sep 2005 16:49:24 -0400 Subject: rpms/perl-Class-DBI-Plugin-Type - New directory Message-ID: <200509012049.j81KnO7A024955@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Class-DBI-Plugin-Type In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24935/perl-Class-DBI-Plugin-Type Log Message: Directory /cvs/extras/rpms/perl-Class-DBI-Plugin-Type added to the repository From fedora-extras-commits at redhat.com Thu Sep 1 20:49:38 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 1 Sep 2005 16:49:38 -0400 Subject: rpms/perl-Class-DBI-Plugin-Type Makefile, NONE, 1.1 import.log, NONE, 1.1 Message-ID: <200509012049.j81Kncp7025009@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Class-DBI-Plugin-Type In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24980 Added Files: Makefile import.log Log Message: Setup of module perl-Class-DBI-Plugin-Type --- NEW FILE Makefile --- # Top level Makefile for module perl-Class-DBI-Plugin-Type all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Thu Sep 1 20:49:38 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 1 Sep 2005 16:49:38 -0400 Subject: rpms/perl-Class-DBI-Plugin-Type/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200509012049.j81Knc6r025014@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Class-DBI-Plugin-Type/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24980/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-Class-DBI-Plugin-Type --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Thu Sep 1 20:49:58 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 1 Sep 2005 16:49:58 -0400 Subject: rpms/perl-Class-DBI-Plugin-Type import.log,1.1,1.2 Message-ID: <200509012049.j81KnwAI025083@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Class-DBI-Plugin-Type In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25048 Modified Files: import.log Log Message: auto-import perl-Class-DBI-Plugin-Type-0.02-3 on branch devel from perl-Class-DBI-Plugin-Type-0.02-3.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-Class-DBI-Plugin-Type/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 1 Sep 2005 20:49:36 -0000 1.1 +++ import.log 1 Sep 2005 20:49:56 -0000 1.2 @@ -0,0 +1 @@ +perl-Class-DBI-Plugin-Type-0_02-3:HEAD:perl-Class-DBI-Plugin-Type-0.02-3.src.rpm:1125607792 From fedora-extras-commits at redhat.com Thu Sep 1 20:49:59 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 1 Sep 2005 16:49:59 -0400 Subject: rpms/perl-Class-DBI-Plugin-Type/devel perl-Class-DBI-Plugin-Type.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200509012050.j81KnxOM025090@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Class-DBI-Plugin-Type/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25048/devel Modified Files: .cvsignore sources Added Files: perl-Class-DBI-Plugin-Type.spec Log Message: auto-import perl-Class-DBI-Plugin-Type-0.02-3 on branch devel from perl-Class-DBI-Plugin-Type-0.02-3.src.rpm --- NEW FILE perl-Class-DBI-Plugin-Type.spec --- Name: perl-Class-DBI-Plugin-Type Version: 0.02 Release: 3%{?dist} Summary: Determine type information for columns Group: Development/Libraries License: GPL or Artistic URL: http://search.cpan.org/dist/Class-DBI-Plugin-Type Source0: http://search.cpan.org/CPAN/authors/id/S/SI/SIMON/Class-DBI-Plugin-Type-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(Class::DBI::Plugin), perl(DBD::SQLite) Requires: perl(Class::DBI::Plugin) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description %{summary}. %prep %setup -q -n Class-DBI-Plugin-Type-%{version} perldoc -t perlartistic > Artistic perldoc -t perlgpl > COPYING %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' chmod -R u+w $RPM_BUILD_ROOT/* %check make test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc Artistic COPYING Changes %{perl_vendorlib}/Class/DBI/Plugin/ %{_mandir}/man3/*.3* %changelog * Wed Aug 31 2005 Paul Howarth 0.02-3 - remove redundant BR: perl - use %{?_smp_mflags} with make in %%build - include license text - add BR: perl(DBD::SQLite) for %%check * Fri Jul 8 2005 Tom "spot" Callaway 0.02-2 - cleanups * Wed Jul 6 2005 Tom "spot" Callaway 0.02-1 - Initial package for Fedora Extras Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Class-DBI-Plugin-Type/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 1 Sep 2005 20:49:36 -0000 1.1 +++ .cvsignore 1 Sep 2005 20:49:57 -0000 1.2 @@ -0,0 +1 @@ +Class-DBI-Plugin-Type-0.02.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Class-DBI-Plugin-Type/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 1 Sep 2005 20:49:36 -0000 1.1 +++ sources 1 Sep 2005 20:49:57 -0000 1.2 @@ -0,0 +1 @@ +2f80426ccc67629543404ee9376a6d3e Class-DBI-Plugin-Type-0.02.tar.gz From fedora-extras-commits at redhat.com Thu Sep 1 20:55:58 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 1 Sep 2005 16:55:58 -0400 Subject: owners owners.list,1.156,1.157 Message-ID: <200509012055.j81Ktwkx025956@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25937 Modified Files: owners.list Log Message: perl-Class-DBI-Plugin-Type Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.156 retrieving revision 1.157 diff -u -r1.156 -r1.157 --- owners.list 31 Aug 2005 22:55:35 -0000 1.156 +++ owners.list 1 Sep 2005 20:55:56 -0000 1.157 @@ -565,6 +565,7 @@ Fedora Extras|perl-Class-Data-Inheritable|Inheritable, overridable class data|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Class-DBI|Simple Database Abstraction|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Class-DBI-Plugin|Abstract base class for Class::DBI plugins|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-Class-DBI-Plugin-Type|Determine type information for columns|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Class-MethodMaker|Create generic methods for OO Perl|dgregor at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Class-ReturnValue|Class::ReturnValue Perl module|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Class-Trigger|Mixin to add / call inheritable triggers|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com From fedora-extras-commits at redhat.com Thu Sep 1 21:31:09 2005 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Thu, 1 Sep 2005 17:31:09 -0400 Subject: rpms/unison/FC-4 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 unison.spec, 1.13, 1.14 Message-ID: <200509012131.j81LV9Ob027456@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/unison/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27433 Modified Files: .cvsignore sources unison.spec Log Message: new version 2.13.16 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/unison/FC-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 31 Jul 2005 12:38:19 -0000 1.3 +++ .cvsignore 1 Sep 2005 21:31:07 -0000 1.4 @@ -1 +1 @@ -unison-2.12.0.tar.gz +unison-2.13.16.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/unison/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 31 Jul 2005 12:38:19 -0000 1.3 +++ sources 1 Sep 2005 21:31:07 -0000 1.4 @@ -1 +1 @@ -c2b818e77e95951b5db0b95272e385a2 unison-2.12.0.tar.gz +a79bf5f4ebf2a1eaf15b1ac97f827374 unison-2.13.16.tar.gz Index: unison.spec =================================================================== RCS file: /cvs/extras/rpms/unison/FC-4/unison.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- unison.spec 31 Jul 2005 12:39:57 -0000 1.13 +++ unison.spec 1 Sep 2005 21:31:07 -0000 1.14 @@ -1,5 +1,5 @@ Name: unison -Version: 2.12.0 +Version: 2.13.16 Release: 1%{?dist} Summary: File-synchronization tool @@ -7,7 +7,7 @@ Group: Applications/File License: GPL URL: http://www.cis.upenn.edu/~bcpierce/unison -Source: http://www.cis.upenn.edu/~bcpierce/unison/download/releases/stable/unison-2.12.0.tar.gz +Source: http://www.cis.upenn.edu/~bcpierce/unison/download/releases/stable/unison-2.13.16.tar.gz Source1: unison.png BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ocaml >= 3.08, lablgtk >= 2.4.0, tetex-latex @@ -68,6 +68,9 @@ %{_datadir}/pixmaps/* %changelog +* Thu Sep 1 2005 Gerard Milmeister - 2.13.16 +- New Version 2.13.16 + * Sun Jul 31 2005 Gerard Milmeister - 2.12.0-0 - New Version 2.12.0 From fedora-extras-commits at redhat.com Thu Sep 1 21:31:51 2005 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Thu, 1 Sep 2005 17:31:51 -0400 Subject: rpms/unison/FC-3 sources,1.3,1.4 unison.spec,1.7,1.8 Message-ID: <200509012131.j81LVpH2027526@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/unison/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27505 Modified Files: sources unison.spec Log Message: new version 2.13.16 Index: sources =================================================================== RCS file: /cvs/extras/rpms/unison/FC-3/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 4 Aug 2005 07:52:57 -0000 1.3 +++ sources 1 Sep 2005 21:31:49 -0000 1.4 @@ -1 +1 @@ -c2b818e77e95951b5db0b95272e385a2 unison-2.12.0.tar.gz +a79bf5f4ebf2a1eaf15b1ac97f827374 unison-2.13.16.tar.gz Index: unison.spec =================================================================== RCS file: /cvs/extras/rpms/unison/FC-3/unison.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- unison.spec 4 Aug 2005 07:52:57 -0000 1.7 +++ unison.spec 1 Sep 2005 21:31:49 -0000 1.8 @@ -1,5 +1,5 @@ Name: unison -Version: 2.12.0 +Version: 2.13.16 Release: 1%{?dist} Summary: File-synchronization tool @@ -7,7 +7,7 @@ Group: Applications/File License: GPL URL: http://www.cis.upenn.edu/~bcpierce/unison -Source: http://www.cis.upenn.edu/~bcpierce/unison/download/releases/stable/unison-2.12.0.tar.gz +Source: http://www.cis.upenn.edu/~bcpierce/unison/download/releases/stable/unison-2.13.16.tar.gz Source1: unison.png BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ocaml >= 3.08, lablgtk >= 2.4.0, tetex-latex @@ -68,6 +68,9 @@ %{_datadir}/pixmaps/* %changelog +* Thu Sep 1 2005 Gerard Milmeister - 2.13.16 +- New Version 2.13.16 + * Sun Jul 31 2005 Gerard Milmeister - 2.12.0-0 - New Version 2.12.0 From fedora-extras-commits at redhat.com Thu Sep 1 21:32:45 2005 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Thu, 1 Sep 2005 17:32:45 -0400 Subject: rpms/unison/devel sources,1.3,1.4 unison.spec,1.12,1.13 Message-ID: <200509012132.j81LWjkv027591@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/unison/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27570 Modified Files: sources unison.spec Log Message: new version 2.13.16 Index: sources =================================================================== RCS file: /cvs/extras/rpms/unison/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 31 Jul 2005 12:42:18 -0000 1.3 +++ sources 1 Sep 2005 21:32:43 -0000 1.4 @@ -1 +1 @@ -c2b818e77e95951b5db0b95272e385a2 unison-2.12.0.tar.gz +a79bf5f4ebf2a1eaf15b1ac97f827374 unison-2.13.16.tar.gz Index: unison.spec =================================================================== RCS file: /cvs/extras/rpms/unison/devel/unison.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- unison.spec 31 Jul 2005 12:42:18 -0000 1.12 +++ unison.spec 1 Sep 2005 21:32:43 -0000 1.13 @@ -1,5 +1,5 @@ Name: unison -Version: 2.12.0 +Version: 2.13.16 Release: 1%{?dist} Summary: File-synchronization tool @@ -7,7 +7,7 @@ Group: Applications/File License: GPL URL: http://www.cis.upenn.edu/~bcpierce/unison -Source: http://www.cis.upenn.edu/~bcpierce/unison/download/releases/stable/unison-2.12.0.tar.gz +Source: http://www.cis.upenn.edu/~bcpierce/unison/download/releases/stable/unison-2.13.16.tar.gz Source1: unison.png BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ocaml >= 3.08, lablgtk >= 2.4.0, tetex-latex @@ -68,6 +68,9 @@ %{_datadir}/pixmaps/* %changelog +* Thu Sep 1 2005 Gerard Milmeister - 2.13.16 +- New Version 2.13.16 + * Sun Jul 31 2005 Gerard Milmeister - 2.12.0-0 - New Version 2.12.0 From fedora-extras-commits at redhat.com Fri Sep 2 01:30:39 2005 From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh)) Date: Thu, 1 Sep 2005 21:30:39 -0400 Subject: rpms/scim-hangul/FC-3 scim-hangul-0.2.0-ignore-invisible-char.patch, NONE, 1.1 scim-hangul.spec, 1.5, 1.6 Message-ID: <200509020130.j821UdPH000618@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/extras/rpms/scim-hangul/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv596 Modified Files: scim-hangul.spec Added Files: scim-hangul-0.2.0-ignore-invisible-char.patch Log Message: * Fri Sep 2 2005 Akira TAGOH - 0.2.0-5.fc3.1 - scim-hangul-0.2.0-ignore-invisible-char.patch: backported from Core to fix the problem with 3bul Yetgeul. - correct Release. it has to be greater than the previous Release. scim-hangul-0.2.0-ignore-invisible-char.patch: --- NEW FILE scim-hangul-0.2.0-ignore-invisible-char.patch --- diff -ruN --exclude .libs --exclude .deps --exclude 'stamp*' --exclude '*.la' --exclude mozilla --exclude '*o' --exclude POTFILES --exclude '*spec' --exclude 'Makefile*' --exclude 'config*' --exclude libtool scim-hangul-0.2.0.orig/src/hangulinputcontext.c scim-hangul-0.2.0/src/hangulinputcontext.c --- scim-hangul-0.2.0.orig/src/hangulinputcontext.c 2004-12-27 14:19:31.000000000 +0900 +++ scim-hangul-0.2.0/src/hangulinputcontext.c 2005-08-25 13:57:43.000000000 +0900 @@ -93,6 +93,10 @@ { int n = 0; + if (!buffer->choseong && !buffer->jungseong && !buffer->jongseong) { + buf[0] = L'\0'; + return 0; + } if (buffer->choseong) { buf[n++] = buffer->choseong; } else { Index: scim-hangul.spec =================================================================== RCS file: /cvs/extras/rpms/scim-hangul/FC-3/scim-hangul.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- scim-hangul.spec 25 Aug 2005 14:25:30 -0000 1.5 +++ scim-hangul.spec 2 Sep 2005 01:30:37 -0000 1.6 @@ -1,12 +1,13 @@ Name: scim-hangul Version: 0.2.0 -Release: 5.1%{?dist} +Release: 5.%{?dist}.1 License: GPL URL: http://www.scim-im.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildRequires: scim-devel >= 1.2.0 Source0: http://prdownloads.sourceforge.net/scim/%{name}-%{version}.tar.gz +Patch0: scim-hangul-0.2.0-ignore-invisible-char.patch Summary: Hangul Input Method Engine for SCIM @@ -17,11 +18,12 @@ %prep %setup -q -n %{name}-%{version} +%patch0 -p1 -b .invisible-char %build %configure --disable-static -make %{?_smp_mflags} +make %{?_smp_mflags} %install @@ -47,11 +49,16 @@ %changelog +* Fri Sep 2 2005 Akira TAGOH - 0.2.0-5.fc3.1 +- scim-hangul-0.2.0-ignore-invisible-char.patch: backported from Core to fix + the problem with 3bul Yetgeul. +- correct Release. it has to be greater than the previous Release. + * Wed Aug 24 2005 Ryo Dairiki - 0.2.0-5.1 - Minor fixes on spec file -* Tue Aug 23 2005 Akira TAGOH - 0.2.0-5.fc4 -- Imported for FC-4. +* Tue Aug 23 2005 Akira TAGOH - 0.2.0-5.fc3 +- Imported for FC-3. * Tue Aug 16 2005 Akira TAGOH - 0.2.0-4.fc5 - Rebuild. From fedora-extras-commits at redhat.com Fri Sep 2 01:38:48 2005 From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh)) Date: Thu, 1 Sep 2005 21:38:48 -0400 Subject: rpms/scim-hangul/FC-3 scim-hangul.spec,1.6,1.7 Message-ID: <200509020138.j821cmqS000647@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/extras/rpms/scim-hangul/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv628 Modified Files: scim-hangul.spec Log Message: Index: scim-hangul.spec =================================================================== RCS file: /cvs/extras/rpms/scim-hangul/FC-3/scim-hangul.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- scim-hangul.spec 2 Sep 2005 01:30:37 -0000 1.6 +++ scim-hangul.spec 2 Sep 2005 01:38:46 -0000 1.7 @@ -1,6 +1,6 @@ Name: scim-hangul Version: 0.2.0 -Release: 5.%{?dist}.1 +Release: 5%{?dist}.1 License: GPL URL: http://www.scim-im.org/ From fedora-extras-commits at redhat.com Fri Sep 2 01:56:57 2005 From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh)) Date: Thu, 1 Sep 2005 21:56:57 -0400 Subject: rpms/scim-hangul/FC-4 scim-hangul.spec,1.5,1.6 Message-ID: <200509020156.j821uvr7000776@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/extras/rpms/scim-hangul/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv757 Modified Files: scim-hangul.spec Log Message: * Fri Sep 2 2005 Akira TAGOH - 0.2.0-5.2 - scim-hangul-0.2.0-ignore-invisible-char.patch: backported from Core to fix the problem with 3bul Yetgeul. - correct Release. it has to be greater than the previous Release. Index: scim-hangul.spec =================================================================== RCS file: /cvs/extras/rpms/scim-hangul/FC-4/scim-hangul.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- scim-hangul.spec 25 Aug 2005 14:25:07 -0000 1.5 +++ scim-hangul.spec 2 Sep 2005 01:56:55 -0000 1.6 @@ -1,12 +1,13 @@ Name: scim-hangul Version: 0.2.0 -Release: 5.1%{?dist} +Release: 5%{?dist}.2 License: GPL URL: http://www.scim-im.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildRequires: scim-devel >= 1.2.0 Source0: http://prdownloads.sourceforge.net/scim/%{name}-%{version}.tar.gz +Patch0: scim-hangul-0.2.0-ignore-invisible-char.patch Summary: Hangul Input Method Engine for SCIM @@ -17,11 +18,12 @@ %prep %setup -q -n %{name}-%{version} +%patch0 -p1 -b .invisible-char %build %configure --disable-static -make %{?_smp_mflags} +make %{?_smp_mflags} %install @@ -47,11 +49,16 @@ %changelog +* Fri Sep 2 2005 Akira TAGOH - 0.2.0-5.2 +- scim-hangul-0.2.0-ignore-invisible-char.patch: backported from Core to fix + the problem with 3bul Yetgeul. +- correct Release. it has to be greater than the previous Release. + * Wed Aug 24 2005 Ryo Dairiki - 0.2.0-5.1 - Minor fixes on spec file -* Tue Aug 23 2005 Akira TAGOH - 0.2.0-5.fc4 -- Imported for FC-4. +* Tue Aug 23 2005 Akira TAGOH - 0.2.0-5 +- Imported into Extras. * Tue Aug 16 2005 Akira TAGOH - 0.2.0-4.fc5 - Rebuild. From fedora-extras-commits at redhat.com Fri Sep 2 01:58:19 2005 From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh)) Date: Thu, 1 Sep 2005 21:58:19 -0400 Subject: rpms/scim-hangul/FC-3 scim-hangul.spec,1.7,1.8 Message-ID: <200509020158.j821wJPn000801@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/extras/rpms/scim-hangul/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv782 Modified Files: scim-hangul.spec Log Message: Index: scim-hangul.spec =================================================================== RCS file: /cvs/extras/rpms/scim-hangul/FC-3/scim-hangul.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- scim-hangul.spec 2 Sep 2005 01:38:46 -0000 1.7 +++ scim-hangul.spec 2 Sep 2005 01:58:17 -0000 1.8 @@ -1,6 +1,6 @@ Name: scim-hangul Version: 0.2.0 -Release: 5%{?dist}.1 +Release: 5%{?dist}.2 License: GPL URL: http://www.scim-im.org/ @@ -49,7 +49,7 @@ %changelog -* Fri Sep 2 2005 Akira TAGOH - 0.2.0-5.fc3.1 +* Fri Sep 2 2005 Akira TAGOH - 0.2.0-5.2 - scim-hangul-0.2.0-ignore-invisible-char.patch: backported from Core to fix the problem with 3bul Yetgeul. - correct Release. it has to be greater than the previous Release. @@ -57,8 +57,8 @@ * Wed Aug 24 2005 Ryo Dairiki - 0.2.0-5.1 - Minor fixes on spec file -* Tue Aug 23 2005 Akira TAGOH - 0.2.0-5.fc3 -- Imported for FC-3. +* Tue Aug 23 2005 Akira TAGOH - 0.2.0-5 +- Imported into Extras. * Tue Aug 16 2005 Akira TAGOH - 0.2.0-4.fc5 - Rebuild. From fedora-extras-commits at redhat.com Fri Sep 2 02:55:45 2005 From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh)) Date: Thu, 1 Sep 2005 22:55:45 -0400 Subject: rpms/scim-hangul/FC-4 scim-hangul-0.2.0-ignore-invisible-char.patch, NONE, 1.1 Message-ID: <200509020255.j822tjIN002299@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/extras/rpms/scim-hangul/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2279 Added Files: scim-hangul-0.2.0-ignore-invisible-char.patch Log Message: scim-hangul-0.2.0-ignore-invisible-char.patch: --- NEW FILE scim-hangul-0.2.0-ignore-invisible-char.patch --- diff -ruN --exclude .libs --exclude .deps --exclude 'stamp*' --exclude '*.la' --exclude mozilla --exclude '*o' --exclude POTFILES --exclude '*spec' --exclude 'Makefile*' --exclude 'config*' --exclude libtool scim-hangul-0.2.0.orig/src/hangulinputcontext.c scim-hangul-0.2.0/src/hangulinputcontext.c --- scim-hangul-0.2.0.orig/src/hangulinputcontext.c 2004-12-27 14:19:31.000000000 +0900 +++ scim-hangul-0.2.0/src/hangulinputcontext.c 2005-08-25 13:57:43.000000000 +0900 @@ -93,6 +93,10 @@ { int n = 0; + if (!buffer->choseong && !buffer->jungseong && !buffer->jongseong) { + buf[0] = L'\0'; + return 0; + } if (buffer->choseong) { buf[n++] = buffer->choseong; } else { From fedora-extras-commits at redhat.com Fri Sep 2 06:43:42 2005 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Fri, 2 Sep 2005 02:43:42 -0400 Subject: rpms/BibTool - New directory Message-ID: <200509020643.j826hgTH008560@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/BibTool In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8540/BibTool Log Message: Directory /cvs/extras/rpms/BibTool added to the repository From fedora-extras-commits at redhat.com Fri Sep 2 06:43:42 2005 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Fri, 2 Sep 2005 02:43:42 -0400 Subject: rpms/BibTool/devel - New directory Message-ID: <200509020643.j826hgTu008565@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/BibTool/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8540/BibTool/devel Log Message: Directory /cvs/extras/rpms/BibTool/devel added to the repository From fedora-extras-commits at redhat.com Fri Sep 2 06:44:00 2005 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Fri, 2 Sep 2005 02:44:00 -0400 Subject: rpms/BibTool Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200509020644.j826i0Q6008614@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/BibTool In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8585 Added Files: Makefile import.log Log Message: Setup of module BibTool --- NEW FILE Makefile --- # Top level Makefile for module BibTool all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Fri Sep 2 06:44:00 2005 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Fri, 2 Sep 2005 02:44:00 -0400 Subject: rpms/BibTool/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200509020644.j826i0DT008619@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/BibTool/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8585/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module BibTool --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Fri Sep 2 06:44:45 2005 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Fri, 2 Sep 2005 02:44:45 -0400 Subject: rpms/BibTool import.log,1.1,1.2 Message-ID: <200509020645.j826jFLE008702@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/BibTool In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8658 Modified Files: import.log Log Message: auto-import BibTool-2.48-3 on branch devel from BibTool-2.48-3.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/BibTool/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 2 Sep 2005 06:43:58 -0000 1.1 +++ import.log 2 Sep 2005 06:44:42 -0000 1.2 @@ -0,0 +1 @@ +BibTool-2_48-3:HEAD:BibTool-2.48-3.src.rpm:1125643280 From fedora-extras-commits at redhat.com Fri Sep 2 06:44:45 2005 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Fri, 2 Sep 2005 02:44:45 -0400 Subject: rpms/BibTool/devel BibTool.spec, NONE, 1.1 bibtool-AutoConf-makefile.in-honor_DESTDIR.diff, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200509020644.j826ijDY008693@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/BibTool/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8658/devel Modified Files: .cvsignore sources Added Files: BibTool.spec bibtool-AutoConf-makefile.in-honor_DESTDIR.diff Log Message: auto-import BibTool-2.48-3 on branch devel from BibTool-2.48-3.src.rpm --- NEW FILE BibTool.spec --- Summary: A Tool for manipulating BibTeX data bases Name: BibTool Version: 2.48 Release: 3%{?dist} Group: Applications/Publishing Source: ftp://ftp.dante.de/tex-archive/biblio/bibtex/utils/bibtool/BibTool-%{version}.tar.gz URL: http://www.gerd-neugebauer.de/software/TeX/BibTool.en.html Patch: bibtool-AutoConf-makefile.in-honor_DESTDIR.diff License: GPL BuildRequires: tetex-latex BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description BibTeX provides an easy to use means to integrate citations and bibliographies into LaTeX documents. But the user is left alone with the management of the BibTeX files. The program BibTool is intended to fill this gap. BibTool allows the manipulation of BibTeX files which goes beyond the possibilities --- and intentions --- of BibTeX. %prep %setup %patch sed -i -e 's%^#!/usr/local/bin/tclsh%#!/usr/bin/tclsh%' Tcl/bibtool.tcl sed -i -e 's%^#!/usr/local/bin/perl%#!/usr/bin/perl%' Perl/bibtool.pl %build %configure --libdir=%{_datadir} make %{?_smp_mflags} make doc %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT make install-man DESTDIR=$RPM_BUILD_ROOT %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc Changes.xml COPYING INSTALL README THANKS Doc/*.dvi Perl Tcl %{_bindir}/bibtool %{_datadir}/BibTool/ %{_mandir}/man1/bibtool* %changelog * Fri Sep 2 2005 Patrice Dumas 2.48-3 - change shebangs in example scripts * Thu Jul 14 2005 Patrice Dumas 2.48-2 - update to 2.48 - use fedora template * Mon Sep 10 2001 Lenny Cartier 2.44-1mdk - added in contribs by Guillaume Rousse - first mdk release bibtool-AutoConf-makefile.in-honor_DESTDIR.diff: --- NEW FILE bibtool-AutoConf-makefile.in-honor_DESTDIR.diff --- --- AutoConf/makefile.in.save 2005-07-14 11:27:45.000000000 +0200 +++ AutoConf/makefile.in 2005-07-14 11:27:06.000000000 +0200 @@ -499,46 +499,46 @@ install: install.bin install.lib install.bin install-exec: bibtool$(EXT) - -$(INSTALL_DIR) $(BINDIR) - $(INSTALL) bibtool$(EXT) $(BINDIR) + -$(INSTALL_DIR) $(DESTDIR)$(BINDIR) + $(INSTALL) bibtool$(EXT) $(DESTDIR)$(BINDIR) INSTALL_LIB_FILES = Lib$(DIR_SEP)*.* install.lib install-data: - -$(INSTALL_DIR) $(LIBDIR) + -$(INSTALL_DIR) $(DESTDIR)$(LIBDIR) for lib in $(INSTALL_LIB_FILES); do \ - $(INSTALL_DATA) $$lib $(LIBDIR); \ + $(INSTALL_DATA) $$lib $(DESTDIR)$(LIBDIR); \ done INSTALL_INCLUDE_FILES = $(HFILES) install.include install-include: - -$(INSTALL_DIR) $(INCLUDEDIR) + -$(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR) for inc in $(INSTALL_INCLUDE_FILES); do \ - $(INSTALL_DATA) $$inc $(INCLUDEDIR); \ + $(INSTALL_DATA) $$inc $(DESTDIR)$(INCLUDEDIR); \ done install.man install-man: - -$(INSTALL_DIR) $(MANDIR)$(DIR_SEP)man$(MANSECT) + -$(INSTALL_DIR) $(DESTDIR)$(MANDIR)$(DIR_SEP)man$(MANSECT) $(INSTALL) Doc$(DIR_SEP)bibtool.1 \ - $(MANDIR)$(DIR_SEP)man$(MANSECT)$(DIR_SEP)bibtool.$(MANSECT) + $(DESTDIR)$(MANDIR)$(DIR_SEP)man$(MANSECT)$(DIR_SEP)bibtool.$(MANSECT) uninstall: uninstall.bin uninstall.lib uninstall.bin uninstall-exec: - -$(RM) $(BINDIR)$(DIR_SEP)bibtool$(EXT) + -$(RM) $(DESTDIR)$(BINDIR)$(DIR_SEP)bibtool$(EXT) uninstall.lib uninstall-data: - -$(RM) $(LIBDIR) + -$(RM) $(DESTDIR)$(LIBDIR) uninstall.include uninstall-include: - -$(RM) $(INCLUDEDIR) + -$(RM) $(DESTDIR)$(INCLUDEDIR) uninstall.man uninstall-man: - -$(RM) $(MANDIR)$(DIR_SEP)man$(MANSECT)$(DIR_SEP)bibtool.$(MANSECT) + -$(RM) $(DESTDIR)$(MANDIR)$(DIR_SEP)man$(MANSECT)$(DIR_SEP)bibtool.$(MANSECT) status: - @echo $(LIBDIR) + @echo $(DESTDIR)$(LIBDIR) # ============================================================================= # DO NOT DELETE THIS LINE -- make depend depends on it. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/BibTool/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 2 Sep 2005 06:43:58 -0000 1.1 +++ .cvsignore 2 Sep 2005 06:44:43 -0000 1.2 @@ -0,0 +1 @@ +BibTool-2.48.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/BibTool/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 2 Sep 2005 06:43:58 -0000 1.1 +++ sources 2 Sep 2005 06:44:43 -0000 1.2 @@ -0,0 +1 @@ +20ebb18ea55e5f64b67f5b8edaa0d6fa BibTool-2.48.tar.gz From fedora-extras-commits at redhat.com Fri Sep 2 07:15:21 2005 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Fri, 2 Sep 2005 03:15:21 -0400 Subject: rpms/pam_ssh/devel pam_ssh.spec,1.4,1.5 Message-ID: <200509020715.j827FLQt010204@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/pam_ssh/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10148/devel Modified Files: pam_ssh.spec Log Message: Bump release for all the branches to trigger a rebuild Index: pam_ssh.spec =================================================================== RCS file: /cvs/extras/rpms/pam_ssh/devel/pam_ssh.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- pam_ssh.spec 1 Sep 2005 18:56:06 -0000 1.4 +++ pam_ssh.spec 2 Sep 2005 07:15:18 -0000 1.5 @@ -1,6 +1,6 @@ Name: pam_ssh Version: 1.91 -Release: 8.1%{?dist} +Release: 9%{?dist} Summary: PAM module for use with SSH keys and ssh-agent Source: http://dl.sourceforge.net/sourceforge/pam-ssh/pam_ssh-%{version}.tar.bz2 URL: http://sourceforge.net/projects/pam-ssh/ @@ -52,6 +52,9 @@ %dir %{_localstatedir}/run/pam_ssh %changelog +* Fri Sep 2 2005 1.91-9 +- bump release + * Fri Aug 26 2005 1.91-8 - add --with-pam-dir switch for ./configure From fedora-extras-commits at redhat.com Fri Sep 2 07:15:15 2005 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Fri, 2 Sep 2005 03:15:15 -0400 Subject: rpms/pam_ssh/FC-3 pam_ssh.spec,1.4,1.5 Message-ID: <200509020715.j827FjhL010212@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/pam_ssh/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10148/FC-3 Modified Files: pam_ssh.spec Log Message: Bump release for all the branches to trigger a rebuild Index: pam_ssh.spec =================================================================== RCS file: /cvs/extras/rpms/pam_ssh/FC-3/pam_ssh.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- pam_ssh.spec 1 Sep 2005 09:40:09 -0000 1.4 +++ pam_ssh.spec 2 Sep 2005 07:15:13 -0000 1.5 @@ -1,6 +1,6 @@ Name: pam_ssh Version: 1.91 -Release: 8.1%{?dist} +Release: 9%{?dist} Summary: PAM module for use with SSH keys and ssh-agent Source: http://dl.sourceforge.net/sourceforge/pam-ssh/pam_ssh-%{version}.tar.bz2 URL: http://sourceforge.net/projects/pam-ssh/ @@ -52,6 +52,9 @@ %dir %{_localstatedir}/run/pam_ssh %changelog +* Fri Sep 2 2005 1.91-9 +- bump release + * Fri Aug 26 2005 1.91-8 - add --with-pam-dir switch for ./configure From fedora-extras-commits at redhat.com Fri Sep 2 07:15:15 2005 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Fri, 2 Sep 2005 03:15:15 -0400 Subject: rpms/pam_ssh/FC-4 pam_ssh.spec,1.4,1.5 Message-ID: <200509020715.j827Fj3T010215@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/pam_ssh/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10148/FC-4 Modified Files: pam_ssh.spec Log Message: Bump release for all the branches to trigger a rebuild Index: pam_ssh.spec =================================================================== RCS file: /cvs/extras/rpms/pam_ssh/FC-4/pam_ssh.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- pam_ssh.spec 1 Sep 2005 07:33:54 -0000 1.4 +++ pam_ssh.spec 2 Sep 2005 07:15:13 -0000 1.5 @@ -1,6 +1,6 @@ Name: pam_ssh Version: 1.91 -Release: 8.1%{?dist} +Release: 9%{?dist} Summary: PAM module for use with SSH keys and ssh-agent Source: http://dl.sourceforge.net/sourceforge/pam-ssh/pam_ssh-%{version}.tar.bz2 URL: http://sourceforge.net/projects/pam-ssh/ @@ -52,6 +52,9 @@ %dir %{_localstatedir}/run/pam_ssh %changelog +* Fri Sep 2 2005 1.91-9 +- bump release + * Fri Aug 26 2005 1.91-8 - add --with-pam-dir switch for ./configure From fedora-extras-commits at redhat.com Fri Sep 2 10:11:32 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Fri, 2 Sep 2005 06:11:32 -0400 Subject: owners owners.list,1.157,1.158 Message-ID: <200509021011.j82ABW1M015688@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15669 Modified Files: owners.list Log Message: take over libsidplay and xmms-sid from Panu Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.157 retrieving revision 1.158 diff -u -r1.157 -r1.158 --- owners.list 1 Sep 2005 20:55:56 -0000 1.157 +++ owners.list 2 Sep 2005 10:11:29 -0000 1.158 @@ -418,7 +418,7 @@ Fedora Extras|libsafe|For bugs related to the libsafe component|sgrubb at redhat.com|extras-qa at fedoraproject.org|wtogami at redhat.com Fedora Extras|libsamplerate|A library for performing sample rate conversion on audio|anvil at livna.org|extras-qa at fedoraproject.org| Fedora Extras|libshout|icecast source streaming library|thomas at apestaart.org|extras-qa at fedoraproject.org| -Fedora Extras|libsidplay|A Commodore 64 music player and SID chip emulator library|pmatilai at laiskiainen.org|extras-qa at fedoraproject.org| +Fedora Extras|libsidplay|A Commodore 64 music player and SID chip emulator library|bugs.michael at gmx.net|extras-qa at fedoraproject.org| Fedora Extras|libsigc++20|The Typesafe Signal Framework for C++|denisleroy at yahoo.com|extras-qa at fedoraproject.org| Fedora Extras|libsigc++|Typesafe Signal Framework for C++|compton at pcompton.com|extras-qa at fedoraproject.org| Fedora Extras|libsigsegv|Handling page faults in user mode|rdieter at math.unl.edu|extras-qa at fedoraproject.org| @@ -998,7 +998,7 @@ Fedora Extras|xmms-flac|XMMS plugin needed to play FLAC (Free Lossless Audio Codec) files|matthias at rpmforge.net|extras-qa at fedoraproject.org| Fedora Extras|xmms-lirc|Plugin to use LIRC supported infrared devices in XMMS|matthias at rpmforge.net|extras-qa at fedoraproject.org| Fedora Extras|xmms-modplug|Modplug Plugin for XMMS|ville.skytta at iki.fi|extras-qa at fedoraproject.org| -Fedora Extras|xmms-sid|SIDPlay input plugin for X MultiMedia System (XMMS)|pmatilai at laiskiainen.org|extras-qa at fedoraproject.org| +Fedora Extras|xmms-sid|SIDPlay input plugin for X MultiMedia System (XMMS)|bugs.michael at gmx.net|extras-qa at fedoraproject.org| Fedora Extras|xmms-skins|Skins for the X MultiMedia System|matthias at rpmforge.net|extras-qa at fedoraproject.org| Fedora Extras|xmms-speex|X MultiMedia System input plugin to play speex files|matthias at rpmforge.net|extras-qa at fedoraproject.org| Fedora Extras|xmms|The X MultiMedia System, a media player which resembles Winamp|matthias at rpmforge.net|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Fri Sep 2 10:45:35 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Fri, 2 Sep 2005 06:45:35 -0400 Subject: rpms/lighttpd/devel .cvsignore, 1.8, 1.9 lighttpd.spec, 1.12, 1.13 sources, 1.8, 1.9 Message-ID: <200509021045.j82AjZ1h015773@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/lighttpd/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15750 Modified Files: .cvsignore lighttpd.spec sources Log Message: Update to 1.4.3, change install to have modules still work. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/lighttpd/devel/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 30 Aug 2005 16:22:19 -0000 1.8 +++ .cvsignore 2 Sep 2005 10:45:33 -0000 1.9 @@ -1 +1 @@ -lighttpd-1.4.2.tar.gz +lighttpd-1.4.3.tar.gz Index: lighttpd.spec =================================================================== RCS file: /cvs/extras/rpms/lighttpd/devel/lighttpd.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- lighttpd.spec 30 Aug 2005 16:22:19 -0000 1.12 +++ lighttpd.spec 2 Sep 2005 10:45:33 -0000 1.13 @@ -2,7 +2,7 @@ Summary: Lightning fast webserver with light system requirements Name: lighttpd -Version: 1.4.2 +Version: 1.4.3 Release: 1%{?dist} License: BSD Group: System Environment/Daemons @@ -81,8 +81,7 @@ %install %{__rm} -rf %{buildroot} -%makeinstall \ - libdir="%{buildroot}%{_libdir}/lighttpd" +%{__make} install DESTDIR=%{buildroot} # Install included init script and sysconfig entry %{__install} -D -p -m 0755 doc/rc.lighttpd.redhat \ @@ -169,6 +168,11 @@ %changelog +* Fri Sep 2 2005 Matthias Saou 1.4.3-1 +- Update to 1.4.3. +- No longer override libdir at make install stage, use DESTDIR instead, as + the resulting binary would now have referenced to %%{buildroot} :-( + * Tue Aug 30 2005 Matthias Saou 1.4.2-1 - Update to 1.4.2. Index: sources =================================================================== RCS file: /cvs/extras/rpms/lighttpd/devel/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 30 Aug 2005 16:22:19 -0000 1.8 +++ sources 2 Sep 2005 10:45:33 -0000 1.9 @@ -1 +1 @@ -c26eea734490129a45e465ac0f327e4a lighttpd-1.4.2.tar.gz +5a08721c2ea7fbfc6790a1cf0063c8ef lighttpd-1.4.3.tar.gz From fedora-extras-commits at redhat.com Fri Sep 2 10:46:15 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Fri, 2 Sep 2005 06:46:15 -0400 Subject: rpms/inkscape/devel .cvsignore, 1.6, 1.7 inkscape.spec, 1.21, 1.22 sources, 1.6, 1.7 Message-ID: <200509021046.j82AkFJ7015844@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/inkscape/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15821 Modified Files: .cvsignore inkscape.spec sources Log Message: * Thu Sep 1 2005 Michael Schwendt - 0.42.2-1 - update to 0.42.2 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/inkscape/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 26 Jul 2005 01:09:18 -0000 1.6 +++ .cvsignore 2 Sep 2005 10:46:13 -0000 1.7 @@ -1,2 +1,2 @@ -inkscape-0.42.tar.bz2 -inkscape-0.42.tar.bz2.sig +inkscape-0.42.2.tar.bz2 +inkscape-0.42.2.tar.bz2.sig Index: inkscape.spec =================================================================== RCS file: /cvs/extras/rpms/inkscape/devel/inkscape.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- inkscape.spec 18 Aug 2005 21:56:51 -0000 1.21 +++ inkscape.spec 2 Sep 2005 10:46:13 -0000 1.22 @@ -1,6 +1,6 @@ Name: inkscape -Version: 0.42 -Release: 3%{?dist} +Version: 0.42.2 +Release: 1%{?dist} Summary: Vector-based drawing program using SVG Group: Applications/Productivity @@ -104,6 +104,9 @@ %changelog +* Thu Sep 1 2005 Michael Schwendt - 0.42.2-1 +- update to 0.42.2 + * Thu Aug 18 2005 Michael Schwendt - 0.42-3 - rebuilt - add patch to repair link-check of GC >= 6.5 (needs pthread and dl) Index: sources =================================================================== RCS file: /cvs/extras/rpms/inkscape/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 26 Jul 2005 01:09:18 -0000 1.6 +++ sources 2 Sep 2005 10:46:13 -0000 1.7 @@ -1,2 +1,2 @@ -4af587b942647bf9e27861e2238844c8 inkscape-0.42.tar.bz2 -e0a299ff70044fd9a424961bd3ad8c13 inkscape-0.42.tar.bz2.sig +a27172087018e850e92e97e52b5dad08 inkscape-0.42.2.tar.bz2 +40858e2f3f205525929076c9cb3ea075 inkscape-0.42.2.tar.bz2.sig From fedora-extras-commits at redhat.com Fri Sep 2 10:54:48 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Fri, 2 Sep 2005 06:54:48 -0400 Subject: owners owners.list,1.158,1.159 Message-ID: <200509021054.j82Asm9K015917@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15898 Modified Files: owners.list Log Message: wesnoth (Battle for Wesnoth) is without maintainer, although I've developed the package further some time for Panu -- might continue up to 1.0 Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.158 retrieving revision 1.159 diff -u -r1.158 -r1.159 --- owners.list 2 Sep 2005 10:11:29 -0000 1.158 +++ owners.list 2 Sep 2005 10:54:45 -0000 1.159 @@ -947,7 +947,7 @@ Fedora Extras|w3c-markup-validator|W3C Markup Validator|ville.skytta at iki.fi|extras-qa at fedoraproject.org| Fedora Extras|w3m-el|W3m interface for Emacs|tagoh at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|wbxml2|Library and tools to parse, encode and handle WBXML documents|pmatilai at laiskiainen.org|extras-qa at fedoraproject.org| -Fedora Extras|wesnoth|Battle for Wesnoth is a fantasy turn-based strategy game|pmatilai at laiskiainen.org|extras-qa at fedoraproject.org| +Fedora Extras|wesnoth|Battle for Wesnoth is a fantasy turn-based strategy game|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|bugs.michael at gmx.net Fedora Extras|whowatch|Displays informations about the users currently logged in|nos at utelsystems.com|extras-qa at fedoraproject.org| Fedora Extras|WindowMaker|A fast, feature rich Window manager|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org| Fedora Extras|wine|A Windows 16/32 bit emulator|pmatilai at laiskiainen.org|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Fri Sep 2 11:15:35 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Fri, 2 Sep 2005 07:15:35 -0400 Subject: rpms/glibmm24/devel glibmm.spec,1.5,1.6 Message-ID: <200509021115.j82BFZOo017260@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/glibmm24/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17241 Modified Files: glibmm.spec Log Message: * Fri Sep 2 2005 Michael Schwendt - 2.6.1-2 - rebuild for gcc-c++-4.0.1-12 result for GLIBMM_CXX_ALLOWS_STATIC_INLINE_NPOS check changed Index: glibmm.spec =================================================================== RCS file: /cvs/extras/rpms/glibmm24/devel/glibmm.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- glibmm.spec 28 Apr 2005 22:31:10 -0000 1.5 +++ glibmm.spec 2 Sep 2005 11:15:33 -0000 1.6 @@ -1,7 +1,6 @@ Name: glibmm24 Version: 2.6.1 -Release: 1 - +Release: 2 Summary: C++ interface for GTK2 (a GUI library for X) Group: System Environment/Libraries @@ -78,6 +77,10 @@ %{_datadir}/aclocal/*.m4 %changelog +* Fri Sep 2 2005 Michael Schwendt - 2.6.1-2 +- rebuild for gcc-c++-4.0.1-12 + result for GLIBMM_CXX_ALLOWS_STATIC_INLINE_NPOS check changed + * Sat Apr 9 2005 Denis Leroy - 2.6.1-1 - Update to version 2.6.1 From fedora-extras-commits at redhat.com Fri Sep 2 12:16:22 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Fri, 2 Sep 2005 08:16:22 -0400 Subject: rpms/lyx/FC-3 find_helpers.sh,NONE,1.1 lyx.spec,1.9,1.10 Message-ID: <200509021216.j82CGMi8018758@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/lyx/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18708/FC-3 Modified Files: lyx.spec Added Files: find_helpers.sh Log Message: * Fri Sep 02 2005 Rex Dieter 1.3.6-4 - leave out kde-redhat bits in Fedora Extras build - define/use safer (esp for x86_64) QTDIR bits ***** Error reading new file: [Errno 2] No such file or directory: 'find_helpers.sh' Index: lyx.spec =================================================================== RCS file: /cvs/extras/rpms/lyx/FC-3/lyx.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- lyx.spec 23 Aug 2005 15:13:10 -0000 1.9 +++ lyx.spec 2 Sep 2005 12:16:20 -0000 1.10 @@ -2,7 +2,7 @@ Summary: WYSIWYM (What You See Is What You Mean) document processor Name: lyx Version: 1.3.6 -Release: 4%{?dist} +Release: 4%{?dist}%{?kde} License: GPL Group: Applications/Publishing @@ -16,6 +16,10 @@ # "borrow" kde's crystal icon for lyx Source2: lyx-crystal.png +# TODO: use this find_helpers.sh script at runtime, instead of depending on +# lyx's configure and %%triggers +Source10: find_helpers.sh + BuildRequires: desktop-file-utils BuildRequires: aiksaurus-devel BuildRequires: aspell-devel @@ -35,8 +39,11 @@ Requires: htmlview BuildRequires: qt-devel >= 1:3.3 -%define qt_ver %(rpm -q --qf '%%{version}' qt-devel ) +%if "%{?kde}" != "%{nil}" +# kde-redhat crud, not needed in Fedora Extras +%define qt_ver %{expand:%%(rpm -q --qf '%%{VERSION}' qt-devel )} Requires: qt >= 1:%{qt_ver} +%endif %description @@ -65,8 +72,10 @@ %build -unset LINGUAS ||: -unset QTDIR ||: ; . /etc/profile.d/qt.sh +test -f /etc/profile.d/qt.sh && unset QTDIR || : ; . /etc/profile.d/qt.sh +export QTLIB=${QTDIR}/lib;QTINC=${QTDIR}/include + +unset LINGUAS ||: %{?gcc296: export CXXFLAGS="$RPM_OPT_FLAGS -ftemplate-depth-44" } @@ -95,7 +104,7 @@ mv ${RPM_BUILD_ROOT}%{_datadir}/lyx/tex \ ${RPM_BUILD_ROOT}${texmf}/tex/latex/lyx -# KDE has a nice builtin crystalsvg icon, but this is for gnome's benefit +# KDE already has a nice builtin crystalsvg icon, but this is for gnome's benefit install -p -m644 -D %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/pixmaps/lyx.png mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications @@ -152,7 +161,11 @@ %changelog -* Fri Aug 05 2005 Rex Dieter 1.3.6-4 +* Fri Sep 02 2005 Rex Dieter 1.3.6-4 +- leave out kde-redhat bits in Fedora Extras build +- define/use safer (esp for x86_64) QTDIR bits + +* Fri Aug 05 2005 Rex Dieter 1.3.6-3 - touchup helpers script - fix for (sometimes missing) PSres.upr From fedora-extras-commits at redhat.com Fri Sep 2 12:16:23 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Fri, 2 Sep 2005 08:16:23 -0400 Subject: rpms/lyx/devel find_helpers.sh,NONE,1.1 lyx.spec,1.13,1.14 Message-ID: <200509021216.j82CGNkf018770@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/lyx/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18708/devel Modified Files: lyx.spec Added Files: find_helpers.sh Log Message: * Fri Sep 02 2005 Rex Dieter 1.3.6-4 - leave out kde-redhat bits in Fedora Extras build - define/use safer (esp for x86_64) QTDIR bits ***** Error reading new file: [Errno 2] No such file or directory: 'find_helpers.sh' Index: lyx.spec =================================================================== RCS file: /cvs/extras/rpms/lyx/devel/lyx.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- lyx.spec 23 Aug 2005 15:13:09 -0000 1.13 +++ lyx.spec 2 Sep 2005 12:16:21 -0000 1.14 @@ -2,7 +2,7 @@ Summary: WYSIWYM (What You See Is What You Mean) document processor Name: lyx Version: 1.3.6 -Release: 4%{?dist} +Release: 4%{?dist}%{?kde} License: GPL Group: Applications/Publishing @@ -16,6 +16,10 @@ # "borrow" kde's crystal icon for lyx Source2: lyx-crystal.png +# TODO: use this find_helpers.sh script at runtime, instead of depending on +# lyx's configure and %%triggers +Source10: find_helpers.sh + BuildRequires: desktop-file-utils BuildRequires: aiksaurus-devel BuildRequires: aspell-devel @@ -35,8 +39,11 @@ Requires: htmlview BuildRequires: qt-devel >= 1:3.3 -%define qt_ver %(rpm -q --qf '%%{version}' qt-devel ) +%if "%{?kde}" != "%{nil}" +# kde-redhat crud, not needed in Fedora Extras +%define qt_ver %{expand:%%(rpm -q --qf '%%{VERSION}' qt-devel )} Requires: qt >= 1:%{qt_ver} +%endif %description @@ -65,8 +72,10 @@ %build -unset LINGUAS ||: -unset QTDIR ||: ; . /etc/profile.d/qt.sh +test -f /etc/profile.d/qt.sh && unset QTDIR || : ; . /etc/profile.d/qt.sh +export QTLIB=${QTDIR}/lib;QTINC=${QTDIR}/include + +unset LINGUAS ||: %{?gcc296: export CXXFLAGS="$RPM_OPT_FLAGS -ftemplate-depth-44" } @@ -95,7 +104,7 @@ mv ${RPM_BUILD_ROOT}%{_datadir}/lyx/tex \ ${RPM_BUILD_ROOT}${texmf}/tex/latex/lyx -# KDE has a nice builtin crystalsvg icon, but this is for gnome's benefit +# KDE already has a nice builtin crystalsvg icon, but this is for gnome's benefit install -p -m644 -D %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/pixmaps/lyx.png mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications @@ -152,7 +161,11 @@ %changelog -* Fri Aug 05 2005 Rex Dieter 1.3.6-4 +* Fri Sep 02 2005 Rex Dieter 1.3.6-4 +- leave out kde-redhat bits in Fedora Extras build +- define/use safer (esp for x86_64) QTDIR bits + +* Fri Aug 05 2005 Rex Dieter 1.3.6-3 - touchup helpers script - fix for (sometimes missing) PSres.upr From fedora-extras-commits at redhat.com Fri Sep 2 12:16:22 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Fri, 2 Sep 2005 08:16:22 -0400 Subject: rpms/lyx/FC-4 find_helpers.sh,NONE,1.1 lyx.spec,1.12,1.13 Message-ID: <200509021216.j82CGMhv018764@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/lyx/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18708/FC-4 Modified Files: lyx.spec Added Files: find_helpers.sh Log Message: * Fri Sep 02 2005 Rex Dieter 1.3.6-4 - leave out kde-redhat bits in Fedora Extras build - define/use safer (esp for x86_64) QTDIR bits ***** Error reading new file: [Errno 2] No such file or directory: 'find_helpers.sh' Index: lyx.spec =================================================================== RCS file: /cvs/extras/rpms/lyx/FC-4/lyx.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- lyx.spec 23 Aug 2005 15:13:09 -0000 1.12 +++ lyx.spec 2 Sep 2005 12:16:20 -0000 1.13 @@ -2,7 +2,7 @@ Summary: WYSIWYM (What You See Is What You Mean) document processor Name: lyx Version: 1.3.6 -Release: 4%{?dist} +Release: 4%{?dist}%{?kde} License: GPL Group: Applications/Publishing @@ -16,6 +16,10 @@ # "borrow" kde's crystal icon for lyx Source2: lyx-crystal.png +# TODO: use this find_helpers.sh script at runtime, instead of depending on +# lyx's configure and %%triggers +Source10: find_helpers.sh + BuildRequires: desktop-file-utils BuildRequires: aiksaurus-devel BuildRequires: aspell-devel @@ -35,8 +39,11 @@ Requires: htmlview BuildRequires: qt-devel >= 1:3.3 -%define qt_ver %(rpm -q --qf '%%{version}' qt-devel ) +%if "%{?kde}" != "%{nil}" +# kde-redhat crud, not needed in Fedora Extras +%define qt_ver %{expand:%%(rpm -q --qf '%%{VERSION}' qt-devel )} Requires: qt >= 1:%{qt_ver} +%endif %description @@ -65,8 +72,10 @@ %build -unset LINGUAS ||: -unset QTDIR ||: ; . /etc/profile.d/qt.sh +test -f /etc/profile.d/qt.sh && unset QTDIR || : ; . /etc/profile.d/qt.sh +export QTLIB=${QTDIR}/lib;QTINC=${QTDIR}/include + +unset LINGUAS ||: %{?gcc296: export CXXFLAGS="$RPM_OPT_FLAGS -ftemplate-depth-44" } @@ -95,7 +104,7 @@ mv ${RPM_BUILD_ROOT}%{_datadir}/lyx/tex \ ${RPM_BUILD_ROOT}${texmf}/tex/latex/lyx -# KDE has a nice builtin crystalsvg icon, but this is for gnome's benefit +# KDE already has a nice builtin crystalsvg icon, but this is for gnome's benefit install -p -m644 -D %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/pixmaps/lyx.png mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications @@ -152,7 +161,11 @@ %changelog -* Fri Aug 05 2005 Rex Dieter 1.3.6-4 +* Fri Sep 02 2005 Rex Dieter 1.3.6-4 +- leave out kde-redhat bits in Fedora Extras build +- define/use safer (esp for x86_64) QTDIR bits + +* Fri Aug 05 2005 Rex Dieter 1.3.6-3 - touchup helpers script - fix for (sometimes missing) PSres.upr From fedora-extras-commits at redhat.com Fri Sep 2 12:34:43 2005 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Fri, 2 Sep 2005 08:34:43 -0400 Subject: owners owners.list,1.159,1.160 Message-ID: <200509021234.j82CYhHp018853@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18834 Modified Files: owners.list Log Message: New packages: perl-Carp-Assert-More perl-HTML-Scrubber perl-Module-Versions-Report perl-Text-WikiFormat Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.159 retrieving revision 1.160 diff -u -r1.159 -r1.160 --- owners.list 2 Sep 2005 10:54:45 -0000 1.159 +++ owners.list 2 Sep 2005 12:34:41 -0000 1.160 @@ -555,6 +555,7 @@ Fedora Extras|perl-Cache-Cache|Cache-Cache module for perl|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Cache-Simple-TimedExpiry|Cache::Simple::TimedExpiry Perl module|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Carp-Assert|Executable comments|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-Carp-Assert-More|Convenience wrappers around Carp::Assert|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-CGI-Simple|Simple totally OO CGI interface that is CGI.pm compliant|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-CGI-Untaint|Process CGI input parameters|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-CGI-Untaint-date|Validate a date|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com @@ -610,6 +611,7 @@ Fedora Extras|perl-Gtk2|Perl interface to the 2.x series of the Gimp Toolkit library|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Heap|A collection of routines for managing a heap data structure|thm at duke.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-HTML-Format|HTML formatter modules|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-HTML-Scrubber|Library for scrubbing/sanitizing html|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-HTML-Template|Perl module to use HTML Templates|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-HTML-Template-Expr|Expression support extension for HTML::Template|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-HTML-Tree|HTML tree handling modules for Perl|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com @@ -647,6 +649,7 @@ Fedora Extras|perl-Module-CoreList|Perl core modules indexed by perl versions|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Module-Refresh|Refresh %INC files when updated on disk|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Module-Signature|CPAN signature management utilities and modules|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-Module-Versions-Report|Report versions of all modules in memory|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Net-CIDR-Lite|Net::CIDR::Lite perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Net-IP|Perl module for manipulation of IPv4 and IPv6 addresses|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Net-Netmask|Perl module for manipulation and lookup of IP network blocks|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com @@ -697,6 +700,7 @@ Fedora Extras|perl-Text-Reform|Manual text wrapping and reformatting|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Text-Shellwords|A thin wrapper around the shellwords.pl package|thm at duke.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Text-Template|Expand template text with embedded Perl|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-Text-WikiFormat|Translate Wiki formatted text into other formats|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Text-Wrapper|Simple word wrapping perl module|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perltidy|Tool for indenting and reformatting Perl scripts|ville.skytta at iki.fi|extras-qa at fedoraproject.org| Fedora Extras|perl-Tie-DBI|Tie hashes to DBI relational databases|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com From fedora-extras-commits at redhat.com Fri Sep 2 14:35:14 2005 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Fri, 2 Sep 2005 10:35:14 -0400 Subject: rpms/freeciv/devel .cvsignore, 1.7, 1.8 freeciv.spec, 1.14, 1.15 sources, 1.7, 1.8 Message-ID: <200509021435.j82EZEHj021647@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/freeciv/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21624 Modified Files: .cvsignore freeciv.spec sources Log Message: * Fri Sep 2 2005 Brian Pepple - 2.0.5-3 - Update to 2.0.5. - Enable debug info. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/freeciv/devel/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 29 Jul 2005 16:00:46 -0000 1.7 +++ .cvsignore 2 Sep 2005 14:35:12 -0000 1.8 @@ -1,2 +1,2 @@ -freeciv-2.0.4.tar.bz2 +freeciv-2.0.5.tar.bz2 stdsounds3.tar.gz Index: freeciv.spec =================================================================== RCS file: /cvs/extras/rpms/freeciv/devel/freeciv.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- freeciv.spec 17 Aug 2005 00:01:45 -0000 1.14 +++ freeciv.spec 2 Sep 2005 14:35:12 -0000 1.15 @@ -1,6 +1,6 @@ Name: freeciv -Version: 2.0.4 -Release: 4%{?dist} +Version: 2.0.5 +Release: 3%{?dist} Summary: The Freeciv multi-player strategy game Group: Amusements/Games @@ -39,8 +39,7 @@ %patch2 -p0 -b .aifill %build -%configure --enable-debug=no \ - --enable-client=gtk2 +%configure --enable-client=gtk2 make %{?_smp_mflags} %install @@ -91,6 +90,10 @@ %{_mandir}/man6/civclient.6.gz %changelog +* Fri Sep 2 2005 Brian Pepple - 2.0.5-3 +- Update to 2.0.5. +- Enable debug info. + * Tue Aug 16 2005 Brian Pepple - 2.0.4-4 - Rebuild for cairo dep. Index: sources =================================================================== RCS file: /cvs/extras/rpms/freeciv/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 29 Jul 2005 16:00:46 -0000 1.7 +++ sources 2 Sep 2005 14:35:12 -0000 1.8 @@ -1,2 +1,2 @@ -833befa003eefda244f49d349bdb585c freeciv-2.0.4.tar.bz2 +cc224a166f914b3404291c6fe997f90a freeciv-2.0.5.tar.bz2 77215914712f2f351092918f5e41e39e stdsounds3.tar.gz From fedora-extras-commits at redhat.com Fri Sep 2 14:36:50 2005 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Fri, 2 Sep 2005 10:36:50 -0400 Subject: rpms/freeciv/FC-4 .cvsignore, 1.7, 1.8 freeciv.spec, 1.12, 1.13 sources, 1.7, 1.8 Message-ID: <200509021436.j82EaoKc021726@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/freeciv/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21703 Modified Files: .cvsignore freeciv.spec sources Log Message: * Fri Sep 2 2005 Brian Pepple - 2.0.5-2 - Updateto 2.0.5. - Enable debug info. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/freeciv/FC-4/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 29 Jul 2005 16:17:22 -0000 1.7 +++ .cvsignore 2 Sep 2005 14:36:47 -0000 1.8 @@ -1,2 +1,2 @@ -freeciv-2.0.4.tar.bz2 +freeciv-2.0.5.tar.bz2 stdsounds3.tar.gz Index: freeciv.spec =================================================================== RCS file: /cvs/extras/rpms/freeciv/FC-4/freeciv.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- freeciv.spec 29 Jul 2005 16:17:22 -0000 1.12 +++ freeciv.spec 2 Sep 2005 14:36:47 -0000 1.13 @@ -1,6 +1,6 @@ Name: freeciv -Version: 2.0.4 -Release: 1%{?dist} +Version: 2.0.5 +Release: 2%{?dist} Summary: The Freeciv multi-player strategy game Group: Amusements/Games @@ -39,8 +39,7 @@ %patch2 -p0 -b .aifill %build -%configure --enable-debug=no \ - --enable-client=gtk2 +%configure --enable-client=gtk2 make %{?_smp_mflags} %install @@ -91,6 +90,10 @@ %{_mandir}/man6/civclient.6.gz %changelog +* Fri Sep 2 2005 Brian Pepple - 2.0.5-2 +- Updateto 2.0.5. +- Enable debug info. + * Thu Jul 28 2005 Brian Pepple - 2.0.4-1 - Update to 2.0.4. - Use new stdsounds. Index: sources =================================================================== RCS file: /cvs/extras/rpms/freeciv/FC-4/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 29 Jul 2005 16:17:22 -0000 1.7 +++ sources 2 Sep 2005 14:36:48 -0000 1.8 @@ -1,2 +1,2 @@ -833befa003eefda244f49d349bdb585c freeciv-2.0.4.tar.bz2 +cc224a166f914b3404291c6fe997f90a freeciv-2.0.5.tar.bz2 77215914712f2f351092918f5e41e39e stdsounds3.tar.gz From fedora-extras-commits at redhat.com Fri Sep 2 22:28:12 2005 From: fedora-extras-commits at redhat.com (Marc Maurer (uwog)) Date: Fri, 2 Sep 2005 18:28:12 -0400 Subject: rpms/abiword/devel abiword.spec,1.15,1.16 Message-ID: <200509022228.j82MSiwN002668@cvs-int.fedora.redhat.com> Author: uwog Update of /cvs/extras/rpms/abiword/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2649 Modified Files: abiword.spec Log Message: Enable the abimathview plugin Index: abiword.spec =================================================================== RCS file: /cvs/extras/rpms/abiword/devel/abiword.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- abiword.spec 21 Aug 2005 12:40:16 -0000 1.15 +++ abiword.spec 2 Sep 2005 22:28:08 -0000 1.16 @@ -3,7 +3,7 @@ Summary: The AbiWord word processor Name: abiword Version: 2.3.5 -Release: 1 +Release: 2 Epoch: 1 Group: Applications/Editors License: GPL @@ -32,6 +32,7 @@ BuildRequires: libwmf-devel BuildRequires: aiksaurus-gtk-devel >= 1.2.1 BuildRequires: link-grammar-devel >= 4.1.3 +BuildRequires: gtkmathview >= 0.7.3 # gnome build deps BuildRequires: libbonobo-devel @@ -66,7 +67,7 @@ cd ../abiword-plugins libtoolize --copy --force ./nextgen.sh -%configure --disable-gda --disable-abimathview --with-abiword=../abi +%configure --disable-gda --with-abiword=../abi sed 's/^predep_objects=.*/predep_objects=\"\"/' < libtool > libtool.foo sed 's/^postdep_objects=.*/postdep_objects=\"\"/' < libtool.foo > libtool make @@ -132,6 +133,9 @@ %{_datadir}/icons/*png %changelog +* Sat Sep 3 2005 Marc Maurer - 1:2.3.5-1 +- Enable the abimathview plugin + * Sun Aug 21 2005 Marc Maurer - 1:2.3.5-1 - Update to 2.3.5 From fedora-extras-commits at redhat.com Fri Sep 2 22:30:23 2005 From: fedora-extras-commits at redhat.com (Marc Maurer (uwog)) Date: Fri, 2 Sep 2005 18:30:23 -0400 Subject: rpms/abiword/devel abiword.spec,1.16,1.17 Message-ID: <200509022230.j82MUNVg002723@cvs-int.fedora.redhat.com> Author: uwog Update of /cvs/extras/rpms/abiword/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2704 Modified Files: abiword.spec Log Message: rebuild Index: abiword.spec =================================================================== RCS file: /cvs/extras/rpms/abiword/devel/abiword.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- abiword.spec 2 Sep 2005 22:28:08 -0000 1.16 +++ abiword.spec 2 Sep 2005 22:30:21 -0000 1.17 @@ -3,7 +3,7 @@ Summary: The AbiWord word processor Name: abiword Version: 2.3.5 -Release: 2 +Release: 3 Epoch: 1 Group: Applications/Editors License: GPL @@ -133,7 +133,10 @@ %{_datadir}/icons/*png %changelog -* Sat Sep 3 2005 Marc Maurer - 1:2.3.5-1 +* Sat Sep 3 2005 Marc Maurer - 1:2.3.5-3 +- Rebuild + +* Sat Sep 3 2005 Marc Maurer - 1:2.3.5-2 - Enable the abimathview plugin * Sun Aug 21 2005 Marc Maurer - 1:2.3.5-1 From fedora-extras-commits at redhat.com Fri Sep 2 22:45:33 2005 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Fri, 2 Sep 2005 18:45:33 -0400 Subject: rpms/perl-Locale-Maketext-Fuzzy - New directory Message-ID: <200509022245.j82MjX8d002860@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Locale-Maketext-Fuzzy In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2836/perl-Locale-Maketext-Fuzzy Log Message: Directory /cvs/extras/rpms/perl-Locale-Maketext-Fuzzy added to the repository From fedora-extras-commits at redhat.com Fri Sep 2 22:45:34 2005 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Fri, 2 Sep 2005 18:45:34 -0400 Subject: rpms/perl-Locale-Maketext-Fuzzy/devel - New directory Message-ID: <200509022245.j82MjYHm002865@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Locale-Maketext-Fuzzy/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2836/perl-Locale-Maketext-Fuzzy/devel Log Message: Directory /cvs/extras/rpms/perl-Locale-Maketext-Fuzzy/devel added to the repository From fedora-extras-commits at redhat.com Fri Sep 2 22:45:51 2005 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Fri, 2 Sep 2005 18:45:51 -0400 Subject: rpms/perl-Locale-Maketext-Fuzzy Makefile, NONE, 1.1 import.log, NONE, 1.1 Message-ID: <200509022245.j82MjpCa002916@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Locale-Maketext-Fuzzy In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2881 Added Files: Makefile import.log Log Message: Setup of module perl-Locale-Maketext-Fuzzy --- NEW FILE Makefile --- # Top level Makefile for module perl-Locale-Maketext-Fuzzy all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Fri Sep 2 22:45:52 2005 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Fri, 2 Sep 2005 18:45:52 -0400 Subject: rpms/perl-Locale-Maketext-Fuzzy/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200509022245.j82MjqnY002921@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Locale-Maketext-Fuzzy/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2881/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-Locale-Maketext-Fuzzy --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Fri Sep 2 22:46:25 2005 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Fri, 2 Sep 2005 18:46:25 -0400 Subject: rpms/perl-Locale-Maketext-Fuzzy import.log,1.1,1.2 Message-ID: <200509022246.j82MkP52002984@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Locale-Maketext-Fuzzy In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2949 Modified Files: import.log Log Message: auto-import perl-Locale-Maketext-Fuzzy-0.02-1 on branch devel from perl-Locale-Maketext-Fuzzy-0.02-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-Locale-Maketext-Fuzzy/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 2 Sep 2005 22:45:49 -0000 1.1 +++ import.log 2 Sep 2005 22:46:23 -0000 1.2 @@ -0,0 +1 @@ +perl-Locale-Maketext-Fuzzy-0_02-1:HEAD:perl-Locale-Maketext-Fuzzy-0.02-1.src.rpm:1125701174 From fedora-extras-commits at redhat.com Fri Sep 2 22:46:26 2005 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Fri, 2 Sep 2005 18:46:26 -0400 Subject: rpms/perl-Locale-Maketext-Fuzzy/devel perl-Locale-Maketext-Fuzzy.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200509022246.j82MkQiV002991@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Locale-Maketext-Fuzzy/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2949/devel Modified Files: .cvsignore sources Added Files: perl-Locale-Maketext-Fuzzy.spec Log Message: auto-import perl-Locale-Maketext-Fuzzy-0.02-1 on branch devel from perl-Locale-Maketext-Fuzzy-0.02-1.src.rpm --- NEW FILE perl-Locale-Maketext-Fuzzy.spec --- Name: perl-Locale-Maketext-Fuzzy Version: 0.02 Release: 1%{?dist} Summary: Maketext from already interpolated strings Group: Development/Libraries License: GPL or Artistic URL: http://search.cpan.org/dist/Locale-Maketext-Fuzzy/ Source0: http://www.cpan.org/authors/id/A/AU/AUTRIJUS/Locale-Maketext-Fuzzy-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description This module is a subclass of Locale::Maketext, with additional support for localizing messages that already contains interpolated variables. This is most useful when the messages are returned by external modules -- for example, to match "dir: command not foundr" against "[_1]: command not found". %prep %setup -q -n Locale-Maketext-Fuzzy-%{version} %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' chmod -R u+w $RPM_BUILD_ROOT/* %check make test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc Changes README %{perl_vendorlib}/Locale/ %{_mandir}/man3/*.3* %changelog * Thu Aug 11 2005 Jose Pedro Oliveira - 0.02-1 - Update to Fedora Extras template. * Sun Oct 31 2004 Jose Pedro Oliveira - 0:0.02-0.fdr.1 - First build. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Locale-Maketext-Fuzzy/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 2 Sep 2005 22:45:49 -0000 1.1 +++ .cvsignore 2 Sep 2005 22:46:24 -0000 1.2 @@ -0,0 +1 @@ +Locale-Maketext-Fuzzy-0.02.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Locale-Maketext-Fuzzy/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 2 Sep 2005 22:45:49 -0000 1.1 +++ sources 2 Sep 2005 22:46:24 -0000 1.2 @@ -0,0 +1 @@ +0425610d448900a774ed253eb678c559 Locale-Maketext-Fuzzy-0.02.tar.gz From fedora-extras-commits at redhat.com Fri Sep 2 22:49:40 2005 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Fri, 2 Sep 2005 18:49:40 -0400 Subject: rpms/perl-Hook-LexWrap - New directory Message-ID: <200509022249.j82MneSV003092@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Hook-LexWrap In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3072/perl-Hook-LexWrap Log Message: Directory /cvs/extras/rpms/perl-Hook-LexWrap added to the repository From fedora-extras-commits at redhat.com Fri Sep 2 22:49:41 2005 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Fri, 2 Sep 2005 18:49:41 -0400 Subject: rpms/perl-Hook-LexWrap/devel - New directory Message-ID: <200509022249.j82Mnf0b003097@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Hook-LexWrap/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3072/perl-Hook-LexWrap/devel Log Message: Directory /cvs/extras/rpms/perl-Hook-LexWrap/devel added to the repository From fedora-extras-commits at redhat.com Fri Sep 2 22:50:00 2005 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Fri, 2 Sep 2005 18:50:00 -0400 Subject: rpms/perl-Hook-LexWrap Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200509022250.j82Mo0hb003146@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Hook-LexWrap In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3117 Added Files: Makefile import.log Log Message: Setup of module perl-Hook-LexWrap --- NEW FILE Makefile --- # Top level Makefile for module perl-Hook-LexWrap all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Fri Sep 2 22:50:00 2005 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Fri, 2 Sep 2005 18:50:00 -0400 Subject: rpms/perl-Hook-LexWrap/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200509022250.j82Mo0Yo003151@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Hook-LexWrap/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3117/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-Hook-LexWrap --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Fri Sep 2 22:50:34 2005 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Fri, 2 Sep 2005 18:50:34 -0400 Subject: rpms/perl-Hook-LexWrap import.log,1.1,1.2 Message-ID: <200509022251.j82Mp48m003223@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Hook-LexWrap In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3185 Modified Files: import.log Log Message: auto-import perl-Hook-LexWrap-0.20-1 on branch devel from perl-Hook-LexWrap-0.20-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-Hook-LexWrap/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 2 Sep 2005 22:49:58 -0000 1.1 +++ import.log 2 Sep 2005 22:50:32 -0000 1.2 @@ -0,0 +1 @@ +perl-Hook-LexWrap-0_20-1:HEAD:perl-Hook-LexWrap-0.20-1.src.rpm:1125701423 From fedora-extras-commits at redhat.com Fri Sep 2 22:50:34 2005 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Fri, 2 Sep 2005 18:50:34 -0400 Subject: rpms/perl-Hook-LexWrap/devel perl-Hook-LexWrap.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200509022251.j82Mp5EY003227@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Hook-LexWrap/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3185/devel Modified Files: .cvsignore sources Added Files: perl-Hook-LexWrap.spec Log Message: auto-import perl-Hook-LexWrap-0.20-1 on branch devel from perl-Hook-LexWrap-0.20-1.src.rpm --- NEW FILE perl-Hook-LexWrap.spec --- Name: perl-Hook-LexWrap Version: 0.20 Release: 1%{?dist} Summary: Lexically scoped subroutine wrappers Group: Development/Libraries License: GPL or Artistic URL: http://search.cpan.org/dist/Hook-LexWrap/ Source0: http://www.cpan.org/authors/id/D/DC/DCONWAY/Hook-LexWrap-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description Hook::LexWrap allows you to install a pre- or post-wrapper (or both) around an existing subroutine. Unlike other modules that provide this capacity (e.g. Hook::PreAndPost and Hook::WrapSub), Hook::LexWrap implements wrappers in such a way that the standard `caller' function works correctly within the wrapped subroutine. %prep %setup -q -n Hook-LexWrap-%{version} chmod a-x Changes README lib/Hook/*.pm %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' chmod -R u+w $RPM_BUILD_ROOT/* %check make test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc Changes README %{perl_vendorlib}/Hook/ %{_mandir}/man3/*.3* %changelog * Fri Aug 26 2005 Jose Pedro Oliveira - 0.20-1 - First build. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Hook-LexWrap/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 2 Sep 2005 22:49:58 -0000 1.1 +++ .cvsignore 2 Sep 2005 22:50:32 -0000 1.2 @@ -0,0 +1 @@ +Hook-LexWrap-0.20.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Hook-LexWrap/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 2 Sep 2005 22:49:58 -0000 1.1 +++ sources 2 Sep 2005 22:50:32 -0000 1.2 @@ -0,0 +1 @@ +e3aaeb59a3adddc80ed3867e4d16654e Hook-LexWrap-0.20.tar.gz From fedora-extras-commits at redhat.com Sat Sep 3 01:34:13 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Fri, 2 Sep 2005 21:34:13 -0400 Subject: rpms/libnet10/FC-3 libnet10.spec,1.4,1.5 Message-ID: <200509030134.j831YDWq007279@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/libnet10/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7246/FC-3 Modified Files: libnet10.spec Log Message: sync with devel -- in preparation for new libnet-devel version Index: libnet10.spec =================================================================== RCS file: /cvs/extras/rpms/libnet10/FC-3/libnet10.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- libnet10.spec 10 Dec 2004 22:03:05 -0000 1.4 +++ libnet10.spec 3 Sep 2005 01:34:10 -0000 1.5 @@ -1,8 +1,7 @@ -Summary: High-level API (toolkit) allowing the application programmer to construct and inject network packets. +Summary: High-level API (toolkit) to construct and inject network packets Name: libnet10 Version: 1.0.2a -Release: 5 -Epoch: 0 +Release: 8%{?dist} URL: http://www.packetfactory.net/libnet/ License: BSD Group: System Environment/Libraries @@ -10,11 +9,13 @@ Patch0: gcc33.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Obsoletes: libnet < 1.1.0 -Provides: libnet = %{epoch}:%{version}-%{release} +Obsoletes: libnet-devel < 1.1.0 +Provides: libnet = %{version}-%{release} +Provides: libnet-devel = %{version}-%{release} %description Libnet is a high-level API (toolkit) allowing the application programmer to -construct and inject network packets. It provides a portable and simplified +construct and inject network packets. It provides a portable and simplified interface for low-level network packet shaping, handling and injection. Libnet hides much of the tedium of packet creation from the application programmer such as multiplexing, buffer management, arcane packet header information, @@ -35,7 +36,7 @@ %build %configure -make %{?_smp_mflags} +make %{?_smp_mflags} CFLAGS="${RPM_OPT_FLAGS}" @@ -69,6 +70,17 @@ %changelog +* Sun Aug 28 2005 Michael Schwendt - 1.0.2a-8 +- add versioned Obsoletes/Provides for libnet and libnet-devel + so libnet/libnet-devel >= 1.1.0 upgrade this and don't just conflict +- pass CFLAGS to make explicitly + +* Sun May 22 2005 Jeremy Katz - 1.0.2a-7 +- rebuild on all arches + +* Fri Apr 7 2005 Michael Schwendt +- rebuilt + * Wed Sep 17 2003 Phillip Compton - 0:1.0.2a-0.fdr.5 - Fixed last header file permission. From fedora-extras-commits at redhat.com Sat Sep 3 01:34:13 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Fri, 2 Sep 2005 21:34:13 -0400 Subject: rpms/libnet10/FC-4 libnet10.spec,1.7,1.8 Message-ID: <200509030134.j831YD0w007285@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/libnet10/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7246/FC-4 Modified Files: libnet10.spec Log Message: sync with devel -- in preparation for new libnet-devel version Index: libnet10.spec =================================================================== RCS file: /cvs/extras/rpms/libnet10/FC-4/libnet10.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- libnet10.spec 23 May 2005 00:03:09 -0000 1.7 +++ libnet10.spec 3 Sep 2005 01:34:11 -0000 1.8 @@ -1,8 +1,7 @@ Summary: High-level API (toolkit) to construct and inject network packets Name: libnet10 Version: 1.0.2a -Release: 7 - +Release: 8%{?dist} URL: http://www.packetfactory.net/libnet/ License: BSD Group: System Environment/Libraries @@ -10,7 +9,9 @@ Patch0: gcc33.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Obsoletes: libnet < 1.1.0 +Obsoletes: libnet-devel < 1.1.0 Provides: libnet = %{version}-%{release} +Provides: libnet-devel = %{version}-%{release} %description Libnet is a high-level API (toolkit) allowing the application programmer to @@ -35,7 +36,7 @@ %build %configure -make %{?_smp_mflags} +make %{?_smp_mflags} CFLAGS="${RPM_OPT_FLAGS}" @@ -69,6 +70,11 @@ %changelog +* Sun Aug 28 2005 Michael Schwendt - 1.0.2a-8 +- add versioned Obsoletes/Provides for libnet and libnet-devel + so libnet/libnet-devel >= 1.1.0 upgrade this and don't just conflict +- pass CFLAGS to make explicitly + * Sun May 22 2005 Jeremy Katz - 1.0.2a-7 - rebuild on all arches From fedora-extras-commits at redhat.com Sat Sep 3 04:20:59 2005 From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio)) Date: Sat, 3 Sep 2005 00:20:59 -0400 Subject: rpms/pexpect/devel .cvsignore, 1.3, 1.4 pexpect.spec, 1.7, 1.8 sources, 1.3, 1.4 Message-ID: <200509030420.j834Kxme011447@cvs-int.fedora.redhat.com> Author: toshio Update of /cvs/extras/rpms/pexpect/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11424 Modified Files: .cvsignore pexpect.spec sources Log Message: - Update to version 0.99999b. - Add dist tag. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/pexpect/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 8 Nov 2004 05:12:26 -0000 1.3 +++ .cvsignore 3 Sep 2005 04:20:56 -0000 1.4 @@ -1,3 +1,3 @@ -pexpect-0.999.tgz +pexpect-0.99999b.tgz pexpect-doc.tgz pexpect-examples.tgz Index: pexpect.spec =================================================================== RCS file: /cvs/extras/rpms/pexpect/devel/pexpect.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- pexpect.spec 6 Apr 2005 22:13:29 -0000 1.7 +++ pexpect.spec 3 Sep 2005 04:20:56 -0000 1.8 @@ -4,8 +4,8 @@ Summary: Expect module for Python Name: pexpect -Version: 0.999 -Release: 3 +Version: 0.99999b +Release: 1%{?dist} License: PSFL Group: Development/Languages @@ -46,21 +46,9 @@ # needed by the chess* examples.... Moving them to examples for now. cp ANSI.py screen.py FSM.py examples -#touch %{name}-ghost.files -#for file in $(find $RPM_BUILD_ROOT -type f -name "*.py"); do -#for suffix in c o; do -#if [ ! -e "$file$suffix" ]; then -#touch "$file$suffix" -#echo "%ghost $file$suffix" | sed "s|$RPM_BUILD_ROOT||" \ -#>> %{name}-ghost.files -#fi -#done -#done - %clean rm -rf $RPM_BUILD_ROOT -#%files -f %{name}-ghost.files %files %defattr(-,root,root,-) %{python_sitelib}/pexpect.py @@ -70,6 +58,10 @@ %doc README.txt doc examples %changelog +* Fri Sep 2 2005 Toshio Kuratomi 0.99999b +- Update to version 0.99999b. +- Add dist tag. + * Fri Apr 7 2005 Michael Schwendt - rebuilt Index: sources =================================================================== RCS file: /cvs/extras/rpms/pexpect/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 8 Nov 2004 05:12:26 -0000 1.3 +++ sources 3 Sep 2005 04:20:56 -0000 1.4 @@ -1,3 +1,3 @@ -e426e5f54d323aaf392008c9eb35131d pexpect-0.999.tgz +c5435bfd4a3705efdf898b46b344da09 pexpect-0.99999b.tgz 69bfc0056938f561875289651c8715ad pexpect-doc.tgz ee05cad1d7b6b4de0dc74bc16330b852 pexpect-examples.tgz From fedora-extras-commits at redhat.com Sat Sep 3 05:12:49 2005 From: fedora-extras-commits at redhat.com (Tim Lauridsen (timlau)) Date: Sat, 3 Sep 2005 01:12:49 -0400 Subject: rpms/yumex/devel sources,1.3,1.4 yumex.spec,1.3,1.4 Message-ID: <200509030512.j835CnHB012839@cvs-int.fedora.redhat.com> Author: timlau Update of /cvs/extras/rpms/yumex/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12818 Modified Files: sources yumex.spec Log Message: updated devel to 0.42-04 Index: sources =================================================================== RCS file: /cvs/extras/rpms/yumex/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 17 Aug 2005 09:48:39 -0000 1.3 +++ sources 3 Sep 2005 05:12:47 -0000 1.4 @@ -1 +1 @@ -8df6733cf79c6c375341e29d7a37d6ba yumex-0.42-1.tar.gz +01b20730d2f56c0a836c4d17951871d4 yumex-0.42-4.tar.gz Index: yumex.spec =================================================================== RCS file: /cvs/extras/rpms/yumex/devel/yumex.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- yumex.spec 17 Aug 2005 09:48:39 -0000 1.3 +++ yumex.spec 3 Sep 2005 05:12:47 -0000 1.4 @@ -1,8 +1,8 @@ -%define build_v 1 +%define build_v 4 Name: yumex Version: 0.42 -Release: 1.0%{?dist} +Release: 4.0%{?dist} Summary: Yum Extender graphical package management tool Group: Applications/System @@ -67,6 +67,18 @@ %{_datadir}/applications/fedora-%{name}.desktop %changelog +* Tue Aug 30 2005 Tim Lauridsen - 0.42-4.0 +- Release 0.42-4.0 +- Fixed delete repo on repos page. (Rightclick + Delete now working) +- Fixed UTF-8 bugs, when strings are encoded with iso-8859-1. +* Sat Aug 20 2005 Tim Lauridsen - 0.42-3.0 +- Release 0.42-3.0 +- Fixed Dependencies not resolved bug. +* Wed Aug 17 2005 Tim Lauridsen - 0.42-2.0 +- Release 0.42-2.0 +- Fixed TypeError in yumexBase.errorlog in yumbase.py + + * Wed Aug 17 2005 Tim Lauridsen - 0.42-1.0 - Release 0.42 - Added Requires: pygtk2-libglade (Bugzilla 163439) From fedora-extras-commits at redhat.com Sat Sep 3 08:57:34 2005 From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard)) Date: Sat, 3 Sep 2005 04:57:34 -0400 Subject: rpms/perl-Jcode/FC-4 .cvsignore, 1.3, 1.4 perl-Jcode.spec, 1.7, 1.8 sources, 1.3, 1.4 Message-ID: <200509030858.j838w4S0017557@cvs-int.fedora.redhat.com> Author: abompard Update of /cvs/extras/rpms/perl-Jcode/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17515/FC-4 Modified Files: .cvsignore perl-Jcode.spec sources Log Message: - update to 2.03 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Jcode/FC-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 8 Dec 2004 17:46:27 -0000 1.3 +++ .cvsignore 3 Sep 2005 08:57:32 -0000 1.4 @@ -1 +1 @@ -Jcode-0.88.tar.gz +Jcode-2.03.tar.gz Index: perl-Jcode.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Jcode/FC-4/perl-Jcode.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- perl-Jcode.spec 6 Apr 2005 22:13:06 -0000 1.7 +++ perl-Jcode.spec 3 Sep 2005 08:57:32 -0000 1.8 @@ -1,15 +1,13 @@ -%{!?perl_vendorarch: %define perl_vendorarch %(eval "`%{__perl} -V:installvendorarch`"; echo $installvendorarch)} - Name: perl-Jcode -Version: 0.88 -Release: 2 +Version: 2.03 +Release: 1%{?dist} Summary: Perl extension interface for converting Japanese text License: GPL or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Jcode/ -Source0: http://www.cpan.org/authors/id/D/DA/DANKOGAI/Jcode-0.88.tar.gz +Source0: http://www.cpan.org/authors/id/D/DA/DANKOGAI/Jcode-2.03.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: perl >= 1:5.6.1 @@ -25,21 +23,18 @@ %build CFLAGS="$RPM_OPT_FLAGS" %{__perl} Makefile.PL INSTALLDIRS=vendor -%{__perl} -pi -e 's/^\tLD_RUN_PATH=[^\s]+\s*/\t/' Makefile make %{?_smp_mflags} OPTIMIZE="$RPM_OPT_FLAGS" %install rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT -find $RPM_BUILD_ROOT -type f -a \( -name .packlist \ - -o \( -name '*.bs' -a -empty \) -o -name _test.pl -o -name '*_install.pl' \ - \) -exec rm -f {} ';' +find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' +find $RPM_BUILD_ROOT -type f -name '*.bs' -a -size 0 -exec rm -f {} ';' find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' chmod -R u+w $RPM_BUILD_ROOT/* - -%check || : +%check make test @@ -50,12 +45,15 @@ %files %defattr(-,root,root,-) %doc Changes README -%{perl_vendorarch}/auto/Jcode -%{perl_vendorarch}/Jcode* +%{perl_vendorlib}/Jcode* %{_mandir}/man3/*.3* %changelog +* Sat Sep 03 2005 Aurelien Bompard 2.03-1 +- update to 2.03 +- be closer to perl spec template + * Fri Apr 7 2005 Michael Schwendt - rebuilt Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Jcode/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 8 Dec 2004 17:46:27 -0000 1.3 +++ sources 3 Sep 2005 08:57:32 -0000 1.4 @@ -1 +1 @@ -49d4c96b209d3e7feed25b4847ec8fb1 Jcode-0.88.tar.gz +8d285ebf5e5d4f60938829a2c11bdef6 Jcode-2.03.tar.gz From fedora-extras-commits at redhat.com Sat Sep 3 08:57:34 2005 From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard)) Date: Sat, 3 Sep 2005 04:57:34 -0400 Subject: rpms/perl-Jcode/devel .cvsignore, 1.3, 1.4 perl-Jcode.spec, 1.7, 1.8 sources, 1.3, 1.4 Message-ID: <200509030858.j838w5x7017562@cvs-int.fedora.redhat.com> Author: abompard Update of /cvs/extras/rpms/perl-Jcode/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17515/devel Modified Files: .cvsignore perl-Jcode.spec sources Log Message: - update to 2.03 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Jcode/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 8 Dec 2004 17:46:27 -0000 1.3 +++ .cvsignore 3 Sep 2005 08:57:32 -0000 1.4 @@ -1 +1 @@ -Jcode-0.88.tar.gz +Jcode-2.03.tar.gz Index: perl-Jcode.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Jcode/devel/perl-Jcode.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- perl-Jcode.spec 6 Apr 2005 22:13:06 -0000 1.7 +++ perl-Jcode.spec 3 Sep 2005 08:57:32 -0000 1.8 @@ -1,15 +1,13 @@ -%{!?perl_vendorarch: %define perl_vendorarch %(eval "`%{__perl} -V:installvendorarch`"; echo $installvendorarch)} - Name: perl-Jcode -Version: 0.88 -Release: 2 +Version: 2.03 +Release: 1%{?dist} Summary: Perl extension interface for converting Japanese text License: GPL or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Jcode/ -Source0: http://www.cpan.org/authors/id/D/DA/DANKOGAI/Jcode-0.88.tar.gz +Source0: http://www.cpan.org/authors/id/D/DA/DANKOGAI/Jcode-2.03.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: perl >= 1:5.6.1 @@ -25,21 +23,18 @@ %build CFLAGS="$RPM_OPT_FLAGS" %{__perl} Makefile.PL INSTALLDIRS=vendor -%{__perl} -pi -e 's/^\tLD_RUN_PATH=[^\s]+\s*/\t/' Makefile make %{?_smp_mflags} OPTIMIZE="$RPM_OPT_FLAGS" %install rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT -find $RPM_BUILD_ROOT -type f -a \( -name .packlist \ - -o \( -name '*.bs' -a -empty \) -o -name _test.pl -o -name '*_install.pl' \ - \) -exec rm -f {} ';' +find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' +find $RPM_BUILD_ROOT -type f -name '*.bs' -a -size 0 -exec rm -f {} ';' find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' chmod -R u+w $RPM_BUILD_ROOT/* - -%check || : +%check make test @@ -50,12 +45,15 @@ %files %defattr(-,root,root,-) %doc Changes README -%{perl_vendorarch}/auto/Jcode -%{perl_vendorarch}/Jcode* +%{perl_vendorlib}/Jcode* %{_mandir}/man3/*.3* %changelog +* Sat Sep 03 2005 Aurelien Bompard 2.03-1 +- update to 2.03 +- be closer to perl spec template + * Fri Apr 7 2005 Michael Schwendt - rebuilt Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Jcode/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 8 Dec 2004 17:46:27 -0000 1.3 +++ sources 3 Sep 2005 08:57:32 -0000 1.4 @@ -1 +1 @@ -49d4c96b209d3e7feed25b4847ec8fb1 Jcode-0.88.tar.gz +8d285ebf5e5d4f60938829a2c11bdef6 Jcode-2.03.tar.gz From fedora-extras-commits at redhat.com Sat Sep 3 10:13:35 2005 From: fedora-extras-commits at redhat.com (Dawid Gajownik (gajownik)) Date: Sat, 3 Sep 2005 06:13:35 -0400 Subject: rpms/gajim import.log,1.2,1.3 Message-ID: <200509031013.j83ADZhM020386@cvs-int.fedora.redhat.com> Author: gajownik Update of /cvs/extras/rpms/gajim In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20350 Modified Files: import.log Log Message: auto-import gajim-0.8.1-1 on branch devel from gajim-0.8.1-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/gajim/import.log,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- import.log 24 Aug 2005 13:09:53 -0000 1.2 +++ import.log 3 Sep 2005 10:13:33 -0000 1.3 @@ -1 +1,2 @@ gajim-0_8-2:HEAD:gajim-0.8-2.src.rpm:1124889138 +gajim-0_8_1-1:HEAD:gajim-0.8.1-1.src.rpm:1125742592 From fedora-extras-commits at redhat.com Sat Sep 3 10:13:35 2005 From: fedora-extras-commits at redhat.com (Dawid Gajownik (gajownik)) Date: Sat, 3 Sep 2005 06:13:35 -0400 Subject: rpms/gajim/devel gajim-0.8.1.remote.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 gajim.spec, 1.4, 1.5 sources, 1.2, 1.3 gajim-0.8.remote.patch, 1.1, NONE gajim-remote.py, 1.1, NONE Message-ID: <200509031013.j83ADZh2020395@cvs-int.fedora.redhat.com> Author: gajownik Update of /cvs/extras/rpms/gajim/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20350/devel Modified Files: .cvsignore gajim.spec sources Added Files: gajim-0.8.1.remote.patch Removed Files: gajim-0.8.remote.patch gajim-remote.py Log Message: auto-import gajim-0.8.1-1 on branch devel from gajim-0.8.1-1.src.rpm gajim-0.8.1.remote.patch: --- NEW FILE gajim-0.8.1.remote.patch --- diff -Nurp gajim-0.8.1.orig/scripts/gajim-remote gajim-0.8.1/scripts/gajim-remote --- gajim-0.8.1.orig/scripts/gajim-remote 2005-09-02 16:06:46.000000000 +0200 +++ gajim-0.8.1/scripts/gajim-remote 2005-09-03 11:04:13.000000000 +0200 @@ -22,6 +22,6 @@ if [ `id -u` -eq 0 ]; then echo "You must not launch gajim-remote as root, it is INSECURE" fi -cd PREFIX/share/gajim/scripts +cd PREFIX/share/gajim/src export PYTHONPATH="$PYTHONPATH:PREFIXLIB/gajim" python gajim-remote.py $@ diff -Nurp gajim-0.8.1.orig/scripts/gajim-remote.py gajim-0.8.1/scripts/gajim-remote.py --- gajim-0.8.1.orig/scripts/gajim-remote.py 2005-09-02 16:06:46.000000000 +0200 +++ gajim-0.8.1/scripts/gajim-remote.py 2005-09-03 11:05:11.000000000 +0200 @@ -32,7 +32,7 @@ import signal signal.signal(signal.SIGINT, signal.SIG_DFL) # ^C exits the application -import i18n +from common import i18n _ = i18n._ i18n.init() Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gajim/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 24 Aug 2005 13:09:53 -0000 1.2 +++ .cvsignore 3 Sep 2005 10:13:33 -0000 1.3 @@ -1 +1 @@ -gajim-0.8.tar.bz2 +gajim-0.8.1.tar.bz2 Index: gajim.spec =================================================================== RCS file: /cvs/extras/rpms/gajim/devel/gajim.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- gajim.spec 24 Aug 2005 18:56:35 -0000 1.4 +++ gajim.spec 3 Sep 2005 10:13:33 -0000 1.5 @@ -2,19 +2,17 @@ %define use_internal_modules 0 Name: gajim -Version: 0.8 -Release: 5%{?dist} +Version: 0.8.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 -# http://trac.gajim.org/file/trunk/scripts/gajim-remote.py?rev=3170&format=raw -Source1: http://trac.gajim.org/file/trunk/scripts/gajim-remote.py Patch0: gajim-0.8.cflags.patch Patch1: gajim-0.8.po.patch -Patch2: gajim-0.8.remote.patch +Patch2: gajim-0.8.1.remote.patch Patch3: gajim-0.8.aplay.patch Patch4: gajim-0.8.x86_64.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -79,11 +77,15 @@ --delete-original \ %{buildroot}%{_datadir}/applications/gajim.desktop +# These lines and gajim-0.8.1.remote.patch are a workaround +# for broken i18n module import +mv %{buildroot}%{_datadir}/gajim/scripts/gajim-remote.py \ + %{buildroot}%{_datadir}/gajim/src/gajim-remote.py +rmdir %{buildroot}%{_datadir}/gajim/scripts + + %find_lang %{name} -install -p -m 0755 %{SOURCE1} %{buildroot}%{_datadir}/gajim/src -sed -e 's/^import i18n$/from common import i18n/g' -i \ - %{buildroot}%{_datadir}/gajim/src/gajim-remote.py %clean rm -rf %{buildroot} @@ -101,6 +103,10 @@ %{_mandir}/man1/gajim* %changelog +* Sat Sep 3 2005 Dawid Gajownik - 0.8.1-1 +- Version 0.8.1 +- drop gajim-remote.py file (included in tarball) + * Wed Aug 24 2005 Dawid Gajownik - 0.8-5 - Don't build internal modules Index: sources =================================================================== RCS file: /cvs/extras/rpms/gajim/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 24 Aug 2005 13:09:53 -0000 1.2 +++ sources 3 Sep 2005 10:13:33 -0000 1.3 @@ -1 +1 @@ -1f9b4864c56d744d1e6f1c0b42afc4e9 gajim-0.8.tar.bz2 +d4cbbd64078b9c93fdd1492c27dbcdab gajim-0.8.1.tar.bz2 --- gajim-0.8.remote.patch DELETED --- --- gajim-remote.py DELETED --- From fedora-extras-commits at redhat.com Sat Sep 3 10:16:55 2005 From: fedora-extras-commits at redhat.com (Dawid Gajownik (gajownik)) Date: Sat, 3 Sep 2005 06:16:55 -0400 Subject: rpms/gajim import.log,1.3,1.4 Message-ID: <200509031017.j83AHQ8p020515@cvs-int.fedora.redhat.com> Author: gajownik Update of /cvs/extras/rpms/gajim In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20474 Modified Files: import.log Log Message: auto-import gajim-0.8.1-1 on branch FC-4 from gajim-0.8.1-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/gajim/import.log,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- import.log 3 Sep 2005 10:13:33 -0000 1.3 +++ import.log 3 Sep 2005 10:16:53 -0000 1.4 @@ -1,2 +1,3 @@ gajim-0_8-2:HEAD:gajim-0.8-2.src.rpm:1124889138 gajim-0_8_1-1:HEAD:gajim-0.8.1-1.src.rpm:1125742592 +gajim-0_8_1-1:FC-4:gajim-0.8.1-1.src.rpm:1125742792 From fedora-extras-commits at redhat.com Sat Sep 3 10:16:56 2005 From: fedora-extras-commits at redhat.com (Dawid Gajownik (gajownik)) Date: Sat, 3 Sep 2005 06:16:56 -0400 Subject: rpms/gajim/FC-4 gajim-0.8.1.remote.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 gajim.spec, 1.4, 1.5 sources, 1.2, 1.3 gajim-0.8.remote.patch, 1.1, NONE gajim-remote.py, 1.1, NONE Message-ID: <200509031017.j83AHQwS020520@cvs-int.fedora.redhat.com> Author: gajownik Update of /cvs/extras/rpms/gajim/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20474/FC-4 Modified Files: .cvsignore gajim.spec sources Added Files: gajim-0.8.1.remote.patch Removed Files: gajim-0.8.remote.patch gajim-remote.py Log Message: auto-import gajim-0.8.1-1 on branch FC-4 from gajim-0.8.1-1.src.rpm gajim-0.8.1.remote.patch: --- NEW FILE gajim-0.8.1.remote.patch --- diff -Nurp gajim-0.8.1.orig/scripts/gajim-remote gajim-0.8.1/scripts/gajim-remote --- gajim-0.8.1.orig/scripts/gajim-remote 2005-09-02 16:06:46.000000000 +0200 +++ gajim-0.8.1/scripts/gajim-remote 2005-09-03 11:04:13.000000000 +0200 @@ -22,6 +22,6 @@ if [ `id -u` -eq 0 ]; then echo "You must not launch gajim-remote as root, it is INSECURE" fi -cd PREFIX/share/gajim/scripts +cd PREFIX/share/gajim/src export PYTHONPATH="$PYTHONPATH:PREFIXLIB/gajim" python gajim-remote.py $@ diff -Nurp gajim-0.8.1.orig/scripts/gajim-remote.py gajim-0.8.1/scripts/gajim-remote.py --- gajim-0.8.1.orig/scripts/gajim-remote.py 2005-09-02 16:06:46.000000000 +0200 +++ gajim-0.8.1/scripts/gajim-remote.py 2005-09-03 11:05:11.000000000 +0200 @@ -32,7 +32,7 @@ import signal signal.signal(signal.SIGINT, signal.SIG_DFL) # ^C exits the application -import i18n +from common import i18n _ = i18n._ i18n.init() Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gajim/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 24 Aug 2005 13:09:53 -0000 1.2 +++ .cvsignore 3 Sep 2005 10:16:54 -0000 1.3 @@ -1 +1 @@ -gajim-0.8.tar.bz2 +gajim-0.8.1.tar.bz2 Index: gajim.spec =================================================================== RCS file: /cvs/extras/rpms/gajim/FC-4/gajim.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- gajim.spec 24 Aug 2005 18:58:51 -0000 1.4 +++ gajim.spec 3 Sep 2005 10:16:54 -0000 1.5 @@ -2,19 +2,17 @@ %define use_internal_modules 0 Name: gajim -Version: 0.8 -Release: 5%{?dist} +Version: 0.8.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 -# http://trac.gajim.org/file/trunk/scripts/gajim-remote.py?rev=3170&format=raw -Source1: http://trac.gajim.org/file/trunk/scripts/gajim-remote.py Patch0: gajim-0.8.cflags.patch Patch1: gajim-0.8.po.patch -Patch2: gajim-0.8.remote.patch +Patch2: gajim-0.8.1.remote.patch Patch3: gajim-0.8.aplay.patch Patch4: gajim-0.8.x86_64.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -79,11 +77,15 @@ --delete-original \ %{buildroot}%{_datadir}/applications/gajim.desktop +# These lines and gajim-0.8.1.remote.patch are a workaround +# for broken i18n module import +mv %{buildroot}%{_datadir}/gajim/scripts/gajim-remote.py \ + %{buildroot}%{_datadir}/gajim/src/gajim-remote.py +rmdir %{buildroot}%{_datadir}/gajim/scripts + + %find_lang %{name} -install -p -m 0755 %{SOURCE1} %{buildroot}%{_datadir}/gajim/src -sed -e 's/^import i18n$/from common import i18n/g' -i \ - %{buildroot}%{_datadir}/gajim/src/gajim-remote.py %clean rm -rf %{buildroot} @@ -101,6 +103,10 @@ %{_mandir}/man1/gajim* %changelog +* Sat Sep 3 2005 Dawid Gajownik - 0.8.1-1 +- Version 0.8.1 +- drop gajim-remote.py file (included in tarball) + * Wed Aug 24 2005 Dawid Gajownik - 0.8-5 - Don't build internal modules Index: sources =================================================================== RCS file: /cvs/extras/rpms/gajim/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 24 Aug 2005 13:09:53 -0000 1.2 +++ sources 3 Sep 2005 10:16:54 -0000 1.3 @@ -1 +1 @@ -1f9b4864c56d744d1e6f1c0b42afc4e9 gajim-0.8.tar.bz2 +d4cbbd64078b9c93fdd1492c27dbcdab gajim-0.8.1.tar.bz2 --- gajim-0.8.remote.patch DELETED --- --- gajim-remote.py DELETED --- From fedora-extras-commits at redhat.com Sat Sep 3 10:51:10 2005 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Sat, 3 Sep 2005 06:51:10 -0400 Subject: owners owners.list,1.160,1.161 Message-ID: <200509031051.j83ApAK1020703@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20681 Modified Files: owners.list Log Message: Add BibTool Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.160 retrieving revision 1.161 diff -u -r1.160 -r1.161 --- owners.list 2 Sep 2005 12:34:41 -0000 1.160 +++ owners.list 3 Sep 2005 10:51:08 -0000 1.161 @@ -47,6 +47,7 @@ Fedora Extras|bazaar|A distributed revision control system|shahms at shahms.com|extras-qa at fedoraproject.org| Fedora Extras|bbkeys|Completely configurable key-combo grabber for blackbox|matthias at rpmforge.net|extras-qa at fedoraproject.org| Fedora Extras|bchunk|CD image format converter from .bin/.cue to .iso/.cdr|bugs.michael at gmx.net|extras-qa at fedoraproject.org| +Fedora Extras|BibTool|A Tool for manipulating BibTeX data bases|pertusus at free.fr|extras-qa at fedoraproject.org| Fedora Extras|bin2iso|Convert ".bin" files into ISO or WAV|anvil at livna.org|extras-qa at fedoraproject.org| Fedora Extras|bittorrent|BitTorrent swarming network file transfer tool|paul at city-fan.org|extras-qa at fedoraproject.org| Fedora Extras|blackbox|Very small and fast Window Manager|matthias at rpmforge.net|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Sat Sep 3 14:13:06 2005 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Sat, 3 Sep 2005 10:13:06 -0400 Subject: rpms/nexuiz-data/devel .cvsignore, 1.2, 1.3 nexuiz-data.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200509031413.j83ED6L0026050@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/rpms/nexuiz-data/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26027 Modified Files: .cvsignore nexuiz-data.spec sources Log Message: * Fri Sep 02 2005 Adrian Reber - 1.2-1 - updated to 1.2 - included serverfix12.zip Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/nexuiz-data/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Jul 2005 21:57:05 -0000 1.2 +++ .cvsignore 3 Sep 2005 14:13:03 -0000 1.3 @@ -1 +1,2 @@ -nexuiz-data-1.1.tar +nexuiz-data-1.2.tar +serverfix12.zip Index: nexuiz-data.spec =================================================================== RCS file: /cvs/extras/rpms/nexuiz-data/devel/nexuiz-data.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- nexuiz-data.spec 8 Jul 2005 21:57:05 -0000 1.1 +++ nexuiz-data.spec 3 Sep 2005 14:13:03 -0000 1.2 @@ -1,20 +1,21 @@ -%define datadate 20050703 +%define datadate 20050818 Summary: Game data for the Nexuiz first person shooter Name: nexuiz-data -Version: 1.1 +Version: 1.2 Release: 1 License: GPL Group: Amusements/Games URL: http://www.nexuiz.com/ # Source is custom, obtained with : # wget http://dl.sf.net/sourceforge/nexuiz/nexuiz11.zip -# unzip nexuiz11.zip -# mkdir nexuiz-data-1.1/ -# mv Nexuiz/data/ Nexuiz/Readme.htm Nexuiz/sources/darkplaces/COPYING \ -# nexuiz-data-1.1/ -# tar cvf nexuiz-data-1.1.tar nexuiz-data-1.1/ -Source: nexuiz-data-%{version}.tar +# unzip nexuiz12.zip +# mkdir nexuiz-data-1.2/ +# mv Nexuiz/data/ Nexuiz/Readme.htm Nexuiz/gpl.txt \ +# nexuiz-data-1.2/ +# tar cvf nexuiz-data-1.2.tar nexuiz-data-1.2/ +Source0: nexuiz-data-%{version}.tar +Source1: http://dl.sf.net/sourceforge/nexuiz/serverfix12.zip BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -23,28 +24,34 @@ focused on providing basic, old style deathmatches. Data (textures, maps, sounds and models) required to play nexuiz. -This includes 17 maps, 28 playable characters and 10 music tracks. %prep %setup -q %{__sed} -i 's/\r//' Readme.htm +%{__unzip} %{SOURCE1} data/data20050830.pk3 %build %install %{__rm} -rf %{buildroot} -%{__install} -D -p data/data%{datadate}.pk3 \ - %{buildroot}%{_datadir}/nexuiz/data/data%{datadate}.pk3 +%{__mkdir_p} %{buildroot}%{_datadir}/nexuiz/data/ +%{__install} -p data/data%{datadate}-full.pk3 \ + data/data20050830.pk3 \ + %{buildroot}%{_datadir}/nexuiz/data/ %clean %{__rm} -rf %{buildroot} %files %defattr(0644, root, root, 0755) -%doc Readme.htm COPYING +%doc Readme.htm gpl.txt cvars.txt mapping.txt %{_datadir}/nexuiz/ %changelog +* Fri Sep 02 2005 Adrian Reber - 1.2-1 +- updated to 1.2 +- included serverfix12.zip + * Fri Jul 8 2005 Matthias Saou 1.1-0 - Split off data from the main package, will make fixing the binaries much easier and allow sharing this noarch package between archs. It also avoids Index: sources =================================================================== RCS file: /cvs/extras/rpms/nexuiz-data/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Jul 2005 21:57:05 -0000 1.2 +++ sources 3 Sep 2005 14:13:03 -0000 1.3 @@ -1 +1,2 @@ -c177cce8cf6ac9134d1d9b8a08dc3272 nexuiz-data-1.1.tar +d6cc369900e6356a21daf4b95297c7f3 nexuiz-data-1.2.tar +6e5f8fe6b9933f628779121eb31c9550 serverfix12.zip From fedora-extras-commits at redhat.com Sat Sep 3 14:14:04 2005 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Sat, 3 Sep 2005 10:14:04 -0400 Subject: rpms/nexuiz/devel .cvsignore, 1.2, 1.3 nexuiz.spec, 1.3, 1.4 sources, 1.2, 1.3 Message-ID: <200509031414.j83EE4tW026113@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/rpms/nexuiz/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26090 Modified Files: .cvsignore nexuiz.spec sources Log Message: * Fri Sep 02 2005 Adrian Reber - 1.2-1 - updated to 1.2 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/nexuiz/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 9 Jul 2005 11:59:33 -0000 1.2 +++ .cvsignore 3 Sep 2005 14:14:02 -0000 1.3 @@ -1 +1 @@ -nexuiz-1.1.tar.bz2 +nexuizenginesource20050814beta1.zip Index: nexuiz.spec =================================================================== RCS file: /cvs/extras/rpms/nexuiz/devel/nexuiz.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- nexuiz.spec 16 Aug 2005 08:15:54 -0000 1.3 +++ nexuiz.spec 3 Sep 2005 14:14:02 -0000 1.4 @@ -1,17 +1,14 @@ Summary: Multiplayer, deathmatch oriented first person shooter Name: nexuiz -Version: 1.1 -Release: 2%{?dist} +Version: 1.2 +Release: 1%{?dist} License: GPL Group: Amusements/Games URL: http://www.nexuiz.com/ # Source is custom, obtained with : -# wget http://dl.sf.net/sourceforge/nexuiz/nexuiz11.zip -# unzip nexuiz11.zip -# mkdir nexuiz-1.1/ -# mv Nexuiz/sources/darkplaces/* Nexuiz/Readme.htm nexuiz-1.1/ -# tar cjvf nexuiz-1.1.tar.bz2 nexuiz-1.1/ -Source: nexuiz-%{version}.tar.bz2 +# wget http://dl.sf.net/sourceforge/nexuiz/nexuiz12.zip +# unzip nexuiz12.zip Nexuiz/nexuizenginesource20050814beta1.zip +Source: nexuizenginesource20050814beta1.zip Patch0: nexuiz-1.0-basedir.patch Patch1: nexuiz-1.1-nostrip.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -22,7 +19,7 @@ # and therefore it isn't picked up by RPM during build Requires: libz.so.1 libvorbis.so.0 libvorbisfile.so.3 libjpeg.so.62 Requires: desktop-file-utils >= 0.9 -Requires: nexuiz-data +Requires: nexuiz-data = %{version} Requires(post): desktop-file-utils Requires(postun): desktop-file-utils @@ -34,7 +31,7 @@ %package server Group: Amusements/Games Summary: Dedicated server for the Nexuiz first person shooter -Requires: nexuiz-data +Requires: nexuiz-data = %{version} # This is necessary as these libraries are loaded during runtime # and therefore it isn't picked up by RPM during build Requires: libz.so.1 @@ -47,10 +44,10 @@ %prep -%setup -q +%setup -q -n darkplaces %patch0 -p0 -b .basedir %patch1 -p0 -b .nostrip -%{__sed} -i 's/\r//' Readme.htm +%{__sed} -i 's/\r//' darkplaces.txt %build @@ -111,18 +108,21 @@ %files %defattr(-,root,root,-) -%doc Readme.htm COPYING +%doc COPYING ChangeLog darkplaces.txt %{_bindir}/nexuiz-glx %{_datadir}/icons/hicolor/*/apps/nexuiz.png %{_datadir}/applications/*%{name}.desktop %files server %defattr(-,root,root,-) -%doc Readme.htm COPYING +%doc COPYING ChangeLog darkplaces.txt %{_bindir}/nexuiz-dedicated %changelog +* Fri Sep 02 2005 Adrian Reber - 1.2-1 +- updated to 1.2 + * Tue Aug 16 2005 Adrian Reber - 1.1-2 - support building on RHEL4 (#165522) Index: sources =================================================================== RCS file: /cvs/extras/rpms/nexuiz/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 9 Jul 2005 11:59:33 -0000 1.2 +++ sources 3 Sep 2005 14:14:02 -0000 1.3 @@ -1 +1 @@ -a2177339360d4ad19816c66a7dfd0353 nexuiz-1.1.tar.bz2 +f46eab779e2d5d08bd21dad648a1e62f nexuizenginesource20050814beta1.zip From fedora-extras-commits at redhat.com Sat Sep 3 14:35:50 2005 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Sat, 3 Sep 2005 10:35:50 -0400 Subject: rpms/nexuiz/devel nexuiz.spec,1.4,1.5 Message-ID: <200509031435.j83EZoCh026224@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/rpms/nexuiz/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26205 Modified Files: nexuiz.spec Log Message: * Fri Sep 02 2005 Adrian Reber - 1.2-2 - another try without smp_mflags Index: nexuiz.spec =================================================================== RCS file: /cvs/extras/rpms/nexuiz/devel/nexuiz.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- nexuiz.spec 3 Sep 2005 14:14:02 -0000 1.4 +++ nexuiz.spec 3 Sep 2005 14:35:48 -0000 1.5 @@ -1,7 +1,7 @@ Summary: Multiplayer, deathmatch oriented first person shooter Name: nexuiz Version: 1.2 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: Amusements/Games URL: http://www.nexuiz.com/ @@ -51,7 +51,7 @@ %build -%{__make} %{?_smp_mflags} cl-release sv-release OPTIM_RELEASE="$RPM_OPT_FLAGS" +%{__make} cl-release sv-release OPTIM_RELEASE="$RPM_OPT_FLAGS" convert nexuiz.ico nexuiz.png @@ -120,6 +120,9 @@ %changelog +* Fri Sep 02 2005 Adrian Reber - 1.2-2 +- another try without smp_mflags + * Fri Sep 02 2005 Adrian Reber - 1.2-1 - updated to 1.2 From fedora-extras-commits at redhat.com Sat Sep 3 14:41:06 2005 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Sat, 3 Sep 2005 10:41:06 -0400 Subject: rpms/nexuiz-data/devel nexuiz-data.spec,1.2,1.3 Message-ID: <200509031441.j83Ef6gv026303@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/rpms/nexuiz-data/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26284 Modified Files: nexuiz-data.spec Log Message: * Sat Sep 03 2005 Adrian Reber - 1.2-2 - I should really test my changes before check-in Index: nexuiz-data.spec =================================================================== RCS file: /cvs/extras/rpms/nexuiz-data/devel/nexuiz-data.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- nexuiz-data.spec 3 Sep 2005 14:13:03 -0000 1.2 +++ nexuiz-data.spec 3 Sep 2005 14:41:04 -0000 1.3 @@ -3,7 +3,7 @@ Summary: Game data for the Nexuiz first person shooter Name: nexuiz-data Version: 1.2 -Release: 1 +Release: 2 License: GPL Group: Amusements/Games URL: http://www.nexuiz.com/ @@ -44,10 +44,13 @@ %files %defattr(0644, root, root, 0755) -%doc Readme.htm gpl.txt cvars.txt mapping.txt +%doc Readme.htm gpl.txt data/cvars.txt data/mapping.txt %{_datadir}/nexuiz/ %changelog +* Sat Sep 03 2005 Adrian Reber - 1.2-2 +- I should really test my changes before check-in + * Fri Sep 02 2005 Adrian Reber - 1.2-1 - updated to 1.2 - included serverfix12.zip From fedora-extras-commits at redhat.com Sat Sep 3 16:38:46 2005 From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl)) Date: Sat, 3 Sep 2005 12:38:46 -0400 Subject: rpms/icu/devel icu.spec,1.5,1.6 Message-ID: <200509031638.j83Gckun029038@cvs-int.fedora.redhat.com> Author: thl Update of /cvs/extras/rpms/icu/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29019 Modified Files: icu.spec Log Message: Use dist and remove some parms from optflags that gcc32 cannot handle Index: icu.spec =================================================================== RCS file: /cvs/extras/rpms/icu/devel/icu.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- icu.spec 2 Aug 2005 10:23:41 -0000 1.5 +++ icu.spec 3 Sep 2005 16:38:44 -0000 1.6 @@ -2,7 +2,7 @@ Name: icu Version: 3.4 -Release: 2 +Release: 3%{?dist} Summary: International Components for Unicode Group: Applications/Text @@ -61,7 +61,7 @@ %build cd source %if %{gcc32} -%{expand: %%define optflags %(echo %{optflags} | sed -e s/-mtune=/-mcpu=/)} +%{expand: %%define optflags %(echo %{optflags} | sed -e 's/-mtune=/-mcpu=/;s/-fstack-protector//; s/--param=ssp-buffer-size=4//')} export CC=gcc32 CXX=g++32 %endif %configure --with-data-packaging=library --disable-samples @@ -132,6 +132,11 @@ %changelog +* Wed Aug 31 2005 Thorsten Leemhuis - 3.4-3 +- Use dist +- gcc32 does not understand -fstack-protector and + --param=ssp-buffer-size=4 + * Tue Aug 2 2005 Ville Skytt?? - 3.4-2 - 3.4. From fedora-extras-commits at redhat.com Sat Sep 3 17:00:55 2005 From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl)) Date: Sat, 3 Sep 2005 13:00:55 -0400 Subject: rpms/mail-notification/devel mail-notification.spec,1.9,1.10 Message-ID: <200509031700.j83H0tVN029221@cvs-int.fedora.redhat.com> Author: thl Update of /cvs/extras/rpms/mail-notification/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29202 Modified Files: mail-notification.spec Log Message: rebuild Index: mail-notification.spec =================================================================== RCS file: /cvs/extras/rpms/mail-notification/devel/mail-notification.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- mail-notification.spec 19 Aug 2005 17:15:52 -0000 1.9 +++ mail-notification.spec 3 Sep 2005 17:00:53 -0000 1.10 @@ -1,6 +1,6 @@ Name: mail-notification Version: 2.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Status icon that informs you if you have new mail Group: Applications/Internet @@ -113,6 +113,9 @@ %changelog +* Sat Sep 03 2005 Thorsten Leemhuis - 2.0-3 +- rebuild for new icu + * Fri Aug 19 2005 Thorsten Leemhuis - 2.0-2 - rebuild From fedora-extras-commits at redhat.com Sat Sep 3 17:49:33 2005 From: fedora-extras-commits at redhat.com (Anthony Green (green)) Date: Sat, 3 Sep 2005 13:49:33 -0400 Subject: rpms/jogl - New directory Message-ID: <200509031749.j83HnXvo030680@cvs-int.fedora.redhat.com> Author: green Update of /cvs/extras/rpms/jogl In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30660/jogl Log Message: Directory /cvs/extras/rpms/jogl added to the repository From fedora-extras-commits at redhat.com Sat Sep 3 17:49:34 2005 From: fedora-extras-commits at redhat.com (Anthony Green (green)) Date: Sat, 3 Sep 2005 13:49:34 -0400 Subject: rpms/jogl/devel - New directory Message-ID: <200509031749.j83HnYT1030685@cvs-int.fedora.redhat.com> Author: green Update of /cvs/extras/rpms/jogl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30660/jogl/devel Log Message: Directory /cvs/extras/rpms/jogl/devel added to the repository From fedora-extras-commits at redhat.com Sat Sep 3 17:49:59 2005 From: fedora-extras-commits at redhat.com (Anthony Green (green)) Date: Sat, 3 Sep 2005 13:49:59 -0400 Subject: rpms/jogl Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200509031749.j83Hnxav030740@cvs-int.fedora.redhat.com> Author: green Update of /cvs/extras/rpms/jogl In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30705 Added Files: Makefile import.log Log Message: Setup of module jogl --- NEW FILE Makefile --- # Top level Makefile for module jogl all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Sat Sep 3 17:50:00 2005 From: fedora-extras-commits at redhat.com (Anthony Green (green)) Date: Sat, 3 Sep 2005 13:50:00 -0400 Subject: rpms/jogl/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200509031750.j83Ho02q030745@cvs-int.fedora.redhat.com> Author: green Update of /cvs/extras/rpms/jogl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30705/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module jogl --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Sat Sep 3 17:51:47 2005 From: fedora-extras-commits at redhat.com (Anthony Green (green)) Date: Sat, 3 Sep 2005 13:51:47 -0400 Subject: rpms/jogl/devel SGIFreeSWLicB.1.1.ps, NONE, 1.1 jogl-README.txt, NONE, 1.1 jogl.properties, NONE, 1.1 jogl.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200509031751.j83HplaG030834@cvs-int.fedora.redhat.com> Author: green Update of /cvs/extras/rpms/jogl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30789/devel Modified Files: .cvsignore sources Added Files: SGIFreeSWLicB.1.1.ps jogl-README.txt jogl.properties jogl.spec Log Message: auto-import jogl-1.1.1-1 on branch devel from jogl-1.1.1-1.src.rpm --- NEW FILE SGIFreeSWLicB.1.1.ps --- %!PS-Adobe-3.0 %%Title: Microsoft Word - SGIFreeSWLicBWordV1.1020022.doc %%Creator: Windows NT 4.0 %%CreationDate: 12:39 4/24/2000 %%Pages: (atend) %%BoundingBox: 13 13 599 780 %%LanguageLevel: 2 %%DocumentNeededFonts: (atend) %%DocumentSuppliedFonts: (atend) %%EndComments %%BeginProlog %%BeginResource: procset NTPSOct95 /NTPSOct95 100 dict dup begin/bd{bind def}bind def/ld{load def}bd/ed{exch def} bd/a{currentpoint}bd/c/curveto ld/d/dup ld/e/eofill ld/f/fill ld/tr/translate ld/gr/grestore ld/gs/gsave ld/j/setlinejoin ld/L/lineto ld/M/moveto ld/n /newpath ld/cp/closepath ld/rm/rmoveto ld/sl/setlinewidth ld/sd/setdash ld/g /setgray ld/r/setrgbcolor ld/s/stroke ld/t/show ld/aw/awidthshow ld/im /imagemask ld/MS{moveto show}bd/SF{findfont exch scalefont setfont}bd/SM{cmtx setmatrix}bd/MF{findfont exch makefont setfont}bd/CM{/cmtx matrix currentmatrix def}bd/B{M exch dup 0 rlt exch 0 exch rlt neg 0 rlt}bd/CB{B cp eoclip}bd/EA{1 index 0/G0 put 4 string 1 1 4 -1 roll{3 copy neg exch cvs dup 0 71 put cvn 3 -1 roll exch put}for pop}bd/rlt/rlineto ld/L2?/languagelevel where{pop languagelevel 2 ge}{false}ifelse def end def %%EndResource %%EndProlog %%BeginSetup [{0 /languagelevel where{pop languagelevel 2 ge}{false}ifelse {1 dict dup/JobTimeout 4 -1 roll put setuserparams} {statusdict/setjobtimeout get exec}ifelse }stopped cleartomark [{120 /languagelevel where{pop languagelevel 2 ge}{false}ifelse {1 dict dup/WaitTimeout 4 -1 roll put setuserparams} {statusdict/waittimeout 3 -1 roll put}ifelse }stopped cleartomark /#copies 1 def [{ %%BeginFeature: *Resolution 600dpi << /HWResolution [600 600]>> setpagedevice %%EndFeature } stopped cleartomark [{ %%BeginFeature: *HPHalftone Enhanced << /Install { currentpagedevice /HWResolution get dup 0 get 600 eq exch 1 get 600 eq and {/EnhancedColorRendering600} {/EnhancedColorRendering} ifelse /ColorRendering findresource setcolorrendering /EnhancedHalftone /Halftone findresource sethalftone { } settransfer false setstrokeadjust } >> setpagedevice currentpagedevice /HWResolution get dup 0 get 600 eq exch 1 get 600 eq and { << /PostRenderingEnhance false >> setpagedevice }if /setscreen { 3 {pop} repeat } def /setcolorscreen { 12 {pop} repeat } def /sethalftone { pop } def %%EndFeature } stopped cleartomark [{ %%BeginFeature: *Smoothing True << /PostRenderingEnhance true >> setpagedevice %%EndFeature } stopped cleartomark [{ %%BeginFeature: *MediaType None <> setpagedevice %%EndFeature } stopped cleartomark [{ %%BeginFeature: *PageSize Letter <> setpagedevice %%EndFeature } stopped cleartomark [{ %%BeginFeature: *Duplex None <> setpagedevice %%EndFeature } stopped cleartomark [{ %%BeginFeature: *OutputBin Upper <> setpagedevice %%EndFeature } stopped cleartomark %%EndSetup NTPSOct95 begin %%Page: 1 1 NTPSOct95 /PageSV save put 13.238 780.059 translate 72 600 div dup neg scale 0 0 transform .25 add round .25 sub exch .25 add round .25 sub exch itransform translate %%IncludeFont: Times-Bold [100 0 0 -100 0 0]/Times-Bold MF (S)490 635 MS (G)546 635 MS (I)623 635 MS ( )662 635 MS (F)687 635 MS (R)748 635 MS (E)820 635 MS (E)887 635 MS ( )954 635 MS (S)979 635 MS (O)1035 635 MS (F)1113 635 MS (T)1173 635 MS (W)1240 635 MS (A)1340 635 MS (R)1412 635 MS (E)1484 635 MS ( )1551 635 MS (L)1576 635 MS (I)1643 635 MS (C)1682 635 MS (E)1754 635 MS (N)1821 635 MS (S)1893 635 MS (E)1949 635 MS ( )2016 635 MS (B)2041 635 MS ( )2108 635 MS (\()2133 635 MS (V)2166 635 MS (e)2238 635 MS (r)2282 635 MS (s)2326 635 MS (i)2365 635 MS (o)2393 635 MS (n)2443 635 MS ( )2499 635 MS (1)2524 635 MS (.)2574 635 MS (1)2599 635 MS ( )2649 635 MS ([)2674 635 MS (0)2707 635 MS (2)2757 635 MS (/)2807 635 MS (2)2835 635 MS (2)2885 635 MS (/)2935 635 MS (2)2963 635 MS (0)3013 635 MS (0)3063 635 MS (0)3113 635 MS (])3163 635 MS (\))3196 635 MS (1)490 834 MS (.)540 834 MS %%IncludeFont: Helvetica-Bold [100 0 0 -100 0 0]/Helvetica-Bold MF ( )565 834 MS [100 0 0 -100 0 0]/Times-Bold MF (D)790 834 MS (e)862 834 MS (f)906 834 MS (i)940 834 MS (n)968 834 MS (i)1024 834 MS (t)1052 834 MS (i)1085 834 MS (o)1113 834 MS (n)1163 834 MS (s)1219 834 MS (.)1258 834 MS %%IncludeFont: Times-Roman [100 0 0 -100 0 0]/Times-Roman MF (1)490 1029 MS (.)540 1029 MS (1)565 1029 MS (.)615 1029 MS %%IncludeFont: Helvetica [100 0 0 -100 0 0]/Helvetica MF ( )640 1029 MS [100 0 0 -100 0 0]/Times-Bold MF (")790 1029 MS (A)846 1029 MS (d)918 1029 MS (d)974 1029 MS (i)1030 1029 MS (t)1058 1029 MS (i)1091 1029 MS (o)1119 1029 MS (n)1168 1029 MS (a)1224 1029 MS (l)1274 1029 MS ( )1302 1029 MS (N)1327 1029 MS (o)1399 1029 MS (t)1449 1029 MS (i)1482 1029 MS (c)1510 1029 MS (e)1554 1029 MS ( )1598 1029 MS (P)1623 1029 MS (r)1684 1029 MS (o)1728 1029 MS (v)1778 1029 MS (i)1828 1029 MS (s)1856 1029 MS (i)1895 1029 MS (o)1923 1029 MS (n)1973 1029 MS (s)2029 1029 MS (")2068 1029 MS [100 0 0 -100 0 0]/Times-Roman MF ( )2124 1029 MS (m)2149 1029 MS (e)2227 1029 MS (a)2271 1029 MS (n)2315 1029 MS (s)2365 1029 MS ( )2404 1029 MS (s)2429 1029 MS (u)2468 1029 MS (c)2518 1029 MS (h)2562 1029 MS ( )2612 1029 MS (a)2637 1029 MS (d)2681 1029 MS (d)2731 1029 MS (i)2781 1029 MS (t)2809 1029 MS (i)2837 1029 MS (o)2865 1029 MS (n)2915 1029 MS (a)2965 1029 MS (l)3009 1029 MS ( )3037 1029 MS (p)3062 1029 MS (r)3112 1029 MS (o)3145 1029 MS (v)3195 1029 MS (i)3245 1029 MS (s)3273 1029 MS (i)3312 1029 MS (o)3340 1029 MS (n)3390 1029 MS (s)3440 1029 MS ( )3479 1029 MS (a)3504 1029 MS (s)3548 1029 MS ( )3587 1029 MS (a)3612 1029 MS (p)3656 1029 MS (p)3706 1029 MS (e)3756 1029 MS (a)3800 1029 MS (r)3844 1029 MS ( )3878 1029 MS (i)3903 1029 MS (n)3931 1029 MS ( )3981 1029 MS (t)4006 1029 MS (h)4034 1029 MS (e)4084 1029 MS (N)490 1144 MS (o)562 1144 MS (t)612 1144 MS (i)640 1144 MS (c)668 1144 MS (e)712 1144 MS ( )756 1144 MS (i)781 1144 MS (n)809 1144 MS ( )859 1144 MS (O)884 1144 MS (r)956 1144 MS (i)989 1144 MS (g)1018 1144 MS (i)1067 1144 MS (n)1095 1144 MS (a)1145 1144 MS (l)1189 1144 MS ( )1217 1144 MS (C)1242 1144 MS (o)1309 1144 MS (d)1359 1144 MS (e)1409 1144 MS ( )1453 1144 MS (u)1478 1144 MS (n)1528 1144 MS (d)1578 1144 MS (e)1628 1144 MS (r)1672 1144 MS ( )1705 1144 MS (t)1730 1144 MS (h)1758 1144 MS (e)1809 1144 MS ( )1853 1144 MS (h)1878 1144 MS (e)1928 1144 MS (a)1972 1144 MS (d)2016 1144 MS (i)2066 1144 MS (n)2094 1144 MS (g)2145 1144 MS ( )2194 1144 MS (")2220 1144 MS (A)2260 1144 MS (d)2332 1144 MS (d)2382 1144 MS (i)2432 1144 MS (t)2460 1144 MS (i)2488 1144 MS (o)2516 1144 MS (n)2566 1144 MS (a)2616 1144 MS (l)2660 1144 MS ( )2688 1144 MS (N)2713 1144 MS (o)2785 1144 MS (t)2835 1144 MS (i)2863 1144 MS (c)2891 1144 MS (e)2935 1144 MS ( )2979 1144 MS (P)3004 1144 MS (r)3060 1144 MS (o)3093 1144 MS (v)3143 1144 MS (i)3193 1144 MS (s)3221 1144 MS (i)3260 1144 MS (o)3288 1144 MS (n)3338 1144 MS (s)3388 1144 MS (.)3427 1144 MS (")3453 1144 MS (1)490 1343 MS (.)540 1343 MS (2)565 1343 MS (.)615 1343 MS [100 0 0 -100 0 0]/Helvetica MF ( )640 1343 MS [100 0 0 -100 0 0]/Times-Bold MF (")790 1343 MS (C)846 1343 MS (o)918 1343 MS (v)968 1343 MS (e)1018 1343 MS (r)1062 1343 MS (e)1106 1343 MS (d)1150 1343 MS ( )1206 1343 MS (C)1231 1343 MS (o)1303 1343 MS (d)1353 1343 MS (e)1409 1343 MS (")1453 1343 MS [100 0 0 -100 0 0]/Times-Roman MF ( )1509 1343 MS (m)1534 1343 MS (e)1612 1343 MS (a)1656 1343 MS (n)1700 1343 MS (s)1750 1343 MS ( )1789 1343 MS (t)1814 1343 MS (h)1842 1343 MS (e)1892 1343 MS ( )1936 1343 MS (O)1961 1343 MS (r)2033 1343 MS (i)2066 1343 MS (g)2095 1343 MS (i)2144 1343 MS (n)2172 1343 MS (a)2222 1343 MS (l)2266 1343 MS ( )2294 1343 MS (C)2319 1343 MS (o)2386 1343 MS (d)2436 1343 MS (e)2486 1343 MS ( )2530 1343 MS (o)2555 1343 MS (r)2606 1343 MS ( )2639 1343 MS (M)2664 1343 MS (o)2753 1343 MS (d)2803 1343 MS (i)2853 1343 MS (f)2881 1343 MS (i)2914 1343 MS (c)2942 1343 MS (a)2986 1343 MS (t)3030 1343 MS (i)3058 1343 MS (o)3086 1343 MS (n)3136 1343 MS (s)3186 1343 MS (,)3225 1343 MS ( )3250 1343 MS (o)3275 1343 MS (r)3325 1343 MS ( )3358 1343 MS (a)3383 1343 MS (n)3427 1343 MS (y)3479 1343 MS ( )3527 1343 MS (c)3553 1343 MS (o)3597 1343 MS (m)3647 1343 MS (b)3725 1343 MS (i)3775 1343 MS (n)3803 1343 MS (a)3853 1343 MS (t)3897 1343 MS (i)3925 1343 MS (o)3953 1343 MS (n)4003 1343 MS ( )4053 1343 MS (t)4078 1343 MS (h)4106 1343 MS (e)4156 1343 MS (r)4200 1343 MS (e)4233 1343 MS (o)4277 1343 MS (f)4328 1343 MS (.)4361 1343 MS (1)490 1541 MS (.)540 1541 MS (3)565 1541 MS (.)615 1541 MS [100 0 0 -100 0 0]/Helvetica MF ( )640 1541 MS [100 0 0 -100 0 0]/Times-Bold MF (")790 1541 MS (H)846 1541 MS (a)924 1541 MS (r)974 1541 MS (d)1018 1541 MS (w)1074 1541 MS (a)1147 1541 MS (r)1197 1541 MS (e)1241 1541 MS (")1285 1541 MS [100 0 0 -100 0 0]/Times-Roman MF ( )1341 1541 MS (m)1366 1541 MS (e)1444 1541 MS (a)1488 1541 MS (n)1532 1541 MS (s)1582 1541 MS ( )1621 1541 MS (a)1646 1541 MS (n)1690 1541 MS (y)1741 1541 MS ( )1789 1541 MS (p)1814 1541 MS (h)1864 1541 MS (y)1916 1541 MS (s)1964 1541 MS (i)2003 1541 MS (c)2031 1541 MS (a)2075 1541 MS (l)2119 1541 MS ( )2147 1541 MS (d)2172 1541 MS (e)2222 1541 MS (v)2266 1541 MS (i)2316 1541 MS (c)2345 1541 MS (e)2389 1541 MS ( )2433 1541 MS (t)2458 1541 MS (h)2486 1541 MS (a)2536 1541 MS (t)2580 1541 MS ( )2608 1541 MS (a)2633 1541 MS (c)2678 1541 MS (c)2722 1541 MS (e)2766 1541 MS (p)2810 1541 MS (t)2860 1541 MS (s)2888 1541 MS ( )2927 1541 MS (i)2952 1541 MS (n)2980 1541 MS (p)3030 1541 MS (u)3080 1541 MS (t)3130 1541 MS (,)3158 1541 MS ( )3183 1541 MS (p)3208 1541 MS (r)3258 1541 MS (o)3291 1541 MS (c)3341 1541 MS (e)3386 1541 MS (s)3430 1541 MS (s)3469 1541 MS (e)3508 1541 MS (s)3552 1541 MS ( )3591 1541 MS (i)3616 1541 MS (n)3644 1541 MS (p)3694 1541 MS (u)3744 1541 MS (t)3794 1541 MS (,)3822 1541 MS ( )3847 1541 MS (s)3872 1541 MS (t)3911 1541 MS (o)3939 1541 MS (r)3989 1541 MS (e)4022 1541 MS (s)4066 1541 MS ( )4105 1541 MS (t)4130 1541 MS (h)4158 1541 MS (e)4208 1541 MS (r)490 1656 MS (e)523 1656 MS (s)567 1656 MS (u)606 1656 MS (l)656 1656 MS (t)684 1656 MS (s)712 1656 MS ( )751 1656 MS (o)776 1656 MS (f)826 1656 MS ( )859 1656 MS (p)884 1656 MS (r)934 1656 MS (o)967 1656 MS (c)1017 1656 MS (e)1062 1656 MS (s)1106 1656 MS (s)1145 1656 MS (i)1184 1656 MS (n)1212 1656 MS (g)1262 1656 MS (,)1311 1656 MS ( )1336 1656 MS (a)1362 1656 MS (n)1406 1656 MS (d)1456 1656 MS (/)1506 1656 MS (o)1534 1656 MS (r)1584 1656 MS ( )1617 1656 MS (p)1642 1656 MS (r)1692 1656 MS (o)1725 1656 MS (v)1775 1656 MS (i)1825 1656 MS (d)1853 1656 MS (e)1903 1656 MS (s)1947 1656 MS ( )1986 1656 MS (o)2011 1656 MS (u)2061 1656 MS (t)2111 1656 MS (p)2139 1656 MS (u)2189 1656 MS (t)2239 1656 MS (.)2267 1656 MS (1)490 1854 MS (.)540 1854 MS (4)565 1854 MS (.)615 1854 MS [100 0 0 -100 0 0]/Helvetica MF ( )640 1854 MS [100 0 0 -100 0 0]/Times-Bold MF (")790 1854 MS (L)846 1854 MS (a)913 1854 MS (r)963 1854 MS (g)1007 1854 MS (e)1057 1854 MS (r)1101 1854 MS ( )1145 1854 MS (W)1170 1854 MS (o)1270 1854 MS (r)1320 1854 MS (k)1364 1854 MS (")1420 1854 MS [100 0 0 -100 0 0]/Times-Roman MF ( )1476 1854 MS (m)1501 1854 MS (e)1579 1854 MS (a)1623 1854 MS (n)1667 1854 MS (s)1717 1854 MS ( )1756 1854 MS (a)1781 1854 MS ( )1825 1854 MS (w)1850 1854 MS (o)1922 1854 MS (r)1972 1854 MS (k)2005 1854 MS ( )2055 1854 MS (t)2080 1854 MS (h)2108 1854 MS (a)2159 1854 MS (t)2203 1854 MS ( )2231 1854 MS (c)2256 1854 MS (o)2300 1854 MS (m)2350 1854 MS (b)2428 1854 MS (i)2478 1854 MS (n)2506 1854 MS (e)2556 1854 MS (s)2600 1854 MS ( )2639 1854 MS (C)2664 1854 MS (o)2731 1854 MS (v)2781 1854 MS (e)2831 1854 MS (r)2875 1854 MS (e)2908 1854 MS (d)2952 1854 MS ( )3002 1854 MS (C)3027 1854 MS (o)3094 1854 MS (d)3144 1854 MS (e)3195 1854 MS ( )3239 1854 MS (o)3264 1854 MS (r)3314 1854 MS ( )3347 1854 MS (p)3372 1854 MS (o)3422 1854 MS (r)3472 1854 MS (t)3505 1854 MS (i)3533 1854 MS (o)3561 1854 MS (n)3611 1854 MS (s)3661 1854 MS ( )3700 1854 MS (t)3725 1854 MS (h)3753 1854 MS (e)3803 1854 MS (r)3847 1854 MS (e)3880 1854 MS (o)3924 1854 MS (f)3974 1854 MS ( )4007 1854 MS (w)4033 1854 MS (i)4105 1854 MS (t)4133 1854 MS (h)4161 1854 MS (c)490 1969 MS (o)534 1969 MS (d)584 1969 MS (e)634 1969 MS ( )678 1969 MS (n)703 1969 MS (o)753 1969 MS (t)803 1969 MS ( )831 1969 MS (g)857 1969 MS (o)906 1969 MS (v)956 1969 MS (e)1006 1969 MS (r)1050 1969 MS (n)1083 1969 MS (e)1134 1969 MS (d)1178 1969 MS ( )1228 1969 MS (b)1253 1969 MS (y)1305 1969 MS ( )1353 1969 MS (t)1378 1969 MS (h)1406 1969 MS (e)1456 1969 MS ( )1500 1969 MS (t)1525 1969 MS (e)1553 1969 MS (r)1597 1969 MS (m)1630 1969 MS (s)1708 1969 MS ( )1747 1969 MS (o)1772 1969 MS (f)1822 1969 MS ( )1855 1969 MS (t)1880 1969 MS (h)1908 1969 MS (i)1958 1969 MS (s)1986 1969 MS ( )2025 1969 MS (L)2051 1969 MS (i)2111 1969 MS (c)2139 1969 MS (e)2184 1969 MS (n)2228 1969 MS (s)2278 1969 MS (e)2317 1969 MS (.)2361 1969 MS (1)490 2168 MS (.)540 2168 MS (5)565 2168 MS (.)615 2168 MS [100 0 0 -100 0 0]/Helvetica MF ( )640 2168 MS [100 0 0 -100 0 0]/Times-Bold MF (")790 2168 MS (L)846 2168 MS (i)913 2168 MS (c)941 2168 MS (e)985 2168 MS (n)1029 2168 MS (s)1085 2168 MS (a)1124 2168 MS (b)1174 2168 MS (l)1230 2168 MS (e)1258 2168 MS (")1302 2168 MS [100 0 0 -100 0 0]/Times-Roman MF ( )1358 2168 MS (m)1382 2168 MS (e)1460 2168 MS (a)1504 2168 MS (n)1548 2168 MS (s)1598 2168 MS ( )1637 2168 MS (h)1662 2168 MS (a)1712 2168 MS (v)1756 2168 MS (i)1806 2168 MS (n)1834 2168 MS (g)1884 2168 MS ( )1933 2168 MS (t)1958 2168 MS (h)1986 2168 MS (e)2037 2168 MS ( )2081 2168 MS (r)2106 2168 MS (i)2139 2168 MS (g)2168 2168 MS (h)2217 2168 MS (t)2267 2168 MS ( )2295 2168 MS (t)2320 2168 MS (o)2348 2168 MS ( )2398 2168 MS (g)2423 2168 MS (r)2472 2168 MS (a)2506 2168 MS (n)2550 2168 MS (t)2600 2168 MS (,)2628 2168 MS ( )2653 2168 MS (t)2678 2168 MS (o)2706 2168 MS ( )2756 2168 MS (t)2781 2168 MS (h)2809 2168 MS (e)2859 2168 MS ( )2903 2168 MS (m)2928 2168 MS (a)3006 2168 MS (x)3050 2168 MS (i)3101 2168 MS (m)3129 2168 MS (u)3207 2168 MS (m)3257 2168 MS ( )3335 2168 MS (e)3360 2168 MS (x)3404 2168 MS (t)3454 2168 MS (e)3482 2168 MS (n)3526 2168 MS (t)3576 2168 MS ( )3604 2168 MS (p)3629 2168 MS (o)3679 2168 MS (s)3729 2168 MS (s)3768 2168 MS (i)3807 2168 MS (b)3835 2168 MS (l)3885 2168 MS (e)3913 2168 MS (,)3957 2168 MS ( )3982 2168 MS (w)4007 2168 MS (h)4079 2168 MS (e)4129 2168 MS (t)4173 2168 MS (h)4201 2168 MS (e)4251 2168 MS (r)4295 2168 MS (a)490 2282 MS (t)534 2282 MS ( )562 2282 MS (t)587 2282 MS (h)615 2282 MS (e)665 2282 MS ( )709 2282 MS (t)734 2282 MS (i)762 2282 MS (m)790 2282 MS (e)868 2282 MS ( )912 2282 MS (o)937 2282 MS (f)987 2282 MS ( )1020 2282 MS (t)1045 2282 MS (h)1073 2282 MS (e)1123 2282 MS ( )1167 2282 MS (i)1192 2282 MS (n)1220 2282 MS (i)1270 2282 MS (t)1298 2282 MS (i)1326 2282 MS (a)1354 2282 MS (l)1398 2282 MS ( )1426 2282 MS (g)1451 2282 MS (r)1500 2282 MS (a)1534 2282 MS (n)1578 2282 MS (t)1628 2282 MS ( )1656 2282 MS (o)1681 2282 MS (r)1731 2282 MS ( )1764 2282 MS (s)1789 2282 MS (u)1828 2282 MS (b)1878 2282 MS (s)1928 2282 MS (e)1967 2282 MS (q)2011 2282 MS (u)2061 2282 MS (e)2111 2282 MS (n)2155 2282 MS (t)2205 2282 MS (l)2233 2282 MS (y)2263 2282 MS ( )2311 2282 MS (a)2336 2282 MS (c)2381 2282 MS (q)2425 2282 MS (u)2475 2282 MS (i)2525 2282 MS (r)2553 2282 MS (e)2586 2282 MS (d)2630 2282 MS (,)2680 2282 MS ( )2705 2282 MS (a)2731 2282 MS (n)2775 2282 MS (y)2827 2282 MS ( )2875 2282 MS (a)2900 2282 MS (n)2944 2282 MS (d)2994 2282 MS ( )3044 2282 MS (a)3069 2282 MS (l)3113 2282 MS (l)3141 2282 MS ( )3169 2282 MS (o)3194 2282 MS (f)3244 2282 MS ( )3277 2282 MS (t)3302 2282 MS (h)3330 2282 MS (e)3380 2282 MS ( )3424 2282 MS (r)3450 2282 MS (i)3483 2282 MS (g)3512 2282 MS (h)3561 2282 MS (t)3611 2282 MS (s)3639 2282 MS ( )3678 2282 MS (c)3703 2282 MS (o)3747 2282 MS (n)3797 2282 MS (v)3847 2282 MS (e)3897 2282 MS (y)3943 2282 MS (e)3991 2282 MS (d)4035 2282 MS ( )4085 2282 MS (h)4110 2282 MS (e)4161 2282 MS (r)4205 2282 MS (e)4239 2282 MS (i)4283 2282 MS (n)4311 2282 MS (.)4361 2282 MS (1)490 2482 MS (.)540 2482 MS (6)565 2482 MS (.)615 2482 MS [100 0 0 -100 0 0]/Helvetica MF ( )640 2482 MS [100 0 0 -100 0 0]/Times-Bold MF (")790 2482 MS (L)846 2482 MS (i)913 2482 MS (c)941 2482 MS (e)985 2482 MS (n)1029 2482 MS (s)1085 2482 MS (e)1124 2482 MS (")1168 2482 MS [100 0 0 -100 0 0]/Times-Roman MF ( )1224 2482 MS (m)1249 2482 MS (e)1327 2482 MS (a)1371 2482 MS (n)1415 2482 MS (s)1465 2482 MS ( )1504 2482 MS (t)1529 2482 MS (h)1557 2482 MS (i)1607 2482 MS (s)1635 2482 MS ( )1674 2482 MS (d)1699 2482 MS (o)1749 2482 MS (c)1799 2482 MS (u)1843 2482 MS (m)1893 2482 MS (e)1971 2482 MS (n)2015 2482 MS (t)2065 2482 MS (.)2093 2482 MS (1)490 2679 MS (.)540 2679 MS (7)565 2679 MS (.)615 2679 MS [100 0 0 -100 0 0]/Helvetica MF ( )640 2679 MS [100 0 0 -100 0 0]/Times-Bold MF (")790 2679 MS (L)846 2679 MS (i)913 2679 MS (c)941 2679 MS (e)985 2679 MS (n)1029 2679 MS (s)1085 2679 MS (e)1124 2679 MS (d)1168 2679 MS ( )1224 2679 MS (P)1249 2679 MS (a)1309 2679 MS (t)1359 2679 MS (e)1392 2679 MS (n)1436 2679 MS (t)1492 2679 MS (s)1525 2679 MS (")1564 2679 MS [100 0 0 -100 0 0]/Times-Roman MF ( )1620 2679 MS (m)1645 2679 MS (e)1723 2679 MS (a)1767 2679 MS (n)1811 2679 MS (s)1861 2679 MS ( )1900 2679 MS (p)1925 2679 MS (a)1975 2679 MS (t)2019 2679 MS (e)2048 2679 MS (n)2092 2679 MS (t)2142 2679 MS ( )2170 2679 MS (c)2195 2679 MS (l)2239 2679 MS (a)2267 2679 MS (i)2311 2679 MS (m)2339 2679 MS (s)2417 2679 MS ( )2456 2679 MS (L)2482 2679 MS (i)2541 2679 MS (c)2570 2679 MS (e)2614 2679 MS (n)2658 2679 MS (s)2708 2679 MS (a)2747 2679 MS (b)2791 2679 MS (l)2841 2679 MS (e)2870 2679 MS ( )2914 2679 MS (b)2939 2679 MS (y)2991 2679 MS ( )3039 2679 MS (S)3064 2679 MS (G)3120 2679 MS (I)3193 2679 MS ( )3225 2679 MS (t)3250 2679 MS (h)3278 2679 MS (a)3328 2679 MS (t)3372 2679 MS ( )3400 2679 MS (a)3425 2679 MS (r)3469 2679 MS (e)3503 2679 MS ( )3547 2679 MS (i)3572 2679 MS (n)3600 2679 MS (f)3650 2679 MS (r)3683 2679 MS (i)3716 2679 MS (n)3744 2679 MS (g)3795 2679 MS (e)3844 2679 MS (d)3888 2679 MS ( )3938 2679 MS (b)3963 2679 MS (y)4015 2679 MS ( )4063 2679 MS (t)4088 2679 MS (h)4116 2679 MS (e)4167 2679 MS ( )4211 2679 MS (u)4236 2679 MS (s)4286 2679 MS (e)4325 2679 MS (o)490 2794 MS (r)540 2794 MS ( )573 2794 MS (s)598 2794 MS (a)637 2794 MS (l)681 2794 MS (e)709 2794 MS ( )753 2794 MS (o)778 2794 MS (f)828 2794 MS ( )861 2794 MS (O)886 2794 MS (r)959 2794 MS (i)992 2794 MS (g)1020 2794 MS (i)1069 2794 MS (n)1097 2794 MS (a)1148 2794 MS (l)1192 2794 MS ( )1220 2794 MS (C)1245 2794 MS (o)1312 2794 MS (d)1362 2794 MS (e)1412 2794 MS ( )1456 2794 MS (o)1481 2794 MS (r)1531 2794 MS ( )1564 2794 MS (a)1589 2794 MS (n)1633 2794 MS (y)1685 2794 MS ( )1733 2794 MS (M)1758 2794 MS (o)1847 2794 MS (d)1897 2794 MS (i)1947 2794 MS (f)1975 2794 MS (i)2008 2794 MS (c)2036 2794 MS (a)2081 2794 MS (t)2125 2794 MS (i)2153 2794 MS (o)2181 2794 MS (n)2231 2794 MS (s)2281 2794 MS ( )2320 2794 MS (p)2345 2794 MS (r)2395 2794 MS (o)2428 2794 MS (v)2478 2794 MS (i)2528 2794 MS (d)2556 2794 MS (e)2606 2794 MS (d)2650 2794 MS ( )2700 2794 MS (b)2725 2794 MS (y)2777 2794 MS ( )2825 2794 MS (S)2850 2794 MS (G)2906 2794 MS (I)2979 2794 MS (,)3011 2794 MS ( )3036 2794 MS (o)3061 2794 MS (r)3111 2794 MS ( )3144 2794 MS (a)3170 2794 MS (n)3214 2794 MS (y)3266 2794 MS ( )3314 2794 MS (c)3339 2794 MS (o)3383 2794 MS (m)3433 2794 MS (b)3511 2794 MS (i)3561 2794 MS (n)3589 2794 MS (a)3639 2794 MS (t)3683 2794 MS (i)3711 2794 MS (o)3739 2794 MS (n)3789 2794 MS ( )3839 2794 MS (t)3864 2794 MS (h)3892 2794 MS (e)3942 2794 MS (r)3986 2794 MS (e)4019 2794 MS (o)4063 2794 MS (f)4114 2794 MS (.)4147 2794 MS (1)490 2993 MS (.)540 2993 MS (8)565 2993 MS (.)615 2993 MS [100 0 0 -100 0 0]/Helvetica MF ( )640 2993 MS [100 0 0 -100 0 0]/Times-Bold MF (")790 2993 MS (M)846 2993 MS (o)940 2993 MS (d)990 2993 MS (i)1046 2993 MS (f)1074 2993 MS (i)1107 2993 MS (c)1135 2993 MS (a)1179 2993 MS (t)1229 2993 MS (i)1262 2993 MS (o)1290 2993 MS (n)1340 2993 MS (s)1396 2993 MS (")1435 2993 MS ( )1491 2993 MS [100 0 0 -100 0 0]/Times-Roman MF (m)1516 2993 MS (e)1594 2993 MS (a)1638 2993 MS (n)1682 2993 MS (s)1732 2993 MS ( )1771 2993 MS (a)1796 2993 MS (n)1840 2993 MS (y)1891 2993 MS ( )1939 2993 MS (a)1964 2993 MS (d)2008 2993 MS (d)2058 2993 MS (i)2108 2993 MS (t)2136 2993 MS (i)2164 2993 MS (o)2192 2993 MS (n)2242 2993 MS ( )2292 2993 MS (t)2317 2993 MS (o)2345 2993 MS ( )2395 2993 MS (o)2420 2993 MS (r)2470 2993 MS ( )2503 2993 MS (d)2528 2993 MS (e)2578 2993 MS (l)2622 2993 MS (e)2650 2993 MS (t)2694 2993 MS (i)2722 2993 MS (o)2750 2993 MS (n)2800 2993 MS ( )2850 2993 MS (f)2875 2993 MS (r)2908 2993 MS (o)2941 2993 MS (m)2991 2993 MS ( )3069 2993 MS (t)3094 2993 MS (h)3122 2993 MS (e)3172 2993 MS ( )3216 2993 MS (s)3241 2993 MS (u)3280 2993 MS (b)3330 2993 MS (s)3380 2993 MS (t)3419 2993 MS (a)3447 2993 MS (n)3491 2993 MS (c)3542 2993 MS (e)3586 2993 MS ( )3630 2993 MS (o)3655 2993 MS (r)3706 2993 MS ( )3739 2993 MS (s)3764 2993 MS (t)3803 2993 MS (r)3831 2993 MS (u)3864 2993 MS (c)3914 2993 MS (t)3958 2993 MS (u)3986 2993 MS (r)4036 2993 MS (e)4069 2993 MS ( )4113 2993 MS (o)4138 2993 MS (f)4189 2993 MS ( )4222 2993 MS (t)4247 2993 MS (h)4275 2993 MS (e)4325 2993 MS (O)490 3108 MS (r)562 3108 MS (i)595 3108 MS (g)623 3108 MS (i)672 3108 MS (n)700 3108 MS (a)750 3108 MS (l)794 3108 MS ( )822 3108 MS (C)847 3108 MS (o)914 3108 MS (d)964 3108 MS (e)1014 3108 MS ( )1058 3108 MS (o)1083 3108 MS (r)1134 3108 MS ( )1167 3108 MS (a)1192 3108 MS (n)1236 3108 MS (y)1288 3108 MS ( )1336 3108 MS (p)1361 3108 MS (r)1411 3108 MS (e)1445 3108 MS (v)1489 3108 MS (i)1539 3108 MS (o)1567 3108 MS (u)1617 3108 MS (s)1667 3108 MS ( )1706 3108 MS (M)1731 3108 MS (o)1820 3108 MS (d)1870 3108 MS (i)1920 3108 MS (f)1948 3108 MS (i)1981 3108 MS (c)2009 3108 MS (a)2053 3108 MS (t)2097 3108 MS (i)2125 3108 MS (o)2153 3108 MS (n)2203 3108 MS (s)2253 3108 MS (.)2292 3108 MS ( )2317 3108 MS (W)2342 3108 MS (h)2437 3108 MS (e)2487 3108 MS (n)2531 3108 MS ( )2581 3108 MS (C)2606 3108 MS (o)2673 3108 MS (v)2723 3108 MS (e)2773 3108 MS (r)2817 3108 MS (e)2850 3108 MS (d)2894 3108 MS ( )2944 3108 MS (C)2969 3108 MS (o)3036 3108 MS (d)3086 3108 MS (e)3136 3108 MS ( )3180 3108 MS (i)3205 3108 MS (s)3233 3108 MS ( )3272 3108 MS (r)3297 3108 MS (e)3331 3108 MS (l)3375 3108 MS (e)3403 3108 MS (a)3447 3108 MS (s)3491 3108 MS (e)3530 3108 MS (d)3575 3108 MS ( )3625 3108 MS (a)3650 3108 MS (s)3694 3108 MS ( )3733 3108 MS (a)3758 3108 MS ( )3802 3108 MS (s)3827 3108 MS (e)3867 3108 MS (r)3911 3108 MS (i)3944 3108 MS (e)3972 3108 MS (s)4016 3108 MS ( )4055 3108 MS (o)4080 3108 MS (f)4130 3108 MS ( )4163 3108 MS (f)4189 3108 MS (i)4222 3108 MS (l)4250 3108 MS (e)4278 3108 MS (s)4322 3108 MS (,)4361 3108 MS (a)490 3222 MS ( )534 3222 MS (M)559 3222 MS (o)648 3222 MS (d)698 3222 MS (i)748 3222 MS (f)776 3222 MS (i)809 3222 MS (c)837 3222 MS (a)881 3222 MS (t)925 3222 MS (i)953 3222 MS (o)981 3222 MS (n)1031 3222 MS ( )1081 3222 MS (i)1106 3222 MS (s)1134 3222 MS (:)1173 3222 MS (A)640 3421 MS (.)712 3421 MS [100 0 0 -100 0 0]/Helvetica MF ( )737 3421 MS [100 0 0 -100 0 0]/Times-Roman MF (A)790 3421 MS (n)862 3421 MS (y)913 3421 MS ( )961 3421 MS (a)987 3421 MS (d)1031 3421 MS (d)1081 3421 MS (i)1131 3421 MS (t)1159 3421 MS (i)1187 3421 MS (o)1215 3421 MS (n)1265 3421 MS ( )1315 3421 MS (t)1340 3421 MS (o)1368 3421 MS ( )1418 3421 MS (t)1443 3421 MS (h)1471 3421 MS (e)1521 3421 MS ( )1565 3421 MS (c)1590 3421 MS (o)1634 3421 MS (n)1684 3421 MS (t)1734 3421 MS (e)1762 3421 MS (n)1806 3421 MS (t)1856 3421 MS (s)1884 3421 MS ( )1923 3421 MS (o)1948 3421 MS (f)1998 3421 MS ( )2031 3421 MS (a)2056 3421 MS ( )2100 3421 MS (f)2125 3421 MS (i)2158 3421 MS (l)2186 3421 MS (e)2214 3421 MS ( )2258 3421 MS (c)2284 3421 MS (o)2328 3421 MS (n)2378 3421 MS (t)2428 3421 MS (a)2456 3421 MS (i)2500 3421 MS (n)2528 3421 MS (i)2578 3421 MS (n)2606 3421 MS (g)2656 3421 MS ( )2705 3421 MS (O)2731 3421 MS (r)2803 3421 MS (i)2836 3421 MS (g)2865 3421 MS (i)2914 3421 MS (n)2942 3421 MS (a)2992 3421 MS (l)3036 3421 MS ( )3064 3421 MS (C)3089 3421 MS (o)3156 3421 MS (d)3206 3421 MS (e)3256 3421 MS ( )3300 3421 MS (a)3325 3421 MS (n)3369 3421 MS (d)3419 3421 MS (/)3469 3421 MS (o)3497 3421 MS (r)3547 3421 MS ( )3580 3421 MS (a)3606 3421 MS (d)3650 3421 MS (d)3700 3421 MS (i)3750 3421 MS (t)3778 3421 MS (i)3806 3421 MS (o)3834 3421 MS (n)3884 3421 MS ( )3934 3421 MS (t)3959 3421 MS (o)3987 3421 MS ( )4037 3421 MS (o)4062 3421 MS (r)4112 3421 MS (d)790 3535 MS (e)840 3535 MS (l)884 3535 MS (e)912 3535 MS (t)956 3535 MS (i)984 3535 MS (o)1012 3535 MS (n)1062 3535 MS ( )1112 3535 MS (f)1137 3535 MS (r)1170 3535 MS (o)1203 3535 MS (m)1253 3535 MS ( )1331 3535 MS (t)1356 3535 MS (h)1384 3535 MS (e)1434 3535 MS ( )1478 3535 MS (c)1503 3535 MS (o)1547 3535 MS (n)1597 3535 MS (t)1647 3535 MS (e)1675 3535 MS (n)1719 3535 MS (t)1769 3535 MS (s)1797 3535 MS ( )1836 3535 MS (o)1861 3535 MS (f)1911 3535 MS ( )1944 3535 MS (a)1970 3535 MS ( )2014 3535 MS (f)2039 3535 MS (i)2072 3535 MS (l)2100 3535 MS (e)2128 3535 MS ( )2172 3535 MS (c)2197 3535 MS (o)2241 3535 MS (n)2291 3535 MS (t)2341 3535 MS (a)2370 3535 MS (i)2414 3535 MS (n)2442 3535 MS (i)2492 3535 MS (n)2520 3535 MS (g)2570 3535 MS ( )2619 3535 MS (p)2644 3535 MS (r)2694 3535 MS (e)2728 3535 MS (v)2772 3535 MS (i)2822 3535 MS (o)2850 3535 MS (u)2900 3535 MS (s)2950 3535 MS ( )2989 3535 MS (M)3014 3535 MS (o)3103 3535 MS (d)3153 3535 MS (i)3203 3535 MS (f)3231 3535 MS (i)3264 3535 MS (c)3292 3535 MS (a)3336 3535 MS (t)3380 3535 MS (i)3408 3535 MS (o)3436 3535 MS (n)3486 3535 MS (s)3536 3535 MS (.)3575 3535 MS (B)640 3735 MS (.)706 3735 MS [100 0 0 -100 0 0]/Helvetica MF ( )731 3735 MS [100 0 0 -100 0 0]/Times-Roman MF (A)790 3735 MS (n)862 3735 MS (y)913 3735 MS ( )961 3735 MS (n)986 3735 MS (e)1037 3735 MS (w)1081 3735 MS ( )1153 3735 MS (f)1178 3735 MS (i)1211 3735 MS (l)1239 3735 MS (e)1267 3735 MS ( )1311 3735 MS (t)1336 3735 MS (h)1364 3735 MS (a)1414 3735 MS (t)1458 3735 MS ( )1486 3735 MS (c)1511 3735 MS (o)1555 3735 MS (n)1605 3735 MS (t)1655 3735 MS (a)1684 3735 MS (i)1728 3735 MS (n)1756 3735 MS (s)1806 3735 MS ( )1845 3735 MS (a)1870 3735 MS (n)1914 3735 MS (y)1966 3735 MS ( )2014 3735 MS (p)2039 3735 MS (a)2089 3735 MS (r)2133 3735 MS (t)2166 3735 MS ( )2194 3735 MS (o)2219 3735 MS (f)2270 3735 MS ( )2303 3735 MS (t)2328 3735 MS (h)2356 3735 MS (e)2406 3735 MS ( )2450 3735 MS (O)2475 3735 MS (r)2547 3735 MS (i)2580 3735 MS (g)2609 3735 MS (i)2658 3735 MS (n)2686 3735 MS (a)2736 3735 MS (l)2780 3735 MS ( )2808 3735 MS (C)2833 3735 MS (o)2900 3735 MS (d)2950 3735 MS (e)3000 3735 MS ( )3044 3735 MS (o)3069 3735 MS (r)3119 3735 MS ( )3152 3735 MS (p)3177 3735 MS (r)3228 3735 MS (e)3261 3735 MS (v)3305 3735 MS (i)3355 3735 MS (o)3383 3735 MS (u)3433 3735 MS (s)3483 3735 MS ( )3522 3735 MS (M)3547 3735 MS (o)3636 3735 MS (d)3686 3735 MS (i)3736 3735 MS (f)3764 3735 MS (i)3797 3735 MS (c)3825 3735 MS (a)3869 3735 MS (t)3913 3735 MS (i)3941 3735 MS (o)3969 3735 MS (n)4019 3735 MS (s)4069 3735 MS (.)4108 3735 MS (1)490 3932 MS (.)540 3932 MS (9)565 3932 MS (.)615 3932 MS [100 0 0 -100 0 0]/Helvetica MF ( )640 3932 MS [100 0 0 -100 0 0]/Times-Bold MF (")790 3932 MS (N)846 3932 MS (o)918 3932 MS (t)968 3932 MS (i)1001 3932 MS (c)1029 3932 MS (e)1073 3932 MS (")1117 3932 MS [100 0 0 -100 0 0]/Times-Roman MF ( )1173 3932 MS (m)1198 3932 MS (e)1276 3932 MS (a)1320 3932 MS (n)1364 3932 MS (s)1414 3932 MS ( )1453 3932 MS (a)1478 3932 MS (n)1522 3932 MS (y)1574 3932 MS ( )1622 3932 MS (n)1647 3932 MS (o)1697 3932 MS (t)1747 3932 MS (i)1775 3932 MS (c)1803 3932 MS (e)1847 3932 MS ( )1891 3932 MS (i)1916 3932 MS (n)1944 3932 MS ( )1994 3932 MS (O)2019 3932 MS (r)2092 3932 MS (i)2125 3932 MS (g)2153 3932 MS (i)2202 3932 MS (n)2230 3932 MS (a)2281 3932 MS (l)2325 3932 MS ( )2353 3932 MS (C)2378 3932 MS (o)2445 3932 MS (d)2495 3932 MS (e)2545 3932 MS ( )2589 3932 MS (o)2614 3932 MS (r)2664 3932 MS ( )2697 3932 MS (C)2722 3932 MS (o)2789 3932 MS (v)2839 3932 MS (e)2889 3932 MS (r)2933 3932 MS (e)2967 3932 MS (d)3011 3932 MS ( )3061 3932 MS (C)3086 3932 MS (o)3153 3932 MS (d)3203 3932 MS (e)3253 3932 MS (,)3297 3932 MS ( )3322 3932 MS (a)3347 3932 MS (s)3391 3932 MS ( )3430 3932 MS (r)3455 3932 MS (e)3489 3932 MS (q)3533 3932 MS (u)3583 3932 MS (i)3633 3932 MS (r)3661 3932 MS (e)3694 3932 MS (d)3738 3932 MS ( )3788 3932 MS (b)3813 3932 MS (y)3865 3932 MS ( )3913 3932 MS (a)3939 3932 MS (n)3983 3932 MS (d)4033 3932 MS ( )4083 3932 MS (i)4108 3932 MS (n)4136 3932 MS (c)490 4047 MS (o)534 4047 MS (m)584 4047 MS (p)662 4047 MS (l)712 4047 MS (i)740 4047 MS (a)768 4047 MS (n)812 4047 MS (c)862 4047 MS (e)906 4047 MS ( )950 4047 MS (w)975 4047 MS (i)1047 4047 MS (t)1075 4047 MS (h)1103 4047 MS ( )1153 4047 MS (t)1178 4047 MS (h)1206 4047 MS (i)1256 4047 MS (s)1284 4047 MS ( )1323 4047 MS (L)1349 4047 MS (i)1408 4047 MS (c)1436 4047 MS (e)1480 4047 MS (n)1525 4047 MS (s)1575 4047 MS (e)1614 4047 MS (.)1658 4047 MS (1)490 4246 MS (.)540 4246 MS (1)565 4246 MS (0)615 4246 MS (.)665 4246 MS [100 0 0 -100 0 0]/Helvetica MF ( )690 4246 MS [100 0 0 -100 0 0]/Times-Bold MF (")790 4246 MS (O)846 4246 MS (r)924 4246 MS (i)968 4246 MS (g)996 4246 MS (i)1046 4246 MS (n)1074 4246 MS (a)1130 4246 MS (l)1180 4246 MS ( )1208 4246 MS (C)1233 4246 MS (o)1305 4246 MS (d)1355 4246 MS (e)1411 4246 MS (")1454 4246 MS [100 0 0 -100 0 0]/Times-Roman MF ( )1510 4246 MS (m)1535 4246 MS (e)1613 4246 MS (a)1657 4246 MS (n)1701 4246 MS (s)1751 4246 MS ( )1790 4246 MS (s)1815 4246 MS (o)1854 4246 MS (u)1904 4246 MS (r)1954 4246 MS (c)1987 4246 MS (e)2031 4246 MS ( )2075 4246 MS (c)2100 4246 MS (o)2144 4246 MS (d)2194 4246 MS (e)2245 4246 MS ( )2289 4246 MS (o)2314 4246 MS (f)2364 4246 MS ( )2397 4246 MS (c)2422 4246 MS (o)2466 4246 MS (m)2516 4246 MS (p)2594 4246 MS (u)2644 4246 MS (t)2694 4246 MS (e)2722 4246 MS (r)2767 4246 MS ( )2800 4246 MS (s)2825 4246 MS (o)2864 4246 MS (f)2914 4246 MS (t)2947 4246 MS (w)2975 4246 MS (a)3047 4246 MS (r)3092 4246 MS (e)3125 4246 MS ( )3169 4246 MS (c)3194 4246 MS (o)3238 4246 MS (d)3288 4246 MS (e)3339 4246 MS ( )3383 4246 MS (t)3408 4246 MS (h)3436 4246 MS (a)3486 4246 MS (t)3530 4246 MS ( )3558 4246 MS (i)3583 4246 MS (s)3611 4246 MS ( )3650 4246 MS (d)3675 4246 MS (e)3725 4246 MS (s)3769 4246 MS (c)3808 4246 MS (r)3852 4246 MS (i)3885 4246 MS (b)3913 4246 MS (e)3964 4246 MS (d)4008 4246 MS ( )4058 4246 MS (i)4083 4246 MS (n)4111 4246 MS ( )4161 4246 MS (t)4186 4246 MS (h)4214 4246 MS (e)4264 4246 MS (s)490 4361 MS (o)529 4361 MS (u)579 4361 MS (r)629 4361 MS (c)662 4361 MS (e)706 4361 MS ( )750 4361 MS (c)775 4361 MS (o)819 4361 MS (d)869 4361 MS (e)920 4361 MS ( )964 4361 MS (N)989 4361 MS (o)1061 4361 MS (t)1111 4361 MS (i)1139 4361 MS (c)1167 4361 MS (e)1211 4361 MS ( )1255 4361 MS (r)1281 4361 MS (e)1314 4361 MS (q)1358 4361 MS (u)1408 4361 MS (i)1458 4361 MS (r)1486 4361 MS (e)1520 4361 MS (d)1564 4361 MS ( )1614 4361 MS (b)1639 4361 MS (y)1691 4361 MS ( )1739 4361 MS (E)1764 4361 MS (x)1825 4361 MS (h)1876 4361 MS (i)1926 4361 MS (b)1954 4361 MS (i)2004 4361 MS (t)2032 4361 MS ( )2060 4361 MS (A)2085 4361 MS ( )2157 4361 MS (a)2182 4361 MS (s)2226 4361 MS ( )2265 4361 MS (O)2290 4361 MS (r)2362 4361 MS (i)2395 4361 MS (g)2423 4361 MS (i)2472 4361 MS (n)2500 4361 MS (a)2550 4361 MS (l)2594 4361 MS ( )2622 4361 MS (C)2647 4361 MS (o)2714 4361 MS (d)2764 4361 MS (e)2814 4361 MS (,)2858 4361 MS ( )2883 4361 MS (a)2908 4361 MS (n)2952 4361 MS (d)3002 4361 MS ( )3052 4361 MS (u)3077 4361 MS (p)3127 4361 MS (d)3177 4361 MS (a)3228 4361 MS (t)3272 4361 MS (e)3300 4361 MS (s)3344 4361 MS ( )3383 4361 MS (a)3408 4361 MS (n)3452 4361 MS (d)3502 4361 MS ( )3552 4361 MS (e)3578 4361 MS (r)3622 4361 MS (r)3655 4361 MS (o)3688 4361 MS (r)3739 4361 MS ( )3772 4361 MS (c)3797 4361 MS (o)3841 4361 MS (r)3891 4361 MS (r)3925 4361 MS (e)3958 4361 MS (c)4002 4361 MS (t)4046 4361 MS (i)4074 4361 MS (o)4102 4361 MS (n)4152 4361 MS (s)4202 4361 MS (s)490 4475 MS (p)529 4475 MS (e)579 4475 MS (c)623 4475 MS (i)667 4475 MS (f)695 4475 MS (i)728 4475 MS (c)756 4475 MS (a)800 4475 MS (l)844 4475 MS (l)872 4475 MS (y)902 4475 MS ( )950 4475 MS (t)975 4475 MS (h)1003 4475 MS (e)1053 4475 MS (r)1097 4475 MS (e)1131 4475 MS (t)1175 4475 MS (o)1203 4475 MS (.)1253 4475 MS (1)490 4674 MS (.)540 4674 MS (1)565 4674 MS (1)615 4674 MS (.)665 4674 MS [100 0 0 -100 0 0]/Helvetica MF ( )690 4674 MS [100 0 0 -100 0 0]/Times-Bold MF (")790 4674 MS (R)846 4674 MS (e)918 4674 MS (c)962 4674 MS (i)1006 4674 MS (p)1034 4674 MS (i)1090 4674 MS (e)1118 4674 MS (n)1162 4674 MS (t)1218 4674 MS (")1251 4674 MS ( )1307 4674 MS [100 0 0 -100 0 0]/Times-Roman MF (m)1332 4674 MS (e)1410 4674 MS (a)1454 4674 MS (n)1498 4674 MS (s)1548 4674 MS ( )1587 4674 MS (a)1612 4674 MS (n)1656 4674 MS ( )1706 4674 MS (i)1731 4674 MS (n)1759 4674 MS (d)1809 4674 MS (i)1859 4674 MS (v)1887 4674 MS (i)1937 4674 MS (d)1965 4674 MS (u)2015 4674 MS (a)2065 4674 MS (l)2109 4674 MS ( )2137 4674 MS (o)2162 4674 MS (r)2212 4674 MS ( )2245 4674 MS (a)2270 4674 MS ( )2314 4674 MS (l)2339 4674 MS (e)2367 4674 MS (g)2412 4674 MS (a)2461 4674 MS (l)2505 4674 MS ( )2533 4674 MS (e)2558 4674 MS (n)2602 4674 MS (t)2652 4674 MS (i)2680 4674 MS (t)2708 4674 MS (y)2738 4674 MS ( )2786 4674 MS (e)2811 4674 MS (x)2855 4674 MS (e)2906 4674 MS (r)2950 4674 MS (c)2983 4674 MS (i)3027 4674 MS (s)3055 4674 MS (i)3094 4674 MS (n)3122 4674 MS (g)3173 4674 MS ( )3222 4674 MS (r)3247 4674 MS (i)3280 4674 MS (g)3309 4674 MS (h)3358 4674 MS (t)3408 4674 MS (s)3436 4674 MS ( )3475 4674 MS (u)3500 4674 MS (n)3550 4674 MS (d)3600 4674 MS (e)3650 4674 MS (r)3694 4674 MS (,)3727 4674 MS ( )3752 4674 MS (a)3778 4674 MS (n)3822 4674 MS (d)3872 4674 MS ( )3922 4674 MS (c)3947 4674 MS (o)3991 4674 MS (m)4041 4674 MS (p)4119 4674 MS (l)4169 4674 MS (y)4199 4674 MS (i)4246 4674 MS (n)4274 4674 MS (g)4325 4674 MS (w)490 4789 MS (i)562 4789 MS (t)590 4789 MS (h)618 4789 MS ( )668 4789 MS (a)693 4789 MS (l)737 4789 MS (l)765 4789 MS ( )793 4789 MS (o)818 4789 MS (f)868 4789 MS ( )901 4789 MS (t)926 4789 MS (h)954 4789 MS (e)1004 4789 MS ( )1048 4789 MS (t)1073 4789 MS (e)1101 4789 MS (r)1145 4789 MS (m)1178 4789 MS (s)1256 4789 MS ( )1295 4789 MS (o)1320 4789 MS (f)1370 4789 MS (,)1403 4789 MS ( )1428 4789 MS (t)1453 4789 MS (h)1481 4789 MS (i)1531 4789 MS (s)1559 4789 MS ( )1598 4789 MS (L)1624 4789 MS (i)1683 4789 MS (c)1712 4789 MS (e)1756 4789 MS (n)1800 4789 MS (s)1850 4789 MS (e)1889 4789 MS ( )1933 4789 MS (o)1958 4789 MS (r)2009 4789 MS ( )2042 4789 MS (a)2067 4789 MS ( )2111 4789 MS (f)2136 4789 MS (u)2169 4789 MS (t)2219 4789 MS (u)2247 4789 MS (r)2297 4789 MS (e)2331 4789 MS ( )2375 4789 MS (v)2400 4789 MS (e)2450 4789 MS (r)2494 4789 MS (s)2527 4789 MS (i)2566 4789 MS (o)2594 4789 MS (n)2644 4789 MS ( )2694 4789 MS (o)2719 4789 MS (f)2769 4789 MS ( )2802 4789 MS (t)2827 4789 MS (h)2855 4789 MS (i)2905 4789 MS (s)2933 4789 MS ( )2972 4789 MS (L)2998 4789 MS (i)3058 4789 MS (c)3086 4789 MS (e)3131 4789 MS (n)3175 4789 MS (s)3225 4789 MS (e)3264 4789 MS ( )3308 4789 MS (i)3333 4789 MS (s)3361 4789 MS (s)3400 4789 MS (u)3439 4789 MS (e)3489 4789 MS (d)3533 4789 MS ( )3583 4789 MS (u)3608 4789 MS (n)3658 4789 MS (d)3708 4789 MS (e)3758 4789 MS (r)3803 4789 MS ( )3836 4789 MS (S)3861 4789 MS (e)3917 4789 MS (c)3961 4789 MS (t)4005 4789 MS (i)4033 4789 MS (o)4061 4789 MS (n)4111 4789 MS ( )4161 4789 MS (8)4186 4789 MS (.)4236 4789 MS (F)490 4904 MS (o)545 4904 MS (r)595 4904 MS ( )628 4904 MS (l)653 4904 MS (e)681 4904 MS (g)726 4904 MS (a)775 4904 MS (l)819 4904 MS ( )847 4904 MS (e)873 4904 MS (n)917 4904 MS (t)967 4904 MS (i)995 4904 MS (t)1023 4904 MS (i)1051 4904 MS (e)1079 4904 MS (s)1123 4904 MS (,)1162 4904 MS ( )1187 4904 MS (")1212 4904 MS (R)1252 4904 MS (e)1319 4904 MS (c)1363 4904 MS (i)1407 4904 MS (p)1435 4904 MS (i)1485 4904 MS (e)1513 4904 MS (n)1557 4904 MS (t)1607 4904 MS (")1636 4904 MS ( )1676 4904 MS (i)1701 4904 MS (n)1729 4904 MS (c)1779 4904 MS (l)1823 4904 MS (u)1851 4904 MS (d)1901 4904 MS (e)1951 4904 MS (s)1995 4904 MS ( )2034 4904 MS (a)2060 4904 MS (n)2104 4904 MS (y)2156 4904 MS ( )2204 4904 MS (e)2229 4904 MS (n)2273 4904 MS (t)2323 4904 MS (i)2351 4904 MS (t)2379 4904 MS (y)2408 4904 MS ( )2456 4904 MS (t)2481 4904 MS (h)2509 4904 MS (a)2560 4904 MS (t)2604 4904 MS ( )2632 4904 MS (c)2657 4904 MS (o)2701 4904 MS (n)2751 4904 MS (t)2801 4904 MS (r)2829 4904 MS (o)2862 4904 MS (l)2912 4904 MS (s)2940 4904 MS (,)2979 4904 MS ( )3004 4904 MS (i)3029 4904 MS (s)3057 4904 MS ( )3096 4904 MS (c)3121 4904 MS (o)3165 4904 MS (n)3215 4904 MS (t)3265 4904 MS (r)3293 4904 MS (o)3326 4904 MS (l)3376 4904 MS (l)3404 4904 MS (e)3432 4904 MS (d)3476 4904 MS ( )3526 4904 MS (b)3551 4904 MS (y)3603 4904 MS (,)3651 4904 MS ( )3676 4904 MS (o)3701 4904 MS (r)3751 4904 MS ( )3784 4904 MS (i)3809 4904 MS (s)3837 4904 MS ( )3876 4904 MS (u)3901 4904 MS (n)3951 4904 MS (d)4001 4904 MS (e)4051 4904 MS (r)4095 4904 MS (c)490 5019 MS (o)534 5019 MS (m)584 5019 MS (m)662 5019 MS (o)740 5019 MS (n)790 5019 MS ( )840 5019 MS (c)865 5019 MS (o)909 5019 MS (n)959 5019 MS (t)1009 5019 MS (r)1037 5019 MS (o)1070 5019 MS (l)1120 5019 MS ( )1148 5019 MS (w)1173 5019 MS (i)1245 5019 MS (t)1273 5019 MS (h)1301 5019 MS ( )1351 5019 MS (R)1376 5019 MS (e)1443 5019 MS (c)1487 5019 MS (i)1531 5019 MS (p)1559 5019 MS (i)1609 5019 MS (e)1637 5019 MS (n)1681 5019 MS (t)1731 5019 MS (.)1759 5019 MS ( )1784 5019 MS (F)1809 5019 MS (o)1864 5019 MS (r)1914 5019 MS ( )1947 5019 MS (p)1972 5019 MS (u)2022 5019 MS (r)2073 5019 MS (p)2106 5019 MS (o)2156 5019 MS (s)2206 5019 MS (e)2245 5019 MS (s)2289 5019 MS ( )2328 5019 MS (o)2353 5019 MS (f)2403 5019 MS ( )2436 5019 MS (t)2461 5019 MS (h)2489 5019 MS (i)2539 5019 MS (s)2567 5019 MS ( )2606 5019 MS (d)2631 5019 MS (e)2681 5019 MS (f)2725 5019 MS (i)2758 5019 MS (n)2786 5019 MS (i)2836 5019 MS (t)2864 5019 MS (i)2892 5019 MS (o)2920 5019 MS (n)2970 5019 MS (,)3020 5019 MS ( )3045 5019 MS (")3070 5019 MS (c)3111 5019 MS (o)3155 5019 MS (n)3205 5019 MS (t)3255 5019 MS (r)3283 5019 MS (o)3316 5019 MS (l)3366 5019 MS (")3394 5019 MS ( )3434 5019 MS (o)3459 5019 MS (f)3510 5019 MS ( )3543 5019 MS (a)3568 5019 MS (n)3612 5019 MS ( )3662 5019 MS (e)3687 5019 MS (n)3731 5019 MS (t)3781 5019 MS (i)3809 5019 MS (t)3837 5019 MS (y)3867 5019 MS ( )3915 5019 MS (m)3940 5019 MS (e)4018 5019 MS (a)4062 5019 MS (n)4106 5019 MS (s)4156 5019 MS ( )4195 5019 MS (\()4221 5019 MS (a)4254 5019 MS (\))4298 5019 MS (t)490 5134 MS (h)518 5134 MS (e)568 5134 MS ( )612 5134 MS (p)637 5134 MS (o)687 5134 MS (w)737 5134 MS (e)809 5134 MS (r)853 5134 MS (,)886 5134 MS ( )911 5134 MS (d)936 5134 MS (i)986 5134 MS (r)1014 5134 MS (e)1048 5134 MS (c)1092 5134 MS (t)1136 5134 MS ( )1164 5134 MS (o)1189 5134 MS (r)1239 5134 MS ( )1272 5134 MS (i)1297 5134 MS (n)1325 5134 MS (d)1375 5134 MS (i)1425 5134 MS (r)1453 5134 MS (e)1486 5134 MS (c)1531 5134 MS (t)1575 5134 MS (,)1603 5134 MS ( )1628 5134 MS (t)1653 5134 MS (o)1681 5134 MS ( )1731 5134 MS (d)1756 5134 MS (i)1806 5134 MS (r)1834 5134 MS (e)1867 5134 MS (c)1911 5134 MS (t)1955 5134 MS ( )1983 5134 MS (o)2008 5134 MS (r)2058 5134 MS ( )2091 5134 MS (m)2116 5134 MS (a)2194 5134 MS (n)2238 5134 MS (a)2289 5134 MS (g)2334 5134 MS (e)2383 5134 MS ( )2427 5134 MS (s)2452 5134 MS (u)2491 5134 MS (c)2542 5134 MS (h)2586 5134 MS ( )2636 5134 MS (e)2661 5134 MS (n)2705 5134 MS (t)2755 5134 MS (i)2783 5134 MS (t)2811 5134 MS (y)2840 5134 MS (,)2888 5134 MS ( )2913 5134 MS (o)2938 5134 MS (r)2989 5134 MS ( )3022 5134 MS (\()3047 5134 MS (b)3080 5134 MS (\))3130 5134 MS ( )3163 5134 MS (o)3188 5134 MS (w)3238 5134 MS (n)3310 5134 MS (e)3361 5134 MS (r)3405 5134 MS (s)3438 5134 MS (h)3477 5134 MS (i)3527 5134 MS (p)3555 5134 MS ( )3605 5134 MS (o)3630 5134 MS (f)3680 5134 MS ( )3713 5134 MS (f)3738 5134 MS (i)3771 5134 MS (f)3800 5134 MS (t)3833 5134 MS (y)3862 5134 MS ( )3910 5134 MS (p)3935 5134 MS (e)3986 5134 MS (r)4030 5134 MS (c)4063 5134 MS (e)4108 5134 MS (n)4152 5134 MS (t)4202 5134 MS (\()490 5249 MS (5)523 5249 MS (0)573 5249 MS (%)623 5249 MS (\))706 5249 MS ( )739 5249 MS (o)764 5249 MS (r)814 5249 MS ( )847 5249 MS (m)872 5249 MS (o)950 5249 MS (r)1000 5249 MS (e)1034 5249 MS ( )1078 5249 MS (o)1103 5249 MS (f)1153 5249 MS ( )1186 5249 MS (t)1211 5249 MS (h)1239 5249 MS (e)1289 5249 MS ( )1333 5249 MS (o)1358 5249 MS (u)1408 5249 MS (t)1458 5249 MS (s)1486 5249 MS (t)1525 5249 MS (a)1553 5249 MS (n)1597 5249 MS (d)1647 5249 MS (i)1697 5249 MS (n)1725 5249 MS (g)1776 5249 MS ( )1825 5249 MS (s)1850 5249 MS (h)1889 5249 MS (a)1939 5249 MS (r)1984 5249 MS (e)2017 5249 MS (s)2061 5249 MS ( )2100 5249 MS (o)2125 5249 MS (r)2175 5249 MS ( )2208 5249 MS (b)2233 5249 MS (e)2284 5249 MS (n)2328 5249 MS (e)2378 5249 MS (f)2422 5249 MS (i)2455 5249 MS (c)2483 5249 MS (i)2527 5249 MS (a)2556 5249 MS (l)2600 5249 MS ( )2628 5249 MS (o)2653 5249 MS (w)2703 5249 MS (n)2775 5249 MS (e)2825 5249 MS (r)2869 5249 MS (s)2902 5249 MS (h)2941 5249 MS (i)2991 5249 MS (p)3019 5249 MS ( )3069 5249 MS (o)3094 5249 MS (f)3144 5249 MS ( )3177 5249 MS (s)3202 5249 MS (u)3241 5249 MS (c)3292 5249 MS (h)3336 5249 MS ( )3386 5249 MS (e)3411 5249 MS (n)3455 5249 MS (t)3505 5249 MS (i)3533 5249 MS (t)3561 5249 MS (y)3590 5249 MS (.)3638 5249 MS (1)490 5447 MS (.)540 5447 MS (1)565 5447 MS (2)615 5447 MS (.)665 5447 MS [100 0 0 -100 0 0]/Helvetica MF ( )690 5447 MS [100 0 0 -100 0 0]/Times-Bold MF (")790 5447 MS (R)846 5447 MS (e)918 5447 MS (c)962 5447 MS (i)1006 5447 MS (p)1034 5447 MS (i)1090 5447 MS (e)1118 5447 MS (n)1162 5447 MS (t)1218 5447 MS ( )1251 5447 MS (P)1276 5447 MS (a)1336 5447 MS (t)1386 5447 MS (e)1420 5447 MS (n)1464 5447 MS (t)1520 5447 MS (s)1553 5447 MS (")1592 5447 MS ( )1648 5447 MS [100 0 0 -100 0 0]/Times-Roman MF (m)1673 5447 MS (e)1751 5447 MS (a)1795 5447 MS (n)1839 5447 MS (s)1889 5447 MS ( )1928 5447 MS (p)1953 5447 MS (a)2003 5447 MS (t)2047 5447 MS (e)2075 5447 MS (n)2119 5447 MS (t)2169 5447 MS ( )2197 5447 MS (c)2222 5447 MS (l)2266 5447 MS (a)2295 5447 MS (i)2339 5447 MS (m)2367 5447 MS (s)2445 5447 MS ( )2484 5447 MS (L)2510 5447 MS (i)2569 5447 MS (c)2597 5447 MS (e)2642 5447 MS (n)2686 5447 MS (s)2736 5447 MS (a)2775 5447 MS (b)2819 5447 MS (l)2869 5447 MS (e)2897 5447 MS ( )2941 5447 MS (b)2966 5447 MS (y)3018 5447 MS ( )3066 5447 MS (a)3092 5447 MS ( )3136 5447 MS (R)3161 5447 MS (e)3228 5447 MS (c)3272 5447 MS (i)3316 5447 MS (p)3344 5447 MS (i)3394 5447 MS (e)3422 5447 MS (n)3466 5447 MS (t)3516 5447 MS ( )3544 5447 MS (t)3569 5447 MS (h)3597 5447 MS (a)3647 5447 MS (t)3691 5447 MS ( )3719 5447 MS (a)3744 5447 MS (r)3789 5447 MS (e)3822 5447 MS ( )3866 5447 MS (i)3891 5447 MS (n)3919 5447 MS (f)3969 5447 MS (r)4002 5447 MS (i)4035 5447 MS (n)4063 5447 MS (g)4114 5447 MS (e)4163 5447 MS (d)4207 5447 MS ( )4257 5447 MS (b)4282 5447 MS (y)4334 5447 MS (t)490 5562 MS (h)518 5562 MS (e)568 5562 MS ( )612 5562 MS (u)637 5562 MS (s)687 5562 MS (e)726 5562 MS ( )770 5562 MS (o)795 5562 MS (r)845 5562 MS ( )878 5562 MS (s)903 5562 MS (a)942 5562 MS (l)986 5562 MS (e)1014 5562 MS ( )1058 5562 MS (o)1083 5562 MS (f)1134 5562 MS ( )1167 5562 MS (O)1192 5562 MS (r)1264 5562 MS (i)1297 5562 MS (g)1326 5562 MS (i)1375 5562 MS (n)1403 5562 MS (a)1453 5562 MS (l)1497 5562 MS ( )1525 5562 MS (C)1550 5562 MS (o)1617 5562 MS (d)1667 5562 MS (e)1717 5562 MS ( )1761 5562 MS (o)1786 5562 MS (r)1836 5562 MS ( )1869 5562 MS (a)1895 5562 MS (n)1939 5562 MS (y)1991 5562 MS ( )2039 5562 MS (M)2064 5562 MS (o)2153 5562 MS (d)2203 5562 MS (i)2253 5562 MS (f)2281 5562 MS (i)2314 5562 MS (c)2342 5562 MS (a)2386 5562 MS (t)2430 5562 MS (i)2458 5562 MS (o)2486 5562 MS (n)2536 5562 MS (s)2586 5562 MS ( )2625 5562 MS (p)2650 5562 MS (r)2700 5562 MS (o)2733 5562 MS (v)2783 5562 MS (i)2833 5562 MS (d)2861 5562 MS (e)2911 5562 MS (d)2955 5562 MS ( )3005 5562 MS (b)3030 5562 MS (y)3082 5562 MS ( )3130 5562 MS (S)3155 5562 MS (G)3211 5562 MS (I)3284 5562 MS (,)3316 5562 MS ( )3341 5562 MS (o)3366 5562 MS (r)3417 5562 MS ( )3450 5562 MS (a)3475 5562 MS (n)3519 5562 MS (y)3571 5562 MS ( )3619 5562 MS (c)3645 5562 MS (o)3689 5562 MS (m)3739 5562 MS (b)3817 5562 MS (i)3867 5562 MS (n)3895 5562 MS (a)3945 5562 MS (t)3989 5562 MS (i)4017 5562 MS (o)4045 5562 MS (n)4095 5562 MS (t)490 5677 MS (h)518 5677 MS (e)568 5677 MS (r)612 5677 MS (e)645 5677 MS (o)689 5677 MS (f)739 5677 MS (.)772 5677 MS (1)490 5876 MS (.)540 5876 MS (1)565 5876 MS (3)615 5876 MS (.)665 5876 MS [100 0 0 -100 0 0]/Helvetica MF ( )690 5876 MS [100 0 0 -100 0 0]/Times-Bold MF (")790 5876 MS (S)846 5876 MS (G)902 5876 MS (I)979 5876 MS (")1018 5876 MS [100 0 0 -100 0 0]/Times-Roman MF ( )1074 5876 MS (m)1099 5876 MS (e)1177 5876 MS (a)1221 5876 MS (n)1265 5876 MS (s)1315 5876 MS ( )1354 5876 MS (S)1379 5876 MS (i)1435 5876 MS (l)1463 5876 MS (i)1491 5876 MS (c)1519 5876 MS (o)1563 5876 MS (n)1613 5876 MS ( )1663 5876 MS (G)1688 5876 MS (r)1760 5876 MS (a)1793 5876 MS (p)1837 5876 MS (h)1887 5876 MS (i)1937 5876 MS (c)1965 5876 MS (s)2009 5876 MS (,)2048 5876 MS ( )2073 5876 MS (I)2099 5876 MS (n)2131 5876 MS (c)2181 5876 MS (.)2225 5876 MS showpage %%Page: 2 2 13.238 780.059 translate 72 600 div dup neg scale 0 0 transform .25 add round .25 sub exch .25 add round .25 sub exch itransform translate [100 0 0 -100 0 0]/Times-Roman MF (1)490 592 MS (.)540 592 MS (1)565 592 MS (4)615 592 MS (.)665 592 MS [100 0 0 -100 0 0]/Helvetica MF ( )690 592 MS [100 0 0 -100 0 0]/Times-Bold MF (")790 592 MS (S)846 592 MS (G)902 592 MS (I)979 592 MS ( )1018 592 MS (P)1043 592 MS (a)1103 592 MS (t)1153 592 MS (e)1187 592 MS (n)1231 592 MS (t)1287 592 MS (s)1320 592 MS (")1359 592 MS ( )1415 592 MS [100 0 0 -100 0 0]/Times-Roman MF (m)1440 592 MS (e)1518 592 MS (a)1562 592 MS (n)1606 592 MS (s)1656 592 MS ( )1695 592 MS (p)1720 592 MS (a)1770 592 MS (t)1814 592 MS (e)1842 592 MS (n)1886 592 MS (t)1936 592 MS ( )1964 592 MS (c)1989 592 MS (l)2033 592 MS (a)2061 592 MS (i)2105 592 MS (m)2133 592 MS (s)2211 592 MS ( )2250 592 MS (L)2276 592 MS (i)2336 592 MS (c)2364 592 MS (e)2409 592 MS (n)2453 592 MS (s)2503 592 MS (a)2542 592 MS (b)2586 592 MS (l)2636 592 MS (e)2664 592 MS ( )2708 592 MS (b)2733 592 MS (y)2785 592 MS ( )2833 592 MS (S)2858 592 MS (G)2914 592 MS (I)2987 592 MS ( )3019 592 MS (o)3044 592 MS (t)3094 592 MS (h)3122 592 MS (e)3172 592 MS (r)3217 592 MS ( )3250 592 MS (t)3275 592 MS (h)3303 592 MS (a)3353 592 MS (n)3397 592 MS ( )3447 592 MS (t)3472 592 MS (h)3500 592 MS (e)3550 592 MS ( )3594 592 MS (L)3620 592 MS (i)3680 592 MS (c)3708 592 MS (e)3753 592 MS (n)3797 592 MS (s)3847 592 MS (e)3886 592 MS (d)3930 592 MS ( )3980 592 MS (P)4005 592 MS (a)4061 592 MS (t)4105 592 MS (e)4133 592 MS (n)4177 592 MS (t)4227 592 MS (s)4255 592 MS (.)4294 592 MS [100 0 0 -100 0 0]/Times-Bold MF (2)490 792 MS (.)540 792 MS [100 0 0 -100 0 0]/Helvetica-Bold MF ( )565 792 MS [100 0 0 -100 0 0]/Times-Bold MF (L)790 792 MS (i)857 792 MS (c)885 792 MS (e)929 792 MS (n)973 792 MS (s)1029 792 MS (e)1068 792 MS ( )1112 792 MS (G)1137 792 MS (r)1214 792 MS (a)1258 792 MS (n)1308 792 MS (t)1364 792 MS ( )1397 792 MS (a)1422 792 MS (n)1472 792 MS (d)1528 792 MS ( )1584 792 MS (R)1609 792 MS (e)1681 792 MS (s)1725 792 MS (t)1764 792 MS (r)1797 792 MS (i)1842 792 MS (c)1870 792 MS (t)1914 792 MS (i)1947 792 MS (o)1975 792 MS (n)2025 792 MS (s)2081 792 MS (.)2120 792 MS [100 0 0 -100 0 0]/Times-Roman MF (2)490 988 MS (.)540 988 MS (1)565 988 MS (.)615 988 MS [100 0 0 -100 0 0]/Helvetica MF ( )640 988 MS [100 0 0 -100 0 0]/Times-Bold MF (S)790 988 MS (G)846 988 MS (I)923 988 MS ( )962 988 MS (L)987 988 MS (i)1054 988 MS (c)1082 988 MS (e)1126 988 MS (n)1170 988 MS (s)1226 988 MS (e)1265 988 MS ( )1309 988 MS (G)1334 988 MS (r)1412 988 MS (a)1456 988 MS (n)1506 988 MS (t)1562 988 MS (.)1595 988 MS [100 0 0 -100 0 0]/Times-Roman MF ( )1620 988 MS (S)1645 988 MS (u)1701 988 MS (b)1751 988 MS (j)1801 988 MS (e)1829 988 MS (c)1873 988 MS (t)1917 988 MS ( )1945 988 MS (t)1970 988 MS (o)1998 988 MS ( )2048 988 MS (t)2073 988 MS (h)2101 988 MS (e)2151 988 MS ( )2195 988 MS (t)2220 988 MS (e)2248 988 MS (r)2292 988 MS (m)2325 988 MS (s)2403 988 MS ( )2442 988 MS (o)2467 988 MS (f)2517 988 MS ( )2550 988 MS (t)2575 988 MS (h)2603 988 MS (i)2653 988 MS (s)2681 988 MS ( )2720 988 MS (L)2746 988 MS (i)2805 988 MS (c)2833 988 MS (e)2878 988 MS (n)2922 988 MS (s)2972 988 MS (e)3012 988 MS ( )3056 988 MS (a)3081 988 MS (n)3125 988 MS (d)3175 988 MS ( )3225 988 MS (a)3250 988 MS (n)3294 988 MS (y)3346 988 MS ( )3394 988 MS (t)3419 988 MS (h)3447 988 MS (i)3497 988 MS (r)3525 988 MS (d)3558 988 MS ( )3608 988 MS (p)3633 988 MS (a)3684 988 MS (r)3728 988 MS (t)3761 988 MS (y)3791 988 MS ( )3839 988 MS (i)3864 988 MS (n)3892 988 MS (t)3942 988 MS (e)3970 988 MS (l)4014 988 MS (l)4042 988 MS (e)4070 988 MS (c)4114 988 MS (t)4158 988 MS (u)4186 988 MS (a)4236 988 MS (l)4280 988 MS (p)490 1103 MS (r)540 1103 MS (o)573 1103 MS (p)623 1103 MS (e)673 1103 MS (r)717 1103 MS (t)750 1103 MS (y)780 1103 MS ( )828 1103 MS (c)853 1103 MS (l)897 1103 MS (a)925 1103 MS (i)969 1103 MS (m)997 1103 MS (s)1075 1103 MS (,)1114 1103 MS ( )1139 1103 MS (f)1164 1103 MS (o)1197 1103 MS (r)1247 1103 MS ( )1280 1103 MS (t)1305 1103 MS (h)1333 1103 MS (e)1384 1103 MS ( )1428 1103 MS (d)1453 1103 MS (u)1503 1103 MS (r)1553 1103 MS (a)1586 1103 MS (t)1630 1103 MS (i)1658 1103 MS (o)1686 1103 MS (n)1736 1103 MS ( )1786 1103 MS (o)1811 1103 MS (f)1861 1103 MS ( )1894 1103 MS (i)1919 1103 MS (n)1947 1103 MS (t)1997 1103 MS (e)2025 1103 MS (l)2069 1103 MS (l)2097 1103 MS (e)2125 1103 MS (c)2170 1103 MS (t)2214 1103 MS (u)2242 1103 MS (a)2292 1103 MS (l)2336 1103 MS ( )2364 1103 MS (p)2389 1103 MS (r)2439 1103 MS (o)2472 1103 MS (p)2522 1103 MS (e)2572 1103 MS (r)2617 1103 MS (t)2650 1103 MS (y)2679 1103 MS ( )2727 1103 MS (p)2752 1103 MS (r)2803 1103 MS (o)2836 1103 MS (t)2886 1103 MS (e)2914 1103 MS (c)2958 1103 MS (t)3002 1103 MS (i)3030 1103 MS (o)3058 1103 MS (n)3108 1103 MS (s)3158 1103 MS ( )3197 1103 MS (i)3222 1103 MS (n)3250 1103 MS (h)3300 1103 MS (e)3350 1103 MS (r)3394 1103 MS (e)3428 1103 MS (n)3472 1103 MS (t)3522 1103 MS ( )3550 1103 MS (i)3575 1103 MS (n)3603 1103 MS ( )3653 1103 MS (t)3678 1103 MS (h)3706 1103 MS (e)3756 1103 MS ( )3800 1103 MS (O)3825 1103 MS (r)3897 1103 MS (i)3930 1103 MS (g)3959 1103 MS (i)4008 1103 MS (n)4036 1103 MS (a)4086 1103 MS (l)4130 1103 MS (C)490 1218 MS (o)557 1218 MS (d)607 1218 MS (e)657 1218 MS (,)701 1218 MS ( )726 1218 MS (S)751 1218 MS (G)807 1218 MS (I)880 1218 MS ( )911 1218 MS (h)936 1218 MS (e)987 1218 MS (r)1031 1218 MS (e)1064 1218 MS (b)1108 1218 MS (y)1160 1218 MS ( )1208 1218 MS (g)1234 1218 MS (r)1284 1218 MS (a)1317 1218 MS (n)1361 1218 MS (t)1411 1218 MS (s)1439 1218 MS ( )1478 1218 MS (R)1503 1218 MS (e)1570 1218 MS (c)1614 1218 MS (i)1658 1218 MS (p)1686 1218 MS (i)1736 1218 MS (e)1764 1218 MS (n)1808 1218 MS (t)1858 1218 MS ( )1886 1218 MS (a)1911 1218 MS ( )1955 1218 MS (w)1981 1218 MS (o)2053 1218 MS (r)2103 1218 MS (l)2136 1218 MS (d)2164 1218 MS (w)2214 1218 MS (i)2286 1218 MS (d)2314 1218 MS (e)2364 1218 MS (,)2408 1218 MS ( )2433 1218 MS (r)2458 1218 MS (o)2491 1218 MS (y)2543 1218 MS (a)2591 1218 MS (l)2636 1218 MS (t)2664 1218 MS (y)2693 1218 MS (-)2741 1218 MS (f)2775 1218 MS (r)2808 1218 MS (e)2842 1218 MS (e)2886 1218 MS (,)2930 1218 MS ( )2955 1218 MS (n)2980 1218 MS (o)3030 1218 MS (n)3080 1218 MS (-)3130 1218 MS (e)3163 1218 MS (x)3207 1218 MS (c)3258 1218 MS (l)3302 1218 MS (u)3330 1218 MS (s)3380 1218 MS (i)3419 1218 MS (v)3447 1218 MS (e)3497 1218 MS ( )3541 1218 MS (l)3566 1218 MS (i)3594 1218 MS (c)3622 1218 MS (e)3666 1218 MS (n)3710 1218 MS (s)3760 1218 MS (e)3800 1218 MS (,)3844 1218 MS ( )3869 1218 MS (t)3894 1218 MS (o)3922 1218 MS ( )3972 1218 MS (d)3997 1218 MS (o)4047 1218 MS ( )4097 1218 MS (t)4122 1218 MS (h)4150 1218 MS (e)4200 1218 MS (f)490 1333 MS (o)523 1333 MS (l)573 1333 MS (l)601 1333 MS (o)629 1333 MS (w)679 1333 MS (i)751 1333 MS (n)779 1333 MS (g)829 1333 MS (:)878 1333 MS ( )906 1333 MS (\()931 1333 MS (i)964 1333 MS (\))992 1333 MS ( )1025 1333 MS (u)1050 1333 MS (n)1100 1333 MS (d)1150 1333 MS (e)1200 1333 MS (r)1245 1333 MS ( )1278 1333 MS (c)1303 1333 MS (o)1347 1333 MS (p)1397 1333 MS (y)1449 1333 MS (r)1497 1333 MS (i)1530 1333 MS (g)1559 1333 MS (h)1608 1333 MS (t)1658 1333 MS (s)1686 1333 MS ( )1725 1333 MS (L)1751 1333 MS (i)1811 1333 MS (c)1839 1333 MS (e)1884 1333 MS (n)1928 1333 MS (s)1978 1333 MS (a)2017 1333 MS (b)2061 1333 MS (l)2111 1333 MS (e)2139 1333 MS ( )2183 1333 MS (b)2208 1333 MS (y)2260 1333 MS ( )2308 1333 MS (S)2333 1333 MS (G)2389 1333 MS (I)2462 1333 MS (,)2494 1333 MS ( )2519 1333 MS (t)2544 1333 MS (o)2572 1333 MS ( )2622 1333 MS (r)2647 1333 MS (e)2681 1333 MS (p)2725 1333 MS (r)2775 1333 MS (o)2808 1333 MS (d)2858 1333 MS (u)2908 1333 MS (c)2958 1333 MS (e)3003 1333 MS (,)3047 1333 MS ( )3072 1333 MS (d)3097 1333 MS (i)3147 1333 MS (s)3175 1333 MS (t)3214 1333 MS (r)3242 1333 MS (i)3275 1333 MS (b)3303 1333 MS (u)3353 1333 MS (t)3403 1333 MS (e)3431 1333 MS (,)3475 1333 MS ( )3500 1333 MS (c)3525 1333 MS (r)3569 1333 MS (e)3603 1333 MS (a)3647 1333 MS (t)3691 1333 MS (e)3719 1333 MS ( )3763 1333 MS (d)3788 1333 MS (e)3839 1333 MS (r)3883 1333 MS (i)3916 1333 MS (v)3944 1333 MS (a)3994 1333 MS (t)4038 1333 MS (i)4066 1333 MS (v)4094 1333 MS (e)4144 1333 MS (w)490 1448 MS (o)562 1448 MS (r)612 1448 MS (k)645 1448 MS (s)695 1448 MS ( )734 1448 MS (f)759 1448 MS (r)792 1448 MS (o)825 1448 MS (m)875 1448 MS (,)953 1448 MS ( )978 1448 MS (a)1003 1448 MS (n)1047 1448 MS (d)1097 1448 MS (,)1147 1448 MS ( )1172 1448 MS (t)1197 1448 MS (o)1225 1448 MS ( )1275 1448 MS (t)1300 1448 MS (h)1328 1448 MS (e)1378 1448 MS ( )1422 1448 MS (e)1448 1448 MS (x)1492 1448 MS (t)1543 1448 MS (e)1571 1448 MS (n)1615 1448 MS (t)1665 1448 MS ( )1693 1448 MS (a)1718 1448 MS (p)1762 1448 MS (p)1812 1448 MS (l)1862 1448 MS (i)1890 1448 MS (c)1918 1448 MS (a)1962 1448 MS (b)2006 1448 MS (l)2056 1448 MS (e)2084 1448 MS (,)2128 1448 MS ( )2153 1448 MS (d)2178 1448 MS (i)2228 1448 MS (s)2256 1448 MS (p)2295 1448 MS (l)2345 1448 MS (a)2373 1448 MS (y)2418 1448 MS ( )2466 1448 MS (a)2492 1448 MS (n)2536 1448 MS (d)2586 1448 MS ( )2636 1448 MS (p)2661 1448 MS (e)2711 1448 MS (r)2755 1448 MS (f)2789 1448 MS (o)2822 1448 MS (r)2872 1448 MS (m)2905 1448 MS ( )2983 1448 MS (t)3008 1448 MS (h)3036 1448 MS (e)3086 1448 MS ( )3130 1448 MS (O)3155 1448 MS (r)3228 1448 MS (i)3261 1448 MS (g)3289 1448 MS (i)3338 1448 MS (n)3366 1448 MS (a)3416 1448 MS (l)3460 1448 MS ( )3488 1448 MS (C)3513 1448 MS (o)3580 1448 MS (d)3630 1448 MS (e)3680 1448 MS ( )3724 1448 MS (a)3750 1448 MS (n)3794 1448 MS (d)3844 1448 MS (/)3894 1448 MS (o)3922 1448 MS (r)3972 1448 MS ( )4005 1448 MS (a)4030 1448 MS (n)4074 1448 MS (y)4126 1448 MS (M)490 1563 MS (o)579 1563 MS (d)629 1563 MS (i)679 1563 MS (f)707 1563 MS (i)740 1563 MS (c)768 1563 MS (a)812 1563 MS (t)856 1563 MS (i)884 1563 MS (o)912 1563 MS (n)962 1563 MS (s)1012 1563 MS ( )1051 1563 MS (p)1076 1563 MS (r)1126 1563 MS (o)1159 1563 MS (v)1209 1563 MS (i)1259 1563 MS (d)1287 1563 MS (e)1337 1563 MS (d)1381 1563 MS ( )1431 1563 MS (b)1456 1563 MS (y)1506 1563 MS ( )1555 1563 MS (S)1580 1563 MS (G)1636 1563 MS (I)1710 1563 MS ( )1742 1563 MS (a)1767 1563 MS (l)1811 1563 MS (o)1839 1563 MS (n)1889 1563 MS (e)1939 1563 MS ( )1983 1563 MS (a)2009 1563 MS (n)2053 1563 MS (d)2103 1563 MS (/)2153 1563 MS (o)2181 1563 MS (r)2231 1563 MS ( )2264 1563 MS (a)2289 1563 MS (s)2333 1563 MS ( )2372 1563 MS (p)2397 1563 MS (a)2448 1563 MS (r)2492 1563 MS (t)2525 1563 MS ( )2553 1563 MS (o)2578 1563 MS (f)2628 1563 MS ( )2661 1563 MS (a)2686 1563 MS ( )2730 1563 MS (L)2756 1563 MS (a)2816 1563 MS (r)2861 1563 MS (g)2895 1563 MS (e)2944 1563 MS (r)2989 1563 MS ( )3022 1563 MS (W)3047 1563 MS (o)3142 1563 MS (r)3192 1563 MS (k)3225 1563 MS (;)3275 1563 MS ( )3303 1563 MS (a)3328 1563 MS (n)3372 1563 MS (d)3422 1563 MS ( )3472 1563 MS (\()3497 1563 MS (i)3530 1563 MS (i)3558 1563 MS (\))3586 1563 MS ( )3619 1563 MS (u)3644 1563 MS (n)3694 1563 MS (d)3744 1563 MS (e)3794 1563 MS (r)3839 1563 MS ( )3872 1563 MS (a)3897 1563 MS (n)3941 1563 MS (y)3993 1563 MS (L)490 1678 MS (i)550 1678 MS (c)578 1678 MS (e)623 1678 MS (n)667 1678 MS (s)717 1678 MS (a)756 1678 MS (b)800 1678 MS (l)850 1678 MS (e)878 1678 MS ( )922 1678 MS (P)947 1678 MS (a)1003 1678 MS (t)1047 1678 MS (e)1075 1678 MS (n)1119 1678 MS (t)1169 1678 MS (s)1197 1678 MS (,)1236 1678 MS ( )1261 1678 MS (t)1286 1678 MS (o)1314 1678 MS ( )1364 1678 MS (m)1389 1678 MS (a)1467 1678 MS (k)1511 1678 MS (e)1561 1678 MS (,)1605 1678 MS ( )1630 1678 MS (h)1655 1678 MS (a)1706 1678 MS (v)1750 1678 MS (e)1800 1678 MS ( )1844 1678 MS (m)1869 1678 MS (a)1947 1678 MS (d)1991 1678 MS (e)2042 1678 MS (,)2086 1678 MS ( )2111 1678 MS (u)2136 1678 MS (s)2186 1678 MS (e)2225 1678 MS (,)2269 1678 MS ( )2294 1678 MS (s)2319 1678 MS (e)2358 1678 MS (l)2402 1678 MS (l)2430 1678 MS (,)2458 1678 MS ( )2483 1678 MS (o)2508 1678 MS (f)2558 1678 MS (f)2592 1678 MS (e)2625 1678 MS (r)2669 1678 MS ( )2702 1678 MS (f)2728 1678 MS (o)2761 1678 MS (r)2811 1678 MS ( )2844 1678 MS (s)2869 1678 MS (a)2908 1678 MS (l)2952 1678 MS (e)2980 1678 MS (,)3024 1678 MS ( )3049 1678 MS (i)3074 1678 MS (m)3102 1678 MS (p)3180 1678 MS (o)3230 1678 MS (r)3280 1678 MS (t)3313 1678 MS ( )3341 1678 MS (a)3366 1678 MS (n)3410 1678 MS (d)3460 1678 MS (/)3510 1678 MS (o)3538 1678 MS (r)3589 1678 MS ( )3622 1678 MS (o)3647 1678 MS (t)3697 1678 MS (h)3725 1678 MS (e)3775 1678 MS (r)3819 1678 MS (w)3852 1678 MS (i)3924 1678 MS (s)3952 1678 MS (e)3991 1678 MS ( )4035 1678 MS (t)4060 1678 MS (r)4088 1678 MS (a)4122 1678 MS (n)4166 1678 MS (s)4216 1678 MS (f)4255 1678 MS (e)4288 1678 MS (r)4333 1678 MS (t)490 1793 MS (h)518 1793 MS (e)568 1793 MS ( )612 1793 MS (O)637 1793 MS (r)709 1793 MS (i)742 1793 MS (g)770 1793 MS (i)819 1793 MS (n)847 1793 MS (a)898 1793 MS (l)942 1793 MS ( )970 1793 MS (C)995 1793 MS (o)1062 1793 MS (d)1112 1793 MS (e)1162 1793 MS ( )1206 1793 MS (a)1231 1793 MS (n)1275 1793 MS (d)1325 1793 MS (/)1375 1793 MS (o)1403 1793 MS (r)1453 1793 MS ( )1486 1793 MS (a)1511 1793 MS (n)1555 1793 MS (y)1607 1793 MS ( )1655 1793 MS (M)1680 1793 MS (o)1769 1793 MS (d)1819 1793 MS (i)1869 1793 MS (f)1897 1793 MS (i)1930 1793 MS (c)1959 1793 MS (a)2003 1793 MS (t)2047 1793 MS (i)2075 1793 MS (o)2103 1793 MS (n)2153 1793 MS (s)2203 1793 MS ( )2242 1793 MS (p)2267 1793 MS (r)2317 1793 MS (o)2350 1793 MS (v)2400 1793 MS (i)2450 1793 MS (d)2478 1793 MS (e)2528 1793 MS (d)2572 1793 MS ( )2622 1793 MS (b)2647 1793 MS (y)2699 1793 MS ( )2747 1793 MS (S)2772 1793 MS (G)2828 1793 MS (I)2901 1793 MS (.)2933 1793 MS ( )2958 1793 MS (R)2983 1793 MS (e)3050 1793 MS (c)3095 1793 MS (i)3139 1793 MS (p)3167 1793 MS (i)3217 1793 MS (e)3245 1793 MS (n)3289 1793 MS (t)3339 1793 MS ( )3367 1793 MS (a)3392 1793 MS (c)3436 1793 MS (c)3481 1793 MS (e)3525 1793 MS (p)3569 1793 MS (t)3619 1793 MS (s)3647 1793 MS ( )3686 1793 MS (t)3711 1793 MS (h)3739 1793 MS (e)3789 1793 MS ( )3833 1793 MS (t)3858 1793 MS (e)3886 1793 MS (r)3930 1793 MS (m)3963 1793 MS (s)4041 1793 MS ( )4080 1793 MS (a)4105 1793 MS (n)4149 1793 MS (d)4199 1793 MS (c)490 1908 MS (o)534 1908 MS (n)584 1908 MS (d)634 1908 MS (i)684 1908 MS (t)712 1908 MS (i)740 1908 MS (o)768 1908 MS (n)818 1908 MS (s)868 1908 MS ( )907 1908 MS (o)932 1908 MS (f)982 1908 MS ( )1015 1908 MS (t)1040 1908 MS (h)1068 1908 MS (i)1118 1908 MS (s)1146 1908 MS ( )1185 1908 MS (L)1211 1908 MS (i)1270 1908 MS (c)1298 1908 MS (e)1342 1908 MS (n)1386 1908 MS (s)1436 1908 MS (e)1475 1908 MS ( )1519 1908 MS (b)1544 1908 MS (y)1596 1908 MS ( )1644 1908 MS (u)1669 1908 MS (n)1719 1908 MS (d)1769 1908 MS (e)1820 1908 MS (r)1864 1908 MS (t)1897 1908 MS (a)1925 1908 MS (k)1969 1908 MS (i)2019 1908 MS (n)2047 1908 MS (g)2098 1908 MS ( )2147 1908 MS (a)2173 1908 MS (n)2217 1908 MS (y)2269 1908 MS ( )2317 1908 MS (o)2342 1908 MS (f)2392 1908 MS ( )2425 1908 MS (t)2450 1908 MS (h)2478 1908 MS (e)2528 1908 MS ( )2572 1908 MS (a)2597 1908 MS (f)2642 1908 MS (o)2675 1908 MS (r)2725 1908 MS (e)2758 1908 MS (m)2802 1908 MS (e)2881 1908 MS (n)2925 1908 MS (t)2975 1908 MS (i)3003 1908 MS (o)3031 1908 MS (n)3081 1908 MS (e)3131 1908 MS (d)3175 1908 MS ( )3225 1908 MS (a)3250 1908 MS (c)3294 1908 MS (t)3338 1908 MS (i)3366 1908 MS (o)3394 1908 MS (n)3444 1908 MS (s)3494 1908 MS (.)3533 1908 MS ( )3558 1908 MS (T)3583 1908 MS (h)3644 1908 MS (e)3694 1908 MS ( )3738 1908 MS (p)3763 1908 MS (a)3814 1908 MS (t)3858 1908 MS (e)3886 1908 MS (n)3930 1908 MS (t)3980 1908 MS ( )4008 1908 MS (l)4033 1908 MS (i)4061 1908 MS (c)4089 1908 MS (e)4133 1908 MS (n)4177 1908 MS (s)4227 1908 MS (e)4266 1908 MS (s)490 2023 MS (h)529 2023 MS (a)579 2023 MS (l)623 2023 MS (l)651 2023 MS ( )679 2023 MS (a)704 2023 MS (p)748 2023 MS (p)798 2023 MS (l)848 2023 MS (y)877 2023 MS ( )925 2023 MS (t)950 2023 MS (o)978 2023 MS ( )1028 2023 MS (t)1053 2023 MS (h)1081 2023 MS (e)1131 2023 MS ( )1175 2023 MS (C)1200 2023 MS (o)1267 2023 MS (v)1317 2023 MS (e)1367 2023 MS (r)1411 2023 MS (e)1445 2023 MS (d)1489 2023 MS ( )1539 2023 MS (C)1564 2023 MS (o)1631 2023 MS (d)1681 2023 MS (e)1731 2023 MS ( )1775 2023 MS (i)1800 2023 MS (f)1828 2023 MS (,)1861 2023 MS ( )1886 2023 MS (a)1911 2023 MS (t)1955 2023 MS ( )1983 2023 MS (t)2008 2023 MS (h)2036 2023 MS (e)2086 2023 MS ( )2130 2023 MS (t)2155 2023 MS (i)2183 2023 MS (m)2211 2023 MS (e)2289 2023 MS ( )2333 2023 MS (a)2359 2023 MS (n)2403 2023 MS (y)2455 2023 MS ( )2503 2023 MS (r)2528 2023 MS (e)2561 2023 MS (l)2605 2023 MS (a)2633 2023 MS (t)2677 2023 MS (e)2706 2023 MS (d)2750 2023 MS ( )2800 2023 MS (M)2825 2023 MS (o)2914 2023 MS (d)2964 2023 MS (i)3014 2023 MS (f)3042 2023 MS (i)3075 2023 MS (c)3103 2023 MS (a)3147 2023 MS (t)3191 2023 MS (i)3219 2023 MS (o)3247 2023 MS (n)3297 2023 MS ( )3347 2023 MS (i)3372 2023 MS (s)3400 2023 MS ( )3439 2023 MS (a)3464 2023 MS (d)3508 2023 MS (d)3558 2023 MS (e)3608 2023 MS (d)3652 2023 MS (,)3702 2023 MS ( )3727 2023 MS (s)3752 2023 MS (u)3791 2023 MS (c)3842 2023 MS (h)3886 2023 MS ( )3936 2023 MS (a)3961 2023 MS (d)4005 2023 MS (d)4055 2023 MS (i)4105 2023 MS (t)4133 2023 MS (i)4161 2023 MS (o)4189 2023 MS (n)4239 2023 MS (o)490 2138 MS (f)540 2138 MS ( )573 2138 MS (t)598 2138 MS (h)626 2138 MS (e)676 2138 MS ( )720 2138 MS (M)745 2138 MS (o)834 2138 MS (d)884 2138 MS (i)934 2138 MS (f)962 2138 MS (i)995 2138 MS (c)1023 2138 MS (a)1067 2138 MS (t)1111 2138 MS (i)1139 2138 MS (o)1167 2138 MS (n)1217 2138 MS ( )1267 2138 MS (c)1292 2138 MS (a)1336 2138 MS (u)1380 2138 MS (s)1430 2138 MS (e)1469 2138 MS (s)1514 2138 MS ( )1553 2138 MS (s)1578 2138 MS (u)1617 2138 MS (c)1667 2138 MS (h)1711 2138 MS ( )1761 2138 MS (c)1786 2138 MS (o)1830 2138 MS (m)1880 2138 MS (b)1958 2138 MS (i)2008 2138 MS (n)2036 2138 MS (a)2086 2138 MS (t)2130 2138 MS (i)2158 2138 MS (o)2186 2138 MS (n)2236 2138 MS ( )2286 2138 MS (t)2311 2138 MS (o)2339 2138 MS ( )2389 2138 MS (b)2414 2138 MS (e)2464 2138 MS ( )2508 2138 MS (c)2533 2138 MS (o)2577 2138 MS (v)2628 2138 MS (e)2678 2138 MS (r)2722 2138 MS (e)2756 2138 MS (d)2800 2138 MS ( )2850 2138 MS (b)2875 2138 MS (y)2927 2138 MS ( )2975 2138 MS (t)3000 2138 MS (h)3028 2138 MS (e)3078 2138 MS ( )3122 2138 MS (L)3148 2138 MS (i)3208 2138 MS (c)3236 2138 MS (e)3280 2138 MS (n)3324 2138 MS (s)3374 2138 MS (e)3414 2138 MS (d)3458 2138 MS ( )3508 2138 MS (P)3533 2138 MS (a)3589 2138 MS (t)3633 2138 MS (e)3661 2138 MS (n)3705 2138 MS (t)3755 2138 MS (s)3783 2138 MS (.)3822 2138 MS ( )3847 2138 MS (T)3872 2138 MS (h)3933 2138 MS (e)3983 2138 MS ( )4027 2138 MS (p)4052 2138 MS (a)4103 2138 MS (t)4147 2138 MS (e)4175 2138 MS (n)4219 2138 MS (t)4269 2138 MS (l)490 2253 MS (i)518 2253 MS (c)546 2253 MS (e)590 2253 MS (n)634 2253 MS (s)684 2253 MS (e)723 2253 MS ( )767 2253 MS (i)792 2253 MS (n)820 2253 MS ( )870 2253 MS (S)895 2253 MS (e)951 2253 MS (c)995 2253 MS (t)1039 2253 MS (i)1067 2253 MS (o)1095 2253 MS (n)1145 2253 MS ( )1195 2253 MS (2)1220 2253 MS (.)1270 2253 MS (1)1295 2253 MS (\()1345 2253 MS (i)1378 2253 MS (i)1406 2253 MS (\))1434 2253 MS ( )1467 2253 MS (s)1492 2253 MS (h)1531 2253 MS (a)1581 2253 MS (l)1625 2253 MS (l)1653 2253 MS ( )1681 2253 MS (n)1706 2253 MS (o)1756 2253 MS (t)1806 2253 MS ( )1834 2253 MS (a)1859 2253 MS (p)1903 2253 MS (p)1953 2253 MS (l)2003 2253 MS (y)2032 2253 MS ( )2080 2253 MS (t)2105 2253 MS (o)2133 2253 MS ( )2183 2253 MS (a)2209 2253 MS (n)2253 2253 MS (y)2305 2253 MS ( )2353 2253 MS (o)2378 2253 MS (t)2428 2253 MS (h)2456 2253 MS (e)2506 2253 MS (r)2550 2253 MS ( )2583 2253 MS (c)2609 2253 MS (o)2653 2253 MS (m)2703 2253 MS (b)2781 2253 MS (i)2831 2253 MS (n)2859 2253 MS (a)2909 2253 MS (t)2953 2253 MS (i)2981 2253 MS (o)3009 2253 MS (n)3059 2253 MS (s)3109 2253 MS ( )3148 2253 MS (t)3173 2253 MS (h)3201 2253 MS (a)3251 2253 MS (t)3295 2253 MS ( )3323 2253 MS (i)3348 2253 MS (n)3376 2253 MS (c)3426 2253 MS (l)3470 2253 MS (u)3498 2253 MS (d)3548 2253 MS (e)3598 2253 MS ( )3642 2253 MS (t)3667 2253 MS (h)3695 2253 MS (e)3745 2253 MS ( )3789 2253 MS (M)3814 2253 MS (o)3903 2253 MS (d)3953 2253 MS (i)4003 2253 MS (f)4031 2253 MS (i)4064 2253 MS (c)4092 2253 MS (a)4136 2253 MS (t)4180 2253 MS (i)4208 2253 MS (o)4236 2253 MS (n)4286 2253 MS (.)4336 2253 MS (N)490 2368 MS (o)562 2368 MS ( )612 2368 MS (p)637 2368 MS (a)687 2368 MS (t)731 2368 MS (e)759 2368 MS (n)803 2368 MS (t)853 2368 MS ( )881 2368 MS (l)906 2368 MS (i)934 2368 MS (c)962 2368 MS (e)1006 2368 MS (n)1050 2368 MS (s)1100 2368 MS (e)1139 2368 MS ( )1183 2368 MS (i)1208 2368 MS (s)1236 2368 MS ( )1275 2368 MS (p)1300 2368 MS (r)1350 2368 MS (o)1383 2368 MS (v)1433 2368 MS (i)1483 2368 MS (d)1511 2368 MS (e)1561 2368 MS (d)1605 2368 MS ( )1655 2368 MS (u)1680 2368 MS (n)1730 2368 MS (d)1780 2368 MS (e)1831 2368 MS (r)1875 2368 MS ( )1908 2368 MS (S)1933 2368 MS (G)1989 2368 MS (I)2062 2368 MS ( )2094 2368 MS (P)2119 2368 MS (a)2175 2368 MS (t)2219 2368 MS (e)2247 2368 MS (n)2291 2368 MS (t)2341 2368 MS (s)2369 2368 MS ( )2408 2368 MS (f)2433 2368 MS (o)2467 2368 MS (r)2517 2368 MS ( )2550 2368 MS (i)2575 2368 MS (n)2603 2368 MS (f)2653 2368 MS (r)2686 2368 MS (i)2719 2368 MS (n)2747 2368 MS (g)2798 2368 MS (e)2847 2368 MS (m)2891 2368 MS (e)2970 2368 MS (n)3014 2368 MS (t)3064 2368 MS (s)3092 2368 MS ( )3131 2368 MS (o)3156 2368 MS (f)3206 2368 MS ( )3239 2368 MS (S)3264 2368 MS (G)3320 2368 MS (I)3393 2368 MS ( )3425 2368 MS (P)3450 2368 MS (a)3506 2368 MS (t)3550 2368 MS (e)3578 2368 MS (n)3622 2368 MS (t)3672 2368 MS (s)3700 2368 MS ( )3739 2368 MS (b)3764 2368 MS (y)3814 2368 MS (M)490 2483 MS (o)579 2483 MS (d)629 2483 MS (i)679 2483 MS (f)707 2483 MS (i)740 2483 MS (c)768 2483 MS (a)812 2483 MS (t)856 2483 MS (i)884 2483 MS (o)912 2483 MS (n)962 2483 MS (s)1012 2483 MS ( )1051 2483 MS (n)1076 2483 MS (o)1126 2483 MS (t)1176 2483 MS ( )1204 2483 MS (p)1229 2483 MS (r)1279 2483 MS (o)1312 2483 MS (v)1362 2483 MS (i)1412 2483 MS (d)1440 2483 MS (e)1490 2483 MS (d)1534 2483 MS ( )1584 2483 MS (b)1609 2483 MS (y)1660 2483 MS ( )1708 2483 MS (S)1733 2483 MS (G)1789 2483 MS (I)1863 2483 MS ( )1895 2483 MS (o)1920 2483 MS (r)1970 2483 MS ( )2003 2483 MS (c)2028 2483 MS (o)2072 2483 MS (m)2122 2483 MS (b)2200 2483 MS (i)2250 2483 MS (n)2278 2483 MS (a)2328 2483 MS (t)2372 2483 MS (i)2400 2483 MS (o)2428 2483 MS (n)2478 2483 MS (s)2528 2483 MS ( )2567 2483 MS (o)2592 2483 MS (f)2642 2483 MS ( )2675 2483 MS (O)2700 2483 MS (r)2773 2483 MS (i)2806 2483 MS (g)2834 2483 MS (i)2883 2483 MS (n)2911 2483 MS (a)2962 2483 MS (l)3006 2483 MS ( )3034 2483 MS (C)3059 2483 MS (o)3126 2483 MS (d)3176 2483 MS (e)3226 2483 MS ( )3270 2483 MS (a)3295 2483 MS (n)3339 2483 MS (d)3389 2483 MS ( )3439 2483 MS (M)3464 2483 MS (o)3553 2483 MS (d)3603 2483 MS (i)3653 2483 MS (f)3681 2483 MS (i)3714 2483 MS (c)3742 2483 MS (a)3786 2483 MS (t)3830 2483 MS (i)3858 2483 MS (o)3886 2483 MS (n)3936 2483 MS (s)3986 2483 MS ( )4025 2483 MS (n)4050 2483 MS (o)4100 2483 MS (t)4150 2483 MS (p)490 2597 MS (r)540 2597 MS (o)573 2597 MS (v)623 2597 MS (i)673 2597 MS (d)701 2597 MS (e)751 2597 MS (d)795 2597 MS ( )845 2597 MS (b)870 2597 MS (y)922 2597 MS ( )970 2597 MS (S)995 2597 MS (G)1051 2597 MS (I)1124 2597 MS (.)1156 2597 MS (2)490 2796 MS (.)540 2796 MS (2)565 2796 MS (.)615 2796 MS [100 0 0 -100 0 0]/Helvetica MF ( )640 2796 MS [100 0 0 -100 0 0]/Times-Bold MF (R)790 2796 MS (e)862 2796 MS (c)906 2796 MS (i)950 2796 MS (p)978 2796 MS (i)1034 2796 MS (e)1062 2796 MS (n)1106 2796 MS (t)1162 2796 MS ( )1195 2796 MS (L)1220 2796 MS (i)1287 2796 MS (c)1315 2796 MS (e)1359 2796 MS (n)1403 2796 MS (s)1459 2796 MS (e)1498 2796 MS ( )1542 2796 MS (G)1567 2796 MS (r)1645 2796 MS (a)1689 2796 MS (n)1739 2796 MS (t)1795 2796 MS (.)1828 2796 MS [100 0 0 -100 0 0]/Times-Roman MF ( )1853 2796 MS (S)1878 2796 MS (u)1934 2796 MS (b)1984 2796 MS (j)2034 2796 MS (e)2062 2796 MS (c)2106 2796 MS (t)2150 2796 MS ( )2178 2796 MS (t)2203 2796 MS (o)2231 2796 MS ( )2281 2796 MS (t)2306 2796 MS (h)2334 2796 MS (e)2384 2796 MS ( )2428 2796 MS (t)2453 2796 MS (e)2481 2796 MS (r)2525 2796 MS (m)2558 2796 MS (s)2636 2796 MS ( )2675 2796 MS (o)2700 2796 MS (f)2750 2796 MS ( )2783 2796 MS (t)2808 2796 MS (h)2836 2796 MS (i)2886 2796 MS (s)2914 2796 MS ( )2953 2796 MS (L)2979 2796 MS (i)3039 2796 MS (c)3067 2796 MS (e)3111 2796 MS (n)3155 2796 MS (s)3205 2796 MS (e)3245 2796 MS ( )3289 2796 MS (a)3314 2796 MS (n)3358 2796 MS (d)3408 2796 MS ( )3458 2796 MS (a)3483 2796 MS (n)3527 2796 MS (y)3579 2796 MS ( )3627 2796 MS (t)3652 2796 MS (h)3680 2796 MS (i)3730 2796 MS (r)3758 2796 MS (d)3791 2796 MS ( )3841 2796 MS (p)3866 2796 MS (a)3917 2796 MS (r)3961 2796 MS (t)3994 2796 MS (y)4024 2796 MS (i)490 2911 MS (n)518 2911 MS (t)568 2911 MS (e)596 2911 MS (l)640 2911 MS (l)668 2911 MS (e)696 2911 MS (c)740 2911 MS (t)784 2911 MS (u)812 2911 MS (a)862 2911 MS (l)906 2911 MS ( )934 2911 MS (p)959 2911 MS (r)1009 2911 MS (o)1042 2911 MS (p)1092 2911 MS (e)1142 2911 MS (r)1186 2911 MS (t)1219 2911 MS (y)1249 2911 MS ( )1297 2911 MS (c)1322 2911 MS (l)1366 2911 MS (a)1395 2911 MS (i)1439 2911 MS (m)1467 2911 MS (s)1545 2911 MS (,)1584 2911 MS ( )1609 2911 MS (R)1634 2911 MS (e)1701 2911 MS (c)1745 2911 MS (i)1789 2911 MS (p)1817 2911 MS (i)1867 2911 MS (e)1895 2911 MS (n)1939 2911 MS (t)1989 2911 MS ( )2017 2911 MS (h)2042 2911 MS (e)2092 2911 MS (r)2136 2911 MS (e)2169 2911 MS (b)2213 2911 MS (y)2265 2911 MS ( )2313 2911 MS (g)2339 2911 MS (r)2389 2911 MS (a)2422 2911 MS (n)2466 2911 MS (t)2516 2911 MS (s)2544 2911 MS ( )2583 2911 MS (S)2608 2911 MS (G)2664 2911 MS (I)2737 2911 MS ( )2769 2911 MS (a)2794 2911 MS (n)2838 2911 MS (d)2888 2911 MS ( )2938 2911 MS (a)2964 2911 MS (n)3008 2911 MS (y)3060 2911 MS ( )3108 2911 MS (o)3133 2911 MS (t)3183 2911 MS (h)3211 2911 MS (e)3261 2911 MS (r)3305 2911 MS ( )3338 2911 MS (R)3363 2911 MS (e)3430 2911 MS (c)3475 2911 MS (i)3519 2911 MS (p)3547 2911 MS (i)3597 2911 MS (e)3625 2911 MS (n)3669 2911 MS (t)3719 2911 MS (s)3747 2911 MS ( )3786 2911 MS (a)3811 2911 MS ( )3855 2911 MS (w)3880 2911 MS (o)3952 2911 MS (r)4002 2911 MS (l)4035 2911 MS (d)4063 2911 MS (w)4113 2911 MS (i)4185 2911 MS (d)4213 2911 MS (e)4264 2911 MS (,)4308 2911 MS (r)490 3026 MS (o)523 3026 MS (y)574 3026 MS (a)622 3026 MS (l)666 3026 MS (t)694 3026 MS (y)724 3026 MS (-)772 3026 MS (f)806 3026 MS (r)839 3026 MS (e)873 3026 MS (e)917 3026 MS (,)961 3026 MS ( )986 3026 MS (n)1011 3026 MS (o)1061 3026 MS (n)1111 3026 MS (-)1161 3026 MS (e)1195 3026 MS (x)1239 3026 MS (c)1290 3026 MS (l)1334 3026 MS (u)1362 3026 MS (s)1412 3026 MS (i)1451 3026 MS (v)1479 3026 MS (e)1529 3026 MS ( )1573 3026 MS (l)1598 3026 MS (i)1626 3026 MS (c)1654 3026 MS (e)1698 3026 MS (n)1742 3026 MS (s)1792 3026 MS (e)1831 3026 MS (,)1875 3026 MS ( )1900 3026 MS (u)1925 3026 MS (n)1975 3026 MS (d)2025 3026 MS (e)2075 3026 MS (r)2119 3026 MS ( )2152 3026 MS (a)2178 3026 MS (n)2222 3026 MS (y)2274 3026 MS ( )2322 3026 MS (R)2347 3026 MS (e)2414 3026 MS (c)2458 3026 MS (i)2502 3026 MS (p)2530 3026 MS (i)2580 3026 MS (e)2608 3026 MS (n)2652 3026 MS (t)2702 3026 MS ( )2730 3026 MS (P)2755 3026 MS (a)2811 3026 MS (t)2855 3026 MS (e)2883 3026 MS (n)2927 3026 MS (t)2977 3026 MS (s)3005 3026 MS (,)3044 3026 MS ( )3069 3026 MS (t)3094 3026 MS (o)3122 3026 MS ( )3172 3026 MS (m)3197 3026 MS (a)3275 3026 MS (k)3319 3026 MS (e)3369 3026 MS (,)3413 3026 MS ( )3438 3026 MS (h)3463 3026 MS (a)3514 3026 MS (v)3558 3026 MS (e)3608 3026 MS ( )3652 3026 MS (m)3677 3026 MS (a)3755 3026 MS (d)3799 3026 MS (e)3850 3026 MS (,)3894 3026 MS ( )3919 3026 MS (u)3944 3026 MS (s)3994 3026 MS (e)4033 3026 MS (,)4077 3026 MS ( )4102 3026 MS (s)4127 3026 MS (e)4166 3026 MS (l)4210 3026 MS (l)4238 3026 MS (,)4266 3026 MS (o)490 3141 MS (f)540 3141 MS (f)573 3141 MS (e)606 3141 MS (r)650 3141 MS ( )683 3141 MS (f)709 3141 MS (o)742 3141 MS (r)792 3141 MS ( )825 3141 MS (s)850 3141 MS (a)889 3141 MS (l)933 3141 MS (e)961 3141 MS (,)1005 3141 MS ( )1030 3141 MS (i)1055 3141 MS (m)1083 3141 MS (p)1161 3141 MS (o)1211 3141 MS (r)1261 3141 MS (t)1294 3141 MS ( )1322 3141 MS (a)1347 3141 MS (n)1391 3141 MS (d)1441 3141 MS (/)1491 3141 MS (o)1519 3141 MS (r)1570 3141 MS ( )1603 3141 MS (o)1628 3141 MS (t)1678 3141 MS (h)1706 3141 MS (e)1756 3141 MS (r)1800 3141 MS (w)1833 3141 MS (i)1905 3141 MS (s)1933 3141 MS (e)1972 3141 MS ( )2016 3141 MS (t)2041 3141 MS (r)2069 3141 MS (a)2103 3141 MS (n)2147 3141 MS (s)2197 3141 MS (f)2236 3141 MS (e)2269 3141 MS (r)2314 3141 MS ( )2347 3141 MS (t)2372 3141 MS (h)2400 3141 MS (e)2450 3141 MS ( )2494 3141 MS (O)2519 3141 MS (r)2591 3141 MS (i)2624 3141 MS (g)2653 3141 MS (i)2702 3141 MS (n)2730 3141 MS (a)2780 3141 MS (l)2824 3141 MS ( )2852 3141 MS (C)2877 3141 MS (o)2944 3141 MS (d)2994 3141 MS (e)3044 3141 MS ( )3088 3141 MS (a)3114 3141 MS (n)3158 3141 MS (d)3208 3141 MS (/)3258 3141 MS (o)3286 3141 MS (r)3336 3141 MS ( )3369 3141 MS (a)3394 3141 MS (n)3438 3141 MS (y)3490 3141 MS ( )3538 3141 MS (M)3563 3141 MS (o)3652 3141 MS (d)3702 3141 MS (i)3752 3141 MS (f)3780 3141 MS (i)3813 3141 MS (c)3841 3141 MS (a)3886 3141 MS (t)3930 3141 MS (i)3958 3141 MS (o)3986 3141 MS (n)4036 3141 MS (s)4086 3141 MS (p)490 3255 MS (r)540 3255 MS (o)573 3255 MS (v)623 3255 MS (i)673 3255 MS (d)701 3255 MS (e)751 3255 MS (d)795 3255 MS ( )845 3255 MS (b)870 3255 MS (y)922 3255 MS ( )970 3255 MS (S)995 3255 MS (G)1051 3255 MS (I)1124 3255 MS (.)1156 3255 MS (2)490 3454 MS (.)540 3454 MS (3)565 3454 MS (.)615 3454 MS [100 0 0 -100 0 0]/Helvetica MF ( )640 3454 MS [100 0 0 -100 0 0]/Times-Bold MF (N)790 3454 MS (o)862 3454 MS ( )912 3454 MS (L)937 3454 MS (i)1004 3454 MS (c)1032 3454 MS (e)1076 3454 MS (n)1120 3454 MS (s)1176 3454 MS (e)1215 3454 MS ( )1259 3454 MS (F)1285 3454 MS (o)1345 3454 MS (r)1395 3454 MS ( )1439 3454 MS (H)1464 3454 MS (a)1542 3454 MS (r)1592 3454 MS (d)1636 3454 MS (w)1692 3454 MS (a)1765 3454 MS (r)1815 3454 MS (e)1859 3454 MS ( )1903 3454 MS (I)1928 3454 MS (m)1968 3454 MS (p)2050 3454 MS (l)2106 3454 MS (e)2134 3454 MS (m)2179 3454 MS (e)2261 3454 MS (n)2305 3454 MS (t)2361 3454 MS (a)2394 3454 MS (t)2445 3454 MS (i)2478 3454 MS (o)2506 3454 MS (n)2556 3454 MS (s)2612 3454 MS (.)2651 3454 MS [100 0 0 -100 0 0]/Times-Roman MF ( )2676 3454 MS (T)2701 3454 MS (h)2762 3454 MS (e)2812 3454 MS ( )2856 3454 MS (l)2881 3454 MS (i)2909 3454 MS (c)2937 3454 MS (e)2981 3454 MS (n)3025 3454 MS (s)3075 3454 MS (e)3114 3454 MS (s)3158 3454 MS ( )3197 3454 MS (g)3223 3454 MS (r)3272 3454 MS (a)3306 3454 MS (n)3350 3454 MS (t)3400 3454 MS (e)3428 3454 MS (d)3472 3454 MS ( )3522 3454 MS (i)3547 3454 MS (n)3575 3454 MS ( )3625 3454 MS (S)3650 3454 MS (e)3706 3454 MS (c)3750 3454 MS (t)3794 3454 MS (i)3822 3454 MS (o)3850 3454 MS (n)3900 3454 MS ( )3950 3454 MS (2)3975 3454 MS (.)4025 3454 MS (1)4050 3454 MS ( )4100 3454 MS (a)4125 3454 MS (n)4169 3454 MS (d)4219 3454 MS (2)490 3569 MS (.)540 3569 MS (2)565 3569 MS ( )615 3569 MS (a)640 3569 MS (r)684 3569 MS (e)717 3569 MS ( )761 3569 MS (n)786 3569 MS (o)836 3569 MS (t)886 3569 MS ( )914 3569 MS (a)939 3569 MS (p)983 3569 MS (p)1033 3569 MS (l)1083 3569 MS (i)1111 3569 MS (c)1139 3569 MS (a)1184 3569 MS (b)1228 3569 MS (l)1278 3569 MS (e)1306 3569 MS ( )1350 3569 MS (t)1375 3569 MS (o)1403 3569 MS ( )1453 3569 MS (i)1478 3569 MS (m)1506 3569 MS (p)1584 3569 MS (l)1634 3569 MS (e)1662 3569 MS (m)1706 3569 MS (e)1784 3569 MS (n)1828 3569 MS (t)1878 3569 MS (a)1906 3569 MS (t)1950 3569 MS (i)1978 3569 MS (o)2006 3569 MS (n)2056 3569 MS ( )2106 3569 MS (i)2131 3569 MS (n)2159 3569 MS ( )2209 3569 MS (H)2234 3569 MS (a)2306 3569 MS (r)2350 3569 MS (d)2383 3569 MS (w)2433 3569 MS (a)2505 3569 MS (r)2550 3569 MS (e)2583 3569 MS ( )2627 3569 MS (o)2652 3569 MS (f)2703 3569 MS ( )2736 3569 MS (t)2761 3569 MS (h)2789 3569 MS (e)2839 3569 MS ( )2883 3569 MS (a)2908 3569 MS (l)2952 3569 MS (g)2981 3569 MS (o)3030 3569 MS (r)3080 3569 MS (i)3113 3569 MS (t)3141 3569 MS (h)3169 3569 MS (m)3219 3569 MS (s)3297 3569 MS ( )3336 3569 MS (e)3361 3569 MS (m)3405 3569 MS (b)3483 3569 MS (o)3533 3569 MS (d)3583 3569 MS (i)3633 3569 MS (e)3661 3569 MS (d)3705 3569 MS ( )3755 3569 MS (i)3780 3569 MS (n)3808 3569 MS ( )3858 3569 MS (t)3883 3569 MS (h)3911 3569 MS (e)3961 3569 MS ( )4005 3569 MS (O)4030 3569 MS (r)4102 3569 MS (i)4135 3569 MS (g)4164 3569 MS (i)4213 3569 MS (n)4241 3569 MS (a)4291 3569 MS (l)4335 3569 MS (C)490 3684 MS (o)557 3684 MS (d)607 3684 MS (e)657 3684 MS ( )701 3684 MS (o)726 3684 MS (r)776 3684 MS ( )809 3684 MS (a)834 3684 MS (n)878 3684 MS (y)930 3684 MS ( )978 3684 MS (M)1003 3684 MS (o)1092 3684 MS (d)1142 3684 MS (i)1192 3684 MS (f)1220 3684 MS (i)1253 3684 MS (c)1281 3684 MS (a)1325 3684 MS (t)1369 3684 MS (i)1397 3684 MS (o)1425 3684 MS (n)1475 3684 MS (s)1525 3684 MS ( )1564 3684 MS (p)1589 3684 MS (r)1639 3684 MS (o)1672 3684 MS (v)1722 3684 MS (i)1772 3684 MS (d)1800 3684 MS (e)1850 3684 MS (d)1894 3684 MS ( )1944 3684 MS (b)1969 3684 MS (y)2021 3684 MS ( )2069 3684 MS (S)2094 3684 MS (G)2150 3684 MS (I)2224 3684 MS ( )2256 3684 MS (.)2281 3684 MS [100 0 0 -100 0 0]/Times-Bold MF (3)490 3885 MS (.)540 3885 MS [100 0 0 -100 0 0]/Helvetica-Bold MF ( )565 3885 MS [100 0 0 -100 0 0]/Times-Bold MF (R)790 3885 MS (e)862 3885 MS (d)906 3885 MS (i)962 3885 MS (s)990 3885 MS (t)1029 3885 MS (r)1062 3885 MS (i)1106 3885 MS (b)1134 3885 MS (u)1190 3885 MS (t)1246 3885 MS (i)1279 3885 MS (o)1307 3885 MS (n)1357 3885 MS (s)1413 3885 MS (.)1452 3885 MS [100 0 0 -100 0 0]/Times-Roman MF (3)490 4081 MS (.)540 4081 MS (1)565 4081 MS (.)615 4081 MS [100 0 0 -100 0 0]/Helvetica MF ( )640 4081 MS [100 0 0 -100 0 0]/Times-Bold MF (R)790 4081 MS (e)862 4081 MS (t)906 4081 MS (e)939 4081 MS (n)983 4081 MS (t)1039 4081 MS (i)1072 4081 MS (o)1100 4081 MS (n)1150 4081 MS ( )1206 4081 MS (o)1231 4081 MS (f)1281 4081 MS ( )1315 4081 MS (N)1340 4081 MS (o)1412 4081 MS (t)1462 4081 MS (i)1495 4081 MS (c)1523 4081 MS (e)1567 4081 MS (/)1611 4081 MS (C)1639 4081 MS (o)1711 4081 MS (p)1761 4081 MS (y)1817 4081 MS ( )1867 4081 MS (o)1892 4081 MS (f)1942 4081 MS ( )1976 4081 MS (L)2001 4081 MS (i)2068 4081 MS (c)2096 4081 MS (e)2140 4081 MS (n)2184 4081 MS (s)2240 4081 MS (e)2279 4081 MS (.)2323 4081 MS [100 0 0 -100 0 0]/Times-Roman MF ( )2348 4081 MS (T)2373 4081 MS (h)2434 4081 MS (e)2484 4081 MS ( )2528 4081 MS (N)2553 4081 MS (o)2625 4081 MS (t)2675 4081 MS (i)2703 4081 MS (c)2731 4081 MS (e)2775 4081 MS ( )2819 4081 MS (s)2844 4081 MS (e)2884 4081 MS (t)2928 4081 MS ( )2956 4081 MS (f)2981 4081 MS (o)3014 4081 MS (r)3064 4081 MS (t)3097 4081 MS (h)3125 4081 MS ( )3175 4081 MS (i)3200 4081 MS (n)3228 4081 MS ( )3278 4081 MS (E)3303 4081 MS (x)3364 4081 MS (h)3415 4081 MS (i)3465 4081 MS (b)3493 4081 MS (i)3543 4081 MS (t)3571 4081 MS ( )3599 4081 MS (A)3624 4081 MS (,)3696 4081 MS ( )3721 4081 MS (b)3746 4081 MS (e)3796 4081 MS (l)3840 4081 MS (o)3868 4081 MS (w)3918 4081 MS (,)3990 4081 MS ( )4015 4081 MS (m)4040 4081 MS (u)4118 4081 MS (s)4168 4081 MS (t)4207 4081 MS ( )4235 4081 MS (b)4260 4081 MS (e)4310 4081 MS (c)490 4196 MS (o)534 4196 MS (n)584 4196 MS (s)634 4196 MS (p)673 4196 MS (i)723 4196 MS (c)751 4196 MS (u)795 4196 MS (o)845 4196 MS (u)895 4196 MS (s)945 4196 MS (l)984 4196 MS (y)1013 4196 MS ( )1061 4196 MS (r)1087 4196 MS (e)1120 4196 MS (t)1164 4196 MS (a)1192 4196 MS (i)1236 4196 MS (n)1264 4196 MS (e)1314 4196 MS (d)1358 4196 MS ( )1408 4196 MS (o)1433 4196 MS (r)1483 4196 MS ( )1517 4196 MS (i)1542 4196 MS (n)1570 4196 MS (c)1620 4196 MS (l)1664 4196 MS (u)1692 4196 MS (d)1742 4196 MS (e)1792 4196 MS (d)1836 4196 MS ( )1886 4196 MS (i)1911 4196 MS (n)1939 4196 MS ( )1989 4196 MS (a)2014 4196 MS (n)2058 4196 MS (y)2110 4196 MS ( )2158 4196 MS (a)2184 4196 MS (n)2228 4196 MS (d)2278 4196 MS ( )2328 4196 MS (a)2353 4196 MS (l)2397 4196 MS (l)2425 4196 MS ( )2453 4196 MS (r)2478 4196 MS (e)2511 4196 MS (d)2555 4196 MS (i)2605 4196 MS (s)2633 4196 MS (t)2672 4196 MS (r)2700 4196 MS (i)2733 4196 MS (b)2761 4196 MS (u)2811 4196 MS (t)2861 4196 MS (i)2889 4196 MS (o)2917 4196 MS (n)2967 4196 MS (s)3017 4196 MS ( )3056 4196 MS (o)3081 4196 MS (f)3131 4196 MS ( )3164 4196 MS (C)3189 4196 MS (o)3256 4196 MS (v)3306 4196 MS (e)3356 4196 MS (r)3400 4196 MS (e)3433 4196 MS (d)3477 4196 MS ( )3527 4196 MS (C)3552 4196 MS (o)3619 4196 MS (d)3669 4196 MS (e)3719 4196 MS (.)3763 4196 MS ( )3788 4196 MS (F)3813 4196 MS (o)3868 4196 MS (r)3918 4196 MS (d)490 4311 MS (i)540 4311 MS (s)568 4311 MS (t)607 4311 MS (r)635 4311 MS (i)668 4311 MS (b)696 4311 MS (u)746 4311 MS (t)796 4311 MS (i)824 4311 MS (o)852 4311 MS (n)902 4311 MS (s)952 4311 MS ( )991 4311 MS (o)1016 4311 MS (f)1066 4311 MS ( )1099 4311 MS (t)1124 4311 MS (h)1152 4311 MS (e)1202 4311 MS ( )1246 4311 MS (C)1271 4311 MS (o)1338 4311 MS (v)1388 4311 MS (e)1438 4311 MS (r)1482 4311 MS (e)1515 4311 MS (d)1559 4311 MS ( )1609 4311 MS (C)1634 4311 MS (o)1701 4311 MS (d)1751 4311 MS (e)1801 4311 MS ( )1845 4311 MS (i)1870 4311 MS (n)1898 4311 MS ( )1948 4311 MS (s)1973 4311 MS (o)2012 4311 MS (u)2062 4311 MS (r)2112 4311 MS (c)2145 4311 MS (e)2189 4311 MS ( )2233 4311 MS (c)2259 4311 MS (o)2303 4311 MS (d)2353 4311 MS (e)2403 4311 MS ( )2447 4311 MS (f)2472 4311 MS (o)2505 4311 MS (r)2556 4311 MS (m)2589 4311 MS (,)2667 4311 MS ( )2692 4311 MS (t)2717 4311 MS (h)2745 4311 MS (e)2795 4311 MS ( )2839 4311 MS (N)2864 4311 MS (o)2936 4311 MS (t)2986 4311 MS (i)3014 4311 MS (c)3042 4311 MS (e)3086 4311 MS ( )3130 4311 MS (m)3155 4311 MS (u)3233 4311 MS (s)3283 4311 MS (t)3322 4311 MS ( )3350 4311 MS (a)3375 4311 MS (p)3419 4311 MS (p)3469 4311 MS (e)3519 4311 MS (a)3564 4311 MS (r)3608 4311 MS ( )3641 4311 MS (i)3666 4311 MS (n)3694 4311 MS ( )3744 4311 MS (e)3769 4311 MS (v)3813 4311 MS (e)3864 4311 MS (r)3908 4311 MS (y)3943 4311 MS ( )3991 4311 MS (f)4016 4311 MS (i)4049 4311 MS (l)4077 4311 MS (e)4105 4311 MS ( )4149 4311 MS (t)4174 4311 MS (h)4202 4311 MS (a)4253 4311 MS (t)4297 4311 MS (c)490 4426 MS (a)534 4426 MS (n)578 4426 MS ( )628 4426 MS (i)653 4426 MS (n)681 4426 MS (c)731 4426 MS (l)775 4426 MS (u)803 4426 MS (d)853 4426 MS (e)903 4426 MS ( )947 4426 MS (a)973 4426 MS ( )1017 4426 MS (t)1042 4426 MS (e)1070 4426 MS (x)1114 4426 MS (t)1165 4426 MS ( )1193 4426 MS (c)1218 4426 MS (o)1262 4426 MS (m)1312 4426 MS (m)1390 4426 MS (e)1468 4426 MS (n)1512 4426 MS (t)1562 4426 MS (s)1590 4426 MS ( )1629 4426 MS (f)1654 4426 MS (i)1687 4426 MS (e)1715 4426 MS (l)1759 4426 MS (d)1787 4426 MS (;)1837 4426 MS ( )1865 4426 MS (i)1890 4426 MS (n)1918 4426 MS ( )1968 4426 MS (e)1993 4426 MS (x)2037 4426 MS (e)2088 4426 MS (c)2132 4426 MS (u)2176 4426 MS (t)2226 4426 MS (a)2254 4426 MS (b)2298 4426 MS (l)2348 4426 MS (e)2376 4426 MS ( )2420 4426 MS (f)2445 4426 MS (o)2478 4426 MS (r)2528 4426 MS (m)2561 4426 MS (,)2639 4426 MS ( )2664 4426 MS (t)2689 4426 MS (h)2717 4426 MS (e)2767 4426 MS ( )2811 4426 MS (N)2836 4426 MS (o)2908 4426 MS (t)2958 4426 MS (i)2986 4426 MS (c)3014 4426 MS (e)3058 4426 MS ( )3102 4426 MS (a)3127 4426 MS (n)3171 4426 MS (d)3221 4426 MS ( )3271 4426 MS (a)3297 4426 MS ( )3341 4426 MS (c)3366 4426 MS (o)3410 4426 MS (p)3460 4426 MS (y)3512 4426 MS ( )3560 4426 MS (o)3585 4426 MS (f)3636 4426 MS ( )3669 4426 MS (t)3694 4426 MS (h)3722 4426 MS (i)3772 4426 MS (s)3800 4426 MS ( )3839 4426 MS (L)3865 4426 MS (i)3924 4426 MS (c)3952 4426 MS (e)3997 4426 MS (n)4041 4426 MS (s)4091 4426 MS (e)4130 4426 MS /IsChar{exch/CharStrings get exch known}bd/MapCh{3 -1 roll/Encoding get 3 1 roll put}bd/MapDegree{dup 16#b0 exch/degree IsChar{/degree}{/ring}ifelse MapCh} bd/MapBB{dup 16#a6 exch/brokenbar IsChar{/brokenbar}{/bar}ifelse MapCh}bd /reencode{findfont begin currentdict dup length dict begin{1 index/FID ne{def} {pop pop}ifelse}forall/FontName exch def dup length 0 ne{/Encoding Encoding 256 array copy def 0 exch{dup type/nametype eq{Encoding 2 index 2 index put pop 1 add}{exch pop}ifelse}forall}if pop currentdict dup end end/FontName get exch definefont dup MapDegree MapBB}bd/LATENC[0/grave/acute/circumflex/tilde/macron /breve/dotaccent/dieresis/ring/cedilla/hungarumlaut/ogonek/caron/dotlessi/fi/fl /Lslash/lslash/Zcaron/zcaron/minus/.notdef/.notdef/.notdef/.notdef/.notdef /.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/space/exclam/quotedbl /numbersign/dollar/percent/ampersand/quotesingle/parenleft/parenright/asterisk /plus/comma/hyphen/period/slash/zero/one/two/three/four/five/six/seven/eight /nine/colon/semicolon/less/equal/greater/question/at/A/B/C/D/E/F/G/H/I/J/K/L/M /N/O/P/Q/R/S/T/U/V/W/X/Y/Z/bracketleft/backslash/bracketright/asciicircum /underscore/grave/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/braceleft /bar/braceright/asciitilde/.notdef/.notdef/.notdef/quotesinglbase/florin /quotedblbase/ellipsis/dagger/daggerdbl/circumflex/perthousand/Scaron /guilsinglleft/OE/.notdef/.notdef/.notdef/.notdef/quoteleft/quoteright /quotedblleft/quotedblright/bullet/endash/emdash/tilde/trademark/scaron /guilsinglright/oe/.notdef/.notdef/Ydieresis/.notdef/exclamdown/cent/sterling /currency/yen/brokenbar/section/dieresis/copyright/ordfeminine/guillemotleft /logicalnot/hyphen/registered/macron/degree/plusminus/twosuperior/threesuperior /acute/mu/paragraph/periodcentered/cedilla/onesuperior/ordmasculine /guillemotright/onequarter/onehalf/threequarters/questiondown/Agrave/Aacute /Acircumflex/Atilde/Adieresis/Aring/AE/Ccedilla/Egrave/Eacute/Ecircumflex /Edieresis/Igrave/Iacute/Icircumflex/Idieresis/Eth/Ntilde/Ograve/Oacute /Ocircumflex/Otilde/Odieresis/multiply/Oslash/Ugrave/Uacute/Ucircumflex /Udieresis/Yacute/Thorn/germandbls/agrave/aacute/acircumflex/atilde/adieresis /aring/ae/ccedilla/egrave/eacute/ecircumflex/edieresis/igrave/iacute /icircumflex/idieresis/eth/ntilde/ograve/oacute/ocircumflex/otilde/odieresis /divide/oslash/ugrave/uacute/ucircumflex/udieresis/yacute/thorn/ydieresis]def LATENC /_Times-Roman /Times-Roman reencode [100 0 0 -100 0 0]/_Times-Roman MF (m)490 4541 MS (u)568 4541 MS (s)618 4541 MS (t)657 4541 MS ( )685 4541 MS (a)710 4541 MS (p)754 4541 MS (p)804 4541 MS (e)854 4541 MS (a)898 4541 MS (r)942 4541 MS ( )975 4541 MS (i)1000 4541 MS (n)1028 4541 MS ( )1078 4541 MS (r)1103 4541 MS (e)1136 4541 MS (l)1180 4541 MS (a)1209 4541 MS (t)1253 4541 MS (e)1281 4541 MS (d)1325 4541 MS ( )1375 4541 MS (d)1400 4541 MS (o)1450 4541 MS (c)1500 4541 MS (u)1544 4541 MS (m)1594 4541 MS (e)1672 4541 MS (n)1716 4541 MS (t)1766 4541 MS (a)1795 4541 MS (t)1839 4541 MS (i)1867 4541 MS (o)1895 4541 MS (n)1945 4541 MS ( )1995 4541 MS (o)2020 4541 MS (r)2070 4541 MS ( )2103 4541 MS (c)2128 4541 MS (o)2172 4541 MS (l)2222 4541 MS (l)2250 4541 MS (a)2278 4541 MS (t)2322 4541 MS (e)2350 4541 MS (r)2394 4541 MS (a)2428 4541 MS (l)2472 4541 MS ( )2500 4541 MS (w)2525 4541 MS (h)2597 4541 MS (e)2647 4541 MS (r)2691 4541 MS (e)2725 4541 MS ( )2769 4541 MS (t)2794 4541 MS (h)2822 4541 MS (e)2872 4541 MS ( )2916 4541 MS (R)2941 4541 MS (e)3008 4541 MS (c)3052 4541 MS (i)3096 4541 MS (p)3124 4541 MS (i)3174 4541 MS (e)3202 4541 MS (n)3246 4541 MS (t)3296 4541 MS (\222)3324 4541 MS (s)3357 4541 MS ( )3396 4541 MS (r)3422 4541 MS (i)3455 4541 MS (g)3484 4541 MS (h)3533 4541 MS (t)3583 4541 MS (s)3611 4541 MS ( )3650 4541 MS (r)3675 4541 MS (e)3708 4541 MS (l)3752 4541 MS (a)3780 4541 MS (t)3824 4541 MS (i)3852 4541 MS (n)3880 4541 MS (g)3931 4541 MS ( )3980 4541 MS (t)4005 4541 MS (o)4033 4541 MS (C)490 4656 MS (o)557 4656 MS (v)607 4656 MS (e)657 4656 MS (r)701 4656 MS (e)734 4656 MS (d)778 4656 MS ( )828 4656 MS (C)853 4656 MS (o)920 4656 MS (d)970 4656 MS (e)1020 4656 MS ( )1064 4656 MS (a)1089 4656 MS (r)1134 4656 MS (e)1167 4656 MS ( )1211 4656 MS (d)1236 4656 MS (e)1286 4656 MS (s)1330 4656 MS (c)1370 4656 MS (r)1414 4656 MS (i)1447 4656 MS (b)1475 4656 MS (e)1525 4656 MS (d)1569 4656 MS (.)1619 4656 MS ( )1644 4656 MS (A)1669 4656 MS (n)1741 4656 MS (y)1793 4656 MS ( )1841 4656 MS (A)1867 4656 MS (d)1939 4656 MS (d)1989 4656 MS (i)2039 4656 MS (t)2067 4656 MS (i)2095 4656 MS (o)2123 4656 MS (n)2173 4656 MS (a)2223 4656 MS (l)2267 4656 MS ( )2295 4656 MS (N)2320 4656 MS (o)2392 4656 MS (t)2442 4656 MS (i)2470 4656 MS (c)2498 4656 MS (e)2542 4656 MS ( )2586 4656 MS (P)2611 4656 MS (r)2667 4656 MS (o)2700 4656 MS (v)2750 4656 MS (i)2800 4656 MS (s)2828 4656 MS (i)2867 4656 MS (o)2895 4656 MS (n)2945 4656 MS (s)2995 4656 MS ( )3034 4656 MS (w)3059 4656 MS (h)3131 4656 MS (i)3181 4656 MS (c)3209 4656 MS (h)3253 4656 MS ( )3303 4656 MS (a)3328 4656 MS (c)3372 4656 MS (t)3416 4656 MS (u)3444 4656 MS (a)3494 4656 MS (l)3538 4656 MS (l)3566 4656 MS (y)3596 4656 MS ( )3644 4656 MS (a)3669 4656 MS (p)3713 4656 MS (p)3763 4656 MS (e)3814 4656 MS (a)3858 4656 MS (r)3903 4656 MS (s)3936 4656 MS ( )3975 4656 MS (i)4000 4656 MS (n)4028 4656 MS ( )4078 4656 MS (t)4103 4656 MS (h)4131 4656 MS (e)4181 4656 MS (O)490 4770 MS (r)562 4770 MS (i)595 4770 MS (g)623 4770 MS (i)672 4770 MS (n)700 4770 MS (a)750 4770 MS (l)794 4770 MS ( )822 4770 MS (C)847 4770 MS (o)914 4770 MS (d)964 4770 MS (e)1014 4770 MS ( )1058 4770 MS (m)1083 4770 MS (u)1161 4770 MS (s)1211 4770 MS (t)1250 4770 MS ( )1278 4770 MS (a)1303 4770 MS (l)1347 4770 MS (s)1375 4770 MS (o)1414 4770 MS ( )1464 4770 MS (b)1489 4770 MS (e)1539 4770 MS ( )1583 4770 MS (r)1609 4770 MS (e)1642 4770 MS (t)1686 4770 MS (a)1714 4770 MS (i)1758 4770 MS (n)1786 4770 MS (e)1836 4770 MS (d)1880 4770 MS ( )1930 4770 MS (o)1955 4770 MS (r)2006 4770 MS ( )2039 4770 MS (i)2064 4770 MS (n)2092 4770 MS (c)2142 4770 MS (l)2186 4770 MS (u)2214 4770 MS (d)2264 4770 MS (e)2314 4770 MS (d)2358 4770 MS ( )2408 4770 MS (i)2433 4770 MS (n)2461 4770 MS ( )2511 4770 MS (a)2536 4770 MS (n)2580 4770 MS (y)2632 4770 MS ( )2680 4770 MS (a)2706 4770 MS (n)2750 4770 MS (d)2800 4770 MS ( )2850 4770 MS (a)2875 4770 MS (l)2919 4770 MS (l)2947 4770 MS ( )2975 4770 MS (r)3000 4770 MS (e)3033 4770 MS (d)3077 4770 MS (i)3127 4770 MS (s)3155 4770 MS (t)3194 4770 MS (r)3222 4770 MS (i)3255 4770 MS (b)3283 4770 MS (u)3333 4770 MS (t)3383 4770 MS (i)3411 4770 MS (o)3439 4770 MS (n)3489 4770 MS (s)3539 4770 MS ( )3578 4770 MS (o)3603 4770 MS (f)3653 4770 MS ( )3686 4770 MS (C)3711 4770 MS (o)3778 4770 MS (v)3828 4770 MS (e)3878 4770 MS (r)3922 4770 MS (e)3956 4770 MS (d)4000 4770 MS ( )4050 4770 MS (C)4075 4770 MS (o)4142 4770 MS (d)4192 4770 MS (e)4242 4770 MS (.)4286 4770 MS (3)490 4969 MS (.)540 4969 MS (2)565 4969 MS (.)615 4969 MS [100 0 0 -100 0 0]/Helvetica MF ( )640 4969 MS [100 0 0 -100 0 0]/Times-Bold MF (A)790 4969 MS (l)862 4969 MS (t)890 4969 MS (e)923 4969 MS (r)967 4969 MS (n)1011 4969 MS (a)1067 4969 MS (t)1117 4969 MS (i)1150 4969 MS (v)1178 4969 MS (e)1228 4969 MS ( )1272 4969 MS (L)1297 4969 MS (i)1364 4969 MS (c)1392 4969 MS (e)1436 4969 MS (n)1480 4969 MS (s)1536 4969 MS (e)1575 4969 MS (.)1619 4969 MS ( )1644 4969 MS [100 0 0 -100 0 0]/_Times-Roman MF (P)1669 4969 MS (r)1725 4969 MS (o)1758 4969 MS (v)1808 4969 MS (i)1858 4969 MS (d)1886 4969 MS (e)1936 4969 MS (d)1981 4969 MS ( )2031 4969 MS (t)2056 4969 MS (h)2084 4969 MS (a)2134 4969 MS (t)2178 4969 MS ( )2206 4969 MS (R)2231 4969 MS (e)2298 4969 MS (c)2342 4969 MS (i)2386 4969 MS (p)2414 4969 MS (i)2464 4969 MS (e)2492 4969 MS (n)2536 4969 MS (t)2586 4969 MS ( )2614 4969 MS (i)2639 4969 MS (s)2667 4969 MS ( )2706 4969 MS (i)2731 4969 MS (n)2759 4969 MS ( )2809 4969 MS (c)2834 4969 MS (o)2878 4969 MS (m)2928 4969 MS (p)3006 4969 MS (l)3056 4969 MS (i)3084 4969 MS (a)3112 4969 MS (n)3156 4969 MS (c)3206 4969 MS (e)3250 4969 MS ( )3294 4969 MS (w)3319 4969 MS (i)3391 4969 MS (t)3419 4969 MS (h)3447 4969 MS ( )3497 4969 MS (t)3522 4969 MS (h)3550 4969 MS (e)3600 4969 MS ( )3644 4969 MS (t)3669 4969 MS (e)3697 4969 MS (r)3742 4969 MS (m)3775 4969 MS (s)3853 4969 MS ( )3892 4969 MS (o)3917 4969 MS (f)3967 4969 MS ( )4000 4969 MS (t)4025 4969 MS (h)4053 4969 MS (i)4103 4969 MS (s)4131 4969 MS (L)490 5084 MS (i)550 5084 MS (c)578 5084 MS (e)623 5084 MS (n)667 5084 MS (s)717 5084 MS (e)756 5084 MS (,)800 5084 MS ( )825 5084 MS (R)850 5084 MS (e)917 5084 MS (c)961 5084 MS (i)1005 5084 MS (p)1033 5084 MS (i)1083 5084 MS (e)1111 5084 MS (n)1155 5084 MS (t)1205 5084 MS ( )1233 5084 MS (m)1258 5084 MS (a)1336 5084 MS (y)1382 5084 MS (,)1430 5084 MS ( )1455 5084 MS (s)1480 5084 MS (o)1519 5084 MS ( )1569 5084 MS (l)1594 5084 MS (o)1622 5084 MS (n)1672 5084 MS (g)1723 5084 MS ( )1772 5084 MS (a)1797 5084 MS (s)1841 5084 MS ( )1880 5084 MS (w)1906 5084 MS (i)1978 5084 MS (t)2006 5084 MS (h)2034 5084 MS (o)2084 5084 MS (u)2134 5084 MS (t)2184 5084 MS ( )2212 5084 MS (d)2237 5084 MS (e)2287 5084 MS (r)2331 5084 MS (o)2364 5084 MS (g)2415 5084 MS (a)2464 5084 MS (t)2508 5084 MS (i)2536 5084 MS (o)2564 5084 MS (n)2614 5084 MS ( )2664 5084 MS (o)2689 5084 MS (f)2739 5084 MS ( )2772 5084 MS (a)2797 5084 MS (n)2841 5084 MS (y)2893 5084 MS ( )2941 5084 MS (o)2966 5084 MS (f)3017 5084 MS ( )3050 5084 MS (S)3075 5084 MS (G)3131 5084 MS (I)3204 5084 MS (\222)3236 5084 MS (s)3269 5084 MS ( )3308 5084 MS (r)3333 5084 MS (i)3366 5084 MS (g)3395 5084 MS (h)3444 5084 MS (t)3494 5084 MS (s)3522 5084 MS ( )3561 5084 MS (i)3586 5084 MS (n)3614 5084 MS ( )3664 5084 MS (a)3689 5084 MS (n)3733 5084 MS (d)3783 5084 MS ( )3833 5084 MS (t)3858 5084 MS (o)3886 5084 MS ( )3936 5084 MS (t)3961 5084 MS (h)3989 5084 MS (e)4039 5084 MS (O)490 5199 MS (r)562 5199 MS (i)595 5199 MS (g)623 5199 MS (i)672 5199 MS (n)700 5199 MS (a)750 5199 MS (l)794 5199 MS ( )822 5199 MS (C)847 5199 MS (o)914 5199 MS (d)964 5199 MS (e)1014 5199 MS (,)1058 5199 MS ( )1083 5199 MS (d)1108 5199 MS (i)1158 5199 MS (s)1186 5199 MS (t)1225 5199 MS (r)1253 5199 MS (i)1286 5199 MS (b)1314 5199 MS (u)1364 5199 MS (t)1414 5199 MS (e)1442 5199 MS ( )1486 5199 MS (t)1511 5199 MS (h)1539 5199 MS (e)1589 5199 MS ( )1633 5199 MS (s)1658 5199 MS (o)1697 5199 MS (u)1747 5199 MS (r)1798 5199 MS (c)1831 5199 MS (e)1875 5199 MS ( )1919 5199 MS (c)1945 5199 MS (o)1989 5199 MS (d)2039 5199 MS (e)2089 5199 MS ( )2133 5199 MS (a)2159 5199 MS (n)2203 5199 MS (d)2253 5199 MS (/)2303 5199 MS (o)2331 5199 MS (r)2381 5199 MS ( )2414 5199 MS (e)2439 5199 MS (x)2483 5199 MS (e)2534 5199 MS (c)2578 5199 MS (u)2622 5199 MS (t)2672 5199 MS (a)2700 5199 MS (b)2744 5199 MS (l)2794 5199 MS (e)2822 5199 MS ( )2866 5199 MS (v)2891 5199 MS (e)2942 5199 MS (r)2986 5199 MS (s)3019 5199 MS (i)3058 5199 MS (o)3086 5199 MS (n)3136 5199 MS (\()3186 5199 MS (s)3219 5199 MS (\))3258 5199 MS ( )3291 5199 MS (o)3316 5199 MS (f)3366 5199 MS ( )3399 5199 MS (C)3424 5199 MS (o)3491 5199 MS (v)3541 5199 MS (e)3591 5199 MS (r)3636 5199 MS (e)3669 5199 MS (d)3713 5199 MS ( )3763 5199 MS (C)3788 5199 MS (o)3855 5199 MS (d)3905 5199 MS (e)3955 5199 MS ( )3999 5199 MS (u)4024 5199 MS (n)4074 5199 MS (d)4124 5199 MS (e)4175 5199 MS (r)4219 5199 MS (\()490 5314 MS (1)523 5314 MS (\))573 5314 MS ( )606 5314 MS (t)631 5314 MS (h)659 5314 MS (i)709 5314 MS (s)737 5314 MS ( )776 5314 MS (L)802 5314 MS (i)861 5314 MS (c)889 5314 MS (e)934 5314 MS (n)978 5314 MS (s)1028 5314 MS (e)1067 5314 MS (;)1111 5314 MS ( )1139 5314 MS (\()1164 5314 MS (2)1197 5314 MS (\))1247 5314 MS ( )1280 5314 MS (a)1306 5314 MS ( )1350 5314 MS (l)1375 5314 MS (i)1403 5314 MS (c)1431 5314 MS (e)1475 5314 MS (n)1519 5314 MS (s)1569 5314 MS (e)1609 5314 MS ( )1653 5314 MS (i)1678 5314 MS (d)1706 5314 MS (e)1756 5314 MS (n)1800 5314 MS (t)1850 5314 MS (i)1878 5314 MS (c)1906 5314 MS (a)1950 5314 MS (l)1994 5314 MS ( )2022 5314 MS (t)2047 5314 MS (o)2075 5314 MS ( )2125 5314 MS (t)2150 5314 MS (h)2178 5314 MS (i)2228 5314 MS (s)2256 5314 MS ( )2295 5314 MS (L)2321 5314 MS (i)2380 5314 MS (c)2408 5314 MS (e)2453 5314 MS (n)2497 5314 MS (s)2547 5314 MS (e)2586 5314 MS ( )2630 5314 MS (b)2655 5314 MS (u)2705 5314 MS (t)2755 5314 MS ( )2783 5314 MS (f)2808 5314 MS (o)2841 5314 MS (r)2891 5314 MS ( )2924 5314 MS (o)2949 5314 MS (n)3000 5314 MS (l)3050 5314 MS (y)3079 5314 MS ( )3127 5314 MS (s)3152 5314 MS (u)3191 5314 MS (c)3242 5314 MS (h)3286 5314 MS ( )3336 5314 MS (c)3361 5314 MS (h)3405 5314 MS (a)3455 5314 MS (n)3499 5314 MS (g)3549 5314 MS (e)3599 5314 MS (s)3644 5314 MS ( )3683 5314 MS (a)3708 5314 MS (s)3752 5314 MS ( )3791 5314 MS (a)3816 5314 MS (r)3861 5314 MS (e)3894 5314 MS ( )3938 5314 MS (n)3963 5314 MS (e)4013 5314 MS (c)4058 5314 MS (e)4102 5314 MS (s)4146 5314 MS (s)4185 5314 MS (a)4224 5314 MS (r)4269 5314 MS (y)4304 5314 MS (i)490 5429 MS (n)518 5429 MS ( )568 5429 MS (o)593 5429 MS (r)643 5429 MS (d)676 5429 MS (e)726 5429 MS (r)770 5429 MS ( )803 5429 MS (t)828 5429 MS (o)856 5429 MS ( )906 5429 MS (c)931 5429 MS (l)975 5429 MS (a)1003 5429 MS (r)1047 5429 MS (i)1080 5429 MS (f)1109 5429 MS (y)1144 5429 MS ( )1192 5429 MS (R)1217 5429 MS (e)1284 5429 MS (c)1328 5429 MS (i)1372 5429 MS (p)1400 5429 MS (i)1450 5429 MS (e)1478 5429 MS (n)1522 5429 MS (t)1572 5429 MS (\222)1600 5429 MS (s)1633 5429 MS ( )1672 5429 MS (r)1697 5429 MS (o)1730 5429 MS (l)1780 5429 MS (e)1808 5429 MS ( )1852 5429 MS (a)1878 5429 MS (s)1922 5429 MS ( )1961 5429 MS (l)1986 5429 MS (i)2014 5429 MS (c)2042 5429 MS (e)2086 5429 MS (n)2130 5429 MS (s)2180 5429 MS (o)2219 5429 MS (r)2269 5429 MS ( )2302 5429 MS (o)2327 5429 MS (f)2378 5429 MS ( )2411 5429 MS (M)2436 5429 MS (o)2525 5429 MS (d)2575 5429 MS (i)2625 5429 MS (f)2653 5429 MS (i)2686 5429 MS (c)2714 5429 MS (a)2758 5429 MS (t)2802 5429 MS (i)2830 5429 MS (o)2858 5429 MS (n)2908 5429 MS (s)2958 5429 MS (;)2997 5429 MS ( )3025 5429 MS (a)3050 5429 MS (n)3094 5429 MS (d)3144 5429 MS (/)3194 5429 MS (o)3222 5429 MS (r)3272 5429 MS ( )3305 5429 MS (\()3330 5429 MS (3)3363 5429 MS (\))3414 5429 MS ( )3447 5429 MS (a)3472 5429 MS ( )3516 5429 MS (l)3541 5429 MS (i)3569 5429 MS (c)3597 5429 MS (e)3641 5429 MS (n)3685 5429 MS (s)3735 5429 MS (e)3775 5429 MS ( )3819 5429 MS (o)3844 5429 MS (f)3894 5429 MS (R)490 5544 MS (e)557 5544 MS (c)601 5544 MS (i)645 5544 MS (p)673 5544 MS (i)723 5544 MS (e)751 5544 MS (n)795 5544 MS (t)845 5544 MS (\222)873 5544 MS (s)906 5544 MS ( )945 5544 MS (c)970 5544 MS (h)1014 5544 MS (o)1064 5544 MS (o)1114 5544 MS (s)1164 5544 MS (i)1203 5544 MS (n)1231 5544 MS (g)1282 5544 MS (,)1331 5544 MS ( )1356 5544 MS (c)1381 5544 MS (o)1425 5544 MS (n)1475 5544 MS (t)1525 5544 MS (a)1553 5544 MS (i)1597 5544 MS (n)1625 5544 MS (i)1675 5544 MS (n)1703 5544 MS (g)1754 5544 MS ( )1803 5544 MS (t)1828 5544 MS (e)1856 5544 MS (r)1900 5544 MS (m)1933 5544 MS (s)2011 5544 MS ( )2050 5544 MS (d)2075 5544 MS (i)2125 5544 MS (f)2153 5544 MS (f)2186 5544 MS (e)2220 5544 MS (r)2264 5544 MS (e)2297 5544 MS (n)2341 5544 MS (t)2391 5544 MS ( )2419 5544 MS (f)2444 5544 MS (r)2478 5544 MS (o)2511 5544 MS (m)2561 5544 MS ( )2639 5544 MS (t)2664 5544 MS (h)2692 5544 MS (i)2742 5544 MS (s)2770 5544 MS ( )2809 5544 MS (L)2835 5544 MS (i)2894 5544 MS (c)2922 5544 MS (e)2967 5544 MS (n)3011 5544 MS (s)3061 5544 MS (e)3100 5544 MS (,)3144 5544 MS ( )3169 5544 MS (p)3194 5544 MS (r)3244 5544 MS (o)3277 5544 MS (v)3327 5544 MS (i)3377 5544 MS (d)3405 5544 MS (e)3456 5544 MS (d)3500 5544 MS ( )3550 5544 MS (t)3575 5544 MS (h)3603 5544 MS (a)3653 5544 MS (t)3697 5544 MS ( )3725 5544 MS (t)3750 5544 MS (h)3778 5544 MS (e)3828 5544 MS ( )3872 5544 MS (l)3897 5544 MS (i)3925 5544 MS (c)3953 5544 MS (e)3997 5544 MS (n)4041 5544 MS (s)4091 5544 MS (e)4130 5544 MS (t)490 5659 MS (e)518 5659 MS (r)562 5659 MS (m)595 5659 MS (s)673 5659 MS ( )712 5659 MS (i)737 5659 MS (n)765 5659 MS (c)815 5659 MS (l)859 5659 MS (u)887 5659 MS (d)937 5659 MS (e)987 5659 MS ( )1031 5659 MS (t)1056 5659 MS (h)1084 5659 MS (i)1134 5659 MS (s)1162 5659 MS ( )1201 5659 MS (S)1226 5659 MS (e)1282 5659 MS (c)1326 5659 MS (t)1370 5659 MS (i)1398 5659 MS (o)1426 5659 MS (n)1476 5659 MS ( )1526 5659 MS (3)1551 5659 MS ( )1601 5659 MS (a)1626 5659 MS (n)1670 5659 MS (d)1720 5659 MS ( )1770 5659 MS (S)1795 5659 MS (e)1851 5659 MS (c)1895 5659 MS (t)1939 5659 MS (i)1967 5659 MS (o)1995 5659 MS (n)2045 5659 MS (s)2095 5659 MS ( )2134 5659 MS (4)2159 5659 MS (,)2209 5659 MS ( )2234 5659 MS (6)2259 5659 MS (,)2309 5659 MS ( )2334 5659 MS (7)2359 5659 MS (,)2409 5659 MS ( )2434 5659 MS (1)2459 5659 MS (0)2509 5659 MS (,)2559 5659 MS ( )2584 5659 MS (1)2609 5659 MS (2)2659 5659 MS (,)2709 5659 MS ( )2734 5659 MS (a)2759 5659 MS (n)2803 5659 MS (d)2853 5659 MS ( )2903 5659 MS (1)2928 5659 MS (3)2978 5659 MS (,)3028 5659 MS ( )3053 5659 MS (w)3078 5659 MS (h)3150 5659 MS (i)3200 5659 MS (c)3228 5659 MS (h)3272 5659 MS ( )3322 5659 MS (t)3347 5659 MS (e)3375 5659 MS (r)3420 5659 MS (m)3453 5659 MS (s)3531 5659 MS ( )3570 5659 MS (m)3595 5659 MS (a)3673 5659 MS (y)3719 5659 MS ( )3767 5659 MS (n)3792 5659 MS (o)3842 5659 MS (t)3892 5659 MS ( )3920 5659 MS (b)3945 5659 MS (e)3995 5659 MS (m)490 5774 MS (o)568 5774 MS (d)618 5774 MS (i)668 5774 MS (f)696 5774 MS (i)729 5774 MS (e)757 5774 MS (d)801 5774 MS ( )851 5774 MS (o)876 5774 MS (r)926 5774 MS ( )959 5774 MS (s)984 5774 MS (u)1023 5774 MS (p)1073 5774 MS (e)1123 5774 MS (r)1167 5774 MS (s)1200 5774 MS (e)1239 5774 MS (d)1283 5774 MS (e)1334 5774 MS (d)1378 5774 MS ( )1428 5774 MS (b)1453 5774 MS (y)1503 5774 MS ( )1552 5774 MS (a)1578 5774 MS (n)1622 5774 MS (y)1672 5774 MS ( )1721 5774 MS (o)1747 5774 MS (t)1797 5774 MS (h)1825 5774 MS (e)1875 5774 MS (r)1920 5774 MS ( )1953 5774 MS (t)1978 5774 MS (e)2006 5774 MS (r)2050 5774 MS (m)2083 5774 MS (s)2161 5774 MS ( )2200 5774 MS (o)2225 5774 MS (f)2275 5774 MS ( )2308 5774 MS (s)2333 5774 MS (u)2372 5774 MS (c)2422 5774 MS (h)2466 5774 MS ( )2516 5774 MS (l)2541 5774 MS (i)2569 5774 MS (c)2597 5774 MS (e)2642 5774 MS (n)2686 5774 MS (s)2736 5774 MS (e)2775 5774 MS (.)2819 5774 MS ( )2844 5774 MS (I)2869 5774 MS (f)2902 5774 MS ( )2936 5774 MS (R)2961 5774 MS (e)3028 5774 MS (c)3072 5774 MS (i)3116 5774 MS (p)3144 5774 MS (i)3194 5774 MS (e)3222 5774 MS (n)3266 5774 MS (t)3316 5774 MS ( )3344 5774 MS (e)3369 5774 MS (l)3413 5774 MS (e)3441 5774 MS (c)3486 5774 MS (t)3530 5774 MS (s)3558 5774 MS ( )3597 5774 MS (t)3622 5774 MS (o)3650 5774 MS ( )3700 5774 MS (u)3725 5774 MS (s)3775 5774 MS (e)3814 5774 MS ( )3858 5774 MS (a)3883 5774 MS (n)3927 5774 MS (y)3979 5774 MS ( )4027 5774 MS (l)4052 5774 MS (i)4080 5774 MS (c)4108 5774 MS (e)4152 5774 MS (n)4196 5774 MS (s)4246 5774 MS (e)4286 5774 MS showpage %%Page: 3 3 13.238 780.059 translate 72 600 div dup neg scale 0 0 transform .25 add round .25 sub exch .25 add round .25 sub exch itransform translate [100 0 0 -100 0 0]/Times-Roman MF (o)490 591 MS (t)540 591 MS (h)568 591 MS (e)618 591 MS (r)662 591 MS ( )695 591 MS (t)720 591 MS (h)748 591 MS (a)798 591 MS (n)842 591 MS ( )892 591 MS (t)917 591 MS (h)945 591 MS (i)995 591 MS (s)1023 591 MS ( )1062 591 MS (L)1088 591 MS (i)1147 591 MS (c)1175 591 MS (e)1220 591 MS (n)1264 591 MS (s)1314 591 MS (e)1353 591 MS (,)1397 591 MS ( )1422 591 MS (R)1447 591 MS (e)1514 591 MS (c)1559 591 MS (i)1603 591 MS (p)1631 591 MS (i)1681 591 MS (e)1709 591 MS (n)1753 591 MS (t)1803 591 MS ( )1831 591 MS (m)1856 591 MS (u)1934 591 MS (s)1984 591 MS (t)2023 591 MS ( )2051 591 MS (m)2076 591 MS (a)2154 591 MS (k)2198 591 MS (e)2248 591 MS ( )2292 591 MS (i)2317 591 MS (t)2345 591 MS ( )2373 591 MS (a)2398 591 MS (b)2442 591 MS (s)2492 591 MS (o)2531 591 MS (l)2581 591 MS (u)2609 591 MS (t)2659 591 MS (e)2687 591 MS (l)2731 591 MS (y)2760 591 MS ( )2808 591 MS (c)2833 591 MS (l)2877 591 MS (e)2906 591 MS (a)2950 591 MS (r)2994 591 MS ( )3027 591 MS (t)3052 591 MS (h)3080 591 MS (a)3131 591 MS (t)3175 591 MS ( )3203 591 MS (a)3228 591 MS (n)3272 591 MS (y)3324 591 MS ( )3372 591 MS (o)3397 591 MS (f)3447 591 MS ( )3480 591 MS (i)3505 591 MS (t)3533 591 MS (s)3561 591 MS ( )3600 591 MS (t)3625 591 MS (e)3653 591 MS (r)3697 591 MS (m)3730 591 MS (s)3808 591 MS ( )3847 591 MS (w)3872 591 MS (h)3944 591 MS (i)3994 591 MS (c)4022 591 MS (h)4066 591 MS ( )4116 591 MS (d)4141 591 MS (i)4191 591 MS (f)4219 591 MS (f)4252 591 MS (e)4286 591 MS (r)4330 591 MS (f)490 706 MS (r)523 706 MS (o)556 706 MS (m)606 706 MS ( )684 706 MS (t)709 706 MS (h)737 706 MS (i)787 706 MS (s)815 706 MS ( )854 706 MS (L)880 706 MS (i)939 706 MS (c)967 706 MS (e)1012 706 MS (n)1056 706 MS (s)1106 706 MS (e)1145 706 MS ( )1189 706 MS (a)1214 706 MS (r)1259 706 MS (e)1292 706 MS ( )1336 706 MS (o)1361 706 MS (f)1411 706 MS (f)1445 706 MS (e)1478 706 MS (r)1522 706 MS (e)1556 706 MS (d)1600 706 MS ( )1650 706 MS (b)1675 706 MS (y)1727 706 MS ( )1775 706 MS (R)1800 706 MS (e)1867 706 MS (c)1911 706 MS (i)1955 706 MS (p)1983 706 MS (i)2033 706 MS (e)2061 706 MS (n)2105 706 MS (t)2155 706 MS ( )2183 706 MS (a)2208 706 MS (l)2252 706 MS (o)2280 706 MS (n)2330 706 MS (e)2380 706 MS (,)2424 706 MS ( )2449 706 MS (a)2475 706 MS (n)2519 706 MS (d)2569 706 MS ( )2619 706 MS (n)2644 706 MS (o)2694 706 MS (t)2744 706 MS ( )2772 706 MS (b)2797 706 MS (y)2849 706 MS ( )2897 706 MS (S)2922 706 MS (G)2978 706 MS (I)3051 706 MS (.)3083 706 MS ( )3108 706 MS (I)3134 706 MS (t)3166 706 MS ( )3194 706 MS (i)3219 706 MS (s)3247 706 MS ( )3286 706 MS (e)3311 706 MS (m)3355 706 MS (p)3433 706 MS (h)3483 706 MS (a)3533 706 MS (s)3577 706 MS (i)3616 706 MS (z)3644 706 MS (e)3689 706 MS (d)3733 706 MS ( )3783 706 MS (t)3808 706 MS (h)3836 706 MS (a)3886 706 MS (t)3930 706 MS ( )3958 706 MS (t)3983 706 MS (h)4011 706 MS (i)4061 706 MS (s)4089 706 MS (L)490 821 MS (i)550 821 MS (c)578 821 MS (e)623 821 MS (n)667 821 MS (s)717 821 MS (e)756 821 MS ( )800 821 MS (i)825 821 MS (s)853 821 MS ( )892 821 MS (a)917 821 MS ( )961 821 MS (l)986 821 MS (i)1014 821 MS (m)1042 821 MS (i)1120 821 MS (t)1148 821 MS (e)1176 821 MS (d)1220 821 MS ( )1270 821 MS (l)1295 821 MS (i)1323 821 MS (c)1351 821 MS (e)1395 821 MS (n)1439 821 MS (s)1489 821 MS (e)1528 821 MS (,)1572 821 MS ( )1597 821 MS (a)1622 821 MS (n)1666 821 MS (d)1716 821 MS (,)1766 821 MS ( )1791 821 MS (r)1817 821 MS (e)1850 821 MS (g)1895 821 MS (a)1945 821 MS (r)1989 821 MS (d)2022 821 MS (l)2072 821 MS (e)2100 821 MS (s)2144 821 MS (s)2183 821 MS ( )2222 821 MS (o)2247 821 MS (f)2297 821 MS ( )2330 821 MS (t)2355 821 MS (h)2383 821 MS (e)2433 821 MS ( )2477 821 MS (l)2502 821 MS (i)2530 821 MS (c)2558 821 MS (e)2603 821 MS (n)2647 821 MS (s)2697 821 MS (e)2736 821 MS ( )2780 821 MS (f)2805 821 MS (o)2838 821 MS (r)2889 821 MS (m)2922 821 MS ( )3000 821 MS (e)3025 821 MS (m)3069 821 MS (p)3147 821 MS (l)3197 821 MS (o)3225 821 MS (y)3276 821 MS (e)3324 821 MS (d)3369 821 MS ( )3419 821 MS (b)3444 821 MS (y)3496 821 MS ( )3544 821 MS (R)3569 821 MS (e)3636 821 MS (c)3680 821 MS (i)3724 821 MS (p)3752 821 MS (i)3802 821 MS (e)3830 821 MS (n)3874 821 MS (t)3924 821 MS ( )3952 821 MS (i)3977 821 MS (n)4005 821 MS (a)490 936 MS (c)534 936 MS (c)578 936 MS (o)622 936 MS (r)672 936 MS (d)705 936 MS (a)756 936 MS (n)800 936 MS (c)850 936 MS (e)895 936 MS ( )939 936 MS (w)964 936 MS (i)1036 936 MS (t)1064 936 MS (h)1092 936 MS ( )1142 936 MS (t)1167 936 MS (h)1195 936 MS (i)1245 936 MS (s)1273 936 MS ( )1312 936 MS (S)1337 936 MS (e)1393 936 MS (c)1437 936 MS (t)1481 936 MS (i)1509 936 MS (o)1537 936 MS (n)1587 936 MS ( )1637 936 MS (3)1662 936 MS (.)1712 936 MS (2)1737 936 MS (,)1787 936 MS ( )1812 936 MS (R)1837 936 MS (e)1904 936 MS (c)1948 936 MS (i)1992 936 MS (p)2020 936 MS (i)2070 936 MS (e)2098 936 MS (n)2142 936 MS (t)2192 936 MS ( )2220 936 MS (m)2245 936 MS (a)2323 936 MS (y)2368 936 MS ( )2416 936 MS (r)2441 936 MS (e)2475 936 MS (l)2519 936 MS (i)2547 936 MS (c)2575 936 MS (e)2619 936 MS (n)2663 936 MS (s)2713 936 MS (e)2753 936 MS ( )2797 936 MS (o)2822 936 MS (n)2872 936 MS (l)2922 936 MS (y)2951 936 MS ( )2999 936 MS (s)3024 936 MS (u)3063 936 MS (c)3114 936 MS (h)3158 936 MS ( )3208 936 MS (r)3233 936 MS (i)3266 936 MS (g)3295 936 MS (h)3344 936 MS (t)3394 936 MS (s)3422 936 MS (,)3461 936 MS ( )3486 936 MS (i)3511 936 MS (n)3539 936 MS ( )3589 936 MS (O)3614 936 MS (r)3686 936 MS (i)3719 936 MS (g)3748 936 MS (i)3797 936 MS (n)3825 936 MS (a)3875 936 MS (l)3919 936 MS ( )3947 936 MS (C)3972 936 MS (o)4039 936 MS (d)4089 936 MS (e)4139 936 MS ( )4183 936 MS (a)4208 936 MS (n)4252 936 MS (d)4302 936 MS (M)490 1051 MS (o)579 1051 MS (d)629 1051 MS (i)679 1051 MS (f)707 1051 MS (i)740 1051 MS (c)768 1051 MS (a)812 1051 MS (t)856 1051 MS (i)884 1051 MS (o)912 1051 MS (n)962 1051 MS (s)1012 1051 MS ( )1051 1051 MS (b)1076 1051 MS (y)1127 1051 MS ( )1175 1051 MS (S)1200 1051 MS (G)1256 1051 MS (I)1329 1051 MS (,)1361 1051 MS ( )1386 1051 MS (a)1412 1051 MS (s)1456 1051 MS ( )1495 1051 MS (i)1520 1051 MS (t)1548 1051 MS ( )1576 1051 MS (h)1601 1051 MS (a)1651 1051 MS (s)1695 1051 MS ( )1734 1051 MS (a)1759 1051 MS (c)1803 1051 MS (t)1847 1051 MS (u)1875 1051 MS (a)1925 1051 MS (l)1969 1051 MS (l)1997 1051 MS (y)2027 1051 MS ( )2075 1051 MS (b)2100 1051 MS (e)2150 1051 MS (e)2195 1051 MS (n)2239 1051 MS ( )2289 1051 MS (g)2315 1051 MS (r)2364 1051 MS (a)2397 1051 MS (n)2441 1051 MS (t)2491 1051 MS (e)2519 1051 MS (d)2564 1051 MS ( )2614 1051 MS (b)2639 1051 MS (y)2691 1051 MS ( )2739 1051 MS (S)2764 1051 MS (G)2820 1051 MS (I)2893 1051 MS ( )2925 1051 MS (i)2950 1051 MS (n)2978 1051 MS ( )3028 1051 MS (t)3053 1051 MS (h)3081 1051 MS (i)3131 1051 MS (s)3159 1051 MS ( )3198 1051 MS (L)3224 1051 MS (i)3283 1051 MS (c)3311 1051 MS (e)3356 1051 MS (n)3400 1051 MS (s)3450 1051 MS (e)3489 1051 MS (.)3533 1051 MS (3)490 1249 MS (.)540 1249 MS (3)565 1249 MS (.)615 1249 MS [100 0 0 -100 0 0]/Helvetica MF ( )640 1249 MS [100 0 0 -100 0 0]/Times-Bold MF (I)790 1249 MS (n)829 1249 MS (d)885 1249 MS (e)941 1249 MS (m)985 1249 MS (n)1067 1249 MS (i)1123 1249 MS (t)1151 1249 MS (y)1184 1249 MS (.)1234 1249 MS ( )1259 1249 MS [100 0 0 -100 0 0]/Times-Roman MF (R)1284 1249 MS (e)1351 1249 MS (c)1395 1249 MS (i)1439 1249 MS (p)1467 1249 MS (i)1517 1249 MS (e)1545 1249 MS (n)1589 1249 MS (t)1639 1249 MS ( )1667 1249 MS (h)1692 1249 MS (e)1742 1249 MS (r)1786 1249 MS (e)1820 1249 MS (b)1864 1249 MS (y)1916 1249 MS ( )1964 1249 MS (a)1989 1249 MS (g)2034 1249 MS (r)2084 1249 MS (e)2117 1249 MS (e)2161 1249 MS (s)2205 1249 MS ( )2244 1249 MS (t)2269 1249 MS (o)2297 1249 MS ( )2347 1249 MS (i)2372 1249 MS (n)2400 1249 MS (d)2450 1249 MS (e)2500 1249 MS (m)2544 1249 MS (n)2622 1249 MS (i)2672 1249 MS (f)2700 1249 MS (y)2735 1249 MS ( )2783 1249 MS (S)2808 1249 MS (G)2864 1249 MS (I)2937 1249 MS ( )2969 1249 MS (f)2995 1249 MS (o)3028 1249 MS (r)3078 1249 MS ( )3111 1249 MS (a)3136 1249 MS (n)3180 1249 MS (y)3232 1249 MS ( )3280 1249 MS (l)3305 1249 MS (i)3333 1249 MS (a)3361 1249 MS (b)3405 1249 MS (i)3455 1249 MS (l)3483 1249 MS (i)3511 1249 MS (t)3539 1249 MS (y)3568 1249 MS ( )3616 1249 MS (i)3641 1249 MS (n)3669 1249 MS (c)3720 1249 MS (u)3764 1249 MS (r)3814 1249 MS (r)3847 1249 MS (e)3881 1249 MS (d)3925 1249 MS ( )3975 1249 MS (b)4000 1249 MS (y)4052 1249 MS ( )4100 1249 MS (S)4125 1249 MS (G)4181 1249 MS (I)4254 1249 MS (a)490 1364 MS (s)534 1364 MS ( )573 1364 MS (a)598 1364 MS ( )642 1364 MS (r)667 1364 MS (e)700 1364 MS (s)744 1364 MS (u)783 1364 MS (l)833 1364 MS (t)861 1364 MS ( )889 1364 MS (o)914 1364 MS (f)964 1364 MS ( )997 1364 MS (a)1023 1364 MS (n)1067 1364 MS (y)1119 1364 MS ( )1167 1364 MS (s)1192 1364 MS (u)1231 1364 MS (c)1281 1364 MS (h)1325 1364 MS ( )1375 1364 MS (a)1400 1364 MS (l)1444 1364 MS (t)1472 1364 MS (e)1500 1364 MS (r)1545 1364 MS (n)1578 1364 MS (a)1628 1364 MS (t)1672 1364 MS (i)1700 1364 MS (v)1728 1364 MS (e)1778 1364 MS ( )1822 1364 MS (l)1847 1364 MS (i)1875 1364 MS (c)1903 1364 MS (e)1947 1364 MS (n)1991 1364 MS (s)2041 1364 MS (e)2081 1364 MS ( )2125 1364 MS (t)2150 1364 MS (e)2178 1364 MS (r)2222 1364 MS (m)2255 1364 MS (s)2333 1364 MS ( )2372 1364 MS (R)2397 1364 MS (e)2464 1364 MS (c)2508 1364 MS (i)2552 1364 MS (p)2580 1364 MS (i)2630 1364 MS (e)2658 1364 MS (n)2702 1364 MS (t)2752 1364 MS ( )2780 1364 MS (o)2805 1364 MS (f)2855 1364 MS (f)2889 1364 MS (e)2922 1364 MS (r)2966 1364 MS (s)2999 1364 MS (.)3038 1364 MS (4)490 1563 MS (.)540 1563 MS [100 0 0 -100 0 0]/Helvetica MF ( )565 1563 MS [100 0 0 -100 0 0]/Times-Bold MF (T)790 1563 MS (e)857 1563 MS (r)901 1563 MS (m)946 1563 MS (i)1028 1563 MS (n)1056 1563 MS (a)1112 1563 MS (t)1162 1563 MS (i)1195 1563 MS (o)1223 1563 MS (n)1273 1563 MS (.)1329 1563 MS ( )1354 1563 MS [100 0 0 -100 0 0]/Times-Roman MF (T)1379 1563 MS (h)1440 1563 MS (i)1490 1563 MS (s)1518 1563 MS ( )1557 1563 MS (L)1583 1563 MS (i)1642 1563 MS (c)1670 1563 MS (e)1714 1563 MS (n)1758 1563 MS (s)1808 1563 MS (e)1848 1563 MS ( )1892 1563 MS (a)1917 1563 MS (n)1961 1563 MS (d)2011 1563 MS ( )2061 1563 MS (t)2086 1563 MS (h)2114 1563 MS (e)2164 1563 MS ( )2208 1563 MS (r)2234 1563 MS (i)2267 1563 MS (g)2295 1563 MS (h)2344 1563 MS (t)2394 1563 MS (s)2422 1563 MS ( )2461 1563 MS (g)2487 1563 MS (r)2536 1563 MS (a)2570 1563 MS (n)2614 1563 MS (t)2664 1563 MS (e)2692 1563 MS (d)2736 1563 MS ( )2786 1563 MS (h)2811 1563 MS (e)2861 1563 MS (r)2906 1563 MS (e)2939 1563 MS (u)2983 1563 MS (n)3033 1563 MS (d)3083 1563 MS (e)3133 1563 MS (r)3178 1563 MS ( )3211 1563 MS (w)3236 1563 MS (i)3308 1563 MS (l)3336 1563 MS (l)3364 1563 MS ( )3392 1563 MS (t)3417 1563 MS (e)3445 1563 MS (r)3489 1563 MS (m)3522 1563 MS (i)3600 1563 MS (n)3628 1563 MS (a)3678 1563 MS (t)3722 1563 MS (e)3750 1563 MS ( )3794 1563 MS (a)3819 1563 MS (u)3863 1563 MS (t)3913 1563 MS (o)3941 1563 MS (m)3991 1563 MS (a)4069 1563 MS (t)4113 1563 MS (i)4141 1563 MS (c)4169 1563 MS (a)4214 1563 MS (l)4258 1563 MS (l)4286 1563 MS (y)4314 1563 MS (i)490 1678 MS (f)518 1678 MS ( )551 1678 MS (R)576 1678 MS (e)643 1678 MS (c)687 1678 MS (i)731 1678 MS (p)759 1678 MS (i)809 1678 MS (e)837 1678 MS (n)881 1678 MS (t)931 1678 MS ( )959 1678 MS (b)984 1678 MS (r)1034 1678 MS (e)1067 1678 MS (a)1111 1678 MS (c)1156 1678 MS (h)1200 1678 MS (e)1250 1678 MS (s)1294 1678 MS ( )1333 1678 MS (a)1358 1678 MS (n)1403 1678 MS (y)1455 1678 MS ( )1503 1678 MS (t)1528 1678 MS (e)1556 1678 MS (r)1600 1678 MS (m)1633 1678 MS ( )1711 1678 MS (h)1736 1678 MS (e)1786 1678 MS (r)1830 1678 MS (e)1864 1678 MS (i)1908 1678 MS (n)1936 1678 MS ( )1986 1678 MS (a)2011 1678 MS (n)2055 1678 MS (d)2105 1678 MS ( )2155 1678 MS (f)2180 1678 MS (a)2214 1678 MS (i)2258 1678 MS (l)2286 1678 MS (s)2314 1678 MS ( )2353 1678 MS (t)2378 1678 MS (o)2406 1678 MS ( )2456 1678 MS (c)2481 1678 MS (u)2525 1678 MS (r)2575 1678 MS (e)2608 1678 MS ( )2652 1678 MS (s)2677 1678 MS (u)2716 1678 MS (c)2766 1678 MS (h)2810 1678 MS ( )2860 1678 MS (b)2885 1678 MS (r)2936 1678 MS (e)2969 1678 MS (a)3014 1678 MS (c)3058 1678 MS (h)3102 1678 MS ( )3152 1678 MS (w)3177 1678 MS (i)3249 1678 MS (t)3277 1678 MS (h)3305 1678 MS (i)3355 1678 MS (n)3383 1678 MS ( )3433 1678 MS (3)3458 1678 MS (0)3508 1678 MS ( )3558 1678 MS (d)3583 1678 MS (a)3633 1678 MS (y)3679 1678 MS (s)3727 1678 MS ( )3766 1678 MS (t)3791 1678 MS (h)3819 1678 MS (e)3869 1678 MS (r)3913 1678 MS (e)3947 1678 MS (o)3991 1678 MS (f)4041 1678 MS (.)4074 1678 MS ( )4099 1678 MS (A)4124 1678 MS (n)4196 1678 MS (y)4248 1678 MS (s)490 1793 MS (u)529 1793 MS (b)579 1793 MS (l)629 1793 MS (i)657 1793 MS (c)685 1793 MS (e)729 1793 MS (n)773 1793 MS (s)823 1793 MS (e)862 1793 MS ( )906 1793 MS (t)931 1793 MS (o)959 1793 MS ( )1009 1793 MS (t)1034 1793 MS (h)1062 1793 MS (e)1112 1793 MS ( )1156 1793 MS (C)1181 1793 MS (o)1248 1793 MS (v)1298 1793 MS (e)1348 1793 MS (r)1392 1793 MS (e)1425 1793 MS (d)1469 1793 MS ( )1519 1793 MS (C)1544 1793 MS (o)1611 1793 MS (d)1661 1793 MS (e)1711 1793 MS ( )1755 1793 MS (t)1780 1793 MS (h)1808 1793 MS (a)1859 1793 MS (t)1903 1793 MS ( )1931 1793 MS (i)1956 1793 MS (s)1984 1793 MS ( )2023 1793 MS (p)2048 1793 MS (r)2098 1793 MS (o)2131 1793 MS (p)2181 1793 MS (e)2231 1793 MS (r)2275 1793 MS (l)2308 1793 MS (y)2338 1793 MS ( )2386 1793 MS (g)2412 1793 MS (r)2461 1793 MS (a)2494 1793 MS (n)2539 1793 MS (t)2589 1793 MS (e)2617 1793 MS (d)2661 1793 MS ( )2711 1793 MS (s)2736 1793 MS (h)2775 1793 MS (a)2825 1793 MS (l)2869 1793 MS (l)2897 1793 MS ( )2925 1793 MS (s)2950 1793 MS (u)2989 1793 MS (r)3039 1793 MS (v)3072 1793 MS (i)3122 1793 MS (v)3150 1793 MS (e)3200 1793 MS ( )3244 1793 MS (a)3269 1793 MS (n)3313 1793 MS (y)3365 1793 MS ( )3413 1793 MS (t)3438 1793 MS (e)3467 1793 MS (r)3511 1793 MS (m)3544 1793 MS (i)3622 1793 MS (n)3650 1793 MS (a)3700 1793 MS (t)3744 1793 MS (i)3772 1793 MS (o)3800 1793 MS (n)3850 1793 MS ( )3900 1793 MS (o)3925 1793 MS (f)3975 1793 MS ( )4008 1793 MS (t)4033 1793 MS (h)4061 1793 MS (i)4111 1793 MS (s)4139 1793 MS (L)490 1908 MS (i)550 1908 MS (c)578 1908 MS (e)623 1908 MS (n)667 1908 MS (s)717 1908 MS (e)756 1908 MS (,)800 1908 MS ( )825 1908 MS (a)850 1908 MS (b)894 1908 MS (s)944 1908 MS (e)984 1908 MS (n)1028 1908 MS (t)1078 1908 MS ( )1106 1908 MS (t)1131 1908 MS (e)1159 1908 MS (r)1203 1908 MS (m)1236 1908 MS (i)1314 1908 MS (n)1342 1908 MS (a)1392 1908 MS (t)1436 1908 MS (i)1464 1908 MS (o)1492 1908 MS (n)1542 1908 MS ( )1592 1908 MS (b)1617 1908 MS (y)1668 1908 MS ( )1716 1908 MS (t)1741 1908 MS (h)1769 1908 MS (e)1820 1908 MS ( )1864 1908 MS (t)1889 1908 MS (e)1917 1908 MS (r)1961 1908 MS (m)1994 1908 MS (s)2072 1908 MS ( )2111 1908 MS (o)2136 1908 MS (f)2186 1908 MS ( )2219 1908 MS (s)2244 1908 MS (u)2283 1908 MS (c)2333 1908 MS (h)2377 1908 MS ( )2427 1908 MS (s)2452 1908 MS (u)2491 1908 MS (b)2541 1908 MS (l)2591 1908 MS (i)2619 1908 MS (c)2647 1908 MS (e)2692 1908 MS (n)2736 1908 MS (s)2786 1908 MS (e)2825 1908 MS (.)2869 1908 MS ( )2894 1908 MS (P)2919 1908 MS (r)2975 1908 MS (o)3008 1908 MS (v)3058 1908 MS (i)3108 1908 MS (s)3136 1908 MS (i)3175 1908 MS (o)3203 1908 MS (n)3253 1908 MS (s)3303 1908 MS ( )3342 1908 MS (t)3367 1908 MS (h)3395 1908 MS (a)3445 1908 MS (t)3489 1908 MS (,)3517 1908 MS ( )3542 1908 MS (b)3567 1908 MS (y)3618 1908 MS ( )3666 1908 MS (t)3691 1908 MS (h)3719 1908 MS (e)3770 1908 MS (i)3814 1908 MS (r)3842 1908 MS ( )3875 1908 MS (n)3900 1908 MS (a)3950 1908 MS (t)3994 1908 MS (u)4022 1908 MS (r)4072 1908 MS (e)4106 1908 MS (,)4150 1908 MS (m)490 2022 MS (u)568 2022 MS (s)618 2022 MS (t)657 2022 MS ( )685 2022 MS (r)710 2022 MS (e)743 2022 MS (m)787 2022 MS (a)865 2022 MS (i)909 2022 MS (n)937 2022 MS ( )987 2022 MS (i)1012 2022 MS (n)1040 2022 MS ( )1090 2022 MS (e)1115 2022 MS (f)1159 2022 MS (f)1192 2022 MS (e)1225 2022 MS (c)1270 2022 MS (t)1314 2022 MS ( )1342 2022 MS (b)1367 2022 MS (e)1417 2022 MS (y)1463 2022 MS (o)1511 2022 MS (n)1561 2022 MS (d)1611 2022 MS ( )1661 2022 MS (t)1686 2022 MS (h)1714 2022 MS (e)1764 2022 MS ( )1808 2022 MS (t)1833 2022 MS (e)1861 2022 MS (r)1906 2022 MS (m)1939 2022 MS (i)2017 2022 MS (n)2045 2022 MS (a)2095 2022 MS (t)2139 2022 MS (i)2167 2022 MS (o)2195 2022 MS (n)2245 2022 MS ( )2295 2022 MS (o)2320 2022 MS (f)2370 2022 MS ( )2403 2022 MS (t)2428 2022 MS (h)2456 2022 MS (i)2506 2022 MS (s)2534 2022 MS ( )2573 2022 MS (L)2598 2022 MS (i)2657 2022 MS (c)2686 2022 MS (e)2731 2022 MS (n)2775 2022 MS (s)2825 2022 MS (e)2864 2022 MS (,)2908 2022 MS ( )2933 2022 MS (s)2958 2022 MS (h)2997 2022 MS (a)3047 2022 MS (l)3091 2022 MS (l)3119 2022 MS ( )3147 2022 MS (s)3172 2022 MS (u)3211 2022 MS (r)3261 2022 MS (v)3294 2022 MS (i)3344 2022 MS (v)3372 2022 MS (e)3422 2022 MS (.)3466 2022 MS (5)490 2221 MS (.)540 2221 MS [100 0 0 -100 0 0]/Helvetica MF ( )565 2221 MS [100 0 0 -100 0 0]/Times-Bold MF (N)790 2221 MS (o)862 2221 MS ( )912 2221 MS (T)937 2221 MS (r)1004 2221 MS (a)1048 2221 MS (d)1098 2221 MS (e)1154 2221 MS (m)1199 2221 MS (a)1281 2221 MS (r)1331 2221 MS (k)1375 2221 MS ( )1431 2221 MS (O)1456 2221 MS (r)1534 2221 MS ( )1578 2221 MS (O)1603 2221 MS (t)1681 2221 MS (h)1714 2221 MS (e)1770 2221 MS (r)1814 2221 MS ( )1858 2221 MS (R)1884 2221 MS (i)1956 2221 MS (g)1984 2221 MS (h)2034 2221 MS (t)2090 2221 MS (s)2123 2221 MS (.)2162 2221 MS ( )2187 2221 MS [100 0 0 -100 0 0]/Times-Roman MF (T)2212 2221 MS (h)2273 2221 MS (i)2323 2221 MS (s)2351 2221 MS ( )2390 2221 MS (L)2416 2221 MS (i)2475 2221 MS (c)2503 2221 MS (e)2548 2221 MS (n)2592 2221 MS (s)2642 2221 MS (e)2681 2221 MS ( )2725 2221 MS (d)2750 2221 MS (o)2800 2221 MS (e)2850 2221 MS (s)2894 2221 MS ( )2933 2221 MS (n)2958 2221 MS (o)3008 2221 MS (t)3058 2221 MS ( )3086 2221 MS (g)3112 2221 MS (r)3161 2221 MS (a)3195 2221 MS (n)3239 2221 MS (t)3289 2221 MS ( )3317 2221 MS (a)3342 2221 MS (n)3386 2221 MS (y)3438 2221 MS ( )3486 2221 MS (r)3511 2221 MS (i)3544 2221 MS (g)3573 2221 MS (h)3622 2221 MS (t)3672 2221 MS (s)3700 2221 MS ( )3739 2221 MS (t)3764 2221 MS (o)3792 2221 MS (:)3842 2221 MS ( )3870 2221 MS (\()3895 2221 MS (i)3928 2221 MS (\))3956 2221 MS ( )3989 2221 MS (a)4014 2221 MS (n)4058 2221 MS (y)4110 2221 MS (s)490 2336 MS (o)529 2336 MS (f)579 2336 MS (t)612 2336 MS (w)640 2336 MS (a)712 2336 MS (r)756 2336 MS (e)789 2336 MS ( )833 2336 MS (a)859 2336 MS (p)903 2336 MS (a)953 2336 MS (r)997 2336 MS (t)1030 2336 MS ( )1058 2336 MS (f)1083 2336 MS (r)1117 2336 MS (o)1150 2336 MS (m)1200 2336 MS ( )1278 2336 MS (t)1303 2336 MS (h)1331 2336 MS (e)1381 2336 MS ( )1425 2336 MS (C)1450 2336 MS (o)1517 2336 MS (v)1567 2336 MS (e)1617 2336 MS (r)1661 2336 MS (e)1695 2336 MS (d)1739 2336 MS ( )1789 2336 MS (C)1814 2336 MS (o)1881 2336 MS (d)1931 2336 MS (e)1981 2336 MS (,)2025 2336 MS ( )2050 2336 MS (n)2075 2336 MS (o)2125 2336 MS (r)2175 2336 MS ( )2208 2336 MS (s)2233 2336 MS (h)2272 2336 MS (a)2322 2336 MS (l)2366 2336 MS (l)2394 2336 MS ( )2422 2336 MS (a)2447 2336 MS (n)2491 2336 MS (y)2543 2336 MS ( )2591 2336 MS (o)2616 2336 MS (t)2666 2336 MS (h)2694 2336 MS (e)2744 2336 MS (r)2789 2336 MS ( )2822 2336 MS (r)2847 2336 MS (i)2880 2336 MS (g)2909 2336 MS (h)2958 2336 MS (t)3008 2336 MS (s)3036 2336 MS ( )3075 2336 MS (o)3100 2336 MS (r)3150 2336 MS ( )3183 2336 MS (l)3208 2336 MS (i)3236 2336 MS (c)3264 2336 MS (e)3308 2336 MS (n)3352 2336 MS (s)3402 2336 MS (e)3442 2336 MS (s)3486 2336 MS ( )3525 2336 MS (n)3550 2336 MS (o)3600 2336 MS (t)3650 2336 MS ( )3678 2336 MS (e)3703 2336 MS (x)3747 2336 MS (p)3798 2336 MS (r)3848 2336 MS (e)3881 2336 MS (s)3925 2336 MS (s)3964 2336 MS (l)4003 2336 MS (y)4032 2336 MS (g)490 2451 MS (r)539 2451 MS (a)573 2451 MS (n)617 2451 MS (t)667 2451 MS (e)695 2451 MS (d)739 2451 MS ( )789 2451 MS (h)814 2451 MS (e)864 2451 MS (r)909 2451 MS (e)942 2451 MS (u)986 2451 MS (n)1036 2451 MS (d)1086 2451 MS (e)1136 2451 MS (r)1181 2451 MS ( )1214 2451 MS (a)1239 2451 MS (r)1283 2451 MS (i)1316 2451 MS (s)1344 2451 MS (e)1383 2451 MS ( )1427 2451 MS (b)1452 2451 MS (y)1502 2451 MS ( )1551 2451 MS (i)1577 2451 MS (m)1605 2451 MS (p)1683 2451 MS (l)1733 2451 MS (i)1761 2451 MS (c)1789 2451 MS (a)1833 2451 MS (t)1877 2451 MS (i)1905 2451 MS (o)1933 2451 MS (n)1983 2451 MS (,)2033 2451 MS ( )2058 2451 MS (e)2083 2451 MS (s)2127 2451 MS (t)2166 2451 MS (o)2194 2451 MS (p)2244 2451 MS (p)2294 2451 MS (e)2344 2451 MS (l)2388 2451 MS ( )2416 2451 MS (o)2441 2451 MS (r)2492 2451 MS ( )2525 2451 MS (o)2550 2451 MS (t)2600 2451 MS (h)2628 2451 MS (e)2678 2451 MS (r)2722 2451 MS (w)2755 2451 MS (i)2827 2451 MS (s)2855 2451 MS (e)2894 2451 MS ( )2938 2451 MS (w)2964 2451 MS (i)3036 2451 MS (t)3064 2451 MS (h)3092 2451 MS ( )3142 2451 MS (r)3167 2451 MS (e)3200 2451 MS (s)3244 2451 MS (p)3283 2451 MS (e)3333 2451 MS (c)3378 2451 MS (t)3422 2451 MS ( )3450 2451 MS (t)3475 2451 MS (o)3503 2451 MS ( )3553 2451 MS (t)3578 2451 MS (h)3606 2451 MS (e)3656 2451 MS ( )3700 2451 MS (C)3725 2451 MS (o)3792 2451 MS (v)3842 2451 MS (e)3892 2451 MS (r)3936 2451 MS (e)3969 2451 MS (d)4013 2451 MS ( )4063 2451 MS (C)4088 2451 MS (o)4155 2451 MS (d)4205 2451 MS (e)4255 2451 MS (;)4299 2451 MS (\()490 2566 MS (i)523 2566 MS (i)551 2566 MS (\))579 2566 MS ( )612 2566 MS (a)637 2566 MS (n)681 2566 MS (y)733 2566 MS ( )781 2566 MS (t)806 2566 MS (r)834 2566 MS (a)867 2566 MS (d)911 2566 MS (e)961 2566 MS ( )1005 2566 MS (n)1030 2566 MS (a)1081 2566 MS (m)1125 2566 MS (e)1203 2566 MS (,)1247 2566 MS ( )1272 2566 MS (t)1297 2566 MS (r)1325 2566 MS (a)1358 2566 MS (d)1403 2566 MS (e)1453 2566 MS (m)1497 2566 MS (a)1575 2566 MS (r)1619 2566 MS (k)1652 2566 MS ( )1702 2566 MS (o)1727 2566 MS (r)1778 2566 MS ( )1811 2566 MS (s)1836 2566 MS (e)1875 2566 MS (r)1919 2566 MS (v)1952 2566 MS (i)2002 2566 MS (c)2030 2566 MS (e)2075 2566 MS ( )2119 2566 MS (m)2144 2566 MS (a)2222 2566 MS (r)2266 2566 MS (k)2299 2566 MS ( )2349 2566 MS (w)2375 2566 MS (h)2447 2566 MS (a)2497 2566 MS (t)2541 2566 MS (s)2569 2566 MS (o)2608 2566 MS (e)2658 2566 MS (v)2702 2566 MS (e)2752 2566 MS (r)2797 2566 MS (,)2830 2566 MS ( )2855 2566 MS (i)2880 2566 MS (n)2908 2566 MS (c)2958 2566 MS (l)3002 2566 MS (u)3030 2566 MS (d)3080 2566 MS (i)3130 2566 MS (n)3158 2566 MS (g)3209 2566 MS ( )3258 2566 MS (w)3283 2566 MS (i)3355 2566 MS (t)3383 2566 MS (h)3411 2566 MS (o)3461 2566 MS (u)3511 2566 MS (t)3561 2566 MS ( )3589 2566 MS (l)3614 2566 MS (i)3642 2566 MS (m)3670 2566 MS (i)3748 2566 MS (t)3776 2566 MS (a)3804 2566 MS (t)3848 2566 MS (i)3876 2566 MS (o)3904 2566 MS (n)3954 2566 MS ( )4004 2566 MS (a)4029 2566 MS (n)4073 2566 MS (y)4124 2566 MS (r)490 2681 MS (e)523 2681 MS (l)567 2681 MS (a)595 2681 MS (t)639 2681 MS (e)667 2681 MS (d)711 2681 MS ( )761 2681 MS (r)786 2681 MS (i)819 2681 MS (g)848 2681 MS (h)897 2681 MS (t)947 2681 MS ( )975 2681 MS (f)1000 2681 MS (o)1033 2681 MS (r)1084 2681 MS ( )1117 2681 MS (p)1142 2681 MS (u)1192 2681 MS (r)1242 2681 MS (p)1275 2681 MS (o)1325 2681 MS (s)1375 2681 MS (e)1414 2681 MS (s)1458 2681 MS ( )1497 2681 MS (o)1522 2681 MS (f)1572 2681 MS ( )1605 2681 MS (e)1631 2681 MS (n)1675 2681 MS (d)1725 2681 MS (o)1775 2681 MS (r)1825 2681 MS (s)1858 2681 MS (e)1897 2681 MS (m)1941 2681 MS (e)2020 2681 MS (n)2064 2681 MS (t)2114 2681 MS ( )2142 2681 MS (o)2167 2681 MS (r)2217 2681 MS ( )2250 2681 MS (p)2275 2681 MS (r)2325 2681 MS (o)2358 2681 MS (m)2408 2681 MS (o)2486 2681 MS (t)2536 2681 MS (i)2564 2681 MS (o)2592 2681 MS (n)2642 2681 MS ( )2692 2681 MS (o)2717 2681 MS (f)2767 2681 MS ( )2800 2681 MS (p)2825 2681 MS (r)2875 2681 MS (o)2908 2681 MS (d)2958 2681 MS (u)3008 2681 MS (c)3058 2681 MS (t)3102 2681 MS (s)3130 2681 MS ( )3169 2681 MS (d)3194 2681 MS (e)3244 2681 MS (r)3289 2681 MS (i)3322 2681 MS (v)3350 2681 MS (e)3400 2681 MS (d)3444 2681 MS ( )3494 2681 MS (f)3519 2681 MS (r)3552 2681 MS (o)3586 2681 MS (m)3636 2681 MS ( )3714 2681 MS (t)3739 2681 MS (h)3767 2681 MS (e)3817 2681 MS ( )3861 2681 MS (C)3886 2681 MS (o)3953 2681 MS (v)4003 2681 MS (e)4053 2681 MS (r)4097 2681 MS (e)4130 2681 MS (d)4174 2681 MS (C)490 2796 MS (o)557 2796 MS (d)607 2796 MS (e)657 2796 MS (,)701 2796 MS ( )726 2796 MS (w)751 2796 MS (i)823 2796 MS (t)851 2796 MS (h)879 2796 MS (o)929 2796 MS (u)979 2796 MS (t)1029 2796 MS ( )1057 2796 MS (p)1082 2796 MS (r)1132 2796 MS (i)1165 2796 MS (o)1193 2796 MS (r)1243 2796 MS ( )1276 2796 MS (w)1301 2796 MS (r)1373 2796 MS (i)1406 2796 MS (t)1434 2796 MS (t)1462 2796 MS (e)1490 2796 MS (n)1534 2796 MS ( )1584 2796 MS (p)1609 2796 MS (e)1659 2796 MS (r)1703 2796 MS (m)1736 2796 MS (i)1814 2796 MS (s)1842 2796 MS (s)1881 2796 MS (i)1920 2796 MS (o)1948 2796 MS (n)1998 2796 MS ( )2048 2796 MS (o)2073 2796 MS (f)2123 2796 MS ( )2156 2796 MS (S)2181 2796 MS (G)2237 2796 MS (I)2310 2796 MS (;)2342 2796 MS ( )2370 2796 MS (o)2395 2796 MS (r)2445 2796 MS ( )2478 2796 MS (\()2503 2796 MS (i)2536 2796 MS (i)2564 2796 MS (i)2592 2796 MS (\))2620 2796 MS ( )2653 2796 MS (a)2678 2796 MS (n)2722 2796 MS (y)2774 2796 MS ( )2822 2796 MS (t)2847 2796 MS (i)2875 2796 MS (t)2903 2796 MS (l)2931 2796 MS (e)2959 2796 MS ( )3003 2796 MS (t)3028 2796 MS (o)3056 2796 MS ( )3106 2796 MS (o)3131 2796 MS (r)3181 2796 MS ( )3214 2796 MS (o)3239 2796 MS (w)3289 2796 MS (n)3361 2796 MS (e)3411 2796 MS (r)3456 2796 MS (s)3489 2796 MS (h)3528 2796 MS (i)3578 2796 MS (p)3606 2796 MS ( )3656 2796 MS (o)3681 2796 MS (f)3731 2796 MS ( )3764 2796 MS (t)3789 2796 MS (h)3817 2796 MS (e)3867 2796 MS ( )3911 2796 MS (O)3936 2796 MS (r)4008 2796 MS (i)4041 2796 MS (g)4070 2796 MS (i)4119 2796 MS (n)4147 2796 MS (a)4197 2796 MS (l)4241 2796 MS (C)490 2911 MS (o)557 2911 MS (d)607 2911 MS (e)657 2911 MS (,)701 2911 MS ( )726 2911 MS (w)751 2911 MS (h)823 2911 MS (i)873 2911 MS (c)901 2911 MS (h)945 2911 MS ( )995 2911 MS (s)1020 2911 MS (h)1059 2911 MS (a)1109 2911 MS (l)1153 2911 MS (l)1181 2911 MS ( )1209 2911 MS (a)1234 2911 MS (t)1278 2911 MS ( )1306 2911 MS (a)1331 2911 MS (l)1375 2911 MS (l)1403 2911 MS ( )1431 2911 MS (t)1456 2911 MS (i)1484 2911 MS (m)1512 2911 MS (e)1590 2911 MS (s)1634 2911 MS ( )1673 2911 MS (r)1698 2911 MS (e)1731 2911 MS (m)1775 2911 MS (a)1853 2911 MS (i)1897 2911 MS (n)1925 2911 MS (s)1975 2911 MS ( )2014 2911 MS (w)2039 2911 MS (i)2111 2911 MS (t)2139 2911 MS (h)2167 2911 MS ( )2217 2911 MS (S)2242 2911 MS (G)2298 2911 MS (I)2371 2911 MS (.)2403 2911 MS ( )2428 2911 MS (A)2453 2911 MS (l)2525 2911 MS (l)2553 2911 MS ( )2581 2911 MS (r)2606 2911 MS (i)2639 2911 MS (g)2668 2911 MS (h)2717 2911 MS (t)2767 2911 MS (s)2795 2911 MS ( )2834 2911 MS (i)2859 2911 MS (n)2887 2911 MS ( )2937 2911 MS (t)2962 2911 MS (h)2990 2911 MS (e)3040 2911 MS ( )3084 2911 MS (O)3109 2911 MS (r)3181 2911 MS (i)3214 2911 MS (g)3243 2911 MS (i)3292 2911 MS (n)3320 2911 MS (a)3370 2911 MS (l)3414 2911 MS ( )3442 2911 MS (C)3467 2911 MS (o)3534 2911 MS (d)3584 2911 MS (e)3634 2911 MS ( )3678 2911 MS (n)3703 2911 MS (o)3753 2911 MS (t)3803 2911 MS ( )3831 2911 MS (e)3856 2911 MS (x)3900 2911 MS (p)3951 2911 MS (r)4001 2911 MS (e)4034 2911 MS (s)4078 2911 MS (s)4117 2911 MS (l)4156 2911 MS (y)4185 2911 MS (g)490 3025 MS (r)539 3025 MS (a)573 3025 MS (n)617 3025 MS (t)667 3025 MS (e)695 3025 MS (d)739 3025 MS ( )789 3025 MS (u)814 3025 MS (n)864 3025 MS (d)914 3025 MS (e)964 3025 MS (r)1009 3025 MS ( )1042 3025 MS (t)1067 3025 MS (h)1095 3025 MS (i)1145 3025 MS (s)1173 3025 MS ( )1212 3025 MS (L)1238 3025 MS (i)1297 3025 MS (c)1325 3025 MS (e)1370 3025 MS (n)1414 3025 MS (s)1464 3025 MS (e)1503 3025 MS ( )1547 3025 MS (a)1572 3025 MS (r)1617 3025 MS (e)1650 3025 MS ( )1694 3025 MS (r)1719 3025 MS (e)1753 3025 MS (s)1797 3025 MS (e)1836 3025 MS (r)1880 3025 MS (v)1913 3025 MS (e)1964 3025 MS (d)2008 3025 MS (.)2058 3025 MS (6)490 3224 MS (.)540 3224 MS [100 0 0 -100 0 0]/Helvetica MF ( )565 3224 MS [100 0 0 -100 0 0]/Times-Bold MF (C)790 3224 MS (o)862 3224 MS (m)913 3224 MS (p)995 3224 MS (l)1051 3224 MS (i)1079 3224 MS (a)1107 3224 MS (n)1157 3224 MS (c)1213 3224 MS (e)1257 3224 MS ( )1301 3224 MS (w)1326 3224 MS (i)1399 3224 MS (t)1427 3224 MS (h)1460 3224 MS ( )1516 3224 MS (L)1541 3224 MS (a)1608 3224 MS (w)1657 3224 MS (s)1730 3224 MS (;)1769 3224 MS ( )1802 3224 MS (N)1827 3224 MS (o)1899 3224 MS (n)1949 3224 MS (-)2005 3224 MS (I)2038 3224 MS (n)2077 3224 MS (f)2132 3224 MS (r)2166 3224 MS (i)2210 3224 MS (n)2238 3224 MS (g)2294 3224 MS (e)2344 3224 MS (m)2388 3224 MS (e)2470 3224 MS (n)2514 3224 MS (t)2570 3224 MS (.)2603 3224 MS [100 0 0 -100 0 0]/Times-Roman MF ( )2628 3224 MS (T)2653 3224 MS (h)2714 3224 MS (e)2764 3224 MS (r)2808 3224 MS (e)2842 3224 MS ( )2886 3224 MS (a)2912 3224 MS (r)2956 3224 MS (e)2989 3224 MS ( )3033 3224 MS (v)3058 3224 MS (a)3109 3224 MS (r)3153 3224 MS (i)3186 3224 MS (o)3214 3224 MS (u)3264 3224 MS (s)3314 3224 MS ( )3353 3224 MS (w)3378 3224 MS (o)3450 3224 MS (r)3500 3224 MS (l)3533 3224 MS (d)3561 3224 MS (w)3611 3224 MS (i)3683 3224 MS (d)3711 3224 MS (e)3761 3224 MS ( )3805 3224 MS (l)3830 3224 MS (a)3858 3224 MS (w)3903 3224 MS (s)3975 3224 MS (,)4014 3224 MS (r)490 3339 MS (e)523 3339 MS (g)568 3339 MS (u)617 3339 MS (l)667 3339 MS (a)695 3339 MS (t)739 3339 MS (i)767 3339 MS (o)795 3339 MS (n)845 3339 MS (s)895 3339 MS (,)934 3339 MS ( )959 3339 MS (a)984 3339 MS (n)1028 3339 MS (d)1078 3339 MS ( )1128 3339 MS (e)1153 3339 MS (x)1197 3339 MS (e)1248 3339 MS (c)1292 3339 MS (u)1336 3339 MS (t)1386 3339 MS (i)1414 3339 MS (v)1442 3339 MS (e)1492 3339 MS ( )1536 3339 MS (o)1561 3339 MS (r)1611 3339 MS (d)1644 3339 MS (e)1695 3339 MS (r)1739 3339 MS (s)1772 3339 MS ( )1811 3339 MS (a)1836 3339 MS (p)1880 3339 MS (p)1930 3339 MS (l)1980 3339 MS (i)2008 3339 MS (c)2036 3339 MS (a)2081 3339 MS (b)2125 3339 MS (l)2175 3339 MS (e)2203 3339 MS ( )2247 3339 MS (t)2272 3339 MS (o)2300 3339 MS ( )2350 3339 MS (d)2375 3339 MS (i)2425 3339 MS (s)2453 3339 MS (p)2492 3339 MS (o)2542 3339 MS (s)2592 3339 MS (i)2631 3339 MS (t)2659 3339 MS (i)2687 3339 MS (o)2715 3339 MS (n)2765 3339 MS (s)2815 3339 MS ( )2854 3339 MS (o)2879 3339 MS (f)2929 3339 MS ( )2962 3339 MS (C)2987 3339 MS (o)3054 3339 MS (v)3104 3339 MS (e)3154 3339 MS (r)3198 3339 MS (e)3231 3339 MS (d)3275 3339 MS ( )3325 3339 MS (C)3350 3339 MS (o)3417 3339 MS (d)3467 3339 MS (e)3517 3339 MS (,)3561 3339 MS ( )3586 3339 MS (i)3611 3339 MS (n)3639 3339 MS (c)3689 3339 MS (l)3733 3339 MS (u)3761 3339 MS (d)3811 3339 MS (i)3861 3339 MS (n)3889 3339 MS (g)3939 3339 MS ( )3988 3339 MS (w)4014 3339 MS (i)4086 3339 MS (t)4114 3339 MS (h)4142 3339 MS (o)4192 3339 MS (u)4242 3339 MS (t)4292 3339 MS (l)490 3454 MS (i)518 3454 MS (m)546 3454 MS (i)624 3454 MS (t)652 3454 MS (a)680 3454 MS (t)724 3454 MS (i)752 3454 MS (o)780 3454 MS (n)830 3454 MS ( )880 3454 MS (e)905 3454 MS (x)948 3454 MS (p)999 3454 MS (o)1049 3454 MS (r)1099 3454 MS (t)1132 3454 MS (,)1160 3454 MS ( )1185 3454 MS (r)1210 3454 MS (e)1243 3454 MS (-)1287 3454 MS (e)1320 3454 MS (x)1364 3454 MS (p)1415 3454 MS (o)1465 3454 MS (r)1515 3454 MS (t)1548 3454 MS (,)1576 3454 MS ( )1601 3454 MS (a)1626 3454 MS (n)1670 3454 MS (d)1720 3454 MS ( )1770 3454 MS (i)1795 3454 MS (m)1823 3454 MS (p)1901 3454 MS (o)1951 3454 MS (r)2001 3454 MS (t)2034 3454 MS ( )2062 3454 MS (c)2087 3454 MS (o)2131 3454 MS (n)2181 3454 MS (t)2231 3454 MS (r)2259 3454 MS (o)2292 3454 MS (l)2342 3454 MS ( )2370 3454 MS (l)2395 3454 MS (a)2423 3454 MS (w)2467 3454 MS (s)2539 3454 MS (,)2578 3454 MS ( )2603 3454 MS (r)2628 3454 MS (e)2661 3454 MS (g)2706 3454 MS (u)2755 3454 MS (l)2805 3454 MS (a)2833 3454 MS (t)2877 3454 MS (i)2905 3454 MS (o)2933 3454 MS (n)2983 3454 MS (s)3033 3454 MS (,)3072 3454 MS ( )3097 3454 MS (a)3122 3454 MS (n)3166 3454 MS (d)3216 3454 MS ( )3266 3454 MS (e)3292 3454 MS (x)3336 3454 MS (e)3387 3454 MS (c)3431 3454 MS (u)3475 3454 MS (t)3525 3454 MS (i)3553 3454 MS (v)3581 3454 MS (e)3631 3454 MS ( )3675 3454 MS (o)3700 3454 MS (r)3750 3454 MS (d)3783 3454 MS (e)3833 3454 MS (r)3877 3454 MS (s)3910 3454 MS (,)3949 3454 MS ( )3974 3454 MS (o)3999 3454 MS (f)4050 3454 MS ( )4083 3454 MS (t)4108 3454 MS (h)4136 3454 MS (e)4186 3454 MS (U)490 3569 MS (.)562 3569 MS (S)587 3569 MS (.)643 3569 MS ( )668 3569 MS (g)693 3569 MS (o)742 3569 MS (v)792 3569 MS (e)842 3569 MS (r)887 3569 MS (n)920 3569 MS (m)970 3569 MS (e)1048 3569 MS (n)1092 3569 MS (t)1142 3569 MS ( )1170 3569 MS (a)1195 3569 MS (n)1239 3569 MS (d)1289 3569 MS ( )1339 3569 MS (o)1364 3569 MS (t)1414 3569 MS (h)1442 3569 MS (e)1492 3569 MS (r)1536 3569 MS ( )1569 3569 MS (c)1595 3569 MS (o)1639 3569 MS (u)1689 3569 MS (n)1739 3569 MS (t)1789 3569 MS (r)1817 3569 MS (i)1850 3569 MS (e)1878 3569 MS (s)1922 3569 MS (,)1961 3569 MS ( )1986 3569 MS (a)2011 3569 MS (n)2055 3569 MS (d)2105 3569 MS ( )2155 3569 MS (R)2180 3569 MS (e)2247 3569 MS (c)2292 3569 MS (i)2336 3569 MS (p)2364 3569 MS (i)2414 3569 MS (e)2442 3569 MS (n)2486 3569 MS (t)2536 3569 MS ( )2564 3569 MS (i)2589 3569 MS (s)2617 3569 MS ( )2656 3569 MS (r)2681 3569 MS (e)2714 3569 MS (m)2758 3569 MS (i)2836 3569 MS (n)2864 3569 MS (d)2914 3569 MS (e)2964 3569 MS (d)3008 3569 MS ( )3058 3569 MS (i)3083 3569 MS (t)3111 3569 MS ( )3139 3569 MS (i)3164 3569 MS (s)3192 3569 MS ( )3231 3569 MS (o)3256 3569 MS (b)3306 3569 MS (l)3356 3569 MS (i)3384 3569 MS (g)3412 3569 MS (e)3461 3569 MS (d)3505 3569 MS ( )3555 3569 MS (t)3580 3569 MS (o)3608 3569 MS ( )3658 3569 MS (o)3683 3569 MS (b)3733 3569 MS (e)3783 3569 MS (y)3829 3569 MS ( )3877 3569 MS (s)3902 3569 MS (u)3941 3569 MS (c)3992 3569 MS (h)4036 3569 MS ( )4086 3569 MS (l)4111 3569 MS (a)4139 3569 MS (w)4183 3569 MS (s)4255 3569 MS (,)4294 3569 MS (r)490 3684 MS (e)523 3684 MS (g)568 3684 MS (u)617 3684 MS (l)667 3684 MS (a)695 3684 MS (t)739 3684 MS (i)767 3684 MS (o)795 3684 MS (n)845 3684 MS (s)895 3684 MS (,)934 3684 MS ( )959 3684 MS (a)984 3684 MS (n)1028 3684 MS (d)1078 3684 MS ( )1128 3684 MS (e)1153 3684 MS (x)1197 3684 MS (e)1248 3684 MS (c)1292 3684 MS (u)1336 3684 MS (t)1386 3684 MS (i)1414 3684 MS (v)1442 3684 MS (e)1492 3684 MS ( )1536 3684 MS (o)1561 3684 MS (r)1611 3684 MS (d)1644 3684 MS (e)1695 3684 MS (r)1739 3684 MS (s)1772 3684 MS (.)1811 3684 MS ( )1836 3684 MS (R)1861 3684 MS (e)1928 3684 MS (c)1972 3684 MS (i)2016 3684 MS (p)2044 3684 MS (i)2094 3684 MS (e)2122 3684 MS (n)2166 3684 MS (t)2216 3684 MS ( )2244 3684 MS (m)2269 3684 MS (a)2347 3684 MS (y)2393 3684 MS ( )2441 3684 MS (n)2466 3684 MS (o)2516 3684 MS (t)2566 3684 MS ( )2594 3684 MS (d)2619 3684 MS (i)2669 3684 MS (s)2697 3684 MS (t)2736 3684 MS (r)2764 3684 MS (i)2797 3684 MS (b)2825 3684 MS (u)2875 3684 MS (t)2925 3684 MS (e)2953 3684 MS ( )2997 3684 MS (C)3022 3684 MS (o)3089 3684 MS (v)3139 3684 MS (e)3189 3684 MS (r)3233 3684 MS (e)3267 3684 MS (d)3311 3684 MS ( )3361 3684 MS (C)3386 3684 MS (o)3453 3684 MS (d)3503 3684 MS (e)3553 3684 MS ( )3597 3684 MS (t)3622 3684 MS (h)3650 3684 MS (a)3700 3684 MS (t)3744 3684 MS ( )3772 3684 MS (\()3797 3684 MS (i)3830 3684 MS (\))3858 3684 MS ( )3891 3684 MS (i)3916 3684 MS (n)3944 3684 MS ( )3994 3684 MS (a)4019 3684 MS (n)4063 3684 MS (y)4115 3684 MS ( )4163 3684 MS (w)4188 3684 MS (a)4261 3684 MS (y)4307 3684 MS (i)490 3799 MS (n)518 3799 MS (f)568 3799 MS (r)601 3799 MS (i)634 3799 MS (n)662 3799 MS (g)712 3799 MS (e)762 3799 MS (s)806 3799 MS ( )845 3799 MS (\()870 3799 MS (d)903 3799 MS (i)953 3799 MS (r)981 3799 MS (e)1014 3799 MS (c)1059 3799 MS (t)1103 3799 MS (l)1131 3799 MS (y)1160 3799 MS ( )1208 3799 MS (o)1233 3799 MS (r)1284 3799 MS ( )1317 3799 MS (c)1342 3799 MS (o)1386 3799 MS (n)1436 3799 MS (t)1486 3799 MS (r)1514 3799 MS (i)1547 3799 MS (b)1575 3799 MS (u)1625 3799 MS (t)1675 3799 MS (o)1703 3799 MS (r)1753 3799 MS (i)1786 3799 MS (l)1814 3799 MS (y)1844 3799 MS (\))1892 3799 MS ( )1925 3799 MS (a)1950 3799 MS (n)1994 3799 MS (y)2046 3799 MS ( )2094 3799 MS (i)2119 3799 MS (n)2147 3799 MS (t)2197 3799 MS (e)2225 3799 MS (l)2269 3799 MS (l)2297 3799 MS (e)2325 3799 MS (c)2370 3799 MS (t)2414 3799 MS (u)2442 3799 MS (a)2492 3799 MS (l)2536 3799 MS ( )2564 3799 MS (p)2589 3799 MS (r)2639 3799 MS (o)2672 3799 MS (p)2722 3799 MS (e)2772 3799 MS (r)2816 3799 MS (t)2849 3799 MS (y)2879 3799 MS ( )2927 3799 MS (r)2953 3799 MS (i)2986 3799 MS (g)3014 3799 MS (h)3063 3799 MS (t)3113 3799 MS (s)3141 3799 MS ( )3180 3799 MS (o)3205 3799 MS (f)3255 3799 MS ( )3288 3799 MS (a)3314 3799 MS (n)3358 3799 MS (y)3410 3799 MS ( )3458 3799 MS (k)3483 3799 MS (i)3533 3799 MS (n)3561 3799 MS (d)3611 3799 MS ( )3661 3799 MS (o)3686 3799 MS (f)3736 3799 MS ( )3769 3799 MS (a)3794 3799 MS (n)3838 3799 MS (y)3890 3799 MS ( )3938 3799 MS (o)3963 3799 MS (t)4013 3799 MS (h)4041 3799 MS (e)4091 3799 MS (r)4136 3799 MS (p)490 3914 MS (e)540 3914 MS (r)584 3914 MS (s)617 3914 MS (o)656 3914 MS (n)706 3914 MS ( )756 3914 MS (o)781 3914 MS (r)831 3914 MS ( )864 3914 MS (e)889 3914 MS (n)933 3914 MS (t)983 3914 MS (i)1011 3914 MS (t)1039 3914 MS (y)1069 3914 MS ( )1117 3914 MS (o)1142 3914 MS (r)1192 3914 MS ( )1225 3914 MS (\()1250 3914 MS (i)1283 3914 MS (i)1311 3914 MS (\))1339 3914 MS ( )1372 3914 MS (b)1397 3914 MS (r)1447 3914 MS (e)1480 3914 MS (a)1525 3914 MS (c)1570 3914 MS (h)1614 3914 MS (e)1664 3914 MS (s)1708 3914 MS ( )1747 3914 MS (a)1772 3914 MS (n)1816 3914 MS (y)1868 3914 MS ( )1916 3914 MS (r)1942 3914 MS (e)1975 3914 MS (p)2019 3914 MS (r)2069 3914 MS (e)2103 3914 MS (s)2147 3914 MS (e)2186 3914 MS (n)2230 3914 MS (t)2280 3914 MS (a)2308 3914 MS (t)2352 3914 MS (i)2380 3914 MS (o)2408 3914 MS (n)2458 3914 MS ( )2508 3914 MS (o)2533 3914 MS (r)2583 3914 MS ( )2616 3914 MS (w)2641 3914 MS (a)2714 3914 MS (r)2758 3914 MS (r)2791 3914 MS (a)2825 3914 MS (n)2869 3914 MS (t)2919 3914 MS (y)2949 3914 MS (,)2997 3914 MS ( )3022 3914 MS (e)3047 3914 MS (x)3091 3914 MS (p)3142 3914 MS (r)3192 3914 MS (e)3225 3914 MS (s)3269 3914 MS (s)3308 3914 MS (,)3347 3914 MS ( )3372 3914 MS (i)3397 3914 MS (m)3425 3914 MS (p)3503 3914 MS (l)3553 3914 MS (i)3581 3914 MS (e)3609 3914 MS (d)3653 3914 MS ( )3703 3914 MS (o)3728 3914 MS (r)3778 3914 MS ( )3811 3914 MS (s)3836 3914 MS (t)3875 3914 MS (a)3903 3914 MS (t)3947 3914 MS (u)3975 3914 MS (t)4025 3914 MS (o)4053 3914 MS (r)4103 3914 MS (y)4137 3914 MS (,)4185 3914 MS ( )4210 3914 MS (t)4235 3914 MS (o)4263 3914 MS (w)490 4029 MS (h)562 4029 MS (i)612 4029 MS (c)640 4029 MS (h)684 4029 MS (,)734 4029 MS ( )759 4029 MS (u)784 4029 MS (n)834 4029 MS (d)884 4029 MS (e)934 4029 MS (r)978 4029 MS ( )1011 4029 MS (a)1037 4029 MS (n)1081 4029 MS (y)1133 4029 MS ( )1181 4029 MS (a)1206 4029 MS (p)1250 4029 MS (p)1300 4029 MS (l)1350 4029 MS (i)1378 4029 MS (c)1406 4029 MS (a)1450 4029 MS (b)1494 4029 MS (l)1544 4029 MS (e)1572 4029 MS ( )1616 4029 MS (l)1641 4029 MS (a)1670 4029 MS (w)1714 4029 MS (,)1786 4029 MS ( )1811 4029 MS (i)1836 4029 MS (t)1864 4029 MS ( )1892 4029 MS (m)1917 4029 MS (i)1995 4029 MS (g)2023 4029 MS (h)2072 4029 MS (t)2122 4029 MS ( )2150 4029 MS (b)2175 4029 MS (e)2225 4029 MS ( )2269 4029 MS (d)2294 4029 MS (e)2345 4029 MS (e)2389 4029 MS (m)2433 4029 MS (e)2511 4029 MS (d)2555 4029 MS ( )2605 4029 MS (t)2630 4029 MS (o)2658 4029 MS ( )2708 4029 MS (h)2733 4029 MS (a)2783 4029 MS (v)2827 4029 MS (e)2878 4029 MS ( )2922 4029 MS (b)2947 4029 MS (e)2997 4029 MS (e)3041 4029 MS (n)3085 4029 MS ( )3135 4029 MS (s)3160 4029 MS (u)3199 4029 MS (b)3249 4029 MS (j)3299 4029 MS (e)3328 4029 MS (c)3372 4029 MS (t)3416 4029 MS (.)3444 4029 MS (7)490 4227 MS (.)540 4227 MS [100 0 0 -100 0 0]/Helvetica MF ( )565 4227 MS [100 0 0 -100 0 0]/Times-Bold MF (C)790 4227 MS (l)862 4227 MS (a)890 4227 MS (i)940 4227 MS (m)968 4227 MS (s)1050 4227 MS ( )1089 4227 MS (o)1114 4227 MS (f)1164 4227 MS ( )1198 4227 MS (I)1223 4227 MS (n)1262 4227 MS (f)1318 4227 MS (r)1352 4227 MS (i)1396 4227 MS (n)1424 4227 MS (g)1480 4227 MS (e)1530 4227 MS (m)1574 4227 MS (e)1656 4227 MS (n)1700 4227 MS (t)1756 4227 MS (.)1789 4227 MS ( )1814 4227 MS [100 0 0 -100 0 0]/Times-Roman MF (I)1839 4227 MS (f)1872 4227 MS ( )1906 4227 MS (R)1931 4227 MS (e)1998 4227 MS (c)2042 4227 MS (i)2086 4227 MS (p)2114 4227 MS (i)2164 4227 MS (e)2192 4227 MS (n)2236 4227 MS (t)2286 4227 MS ( )2314 4227 MS (l)2339 4227 MS (e)2367 4227 MS (a)2411 4227 MS (r)2456 4227 MS (n)2489 4227 MS (s)2539 4227 MS ( )2578 4227 MS (o)2603 4227 MS (f)2653 4227 MS ( )2686 4227 MS (a)2711 4227 MS (n)2755 4227 MS (y)2805 4227 MS ( )2854 4227 MS (t)2880 4227 MS (h)2908 4227 MS (i)2958 4227 MS (r)2986 4227 MS (d)3019 4227 MS ( )3069 4227 MS (p)3094 4227 MS (a)3145 4227 MS (r)3189 4227 MS (t)3222 4227 MS (y)3252 4227 MS ( )3300 4227 MS (c)3325 4227 MS (l)3369 4227 MS (a)3397 4227 MS (i)3441 4227 MS (m)3469 4227 MS ( )3547 4227 MS (t)3572 4227 MS (h)3600 4227 MS (a)3650 4227 MS (t)3694 4227 MS ( )3722 4227 MS (a)3747 4227 MS (n)3791 4227 MS (y)3841 4227 MS ( )3890 4227 MS (d)3916 4227 MS (i)3966 4227 MS (s)3994 4227 MS (p)4033 4227 MS (o)4083 4227 MS (s)4133 4227 MS (i)4172 4227 MS (t)4200 4227 MS (i)4228 4227 MS (o)4256 4227 MS (n)4306 4227 MS (o)490 4342 MS (f)540 4342 MS ( )573 4342 MS (C)598 4342 MS (o)665 4342 MS (v)715 4342 MS (e)765 4342 MS (r)809 4342 MS (e)842 4342 MS (d)886 4342 MS ( )936 4342 MS (C)961 4342 MS (o)1028 4342 MS (d)1078 4342 MS (e)1128 4342 MS ( )1172 4342 MS (a)1198 4342 MS (n)1242 4342 MS (d)1292 4342 MS (/)1342 4342 MS (o)1370 4342 MS (r)1420 4342 MS ( )1453 4342 MS (f)1478 4342 MS (u)1511 4342 MS (n)1561 4342 MS (c)1611 4342 MS (t)1655 4342 MS (i)1683 4342 MS (o)1711 4342 MS (n)1761 4342 MS (a)1811 4342 MS (l)1855 4342 MS (i)1883 4342 MS (t)1911 4342 MS (y)1941 4342 MS ( )1989 4342 MS (w)2014 4342 MS (h)2086 4342 MS (o)2136 4342 MS (l)2186 4342 MS (l)2214 4342 MS (y)2244 4342 MS ( )2292 4342 MS (o)2317 4342 MS (r)2367 4342 MS ( )2400 4342 MS (p)2425 4342 MS (a)2475 4342 MS (r)2519 4342 MS (t)2552 4342 MS (i)2580 4342 MS (a)2608 4342 MS (l)2652 4342 MS (l)2680 4342 MS (y)2710 4342 MS ( )2758 4342 MS (i)2783 4342 MS (n)2811 4342 MS (f)2861 4342 MS (r)2894 4342 MS (i)2927 4342 MS (n)2955 4342 MS (g)3006 4342 MS (e)3056 4342 MS (s)3100 4342 MS ( )3139 4342 MS (t)3164 4342 MS (h)3192 4342 MS (e)3242 4342 MS ( )3286 4342 MS (t)3311 4342 MS (h)3339 4342 MS (i)3389 4342 MS (r)3417 4342 MS (d)3450 4342 MS ( )3500 4342 MS (p)3525 4342 MS (a)3575 4342 MS (r)3619 4342 MS (t)3652 4342 MS (y)3682 4342 MS (')3730 4342 MS (s)3748 4342 MS ( )3787 4342 MS (i)3812 4342 MS (n)3840 4342 MS (t)3890 4342 MS (e)3918 4342 MS (l)3962 4342 MS (l)3990 4342 MS (e)4018 4342 MS (c)4062 4342 MS (t)4106 4342 MS (u)4134 4342 MS (a)4185 4342 MS (l)4229 4342 MS (p)490 4457 MS (r)540 4457 MS (o)573 4457 MS (p)623 4457 MS (e)673 4457 MS (r)717 4457 MS (t)750 4457 MS (y)780 4457 MS ( )828 4457 MS (r)853 4457 MS (i)886 4457 MS (g)915 4457 MS (h)964 4457 MS (t)1014 4457 MS (s)1042 4457 MS (,)1081 4457 MS ( )1106 4457 MS (R)1131 4457 MS (e)1198 4457 MS (c)1242 4457 MS (i)1286 4457 MS (p)1314 4457 MS (i)1364 4457 MS (e)1392 4457 MS (n)1436 4457 MS (t)1486 4457 MS ( )1514 4457 MS (w)1539 4457 MS (i)1611 4457 MS (l)1639 4457 MS (l)1667 4457 MS ( )1695 4457 MS (p)1720 4457 MS (r)1770 4457 MS (o)1803 4457 MS (m)1853 4457 MS (p)1931 4457 MS (t)1981 4457 MS (l)2009 4457 MS (y)2038 4457 MS ( )2086 4457 MS (n)2111 4457 MS (o)2161 4457 MS (t)2211 4457 MS (i)2239 4457 MS (f)2267 4457 MS (y)2302 4457 MS ( )2350 4457 MS (S)2375 4457 MS (G)2431 4457 MS (I)2504 4457 MS ( )2536 4457 MS (o)2561 4457 MS (f)2611 4457 MS ( )2644 4457 MS (s)2669 4457 MS (u)2708 4457 MS (c)2759 4457 MS (h)2803 4457 MS ( )2853 4457 MS (c)2878 4457 MS (l)2922 4457 MS (a)2950 4457 MS (i)2994 4457 MS (m)3022 4457 MS (.)3100 4457 MS (8)490 4656 MS (.)540 4656 MS [100 0 0 -100 0 0]/Helvetica MF ( )565 4656 MS [100 0 0 -100 0 0]/Times-Bold MF (V)753 4656 MS (e)825 4656 MS (r)869 4656 MS (s)913 4656 MS (i)952 4656 MS (o)980 4656 MS (n)1030 4656 MS (s)1086 4656 MS ( )1125 4656 MS (o)1150 4656 MS (f)1200 4656 MS ( )1234 4656 MS (t)1259 4656 MS (h)1292 4656 MS (e)1348 4656 MS ( )1392 4656 MS (L)1417 4656 MS (i)1484 4656 MS (c)1512 4656 MS (e)1556 4656 MS (n)1600 4656 MS (s)1656 4656 MS (e)1695 4656 MS (.)1739 4656 MS [100 0 0 -100 0 0]/Times-Roman MF ( )1764 4656 MS (S)1789 4656 MS (G)1845 4656 MS (I)1917 4656 MS ( )1948 4656 MS (m)1973 4656 MS (a)2051 4656 MS (y)2097 4656 MS ( )2145 4656 MS (p)2170 4656 MS (u)2220 4656 MS (b)2270 4656 MS (l)2320 4656 MS (i)2348 4656 MS (s)2376 4656 MS (h)2415 4656 MS ( )2465 4656 MS (r)2490 4656 MS (e)2524 4656 MS (v)2568 4656 MS (i)2618 4656 MS (s)2646 4656 MS (e)2685 4656 MS (d)2729 4656 MS ( )2779 4656 MS (a)2804 4656 MS (n)2848 4656 MS (d)2898 4656 MS (/)2948 4656 MS (o)2976 4656 MS (r)3026 4656 MS ( )3059 4656 MS (n)3084 4656 MS (e)3135 4656 MS (w)3179 4656 MS ( )3251 4656 MS (v)3276 4656 MS (e)3326 4656 MS (r)3371 4656 MS (s)3404 4656 MS (i)3443 4656 MS (o)3471 4656 MS (n)3521 4656 MS (s)3571 4656 MS ( )3610 4656 MS (o)3635 4656 MS (f)3685 4656 MS ( )3718 4656 MS (t)3743 4656 MS (h)3771 4656 MS (e)3821 4656 MS ( )3865 4656 MS (L)3891 4656 MS (i)3950 4656 MS (c)3979 4656 MS (e)4023 4656 MS (n)4067 4656 MS (s)4117 4656 MS (e)4157 4656 MS (f)490 4771 MS (r)523 4771 MS (o)556 4771 MS (m)606 4771 MS ( )684 4771 MS (t)709 4771 MS (i)737 4771 MS (m)765 4771 MS (e)843 4771 MS ( )887 4771 MS (t)912 4771 MS (o)940 4771 MS ( )990 4771 MS (t)1015 4771 MS (i)1043 4771 MS (m)1071 4771 MS (e)1149 4771 MS (,)1193 4771 MS ( )1218 4771 MS (e)1243 4771 MS (a)1287 4771 MS (c)1331 4771 MS (h)1375 4771 MS ( )1425 4771 MS (w)1450 4771 MS (i)1522 4771 MS (t)1550 4771 MS (h)1578 4771 MS ( )1628 4771 MS (a)1653 4771 MS ( )1697 4771 MS (d)1722 4771 MS (i)1772 4771 MS (s)1800 4771 MS (t)1839 4771 MS (i)1867 4771 MS (n)1895 4771 MS (g)1945 4771 MS (u)1994 4771 MS (i)2044 4771 MS (s)2072 4771 MS (h)2111 4771 MS (i)2161 4771 MS (n)2189 4771 MS (g)2240 4771 MS ( )2289 4771 MS (v)2314 4771 MS (e)2364 4771 MS (r)2409 4771 MS (s)2442 4771 MS (i)2481 4771 MS (o)2509 4771 MS (n)2559 4771 MS ( )2609 4771 MS (n)2634 4771 MS (u)2684 4771 MS (m)2734 4771 MS (b)2812 4771 MS (e)2862 4771 MS (r)2906 4771 MS (.)2939 4771 MS ( )2964 4771 MS (O)2989 4771 MS (n)3061 4771 MS (c)3111 4771 MS (e)3156 4771 MS ( )3200 4771 MS (C)3225 4771 MS (o)3292 4771 MS (v)3342 4771 MS (e)3392 4771 MS (r)3436 4771 MS (e)3470 4771 MS (d)3514 4771 MS ( )3564 4771 MS (C)3589 4771 MS (o)3656 4771 MS (d)3706 4771 MS (e)3756 4771 MS ( )3800 4771 MS (h)3825 4771 MS (a)3875 4771 MS (s)3919 4771 MS ( )3958 4771 MS (b)3983 4771 MS (e)4033 4771 MS (e)4078 4771 MS (n)4122 4771 MS (p)490 4886 MS (u)540 4886 MS (b)590 4886 MS (l)640 4886 MS (i)668 4886 MS (s)696 4886 MS (h)735 4886 MS (e)785 4886 MS (d)829 4886 MS ( )879 4886 MS (u)904 4886 MS (n)954 4886 MS (d)1004 4886 MS (e)1054 4886 MS (r)1098 4886 MS ( )1131 4886 MS (a)1156 4886 MS ( )1200 4886 MS (p)1225 4886 MS (a)1275 4886 MS (r)1320 4886 MS (t)1353 4886 MS (i)1381 4886 MS (c)1409 4886 MS (u)1453 4886 MS (l)1503 4886 MS (a)1531 4886 MS (r)1575 4886 MS ( )1608 4886 MS (v)1633 4886 MS (e)1684 4886 MS (r)1728 4886 MS (s)1761 4886 MS (i)1800 4886 MS (o)1828 4886 MS (n)1878 4886 MS ( )1928 4886 MS (o)1953 4886 MS (f)2003 4886 MS ( )2036 4886 MS (t)2061 4886 MS (h)2089 4886 MS (e)2139 4886 MS ( )2183 4886 MS (L)2209 4886 MS (i)2269 4886 MS (c)2297 4886 MS (e)2342 4886 MS (n)2386 4886 MS (s)2436 4886 MS (e)2475 4886 MS (,)2519 4886 MS ( )2544 4886 MS (R)2569 4886 MS (e)2636 4886 MS (c)2680 4886 MS (i)2724 4886 MS (p)2752 4886 MS (i)2802 4886 MS (e)2830 4886 MS (n)2874 4886 MS (t)2924 4886 MS ( )2952 4886 MS (m)2977 4886 MS (a)3055 4886 MS (y)3101 4886 MS (,)3149 4886 MS ( )3174 4886 MS (f)3200 4886 MS (o)3233 4886 MS (r)3283 4886 MS ( )3316 4886 MS (t)3341 4886 MS (h)3369 4886 MS (e)3419 4886 MS ( )3463 4886 MS (d)3488 4886 MS (u)3538 4886 MS (r)3589 4886 MS (a)3622 4886 MS (t)3666 4886 MS (i)3694 4886 MS (o)3722 4886 MS (n)3772 4886 MS ( )3822 4886 MS (o)3847 4886 MS (f)3897 4886 MS ( )3930 4886 MS (t)3955 4886 MS (h)3983 4886 MS (e)4033 4886 MS (l)490 5001 MS (i)518 5001 MS (c)546 5001 MS (e)590 5001 MS (n)634 5001 MS (s)684 5001 MS (e)723 5001 MS (,)767 5001 MS ( )792 5001 MS (c)817 5001 MS (o)861 5001 MS (n)911 5001 MS (t)961 5001 MS (i)989 5001 MS (n)1017 5001 MS (u)1067 5001 MS (e)1117 5001 MS ( )1161 5001 MS (t)1186 5001 MS (o)1214 5001 MS ( )1264 5001 MS (u)1289 5001 MS (s)1339 5001 MS (e)1378 5001 MS ( )1422 5001 MS (i)1447 5001 MS (t)1475 5001 MS ( )1503 5001 MS (u)1528 5001 MS (n)1578 5001 MS (d)1628 5001 MS (e)1678 5001 MS (r)1722 5001 MS ( )1755 5001 MS (t)1780 5001 MS (h)1808 5001 MS (e)1859 5001 MS ( )1903 5001 MS (t)1928 5001 MS (e)1956 5001 MS (r)2000 5001 MS (m)2033 5001 MS (s)2111 5001 MS ( )2150 5001 MS (o)2175 5001 MS (f)2225 5001 MS ( )2258 5001 MS (t)2283 5001 MS (h)2311 5001 MS (a)2361 5001 MS (t)2405 5001 MS ( )2433 5001 MS (v)2458 5001 MS (e)2508 5001 MS (r)2553 5001 MS (s)2586 5001 MS (i)2625 5001 MS (o)2653 5001 MS (n)2703 5001 MS (,)2753 5001 MS ( )2778 5001 MS (o)2803 5001 MS (r)2853 5001 MS ( )2886 5001 MS (c)2911 5001 MS (h)2955 5001 MS (o)3005 5001 MS (o)3055 5001 MS (s)3105 5001 MS (e)3144 5001 MS ( )3188 5001 MS (t)3213 5001 MS (o)3241 5001 MS ( )3291 5001 MS (u)3316 5001 MS (s)3366 5001 MS (e)3406 5001 MS ( )3450 5001 MS (s)3475 5001 MS (u)3514 5001 MS (c)3564 5001 MS (h)3608 5001 MS ( )3658 5001 MS (C)3683 5001 MS (o)3750 5001 MS (v)3800 5001 MS (e)3850 5001 MS (r)3894 5001 MS (e)3928 5001 MS (d)3972 5001 MS ( )4022 5001 MS (C)4047 5001 MS (o)4114 5001 MS (d)4164 5001 MS (e)4214 5001 MS (u)490 5116 MS (n)540 5116 MS (d)590 5116 MS (e)640 5116 MS (r)684 5116 MS ( )717 5116 MS (t)742 5116 MS (h)770 5116 MS (e)820 5116 MS ( )864 5116 MS (t)889 5116 MS (e)917 5116 MS (r)961 5116 MS (m)994 5116 MS (s)1072 5116 MS ( )1111 5116 MS (o)1136 5116 MS (f)1186 5116 MS ( )1219 5116 MS (a)1245 5116 MS (n)1289 5116 MS (y)1341 5116 MS ( )1389 5116 MS (s)1414 5116 MS (u)1453 5116 MS (b)1503 5116 MS (s)1553 5116 MS (e)1592 5116 MS (q)1636 5116 MS (u)1686 5116 MS (e)1736 5116 MS (n)1780 5116 MS (t)1830 5116 MS ( )1858 5116 MS (v)1883 5116 MS (e)1934 5116 MS (r)1978 5116 MS (s)2011 5116 MS (i)2050 5116 MS (o)2078 5116 MS (n)2128 5116 MS ( )2178 5116 MS (p)2203 5116 MS (u)2253 5116 MS (b)2303 5116 MS (l)2353 5116 MS (i)2381 5116 MS (s)2409 5116 MS (h)2448 5116 MS (e)2498 5116 MS (d)2542 5116 MS ( )2592 5116 MS (b)2617 5116 MS (y)2669 5116 MS ( )2717 5116 MS (S)2742 5116 MS (G)2798 5116 MS (I)2871 5116 MS (.)2903 5116 MS ( )2928 5116 MS (S)2953 5116 MS (u)3009 5116 MS (b)3059 5116 MS (j)3109 5116 MS (e)3137 5116 MS (c)3181 5116 MS (t)3225 5116 MS ( )3253 5116 MS (t)3278 5116 MS (o)3306 5116 MS ( )3356 5116 MS (t)3381 5116 MS (h)3409 5116 MS (e)3459 5116 MS ( )3503 5116 MS (p)3528 5116 MS (r)3578 5116 MS (o)3611 5116 MS (v)3661 5116 MS (i)3711 5116 MS (s)3739 5116 MS (i)3778 5116 MS (o)3806 5116 MS (n)3856 5116 MS (s)3906 5116 MS ( )3945 5116 MS (o)3970 5116 MS (f)4020 5116 MS (S)490 5231 MS (e)546 5231 MS (c)590 5231 MS (t)634 5231 MS (i)662 5231 MS (o)690 5231 MS (n)740 5231 MS (s)790 5231 MS ( )829 5231 MS (3)854 5231 MS ( )904 5231 MS (a)929 5231 MS (n)973 5231 MS (d)1023 5231 MS ( )1073 5231 MS (4)1098 5231 MS ( )1148 5231 MS (o)1173 5231 MS (f)1223 5231 MS ( )1256 5231 MS (t)1281 5231 MS (h)1309 5231 MS (i)1359 5231 MS (s)1387 5231 MS ( )1426 5231 MS (L)1452 5231 MS (i)1511 5231 MS (c)1539 5231 MS (e)1584 5231 MS (n)1628 5231 MS (s)1678 5231 MS (e)1717 5231 MS (,)1761 5231 MS ( )1786 5231 MS (o)1811 5231 MS (n)1861 5231 MS (l)1911 5231 MS (y)1941 5231 MS ( )1989 5231 MS (S)2014 5231 MS (G)2070 5231 MS (I)2143 5231 MS ( )2175 5231 MS (m)2200 5231 MS (a)2278 5231 MS (y)2324 5231 MS ( )2372 5231 MS (m)2397 5231 MS (o)2475 5231 MS (d)2525 5231 MS (i)2575 5231 MS (f)2603 5231 MS (y)2638 5231 MS ( )2686 5231 MS (t)2711 5231 MS (h)2739 5231 MS (e)2789 5231 MS ( )2833 5231 MS (t)2858 5231 MS (e)2886 5231 MS (r)2931 5231 MS (m)2964 5231 MS (s)3042 5231 MS ( )3081 5231 MS (a)3106 5231 MS (p)3150 5231 MS (p)3200 5231 MS (l)3250 5231 MS (i)3278 5231 MS (c)3306 5231 MS (a)3350 5231 MS (b)3394 5231 MS (l)3444 5231 MS (e)3472 5231 MS ( )3516 5231 MS (t)3541 5231 MS (o)3569 5231 MS ( )3619 5231 MS (C)3644 5231 MS (o)3711 5231 MS (v)3761 5231 MS (e)3811 5231 MS (r)3856 5231 MS (e)3889 5231 MS (d)3933 5231 MS ( )3983 5231 MS (C)4008 5231 MS (o)4075 5231 MS (d)4125 5231 MS (e)4175 5231 MS (c)490 5345 MS (r)534 5345 MS (e)567 5345 MS (a)611 5345 MS (t)655 5345 MS (e)684 5345 MS (d)728 5345 MS ( )778 5345 MS (u)803 5345 MS (n)853 5345 MS (d)903 5345 MS (e)953 5345 MS (r)997 5345 MS ( )1030 5345 MS (t)1055 5345 MS (h)1083 5345 MS (i)1133 5345 MS (s)1161 5345 MS ( )1200 5345 MS (L)1226 5345 MS (i)1286 5345 MS (c)1314 5345 MS (e)1358 5345 MS (n)1403 5345 MS (s)1453 5345 MS (e)1492 5345 MS (.)1536 5345 MS (9)490 5544 MS (.)540 5544 MS [100 0 0 -100 0 0]/Helvetica MF ( )565 5544 MS [100 0 0 -100 0 0]/Times-Bold MF (D)790 5544 MS (I)862 5544 MS (S)901 5544 MS (C)957 5544 MS (L)1029 5544 MS (A)1096 5544 MS (I)1168 5544 MS (M)1207 5544 MS (E)1301 5544 MS (R)1368 5544 MS ( )1440 5544 MS (O)1465 5544 MS (F)1543 5544 MS ( )1603 5544 MS (W)1628 5544 MS (A)1728 5544 MS (R)1800 5544 MS (R)1873 5544 MS (A)1945 5544 MS (N)2017 5544 MS (T)2089 5544 MS (Y)2156 5544 MS (.)2228 5544 MS [100 0 0 -100 0 0]/Times-Roman MF ( )2253 5544 MS (C)2278 5544 MS (O)2345 5544 MS (V)2417 5544 MS (E)2489 5544 MS (R)2550 5544 MS (E)2617 5544 MS (D)2678 5544 MS ( )2750 5544 MS (C)2775 5544 MS (O)2842 5544 MS (D)2914 5544 MS (E)2987 5544 MS ( )3048 5544 MS (I)3074 5544 MS (S)3106 5544 MS ( )3162 5544 MS (P)3187 5544 MS (R)3243 5544 MS (O)3310 5544 MS (V)3382 5544 MS (I)3455 5544 MS (D)3487 5544 MS (E)3559 5544 MS (D)3620 5544 MS ( )3692 5544 MS (")3718 5544 MS (A)3758 5544 MS (S)3830 5544 MS ( )3886 5544 MS (I)3912 5544 MS (S)3944 5544 MS (.)4000 5544 MS (")4026 5544 MS ( )4066 5544 MS (A)4091 5544 MS (L)4164 5544 MS (L)4225 5544 MS (E)490 5659 MS (X)551 5659 MS (P)623 5659 MS (R)679 5659 MS (E)746 5659 MS (S)807 5659 MS (S)863 5659 MS ( )919 5659 MS (A)944 5659 MS (N)1016 5659 MS (D)1088 5659 MS ( )1160 5659 MS (I)1186 5659 MS (M)1217 5659 MS (P)1306 5659 MS (L)1363 5659 MS (I)1424 5659 MS (E)1456 5659 MS (D)1517 5659 MS ( )1589 5659 MS (W)1614 5659 MS (A)1709 5659 MS (R)1781 5659 MS (R)1848 5659 MS (A)1915 5659 MS (N)1987 5659 MS (T)2059 5659 MS (I)2121 5659 MS (E)2153 5659 MS (S)2214 5659 MS ( )2270 5659 MS (A)2295 5659 MS (N)2367 5659 MS (D)2439 5659 MS ( )2511 5659 MS (C)2536 5659 MS (O)2603 5659 MS (N)2676 5659 MS (D)2748 5659 MS (I)2821 5659 MS (T)2853 5659 MS (I)2915 5659 MS (O)2947 5659 MS (N)3020 5659 MS (S)3092 5659 MS ( )3148 5659 MS (A)3173 5659 MS (R)3245 5659 MS (E)3312 5659 MS ( )3373 5659 MS (D)3398 5659 MS (I)3471 5659 MS (S)3503 5659 MS (C)3559 5659 MS (L)3627 5659 MS (A)3687 5659 MS (I)3760 5659 MS (M)3792 5659 MS (E)3881 5659 MS (D)3942 5659 MS (,)4014 5659 MS (I)490 5774 MS (N)522 5774 MS (C)594 5774 MS (L)662 5774 MS (U)722 5774 MS (D)795 5774 MS (I)868 5774 MS (N)900 5774 MS (G)973 5774 MS (,)1045 5774 MS ( )1070 5774 MS (W)1095 5774 MS (I)1191 5774 MS (T)1222 5774 MS (H)1284 5774 MS (O)1356 5774 MS (U)1428 5774 MS (T)1500 5774 MS ( )1561 5774 MS (L)1587 5774 MS (I)1648 5774 MS (M)1680 5774 MS (I)1771 5774 MS (T)1803 5774 MS (A)1864 5774 MS (T)1936 5774 MS (I)1998 5774 MS (O)2030 5774 MS (N)2103 5774 MS (,)2175 5774 MS ( )2200 5774 MS (A)2225 5774 MS (N)2297 5774 MS (Y)2369 5774 MS ( )2441 5774 MS (I)2468 5774 MS (M)2500 5774 MS (P)2589 5774 MS (L)2646 5774 MS (I)2707 5774 MS (E)2739 5774 MS (D)2800 5774 MS ( )2872 5774 MS (W)2897 5774 MS (A)2992 5774 MS (R)3064 5774 MS (R)3131 5774 MS (A)3198 5774 MS (N)3270 5774 MS (T)3342 5774 MS (I)3404 5774 MS (E)3436 5774 MS (S)3497 5774 MS ( )3553 5774 MS (A)3578 5774 MS (N)3650 5774 MS (D)3722 5774 MS showpage %%Page: 4 4 13.238 780.059 translate 72 600 div dup neg scale 0 0 transform .25 add round .25 sub exch .25 add round .25 sub exch itransform translate [100 0 0 -100 0 0]/Times-Roman MF (C)490 591 MS (O)557 591 MS (N)629 591 MS (D)701 591 MS (I)774 591 MS (T)806 591 MS (I)868 591 MS (O)900 591 MS (N)973 591 MS (S)1045 591 MS ( )1101 591 MS (O)1126 591 MS (F)1198 591 MS ( )1253 591 MS (M)1278 591 MS (E)1367 591 MS (R)1428 591 MS (C)1495 591 MS (H)1562 591 MS (A)1634 591 MS (N)1706 591 MS (T)1778 591 MS (A)1839 591 MS (B)1912 591 MS (I)1979 591 MS (L)2012 591 MS (I)2073 591 MS (T)2105 591 MS (Y)2167 591 MS (,)2239 591 MS ( )2264 591 MS (S)2289 591 MS (A)2345 591 MS (T)2417 591 MS (I)2479 591 MS (S)2511 591 MS (F)2568 591 MS (A)2623 591 MS (C)2695 591 MS (T)2762 591 MS (O)2823 591 MS (R)2895 591 MS (Y)2962 591 MS ( )3034 591 MS (Q)3059 591 MS (U)3131 591 MS (A)3203 591 MS (L)3276 591 MS (I)3337 591 MS (T)3369 591 MS (Y)3431 591 MS (,)3503 591 MS ( )3528 591 MS (F)3553 591 MS (I)3610 591 MS (T)3642 591 MS (N)3703 591 MS (E)3775 591 MS (S)3836 591 MS (S)3892 591 MS ( )3948 591 MS (F)3973 591 MS (O)4029 591 MS (R)4101 591 MS ( )4168 591 MS (A)4193 591 MS (P)490 706 MS (A)546 706 MS (R)618 706 MS (T)685 706 MS (I)747 706 MS (C)778 706 MS (U)845 706 MS (L)918 706 MS (A)978 706 MS (R)1050 706 MS ( )1117 706 MS (P)1142 706 MS (U)1198 706 MS (R)1270 706 MS (P)1337 706 MS (O)1393 706 MS (S)1465 706 MS (E)1521 706 MS (,)1582 706 MS ( )1607 706 MS (A)1632 706 MS (N)1704 706 MS (D)1776 706 MS ( )1848 706 MS (N)1873 706 MS (O)1945 706 MS (N)2017 706 MS (-)2090 706 MS (I)2123 706 MS (N)2155 706 MS (F)2228 706 MS (R)2283 706 MS (I)2352 706 MS (N)2384 706 MS (G)2456 706 MS (E)2528 706 MS (M)2589 706 MS (E)2678 706 MS (N)2740 706 MS (T)2812 706 MS (.)2873 706 MS ( )2898 706 MS (S)2923 706 MS (G)2979 706 MS (I)3052 706 MS ( )3084 706 MS (A)3109 706 MS (S)3181 706 MS (S)3237 706 MS (U)3293 706 MS (M)3365 706 MS (E)3454 706 MS (S)3515 706 MS ( )3571 706 MS (N)3596 706 MS (O)3668 706 MS ( )3740 706 MS (R)3765 706 MS (I)3833 706 MS (S)3864 706 MS (K)3920 706 MS ( )3992 706 MS (A)4018 706 MS (S)4090 706 MS ( )4146 706 MS (T)4171 706 MS (O)4232 706 MS (T)490 821 MS (H)551 821 MS (E)623 821 MS ( )684 821 MS (Q)709 821 MS (U)781 821 MS (A)853 821 MS (L)926 821 MS (I)987 821 MS (T)1019 821 MS (Y)1081 821 MS ( )1153 821 MS (A)1178 821 MS (N)1250 821 MS (D)1322 821 MS ( )1394 821 MS (P)1419 821 MS (E)1475 821 MS (R)1536 821 MS (F)1603 821 MS (O)1659 821 MS (R)1731 821 MS (M)1798 821 MS (A)1887 821 MS (N)1959 821 MS (C)2031 821 MS (E)2098 821 MS ( )2159 821 MS (O)2184 821 MS (F)2256 821 MS ( )2311 821 MS (T)2336 821 MS (H)2398 821 MS (E)2470 821 MS ( )2531 821 MS (S)2556 821 MS (O)2612 821 MS (F)2684 821 MS (T)2739 821 MS (W)2800 821 MS (A)2895 821 MS (R)2967 821 MS (E)3034 821 MS (.)3095 821 MS ( )3120 821 MS (S)3145 821 MS (H)3201 821 MS (O)3273 821 MS (U)3345 821 MS (L)3418 821 MS (D)3478 821 MS ( )3550 821 MS (T)3575 821 MS (H)3637 821 MS (E)3709 821 MS ( )3770 821 MS (S)3795 821 MS (O)3851 821 MS (F)3923 821 MS (T)3978 821 MS (W)4039 821 MS (A)4134 821 MS (R)4206 821 MS (E)4273 821 MS (P)490 936 MS (R)546 936 MS (O)613 936 MS (V)685 936 MS (E)757 936 MS ( )818 936 MS (D)843 936 MS (E)915 936 MS (F)976 936 MS (E)1031 936 MS (C)1092 936 MS (T)1159 936 MS (I)1221 936 MS (V)1253 936 MS (E)1325 936 MS ( )1386 936 MS (I)1413 936 MS (N)1445 936 MS ( )1517 936 MS (A)1542 936 MS (N)1614 936 MS (Y)1686 936 MS ( )1758 936 MS (R)1783 936 MS (E)1850 936 MS (S)1911 936 MS (P)1967 936 MS (E)2023 936 MS (C)2084 936 MS (T)2151 936 MS (,)2212 936 MS ( )2237 936 MS (S)2262 936 MS (G)2318 936 MS (I)2391 936 MS ( )2423 936 MS (A)2448 936 MS (S)2520 936 MS (S)2576 936 MS (U)2632 936 MS (M)2704 936 MS (E)2793 936 MS (S)2854 936 MS ( )2910 936 MS (N)2935 936 MS (O)3007 936 MS ( )3079 936 MS (C)3104 936 MS (O)3171 936 MS (S)3243 936 MS (T)3299 936 MS ( )3360 936 MS (O)3385 936 MS (R)3457 936 MS ( )3524 936 MS (L)3549 936 MS (I)3610 936 MS (A)3642 936 MS (B)3715 936 MS (I)3783 936 MS (L)3816 936 MS (I)3877 936 MS (T)3909 936 MS (Y)3970 936 MS ( )4042 936 MS (F)4068 936 MS (O)4123 936 MS (R)4195 936 MS (S)490 1051 MS (E)546 1051 MS (R)607 1051 MS (V)674 1051 MS (I)747 1051 MS (C)778 1051 MS (I)846 1051 MS (N)878 1051 MS (G)950 1051 MS (,)1022 1051 MS ( )1047 1051 MS (R)1072 1051 MS (E)1139 1051 MS (P)1200 1051 MS (A)1256 1051 MS (I)1329 1051 MS (R)1361 1051 MS ( )1428 1051 MS (O)1453 1051 MS (R)1525 1051 MS ( )1592 1051 MS (C)1617 1051 MS (O)1684 1051 MS (R)1756 1051 MS (R)1823 1051 MS (E)1890 1051 MS (C)1951 1051 MS (T)2018 1051 MS (I)2080 1051 MS (O)2112 1051 MS (N)2184 1051 MS (.)2256 1051 MS ( )2281 1051 MS (T)2306 1051 MS (H)2367 1051 MS (I)2441 1051 MS (S)2472 1051 MS ( )2528 1051 MS (D)2553 1051 MS (I)2627 1051 MS (S)2658 1051 MS (C)2714 1051 MS (L)2782 1051 MS (A)2842 1051 MS (I)2916 1051 MS (M)2948 1051 MS (E)3037 1051 MS (R)3098 1051 MS ( )3165 1051 MS (O)3190 1051 MS (F)3262 1051 MS ( )3317 1051 MS (W)3342 1051 MS (A)3437 1051 MS (R)3509 1051 MS (R)3576 1051 MS (A)3643 1051 MS (N)3715 1051 MS (T)3787 1051 MS (Y)3848 1051 MS ( )3920 1051 MS (I)3946 1051 MS (S)3978 1051 MS ( )4034 1051 MS (A)4059 1051 MS (N)4131 1051 MS (E)490 1166 MS (S)551 1166 MS (S)607 1166 MS (E)663 1166 MS (N)724 1166 MS (T)796 1166 MS (I)858 1166 MS (A)889 1166 MS (L)962 1166 MS ( )1022 1166 MS (P)1047 1166 MS (A)1103 1166 MS (R)1175 1166 MS (T)1242 1166 MS ( )1303 1166 MS (O)1328 1166 MS (F)1401 1166 MS ( )1456 1166 MS (T)1481 1166 MS (H)1542 1166 MS (I)1615 1166 MS (S)1647 1166 MS ( )1703 1166 MS (L)1729 1166 MS (I)1790 1166 MS (C)1822 1166 MS (E)1889 1166 MS (N)1950 1166 MS (S)2022 1166 MS (E)2078 1166 MS (.)2139 1166 MS ( )2164 1166 MS (N)2189 1166 MS (O)2262 1166 MS ( )2334 1166 MS (U)2359 1166 MS (S)2431 1166 MS (E)2487 1166 MS ( )2548 1166 MS (O)2573 1166 MS (F)2645 1166 MS ( )2700 1166 MS (A)2726 1166 MS (N)2798 1166 MS (Y)2870 1166 MS ( )2942 1166 MS (C)2967 1166 MS (O)3034 1166 MS (V)3106 1166 MS (E)3178 1166 MS (R)3239 1166 MS (E)3306 1166 MS (D)3367 1166 MS ( )3439 1166 MS (C)3464 1166 MS (O)3531 1166 MS (D)3603 1166 MS (E)3676 1166 MS ( )3737 1166 MS (I)3763 1166 MS (S)3794 1166 MS (A)490 1281 MS (U)562 1281 MS (T)634 1281 MS (H)695 1281 MS (O)767 1281 MS (R)839 1281 MS (I)907 1281 MS (Z)939 1281 MS (E)1000 1281 MS (D)1061 1281 MS ( )1133 1281 MS (H)1159 1281 MS (E)1231 1281 MS (R)1292 1281 MS (E)1359 1281 MS (U)1420 1281 MS (N)1492 1281 MS (D)1564 1281 MS (E)1636 1281 MS (R)1697 1281 MS ( )1764 1281 MS (E)1789 1281 MS (X)1850 1281 MS (C)1922 1281 MS (E)1989 1281 MS (P)2050 1281 MS (T)2106 1281 MS ( )2167 1281 MS (S)2192 1281 MS (U)2248 1281 MS (B)2320 1281 MS (J)2386 1281 MS (E)2426 1281 MS (C)2487 1281 MS (T)2554 1281 MS ( )2615 1281 MS (T)2640 1281 MS (O)2701 1281 MS ( )2773 1281 MS (T)2798 1281 MS (H)2859 1281 MS (I)2932 1281 MS (S)2964 1281 MS ( )3020 1281 MS (D)3045 1281 MS (I)3118 1281 MS (S)3150 1281 MS (C)3206 1281 MS (L)3274 1281 MS (A)3334 1281 MS (I)3407 1281 MS (M)3439 1281 MS (E)3528 1281 MS (R)3589 1281 MS (.)3656 1281 MS (1)490 1479 MS (0)540 1479 MS (.)590 1479 MS [100 0 0 -100 0 0]/Helvetica MF ( )615 1479 MS [100 0 0 -100 0 0]/Times-Bold MF (L)790 1479 MS (I)857 1479 MS (M)896 1479 MS (I)990 1479 MS (T)1029 1479 MS (A)1096 1479 MS (T)1168 1479 MS (I)1235 1479 MS (O)1274 1479 MS (N)1352 1479 MS ( )1424 1479 MS (O)1449 1479 MS (F)1527 1479 MS ( )1587 1479 MS (L)1612 1479 MS (I)1679 1479 MS (A)1718 1479 MS (B)1790 1479 MS (I)1857 1479 MS (L)1896 1479 MS (I)1963 1479 MS (T)2002 1479 MS (Y)2069 1479 MS (.)2141 1479 MS [100 0 0 -100 0 0]/Times-Roman MF ( )2166 1479 MS (U)2191 1479 MS (N)2263 1479 MS (D)2335 1479 MS (E)2407 1479 MS (R)2468 1479 MS ( )2535 1479 MS (N)2560 1479 MS (O)2632 1479 MS ( )2704 1479 MS (C)2729 1479 MS (I)2797 1479 MS (R)2828 1479 MS (C)2895 1479 MS (U)2962 1479 MS (M)3034 1479 MS (S)3123 1479 MS (T)3179 1479 MS (A)3240 1479 MS (N)3312 1479 MS (C)3384 1479 MS (E)3451 1479 MS (S)3512 1479 MS ( )3568 1479 MS (N)3593 1479 MS (O)3665 1479 MS (R)3737 1479 MS ( )3804 1479 MS (L)3829 1479 MS (E)3889 1479 MS (G)3951 1479 MS (A)4023 1479 MS (L)4096 1479 MS (T)490 1594 MS (H)551 1594 MS (E)623 1594 MS (O)684 1594 MS (R)756 1594 MS (Y)823 1594 MS (,)895 1594 MS ( )920 1594 MS (W)945 1594 MS (H)1040 1594 MS (E)1112 1594 MS (T)1173 1594 MS (H)1234 1594 MS (E)1306 1594 MS (R)1367 1594 MS ( )1434 1594 MS (T)1459 1594 MS (O)1520 1594 MS (R)1592 1594 MS (T)1659 1594 MS ( )1720 1594 MS (\()1745 1594 MS (I)1779 1594 MS (N)1811 1594 MS (C)1883 1594 MS (L)1951 1594 MS (U)2011 1594 MS (D)2083 1594 MS (I)2157 1594 MS (N)2189 1594 MS (G)2261 1594 MS (,)2333 1594 MS ( )2358 1594 MS (W)2383 1594 MS (I)2479 1594 MS (T)2511 1594 MS (H)2572 1594 MS (O)2645 1594 MS (U)2717 1594 MS (T)2789 1594 MS ( )2850 1594 MS (L)2876 1594 MS (I)2937 1594 MS (M)2969 1594 MS (I)3059 1594 MS (T)3091 1594 MS (A)3153 1594 MS (T)3225 1594 MS (I)3287 1594 MS (O)3319 1594 MS (N)3392 1594 MS (,)3464 1594 MS ( )3489 1594 MS (N)3514 1594 MS (E)3586 1594 MS (G)3647 1594 MS (L)3720 1594 MS (I)3781 1594 MS (G)3813 1594 MS (E)3886 1594 MS (N)3947 1594 MS (C)4019 1594 MS (E)4086 1594 MS ( )4147 1594 MS (O)4172 1594 MS (R)4244 1594 MS (S)490 1709 MS (T)546 1709 MS (R)607 1709 MS (I)675 1709 MS (C)706 1709 MS (T)773 1709 MS ( )834 1709 MS (L)860 1709 MS (I)921 1709 MS (A)953 1709 MS (B)1026 1709 MS (I)1093 1709 MS (L)1126 1709 MS (I)1187 1709 MS (T)1219 1709 MS (Y)1281 1709 MS (\))1353 1709 MS (,)1386 1709 MS ( )1411 1709 MS (C)1436 1709 MS (O)1503 1709 MS (N)1575 1709 MS (T)1647 1709 MS (R)1708 1709 MS (A)1775 1709 MS (C)1847 1709 MS (T)1914 1709 MS (,)1975 1709 MS ( )2000 1709 MS (O)2025 1709 MS (R)2097 1709 MS ( )2164 1709 MS (O)2189 1709 MS (T)2261 1709 MS (H)2323 1709 MS (E)2395 1709 MS (R)2456 1709 MS (W)2523 1709 MS (I)2619 1709 MS (S)2650 1709 MS (E)2706 1709 MS (,)2767 1709 MS ( )2792 1709 MS (S)2817 1709 MS (H)2873 1709 MS (A)2945 1709 MS (L)3018 1709 MS (L)3079 1709 MS ( )3139 1709 MS (S)3164 1709 MS (G)3220 1709 MS (I)3293 1709 MS ( )3325 1709 MS (O)3350 1709 MS (R)3422 1709 MS ( )3489 1709 MS (A)3514 1709 MS (N)3587 1709 MS (Y)3659 1709 MS ( )3731 1709 MS (S)3756 1709 MS (G)3812 1709 MS (I)3885 1709 MS (L)490 1824 MS (I)551 1824 MS (C)583 1824 MS (E)650 1824 MS (N)711 1824 MS (S)783 1824 MS (O)839 1824 MS (R)911 1824 MS ( )978 1824 MS (B)1004 1824 MS (E)1070 1824 MS ( )1131 1824 MS (L)1157 1824 MS (I)1218 1824 MS (A)1250 1824 MS (B)1323 1824 MS (L)1390 1824 MS (E)1450 1824 MS ( )1511 1824 MS (F)1537 1824 MS (O)1592 1824 MS (R)1664 1824 MS ( )1731 1824 MS (A)1756 1824 MS (N)1828 1824 MS (Y)1900 1824 MS ( )1972 1824 MS (D)1998 1824 MS (I)2071 1824 MS (R)2103 1824 MS (E)2170 1824 MS (C)2231 1824 MS (T)2298 1824 MS (,)2359 1824 MS ( )2384 1824 MS (I)2410 1824 MS (N)2442 1824 MS (D)2514 1824 MS (I)2588 1824 MS (R)2619 1824 MS (E)2686 1824 MS (C)2747 1824 MS (T)2814 1824 MS (,)2875 1824 MS ( )2900 1824 MS (S)2925 1824 MS (P)2981 1824 MS (E)3037 1824 MS (C)3098 1824 MS (I)3166 1824 MS (A)3198 1824 MS (L)3271 1824 MS (,)3331 1824 MS ( )3356 1824 MS (I)3382 1824 MS (N)3414 1824 MS (C)3486 1824 MS (I)3553 1824 MS (D)3586 1824 MS (E)3659 1824 MS (N)3720 1824 MS (T)3792 1824 MS (A)3853 1824 MS (L)3926 1824 MS (,)3986 1824 MS ( )4011 1824 MS (O)4037 1824 MS (R)4109 1824 MS (C)490 1939 MS (O)557 1939 MS (N)629 1939 MS (S)701 1939 MS (E)757 1939 MS (Q)818 1939 MS (U)890 1939 MS (E)962 1939 MS (N)1023 1939 MS (T)1095 1939 MS (I)1157 1939 MS (A)1189 1939 MS (L)1262 1939 MS ( )1322 1939 MS (D)1348 1939 MS (A)1420 1939 MS (M)1492 1939 MS (A)1581 1939 MS (G)1653 1939 MS (E)1725 1939 MS (S)1786 1939 MS ( )1842 1939 MS (O)1867 1939 MS (F)1940 1939 MS ( )1995 1939 MS (A)2020 1939 MS (N)2092 1939 MS (Y)2164 1939 MS ( )2236 1939 MS (C)2261 1939 MS (H)2328 1939 MS (A)2401 1939 MS (R)2473 1939 MS (A)2540 1939 MS (C)2612 1939 MS (T)2679 1939 MS (E)2740 1939 MS (R)2801 1939 MS ( )2868 1939 MS (I)2894 1939 MS (N)2926 1939 MS (C)2998 1939 MS (L)3066 1939 MS (U)3126 1939 MS (D)3198 1939 MS (I)3271 1939 MS (N)3303 1939 MS (G)3376 1939 MS (,)3448 1939 MS ( )3473 1939 MS (W)3498 1939 MS (I)3594 1939 MS (T)3625 1939 MS (H)3687 1939 MS (O)3759 1939 MS (U)3831 1939 MS (T)3903 1939 MS (L)490 2054 MS (I)551 2054 MS (M)583 2054 MS (I)674 2054 MS (T)706 2054 MS (A)767 2054 MS (T)839 2054 MS (I)901 2054 MS (O)933 2054 MS (N)1006 2054 MS (,)1078 2054 MS ( )1103 2054 MS (D)1128 2054 MS (A)1200 2054 MS (M)1272 2054 MS (A)1361 2054 MS (G)1434 2054 MS (E)1506 2054 MS (S)1567 2054 MS ( )1623 2054 MS (F)1648 2054 MS (O)1703 2054 MS (R)1775 2054 MS ( )1842 2054 MS (L)1868 2054 MS (O)1928 2054 MS (S)2000 2054 MS (S)2056 2054 MS ( )2112 2054 MS (O)2137 2054 MS (F)2209 2054 MS ( )2264 2054 MS (G)2289 2054 MS (O)2362 2054 MS (O)2434 2054 MS (D)2506 2054 MS (W)2578 2054 MS (I)2674 2054 MS (L)2707 2054 MS (L)2768 2054 MS (,)2828 2054 MS ( )2853 2054 MS (W)2878 2054 MS (O)2973 2054 MS (R)3045 2054 MS (K)3112 2054 MS ( )3184 2054 MS (S)3209 2054 MS (T)3265 2054 MS (O)3326 2054 MS (P)3398 2054 MS (P)3454 2054 MS (A)3510 2054 MS (G)3582 2054 MS (E)3654 2054 MS (,)3715 2054 MS ( )3740 2054 MS (L)3766 2054 MS (O)3826 2054 MS (S)3898 2054 MS (S)3954 2054 MS ( )4010 2054 MS (O)4035 2054 MS (F)4107 2054 MS (D)490 2169 MS (A)562 2169 MS (T)634 2169 MS (A)695 2169 MS (,)767 2169 MS ( )792 2169 MS (C)817 2169 MS (O)884 2169 MS (M)956 2169 MS (P)1045 2169 MS (U)1101 2169 MS (T)1173 2169 MS (E)1234 2169 MS (R)1295 2169 MS ( )1362 2169 MS (F)1387 2169 MS (A)1442 2169 MS (I)1515 2169 MS (L)1548 2169 MS (U)1608 2169 MS (R)1680 2169 MS (E)1748 2169 MS ( )1809 2169 MS (O)1834 2169 MS (R)1906 2169 MS ( )1973 2169 MS (M)1998 2169 MS (A)2087 2169 MS (L)2160 2169 MS (F)2220 2169 MS (U)2276 2169 MS (N)2348 2169 MS (C)2420 2169 MS (T)2487 2169 MS (I)2549 2169 MS (O)2581 2169 MS (N)2653 2169 MS (,)2725 2169 MS ( )2750 2169 MS (O)2776 2169 MS (R)2848 2169 MS ( )2915 2169 MS (A)2940 2169 MS (N)3012 2169 MS (Y)3084 2169 MS ( )3156 2169 MS (A)3181 2169 MS (N)3253 2169 MS (D)3326 2169 MS ( )3398 2169 MS (A)3423 2169 MS (L)3496 2169 MS (L)3556 2169 MS ( )3616 2169 MS (O)3642 2169 MS (T)3714 2169 MS (H)3776 2169 MS (E)3848 2169 MS (R)3909 2169 MS (C)490 2284 MS (O)557 2284 MS (M)629 2284 MS (M)718 2284 MS (E)807 2284 MS (R)868 2284 MS (C)935 2284 MS (I)1003 2284 MS (A)1034 2284 MS (L)1107 2284 MS ( )1167 2284 MS (D)1192 2284 MS (A)1264 2284 MS (M)1336 2284 MS (A)1425 2284 MS (G)1497 2284 MS (E)1570 2284 MS (S)1631 2284 MS ( )1687 2284 MS (O)1712 2284 MS (R)1784 2284 MS ( )1851 2284 MS (L)1877 2284 MS (O)1937 2284 MS (S)2009 2284 MS (S)2065 2284 MS (E)2121 2284 MS (S)2182 2284 MS (,)2238 2284 MS ( )2263 2284 MS (E)2288 2284 MS (V)2349 2284 MS (E)2421 2284 MS (N)2482 2284 MS ( )2554 2284 MS (I)2580 2284 MS (F)2612 2284 MS ( )2667 2284 MS (S)2692 2284 MS (U)2748 2284 MS (C)2820 2284 MS (H)2887 2284 MS ( )2959 2284 MS (P)2984 2284 MS (A)3040 2284 MS (R)3112 2284 MS (T)3179 2284 MS (Y)3240 2284 MS ( )3312 2284 MS (S)3337 2284 MS (H)3393 2284 MS (A)3465 2284 MS (L)3537 2284 MS (L)3598 2284 MS ( )3658 2284 MS (H)3684 2284 MS (A)3756 2284 MS (V)3829 2284 MS (E)3901 2284 MS ( )3962 2284 MS (B)3987 2284 MS (E)4054 2284 MS (E)4115 2284 MS (N)4176 2284 MS (I)490 2399 MS (N)522 2399 MS (F)595 2399 MS (O)650 2399 MS (R)722 2399 MS (M)789 2399 MS (E)878 2399 MS (D)939 2399 MS ( )1011 2399 MS (O)1037 2399 MS (F)1109 2399 MS ( )1164 2399 MS (T)1189 2399 MS (H)1250 2399 MS (E)1323 2399 MS ( )1384 2399 MS (P)1409 2399 MS (O)1465 2399 MS (S)1537 2399 MS (S)1593 2399 MS (I)1650 2399 MS (B)1682 2399 MS (I)1749 2399 MS (L)1782 2399 MS (I)1843 2399 MS (T)1875 2399 MS (Y)1937 2399 MS ( )2009 2399 MS (O)2034 2399 MS (F)2106 2399 MS ( )2161 2399 MS (S)2186 2399 MS (U)2242 2399 MS (C)2314 2399 MS (H)2381 2399 MS ( )2453 2399 MS (D)2478 2399 MS (A)2551 2399 MS (M)2623 2399 MS (A)2712 2399 MS (G)2784 2399 MS (E)2856 2399 MS (S)2917 2399 MS (.)2973 2399 MS ( )2998 2399 MS (T)3023 2399 MS (H)3084 2399 MS (I)3157 2399 MS (S)3189 2399 MS ( )3245 2399 MS (L)3271 2399 MS (I)3332 2399 MS (M)3364 2399 MS (I)3455 2399 MS (T)3487 2399 MS (A)3548 2399 MS (T)3620 2399 MS (I)3682 2399 MS (O)3714 2399 MS (N)3787 2399 MS ( )3859 2399 MS (O)3884 2399 MS (F)3957 2399 MS (L)490 2514 MS (I)551 2514 MS (A)583 2514 MS (B)656 2514 MS (I)724 2514 MS (L)757 2514 MS (I)818 2514 MS (T)850 2514 MS (Y)911 2514 MS ( )983 2514 MS (S)1008 2514 MS (H)1064 2514 MS (A)1136 2514 MS (L)1209 2514 MS (L)1270 2514 MS ( )1330 2514 MS (N)1356 2514 MS (O)1428 2514 MS (T)1500 2514 MS ( )1561 2514 MS (A)1586 2514 MS (P)1658 2514 MS (P)1714 2514 MS (L)1771 2514 MS (Y)1831 2514 MS ( )1903 2514 MS (T)1928 2514 MS (O)1989 2514 MS ( )2061 2514 MS (L)2087 2514 MS (I)2148 2514 MS (A)2180 2514 MS (B)2253 2514 MS (I)2321 2514 MS (L)2354 2514 MS (I)2415 2514 MS (T)2447 2514 MS (Y)2508 2514 MS ( )2581 2514 MS (F)2606 2514 MS (O)2661 2514 MS (R)2733 2514 MS ( )2800 2514 MS (D)2825 2514 MS (E)2897 2514 MS (A)2959 2514 MS (T)3031 2514 MS (H)3092 2514 MS ( )3164 2514 MS (O)3189 2514 MS (R)3261 2514 MS ( )3328 2514 MS (P)3353 2514 MS (E)3409 2514 MS (R)3470 2514 MS (S)3537 2514 MS (O)3593 2514 MS (N)3665 2514 MS (A)3737 2514 MS (L)3810 2514 MS ( )3870 2514 MS (I)3896 2514 MS (N)3928 2514 MS (J)4000 2514 MS (U)4040 2514 MS (R)4112 2514 MS (Y)4179 2514 MS (R)490 2629 MS (E)557 2629 MS (S)618 2629 MS (U)674 2629 MS (L)747 2629 MS (T)806 2629 MS (I)868 2629 MS (N)900 2629 MS (G)973 2629 MS ( )1045 2629 MS (F)1070 2629 MS (R)1125 2629 MS (O)1192 2629 MS (M)1264 2629 MS ( )1353 2629 MS (S)1378 2629 MS (G)1434 2629 MS (I)1506 2629 MS (')1539 2629 MS (s)1557 2629 MS ( )1596 2629 MS (N)1621 2629 MS (E)1693 2629 MS (G)1755 2629 MS (L)1828 2629 MS (I)1889 2629 MS (G)1921 2629 MS (E)1993 2629 MS (N)2055 2629 MS (C)2127 2629 MS (E)2194 2629 MS ( )2255 2629 MS (T)2280 2629 MS (O)2341 2629 MS ( )2413 2629 MS (T)2438 2629 MS (H)2499 2629 MS (E)2571 2629 MS ( )2632 2629 MS (E)2657 2629 MS (X)2718 2629 MS (T)2790 2629 MS (E)2852 2629 MS (N)2913 2629 MS (T)2985 2629 MS ( )3046 2629 MS (A)3071 2629 MS (P)3143 2629 MS (P)3199 2629 MS (L)3256 2629 MS (I)3317 2629 MS (C)3348 2629 MS (A)3416 2629 MS (B)3488 2629 MS (L)3554 2629 MS (E)3615 2629 MS ( )3677 2629 MS (L)3703 2629 MS (A)3763 2629 MS (W)3835 2629 MS (P)490 2744 MS (R)546 2744 MS (O)613 2744 MS (H)685 2744 MS (I)758 2744 MS (B)790 2744 MS (I)857 2744 MS (T)889 2744 MS (S)950 2744 MS ( )1006 2744 MS (S)1031 2744 MS (U)1087 2744 MS (C)1159 2744 MS (H)1226 2744 MS ( )1298 2744 MS (L)1324 2744 MS (I)1385 2744 MS (M)1417 2744 MS (I)1506 2744 MS (T)1538 2744 MS (A)1600 2744 MS (T)1673 2744 MS (I)1735 2744 MS (O)1767 2744 MS (N)1839 2744 MS (.)1911 2744 MS ( )1936 2744 MS (S)1961 2744 MS (O)2017 2744 MS (M)2089 2744 MS (E)2178 2744 MS ( )2239 2744 MS (J)2264 2744 MS (U)2304 2744 MS (R)2376 2744 MS (I)2444 2744 MS (S)2475 2744 MS (D)2531 2744 MS (I)2604 2744 MS (C)2636 2744 MS (T)2703 2744 MS (I)2766 2744 MS (O)2798 2744 MS (N)2870 2744 MS (S)2942 2744 MS ( )2998 2744 MS (D)3023 2744 MS (O)3095 2744 MS ( )3167 2744 MS (N)3192 2744 MS (O)3265 2744 MS (T)3337 2744 MS ( )3398 2744 MS (A)3423 2744 MS (L)3496 2744 MS (L)3556 2744 MS (O)3616 2744 MS (W)3689 2744 MS ( )3784 2744 MS (T)3809 2744 MS (H)3870 2744 MS (E)3942 2744 MS (E)490 2859 MS (X)551 2859 MS (C)623 2859 MS (L)691 2859 MS (U)750 2859 MS (S)822 2859 MS (I)879 2859 MS (O)911 2859 MS (N)984 2859 MS ( )1056 2859 MS (O)1081 2859 MS (R)1153 2859 MS ( )1220 2859 MS (L)1246 2859 MS (I)1307 2859 MS (M)1339 2859 MS (I)1429 2859 MS (T)1461 2859 MS (A)1523 2859 MS (T)1595 2859 MS (I)1657 2859 MS (O)1689 2859 MS (N)1761 2859 MS ( )1833 2859 MS (O)1859 2859 MS (F)1931 2859 MS ( )1986 2859 MS (I)2013 2859 MS (N)2045 2859 MS (C)2117 2859 MS (I)2185 2859 MS (D)2217 2859 MS (E)2289 2859 MS (N)2350 2859 MS (T)2422 2859 MS (A)2483 2859 MS (L)2557 2859 MS ( )2617 2859 MS (O)2642 2859 MS (R)2714 2859 MS ( )2781 2859 MS (C)2806 2859 MS (O)2873 2859 MS (N)2945 2859 MS (S)3017 2859 MS (E)3073 2859 MS (Q)3134 2859 MS (U)3206 2859 MS (E)3278 2859 MS (N)3339 2859 MS (T)3411 2859 MS (I)3474 2859 MS (A)3506 2859 MS (L)3579 2859 MS ( )3639 2859 MS (D)3664 2859 MS (A)3736 2859 MS (M)3808 2859 MS (A)3898 2859 MS (G)3970 2859 MS (E)4042 2859 MS (S)4103 2859 MS (,)4159 2859 MS ( )4184 2859 MS (S)4209 2859 MS (O)4265 2859 MS (T)490 2974 MS (H)551 2974 MS (A)623 2974 MS (T)695 2974 MS ( )756 2974 MS (E)781 2974 MS (X)842 2974 MS (C)914 2974 MS (L)982 2974 MS (U)1042 2974 MS (S)1114 2974 MS (I)1171 2974 MS (O)1203 2974 MS (N)1275 2974 MS ( )1347 2974 MS (A)1373 2974 MS (N)1445 2974 MS (D)1517 2974 MS ( )1589 2974 MS (L)1615 2974 MS (I)1676 2974 MS (M)1708 2974 MS (I)1799 2974 MS (T)1831 2974 MS (A)1892 2974 MS (T)1964 2974 MS (I)2026 2974 MS (O)2058 2974 MS (N)2131 2974 MS ( )2203 2974 MS (M)2228 2974 MS (A)2317 2974 MS (Y)2389 2974 MS ( )2461 2974 MS (N)2486 2974 MS (O)2559 2974 MS (T)2631 2974 MS ( )2692 2974 MS (A)2717 2974 MS (P)2789 2974 MS (P)2845 2974 MS (L)2902 2974 MS (Y)2961 2974 MS ( )3033 2974 MS (T)3059 2974 MS (O)3120 2974 MS ( )3192 2974 MS (R)3217 2974 MS (E)3284 2974 MS (C)3345 2974 MS (I)3413 2974 MS (P)3444 2974 MS (I)3501 2974 MS (E)3533 2974 MS (N)3595 2974 MS (T)3667 2974 MS (.)3728 2974 MS (1)490 3172 MS (1)540 3172 MS (.)590 3172 MS [100 0 0 -100 0 0]/Helvetica MF ( )615 3172 MS [100 0 0 -100 0 0]/Times-Bold MF (I)790 3172 MS (n)829 3172 MS (d)885 3172 MS (e)941 3172 MS (m)985 3172 MS (n)1067 3172 MS (i)1123 3172 MS (t)1151 3172 MS (y)1184 3172 MS (.)1234 3172 MS ( )1259 3172 MS [100 0 0 -100 0 0]/Times-Roman MF (R)1284 3172 MS (e)1351 3172 MS (c)1395 3172 MS (i)1439 3172 MS (p)1467 3172 MS (i)1517 3172 MS (e)1545 3172 MS (n)1589 3172 MS (t)1639 3172 MS ( )1667 3172 MS (s)1692 3172 MS (h)1731 3172 MS (a)1781 3172 MS (l)1825 3172 MS (l)1853 3172 MS ( )1881 3172 MS (b)1906 3172 MS (e)1956 3172 MS ( )2000 3172 MS (s)2025 3172 MS (o)2064 3172 MS (l)2114 3172 MS (e)2142 3172 MS (l)2186 3172 MS (y)2216 3172 MS ( )2264 3172 MS (r)2289 3172 MS (e)2323 3172 MS (s)2367 3172 MS (p)2406 3172 MS (o)2456 3172 MS (n)2506 3172 MS (s)2556 3172 MS (i)2595 3172 MS (b)2623 3172 MS (l)2673 3172 MS (e)2701 3172 MS ( )2745 3172 MS (f)2770 3172 MS (o)2803 3172 MS (r)2853 3172 MS ( )2886 3172 MS (d)2911 3172 MS (a)2961 3172 MS (m)3005 3172 MS (a)3084 3172 MS (g)3129 3172 MS (e)3178 3172 MS (s)3222 3172 MS ( )3261 3172 MS (a)3286 3172 MS (r)3331 3172 MS (i)3364 3172 MS (s)3392 3172 MS (i)3431 3172 MS (n)3459 3172 MS (g)3509 3172 MS (,)3558 3172 MS ( )3583 3172 MS (d)3608 3172 MS (i)3658 3172 MS (r)3686 3172 MS (e)3720 3172 MS (c)3764 3172 MS (t)3808 3172 MS (l)3836 3172 MS (y)3866 3172 MS ( )3914 3172 MS (o)3939 3172 MS (r)3989 3172 MS (i)490 3287 MS (n)518 3287 MS (d)568 3287 MS (i)618 3287 MS (r)646 3287 MS (e)679 3287 MS (c)723 3287 MS (t)767 3287 MS (l)795 3287 MS (y)824 3287 MS (,)872 3287 MS ( )897 3287 MS (o)922 3287 MS (u)972 3287 MS (t)1022 3287 MS ( )1050 3287 MS (o)1075 3287 MS (f)1125 3287 MS ( )1158 3287 MS (i)1183 3287 MS (t)1211 3287 MS (s)1239 3287 MS ( )1278 3287 MS (u)1303 3287 MS (t)1353 3287 MS (i)1381 3287 MS (l)1409 3287 MS (i)1437 3287 MS (z)1465 3287 MS (a)1510 3287 MS (t)1554 3287 MS (i)1582 3287 MS (o)1610 3287 MS (n)1660 3287 MS ( )1710 3287 MS (o)1735 3287 MS (f)1785 3287 MS ( )1818 3287 MS (r)1843 3287 MS (i)1876 3287 MS (g)1904 3287 MS (h)1953 3287 MS (t)2003 3287 MS (s)2031 3287 MS ( )2070 3287 MS (u)2095 3287 MS (n)2145 3287 MS (d)2195 3287 MS (e)2245 3287 MS (r)2289 3287 MS ( )2322 3287 MS (t)2347 3287 MS (h)2375 3287 MS (i)2425 3287 MS (s)2453 3287 MS ( )2492 3287 MS (L)2517 3287 MS (i)2577 3287 MS (c)2606 3287 MS (e)2650 3287 MS (n)2694 3287 MS (s)2744 3287 MS (e)2784 3287 MS (.)2828 3287 MS ( )2853 3287 MS (R)2878 3287 MS (e)2945 3287 MS (c)2989 3287 MS (i)3033 3287 MS (p)3061 3287 MS (i)3111 3287 MS (e)3139 3287 MS (n)3183 3287 MS (t)3233 3287 MS ( )3261 3287 MS (w)3286 3287 MS (i)3358 3287 MS (l)3386 3287 MS (l)3414 3287 MS ( )3442 3287 MS (d)3467 3287 MS (e)3517 3287 MS (f)3561 3287 MS (e)3595 3287 MS (n)3639 3287 MS (d)3689 3287 MS (,)3739 3287 MS ( )3764 3287 MS (i)3789 3287 MS (n)3817 3287 MS (d)3867 3287 MS (e)3917 3287 MS (m)3961 3287 MS (n)4039 3287 MS (i)4089 3287 MS (f)4117 3287 MS (y)4152 3287 MS ( )4200 3287 MS (a)4225 3287 MS (n)4269 3287 MS (d)4319 3287 MS (h)490 3402 MS (o)540 3402 MS (l)590 3402 MS (d)618 3402 MS ( )668 3402 MS (h)693 3402 MS (a)743 3402 MS (r)787 3402 MS (m)820 3402 MS (l)898 3402 MS (e)926 3402 MS (s)970 3402 MS (s)1009 3402 MS ( )1048 3402 MS (S)1073 3402 MS (i)1129 3402 MS (l)1157 3402 MS (i)1185 3402 MS (c)1213 3402 MS (o)1257 3402 MS (n)1307 3402 MS ( )1357 3402 MS (G)1382 3402 MS (r)1454 3402 MS (a)1487 3402 MS (p)1531 3402 MS (h)1581 3402 MS (i)1631 3402 MS (c)1659 3402 MS (s)1703 3402 MS (,)1742 3402 MS ( )1767 3402 MS (I)1793 3402 MS (n)1825 3402 MS (c)1875 3402 MS (.)1919 3402 MS ( )1944 3402 MS (f)1970 3402 MS (r)2003 3402 MS (o)2036 3402 MS (m)2086 3402 MS ( )2164 3402 MS (a)2189 3402 MS (n)2233 3402 MS (d)2283 3402 MS ( )2333 3402 MS (a)2359 3402 MS (g)2404 3402 MS (a)2453 3402 MS (i)2497 3402 MS (n)2525 3402 MS (s)2575 3402 MS (t)2614 3402 MS ( )2642 3402 MS (a)2667 3402 MS (n)2711 3402 MS (y)2763 3402 MS ( )2811 3402 MS (l)2836 3402 MS (o)2864 3402 MS (s)2914 3402 MS (s)2953 3402 MS (,)2992 3402 MS ( )3017 3402 MS (l)3042 3402 MS (i)3070 3402 MS (a)3098 3402 MS (b)3142 3402 MS (i)3192 3402 MS (l)3220 3402 MS (i)3248 3402 MS (t)3276 3402 MS (y)3305 3402 MS (,)3353 3402 MS ( )3378 3402 MS (d)3403 3402 MS (a)3453 3402 MS (m)3497 3402 MS (a)3575 3402 MS (g)3620 3402 MS (e)3670 3402 MS (s)3714 3402 MS (,)3753 3402 MS ( )3778 3402 MS (c)3803 3402 MS (o)3847 3402 MS (s)3897 3402 MS (t)3936 3402 MS (s)3964 3402 MS ( )4003 3402 MS (o)4028 3402 MS (r)4078 3402 MS (e)490 3517 MS (x)534 3517 MS (p)585 3517 MS (e)635 3517 MS (n)679 3517 MS (s)729 3517 MS (e)768 3517 MS (s)812 3517 MS ( )851 3517 MS (\()876 3517 MS (i)909 3517 MS (n)937 3517 MS (c)987 3517 MS (l)1031 3517 MS (u)1059 3517 MS (d)1109 3517 MS (i)1159 3517 MS (n)1187 3517 MS (g)1237 3517 MS ( )1286 3517 MS (t)1311 3517 MS (h)1339 3517 MS (e)1389 3517 MS ( )1433 3517 MS (p)1458 3517 MS (a)1508 3517 MS (y)1554 3517 MS (m)1602 3517 MS (e)1681 3517 MS (n)1725 3517 MS (t)1775 3517 MS ( )1803 3517 MS (o)1828 3517 MS (f)1878 3517 MS ( )1911 3517 MS (r)1936 3517 MS (e)1970 3517 MS (a)2014 3517 MS (s)2058 3517 MS (o)2097 3517 MS (n)2147 3517 MS (a)2197 3517 MS (b)2241 3517 MS (l)2291 3517 MS (e)2320 3517 MS ( )2364 3517 MS (a)2389 3517 MS (t)2433 3517 MS (t)2461 3517 MS (o)2489 3517 MS (r)2539 3517 MS (n)2572 3517 MS (e)2622 3517 MS (y)2668 3517 MS (s)2716 3517 MS ( )2755 3517 MS (f)2780 3517 MS (e)2814 3517 MS (e)2858 3517 MS (s)2902 3517 MS (\))2941 3517 MS ( )2974 3517 MS (a)3000 3517 MS (r)3044 3517 MS (i)3077 3517 MS (s)3105 3517 MS (i)3144 3517 MS (n)3172 3517 MS (g)3223 3517 MS ( )3272 3517 MS (o)3297 3517 MS (u)3347 3517 MS (t)3397 3517 MS ( )3425 3517 MS (o)3450 3517 MS (f)3500 3517 MS ( )3533 3517 MS (R)3558 3517 MS (e)3625 3517 MS (c)3669 3517 MS (i)3713 3517 MS (p)3741 3517 MS (i)3791 3517 MS (e)3819 3517 MS (n)3863 3517 MS (t)3913 3517 MS (')3942 3517 MS (s)3959 3517 MS ( )3998 3517 MS (u)4023 3517 MS (s)4073 3517 MS (e)4112 3517 MS (,)4156 3517 MS (m)490 3632 MS (o)568 3632 MS (d)618 3632 MS (i)668 3632 MS (f)696 3632 MS (i)729 3632 MS (c)757 3632 MS (a)801 3632 MS (t)845 3632 MS (i)873 3632 MS (o)901 3632 MS (n)951 3632 MS (,)1001 3632 MS ( )1026 3632 MS (r)1051 3632 MS (e)1084 3632 MS (p)1128 3632 MS (r)1178 3632 MS (o)1211 3632 MS (d)1261 3632 MS (u)1311 3632 MS (c)1361 3632 MS (t)1405 3632 MS (i)1433 3632 MS (o)1461 3632 MS (n)1511 3632 MS ( )1561 3632 MS (a)1586 3632 MS (n)1630 3632 MS (d)1680 3632 MS ( )1730 3632 MS (d)1755 3632 MS (i)1805 3632 MS (s)1833 3632 MS (t)1872 3632 MS (r)1900 3632 MS (i)1933 3632 MS (b)1961 3632 MS (u)2011 3632 MS (t)2061 3632 MS (i)2089 3632 MS (o)2117 3632 MS (n)2167 3632 MS ( )2217 3632 MS (o)2242 3632 MS (f)2292 3632 MS ( )2325 3632 MS (t)2350 3632 MS (h)2378 3632 MS (e)2428 3632 MS ( )2472 3632 MS (C)2497 3632 MS (o)2564 3632 MS (v)2614 3632 MS (e)2664 3632 MS (r)2708 3632 MS (e)2742 3632 MS (d)2786 3632 MS ( )2836 3632 MS (C)2861 3632 MS (o)2928 3632 MS (d)2978 3632 MS (e)3028 3632 MS ( )3072 3632 MS (o)3097 3632 MS (r)3147 3632 MS ( )3180 3632 MS (o)3205 3632 MS (u)3255 3632 MS (t)3305 3632 MS ( )3333 3632 MS (o)3358 3632 MS (f)3408 3632 MS ( )3441 3632 MS (a)3467 3632 MS (n)3511 3632 MS (y)3561 3632 MS ( )3610 3632 MS (r)3636 3632 MS (e)3669 3632 MS (p)3713 3632 MS (r)3764 3632 MS (e)3797 3632 MS (s)3841 3632 MS (e)3880 3632 MS (n)3924 3632 MS (t)3974 3632 MS (a)4003 3632 MS (t)4047 3632 MS (i)4075 3632 MS (o)4103 3632 MS (n)4153 3632 MS ( )4203 3632 MS (o)4228 3632 MS (r)4278 3632 MS (w)490 3747 MS (a)562 3747 MS (r)606 3747 MS (r)639 3747 MS (a)673 3747 MS (n)717 3747 MS (t)767 3747 MS (y)796 3747 MS ( )844 3747 MS (m)869 3747 MS (a)948 3747 MS (d)992 3747 MS (e)1042 3747 MS ( )1086 3747 MS (b)1111 3747 MS (y)1163 3747 MS ( )1211 3747 MS (R)1236 3747 MS (e)1303 3747 MS (c)1347 3747 MS (i)1391 3747 MS (p)1419 3747 MS (i)1469 3747 MS (e)1497 3747 MS (n)1541 3747 MS (t)1591 3747 MS (.)1619 3747 MS (1)490 3946 MS (2)540 3946 MS (.)590 3946 MS [100 0 0 -100 0 0]/Helvetica MF ( )615 3946 MS [100 0 0 -100 0 0]/Times-Bold MF (U)790 3946 MS (.)862 3946 MS (S)887 3946 MS (.)943 3946 MS ( )968 3946 MS (G)993 3946 MS (o)1070 3946 MS (v)1120 3946 MS (e)1170 3946 MS (r)1214 3946 MS (n)1258 3946 MS (m)1315 3946 MS (e)1398 3946 MS (n)1442 3946 MS (t)1498 3946 MS ( )1531 3946 MS (E)1556 3946 MS (n)1623 3946 MS (d)1679 3946 MS ( )1735 3946 MS (U)1760 3946 MS (s)1832 3946 MS (e)1871 3946 MS (r)1915 3946 MS (s)1959 3946 MS (.)1998 3946 MS ( )2023 3946 MS [100 0 0 -100 0 0]/Times-Roman MF (T)2048 3946 MS (h)2109 3946 MS (e)2159 3946 MS ( )2203 3946 MS (C)2228 3946 MS (o)2295 3946 MS (v)2345 3946 MS (e)2395 3946 MS (r)2439 3946 MS (e)2473 3946 MS (d)2517 3946 MS ( )2567 3946 MS (C)2592 3946 MS (o)2659 3946 MS (d)2709 3946 MS (e)2759 3946 MS ( )2803 3946 MS (i)2828 3946 MS (s)2856 3946 MS ( )2895 3946 MS (a)2920 3946 MS ( )2964 3946 MS (")2990 3946 MS (c)3030 3946 MS (o)3074 3946 MS (m)3124 3946 MS (m)3202 3946 MS (e)3280 3946 MS (r)3324 3946 MS (c)3358 3946 MS (i)3402 3946 MS (a)3430 3946 MS (l)3474 3946 MS ( )3502 3946 MS (i)3527 3946 MS (t)3555 3946 MS (e)3583 3946 MS (m)3627 3946 MS (")3705 3946 MS ( )3745 3946 MS (c)3771 3946 MS (o)3815 3946 MS (n)3865 3946 MS (s)3915 3946 MS (i)3954 3946 MS (s)3982 3946 MS (t)4021 3946 MS (i)4049 3946 MS (n)4077 3946 MS (g)4127 3946 MS ( )4176 3946 MS (o)4201 3946 MS (f)4251 3946 MS (")490 4061 MS (c)530 4061 MS (o)574 4061 MS (m)624 4061 MS (m)702 4061 MS (e)780 4061 MS (r)824 4061 MS (c)858 4061 MS (i)902 4061 MS (a)930 4061 MS (l)974 4061 MS ( )1002 4061 MS (c)1027 4061 MS (o)1071 4061 MS (m)1121 4061 MS (p)1199 4061 MS (u)1249 4061 MS (t)1299 4061 MS (e)1327 4061 MS (r)1372 4061 MS ( )1405 4061 MS (s)1430 4061 MS (o)1469 4061 MS (f)1519 4061 MS (t)1552 4061 MS (w)1580 4061 MS (a)1652 4061 MS (r)1696 4061 MS (e)1730 4061 MS (")1775 4061 MS ( )1815 4061 MS (a)1840 4061 MS (s)1884 4061 MS ( )1923 4061 MS (s)1948 4061 MS (u)1987 4061 MS (c)2037 4061 MS (h)2081 4061 MS ( )2131 4061 MS (t)2156 4061 MS (e)2184 4061 MS (r)2229 4061 MS (m)2262 4061 MS (s)2340 4061 MS ( )2379 4061 MS (a)2404 4061 MS (r)2448 4061 MS (e)2482 4061 MS ( )2526 4061 MS (d)2551 4061 MS (e)2601 4061 MS (f)2645 4061 MS (i)2678 4061 MS (n)2706 4061 MS (e)2756 4061 MS (d)2800 4061 MS ( )2850 4061 MS (i)2875 4061 MS (n)2903 4061 MS ( )2953 4061 MS (t)2978 4061 MS (i)3006 4061 MS (t)3034 4061 MS (l)3062 4061 MS (e)3090 4061 MS ( )3134 4061 MS (4)3159 4061 MS (8)3209 4061 MS ( )3259 4061 MS (o)3284 4061 MS (f)3334 4061 MS ( )3367 4061 MS (t)3392 4061 MS (h)3420 4061 MS (e)3470 4061 MS ( )3514 4061 MS (C)3539 4061 MS (o)3606 4061 MS (d)3656 4061 MS (e)3706 4061 MS ( )3750 4061 MS (o)3775 4061 MS (f)3826 4061 MS ( )3859 4061 MS (F)3884 4061 MS (e)3940 4061 MS (d)3984 4061 MS (e)4034 4061 MS (r)4078 4061 MS (a)4112 4061 MS (l)4156 4061 MS (R)490 4176 MS (e)557 4176 MS (g)601 4176 MS (u)650 4176 MS (l)700 4176 MS (a)728 4176 MS (t)772 4176 MS (i)800 4176 MS (o)828 4176 MS (n)878 4176 MS (s)928 4176 MS ( )967 4176 MS (a)992 4176 MS (n)1036 4176 MS (d)1086 4176 MS ( )1136 4176 MS (a)1162 4176 MS (l)1206 4176 MS (l)1234 4176 MS ( )1262 4176 MS (U)1287 4176 MS (.)1359 4176 MS (S)1384 4176 MS (.)1440 4176 MS ( )1465 4176 MS (G)1490 4176 MS (o)1562 4176 MS (v)1612 4176 MS (e)1662 4176 MS (r)1706 4176 MS (n)1739 4176 MS (m)1789 4176 MS (e)1867 4176 MS (n)1911 4176 MS (t)1961 4176 MS ( )1989 4176 MS (E)2014 4176 MS (n)2075 4176 MS (d)2125 4176 MS ( )2175 4176 MS (U)2200 4176 MS (s)2272 4176 MS (e)2312 4176 MS (r)2356 4176 MS (s)2389 4176 MS ( )2428 4176 MS (a)2453 4176 MS (c)2497 4176 MS (q)2542 4176 MS (u)2592 4176 MS (i)2642 4176 MS (r)2670 4176 MS (e)2703 4176 MS ( )2747 4176 MS (o)2772 4176 MS (n)2822 4176 MS (l)2872 4176 MS (y)2902 4176 MS ( )2950 4176 MS (t)2975 4176 MS (h)3003 4176 MS (e)3053 4176 MS ( )3097 4176 MS (r)3122 4176 MS (i)3155 4176 MS (g)3184 4176 MS (h)3233 4176 MS (t)3283 4176 MS (s)3311 4176 MS ( )3350 4176 MS (s)3375 4176 MS (e)3414 4176 MS (t)3458 4176 MS ( )3486 4176 MS (f)3511 4176 MS (o)3544 4176 MS (r)3594 4176 MS (t)3627 4176 MS (h)3655 4176 MS ( )3705 4176 MS (i)3730 4176 MS (n)3758 4176 MS ( )3808 4176 MS (t)3833 4176 MS (h)3861 4176 MS (i)3911 4176 MS (s)3939 4176 MS ( )3978 4176 MS (L)4004 4176 MS (i)4063 4176 MS (c)4092 4176 MS (e)4136 4176 MS (n)4180 4176 MS (s)4230 4176 MS (e)4270 4176 MS (a)490 4290 MS (n)534 4290 MS (d)584 4290 MS ( )634 4290 MS (a)659 4290 MS (r)703 4290 MS (e)736 4290 MS ( )780 4290 MS (s)805 4290 MS (u)844 4290 MS (b)894 4290 MS (j)944 4290 MS (e)973 4290 MS (c)1017 4290 MS (t)1061 4290 MS ( )1089 4290 MS (t)1114 4290 MS (o)1142 4290 MS ( )1192 4290 MS (t)1217 4290 MS (h)1245 4290 MS (e)1295 4290 MS ( )1339 4290 MS (t)1364 4290 MS (e)1392 4290 MS (r)1436 4290 MS (m)1469 4290 MS (s)1547 4290 MS ( )1586 4290 MS (o)1611 4290 MS (f)1661 4290 MS ( )1694 4290 MS (t)1719 4290 MS (h)1747 4290 MS (i)1797 4290 MS (s)1825 4290 MS ( )1864 4290 MS (L)1890 4290 MS (i)1950 4290 MS (c)1978 4290 MS (e)2022 4290 MS (n)2066 4290 MS (s)2116 4290 MS (e)2156 4290 MS (.)2200 4290 MS (1)490 4489 MS (3)540 4489 MS (.)590 4489 MS [100 0 0 -100 0 0]/Helvetica MF ( )615 4489 MS [100 0 0 -100 0 0]/Times-Bold MF (M)790 4489 MS (i)884 4489 MS (s)912 4489 MS (c)951 4489 MS (e)995 4489 MS (l)1039 4489 MS (l)1067 4489 MS (a)1095 4489 MS (n)1145 4489 MS (e)1201 4489 MS (o)1245 4489 MS (u)1295 4489 MS (s)1351 4489 MS (.)1390 4489 MS ( )1415 4489 MS [100 0 0 -100 0 0]/Times-Roman MF (T)1440 4489 MS (h)1501 4489 MS (i)1551 4489 MS (s)1579 4489 MS ( )1618 4489 MS (L)1644 4489 MS (i)1703 4489 MS (c)1731 4489 MS (e)1775 4489 MS (n)1819 4489 MS (s)1869 4489 MS (e)1909 4489 MS ( )1953 4489 MS (r)1978 4489 MS (e)2011 4489 MS (p)2055 4489 MS (r)2106 4489 MS (e)2139 4489 MS (s)2183 4489 MS (e)2222 4489 MS (n)2266 4489 MS (t)2316 4489 MS (s)2344 4489 MS ( )2383 4489 MS (t)2408 4489 MS (h)2436 4489 MS (e)2486 4489 MS ( )2530 4489 MS (c)2556 4489 MS (o)2600 4489 MS (m)2650 4489 MS (p)2728 4489 MS (l)2778 4489 MS (e)2806 4489 MS (t)2850 4489 MS (e)2878 4489 MS ( )2922 4489 MS (a)2947 4489 MS (g)2992 4489 MS (r)3042 4489 MS (e)3075 4489 MS (e)3119 4489 MS (m)3163 4489 MS (e)3242 4489 MS (n)3286 4489 MS (t)3336 4489 MS ( )3364 4489 MS (c)3389 4489 MS (o)3433 4489 MS (n)3483 4489 MS (c)3533 4489 MS (e)3577 4489 MS (r)3622 4489 MS (n)3655 4489 MS (i)3705 4489 MS (n)3733 4489 MS (g)3784 4489 MS ( )3833 4489 MS (t)3858 4489 MS (h)3886 4489 MS (e)3936 4489 MS ( )3980 4489 MS (i)4005 4489 MS (t)4033 4489 MS (s)4061 4489 MS (s)490 4604 MS (u)529 4604 MS (b)579 4604 MS (j)629 4604 MS (e)657 4604 MS (c)701 4604 MS (t)745 4604 MS ( )773 4604 MS (m)798 4604 MS (a)876 4604 MS (t)920 4604 MS (t)948 4604 MS (e)976 4604 MS (r)1020 4604 MS (.)1053 4604 MS ( )1078 4604 MS (I)1104 4604 MS (f)1136 4604 MS ( )1169 4604 MS (a)1195 4604 MS (n)1239 4604 MS (y)1291 4604 MS ( )1339 4604 MS (p)1364 4604 MS (r)1414 4604 MS (o)1447 4604 MS (v)1497 4604 MS (i)1547 4604 MS (s)1575 4604 MS (i)1614 4604 MS (o)1642 4604 MS (n)1692 4604 MS ( )1742 4604 MS (o)1767 4604 MS (f)1817 4604 MS ( )1850 4604 MS (t)1875 4604 MS (h)1903 4604 MS (i)1953 4604 MS (s)1981 4604 MS ( )2020 4604 MS (L)2046 4604 MS (i)2105 4604 MS (c)2134 4604 MS (e)2178 4604 MS (n)2222 4604 MS (s)2272 4604 MS (e)2311 4604 MS ( )2355 4604 MS (i)2380 4604 MS (s)2408 4604 MS ( )2447 4604 MS (h)2472 4604 MS (e)2522 4604 MS (l)2566 4604 MS (d)2594 4604 MS ( )2644 4604 MS (t)2669 4604 MS (o)2697 4604 MS ( )2747 4604 MS (b)2772 4604 MS (e)2822 4604 MS ( )2866 4604 MS (u)2891 4604 MS (n)2941 4604 MS (e)2992 4604 MS (n)3036 4604 MS (f)3086 4604 MS (o)3119 4604 MS (r)3169 4604 MS (c)3203 4604 MS (e)3247 4604 MS (a)3292 4604 MS (b)3336 4604 MS (l)3386 4604 MS (e)3414 4604 MS (,)3458 4604 MS ( )3483 4604 MS (s)3508 4604 MS (u)3547 4604 MS (c)3597 4604 MS (h)3641 4604 MS ( )3691 4604 MS (p)3716 4604 MS (r)3766 4604 MS (o)3799 4604 MS (v)3849 4604 MS (i)3899 4604 MS (s)3927 4604 MS (i)3966 4604 MS (o)3994 4604 MS (n)4044 4604 MS ( )4094 4604 MS (s)4119 4604 MS (h)4158 4604 MS (a)4208 4604 MS (l)4252 4604 MS (l)4280 4604 MS (b)490 4719 MS (e)540 4719 MS ( )584 4719 MS (r)609 4719 MS (e)642 4719 MS (f)686 4719 MS (o)719 4719 MS (r)770 4719 MS (m)803 4719 MS (e)881 4719 MS (d)925 4719 MS ( )975 4719 MS (s)1000 4719 MS (o)1039 4719 MS ( )1089 4719 MS (a)1114 4719 MS (s)1158 4719 MS ( )1197 4719 MS (t)1222 4719 MS (o)1250 4719 MS ( )1300 4719 MS (a)1325 4719 MS (c)1370 4719 MS (h)1414 4719 MS (i)1464 4719 MS (e)1492 4719 MS (v)1536 4719 MS (e)1586 4719 MS ( )1630 4719 MS (a)1656 4719 MS (s)1700 4719 MS ( )1739 4719 MS (n)1764 4719 MS (e)1814 4719 MS (a)1858 4719 MS (r)1903 4719 MS (l)1936 4719 MS (y)1965 4719 MS ( )2013 4719 MS (a)2039 4719 MS (s)2083 4719 MS ( )2122 4719 MS (p)2147 4719 MS (o)2197 4719 MS (s)2247 4719 MS (s)2286 4719 MS (i)2325 4719 MS (b)2353 4719 MS (l)2403 4719 MS (e)2431 4719 MS ( )2475 4719 MS (t)2500 4719 MS (h)2528 4719 MS (e)2578 4719 MS ( )2622 4719 MS (s)2647 4719 MS (a)2686 4719 MS (m)2730 4719 MS (e)2808 4719 MS ( )2852 4719 MS (l)2877 4719 MS (e)2905 4719 MS (g)2950 4719 MS (a)3000 4719 MS (l)3044 4719 MS ( )3072 4719 MS (a)3097 4719 MS (n)3141 4719 MS (d)3191 4719 MS ( )3241 4719 MS (e)3266 4719 MS (c)3311 4719 MS (o)3355 4719 MS (n)3405 4719 MS (o)3455 4719 MS (m)3505 4719 MS (i)3583 4719 MS (c)3611 4719 MS ( )3655 4719 MS (e)3680 4719 MS (f)3724 4719 MS (f)3758 4719 MS (e)3791 4719 MS (c)3836 4719 MS (t)3880 4719 MS ( )3908 4719 MS (a)3933 4719 MS (s)3977 4719 MS ( )4016 4719 MS (t)4041 4719 MS (h)4069 4719 MS (e)4119 4719 MS (o)490 4834 MS (r)540 4834 MS (i)573 4834 MS (g)601 4834 MS (i)650 4834 MS (n)678 4834 MS (a)728 4834 MS (l)772 4834 MS ( )800 4834 MS (p)825 4834 MS (r)875 4834 MS (o)908 4834 MS (v)958 4834 MS (i)1008 4834 MS (s)1036 4834 MS (i)1075 4834 MS (o)1103 4834 MS (n)1153 4834 MS ( )1203 4834 MS (a)1228 4834 MS (n)1272 4834 MS (d)1322 4834 MS ( )1372 4834 MS (t)1397 4834 MS (h)1425 4834 MS (e)1475 4834 MS ( )1519 4834 MS (r)1545 4834 MS (e)1578 4834 MS (m)1622 4834 MS (a)1700 4834 MS (i)1744 4834 MS (n)1772 4834 MS (d)1822 4834 MS (e)1873 4834 MS (r)1917 4834 MS ( )1950 4834 MS (o)1975 4834 MS (f)2025 4834 MS ( )2058 4834 MS (t)2083 4834 MS (h)2111 4834 MS (i)2161 4834 MS (s)2189 4834 MS ( )2228 4834 MS (L)2254 4834 MS (i)2313 4834 MS (c)2342 4834 MS (e)2386 4834 MS (n)2430 4834 MS (s)2480 4834 MS (e)2519 4834 MS ( )2564 4834 MS (w)2589 4834 MS (i)2661 4834 MS (l)2689 4834 MS (l)2717 4834 MS ( )2745 4834 MS (r)2770 4834 MS (e)2803 4834 MS (m)2847 4834 MS (a)2925 4834 MS (i)2969 4834 MS (n)2997 4834 MS ( )3047 4834 MS (i)3072 4834 MS (n)3100 4834 MS ( )3150 4834 MS (e)3175 4834 MS (f)3219 4834 MS (f)3253 4834 MS (e)3286 4834 MS (c)3330 4834 MS (t)3374 4834 MS (.)3402 4834 MS ( )3427 4834 MS (T)3452 4834 MS (h)3513 4834 MS (i)3563 4834 MS (s)3591 4834 MS ( )3630 4834 MS (L)3656 4834 MS (i)3716 4834 MS (c)3744 4834 MS (e)3789 4834 MS (n)3833 4834 MS (s)3883 4834 MS (e)3922 4834 MS ( )3966 4834 MS (s)3991 4834 MS (h)4030 4834 MS (a)4080 4834 MS (l)4124 4834 MS (l)4152 4834 MS ( )4180 4834 MS (b)4205 4834 MS (e)4255 4834 MS (g)490 4949 MS (o)539 4949 MS (v)589 4949 MS (e)639 4949 MS (r)684 4949 MS (n)717 4949 MS (e)767 4949 MS (d)811 4949 MS ( )861 4949 MS (b)886 4949 MS (y)938 4949 MS ( )986 4949 MS (a)1011 4949 MS (n)1056 4949 MS (d)1106 4949 MS ( )1156 4949 MS (c)1181 4949 MS (o)1225 4949 MS (n)1275 4949 MS (s)1325 4949 MS (t)1364 4949 MS (r)1392 4949 MS (u)1425 4949 MS (e)1475 4949 MS (d)1519 4949 MS ( )1569 4949 MS (i)1594 4949 MS (n)1622 4949 MS ( )1672 4949 MS (a)1697 4949 MS (c)1742 4949 MS (c)1786 4949 MS (o)1830 4949 MS (r)1881 4949 MS (d)1914 4949 MS (a)1964 4949 MS (n)2008 4949 MS (c)2058 4949 MS (e)2103 4949 MS ( )2147 4949 MS (w)2172 4949 MS (i)2244 4949 MS (t)2272 4949 MS (h)2300 4949 MS ( )2350 4949 MS (t)2375 4949 MS (h)2403 4949 MS (e)2453 4949 MS ( )2497 4949 MS (l)2522 4949 MS (a)2550 4949 MS (w)2594 4949 MS (s)2666 4949 MS ( )2705 4949 MS (o)2730 4949 MS (f)2780 4949 MS ( )2813 4949 MS (t)2838 4949 MS (h)2866 4949 MS (e)2917 4949 MS ( )2961 4949 MS (U)2986 4949 MS (n)3058 4949 MS (i)3108 4949 MS (t)3136 4949 MS (e)3164 4949 MS (d)3208 4949 MS ( )3258 4949 MS (S)3283 4949 MS (t)3339 4949 MS (a)3367 4949 MS (t)3411 4949 MS (e)3439 4949 MS (s)3483 4949 MS ( )3522 4949 MS (a)3547 4949 MS (n)3591 4949 MS (d)3641 4949 MS ( )3691 4949 MS (t)3716 4949 MS (h)3744 4949 MS (e)3794 4949 MS ( )3838 4949 MS (S)3863 4949 MS (t)3919 4949 MS (a)3947 4949 MS (t)3991 4949 MS (e)4019 4949 MS ( )4063 4949 MS (o)4088 4949 MS (f)4138 4949 MS (C)490 5064 MS (a)557 5064 MS (l)601 5064 MS (i)629 5064 MS (f)657 5064 MS (o)690 5064 MS (r)740 5064 MS (n)773 5064 MS (i)823 5064 MS (a)851 5064 MS ( )895 5064 MS (a)920 5064 MS (s)964 5064 MS ( )1003 5064 MS (a)1028 5064 MS (p)1072 5064 MS (p)1122 5064 MS (l)1172 5064 MS (i)1200 5064 MS (e)1228 5064 MS (d)1272 5064 MS ( )1322 5064 MS (t)1347 5064 MS (o)1375 5064 MS ( )1425 5064 MS (a)1450 5064 MS (g)1494 5064 MS (r)1544 5064 MS (e)1578 5064 MS (e)1622 5064 MS (m)1666 5064 MS (e)1745 5064 MS (n)1789 5064 MS (t)1839 5064 MS (s)1867 5064 MS ( )1906 5064 MS (e)1931 5064 MS (n)1975 5064 MS (t)2025 5064 MS (e)2053 5064 MS (r)2097 5064 MS (e)2131 5064 MS (d)2175 5064 MS ( )2225 5064 MS (i)2250 5064 MS (n)2278 5064 MS (t)2328 5064 MS (o)2356 5064 MS ( )2406 5064 MS (a)2431 5064 MS (n)2475 5064 MS (d)2525 5064 MS ( )2575 5064 MS (t)2600 5064 MS (o)2628 5064 MS ( )2678 5064 MS (b)2703 5064 MS (e)2753 5064 MS ( )2797 5064 MS (p)2822 5064 MS (e)2872 5064 MS (r)2916 5064 MS (f)2950 5064 MS (o)2983 5064 MS (r)3033 5064 MS (m)3066 5064 MS (e)3144 5064 MS (d)3188 5064 MS ( )3238 5064 MS (e)3264 5064 MS (n)3308 5064 MS (t)3358 5064 MS (i)3386 5064 MS (r)3414 5064 MS (e)3447 5064 MS (l)3491 5064 MS (y)3519 5064 MS ( )3568 5064 MS (w)3594 5064 MS (i)3666 5064 MS (t)3694 5064 MS (h)3722 5064 MS (i)3772 5064 MS (n)3800 5064 MS ( )3850 5064 MS (C)3875 5064 MS (a)3942 5064 MS (l)3986 5064 MS (i)4014 5064 MS (f)4042 5064 MS (o)4075 5064 MS (r)4125 5064 MS (n)4158 5064 MS (i)4208 5064 MS (a)4236 5064 MS (b)490 5179 MS (e)540 5179 MS (t)584 5179 MS (w)612 5179 MS (e)684 5179 MS (e)728 5179 MS (n)772 5179 MS ( )822 5179 MS (C)847 5179 MS (a)914 5179 MS (l)958 5179 MS (i)986 5179 MS (f)1014 5179 MS (o)1047 5179 MS (r)1097 5179 MS (n)1130 5179 MS (i)1180 5179 MS (a)1209 5179 MS ( )1253 5179 MS (r)1278 5179 MS (e)1311 5179 MS (s)1355 5179 MS (i)1394 5179 MS (d)1422 5179 MS (e)1472 5179 MS (n)1516 5179 MS (t)1566 5179 MS (s)1594 5179 MS (.)1633 5179 MS ( )1658 5179 MS (A)1683 5179 MS (n)1755 5179 MS (y)1807 5179 MS ( )1855 5179 MS (l)1880 5179 MS (i)1908 5179 MS (t)1936 5179 MS (i)1964 5179 MS (g)1993 5179 MS (a)2042 5179 MS (t)2086 5179 MS (i)2114 5179 MS (o)2142 5179 MS (n)2192 5179 MS ( )2242 5179 MS (r)2267 5179 MS (e)2300 5179 MS (l)2344 5179 MS (a)2372 5179 MS (t)2416 5179 MS (i)2444 5179 MS (n)2472 5179 MS (g)2522 5179 MS ( )2572 5179 MS (t)2597 5179 MS (o)2625 5179 MS ( )2675 5179 MS (t)2700 5179 MS (h)2728 5179 MS (i)2778 5179 MS (s)2806 5179 MS ( )2845 5179 MS (L)2871 5179 MS (i)2930 5179 MS (c)2958 5179 MS (e)3003 5179 MS (n)3047 5179 MS (s)3097 5179 MS (e)3136 5179 MS ( )3180 5179 MS (s)3205 5179 MS (h)3244 5179 MS (a)3294 5179 MS (l)3338 5179 MS (l)3366 5179 MS ( )3394 5179 MS (b)3419 5179 MS (e)3469 5179 MS ( )3513 5179 MS (s)3538 5179 MS (u)3577 5179 MS (b)3627 5179 MS (j)3677 5179 MS (e)3706 5179 MS (c)3750 5179 MS (t)3794 5179 MS ( )3822 5179 MS (t)3847 5179 MS (o)3875 5179 MS ( )3925 5179 MS (t)3950 5179 MS (h)3978 5179 MS (e)4028 5179 MS (e)490 5294 MS (x)534 5294 MS (c)585 5294 MS (l)629 5294 MS (u)657 5294 MS (s)707 5294 MS (i)746 5294 MS (v)774 5294 MS (e)824 5294 MS ( )868 5294 MS (j)893 5294 MS (u)921 5294 MS (r)971 5294 MS (i)1004 5294 MS (s)1032 5294 MS (d)1071 5294 MS (i)1121 5294 MS (c)1149 5294 MS (t)1193 5294 MS (i)1221 5294 MS (o)1249 5294 MS (n)1299 5294 MS ( )1349 5294 MS (o)1374 5294 MS (f)1424 5294 MS ( )1457 5294 MS (t)1482 5294 MS (h)1510 5294 MS (e)1560 5294 MS ( )1604 5294 MS (F)1629 5294 MS (e)1684 5294 MS (d)1728 5294 MS (e)1778 5294 MS (r)1822 5294 MS (a)1856 5294 MS (l)1900 5294 MS ( )1928 5294 MS (C)1953 5294 MS (o)2020 5294 MS (u)2070 5294 MS (r)2120 5294 MS (t)2153 5294 MS (s)2181 5294 MS ( )2220 5294 MS (o)2245 5294 MS (f)2295 5294 MS ( )2328 5294 MS (t)2353 5294 MS (h)2381 5294 MS (e)2431 5294 MS ( )2475 5294 MS (N)2500 5294 MS (o)2572 5294 MS (r)2622 5294 MS (t)2655 5294 MS (h)2683 5294 MS (e)2734 5294 MS (r)2778 5294 MS (n)2811 5294 MS ( )2861 5294 MS (D)2886 5294 MS (i)2958 5294 MS (s)2986 5294 MS (t)3025 5294 MS (r)3053 5294 MS (i)3086 5294 MS (c)3114 5294 MS (t)3158 5294 MS ( )3186 5294 MS (o)3211 5294 MS (f)3261 5294 MS ( )3294 5294 MS (C)3319 5294 MS (a)3386 5294 MS (l)3430 5294 MS (i)3458 5294 MS (f)3486 5294 MS (o)3519 5294 MS (r)3569 5294 MS (n)3602 5294 MS (i)3652 5294 MS (a)3681 5294 MS ( )3725 5294 MS (\()3750 5294 MS (o)3783 5294 MS (r)3833 5294 MS (,)3866 5294 MS ( )3891 5294 MS (a)3917 5294 MS (b)3961 5294 MS (s)4011 5294 MS (e)4050 5294 MS (n)4094 5294 MS (t)4144 5294 MS (s)490 5409 MS (u)529 5409 MS (b)579 5409 MS (j)629 5409 MS (e)657 5409 MS (c)701 5409 MS (t)745 5409 MS ( )773 5409 MS (m)798 5409 MS (a)876 5409 MS (t)920 5409 MS (t)948 5409 MS (e)976 5409 MS (r)1020 5409 MS ( )1053 5409 MS (j)1078 5409 MS (u)1106 5409 MS (r)1156 5409 MS (i)1189 5409 MS (s)1217 5409 MS (d)1256 5409 MS (i)1306 5409 MS (c)1334 5409 MS (t)1378 5409 MS (i)1406 5409 MS (o)1434 5409 MS (n)1484 5409 MS ( )1534 5409 MS (i)1559 5409 MS (n)1587 5409 MS ( )1637 5409 MS (s)1662 5409 MS (u)1701 5409 MS (c)1751 5409 MS (h)1795 5409 MS ( )1845 5409 MS (c)1870 5409 MS (o)1914 5409 MS (u)1964 5409 MS (r)2014 5409 MS (t)2047 5409 MS (s)2075 5409 MS (,)2114 5409 MS ( )2139 5409 MS (t)2164 5409 MS (h)2192 5409 MS (e)2242 5409 MS ( )2286 5409 MS (c)2311 5409 MS (o)2355 5409 MS (u)2405 5409 MS (r)2456 5409 MS (t)2489 5409 MS (s)2517 5409 MS ( )2556 5409 MS (o)2581 5409 MS (f)2631 5409 MS ( )2664 5409 MS (t)2689 5409 MS (h)2717 5409 MS (e)2767 5409 MS ( )2811 5409 MS (S)2836 5409 MS (t)2892 5409 MS (a)2920 5409 MS (t)2964 5409 MS (e)2992 5409 MS ( )3036 5409 MS (o)3061 5409 MS (f)3111 5409 MS ( )3144 5409 MS (C)3169 5409 MS (a)3236 5409 MS (l)3280 5409 MS (i)3308 5409 MS (f)3336 5409 MS (o)3369 5409 MS (r)3419 5409 MS (n)3452 5409 MS (i)3502 5409 MS (a)3530 5409 MS (\))3575 5409 MS (,)3608 5409 MS ( )3633 5409 MS (w)3658 5409 MS (i)3730 5409 MS (t)3758 5409 MS (h)3786 5409 MS ( )3836 5409 MS (v)3861 5409 MS (e)3911 5409 MS (n)3955 5409 MS (u)4005 5409 MS (e)4055 5409 MS ( )4099 5409 MS (l)4124 5409 MS (y)4154 5409 MS (i)4202 5409 MS (n)4230 5409 MS (g)4281 5409 MS (e)490 5524 MS (x)534 5524 MS (c)585 5524 MS (l)629 5524 MS (u)657 5524 MS (s)707 5524 MS (i)746 5524 MS (v)774 5524 MS (e)824 5524 MS (l)868 5524 MS (y)897 5524 MS ( )944 5524 MS (i)969 5524 MS (n)997 5524 MS ( )1047 5524 MS (S)1072 5524 MS (a)1128 5524 MS (n)1172 5524 MS (t)1222 5524 MS (a)1250 5524 MS ( )1294 5524 MS (C)1319 5524 MS (l)1386 5524 MS (a)1414 5524 MS (r)1459 5524 MS (a)1492 5524 MS ( )1536 5524 MS (C)1561 5524 MS (o)1628 5524 MS (u)1678 5524 MS (n)1728 5524 MS (t)1778 5524 MS (y)1808 5524 MS (,)1856 5524 MS ( )1881 5524 MS (C)1906 5524 MS (a)1973 5524 MS (l)2017 5524 MS (i)2045 5524 MS (f)2073 5524 MS (o)2106 5524 MS (r)2156 5524 MS (n)2189 5524 MS (i)2239 5524 MS (a)2267 5524 MS (,)2311 5524 MS ( )2336 5524 MS (w)2361 5524 MS (i)2433 5524 MS (t)2461 5524 MS (h)2489 5524 MS ( )2539 5524 MS (t)2564 5524 MS (h)2592 5524 MS (e)2642 5524 MS ( )2686 5524 MS (l)2711 5524 MS (o)2739 5524 MS (s)2789 5524 MS (i)2828 5524 MS (n)2856 5524 MS (g)2906 5524 MS ( )2955 5524 MS (p)2980 5524 MS (a)3031 5524 MS (r)3075 5524 MS (t)3108 5524 MS (y)3138 5524 MS ( )3186 5524 MS (r)3211 5524 MS (e)3245 5524 MS (s)3289 5524 MS (p)3328 5524 MS (o)3378 5524 MS (n)3428 5524 MS (s)3478 5524 MS (i)3517 5524 MS (b)3545 5524 MS (l)3595 5524 MS (e)3623 5524 MS ( )3667 5524 MS (f)3692 5524 MS (o)3725 5524 MS (r)3775 5524 MS ( )3808 5524 MS (c)3833 5524 MS (o)3877 5524 MS (s)3927 5524 MS (t)3966 5524 MS (s)3994 5524 MS (,)4033 5524 MS (i)490 5639 MS (n)518 5639 MS (c)568 5639 MS (l)612 5639 MS (u)640 5639 MS (d)690 5639 MS (i)740 5639 MS (n)768 5639 MS (g)818 5639 MS ( )867 5639 MS (w)892 5639 MS (i)964 5639 MS (t)992 5639 MS (h)1020 5639 MS (o)1070 5639 MS (u)1120 5639 MS (t)1170 5639 MS ( )1198 5639 MS (l)1223 5639 MS (i)1251 5639 MS (m)1279 5639 MS (i)1357 5639 MS (t)1385 5639 MS (a)1413 5639 MS (t)1457 5639 MS (i)1485 5639 MS (o)1513 5639 MS (n)1563 5639 MS (,)1613 5639 MS ( )1638 5639 MS (c)1663 5639 MS (o)1707 5639 MS (u)1757 5639 MS (r)1807 5639 MS (t)1840 5639 MS ( )1868 5639 MS (c)1893 5639 MS (o)1937 5639 MS (s)1987 5639 MS (t)2026 5639 MS (s)2054 5639 MS ( )2093 5639 MS (a)2118 5639 MS (n)2162 5639 MS (d)2212 5639 MS ( )2262 5639 MS (r)2287 5639 MS (e)2320 5639 MS (a)2364 5639 MS (s)2408 5639 MS (o)2447 5639 MS (n)2497 5639 MS (a)2548 5639 MS (b)2592 5639 MS (l)2642 5639 MS (e)2670 5639 MS ( )2714 5639 MS (a)2739 5639 MS (t)2783 5639 MS (t)2811 5639 MS (o)2839 5639 MS (r)2889 5639 MS (n)2922 5639 MS (e)2972 5639 MS (y)3018 5639 MS (s)3066 5639 MS ( )3105 5639 MS (f)3131 5639 MS (e)3164 5639 MS (e)3208 5639 MS (s)3252 5639 MS ( )3291 5639 MS (a)3317 5639 MS (n)3361 5639 MS (d)3411 5639 MS ( )3461 5639 MS (e)3486 5639 MS (x)3530 5639 MS (p)3581 5639 MS (e)3631 5639 MS (n)3675 5639 MS (s)3725 5639 MS (e)3764 5639 MS (s)3808 5639 MS (.)3847 5639 MS ( )3872 5639 MS (T)3897 5639 MS (h)3958 5639 MS (e)4008 5639 MS (a)490 5754 MS (p)534 5754 MS (p)584 5754 MS (l)634 5754 MS (i)662 5754 MS (c)690 5754 MS (a)734 5754 MS (t)778 5754 MS (i)806 5754 MS (o)834 5754 MS (n)884 5754 MS ( )934 5754 MS (o)959 5754 MS (f)1009 5754 MS ( )1042 5754 MS (t)1067 5754 MS (h)1095 5754 MS (e)1145 5754 MS ( )1189 5754 MS (U)1214 5754 MS (n)1286 5754 MS (i)1336 5754 MS (t)1364 5754 MS (e)1392 5754 MS (d)1436 5754 MS ( )1486 5754 MS (N)1511 5754 MS (a)1584 5754 MS (t)1628 5754 MS (i)1656 5754 MS (o)1684 5754 MS (n)1734 5754 MS (s)1784 5754 MS ( )1823 5754 MS (C)1848 5754 MS (o)1915 5754 MS (n)1965 5754 MS (v)2015 5754 MS (e)2065 5754 MS (n)2109 5754 MS (t)2159 5754 MS (i)2187 5754 MS (o)2215 5754 MS (n)2265 5754 MS ( )2315 5754 MS (o)2340 5754 MS (n)2390 5754 MS ( )2440 5754 MS (C)2465 5754 MS (o)2532 5754 MS (n)2582 5754 MS (t)2632 5754 MS (r)2660 5754 MS (a)2693 5754 MS (c)2737 5754 MS (t)2781 5754 MS (s)2809 5754 MS ( )2848 5754 MS (f)2873 5754 MS (o)2906 5754 MS (r)2956 5754 MS ( )2989 5754 MS (t)3014 5754 MS (h)3042 5754 MS (e)3092 5754 MS ( )3136 5754 MS (I)3162 5754 MS (n)3194 5754 MS (t)3244 5754 MS (e)3272 5754 MS (r)3317 5754 MS (n)3350 5754 MS (a)3400 5754 MS (t)3444 5754 MS (i)3472 5754 MS (o)3500 5754 MS (n)3550 5754 MS (a)3600 5754 MS (l)3644 5754 MS ( )3672 5754 MS (S)3697 5754 MS (a)3753 5754 MS (l)3797 5754 MS (e)3825 5754 MS ( )3869 5754 MS (o)3894 5754 MS (f)3944 5754 MS ( )3977 5754 MS (G)4003 5754 MS (o)4075 5754 MS (o)4125 5754 MS (d)4175 5754 MS (s)4225 5754 MS ( )4264 5754 MS (i)4289 5754 MS (s)4317 5754 MS (e)490 5869 MS (x)534 5869 MS (p)585 5869 MS (r)635 5869 MS (e)668 5869 MS (s)712 5869 MS (s)751 5869 MS (l)790 5869 MS (y)819 5869 MS ( )867 5869 MS (e)892 5869 MS (x)936 5869 MS (c)987 5869 MS (l)1031 5869 MS (u)1059 5869 MS (d)1109 5869 MS (e)1159 5869 MS (d)1203 5869 MS (.)1253 5869 MS ( )1278 5869 MS (A)1303 5869 MS (n)1375 5869 MS (y)1427 5869 MS ( )1475 5869 MS (l)1500 5869 MS (a)1528 5869 MS (w)1572 5869 MS ( )1644 5869 MS (o)1669 5869 MS (r)1720 5869 MS ( )1753 5869 MS (r)1778 5869 MS (e)1811 5869 MS (g)1856 5869 MS (u)1905 5869 MS (l)1955 5869 MS (a)1983 5869 MS (t)2027 5869 MS (i)2055 5869 MS (o)2083 5869 MS (n)2133 5869 MS ( )2183 5869 MS (t)2208 5869 MS (h)2236 5869 MS (a)2286 5869 MS (t)2330 5869 MS ( )2358 5869 MS (p)2383 5869 MS (r)2433 5869 MS (o)2466 5869 MS (v)2516 5869 MS (i)2566 5869 MS (d)2594 5869 MS (e)2645 5869 MS (s)2689 5869 MS ( )2728 5869 MS (t)2753 5869 MS (h)2781 5869 MS (a)2831 5869 MS (t)2875 5869 MS ( )2903 5869 MS (t)2928 5869 MS (h)2956 5869 MS (e)3006 5869 MS ( )3050 5869 MS (l)3075 5869 MS (a)3103 5869 MS (n)3147 5869 MS (g)3198 5869 MS (u)3247 5869 MS (a)3297 5869 MS (g)3342 5869 MS (e)3392 5869 MS ( )3436 5869 MS (o)3461 5869 MS (f)3511 5869 MS ( )3544 5869 MS (a)3569 5869 MS ( )3613 5869 MS (c)3639 5869 MS (o)3683 5869 MS (n)3733 5869 MS (t)3783 5869 MS (r)3811 5869 MS (a)3844 5869 MS (c)3889 5869 MS (t)3933 5869 MS ( )3961 5869 MS (s)3986 5869 MS (h)4025 5869 MS (a)4075 5869 MS (l)4119 5869 MS (l)4147 5869 MS ( )4175 5869 MS (b)4200 5869 MS (e)4250 5869 MS showpage %%Page: 5 5 13.238 780.059 translate 72 600 div dup neg scale 0 0 transform .25 add round .25 sub exch .25 add round .25 sub exch itransform translate [100 0 0 -100 0 0]/Times-Roman MF (c)490 591 MS (o)534 591 MS (n)584 591 MS (s)634 591 MS (t)673 591 MS (r)701 591 MS (u)734 591 MS (e)784 591 MS (d)828 591 MS ( )878 591 MS (a)903 591 MS (g)948 591 MS (a)998 591 MS (i)1042 591 MS (n)1070 591 MS (s)1120 591 MS (t)1159 591 MS ( )1187 591 MS (t)1212 591 MS (h)1240 591 MS (e)1290 591 MS ( )1334 591 MS (d)1359 591 MS (r)1409 591 MS (a)1442 591 MS (f)1486 591 MS (t)1519 591 MS (e)1547 591 MS (r)1592 591 MS ( )1625 591 MS (s)1650 591 MS (h)1689 591 MS (a)1739 591 MS (l)1783 591 MS (l)1811 591 MS ( )1839 591 MS (n)1864 591 MS (o)1914 591 MS (t)1964 591 MS ( )1992 591 MS (a)2017 591 MS (p)2061 591 MS (p)2111 591 MS (l)2161 591 MS (y)2191 591 MS ( )2239 591 MS (t)2264 591 MS (o)2292 591 MS ( )2342 591 MS (t)2367 591 MS (h)2395 591 MS (i)2445 591 MS (s)2473 591 MS ( )2512 591 MS (L)2537 591 MS (i)2597 591 MS (c)2625 591 MS (e)2670 591 MS (n)2714 591 MS (s)2764 591 MS (e)2803 591 MS (.)2847 591 MS [100 0 0 -100 0 0]/Times-Bold MF (E)490 792 MS (x)557 792 MS (h)607 792 MS (i)663 792 MS (b)691 792 MS (i)747 792 MS (t)775 792 MS ( )808 792 MS (A)833 792 MS (L)490 988 MS (i)557 988 MS (c)585 988 MS (e)629 988 MS (n)673 988 MS (s)729 988 MS (e)768 988 MS ( )812 988 MS (A)837 988 MS (p)909 988 MS (p)965 988 MS (l)1021 988 MS (i)1049 988 MS (c)1077 988 MS (a)1121 988 MS (b)1171 988 MS (i)1227 988 MS (l)1255 988 MS (i)1283 988 MS (t)1311 988 MS (y)1344 988 MS (.)1394 988 MS ( )1419 988 MS [100 0 0 -100 0 0]/Times-Roman MF (E)1444 988 MS (x)1505 988 MS (c)1555 988 MS (e)1599 988 MS (p)1643 988 MS (t)1693 988 MS ( )1721 988 MS (t)1746 988 MS (o)1774 988 MS ( )1824 988 MS (t)1849 988 MS (h)1877 988 MS (e)1927 988 MS ( )1971 988 MS (e)1996 988 MS (x)2040 988 MS (t)2091 988 MS (e)2119 988 MS (n)2163 988 MS (t)2213 988 MS ( )2241 988 MS (p)2266 988 MS (o)2316 988 MS (r)2366 988 MS (t)2399 988 MS (i)2427 988 MS (o)2455 988 MS (n)2505 988 MS (s)2555 988 MS ( )2594 988 MS (o)2619 988 MS (f)2669 988 MS ( )2702 988 MS (t)2727 988 MS (h)2755 988 MS (i)2805 988 MS (s)2833 988 MS ( )2872 988 MS (f)2897 988 MS (i)2930 988 MS (l)2957 988 MS (e)2985 988 MS ( )3029 988 MS (a)3054 988 MS (r)3098 988 MS (e)3131 988 MS ( )3175 988 MS (m)3200 988 MS (a)3278 988 MS (d)3322 988 MS (e)3372 988 MS ( )3416 988 MS (s)3441 988 MS (u)3480 988 MS (b)3530 988 MS (j)3580 988 MS (e)3609 988 MS (c)3653 988 MS (t)3697 988 MS ( )3725 988 MS (t)3750 988 MS (o)3778 988 MS ( )3828 988 MS (a)3853 988 MS (n)3897 988 MS (a)490 1103 MS (l)534 1103 MS (t)562 1103 MS (e)590 1103 MS (r)634 1103 MS (n)667 1103 MS (a)717 1103 MS (t)761 1103 MS (i)789 1103 MS (v)817 1103 MS (e)867 1103 MS ( )911 1103 MS (l)936 1103 MS (i)964 1103 MS (c)992 1103 MS (e)1036 1103 MS (n)1080 1103 MS (s)1130 1103 MS (e)1170 1103 MS ( )1214 1103 MS (a)1239 1103 MS (s)1283 1103 MS ( )1322 1103 MS (p)1347 1103 MS (e)1397 1103 MS (r)1442 1103 MS (m)1475 1103 MS (i)1553 1103 MS (t)1581 1103 MS (t)1609 1103 MS (e)1637 1103 MS (d)1681 1103 MS ( )1731 1103 MS (i)1756 1103 MS (n)1784 1103 MS ( )1834 1103 MS (t)1859 1103 MS (h)1887 1103 MS (e)1937 1103 MS ( )1981 1103 MS (S)2006 1103 MS (G)2062 1103 MS (I)2135 1103 MS ( )2166 1103 MS (F)2192 1103 MS (r)2247 1103 MS (e)2281 1103 MS (e)2325 1103 MS ( )2369 1103 MS (S)2394 1103 MS (o)2450 1103 MS (f)2500 1103 MS (t)2533 1103 MS (w)2561 1103 MS (a)2633 1103 MS (r)2678 1103 MS (e)2711 1103 MS ( )2755 1103 MS (L)2781 1103 MS (i)2841 1103 MS (c)2869 1103 MS (e)2914 1103 MS (n)2958 1103 MS (s)3008 1103 MS (e)3047 1103 MS ( )3091 1103 MS (B)3117 1103 MS (,)3183 1103 MS ( )3208 1103 MS (V)3233 1103 MS (e)3305 1103 MS (r)3350 1103 MS (s)3383 1103 MS (i)3422 1103 MS (o)3450 1103 MS (n)3500 1103 MS ( )3550 1103 MS (1)3575 1103 MS (.)3625 1103 MS (1)3650 1103 MS ( )3700 1103 MS (\()3725 1103 MS (t)3758 1103 MS (h)3786 1103 MS (e)3836 1103 MS ( )3880 1103 MS (")3906 1103 MS (L)3947 1103 MS (i)4007 1103 MS (c)4035 1103 MS (e)4079 1103 MS (n)4123 1103 MS (s)4173 1103 MS (e)4213 1103 MS (")4257 1103 MS (\))4298 1103 MS (,)4331 1103 MS (t)490 1218 MS (h)518 1218 MS (e)568 1218 MS ( )612 1218 MS (c)637 1218 MS (o)681 1218 MS (n)731 1218 MS (t)781 1218 MS (e)809 1218 MS (n)853 1218 MS (t)903 1218 MS (s)931 1218 MS ( )970 1218 MS (o)995 1218 MS (f)1045 1218 MS ( )1078 1218 MS (t)1103 1218 MS (h)1131 1218 MS (i)1181 1218 MS (s)1209 1218 MS ( )1248 1218 MS (f)1273 1218 MS (i)1306 1218 MS (l)1334 1218 MS (e)1362 1218 MS ( )1406 1218 MS (a)1431 1218 MS (r)1475 1218 MS (e)1508 1218 MS ( )1553 1218 MS (s)1578 1218 MS (u)1617 1218 MS (b)1667 1218 MS (j)1717 1218 MS (e)1745 1218 MS (c)1789 1218 MS (t)1833 1218 MS ( )1861 1218 MS (o)1886 1218 MS (n)1936 1218 MS (l)1986 1218 MS (y)2016 1218 MS ( )2064 1218 MS (t)2089 1218 MS (o)2117 1218 MS ( )2167 1218 MS (t)2192 1218 MS (h)2220 1218 MS (e)2270 1218 MS ( )2314 1218 MS (p)2339 1218 MS (r)2389 1218 MS (o)2422 1218 MS (v)2472 1218 MS (i)2522 1218 MS (s)2550 1218 MS (i)2589 1218 MS (o)2617 1218 MS (n)2667 1218 MS (s)2717 1218 MS ( )2756 1218 MS (o)2781 1218 MS (f)2831 1218 MS ( )2864 1218 MS (t)2889 1218 MS (h)2917 1218 MS (e)2967 1218 MS ( )3011 1218 MS (L)3037 1218 MS (i)3097 1218 MS (c)3125 1218 MS (e)3170 1218 MS (n)3214 1218 MS (s)3264 1218 MS (e)3303 1218 MS (.)3347 1218 MS ( )3372 1218 MS (Y)3397 1218 MS (o)3469 1218 MS (u)3519 1218 MS ( )3569 1218 MS (m)3594 1218 MS (a)3672 1218 MS (y)3718 1218 MS ( )3766 1218 MS (n)3791 1218 MS (o)3841 1218 MS (t)3891 1218 MS ( )3919 1218 MS (u)3944 1218 MS (s)3994 1218 MS (e)4033 1218 MS ( )4077 1218 MS (t)4102 1218 MS (h)4130 1218 MS (i)4180 1218 MS (s)4208 1218 MS (f)490 1333 MS (i)523 1333 MS (l)551 1333 MS (e)579 1333 MS ( )623 1333 MS (e)648 1333 MS (x)692 1333 MS (c)743 1333 MS (e)787 1333 MS (p)831 1333 MS (t)881 1333 MS ( )909 1333 MS (i)934 1333 MS (n)962 1333 MS ( )1012 1333 MS (c)1037 1333 MS (o)1081 1333 MS (m)1131 1333 MS (p)1209 1333 MS (l)1259 1333 MS (i)1287 1333 MS (a)1315 1333 MS (n)1359 1333 MS (c)1409 1333 MS (e)1453 1333 MS ( )1497 1333 MS (w)1522 1333 MS (i)1594 1333 MS (t)1622 1333 MS (h)1650 1333 MS ( )1700 1333 MS (t)1725 1333 MS (h)1753 1333 MS (e)1803 1333 MS ( )1847 1333 MS (L)1873 1333 MS (i)1933 1333 MS (c)1961 1333 MS (e)2006 1333 MS (n)2050 1333 MS (s)2100 1333 MS (e)2139 1333 MS (.)2183 1333 MS ( )2208 1333 MS (Y)2233 1333 MS (o)2305 1333 MS (u)2355 1333 MS ( )2405 1333 MS (m)2430 1333 MS (a)2508 1333 MS (y)2554 1333 MS ( )2602 1333 MS (o)2627 1333 MS (b)2677 1333 MS (t)2727 1333 MS (a)2755 1333 MS (i)2799 1333 MS (n)2827 1333 MS ( )2877 1333 MS (a)2903 1333 MS ( )2947 1333 MS (c)2972 1333 MS (o)3016 1333 MS (p)3066 1333 MS (y)3118 1333 MS ( )3166 1333 MS (o)3191 1333 MS (f)3241 1333 MS ( )3274 1333 MS (t)3299 1333 MS (h)3327 1333 MS (e)3378 1333 MS ( )3422 1333 MS (L)3448 1333 MS (i)3507 1333 MS (c)3535 1333 MS (e)3580 1333 MS (n)3624 1333 MS (s)3674 1333 MS (e)3714 1333 MS ( )3758 1333 MS (a)3783 1333 MS (t)3827 1333 MS ( )3855 1333 MS (S)3880 1333 MS (i)3936 1333 MS (l)3964 1333 MS (i)3992 1333 MS (c)4020 1333 MS (o)4064 1333 MS (n)4114 1333 MS (G)490 1448 MS (r)562 1448 MS (a)595 1448 MS (p)639 1448 MS (h)689 1448 MS (i)739 1448 MS (c)767 1448 MS (s)811 1448 MS (,)850 1448 MS ( )875 1448 MS (I)901 1448 MS (n)933 1448 MS (c)984 1448 MS (.)1028 1448 MS (,)1053 1448 MS ( )1078 1448 MS (a)1103 1448 MS (t)1147 1448 MS (t)1175 1448 MS (n)1203 1448 MS (:)1253 1448 MS ( )1281 1448 MS (L)1307 1448 MS (e)1367 1448 MS (g)1412 1448 MS (a)1461 1448 MS (l)1505 1448 MS ( )1533 1448 MS (S)1558 1448 MS (e)1614 1448 MS (r)1658 1448 MS (v)1691 1448 MS (i)1741 1448 MS (c)1770 1448 MS (e)1814 1448 MS (s)1858 1448 MS (,)1897 1448 MS ( )1922 1448 MS (1)1947 1448 MS (6)1997 1448 MS (0)2047 1448 MS (0)2097 1448 MS ( )2147 1448 MS (A)2172 1448 MS (m)2244 1448 MS (p)2322 1448 MS (h)2372 1448 MS (i)2422 1448 MS (t)2450 1448 MS (h)2478 1448 MS (e)2528 1448 MS (a)2572 1448 MS (t)2616 1448 MS (r)2644 1448 MS (e)2678 1448 MS ( )2722 1448 MS (P)2747 1448 MS (a)2803 1448 MS (r)2847 1448 MS (k)2880 1448 MS (w)2930 1448 MS (a)3003 1448 MS (y)3049 1448 MS (,)3097 1448 MS ( )3122 1448 MS (M)3147 1448 MS (o)3236 1448 MS (u)3286 1448 MS (n)3336 1448 MS (t)3386 1448 MS (a)3414 1448 MS (i)3458 1448 MS (n)3486 1448 MS ( )3536 1448 MS (V)3561 1448 MS (i)3633 1448 MS (e)3661 1448 MS (w)3705 1448 MS (,)3777 1448 MS ( )3802 1448 MS (C)3827 1448 MS (A)3894 1448 MS ( )3966 1448 MS (9)3991 1448 MS (4)4041 1448 MS (0)4091 1448 MS (4)4141 1448 MS (3)4191 1448 MS (-)4242 1448 MS (1)490 1562 MS (3)540 1562 MS (5)590 1562 MS (1)640 1562 MS (,)690 1562 MS ( )715 1562 MS (o)740 1562 MS (r)790 1562 MS ( )823 1562 MS (a)848 1562 MS (t)892 1562 MS (:)920 1562 MS (h)490 1762 MS (t)540 1762 MS (t)568 1762 MS (p)596 1762 MS (:)646 1762 MS (/)674 1762 MS (/)702 1762 MS (o)730 1762 MS (s)780 1762 MS (s)819 1762 MS (.)858 1762 MS (s)883 1762 MS (g)922 1762 MS (i)971 1762 MS (.)999 1762 MS (c)1024 1762 MS (o)1068 1762 MS (m)1118 1762 MS (/)1196 1762 MS (p)1224 1762 MS (r)1274 1762 MS (o)1307 1762 MS (j)1357 1762 MS (e)1385 1762 MS (c)1429 1762 MS (t)1473 1762 MS (s)1501 1762 MS (/)1540 1762 MS (F)1568 1762 MS (r)1623 1762 MS (e)1656 1762 MS (e)1701 1762 MS (B)1745 1762 MS (N)490 1959 MS (o)562 1959 MS (t)612 1959 MS (e)640 1959 MS ( )684 1959 MS (t)709 1959 MS (h)737 1959 MS (a)787 1959 MS (t)831 1959 MS (,)859 1959 MS ( )884 1959 MS (a)909 1959 MS (s)953 1959 MS ( )992 1959 MS (p)1017 1959 MS (r)1067 1959 MS (o)1100 1959 MS (v)1150 1959 MS (i)1200 1959 MS (d)1228 1959 MS (e)1278 1959 MS (d)1322 1959 MS ( )1372 1959 MS (i)1397 1959 MS (n)1425 1959 MS ( )1475 1959 MS (t)1500 1959 MS (h)1528 1959 MS (e)1578 1959 MS ( )1622 1959 MS (L)1648 1959 MS (i)1708 1959 MS (c)1736 1959 MS (e)1781 1959 MS (n)1825 1959 MS (s)1875 1959 MS (e)1914 1959 MS (,)1958 1959 MS ( )1983 1959 MS (t)2008 1959 MS (h)2036 1959 MS (e)2086 1959 MS ( )2130 1959 MS (S)2155 1959 MS (o)2211 1959 MS (f)2261 1959 MS (t)2294 1959 MS (w)2322 1959 MS (a)2395 1959 MS (r)2439 1959 MS (e)2472 1959 MS ( )2516 1959 MS (i)2541 1959 MS (s)2569 1959 MS ( )2608 1959 MS (d)2633 1959 MS (i)2683 1959 MS (s)2711 1959 MS (t)2750 1959 MS (r)2778 1959 MS (i)2811 1959 MS (b)2839 1959 MS (u)2889 1959 MS (t)2939 1959 MS (e)2967 1959 MS (d)3011 1959 MS ( )3061 1959 MS (o)3086 1959 MS (n)3136 1959 MS ( )3186 1959 MS (a)3211 1959 MS (n)3255 1959 MS ( )3305 1959 MS (")3331 1959 MS (A)3371 1959 MS (S)3443 1959 MS ( )3499 1959 MS (I)3525 1959 MS (S)3557 1959 MS (")3614 1959 MS ( )3654 1959 MS (b)3679 1959 MS (a)3729 1959 MS (s)3773 1959 MS (i)3812 1959 MS (s)3840 1959 MS (,)3879 1959 MS ( )3904 1959 MS (w)3929 1959 MS (i)4001 1959 MS (t)4029 1959 MS (h)4057 1959 MS ( )4107 1959 MS (A)4132 1959 MS (L)4205 1959 MS (L)4266 1959 MS (E)490 2074 MS (X)551 2074 MS (P)623 2074 MS (R)679 2074 MS (E)746 2074 MS (S)807 2074 MS (S)863 2074 MS ( )919 2074 MS (A)944 2074 MS (N)1016 2074 MS (D)1088 2074 MS ( )1160 2074 MS (I)1186 2074 MS (M)1217 2074 MS (P)1306 2074 MS (L)1363 2074 MS (I)1424 2074 MS (E)1456 2074 MS (D)1517 2074 MS ( )1589 2074 MS (W)1614 2074 MS (A)1709 2074 MS (R)1781 2074 MS (R)1848 2074 MS (A)1915 2074 MS (N)1987 2074 MS (T)2059 2074 MS (I)2121 2074 MS (E)2153 2074 MS (S)2214 2074 MS ( )2270 2074 MS (A)2295 2074 MS (N)2367 2074 MS (D)2439 2074 MS ( )2511 2074 MS (C)2536 2074 MS (O)2603 2074 MS (N)2676 2074 MS (D)2748 2074 MS (I)2821 2074 MS (T)2853 2074 MS (I)2915 2074 MS (O)2947 2074 MS (N)3020 2074 MS (S)3092 2074 MS ( )3148 2074 MS (D)3173 2074 MS (I)3246 2074 MS (S)3278 2074 MS (C)3334 2074 MS (L)3402 2074 MS (A)3462 2074 MS (I)3534 2074 MS (M)3566 2074 MS (E)3656 2074 MS (D)3717 2074 MS (,)3789 2074 MS (I)490 2189 MS (N)522 2189 MS (C)594 2189 MS (L)662 2189 MS (U)722 2189 MS (D)795 2189 MS (I)868 2189 MS (N)900 2189 MS (G)973 2189 MS (,)1045 2189 MS ( )1070 2189 MS (W)1095 2189 MS (I)1191 2189 MS (T)1222 2189 MS (H)1284 2189 MS (O)1356 2189 MS (U)1428 2189 MS (T)1500 2189 MS ( )1561 2189 MS (L)1587 2189 MS (I)1648 2189 MS (M)1680 2189 MS (I)1771 2189 MS (T)1803 2189 MS (A)1864 2189 MS (T)1936 2189 MS (I)1998 2189 MS (O)2030 2189 MS (N)2103 2189 MS (,)2175 2189 MS ( )2200 2189 MS (A)2225 2189 MS (N)2297 2189 MS (Y)2369 2189 MS ( )2441 2189 MS (I)2468 2189 MS (M)2500 2189 MS (P)2589 2189 MS (L)2646 2189 MS (I)2707 2189 MS (E)2739 2189 MS (D)2800 2189 MS ( )2872 2189 MS (W)2897 2189 MS (A)2992 2189 MS (R)3064 2189 MS (R)3131 2189 MS (A)3198 2189 MS (N)3270 2189 MS (T)3342 2189 MS (I)3404 2189 MS (E)3436 2189 MS (S)3497 2189 MS ( )3553 2189 MS (A)3578 2189 MS (N)3650 2189 MS (D)3722 2189 MS (C)490 2304 MS (O)557 2304 MS (N)629 2304 MS (D)701 2304 MS (I)774 2304 MS (T)806 2304 MS (I)868 2304 MS (O)900 2304 MS (N)973 2304 MS (S)1045 2304 MS ( )1101 2304 MS (O)1126 2304 MS (F)1198 2304 MS ( )1253 2304 MS (M)1278 2304 MS (E)1367 2304 MS (R)1428 2304 MS (C)1495 2304 MS (H)1562 2304 MS (A)1634 2304 MS (N)1706 2304 MS (T)1778 2304 MS (A)1839 2304 MS (B)1912 2304 MS (I)1979 2304 MS (L)2012 2304 MS (I)2073 2304 MS (T)2105 2304 MS (Y)2167 2304 MS (,)2239 2304 MS ( )2264 2304 MS (S)2289 2304 MS (A)2345 2304 MS (T)2417 2304 MS (I)2479 2304 MS (S)2511 2304 MS (F)2568 2304 MS (A)2623 2304 MS (C)2695 2304 MS (T)2762 2304 MS (O)2823 2304 MS (R)2895 2304 MS (Y)2962 2304 MS ( )3034 2304 MS (Q)3059 2304 MS (U)3131 2304 MS (A)3203 2304 MS (L)3276 2304 MS (I)3337 2304 MS (T)3369 2304 MS (Y)3431 2304 MS (,)3503 2304 MS ( )3528 2304 MS (F)3553 2304 MS (I)3610 2304 MS (T)3642 2304 MS (N)3703 2304 MS (E)3775 2304 MS (S)3836 2304 MS (S)3892 2304 MS ( )3948 2304 MS (F)3973 2304 MS (O)4029 2304 MS (R)4101 2304 MS ( )4168 2304 MS (A)4193 2304 MS (P)490 2419 MS (A)546 2419 MS (R)618 2419 MS (T)685 2419 MS (I)747 2419 MS (C)778 2419 MS (U)845 2419 MS (L)918 2419 MS (A)978 2419 MS (R)1050 2419 MS ( )1117 2419 MS (P)1142 2419 MS (U)1198 2419 MS (R)1270 2419 MS (P)1337 2419 MS (O)1393 2419 MS (S)1465 2419 MS (E)1521 2419 MS (,)1582 2419 MS ( )1607 2419 MS (A)1632 2419 MS (N)1704 2419 MS (D)1776 2419 MS ( )1848 2419 MS (N)1873 2419 MS (O)1945 2419 MS (N)2017 2419 MS (-)2090 2419 MS (I)2123 2419 MS (N)2155 2419 MS (F)2228 2419 MS (R)2283 2419 MS (I)2352 2419 MS (N)2384 2419 MS (G)2456 2419 MS (E)2528 2419 MS (M)2589 2419 MS (E)2678 2419 MS (N)2740 2419 MS (T)2812 2419 MS (.)2873 2419 MS [100 0 0 -100 0 0]/Times-Bold MF (O)490 2618 MS (r)568 2618 MS (i)612 2618 MS (g)640 2618 MS (i)690 2618 MS (n)718 2618 MS (a)774 2618 MS (l)824 2618 MS ( )852 2618 MS (C)877 2618 MS (o)949 2618 MS (d)999 2618 MS (e)1055 2618 MS (.)1099 2618 MS ( )1124 2618 MS [100 0 0 -100 0 0]/Times-Roman MF (T)1149 2618 MS (h)1210 2618 MS (e)1260 2618 MS ( )1304 2618 MS (O)1329 2618 MS (r)1401 2618 MS (i)1434 2618 MS (g)1462 2618 MS (i)1511 2618 MS (n)1539 2618 MS (a)1589 2618 MS (l)1633 2618 MS ( )1661 2618 MS (C)1686 2618 MS (o)1753 2618 MS (d)1803 2618 MS (e)1853 2618 MS ( )1897 2618 MS (i)1922 2618 MS (s)1950 2618 MS (:)1989 2618 MS ( )2017 2618 MS ([)2042 2618 MS (n)2076 2618 MS (a)2126 2618 MS (m)2170 2618 MS (e)2248 2618 MS ( )2292 2618 MS (o)2317 2618 MS (f)2367 2618 MS ( )2400 2618 MS (s)2425 2618 MS (o)2464 2618 MS (f)2514 2618 MS (t)2547 2618 MS (w)2575 2618 MS (a)2648 2618 MS (r)2692 2618 MS (e)2725 2618 MS (,)2769 2618 MS ( )2794 2618 MS (v)2819 2618 MS (e)2870 2618 MS (r)2914 2618 MS (s)2947 2618 MS (i)2986 2618 MS (o)3014 2618 MS (n)3064 2618 MS ( )3114 2618 MS (n)3139 2618 MS (u)3189 2618 MS (m)3239 2618 MS (b)3317 2618 MS (e)3367 2618 MS (r)3411 2618 MS (,)3444 2618 MS ( )3469 2618 MS (a)3495 2618 MS (n)3539 2618 MS (d)3589 2618 MS ( )3639 2618 MS (r)3664 2618 MS (e)3697 2618 MS (l)3741 2618 MS (e)3769 2618 MS (a)3814 2618 MS (s)3858 2618 MS (e)3897 2618 MS ( )3941 2618 MS (d)3966 2618 MS (a)4017 2618 MS (t)4061 2618 MS (e)4089 2618 MS (])4133 2618 MS (,)4167 2618 MS (d)490 2733 MS (e)540 2733 MS (v)584 2733 MS (e)634 2733 MS (l)678 2733 MS (o)706 2733 MS (p)756 2733 MS (e)806 2733 MS (d)850 2733 MS ( )900 2733 MS (b)925 2733 MS (y)977 2733 MS ( )1025 2733 MS (S)1050 2733 MS (i)1106 2733 MS (l)1134 2733 MS (i)1162 2733 MS (c)1190 2733 MS (o)1234 2733 MS (n)1284 2733 MS ( )1334 2733 MS (G)1359 2733 MS (r)1431 2733 MS (a)1464 2733 MS (p)1508 2733 MS (h)1558 2733 MS (i)1608 2733 MS (c)1636 2733 MS (s)1680 2733 MS (,)1719 2733 MS ( )1744 2733 MS (I)1771 2733 MS (n)1803 2733 MS (c)1853 2733 MS (.)1897 2733 MS ( )1922 2733 MS (T)1947 2733 MS (h)2008 2733 MS (e)2059 2733 MS ( )2103 2733 MS (O)2128 2733 MS (r)2200 2733 MS (i)2233 2733 MS (g)2262 2733 MS (i)2311 2733 MS (n)2339 2733 MS (a)2389 2733 MS (l)2433 2733 MS ( )2461 2733 MS (C)2486 2733 MS (o)2553 2733 MS (d)2603 2733 MS (e)2653 2733 MS ( )2697 2733 MS (i)2722 2733 MS (s)2750 2733 MS ( )2789 2733 MS (C)2814 2733 MS (o)2881 2733 MS (p)2931 2733 MS (y)2982 2733 MS (r)3030 2733 MS (i)3063 2733 MS (g)3092 2733 MS (h)3141 2733 MS (t)3191 2733 MS ( )3219 2733 MS (\()3245 2733 MS (c)3278 2733 MS (\))3322 2733 MS ( )3355 2733 MS ([)3380 2733 MS (d)3414 2733 MS (a)3464 2733 MS (t)3508 2733 MS (e)3536 2733 MS (s)3580 2733 MS ( )3619 2733 MS (o)3644 2733 MS (f)3694 2733 MS ( )3727 2733 MS (f)3753 2733 MS (i)3786 2733 MS (r)3814 2733 MS (s)3847 2733 MS (t)3886 2733 MS (p)490 2848 MS (u)540 2848 MS (b)590 2848 MS (l)640 2848 MS (i)668 2848 MS (c)696 2848 MS (a)740 2848 MS (t)784 2848 MS (i)812 2848 MS (o)840 2848 MS (n)890 2848 MS (,)940 2848 MS ( )965 2848 MS (a)990 2848 MS (s)1034 2848 MS ( )1073 2848 MS (a)1098 2848 MS (p)1142 2848 MS (p)1192 2848 MS (e)1242 2848 MS (a)1286 2848 MS (r)1331 2848 MS (i)1364 2848 MS (n)1392 2848 MS (g)1443 2848 MS ( )1492 2848 MS (i)1517 2848 MS (n)1545 2848 MS ( )1595 2848 MS (t)1620 2848 MS (h)1648 2848 MS (e)1698 2848 MS ( )1742 2848 MS (N)1767 2848 MS (o)1839 2848 MS (t)1889 2848 MS (i)1917 2848 MS (c)1945 2848 MS (e)1989 2848 MS ( )2033 2848 MS (i)2058 2848 MS (n)2086 2848 MS ( )2136 2848 MS (t)2161 2848 MS (h)2189 2848 MS (e)2239 2848 MS ( )2283 2848 MS (O)2308 2848 MS (r)2381 2848 MS (i)2414 2848 MS (g)2442 2848 MS (i)2491 2848 MS (n)2519 2848 MS (a)2570 2848 MS (l)2614 2848 MS ( )2642 2848 MS (C)2667 2848 MS (o)2734 2848 MS (d)2784 2848 MS (e)2834 2848 MS (])2878 2848 MS ( )2912 2848 MS (S)2937 2848 MS (i)2993 2848 MS (l)3021 2848 MS (i)3049 2848 MS (c)3077 2848 MS (o)3121 2848 MS (n)3171 2848 MS ( )3221 2848 MS (G)3246 2848 MS (r)3318 2848 MS (a)3351 2848 MS (p)3395 2848 MS (h)3445 2848 MS (i)3495 2848 MS (c)3523 2848 MS (s)3567 2848 MS (,)3606 2848 MS ( )3631 2848 MS (I)3657 2848 MS (n)3688 2848 MS (c)3739 2848 MS (.)3783 2848 MS ( )3808 2848 MS (C)3833 2848 MS (o)3900 2848 MS (p)3950 2848 MS (y)4002 2848 MS (r)4050 2848 MS (i)4083 2848 MS (g)4112 2848 MS (h)4161 2848 MS (t)4211 2848 MS ( )4239 2848 MS (i)4264 2848 MS (n)4292 2848 MS (a)490 2962 MS (n)534 2962 MS (y)585 2962 MS ( )633 2962 MS (p)658 2962 MS (o)708 2962 MS (r)759 2962 MS (t)792 2962 MS (i)820 2962 MS (o)848 2962 MS (n)898 2962 MS (s)948 2962 MS ( )987 2962 MS (c)1012 2962 MS (r)1056 2962 MS (e)1089 2962 MS (a)1134 2962 MS (t)1178 2962 MS (e)1206 2962 MS (d)1250 2962 MS ( )1300 2962 MS (b)1325 2962 MS (y)1377 2962 MS ( )1425 2962 MS (t)1450 2962 MS (h)1478 2962 MS (i)1528 2962 MS (r)1556 2962 MS (d)1589 2962 MS ( )1639 2962 MS (p)1664 2962 MS (a)1714 2962 MS (r)1758 2962 MS (t)1791 2962 MS (i)1819 2962 MS (e)1847 2962 MS (s)1891 2962 MS ( )1930 2962 MS (i)1955 2962 MS (s)1983 2962 MS ( )2022 2962 MS (a)2047 2962 MS (s)2091 2962 MS ( )2130 2962 MS (i)2155 2962 MS (n)2183 2962 MS (d)2233 2962 MS (i)2283 2962 MS (c)2311 2962 MS (a)2356 2962 MS (t)2400 2962 MS (e)2428 2962 MS (d)2472 2962 MS ( )2522 2962 MS (e)2547 2962 MS (l)2591 2962 MS (s)2619 2962 MS (e)2658 2962 MS (w)2703 2962 MS (h)2775 2962 MS (e)2825 2962 MS (r)2869 2962 MS (e)2903 2962 MS ( )2947 2962 MS (h)2972 2962 MS (e)3022 2962 MS (r)3066 2962 MS (e)3100 2962 MS (i)3144 2962 MS (n)3172 2962 MS (.)3222 2962 MS ( )3247 2962 MS (A)3272 2962 MS (l)3344 2962 MS (l)3372 2962 MS ( )3400 2962 MS (R)3425 2962 MS (i)3492 2962 MS (g)3520 2962 MS (h)3569 2962 MS (t)3619 2962 MS (s)3647 2962 MS ( )3686 2962 MS (R)3711 2962 MS (e)3778 2962 MS (s)3822 2962 MS (e)3861 2962 MS (r)3905 2962 MS (v)3938 2962 MS (e)3989 2962 MS (d)4033 2962 MS (.)4083 2962 MS [100 0 0 -100 0 0]/Times-Bold MF (A)490 3161 MS (d)562 3161 MS (d)618 3161 MS (i)674 3161 MS (t)702 3161 MS (i)735 3161 MS (o)763 3161 MS (n)813 3161 MS (a)869 3161 MS (l)919 3161 MS ( )947 3161 MS (N)972 3161 MS (o)1044 3161 MS (t)1094 3161 MS (i)1127 3161 MS (c)1155 3161 MS (e)1199 3161 MS ( )1243 3161 MS (P)1268 3161 MS (r)1328 3161 MS (o)1372 3161 MS (v)1422 3161 MS (i)1472 3161 MS (s)1500 3161 MS (i)1539 3161 MS (o)1567 3161 MS (n)1617 3161 MS (s)1673 3161 MS (:)1712 3161 MS ( )1745 3161 MS [100 0 0 -100 0 0]/Times-Roman MF ([)1770 3161 MS (s)1804 3161 MS (u)1843 3161 MS (c)1893 3161 MS (h)1937 3161 MS ( )1987 3161 MS (a)2012 3161 MS (d)2056 3161 MS (d)2106 3161 MS (i)2156 3161 MS (t)2184 3161 MS (i)2212 3161 MS (o)2240 3161 MS (n)2290 3161 MS (a)2340 3161 MS (l)2384 3161 MS ( )2412 3161 MS (p)2437 3161 MS (r)2487 3161 MS (o)2520 3161 MS (v)2570 3161 MS (i)2620 3161 MS (s)2648 3161 MS (i)2687 3161 MS (o)2715 3161 MS (n)2765 3161 MS (s)2815 3161 MS (,)2854 3161 MS ( )2879 3161 MS (i)2904 3161 MS (f)2932 3161 MS ( )2965 3161 MS (a)2990 3161 MS (n)3034 3161 MS (y)3085 3161 MS (,)3133 3161 MS ( )3158 3161 MS (a)3184 3161 MS (s)3228 3161 MS ( )3267 3161 MS (a)3292 3161 MS (p)3336 3161 MS (p)3386 3161 MS (e)3437 3161 MS (a)3481 3161 MS (r)3525 3161 MS ( )3558 3161 MS (i)3583 3161 MS (n)3611 3161 MS ( )3661 3161 MS (t)3686 3161 MS (h)3714 3161 MS (e)3764 3161 MS ( )3808 3161 MS (N)3833 3161 MS (o)3905 3161 MS (t)3955 3161 MS (i)3983 3161 MS (c)4011 3161 MS (e)4056 3161 MS ( )4100 3161 MS (i)4125 3161 MS (n)4153 3161 MS ( )4203 3161 MS (t)4228 3161 MS (h)4256 3161 MS (e)4306 3161 MS (O)490 3275 MS (r)562 3275 MS (i)595 3275 MS (g)623 3275 MS (i)672 3275 MS (n)700 3275 MS (a)750 3275 MS (l)794 3275 MS ( )822 3275 MS (C)847 3275 MS (o)914 3275 MS (d)964 3275 MS (e)1014 3275 MS ( )1058 3275 MS (u)1083 3275 MS (n)1133 3275 MS (d)1183 3275 MS (e)1234 3275 MS (r)1278 3275 MS ( )1311 3275 MS (t)1336 3275 MS (h)1364 3275 MS (e)1414 3275 MS ( )1458 3275 MS (h)1483 3275 MS (e)1534 3275 MS (a)1578 3275 MS (d)1622 3275 MS (i)1672 3275 MS (n)1700 3275 MS (g)1751 3275 MS ( )1800 3275 MS (")1826 3275 MS (A)1866 3275 MS (d)1938 3275 MS (d)1988 3275 MS (i)2038 3275 MS (t)2066 3275 MS (i)2094 3275 MS (o)2122 3275 MS (n)2172 3275 MS (a)2222 3275 MS (l)2266 3275 MS ( )2294 3275 MS (N)2319 3275 MS (o)2391 3275 MS (t)2441 3275 MS (i)2469 3275 MS (c)2497 3275 MS (e)2541 3275 MS ( )2585 3275 MS (P)2610 3275 MS (r)2666 3275 MS (o)2699 3275 MS (v)2749 3275 MS (i)2799 3275 MS (s)2827 3275 MS (i)2866 3275 MS (o)2894 3275 MS (n)2944 3275 MS (s)2994 3275 MS (")3033 3275 MS (])3073 3275 MS showpage PageSV restore %%Trailer %%DocumentNeededFonts: %%+ Helvetica %%+ Helvetica-Bold %%+ Times-Bold %%+ Times-Roman %%DocumentSuppliedFonts: end %%Pages: 5 %%EOF --- NEW FILE jogl-README.txt --- JOGL javadoc documentation is available in the jogl-javadoc RPM package. Each JOGL source file is licensed under one of the two following licenses. See the JOGL source code for details. ============================================================================= /* * Copyright (c) 2003 Sun Microsystems, 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: * * - Redistribution of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * - Redistribution in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * * Neither the name of Sun Microsystems, Inc. or the names of * contributors may be used to endorse or promote products derived from * this software without specific prior written permission. * * This software is provided "AS IS," without a warranty of any kind. ALL * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES, * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN * MIDROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY, * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. * * You acknowledge that this software is not designed or intended for use * in the design, construction, operation or maintenance of any nuclear * facility. * * Sun gratefully acknowledges that this software was originally authored * and developed by Kenneth Bradley Russell and Christopher John Kline. */ ============================================================================= /* ** License Applicability. Except to the extent portions of this file are ** made subject to an alternative license as permitted in the SGI Free ** Software License B, Version 1.1 (the "License"), the contents of this ** file are subject only to the provisions of the License. You may not use ** this file except in compliance with the License. You may obtain a copy ** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600 ** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at: ** ** http://oss.sgi.com/projects/FreeB ** ** Note that, as provided in the License, the Software is distributed on an ** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS ** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND ** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A ** PARTICULAR PURPOSE, AND NON-INFRINGEMENT. ** ** Original Code. The Original Code is: OpenGL Sample Implementation, ** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics, ** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc. ** Copyright in any portions created by third parties is as indicated ** elsewhere herein. All Rights Reserved. ** ** Additional Notice Provisions: The application programming interfaces ** established by SGI in conjunction with the Original Code are The ** OpenGL(R) Graphics System: A Specification (Version 1.2.1), released ** April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version ** 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X ** Window System(R) (Version 1.3), released October 19, 1998. This software ** was created using the OpenGL(R) version 1.2.1 Sample Implementation ** published by SGI, but has not been independently verified as being ** compliant with the OpenGL(R) version 1.2.1 Specification. ** ** Author: Eric Veach, July 1994 ** Java Port: Pepijn Van Eeckhoudt, July 2003 ** Java Port: Nathan Parker Burg, August 2003 */ ============================================================================= --- NEW FILE jogl.properties --- ############################################################################### # The host specific properties. The build will inform you of required # properties. This file must be copied into your home directory (pointed # to by the Java system property user.home) and the copy modified appropriately. ############################################################################### # # java.home.dir is usually inferred from the java.home variable. # If it appears the build is failing because of an inability to # find e.g. JAWT or JNI headers, override this to point to the # root directory of your JDK. # # java.home.dir=C:/jdk1.4.2 # # The required antlr.jar property that is the full path to the antlr.jar # including the name of the jar # # Windows # antlr.jar=C:/Users/kbr/ANTLR/antlr-2.7.2/antlr.jar # Linux antlr.jar=/usr/share/java/antlr-2.7.4.jar # Mac OS X # antlr.jar=/Users/kbr/antlr-2.7.2/antlr.jar # Solaris # antlr.jar=/export/kbr/ANTLR/antlr-2.7.2/antlr.jar # # Force the use of jikes in +E (emacs) mode # NOTE: this is optional # #build.compiler=jikes #build.compiler.emacs=true # # If you are building on Windows with Visual C++ 6.0 and have installed # the compiler in somewhere other than the default location, modify this # to point to the absolute path of the VC98 directory # vc6.root=C:/Program Files/Microsoft Visual Studio/VC98 # # If you are building on Windows with Visual C++ 7.0 and have installed # the compiler in somewhere other than the default location, modify this # to point to the absolute path of the VC98 directory # vc7.root=C:/Program Files/Microsoft Visual Studio .NET/Vc7 # # If you are building the Cg binding (by specifying -Djogl.cg=1 to the # Ant build) and have installed the Cg SDK in somewhere other than the # default location, modify the appropriate variable to point to the # absolute path of the lib directory # windows.cg.lib=C:/Program Files/Nvidia Corporation/Cg/lib x11.cg.lib=/usr/lib --- NEW FILE jogl.spec --- Name: jogl Version: 1.1.1 Release: 1 Epoch: 0 Summary: Java bindings for the OpenGL API Group: System Environment/Libraries License: BSD URL: http://jogl.dev.java.net/ Source0: jogl-src.zip Source1: jogl.properties Source2: SGIFreeSWLicB.1.1.ps Source3: jogl-README.txt BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ant, antlr, jpackage-utils >= 0:1.5 BuildRequires: xorg-x11-devel BuildRequires: java-gcj-compat-devel >= 1.0.31 Requires(post): java-gcj-compat >= 1.0.31 Requires(postun): java-gcj-compat >= 1.0.31 %description The JOGL Project hosts a reference implementation of the Java bindings for OpenGL API, and is designed to provide hardware-supported 3D graphics to applications written in the Java programming language. Is is part of a suite of open-source technologies initiated bu the Game Technology Group at Sun Microsystems. JOGL provides full access to the APIs in the OpenGL 1.5 specification as well as nearly all vendor extensions, and integrated with the AWT and Swing widget sets. %package javadoc Summary: Javadoc for %{name} Group: Development/Documentation #BuildRequires: java-javadoc %description javadoc %{summary}. %prep %setup -q -n jogl cp %{SOURCE1} . cp %{SOURCE2} . cp %{SOURCE3} . %build (cd make && ant -Duser.home=%{_topdir}/SOURCES linux javadoc.dev.x11) # Rename the jar into a versioned jar name and create the .so version. mv build/jogl.jar build/%{name}-%{version}.jar %install rm -rf $RPM_BUILD_ROOT install -dm 755 $RPM_BUILD_ROOT%{_javadir} install -pm 644 build/%{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar install -dm 755 $RPM_BUILD_ROOT%{_libdir} install -pm 755 build/obj/libjogl.so $RPM_BUILD_ROOT%{_libdir}/libjogl.so install -dm 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} cp -pR javadoc_jogl_dev/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} aot-compile-rpm %clean rm -rf $RPM_BUILD_ROOT %post %{_bindir}/rebuild-gcj-db ldconfig %postun %{_bindir}/rebuild-gcj-db ldconfig %post javadoc rm -f %{_javadocdir}/%{name} ln -s %{name}-%{version} %{_javadocdir}/%{name} %files %defattr(644,root,root,755) %doc SGIFreeSWLicB.1.1.ps %doc jogl-README.txt %doc doc/* %{_javadir}/*.jar %{_libdir}/gcj/* %{_libdir}/*.so # %attr(-,root,root) %{_libdir}/gcj/%{name} %files javadoc %defattr(644,root,root,755) %doc %{_javadocdir}/%{name}-%{version} %ghost %doc %{_javadocdir}/%{name} %changelog * Thu Sep 1 2005 Anthony Green - 0:1.1.1-1 - Use aot-compile-rpm and other fixes from Tom Fitzsimmons. * Mon Aug 22 2005 Anthony Green - 0:1.1b12-2fc4 - Add --as-needed linker options. * Mon Jun 20 2005 Anthony Green - 0:1.1b12-1fc4 - Upgrade to 1.1 beta 12. - Rebuilt on real FC4 system. * Mon May 16 2005 Anthony Green - 0:1.1b11-1fc - Build requires xorg-x11-devel. - Switch to aot-compile from find-and-nativify. - Upgrade to 1.1 beta 11. * Sun Apr 3 2005 Anthony Green - 0:1.1b10-1fc - Created. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/jogl/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 3 Sep 2005 17:49:58 -0000 1.1 +++ .cvsignore 3 Sep 2005 17:51:45 -0000 1.2 @@ -0,0 +1 @@ +jogl-src.zip Index: sources =================================================================== RCS file: /cvs/extras/rpms/jogl/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 3 Sep 2005 17:49:58 -0000 1.1 +++ sources 3 Sep 2005 17:51:45 -0000 1.2 @@ -0,0 +1 @@ +a5d6b630a17b41227ab41506c826277b jogl-src.zip From fedora-extras-commits at redhat.com Sat Sep 3 17:51:46 2005 From: fedora-extras-commits at redhat.com (Anthony Green (green)) Date: Sat, 3 Sep 2005 13:51:46 -0400 Subject: rpms/jogl import.log,1.1,1.2 Message-ID: <200509031751.j83Hpkgq030829@cvs-int.fedora.redhat.com> Author: green Update of /cvs/extras/rpms/jogl In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30789 Modified Files: import.log Log Message: auto-import jogl-1.1.1-1 on branch devel from jogl-1.1.1-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/jogl/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 3 Sep 2005 17:49:57 -0000 1.1 +++ import.log 3 Sep 2005 17:51:44 -0000 1.2 @@ -0,0 +1 @@ +jogl-1_1_1-1:HEAD:jogl-1.1.1-1.src.rpm:1125769878 From fedora-extras-commits at redhat.com Sat Sep 3 17:55:40 2005 From: fedora-extras-commits at redhat.com (Anthony Green (green)) Date: Sat, 3 Sep 2005 13:55:40 -0400 Subject: owners owners.list,1.161,1.162 Message-ID: <200509031755.j83Htexb030895@cvs-int.fedora.redhat.com> Author: green Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30876 Modified Files: owners.list Log Message: Add entry for jogl. Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.161 retrieving revision 1.162 diff -u -r1.161 -r1.162 --- owners.list 3 Sep 2005 10:51:08 -0000 1.161 +++ owners.list 3 Sep 2005 17:55:38 -0000 1.162 @@ -336,6 +336,7 @@ Fedora Extras|jhead|Tool for displaying EXIF data embedded in JPEG images|adrian at lisas.de|extras-qa at fedoraproject.org| Fedora Extras|jikes|A Java source file to bytecode compiler|ville.skytta at iki.fi|extras-qa at fedoraproject.org| Fedora Extras|jlint|Java program checker|ville.skytta at iki.fi|extras-qa at fedoraproject.org| +Fedora Extras|jogl|Java bindings for the OpenGL API|green at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|john|John the Ripper password cracker|ghenry at suretecsystems.com|extras-qa at fedoraproject.org| Fedora Extras|jpgraph|An OO graph drawing class library for PHP|gauret at free.fr|extras-qa at fedoraproject.org| Fedora Extras|js|JavaScript interpreter|matthias at rpmforge.net|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Sat Sep 3 18:19:41 2005 From: fedora-extras-commits at redhat.com (Anthony Green (green)) Date: Sat, 3 Sep 2005 14:19:41 -0400 Subject: rpms/jogl/devel jogl.spec,1.1,1.2 Message-ID: <200509031819.j83IJfGw032250@cvs-int.fedora.redhat.com> Author: green Update of /cvs/extras/rpms/jogl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32231 Modified Files: jogl.spec Log Message: Add some debug output to the build process in order to debug the FE build. Index: jogl.spec =================================================================== RCS file: /cvs/extras/rpms/jogl/devel/jogl.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- jogl.spec 3 Sep 2005 17:51:45 -0000 1.1 +++ jogl.spec 3 Sep 2005 18:19:39 -0000 1.2 @@ -43,7 +43,8 @@ cp %{SOURCE3} . %build -(cd make && ant -Duser.home=%{_topdir}/SOURCES linux javadoc.dev.x11) +ls -l /usr/share/java +(cd make && ant -verbose -Duser.home=%{_topdir}/SOURCES linux javadoc.dev.x11) # Rename the jar into a versioned jar name and create the .so version. mv build/jogl.jar build/%{name}-%{version}.jar From fedora-extras-commits at redhat.com Sat Sep 3 18:26:18 2005 From: fedora-extras-commits at redhat.com (Anthony Green (green)) Date: Sat, 3 Sep 2005 14:26:18 -0400 Subject: rpms/jogl/devel jogl.spec,1.2,1.3 Message-ID: <200509031826.j83IQIlj032314@cvs-int.fedora.redhat.com> Author: green Update of /cvs/extras/rpms/jogl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32295 Modified Files: jogl.spec Log Message: Bumped release number. Make build more verbose. Index: jogl.spec =================================================================== RCS file: /cvs/extras/rpms/jogl/devel/jogl.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- jogl.spec 3 Sep 2005 18:19:39 -0000 1.2 +++ jogl.spec 3 Sep 2005 18:26:16 -0000 1.3 @@ -1,6 +1,6 @@ Name: jogl Version: 1.1.1 -Release: 1 +Release: 2 Epoch: 0 Summary: Java bindings for the OpenGL API @@ -96,6 +96,10 @@ %ghost %doc %{_javadocdir}/%{name} %changelog +* Sat Sep 3 2005 Anthony Green - 0:1.1.1-2 +- Make build more verbose to debug build problems on FE build + infrastructure. + * Thu Sep 1 2005 Anthony Green - 0:1.1.1-1 - Use aot-compile-rpm and other fixes from Tom Fitzsimmons. From fedora-extras-commits at redhat.com Sat Sep 3 18:33:12 2005 From: fedora-extras-commits at redhat.com (John Patrick Mahowald (jpmahowa)) Date: Sat, 3 Sep 2005 14:33:12 -0400 Subject: owners owners.list,1.162,1.163 Message-ID: <200509031833.j83IXC9D032390@cvs-int.fedora.redhat.com> Author: jpmahowa Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32369 Modified Files: owners.list Log Message: CC fixed on smeg and pyxdg Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.162 retrieving revision 1.163 diff -u -r1.162 -r1.163 --- owners.list 3 Sep 2005 17:55:38 -0000 1.162 +++ owners.list 3 Sep 2005 18:33:10 -0000 1.163 @@ -791,7 +791,7 @@ Fedora Extras|python-twisted|Event-driven networking framework written in Python|thomas at apestaart.org|extras-qa at fedoraproject.org| Fedora Extras|pygsl|GNU Scientific Library Interface for python|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| Fedora Extras|pytz|World Timezone Definitions for Python|orion at cora.nwra.com|extras-qa at fedoraproject.org| -Fedora Extras|pyxdg|PyXDG is a python library to access freedesktop.org standards|jpmahowald at gmail.com|extras-qa at fedoraproject.org|foolish at fedoraforum.org +Fedora Extras|pyxdg|PyXDG is a python library to access freedesktop.org standards|jpmahowald at gmail.com|extras-qa at fedoraproject.org|foolish at guezz.net Fedora Extras|pyzor|Pyzor collaborative spam filtering system|wtogami at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|qa-assistant|Graphical quality assurance report generator|toshio at tiki-lounge.com|extras-qa at fedoraproject.org| Fedora Extras|qascade|QT port of classic puzzle game|ville.skytta at iki.fi|extras-qa at fedoraproject.org| @@ -860,7 +860,7 @@ Fedora Extras|sirius|Othello for Gnome|compton at pcompton.com|extras-qa at fedoraproject.org| Fedora Extras|skencil|A vector drawing program|gemi at bluewin.ch|extras-qa at fedoraproject.org| Fedora Extras|skkdic|Japanese dictionaries for skk input|petersen at redhat.com|extras-qa at fedoraproject.org| -Fedora Extras|smeg|Simple menu editor for GNOME|jpmahowald at gmail.com|extras-qa at fedoraproject.org|foolish at fedoraforum.org +Fedora Extras|smeg|Simple menu editor for GNOME|jpmahowald at gmail.com|extras-qa at fedoraproject.org|foolish at guezz.net Fedora Extras|snort|An intrusion detection system|compton at pcompton.com|extras-qa at fedoraproject.org| Fedora Extras|snownews|A RSS/RDF news aggregator|shishz at hotpop.com|extras-qa at fedoraproject.org| Fedora Extras|sodipodi|Vector-based drawing program|compton at pcompton.com|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Sat Sep 3 18:34:29 2005 From: fedora-extras-commits at redhat.com (Anthony Green (green)) Date: Sat, 3 Sep 2005 14:34:29 -0400 Subject: rpms/jogl/devel jogl.spec,1.3,1.4 Message-ID: <200509031834.j83IYTrk032415@cvs-int.fedora.redhat.com> Author: green Update of /cvs/extras/rpms/jogl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32396 Modified Files: jogl.spec Log Message: BuildRequire ant-antlr Index: jogl.spec =================================================================== RCS file: /cvs/extras/rpms/jogl/devel/jogl.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- jogl.spec 3 Sep 2005 18:26:16 -0000 1.3 +++ jogl.spec 3 Sep 2005 18:34:27 -0000 1.4 @@ -1,6 +1,6 @@ Name: jogl Version: 1.1.1 -Release: 2 +Release: 3 Epoch: 0 Summary: Java bindings for the OpenGL API @@ -13,7 +13,7 @@ Source3: jogl-README.txt BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: ant, antlr, jpackage-utils >= 0:1.5 +BuildRequires: ant, antlr, ant-antlr, jpackage-utils >= 0:1.5 BuildRequires: xorg-x11-devel BuildRequires: java-gcj-compat-devel >= 1.0.31 Requires(post): java-gcj-compat >= 1.0.31 @@ -43,8 +43,7 @@ cp %{SOURCE3} . %build -ls -l /usr/share/java -(cd make && ant -verbose -Duser.home=%{_topdir}/SOURCES linux javadoc.dev.x11) +(cd make && ant -Duser.home=%{_topdir}/SOURCES linux javadoc.dev.x11) # Rename the jar into a versioned jar name and create the .so version. mv build/jogl.jar build/%{name}-%{version}.jar @@ -96,6 +95,9 @@ %ghost %doc %{_javadocdir}/%{name} %changelog +* Sat Sep 3 2005 Anthony Green - 0:1.1.1-3 +- BuildRequire ant-antlr. + * Sat Sep 3 2005 Anthony Green - 0:1.1.1-2 - Make build more verbose to debug build problems on FE build infrastructure. From fedora-extras-commits at redhat.com Sat Sep 3 18:55:29 2005 From: fedora-extras-commits at redhat.com (Anthony Green (green)) Date: Sat, 3 Sep 2005 14:55:29 -0400 Subject: rpms/jogl/devel jogl-ppc.patch,NONE,1.1 jogl.spec,1.4,1.5 Message-ID: <200509031855.j83ItTpa032518@cvs-int.fedora.redhat.com> Author: green Update of /cvs/extras/rpms/jogl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32496 Modified Files: jogl.spec Added Files: jogl-ppc.patch Log Message: Add ppc patch. jogl-ppc.patch: --- NEW FILE jogl-ppc.patch --- --- src/net/java/games/gluegen/StructLayout.java~ 2005-05-27 14:24:16.000000000 -0700 +++ src/net/java/games/gluegen/StructLayout.java 2005-09-03 11:50:26.000000000 -0700 @@ -124,6 +124,7 @@ public class StructLayout { if ((os.startsWith("windows") && cpu.equals("x86")) || (os.startsWith("linux") && cpu.equals("i386")) || (os.startsWith("linux") && cpu.equals("amd64")) || + (os.startsWith("linux") && cpu.equals("ppc")) || (os.startsWith("linux") && cpu.equals("ia64")) || (os.startsWith("sunos") && cpu.equals("sparc")) || (os.startsWith("sunos") && cpu.equals("x86")) || Index: jogl.spec =================================================================== RCS file: /cvs/extras/rpms/jogl/devel/jogl.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- jogl.spec 3 Sep 2005 18:34:27 -0000 1.4 +++ jogl.spec 3 Sep 2005 18:55:27 -0000 1.5 @@ -1,6 +1,6 @@ Name: jogl Version: 1.1.1 -Release: 3 +Release: 4 Epoch: 0 Summary: Java bindings for the OpenGL API @@ -11,6 +11,7 @@ Source1: jogl.properties Source2: SGIFreeSWLicB.1.1.ps Source3: jogl-README.txt +Patch0: jogl-ppc.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ant, antlr, ant-antlr, jpackage-utils >= 0:1.5 @@ -38,6 +39,7 @@ %prep %setup -q -n jogl +%patch0 -p0 cp %{SOURCE1} . cp %{SOURCE2} . cp %{SOURCE3} . @@ -95,6 +97,9 @@ %ghost %doc %{_javadocdir}/%{name} %changelog +* Sat Sep 3 2005 Anthony Green - 0:1.1.1-4 +- Add ppc build patch. + * Sat Sep 3 2005 Anthony Green - 0:1.1.1-3 - BuildRequire ant-antlr. From fedora-extras-commits at redhat.com Sat Sep 3 19:36:44 2005 From: fedora-extras-commits at redhat.com (Anthony Green (green)) Date: Sat, 3 Sep 2005 15:36:44 -0400 Subject: rpms/jogl/devel jogl-nojavadoclink.patch, NONE, 1.1 jogl.spec, 1.5, 1.6 Message-ID: <200509031936.j83Jai7M001435@cvs-int.fedora.redhat.com> Author: green Update of /cvs/extras/rpms/jogl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1413 Modified Files: jogl.spec Added Files: jogl-nojavadoclink.patch Log Message: Add nojavadoclink patch. jogl-nojavadoclink.patch: --- NEW FILE jogl-nojavadoclink.patch --- --- make/build.xml~ 2005-05-13 16:35:36.000000000 -0700 +++ make/build.xml 2005-09-03 12:32:23.000000000 -0700 @@ -928,8 +928,7 @@ + source="1.4" /> @@ -938,8 +937,7 @@ + source="1.4" /> @@ -949,8 +947,7 @@ + source="1.4" /> @@ -959,8 +956,7 @@ + source="1.4" /> Index: jogl.spec =================================================================== RCS file: /cvs/extras/rpms/jogl/devel/jogl.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- jogl.spec 3 Sep 2005 18:55:27 -0000 1.5 +++ jogl.spec 3 Sep 2005 19:36:42 -0000 1.6 @@ -1,6 +1,6 @@ Name: jogl Version: 1.1.1 -Release: 4 +Release: 5 Epoch: 0 Summary: Java bindings for the OpenGL API @@ -12,6 +12,7 @@ Source2: SGIFreeSWLicB.1.1.ps Source3: jogl-README.txt Patch0: jogl-ppc.patch +Patch1: jogl-nojavadoclink.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ant, antlr, ant-antlr, jpackage-utils >= 0:1.5 @@ -40,6 +41,7 @@ %prep %setup -q -n jogl %patch0 -p0 +%patch1 -p0 cp %{SOURCE1} . cp %{SOURCE2} . cp %{SOURCE3} . @@ -97,6 +99,10 @@ %ghost %doc %{_javadocdir}/%{name} %changelog +* Sat Sep 3 2005 Anthony Green - 0:1.1.1-5 +- Add nojavadoclink patch so we don't end up referencing Sun's + javadocs. + * Sat Sep 3 2005 Anthony Green - 0:1.1.1-4 - Add ppc build patch. From fedora-extras-commits at redhat.com Sat Sep 3 20:40:19 2005 From: fedora-extras-commits at redhat.com (Anthony Green (green)) Date: Sat, 3 Sep 2005 16:40:19 -0400 Subject: rpms/jogl/devel jogl-ppctools.patch,NONE,1.1 jogl.spec,1.6,1.7 Message-ID: <200509032040.j83KeJiJ002833@cvs-int.fedora.redhat.com> Author: green Update of /cvs/extras/rpms/jogl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2811 Modified Files: jogl.spec Added Files: jogl-ppctools.patch Log Message: ppc build fixes. only build for x86 and ppc for now. remove epoch:0. jogl-ppctools.patch: --- NEW FILE jogl-ppctools.patch --- *** make/build.xml.old 2005-09-03 13:17:38.000000000 -0700 --- make/build.xml 2005-09-03 13:17:46.000000000 -0700 *************** *** 202,207 **** --- 202,208 ---- + *************** *** 315,320 **** --- 316,329 ---- + + + + + + + + *************** *** 684,689 **** --- 693,702 ---- + + + + *************** *** 885,890 **** --- 898,906 ---- + + + *************** Use a platform specific target: linux, *** 1093,1098 **** --- 1109,1125 ---- + + + + + + + + + Index: jogl.spec =================================================================== RCS file: /cvs/extras/rpms/jogl/devel/jogl.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- jogl.spec 3 Sep 2005 19:36:42 -0000 1.6 +++ jogl.spec 3 Sep 2005 20:40:16 -0000 1.7 @@ -1,7 +1,8 @@ +ExclusiveArch: %{ix86} ppc + Name: jogl Version: 1.1.1 -Release: 5 -Epoch: 0 +Release: 6 Summary: Java bindings for the OpenGL API Group: System Environment/Libraries @@ -13,9 +14,10 @@ Source3: jogl-README.txt Patch0: jogl-ppc.patch Patch1: jogl-nojavadoclink.patch +Patch2: jogl-ppctools.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: ant, antlr, ant-antlr, jpackage-utils >= 0:1.5 +BuildRequires: ant, antlr, ant-antlr, jpackage-utils >= 1.5 BuildRequires: xorg-x11-devel BuildRequires: java-gcj-compat-devel >= 1.0.31 Requires(post): java-gcj-compat >= 1.0.31 @@ -42,12 +44,19 @@ %setup -q -n jogl %patch0 -p0 %patch1 -p0 +%patch2 -p0 cp %{SOURCE1} . cp %{SOURCE2} . cp %{SOURCE3} . %build -(cd make && ant -Duser.home=%{_topdir}/SOURCES linux javadoc.dev.x11) + +TARGET=linux +%ifarch ppc +TARGET=linux.ppc +%endif + +(cd make && ant -Duser.home=%{_topdir}/SOURCES $TARGET javadoc.dev.x11) # Rename the jar into a versioned jar name and create the .so version. mv build/jogl.jar build/%{name}-%{version}.jar @@ -99,6 +108,10 @@ %ghost %doc %{_javadocdir}/%{name} %changelog +* Sat Sep 3 2005 Anthony Green - 0:1.1.1-6 +- Add ppctools patch and only build for x86 and ppc for now. +- Remove Epoch. + * Sat Sep 3 2005 Anthony Green - 0:1.1.1-5 - Add nojavadoclink patch so we don't end up referencing Sun's javadocs. From fedora-extras-commits at redhat.com Sat Sep 3 21:11:03 2005 From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio)) Date: Sat, 3 Sep 2005 17:11:03 -0400 Subject: owners owners.list,1.163,1.164 Message-ID: <200509032111.j83LB3Sk004221@cvs-int.fedora.redhat.com> Author: toshio Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4200 Modified Files: owners.list Log Message: * Toshio now owns pexpect Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.163 retrieving revision 1.164 diff -u -r1.163 -r1.164 --- owners.list 3 Sep 2005 18:33:10 -0000 1.163 +++ owners.list 3 Sep 2005 21:11:01 -0000 1.164 @@ -727,7 +727,7 @@ Fedora Extras|perl-XML-Writer|A simple Perl module for writing XML documents|thm at duke.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-XML-XPath|XPath parser and evaluator for Perl|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-YAML|YAML Ain't Markup Language (tm)|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com -Fedora Extras|pexpect|Expect module for Python|pmatilai at laiskiainen.org|extras-qa at fedoraproject.org| +Fedora Extras|pexpect|Expect module for Python|toshio at tiki-lounge.com|extras-qa at fedoraproject.org| Fedora Extras|pgadmin3|Graphical client for PostgreSQL|ghenry at suretecsystems.com|extras-qa at fedoraproject.org| Fedora Extras|php-adodb|Active Data Objects Data Base|gauret at free.fr|extras-qa at fedoraproject.org| Fedora Extras|php-eaccelerator|PHP accelerator, optimizer, encoder and dynamic content cacher|matthias at rpmforge.net|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Sat Sep 3 21:49:52 2005 From: fedora-extras-commits at redhat.com (Anthony Green (green)) Date: Sat, 3 Sep 2005 17:49:52 -0400 Subject: rpms/jogl/devel jogl.spec,1.7,1.8 Message-ID: <200509032150.j83LobBc004290@cvs-int.fedora.redhat.com> Author: green Update of /cvs/extras/rpms/jogl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4270 Modified Files: jogl.spec Log Message: Clean uap javadoc handling as per ville.skytta at iki.fi's suggestions in bugzilla. Index: jogl.spec =================================================================== RCS file: /cvs/extras/rpms/jogl/devel/jogl.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- jogl.spec 3 Sep 2005 20:40:16 -0000 1.7 +++ jogl.spec 3 Sep 2005 21:49:45 -0000 1.8 @@ -2,7 +2,7 @@ Name: jogl Version: 1.1.1 -Release: 6 +Release: 7 Summary: Java bindings for the OpenGL API Group: System Environment/Libraries @@ -88,10 +88,6 @@ %{_bindir}/rebuild-gcj-db ldconfig -%post javadoc -rm -f %{_javadocdir}/%{name} -ln -s %{name}-%{version} %{_javadocdir}/%{name} - %files %defattr(644,root,root,755) %doc SGIFreeSWLicB.1.1.ps @@ -105,9 +101,13 @@ %files javadoc %defattr(644,root,root,755) %doc %{_javadocdir}/%{name}-%{version} -%ghost %doc %{_javadocdir}/%{name} +%doc %{_javadocdir}/%{name} %changelog +* Sat Sep 3 2005 Anthony Green - 0:1.1.1-7 +- Removed %ghost for javadoc, and remove javadoc post scriptlet, + as per ville.skytta at iki.fi's suggestion. + * Sat Sep 3 2005 Anthony Green - 0:1.1.1-6 - Add ppctools patch and only build for x86 and ppc for now. - Remove Epoch. From fedora-extras-commits at redhat.com Sat Sep 3 22:07:59 2005 From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez)) Date: Sat, 3 Sep 2005 18:07:59 -0400 Subject: rpms/notecase/FC-4 notecase.spec,1.11,1.12 Message-ID: <200509032207.j83M7x7h005643@cvs-int.fedora.redhat.com> Author: ivazquez Update of /cvs/extras/rpms/notecase/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5591/FC-4 Modified Files: notecase.spec Log Message: - Fixed help file path (#166562) - Use sed instead of dos2unix Index: notecase.spec =================================================================== RCS file: /cvs/extras/rpms/notecase/FC-4/notecase.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- notecase.spec 23 Jul 2005 07:53:24 -0000 1.11 +++ notecase.spec 3 Sep 2005 22:07:57 -0000 1.12 @@ -1,6 +1,6 @@ Name: notecase Version: 1.0.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A hierarchical note manager Group: Applications/Productivity @@ -11,7 +11,7 @@ Patch1: notecase-1.0.0-paths.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: gtk2-devel >= 2.4 desktop-file-utils gettext /usr/bin/dos2unix +BuildRequires: gtk2-devel >= 2.4 desktop-file-utils gettext Requires(post): desktop-file-utils shared-mime-info Requires(postun): desktop-file-utils shared-mime-info @@ -26,9 +26,10 @@ %setup -q -n notecase %patch -p1 %patch1 -p1 -b .paths -find docs -type f -exec /usr/bin/dos2unix \{\} \; -/usr/bin/dos2unix readme.txt -sed -i -e 's!\(#define HELP_FILE_PATH\).*!\1 "%{_docdir}/%{name}-%{version}/help.ncd"! +find docs -type f -exec sed -i -e 's/\r//g' \{\} \; +sed -i -e 's/\r//g' readme.txt +%define ncdhelppath %(sed 's|^%{_prefix}||' <<< "%{_docdir}") +sed -i -e 's!\(#define HELP_FILE_PATH\).*!\1 "%{ncdhelppath}/%{name}-%{version}/help.ncd"! s!\(#define LOCALE_DIR\).*!\1 "%{_datadir}/locale/"!' src/config.h %build @@ -66,6 +67,10 @@ %{_datadir}/mime/packages/%{name}.xml %changelog +* Sat Sep 3 2005 Ignacio Vazquez-Abrams 1.0.0-2 +- Fixed help file path (#166562) +- Use sed instead of dos2unix + * Sat Jul 23 2005 Ignacio Vazquez-Abrams 1.0.0-1 - Upstream update From fedora-extras-commits at redhat.com Sat Sep 3 22:08:00 2005 From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez)) Date: Sat, 3 Sep 2005 18:08:00 -0400 Subject: rpms/notecase/devel notecase.spec,1.11,1.12 Message-ID: <200509032208.j83M80WS005650@cvs-int.fedora.redhat.com> Author: ivazquez Update of /cvs/extras/rpms/notecase/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5591/devel Modified Files: notecase.spec Log Message: - Fixed help file path (#166562) - Use sed instead of dos2unix Index: notecase.spec =================================================================== RCS file: /cvs/extras/rpms/notecase/devel/notecase.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- notecase.spec 23 Jul 2005 07:53:25 -0000 1.11 +++ notecase.spec 3 Sep 2005 22:07:58 -0000 1.12 @@ -1,6 +1,6 @@ Name: notecase Version: 1.0.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A hierarchical note manager Group: Applications/Productivity @@ -11,7 +11,7 @@ Patch1: notecase-1.0.0-paths.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: gtk2-devel >= 2.4 desktop-file-utils gettext /usr/bin/dos2unix +BuildRequires: gtk2-devel >= 2.4 desktop-file-utils gettext Requires(post): desktop-file-utils shared-mime-info Requires(postun): desktop-file-utils shared-mime-info @@ -26,9 +26,10 @@ %setup -q -n notecase %patch -p1 %patch1 -p1 -b .paths -find docs -type f -exec /usr/bin/dos2unix \{\} \; -/usr/bin/dos2unix readme.txt -sed -i -e 's!\(#define HELP_FILE_PATH\).*!\1 "%{_docdir}/%{name}-%{version}/help.ncd"! +find docs -type f -exec sed -i -e 's/\r//g' \{\} \; +sed -i -e 's/\r//g' readme.txt +%define ncdhelppath %(sed 's|^%{_prefix}||' <<< "%{_docdir}") +sed -i -e 's!\(#define HELP_FILE_PATH\).*!\1 "%{ncdhelppath}/%{name}-%{version}/help.ncd"! s!\(#define LOCALE_DIR\).*!\1 "%{_datadir}/locale/"!' src/config.h %build @@ -66,6 +67,10 @@ %{_datadir}/mime/packages/%{name}.xml %changelog +* Sat Sep 3 2005 Ignacio Vazquez-Abrams 1.0.0-2 +- Fixed help file path (#166562) +- Use sed instead of dos2unix + * Sat Jul 23 2005 Ignacio Vazquez-Abrams 1.0.0-1 - Upstream update From fedora-extras-commits at redhat.com Sat Sep 3 22:07:58 2005 From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez)) Date: Sat, 3 Sep 2005 18:07:58 -0400 Subject: rpms/notecase/FC-3 notecase.spec,1.11,1.12 Message-ID: <200509032208.j83M8WL9005653@cvs-int.fedora.redhat.com> Author: ivazquez Update of /cvs/extras/rpms/notecase/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5591/FC-3 Modified Files: notecase.spec Log Message: - Fixed help file path (#166562) - Use sed instead of dos2unix Index: notecase.spec =================================================================== RCS file: /cvs/extras/rpms/notecase/FC-3/notecase.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- notecase.spec 28 Jul 2005 14:19:54 -0000 1.11 +++ notecase.spec 3 Sep 2005 22:07:56 -0000 1.12 @@ -1,6 +1,6 @@ Name: notecase Version: 1.0.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A hierarchical note manager Group: Applications/Productivity @@ -11,7 +11,7 @@ Patch1: notecase-1.0.0-paths.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: gtk2-devel >= 2.4 desktop-file-utils gettext /usr/bin/dos2unix +BuildRequires: gtk2-devel >= 2.4 desktop-file-utils gettext Requires(post): desktop-file-utils shared-mime-info Requires(postun): desktop-file-utils shared-mime-info @@ -26,9 +26,10 @@ %setup -q -n notecase %patch -p1 %patch1 -p1 -b .paths -find docs -type f -exec /usr/bin/dos2unix \{\} \; -/usr/bin/dos2unix readme.txt -sed -i -e 's!\(#define HELP_FILE_PATH\).*!\1 "%{_docdir}/%{name}-%{version}/help.ncd"! +find docs -type f -exec sed -i -e 's/\r//g' \{\} \; +sed -i -e 's/\r//g' readme.txt +%define ncdhelppath %(sed 's|^%{_prefix}||' <<< "%{_docdir}") +sed -i -e 's!\(#define HELP_FILE_PATH\).*!\1 "%{ncdhelppath}/%{name}-%{version}/help.ncd"! s!\(#define LOCALE_DIR\).*!\1 "%{_datadir}/locale/"!' src/config.h %build @@ -66,6 +67,10 @@ %{_datadir}/mime/packages/%{name}.xml %changelog +* Sat Sep 3 2005 Ignacio Vazquez-Abrams 1.0.0-2 +- Fixed help file path (#166562) +- Use sed instead of dos2unix + * Sat Jul 23 2005 Ignacio Vazquez-Abrams 1.0.0-1 - Upstream update From fedora-extras-commits at redhat.com Sat Sep 3 22:30:15 2005 From: fedora-extras-commits at redhat.com (Anthony Green (green)) Date: Sat, 3 Sep 2005 18:30:15 -0400 Subject: rpms/jogl/devel jogl.spec,1.8,1.9 Message-ID: <200509032230.j83MUFHL005762@cvs-int.fedora.redhat.com> Author: green Update of /cvs/extras/rpms/jogl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5743 Modified Files: jogl.spec Log Message: Add %{?dist} to the release tag. Index: jogl.spec =================================================================== RCS file: /cvs/extras/rpms/jogl/devel/jogl.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- jogl.spec 3 Sep 2005 21:49:45 -0000 1.8 +++ jogl.spec 3 Sep 2005 22:30:13 -0000 1.9 @@ -2,7 +2,7 @@ Name: jogl Version: 1.1.1 -Release: 7 +Release: 8%{?dist} Summary: Java bindings for the OpenGL API Group: System Environment/Libraries @@ -104,6 +104,9 @@ %doc %{_javadocdir}/%{name} %changelog +* Sat Sep 3 2005 Anthony Green - 0:1.1.1-8 +- Add %{?dist} to the release tag. + * Sat Sep 3 2005 Anthony Green - 0:1.1.1-7 - Removed %ghost for javadoc, and remove javadoc post scriptlet, as per ville.skytta at iki.fi's suggestion. From fedora-extras-commits at redhat.com Sat Sep 3 22:32:30 2005 From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio)) Date: Sat, 3 Sep 2005 18:32:30 -0400 Subject: rpms/pexpect/devel LICENSE,NONE,1.1 pexpect.spec,1.8,1.9 Message-ID: <200509032232.j83MWUfs005840@cvs-int.fedora.redhat.com> Author: toshio Update of /cvs/extras/rpms/pexpect/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5813 Modified Files: pexpect.spec Added Files: LICENSE Log Message: - Add LICENSE File. - Make noarch. - Remove executable permissions from the modules copied to examples. --- NEW FILE LICENSE --- A. HISTORY OF THE SOFTWARE ========================== Python was created in the early 1990s by Guido van Rossum at Stichting Mathematisch Centrum (CWI, see http://www.cwi.nl) in the Netherlands as a successor of a language called ABC. Guido remains Python's principal author, although it includes many contributions from others. In 1995, Guido continued his work on Python at the Corporation for National Research Initiatives (CNRI, see http://www.cnri.reston.va.us) in Reston, Virginia where he released several versions of the software. In May 2000, Guido and the Python core development team moved to BeOpen.com to form the BeOpen PythonLabs team. In October of the same year, the PythonLabs team moved to Digital Creations (now Zope Corporation, see http://www.zope.com). In 2001, the Python Software Foundation (PSF, see http://www.python.org/psf/) was formed, a non-profit organization created specifically to own Python-related Intellectual Property. Zope Corporation is a sponsoring member of the PSF. All Python releases are Open Source (see http://www.opensource.org for the Open Source Definition). Historically, most, but not all, Python releases have also been GPL-compatible; the table below summarizes the various releases. Release Derived Year Owner GPL- from compatible? (1) 0.9.0 thru 1.2 1991-1995 CWI yes 1.3 thru 1.5.2 1.2 1995-1999 CNRI yes 1.6 1.5.2 2000 CNRI no 2.0 1.6 2000 BeOpen.com no 1.6.1 1.6 2001 CNRI yes (2) 2.1 2.0+1.6.1 2001 PSF no 2.0.1 2.0+1.6.1 2001 PSF yes 2.1.1 2.1+2.0.1 2001 PSF yes 2.2 2.1.1 2001 PSF yes 2.1.2 2.1.1 2002 PSF yes 2.1.3 2.1.2 2002 PSF yes 2.2.1 2.2 2002 PSF yes 2.2.2 2.2.1 2002 PSF yes 2.2.3 2.2.2 2003 PSF yes 2.3 2.2.2 2002-2003 PSF yes 2.3.1 2.3 2002-2003 PSF yes 2.3.2 2.3.1 2002-2003 PSF yes 2.3.3 2.3.2 2002-2003 PSF yes 2.3.4 2.3.3 2004 PSF yes 2.3.5 2.3.4 2005 PSF yes 2.4 2.3 2004 PSF yes 2.4.1 2.4.1 2005 PSF yes Footnotes: (1) GPL-compatible doesn't mean that we're distributing Python under the GPL. All Python licenses, unlike the GPL, let you distribute a modified version without making your changes open source. The GPL-compatible licenses make it possible to combine Python with other software that is released under the GPL; the others don't. (2) According to Richard Stallman, 1.6.1 is not GPL-compatible, because its license has a choice of law clause. According to CNRI, however, Stallman's lawyer has told CNRI's lawyer that 1.6.1 is "not incompatible" with the GPL. Thanks to the many outside volunteers who have worked under Guido's direction to make these releases possible. B. TERMS AND CONDITIONS FOR ACCESSING OR OTHERWISE USING PYTHON =============================================================== PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2 -------------------------------------------- 1. This LICENSE AGREEMENT is between the Python Software Foundation ("PSF"), and the Individual or Organization ("Licensee") accessing and otherwise using this software ("Python") in source or binary form and its associated documentation. 2. Subject to the terms and conditions of this License Agreement, PSF hereby grants Licensee a nonexclusive, royalty-free, world-wide license to reproduce, analyze, test, perform and/or display publicly, prepare derivative works, distribute, and otherwise use Python alone or in any derivative version, provided, however, that PSF's License Agreement and PSF's notice of copyright, i.e., "Copyright (c) 2001, 2002, 2003, 2004 Python Software Foundation; All Rights Reserved" are retained in Python alone or in any derivative version prepared by Licensee. 3. In the event Licensee prepares a derivative work that is based on or incorporates Python or any part thereof, and wants to make the derivative work available to others as provided herein, then Licensee hereby agrees to include in any such work a brief summary of the changes made to Python. 4. PSF is making Python available to Licensee on an "AS IS" basis. PSF MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, PSF MAKES NO AND DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON WILL NOT INFRINGE ANY THIRD PARTY RIGHTS. 5. PSF SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON, OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF. 6. This License Agreement will automatically terminate upon a material breach of its terms and conditions. 7. Nothing in this License Agreement shall be deemed to create any relationship of agency, partnership, or joint venture between PSF and Licensee. This License Agreement does not grant permission to use PSF trademarks or trade name in a trademark sense to endorse or promote products or services of Licensee, or any third party. 8. By copying, installing or otherwise using Python, Licensee agrees to be bound by the terms and conditions of this License Agreement. BEOPEN.COM LICENSE AGREEMENT FOR PYTHON 2.0 ------------------------------------------- BEOPEN PYTHON OPEN SOURCE LICENSE AGREEMENT VERSION 1 1. This LICENSE AGREEMENT is between BeOpen.com ("BeOpen"), having an office at 160 Saratoga Avenue, Santa Clara, CA 95051, and the Individual or Organization ("Licensee") accessing and otherwise using this software in source or binary form and its associated documentation ("the Software"). 2. Subject to the terms and conditions of this BeOpen Python License Agreement, BeOpen hereby grants Licensee a non-exclusive, royalty-free, world-wide license to reproduce, analyze, test, perform and/or display publicly, prepare derivative works, distribute, and otherwise use the Software alone or in any derivative version, provided, however, that the BeOpen Python License is retained in the Software, alone or in any derivative version prepared by Licensee. 3. BeOpen is making the Software available to Licensee on an "AS IS" basis. BEOPEN MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, BEOPEN MAKES NO AND DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE SOFTWARE WILL NOT INFRINGE ANY THIRD PARTY RIGHTS. 4. BEOPEN SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF THE SOFTWARE FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS A RESULT OF USING, MODIFYING OR DISTRIBUTING THE SOFTWARE, OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF. 5. This License Agreement will automatically terminate upon a material breach of its terms and conditions. 6. This License Agreement shall be governed by and interpreted in all respects by the law of the State of California, excluding conflict of law provisions. Nothing in this License Agreement shall be deemed to create any relationship of agency, partnership, or joint venture between BeOpen and Licensee. This License Agreement does not grant permission to use BeOpen trademarks or trade names in a trademark sense to endorse or promote products or services of Licensee, or any third party. As an exception, the "BeOpen Python" logos available at http://www.pythonlabs.com/logos.html may be used according to the permissions granted on that web page. 7. By copying, installing or otherwise using the software, Licensee agrees to be bound by the terms and conditions of this License Agreement. CNRI LICENSE AGREEMENT FOR PYTHON 1.6.1 --------------------------------------- 1. This LICENSE AGREEMENT is between the Corporation for National Research Initiatives, having an office at 1895 Preston White Drive, Reston, VA 20191 ("CNRI"), and the Individual or Organization ("Licensee") accessing and otherwise using Python 1.6.1 software in source or binary form and its associated documentation. 2. Subject to the terms and conditions of this License Agreement, CNRI hereby grants Licensee a nonexclusive, royalty-free, world-wide license to reproduce, analyze, test, perform and/or display publicly, prepare derivative works, distribute, and otherwise use Python 1.6.1 alone or in any derivative version, provided, however, that CNRI's License Agreement and CNRI's notice of copyright, i.e., "Copyright (c) 1995-2001 Corporation for National Research Initiatives; All Rights Reserved" are retained in Python 1.6.1 alone or in any derivative version prepared by Licensee. Alternately, in lieu of CNRI's License Agreement, Licensee may substitute the following text (omitting the quotes): "Python 1.6.1 is made available subject to the terms and conditions in CNRI's License Agreement. This Agreement together with Python 1.6.1 may be located on the Internet using the following unique, persistent identifier (known as a handle): 1895.22/1013. This Agreement may also be obtained from a proxy server on the Internet using the following URL: http://hdl.handle.net/1895.22/1013". 3. In the event Licensee prepares a derivative work that is based on or incorporates Python 1.6.1 or any part thereof, and wants to make the derivative work available to others as provided herein, then Licensee hereby agrees to include in any such work a brief summary of the changes made to Python 1.6.1. 4. CNRI is making Python 1.6.1 available to Licensee on an "AS IS" basis. CNRI MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, CNRI MAKES NO AND DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON 1.6.1 WILL NOT INFRINGE ANY THIRD PARTY RIGHTS. 5. CNRI SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON 1.6.1 FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON 1.6.1, OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF. 6. This License Agreement will automatically terminate upon a material breach of its terms and conditions. 7. This License Agreement shall be governed by the federal intellectual property law of the United States, including without limitation the federal copyright law, and, to the extent such U.S. federal law does not apply, by the law of the Commonwealth of Virginia, excluding Virginia's conflict of law provisions. Notwithstanding the foregoing, with regard to derivative works based on Python 1.6.1 that incorporate non-separable material that was previously distributed under the GNU General Public License (GPL), the law of the Commonwealth of Virginia shall govern this License Agreement only as to issues arising under or with respect to Paragraphs 4, 5, and 7 of this License Agreement. Nothing in this License Agreement shall be deemed to create any relationship of agency, partnership, or joint venture between CNRI and Licensee. This License Agreement does not grant permission to use CNRI trademarks or trade name in a trademark sense to endorse or promote products or services of Licensee, or any third party. 8. By clicking on the "ACCEPT" button where indicated, or by copying, installing or otherwise using Python 1.6.1, Licensee agrees to be bound by the terms and conditions of this License Agreement. ACCEPT CWI LICENSE AGREEMENT FOR PYTHON 0.9.0 THROUGH 1.2 -------------------------------------------------- Copyright (c) 1991 - 1995, Stichting Mathematisch Centrum Amsterdam, The Netherlands. All rights reserved. Permission to use, copy, modify, and distribute this software and its documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all copies and that both that copyright notice and this permission notice appear in supporting documentation, and that the name of Stichting Mathematisch Centrum or CWI not be used in advertising or publicity pertaining to distribution of the software without specific, written prior permission. STICHTING MATHEMATISCH CENTRUM DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL STICHTING MATHEMATISCH CENTRUM BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. Index: pexpect.spec =================================================================== RCS file: /cvs/extras/rpms/pexpect/devel/pexpect.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- pexpect.spec 3 Sep 2005 04:20:56 -0000 1.8 +++ pexpect.spec 3 Sep 2005 22:32:28 -0000 1.9 @@ -5,17 +5,19 @@ Summary: Expect module for Python Name: pexpect Version: 0.99999b -Release: 1%{?dist} +Release: 2%{?dist} -License: PSFL +License: PSF Group: Development/Languages URL: http://pexpect.sourceforge.net Source: http://download.sourceforge.net/pexpect/%{name}-%{version}.tgz Source1: http://download.sourceforge.net/pexpect/pexpect-doc.tgz Source2: http://download.sourceforge.net/pexpect/pexpect-examples.tgz +Source10: LICENSE BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root Requires: python-abi = %{pyver} -BuildRequires: python-devel >= 2.2 +BuildRequires: python +BuildArch: noarch %description Pexpect is a pure Python module for spawning child applications; controlling @@ -35,6 +37,7 @@ %prep %setup -q -a1 -a2 rm -rf $(find . -type d -name CVS) +cp %{SOURCE10} . %build %{__python} setup.py build @@ -44,6 +47,7 @@ # These are apparently works in progress and thus not installed. But they are # needed by the chess* examples.... Moving them to examples for now. +chmod a-x ANSI.py screen.py FSM.py cp ANSI.py screen.py FSM.py examples %clean @@ -55,9 +59,14 @@ %{python_sitelib}/pexpect.pyc %ghost %{python_sitelib}/pexpect.pyo -%doc README.txt doc examples +%doc README.txt doc examples LICENSE %changelog +* Sat Sep 3 2005 Toshio Kuratomi 0.99999b-2 +- Add LICENSE File. +- Make noarch. +- Remove executable permissions from the modules copied to examples. + * Fri Sep 2 2005 Toshio Kuratomi 0.99999b - Update to version 0.99999b. - Add dist tag. From fedora-extras-commits at redhat.com Sat Sep 3 23:38:39 2005 From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma)) Date: Sat, 3 Sep 2005 19:38:39 -0400 Subject: rpms/grhino - New directory Message-ID: <200509032338.j83Ncdmm007311@cvs-int.fedora.redhat.com> Author: salimma Update of /cvs/extras/rpms/grhino In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7285/grhino Log Message: Directory /cvs/extras/rpms/grhino added to the repository From fedora-extras-commits at redhat.com Sat Sep 3 23:38:39 2005 From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma)) Date: Sat, 3 Sep 2005 19:38:39 -0400 Subject: rpms/grhino/devel - New directory Message-ID: <200509032338.j83NcdXt007316@cvs-int.fedora.redhat.com> Author: salimma Update of /cvs/extras/rpms/grhino/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7285/grhino/devel Log Message: Directory /cvs/extras/rpms/grhino/devel added to the repository From fedora-extras-commits at redhat.com Sat Sep 3 23:38:56 2005 From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma)) Date: Sat, 3 Sep 2005 19:38:56 -0400 Subject: rpms/grhino Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200509032338.j83Ncu6l007367@cvs-int.fedora.redhat.com> Author: salimma Update of /cvs/extras/rpms/grhino In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7332 Added Files: Makefile import.log Log Message: Setup of module grhino --- NEW FILE Makefile --- # Top level Makefile for module grhino all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Sat Sep 3 23:38:56 2005 From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma)) Date: Sat, 3 Sep 2005 19:38:56 -0400 Subject: rpms/grhino/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200509032339.j83NcuY8007372@cvs-int.fedora.redhat.com> Author: salimma Update of /cvs/extras/rpms/grhino/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7332/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module grhino --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Sat Sep 3 23:41:00 2005 From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma)) Date: Sat, 3 Sep 2005 19:41:00 -0400 Subject: rpms/grhino import.log,1.1,1.2 Message-ID: <200509032341.j83Nf0V3007470@cvs-int.fedora.redhat.com> Author: salimma Update of /cvs/extras/rpms/grhino In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7433 Modified Files: import.log Log Message: auto-import grhino-0.15.0-2.fc4 on branch devel from grhino-0.15.0-2.fc4.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/grhino/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 3 Sep 2005 23:38:54 -0000 1.1 +++ import.log 3 Sep 2005 23:40:58 -0000 1.2 @@ -0,0 +1 @@ +grhino-0_15_0-2_fc4:HEAD:grhino-0.15.0-2.fc4.src.rpm:1125790852 From fedora-extras-commits at redhat.com Sat Sep 3 23:41:00 2005 From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma)) Date: Sat, 3 Sep 2005 19:41:00 -0400 Subject: rpms/grhino/devel grhino-Makefile-in.patch, NONE, 1.1 grhino.desktop, NONE, 1.1 grhino.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200509032341.j83Nf0ZS007480@cvs-int.fedora.redhat.com> Author: salimma Update of /cvs/extras/rpms/grhino/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7433/devel Modified Files: .cvsignore sources Added Files: grhino-Makefile-in.patch grhino.desktop grhino.spec Log Message: auto-import grhino-0.15.0-2.fc4 on branch devel from grhino-0.15.0-2.fc4.src.rpm grhino-Makefile-in.patch: --- NEW FILE grhino-Makefile-in.patch --- diff -ru grhino-0.15.0-orig/Makefile.in grhino-0.15.0/Makefile.in --- grhino-0.15.0-orig/Makefile.in 2005-04-15 09:03:04.000000000 -0500 +++ grhino-0.15.0/Makefile.in 2005-08-20 16:33:54.000000000 -0500 @@ -444,82 +444,82 @@ $(adBeginSubdir) $@ $(adEndSubdir) install_mkdir : - if [ ! -e "$(bindir)" ]; then \ - mkdir -p "$(bindir)"; \ - chmod 755 "$(bindir)"; \ - fi - if [ ! -e "$(pattern_dir)" ]; then \ - mkdir -p "$(pattern_dir)"; \ - chmod 755 "$(pattern_dir)"; \ - fi - if [ ! -e "$(book_dir)" ]; then \ - mkdir -p "$(book_dir)"; \ - chmod 755 "$(book_dir)"; \ - fi - if [ ! -e "$(theme_dir)" ]; then \ - mkdir -p "$(theme_dir)"; \ - chmod 755 "$(theme_dir)"; \ - fi - if [ ! -e "$(theme_dir)/small" ]; then \ - mkdir -p "$(theme_dir)/small"; \ - chmod 755 "$(theme_dir)/small"; \ - fi - if [ ! -e "$(helpdir)" ]; then \ - mkdir -p "$(helpdir)"; \ - chmod 755 "$(helpdir)"; \ - fi - if [ ! -e "$(helpdir)/C" ]; then \ - mkdir -p "$(helpdir)/C"; \ - chmod 755 "$(helpdir)/C"; \ - fi - if [ ! -e "$(helpdir)/C/figures" ]; then \ - mkdir -p "$(helpdir)/C/figures"; \ - chmod 755 "$(helpdir)/C/figures"; \ + if [ ! -e "$(DESTDIR)$(bindir)" ]; then \ + mkdir -p "$(DESTDIR)$(bindir)"; \ + chmod 755 "$(DESTDIR)$(bindir)"; \ + fi + if [ ! -e "$(DESTDIR)$(pattern_dir)" ]; then \ + mkdir -p "$(DESTDIR)$(pattern_dir)"; \ + chmod 755 "$(DESTDIR)$(pattern_dir)"; \ + fi + if [ ! -e "$(DESTDIR)$(book_dir)" ]; then \ + mkdir -p "$(DESTDIR)$(book_dir)"; \ + chmod 755 "$(DESTDIR)$(book_dir)"; \ + fi + if [ ! -e "$(DESTDIR)$(theme_dir)" ]; then \ + mkdir -p "$(DESTDIR)$(theme_dir)"; \ + chmod 755 "$(DESTDIR)$(theme_dir)"; \ + fi + if [ ! -e "$(DESTDIR)$(theme_dir)/small" ]; then \ + mkdir -p "$(DESTDIR)$(theme_dir)/small"; \ + chmod 755 "$(DESTDIR)$(theme_dir)/small"; \ + fi + if [ ! -e "$(DESTDIR)$(helpdir)" ]; then \ + mkdir -p "$(DESTDIR)$(helpdir)"; \ + chmod 755 "$(DESTDIR)$(helpdir)"; \ + fi + if [ ! -e "$(DESTDIR)$(helpdir)/C" ]; then \ + mkdir -p "$(DESTDIR)$(helpdir)/C"; \ + chmod 755 "$(DESTDIR)$(helpdir)/C"; \ + fi + if [ ! -e "$(DESTDIR)$(helpdir)/C/figures" ]; then \ + mkdir -p "$(DESTDIR)$(helpdir)/C/figures"; \ + chmod 755 "$(DESTDIR)$(helpdir)/C/figures"; \ fi install : install_mkdir - -$(INSTALL_PROGRAM) grhino "$(bindir)/grhino" - -$(INSTALL_PROGRAM) gtp-rhino "$(bindir)/gtp-rhino" - $(INSTALL_DATA) "$(srcdir)/row1.bin" "$(pattern_dir)/row1.bin" - $(INSTALL_DATA) "$(srcdir)/row2.bin" "$(pattern_dir)/row2.bin" - $(INSTALL_DATA) "$(srcdir)/row3.bin" "$(pattern_dir)/row3.bin" - $(INSTALL_DATA) "$(srcdir)/row4.bin" "$(pattern_dir)/row4.bin" - $(INSTALL_DATA) "$(srcdir)/diag1.bin" "$(pattern_dir)/diag1.bin" - $(INSTALL_DATA) "$(srcdir)/diag2.bin" "$(pattern_dir)/diag2.bin" - $(INSTALL_DATA) "$(srcdir)/diag3.bin" "$(pattern_dir)/diag3.bin" - $(INSTALL_DATA) "$(srcdir)/diag4.bin" "$(pattern_dir)/diag4.bin" - $(INSTALL_DATA) "$(srcdir)/diag5.bin" "$(pattern_dir)/diag5.bin" - $(INSTALL_DATA) "$(srcdir)/corner5x2.bin" "$(pattern_dir)/corner5x2.bin" - $(INSTALL_DATA) "$(srcdir)/book.bin" "$(book_dir)/book.bin" - $(INSTALL_DATA) "$(srcdir)/help/C/legal.xml" "$(helpdir)/C/legal.xml" - -scrollkeeper-preinstall "$(helpdir)/C/grhino.xml" \ - "$(srcdir)/help/C/grhino-C.omf.in" "$(helpdir)/C/grhino-C.omf" - $(INSTALL_DATA) "$(srcdir)/help/C/grhino.xml" "$(helpdir)/C/grhino.xml" + -$(INSTALL_PROGRAM) grhino "$(DESTDIR)$(bindir)/grhino" + -$(INSTALL_PROGRAM) gtp-rhino "$(DESTDIR)$(bindir)/gtp-rhino" + $(INSTALL_DATA) "$(srcdir)/row1.bin" "$(DESTDIR)$(pattern_dir)/row1.bin" + $(INSTALL_DATA) "$(srcdir)/row2.bin" "$(DESTDIR)$(pattern_dir)/row2.bin" + $(INSTALL_DATA) "$(srcdir)/row3.bin" "$(DESTDIR)$(pattern_dir)/row3.bin" + $(INSTALL_DATA) "$(srcdir)/row4.bin" "$(DESTDIR)$(pattern_dir)/row4.bin" + $(INSTALL_DATA) "$(srcdir)/diag1.bin" "$(DESTDIR)$(pattern_dir)/diag1.bin" + $(INSTALL_DATA) "$(srcdir)/diag2.bin" "$(DESTDIR)$(pattern_dir)/diag2.bin" + $(INSTALL_DATA) "$(srcdir)/diag3.bin" "$(DESTDIR)$(pattern_dir)/diag3.bin" + $(INSTALL_DATA) "$(srcdir)/diag4.bin" "$(DESTDIR)$(pattern_dir)/diag4.bin" + $(INSTALL_DATA) "$(srcdir)/diag5.bin" "$(DESTDIR)$(pattern_dir)/diag5.bin" + $(INSTALL_DATA) "$(srcdir)/corner5x2.bin" "$(DESTDIR)$(pattern_dir)/corner5x2.bin" + $(INSTALL_DATA) "$(srcdir)/book.bin" "$(DESTDIR)$(book_dir)/book.bin" + $(INSTALL_DATA) "$(srcdir)/help/C/legal.xml" "$(DESTDIR)$(helpdir)/C/legal.xml" + -scrollkeeper-preinstall "$(DESTDIR)$(helpdir)/C/grhino.xml" \ + "$(srcdir)/help/C/grhino-C.omf.in" "$(DESTDIR)$(helpdir)/C/grhino-C.omf" + $(INSTALL_DATA) "$(srcdir)/help/C/grhino.xml" "$(DESTDIR)$(helpdir)/C/grhino.xml" $(INSTALL_DATA) "$(srcdir)/help/C/figures/gamelist.png" \ - "$(helpdir)/C/figures/gamelist.png" + "$(DESTDIR)$(helpdir)/C/figures/gamelist.png" $(INSTALL_DATA) "$(srcdir)/help/C/figures/history.png" \ - "$(helpdir)/C/figures/history.png" + "$(DESTDIR)$(helpdir)/C/figures/history.png" $(INSTALL_DATA) "$(srcdir)/help/C/figures/mainwindow.png" \ - "$(helpdir)/C/figures/mainwindow.png" + "$(DESTDIR)$(helpdir)/C/figures/mainwindow.png" $(INSTALL_DATA) "$(srcdir)/help/C/figures/pattern.png" \ - "$(helpdir)/C/figures/pattern.png" + "$(DESTDIR)$(helpdir)/C/figures/pattern.png" $(INSTALL_DATA) "$(srcdir)/help/C/figures/prefs-ai.png" \ - "$(helpdir)/C/figures/prefs-ai.png" + "$(DESTDIR)$(helpdir)/C/figures/prefs-ai.png" $(INSTALL_DATA) "$(srcdir)/help/C/figures/prefs-board.png" \ - "$(helpdir)/C/figures/prefs-board.png" + "$(DESTDIR)$(helpdir)/C/figures/prefs-board.png" $(INSTALL_DATA) "$(srcdir)/help/C/figures/prefs-theme.png" \ - "$(helpdir)/C/figures/prefs-theme.png" - $(INSTALL_DATA) "$(srcdir)/theme/small/black.xpm" "$(theme_dir)/small/black.xpm" - $(INSTALL_DATA) "$(srcdir)/theme/small/black_last.xpm" "$(theme_dir)/small/black_last.xpm" - $(INSTALL_DATA) "$(srcdir)/theme/small/bottom.xpm" "$(theme_dir)/small/bottom.xpm" - $(INSTALL_DATA) "$(srcdir)/theme/small/empty.xpm" "$(theme_dir)/small/empty.xpm" - $(INSTALL_DATA) "$(srcdir)/theme/small/hint_black.xpm" "$(theme_dir)/small/hint_black.xpm" - $(INSTALL_DATA) "$(srcdir)/theme/small/hint_white.xpm" "$(theme_dir)/small/hint_white.xpm" - $(INSTALL_DATA) "$(srcdir)/theme/small/left.xpm" "$(theme_dir)/small/left.xpm" - $(INSTALL_DATA) "$(srcdir)/theme/small/right.xpm" "$(theme_dir)/small/right.xpm" - $(INSTALL_DATA) "$(srcdir)/theme/small/top.xpm" "$(theme_dir)/small/top.xpm" - $(INSTALL_DATA) "$(srcdir)/theme/small/white.xpm" "$(theme_dir)/small/white.xpm" - $(INSTALL_DATA) "$(srcdir)/theme/small/white_last.xpm" "$(theme_dir)/small/white_last.xpm" + "$(DESTDIR)$(helpdir)/C/figures/prefs-theme.png" + $(INSTALL_DATA) "$(srcdir)/theme/small/black.xpm" "$(DESTDIR)$(theme_dir)/small/black.xpm" + $(INSTALL_DATA) "$(srcdir)/theme/small/black_last.xpm" "$(DESTDIR)$(theme_dir)/small/black_last.xpm" + $(INSTALL_DATA) "$(srcdir)/theme/small/bottom.xpm" "$(DESTDIR)$(theme_dir)/small/bottom.xpm" + $(INSTALL_DATA) "$(srcdir)/theme/small/empty.xpm" "$(DESTDIR)$(theme_dir)/small/empty.xpm" + $(INSTALL_DATA) "$(srcdir)/theme/small/hint_black.xpm" "$(DESTDIR)$(theme_dir)/small/hint_black.xpm" + $(INSTALL_DATA) "$(srcdir)/theme/small/hint_white.xpm" "$(DESTDIR)$(theme_dir)/small/hint_white.xpm" + $(INSTALL_DATA) "$(srcdir)/theme/small/left.xpm" "$(DESTDIR)$(theme_dir)/small/left.xpm" + $(INSTALL_DATA) "$(srcdir)/theme/small/right.xpm" "$(DESTDIR)$(theme_dir)/small/right.xpm" + $(INSTALL_DATA) "$(srcdir)/theme/small/top.xpm" "$(DESTDIR)$(theme_dir)/small/top.xpm" + $(INSTALL_DATA) "$(srcdir)/theme/small/white.xpm" "$(DESTDIR)$(theme_dir)/small/white.xpm" + $(INSTALL_DATA) "$(srcdir)/theme/small/white_last.xpm" "$(DESTDIR)$(theme_dir)/small/white_last.xpm" if [ ! "@GMSGFMT@" = ":" ]; then \ cd po; \ $(MAKE) prefix="$(prefix)" DESTDIR="$(DESTDIR)" install; \ --- NEW FILE grhino.desktop --- [Desktop Entry] Encoding=UTF-8 Name=GRhino GenericName=GNOME2 Othello/Reversi game Comment=An Othello/Reversi game for GNOME 2 Exec=grhino #Icon= Terminal=false Type=Application Version=0.15.0 Categories=Application;GNOME;Game;BoardGame; StartupNotify=true --- NEW FILE grhino.spec --- Name: grhino Version: 0.15.0 Release: 2%{?dist} Summary: Othello/Reversi game Group: Amusements/Games License: GPL URL: http://rhino.sourceforge.net/ Source0: http://dl.sourceforge.net/rhino/grhino-%{version}.tar.gz Source1: %{name}.desktop Patch0: grhino-Makefile-in.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils BuildRequires: libgnomeui-devel BuildRequires: scrollkeeper #Requires: Requires(post): scrollkeeper Requires(postun): scrollkeeper %description GRhino, or Rhino its former name, is an Othello/Reversi game on Linux and other UNIX-like systems as long as GNOME 2 libraries are installed. It is currently under development and a new version is available occasionally. What distinguish GRhino from most other Othello games is that GRhino will be targeted for experienced Othello players. Strong AI is the main focus with some additional good, useful features (like an endgame solver) is planned. The ultimate target strength of the AI is that it should be able to beat the best human player at the highest difficulty level. Beating Logistello (the strongest program available) is not in the plan :) GRhino supports the Go/Game Text Protocol (GTP), allowing it to be used as an engine for a GTP-compliant controller like Quarry. Othello is a registered trademark of Tsukuda Original, licensed by Anjar Co., copyright 1973, 1990 Pressman Toy Corporation. %prep %setup -q %patch0 -p1 %build %configure make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT # move omf files mkdir -p $RPM_BUILD_ROOT%{_datadir}/omf/grhino/ mv $RPM_BUILD_ROOT%{_datadir}/gnome/help/grhino/*/grhino-*.omf $RPM_BUILD_ROOT%{_datadir}/omf/grhino/ # desktop file #mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications desktop-file-install --vendor fedora \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ --add-category X-Fedora \ %{SOURCE1} %find_lang %{name} %post scrollkeeper-update -q -o %{_datadir}/omf/%{name} || : %postun scrollkeeper-update -q || : %clean rm -rf $RPM_BUILD_ROOT %files -f %{name}.lang %defattr(-,root,root,-) %doc ChangeLog COPYING NEWS README TODO %{_bindir}/grhino %{_bindir}/gtp-rhino %{_datadir}/applications/*.desktop #%{_datadir}/locale/*/LC_MESSAGES/quarry.mo %{_datadir}/gnome/help/grhino/ %{_datadir}/grhino-%{version}/ %{_datadir}/omf/grhino/ %changelog * Fri Sep 2 2005 Michel Salim - 0.15.0-2 - changed BuildReq from libgnome-devel to libgnomeui-devel, which requires the former * Sat Aug 20 2005 Michel Salim - 0.15.0-1 - initial package Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/grhino/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 3 Sep 2005 23:38:54 -0000 1.1 +++ .cvsignore 3 Sep 2005 23:40:58 -0000 1.2 @@ -0,0 +1 @@ +grhino-0.15.0.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/grhino/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 3 Sep 2005 23:38:54 -0000 1.1 +++ sources 3 Sep 2005 23:40:58 -0000 1.2 @@ -0,0 +1 @@ +9f510356c0cfafe32165a582d872655f grhino-0.15.0.tar.gz From fedora-extras-commits at redhat.com Sat Sep 3 23:44:48 2005 From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma)) Date: Sat, 3 Sep 2005 19:44:48 -0400 Subject: owners owners.list,1.164,1.165 Message-ID: <200509032344.j83Nim7u007543@cvs-int.fedora.redhat.com> Author: salimma Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7519 Modified Files: owners.list Log Message: Added grhino to owners.list Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.164 retrieving revision 1.165 diff -u -r1.164 -r1.165 --- owners.list 3 Sep 2005 21:11:01 -0000 1.164 +++ owners.list 3 Sep 2005 23:44:46 -0000 1.165 @@ -269,6 +269,7 @@ Fedora Extras|gramps|Genealogical Research and Analysis Management Programming System|bdpepple at ameritech.net|extras-qa at fedoraproject.org| Fedora Extras|graphviz|Graph Visualization Tools|oliver at linux-kernel.at|extras-qa at fedoraproject.org|ellson at research.att.com Fedora Extras|graveman|A frontend for cdrtools, dvd+rw-tools and sox|gemi at bluewin.ch|extras-qa at fedoraproject.org| +Fedora Extras|grhino|Othello/Reversi game|michel.salim at gmail.com|extras-qa at fedoraproject.org| Fedora Extras|grip|Front-end for CD rippers and Ogg Vorbis encoders|adrian at lisas.de|extras-qa at fedoraproject.org| Fedora Extras|grisbi|Personal finances manager|gauret at free.fr|extras-qa at fedoraproject.org| Fedora Extras|gstreamer-python|Python bindings for GStreamer|thomas at apestaart.org|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Sat Sep 3 23:48:54 2005 From: fedora-extras-commits at redhat.com (Marc Maurer (uwog)) Date: Sat, 3 Sep 2005 19:48:54 -0400 Subject: owners owners.list,1.165,1.166 Message-ID: <200509032348.j83Nmsr5007588@cvs-int.fedora.redhat.com> Author: uwog Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7569 Modified Files: owners.list Log Message: Update email address Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.165 retrieving revision 1.166 diff -u -r1.165 -r1.166 --- owners.list 3 Sep 2005 23:44:46 -0000 1.165 +++ owners.list 3 Sep 2005 23:48:52 -0000 1.166 @@ -12,11 +12,11 @@ Fedora Extras|abcde|A Better CD Encoder|ville.skytta at iki.fi|extras-qa at fedoraproject.org| Fedora Extras|abe|A scrolling, platform-jumping, ancient pyramid exploring game|pmatilai at laiskiainen.org|extras-qa at fedoraproject.org| Fedora Extras|abicheck|ABI checking tool|bugs.michael at gmx.net|extras-qa at fedoraproject.org| -Fedora Extras|abiword|The AbiWord word processor|j.m.maurer at student.utwente.nl|extras-qa at fedoraproject.org| +Fedora Extras|abiword|The AbiWord word processor|uwog at uwog.net|extras-qa at fedoraproject.org| Fedora Extras|adns|Advanced, easy to use, asynchronous-capable DNS client library|colin at fedoraproject.org|extras-qa at fedoraproject.org| Fedora Extras|advancecomp|Recompression utilities for .PNG, .MNG and .ZIP files|matthias at rpmforge.net|extras-qa at fedoraproject.org| Fedora Extras|aide|Intrusion detection environment|bugs.michael at gmx.net|extras-qa at fedoraproject.org| -Fedora Extras|aiksaurus|A thesaurus library|j.m.maurer at student.utwente.nl|extras-qa at fedoraproject.org| +Fedora Extras|aiksaurus|A thesaurus library|uwog at uwog.net|extras-qa at fedoraproject.org| Fedora Extras|airsnort|Wireless LAN (WLAN) tool which recovers encryption keys|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org| Fedora Extras|allegro|A game programming library|jnovy at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|alsa-firmware|Firmware for several ALSA-Supported soundcards|fedora at leemhuis.info|extras-qa at fedoraproject.org| @@ -142,7 +142,7 @@ Fedora Extras|eet|A library designed to write an arbitary set of chunks of data to a file|ivazquez at ivazquez.net|extras-qa at fedoraproject.org| Fedora Extras|elmo|Terminal-based mail client|gauret at free.fr|extras-qa at fedoraproject.org| Fedora Extras|emacs-auctex|Enhanced TeX modes for Emacsen|ed at eh3.com|extras-qa at fedoraproject.org| -Fedora Extras|enchant|An Enchanting Spell Checking Library|j.m.maurer at student.utwente.nl|extras-qa at fedoraproject.org| +Fedora Extras|enchant|An Enchanting Spell Checking Library|uwog at uwog.net|extras-qa at fedoraproject.org| Fedora Extras|enemies-of-carlotta|A simple mailing list manager|redhat-bugzilla at camperquake.de|extras-qa at fedoraproject.org| Fedora Extras|enigma|Clone of the ATARI game Oxyd|fedora at leemhuis.info|extras-qa at fedoraproject.org| Fedora Extras|epiphany-extensions|Extensions for Epiphany, the GNOME web browser|caillon at redhat.com|extras-qa at fedoraproject.org| @@ -277,7 +277,7 @@ Fedora Extras|GtkAda|An Ada95 graphical toolkit based on Gtk+|gemi at bluewin.ch|extras-qa at fedoraproject.org| Fedora Extras|gtkglarea2|An OpenGL GTK widget|anvil at livna.org|extras-qa at fedoraproject.org| Fedora Extras|gtkglext|OpenGL Extension to GTK|rc040203 at freenet.de|extras-qa at fedoraproject.org| -Fedora Extras|gtkmathview|Library for rendering MathML documents|j.m.maurer at student.utwente.nl|extras-qa at fedoraproject.org| +Fedora Extras|gtkmathview|Library for rendering MathML documents|uwog at uwog.net|extras-qa at fedoraproject.org| Fedora Extras|gtkmm20|A C++ interface for GTK2 (a GUI library for X)|denisleroy at yahoo.com|extras-qa at fedoraproject.org| Fedora Extras|gtkmm24|A C++ interface for GTK2 (a GUI library for X)|denisleroy at yahoo.com|extras-qa at fedoraproject.org| Fedora Extras|Gtk-Perl|Perl extensions for GTK+|matthias at rpmforge.net|extras-qa at fedoraproject.org| @@ -442,7 +442,7 @@ Fedora Extras|liferea|An RSS/RDF feed reader|bdpepple at ameritech.net|extras-qa at fedoraproject.org| Fedora Extras|lighttpd|Lightning fast webserver with light system requirements|matthias at rpmforge.net|extras-qa at fedoraproject.org| Fedora Extras|lincvs|Graphical CVS Client|compton at pcompton.com|extras-qa at fedoraproject.org| -Fedora Extras|link-grammar|Library that can perform grammar checking|j.m.maurer at student.utwente.nl|extras-qa at fedoraproject.org| +Fedora Extras|link-grammar|Library that can perform grammar checking|uwog at uwog.net|extras-qa at fedoraproject.org| Fedora Extras|linphone|Phone anywhere in the whole world by using the Internet|ivazquez at ivazquez.net|extras-qa at fedoraproject.org| Fedora Extras|linux_logo|The linux logo - a colorful console penguin logo|matthias at rpmforge.net|extras-qa at fedoraproject.org| Fedora Extras|lirc|The Linux Infrared Remote Control package|ville.skytta at iki.fi|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Sun Sep 4 13:17:47 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sun, 4 Sep 2005 09:17:47 -0400 Subject: rpms/xsupplicant/devel xsupplicant-1.2.1-docsfix.patch, NONE, 1.1 xsupplicant-1.2.1-gcc4-cleanups.patch, NONE, 1.1 sources, 1.2, 1.3 xsupplicant.spec, 1.1, 1.2 Message-ID: <200509041317.j84DHlqH030667@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/xsupplicant/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30591/devel Modified Files: sources xsupplicant.spec Added Files: xsupplicant-1.2.1-docsfix.patch xsupplicant-1.2.1-gcc4-cleanups.patch Log Message: Bump to 1.2.1, fix a LOT of signed/unsigned mistakes in the code. xsupplicant-1.2.1-docsfix.patch: --- NEW FILE xsupplicant-1.2.1-docsfix.patch --- --- xsupplicant-1.2.1/doc/builddocs.sh.BAD 2005-09-03 08:20:54.000000000 -0500 +++ xsupplicant-1.2.1/doc/builddocs.sh 2005-09-03 08:22:29.000000000 -0500 @@ -4,7 +4,7 @@ # best option is just to require users of this script to define # the variable on their own? not quite sure, I guess that's why # it's hard coded for now... -JADE_PUB=/usr/share/doc/openjade-1.3/pubtext +JADE_PUB=/usr/share/doc/openjade-*/pubtext SGML_CATALOG_FILES=/usr/sgml-tools/dtd/catalog:/etc/sgml/catalog:/usr/share/doc/openjade-1.3.2/catalog:/home/chris/t/docbook-dsssl-1.97/catalog mkdir -p html @@ -33,7 +33,7 @@ # create the txt docs echo -n "Building the TXT docs..." -lynx -dump -nolist html/Open1x-UserGuide.html > txt/Open1x-UserGuide.txt +links -dump html/Open1x-UserGuide.html > txt/Open1x-UserGuide.txt if [ $? -ne 0 ] then echo "Error! Build failed!" xsupplicant-1.2.1-gcc4-cleanups.patch: --- NEW FILE xsupplicant-1.2.1-gcc4-cleanups.patch --- --- xsupplicant-1.2.1/src/cardif/linux/cardif_hostap_driver.c.BAD 2005-09-03 17:50:21.000000000 -0500 +++ xsupplicant-1.2.1/src/cardif/linux/cardif_hostap_driver.c 2005-09-03 17:50:50.000000000 -0500 @@ -326,7 +326,7 @@ debug_printf(DEBUG_NORMAL, "alg=%s key_idx=%d set_tx=%d seq_len=%d key_len=%d\n", alg_name, key_idx, set_tx, seq_len, key_len); debug_printf(DEBUG_NORMAL, "KeyRSC = "); - debug_hex_printf(DEBUG_NORMAL, seq, seq_len); + debug_hex_printf(DEBUG_NORMAL, (u_char *) seq, seq_len); if (seq_len > 8) { @@ -350,7 +350,7 @@ memset(param->sta_addr, 0xff, ETH_ALEN); - strncpy(param->u.crypt.alg, alg_name, HOSTAP_CRYPT_ALG_NAME_LEN); + strncpy((char *) param->u.crypt.alg, alg_name, HOSTAP_CRYPT_ALG_NAME_LEN); param->u.crypt.flags = set_tx ? HOSTAP_CRYPT_FLAG_SET_TX_KEY : 0; param->u.crypt.idx = key_idx; memcpy(param->u.crypt.seq, seq, seq_len); --- xsupplicant-1.2.1/src/cardif/linux/cardif_linux_wext.c.BAD 2005-09-03 17:51:02.000000000 -0500 +++ xsupplicant-1.2.1/src/cardif/linux/cardif_linux_wext.c 2005-09-03 17:53:08.000000000 -0500 @@ -119,10 +119,10 @@ // We set the key index to 0x80, to force key 0 to be set to all 0s, // and to have key 0 be set as the default transmit key. - cardif_set_wep_key(thisint, (char *)&zerokey, keylen, 0x80); - cardif_set_wep_key(thisint, (char *)&zerokey, keylen, 0x01); - cardif_set_wep_key(thisint, (char *)&zerokey, keylen, 0x02); - cardif_set_wep_key(thisint, (char *)&zerokey, keylen, 0x03); + cardif_set_wep_key(thisint, (u_char *)&zerokey, keylen, 0x80); + cardif_set_wep_key(thisint, (u_char *)&zerokey, keylen, 0x01); + cardif_set_wep_key(thisint, (u_char *)&zerokey, keylen, 0x02); + cardif_set_wep_key(thisint, (u_char *)&zerokey, keylen, 0x03); } /************************************************************** @@ -947,10 +947,10 @@ if (config_ssid_get_ssid_abilities() & RSN_IE) { - cardif_linux_wext_get_wpa2_ie(intdata, wpaie, &len); + cardif_linux_wext_get_wpa2_ie(intdata, (char *) wpaie, &len); } else if (config_ssid_get_ssid_abilities() & WPA_IE) { - cardif_linux_wext_get_wpa_ie(intdata, wpaie, &len); + cardif_linux_wext_get_wpa_ie(intdata, (char *) wpaie, &len); } if (len > 0) @@ -965,11 +965,11 @@ intdata->flags |= DONTSCAN; cardif_linux_wext_set_ssid(intdata, newssid); - bssid = config_ssid_get_mac(); + bssid = (char *) config_ssid_get_mac(); if (bssid != NULL) { debug_printf(DEBUG_INT, "Dest. BSSID : "); - debug_hex_printf(DEBUG_INT, bssid, 6); + debug_hex_printf(DEBUG_INT, (u_char *) bssid, 6); } // cardif_linux_wext_set_bssid(intdata, bssid); --- xsupplicant-1.2.1/src/cardif/linux/cardif_ipw_driver.c.BAD 2005-09-03 17:54:57.000000000 -0500 +++ xsupplicant-1.2.1/src/cardif/linux/cardif_ipw_driver.c 2005-09-03 17:57:23.000000000 -0500 @@ -240,7 +240,7 @@ wpa2_gen_ie(intdata, iedata, ielen); debug_printf(DEBUG_INT, "Setting WPA2 IE : "); - debug_hex_printf(DEBUG_INT, iedata, *ielen); + debug_hex_printf(DEBUG_INT, (u_char *) iedata, *ielen); debug_printf(DEBUG_INT, "\n"); return XENONE; @@ -372,7 +372,7 @@ param = (struct ipw_param *) buf; param->cmd = IPW_CMD_SET_ENCRYPTION; memset(param->sta_addr, 0xff, 6); - strncpy(param->u.crypt.alg, alg_name, IPW_CRYPT_ALG_NAME_LEN); + strncpy((char *) param->u.crypt.alg, alg_name, IPW_CRYPT_ALG_NAME_LEN); param->u.crypt.set_tx = set_tx ? 1 : 0; param->u.crypt.idx = key_idx; memcpy(param->u.crypt.seq, seq, seq_len); @@ -422,7 +422,7 @@ { int ret; - ret = ipw_mlme(intdata->intName, intdata->source_mac, + ret = ipw_mlme(intdata->intName, (u8 *) intdata->source_mac, IPW_MLME_STA_DISASSOC, reason_code); if (ret <0) return ret; @@ -458,16 +458,16 @@ if (config_ssid_get_ssid_abilities() & RSN_IE) { - cardif_ipw_driver_get_wpa2_ie(intdata, wpaie, &len); + cardif_ipw_driver_get_wpa2_ie(intdata, (char *) wpaie, &len); } else if (config_ssid_get_ssid_abilities() & WPA_IE) { - cardif_ipw_driver_get_wpa_ie(intdata, wpaie, &len); + cardif_ipw_driver_get_wpa_ie(intdata, (char *) wpaie, &len); } // Length needs to be > 0 in order to indicate that we have an IE to set. if ((len < 255) && (len >= 0)) { - if (cardif_ipw_driver_set_wpa_ie(intdata->intName, wpaie, len) < 0) + if (cardif_ipw_driver_set_wpa_ie(intdata->intName, (char *) wpaie, len) < 0) { debug_printf(DEBUG_NORMAL, "Couldn't set WPA/RSN IE on device %s!\n", intdata->intName); --- xsupplicant-1.2.1/src/cardif/linux/cardif_linux_rtnetlink.c.BAD 2005-09-03 17:43:05.000000000 -0500 +++ xsupplicant-1.2.1/src/cardif/linux/cardif_linux_rtnetlink.c 2005-09-03 17:49:49.000000000 -0500 @@ -269,13 +269,13 @@ memcpy(&custom, &tptr[12], (iwe->len - 12)); debug_printf(DEBUG_INT, "(Custom) Value : %s\n", custom); - if (strncmp("wpa_ie=", custom, 7) == 0) + if (strncmp("wpa_ie=", (char *) custom, 7) == 0) { SET_FLAG(flags, WPA_IE); debug_printf(DEBUG_INT, "AP appears to support WPA!\n"); - temp = (char *)malloc((iwe->len - 12)/2); - process_hex(&custom[7], (iwe->len - 12-7), temp); - wpa_parse_ie(temp); + temp = (u_char *)malloc((iwe->len - 12)/2); + process_hex((char *) &custom[7], (iwe->len - 12-7), (char *) temp); + wpa_parse_ie((char *) temp); temp_wpa = temp; temp_wpa_len = ((iwe->len - 12)/2); @@ -285,13 +285,13 @@ temp = NULL; } - if (strncmp("rsn_ie=", custom, 7) == 0) + if (strncmp("rsn_ie=", (char *) custom, 7) == 0) { SET_FLAG(flags, RSN_IE); debug_printf(DEBUG_INT, "AP appears to support WPA2/802.11i!\n"); - temp = (char *)malloc((iwe->len - 12)/2); - process_hex(&custom[7], (iwe->len - 12-7), temp); - wpa2_parse_ie(temp); + temp = (u_char *)malloc((iwe->len - 12)/2); + process_hex((char *) &custom[7], (iwe->len - 12-7), (char *) temp); + wpa2_parse_ie((char *) temp); temp_rsn = temp; temp_rsn_len = ((iwe->len - 12)/2); @@ -381,10 +381,10 @@ "but the WPA_IE or RSN_IE flag(s) aren't set!?!\n"); } - if (strcmp(essid, intdata->cur_essid) == 0) + if (strcmp((char *) essid, intdata->cur_essid) == 0) { debug_printf(DEBUG_INT, "Adding this SSID data!\n"); - config_ssids_add(essid, flags, wpa_ie, wpa_ie_len, rsn_ie, + config_ssids_add((char *) essid, flags, wpa_ie, wpa_ie_len, rsn_ie, rsn_ie_len, freq, stale_mac); } @@ -440,10 +440,10 @@ } } - if (strcmp(essid, intdata->cur_essid) == 0) + if (strcmp((char *) essid, intdata->cur_essid) == 0) { debug_printf(DEBUG_INT, "Adding this SSID data!\n"); - config_ssids_add(essid, flags, wpa_ie, wpa_ie_len, rsn_ie, + config_ssids_add((char *) essid, flags, wpa_ie, wpa_ie_len, rsn_ie, rsn_ie_len, freq, mac); } @@ -490,8 +490,8 @@ // Then harvest the data. debug_printf(DEBUG_INT, "Reaping data. (Size : %d)\n", iwr.u.data.length); - cardif_linux_rtnetlink_reap(idata, (char *)buffer, - ((char *)buffer + iwr.u.data.length)); + cardif_linux_rtnetlink_reap(idata, (u_char *)buffer, + ((u_char *)buffer + iwr.u.data.length)); UNSET_FLAG(idata->flags, SCANNING); @@ -519,7 +519,7 @@ } remain = recvfrom(rtnl_sock, buf, sizeof(buf), MSG_DONTWAIT, - (struct sockaddr *)&rtnl_data, &rtnl_data_size); + (struct sockaddr *)&rtnl_data, (u_int *) &rtnl_data_size); if (remain >= 0) { // We need a pointer to the buffer to work with. @@ -927,7 +927,7 @@ case SIOCGIWAP: memcpy(mac, iwe->u.ap_addr.sa_data, 6); debug_printf(DEBUG_INT, "AP MAC : "); - debug_hex_printf(DEBUG_INT, mac, 6); + debug_hex_printf(DEBUG_INT, (u_char *) mac, 6); if (cardif_linux_rtnetlink_validate(idata, (u_char *)&mac) == 1) { // We have changed to associated mode. Populate the destination @@ -987,7 +987,7 @@ memcpy(buf, custom, iwe->u.data.length); buf[iwe->u.data.length] = '\0'; debug_printf(DEBUG_NORMAL, "Custom Data : \n"); - debug_hex_dump(DEBUG_NORMAL, buf, iwe->u.data.length); + debug_hex_dump(DEBUG_NORMAL, (u_char *) buf, iwe->u.data.length); cardif_linux_rtnetlink_check_custom(idata, buf); break; --- xsupplicant-1.2.1/src/cardif/linux/cardif_ndiswrapper_driver.c.BAD 2005-09-03 17:53:21.000000000 -0500 +++ xsupplicant-1.2.1/src/cardif/linux/cardif_ndiswrapper_driver.c 2005-09-03 17:54:27.000000000 -0500 @@ -202,11 +202,11 @@ wpa_key.addr = addr; wpa_key.key_index = key_idx; wpa_key.set_tx = set_tx; - wpa_key.seq = seq; + wpa_key.seq = (u_char *) seq; wpa_key.seq_len = seq_len; debug_printf(DEBUG_NORMAL, "SEQ : "); - debug_hex_printf(DEBUG_NORMAL, seq, seq_len); - wpa_key.key = key; + debug_hex_printf(DEBUG_NORMAL, (u_char *) seq, seq_len); + wpa_key.key = (u_char *) key; wpa_key.key_len = key_len; debug_printf(DEBUG_INT, "Setting key.. alg=%d idx=%d tx=%d seqlen=%d " @@ -304,11 +304,11 @@ bzero(&wpa_inf, sizeof(wpa_inf)); memcpy(buf, ssid, strlen(ssid)); - wpa_inf.bssid = (char *)config_ssid_get_mac(); - wpa_inf.ssid = (char *)&buf; + wpa_inf.bssid = (u_char *)config_ssid_get_mac(); + wpa_inf.ssid = (u_char *)&buf; wpa_inf.ssid_len = strlen(ssid); wpa_inf.freq = config_ssid_get_freq(); - wpa_inf.wpa_ie = (char *)&wpaie; + wpa_inf.wpa_ie = (u_char *)&wpaie; wpa_inf.wpa_ie_len = ielen; wpa_inf.pairwise_suite = network_data->wpa_pairwise_crypt; --- xsupplicant-1.2.1/src/cardif/linux/linux_core.c.BAD 2005-09-03 17:39:55.000000000 -0500 +++ xsupplicant-1.2.1/src/cardif/linux/linux_core.c 2005-09-03 17:42:28.000000000 -0500 @@ -116,11 +116,11 @@ { if (wepdata->key[keyidx] != NULL) { - klen = strlen(wepdata->key[keyidx]); + klen = strlen((char *) wepdata->key[keyidx]); if (((klen/2) == 5) || ((klen/2) == 13)) { // We have a valid length key. So, convert it, and set it. - process_hex(wepdata->key[keyidx], klen, key); + process_hex((char *) wepdata->key[keyidx], klen, key); // Calculate the proper key index. t = keyidx-1; @@ -130,9 +130,9 @@ debug_printf(DEBUG_INT, "Setting TX key! [%d]\n", wepdata->tx_key); t |= 0x80; - cardif_set_wep_key(intcur, key, (klen/2), t); + cardif_set_wep_key(intcur, (u_char *) key, (klen/2), t); } else { - cardif_set_wep_key(intcur, key, (klen/2), t); + cardif_set_wep_key(intcur, (u_char *) key, (klen/2), t); } } } --- xsupplicant-1.2.1/src/cardif/linux/cardif_linux.c.BAD 2005-09-03 17:37:20.000000000 -0500 +++ xsupplicant-1.2.1/src/cardif/linux/cardif_linux.c 2005-09-03 17:39:29.000000000 -0500 @@ -78,7 +78,7 @@ cardif_GetBSSID(intdata, curbssid); debug_printf(DEBUG_INT, "Current BSSID is "); - debug_hex_printf(DEBUG_INT, curbssid, 6); + debug_hex_printf(DEBUG_INT, (u_char *) curbssid, 6); memset(newmac, 0x00, 6); if (memcmp(newmac, curbssid, 6) == 0) @@ -463,7 +463,7 @@ { if (wireless == NULL) return -1; - return wireless->set_tkip_key(thisint, addr, keyidx, settx, seq, seqlen, + return wireless->set_tkip_key(thisint, (u_char *) addr, keyidx, settx, seq, seqlen, key, keylen); } @@ -478,7 +478,7 @@ { if (wireless == NULL) return -1; - return wireless->set_ccmp_key(thisint, addr, keyidx, settx, seq, seqlen, + return wireless->set_ccmp_key(thisint, (u_char *) addr, keyidx, settx, seq, seqlen, key, keylen); } @@ -746,7 +746,7 @@ { // Since we now know this frame is for us, record the address it // came from. - snmp_dot1xSuppLastEapolFrameSource((char *)&resultframe[6]); + snmp_dot1xSuppLastEapolFrameSource((u_char *)&resultframe[6]); resultsize = newsize; --- xsupplicant-1.2.1/src/psk.c.BAD 2005-09-03 09:24:53.000000000 -0500 +++ xsupplicant-1.2.1/src/psk.c 2005-09-03 09:25:15.000000000 -0500 @@ -50,7 +50,7 @@ // OpenSSL takes the parameters in a different order than what is // defined in F.8.2, so even though it looks wrong, this is correct. ;) HMAC(EVP_sha1(), password, strlen(password), digest, ssidlength+4, - digest1, &k); + digest1, (u_int *) &k); /* output = U1 */ memcpy(output, digest1, SHA_DIGEST_LENGTH); @@ -59,7 +59,7 @@ { /* Un = PRF(P, Un-1) */ HMAC(EVP_sha1(), password, strlen(password), digest1, SHA_DIGEST_LENGTH, - digest, &k); + digest, (u_int *) &k); memcpy(digest1, digest, k); /* output = output xor Un */ --- xsupplicant-1.2.1/src/mic.c.BAD 2005-09-03 09:24:01.000000000 -0500 +++ xsupplicant-1.2.1/src/mic.c 2005-09-03 09:24:43.000000000 -0500 @@ -44,14 +44,14 @@ { case 1: // Do an MD5 HMAC - HMAC(EVP_md5(), key, keylen, datain, insize, mic, &i); + HMAC(EVP_md5(), key, keylen, (u_char *) datain, insize, (u_char *) mic, (u_int *) &i); break; case 2: // Do an SHA1 HMAC // Since the HMAC will be 20 bytes, and we only need 16, we must use // a temporary variable. - HMAC(EVP_sha1(), key, keylen, datain, insize, (char *)&sha_hmac, &i); + HMAC(EVP_sha1(), key, keylen, (u_char *) datain, insize, (u_char *)&sha_hmac, (u_int *) &i); memcpy(mic, &sha_hmac, 16); break; } --- xsupplicant-1.2.1/src/config.h.BAD 2005-09-03 08:39:44.000000000 -0500 +++ xsupplicant-1.2.1/src/config.h 2005-09-03 08:39:53.000000000 -0500 @@ -341,6 +341,7 @@ char config_get_association(); char *config_get_logfile(); int config_get_ipc_gid(); +int config_get_stale_key_timeout(); char config_get_destination(); char *config_get_log_facility(); void config_set_forced_profile(char *); --- xsupplicant-1.2.1/src/eap.c.BAD 2005-09-03 08:34:21.000000000 -0500 +++ xsupplicant-1.2.1/src/eap.c 2005-09-03 08:38:27.000000000 -0500 @@ -191,9 +191,9 @@ switch (eap_request_auth(network_data->activemethod, network_data->methods, - &thisint->recvframe[OFFSET_TO_EAP], + (char *) &thisint->recvframe[OFFSET_TO_EAP], thisint->recv_size, - &thisint->sendframe[OFFSET_TO_EAP], &eapsize)) + (char *) &thisint->sendframe[OFFSET_TO_EAP], &eapsize)) { case XINNERSUCCESS: // We got a LEAP success, so we need to tell the state machine to @@ -231,7 +231,7 @@ if ((eapolver < 1) || (eapolver > MAX_EAPOL_VER)) eapolver = snmp_get_dot1xSuppLastEapolFrameVersion(); - eapol_build_header(EAP_PACKET, eapsize, eapolver, thisint->sendframe); + eapol_build_header(EAP_PACKET, eapsize, eapolver, (char *) thisint->sendframe); thisint->send_size = eapsize+OFFSET_TO_EAP; return XENONE; } @@ -284,7 +284,7 @@ eap_request_id(network_data->identity, eapdata->eap_identifier, - &thisint->sendframe[OFFSET_TO_EAP], &eapsize); + (char *) &thisint->sendframe[OFFSET_TO_EAP], &eapsize); eapolver = network_data->force_eapol_ver; @@ -295,7 +295,7 @@ if ((eapolver < 1) || (eapolver > MAX_EAPOL_VER)) eapolver = snmp_get_dot1xSuppLastEapolFrameVersion(); - eapol_build_header(EAP_PACKET, eapsize, eapolver, thisint->sendframe); + eapol_build_header(EAP_PACKET, eapsize, eapolver, (char *) thisint->sendframe); thisint->send_size = eapsize+OFFSET_TO_EAP; return XENONE; @@ -379,7 +379,7 @@ // We need to determine how long the string that we were returned is. // So, take the EAP length value, and subtract 5 to account for the EAP // header. - strncpy(&myval[0], &inframe[OFFSET_TO_DATA], (ntohs(myeap->eap_length)-5)); + strncpy(&myval[0], (char *) &inframe[OFFSET_TO_DATA], (ntohs(myeap->eap_length)-5)); debug_printf(DEBUG_NORMAL, "EAP Notification : %s\n", &myval[0]); bzero(thisint->recvframe, thisint->recv_size); @@ -814,8 +814,8 @@ if ((pwd_needed != 1) || (activemethod->tempPwd != NULL)) { switch ((*eaphandlers[eapmethod].eap_auth_handlers)(activemethod, - tosendframe, eapinsize, - &outframe[sizeof(struct eap_header)], + (u_char *) tosendframe, eapinsize, + (u_char *) &outframe[sizeof(struct eap_header)], eapsize)) { case XINNERSUCCESS: @@ -962,9 +962,9 @@ (*eaphandlers[eapmethod].eap_auth_get_keys)(thisint); - thisint->statemachine->PMK = thisint->keyingMaterial; + thisint->statemachine->PMK = (char *) thisint->keyingMaterial; debug_printf(DEBUG_INT, "PMK Keys (%d) :\n", thisint->keyingLength); - debug_hex_dump(DEBUG_INT, thisint->statemachine->PMK, thisint->keyingLength); + debug_hex_dump(DEBUG_INT, (u_char *) thisint->statemachine->PMK, thisint->keyingLength); debug_printf(DEBUG_INT, "WEP Keys (%d) :\n", thisint->keyingLength); debug_hex_dump(DEBUG_INT, thisint->keyingMaterial, thisint->keyingLength); --- xsupplicant-1.2.1/src/eapol_key_type2.c.BAD 2005-09-03 09:34:10.000000000 -0500 +++ xsupplicant-1.2.1/src/eapol_key_type2.c 2005-09-03 16:32:47.000000000 -0500 @@ -172,7 +172,7 @@ case 2: // XXX BROKEN! FIX! bzero(key, 16); - aes_unwrap(&intdata->statemachine->PTK[16], (keylen-8)/8, keypayload, + aes_unwrap((u_char *) &intdata->statemachine->PTK[16], (keylen-8)/8, keypayload, key); break; @@ -238,12 +238,12 @@ } debug_printf(DEBUG_INT, "PMK : "); - debug_hex_printf(DEBUG_INT, intdata->statemachine->PMK, 32); - wpa_PRF(intdata->statemachine->PMK, 32, "Pairwise key expansion", 22, - (char *)&prfdata, 76, retval, 64); + debug_hex_printf(DEBUG_INT, (u_char *) intdata->statemachine->PMK, 32); + wpa_PRF((u_char *) intdata->statemachine->PMK, 32, (u_char *) "Pairwise key expansion", 22, + (u_char *)&prfdata, 76, (u_char *) retval, 64); debug_printf(DEBUG_INT, "PTK : "); - debug_hex_printf(DEBUG_INT, retval, 64); + debug_hex_printf(DEBUG_INT, (u_char *) retval, 64); return retval; } @@ -310,10 +310,10 @@ eapolver = snmp_get_dot1xSuppLastEapolFrameVersion(); eapol_build_header(EAPOL_KEY, (intdata->send_size-OFFSET_TO_EAPOL-4), - eapolver, intdata->sendframe); + eapolver, (char *) intdata->sendframe); memcpy(key, intdata->statemachine->PTK, 16); - mic_wpa_populate(intdata->sendframe, intdata->send_size+4, key, 16); + mic_wpa_populate((char *) intdata->sendframe, intdata->send_size+4, key, 16); cardif_sendframe(intdata); intdata->statemachine->eapolEap = FALSE; @@ -394,7 +394,7 @@ bzero(rc4_ek, 32); memcpy(rc4_ek, inkeydata->key_iv, 16); memcpy(&rc4_ek[16], &intdata->statemachine->PTK[16], 16); - rc4_skip(rc4_ek, 32, 256, keydata, value16); + rc4_skip((u_char *) rc4_ek, 32, 256, keydata, value16); debug_printf(DEBUG_INT, "Decrypted data : (%d)\n", value16); debug_hex_dump(DEBUG_INT, keydata, value16); @@ -410,17 +410,17 @@ wpa_common_swap_rx_tx_mic(keydata); debug_printf(DEBUG_INT, "Setting GTK with index of %d\n", keyindex); - cardif_set_tkip_key(intdata, allfs, keyindex, FALSE, inkeydata->key_rsc, - 6, keydata, value16); + cardif_set_tkip_key(intdata, (char *) allfs, keyindex, FALSE, (char *) inkeydata->key_rsc, + 6, (char *) keydata, value16); break; case 2: // First, decrypt the GTK bzero(key, 16); - aes_unwrap(&intdata->statemachine->PTK[16], (value16-8)/8, keydata, - key); + aes_unwrap((u_char *) &intdata->statemachine->PTK[16], (value16-8)/8, keydata, + (u_char *) key); - cardif_set_ccmp_key(intdata, NULL, keyindex, FALSE, inkeydata->key_rsc, + cardif_set_ccmp_key(intdata, NULL, keyindex, FALSE, (char *) inkeydata->key_rsc, 6, key, (value16-8)); break; } @@ -446,13 +446,13 @@ eapolver = snmp_get_dot1xSuppLastEapolFrameVersion(); eapol_build_header(EAPOL_KEY, (intdata->send_size-OFFSET_TO_EAPOL-4), - eapolver, intdata->sendframe); + eapolver, (char *) intdata->sendframe); memcpy(key, intdata->statemachine->PTK, 16); - mic_wpa_populate(intdata->sendframe, intdata->send_size+4, key, 16); + mic_wpa_populate((char *) intdata->sendframe, intdata->send_size+4, key, 16); // Dump what we built. - eapol_key_type2_dump(intdata, intdata->sendframe); + eapol_key_type2_dump(intdata, (char *) intdata->sendframe); if (network_data->methods->method_num == WPA_PSK) { @@ -560,13 +560,13 @@ eapolver = snmp_get_dot1xSuppLastEapolFrameVersion(); eapol_build_header(EAPOL_KEY, (intdata->send_size-OFFSET_TO_EAPOL-4), - eapolver, intdata->sendframe); + eapolver, (char *) intdata->sendframe); memcpy(key, intdata->statemachine->PTK, 16); - mic_wpa_populate(intdata->sendframe, intdata->send_size+4, key, 16); + mic_wpa_populate((char *) intdata->sendframe, intdata->send_size+4, key, 16); // Dump what we built. - eapol_key_type2_dump(intdata, intdata->sendframe); + eapol_key_type2_dump(intdata, (char *) intdata->sendframe); } /******************************************************** @@ -596,7 +596,7 @@ memcpy(iedata, indata, len); debug_printf(DEBUG_INT, "Got an IE of : \n"); - debug_hex_dump(DEBUG_INT, iedata, len); + debug_hex_dump(DEBUG_INT, (u_char *) iedata, len); // XXX Todo : Verify the IE against the IE we have from the AP. @@ -869,20 +869,20 @@ eapolver = snmp_get_dot1xSuppLastEapolFrameVersion(); eapol_build_header(EAPOL_KEY, (intdata->send_size-OFFSET_TO_EAPOL-4), - eapolver, intdata->sendframe); + eapolver, (char *) intdata->sendframe); memcpy(key, intdata->statemachine->PTK, 16); - mic_wpa_populate(intdata->sendframe, intdata->send_size+4, key, 16); + mic_wpa_populate((char *) intdata->sendframe, intdata->send_size+4, key, 16); // Dump what we built. - eapol_key_type2_dump(intdata, intdata->sendframe); + eapol_key_type2_dump(intdata, (char *) intdata->sendframe); // Get TK1 value16 = ntohs(inkeydata->key_length); memcpy(key, (char *)&intdata->statemachine->PTK[32], value16); debug_printf(DEBUG_INT, "TK1 : "); - debug_hex_printf(DEBUG_INT, key, value16); + debug_hex_printf(DEBUG_INT, (u_char *) key, value16); cardif_sendframe(intdata); intdata->statemachine->eapolEap = FALSE; @@ -902,12 +902,12 @@ bzero(rc4_ek, 32); memcpy(rc4_ek, inkeydata->key_iv, 16); memcpy(&rc4_ek[16], &intdata->statemachine->PTK[16], 16); - rc4_skip(rc4_ek, 32, 256, keydata, keylen); + rc4_skip((u_char *) rc4_ek, 32, 256, keydata, keylen); break; case 2: aesval = (uint8_t *)malloc(keylen); - if (aes_unwrap(&intdata->statemachine->PTK[16], (keylen-8)/8, keydata, + if (aes_unwrap((u_char *) &intdata->statemachine->PTK[16], (keylen-8)/8, keydata, aesval)) { debug_printf(DEBUG_NORMAL, "Failed AES unwrap!\n"); @@ -943,13 +943,13 @@ { case 1: wpa_common_swap_rx_tx_mic(gtk); - cardif_set_tkip_key(intdata, allfs, keyindex, txkey, - inkeydata->key_rsc, RSC_LEN, gtk, value16); + cardif_set_tkip_key(intdata, (char*) allfs, keyindex, txkey, + (char *) inkeydata->key_rsc, RSC_LEN, (char *) gtk, value16); break; case 2: - cardif_set_ccmp_key(intdata, allfs, keyindex, txkey, - inkeydata->key_rsc, RSC_LEN, gtk, value16); + cardif_set_ccmp_key(intdata, (char *) allfs, keyindex, txkey, + (char *) inkeydata->key_rsc, RSC_LEN, (char *) gtk, value16); break; } @@ -973,15 +973,15 @@ case 1: // We need to swap the TX/RX MIC values since we are the supplicant. // (Thanks to Jouni Malinen for pointing this out!) - wpa_common_swap_rx_tx_mic(key); + wpa_common_swap_rx_tx_mic((u_char *) key); cardif_set_tkip_key(intdata, intdata->dest_mac, 0, TRUE, - inkeydata->key_rsc, RSC_LEN, key, value16); + (char *) inkeydata->key_rsc, RSC_LEN, key, value16); break; case 2: cardif_set_ccmp_key(intdata, intdata->dest_mac, 0, TRUE, - inkeydata->key_rsc, RSC_LEN, key, value16); + (char *) inkeydata->key_rsc, RSC_LEN, key, value16); break; } } @@ -1008,7 +1008,7 @@ if (keyflags & WPA2_KEY_MIC_FLAG) { - if (mic_wpa_validate(intdata->recvframe, intdata->recv_size, + if (mic_wpa_validate((char *) intdata->recvframe, intdata->recv_size, intdata->statemachine->PTK, 16) == FALSE) { intdata->statemachine->MICVerified = TRUE; @@ -1058,7 +1058,7 @@ eapolver = snmp_get_dot1xSuppLastEapolFrameVersion(); eapol_build_header(EAPOL_KEY, (intdata->recv_size-OFFSET_TO_EAPOL-4), - eapolver, intdata->recvframe); + eapolver, (char *) intdata->recvframe); cardif_sendframe(intdata); intdata->statemachine->eapolEap = FALSE; } @@ -1127,8 +1127,8 @@ } // We have an ASCII password, so calculate it. - if (psk_wpa_pbkdf2(psk->key, intdata->cur_essid, - strlen(intdata->cur_essid), (char *)&tpmk) + if (psk_wpa_pbkdf2(psk->key, (u_char *) intdata->cur_essid, + strlen(intdata->cur_essid), (u_char *)&tpmk) == TRUE) { intdata->statemachine->PMK = (char *)malloc(32); @@ -1168,7 +1168,7 @@ } } - eapol_key_type2_dump(intdata, inframe); + eapol_key_type2_dump(intdata, (char *) inframe); eapol_key_type2_determine_key(intdata); --- xsupplicant-1.2.1/src/eap_types/otp/eapotp.c.BAD 2005-09-03 17:26:09.000000000 -0500 +++ xsupplicant-1.2.1/src/eap_types/otp/eapotp.c 2005-09-03 17:26:47.000000000 -0500 @@ -123,7 +123,7 @@ /* debug_printf(DEBUG_NORMAL, "Response : "); gets(&resp); */ - strcpy(outframe, resp); + strcpy((char *) outframe, resp); *outsize = strlen(resp); return *outsize; --- xsupplicant-1.2.1/src/eap_types/tls/tls_funcs.c.BAD 2005-09-03 16:38:06.000000000 -0500 +++ xsupplicant-1.2.1/src/eap_types/tls/tls_funcs.c 2005-09-03 16:42:46.000000000 -0500 @@ -445,7 +445,7 @@ } debug_printf(DEBUG_AUTHTYPES, "Packet in (%d) :\n", insize); - debug_hex_dump(DEBUG_AUTHTYPES, inframe, insize); + debug_hex_dump(DEBUG_AUTHTYPES, (u_char *) inframe, insize); // First, make sure we don't have any errors. err = ERR_get_error(); @@ -563,7 +563,7 @@ if ((mytls_vars->resuming != 1) || (mytls_vars->quickResponse != TRUE)) { - if (((*dophase2)(thisint, tlsptr, (insize-tlsindex), outframe, + if (((*dophase2)(thisint, (u_char *) tlsptr, (insize-tlsindex), outframe, outsize)) != XENONE) { debug_printf(DEBUG_NORMAL, "Phase 2 failure!\n"); @@ -578,7 +578,7 @@ } } } else { - rtnVal = tls_funcs_parse(thisint, tlsptr, (insize-tlsindex), outframe, outsize, chunksize); + rtnVal = tls_funcs_parse(thisint, (u_char *) tlsptr, (insize-tlsindex), outframe, outsize, chunksize); if (rtnVal < 0) { debug_printf(DEBUG_NORMAL, "Couldn't parse TLS data.\n"); @@ -642,7 +642,7 @@ if ((mytls_vars->resuming != 1) || (mytls_vars->quickResponse != TRUE)) { - if ((*dophase2)(thisint, tlsptr, (insize-tlsindex), + if ((*dophase2)(thisint, (u_char *) tlsptr, (insize-tlsindex), outframe, outsize) != XENONE) { debug_printf(DEBUG_NORMAL, "Phase 2 Failure.\n"); @@ -1083,32 +1083,32 @@ /* P_MD5 */ hash = EVP_md5(); /* Initialize A_MD5 */ - HMAC(hash, S1, L_S1, P_seed, P_seed_len, A_MD5, &hashed_len); + HMAC(hash, S1, L_S1, P_seed, P_seed_len, A_MD5, (u_int *) &hashed_len); for (i = 0; i < MD5_iterations; i++) { HMAC_Init(&ctx, S1, L_S1, hash); HMAC_Update(&ctx, A_MD5, MD5_DIGEST_LENGTH); HMAC_Update(&ctx, P_seed, P_seed_len); - HMAC_Final(&ctx, P_MD5_buf + i*(MD5_DIGEST_LENGTH), &hashed_len); + HMAC_Final(&ctx, P_MD5_buf + i*(MD5_DIGEST_LENGTH), (u_int *) &hashed_len); HMAC_cleanup(&ctx); HMAC(hash, S1, L_S1, A_MD5, MD5_DIGEST_LENGTH, - A_MD5, &hashed_len); + A_MD5, (u_int *) &hashed_len); } /* do P_SHA1 */ hash = EVP_sha1(); /* Initialize A_SHA1 */ - HMAC(hash, S2, L_S2, P_seed, P_seed_len, A_SHA1, &hashed_len); + HMAC(hash, S2, L_S2, P_seed, P_seed_len, A_SHA1, (u_int *) &hashed_len); for (i = 0; i < SHA1_iterations; i++) { HMAC_Init(&ctx, S2, L_S2, hash); HMAC_Update(&ctx, A_SHA1, SHA_DIGEST_LENGTH); HMAC_Update(&ctx, P_seed, P_seed_len); - HMAC_Final(&ctx, P_SHA1_buf + i*(SHA_DIGEST_LENGTH), &hashed_len); + HMAC_Final(&ctx, P_SHA1_buf + i*(SHA_DIGEST_LENGTH), (u_int *) &hashed_len); HMAC_cleanup(&ctx); HMAC(hash, S2, L_S2, A_SHA1, SHA_DIGEST_LENGTH, - A_SHA1, &hashed_len); + A_SHA1, (u_int *) &hashed_len); } /* XOR Them for the answer */ for (i = 0; i < outlen; i++) { --- xsupplicant-1.2.1/src/eap_types/tls/tls_crypt.c.BAD 2005-09-03 16:58:16.000000000 -0500 +++ xsupplicant-1.2.1/src/eap_types/tls/tls_crypt.c 2005-09-03 16:58:35.000000000 -0500 @@ -72,7 +72,7 @@ memcpy(p, mytls_vars->ssl->s3->server_random, SSL3_RANDOM_SIZE); tls_funcs_PRF(SSL_get_session(mytls_vars->ssl)->master_key, SSL_get_session(mytls_vars->ssl)->master_key_length, - sesskey, sesskeylen, seed, + (u_char *) sesskey, sesskeylen, seed, SSL3_RANDOM_SIZE * 2, retblock, TLS_SESSION_KEY_SIZE); --- xsupplicant-1.2.1/src/eap_types/tls/eaptls.c.BAD 2005-09-03 16:33:36.000000000 -0500 +++ xsupplicant-1.2.1/src/eap_types/tls/eaptls.c 2005-09-03 16:36:48.000000000 -0500 @@ -192,7 +192,7 @@ // Make sure we have something to process... if (dataoffs == NULL) return XENONE; - retVal=tls_funcs_decode_packet(thisint, dataoffs, insize, outframe, outsize, + retVal=tls_funcs_decode_packet(thisint, (char *) dataoffs, insize, (char *) outframe, outsize, NULL, userdata->chunk_size); return retVal; @@ -222,7 +222,7 @@ free(thisint->keyingMaterial); } - thisint->keyingMaterial = tls_funcs_gen_keyblock(network_data->activemethod); + thisint->keyingMaterial = (u_char *) tls_funcs_gen_keyblock(network_data->activemethod); thisint->keyingLength = 32; if (thisint->keyingMaterial == NULL) return -1; --- xsupplicant-1.2.1/src/eap_types/peap/eappeap.c.BAD 2005-09-03 17:16:00.000000000 -0500 +++ xsupplicant-1.2.1/src/eap_types/peap/eappeap.c 2005-09-03 17:16:47.000000000 -0500 @@ -239,7 +239,7 @@ set_peap_version(p2d, peap_version); // Tell PEAP what version we want to use. dataoffs[0] = ((uint8_t)dataoffs[0] & 0xfc); // Mask out the version bits. - if (tls_funcs_decode_packet(thisint, dataoffs, insize, outframe, outsize, + if (tls_funcs_decode_packet(thisint, (char *) dataoffs, insize, (char *) outframe, outsize, (phase2_call)peap_do_phase2, userdata->chunk_size) != XENONE) { @@ -335,7 +335,7 @@ { free(thisint->keyingMaterial); } - thisint->keyingMaterial = tls_funcs_gen_keyblock(network_data->activemethod); + thisint->keyingMaterial = (u_char *) tls_funcs_gen_keyblock(network_data->activemethod); thisint->keyingLength = 32; if (thisint->keyingMaterial == NULL) return -1; --- xsupplicant-1.2.1/src/eap_types/peap/peap_phase2.c.BAD 2005-09-03 17:17:38.000000000 -0500 +++ xsupplicant-1.2.1/src/eap_types/peap/peap_phase2.c 2005-09-03 17:21:23.000000000 -0500 @@ -160,7 +160,7 @@ switch ((uint8_t)eapvalue) { case EAP_REQUEST: - eap_request_id(thisint->eapdata->identity, eapid, out, out_size); + eap_request_id(thisint->eapdata->identity, eapid, (char *) out, out_size); break; case EAP_SUCCESS: @@ -192,7 +192,7 @@ return; } eap_request_auth(thisint->activemethod, thisint->eapdata->eap_conf_data, - in, in_size, out, out_size); + (char *) in, in_size, (char *) out, out_size); break; } free(new_frame); @@ -249,7 +249,7 @@ if (eframe != 1) { - peap_pad_frame(in, in_size, padded_frame, &padded_size); + peap_pad_frame(in, in_size, (u_char *) padded_frame, &padded_size); } new_frame = (char *)malloc(1024); @@ -259,12 +259,12 @@ return; } - do_peap_version1(thisint, padded_frame, padded_size, new_frame, + do_peap_version1(thisint, (u_char *) padded_frame, padded_size, (u_char *) new_frame, &new_frame_size); free(padded_frame); if (eframe !=1) { - peap_unpad_frame(new_frame, new_frame_size, out, out_size); + peap_unpad_frame((u_char *) new_frame, new_frame_size, out, out_size); } else { memcpy(out, new_frame, new_frame_size); *out_size = new_frame_size; @@ -330,14 +330,14 @@ p2d->eapdata->identity = peapconf->identity; p2d->eapdata->ias_quirk = peapconf->ias_quirk; - decr_data = (char *)malloc(1550); + decr_data = (u_char *)malloc(1550); if (decr_data == NULL) { debug_printf(DEBUG_NORMAL, "Couldn't allocate memory for decryption buffer!\n"); return XEMALLOC; } - encr_data = (char *)malloc(1550); + encr_data = (u_char *)malloc(1550); if (encr_data == NULL) { debug_printf(DEBUG_NORMAL, "Couldn't allocate memory for encryption buffer!\n"); --- xsupplicant-1.2.1/src/eap_types/mschapv2/eapmschapv2.c.BAD 2005-09-03 17:09:07.000000000 -0500 +++ xsupplicant-1.2.1/src/eap_types/mschapv2/eapmschapv2.c 2005-09-03 17:15:29.000000000 -0500 @@ -153,13 +153,13 @@ myvars->AuthenticatorChallenge = NULL; } - myvars->AuthenticatorChallenge = (u_char *)malloc(16); + myvars->AuthenticatorChallenge = (char *)malloc(16); if (myvars->AuthenticatorChallenge == NULL) return XEMALLOC; memcpy(myvars->AuthenticatorChallenge, &challenge->Challenge, 16); debug_printf(DEBUG_AUTHTYPES, "Authenticator Challenge : "); - debug_hex_printf(DEBUG_AUTHTYPES, myvars->AuthenticatorChallenge, 16); + debug_hex_printf(DEBUG_AUTHTYPES, (u_char *) myvars->AuthenticatorChallenge, 16); if (myvars->PeerChallenge != NULL) { @@ -168,13 +168,13 @@ } // Ignore the RADIUS host, we probably don't care. - myvars->PeerChallenge = (u_char *)malloc(16); + myvars->PeerChallenge = (char *)malloc(16); if (myvars->PeerChallenge == NULL) return XEMALLOC; - RAND_bytes(myvars->PeerChallenge, 16); + RAND_bytes((u_char *) myvars->PeerChallenge, 16); debug_printf(DEBUG_AUTHTYPES, "Generated PeerChallenge : "); - debug_hex_printf(DEBUG_AUTHTYPES, myvars->PeerChallenge,16); + debug_hex_printf(DEBUG_AUTHTYPES, (u_char *) myvars->PeerChallenge,16); if (myvars->NtResponse != NULL) { @@ -182,14 +182,14 @@ myvars->NtResponse = NULL; } - myvars->NtResponse = (u_char *)malloc(24); + myvars->NtResponse = (char *)malloc(24); if (myvars->NtResponse == NULL) return XEMALLOC; GenerateNTResponse(myvars->AuthenticatorChallenge, myvars->PeerChallenge, username, userdata->password, myvars->NtResponse); debug_printf(DEBUG_AUTHTYPES, "myvars->NtResponse = "); - debug_hex_printf(DEBUG_AUTHTYPES, myvars->NtResponse, 24); + debug_hex_printf(DEBUG_AUTHTYPES, (u_char *) myvars->NtResponse, 24); response->OpCode = MS_CHAPV2_RESPONSE; response->MS_CHAPv2_ID = challenge->MS_CHAPv2_ID; @@ -219,7 +219,7 @@ CheckAuthenticatorResponse(userdata->password, myvars->NtResponse, myvars->PeerChallenge, myvars->AuthenticatorChallenge, - username, (u_char *)&recv[0], &respOk); + username, (char *)&recv[0], &respOk); if (respOk == 1) { @@ -227,15 +227,15 @@ outframe[0] = MS_CHAPV2_SUCCESS; // We were successful, so generate keying material. - NtPasswordHash(userdata->password, (u_char *)&NtHash); - HashNtPasswordHash((u_char *)&NtHash, (u_char *)&NtHashHash); - GetMasterKey((u_char *)&NtHashHash, myvars->NtResponse, (u_char *)&MasterKey); + NtPasswordHash(userdata->password, (char *)&NtHash); + HashNtPasswordHash((char *)&NtHash, (char *)&NtHashHash); + GetMasterKey((char *)&NtHashHash, myvars->NtResponse, (char *)&MasterKey); // Now, get the send key. - GetAsymetricStartKey((u_char *)&MasterKey, (u_char *)&mppeSend, 16, TRUE, FALSE); + GetAsymetricStartKey((char *)&MasterKey, (char *)&mppeSend, 16, TRUE, FALSE); // And the recv key. - GetAsymetricStartKey((u_char *)&MasterKey, (u_char *)&mppeRecv, 16, FALSE, FALSE); + GetAsymetricStartKey((char *)&MasterKey, (char *)&mppeRecv, 16, FALSE, FALSE); // Finally, populate our myvars->keyingMaterial. if (myvars->keyingMaterial != NULL) @@ -243,7 +243,7 @@ free(myvars->keyingMaterial); myvars->keyingMaterial = NULL; } - myvars->keyingMaterial = (u_char *)malloc(64); // 32 bytes each. + myvars->keyingMaterial = (char *)malloc(64); // 32 bytes each. if (myvars->keyingMaterial == NULL) return XEMALLOC; bzero(myvars->keyingMaterial, 64); @@ -294,7 +294,7 @@ free(thisint->keyingMaterial); } - thisint->keyingMaterial = (char *)malloc(64); + thisint->keyingMaterial = (u_char *)malloc(64); if (thisint->keyingMaterial == NULL) return -1; memcpy(thisint->keyingMaterial, myconf->keyingMaterial, 64); --- xsupplicant-1.2.1/src/eap_types/mschapv2/mschapv2.c.BAD 2005-09-03 17:01:58.000000000 -0500 +++ xsupplicant-1.2.1/src/eap_types/mschapv2/mschapv2.c 2005-09-03 17:04:49.000000000 -0500 @@ -46,7 +46,7 @@ EVP_DigestUpdate(&cntx, PeerChallenge, 16); EVP_DigestUpdate(&cntx, AuthenticatorChallenge, 16); EVP_DigestUpdate(&cntx, UserName, strlen(UserName)); - EVP_DigestFinal(&cntx, (char *)&Digest, &retLen); + EVP_DigestFinal(&cntx, (u_char *)&Digest, (u_int *) &retLen); memcpy(Challenge, Digest, 8); } @@ -96,7 +96,7 @@ EVP_DigestInit(&cntx, EVP_md4()); EVP_DigestUpdate(&cntx, uniPassword, len); - EVP_DigestFinal(&cntx, (char *)&retVal, (int *)&i); + EVP_DigestFinal(&cntx, (u_char *)&retVal, (u_int *)&i); memcpy(PasswordHash, &retVal, 16); free(uniPassword); } @@ -114,7 +114,7 @@ EVP_DigestInit(&cntx, EVP_md4()); EVP_DigestUpdate(&cntx, PasswordHash, 16); - EVP_DigestFinal(&cntx, PasswordHashHash, &i); + EVP_DigestFinal(&cntx, (u_char *) PasswordHashHash, (u_int *) &i); } // Shamelessly take from the hostap code written by Jouni Malinen @@ -231,7 +231,7 @@ EVP_DigestUpdate(&context, &PasswordHashHash, 16); EVP_DigestUpdate(&context, NTResponse, 24); EVP_DigestUpdate(&context, Magic1, 39); - EVP_DigestFinal(&context, (char *)&Digest, &Digest_len); + EVP_DigestFinal(&context, (u_char *)&Digest, (u_int *) &Digest_len); ChallengeHash(PeerChallenge, AuthenticatorChallenge, UserName, Challenge); @@ -239,7 +239,7 @@ EVP_DigestUpdate(&context, &Digest, 20); EVP_DigestUpdate(&context, &Challenge, 8); EVP_DigestUpdate(&context, Magic2, 41); - EVP_DigestFinal(&context, (char *)&Digest, &Digest_len); + EVP_DigestFinal(&context, (u_char *)&Digest, (u_int *) &Digest_len); memcpy(AuthenticatorResponse, &Digest, Digest_len); } @@ -287,12 +287,12 @@ return; } - des_encrypt(Challenge, PasswordHash, Response); - des_encrypt(Challenge, PasswordHash + 7, Response+8); + des_encrypt((uint8_t *) Challenge, (uint8_t *) PasswordHash, (uint8_t *) Response); + des_encrypt((uint8_t *) Challenge, (uint8_t *) PasswordHash + 7, (uint8_t *) Response+8); zpwd[0] = PasswordHash[14]; zpwd[1] = PasswordHash[15]; memset(zpwd + 2, 0, 5); - des_encrypt(Challenge, zpwd, Response+16); + des_encrypt((uint8_t *) Challenge, zpwd, (uint8_t *) Response+16); } void NtChallengeResponse(char *Challenge, char *Password, char *Response) @@ -323,18 +323,18 @@ ChallengeHash(PeerChallenge, AuthenticatorChallenge, UserName, (char *)&Challenge); debug_printf(DEBUG_AUTHTYPES, "PeerChallenge : "); - debug_hex_printf(DEBUG_AUTHTYPES, PeerChallenge, 8); + debug_hex_printf(DEBUG_AUTHTYPES, (u_char *) PeerChallenge, 8); debug_printf(DEBUG_AUTHTYPES, "AuthenticatorChallenge : "); - debug_hex_printf(DEBUG_AUTHTYPES, AuthenticatorChallenge, 8); + debug_hex_printf(DEBUG_AUTHTYPES, (u_char *) AuthenticatorChallenge, 8); debug_printf(DEBUG_AUTHTYPES, "Username : %s\n",UserName); debug_printf(DEBUG_AUTHTYPES, "Challenge : "); - debug_hex_printf(DEBUG_AUTHTYPES, Challenge, 8); + debug_hex_printf(DEBUG_AUTHTYPES, (u_char *) Challenge, 8); NtPasswordHash(Password, (char *)&PasswordHash); debug_printf(DEBUG_AUTHTYPES, "PasswordHash : "); - debug_hex_printf(DEBUG_AUTHTYPES, PasswordHash, 16); + debug_hex_printf(DEBUG_AUTHTYPES, (u_char *) PasswordHash, 16); ChallengeResponse(Challenge, (char *)&PasswordHash, Response); debug_printf(DEBUG_AUTHTYPES, "Response : "); - debug_hex_printf(DEBUG_AUTHTYPES, Response, 24); + debug_hex_printf(DEBUG_AUTHTYPES, (u_char *) Response, 24); } void GetMasterKey(char *PasswordHashHash, char *NTResponse, char *MasterKey) @@ -360,7 +360,7 @@ EVP_DigestUpdate(&cntx, PasswordHashHash, 16); EVP_DigestUpdate(&cntx, NTResponse, 24); EVP_DigestUpdate(&cntx, (char *)&Magic1, 27); - EVP_DigestFinal(&cntx, (char *)&Digest, &retLen); + EVP_DigestFinal(&cntx, (u_char *)&Digest, (u_int *) &retLen); memcpy(MasterKey, &Digest, 16); } @@ -386,7 +386,7 @@ EVP_DigestUpdate(&cntx, APR, 24); EVP_DigestUpdate(&cntx, PC, 8); EVP_DigestUpdate(&cntx, PR, 24); - EVP_DigestFinal(&cntx, (char *)&Digest, &retLen); + EVP_DigestFinal(&cntx, (u_char *)&Digest, (u_int *) &retLen); memcpy(MasterKey, &Digest, 16); @@ -461,7 +461,7 @@ EVP_DigestUpdate(&cntx, SHSpad1, 40); EVP_DigestUpdate(&cntx, (char *)&Magic, 84); EVP_DigestUpdate(&cntx, SHSpad2, 40); - EVP_DigestFinal(&cntx, (char *)&Digest, &retLen); + EVP_DigestFinal(&cntx, (u_char *)&Digest, (u_int *)&retLen); memcpy(SessionKey, &Digest, SessionKeyLength); } --- xsupplicant-1.2.1/src/eap_types/ttls/eapttls.c.BAD 2005-09-03 16:43:18.000000000 -0500 +++ xsupplicant-1.2.1/src/eap_types/ttls/eapttls.c 2005-09-03 16:44:20.000000000 -0500 @@ -215,7 +215,7 @@ // Make sure we have a valid packet to process. if (dataoffs == NULL) return XENONE; - result=tls_funcs_decode_packet(thisint, dataoffs, insize, outframe, outsize, + result=tls_funcs_decode_packet(thisint, (char *) dataoffs, insize, (char *) outframe, outsize, (phase2_call)ttls_do_phase2, userdata->chunk_size); if (result != 0) @@ -250,7 +250,7 @@ free(thisint->keyingMaterial); } - thisint->keyingMaterial = tls_funcs_gen_keyblock(network_data->activemethod); + thisint->keyingMaterial = (u_char *) tls_funcs_gen_keyblock(network_data->activemethod); thisint->keyingLength = 32; if (thisint->keyingMaterial == NULL) return -1; --- xsupplicant-1.2.1/src/eap_types/ttls/ttlsphase2.c.BAD 2005-09-03 16:45:26.000000000 -0500 +++ xsupplicant-1.2.1/src/eap_types/ttls/ttlsphase2.c 2005-09-03 16:57:41.000000000 -0500 @@ -184,7 +184,7 @@ username_size = strlen(username); // Send the Username AVP - build_avp(USER_NAME_AVP, 0, MANDITORY_FLAG, username, username_size, out_data, &avp_out_size); + build_avp(USER_NAME_AVP, 0, MANDITORY_FLAG, (uint8_t *) username, username_size, (uint8_t *) out_data, &avp_out_size); avp_offset = avp_out_size; @@ -200,7 +200,7 @@ id = challenge[16]; // Send the MS-CHAP AVP - build_avp(MS_CHAP_CHALLENGE, MS_VENDOR_ATTR, (MANDITORY_FLAG | VENDOR_FLAG), (char *)&mschap_challenge, 16, &out_data[avp_offset], &avp_out_size); + build_avp(MS_CHAP_CHALLENGE, MS_VENDOR_ATTR, (MANDITORY_FLAG | VENDOR_FLAG), (uint8_t *) &mschap_challenge, 16, (uint8_t *) &out_data[avp_offset], &avp_out_size); avp_offset+=avp_out_size; @@ -217,7 +217,7 @@ memcpy(&mschap_answer[2], &mschap_challenge, 16); memcpy(&mschap_answer[26], &mschap_result, 24); - build_avp(MS_CHAP2_RESPONSE, MS_VENDOR_ATTR, (MANDITORY_FLAG | VENDOR_FLAG), (char *)&mschap_answer, 50, &out_data[avp_offset], &avp_out_size); + build_avp(MS_CHAP2_RESPONSE, MS_VENDOR_ATTR, (MANDITORY_FLAG | VENDOR_FLAG), (uint8_t *) &mschap_answer, 50, (uint8_t *) &out_data[avp_offset], &avp_out_size); avp_offset+=avp_out_size; *out_size = avp_offset; } @@ -283,7 +283,7 @@ username_size = strlen(username); // Send the Username AVP - build_avp(USER_NAME_AVP, 0, MANDITORY_FLAG, username, username_size, out_data, &avp_out_size); + build_avp(USER_NAME_AVP, 0, MANDITORY_FLAG, (uint8_t *) username, username_size, (uint8_t *) out_data, &avp_out_size); avp_offset = avp_out_size; @@ -299,7 +299,7 @@ id = challenge[8]; // Send the MS-CHAP AVP - build_avp(MS_CHAP_CHALLENGE, MS_VENDOR_ATTR, (MANDITORY_FLAG | VENDOR_FLAG), (char *)&mschap_challenge, 8, &out_data[avp_offset], &avp_out_size); + build_avp(MS_CHAP_CHALLENGE, MS_VENDOR_ATTR, (MANDITORY_FLAG | VENDOR_FLAG), (uint8_t *) &mschap_challenge, 8, (uint8_t *) &out_data[avp_offset], &avp_out_size); avp_offset+=avp_out_size; @@ -313,7 +313,7 @@ mschap_answer[1] = 1; // Use NT Style Passwords. memcpy((char *)&mschap_answer[26], (char *)&mschap_result, 24); - build_avp(MS_CHAP_RESPONSE, MS_VENDOR_ATTR, (MANDITORY_FLAG | VENDOR_FLAG), (char *)&mschap_answer, 50, &out_data[avp_offset], &avp_out_size); + build_avp(MS_CHAP_RESPONSE, MS_VENDOR_ATTR, (MANDITORY_FLAG | VENDOR_FLAG), (uint8_t *) &mschap_answer, 50, (uint8_t *) &out_data[avp_offset], &avp_out_size); avp_offset+=avp_out_size; *out_size = avp_offset; @@ -386,12 +386,12 @@ username = phase2data->username; } username_size = strlen(username); - build_avp(USER_NAME_AVP, 0, MANDITORY_FLAG, username, username_size, out_data, &avp_out_size); + build_avp(USER_NAME_AVP, 0, MANDITORY_FLAG, (uint8_t *) username, username_size, (uint8_t *) out_data, &avp_out_size); avp_offset = avp_out_size; // Get the implicit challenge. - challenge = implicit_challenge(thisint); + challenge = (u_char *) implicit_challenge(thisint); if (challenge == NULL) { debug_printf(DEBUG_NORMAL, "Invalid implicit challenge in ttls_do_chap()!\n"); @@ -409,9 +409,9 @@ return; } - user_passwd = phase2data->password; + user_passwd = (u_char *) phase2data->password; - tohash = (char *)malloc(1+16+strlen(user_passwd)); + tohash = (u_char *)malloc(1+16+strlen((char *) user_passwd)); if (tohash == NULL) { debug_printf(DEBUG_NORMAL, "Error with malloc of \"tohash\" in ttls_do_chap().\n"); @@ -419,13 +419,13 @@ } tohash[0] = session_id; - memcpy(&tohash[1], user_passwd, strlen(user_passwd)); - memcpy(&tohash[1+strlen(user_passwd)], &chap_challenge, 16); - hashlen = 1+strlen(user_passwd)+16; + memcpy(&tohash[1], user_passwd, strlen((char *) user_passwd)); + memcpy(&tohash[1+strlen((char *) user_passwd)], &chap_challenge, 16); + hashlen = 1+strlen((char *) user_passwd)+16; EVP_DigestInit(ctx, EVP_md5()); EVP_DigestUpdate(ctx, tohash, hashlen); - EVP_DigestFinal(ctx, (char *)&chap_hash[1], (int *)&md5_length); + EVP_DigestFinal(ctx, (u_char *)&chap_hash[1], (u_int *)&md5_length); if (md5_length != 16) // We didn't get back a valid hash! { @@ -433,11 +433,11 @@ } chap_hash[0]=session_id; - build_avp(CHAP_PASSWORD_AVP, 0, MANDITORY_FLAG, chap_hash, 17, &out_data[avp_offset], &avp_out_size); + build_avp(CHAP_PASSWORD_AVP, 0, MANDITORY_FLAG, chap_hash, 17, (uint8_t *) &out_data[avp_offset], &avp_out_size); avp_offset += avp_out_size; - build_avp(CHAP_CHALLENGE_AVP, 0, MANDITORY_FLAG, (char *)&chap_challenge, 16, &out_data[avp_offset], &avp_out_size); + build_avp(CHAP_CHALLENGE_AVP, 0, MANDITORY_FLAG, (uint8_t *) &chap_challenge, 16, (uint8_t *) &out_data[avp_offset], &avp_out_size); if (tohash != NULL) { @@ -518,8 +518,8 @@ avp_offset = 0; - build_avp(USER_NAME_AVP, 0, MANDITORY_FLAG, username, - strlen(username), out_data, &avp_out_size); + build_avp(USER_NAME_AVP, 0, MANDITORY_FLAG, (uint8_t *) username, + strlen(username), (uint8_t *) out_data, &avp_out_size); avp_offset += avp_out_size; @@ -537,7 +537,7 @@ bzero(tempbuf, passwd_size); memcpy(tempbuf, phase2data->password, strlen(phase2data->password)); - build_avp(USER_PASSWORD_AVP, 0, MANDITORY_FLAG, tempbuf, passwd_size, &out_data[avp_offset], &avp_out_size); + build_avp(USER_PASSWORD_AVP, 0, MANDITORY_FLAG, (uint8_t *) tempbuf, passwd_size, (uint8_t *) &out_data[avp_offset], &avp_out_size); *out_size = avp_offset + avp_out_size; @@ -548,7 +548,7 @@ } debug_printf(DEBUG_AUTHTYPES, "Returning from do_pap :\n"); - debug_hex_dump(DEBUG_AUTHTYPES, out_data, *out_size); + debug_hex_dump(DEBUG_AUTHTYPES, (u_char *) out_data, *out_size); } // We don't do anything with the "in" stuff for now.. @@ -567,7 +567,7 @@ } debug_printf(DEBUG_AUTHTYPES, "Encrypted Inner (%d) : \n", in_size); - debug_hex_dump(DEBUG_AUTHTYPES, in, in_size); + debug_hex_dump(DEBUG_AUTHTYPES, (u_char *) in, in_size); userdata = (struct config_eap_ttls *)thisint->eap_conf_data; @@ -597,10 +597,10 @@ if ((in_size > 0) && (in[0] != 0x14)) { // We have something to decrypt! - tls_crypt_decrypt(thisint, in, in_size, decr_data, &decrsize); + tls_crypt_decrypt(thisint, (u_char *) in, in_size, (u_char *) decr_data, &decrsize); debug_printf(DEBUG_AUTHTYPES, "Decrypted Inner (%d) : \n", in_size); - debug_hex_dump(DEBUG_AUTHTYPES, decr_data, decrsize); + debug_hex_dump(DEBUG_AUTHTYPES, (u_char *) decr_data, decrsize); if (decr_data[0] == 0x00) { @@ -638,11 +638,11 @@ return XENONE; } - tls_crypt_encrypt_nolen(thisint, toencout, toencsize, out, out_size); + tls_crypt_encrypt_nolen(thisint, (u_char *) toencout, toencsize, (u_char *) out, out_size); free(toencout); debug_printf(DEBUG_AUTHTYPES, "Returning from (TTLS) do_phase2 : \n"); - debug_hex_dump(DEBUG_AUTHTYPES, out, *out_size); + debug_hex_dump(DEBUG_AUTHTYPES, (u_char *) out, *out_size); return XENONE; } --- xsupplicant-1.2.1/src/eap_types/leap/eapleap.c.BAD 2005-09-03 17:22:01.000000000 -0500 +++ xsupplicant-1.2.1/src/eap_types/leap/eapleap.c 2005-09-03 17:25:57.000000000 -0500 @@ -50,7 +50,7 @@ unicodePass[2 * i + 1] = 0; } /* Encrypt plain text password to a 16-byte MD4 hash */ - md4_calc(MD4Hash, unicodePass, passLen * 2); + md4_calc(MD4Hash, (u_char *) unicodePass, passLen * 2); } void leap_mschap(char * password, char * response) { @@ -64,7 +64,7 @@ ntPwdHash(MD4Hash, password); md4_calc(MD4HashHash, MD4Hash, 16); - ChallengeResponse(leapchallenges->apc, MD4HashHash, response); + ChallengeResponse((char *) leapchallenges->apc, (char *) MD4HashHash, response); } @@ -199,7 +199,7 @@ // LEAP shouldn't be used as an inner type, so we should be able to get // away with this. - data = dataoffs-5; + data = (char *) dataoffs-5; eapheader = (struct eap_header *)data; switch (eapheader->eap_code) { @@ -279,7 +279,7 @@ memset(chall_response, 0x0, 8); NtChallengeResponse((char *)leaprequest->randval, userdata->password, (char *)&chall_response); - GenerateNTResponse((char *)leapchallenges->pr, (char *)leapchallenges->pc, username, userdata->password, chall_response); + GenerateNTResponse((char *)leapchallenges->pr, (char *)leapchallenges->pc, username, userdata->password, (char *) chall_response); // store Access Point Challenge memcpy((uint8_t *)leapchallenges->apc, (char *)chall_response, 8); @@ -337,7 +337,7 @@ leapresponse = (struct leap_responses *)dataoffs; - challenge_response_got = (char *)malloc(leapresponse->count+1); + challenge_response_got = (u_char *)malloc(leapresponse->count+1); if (!challenge_response_got) { debug_printf(DEBUG_NORMAL, "(EAP-LEAP) challenge_response_got is NULL after malloc!\n"); } @@ -350,7 +350,7 @@ memset(challenge_response_expected, 0x0, 24); // Calculate the 24 bytes MS-CHAP Challenge Response - leap_mschap(userdata->password, challenge_response_expected); + leap_mschap(userdata->password, (char *) challenge_response_expected); if (memcmp(challenge_response_got, challenge_response_expected, 24) == 0) { debug_printf(DEBUG_AUTHTYPES, "(EAP-LEAP) AP ChallengeResponse got is valid.\n"); @@ -386,7 +386,7 @@ debug_printf(DEBUG_AUTHTYPES, "(EAP-LEAP) leapchallenges->apr : "); debug_hex_printf(DEBUG_AUTHTYPES, (uint8_t *)leapchallenges->apr, 24); - GetMasterLEAPKey((char *)MD4HashHash, leapchallenges->apc, leapchallenges->apr, leapchallenges->pc, leapchallenges->pr, (char *)&MasterKey); + GetMasterLEAPKey((char *)MD4HashHash, (char *) leapchallenges->apc, (char *) leapchallenges->apr, (char *) leapchallenges->pc, (char *) leapchallenges->pr, (char *)&MasterKey); debug_printf(DEBUG_AUTHTYPES, "MasterLEAPKey : "); debug_hex_printf(DEBUG_AUTHTYPES, (unsigned char *)&MasterKey, 16); @@ -444,7 +444,7 @@ mydata = (struct leap_data *)network_data->activemethod->eap_data; // Right now, we don't return anything from LEAP. - thisint->keyingMaterial = mydata->keyingMaterial; + thisint->keyingMaterial = (u_char *) mydata->keyingMaterial; thisint->keyingLength = 16; // We only use 16 bytes for this keying material! return 0; --- xsupplicant-1.2.1/src/wpa_common.c.BAD 2005-09-03 08:42:16.000000000 -0500 +++ xsupplicant-1.2.1/src/wpa_common.c 2005-09-03 08:42:30.000000000 -0500 @@ -201,7 +201,7 @@ // This is a little different than the reference implementation, // because OpenSSL takes parameters in a different order. HMAC(EVP_sha1(), key, key_len, input, total_len, &output[currentindex], - &k); + (u_int *) &k); currentindex += 20; input[total_len-1]++; } --- xsupplicant-1.2.1/src/eapol_key_type1.c.BAD 2005-09-03 08:40:11.000000000 -0500 +++ xsupplicant-1.2.1/src/eapol_key_type1.c 2005-09-03 08:41:54.000000000 -0500 @@ -107,7 +107,7 @@ if (calchmac == NULL) return XEMALLOC; HMAC(EVP_md5(), thisint->keyingMaterial+32, - thisint->keyingLength, framecpy, framesize, calchmac, &outlen); + thisint->keyingLength, (u_char *) framecpy, framesize, (u_char *) calchmac, (u_int *) &outlen); // Now, we need to compare the calculated HMAC to the one sent to us. keydata = (struct key_packet *)&inframe[4]; --- xsupplicant-1.2.1/src/eapol.c.BAD 2005-09-03 08:30:37.000000000 -0500 +++ xsupplicant-1.2.1/src/eapol.c 2005-09-03 08:30:45.000000000 -0500 @@ -122,7 +122,7 @@ // an EAP request that is valid. If we don't have any config informtion, // we should just bail here, and not return an error. - inframe = (u_char *)&workint->recvframe; + inframe = (char *)&workint->recvframe; temp = (struct eapol_header *)&inframe[OFFSET_PAST_MAC]; --- xsupplicant-1.2.1/src/statemachine.c.BAD 2005-09-03 08:32:13.000000000 -0500 +++ xsupplicant-1.2.1/src/statemachine.c 2005-09-03 08:33:13.000000000 -0500 @@ -619,7 +619,7 @@ } } - eapol_build_header(EAPOL_LOGOFF, 0, eapolver, thisint->sendframe); + eapol_build_header(EAPOL_LOGOFF, 0, eapolver, (char *) thisint->sendframe); thisint->send_size = OFFSET_TO_EAP; snmp_dot1xSuppEapolLogoffFramesTx(); @@ -664,7 +664,7 @@ } eapol_build_header(EAPOL_START, 0, network_data->force_eapol_ver, - thisint->sendframe); + (char *) thisint->sendframe); thisint->send_size = OFFSET_TO_EAP; snmp_dot1xSuppEapolStartFramesTx(); --- xsupplicant-1.2.1/src/config_ssid.c.BAD 2005-09-03 08:30:08.000000000 -0500 +++ xsupplicant-1.2.1/src/config_ssid.c 2005-09-03 08:30:24.000000000 -0500 @@ -151,7 +151,7 @@ if (wpa_ie != NULL) { - cur->wpa_ie = (char *)malloc(wpa_ie_len); + cur->wpa_ie = (unsigned char *)malloc(wpa_ie_len); if (cur->wpa_ie == NULL) { debug_printf(DEBUG_NORMAL, "Couldn't allocate memory for wpa_ie! " @@ -168,7 +168,7 @@ if (rsn_ie != NULL) { - cur->rsn_ie = (char *)malloc(rsn_ie_len); + cur->rsn_ie = (unsigned char *)malloc(rsn_ie_len); if (cur->rsn_ie == NULL) { debug_printf(DEBUG_NORMAL, "Couldn't allocate memory for rsn_ie! " --- xsupplicant-1.2.1/src/xsup_ipc.c.BAD 2005-09-03 17:27:32.000000000 -0500 +++ xsupplicant-1.2.1/src/xsup_ipc.c 2005-09-03 17:29:17.000000000 -0500 @@ -144,7 +144,7 @@ } debug_printf(DEBUG_INT, "(IPC) Sending : \n"); - debug_hex_dump(DEBUG_INT, tosend, tolen); + debug_hex_dump(DEBUG_INT, (u_char *) tosend, tolen); err = send(skfd, tosend, tolen, 0); if (err < 0) @@ -194,7 +194,7 @@ *outsize = 0; } else { debug_printf(DEBUG_INT, "(IPC) Got : \n"); - debug_hex_dump(DEBUG_INT, outbuf, readStat); + debug_hex_dump(DEBUG_INT, (u_char *) outbuf, readStat); // Verify that the packet we got is valid. *outsize = readStat; @@ -355,7 +355,7 @@ debug_printf(DEBUG_NORMAL, "Error getting working interface " "dumping current packet: \n"); - debug_hex_dump(DEBUG_NORMAL, buffer, bufsize); + debug_hex_dump(DEBUG_NORMAL, (u_char *) buffer, bufsize); debug_printf(DEBUG_NORMAL, "Ignoring remaining parts of packet!\n"); bufptr = bufsize+1; @@ -419,7 +419,7 @@ { // We got a request for a new IPC client connection. debug_printf(DEBUG_INT, "Got a request to connect a new client.\n"); - newsock = accept(ipc_sock, (struct sockaddr *)&sa, &len); + newsock = accept(ipc_sock, (struct sockaddr *)&sa, (u_int *) &len); if (newsock <= 0) { debug_printf(DEBUG_NORMAL, "Got a request for a new IPC client " @@ -514,7 +514,7 @@ ipc_callout_request_password(intidx, &bufptr, (char *)&packet[0], 512, eapType, challenge); debug_printf(DEBUG_AUTHTYPES, "Sending : \n"); - debug_hex_dump(DEBUG_AUTHTYPES, packet, bufptr); + debug_hex_dump(DEBUG_AUTHTYPES, (u_char *) packet, bufptr); xsup_ipc_send_all((char *)&packet, bufptr); --- xsupplicant-1.2.1/src/eapol_key_type254.c.BAD 2005-09-03 09:05:02.000000000 -0500 +++ xsupplicant-1.2.1/src/eapol_key_type254.c 2005-09-03 09:21:09.000000000 -0500 @@ -192,12 +192,12 @@ } debug_printf(DEBUG_INT, "PMK : "); - debug_hex_printf(DEBUG_INT, intdata->statemachine->PMK, 32); - wpa_PRF(intdata->statemachine->PMK, 32, "Pairwise key expansion", 22, - (char *)&prfdata, 76, retval, 64); + debug_hex_printf(DEBUG_INT, (u_char *) intdata->statemachine->PMK, 32); + wpa_PRF((u_char *) intdata->statemachine->PMK, 32, (u_char *) "Pairwise key expansion", 22, + (u_char *)&prfdata, 76, (u_char *) retval, 64); debug_printf(DEBUG_INT, "PTK : "); - debug_hex_printf(DEBUG_INT, retval, 64); + debug_hex_printf(DEBUG_INT, (u_char *) retval, 64); return retval; } @@ -264,10 +264,10 @@ eapolver = snmp_get_dot1xSuppLastEapolFrameVersion(); eapol_build_header(EAPOL_KEY, (intdata->send_size-OFFSET_TO_EAPOL-4), - eapolver, intdata->sendframe); + eapolver, (char *) intdata->sendframe); memcpy(key, intdata->statemachine->PTK, 16); - mic_wpa_populate(intdata->sendframe, intdata->send_size+4, key, 16); + mic_wpa_populate((char *) intdata->sendframe, intdata->send_size+4, key, 16); cardif_sendframe(intdata); intdata->statemachine->eapolEap = FALSE; @@ -351,21 +351,21 @@ bzero(rc4_ek, 32); memcpy(rc4_ek, inkeydata->key_iv, 16); memcpy(&rc4_ek[16], &intdata->statemachine->PTK[16], 16); - rc4_skip(rc4_ek, 32, 256, keydata, value16); + rc4_skip((u_char *) rc4_ek, 32, 256, keydata, value16); wpa_common_swap_rx_tx_mic(keydata); - cardif_set_tkip_key(intdata, allfs, keyindex, FALSE, inkeydata->key_rsc, - 6, keydata, value16); + cardif_set_tkip_key(intdata, (char *) allfs, keyindex, FALSE, (char *) inkeydata->key_rsc, + 6, (char *) keydata, value16); break; case 2: // First, decrypt the GTK bzero(key, 16); - aes_unwrap(&intdata->statemachine->PTK[16], (value16-8)/8, keydata, - key); + aes_unwrap((u_char *) &intdata->statemachine->PTK[16], (value16-8)/8, keydata, + (u_char *) key); wpa_common_swap_rx_tx_mic(keydata); - cardif_set_ccmp_key(intdata, NULL, keyindex, FALSE, inkeydata->key_rsc, + cardif_set_ccmp_key(intdata, NULL, keyindex, FALSE, (char *) inkeydata->key_rsc, 6, key, (value16-8)); break; } @@ -391,13 +391,13 @@ eapolver = snmp_get_dot1xSuppLastEapolFrameVersion(); eapol_build_header(EAPOL_KEY, (intdata->send_size-OFFSET_TO_EAPOL-4), - eapolver, intdata->sendframe); + eapolver, (char *) intdata->sendframe); memcpy(key, intdata->statemachine->PTK, 16); - mic_wpa_populate(intdata->sendframe, intdata->send_size+4, key, 16); + mic_wpa_populate((char *) intdata->sendframe, intdata->send_size+4, key, 16); // Dump what we built. - eapol_key_type254_dump(intdata->sendframe); + eapol_key_type254_dump((char *) intdata->sendframe); if (network_data->methods->method_num == WPA_PSK) { @@ -504,13 +504,13 @@ eapolver = snmp_get_dot1xSuppLastEapolFrameVersion(); eapol_build_header(EAPOL_KEY, (intdata->send_size-OFFSET_TO_EAPOL-4), - eapolver, intdata->sendframe); + eapolver, (char *) intdata->sendframe); memcpy(key, intdata->statemachine->PTK, 16); - mic_wpa_populate(intdata->sendframe, intdata->send_size+4, key, 16); + mic_wpa_populate((char *) intdata->sendframe, intdata->send_size+4, key, 16); // Dump what we built. - eapol_key_type254_dump(intdata->sendframe); + eapol_key_type254_dump((char *) intdata->sendframe); } /******************************************************** @@ -586,20 +586,20 @@ eapolver = snmp_get_dot1xSuppLastEapolFrameVersion(); eapol_build_header(EAPOL_KEY, (intdata->send_size-OFFSET_TO_EAPOL-4), - eapolver, intdata->sendframe); + eapolver, (char *) intdata->sendframe); memcpy(key, intdata->statemachine->PTK, 16); - mic_wpa_populate(intdata->sendframe, intdata->send_size+4, key, 16); + mic_wpa_populate((char *) intdata->sendframe, intdata->send_size+4, key, 16); // Dump what we built. - eapol_key_type254_dump(intdata->sendframe); + eapol_key_type254_dump((char *) intdata->sendframe); // Get TK1 value16 = ntohs(inkeydata->key_length); memcpy(key, (char *)&intdata->statemachine->PTK[32], value16); debug_printf(DEBUG_INT, "TK1 : "); - debug_hex_printf(DEBUG_INT, key, value16); + debug_hex_printf(DEBUG_INT, (u_char *) key, value16); cardif_sendframe(intdata); intdata->statemachine->eapolEap = FALSE; @@ -612,14 +612,14 @@ case 1: // We need to swap the TX/RX MIC values since we are the supplicant. // (Thanks to Jouni Malinen for pointing this out!) - wpa_common_swap_rx_tx_mic(key); + wpa_common_swap_rx_tx_mic((u_char *) key); cardif_set_tkip_key(intdata, intdata->dest_mac, keyindex, TRUE, - inkeydata->key_rsc, 6, key, value16); + (char *) inkeydata->key_rsc, 6, key, value16); break; case 2: cardif_set_ccmp_key(intdata, intdata->dest_mac, keyindex, TRUE, - inkeydata->key_rsc, 6, key, value16); + (char *) inkeydata->key_rsc, 6, key, value16); break; } } @@ -646,7 +646,7 @@ if (keyflags & WPA_KEY_MIC_FLAG) { - if (mic_wpa_validate(intdata->recvframe, intdata->recv_size, + if (mic_wpa_validate((char *) intdata->recvframe, intdata->recv_size, intdata->statemachine->PTK, 16) == FALSE) { intdata->statemachine->MICVerified = TRUE; @@ -688,7 +688,7 @@ eapolver = snmp_get_dot1xSuppLastEapolFrameVersion(); eapol_build_header(EAPOL_KEY, (intdata->recv_size-OFFSET_TO_EAPOL-4), - eapolver, intdata->recvframe); + eapolver, (char *) intdata->recvframe); cardif_sendframe(intdata); intdata->statemachine->eapolEap = FALSE; } @@ -757,8 +757,8 @@ } // We have an ASCII password, so calculate it. - if (psk_wpa_pbkdf2(psk->key, intdata->cur_essid, - strlen(intdata->cur_essid), (char *)&tpmk) + if (psk_wpa_pbkdf2(psk->key, (u_char *) intdata->cur_essid, + strlen(intdata->cur_essid), (u_char *)&tpmk) == TRUE) { intdata->statemachine->PMK = (char *)malloc(32); @@ -798,7 +798,7 @@ } } - eapol_key_type254_dump(inframe); + eapol_key_type254_dump((char *) inframe); eapol_key_type254_determine_key(intdata); --- xsupplicant-1.2.1/src/config_grammar.y.BAD 2005-09-03 17:31:51.000000000 -0500 +++ xsupplicant-1.2.1/src/config_grammar.y 2005-09-03 17:34:56.000000000 -0500 @@ -829,8 +829,9 @@ } else { int tmp_dst_mac[CONFIG_MAC_LEN]; + int retval; SET_FLAG(tmp_network->flags, CONFIG_NET_DEST_MAC); - sscanf($3, "%2x:%2x:%2x:%2x:%2x:%2x", + retval = sscanf($3, "%2x:%2x:%2x:%2x:%2x:%2x", &tmp_dst_mac[0], &tmp_dst_mac[1], &tmp_dst_mac[2], @@ -1035,25 +1036,25 @@ set_current_static_wep(); parameter_debug("Static Key 1 : %s\n", $3); if (!tmp_static_wep->key[1]) - tmp_static_wep->key[1] = $3; + tmp_static_wep->key[1] = (u_char *) $3; } | TK_STATIC_KEY2 '=' TK_QUOTED_STR { set_current_static_wep(); parameter_debug("Static Key 2 : %s\n", $3); if (!tmp_static_wep->key[2]) - tmp_static_wep->key[2] = $3; + tmp_static_wep->key[2] = (u_char *) $3; } | TK_STATIC_KEY3 '=' TK_QUOTED_STR { set_current_static_wep(); parameter_debug("Static Key 3 : %s\n", $3); if (!tmp_static_wep->key[3]) - tmp_static_wep->key[3] = $3; + tmp_static_wep->key[3] = (u_char *) $3; } | TK_STATIC_KEY4 '=' TK_QUOTED_STR { set_current_static_wep(); parameter_debug("Static Key 4 : %s\n", $3); if (!tmp_static_wep->key[4]) - tmp_static_wep->key[4] = $3; + tmp_static_wep->key[4] = (u_char *) $3; } | TK_WEP_TX_KEY '=' TK_NUMBER { set_current_static_wep(); Index: sources =================================================================== RCS file: /cvs/extras/rpms/xsupplicant/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 19 Aug 2005 18:58:19 -0000 1.2 +++ sources 4 Sep 2005 13:17:45 -0000 1.3 @@ -1 +1,2 @@ e1eee37899b49ed238648699d0a01c5b xsupplicant-1.2.tar.gz +c44300f798a3317c06e501eb0dd98a23 xsupplicant-1.2.1.tar.gz Index: xsupplicant.spec =================================================================== RCS file: /cvs/extras/rpms/xsupplicant/devel/xsupplicant.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- xsupplicant.spec 19 Aug 2005 18:58:19 -0000 1.1 +++ xsupplicant.spec 4 Sep 2005 13:17:45 -0000 1.2 @@ -1,6 +1,6 @@ Name: xsupplicant Summary: Open Source Implementation of IEEE 802.1x -Version: 1.2 +Version: 1.2.1 Release: 1%{?dist} License: GPL Group: System Environment/Base @@ -8,6 +8,8 @@ Source0: http://download.sourceforge.net/open1x/xsupplicant-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: openssl-devel, bison, flex +Patch0: xsupplicant-1.2.1-docsfix.patch +Patch1: xsupplicant-1.2.1-gcc4-cleanups.patch %description This software allows a GNU/Linux or BSD workstation to authenticate with @@ -17,12 +19,17 @@ %prep %setup -q +%patch0 -p1 +%patch1 -p1 perl -pi.orig -e 's|/lib\b|/%{_lib}|g' configure* %build %configure make %{?_smp_mflags} +cd doc +./builddocs.sh +cd .. %install rm -rf $RPM_BUILD_ROOT @@ -35,7 +42,7 @@ %files %defattr(-,root,root,-) -%doc AUTHORS COPYING README doc/html/ doc/txt/ doc/README* etc/*.conf +%doc AUTHORS COPYING README doc/html/ doc/txt/ doc/pdf doc/README* etc/*.conf %config(noreplace) %{_sysconfdir}/xsupplicant.conf %{_bindir}/config-parser %{_bindir}/xsup_monitor @@ -44,6 +51,9 @@ %{_sbindir}/xsupplicant %changelog +* Sat Sep 3 2005 Tom "spot" Callaway 1.2.1-1 +- bump to 1.2.1 release + * Fri Aug 19 2005 Tom "spot" Callaway 1.2-1 - bump to 1.2 final From fedora-extras-commits at redhat.com Sun Sep 4 13:17:42 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sun, 4 Sep 2005 09:17:42 -0400 Subject: rpms/xsupplicant/FC-4 xsupplicant-1.2.1-docsfix.patch, NONE, 1.1 xsupplicant-1.2.1-gcc4-cleanups.patch, NONE, 1.1 sources, 1.2, 1.3 xsupplicant.spec, 1.1, 1.2 Message-ID: <200509041317.j84DHg73030637@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/xsupplicant/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30591/FC-4 Modified Files: sources xsupplicant.spec Added Files: xsupplicant-1.2.1-docsfix.patch xsupplicant-1.2.1-gcc4-cleanups.patch Log Message: Bump to 1.2.1, fix a LOT of signed/unsigned mistakes in the code. xsupplicant-1.2.1-docsfix.patch: --- NEW FILE xsupplicant-1.2.1-docsfix.patch --- --- xsupplicant-1.2.1/doc/builddocs.sh.BAD 2005-09-03 08:20:54.000000000 -0500 +++ xsupplicant-1.2.1/doc/builddocs.sh 2005-09-03 08:22:29.000000000 -0500 @@ -4,7 +4,7 @@ # best option is just to require users of this script to define # the variable on their own? not quite sure, I guess that's why # it's hard coded for now... -JADE_PUB=/usr/share/doc/openjade-1.3/pubtext +JADE_PUB=/usr/share/doc/openjade-*/pubtext SGML_CATALOG_FILES=/usr/sgml-tools/dtd/catalog:/etc/sgml/catalog:/usr/share/doc/openjade-1.3.2/catalog:/home/chris/t/docbook-dsssl-1.97/catalog mkdir -p html @@ -33,7 +33,7 @@ # create the txt docs echo -n "Building the TXT docs..." -lynx -dump -nolist html/Open1x-UserGuide.html > txt/Open1x-UserGuide.txt +links -dump html/Open1x-UserGuide.html > txt/Open1x-UserGuide.txt if [ $? -ne 0 ] then echo "Error! Build failed!" xsupplicant-1.2.1-gcc4-cleanups.patch: --- NEW FILE xsupplicant-1.2.1-gcc4-cleanups.patch --- --- xsupplicant-1.2.1/src/cardif/linux/cardif_hostap_driver.c.BAD 2005-09-03 17:50:21.000000000 -0500 +++ xsupplicant-1.2.1/src/cardif/linux/cardif_hostap_driver.c 2005-09-03 17:50:50.000000000 -0500 @@ -326,7 +326,7 @@ debug_printf(DEBUG_NORMAL, "alg=%s key_idx=%d set_tx=%d seq_len=%d key_len=%d\n", alg_name, key_idx, set_tx, seq_len, key_len); debug_printf(DEBUG_NORMAL, "KeyRSC = "); - debug_hex_printf(DEBUG_NORMAL, seq, seq_len); + debug_hex_printf(DEBUG_NORMAL, (u_char *) seq, seq_len); if (seq_len > 8) { @@ -350,7 +350,7 @@ memset(param->sta_addr, 0xff, ETH_ALEN); - strncpy(param->u.crypt.alg, alg_name, HOSTAP_CRYPT_ALG_NAME_LEN); + strncpy((char *) param->u.crypt.alg, alg_name, HOSTAP_CRYPT_ALG_NAME_LEN); param->u.crypt.flags = set_tx ? HOSTAP_CRYPT_FLAG_SET_TX_KEY : 0; param->u.crypt.idx = key_idx; memcpy(param->u.crypt.seq, seq, seq_len); --- xsupplicant-1.2.1/src/cardif/linux/cardif_linux_wext.c.BAD 2005-09-03 17:51:02.000000000 -0500 +++ xsupplicant-1.2.1/src/cardif/linux/cardif_linux_wext.c 2005-09-03 17:53:08.000000000 -0500 @@ -119,10 +119,10 @@ // We set the key index to 0x80, to force key 0 to be set to all 0s, // and to have key 0 be set as the default transmit key. - cardif_set_wep_key(thisint, (char *)&zerokey, keylen, 0x80); - cardif_set_wep_key(thisint, (char *)&zerokey, keylen, 0x01); - cardif_set_wep_key(thisint, (char *)&zerokey, keylen, 0x02); - cardif_set_wep_key(thisint, (char *)&zerokey, keylen, 0x03); + cardif_set_wep_key(thisint, (u_char *)&zerokey, keylen, 0x80); + cardif_set_wep_key(thisint, (u_char *)&zerokey, keylen, 0x01); + cardif_set_wep_key(thisint, (u_char *)&zerokey, keylen, 0x02); + cardif_set_wep_key(thisint, (u_char *)&zerokey, keylen, 0x03); } /************************************************************** @@ -947,10 +947,10 @@ if (config_ssid_get_ssid_abilities() & RSN_IE) { - cardif_linux_wext_get_wpa2_ie(intdata, wpaie, &len); + cardif_linux_wext_get_wpa2_ie(intdata, (char *) wpaie, &len); } else if (config_ssid_get_ssid_abilities() & WPA_IE) { - cardif_linux_wext_get_wpa_ie(intdata, wpaie, &len); + cardif_linux_wext_get_wpa_ie(intdata, (char *) wpaie, &len); } if (len > 0) @@ -965,11 +965,11 @@ intdata->flags |= DONTSCAN; cardif_linux_wext_set_ssid(intdata, newssid); - bssid = config_ssid_get_mac(); + bssid = (char *) config_ssid_get_mac(); if (bssid != NULL) { debug_printf(DEBUG_INT, "Dest. BSSID : "); - debug_hex_printf(DEBUG_INT, bssid, 6); + debug_hex_printf(DEBUG_INT, (u_char *) bssid, 6); } // cardif_linux_wext_set_bssid(intdata, bssid); --- xsupplicant-1.2.1/src/cardif/linux/cardif_ipw_driver.c.BAD 2005-09-03 17:54:57.000000000 -0500 +++ xsupplicant-1.2.1/src/cardif/linux/cardif_ipw_driver.c 2005-09-03 17:57:23.000000000 -0500 @@ -240,7 +240,7 @@ wpa2_gen_ie(intdata, iedata, ielen); debug_printf(DEBUG_INT, "Setting WPA2 IE : "); - debug_hex_printf(DEBUG_INT, iedata, *ielen); + debug_hex_printf(DEBUG_INT, (u_char *) iedata, *ielen); debug_printf(DEBUG_INT, "\n"); return XENONE; @@ -372,7 +372,7 @@ param = (struct ipw_param *) buf; param->cmd = IPW_CMD_SET_ENCRYPTION; memset(param->sta_addr, 0xff, 6); - strncpy(param->u.crypt.alg, alg_name, IPW_CRYPT_ALG_NAME_LEN); + strncpy((char *) param->u.crypt.alg, alg_name, IPW_CRYPT_ALG_NAME_LEN); param->u.crypt.set_tx = set_tx ? 1 : 0; param->u.crypt.idx = key_idx; memcpy(param->u.crypt.seq, seq, seq_len); @@ -422,7 +422,7 @@ { int ret; - ret = ipw_mlme(intdata->intName, intdata->source_mac, + ret = ipw_mlme(intdata->intName, (u8 *) intdata->source_mac, IPW_MLME_STA_DISASSOC, reason_code); if (ret <0) return ret; @@ -458,16 +458,16 @@ if (config_ssid_get_ssid_abilities() & RSN_IE) { - cardif_ipw_driver_get_wpa2_ie(intdata, wpaie, &len); + cardif_ipw_driver_get_wpa2_ie(intdata, (char *) wpaie, &len); } else if (config_ssid_get_ssid_abilities() & WPA_IE) { - cardif_ipw_driver_get_wpa_ie(intdata, wpaie, &len); + cardif_ipw_driver_get_wpa_ie(intdata, (char *) wpaie, &len); } // Length needs to be > 0 in order to indicate that we have an IE to set. if ((len < 255) && (len >= 0)) { - if (cardif_ipw_driver_set_wpa_ie(intdata->intName, wpaie, len) < 0) + if (cardif_ipw_driver_set_wpa_ie(intdata->intName, (char *) wpaie, len) < 0) { debug_printf(DEBUG_NORMAL, "Couldn't set WPA/RSN IE on device %s!\n", intdata->intName); --- xsupplicant-1.2.1/src/cardif/linux/cardif_linux_rtnetlink.c.BAD 2005-09-03 17:43:05.000000000 -0500 +++ xsupplicant-1.2.1/src/cardif/linux/cardif_linux_rtnetlink.c 2005-09-03 17:49:49.000000000 -0500 @@ -269,13 +269,13 @@ memcpy(&custom, &tptr[12], (iwe->len - 12)); debug_printf(DEBUG_INT, "(Custom) Value : %s\n", custom); - if (strncmp("wpa_ie=", custom, 7) == 0) + if (strncmp("wpa_ie=", (char *) custom, 7) == 0) { SET_FLAG(flags, WPA_IE); debug_printf(DEBUG_INT, "AP appears to support WPA!\n"); - temp = (char *)malloc((iwe->len - 12)/2); - process_hex(&custom[7], (iwe->len - 12-7), temp); - wpa_parse_ie(temp); + temp = (u_char *)malloc((iwe->len - 12)/2); + process_hex((char *) &custom[7], (iwe->len - 12-7), (char *) temp); + wpa_parse_ie((char *) temp); temp_wpa = temp; temp_wpa_len = ((iwe->len - 12)/2); @@ -285,13 +285,13 @@ temp = NULL; } - if (strncmp("rsn_ie=", custom, 7) == 0) + if (strncmp("rsn_ie=", (char *) custom, 7) == 0) { SET_FLAG(flags, RSN_IE); debug_printf(DEBUG_INT, "AP appears to support WPA2/802.11i!\n"); - temp = (char *)malloc((iwe->len - 12)/2); - process_hex(&custom[7], (iwe->len - 12-7), temp); - wpa2_parse_ie(temp); + temp = (u_char *)malloc((iwe->len - 12)/2); + process_hex((char *) &custom[7], (iwe->len - 12-7), (char *) temp); + wpa2_parse_ie((char *) temp); temp_rsn = temp; temp_rsn_len = ((iwe->len - 12)/2); @@ -381,10 +381,10 @@ "but the WPA_IE or RSN_IE flag(s) aren't set!?!\n"); } - if (strcmp(essid, intdata->cur_essid) == 0) + if (strcmp((char *) essid, intdata->cur_essid) == 0) { debug_printf(DEBUG_INT, "Adding this SSID data!\n"); - config_ssids_add(essid, flags, wpa_ie, wpa_ie_len, rsn_ie, + config_ssids_add((char *) essid, flags, wpa_ie, wpa_ie_len, rsn_ie, rsn_ie_len, freq, stale_mac); } @@ -440,10 +440,10 @@ } } - if (strcmp(essid, intdata->cur_essid) == 0) + if (strcmp((char *) essid, intdata->cur_essid) == 0) { debug_printf(DEBUG_INT, "Adding this SSID data!\n"); - config_ssids_add(essid, flags, wpa_ie, wpa_ie_len, rsn_ie, + config_ssids_add((char *) essid, flags, wpa_ie, wpa_ie_len, rsn_ie, rsn_ie_len, freq, mac); } @@ -490,8 +490,8 @@ // Then harvest the data. debug_printf(DEBUG_INT, "Reaping data. (Size : %d)\n", iwr.u.data.length); - cardif_linux_rtnetlink_reap(idata, (char *)buffer, - ((char *)buffer + iwr.u.data.length)); + cardif_linux_rtnetlink_reap(idata, (u_char *)buffer, + ((u_char *)buffer + iwr.u.data.length)); UNSET_FLAG(idata->flags, SCANNING); @@ -519,7 +519,7 @@ } remain = recvfrom(rtnl_sock, buf, sizeof(buf), MSG_DONTWAIT, - (struct sockaddr *)&rtnl_data, &rtnl_data_size); + (struct sockaddr *)&rtnl_data, (u_int *) &rtnl_data_size); if (remain >= 0) { // We need a pointer to the buffer to work with. @@ -927,7 +927,7 @@ case SIOCGIWAP: memcpy(mac, iwe->u.ap_addr.sa_data, 6); debug_printf(DEBUG_INT, "AP MAC : "); - debug_hex_printf(DEBUG_INT, mac, 6); + debug_hex_printf(DEBUG_INT, (u_char *) mac, 6); if (cardif_linux_rtnetlink_validate(idata, (u_char *)&mac) == 1) { // We have changed to associated mode. Populate the destination @@ -987,7 +987,7 @@ memcpy(buf, custom, iwe->u.data.length); buf[iwe->u.data.length] = '\0'; debug_printf(DEBUG_NORMAL, "Custom Data : \n"); - debug_hex_dump(DEBUG_NORMAL, buf, iwe->u.data.length); + debug_hex_dump(DEBUG_NORMAL, (u_char *) buf, iwe->u.data.length); cardif_linux_rtnetlink_check_custom(idata, buf); break; --- xsupplicant-1.2.1/src/cardif/linux/cardif_ndiswrapper_driver.c.BAD 2005-09-03 17:53:21.000000000 -0500 +++ xsupplicant-1.2.1/src/cardif/linux/cardif_ndiswrapper_driver.c 2005-09-03 17:54:27.000000000 -0500 @@ -202,11 +202,11 @@ wpa_key.addr = addr; wpa_key.key_index = key_idx; wpa_key.set_tx = set_tx; - wpa_key.seq = seq; + wpa_key.seq = (u_char *) seq; wpa_key.seq_len = seq_len; debug_printf(DEBUG_NORMAL, "SEQ : "); - debug_hex_printf(DEBUG_NORMAL, seq, seq_len); - wpa_key.key = key; + debug_hex_printf(DEBUG_NORMAL, (u_char *) seq, seq_len); + wpa_key.key = (u_char *) key; wpa_key.key_len = key_len; debug_printf(DEBUG_INT, "Setting key.. alg=%d idx=%d tx=%d seqlen=%d " @@ -304,11 +304,11 @@ bzero(&wpa_inf, sizeof(wpa_inf)); memcpy(buf, ssid, strlen(ssid)); - wpa_inf.bssid = (char *)config_ssid_get_mac(); - wpa_inf.ssid = (char *)&buf; + wpa_inf.bssid = (u_char *)config_ssid_get_mac(); + wpa_inf.ssid = (u_char *)&buf; wpa_inf.ssid_len = strlen(ssid); wpa_inf.freq = config_ssid_get_freq(); - wpa_inf.wpa_ie = (char *)&wpaie; + wpa_inf.wpa_ie = (u_char *)&wpaie; wpa_inf.wpa_ie_len = ielen; wpa_inf.pairwise_suite = network_data->wpa_pairwise_crypt; --- xsupplicant-1.2.1/src/cardif/linux/linux_core.c.BAD 2005-09-03 17:39:55.000000000 -0500 +++ xsupplicant-1.2.1/src/cardif/linux/linux_core.c 2005-09-03 17:42:28.000000000 -0500 @@ -116,11 +116,11 @@ { if (wepdata->key[keyidx] != NULL) { - klen = strlen(wepdata->key[keyidx]); + klen = strlen((char *) wepdata->key[keyidx]); if (((klen/2) == 5) || ((klen/2) == 13)) { // We have a valid length key. So, convert it, and set it. - process_hex(wepdata->key[keyidx], klen, key); + process_hex((char *) wepdata->key[keyidx], klen, key); // Calculate the proper key index. t = keyidx-1; @@ -130,9 +130,9 @@ debug_printf(DEBUG_INT, "Setting TX key! [%d]\n", wepdata->tx_key); t |= 0x80; - cardif_set_wep_key(intcur, key, (klen/2), t); + cardif_set_wep_key(intcur, (u_char *) key, (klen/2), t); } else { - cardif_set_wep_key(intcur, key, (klen/2), t); + cardif_set_wep_key(intcur, (u_char *) key, (klen/2), t); } } } --- xsupplicant-1.2.1/src/cardif/linux/cardif_linux.c.BAD 2005-09-03 17:37:20.000000000 -0500 +++ xsupplicant-1.2.1/src/cardif/linux/cardif_linux.c 2005-09-03 17:39:29.000000000 -0500 @@ -78,7 +78,7 @@ cardif_GetBSSID(intdata, curbssid); debug_printf(DEBUG_INT, "Current BSSID is "); - debug_hex_printf(DEBUG_INT, curbssid, 6); + debug_hex_printf(DEBUG_INT, (u_char *) curbssid, 6); memset(newmac, 0x00, 6); if (memcmp(newmac, curbssid, 6) == 0) @@ -463,7 +463,7 @@ { if (wireless == NULL) return -1; - return wireless->set_tkip_key(thisint, addr, keyidx, settx, seq, seqlen, + return wireless->set_tkip_key(thisint, (u_char *) addr, keyidx, settx, seq, seqlen, key, keylen); } @@ -478,7 +478,7 @@ { if (wireless == NULL) return -1; - return wireless->set_ccmp_key(thisint, addr, keyidx, settx, seq, seqlen, + return wireless->set_ccmp_key(thisint, (u_char *) addr, keyidx, settx, seq, seqlen, key, keylen); } @@ -746,7 +746,7 @@ { // Since we now know this frame is for us, record the address it // came from. - snmp_dot1xSuppLastEapolFrameSource((char *)&resultframe[6]); + snmp_dot1xSuppLastEapolFrameSource((u_char *)&resultframe[6]); resultsize = newsize; --- xsupplicant-1.2.1/src/psk.c.BAD 2005-09-03 09:24:53.000000000 -0500 +++ xsupplicant-1.2.1/src/psk.c 2005-09-03 09:25:15.000000000 -0500 @@ -50,7 +50,7 @@ // OpenSSL takes the parameters in a different order than what is // defined in F.8.2, so even though it looks wrong, this is correct. ;) HMAC(EVP_sha1(), password, strlen(password), digest, ssidlength+4, - digest1, &k); + digest1, (u_int *) &k); /* output = U1 */ memcpy(output, digest1, SHA_DIGEST_LENGTH); @@ -59,7 +59,7 @@ { /* Un = PRF(P, Un-1) */ HMAC(EVP_sha1(), password, strlen(password), digest1, SHA_DIGEST_LENGTH, - digest, &k); + digest, (u_int *) &k); memcpy(digest1, digest, k); /* output = output xor Un */ --- xsupplicant-1.2.1/src/mic.c.BAD 2005-09-03 09:24:01.000000000 -0500 +++ xsupplicant-1.2.1/src/mic.c 2005-09-03 09:24:43.000000000 -0500 @@ -44,14 +44,14 @@ { case 1: // Do an MD5 HMAC - HMAC(EVP_md5(), key, keylen, datain, insize, mic, &i); + HMAC(EVP_md5(), key, keylen, (u_char *) datain, insize, (u_char *) mic, (u_int *) &i); break; case 2: // Do an SHA1 HMAC // Since the HMAC will be 20 bytes, and we only need 16, we must use // a temporary variable. - HMAC(EVP_sha1(), key, keylen, datain, insize, (char *)&sha_hmac, &i); + HMAC(EVP_sha1(), key, keylen, (u_char *) datain, insize, (u_char *)&sha_hmac, (u_int *) &i); memcpy(mic, &sha_hmac, 16); break; } --- xsupplicant-1.2.1/src/config.h.BAD 2005-09-03 08:39:44.000000000 -0500 +++ xsupplicant-1.2.1/src/config.h 2005-09-03 08:39:53.000000000 -0500 @@ -341,6 +341,7 @@ char config_get_association(); char *config_get_logfile(); int config_get_ipc_gid(); +int config_get_stale_key_timeout(); char config_get_destination(); char *config_get_log_facility(); void config_set_forced_profile(char *); --- xsupplicant-1.2.1/src/eap.c.BAD 2005-09-03 08:34:21.000000000 -0500 +++ xsupplicant-1.2.1/src/eap.c 2005-09-03 08:38:27.000000000 -0500 @@ -191,9 +191,9 @@ switch (eap_request_auth(network_data->activemethod, network_data->methods, - &thisint->recvframe[OFFSET_TO_EAP], + (char *) &thisint->recvframe[OFFSET_TO_EAP], thisint->recv_size, - &thisint->sendframe[OFFSET_TO_EAP], &eapsize)) + (char *) &thisint->sendframe[OFFSET_TO_EAP], &eapsize)) { case XINNERSUCCESS: // We got a LEAP success, so we need to tell the state machine to @@ -231,7 +231,7 @@ if ((eapolver < 1) || (eapolver > MAX_EAPOL_VER)) eapolver = snmp_get_dot1xSuppLastEapolFrameVersion(); - eapol_build_header(EAP_PACKET, eapsize, eapolver, thisint->sendframe); + eapol_build_header(EAP_PACKET, eapsize, eapolver, (char *) thisint->sendframe); thisint->send_size = eapsize+OFFSET_TO_EAP; return XENONE; } @@ -284,7 +284,7 @@ eap_request_id(network_data->identity, eapdata->eap_identifier, - &thisint->sendframe[OFFSET_TO_EAP], &eapsize); + (char *) &thisint->sendframe[OFFSET_TO_EAP], &eapsize); eapolver = network_data->force_eapol_ver; @@ -295,7 +295,7 @@ if ((eapolver < 1) || (eapolver > MAX_EAPOL_VER)) eapolver = snmp_get_dot1xSuppLastEapolFrameVersion(); - eapol_build_header(EAP_PACKET, eapsize, eapolver, thisint->sendframe); + eapol_build_header(EAP_PACKET, eapsize, eapolver, (char *) thisint->sendframe); thisint->send_size = eapsize+OFFSET_TO_EAP; return XENONE; @@ -379,7 +379,7 @@ // We need to determine how long the string that we were returned is. // So, take the EAP length value, and subtract 5 to account for the EAP // header. - strncpy(&myval[0], &inframe[OFFSET_TO_DATA], (ntohs(myeap->eap_length)-5)); + strncpy(&myval[0], (char *) &inframe[OFFSET_TO_DATA], (ntohs(myeap->eap_length)-5)); debug_printf(DEBUG_NORMAL, "EAP Notification : %s\n", &myval[0]); bzero(thisint->recvframe, thisint->recv_size); @@ -814,8 +814,8 @@ if ((pwd_needed != 1) || (activemethod->tempPwd != NULL)) { switch ((*eaphandlers[eapmethod].eap_auth_handlers)(activemethod, - tosendframe, eapinsize, - &outframe[sizeof(struct eap_header)], + (u_char *) tosendframe, eapinsize, + (u_char *) &outframe[sizeof(struct eap_header)], eapsize)) { case XINNERSUCCESS: @@ -962,9 +962,9 @@ (*eaphandlers[eapmethod].eap_auth_get_keys)(thisint); - thisint->statemachine->PMK = thisint->keyingMaterial; + thisint->statemachine->PMK = (char *) thisint->keyingMaterial; debug_printf(DEBUG_INT, "PMK Keys (%d) :\n", thisint->keyingLength); - debug_hex_dump(DEBUG_INT, thisint->statemachine->PMK, thisint->keyingLength); + debug_hex_dump(DEBUG_INT, (u_char *) thisint->statemachine->PMK, thisint->keyingLength); debug_printf(DEBUG_INT, "WEP Keys (%d) :\n", thisint->keyingLength); debug_hex_dump(DEBUG_INT, thisint->keyingMaterial, thisint->keyingLength); --- xsupplicant-1.2.1/src/eapol_key_type2.c.BAD 2005-09-03 09:34:10.000000000 -0500 +++ xsupplicant-1.2.1/src/eapol_key_type2.c 2005-09-03 16:32:47.000000000 -0500 @@ -172,7 +172,7 @@ case 2: // XXX BROKEN! FIX! bzero(key, 16); - aes_unwrap(&intdata->statemachine->PTK[16], (keylen-8)/8, keypayload, + aes_unwrap((u_char *) &intdata->statemachine->PTK[16], (keylen-8)/8, keypayload, key); break; @@ -238,12 +238,12 @@ } debug_printf(DEBUG_INT, "PMK : "); - debug_hex_printf(DEBUG_INT, intdata->statemachine->PMK, 32); - wpa_PRF(intdata->statemachine->PMK, 32, "Pairwise key expansion", 22, - (char *)&prfdata, 76, retval, 64); + debug_hex_printf(DEBUG_INT, (u_char *) intdata->statemachine->PMK, 32); + wpa_PRF((u_char *) intdata->statemachine->PMK, 32, (u_char *) "Pairwise key expansion", 22, + (u_char *)&prfdata, 76, (u_char *) retval, 64); debug_printf(DEBUG_INT, "PTK : "); - debug_hex_printf(DEBUG_INT, retval, 64); + debug_hex_printf(DEBUG_INT, (u_char *) retval, 64); return retval; } @@ -310,10 +310,10 @@ eapolver = snmp_get_dot1xSuppLastEapolFrameVersion(); eapol_build_header(EAPOL_KEY, (intdata->send_size-OFFSET_TO_EAPOL-4), - eapolver, intdata->sendframe); + eapolver, (char *) intdata->sendframe); memcpy(key, intdata->statemachine->PTK, 16); - mic_wpa_populate(intdata->sendframe, intdata->send_size+4, key, 16); + mic_wpa_populate((char *) intdata->sendframe, intdata->send_size+4, key, 16); cardif_sendframe(intdata); intdata->statemachine->eapolEap = FALSE; @@ -394,7 +394,7 @@ bzero(rc4_ek, 32); memcpy(rc4_ek, inkeydata->key_iv, 16); memcpy(&rc4_ek[16], &intdata->statemachine->PTK[16], 16); - rc4_skip(rc4_ek, 32, 256, keydata, value16); + rc4_skip((u_char *) rc4_ek, 32, 256, keydata, value16); debug_printf(DEBUG_INT, "Decrypted data : (%d)\n", value16); debug_hex_dump(DEBUG_INT, keydata, value16); @@ -410,17 +410,17 @@ wpa_common_swap_rx_tx_mic(keydata); debug_printf(DEBUG_INT, "Setting GTK with index of %d\n", keyindex); - cardif_set_tkip_key(intdata, allfs, keyindex, FALSE, inkeydata->key_rsc, - 6, keydata, value16); + cardif_set_tkip_key(intdata, (char *) allfs, keyindex, FALSE, (char *) inkeydata->key_rsc, + 6, (char *) keydata, value16); break; case 2: // First, decrypt the GTK bzero(key, 16); - aes_unwrap(&intdata->statemachine->PTK[16], (value16-8)/8, keydata, - key); + aes_unwrap((u_char *) &intdata->statemachine->PTK[16], (value16-8)/8, keydata, + (u_char *) key); - cardif_set_ccmp_key(intdata, NULL, keyindex, FALSE, inkeydata->key_rsc, + cardif_set_ccmp_key(intdata, NULL, keyindex, FALSE, (char *) inkeydata->key_rsc, 6, key, (value16-8)); break; } @@ -446,13 +446,13 @@ eapolver = snmp_get_dot1xSuppLastEapolFrameVersion(); eapol_build_header(EAPOL_KEY, (intdata->send_size-OFFSET_TO_EAPOL-4), - eapolver, intdata->sendframe); + eapolver, (char *) intdata->sendframe); memcpy(key, intdata->statemachine->PTK, 16); - mic_wpa_populate(intdata->sendframe, intdata->send_size+4, key, 16); + mic_wpa_populate((char *) intdata->sendframe, intdata->send_size+4, key, 16); // Dump what we built. - eapol_key_type2_dump(intdata, intdata->sendframe); + eapol_key_type2_dump(intdata, (char *) intdata->sendframe); if (network_data->methods->method_num == WPA_PSK) { @@ -560,13 +560,13 @@ eapolver = snmp_get_dot1xSuppLastEapolFrameVersion(); eapol_build_header(EAPOL_KEY, (intdata->send_size-OFFSET_TO_EAPOL-4), - eapolver, intdata->sendframe); + eapolver, (char *) intdata->sendframe); memcpy(key, intdata->statemachine->PTK, 16); - mic_wpa_populate(intdata->sendframe, intdata->send_size+4, key, 16); + mic_wpa_populate((char *) intdata->sendframe, intdata->send_size+4, key, 16); // Dump what we built. - eapol_key_type2_dump(intdata, intdata->sendframe); + eapol_key_type2_dump(intdata, (char *) intdata->sendframe); } /******************************************************** @@ -596,7 +596,7 @@ memcpy(iedata, indata, len); debug_printf(DEBUG_INT, "Got an IE of : \n"); - debug_hex_dump(DEBUG_INT, iedata, len); + debug_hex_dump(DEBUG_INT, (u_char *) iedata, len); // XXX Todo : Verify the IE against the IE we have from the AP. @@ -869,20 +869,20 @@ eapolver = snmp_get_dot1xSuppLastEapolFrameVersion(); eapol_build_header(EAPOL_KEY, (intdata->send_size-OFFSET_TO_EAPOL-4), - eapolver, intdata->sendframe); + eapolver, (char *) intdata->sendframe); memcpy(key, intdata->statemachine->PTK, 16); - mic_wpa_populate(intdata->sendframe, intdata->send_size+4, key, 16); + mic_wpa_populate((char *) intdata->sendframe, intdata->send_size+4, key, 16); // Dump what we built. - eapol_key_type2_dump(intdata, intdata->sendframe); + eapol_key_type2_dump(intdata, (char *) intdata->sendframe); // Get TK1 value16 = ntohs(inkeydata->key_length); memcpy(key, (char *)&intdata->statemachine->PTK[32], value16); debug_printf(DEBUG_INT, "TK1 : "); - debug_hex_printf(DEBUG_INT, key, value16); + debug_hex_printf(DEBUG_INT, (u_char *) key, value16); cardif_sendframe(intdata); intdata->statemachine->eapolEap = FALSE; @@ -902,12 +902,12 @@ bzero(rc4_ek, 32); memcpy(rc4_ek, inkeydata->key_iv, 16); memcpy(&rc4_ek[16], &intdata->statemachine->PTK[16], 16); - rc4_skip(rc4_ek, 32, 256, keydata, keylen); + rc4_skip((u_char *) rc4_ek, 32, 256, keydata, keylen); break; case 2: aesval = (uint8_t *)malloc(keylen); - if (aes_unwrap(&intdata->statemachine->PTK[16], (keylen-8)/8, keydata, + if (aes_unwrap((u_char *) &intdata->statemachine->PTK[16], (keylen-8)/8, keydata, aesval)) { debug_printf(DEBUG_NORMAL, "Failed AES unwrap!\n"); @@ -943,13 +943,13 @@ { case 1: wpa_common_swap_rx_tx_mic(gtk); - cardif_set_tkip_key(intdata, allfs, keyindex, txkey, - inkeydata->key_rsc, RSC_LEN, gtk, value16); + cardif_set_tkip_key(intdata, (char*) allfs, keyindex, txkey, + (char *) inkeydata->key_rsc, RSC_LEN, (char *) gtk, value16); break; case 2: - cardif_set_ccmp_key(intdata, allfs, keyindex, txkey, - inkeydata->key_rsc, RSC_LEN, gtk, value16); + cardif_set_ccmp_key(intdata, (char *) allfs, keyindex, txkey, + (char *) inkeydata->key_rsc, RSC_LEN, (char *) gtk, value16); break; } @@ -973,15 +973,15 @@ case 1: // We need to swap the TX/RX MIC values since we are the supplicant. // (Thanks to Jouni Malinen for pointing this out!) - wpa_common_swap_rx_tx_mic(key); + wpa_common_swap_rx_tx_mic((u_char *) key); cardif_set_tkip_key(intdata, intdata->dest_mac, 0, TRUE, - inkeydata->key_rsc, RSC_LEN, key, value16); + (char *) inkeydata->key_rsc, RSC_LEN, key, value16); break; case 2: cardif_set_ccmp_key(intdata, intdata->dest_mac, 0, TRUE, - inkeydata->key_rsc, RSC_LEN, key, value16); + (char *) inkeydata->key_rsc, RSC_LEN, key, value16); break; } } @@ -1008,7 +1008,7 @@ if (keyflags & WPA2_KEY_MIC_FLAG) { - if (mic_wpa_validate(intdata->recvframe, intdata->recv_size, + if (mic_wpa_validate((char *) intdata->recvframe, intdata->recv_size, intdata->statemachine->PTK, 16) == FALSE) { intdata->statemachine->MICVerified = TRUE; @@ -1058,7 +1058,7 @@ eapolver = snmp_get_dot1xSuppLastEapolFrameVersion(); eapol_build_header(EAPOL_KEY, (intdata->recv_size-OFFSET_TO_EAPOL-4), - eapolver, intdata->recvframe); + eapolver, (char *) intdata->recvframe); cardif_sendframe(intdata); intdata->statemachine->eapolEap = FALSE; } @@ -1127,8 +1127,8 @@ } // We have an ASCII password, so calculate it. - if (psk_wpa_pbkdf2(psk->key, intdata->cur_essid, - strlen(intdata->cur_essid), (char *)&tpmk) + if (psk_wpa_pbkdf2(psk->key, (u_char *) intdata->cur_essid, + strlen(intdata->cur_essid), (u_char *)&tpmk) == TRUE) { intdata->statemachine->PMK = (char *)malloc(32); @@ -1168,7 +1168,7 @@ } } - eapol_key_type2_dump(intdata, inframe); + eapol_key_type2_dump(intdata, (char *) inframe); eapol_key_type2_determine_key(intdata); --- xsupplicant-1.2.1/src/eap_types/otp/eapotp.c.BAD 2005-09-03 17:26:09.000000000 -0500 +++ xsupplicant-1.2.1/src/eap_types/otp/eapotp.c 2005-09-03 17:26:47.000000000 -0500 @@ -123,7 +123,7 @@ /* debug_printf(DEBUG_NORMAL, "Response : "); gets(&resp); */ - strcpy(outframe, resp); + strcpy((char *) outframe, resp); *outsize = strlen(resp); return *outsize; --- xsupplicant-1.2.1/src/eap_types/tls/tls_funcs.c.BAD 2005-09-03 16:38:06.000000000 -0500 +++ xsupplicant-1.2.1/src/eap_types/tls/tls_funcs.c 2005-09-03 16:42:46.000000000 -0500 @@ -445,7 +445,7 @@ } debug_printf(DEBUG_AUTHTYPES, "Packet in (%d) :\n", insize); - debug_hex_dump(DEBUG_AUTHTYPES, inframe, insize); + debug_hex_dump(DEBUG_AUTHTYPES, (u_char *) inframe, insize); // First, make sure we don't have any errors. err = ERR_get_error(); @@ -563,7 +563,7 @@ if ((mytls_vars->resuming != 1) || (mytls_vars->quickResponse != TRUE)) { - if (((*dophase2)(thisint, tlsptr, (insize-tlsindex), outframe, + if (((*dophase2)(thisint, (u_char *) tlsptr, (insize-tlsindex), outframe, outsize)) != XENONE) { debug_printf(DEBUG_NORMAL, "Phase 2 failure!\n"); @@ -578,7 +578,7 @@ } } } else { - rtnVal = tls_funcs_parse(thisint, tlsptr, (insize-tlsindex), outframe, outsize, chunksize); + rtnVal = tls_funcs_parse(thisint, (u_char *) tlsptr, (insize-tlsindex), outframe, outsize, chunksize); if (rtnVal < 0) { debug_printf(DEBUG_NORMAL, "Couldn't parse TLS data.\n"); @@ -642,7 +642,7 @@ if ((mytls_vars->resuming != 1) || (mytls_vars->quickResponse != TRUE)) { - if ((*dophase2)(thisint, tlsptr, (insize-tlsindex), + if ((*dophase2)(thisint, (u_char *) tlsptr, (insize-tlsindex), outframe, outsize) != XENONE) { debug_printf(DEBUG_NORMAL, "Phase 2 Failure.\n"); @@ -1083,32 +1083,32 @@ /* P_MD5 */ hash = EVP_md5(); /* Initialize A_MD5 */ - HMAC(hash, S1, L_S1, P_seed, P_seed_len, A_MD5, &hashed_len); + HMAC(hash, S1, L_S1, P_seed, P_seed_len, A_MD5, (u_int *) &hashed_len); for (i = 0; i < MD5_iterations; i++) { HMAC_Init(&ctx, S1, L_S1, hash); HMAC_Update(&ctx, A_MD5, MD5_DIGEST_LENGTH); HMAC_Update(&ctx, P_seed, P_seed_len); - HMAC_Final(&ctx, P_MD5_buf + i*(MD5_DIGEST_LENGTH), &hashed_len); + HMAC_Final(&ctx, P_MD5_buf + i*(MD5_DIGEST_LENGTH), (u_int *) &hashed_len); HMAC_cleanup(&ctx); HMAC(hash, S1, L_S1, A_MD5, MD5_DIGEST_LENGTH, - A_MD5, &hashed_len); + A_MD5, (u_int *) &hashed_len); } /* do P_SHA1 */ hash = EVP_sha1(); /* Initialize A_SHA1 */ - HMAC(hash, S2, L_S2, P_seed, P_seed_len, A_SHA1, &hashed_len); + HMAC(hash, S2, L_S2, P_seed, P_seed_len, A_SHA1, (u_int *) &hashed_len); for (i = 0; i < SHA1_iterations; i++) { HMAC_Init(&ctx, S2, L_S2, hash); HMAC_Update(&ctx, A_SHA1, SHA_DIGEST_LENGTH); HMAC_Update(&ctx, P_seed, P_seed_len); - HMAC_Final(&ctx, P_SHA1_buf + i*(SHA_DIGEST_LENGTH), &hashed_len); + HMAC_Final(&ctx, P_SHA1_buf + i*(SHA_DIGEST_LENGTH), (u_int *) &hashed_len); HMAC_cleanup(&ctx); HMAC(hash, S2, L_S2, A_SHA1, SHA_DIGEST_LENGTH, - A_SHA1, &hashed_len); + A_SHA1, (u_int *) &hashed_len); } /* XOR Them for the answer */ for (i = 0; i < outlen; i++) { --- xsupplicant-1.2.1/src/eap_types/tls/tls_crypt.c.BAD 2005-09-03 16:58:16.000000000 -0500 +++ xsupplicant-1.2.1/src/eap_types/tls/tls_crypt.c 2005-09-03 16:58:35.000000000 -0500 @@ -72,7 +72,7 @@ memcpy(p, mytls_vars->ssl->s3->server_random, SSL3_RANDOM_SIZE); tls_funcs_PRF(SSL_get_session(mytls_vars->ssl)->master_key, SSL_get_session(mytls_vars->ssl)->master_key_length, - sesskey, sesskeylen, seed, + (u_char *) sesskey, sesskeylen, seed, SSL3_RANDOM_SIZE * 2, retblock, TLS_SESSION_KEY_SIZE); --- xsupplicant-1.2.1/src/eap_types/tls/eaptls.c.BAD 2005-09-03 16:33:36.000000000 -0500 +++ xsupplicant-1.2.1/src/eap_types/tls/eaptls.c 2005-09-03 16:36:48.000000000 -0500 @@ -192,7 +192,7 @@ // Make sure we have something to process... if (dataoffs == NULL) return XENONE; - retVal=tls_funcs_decode_packet(thisint, dataoffs, insize, outframe, outsize, + retVal=tls_funcs_decode_packet(thisint, (char *) dataoffs, insize, (char *) outframe, outsize, NULL, userdata->chunk_size); return retVal; @@ -222,7 +222,7 @@ free(thisint->keyingMaterial); } - thisint->keyingMaterial = tls_funcs_gen_keyblock(network_data->activemethod); + thisint->keyingMaterial = (u_char *) tls_funcs_gen_keyblock(network_data->activemethod); thisint->keyingLength = 32; if (thisint->keyingMaterial == NULL) return -1; --- xsupplicant-1.2.1/src/eap_types/peap/eappeap.c.BAD 2005-09-03 17:16:00.000000000 -0500 +++ xsupplicant-1.2.1/src/eap_types/peap/eappeap.c 2005-09-03 17:16:47.000000000 -0500 @@ -239,7 +239,7 @@ set_peap_version(p2d, peap_version); // Tell PEAP what version we want to use. dataoffs[0] = ((uint8_t)dataoffs[0] & 0xfc); // Mask out the version bits. - if (tls_funcs_decode_packet(thisint, dataoffs, insize, outframe, outsize, + if (tls_funcs_decode_packet(thisint, (char *) dataoffs, insize, (char *) outframe, outsize, (phase2_call)peap_do_phase2, userdata->chunk_size) != XENONE) { @@ -335,7 +335,7 @@ { free(thisint->keyingMaterial); } - thisint->keyingMaterial = tls_funcs_gen_keyblock(network_data->activemethod); + thisint->keyingMaterial = (u_char *) tls_funcs_gen_keyblock(network_data->activemethod); thisint->keyingLength = 32; if (thisint->keyingMaterial == NULL) return -1; --- xsupplicant-1.2.1/src/eap_types/peap/peap_phase2.c.BAD 2005-09-03 17:17:38.000000000 -0500 +++ xsupplicant-1.2.1/src/eap_types/peap/peap_phase2.c 2005-09-03 17:21:23.000000000 -0500 @@ -160,7 +160,7 @@ switch ((uint8_t)eapvalue) { case EAP_REQUEST: - eap_request_id(thisint->eapdata->identity, eapid, out, out_size); + eap_request_id(thisint->eapdata->identity, eapid, (char *) out, out_size); break; case EAP_SUCCESS: @@ -192,7 +192,7 @@ return; } eap_request_auth(thisint->activemethod, thisint->eapdata->eap_conf_data, - in, in_size, out, out_size); + (char *) in, in_size, (char *) out, out_size); break; } free(new_frame); @@ -249,7 +249,7 @@ if (eframe != 1) { - peap_pad_frame(in, in_size, padded_frame, &padded_size); + peap_pad_frame(in, in_size, (u_char *) padded_frame, &padded_size); } new_frame = (char *)malloc(1024); @@ -259,12 +259,12 @@ return; } - do_peap_version1(thisint, padded_frame, padded_size, new_frame, + do_peap_version1(thisint, (u_char *) padded_frame, padded_size, (u_char *) new_frame, &new_frame_size); free(padded_frame); if (eframe !=1) { - peap_unpad_frame(new_frame, new_frame_size, out, out_size); + peap_unpad_frame((u_char *) new_frame, new_frame_size, out, out_size); } else { memcpy(out, new_frame, new_frame_size); *out_size = new_frame_size; @@ -330,14 +330,14 @@ p2d->eapdata->identity = peapconf->identity; p2d->eapdata->ias_quirk = peapconf->ias_quirk; - decr_data = (char *)malloc(1550); + decr_data = (u_char *)malloc(1550); if (decr_data == NULL) { debug_printf(DEBUG_NORMAL, "Couldn't allocate memory for decryption buffer!\n"); return XEMALLOC; } - encr_data = (char *)malloc(1550); + encr_data = (u_char *)malloc(1550); if (encr_data == NULL) { debug_printf(DEBUG_NORMAL, "Couldn't allocate memory for encryption buffer!\n"); --- xsupplicant-1.2.1/src/eap_types/mschapv2/eapmschapv2.c.BAD 2005-09-03 17:09:07.000000000 -0500 +++ xsupplicant-1.2.1/src/eap_types/mschapv2/eapmschapv2.c 2005-09-03 17:15:29.000000000 -0500 @@ -153,13 +153,13 @@ myvars->AuthenticatorChallenge = NULL; } - myvars->AuthenticatorChallenge = (u_char *)malloc(16); + myvars->AuthenticatorChallenge = (char *)malloc(16); if (myvars->AuthenticatorChallenge == NULL) return XEMALLOC; memcpy(myvars->AuthenticatorChallenge, &challenge->Challenge, 16); debug_printf(DEBUG_AUTHTYPES, "Authenticator Challenge : "); - debug_hex_printf(DEBUG_AUTHTYPES, myvars->AuthenticatorChallenge, 16); + debug_hex_printf(DEBUG_AUTHTYPES, (u_char *) myvars->AuthenticatorChallenge, 16); if (myvars->PeerChallenge != NULL) { @@ -168,13 +168,13 @@ } // Ignore the RADIUS host, we probably don't care. - myvars->PeerChallenge = (u_char *)malloc(16); + myvars->PeerChallenge = (char *)malloc(16); if (myvars->PeerChallenge == NULL) return XEMALLOC; - RAND_bytes(myvars->PeerChallenge, 16); + RAND_bytes((u_char *) myvars->PeerChallenge, 16); debug_printf(DEBUG_AUTHTYPES, "Generated PeerChallenge : "); - debug_hex_printf(DEBUG_AUTHTYPES, myvars->PeerChallenge,16); + debug_hex_printf(DEBUG_AUTHTYPES, (u_char *) myvars->PeerChallenge,16); if (myvars->NtResponse != NULL) { @@ -182,14 +182,14 @@ myvars->NtResponse = NULL; } - myvars->NtResponse = (u_char *)malloc(24); + myvars->NtResponse = (char *)malloc(24); if (myvars->NtResponse == NULL) return XEMALLOC; GenerateNTResponse(myvars->AuthenticatorChallenge, myvars->PeerChallenge, username, userdata->password, myvars->NtResponse); debug_printf(DEBUG_AUTHTYPES, "myvars->NtResponse = "); - debug_hex_printf(DEBUG_AUTHTYPES, myvars->NtResponse, 24); + debug_hex_printf(DEBUG_AUTHTYPES, (u_char *) myvars->NtResponse, 24); response->OpCode = MS_CHAPV2_RESPONSE; response->MS_CHAPv2_ID = challenge->MS_CHAPv2_ID; @@ -219,7 +219,7 @@ CheckAuthenticatorResponse(userdata->password, myvars->NtResponse, myvars->PeerChallenge, myvars->AuthenticatorChallenge, - username, (u_char *)&recv[0], &respOk); + username, (char *)&recv[0], &respOk); if (respOk == 1) { @@ -227,15 +227,15 @@ outframe[0] = MS_CHAPV2_SUCCESS; // We were successful, so generate keying material. - NtPasswordHash(userdata->password, (u_char *)&NtHash); - HashNtPasswordHash((u_char *)&NtHash, (u_char *)&NtHashHash); - GetMasterKey((u_char *)&NtHashHash, myvars->NtResponse, (u_char *)&MasterKey); + NtPasswordHash(userdata->password, (char *)&NtHash); + HashNtPasswordHash((char *)&NtHash, (char *)&NtHashHash); + GetMasterKey((char *)&NtHashHash, myvars->NtResponse, (char *)&MasterKey); // Now, get the send key. - GetAsymetricStartKey((u_char *)&MasterKey, (u_char *)&mppeSend, 16, TRUE, FALSE); + GetAsymetricStartKey((char *)&MasterKey, (char *)&mppeSend, 16, TRUE, FALSE); // And the recv key. - GetAsymetricStartKey((u_char *)&MasterKey, (u_char *)&mppeRecv, 16, FALSE, FALSE); + GetAsymetricStartKey((char *)&MasterKey, (char *)&mppeRecv, 16, FALSE, FALSE); // Finally, populate our myvars->keyingMaterial. if (myvars->keyingMaterial != NULL) @@ -243,7 +243,7 @@ free(myvars->keyingMaterial); myvars->keyingMaterial = NULL; } - myvars->keyingMaterial = (u_char *)malloc(64); // 32 bytes each. + myvars->keyingMaterial = (char *)malloc(64); // 32 bytes each. if (myvars->keyingMaterial == NULL) return XEMALLOC; bzero(myvars->keyingMaterial, 64); @@ -294,7 +294,7 @@ free(thisint->keyingMaterial); } - thisint->keyingMaterial = (char *)malloc(64); + thisint->keyingMaterial = (u_char *)malloc(64); if (thisint->keyingMaterial == NULL) return -1; memcpy(thisint->keyingMaterial, myconf->keyingMaterial, 64); --- xsupplicant-1.2.1/src/eap_types/mschapv2/mschapv2.c.BAD 2005-09-03 17:01:58.000000000 -0500 +++ xsupplicant-1.2.1/src/eap_types/mschapv2/mschapv2.c 2005-09-03 17:04:49.000000000 -0500 @@ -46,7 +46,7 @@ EVP_DigestUpdate(&cntx, PeerChallenge, 16); EVP_DigestUpdate(&cntx, AuthenticatorChallenge, 16); EVP_DigestUpdate(&cntx, UserName, strlen(UserName)); - EVP_DigestFinal(&cntx, (char *)&Digest, &retLen); + EVP_DigestFinal(&cntx, (u_char *)&Digest, (u_int *) &retLen); memcpy(Challenge, Digest, 8); } @@ -96,7 +96,7 @@ EVP_DigestInit(&cntx, EVP_md4()); EVP_DigestUpdate(&cntx, uniPassword, len); - EVP_DigestFinal(&cntx, (char *)&retVal, (int *)&i); + EVP_DigestFinal(&cntx, (u_char *)&retVal, (u_int *)&i); memcpy(PasswordHash, &retVal, 16); free(uniPassword); } @@ -114,7 +114,7 @@ EVP_DigestInit(&cntx, EVP_md4()); EVP_DigestUpdate(&cntx, PasswordHash, 16); - EVP_DigestFinal(&cntx, PasswordHashHash, &i); + EVP_DigestFinal(&cntx, (u_char *) PasswordHashHash, (u_int *) &i); } // Shamelessly take from the hostap code written by Jouni Malinen @@ -231,7 +231,7 @@ EVP_DigestUpdate(&context, &PasswordHashHash, 16); EVP_DigestUpdate(&context, NTResponse, 24); EVP_DigestUpdate(&context, Magic1, 39); - EVP_DigestFinal(&context, (char *)&Digest, &Digest_len); + EVP_DigestFinal(&context, (u_char *)&Digest, (u_int *) &Digest_len); ChallengeHash(PeerChallenge, AuthenticatorChallenge, UserName, Challenge); @@ -239,7 +239,7 @@ EVP_DigestUpdate(&context, &Digest, 20); EVP_DigestUpdate(&context, &Challenge, 8); EVP_DigestUpdate(&context, Magic2, 41); - EVP_DigestFinal(&context, (char *)&Digest, &Digest_len); + EVP_DigestFinal(&context, (u_char *)&Digest, (u_int *) &Digest_len); memcpy(AuthenticatorResponse, &Digest, Digest_len); } @@ -287,12 +287,12 @@ return; } - des_encrypt(Challenge, PasswordHash, Response); - des_encrypt(Challenge, PasswordHash + 7, Response+8); + des_encrypt((uint8_t *) Challenge, (uint8_t *) PasswordHash, (uint8_t *) Response); + des_encrypt((uint8_t *) Challenge, (uint8_t *) PasswordHash + 7, (uint8_t *) Response+8); zpwd[0] = PasswordHash[14]; zpwd[1] = PasswordHash[15]; memset(zpwd + 2, 0, 5); - des_encrypt(Challenge, zpwd, Response+16); + des_encrypt((uint8_t *) Challenge, zpwd, (uint8_t *) Response+16); } void NtChallengeResponse(char *Challenge, char *Password, char *Response) @@ -323,18 +323,18 @@ ChallengeHash(PeerChallenge, AuthenticatorChallenge, UserName, (char *)&Challenge); debug_printf(DEBUG_AUTHTYPES, "PeerChallenge : "); - debug_hex_printf(DEBUG_AUTHTYPES, PeerChallenge, 8); + debug_hex_printf(DEBUG_AUTHTYPES, (u_char *) PeerChallenge, 8); debug_printf(DEBUG_AUTHTYPES, "AuthenticatorChallenge : "); - debug_hex_printf(DEBUG_AUTHTYPES, AuthenticatorChallenge, 8); + debug_hex_printf(DEBUG_AUTHTYPES, (u_char *) AuthenticatorChallenge, 8); debug_printf(DEBUG_AUTHTYPES, "Username : %s\n",UserName); debug_printf(DEBUG_AUTHTYPES, "Challenge : "); - debug_hex_printf(DEBUG_AUTHTYPES, Challenge, 8); + debug_hex_printf(DEBUG_AUTHTYPES, (u_char *) Challenge, 8); NtPasswordHash(Password, (char *)&PasswordHash); debug_printf(DEBUG_AUTHTYPES, "PasswordHash : "); - debug_hex_printf(DEBUG_AUTHTYPES, PasswordHash, 16); + debug_hex_printf(DEBUG_AUTHTYPES, (u_char *) PasswordHash, 16); ChallengeResponse(Challenge, (char *)&PasswordHash, Response); debug_printf(DEBUG_AUTHTYPES, "Response : "); - debug_hex_printf(DEBUG_AUTHTYPES, Response, 24); + debug_hex_printf(DEBUG_AUTHTYPES, (u_char *) Response, 24); } void GetMasterKey(char *PasswordHashHash, char *NTResponse, char *MasterKey) @@ -360,7 +360,7 @@ EVP_DigestUpdate(&cntx, PasswordHashHash, 16); EVP_DigestUpdate(&cntx, NTResponse, 24); EVP_DigestUpdate(&cntx, (char *)&Magic1, 27); - EVP_DigestFinal(&cntx, (char *)&Digest, &retLen); + EVP_DigestFinal(&cntx, (u_char *)&Digest, (u_int *) &retLen); memcpy(MasterKey, &Digest, 16); } @@ -386,7 +386,7 @@ EVP_DigestUpdate(&cntx, APR, 24); EVP_DigestUpdate(&cntx, PC, 8); EVP_DigestUpdate(&cntx, PR, 24); - EVP_DigestFinal(&cntx, (char *)&Digest, &retLen); + EVP_DigestFinal(&cntx, (u_char *)&Digest, (u_int *) &retLen); memcpy(MasterKey, &Digest, 16); @@ -461,7 +461,7 @@ EVP_DigestUpdate(&cntx, SHSpad1, 40); EVP_DigestUpdate(&cntx, (char *)&Magic, 84); EVP_DigestUpdate(&cntx, SHSpad2, 40); - EVP_DigestFinal(&cntx, (char *)&Digest, &retLen); + EVP_DigestFinal(&cntx, (u_char *)&Digest, (u_int *)&retLen); memcpy(SessionKey, &Digest, SessionKeyLength); } --- xsupplicant-1.2.1/src/eap_types/ttls/eapttls.c.BAD 2005-09-03 16:43:18.000000000 -0500 +++ xsupplicant-1.2.1/src/eap_types/ttls/eapttls.c 2005-09-03 16:44:20.000000000 -0500 @@ -215,7 +215,7 @@ // Make sure we have a valid packet to process. if (dataoffs == NULL) return XENONE; - result=tls_funcs_decode_packet(thisint, dataoffs, insize, outframe, outsize, + result=tls_funcs_decode_packet(thisint, (char *) dataoffs, insize, (char *) outframe, outsize, (phase2_call)ttls_do_phase2, userdata->chunk_size); if (result != 0) @@ -250,7 +250,7 @@ free(thisint->keyingMaterial); } - thisint->keyingMaterial = tls_funcs_gen_keyblock(network_data->activemethod); + thisint->keyingMaterial = (u_char *) tls_funcs_gen_keyblock(network_data->activemethod); thisint->keyingLength = 32; if (thisint->keyingMaterial == NULL) return -1; --- xsupplicant-1.2.1/src/eap_types/ttls/ttlsphase2.c.BAD 2005-09-03 16:45:26.000000000 -0500 +++ xsupplicant-1.2.1/src/eap_types/ttls/ttlsphase2.c 2005-09-03 16:57:41.000000000 -0500 @@ -184,7 +184,7 @@ username_size = strlen(username); // Send the Username AVP - build_avp(USER_NAME_AVP, 0, MANDITORY_FLAG, username, username_size, out_data, &avp_out_size); + build_avp(USER_NAME_AVP, 0, MANDITORY_FLAG, (uint8_t *) username, username_size, (uint8_t *) out_data, &avp_out_size); avp_offset = avp_out_size; @@ -200,7 +200,7 @@ id = challenge[16]; // Send the MS-CHAP AVP - build_avp(MS_CHAP_CHALLENGE, MS_VENDOR_ATTR, (MANDITORY_FLAG | VENDOR_FLAG), (char *)&mschap_challenge, 16, &out_data[avp_offset], &avp_out_size); + build_avp(MS_CHAP_CHALLENGE, MS_VENDOR_ATTR, (MANDITORY_FLAG | VENDOR_FLAG), (uint8_t *) &mschap_challenge, 16, (uint8_t *) &out_data[avp_offset], &avp_out_size); avp_offset+=avp_out_size; @@ -217,7 +217,7 @@ memcpy(&mschap_answer[2], &mschap_challenge, 16); memcpy(&mschap_answer[26], &mschap_result, 24); - build_avp(MS_CHAP2_RESPONSE, MS_VENDOR_ATTR, (MANDITORY_FLAG | VENDOR_FLAG), (char *)&mschap_answer, 50, &out_data[avp_offset], &avp_out_size); + build_avp(MS_CHAP2_RESPONSE, MS_VENDOR_ATTR, (MANDITORY_FLAG | VENDOR_FLAG), (uint8_t *) &mschap_answer, 50, (uint8_t *) &out_data[avp_offset], &avp_out_size); avp_offset+=avp_out_size; *out_size = avp_offset; } @@ -283,7 +283,7 @@ username_size = strlen(username); // Send the Username AVP - build_avp(USER_NAME_AVP, 0, MANDITORY_FLAG, username, username_size, out_data, &avp_out_size); + build_avp(USER_NAME_AVP, 0, MANDITORY_FLAG, (uint8_t *) username, username_size, (uint8_t *) out_data, &avp_out_size); avp_offset = avp_out_size; @@ -299,7 +299,7 @@ id = challenge[8]; // Send the MS-CHAP AVP - build_avp(MS_CHAP_CHALLENGE, MS_VENDOR_ATTR, (MANDITORY_FLAG | VENDOR_FLAG), (char *)&mschap_challenge, 8, &out_data[avp_offset], &avp_out_size); + build_avp(MS_CHAP_CHALLENGE, MS_VENDOR_ATTR, (MANDITORY_FLAG | VENDOR_FLAG), (uint8_t *) &mschap_challenge, 8, (uint8_t *) &out_data[avp_offset], &avp_out_size); avp_offset+=avp_out_size; @@ -313,7 +313,7 @@ mschap_answer[1] = 1; // Use NT Style Passwords. memcpy((char *)&mschap_answer[26], (char *)&mschap_result, 24); - build_avp(MS_CHAP_RESPONSE, MS_VENDOR_ATTR, (MANDITORY_FLAG | VENDOR_FLAG), (char *)&mschap_answer, 50, &out_data[avp_offset], &avp_out_size); + build_avp(MS_CHAP_RESPONSE, MS_VENDOR_ATTR, (MANDITORY_FLAG | VENDOR_FLAG), (uint8_t *) &mschap_answer, 50, (uint8_t *) &out_data[avp_offset], &avp_out_size); avp_offset+=avp_out_size; *out_size = avp_offset; @@ -386,12 +386,12 @@ username = phase2data->username; } username_size = strlen(username); - build_avp(USER_NAME_AVP, 0, MANDITORY_FLAG, username, username_size, out_data, &avp_out_size); + build_avp(USER_NAME_AVP, 0, MANDITORY_FLAG, (uint8_t *) username, username_size, (uint8_t *) out_data, &avp_out_size); avp_offset = avp_out_size; // Get the implicit challenge. - challenge = implicit_challenge(thisint); + challenge = (u_char *) implicit_challenge(thisint); if (challenge == NULL) { debug_printf(DEBUG_NORMAL, "Invalid implicit challenge in ttls_do_chap()!\n"); @@ -409,9 +409,9 @@ return; } - user_passwd = phase2data->password; + user_passwd = (u_char *) phase2data->password; - tohash = (char *)malloc(1+16+strlen(user_passwd)); + tohash = (u_char *)malloc(1+16+strlen((char *) user_passwd)); if (tohash == NULL) { debug_printf(DEBUG_NORMAL, "Error with malloc of \"tohash\" in ttls_do_chap().\n"); @@ -419,13 +419,13 @@ } tohash[0] = session_id; - memcpy(&tohash[1], user_passwd, strlen(user_passwd)); - memcpy(&tohash[1+strlen(user_passwd)], &chap_challenge, 16); - hashlen = 1+strlen(user_passwd)+16; + memcpy(&tohash[1], user_passwd, strlen((char *) user_passwd)); + memcpy(&tohash[1+strlen((char *) user_passwd)], &chap_challenge, 16); + hashlen = 1+strlen((char *) user_passwd)+16; EVP_DigestInit(ctx, EVP_md5()); EVP_DigestUpdate(ctx, tohash, hashlen); - EVP_DigestFinal(ctx, (char *)&chap_hash[1], (int *)&md5_length); + EVP_DigestFinal(ctx, (u_char *)&chap_hash[1], (u_int *)&md5_length); if (md5_length != 16) // We didn't get back a valid hash! { @@ -433,11 +433,11 @@ } chap_hash[0]=session_id; - build_avp(CHAP_PASSWORD_AVP, 0, MANDITORY_FLAG, chap_hash, 17, &out_data[avp_offset], &avp_out_size); + build_avp(CHAP_PASSWORD_AVP, 0, MANDITORY_FLAG, chap_hash, 17, (uint8_t *) &out_data[avp_offset], &avp_out_size); avp_offset += avp_out_size; - build_avp(CHAP_CHALLENGE_AVP, 0, MANDITORY_FLAG, (char *)&chap_challenge, 16, &out_data[avp_offset], &avp_out_size); + build_avp(CHAP_CHALLENGE_AVP, 0, MANDITORY_FLAG, (uint8_t *) &chap_challenge, 16, (uint8_t *) &out_data[avp_offset], &avp_out_size); if (tohash != NULL) { @@ -518,8 +518,8 @@ avp_offset = 0; - build_avp(USER_NAME_AVP, 0, MANDITORY_FLAG, username, - strlen(username), out_data, &avp_out_size); + build_avp(USER_NAME_AVP, 0, MANDITORY_FLAG, (uint8_t *) username, + strlen(username), (uint8_t *) out_data, &avp_out_size); avp_offset += avp_out_size; @@ -537,7 +537,7 @@ bzero(tempbuf, passwd_size); memcpy(tempbuf, phase2data->password, strlen(phase2data->password)); - build_avp(USER_PASSWORD_AVP, 0, MANDITORY_FLAG, tempbuf, passwd_size, &out_data[avp_offset], &avp_out_size); + build_avp(USER_PASSWORD_AVP, 0, MANDITORY_FLAG, (uint8_t *) tempbuf, passwd_size, (uint8_t *) &out_data[avp_offset], &avp_out_size); *out_size = avp_offset + avp_out_size; @@ -548,7 +548,7 @@ } debug_printf(DEBUG_AUTHTYPES, "Returning from do_pap :\n"); - debug_hex_dump(DEBUG_AUTHTYPES, out_data, *out_size); + debug_hex_dump(DEBUG_AUTHTYPES, (u_char *) out_data, *out_size); } // We don't do anything with the "in" stuff for now.. @@ -567,7 +567,7 @@ } debug_printf(DEBUG_AUTHTYPES, "Encrypted Inner (%d) : \n", in_size); - debug_hex_dump(DEBUG_AUTHTYPES, in, in_size); + debug_hex_dump(DEBUG_AUTHTYPES, (u_char *) in, in_size); userdata = (struct config_eap_ttls *)thisint->eap_conf_data; @@ -597,10 +597,10 @@ if ((in_size > 0) && (in[0] != 0x14)) { // We have something to decrypt! - tls_crypt_decrypt(thisint, in, in_size, decr_data, &decrsize); + tls_crypt_decrypt(thisint, (u_char *) in, in_size, (u_char *) decr_data, &decrsize); debug_printf(DEBUG_AUTHTYPES, "Decrypted Inner (%d) : \n", in_size); - debug_hex_dump(DEBUG_AUTHTYPES, decr_data, decrsize); + debug_hex_dump(DEBUG_AUTHTYPES, (u_char *) decr_data, decrsize); if (decr_data[0] == 0x00) { @@ -638,11 +638,11 @@ return XENONE; } - tls_crypt_encrypt_nolen(thisint, toencout, toencsize, out, out_size); + tls_crypt_encrypt_nolen(thisint, (u_char *) toencout, toencsize, (u_char *) out, out_size); free(toencout); debug_printf(DEBUG_AUTHTYPES, "Returning from (TTLS) do_phase2 : \n"); - debug_hex_dump(DEBUG_AUTHTYPES, out, *out_size); + debug_hex_dump(DEBUG_AUTHTYPES, (u_char *) out, *out_size); return XENONE; } --- xsupplicant-1.2.1/src/eap_types/leap/eapleap.c.BAD 2005-09-03 17:22:01.000000000 -0500 +++ xsupplicant-1.2.1/src/eap_types/leap/eapleap.c 2005-09-03 17:25:57.000000000 -0500 @@ -50,7 +50,7 @@ unicodePass[2 * i + 1] = 0; } /* Encrypt plain text password to a 16-byte MD4 hash */ - md4_calc(MD4Hash, unicodePass, passLen * 2); + md4_calc(MD4Hash, (u_char *) unicodePass, passLen * 2); } void leap_mschap(char * password, char * response) { @@ -64,7 +64,7 @@ ntPwdHash(MD4Hash, password); md4_calc(MD4HashHash, MD4Hash, 16); - ChallengeResponse(leapchallenges->apc, MD4HashHash, response); + ChallengeResponse((char *) leapchallenges->apc, (char *) MD4HashHash, response); } @@ -199,7 +199,7 @@ // LEAP shouldn't be used as an inner type, so we should be able to get // away with this. - data = dataoffs-5; + data = (char *) dataoffs-5; eapheader = (struct eap_header *)data; switch (eapheader->eap_code) { @@ -279,7 +279,7 @@ memset(chall_response, 0x0, 8); NtChallengeResponse((char *)leaprequest->randval, userdata->password, (char *)&chall_response); - GenerateNTResponse((char *)leapchallenges->pr, (char *)leapchallenges->pc, username, userdata->password, chall_response); + GenerateNTResponse((char *)leapchallenges->pr, (char *)leapchallenges->pc, username, userdata->password, (char *) chall_response); // store Access Point Challenge memcpy((uint8_t *)leapchallenges->apc, (char *)chall_response, 8); @@ -337,7 +337,7 @@ leapresponse = (struct leap_responses *)dataoffs; - challenge_response_got = (char *)malloc(leapresponse->count+1); + challenge_response_got = (u_char *)malloc(leapresponse->count+1); if (!challenge_response_got) { debug_printf(DEBUG_NORMAL, "(EAP-LEAP) challenge_response_got is NULL after malloc!\n"); } @@ -350,7 +350,7 @@ memset(challenge_response_expected, 0x0, 24); // Calculate the 24 bytes MS-CHAP Challenge Response - leap_mschap(userdata->password, challenge_response_expected); + leap_mschap(userdata->password, (char *) challenge_response_expected); if (memcmp(challenge_response_got, challenge_response_expected, 24) == 0) { debug_printf(DEBUG_AUTHTYPES, "(EAP-LEAP) AP ChallengeResponse got is valid.\n"); @@ -386,7 +386,7 @@ debug_printf(DEBUG_AUTHTYPES, "(EAP-LEAP) leapchallenges->apr : "); debug_hex_printf(DEBUG_AUTHTYPES, (uint8_t *)leapchallenges->apr, 24); - GetMasterLEAPKey((char *)MD4HashHash, leapchallenges->apc, leapchallenges->apr, leapchallenges->pc, leapchallenges->pr, (char *)&MasterKey); + GetMasterLEAPKey((char *)MD4HashHash, (char *) leapchallenges->apc, (char *) leapchallenges->apr, (char *) leapchallenges->pc, (char *) leapchallenges->pr, (char *)&MasterKey); debug_printf(DEBUG_AUTHTYPES, "MasterLEAPKey : "); debug_hex_printf(DEBUG_AUTHTYPES, (unsigned char *)&MasterKey, 16); @@ -444,7 +444,7 @@ mydata = (struct leap_data *)network_data->activemethod->eap_data; // Right now, we don't return anything from LEAP. - thisint->keyingMaterial = mydata->keyingMaterial; + thisint->keyingMaterial = (u_char *) mydata->keyingMaterial; thisint->keyingLength = 16; // We only use 16 bytes for this keying material! return 0; --- xsupplicant-1.2.1/src/wpa_common.c.BAD 2005-09-03 08:42:16.000000000 -0500 +++ xsupplicant-1.2.1/src/wpa_common.c 2005-09-03 08:42:30.000000000 -0500 @@ -201,7 +201,7 @@ // This is a little different than the reference implementation, // because OpenSSL takes parameters in a different order. HMAC(EVP_sha1(), key, key_len, input, total_len, &output[currentindex], - &k); + (u_int *) &k); currentindex += 20; input[total_len-1]++; } --- xsupplicant-1.2.1/src/eapol_key_type1.c.BAD 2005-09-03 08:40:11.000000000 -0500 +++ xsupplicant-1.2.1/src/eapol_key_type1.c 2005-09-03 08:41:54.000000000 -0500 @@ -107,7 +107,7 @@ if (calchmac == NULL) return XEMALLOC; HMAC(EVP_md5(), thisint->keyingMaterial+32, - thisint->keyingLength, framecpy, framesize, calchmac, &outlen); + thisint->keyingLength, (u_char *) framecpy, framesize, (u_char *) calchmac, (u_int *) &outlen); // Now, we need to compare the calculated HMAC to the one sent to us. keydata = (struct key_packet *)&inframe[4]; --- xsupplicant-1.2.1/src/eapol.c.BAD 2005-09-03 08:30:37.000000000 -0500 +++ xsupplicant-1.2.1/src/eapol.c 2005-09-03 08:30:45.000000000 -0500 @@ -122,7 +122,7 @@ // an EAP request that is valid. If we don't have any config informtion, // we should just bail here, and not return an error. - inframe = (u_char *)&workint->recvframe; + inframe = (char *)&workint->recvframe; temp = (struct eapol_header *)&inframe[OFFSET_PAST_MAC]; --- xsupplicant-1.2.1/src/statemachine.c.BAD 2005-09-03 08:32:13.000000000 -0500 +++ xsupplicant-1.2.1/src/statemachine.c 2005-09-03 08:33:13.000000000 -0500 @@ -619,7 +619,7 @@ } } - eapol_build_header(EAPOL_LOGOFF, 0, eapolver, thisint->sendframe); + eapol_build_header(EAPOL_LOGOFF, 0, eapolver, (char *) thisint->sendframe); thisint->send_size = OFFSET_TO_EAP; snmp_dot1xSuppEapolLogoffFramesTx(); @@ -664,7 +664,7 @@ } eapol_build_header(EAPOL_START, 0, network_data->force_eapol_ver, - thisint->sendframe); + (char *) thisint->sendframe); thisint->send_size = OFFSET_TO_EAP; snmp_dot1xSuppEapolStartFramesTx(); --- xsupplicant-1.2.1/src/config_ssid.c.BAD 2005-09-03 08:30:08.000000000 -0500 +++ xsupplicant-1.2.1/src/config_ssid.c 2005-09-03 08:30:24.000000000 -0500 @@ -151,7 +151,7 @@ if (wpa_ie != NULL) { - cur->wpa_ie = (char *)malloc(wpa_ie_len); + cur->wpa_ie = (unsigned char *)malloc(wpa_ie_len); if (cur->wpa_ie == NULL) { debug_printf(DEBUG_NORMAL, "Couldn't allocate memory for wpa_ie! " @@ -168,7 +168,7 @@ if (rsn_ie != NULL) { - cur->rsn_ie = (char *)malloc(rsn_ie_len); + cur->rsn_ie = (unsigned char *)malloc(rsn_ie_len); if (cur->rsn_ie == NULL) { debug_printf(DEBUG_NORMAL, "Couldn't allocate memory for rsn_ie! " --- xsupplicant-1.2.1/src/xsup_ipc.c.BAD 2005-09-03 17:27:32.000000000 -0500 +++ xsupplicant-1.2.1/src/xsup_ipc.c 2005-09-03 17:29:17.000000000 -0500 @@ -144,7 +144,7 @@ } debug_printf(DEBUG_INT, "(IPC) Sending : \n"); - debug_hex_dump(DEBUG_INT, tosend, tolen); + debug_hex_dump(DEBUG_INT, (u_char *) tosend, tolen); err = send(skfd, tosend, tolen, 0); if (err < 0) @@ -194,7 +194,7 @@ *outsize = 0; } else { debug_printf(DEBUG_INT, "(IPC) Got : \n"); - debug_hex_dump(DEBUG_INT, outbuf, readStat); + debug_hex_dump(DEBUG_INT, (u_char *) outbuf, readStat); // Verify that the packet we got is valid. *outsize = readStat; @@ -355,7 +355,7 @@ debug_printf(DEBUG_NORMAL, "Error getting working interface " "dumping current packet: \n"); - debug_hex_dump(DEBUG_NORMAL, buffer, bufsize); + debug_hex_dump(DEBUG_NORMAL, (u_char *) buffer, bufsize); debug_printf(DEBUG_NORMAL, "Ignoring remaining parts of packet!\n"); bufptr = bufsize+1; @@ -419,7 +419,7 @@ { // We got a request for a new IPC client connection. debug_printf(DEBUG_INT, "Got a request to connect a new client.\n"); - newsock = accept(ipc_sock, (struct sockaddr *)&sa, &len); + newsock = accept(ipc_sock, (struct sockaddr *)&sa, (u_int *) &len); if (newsock <= 0) { debug_printf(DEBUG_NORMAL, "Got a request for a new IPC client " @@ -514,7 +514,7 @@ ipc_callout_request_password(intidx, &bufptr, (char *)&packet[0], 512, eapType, challenge); debug_printf(DEBUG_AUTHTYPES, "Sending : \n"); - debug_hex_dump(DEBUG_AUTHTYPES, packet, bufptr); + debug_hex_dump(DEBUG_AUTHTYPES, (u_char *) packet, bufptr); xsup_ipc_send_all((char *)&packet, bufptr); --- xsupplicant-1.2.1/src/eapol_key_type254.c.BAD 2005-09-03 09:05:02.000000000 -0500 +++ xsupplicant-1.2.1/src/eapol_key_type254.c 2005-09-03 09:21:09.000000000 -0500 @@ -192,12 +192,12 @@ } debug_printf(DEBUG_INT, "PMK : "); - debug_hex_printf(DEBUG_INT, intdata->statemachine->PMK, 32); - wpa_PRF(intdata->statemachine->PMK, 32, "Pairwise key expansion", 22, - (char *)&prfdata, 76, retval, 64); + debug_hex_printf(DEBUG_INT, (u_char *) intdata->statemachine->PMK, 32); + wpa_PRF((u_char *) intdata->statemachine->PMK, 32, (u_char *) "Pairwise key expansion", 22, + (u_char *)&prfdata, 76, (u_char *) retval, 64); debug_printf(DEBUG_INT, "PTK : "); - debug_hex_printf(DEBUG_INT, retval, 64); + debug_hex_printf(DEBUG_INT, (u_char *) retval, 64); return retval; } @@ -264,10 +264,10 @@ eapolver = snmp_get_dot1xSuppLastEapolFrameVersion(); eapol_build_header(EAPOL_KEY, (intdata->send_size-OFFSET_TO_EAPOL-4), - eapolver, intdata->sendframe); + eapolver, (char *) intdata->sendframe); memcpy(key, intdata->statemachine->PTK, 16); - mic_wpa_populate(intdata->sendframe, intdata->send_size+4, key, 16); + mic_wpa_populate((char *) intdata->sendframe, intdata->send_size+4, key, 16); cardif_sendframe(intdata); intdata->statemachine->eapolEap = FALSE; @@ -351,21 +351,21 @@ bzero(rc4_ek, 32); memcpy(rc4_ek, inkeydata->key_iv, 16); memcpy(&rc4_ek[16], &intdata->statemachine->PTK[16], 16); - rc4_skip(rc4_ek, 32, 256, keydata, value16); + rc4_skip((u_char *) rc4_ek, 32, 256, keydata, value16); wpa_common_swap_rx_tx_mic(keydata); - cardif_set_tkip_key(intdata, allfs, keyindex, FALSE, inkeydata->key_rsc, - 6, keydata, value16); + cardif_set_tkip_key(intdata, (char *) allfs, keyindex, FALSE, (char *) inkeydata->key_rsc, + 6, (char *) keydata, value16); break; case 2: // First, decrypt the GTK bzero(key, 16); - aes_unwrap(&intdata->statemachine->PTK[16], (value16-8)/8, keydata, - key); + aes_unwrap((u_char *) &intdata->statemachine->PTK[16], (value16-8)/8, keydata, + (u_char *) key); wpa_common_swap_rx_tx_mic(keydata); - cardif_set_ccmp_key(intdata, NULL, keyindex, FALSE, inkeydata->key_rsc, + cardif_set_ccmp_key(intdata, NULL, keyindex, FALSE, (char *) inkeydata->key_rsc, 6, key, (value16-8)); break; } @@ -391,13 +391,13 @@ eapolver = snmp_get_dot1xSuppLastEapolFrameVersion(); eapol_build_header(EAPOL_KEY, (intdata->send_size-OFFSET_TO_EAPOL-4), - eapolver, intdata->sendframe); + eapolver, (char *) intdata->sendframe); memcpy(key, intdata->statemachine->PTK, 16); - mic_wpa_populate(intdata->sendframe, intdata->send_size+4, key, 16); + mic_wpa_populate((char *) intdata->sendframe, intdata->send_size+4, key, 16); // Dump what we built. - eapol_key_type254_dump(intdata->sendframe); + eapol_key_type254_dump((char *) intdata->sendframe); if (network_data->methods->method_num == WPA_PSK) { @@ -504,13 +504,13 @@ eapolver = snmp_get_dot1xSuppLastEapolFrameVersion(); eapol_build_header(EAPOL_KEY, (intdata->send_size-OFFSET_TO_EAPOL-4), - eapolver, intdata->sendframe); + eapolver, (char *) intdata->sendframe); memcpy(key, intdata->statemachine->PTK, 16); - mic_wpa_populate(intdata->sendframe, intdata->send_size+4, key, 16); + mic_wpa_populate((char *) intdata->sendframe, intdata->send_size+4, key, 16); // Dump what we built. - eapol_key_type254_dump(intdata->sendframe); + eapol_key_type254_dump((char *) intdata->sendframe); } /******************************************************** @@ -586,20 +586,20 @@ eapolver = snmp_get_dot1xSuppLastEapolFrameVersion(); eapol_build_header(EAPOL_KEY, (intdata->send_size-OFFSET_TO_EAPOL-4), - eapolver, intdata->sendframe); + eapolver, (char *) intdata->sendframe); memcpy(key, intdata->statemachine->PTK, 16); - mic_wpa_populate(intdata->sendframe, intdata->send_size+4, key, 16); + mic_wpa_populate((char *) intdata->sendframe, intdata->send_size+4, key, 16); // Dump what we built. - eapol_key_type254_dump(intdata->sendframe); + eapol_key_type254_dump((char *) intdata->sendframe); // Get TK1 value16 = ntohs(inkeydata->key_length); memcpy(key, (char *)&intdata->statemachine->PTK[32], value16); debug_printf(DEBUG_INT, "TK1 : "); - debug_hex_printf(DEBUG_INT, key, value16); + debug_hex_printf(DEBUG_INT, (u_char *) key, value16); cardif_sendframe(intdata); intdata->statemachine->eapolEap = FALSE; @@ -612,14 +612,14 @@ case 1: // We need to swap the TX/RX MIC values since we are the supplicant. // (Thanks to Jouni Malinen for pointing this out!) - wpa_common_swap_rx_tx_mic(key); + wpa_common_swap_rx_tx_mic((u_char *) key); cardif_set_tkip_key(intdata, intdata->dest_mac, keyindex, TRUE, - inkeydata->key_rsc, 6, key, value16); + (char *) inkeydata->key_rsc, 6, key, value16); break; case 2: cardif_set_ccmp_key(intdata, intdata->dest_mac, keyindex, TRUE, - inkeydata->key_rsc, 6, key, value16); + (char *) inkeydata->key_rsc, 6, key, value16); break; } } @@ -646,7 +646,7 @@ if (keyflags & WPA_KEY_MIC_FLAG) { - if (mic_wpa_validate(intdata->recvframe, intdata->recv_size, + if (mic_wpa_validate((char *) intdata->recvframe, intdata->recv_size, intdata->statemachine->PTK, 16) == FALSE) { intdata->statemachine->MICVerified = TRUE; @@ -688,7 +688,7 @@ eapolver = snmp_get_dot1xSuppLastEapolFrameVersion(); eapol_build_header(EAPOL_KEY, (intdata->recv_size-OFFSET_TO_EAPOL-4), - eapolver, intdata->recvframe); + eapolver, (char *) intdata->recvframe); cardif_sendframe(intdata); intdata->statemachine->eapolEap = FALSE; } @@ -757,8 +757,8 @@ } // We have an ASCII password, so calculate it. - if (psk_wpa_pbkdf2(psk->key, intdata->cur_essid, - strlen(intdata->cur_essid), (char *)&tpmk) + if (psk_wpa_pbkdf2(psk->key, (u_char *) intdata->cur_essid, + strlen(intdata->cur_essid), (u_char *)&tpmk) == TRUE) { intdata->statemachine->PMK = (char *)malloc(32); @@ -798,7 +798,7 @@ } } - eapol_key_type254_dump(inframe); + eapol_key_type254_dump((char *) inframe); eapol_key_type254_determine_key(intdata); --- xsupplicant-1.2.1/src/config_grammar.y.BAD 2005-09-03 17:31:51.000000000 -0500 +++ xsupplicant-1.2.1/src/config_grammar.y 2005-09-03 17:34:56.000000000 -0500 @@ -829,8 +829,9 @@ } else { int tmp_dst_mac[CONFIG_MAC_LEN]; + int retval; SET_FLAG(tmp_network->flags, CONFIG_NET_DEST_MAC); - sscanf($3, "%2x:%2x:%2x:%2x:%2x:%2x", + retval = sscanf($3, "%2x:%2x:%2x:%2x:%2x:%2x", &tmp_dst_mac[0], &tmp_dst_mac[1], &tmp_dst_mac[2], @@ -1035,25 +1036,25 @@ set_current_static_wep(); parameter_debug("Static Key 1 : %s\n", $3); if (!tmp_static_wep->key[1]) - tmp_static_wep->key[1] = $3; + tmp_static_wep->key[1] = (u_char *) $3; } | TK_STATIC_KEY2 '=' TK_QUOTED_STR { set_current_static_wep(); parameter_debug("Static Key 2 : %s\n", $3); if (!tmp_static_wep->key[2]) - tmp_static_wep->key[2] = $3; + tmp_static_wep->key[2] = (u_char *) $3; } | TK_STATIC_KEY3 '=' TK_QUOTED_STR { set_current_static_wep(); parameter_debug("Static Key 3 : %s\n", $3); if (!tmp_static_wep->key[3]) - tmp_static_wep->key[3] = $3; + tmp_static_wep->key[3] = (u_char *) $3; } | TK_STATIC_KEY4 '=' TK_QUOTED_STR { set_current_static_wep(); parameter_debug("Static Key 4 : %s\n", $3); if (!tmp_static_wep->key[4]) - tmp_static_wep->key[4] = $3; + tmp_static_wep->key[4] = (u_char *) $3; } | TK_WEP_TX_KEY '=' TK_NUMBER { set_current_static_wep(); Index: sources =================================================================== RCS file: /cvs/extras/rpms/xsupplicant/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 19 Aug 2005 18:58:19 -0000 1.2 +++ sources 4 Sep 2005 13:17:39 -0000 1.3 @@ -1 +1,2 @@ e1eee37899b49ed238648699d0a01c5b xsupplicant-1.2.tar.gz +c44300f798a3317c06e501eb0dd98a23 xsupplicant-1.2.1.tar.gz Index: xsupplicant.spec =================================================================== RCS file: /cvs/extras/rpms/xsupplicant/FC-4/xsupplicant.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- xsupplicant.spec 19 Aug 2005 18:58:19 -0000 1.1 +++ xsupplicant.spec 4 Sep 2005 13:17:39 -0000 1.2 @@ -1,6 +1,6 @@ Name: xsupplicant Summary: Open Source Implementation of IEEE 802.1x -Version: 1.2 +Version: 1.2.1 Release: 1%{?dist} License: GPL Group: System Environment/Base @@ -8,6 +8,8 @@ Source0: http://download.sourceforge.net/open1x/xsupplicant-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: openssl-devel, bison, flex +Patch0: xsupplicant-1.2.1-docsfix.patch +Patch1: xsupplicant-1.2.1-gcc4-cleanups.patch %description This software allows a GNU/Linux or BSD workstation to authenticate with @@ -17,12 +19,17 @@ %prep %setup -q +%patch0 -p1 +%patch1 -p1 perl -pi.orig -e 's|/lib\b|/%{_lib}|g' configure* %build %configure make %{?_smp_mflags} +cd doc +./builddocs.sh +cd .. %install rm -rf $RPM_BUILD_ROOT @@ -35,7 +42,7 @@ %files %defattr(-,root,root,-) -%doc AUTHORS COPYING README doc/html/ doc/txt/ doc/README* etc/*.conf +%doc AUTHORS COPYING README doc/html/ doc/txt/ doc/pdf doc/README* etc/*.conf %config(noreplace) %{_sysconfdir}/xsupplicant.conf %{_bindir}/config-parser %{_bindir}/xsup_monitor @@ -44,6 +51,9 @@ %{_sbindir}/xsupplicant %changelog +* Sat Sep 3 2005 Tom "spot" Callaway 1.2.1-1 +- bump to 1.2.1 release + * Fri Aug 19 2005 Tom "spot" Callaway 1.2-1 - bump to 1.2 final From fedora-extras-commits at redhat.com Sun Sep 4 13:17:41 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sun, 4 Sep 2005 09:17:41 -0400 Subject: rpms/xsupplicant/FC-3 xsupplicant-1.2.1-docsfix.patch, NONE, 1.1 xsupplicant-1.2.1-gcc4-cleanups.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 xsupplicant.spec, 1.1, 1.2 Message-ID: <200509041317.j84DHfPx030629@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/xsupplicant/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30591/FC-3 Modified Files: .cvsignore sources xsupplicant.spec Added Files: xsupplicant-1.2.1-docsfix.patch xsupplicant-1.2.1-gcc4-cleanups.patch Log Message: Bump to 1.2.1, fix a LOT of signed/unsigned mistakes in the code. xsupplicant-1.2.1-docsfix.patch: --- NEW FILE xsupplicant-1.2.1-docsfix.patch --- --- xsupplicant-1.2.1/doc/builddocs.sh.BAD 2005-09-03 08:20:54.000000000 -0500 +++ xsupplicant-1.2.1/doc/builddocs.sh 2005-09-03 08:22:29.000000000 -0500 @@ -4,7 +4,7 @@ # best option is just to require users of this script to define # the variable on their own? not quite sure, I guess that's why # it's hard coded for now... -JADE_PUB=/usr/share/doc/openjade-1.3/pubtext +JADE_PUB=/usr/share/doc/openjade-*/pubtext SGML_CATALOG_FILES=/usr/sgml-tools/dtd/catalog:/etc/sgml/catalog:/usr/share/doc/openjade-1.3.2/catalog:/home/chris/t/docbook-dsssl-1.97/catalog mkdir -p html @@ -33,7 +33,7 @@ # create the txt docs echo -n "Building the TXT docs..." -lynx -dump -nolist html/Open1x-UserGuide.html > txt/Open1x-UserGuide.txt +links -dump html/Open1x-UserGuide.html > txt/Open1x-UserGuide.txt if [ $? -ne 0 ] then echo "Error! Build failed!" xsupplicant-1.2.1-gcc4-cleanups.patch: --- NEW FILE xsupplicant-1.2.1-gcc4-cleanups.patch --- --- xsupplicant-1.2.1/src/cardif/linux/cardif_hostap_driver.c.BAD 2005-09-03 17:50:21.000000000 -0500 +++ xsupplicant-1.2.1/src/cardif/linux/cardif_hostap_driver.c 2005-09-03 17:50:50.000000000 -0500 @@ -326,7 +326,7 @@ debug_printf(DEBUG_NORMAL, "alg=%s key_idx=%d set_tx=%d seq_len=%d key_len=%d\n", alg_name, key_idx, set_tx, seq_len, key_len); debug_printf(DEBUG_NORMAL, "KeyRSC = "); - debug_hex_printf(DEBUG_NORMAL, seq, seq_len); + debug_hex_printf(DEBUG_NORMAL, (u_char *) seq, seq_len); if (seq_len > 8) { @@ -350,7 +350,7 @@ memset(param->sta_addr, 0xff, ETH_ALEN); - strncpy(param->u.crypt.alg, alg_name, HOSTAP_CRYPT_ALG_NAME_LEN); + strncpy((char *) param->u.crypt.alg, alg_name, HOSTAP_CRYPT_ALG_NAME_LEN); param->u.crypt.flags = set_tx ? HOSTAP_CRYPT_FLAG_SET_TX_KEY : 0; param->u.crypt.idx = key_idx; memcpy(param->u.crypt.seq, seq, seq_len); --- xsupplicant-1.2.1/src/cardif/linux/cardif_linux_wext.c.BAD 2005-09-03 17:51:02.000000000 -0500 +++ xsupplicant-1.2.1/src/cardif/linux/cardif_linux_wext.c 2005-09-03 17:53:08.000000000 -0500 @@ -119,10 +119,10 @@ // We set the key index to 0x80, to force key 0 to be set to all 0s, // and to have key 0 be set as the default transmit key. - cardif_set_wep_key(thisint, (char *)&zerokey, keylen, 0x80); - cardif_set_wep_key(thisint, (char *)&zerokey, keylen, 0x01); - cardif_set_wep_key(thisint, (char *)&zerokey, keylen, 0x02); - cardif_set_wep_key(thisint, (char *)&zerokey, keylen, 0x03); + cardif_set_wep_key(thisint, (u_char *)&zerokey, keylen, 0x80); + cardif_set_wep_key(thisint, (u_char *)&zerokey, keylen, 0x01); + cardif_set_wep_key(thisint, (u_char *)&zerokey, keylen, 0x02); + cardif_set_wep_key(thisint, (u_char *)&zerokey, keylen, 0x03); } /************************************************************** @@ -947,10 +947,10 @@ if (config_ssid_get_ssid_abilities() & RSN_IE) { - cardif_linux_wext_get_wpa2_ie(intdata, wpaie, &len); + cardif_linux_wext_get_wpa2_ie(intdata, (char *) wpaie, &len); } else if (config_ssid_get_ssid_abilities() & WPA_IE) { - cardif_linux_wext_get_wpa_ie(intdata, wpaie, &len); + cardif_linux_wext_get_wpa_ie(intdata, (char *) wpaie, &len); } if (len > 0) @@ -965,11 +965,11 @@ intdata->flags |= DONTSCAN; cardif_linux_wext_set_ssid(intdata, newssid); - bssid = config_ssid_get_mac(); + bssid = (char *) config_ssid_get_mac(); if (bssid != NULL) { debug_printf(DEBUG_INT, "Dest. BSSID : "); - debug_hex_printf(DEBUG_INT, bssid, 6); + debug_hex_printf(DEBUG_INT, (u_char *) bssid, 6); } // cardif_linux_wext_set_bssid(intdata, bssid); --- xsupplicant-1.2.1/src/cardif/linux/cardif_ipw_driver.c.BAD 2005-09-03 17:54:57.000000000 -0500 +++ xsupplicant-1.2.1/src/cardif/linux/cardif_ipw_driver.c 2005-09-03 17:57:23.000000000 -0500 @@ -240,7 +240,7 @@ wpa2_gen_ie(intdata, iedata, ielen); debug_printf(DEBUG_INT, "Setting WPA2 IE : "); - debug_hex_printf(DEBUG_INT, iedata, *ielen); + debug_hex_printf(DEBUG_INT, (u_char *) iedata, *ielen); debug_printf(DEBUG_INT, "\n"); return XENONE; @@ -372,7 +372,7 @@ param = (struct ipw_param *) buf; param->cmd = IPW_CMD_SET_ENCRYPTION; memset(param->sta_addr, 0xff, 6); - strncpy(param->u.crypt.alg, alg_name, IPW_CRYPT_ALG_NAME_LEN); + strncpy((char *) param->u.crypt.alg, alg_name, IPW_CRYPT_ALG_NAME_LEN); param->u.crypt.set_tx = set_tx ? 1 : 0; param->u.crypt.idx = key_idx; memcpy(param->u.crypt.seq, seq, seq_len); @@ -422,7 +422,7 @@ { int ret; - ret = ipw_mlme(intdata->intName, intdata->source_mac, + ret = ipw_mlme(intdata->intName, (u8 *) intdata->source_mac, IPW_MLME_STA_DISASSOC, reason_code); if (ret <0) return ret; @@ -458,16 +458,16 @@ if (config_ssid_get_ssid_abilities() & RSN_IE) { - cardif_ipw_driver_get_wpa2_ie(intdata, wpaie, &len); + cardif_ipw_driver_get_wpa2_ie(intdata, (char *) wpaie, &len); } else if (config_ssid_get_ssid_abilities() & WPA_IE) { - cardif_ipw_driver_get_wpa_ie(intdata, wpaie, &len); + cardif_ipw_driver_get_wpa_ie(intdata, (char *) wpaie, &len); } // Length needs to be > 0 in order to indicate that we have an IE to set. if ((len < 255) && (len >= 0)) { - if (cardif_ipw_driver_set_wpa_ie(intdata->intName, wpaie, len) < 0) + if (cardif_ipw_driver_set_wpa_ie(intdata->intName, (char *) wpaie, len) < 0) { debug_printf(DEBUG_NORMAL, "Couldn't set WPA/RSN IE on device %s!\n", intdata->intName); --- xsupplicant-1.2.1/src/cardif/linux/cardif_linux_rtnetlink.c.BAD 2005-09-03 17:43:05.000000000 -0500 +++ xsupplicant-1.2.1/src/cardif/linux/cardif_linux_rtnetlink.c 2005-09-03 17:49:49.000000000 -0500 @@ -269,13 +269,13 @@ memcpy(&custom, &tptr[12], (iwe->len - 12)); debug_printf(DEBUG_INT, "(Custom) Value : %s\n", custom); - if (strncmp("wpa_ie=", custom, 7) == 0) + if (strncmp("wpa_ie=", (char *) custom, 7) == 0) { SET_FLAG(flags, WPA_IE); debug_printf(DEBUG_INT, "AP appears to support WPA!\n"); - temp = (char *)malloc((iwe->len - 12)/2); - process_hex(&custom[7], (iwe->len - 12-7), temp); - wpa_parse_ie(temp); + temp = (u_char *)malloc((iwe->len - 12)/2); + process_hex((char *) &custom[7], (iwe->len - 12-7), (char *) temp); + wpa_parse_ie((char *) temp); temp_wpa = temp; temp_wpa_len = ((iwe->len - 12)/2); @@ -285,13 +285,13 @@ temp = NULL; } - if (strncmp("rsn_ie=", custom, 7) == 0) + if (strncmp("rsn_ie=", (char *) custom, 7) == 0) { SET_FLAG(flags, RSN_IE); debug_printf(DEBUG_INT, "AP appears to support WPA2/802.11i!\n"); - temp = (char *)malloc((iwe->len - 12)/2); - process_hex(&custom[7], (iwe->len - 12-7), temp); - wpa2_parse_ie(temp); + temp = (u_char *)malloc((iwe->len - 12)/2); + process_hex((char *) &custom[7], (iwe->len - 12-7), (char *) temp); + wpa2_parse_ie((char *) temp); temp_rsn = temp; temp_rsn_len = ((iwe->len - 12)/2); @@ -381,10 +381,10 @@ "but the WPA_IE or RSN_IE flag(s) aren't set!?!\n"); } - if (strcmp(essid, intdata->cur_essid) == 0) + if (strcmp((char *) essid, intdata->cur_essid) == 0) { debug_printf(DEBUG_INT, "Adding this SSID data!\n"); - config_ssids_add(essid, flags, wpa_ie, wpa_ie_len, rsn_ie, + config_ssids_add((char *) essid, flags, wpa_ie, wpa_ie_len, rsn_ie, rsn_ie_len, freq, stale_mac); } @@ -440,10 +440,10 @@ } } - if (strcmp(essid, intdata->cur_essid) == 0) + if (strcmp((char *) essid, intdata->cur_essid) == 0) { debug_printf(DEBUG_INT, "Adding this SSID data!\n"); - config_ssids_add(essid, flags, wpa_ie, wpa_ie_len, rsn_ie, + config_ssids_add((char *) essid, flags, wpa_ie, wpa_ie_len, rsn_ie, rsn_ie_len, freq, mac); } @@ -490,8 +490,8 @@ // Then harvest the data. debug_printf(DEBUG_INT, "Reaping data. (Size : %d)\n", iwr.u.data.length); - cardif_linux_rtnetlink_reap(idata, (char *)buffer, - ((char *)buffer + iwr.u.data.length)); + cardif_linux_rtnetlink_reap(idata, (u_char *)buffer, + ((u_char *)buffer + iwr.u.data.length)); UNSET_FLAG(idata->flags, SCANNING); @@ -519,7 +519,7 @@ } remain = recvfrom(rtnl_sock, buf, sizeof(buf), MSG_DONTWAIT, - (struct sockaddr *)&rtnl_data, &rtnl_data_size); + (struct sockaddr *)&rtnl_data, (u_int *) &rtnl_data_size); if (remain >= 0) { // We need a pointer to the buffer to work with. @@ -927,7 +927,7 @@ case SIOCGIWAP: memcpy(mac, iwe->u.ap_addr.sa_data, 6); debug_printf(DEBUG_INT, "AP MAC : "); - debug_hex_printf(DEBUG_INT, mac, 6); + debug_hex_printf(DEBUG_INT, (u_char *) mac, 6); if (cardif_linux_rtnetlink_validate(idata, (u_char *)&mac) == 1) { // We have changed to associated mode. Populate the destination @@ -987,7 +987,7 @@ memcpy(buf, custom, iwe->u.data.length); buf[iwe->u.data.length] = '\0'; debug_printf(DEBUG_NORMAL, "Custom Data : \n"); - debug_hex_dump(DEBUG_NORMAL, buf, iwe->u.data.length); + debug_hex_dump(DEBUG_NORMAL, (u_char *) buf, iwe->u.data.length); cardif_linux_rtnetlink_check_custom(idata, buf); break; --- xsupplicant-1.2.1/src/cardif/linux/cardif_ndiswrapper_driver.c.BAD 2005-09-03 17:53:21.000000000 -0500 +++ xsupplicant-1.2.1/src/cardif/linux/cardif_ndiswrapper_driver.c 2005-09-03 17:54:27.000000000 -0500 @@ -202,11 +202,11 @@ wpa_key.addr = addr; wpa_key.key_index = key_idx; wpa_key.set_tx = set_tx; - wpa_key.seq = seq; + wpa_key.seq = (u_char *) seq; wpa_key.seq_len = seq_len; debug_printf(DEBUG_NORMAL, "SEQ : "); - debug_hex_printf(DEBUG_NORMAL, seq, seq_len); - wpa_key.key = key; + debug_hex_printf(DEBUG_NORMAL, (u_char *) seq, seq_len); + wpa_key.key = (u_char *) key; wpa_key.key_len = key_len; debug_printf(DEBUG_INT, "Setting key.. alg=%d idx=%d tx=%d seqlen=%d " @@ -304,11 +304,11 @@ bzero(&wpa_inf, sizeof(wpa_inf)); memcpy(buf, ssid, strlen(ssid)); - wpa_inf.bssid = (char *)config_ssid_get_mac(); - wpa_inf.ssid = (char *)&buf; + wpa_inf.bssid = (u_char *)config_ssid_get_mac(); + wpa_inf.ssid = (u_char *)&buf; wpa_inf.ssid_len = strlen(ssid); wpa_inf.freq = config_ssid_get_freq(); - wpa_inf.wpa_ie = (char *)&wpaie; + wpa_inf.wpa_ie = (u_char *)&wpaie; wpa_inf.wpa_ie_len = ielen; wpa_inf.pairwise_suite = network_data->wpa_pairwise_crypt; --- xsupplicant-1.2.1/src/cardif/linux/linux_core.c.BAD 2005-09-03 17:39:55.000000000 -0500 +++ xsupplicant-1.2.1/src/cardif/linux/linux_core.c 2005-09-03 17:42:28.000000000 -0500 @@ -116,11 +116,11 @@ { if (wepdata->key[keyidx] != NULL) { - klen = strlen(wepdata->key[keyidx]); + klen = strlen((char *) wepdata->key[keyidx]); if (((klen/2) == 5) || ((klen/2) == 13)) { // We have a valid length key. So, convert it, and set it. - process_hex(wepdata->key[keyidx], klen, key); + process_hex((char *) wepdata->key[keyidx], klen, key); // Calculate the proper key index. t = keyidx-1; @@ -130,9 +130,9 @@ debug_printf(DEBUG_INT, "Setting TX key! [%d]\n", wepdata->tx_key); t |= 0x80; - cardif_set_wep_key(intcur, key, (klen/2), t); + cardif_set_wep_key(intcur, (u_char *) key, (klen/2), t); } else { - cardif_set_wep_key(intcur, key, (klen/2), t); + cardif_set_wep_key(intcur, (u_char *) key, (klen/2), t); } } } --- xsupplicant-1.2.1/src/cardif/linux/cardif_linux.c.BAD 2005-09-03 17:37:20.000000000 -0500 +++ xsupplicant-1.2.1/src/cardif/linux/cardif_linux.c 2005-09-03 17:39:29.000000000 -0500 @@ -78,7 +78,7 @@ cardif_GetBSSID(intdata, curbssid); debug_printf(DEBUG_INT, "Current BSSID is "); - debug_hex_printf(DEBUG_INT, curbssid, 6); + debug_hex_printf(DEBUG_INT, (u_char *) curbssid, 6); memset(newmac, 0x00, 6); if (memcmp(newmac, curbssid, 6) == 0) @@ -463,7 +463,7 @@ { if (wireless == NULL) return -1; - return wireless->set_tkip_key(thisint, addr, keyidx, settx, seq, seqlen, + return wireless->set_tkip_key(thisint, (u_char *) addr, keyidx, settx, seq, seqlen, key, keylen); } @@ -478,7 +478,7 @@ { if (wireless == NULL) return -1; - return wireless->set_ccmp_key(thisint, addr, keyidx, settx, seq, seqlen, + return wireless->set_ccmp_key(thisint, (u_char *) addr, keyidx, settx, seq, seqlen, key, keylen); } @@ -746,7 +746,7 @@ { // Since we now know this frame is for us, record the address it // came from. - snmp_dot1xSuppLastEapolFrameSource((char *)&resultframe[6]); + snmp_dot1xSuppLastEapolFrameSource((u_char *)&resultframe[6]); resultsize = newsize; --- xsupplicant-1.2.1/src/psk.c.BAD 2005-09-03 09:24:53.000000000 -0500 +++ xsupplicant-1.2.1/src/psk.c 2005-09-03 09:25:15.000000000 -0500 @@ -50,7 +50,7 @@ // OpenSSL takes the parameters in a different order than what is // defined in F.8.2, so even though it looks wrong, this is correct. ;) HMAC(EVP_sha1(), password, strlen(password), digest, ssidlength+4, - digest1, &k); + digest1, (u_int *) &k); /* output = U1 */ memcpy(output, digest1, SHA_DIGEST_LENGTH); @@ -59,7 +59,7 @@ { /* Un = PRF(P, Un-1) */ HMAC(EVP_sha1(), password, strlen(password), digest1, SHA_DIGEST_LENGTH, - digest, &k); + digest, (u_int *) &k); memcpy(digest1, digest, k); /* output = output xor Un */ --- xsupplicant-1.2.1/src/mic.c.BAD 2005-09-03 09:24:01.000000000 -0500 +++ xsupplicant-1.2.1/src/mic.c 2005-09-03 09:24:43.000000000 -0500 @@ -44,14 +44,14 @@ { case 1: // Do an MD5 HMAC - HMAC(EVP_md5(), key, keylen, datain, insize, mic, &i); + HMAC(EVP_md5(), key, keylen, (u_char *) datain, insize, (u_char *) mic, (u_int *) &i); break; case 2: // Do an SHA1 HMAC // Since the HMAC will be 20 bytes, and we only need 16, we must use // a temporary variable. - HMAC(EVP_sha1(), key, keylen, datain, insize, (char *)&sha_hmac, &i); + HMAC(EVP_sha1(), key, keylen, (u_char *) datain, insize, (u_char *)&sha_hmac, (u_int *) &i); memcpy(mic, &sha_hmac, 16); break; } --- xsupplicant-1.2.1/src/config.h.BAD 2005-09-03 08:39:44.000000000 -0500 +++ xsupplicant-1.2.1/src/config.h 2005-09-03 08:39:53.000000000 -0500 @@ -341,6 +341,7 @@ char config_get_association(); char *config_get_logfile(); int config_get_ipc_gid(); +int config_get_stale_key_timeout(); char config_get_destination(); char *config_get_log_facility(); void config_set_forced_profile(char *); --- xsupplicant-1.2.1/src/eap.c.BAD 2005-09-03 08:34:21.000000000 -0500 +++ xsupplicant-1.2.1/src/eap.c 2005-09-03 08:38:27.000000000 -0500 @@ -191,9 +191,9 @@ switch (eap_request_auth(network_data->activemethod, network_data->methods, - &thisint->recvframe[OFFSET_TO_EAP], + (char *) &thisint->recvframe[OFFSET_TO_EAP], thisint->recv_size, - &thisint->sendframe[OFFSET_TO_EAP], &eapsize)) + (char *) &thisint->sendframe[OFFSET_TO_EAP], &eapsize)) { case XINNERSUCCESS: // We got a LEAP success, so we need to tell the state machine to @@ -231,7 +231,7 @@ if ((eapolver < 1) || (eapolver > MAX_EAPOL_VER)) eapolver = snmp_get_dot1xSuppLastEapolFrameVersion(); - eapol_build_header(EAP_PACKET, eapsize, eapolver, thisint->sendframe); + eapol_build_header(EAP_PACKET, eapsize, eapolver, (char *) thisint->sendframe); thisint->send_size = eapsize+OFFSET_TO_EAP; return XENONE; } @@ -284,7 +284,7 @@ eap_request_id(network_data->identity, eapdata->eap_identifier, - &thisint->sendframe[OFFSET_TO_EAP], &eapsize); + (char *) &thisint->sendframe[OFFSET_TO_EAP], &eapsize); eapolver = network_data->force_eapol_ver; @@ -295,7 +295,7 @@ if ((eapolver < 1) || (eapolver > MAX_EAPOL_VER)) eapolver = snmp_get_dot1xSuppLastEapolFrameVersion(); - eapol_build_header(EAP_PACKET, eapsize, eapolver, thisint->sendframe); + eapol_build_header(EAP_PACKET, eapsize, eapolver, (char *) thisint->sendframe); thisint->send_size = eapsize+OFFSET_TO_EAP; return XENONE; @@ -379,7 +379,7 @@ // We need to determine how long the string that we were returned is. // So, take the EAP length value, and subtract 5 to account for the EAP // header. - strncpy(&myval[0], &inframe[OFFSET_TO_DATA], (ntohs(myeap->eap_length)-5)); + strncpy(&myval[0], (char *) &inframe[OFFSET_TO_DATA], (ntohs(myeap->eap_length)-5)); debug_printf(DEBUG_NORMAL, "EAP Notification : %s\n", &myval[0]); bzero(thisint->recvframe, thisint->recv_size); @@ -814,8 +814,8 @@ if ((pwd_needed != 1) || (activemethod->tempPwd != NULL)) { switch ((*eaphandlers[eapmethod].eap_auth_handlers)(activemethod, - tosendframe, eapinsize, - &outframe[sizeof(struct eap_header)], + (u_char *) tosendframe, eapinsize, + (u_char *) &outframe[sizeof(struct eap_header)], eapsize)) { case XINNERSUCCESS: @@ -962,9 +962,9 @@ (*eaphandlers[eapmethod].eap_auth_get_keys)(thisint); - thisint->statemachine->PMK = thisint->keyingMaterial; + thisint->statemachine->PMK = (char *) thisint->keyingMaterial; debug_printf(DEBUG_INT, "PMK Keys (%d) :\n", thisint->keyingLength); - debug_hex_dump(DEBUG_INT, thisint->statemachine->PMK, thisint->keyingLength); + debug_hex_dump(DEBUG_INT, (u_char *) thisint->statemachine->PMK, thisint->keyingLength); debug_printf(DEBUG_INT, "WEP Keys (%d) :\n", thisint->keyingLength); debug_hex_dump(DEBUG_INT, thisint->keyingMaterial, thisint->keyingLength); --- xsupplicant-1.2.1/src/eapol_key_type2.c.BAD 2005-09-03 09:34:10.000000000 -0500 +++ xsupplicant-1.2.1/src/eapol_key_type2.c 2005-09-03 16:32:47.000000000 -0500 @@ -172,7 +172,7 @@ case 2: // XXX BROKEN! FIX! bzero(key, 16); - aes_unwrap(&intdata->statemachine->PTK[16], (keylen-8)/8, keypayload, + aes_unwrap((u_char *) &intdata->statemachine->PTK[16], (keylen-8)/8, keypayload, key); break; @@ -238,12 +238,12 @@ } debug_printf(DEBUG_INT, "PMK : "); - debug_hex_printf(DEBUG_INT, intdata->statemachine->PMK, 32); - wpa_PRF(intdata->statemachine->PMK, 32, "Pairwise key expansion", 22, - (char *)&prfdata, 76, retval, 64); + debug_hex_printf(DEBUG_INT, (u_char *) intdata->statemachine->PMK, 32); + wpa_PRF((u_char *) intdata->statemachine->PMK, 32, (u_char *) "Pairwise key expansion", 22, + (u_char *)&prfdata, 76, (u_char *) retval, 64); debug_printf(DEBUG_INT, "PTK : "); - debug_hex_printf(DEBUG_INT, retval, 64); + debug_hex_printf(DEBUG_INT, (u_char *) retval, 64); return retval; } @@ -310,10 +310,10 @@ eapolver = snmp_get_dot1xSuppLastEapolFrameVersion(); eapol_build_header(EAPOL_KEY, (intdata->send_size-OFFSET_TO_EAPOL-4), - eapolver, intdata->sendframe); + eapolver, (char *) intdata->sendframe); memcpy(key, intdata->statemachine->PTK, 16); - mic_wpa_populate(intdata->sendframe, intdata->send_size+4, key, 16); + mic_wpa_populate((char *) intdata->sendframe, intdata->send_size+4, key, 16); cardif_sendframe(intdata); intdata->statemachine->eapolEap = FALSE; @@ -394,7 +394,7 @@ bzero(rc4_ek, 32); memcpy(rc4_ek, inkeydata->key_iv, 16); memcpy(&rc4_ek[16], &intdata->statemachine->PTK[16], 16); - rc4_skip(rc4_ek, 32, 256, keydata, value16); + rc4_skip((u_char *) rc4_ek, 32, 256, keydata, value16); debug_printf(DEBUG_INT, "Decrypted data : (%d)\n", value16); debug_hex_dump(DEBUG_INT, keydata, value16); @@ -410,17 +410,17 @@ wpa_common_swap_rx_tx_mic(keydata); debug_printf(DEBUG_INT, "Setting GTK with index of %d\n", keyindex); - cardif_set_tkip_key(intdata, allfs, keyindex, FALSE, inkeydata->key_rsc, - 6, keydata, value16); + cardif_set_tkip_key(intdata, (char *) allfs, keyindex, FALSE, (char *) inkeydata->key_rsc, + 6, (char *) keydata, value16); break; case 2: // First, decrypt the GTK bzero(key, 16); - aes_unwrap(&intdata->statemachine->PTK[16], (value16-8)/8, keydata, - key); + aes_unwrap((u_char *) &intdata->statemachine->PTK[16], (value16-8)/8, keydata, + (u_char *) key); - cardif_set_ccmp_key(intdata, NULL, keyindex, FALSE, inkeydata->key_rsc, + cardif_set_ccmp_key(intdata, NULL, keyindex, FALSE, (char *) inkeydata->key_rsc, 6, key, (value16-8)); break; } @@ -446,13 +446,13 @@ eapolver = snmp_get_dot1xSuppLastEapolFrameVersion(); eapol_build_header(EAPOL_KEY, (intdata->send_size-OFFSET_TO_EAPOL-4), - eapolver, intdata->sendframe); + eapolver, (char *) intdata->sendframe); memcpy(key, intdata->statemachine->PTK, 16); - mic_wpa_populate(intdata->sendframe, intdata->send_size+4, key, 16); + mic_wpa_populate((char *) intdata->sendframe, intdata->send_size+4, key, 16); // Dump what we built. - eapol_key_type2_dump(intdata, intdata->sendframe); + eapol_key_type2_dump(intdata, (char *) intdata->sendframe); if (network_data->methods->method_num == WPA_PSK) { @@ -560,13 +560,13 @@ eapolver = snmp_get_dot1xSuppLastEapolFrameVersion(); eapol_build_header(EAPOL_KEY, (intdata->send_size-OFFSET_TO_EAPOL-4), - eapolver, intdata->sendframe); + eapolver, (char *) intdata->sendframe); memcpy(key, intdata->statemachine->PTK, 16); - mic_wpa_populate(intdata->sendframe, intdata->send_size+4, key, 16); + mic_wpa_populate((char *) intdata->sendframe, intdata->send_size+4, key, 16); // Dump what we built. - eapol_key_type2_dump(intdata, intdata->sendframe); + eapol_key_type2_dump(intdata, (char *) intdata->sendframe); } /******************************************************** @@ -596,7 +596,7 @@ memcpy(iedata, indata, len); debug_printf(DEBUG_INT, "Got an IE of : \n"); - debug_hex_dump(DEBUG_INT, iedata, len); + debug_hex_dump(DEBUG_INT, (u_char *) iedata, len); // XXX Todo : Verify the IE against the IE we have from the AP. @@ -869,20 +869,20 @@ eapolver = snmp_get_dot1xSuppLastEapolFrameVersion(); eapol_build_header(EAPOL_KEY, (intdata->send_size-OFFSET_TO_EAPOL-4), - eapolver, intdata->sendframe); + eapolver, (char *) intdata->sendframe); memcpy(key, intdata->statemachine->PTK, 16); - mic_wpa_populate(intdata->sendframe, intdata->send_size+4, key, 16); + mic_wpa_populate((char *) intdata->sendframe, intdata->send_size+4, key, 16); // Dump what we built. - eapol_key_type2_dump(intdata, intdata->sendframe); + eapol_key_type2_dump(intdata, (char *) intdata->sendframe); // Get TK1 value16 = ntohs(inkeydata->key_length); memcpy(key, (char *)&intdata->statemachine->PTK[32], value16); debug_printf(DEBUG_INT, "TK1 : "); - debug_hex_printf(DEBUG_INT, key, value16); + debug_hex_printf(DEBUG_INT, (u_char *) key, value16); cardif_sendframe(intdata); intdata->statemachine->eapolEap = FALSE; @@ -902,12 +902,12 @@ bzero(rc4_ek, 32); memcpy(rc4_ek, inkeydata->key_iv, 16); memcpy(&rc4_ek[16], &intdata->statemachine->PTK[16], 16); - rc4_skip(rc4_ek, 32, 256, keydata, keylen); + rc4_skip((u_char *) rc4_ek, 32, 256, keydata, keylen); break; case 2: aesval = (uint8_t *)malloc(keylen); - if (aes_unwrap(&intdata->statemachine->PTK[16], (keylen-8)/8, keydata, + if (aes_unwrap((u_char *) &intdata->statemachine->PTK[16], (keylen-8)/8, keydata, aesval)) { debug_printf(DEBUG_NORMAL, "Failed AES unwrap!\n"); @@ -943,13 +943,13 @@ { case 1: wpa_common_swap_rx_tx_mic(gtk); - cardif_set_tkip_key(intdata, allfs, keyindex, txkey, - inkeydata->key_rsc, RSC_LEN, gtk, value16); + cardif_set_tkip_key(intdata, (char*) allfs, keyindex, txkey, + (char *) inkeydata->key_rsc, RSC_LEN, (char *) gtk, value16); break; case 2: - cardif_set_ccmp_key(intdata, allfs, keyindex, txkey, - inkeydata->key_rsc, RSC_LEN, gtk, value16); + cardif_set_ccmp_key(intdata, (char *) allfs, keyindex, txkey, + (char *) inkeydata->key_rsc, RSC_LEN, (char *) gtk, value16); break; } @@ -973,15 +973,15 @@ case 1: // We need to swap the TX/RX MIC values since we are the supplicant. // (Thanks to Jouni Malinen for pointing this out!) - wpa_common_swap_rx_tx_mic(key); + wpa_common_swap_rx_tx_mic((u_char *) key); cardif_set_tkip_key(intdata, intdata->dest_mac, 0, TRUE, - inkeydata->key_rsc, RSC_LEN, key, value16); + (char *) inkeydata->key_rsc, RSC_LEN, key, value16); break; case 2: cardif_set_ccmp_key(intdata, intdata->dest_mac, 0, TRUE, - inkeydata->key_rsc, RSC_LEN, key, value16); + (char *) inkeydata->key_rsc, RSC_LEN, key, value16); break; } } @@ -1008,7 +1008,7 @@ if (keyflags & WPA2_KEY_MIC_FLAG) { - if (mic_wpa_validate(intdata->recvframe, intdata->recv_size, + if (mic_wpa_validate((char *) intdata->recvframe, intdata->recv_size, intdata->statemachine->PTK, 16) == FALSE) { intdata->statemachine->MICVerified = TRUE; @@ -1058,7 +1058,7 @@ eapolver = snmp_get_dot1xSuppLastEapolFrameVersion(); eapol_build_header(EAPOL_KEY, (intdata->recv_size-OFFSET_TO_EAPOL-4), - eapolver, intdata->recvframe); + eapolver, (char *) intdata->recvframe); cardif_sendframe(intdata); intdata->statemachine->eapolEap = FALSE; } @@ -1127,8 +1127,8 @@ } // We have an ASCII password, so calculate it. - if (psk_wpa_pbkdf2(psk->key, intdata->cur_essid, - strlen(intdata->cur_essid), (char *)&tpmk) + if (psk_wpa_pbkdf2(psk->key, (u_char *) intdata->cur_essid, + strlen(intdata->cur_essid), (u_char *)&tpmk) == TRUE) { intdata->statemachine->PMK = (char *)malloc(32); @@ -1168,7 +1168,7 @@ } } - eapol_key_type2_dump(intdata, inframe); + eapol_key_type2_dump(intdata, (char *) inframe); eapol_key_type2_determine_key(intdata); --- xsupplicant-1.2.1/src/eap_types/otp/eapotp.c.BAD 2005-09-03 17:26:09.000000000 -0500 +++ xsupplicant-1.2.1/src/eap_types/otp/eapotp.c 2005-09-03 17:26:47.000000000 -0500 @@ -123,7 +123,7 @@ /* debug_printf(DEBUG_NORMAL, "Response : "); gets(&resp); */ - strcpy(outframe, resp); + strcpy((char *) outframe, resp); *outsize = strlen(resp); return *outsize; --- xsupplicant-1.2.1/src/eap_types/tls/tls_funcs.c.BAD 2005-09-03 16:38:06.000000000 -0500 +++ xsupplicant-1.2.1/src/eap_types/tls/tls_funcs.c 2005-09-03 16:42:46.000000000 -0500 @@ -445,7 +445,7 @@ } debug_printf(DEBUG_AUTHTYPES, "Packet in (%d) :\n", insize); - debug_hex_dump(DEBUG_AUTHTYPES, inframe, insize); + debug_hex_dump(DEBUG_AUTHTYPES, (u_char *) inframe, insize); // First, make sure we don't have any errors. err = ERR_get_error(); @@ -563,7 +563,7 @@ if ((mytls_vars->resuming != 1) || (mytls_vars->quickResponse != TRUE)) { - if (((*dophase2)(thisint, tlsptr, (insize-tlsindex), outframe, + if (((*dophase2)(thisint, (u_char *) tlsptr, (insize-tlsindex), outframe, outsize)) != XENONE) { debug_printf(DEBUG_NORMAL, "Phase 2 failure!\n"); @@ -578,7 +578,7 @@ } } } else { - rtnVal = tls_funcs_parse(thisint, tlsptr, (insize-tlsindex), outframe, outsize, chunksize); + rtnVal = tls_funcs_parse(thisint, (u_char *) tlsptr, (insize-tlsindex), outframe, outsize, chunksize); if (rtnVal < 0) { debug_printf(DEBUG_NORMAL, "Couldn't parse TLS data.\n"); @@ -642,7 +642,7 @@ if ((mytls_vars->resuming != 1) || (mytls_vars->quickResponse != TRUE)) { - if ((*dophase2)(thisint, tlsptr, (insize-tlsindex), + if ((*dophase2)(thisint, (u_char *) tlsptr, (insize-tlsindex), outframe, outsize) != XENONE) { debug_printf(DEBUG_NORMAL, "Phase 2 Failure.\n"); @@ -1083,32 +1083,32 @@ /* P_MD5 */ hash = EVP_md5(); /* Initialize A_MD5 */ - HMAC(hash, S1, L_S1, P_seed, P_seed_len, A_MD5, &hashed_len); + HMAC(hash, S1, L_S1, P_seed, P_seed_len, A_MD5, (u_int *) &hashed_len); for (i = 0; i < MD5_iterations; i++) { HMAC_Init(&ctx, S1, L_S1, hash); HMAC_Update(&ctx, A_MD5, MD5_DIGEST_LENGTH); HMAC_Update(&ctx, P_seed, P_seed_len); - HMAC_Final(&ctx, P_MD5_buf + i*(MD5_DIGEST_LENGTH), &hashed_len); + HMAC_Final(&ctx, P_MD5_buf + i*(MD5_DIGEST_LENGTH), (u_int *) &hashed_len); HMAC_cleanup(&ctx); HMAC(hash, S1, L_S1, A_MD5, MD5_DIGEST_LENGTH, - A_MD5, &hashed_len); + A_MD5, (u_int *) &hashed_len); } /* do P_SHA1 */ hash = EVP_sha1(); /* Initialize A_SHA1 */ - HMAC(hash, S2, L_S2, P_seed, P_seed_len, A_SHA1, &hashed_len); + HMAC(hash, S2, L_S2, P_seed, P_seed_len, A_SHA1, (u_int *) &hashed_len); for (i = 0; i < SHA1_iterations; i++) { HMAC_Init(&ctx, S2, L_S2, hash); HMAC_Update(&ctx, A_SHA1, SHA_DIGEST_LENGTH); HMAC_Update(&ctx, P_seed, P_seed_len); - HMAC_Final(&ctx, P_SHA1_buf + i*(SHA_DIGEST_LENGTH), &hashed_len); + HMAC_Final(&ctx, P_SHA1_buf + i*(SHA_DIGEST_LENGTH), (u_int *) &hashed_len); HMAC_cleanup(&ctx); HMAC(hash, S2, L_S2, A_SHA1, SHA_DIGEST_LENGTH, - A_SHA1, &hashed_len); + A_SHA1, (u_int *) &hashed_len); } /* XOR Them for the answer */ for (i = 0; i < outlen; i++) { --- xsupplicant-1.2.1/src/eap_types/tls/tls_crypt.c.BAD 2005-09-03 16:58:16.000000000 -0500 +++ xsupplicant-1.2.1/src/eap_types/tls/tls_crypt.c 2005-09-03 16:58:35.000000000 -0500 @@ -72,7 +72,7 @@ memcpy(p, mytls_vars->ssl->s3->server_random, SSL3_RANDOM_SIZE); tls_funcs_PRF(SSL_get_session(mytls_vars->ssl)->master_key, SSL_get_session(mytls_vars->ssl)->master_key_length, - sesskey, sesskeylen, seed, + (u_char *) sesskey, sesskeylen, seed, SSL3_RANDOM_SIZE * 2, retblock, TLS_SESSION_KEY_SIZE); --- xsupplicant-1.2.1/src/eap_types/tls/eaptls.c.BAD 2005-09-03 16:33:36.000000000 -0500 +++ xsupplicant-1.2.1/src/eap_types/tls/eaptls.c 2005-09-03 16:36:48.000000000 -0500 @@ -192,7 +192,7 @@ // Make sure we have something to process... if (dataoffs == NULL) return XENONE; - retVal=tls_funcs_decode_packet(thisint, dataoffs, insize, outframe, outsize, + retVal=tls_funcs_decode_packet(thisint, (char *) dataoffs, insize, (char *) outframe, outsize, NULL, userdata->chunk_size); return retVal; @@ -222,7 +222,7 @@ free(thisint->keyingMaterial); } - thisint->keyingMaterial = tls_funcs_gen_keyblock(network_data->activemethod); + thisint->keyingMaterial = (u_char *) tls_funcs_gen_keyblock(network_data->activemethod); thisint->keyingLength = 32; if (thisint->keyingMaterial == NULL) return -1; --- xsupplicant-1.2.1/src/eap_types/peap/eappeap.c.BAD 2005-09-03 17:16:00.000000000 -0500 +++ xsupplicant-1.2.1/src/eap_types/peap/eappeap.c 2005-09-03 17:16:47.000000000 -0500 @@ -239,7 +239,7 @@ set_peap_version(p2d, peap_version); // Tell PEAP what version we want to use. dataoffs[0] = ((uint8_t)dataoffs[0] & 0xfc); // Mask out the version bits. - if (tls_funcs_decode_packet(thisint, dataoffs, insize, outframe, outsize, + if (tls_funcs_decode_packet(thisint, (char *) dataoffs, insize, (char *) outframe, outsize, (phase2_call)peap_do_phase2, userdata->chunk_size) != XENONE) { @@ -335,7 +335,7 @@ { free(thisint->keyingMaterial); } - thisint->keyingMaterial = tls_funcs_gen_keyblock(network_data->activemethod); + thisint->keyingMaterial = (u_char *) tls_funcs_gen_keyblock(network_data->activemethod); thisint->keyingLength = 32; if (thisint->keyingMaterial == NULL) return -1; --- xsupplicant-1.2.1/src/eap_types/peap/peap_phase2.c.BAD 2005-09-03 17:17:38.000000000 -0500 +++ xsupplicant-1.2.1/src/eap_types/peap/peap_phase2.c 2005-09-03 17:21:23.000000000 -0500 @@ -160,7 +160,7 @@ switch ((uint8_t)eapvalue) { case EAP_REQUEST: - eap_request_id(thisint->eapdata->identity, eapid, out, out_size); + eap_request_id(thisint->eapdata->identity, eapid, (char *) out, out_size); break; case EAP_SUCCESS: @@ -192,7 +192,7 @@ return; } eap_request_auth(thisint->activemethod, thisint->eapdata->eap_conf_data, - in, in_size, out, out_size); + (char *) in, in_size, (char *) out, out_size); break; } free(new_frame); @@ -249,7 +249,7 @@ if (eframe != 1) { - peap_pad_frame(in, in_size, padded_frame, &padded_size); + peap_pad_frame(in, in_size, (u_char *) padded_frame, &padded_size); } new_frame = (char *)malloc(1024); @@ -259,12 +259,12 @@ return; } - do_peap_version1(thisint, padded_frame, padded_size, new_frame, + do_peap_version1(thisint, (u_char *) padded_frame, padded_size, (u_char *) new_frame, &new_frame_size); free(padded_frame); if (eframe !=1) { - peap_unpad_frame(new_frame, new_frame_size, out, out_size); + peap_unpad_frame((u_char *) new_frame, new_frame_size, out, out_size); } else { memcpy(out, new_frame, new_frame_size); *out_size = new_frame_size; @@ -330,14 +330,14 @@ p2d->eapdata->identity = peapconf->identity; p2d->eapdata->ias_quirk = peapconf->ias_quirk; - decr_data = (char *)malloc(1550); + decr_data = (u_char *)malloc(1550); if (decr_data == NULL) { debug_printf(DEBUG_NORMAL, "Couldn't allocate memory for decryption buffer!\n"); return XEMALLOC; } - encr_data = (char *)malloc(1550); + encr_data = (u_char *)malloc(1550); if (encr_data == NULL) { debug_printf(DEBUG_NORMAL, "Couldn't allocate memory for encryption buffer!\n"); --- xsupplicant-1.2.1/src/eap_types/mschapv2/eapmschapv2.c.BAD 2005-09-03 17:09:07.000000000 -0500 +++ xsupplicant-1.2.1/src/eap_types/mschapv2/eapmschapv2.c 2005-09-03 17:15:29.000000000 -0500 @@ -153,13 +153,13 @@ myvars->AuthenticatorChallenge = NULL; } - myvars->AuthenticatorChallenge = (u_char *)malloc(16); + myvars->AuthenticatorChallenge = (char *)malloc(16); if (myvars->AuthenticatorChallenge == NULL) return XEMALLOC; memcpy(myvars->AuthenticatorChallenge, &challenge->Challenge, 16); debug_printf(DEBUG_AUTHTYPES, "Authenticator Challenge : "); - debug_hex_printf(DEBUG_AUTHTYPES, myvars->AuthenticatorChallenge, 16); + debug_hex_printf(DEBUG_AUTHTYPES, (u_char *) myvars->AuthenticatorChallenge, 16); if (myvars->PeerChallenge != NULL) { @@ -168,13 +168,13 @@ } // Ignore the RADIUS host, we probably don't care. - myvars->PeerChallenge = (u_char *)malloc(16); + myvars->PeerChallenge = (char *)malloc(16); if (myvars->PeerChallenge == NULL) return XEMALLOC; - RAND_bytes(myvars->PeerChallenge, 16); + RAND_bytes((u_char *) myvars->PeerChallenge, 16); debug_printf(DEBUG_AUTHTYPES, "Generated PeerChallenge : "); - debug_hex_printf(DEBUG_AUTHTYPES, myvars->PeerChallenge,16); + debug_hex_printf(DEBUG_AUTHTYPES, (u_char *) myvars->PeerChallenge,16); if (myvars->NtResponse != NULL) { @@ -182,14 +182,14 @@ myvars->NtResponse = NULL; } - myvars->NtResponse = (u_char *)malloc(24); + myvars->NtResponse = (char *)malloc(24); if (myvars->NtResponse == NULL) return XEMALLOC; GenerateNTResponse(myvars->AuthenticatorChallenge, myvars->PeerChallenge, username, userdata->password, myvars->NtResponse); debug_printf(DEBUG_AUTHTYPES, "myvars->NtResponse = "); - debug_hex_printf(DEBUG_AUTHTYPES, myvars->NtResponse, 24); + debug_hex_printf(DEBUG_AUTHTYPES, (u_char *) myvars->NtResponse, 24); response->OpCode = MS_CHAPV2_RESPONSE; response->MS_CHAPv2_ID = challenge->MS_CHAPv2_ID; @@ -219,7 +219,7 @@ CheckAuthenticatorResponse(userdata->password, myvars->NtResponse, myvars->PeerChallenge, myvars->AuthenticatorChallenge, - username, (u_char *)&recv[0], &respOk); + username, (char *)&recv[0], &respOk); if (respOk == 1) { @@ -227,15 +227,15 @@ outframe[0] = MS_CHAPV2_SUCCESS; // We were successful, so generate keying material. - NtPasswordHash(userdata->password, (u_char *)&NtHash); - HashNtPasswordHash((u_char *)&NtHash, (u_char *)&NtHashHash); - GetMasterKey((u_char *)&NtHashHash, myvars->NtResponse, (u_char *)&MasterKey); + NtPasswordHash(userdata->password, (char *)&NtHash); + HashNtPasswordHash((char *)&NtHash, (char *)&NtHashHash); + GetMasterKey((char *)&NtHashHash, myvars->NtResponse, (char *)&MasterKey); // Now, get the send key. - GetAsymetricStartKey((u_char *)&MasterKey, (u_char *)&mppeSend, 16, TRUE, FALSE); + GetAsymetricStartKey((char *)&MasterKey, (char *)&mppeSend, 16, TRUE, FALSE); // And the recv key. - GetAsymetricStartKey((u_char *)&MasterKey, (u_char *)&mppeRecv, 16, FALSE, FALSE); + GetAsymetricStartKey((char *)&MasterKey, (char *)&mppeRecv, 16, FALSE, FALSE); // Finally, populate our myvars->keyingMaterial. if (myvars->keyingMaterial != NULL) @@ -243,7 +243,7 @@ free(myvars->keyingMaterial); myvars->keyingMaterial = NULL; } - myvars->keyingMaterial = (u_char *)malloc(64); // 32 bytes each. + myvars->keyingMaterial = (char *)malloc(64); // 32 bytes each. if (myvars->keyingMaterial == NULL) return XEMALLOC; bzero(myvars->keyingMaterial, 64); @@ -294,7 +294,7 @@ free(thisint->keyingMaterial); } - thisint->keyingMaterial = (char *)malloc(64); + thisint->keyingMaterial = (u_char *)malloc(64); if (thisint->keyingMaterial == NULL) return -1; memcpy(thisint->keyingMaterial, myconf->keyingMaterial, 64); --- xsupplicant-1.2.1/src/eap_types/mschapv2/mschapv2.c.BAD 2005-09-03 17:01:58.000000000 -0500 +++ xsupplicant-1.2.1/src/eap_types/mschapv2/mschapv2.c 2005-09-03 17:04:49.000000000 -0500 @@ -46,7 +46,7 @@ EVP_DigestUpdate(&cntx, PeerChallenge, 16); EVP_DigestUpdate(&cntx, AuthenticatorChallenge, 16); EVP_DigestUpdate(&cntx, UserName, strlen(UserName)); - EVP_DigestFinal(&cntx, (char *)&Digest, &retLen); + EVP_DigestFinal(&cntx, (u_char *)&Digest, (u_int *) &retLen); memcpy(Challenge, Digest, 8); } @@ -96,7 +96,7 @@ EVP_DigestInit(&cntx, EVP_md4()); EVP_DigestUpdate(&cntx, uniPassword, len); - EVP_DigestFinal(&cntx, (char *)&retVal, (int *)&i); + EVP_DigestFinal(&cntx, (u_char *)&retVal, (u_int *)&i); memcpy(PasswordHash, &retVal, 16); free(uniPassword); } @@ -114,7 +114,7 @@ EVP_DigestInit(&cntx, EVP_md4()); EVP_DigestUpdate(&cntx, PasswordHash, 16); - EVP_DigestFinal(&cntx, PasswordHashHash, &i); + EVP_DigestFinal(&cntx, (u_char *) PasswordHashHash, (u_int *) &i); } // Shamelessly take from the hostap code written by Jouni Malinen @@ -231,7 +231,7 @@ EVP_DigestUpdate(&context, &PasswordHashHash, 16); EVP_DigestUpdate(&context, NTResponse, 24); EVP_DigestUpdate(&context, Magic1, 39); - EVP_DigestFinal(&context, (char *)&Digest, &Digest_len); + EVP_DigestFinal(&context, (u_char *)&Digest, (u_int *) &Digest_len); ChallengeHash(PeerChallenge, AuthenticatorChallenge, UserName, Challenge); @@ -239,7 +239,7 @@ EVP_DigestUpdate(&context, &Digest, 20); EVP_DigestUpdate(&context, &Challenge, 8); EVP_DigestUpdate(&context, Magic2, 41); - EVP_DigestFinal(&context, (char *)&Digest, &Digest_len); + EVP_DigestFinal(&context, (u_char *)&Digest, (u_int *) &Digest_len); memcpy(AuthenticatorResponse, &Digest, Digest_len); } @@ -287,12 +287,12 @@ return; } - des_encrypt(Challenge, PasswordHash, Response); - des_encrypt(Challenge, PasswordHash + 7, Response+8); + des_encrypt((uint8_t *) Challenge, (uint8_t *) PasswordHash, (uint8_t *) Response); + des_encrypt((uint8_t *) Challenge, (uint8_t *) PasswordHash + 7, (uint8_t *) Response+8); zpwd[0] = PasswordHash[14]; zpwd[1] = PasswordHash[15]; memset(zpwd + 2, 0, 5); - des_encrypt(Challenge, zpwd, Response+16); + des_encrypt((uint8_t *) Challenge, zpwd, (uint8_t *) Response+16); } void NtChallengeResponse(char *Challenge, char *Password, char *Response) @@ -323,18 +323,18 @@ ChallengeHash(PeerChallenge, AuthenticatorChallenge, UserName, (char *)&Challenge); debug_printf(DEBUG_AUTHTYPES, "PeerChallenge : "); - debug_hex_printf(DEBUG_AUTHTYPES, PeerChallenge, 8); + debug_hex_printf(DEBUG_AUTHTYPES, (u_char *) PeerChallenge, 8); debug_printf(DEBUG_AUTHTYPES, "AuthenticatorChallenge : "); - debug_hex_printf(DEBUG_AUTHTYPES, AuthenticatorChallenge, 8); + debug_hex_printf(DEBUG_AUTHTYPES, (u_char *) AuthenticatorChallenge, 8); debug_printf(DEBUG_AUTHTYPES, "Username : %s\n",UserName); debug_printf(DEBUG_AUTHTYPES, "Challenge : "); - debug_hex_printf(DEBUG_AUTHTYPES, Challenge, 8); + debug_hex_printf(DEBUG_AUTHTYPES, (u_char *) Challenge, 8); NtPasswordHash(Password, (char *)&PasswordHash); debug_printf(DEBUG_AUTHTYPES, "PasswordHash : "); - debug_hex_printf(DEBUG_AUTHTYPES, PasswordHash, 16); + debug_hex_printf(DEBUG_AUTHTYPES, (u_char *) PasswordHash, 16); ChallengeResponse(Challenge, (char *)&PasswordHash, Response); debug_printf(DEBUG_AUTHTYPES, "Response : "); - debug_hex_printf(DEBUG_AUTHTYPES, Response, 24); + debug_hex_printf(DEBUG_AUTHTYPES, (u_char *) Response, 24); } void GetMasterKey(char *PasswordHashHash, char *NTResponse, char *MasterKey) @@ -360,7 +360,7 @@ EVP_DigestUpdate(&cntx, PasswordHashHash, 16); EVP_DigestUpdate(&cntx, NTResponse, 24); EVP_DigestUpdate(&cntx, (char *)&Magic1, 27); - EVP_DigestFinal(&cntx, (char *)&Digest, &retLen); + EVP_DigestFinal(&cntx, (u_char *)&Digest, (u_int *) &retLen); memcpy(MasterKey, &Digest, 16); } @@ -386,7 +386,7 @@ EVP_DigestUpdate(&cntx, APR, 24); EVP_DigestUpdate(&cntx, PC, 8); EVP_DigestUpdate(&cntx, PR, 24); - EVP_DigestFinal(&cntx, (char *)&Digest, &retLen); + EVP_DigestFinal(&cntx, (u_char *)&Digest, (u_int *) &retLen); memcpy(MasterKey, &Digest, 16); @@ -461,7 +461,7 @@ EVP_DigestUpdate(&cntx, SHSpad1, 40); EVP_DigestUpdate(&cntx, (char *)&Magic, 84); EVP_DigestUpdate(&cntx, SHSpad2, 40); - EVP_DigestFinal(&cntx, (char *)&Digest, &retLen); + EVP_DigestFinal(&cntx, (u_char *)&Digest, (u_int *)&retLen); memcpy(SessionKey, &Digest, SessionKeyLength); } --- xsupplicant-1.2.1/src/eap_types/ttls/eapttls.c.BAD 2005-09-03 16:43:18.000000000 -0500 +++ xsupplicant-1.2.1/src/eap_types/ttls/eapttls.c 2005-09-03 16:44:20.000000000 -0500 @@ -215,7 +215,7 @@ // Make sure we have a valid packet to process. if (dataoffs == NULL) return XENONE; - result=tls_funcs_decode_packet(thisint, dataoffs, insize, outframe, outsize, + result=tls_funcs_decode_packet(thisint, (char *) dataoffs, insize, (char *) outframe, outsize, (phase2_call)ttls_do_phase2, userdata->chunk_size); if (result != 0) @@ -250,7 +250,7 @@ free(thisint->keyingMaterial); } - thisint->keyingMaterial = tls_funcs_gen_keyblock(network_data->activemethod); + thisint->keyingMaterial = (u_char *) tls_funcs_gen_keyblock(network_data->activemethod); thisint->keyingLength = 32; if (thisint->keyingMaterial == NULL) return -1; --- xsupplicant-1.2.1/src/eap_types/ttls/ttlsphase2.c.BAD 2005-09-03 16:45:26.000000000 -0500 +++ xsupplicant-1.2.1/src/eap_types/ttls/ttlsphase2.c 2005-09-03 16:57:41.000000000 -0500 @@ -184,7 +184,7 @@ username_size = strlen(username); // Send the Username AVP - build_avp(USER_NAME_AVP, 0, MANDITORY_FLAG, username, username_size, out_data, &avp_out_size); + build_avp(USER_NAME_AVP, 0, MANDITORY_FLAG, (uint8_t *) username, username_size, (uint8_t *) out_data, &avp_out_size); avp_offset = avp_out_size; @@ -200,7 +200,7 @@ id = challenge[16]; // Send the MS-CHAP AVP - build_avp(MS_CHAP_CHALLENGE, MS_VENDOR_ATTR, (MANDITORY_FLAG | VENDOR_FLAG), (char *)&mschap_challenge, 16, &out_data[avp_offset], &avp_out_size); + build_avp(MS_CHAP_CHALLENGE, MS_VENDOR_ATTR, (MANDITORY_FLAG | VENDOR_FLAG), (uint8_t *) &mschap_challenge, 16, (uint8_t *) &out_data[avp_offset], &avp_out_size); avp_offset+=avp_out_size; @@ -217,7 +217,7 @@ memcpy(&mschap_answer[2], &mschap_challenge, 16); memcpy(&mschap_answer[26], &mschap_result, 24); - build_avp(MS_CHAP2_RESPONSE, MS_VENDOR_ATTR, (MANDITORY_FLAG | VENDOR_FLAG), (char *)&mschap_answer, 50, &out_data[avp_offset], &avp_out_size); + build_avp(MS_CHAP2_RESPONSE, MS_VENDOR_ATTR, (MANDITORY_FLAG | VENDOR_FLAG), (uint8_t *) &mschap_answer, 50, (uint8_t *) &out_data[avp_offset], &avp_out_size); avp_offset+=avp_out_size; *out_size = avp_offset; } @@ -283,7 +283,7 @@ username_size = strlen(username); // Send the Username AVP - build_avp(USER_NAME_AVP, 0, MANDITORY_FLAG, username, username_size, out_data, &avp_out_size); + build_avp(USER_NAME_AVP, 0, MANDITORY_FLAG, (uint8_t *) username, username_size, (uint8_t *) out_data, &avp_out_size); avp_offset = avp_out_size; @@ -299,7 +299,7 @@ id = challenge[8]; // Send the MS-CHAP AVP - build_avp(MS_CHAP_CHALLENGE, MS_VENDOR_ATTR, (MANDITORY_FLAG | VENDOR_FLAG), (char *)&mschap_challenge, 8, &out_data[avp_offset], &avp_out_size); + build_avp(MS_CHAP_CHALLENGE, MS_VENDOR_ATTR, (MANDITORY_FLAG | VENDOR_FLAG), (uint8_t *) &mschap_challenge, 8, (uint8_t *) &out_data[avp_offset], &avp_out_size); avp_offset+=avp_out_size; @@ -313,7 +313,7 @@ mschap_answer[1] = 1; // Use NT Style Passwords. memcpy((char *)&mschap_answer[26], (char *)&mschap_result, 24); - build_avp(MS_CHAP_RESPONSE, MS_VENDOR_ATTR, (MANDITORY_FLAG | VENDOR_FLAG), (char *)&mschap_answer, 50, &out_data[avp_offset], &avp_out_size); + build_avp(MS_CHAP_RESPONSE, MS_VENDOR_ATTR, (MANDITORY_FLAG | VENDOR_FLAG), (uint8_t *) &mschap_answer, 50, (uint8_t *) &out_data[avp_offset], &avp_out_size); avp_offset+=avp_out_size; *out_size = avp_offset; @@ -386,12 +386,12 @@ username = phase2data->username; } username_size = strlen(username); - build_avp(USER_NAME_AVP, 0, MANDITORY_FLAG, username, username_size, out_data, &avp_out_size); + build_avp(USER_NAME_AVP, 0, MANDITORY_FLAG, (uint8_t *) username, username_size, (uint8_t *) out_data, &avp_out_size); avp_offset = avp_out_size; // Get the implicit challenge. - challenge = implicit_challenge(thisint); + challenge = (u_char *) implicit_challenge(thisint); if (challenge == NULL) { debug_printf(DEBUG_NORMAL, "Invalid implicit challenge in ttls_do_chap()!\n"); @@ -409,9 +409,9 @@ return; } - user_passwd = phase2data->password; + user_passwd = (u_char *) phase2data->password; - tohash = (char *)malloc(1+16+strlen(user_passwd)); + tohash = (u_char *)malloc(1+16+strlen((char *) user_passwd)); if (tohash == NULL) { debug_printf(DEBUG_NORMAL, "Error with malloc of \"tohash\" in ttls_do_chap().\n"); @@ -419,13 +419,13 @@ } tohash[0] = session_id; - memcpy(&tohash[1], user_passwd, strlen(user_passwd)); - memcpy(&tohash[1+strlen(user_passwd)], &chap_challenge, 16); - hashlen = 1+strlen(user_passwd)+16; + memcpy(&tohash[1], user_passwd, strlen((char *) user_passwd)); + memcpy(&tohash[1+strlen((char *) user_passwd)], &chap_challenge, 16); + hashlen = 1+strlen((char *) user_passwd)+16; EVP_DigestInit(ctx, EVP_md5()); EVP_DigestUpdate(ctx, tohash, hashlen); - EVP_DigestFinal(ctx, (char *)&chap_hash[1], (int *)&md5_length); + EVP_DigestFinal(ctx, (u_char *)&chap_hash[1], (u_int *)&md5_length); if (md5_length != 16) // We didn't get back a valid hash! { @@ -433,11 +433,11 @@ } chap_hash[0]=session_id; - build_avp(CHAP_PASSWORD_AVP, 0, MANDITORY_FLAG, chap_hash, 17, &out_data[avp_offset], &avp_out_size); + build_avp(CHAP_PASSWORD_AVP, 0, MANDITORY_FLAG, chap_hash, 17, (uint8_t *) &out_data[avp_offset], &avp_out_size); avp_offset += avp_out_size; - build_avp(CHAP_CHALLENGE_AVP, 0, MANDITORY_FLAG, (char *)&chap_challenge, 16, &out_data[avp_offset], &avp_out_size); + build_avp(CHAP_CHALLENGE_AVP, 0, MANDITORY_FLAG, (uint8_t *) &chap_challenge, 16, (uint8_t *) &out_data[avp_offset], &avp_out_size); if (tohash != NULL) { @@ -518,8 +518,8 @@ avp_offset = 0; - build_avp(USER_NAME_AVP, 0, MANDITORY_FLAG, username, - strlen(username), out_data, &avp_out_size); + build_avp(USER_NAME_AVP, 0, MANDITORY_FLAG, (uint8_t *) username, + strlen(username), (uint8_t *) out_data, &avp_out_size); avp_offset += avp_out_size; @@ -537,7 +537,7 @@ bzero(tempbuf, passwd_size); memcpy(tempbuf, phase2data->password, strlen(phase2data->password)); - build_avp(USER_PASSWORD_AVP, 0, MANDITORY_FLAG, tempbuf, passwd_size, &out_data[avp_offset], &avp_out_size); + build_avp(USER_PASSWORD_AVP, 0, MANDITORY_FLAG, (uint8_t *) tempbuf, passwd_size, (uint8_t *) &out_data[avp_offset], &avp_out_size); *out_size = avp_offset + avp_out_size; @@ -548,7 +548,7 @@ } debug_printf(DEBUG_AUTHTYPES, "Returning from do_pap :\n"); - debug_hex_dump(DEBUG_AUTHTYPES, out_data, *out_size); + debug_hex_dump(DEBUG_AUTHTYPES, (u_char *) out_data, *out_size); } // We don't do anything with the "in" stuff for now.. @@ -567,7 +567,7 @@ } debug_printf(DEBUG_AUTHTYPES, "Encrypted Inner (%d) : \n", in_size); - debug_hex_dump(DEBUG_AUTHTYPES, in, in_size); + debug_hex_dump(DEBUG_AUTHTYPES, (u_char *) in, in_size); userdata = (struct config_eap_ttls *)thisint->eap_conf_data; @@ -597,10 +597,10 @@ if ((in_size > 0) && (in[0] != 0x14)) { // We have something to decrypt! - tls_crypt_decrypt(thisint, in, in_size, decr_data, &decrsize); + tls_crypt_decrypt(thisint, (u_char *) in, in_size, (u_char *) decr_data, &decrsize); debug_printf(DEBUG_AUTHTYPES, "Decrypted Inner (%d) : \n", in_size); - debug_hex_dump(DEBUG_AUTHTYPES, decr_data, decrsize); + debug_hex_dump(DEBUG_AUTHTYPES, (u_char *) decr_data, decrsize); if (decr_data[0] == 0x00) { @@ -638,11 +638,11 @@ return XENONE; } - tls_crypt_encrypt_nolen(thisint, toencout, toencsize, out, out_size); + tls_crypt_encrypt_nolen(thisint, (u_char *) toencout, toencsize, (u_char *) out, out_size); free(toencout); debug_printf(DEBUG_AUTHTYPES, "Returning from (TTLS) do_phase2 : \n"); - debug_hex_dump(DEBUG_AUTHTYPES, out, *out_size); + debug_hex_dump(DEBUG_AUTHTYPES, (u_char *) out, *out_size); return XENONE; } --- xsupplicant-1.2.1/src/eap_types/leap/eapleap.c.BAD 2005-09-03 17:22:01.000000000 -0500 +++ xsupplicant-1.2.1/src/eap_types/leap/eapleap.c 2005-09-03 17:25:57.000000000 -0500 @@ -50,7 +50,7 @@ unicodePass[2 * i + 1] = 0; } /* Encrypt plain text password to a 16-byte MD4 hash */ - md4_calc(MD4Hash, unicodePass, passLen * 2); + md4_calc(MD4Hash, (u_char *) unicodePass, passLen * 2); } void leap_mschap(char * password, char * response) { @@ -64,7 +64,7 @@ ntPwdHash(MD4Hash, password); md4_calc(MD4HashHash, MD4Hash, 16); - ChallengeResponse(leapchallenges->apc, MD4HashHash, response); + ChallengeResponse((char *) leapchallenges->apc, (char *) MD4HashHash, response); } @@ -199,7 +199,7 @@ // LEAP shouldn't be used as an inner type, so we should be able to get // away with this. - data = dataoffs-5; + data = (char *) dataoffs-5; eapheader = (struct eap_header *)data; switch (eapheader->eap_code) { @@ -279,7 +279,7 @@ memset(chall_response, 0x0, 8); NtChallengeResponse((char *)leaprequest->randval, userdata->password, (char *)&chall_response); - GenerateNTResponse((char *)leapchallenges->pr, (char *)leapchallenges->pc, username, userdata->password, chall_response); + GenerateNTResponse((char *)leapchallenges->pr, (char *)leapchallenges->pc, username, userdata->password, (char *) chall_response); // store Access Point Challenge memcpy((uint8_t *)leapchallenges->apc, (char *)chall_response, 8); @@ -337,7 +337,7 @@ leapresponse = (struct leap_responses *)dataoffs; - challenge_response_got = (char *)malloc(leapresponse->count+1); + challenge_response_got = (u_char *)malloc(leapresponse->count+1); if (!challenge_response_got) { debug_printf(DEBUG_NORMAL, "(EAP-LEAP) challenge_response_got is NULL after malloc!\n"); } @@ -350,7 +350,7 @@ memset(challenge_response_expected, 0x0, 24); // Calculate the 24 bytes MS-CHAP Challenge Response - leap_mschap(userdata->password, challenge_response_expected); + leap_mschap(userdata->password, (char *) challenge_response_expected); if (memcmp(challenge_response_got, challenge_response_expected, 24) == 0) { debug_printf(DEBUG_AUTHTYPES, "(EAP-LEAP) AP ChallengeResponse got is valid.\n"); @@ -386,7 +386,7 @@ debug_printf(DEBUG_AUTHTYPES, "(EAP-LEAP) leapchallenges->apr : "); debug_hex_printf(DEBUG_AUTHTYPES, (uint8_t *)leapchallenges->apr, 24); - GetMasterLEAPKey((char *)MD4HashHash, leapchallenges->apc, leapchallenges->apr, leapchallenges->pc, leapchallenges->pr, (char *)&MasterKey); + GetMasterLEAPKey((char *)MD4HashHash, (char *) leapchallenges->apc, (char *) leapchallenges->apr, (char *) leapchallenges->pc, (char *) leapchallenges->pr, (char *)&MasterKey); debug_printf(DEBUG_AUTHTYPES, "MasterLEAPKey : "); debug_hex_printf(DEBUG_AUTHTYPES, (unsigned char *)&MasterKey, 16); @@ -444,7 +444,7 @@ mydata = (struct leap_data *)network_data->activemethod->eap_data; // Right now, we don't return anything from LEAP. - thisint->keyingMaterial = mydata->keyingMaterial; + thisint->keyingMaterial = (u_char *) mydata->keyingMaterial; thisint->keyingLength = 16; // We only use 16 bytes for this keying material! return 0; --- xsupplicant-1.2.1/src/wpa_common.c.BAD 2005-09-03 08:42:16.000000000 -0500 +++ xsupplicant-1.2.1/src/wpa_common.c 2005-09-03 08:42:30.000000000 -0500 @@ -201,7 +201,7 @@ // This is a little different than the reference implementation, // because OpenSSL takes parameters in a different order. HMAC(EVP_sha1(), key, key_len, input, total_len, &output[currentindex], - &k); + (u_int *) &k); currentindex += 20; input[total_len-1]++; } --- xsupplicant-1.2.1/src/eapol_key_type1.c.BAD 2005-09-03 08:40:11.000000000 -0500 +++ xsupplicant-1.2.1/src/eapol_key_type1.c 2005-09-03 08:41:54.000000000 -0500 @@ -107,7 +107,7 @@ if (calchmac == NULL) return XEMALLOC; HMAC(EVP_md5(), thisint->keyingMaterial+32, - thisint->keyingLength, framecpy, framesize, calchmac, &outlen); + thisint->keyingLength, (u_char *) framecpy, framesize, (u_char *) calchmac, (u_int *) &outlen); // Now, we need to compare the calculated HMAC to the one sent to us. keydata = (struct key_packet *)&inframe[4]; --- xsupplicant-1.2.1/src/eapol.c.BAD 2005-09-03 08:30:37.000000000 -0500 +++ xsupplicant-1.2.1/src/eapol.c 2005-09-03 08:30:45.000000000 -0500 @@ -122,7 +122,7 @@ // an EAP request that is valid. If we don't have any config informtion, // we should just bail here, and not return an error. - inframe = (u_char *)&workint->recvframe; + inframe = (char *)&workint->recvframe; temp = (struct eapol_header *)&inframe[OFFSET_PAST_MAC]; --- xsupplicant-1.2.1/src/statemachine.c.BAD 2005-09-03 08:32:13.000000000 -0500 +++ xsupplicant-1.2.1/src/statemachine.c 2005-09-03 08:33:13.000000000 -0500 @@ -619,7 +619,7 @@ } } - eapol_build_header(EAPOL_LOGOFF, 0, eapolver, thisint->sendframe); + eapol_build_header(EAPOL_LOGOFF, 0, eapolver, (char *) thisint->sendframe); thisint->send_size = OFFSET_TO_EAP; snmp_dot1xSuppEapolLogoffFramesTx(); @@ -664,7 +664,7 @@ } eapol_build_header(EAPOL_START, 0, network_data->force_eapol_ver, - thisint->sendframe); + (char *) thisint->sendframe); thisint->send_size = OFFSET_TO_EAP; snmp_dot1xSuppEapolStartFramesTx(); --- xsupplicant-1.2.1/src/config_ssid.c.BAD 2005-09-03 08:30:08.000000000 -0500 +++ xsupplicant-1.2.1/src/config_ssid.c 2005-09-03 08:30:24.000000000 -0500 @@ -151,7 +151,7 @@ if (wpa_ie != NULL) { - cur->wpa_ie = (char *)malloc(wpa_ie_len); + cur->wpa_ie = (unsigned char *)malloc(wpa_ie_len); if (cur->wpa_ie == NULL) { debug_printf(DEBUG_NORMAL, "Couldn't allocate memory for wpa_ie! " @@ -168,7 +168,7 @@ if (rsn_ie != NULL) { - cur->rsn_ie = (char *)malloc(rsn_ie_len); + cur->rsn_ie = (unsigned char *)malloc(rsn_ie_len); if (cur->rsn_ie == NULL) { debug_printf(DEBUG_NORMAL, "Couldn't allocate memory for rsn_ie! " --- xsupplicant-1.2.1/src/xsup_ipc.c.BAD 2005-09-03 17:27:32.000000000 -0500 +++ xsupplicant-1.2.1/src/xsup_ipc.c 2005-09-03 17:29:17.000000000 -0500 @@ -144,7 +144,7 @@ } debug_printf(DEBUG_INT, "(IPC) Sending : \n"); - debug_hex_dump(DEBUG_INT, tosend, tolen); + debug_hex_dump(DEBUG_INT, (u_char *) tosend, tolen); err = send(skfd, tosend, tolen, 0); if (err < 0) @@ -194,7 +194,7 @@ *outsize = 0; } else { debug_printf(DEBUG_INT, "(IPC) Got : \n"); - debug_hex_dump(DEBUG_INT, outbuf, readStat); + debug_hex_dump(DEBUG_INT, (u_char *) outbuf, readStat); // Verify that the packet we got is valid. *outsize = readStat; @@ -355,7 +355,7 @@ debug_printf(DEBUG_NORMAL, "Error getting working interface " "dumping current packet: \n"); - debug_hex_dump(DEBUG_NORMAL, buffer, bufsize); + debug_hex_dump(DEBUG_NORMAL, (u_char *) buffer, bufsize); debug_printf(DEBUG_NORMAL, "Ignoring remaining parts of packet!\n"); bufptr = bufsize+1; @@ -419,7 +419,7 @@ { // We got a request for a new IPC client connection. debug_printf(DEBUG_INT, "Got a request to connect a new client.\n"); - newsock = accept(ipc_sock, (struct sockaddr *)&sa, &len); + newsock = accept(ipc_sock, (struct sockaddr *)&sa, (u_int *) &len); if (newsock <= 0) { debug_printf(DEBUG_NORMAL, "Got a request for a new IPC client " @@ -514,7 +514,7 @@ ipc_callout_request_password(intidx, &bufptr, (char *)&packet[0], 512, eapType, challenge); debug_printf(DEBUG_AUTHTYPES, "Sending : \n"); - debug_hex_dump(DEBUG_AUTHTYPES, packet, bufptr); + debug_hex_dump(DEBUG_AUTHTYPES, (u_char *) packet, bufptr); xsup_ipc_send_all((char *)&packet, bufptr); --- xsupplicant-1.2.1/src/eapol_key_type254.c.BAD 2005-09-03 09:05:02.000000000 -0500 +++ xsupplicant-1.2.1/src/eapol_key_type254.c 2005-09-03 09:21:09.000000000 -0500 @@ -192,12 +192,12 @@ } debug_printf(DEBUG_INT, "PMK : "); - debug_hex_printf(DEBUG_INT, intdata->statemachine->PMK, 32); - wpa_PRF(intdata->statemachine->PMK, 32, "Pairwise key expansion", 22, - (char *)&prfdata, 76, retval, 64); + debug_hex_printf(DEBUG_INT, (u_char *) intdata->statemachine->PMK, 32); + wpa_PRF((u_char *) intdata->statemachine->PMK, 32, (u_char *) "Pairwise key expansion", 22, + (u_char *)&prfdata, 76, (u_char *) retval, 64); debug_printf(DEBUG_INT, "PTK : "); - debug_hex_printf(DEBUG_INT, retval, 64); + debug_hex_printf(DEBUG_INT, (u_char *) retval, 64); return retval; } @@ -264,10 +264,10 @@ eapolver = snmp_get_dot1xSuppLastEapolFrameVersion(); eapol_build_header(EAPOL_KEY, (intdata->send_size-OFFSET_TO_EAPOL-4), - eapolver, intdata->sendframe); + eapolver, (char *) intdata->sendframe); memcpy(key, intdata->statemachine->PTK, 16); - mic_wpa_populate(intdata->sendframe, intdata->send_size+4, key, 16); + mic_wpa_populate((char *) intdata->sendframe, intdata->send_size+4, key, 16); cardif_sendframe(intdata); intdata->statemachine->eapolEap = FALSE; @@ -351,21 +351,21 @@ bzero(rc4_ek, 32); memcpy(rc4_ek, inkeydata->key_iv, 16); memcpy(&rc4_ek[16], &intdata->statemachine->PTK[16], 16); - rc4_skip(rc4_ek, 32, 256, keydata, value16); + rc4_skip((u_char *) rc4_ek, 32, 256, keydata, value16); wpa_common_swap_rx_tx_mic(keydata); - cardif_set_tkip_key(intdata, allfs, keyindex, FALSE, inkeydata->key_rsc, - 6, keydata, value16); + cardif_set_tkip_key(intdata, (char *) allfs, keyindex, FALSE, (char *) inkeydata->key_rsc, + 6, (char *) keydata, value16); break; case 2: // First, decrypt the GTK bzero(key, 16); - aes_unwrap(&intdata->statemachine->PTK[16], (value16-8)/8, keydata, - key); + aes_unwrap((u_char *) &intdata->statemachine->PTK[16], (value16-8)/8, keydata, + (u_char *) key); wpa_common_swap_rx_tx_mic(keydata); - cardif_set_ccmp_key(intdata, NULL, keyindex, FALSE, inkeydata->key_rsc, + cardif_set_ccmp_key(intdata, NULL, keyindex, FALSE, (char *) inkeydata->key_rsc, 6, key, (value16-8)); break; } @@ -391,13 +391,13 @@ eapolver = snmp_get_dot1xSuppLastEapolFrameVersion(); eapol_build_header(EAPOL_KEY, (intdata->send_size-OFFSET_TO_EAPOL-4), - eapolver, intdata->sendframe); + eapolver, (char *) intdata->sendframe); memcpy(key, intdata->statemachine->PTK, 16); - mic_wpa_populate(intdata->sendframe, intdata->send_size+4, key, 16); + mic_wpa_populate((char *) intdata->sendframe, intdata->send_size+4, key, 16); // Dump what we built. - eapol_key_type254_dump(intdata->sendframe); + eapol_key_type254_dump((char *) intdata->sendframe); if (network_data->methods->method_num == WPA_PSK) { @@ -504,13 +504,13 @@ eapolver = snmp_get_dot1xSuppLastEapolFrameVersion(); eapol_build_header(EAPOL_KEY, (intdata->send_size-OFFSET_TO_EAPOL-4), - eapolver, intdata->sendframe); + eapolver, (char *) intdata->sendframe); memcpy(key, intdata->statemachine->PTK, 16); - mic_wpa_populate(intdata->sendframe, intdata->send_size+4, key, 16); + mic_wpa_populate((char *) intdata->sendframe, intdata->send_size+4, key, 16); // Dump what we built. - eapol_key_type254_dump(intdata->sendframe); + eapol_key_type254_dump((char *) intdata->sendframe); } /******************************************************** @@ -586,20 +586,20 @@ eapolver = snmp_get_dot1xSuppLastEapolFrameVersion(); eapol_build_header(EAPOL_KEY, (intdata->send_size-OFFSET_TO_EAPOL-4), - eapolver, intdata->sendframe); + eapolver, (char *) intdata->sendframe); memcpy(key, intdata->statemachine->PTK, 16); - mic_wpa_populate(intdata->sendframe, intdata->send_size+4, key, 16); + mic_wpa_populate((char *) intdata->sendframe, intdata->send_size+4, key, 16); // Dump what we built. - eapol_key_type254_dump(intdata->sendframe); + eapol_key_type254_dump((char *) intdata->sendframe); // Get TK1 value16 = ntohs(inkeydata->key_length); memcpy(key, (char *)&intdata->statemachine->PTK[32], value16); debug_printf(DEBUG_INT, "TK1 : "); - debug_hex_printf(DEBUG_INT, key, value16); + debug_hex_printf(DEBUG_INT, (u_char *) key, value16); cardif_sendframe(intdata); intdata->statemachine->eapolEap = FALSE; @@ -612,14 +612,14 @@ case 1: // We need to swap the TX/RX MIC values since we are the supplicant. // (Thanks to Jouni Malinen for pointing this out!) - wpa_common_swap_rx_tx_mic(key); + wpa_common_swap_rx_tx_mic((u_char *) key); cardif_set_tkip_key(intdata, intdata->dest_mac, keyindex, TRUE, - inkeydata->key_rsc, 6, key, value16); + (char *) inkeydata->key_rsc, 6, key, value16); break; case 2: cardif_set_ccmp_key(intdata, intdata->dest_mac, keyindex, TRUE, - inkeydata->key_rsc, 6, key, value16); + (char *) inkeydata->key_rsc, 6, key, value16); break; } } @@ -646,7 +646,7 @@ if (keyflags & WPA_KEY_MIC_FLAG) { - if (mic_wpa_validate(intdata->recvframe, intdata->recv_size, + if (mic_wpa_validate((char *) intdata->recvframe, intdata->recv_size, intdata->statemachine->PTK, 16) == FALSE) { intdata->statemachine->MICVerified = TRUE; @@ -688,7 +688,7 @@ eapolver = snmp_get_dot1xSuppLastEapolFrameVersion(); eapol_build_header(EAPOL_KEY, (intdata->recv_size-OFFSET_TO_EAPOL-4), - eapolver, intdata->recvframe); + eapolver, (char *) intdata->recvframe); cardif_sendframe(intdata); intdata->statemachine->eapolEap = FALSE; } @@ -757,8 +757,8 @@ } // We have an ASCII password, so calculate it. - if (psk_wpa_pbkdf2(psk->key, intdata->cur_essid, - strlen(intdata->cur_essid), (char *)&tpmk) + if (psk_wpa_pbkdf2(psk->key, (u_char *) intdata->cur_essid, + strlen(intdata->cur_essid), (u_char *)&tpmk) == TRUE) { intdata->statemachine->PMK = (char *)malloc(32); @@ -798,7 +798,7 @@ } } - eapol_key_type254_dump(inframe); + eapol_key_type254_dump((char *) inframe); eapol_key_type254_determine_key(intdata); --- xsupplicant-1.2.1/src/config_grammar.y.BAD 2005-09-03 17:31:51.000000000 -0500 +++ xsupplicant-1.2.1/src/config_grammar.y 2005-09-03 17:34:56.000000000 -0500 @@ -829,8 +829,9 @@ } else { int tmp_dst_mac[CONFIG_MAC_LEN]; + int retval; SET_FLAG(tmp_network->flags, CONFIG_NET_DEST_MAC); - sscanf($3, "%2x:%2x:%2x:%2x:%2x:%2x", + retval = sscanf($3, "%2x:%2x:%2x:%2x:%2x:%2x", &tmp_dst_mac[0], &tmp_dst_mac[1], &tmp_dst_mac[2], @@ -1035,25 +1036,25 @@ set_current_static_wep(); parameter_debug("Static Key 1 : %s\n", $3); if (!tmp_static_wep->key[1]) - tmp_static_wep->key[1] = $3; + tmp_static_wep->key[1] = (u_char *) $3; } | TK_STATIC_KEY2 '=' TK_QUOTED_STR { set_current_static_wep(); parameter_debug("Static Key 2 : %s\n", $3); if (!tmp_static_wep->key[2]) - tmp_static_wep->key[2] = $3; + tmp_static_wep->key[2] = (u_char *) $3; } | TK_STATIC_KEY3 '=' TK_QUOTED_STR { set_current_static_wep(); parameter_debug("Static Key 3 : %s\n", $3); if (!tmp_static_wep->key[3]) - tmp_static_wep->key[3] = $3; + tmp_static_wep->key[3] = (u_char *) $3; } | TK_STATIC_KEY4 '=' TK_QUOTED_STR { set_current_static_wep(); parameter_debug("Static Key 4 : %s\n", $3); if (!tmp_static_wep->key[4]) - tmp_static_wep->key[4] = $3; + tmp_static_wep->key[4] = (u_char *) $3; } | TK_WEP_TX_KEY '=' TK_NUMBER { set_current_static_wep(); Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/xsupplicant/FC-3/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 19 Aug 2005 18:58:19 -0000 1.2 +++ .cvsignore 4 Sep 2005 13:17:38 -0000 1.3 @@ -1 +1,2 @@ xsupplicant-1.2.tar.gz +xsupplicant-1.2.1.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/xsupplicant/FC-3/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 19 Aug 2005 18:58:19 -0000 1.2 +++ sources 4 Sep 2005 13:17:38 -0000 1.3 @@ -1 +1,2 @@ e1eee37899b49ed238648699d0a01c5b xsupplicant-1.2.tar.gz +c44300f798a3317c06e501eb0dd98a23 xsupplicant-1.2.1.tar.gz Index: xsupplicant.spec =================================================================== RCS file: /cvs/extras/rpms/xsupplicant/FC-3/xsupplicant.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- xsupplicant.spec 19 Aug 2005 18:58:19 -0000 1.1 +++ xsupplicant.spec 4 Sep 2005 13:17:38 -0000 1.2 @@ -1,6 +1,6 @@ Name: xsupplicant Summary: Open Source Implementation of IEEE 802.1x -Version: 1.2 +Version: 1.2.1 Release: 1%{?dist} License: GPL Group: System Environment/Base @@ -8,6 +8,8 @@ Source0: http://download.sourceforge.net/open1x/xsupplicant-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: openssl-devel, bison, flex +Patch0: xsupplicant-1.2.1-docsfix.patch +Patch1: xsupplicant-1.2.1-gcc4-cleanups.patch %description This software allows a GNU/Linux or BSD workstation to authenticate with @@ -17,12 +19,17 @@ %prep %setup -q +%patch0 -p1 +%patch1 -p1 perl -pi.orig -e 's|/lib\b|/%{_lib}|g' configure* %build %configure make %{?_smp_mflags} +cd doc +./builddocs.sh +cd .. %install rm -rf $RPM_BUILD_ROOT @@ -35,7 +42,7 @@ %files %defattr(-,root,root,-) -%doc AUTHORS COPYING README doc/html/ doc/txt/ doc/README* etc/*.conf +%doc AUTHORS COPYING README doc/html/ doc/txt/ doc/pdf doc/README* etc/*.conf %config(noreplace) %{_sysconfdir}/xsupplicant.conf %{_bindir}/config-parser %{_bindir}/xsup_monitor @@ -44,6 +51,9 @@ %{_sbindir}/xsupplicant %changelog +* Sat Sep 3 2005 Tom "spot" Callaway 1.2.1-1 +- bump to 1.2.1 release + * Fri Aug 19 2005 Tom "spot" Callaway 1.2-1 - bump to 1.2 final From fedora-extras-commits at redhat.com Sun Sep 4 13:39:34 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sun, 4 Sep 2005 09:39:34 -0400 Subject: rpms/xsupplicant/FC-3 xsupplicant.spec,1.2,1.3 Message-ID: <200509041339.j84DdYdo030862@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/xsupplicant/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30817/FC-3 Modified Files: xsupplicant.spec Log Message: Missing BR. Index: xsupplicant.spec =================================================================== RCS file: /cvs/extras/rpms/xsupplicant/FC-3/xsupplicant.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- xsupplicant.spec 4 Sep 2005 13:17:38 -0000 1.2 +++ xsupplicant.spec 4 Sep 2005 13:39:32 -0000 1.3 @@ -1,13 +1,13 @@ Name: xsupplicant Summary: Open Source Implementation of IEEE 802.1x Version: 1.2.1 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: System Environment/Base URL: http://www.open1x.org/ Source0: http://download.sourceforge.net/open1x/xsupplicant-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: openssl-devel, bison, flex +BuildRequires: openssl-devel, bison, flex, openjade, elinks, jadetex Patch0: xsupplicant-1.2.1-docsfix.patch Patch1: xsupplicant-1.2.1-gcc4-cleanups.patch @@ -51,6 +51,9 @@ %{_sbindir}/xsupplicant %changelog +* Sun Sep 4 2005 Tom "spot" Callaway 1.2.1-2 +- the new doc generation tool has some new BR: openjade, elinks, jadetex + * Sat Sep 3 2005 Tom "spot" Callaway 1.2.1-1 - bump to 1.2.1 release From fedora-extras-commits at redhat.com Sun Sep 4 13:39:35 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sun, 4 Sep 2005 09:39:35 -0400 Subject: rpms/xsupplicant/FC-4 xsupplicant.spec,1.2,1.3 Message-ID: <200509041339.j84DdZTh030870@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/xsupplicant/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30817/FC-4 Modified Files: xsupplicant.spec Log Message: Missing BR. Index: xsupplicant.spec =================================================================== RCS file: /cvs/extras/rpms/xsupplicant/FC-4/xsupplicant.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- xsupplicant.spec 4 Sep 2005 13:17:39 -0000 1.2 +++ xsupplicant.spec 4 Sep 2005 13:39:33 -0000 1.3 @@ -1,13 +1,13 @@ Name: xsupplicant Summary: Open Source Implementation of IEEE 802.1x Version: 1.2.1 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: System Environment/Base URL: http://www.open1x.org/ Source0: http://download.sourceforge.net/open1x/xsupplicant-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: openssl-devel, bison, flex +BuildRequires: openssl-devel, bison, flex, openjade, elinks, jadetex Patch0: xsupplicant-1.2.1-docsfix.patch Patch1: xsupplicant-1.2.1-gcc4-cleanups.patch @@ -51,6 +51,9 @@ %{_sbindir}/xsupplicant %changelog +* Sun Sep 4 2005 Tom "spot" Callaway 1.2.1-2 +- the new doc generation tool has some new BR: openjade, elinks, jadetex + * Sat Sep 3 2005 Tom "spot" Callaway 1.2.1-1 - bump to 1.2.1 release From fedora-extras-commits at redhat.com Sun Sep 4 13:39:35 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sun, 4 Sep 2005 09:39:35 -0400 Subject: rpms/xsupplicant/devel xsupplicant.spec,1.2,1.3 Message-ID: <200509041339.j84DdZKg030876@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/xsupplicant/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30817/devel Modified Files: xsupplicant.spec Log Message: Missing BR. Index: xsupplicant.spec =================================================================== RCS file: /cvs/extras/rpms/xsupplicant/devel/xsupplicant.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- xsupplicant.spec 4 Sep 2005 13:17:45 -0000 1.2 +++ xsupplicant.spec 4 Sep 2005 13:39:33 -0000 1.3 @@ -1,13 +1,13 @@ Name: xsupplicant Summary: Open Source Implementation of IEEE 802.1x Version: 1.2.1 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: System Environment/Base URL: http://www.open1x.org/ Source0: http://download.sourceforge.net/open1x/xsupplicant-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: openssl-devel, bison, flex +BuildRequires: openssl-devel, bison, flex, openjade, elinks, jadetex Patch0: xsupplicant-1.2.1-docsfix.patch Patch1: xsupplicant-1.2.1-gcc4-cleanups.patch @@ -51,6 +51,9 @@ %{_sbindir}/xsupplicant %changelog +* Sun Sep 4 2005 Tom "spot" Callaway 1.2.1-2 +- the new doc generation tool has some new BR: openjade, elinks, jadetex + * Sat Sep 3 2005 Tom "spot" Callaway 1.2.1-1 - bump to 1.2.1 release From fedora-extras-commits at redhat.com Sun Sep 4 13:57:33 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sun, 4 Sep 2005 09:57:33 -0400 Subject: rpms/xsupplicant/devel xsupplicant.spec,1.3,1.4 Message-ID: <200509041357.j84DvX8F031137@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/xsupplicant/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31084/devel Modified Files: xsupplicant.spec Log Message: No really. More BR. Index: xsupplicant.spec =================================================================== RCS file: /cvs/extras/rpms/xsupplicant/devel/xsupplicant.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- xsupplicant.spec 4 Sep 2005 13:39:33 -0000 1.3 +++ xsupplicant.spec 4 Sep 2005 13:57:31 -0000 1.4 @@ -1,13 +1,14 @@ Name: xsupplicant Summary: Open Source Implementation of IEEE 802.1x Version: 1.2.1 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL Group: System Environment/Base URL: http://www.open1x.org/ Source0: http://download.sourceforge.net/open1x/xsupplicant-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: openssl-devel, bison, flex, openjade, elinks, jadetex +BuildRequires: docbook-dtds, docbook-style-dsssl Patch0: xsupplicant-1.2.1-docsfix.patch Patch1: xsupplicant-1.2.1-gcc4-cleanups.patch @@ -51,6 +52,9 @@ %{_sbindir}/xsupplicant %changelog +* Sun Sep 4 2005 Tom "spot" Callaway 1.2.1-3 +- BR: docbook-dtds, docbook-style-dsssl + * Sun Sep 4 2005 Tom "spot" Callaway 1.2.1-2 - the new doc generation tool has some new BR: openjade, elinks, jadetex From fedora-extras-commits at redhat.com Sun Sep 4 13:57:27 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sun, 4 Sep 2005 09:57:27 -0400 Subject: rpms/xsupplicant/FC-3 xsupplicant.spec,1.3,1.4 Message-ID: <200509041357.j84DvwnR031140@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/xsupplicant/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31084/FC-3 Modified Files: xsupplicant.spec Log Message: No really. More BR. Index: xsupplicant.spec =================================================================== RCS file: /cvs/extras/rpms/xsupplicant/FC-3/xsupplicant.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- xsupplicant.spec 4 Sep 2005 13:39:32 -0000 1.3 +++ xsupplicant.spec 4 Sep 2005 13:57:25 -0000 1.4 @@ -1,13 +1,14 @@ Name: xsupplicant Summary: Open Source Implementation of IEEE 802.1x Version: 1.2.1 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL Group: System Environment/Base URL: http://www.open1x.org/ Source0: http://download.sourceforge.net/open1x/xsupplicant-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: openssl-devel, bison, flex, openjade, elinks, jadetex +BuildRequires: docbook-dtds, docbook-style-dsssl Patch0: xsupplicant-1.2.1-docsfix.patch Patch1: xsupplicant-1.2.1-gcc4-cleanups.patch @@ -51,6 +52,9 @@ %{_sbindir}/xsupplicant %changelog +* Sun Sep 4 2005 Tom "spot" Callaway 1.2.1-3 +- BR: docbook-dtds, docbook-style-dsssl + * Sun Sep 4 2005 Tom "spot" Callaway 1.2.1-2 - the new doc generation tool has some new BR: openjade, elinks, jadetex From fedora-extras-commits at redhat.com Sun Sep 4 13:57:28 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sun, 4 Sep 2005 09:57:28 -0400 Subject: rpms/xsupplicant/FC-4 xsupplicant.spec,1.3,1.4 Message-ID: <200509041357.j84DvwNs031143@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/xsupplicant/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31084/FC-4 Modified Files: xsupplicant.spec Log Message: No really. More BR. Index: xsupplicant.spec =================================================================== RCS file: /cvs/extras/rpms/xsupplicant/FC-4/xsupplicant.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- xsupplicant.spec 4 Sep 2005 13:39:33 -0000 1.3 +++ xsupplicant.spec 4 Sep 2005 13:57:26 -0000 1.4 @@ -1,13 +1,14 @@ Name: xsupplicant Summary: Open Source Implementation of IEEE 802.1x Version: 1.2.1 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL Group: System Environment/Base URL: http://www.open1x.org/ Source0: http://download.sourceforge.net/open1x/xsupplicant-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: openssl-devel, bison, flex, openjade, elinks, jadetex +BuildRequires: docbook-dtds, docbook-style-dsssl Patch0: xsupplicant-1.2.1-docsfix.patch Patch1: xsupplicant-1.2.1-gcc4-cleanups.patch @@ -51,6 +52,9 @@ %{_sbindir}/xsupplicant %changelog +* Sun Sep 4 2005 Tom "spot" Callaway 1.2.1-3 +- BR: docbook-dtds, docbook-style-dsssl + * Sun Sep 4 2005 Tom "spot" Callaway 1.2.1-2 - the new doc generation tool has some new BR: openjade, elinks, jadetex From fedora-extras-commits at redhat.com Sun Sep 4 14:07:46 2005 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Sun, 4 Sep 2005 10:07:46 -0400 Subject: rpms/liferea/devel .cvsignore, 1.11, 1.12 liferea.spec, 1.17, 1.18 sources, 1.12, 1.13 Message-ID: <200509041407.j84E7knr032440@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/liferea/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32417 Modified Files: .cvsignore liferea.spec sources Log Message: * Sun Sep 4 2005 Brian Pepple - 0.9.7b-2 - Update to 0.9.7b. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/liferea/devel/.cvsignore,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- .cvsignore 30 Aug 2005 14:09:32 -0000 1.11 +++ .cvsignore 4 Sep 2005 14:07:29 -0000 1.12 @@ -1 +1 @@ -liferea-0.9.7a.tar.gz +liferea-0.9.7b.tar.gz Index: liferea.spec =================================================================== RCS file: /cvs/extras/rpms/liferea/devel/liferea.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- liferea.spec 30 Aug 2005 14:09:32 -0000 1.17 +++ liferea.spec 4 Sep 2005 14:07:29 -0000 1.18 @@ -1,7 +1,7 @@ %define with_dbus 1 Name: liferea -Version: 0.9.7a +Version: 0.9.7b Release: 2%{?dist} Summary: An RSS/RDF feed reader @@ -92,6 +92,9 @@ %changelog +* Sun Sep 4 2005 Brian Pepple - 0.9.7b-2 +- Update to 0.9.7b. + * Tue Aug 30 2005 Brian Pepple - 0.9.7a-2 - Update to 0.9.7a. Index: sources =================================================================== RCS file: /cvs/extras/rpms/liferea/devel/sources,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- sources 30 Aug 2005 14:09:32 -0000 1.12 +++ sources 4 Sep 2005 14:07:29 -0000 1.13 @@ -1 +1 @@ -303a4a0f678cf689510785dbd91726a6 liferea-0.9.7a.tar.gz +68c75c792c81808160434baca4e9165b liferea-0.9.7b.tar.gz From fedora-extras-commits at redhat.com Sun Sep 4 14:09:10 2005 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Sun, 4 Sep 2005 10:09:10 -0400 Subject: rpms/liferea/FC-4 .cvsignore, 1.11, 1.12 liferea.spec, 1.16, 1.17 sources, 1.12, 1.13 Message-ID: <200509041409.j84E9AZe032549@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/liferea/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32526 Modified Files: .cvsignore liferea.spec sources Log Message: * Sun Sep 4 2005 Brian Pepple - 0.9.7b-1 - Update to 0.9.7b. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/liferea/FC-4/.cvsignore,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- .cvsignore 30 Aug 2005 15:04:41 -0000 1.11 +++ .cvsignore 4 Sep 2005 14:09:08 -0000 1.12 @@ -1 +1 @@ -liferea-0.9.7a.tar.gz +liferea-0.9.7b.tar.gz Index: liferea.spec =================================================================== RCS file: /cvs/extras/rpms/liferea/FC-4/liferea.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- liferea.spec 30 Aug 2005 15:04:42 -0000 1.16 +++ liferea.spec 4 Sep 2005 14:09:08 -0000 1.17 @@ -1,7 +1,7 @@ %define with_dbus 1 Name: liferea -Version: 0.9.7a +Version: 0.9.7b Release: 1%{?dist} Summary: An RSS/RDF feed reader @@ -92,6 +92,9 @@ %changelog +* Sun Sep 4 2005 Brian Pepple - 0.9.7b-1 +- Update to 0.9.7b. + * Tue Aug 30 2005 Brian Pepple - 0.9.7a-1 - Update to 0.9.7a. Index: sources =================================================================== RCS file: /cvs/extras/rpms/liferea/FC-4/sources,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- sources 30 Aug 2005 15:04:42 -0000 1.12 +++ sources 4 Sep 2005 14:09:08 -0000 1.13 @@ -1 +1 @@ -303a4a0f678cf689510785dbd91726a6 liferea-0.9.7a.tar.gz +68c75c792c81808160434baca4e9165b liferea-0.9.7b.tar.gz From fedora-extras-commits at redhat.com Sun Sep 4 14:51:57 2005 From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields)) Date: Sun, 4 Sep 2005 10:51:57 -0400 Subject: web/html/docs/yum generated-index.php, 1.5, 1.6 index.php, 1.5, 1.6 ln-legalnotice.php, 1.5, 1.6 sn-acknowledgements.php, 1.5, 1.6 sn-managing-packages.php, 1.5, 1.6 sn-searching-packages.php, 1.5, 1.6 sn-software-management-concepts.php, 1.5, 1.6 sn-software-management-tools.php, 1.5, 1.6 sn-updating-your-system.php, 1.5, 1.6 sn-using-repositories.php, 1.5, 1.6 sn-yum-installing-frompackage.php, 1.5, 1.6 sn-yum-maintenance.php, 1.5, 1.6 sn-yum-proxy-server.php, 1.5, 1.6 Message-ID: <200509041451.j84EpvJg032730@cvs-int.fedora.redhat.com> Author: pfrields Update of /cvs/fedora/web/html/docs/yum In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32698 Modified Files: generated-index.php index.php ln-legalnotice.php sn-acknowledgements.php sn-managing-packages.php sn-searching-packages.php sn-software-management-concepts.php sn-software-management-tools.php sn-updating-your-system.php sn-using-repositories.php sn-yum-installing-frompackage.php sn-yum-maintenance.php sn-yum-proxy-server.php Log Message: Republish yum tutorial with new revision history chunking Index: index.php =================================================================== RCS file: /cvs/fedora/web/html/docs/yum/index.php,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- index.php 30 Aug 2005 21:54:38 -0000 1.5 +++ index.php 4 Sep 2005 14:51:55 -0000 1.6 @@ -7,32 +7,7 @@ ?> -
      - ><%=builder['address']%>  (<%=num_building%>/<%=builder['num_slots']%>)
      + ><%=builder['address']%>  (<%=slots_text%>)
      <%=arch_list%>
      Managing Software with yum
         Next

      Managing Software with yum

      Stuart Ellis

      Copyright © 2005 Stuart Ellis

      Revision History
      Revision 0.42005-06-01StuartEllis
      -

      - Initial import into CVS. -

      -
      Revision 0.52005-07-19StuartEllis
      -

      - Updated for Fedora Core 4. -

      -
      Revision 0.62005-07-25PaulWFrields
      -

      - Edited for style and usage; BETA publication. -

      -
      Revision 1.02005-08-13PaulWFrields
      -

      - Publish to official project page. -

      -
      Revision 1.0.12005-08-18StuartEllis
      -

      - Added information on installing without repository and - manually adding keys. -

      -
      Revision 1.0.22005-08-26StuartEllis
      -

      - Fix localinstall information. -

      -
      1. Introduction
      1.1. Purpose
      1.2. Audience
      1.3. Using This Document
      1.4. Additional Resources
      2. Software Management Concepts
      2.1. About Packages
      2.2. About Repositories
      2.3. About Dependencies
      2.4. Understanding Package Names
      3. Software Management Tools in Fedora Core
      4. Managing Software with yum
      4.1. Installing New Software with yum
      4.2. Updating Software with yum
      4.! 3. Removing Software with yum!
      5. Searching for Packages with yum
      5.1. Searching by Package Name and Attributes
      5.2. Advanced Searches
      5.3. Understanding Matches
      6. Updating Your System with yum
      6.1. Automatically Updating Your System
      7. Using Other Software Repositories
      7.1. Adding a Repository as a Package Source
      7.2. Manually Authorizing Package Sources
      7.3. Understanding Repository Compatibility
      8. Maintaining yum
      8.1. Disabling or Removing Package Sources
      8.2. Clearing the yum Caches
      9. Manually Installing Software
      10. Using yum with a Proxy Server
      11. Acknowledgements
      Index

      1. Introduction

      1.1. Purpose

      +

      Managing Software with yum
         Next

      Managing Software with yum

      Stuart Ellis

      Copyright © 2005 Stuart Ellis

      1. Introduction
      1.1. Purpose
      1.2. Audience
      1.3. Using This Document
      1.4. Additional Resources
      2. Software Management Concepts
      2.1. About Packages
      2.2. About Repositories
      ! 2.3. About Dependencies
      2.4. Understanding Package Names
      3. Software Management Tools in Fedora Core
      4. Managing Software with yum
      4.1. Installing New Software with yum
      4.2. Updating Software with yum
      4.3. Removing Software with yum
      5. Searching for Pack! ages with yum
      5.1. Searching by Package Name and Attributes
      5.2. Advanced Searches
      5.3. Understanding Matches
      6. Updating Your System with yum
      6.1. Automatically Updating Your System
      7. Using Other Software Repositories
      7.1. Adding a Repository as a Package Source
      7.2. Manually Authorizing Package Sources
      7.3. Understanding Repository Compatibility
      8. Maintaining yum
      8.1. Disabling or Removing Package Sources
      8.2. Clearing the yum Caches
      9. Manually Installing Software
      10. Using yum with a Proxy Server
      11. Acknowledgements
      Index

      1. Introduction

      1.1. Purpose

      This document presents basic concepts of software management on Fedora systems. It outlines the major functions of yum, the recommended software management tool @@ -76,7 +51,7 @@ root password. The example terminal commands use su -c to provide this facility. -

      1.4. Additional Resources

      +

      1.4. Additional Resources

      The yum utility has features and options not discussed in this document. Read the man pages for yum(8) and @@ -85,7 +60,7 @@ 

       man yum
 man yum.conf
-

      +

      Other useful yum resources on the Internet include:

      Index: sn-managing-packages.php =================================================================== RCS file: /cvs/fedora/web/html/docs/yum/sn-managing-packages.php,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sn-managing-packages.php 30 Aug 2005 21:54:38 -0000 1.5 +++ sn-managing-packages.php 4 Sep 2005 14:51:55 -0000 1.6 @@ -7,7 +7,7 @@ ?> -
      4. Managing Software with yum
      Prev   Next

      4. Managing Software with yum

      +

      4. Managing Software with yum
      Prev   Next

      4. Managing Software with yum

      Use the yum utility to modify the software on your system in four ways:

      @@ -100,7 +100,7 @@ /var/cache/yum/, and use them elsewhere if you wish. If you remove a package from the cache, you do not affect the copy of the software installed on your system. -

      4.1. Installing New Software with yum

      +

      4.1. Installing New Software with yum

      To install the package tsclient, enter the command: 

      @@ -125,7 +125,7 @@
           Settings->Server Settings->Services, or use the
           chkconfig and service
           command-line utilities.
-

      4.2. Updating Software with yum

      +

      4.2. Updating Software with yum

      To update the tsclient package to the latest version, type: 

      @@ -152,7 +152,7 @@
           To update all of the packages on your Fedora system, use the
           commands described in
           Section 6, “Updating Your System with yum”.
-

      4.3. Removing Software with yum

      +

      4.3. Removing Software with yum

      To remove software, yum examines your system for both the specified software, and any software which claims it as a dependency. The transaction to remove the software Index: sn-searching-packages.php =================================================================== RCS file: /cvs/fedora/web/html/docs/yum/sn-searching-packages.php,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sn-searching-packages.php 30 Aug 2005 21:54:38 -0000 1.5 +++ sn-searching-packages.php 4 Sep 2005 14:51:55 -0000 1.6 @@ -7,7 +7,7 @@ ?> -

      5. Searching for Packages with yum
      Prev   Next

      5. Searching for Packages with yum

      +

      5. Searching for Packages with yum
      Prev   Next

      5. Searching for Packages with yum

      Use the search features of yum to find software that is available from the configured repositories, or already installed on your system. Searches automatically include both Index: sn-software-management-concepts.php =================================================================== RCS file: /cvs/fedora/web/html/docs/yum/sn-software-management-concepts.php,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sn-software-management-concepts.php 30 Aug 2005 21:54:38 -0000 1.5 +++ sn-software-management-concepts.php 4 Sep 2005 14:51:55 -0000 1.6 @@ -7,7 +7,7 @@ ?> -

      2. Software Management Concepts
      Prev   Next

      2. Software Management Concepts

      2.1. About Packages

      +

      2. Software Management Concepts
      Prev   Next

      2. Software Management Concepts

      2.1. About Packages

      Fedora software and documentation is supplied in the form of files called RPM packages. Each package is a compressed archive containing product information, program @@ -24,7 +24,7 @@ share a common keyring that stores all of the public keys for approved package sources. The system administrator configures these approved package sources. -

      2.2. About Repositories

      +

      2.2. About Repositories

      A repository is a prepared directory or web site that contains software packages and index files. Software management utilities such as yum @@ -56,7 +56,7 @@ their Fedora compatible packages. To learn how to configure your Fedora system to use third-party repositories, read Section 7, “Using Other Software Repositories”. -

      +

      You may also use the package groups provided by the Fedora repositories to manage related packages as sets. Some third-party repositories add packages to these @@ -81,7 +81,7 @@ Section 9, “Manually Installing Software” for details of using yum to install software from a package file. -

      2.3. About Dependencies

      +

      2.3. About Dependencies

      Some of the files installed on a Fedora distribution are libraries which may provide functions to multiple applications. When an application requires a specific @@ -98,7 +98,7 @@ application has requirements that conflict with existing software, yum aborts without making any changes to your system. -

      2.4. Understanding Package Names

      +

      2.4. Understanding Package Names

      Each package file has a long name that indicates several key pieces of information. This is the full name of the tsclient package supplied with Fedora Core: Index: sn-software-management-tools.php =================================================================== RCS file: /cvs/fedora/web/html/docs/yum/sn-software-management-tools.php,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sn-software-management-tools.php 30 Aug 2005 21:54:38 -0000 1.5 +++ sn-software-management-tools.php 4 Sep 2005 14:51:55 -0000 1.6 @@ -7,7 +7,7 @@ ?> -

      3. Software Management Tools in Fedora Core
      Prev   Next

      3. Software Management Tools in Fedora Core

      +

      3. Software Management Tools in Fedora Core
      Prev   Next

      3. Software Management Tools in Fedora Core

      The yum utility is a complete software management system. Fedora Core also includes other several other applications that can supplement yum. Index: sn-updating-your-system.php =================================================================== RCS file: /cvs/fedora/web/html/docs/yum/sn-updating-your-system.php,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sn-updating-your-system.php 30 Aug 2005 21:54:38 -0000 1.5 +++ sn-updating-your-system.php 4 Sep 2005 14:51:55 -0000 1.6 @@ -7,7 +7,7 @@ ?> -

      6. Updating Your System with yum
      Prev   Next

      6. Updating Your System with yum

      +

      6. Updating Your System with yum
      Prev   Next

      6. Updating Your System with yum

      Use the update option to upgrade all of your Fedora system software to the latest version with one operation.

      @@ -17,7 +17,7 @@

      At the prompt, enter the root password. -

      6.1. Automatically Updating Your System

      +

      6.1. Automatically Updating Your System

      The yum package supplied with Fedora Core includes scripts to perform full system updates every day. To activate automatic daily updates, enter this command: Index: sn-using-repositories.php =================================================================== RCS file: /cvs/fedora/web/html/docs/yum/sn-using-repositories.php,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sn-using-repositories.php 30 Aug 2005 21:54:38 -0000 1.5 +++ sn-using-repositories.php 4 Sep 2005 14:51:55 -0000 1.6 @@ -7,7 +7,7 @@ ?> -

      7. Using Other Software Repositories
      Prev   Next

      7. Using Other Software Repositories

      +

      7. Using Other Software Repositories
      Prev   Next

      7. Using Other Software Repositories

      Fedora systems automatically use the Fedora Project repositories. These include Fedora Extras, the default source of packages for software that is not included with Fedora Core. @@ -24,7 +24,7 @@ packages for Fedora systems. For example, http://www.jpackage.org/ distributes popular Java software as packages. -

      7.1. Adding a Repository as a Package Source

      +

      7.1. Adding a Repository as a Package Source

      To add an extra repository, place a definition file in the /etc/yum.repos.d/ directory on your system. Package providers make the definition files for their @@ -57,7 +57,7 @@ configure up2date to use these channels. To do so, edit the /etc/sysconfig/rhn/sources file. -

      7.2. Manually Authorizing Package Sources

      +

      7.2. Manually Authorizing Package Sources

      To manually add a public key to your rpm keyring, use the import feature of the rpm utility. To import the file @@ -82,7 +82,7 @@ To add the Fedora public key to the rpm keyring on Fedora 3 systems, run the command su -c 'rpm --import /usr/share/rhn/RPM-GPG-KEY-fedora'. -

      7.3. Understanding Repository Compatibility

      +

      7.3. Understanding Repository Compatibility

      The Fedora Extras repository provides packages which are built to the same standards as Fedora Core packages. Third-party packages should be compatible with these Fedora Project packages, unless the provider Index: sn-yum-installing-frompackage.php =================================================================== RCS file: /cvs/fedora/web/html/docs/yum/sn-yum-installing-frompackage.php,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sn-yum-installing-frompackage.php 30 Aug 2005 21:54:38 -0000 1.5 +++ sn-yum-installing-frompackage.php 4 Sep 2005 14:51:55 -0000 1.6 @@ -7,7 +7,7 @@ ?> -

      9. Manually Installing Software
      Prev   Next

      9. Manually Installing Software

      +

      9. Manually Installing Software
      Prev   Next

      9. Manually Installing Software

      Use repositories and the standard yum commands to locate and install new software, unless the software package is not available from any repository. In these cases, use the Index: sn-yum-maintenance.php =================================================================== RCS file: /cvs/fedora/web/html/docs/yum/sn-yum-maintenance.php,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sn-yum-maintenance.php 30 Aug 2005 21:54:38 -0000 1.5 +++ sn-yum-maintenance.php 4 Sep 2005 14:51:55 -0000 1.6 @@ -14,7 +14,7 @@ definitions which you no longer require. You may also clear the files from the yum caches in order to recover disk space. -

      8.1. Disabling or Removing Package Sources

      +

      8.1. Disabling or Removing Package Sources

      Set enable=0 in a definition file to prevent yum from using that repository. The yum utility ignores any definition file with @@ -27,7 +27,7 @@

    6. Delete the cache directory from /var/cache/yum/. -

      7. 8.2. Clearing the yum Caches

      +

      8.2. Clearing the yum Caches

      By default, yum retains the packages and package data files that it downloads, so that they may be reused in future operations without being downloaded again. To purge Index: sn-yum-proxy-server.php =================================================================== RCS file: /cvs/fedora/web/html/docs/yum/sn-yum-proxy-server.php,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sn-yum-proxy-server.php 30 Aug 2005 21:54:38 -0000 1.5 +++ sn-yum-proxy-server.php 4 Sep 2005 14:51:55 -0000 1.6 @@ -7,7 +7,7 @@ ?> -

      10. Using yum with a Proxy Server
      Prev   Next

      10. Using yum with a Proxy Server

      +

      10. Using yum with a Proxy Server
      Prev   Next

      10. Using yum with a Proxy Server

      You may access repositories through standard web proxy servers. If your system accesses the Internet through a web proxy server, specify the proxy server details in From fedora-extras-commits at redhat.com Sun Sep 4 14:52:32 2005 From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields)) Date: Sun, 4 Sep 2005 10:52:32 -0400 Subject: web/html/docs/yum rv-revhistory.php,NONE,1.1 Message-ID: <200509041452.j84EqWAk000307@cvs-int.fedora.redhat.com> Author: pfrields Update of /cvs/fedora/web/html/docs/yum In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32757 Added Files: rv-revhistory.php Log Message: And add the revisionhistory chunk ***** Error reading new file: [Errno 2] No such file or directory: 'rv-revhistory.php' From fedora-extras-commits at redhat.com Sun Sep 4 17:52:10 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sun, 4 Sep 2005 13:52:10 -0400 Subject: rpms/xsupplicant/FC-3 sources, 1.3, 1.4 xsupplicant-1.2.1-docsfix.patch, 1.1, 1.2 Message-ID: <200509041752.j84Hqew8004453@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/xsupplicant/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4392/FC-3 Modified Files: sources xsupplicant-1.2.1-docsfix.patch Log Message: Ugly docbook requires unique patches for all branches... but this should get us building again. Index: sources =================================================================== RCS file: /cvs/extras/rpms/xsupplicant/FC-3/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 4 Sep 2005 13:17:38 -0000 1.3 +++ sources 4 Sep 2005 17:52:07 -0000 1.4 @@ -1,2 +1 @@ -e1eee37899b49ed238648699d0a01c5b xsupplicant-1.2.tar.gz c44300f798a3317c06e501eb0dd98a23 xsupplicant-1.2.1.tar.gz xsupplicant-1.2.1-docsfix.patch: Index: xsupplicant-1.2.1-docsfix.patch =================================================================== RCS file: /cvs/extras/rpms/xsupplicant/FC-3/xsupplicant-1.2.1-docsfix.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- xsupplicant-1.2.1-docsfix.patch 4 Sep 2005 13:17:38 -0000 1.1 +++ xsupplicant-1.2.1-docsfix.patch 4 Sep 2005 17:52:07 -0000 1.2 @@ -18,3 +18,13 @@ if [ $? -ne 0 ] then echo "Error! Build failed!" +--- xsupplicant-1.2.1/doc/xml-userguide/userguide.xml.BAD 2005-09-04 10:28:44.000000000 -0500 ++++ xsupplicant-1.2.1/doc/xml-userguide/userguide.xml 2005-09-04 10:28:53.000000000 -0500 +@@ -1,6 +1,6 @@ + + + From fedora-extras-commits at redhat.com Sun Sep 4 17:52:11 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sun, 4 Sep 2005 13:52:11 -0400 Subject: rpms/xsupplicant/FC-4 sources, 1.3, 1.4 xsupplicant-1.2.1-docsfix.patch, 1.1, 1.2 Message-ID: <200509041752.j84HqfMh004460@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/xsupplicant/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4392/FC-4 Modified Files: sources xsupplicant-1.2.1-docsfix.patch Log Message: Ugly docbook requires unique patches for all branches... but this should get us building again. Index: sources =================================================================== RCS file: /cvs/extras/rpms/xsupplicant/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 4 Sep 2005 13:17:39 -0000 1.3 +++ sources 4 Sep 2005 17:52:09 -0000 1.4 @@ -1,2 +1 @@ -e1eee37899b49ed238648699d0a01c5b xsupplicant-1.2.tar.gz c44300f798a3317c06e501eb0dd98a23 xsupplicant-1.2.1.tar.gz xsupplicant-1.2.1-docsfix.patch: Index: xsupplicant-1.2.1-docsfix.patch =================================================================== RCS file: /cvs/extras/rpms/xsupplicant/FC-4/xsupplicant-1.2.1-docsfix.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- xsupplicant-1.2.1-docsfix.patch 4 Sep 2005 13:17:39 -0000 1.1 +++ xsupplicant-1.2.1-docsfix.patch 4 Sep 2005 17:52:09 -0000 1.2 @@ -18,3 +18,13 @@ if [ $? -ne 0 ] then echo "Error! Build failed!" +--- xsupplicant-1.2.1/doc/xml-userguide/userguide.xml.BAD 2005-09-04 10:28:44.000000000 -0500 ++++ xsupplicant-1.2.1/doc/xml-userguide/userguide.xml 2005-09-04 10:28:53.000000000 -0500 +@@ -1,6 +1,6 @@ + + + From fedora-extras-commits at redhat.com Sun Sep 4 17:52:11 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sun, 4 Sep 2005 13:52:11 -0400 Subject: rpms/xsupplicant/devel sources, 1.3, 1.4 xsupplicant-1.2.1-docsfix.patch, 1.1, 1.2 xsupplicant.spec, 1.4, 1.5 Message-ID: <200509041752.j84HqgVI004468@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/xsupplicant/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4392/devel Modified Files: sources xsupplicant-1.2.1-docsfix.patch xsupplicant.spec Log Message: Ugly docbook requires unique patches for all branches... but this should get us building again. Index: sources =================================================================== RCS file: /cvs/extras/rpms/xsupplicant/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 4 Sep 2005 13:17:45 -0000 1.3 +++ sources 4 Sep 2005 17:52:09 -0000 1.4 @@ -1,2 +1 @@ -e1eee37899b49ed238648699d0a01c5b xsupplicant-1.2.tar.gz c44300f798a3317c06e501eb0dd98a23 xsupplicant-1.2.1.tar.gz xsupplicant-1.2.1-docsfix.patch: Index: xsupplicant-1.2.1-docsfix.patch =================================================================== RCS file: /cvs/extras/rpms/xsupplicant/devel/xsupplicant-1.2.1-docsfix.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- xsupplicant-1.2.1-docsfix.patch 4 Sep 2005 13:17:45 -0000 1.1 +++ xsupplicant-1.2.1-docsfix.patch 4 Sep 2005 17:52:09 -0000 1.2 @@ -18,3 +18,13 @@ if [ $? -ne 0 ] then echo "Error! Build failed!" +--- xsupplicant-1.2.1/doc/xml-userguide/userguide.xml.BAD 2005-09-04 10:28:44.000000000 -0500 ++++ xsupplicant-1.2.1/doc/xml-userguide/userguide.xml 2005-09-04 10:28:53.000000000 -0500 +@@ -1,6 +1,6 @@ + + + Index: xsupplicant.spec =================================================================== RCS file: /cvs/extras/rpms/xsupplicant/devel/xsupplicant.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- xsupplicant.spec 4 Sep 2005 13:57:31 -0000 1.4 +++ xsupplicant.spec 4 Sep 2005 17:52:09 -0000 1.5 @@ -54,6 +54,7 @@ %changelog * Sun Sep 4 2005 Tom "spot" Callaway 1.2.1-3 - BR: docbook-dtds, docbook-style-dsssl +- patch to use local docbookx.dtd * Sun Sep 4 2005 Tom "spot" Callaway 1.2.1-2 - the new doc generation tool has some new BR: openjade, elinks, jadetex From fedora-extras-commits at redhat.com Sun Sep 4 21:16:54 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sun, 4 Sep 2005 17:16:54 -0400 Subject: rpms/xsupplicant/FC-4 xsupplicant.spec,1.4,1.5 Message-ID: <200509042117.j84LHOoT010066@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/xsupplicant/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10027/FC-4 Modified Files: xsupplicant.spec Log Message: build for sparc. hahaha. just kidding. Index: xsupplicant.spec =================================================================== RCS file: /cvs/extras/rpms/xsupplicant/FC-4/xsupplicant.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- xsupplicant.spec 4 Sep 2005 13:57:26 -0000 1.4 +++ xsupplicant.spec 4 Sep 2005 21:16:52 -0000 1.5 @@ -54,6 +54,7 @@ %changelog * Sun Sep 4 2005 Tom "spot" Callaway 1.2.1-3 - BR: docbook-dtds, docbook-style-dsssl +- patch to use local docbookx.dtd * Sun Sep 4 2005 Tom "spot" Callaway 1.2.1-2 - the new doc generation tool has some new BR: openjade, elinks, jadetex From fedora-extras-commits at redhat.com Sun Sep 4 21:16:53 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sun, 4 Sep 2005 17:16:53 -0400 Subject: rpms/xsupplicant/FC-3 xsupplicant.spec,1.4,1.5 Message-ID: <200509042117.j84LHNVE010063@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/xsupplicant/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10027/FC-3 Modified Files: xsupplicant.spec Log Message: build for sparc. hahaha. just kidding. Index: xsupplicant.spec =================================================================== RCS file: /cvs/extras/rpms/xsupplicant/FC-3/xsupplicant.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- xsupplicant.spec 4 Sep 2005 13:57:25 -0000 1.4 +++ xsupplicant.spec 4 Sep 2005 21:16:51 -0000 1.5 @@ -54,6 +54,7 @@ %changelog * Sun Sep 4 2005 Tom "spot" Callaway 1.2.1-3 - BR: docbook-dtds, docbook-style-dsssl +- patch to use local docbookx.dtd * Sun Sep 4 2005 Tom "spot" Callaway 1.2.1-2 - the new doc generation tool has some new BR: openjade, elinks, jadetex From fedora-extras-commits at redhat.com Sun Sep 4 21:43:07 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sun, 4 Sep 2005 17:43:07 -0400 Subject: rpms/perl-Class-DBI-SQLite - New directory Message-ID: <200509042143.j84Lh7Tt010334@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Class-DBI-SQLite In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10314/perl-Class-DBI-SQLite Log Message: Directory /cvs/extras/rpms/perl-Class-DBI-SQLite added to the repository From fedora-extras-commits at redhat.com Sun Sep 4 21:43:08 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sun, 4 Sep 2005 17:43:08 -0400 Subject: rpms/perl-Class-DBI-SQLite/devel - New directory Message-ID: <200509042143.j84Lh87J010339@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Class-DBI-SQLite/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10314/perl-Class-DBI-SQLite/devel Log Message: Directory /cvs/extras/rpms/perl-Class-DBI-SQLite/devel added to the repository From fedora-extras-commits at redhat.com Sun Sep 4 21:43:23 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sun, 4 Sep 2005 17:43:23 -0400 Subject: rpms/perl-Class-DBI-SQLite Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200509042143.j84LhNmK010397@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Class-DBI-SQLite In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10359 Added Files: Makefile import.log Log Message: Setup of module perl-Class-DBI-SQLite --- NEW FILE Makefile --- # Top level Makefile for module perl-Class-DBI-SQLite all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Sun Sep 4 21:43:23 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sun, 4 Sep 2005 17:43:23 -0400 Subject: rpms/perl-Class-DBI-SQLite/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200509042143.j84LhNwu010402@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Class-DBI-SQLite/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10359/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-Class-DBI-SQLite --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Sun Sep 4 21:43:51 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sun, 4 Sep 2005 17:43:51 -0400 Subject: rpms/perl-Class-DBI-SQLite import.log,1.1,1.2 Message-ID: <200509042143.j84LhpPq010465@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Class-DBI-SQLite In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10430 Modified Files: import.log Log Message: auto-import perl-Class-DBI-SQLite-0.10-2 on branch devel from perl-Class-DBI-SQLite-0.10-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-Class-DBI-SQLite/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 4 Sep 2005 21:43:21 -0000 1.1 +++ import.log 4 Sep 2005 21:43:48 -0000 1.2 @@ -0,0 +1 @@ +perl-Class-DBI-SQLite-0_10-2:HEAD:perl-Class-DBI-SQLite-0.10-2.src.rpm:1125870218 From fedora-extras-commits at redhat.com Sun Sep 4 21:43:51 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sun, 4 Sep 2005 17:43:51 -0400 Subject: rpms/perl-Class-DBI-SQLite/devel perl-Class-DBI-SQLite.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200509042143.j84LhphK010472@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Class-DBI-SQLite/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10430/devel Modified Files: .cvsignore sources Added Files: perl-Class-DBI-SQLite.spec Log Message: auto-import perl-Class-DBI-SQLite-0.10-2 on branch devel from perl-Class-DBI-SQLite-0.10-2.src.rpm --- NEW FILE perl-Class-DBI-SQLite.spec --- Name: perl-Class-DBI-SQLite Version: 0.10 Release: 2%{?dist} Summary: Extension to Class::DBI for sqlite Group: Development/Libraries License: GPL or Artistic URL: http://search.cpan.org/dist/Class-DBI-SQLite/ Source0: http://search.cpan.org/CPAN/authors/id/M/MI/MIYAGAWA/Class-DBI-SQLite-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(Class::DBI), perl(DBD::SQLite) Requires: perl(DBD::SQLite) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description %{summary}. %prep %setup -q -n Class-DBI-SQLite-%{version} perldoc -t perlartistic > Artistic perldoc -t perlgpl > COPYING %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' chmod -R u+w $RPM_BUILD_ROOT/* %check make test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc Artistic COPYING Changes %{perl_vendorlib}/Class/DBI %{_mandir}/man3/*.3* %changelog * Sun Sep 4 2005 Tom "spot" Callaway 0.10-2 - add R: perl(DBD::SQLite) - remove R: perl(Class::DBI) * Thu Sep 1 2005 Tom "spot" Callaway 0.10-1 - bump to 0.10 * Thu Sep 1 2005 Paul Howarth 0.09-3 - remove redundant BR: perl - include license text - honor %%{?_smp_mflags} - include BR: perl(DBD::SQLite) * Fri Jul 8 2005 Tom "spot" Callaway 0.09-2 - cleanups * Wed Jul 6 2005 Tom "spot" Callaway 0.09-1 - Initial package for Fedora Extras Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Class-DBI-SQLite/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 4 Sep 2005 21:43:21 -0000 1.1 +++ .cvsignore 4 Sep 2005 21:43:49 -0000 1.2 @@ -0,0 +1 @@ +Class-DBI-SQLite-0.10.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Class-DBI-SQLite/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 4 Sep 2005 21:43:21 -0000 1.1 +++ sources 4 Sep 2005 21:43:49 -0000 1.2 @@ -0,0 +1 @@ +13ee636b0bfd08e0b9c6cf0e7429810a Class-DBI-SQLite-0.10.tar.gz From fedora-extras-commits at redhat.com Sun Sep 4 21:58:00 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sun, 4 Sep 2005 17:58:00 -0400 Subject: rpms/xsupplicant/devel xsupplicant-1.2.1-docsfix.patch, 1.2, 1.3 xsupplicant.spec, 1.5, 1.6 Message-ID: <200509042158.j84Lw0rH010580@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/xsupplicant/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10514/devel Modified Files: xsupplicant-1.2.1-docsfix.patch xsupplicant.spec Log Message: use lynx, not elinks xsupplicant-1.2.1-docsfix.patch: Index: xsupplicant-1.2.1-docsfix.patch =================================================================== RCS file: /cvs/extras/rpms/xsupplicant/devel/xsupplicant-1.2.1-docsfix.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- xsupplicant-1.2.1-docsfix.patch 4 Sep 2005 17:52:09 -0000 1.2 +++ xsupplicant-1.2.1-docsfix.patch 4 Sep 2005 21:57:58 -0000 1.3 @@ -9,15 +9,6 @@ SGML_CATALOG_FILES=/usr/sgml-tools/dtd/catalog:/etc/sgml/catalog:/usr/share/doc/openjade-1.3.2/catalog:/home/chris/t/docbook-dsssl-1.97/catalog mkdir -p html -@@ -33,7 +33,7 @@ - - # create the txt docs - echo -n "Building the TXT docs..." --lynx -dump -nolist html/Open1x-UserGuide.html > txt/Open1x-UserGuide.txt -+links -dump html/Open1x-UserGuide.html > txt/Open1x-UserGuide.txt - if [ $? -ne 0 ] - then - echo "Error! Build failed!" --- xsupplicant-1.2.1/doc/xml-userguide/userguide.xml.BAD 2005-09-04 10:28:44.000000000 -0500 +++ xsupplicant-1.2.1/doc/xml-userguide/userguide.xml 2005-09-04 10:28:53.000000000 -0500 @@ -1,6 +1,6 @@ Index: xsupplicant.spec =================================================================== RCS file: /cvs/extras/rpms/xsupplicant/devel/xsupplicant.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- xsupplicant.spec 4 Sep 2005 17:52:09 -0000 1.5 +++ xsupplicant.spec 4 Sep 2005 21:57:58 -0000 1.6 @@ -1,13 +1,13 @@ Name: xsupplicant Summary: Open Source Implementation of IEEE 802.1x Version: 1.2.1 -Release: 3%{?dist} +Release: 4%{?dist} License: GPL Group: System Environment/Base URL: http://www.open1x.org/ Source0: http://download.sourceforge.net/open1x/xsupplicant-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: openssl-devel, bison, flex, openjade, elinks, jadetex +BuildRequires: openssl-devel, bison, flex, openjade, lynx, jadetex BuildRequires: docbook-dtds, docbook-style-dsssl Patch0: xsupplicant-1.2.1-docsfix.patch Patch1: xsupplicant-1.2.1-gcc4-cleanups.patch @@ -52,6 +52,9 @@ %{_sbindir}/xsupplicant %changelog +* Sun Sep 4 2005 Tom "spot" Callaway 1.2.1-4 +- use lynx instead of elinks + * Sun Sep 4 2005 Tom "spot" Callaway 1.2.1-3 - BR: docbook-dtds, docbook-style-dsssl - patch to use local docbookx.dtd From fedora-extras-commits at redhat.com Sun Sep 4 21:57:54 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sun, 4 Sep 2005 17:57:54 -0400 Subject: rpms/xsupplicant/FC-3 xsupplicant-1.2.1-docsfix.patch, 1.2, 1.3 xsupplicant.spec, 1.5, 1.6 Message-ID: <200509042158.j84LwPXd010584@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/xsupplicant/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10514/FC-3 Modified Files: xsupplicant-1.2.1-docsfix.patch xsupplicant.spec Log Message: use lynx, not elinks xsupplicant-1.2.1-docsfix.patch: Index: xsupplicant-1.2.1-docsfix.patch =================================================================== RCS file: /cvs/extras/rpms/xsupplicant/FC-3/xsupplicant-1.2.1-docsfix.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- xsupplicant-1.2.1-docsfix.patch 4 Sep 2005 17:52:07 -0000 1.2 +++ xsupplicant-1.2.1-docsfix.patch 4 Sep 2005 21:57:52 -0000 1.3 @@ -9,15 +9,6 @@ SGML_CATALOG_FILES=/usr/sgml-tools/dtd/catalog:/etc/sgml/catalog:/usr/share/doc/openjade-1.3.2/catalog:/home/chris/t/docbook-dsssl-1.97/catalog mkdir -p html -@@ -33,7 +33,7 @@ - - # create the txt docs - echo -n "Building the TXT docs..." --lynx -dump -nolist html/Open1x-UserGuide.html > txt/Open1x-UserGuide.txt -+links -dump html/Open1x-UserGuide.html > txt/Open1x-UserGuide.txt - if [ $? -ne 0 ] - then - echo "Error! Build failed!" --- xsupplicant-1.2.1/doc/xml-userguide/userguide.xml.BAD 2005-09-04 10:28:44.000000000 -0500 +++ xsupplicant-1.2.1/doc/xml-userguide/userguide.xml 2005-09-04 10:28:53.000000000 -0500 @@ -1,6 +1,6 @@ Index: xsupplicant.spec =================================================================== RCS file: /cvs/extras/rpms/xsupplicant/FC-3/xsupplicant.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- xsupplicant.spec 4 Sep 2005 21:16:51 -0000 1.5 +++ xsupplicant.spec 4 Sep 2005 21:57:52 -0000 1.6 @@ -1,13 +1,13 @@ Name: xsupplicant Summary: Open Source Implementation of IEEE 802.1x Version: 1.2.1 -Release: 3%{?dist} +Release: 4%{?dist} License: GPL Group: System Environment/Base URL: http://www.open1x.org/ Source0: http://download.sourceforge.net/open1x/xsupplicant-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: openssl-devel, bison, flex, openjade, elinks, jadetex +BuildRequires: openssl-devel, bison, flex, openjade, lynx, jadetex BuildRequires: docbook-dtds, docbook-style-dsssl Patch0: xsupplicant-1.2.1-docsfix.patch Patch1: xsupplicant-1.2.1-gcc4-cleanups.patch @@ -52,6 +52,9 @@ %{_sbindir}/xsupplicant %changelog +* Sun Sep 4 2005 Tom "spot" Callaway 1.2.1-4 +- use lynx instead of elinks + * Sun Sep 4 2005 Tom "spot" Callaway 1.2.1-3 - BR: docbook-dtds, docbook-style-dsssl - patch to use local docbookx.dtd From fedora-extras-commits at redhat.com Sun Sep 4 21:57:55 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sun, 4 Sep 2005 17:57:55 -0400 Subject: rpms/xsupplicant/FC-4 xsupplicant-1.2.1-docsfix.patch, 1.2, 1.3 xsupplicant.spec, 1.5, 1.6 Message-ID: <200509042158.j84LwPe1010588@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/xsupplicant/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10514/FC-4 Modified Files: xsupplicant-1.2.1-docsfix.patch xsupplicant.spec Log Message: use lynx, not elinks xsupplicant-1.2.1-docsfix.patch: Index: xsupplicant-1.2.1-docsfix.patch =================================================================== RCS file: /cvs/extras/rpms/xsupplicant/FC-4/xsupplicant-1.2.1-docsfix.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- xsupplicant-1.2.1-docsfix.patch 4 Sep 2005 17:52:09 -0000 1.2 +++ xsupplicant-1.2.1-docsfix.patch 4 Sep 2005 21:57:53 -0000 1.3 @@ -9,15 +9,6 @@ SGML_CATALOG_FILES=/usr/sgml-tools/dtd/catalog:/etc/sgml/catalog:/usr/share/doc/openjade-1.3.2/catalog:/home/chris/t/docbook-dsssl-1.97/catalog mkdir -p html -@@ -33,7 +33,7 @@ - - # create the txt docs - echo -n "Building the TXT docs..." --lynx -dump -nolist html/Open1x-UserGuide.html > txt/Open1x-UserGuide.txt -+links -dump html/Open1x-UserGuide.html > txt/Open1x-UserGuide.txt - if [ $? -ne 0 ] - then - echo "Error! Build failed!" --- xsupplicant-1.2.1/doc/xml-userguide/userguide.xml.BAD 2005-09-04 10:28:44.000000000 -0500 +++ xsupplicant-1.2.1/doc/xml-userguide/userguide.xml 2005-09-04 10:28:53.000000000 -0500 @@ -1,6 +1,6 @@ Index: xsupplicant.spec =================================================================== RCS file: /cvs/extras/rpms/xsupplicant/FC-4/xsupplicant.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- xsupplicant.spec 4 Sep 2005 21:16:52 -0000 1.5 +++ xsupplicant.spec 4 Sep 2005 21:57:53 -0000 1.6 @@ -1,13 +1,13 @@ Name: xsupplicant Summary: Open Source Implementation of IEEE 802.1x Version: 1.2.1 -Release: 3%{?dist} +Release: 4%{?dist} License: GPL Group: System Environment/Base URL: http://www.open1x.org/ Source0: http://download.sourceforge.net/open1x/xsupplicant-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: openssl-devel, bison, flex, openjade, elinks, jadetex +BuildRequires: openssl-devel, bison, flex, openjade, lynx, jadetex BuildRequires: docbook-dtds, docbook-style-dsssl Patch0: xsupplicant-1.2.1-docsfix.patch Patch1: xsupplicant-1.2.1-gcc4-cleanups.patch @@ -52,6 +52,9 @@ %{_sbindir}/xsupplicant %changelog +* Sun Sep 4 2005 Tom "spot" Callaway 1.2.1-4 +- use lynx instead of elinks + * Sun Sep 4 2005 Tom "spot" Callaway 1.2.1-3 - BR: docbook-dtds, docbook-style-dsssl - patch to use local docbookx.dtd From fedora-extras-commits at redhat.com Sun Sep 4 21:59:48 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sun, 4 Sep 2005 17:59:48 -0400 Subject: owners owners.list,1.166,1.167 Message-ID: <200509042159.j84LxmWh010618@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10599 Modified Files: owners.list Log Message: perl-Class-DBI-SQLite Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.166 retrieving revision 1.167 diff -u -r1.166 -r1.167 --- owners.list 3 Sep 2005 23:48:52 -0000 1.166 +++ owners.list 4 Sep 2005 21:59:46 -0000 1.167 @@ -570,6 +570,7 @@ Fedora Extras|perl-Class-DBI|Simple Database Abstraction|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Class-DBI-Plugin|Abstract base class for Class::DBI plugins|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Class-DBI-Plugin-Type|Determine type information for columns|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-Class-DBI-SQLite|Extension to Class::DBI for sqlite|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Class-MethodMaker|Create generic methods for OO Perl|dgregor at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Class-ReturnValue|Class::ReturnValue Perl module|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Class-Trigger|Mixin to add / call inheritable triggers|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com From fedora-extras-commits at redhat.com Mon Sep 5 00:18:57 2005 From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma)) Date: Sun, 4 Sep 2005 20:18:57 -0400 Subject: rpms/grhino/devel grhino-configure-gettext.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 grhino.desktop, 1.1, 1.2 grhino.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200509050018.j850Iv04015132@cvs-int.fedora.redhat.com> Author: salimma Update of /cvs/extras/rpms/grhino/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15105 Modified Files: .cvsignore grhino.desktop grhino.spec sources Added Files: grhino-configure-gettext.patch Log Message: * Sun Sep 4 2005 Michel Salim - 0.15.0-3 - removed references to copyrighted name - packaged modified tarball to prevent trademark infringement - patched configure to fix gettext detection on x86_64 grhino-configure-gettext.patch: --- NEW FILE grhino-configure-gettext.patch --- --- grhino-0.15.0/configure.orig 2005-04-15 09:03:04.000000000 -0500 +++ grhino-0.15.0/configure 2005-09-04 18:39:11.000000000 -0500 @@ -6310,6 +6310,8 @@ echo "$as_me:$LINENO: checking for GNU gettext in libc" >&5 echo $ECHO_N "checking for GNU gettext in libc... $ECHO_C" >&6 +# Force detection of gettext, since the test fails on x86_64 for FC4+ +gt_cv_func_gnugettext1_libc=yes if test "${gt_cv_func_gnugettext1_libc+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/grhino/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 3 Sep 2005 23:40:58 -0000 1.2 +++ .cvsignore 5 Sep 2005 00:18:55 -0000 1.3 @@ -1 +1 @@ -grhino-0.15.0.tar.gz +grhino-0.15.0.tar.bz2 Index: grhino.desktop =================================================================== RCS file: /cvs/extras/rpms/grhino/devel/grhino.desktop,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- grhino.desktop 3 Sep 2005 23:40:58 -0000 1.1 +++ grhino.desktop 5 Sep 2005 00:18:55 -0000 1.2 @@ -1,8 +1,8 @@ [Desktop Entry] Encoding=UTF-8 Name=GRhino -GenericName=GNOME2 Othello/Reversi game -Comment=An Othello/Reversi game for GNOME 2 +GenericName=GTP-compliant Reversi game +Comment=Reversi game for GNOME, supporting the Go/Game Text Protocol Exec=grhino #Icon= Terminal=false Index: grhino.spec =================================================================== RCS file: /cvs/extras/rpms/grhino/devel/grhino.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- grhino.spec 3 Sep 2005 23:40:58 -0000 1.1 +++ grhino.spec 5 Sep 2005 00:18:55 -0000 1.2 @@ -1,14 +1,16 @@ Name: grhino Version: 0.15.0 -Release: 2%{?dist} -Summary: Othello/Reversi game +Release: 3%{?dist} +Summary: Reversi game for GNOME, supporting the Go/Game Text Protocol Group: Amusements/Games License: GPL URL: http://rhino.sourceforge.net/ -Source0: http://dl.sourceforge.net/rhino/grhino-%{version}.tar.gz +#Source0: http://dl.sourceforge.net/rhino/grhino-%{version}.tar.gz +Source0: grhino-%{version}.tar.bz2 Source1: %{name}.desktop Patch0: grhino-Makefile-in.patch +Patch1: grhino-configure-gettext.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils @@ -19,12 +21,12 @@ Requires(postun): scrollkeeper %description -GRhino, or Rhino its former name, is an Othello/Reversi game on Linux and other +GRhino, or Rhino its former name, is a Reversi game on Linux and other UNIX-like systems as long as GNOME 2 libraries are installed. It is currently under development and a new version is available occasionally. -What distinguish GRhino from most other Othello games is that GRhino will be -targeted for experienced Othello players. Strong AI is the main focus with some +What distinguish GRhino from most other Reversi games is that GRhino will be +targeted for experienced Reversi players. Strong AI is the main focus with some additional good, useful features (like an endgame solver) is planned. The ultimate target strength of the AI is that it should be able to beat the best human player at the highest difficulty level. Beating Logistello (the strongest @@ -33,12 +35,10 @@ GRhino supports the Go/Game Text Protocol (GTP), allowing it to be used as an engine for a GTP-compliant controller like Quarry. -Othello is a registered trademark of Tsukuda Original, licensed by Anjar Co., -copyright 1973, 1990 Pressman Toy Corporation. - %prep %setup -q %patch0 -p1 +%patch1 -p1 %build @@ -85,6 +85,11 @@ %changelog +* Sun Sep 4 2005 Michel Salim - 0.15.0-3 +- removed references to copyrighted name +- packaged modified tarball to prevent trademark infringement +- patched configure to fix gettext detection on x86_64 + * Fri Sep 2 2005 Michel Salim - 0.15.0-2 - changed BuildReq from libgnome-devel to libgnomeui-devel, which requires the former Index: sources =================================================================== RCS file: /cvs/extras/rpms/grhino/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 3 Sep 2005 23:40:58 -0000 1.2 +++ sources 5 Sep 2005 00:18:55 -0000 1.3 @@ -1 +1 @@ -9f510356c0cfafe32165a582d872655f grhino-0.15.0.tar.gz +924f8288d479b8a99fb4bacb2b9f291f grhino-0.15.0.tar.bz2 From fedora-extras-commits at redhat.com Mon Sep 5 00:29:08 2005 From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma)) Date: Sun, 4 Sep 2005 20:29:08 -0400 Subject: rpms/grhino/FC-4 .cvsignore, 1.2, 1.3 grhino.desktop, 1.1, 1.2 grhino.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200509050029.j850T8Kf015229@cvs-int.fedora.redhat.com> Author: salimma Update of /cvs/extras/rpms/grhino/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15204 Modified Files: .cvsignore grhino.desktop grhino.spec sources Log Message: * Sun Sep 4 2005 Michel Salim - 0.15.0-3 - removed references to copyrighted name - packaged modified tarball to prevent trademark infringement - patched configure to fix gettext detection on x86_64 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/grhino/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 3 Sep 2005 23:40:58 -0000 1.2 +++ .cvsignore 5 Sep 2005 00:29:06 -0000 1.3 @@ -1 +1 @@ -grhino-0.15.0.tar.gz +grhino-0.15.0.tar.bz2 Index: grhino.desktop =================================================================== RCS file: /cvs/extras/rpms/grhino/FC-4/grhino.desktop,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- grhino.desktop 3 Sep 2005 23:40:58 -0000 1.1 +++ grhino.desktop 5 Sep 2005 00:29:06 -0000 1.2 @@ -1,8 +1,8 @@ [Desktop Entry] Encoding=UTF-8 Name=GRhino -GenericName=GNOME2 Othello/Reversi game -Comment=An Othello/Reversi game for GNOME 2 +GenericName=GTP-compliant Reversi game +Comment=Reversi game for GNOME, supporting the Go/Game Text Protocol Exec=grhino #Icon= Terminal=false Index: grhino.spec =================================================================== RCS file: /cvs/extras/rpms/grhino/FC-4/grhino.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- grhino.spec 3 Sep 2005 23:40:58 -0000 1.1 +++ grhino.spec 5 Sep 2005 00:29:06 -0000 1.2 @@ -1,14 +1,16 @@ Name: grhino Version: 0.15.0 -Release: 2%{?dist} -Summary: Othello/Reversi game +Release: 3%{?dist} +Summary: Reversi game for GNOME, supporting the Go/Game Text Protocol Group: Amusements/Games License: GPL URL: http://rhino.sourceforge.net/ -Source0: http://dl.sourceforge.net/rhino/grhino-%{version}.tar.gz +#Source0: http://dl.sourceforge.net/rhino/grhino-%{version}.tar.gz +Source0: grhino-%{version}.tar.bz2 Source1: %{name}.desktop Patch0: grhino-Makefile-in.patch +Patch1: grhino-configure-gettext.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils @@ -19,12 +21,12 @@ Requires(postun): scrollkeeper %description -GRhino, or Rhino its former name, is an Othello/Reversi game on Linux and other +GRhino, or Rhino its former name, is a Reversi game on Linux and other UNIX-like systems as long as GNOME 2 libraries are installed. It is currently under development and a new version is available occasionally. -What distinguish GRhino from most other Othello games is that GRhino will be -targeted for experienced Othello players. Strong AI is the main focus with some +What distinguish GRhino from most other Reversi games is that GRhino will be +targeted for experienced Reversi players. Strong AI is the main focus with some additional good, useful features (like an endgame solver) is planned. The ultimate target strength of the AI is that it should be able to beat the best human player at the highest difficulty level. Beating Logistello (the strongest @@ -33,12 +35,10 @@ GRhino supports the Go/Game Text Protocol (GTP), allowing it to be used as an engine for a GTP-compliant controller like Quarry. -Othello is a registered trademark of Tsukuda Original, licensed by Anjar Co., -copyright 1973, 1990 Pressman Toy Corporation. - %prep %setup -q %patch0 -p1 +%patch1 -p1 %build @@ -85,6 +85,11 @@ %changelog +* Sun Sep 4 2005 Michel Salim - 0.15.0-3 +- removed references to copyrighted name +- packaged modified tarball to prevent trademark infringement +- patched configure to fix gettext detection on x86_64 + * Fri Sep 2 2005 Michel Salim - 0.15.0-2 - changed BuildReq from libgnome-devel to libgnomeui-devel, which requires the former Index: sources =================================================================== RCS file: /cvs/extras/rpms/grhino/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 3 Sep 2005 23:40:58 -0000 1.2 +++ sources 5 Sep 2005 00:29:06 -0000 1.3 @@ -1 +1 @@ -9f510356c0cfafe32165a582d872655f grhino-0.15.0.tar.gz +924f8288d479b8a99fb4bacb2b9f291f grhino-0.15.0.tar.bz2 From fedora-extras-commits at redhat.com Mon Sep 5 00:30:15 2005 From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma)) Date: Sun, 4 Sep 2005 20:30:15 -0400 Subject: rpms/grhino/FC-4 grhino-configure-gettext.patch,NONE,1.1 Message-ID: <200509050030.j850UFJc015289@cvs-int.fedora.redhat.com> Author: salimma Update of /cvs/extras/rpms/grhino/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15269 Added Files: grhino-configure-gettext.patch Log Message: Added left-out configure-gettext patch grhino-configure-gettext.patch: --- NEW FILE grhino-configure-gettext.patch --- --- grhino-0.15.0/configure.orig 2005-04-15 09:03:04.000000000 -0500 +++ grhino-0.15.0/configure 2005-09-04 18:39:11.000000000 -0500 @@ -6310,6 +6310,8 @@ echo "$as_me:$LINENO: checking for GNU gettext in libc" >&5 echo $ECHO_N "checking for GNU gettext in libc... $ECHO_C" >&6 +# Force detection of gettext, since the test fails on x86_64 for FC4+ +gt_cv_func_gnugettext1_libc=yes if test "${gt_cv_func_gnugettext1_libc+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else From fedora-extras-commits at redhat.com Mon Sep 5 00:37:54 2005 From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma)) Date: Sun, 4 Sep 2005 20:37:54 -0400 Subject: rpms/grhino/FC-3 grhino-cleanup.sh, NONE, 1.1 grhino-configure-gettext.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 grhino.desktop, 1.1, 1.2 grhino.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200509050037.j850bso1015429@cvs-int.fedora.redhat.com> Author: salimma Update of /cvs/extras/rpms/grhino/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15400 Modified Files: .cvsignore grhino.desktop grhino.spec sources Added Files: grhino-cleanup.sh grhino-configure-gettext.patch Log Message: * Sun Sep 4 2005 Michel Salim - 0.15.0-3 - removed references to copyrighted name - packaged modified tarball to prevent trademark infringement - patched configure to fix gettext detection on x86_64 --- NEW FILE grhino-cleanup.sh --- #!/bin/sh # Replaces occurences of trademarked names find . -name '*.po*' -print | while read i; do sed -i 's|An\ Othello\/Reversi|A\ Reversi|g' $i; done find . -name '*.cc' -print | while read i; do sed -i 's|An\ Othello\/Reversi|A\ Reversi|g' $i; done find . -name '*.xml' -print | while read i; do sed -i 's|an\ Othello\/Reversi|a\ Reversi|g' $i; sed -i 's|Othello\/Reversi|Reversi|g' $i; sed -i 's|Othello|Reversi|g' $i; done find . -name '*.omf*' -print | while read i; do sed -i 's|Othello\/Reversi|Reversi|g' $i; done grhino-configure-gettext.patch: --- NEW FILE grhino-configure-gettext.patch --- --- grhino-0.15.0/configure.orig 2005-04-15 09:03:04.000000000 -0500 +++ grhino-0.15.0/configure 2005-09-04 18:39:11.000000000 -0500 @@ -6310,6 +6310,8 @@ echo "$as_me:$LINENO: checking for GNU gettext in libc" >&5 echo $ECHO_N "checking for GNU gettext in libc... $ECHO_C" >&6 +# Force detection of gettext, since the test fails on x86_64 for FC4+ +gt_cv_func_gnugettext1_libc=yes if test "${gt_cv_func_gnugettext1_libc+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/grhino/FC-3/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 3 Sep 2005 23:40:58 -0000 1.2 +++ .cvsignore 5 Sep 2005 00:37:52 -0000 1.3 @@ -1 +1 @@ -grhino-0.15.0.tar.gz +grhino-0.15.0.tar.bz2 Index: grhino.desktop =================================================================== RCS file: /cvs/extras/rpms/grhino/FC-3/grhino.desktop,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- grhino.desktop 3 Sep 2005 23:40:58 -0000 1.1 +++ grhino.desktop 5 Sep 2005 00:37:52 -0000 1.2 @@ -1,8 +1,8 @@ [Desktop Entry] Encoding=UTF-8 Name=GRhino -GenericName=GNOME2 Othello/Reversi game -Comment=An Othello/Reversi game for GNOME 2 +GenericName=GTP-compliant Reversi game +Comment=Reversi game for GNOME, supporting the Go/Game Text Protocol Exec=grhino #Icon= Terminal=false Index: grhino.spec =================================================================== RCS file: /cvs/extras/rpms/grhino/FC-3/grhino.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- grhino.spec 3 Sep 2005 23:40:58 -0000 1.1 +++ grhino.spec 5 Sep 2005 00:37:52 -0000 1.2 @@ -1,14 +1,16 @@ Name: grhino Version: 0.15.0 -Release: 2%{?dist} -Summary: Othello/Reversi game +Release: 3%{?dist} +Summary: Reversi game for GNOME, supporting the Go/Game Text Protocol Group: Amusements/Games License: GPL URL: http://rhino.sourceforge.net/ -Source0: http://dl.sourceforge.net/rhino/grhino-%{version}.tar.gz +#Source0: http://dl.sourceforge.net/rhino/grhino-%{version}.tar.gz +Source0: grhino-%{version}.tar.bz2 Source1: %{name}.desktop Patch0: grhino-Makefile-in.patch +Patch1: grhino-configure-gettext.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils @@ -19,12 +21,12 @@ Requires(postun): scrollkeeper %description -GRhino, or Rhino its former name, is an Othello/Reversi game on Linux and other +GRhino, or Rhino its former name, is a Reversi game on Linux and other UNIX-like systems as long as GNOME 2 libraries are installed. It is currently under development and a new version is available occasionally. -What distinguish GRhino from most other Othello games is that GRhino will be -targeted for experienced Othello players. Strong AI is the main focus with some +What distinguish GRhino from most other Reversi games is that GRhino will be +targeted for experienced Reversi players. Strong AI is the main focus with some additional good, useful features (like an endgame solver) is planned. The ultimate target strength of the AI is that it should be able to beat the best human player at the highest difficulty level. Beating Logistello (the strongest @@ -33,12 +35,10 @@ GRhino supports the Go/Game Text Protocol (GTP), allowing it to be used as an engine for a GTP-compliant controller like Quarry. -Othello is a registered trademark of Tsukuda Original, licensed by Anjar Co., -copyright 1973, 1990 Pressman Toy Corporation. - %prep %setup -q %patch0 -p1 +%patch1 -p1 %build @@ -85,6 +85,11 @@ %changelog +* Sun Sep 4 2005 Michel Salim - 0.15.0-3 +- removed references to copyrighted name +- packaged modified tarball to prevent trademark infringement +- patched configure to fix gettext detection on x86_64 + * Fri Sep 2 2005 Michel Salim - 0.15.0-2 - changed BuildReq from libgnome-devel to libgnomeui-devel, which requires the former Index: sources =================================================================== RCS file: /cvs/extras/rpms/grhino/FC-3/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 3 Sep 2005 23:40:58 -0000 1.2 +++ sources 5 Sep 2005 00:37:52 -0000 1.3 @@ -1 +1 @@ -9f510356c0cfafe32165a582d872655f grhino-0.15.0.tar.gz +924f8288d479b8a99fb4bacb2b9f291f grhino-0.15.0.tar.bz2 From fedora-extras-commits at redhat.com Mon Sep 5 00:41:59 2005 From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma)) Date: Sun, 4 Sep 2005 20:41:59 -0400 Subject: rpms/grhino/FC-4 grhino-cleanup.sh,NONE,1.1 Message-ID: <200509050041.j850fxXM015533@cvs-int.fedora.redhat.com> Author: salimma Update of /cvs/extras/rpms/grhino/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15515 Added Files: grhino-cleanup.sh Log Message: Added missed-out cleanup script --- NEW FILE grhino-cleanup.sh --- #!/bin/sh # Replaces occurences of trademarked names find . -name '*.po*' -print | while read i; do sed -i 's|An\ Othello\/Reversi|A\ Reversi|g' $i; done find . -name '*.cc' -print | while read i; do sed -i 's|An\ Othello\/Reversi|A\ Reversi|g' $i; done find . -name '*.xml' -print | while read i; do sed -i 's|an\ Othello\/Reversi|a\ Reversi|g' $i; sed -i 's|Othello\/Reversi|Reversi|g' $i; sed -i 's|Othello|Reversi|g' $i; done find . -name '*.omf*' -print | while read i; do sed -i 's|Othello\/Reversi|Reversi|g' $i; done From fedora-extras-commits at redhat.com Mon Sep 5 01:32:09 2005 From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma)) Date: Sun, 4 Sep 2005 21:32:09 -0400 Subject: rpms/grhino/FC-4 grhino.spec,1.2,1.3 Message-ID: <200509050132.j851W9PI017190@cvs-int.fedora.redhat.com> Author: salimma Update of /cvs/extras/rpms/grhino/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17171 Modified Files: grhino.spec Log Message: * Sun Sep 4 2005 Michel Salim - 0.15.0-3.1 - subrevision bump to fix CVS tag mistake Index: grhino.spec =================================================================== RCS file: /cvs/extras/rpms/grhino/FC-4/grhino.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- grhino.spec 5 Sep 2005 00:29:06 -0000 1.2 +++ grhino.spec 5 Sep 2005 01:32:07 -0000 1.3 @@ -1,6 +1,6 @@ Name: grhino Version: 0.15.0 -Release: 3%{?dist} +Release: 3.1%{?dist} Summary: Reversi game for GNOME, supporting the Go/Game Text Protocol Group: Amusements/Games @@ -85,6 +85,9 @@ %changelog +* Sun Sep 4 2005 Michel Salim - 0.15.0-3.1 +- subrevision bump to fix CVS tag mistake + * Sun Sep 4 2005 Michel Salim - 0.15.0-3 - removed references to copyrighted name - packaged modified tarball to prevent trademark infringement From fedora-extras-commits at redhat.com Mon Sep 5 02:43:42 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sun, 4 Sep 2005 22:43:42 -0400 Subject: rpms/perl-CGI-Simple/devel perl-CGI-Simple.spec,1.1,1.2 Message-ID: <200509050243.j852hgPH018684@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-CGI-Simple/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18631/devel Modified Files: perl-CGI-Simple.spec Log Message: License texts, remove BR: perl Index: perl-CGI-Simple.spec =================================================================== RCS file: /cvs/extras/rpms/perl-CGI-Simple/devel/perl-CGI-Simple.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-CGI-Simple.spec 30 Jul 2005 03:09:34 -0000 1.1 +++ perl-CGI-Simple.spec 5 Sep 2005 02:43:40 -0000 1.2 @@ -1,6 +1,6 @@ Name: perl-CGI-Simple Version: 0.077 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Simple totally OO CGI interface that is CGI.pm compliant Group: Development/Libraries License: GPL or Artistic @@ -9,7 +9,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -BuildRequires: perl >= 1:5.6.1 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description @@ -18,6 +17,8 @@ %prep %setup -q -n Cgi-Simple-%{version} chmod -x Changes README cgi-simple_vs_cgi-pm.html Simple.pm Simple/*.pm +perldoc -t perlartistic > Artistic +perldoc -t perlgpl > COPYING %build %{__perl} Makefile.PL INSTALLDIRS=vendor @@ -38,12 +39,16 @@ %files %defattr(-,root,root,-) -%doc Changes README cgi-simple_vs_cgi-pm.html +%doc Artistic COPYING Changes README cgi-simple_vs_cgi-pm.html %{perl_vendorlib}/CGI %{_mandir}/man3/*.3* %changelog +* Sun Sep 4 2005 Tom "spot" Callaway 0.077-5 +- remove BR: perl +- add license texts + * Fri Jul 29 2005 Tom "spot" Callaway 0.077-4 - cleanup chmod -x From fedora-extras-commits at redhat.com Mon Sep 5 02:43:36 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sun, 4 Sep 2005 22:43:36 -0400 Subject: rpms/perl-CGI-Simple/FC-3 perl-CGI-Simple.spec,1.1,1.2 Message-ID: <200509050244.j852i7I4018687@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-CGI-Simple/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18631/FC-3 Modified Files: perl-CGI-Simple.spec Log Message: License texts, remove BR: perl Index: perl-CGI-Simple.spec =================================================================== RCS file: /cvs/extras/rpms/perl-CGI-Simple/FC-3/perl-CGI-Simple.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-CGI-Simple.spec 30 Jul 2005 03:09:34 -0000 1.1 +++ perl-CGI-Simple.spec 5 Sep 2005 02:43:34 -0000 1.2 @@ -1,6 +1,6 @@ Name: perl-CGI-Simple Version: 0.077 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Simple totally OO CGI interface that is CGI.pm compliant Group: Development/Libraries License: GPL or Artistic @@ -9,7 +9,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -BuildRequires: perl >= 1:5.6.1 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description @@ -18,6 +17,8 @@ %prep %setup -q -n Cgi-Simple-%{version} chmod -x Changes README cgi-simple_vs_cgi-pm.html Simple.pm Simple/*.pm +perldoc -t perlartistic > Artistic +perldoc -t perlgpl > COPYING %build %{__perl} Makefile.PL INSTALLDIRS=vendor @@ -38,12 +39,16 @@ %files %defattr(-,root,root,-) -%doc Changes README cgi-simple_vs_cgi-pm.html +%doc Artistic COPYING Changes README cgi-simple_vs_cgi-pm.html %{perl_vendorlib}/CGI %{_mandir}/man3/*.3* %changelog +* Sun Sep 4 2005 Tom "spot" Callaway 0.077-5 +- remove BR: perl +- add license texts + * Fri Jul 29 2005 Tom "spot" Callaway 0.077-4 - cleanup chmod -x From fedora-extras-commits at redhat.com Mon Sep 5 02:43:37 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sun, 4 Sep 2005 22:43:37 -0400 Subject: rpms/perl-CGI-Simple/FC-4 perl-CGI-Simple.spec,1.1,1.2 Message-ID: <200509050244.j852i7IW018690@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-CGI-Simple/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18631/FC-4 Modified Files: perl-CGI-Simple.spec Log Message: License texts, remove BR: perl Index: perl-CGI-Simple.spec =================================================================== RCS file: /cvs/extras/rpms/perl-CGI-Simple/FC-4/perl-CGI-Simple.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-CGI-Simple.spec 30 Jul 2005 03:09:34 -0000 1.1 +++ perl-CGI-Simple.spec 5 Sep 2005 02:43:35 -0000 1.2 @@ -1,6 +1,6 @@ Name: perl-CGI-Simple Version: 0.077 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Simple totally OO CGI interface that is CGI.pm compliant Group: Development/Libraries License: GPL or Artistic @@ -9,7 +9,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -BuildRequires: perl >= 1:5.6.1 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description @@ -18,6 +17,8 @@ %prep %setup -q -n Cgi-Simple-%{version} chmod -x Changes README cgi-simple_vs_cgi-pm.html Simple.pm Simple/*.pm +perldoc -t perlartistic > Artistic +perldoc -t perlgpl > COPYING %build %{__perl} Makefile.PL INSTALLDIRS=vendor @@ -38,12 +39,16 @@ %files %defattr(-,root,root,-) -%doc Changes README cgi-simple_vs_cgi-pm.html +%doc Artistic COPYING Changes README cgi-simple_vs_cgi-pm.html %{perl_vendorlib}/CGI %{_mandir}/man3/*.3* %changelog +* Sun Sep 4 2005 Tom "spot" Callaway 0.077-5 +- remove BR: perl +- add license texts + * Fri Jul 29 2005 Tom "spot" Callaway 0.077-4 - cleanup chmod -x From fedora-extras-commits at redhat.com Mon Sep 5 02:54:39 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sun, 4 Sep 2005 22:54:39 -0400 Subject: rpms/c-ares/FC-3 c-ares.spec,1.3,1.4 sources,1.2,1.3 Message-ID: <200509050254.j852sdp9018904@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/c-ares/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18852/FC-3 Modified Files: c-ares.spec sources Log Message: Add license, bump to 1.3.0 Index: c-ares.spec =================================================================== RCS file: /cvs/extras/rpms/c-ares/FC-3/c-ares.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- c-ares.spec 31 May 2005 14:45:24 -0000 1.3 +++ c-ares.spec 5 Sep 2005 02:54:37 -0000 1.4 @@ -1,11 +1,12 @@ Summary: A library that performs asynchronous DNS operations Name: c-ares -Version: 1.2.1 -Release: 4%{?dist} +Version: 1.3.0 +Release: 1%{?dist} License: MIT Group: System Environment/Libraries URL: http://daniel.haxx.se/projects/c-ares/ -Source0: http://daniel.haxx.se/projects/c-ares/c-ares-1.2.1.tar.gz +Source0: http://daniel.haxx.se/projects/c-ares/c-ares-%{version}.tar.gz +Source1: LICENSE BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description @@ -24,6 +25,7 @@ %prep %setup -q +cp %{SOURCE1} . %build %configure --enable-shared @@ -42,7 +44,7 @@ %files %defattr(-, root, root) -%doc README README.cares CHANGES NEWS +%doc README README.cares CHANGES NEWS LICENSE %{_libdir}/*.so.* %files devel @@ -54,6 +56,10 @@ %{_mandir}/man3/ares_* %changelog +* Sun Sep 4 2005 Tom "spot" Callaway 1.3.0-1 +- include LICENSE text +- bump to 1.3.0 + * Tue May 31 2005 Tom "spot" Callaway 1.2.1-4 - use dist tag to prevent EVR overlap Index: sources =================================================================== RCS file: /cvs/extras/rpms/c-ares/FC-3/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 22 Apr 2005 19:34:04 -0000 1.2 +++ sources 5 Sep 2005 02:54:37 -0000 1.3 @@ -1 +1 @@ -8269643c78a02a1745e24fb4e2367ab0 c-ares-1.2.1.tar.gz +badb4563a02d4188b478df31fa1b657d c-ares-1.3.0.tar.gz From fedora-extras-commits at redhat.com Mon Sep 5 02:54:40 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sun, 4 Sep 2005 22:54:40 -0400 Subject: rpms/c-ares/devel .cvsignore, 1.2, 1.3 c-ares.spec, 1.3, 1.4 sources, 1.2, 1.3 Message-ID: <200509050254.j852se5h018917@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/c-ares/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18852/devel Modified Files: .cvsignore c-ares.spec sources Log Message: Add license, bump to 1.3.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/c-ares/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 22 Apr 2005 19:34:04 -0000 1.2 +++ .cvsignore 5 Sep 2005 02:54:37 -0000 1.3 @@ -1 +1,2 @@ c-ares-1.2.1.tar.gz +c-ares-1.3.0.tar.gz Index: c-ares.spec =================================================================== RCS file: /cvs/extras/rpms/c-ares/devel/c-ares.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- c-ares.spec 31 May 2005 14:45:25 -0000 1.3 +++ c-ares.spec 5 Sep 2005 02:54:37 -0000 1.4 @@ -1,11 +1,12 @@ Summary: A library that performs asynchronous DNS operations Name: c-ares -Version: 1.2.1 -Release: 4%{?dist} +Version: 1.3.0 +Release: 1%{?dist} License: MIT Group: System Environment/Libraries URL: http://daniel.haxx.se/projects/c-ares/ -Source0: http://daniel.haxx.se/projects/c-ares/c-ares-1.2.1.tar.gz +Source0: http://daniel.haxx.se/projects/c-ares/c-ares-%{version}.tar.gz +Source1: LICENSE BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description @@ -24,6 +25,7 @@ %prep %setup -q +cp %{SOURCE1} . %build %configure --enable-shared @@ -42,7 +44,7 @@ %files %defattr(-, root, root) -%doc README README.cares CHANGES NEWS +%doc README README.cares CHANGES NEWS LICENSE %{_libdir}/*.so.* %files devel @@ -54,6 +56,10 @@ %{_mandir}/man3/ares_* %changelog +* Sun Sep 4 2005 Tom "spot" Callaway 1.3.0-1 +- include LICENSE text +- bump to 1.3.0 + * Tue May 31 2005 Tom "spot" Callaway 1.2.1-4 - use dist tag to prevent EVR overlap Index: sources =================================================================== RCS file: /cvs/extras/rpms/c-ares/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 22 Apr 2005 19:34:04 -0000 1.2 +++ sources 5 Sep 2005 02:54:37 -0000 1.3 @@ -1 +1 @@ -8269643c78a02a1745e24fb4e2367ab0 c-ares-1.2.1.tar.gz +badb4563a02d4188b478df31fa1b657d c-ares-1.3.0.tar.gz From fedora-extras-commits at redhat.com Mon Sep 5 02:54:39 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sun, 4 Sep 2005 22:54:39 -0400 Subject: rpms/c-ares/FC-4 c-ares.spec,1.3,1.4 sources,1.2,1.3 Message-ID: <200509050254.j852sd4l018911@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/c-ares/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18852/FC-4 Modified Files: c-ares.spec sources Log Message: Add license, bump to 1.3.0 Index: c-ares.spec =================================================================== RCS file: /cvs/extras/rpms/c-ares/FC-4/c-ares.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- c-ares.spec 31 May 2005 14:45:25 -0000 1.3 +++ c-ares.spec 5 Sep 2005 02:54:37 -0000 1.4 @@ -1,11 +1,12 @@ Summary: A library that performs asynchronous DNS operations Name: c-ares -Version: 1.2.1 -Release: 4%{?dist} +Version: 1.3.0 +Release: 1%{?dist} License: MIT Group: System Environment/Libraries URL: http://daniel.haxx.se/projects/c-ares/ -Source0: http://daniel.haxx.se/projects/c-ares/c-ares-1.2.1.tar.gz +Source0: http://daniel.haxx.se/projects/c-ares/c-ares-%{version}.tar.gz +Source1: LICENSE BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description @@ -24,6 +25,7 @@ %prep %setup -q +cp %{SOURCE1} . %build %configure --enable-shared @@ -42,7 +44,7 @@ %files %defattr(-, root, root) -%doc README README.cares CHANGES NEWS +%doc README README.cares CHANGES NEWS LICENSE %{_libdir}/*.so.* %files devel @@ -54,6 +56,10 @@ %{_mandir}/man3/ares_* %changelog +* Sun Sep 4 2005 Tom "spot" Callaway 1.3.0-1 +- include LICENSE text +- bump to 1.3.0 + * Tue May 31 2005 Tom "spot" Callaway 1.2.1-4 - use dist tag to prevent EVR overlap Index: sources =================================================================== RCS file: /cvs/extras/rpms/c-ares/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 22 Apr 2005 19:34:04 -0000 1.2 +++ sources 5 Sep 2005 02:54:37 -0000 1.3 @@ -1 +1 @@ -8269643c78a02a1745e24fb4e2367ab0 c-ares-1.2.1.tar.gz +badb4563a02d4188b478df31fa1b657d c-ares-1.3.0.tar.gz From fedora-extras-commits at redhat.com Mon Sep 5 02:55:36 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sun, 4 Sep 2005 22:55:36 -0400 Subject: rpms/c-ares/FC-3 LICENSE,NONE,1.1 Message-ID: <200509050255.j852ta2l018968@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/c-ares/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18941/FC-3 Added Files: LICENSE Log Message: license text --- NEW FILE LICENSE --- Copyright (C) 2004 by Daniel Stenberg et al Permission to use, copy, modify, and distribute this software and its documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all copies and that both that copyright notice and this permission notice appear in supporting documentation, and that the name of M.I.T. not be used in advertising or publicity pertaining to distribution of the software without specific, written prior permission. M.I.T. makes no representations about the suitability of this software for any purpose. It is provided "as is" without express or implied warranty. From fedora-extras-commits at redhat.com Mon Sep 5 02:55:42 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sun, 4 Sep 2005 22:55:42 -0400 Subject: rpms/c-ares/devel LICENSE,NONE,1.1 Message-ID: <200509050255.j852tgKi018999@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/c-ares/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18941/devel Added Files: LICENSE Log Message: license text --- NEW FILE LICENSE --- Copyright (C) 2004 by Daniel Stenberg et al Permission to use, copy, modify, and distribute this software and its documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all copies and that both that copyright notice and this permission notice appear in supporting documentation, and that the name of M.I.T. not be used in advertising or publicity pertaining to distribution of the software without specific, written prior permission. M.I.T. makes no representations about the suitability of this software for any purpose. It is provided "as is" without express or implied warranty. From fedora-extras-commits at redhat.com Mon Sep 5 02:55:37 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sun, 4 Sep 2005 22:55:37 -0400 Subject: rpms/c-ares/FC-4 LICENSE,NONE,1.1 Message-ID: <200509050255.j852tbTF018973@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/c-ares/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18941/FC-4 Added Files: LICENSE Log Message: license text --- NEW FILE LICENSE --- Copyright (C) 2004 by Daniel Stenberg et al Permission to use, copy, modify, and distribute this software and its documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all copies and that both that copyright notice and this permission notice appear in supporting documentation, and that the name of M.I.T. not be used in advertising or publicity pertaining to distribution of the software without specific, written prior permission. M.I.T. makes no representations about the suitability of this software for any purpose. It is provided "as is" without express or implied warranty. From fedora-extras-commits at redhat.com Mon Sep 5 03:04:07 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sun, 4 Sep 2005 23:04:07 -0400 Subject: rpms/dkms/FC-4 dkms.spec,1.2,1.3 sources,1.2,1.3 Message-ID: <200509050305.j853580T020481@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/dkms/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20416/FC-4 Modified Files: dkms.spec sources Log Message: Bump to 2.0.6, fix license text Index: dkms.spec =================================================================== RCS file: /cvs/extras/rpms/dkms/FC-4/dkms.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- dkms.spec 1 Apr 2005 14:11:56 -0000 1.2 +++ dkms.spec 5 Sep 2005 03:04:05 -0000 1.3 @@ -1,14 +1,14 @@ Summary: Dynamic Kernel Module Support Framework Name: dkms -Version: 2.0.5.2 -Release: 3 +Version: 2.0.6 +Release: 1%{?dist} License: GPL Group: System Environment/Base BuildArch: noarch Requires: sed gawk findutils modutils tar cpio gzip grep mktemp Requires: bash > 1.99 Provides: dkms-minimal -Source0: dkms-%version.tar.gz +Source0: http://linux.dell.com/dkms/dkms-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description @@ -84,6 +84,7 @@ %files %defattr(-,root,root) +%doc AUTHORS COPYING %attr(0755,root,root) /usr/sbin/dkms %attr(0755,root,root) /var/lib/dkms %attr(0755,root,root) /etc/init.d/dkms_autoinstaller @@ -100,6 +101,13 @@ %changelog +* Sun Sep 4 2005 Tom "spot" Callaway 2.0.6-1 +- bump to 2.0.6 +- include COPYING AUTHORS in %%doc + +* Tue May 31 2005 Tom "spot" Callaway 2.0.5.2-4 +- dist tag + * Fri Apr 1 2005 Michael Schwendt 2.0.5.2-3 - Include /etc/dkms directory. Index: sources =================================================================== RCS file: /cvs/extras/rpms/dkms/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 15 Mar 2005 15:48:34 -0000 1.2 +++ sources 5 Sep 2005 03:04:05 -0000 1.3 @@ -1 +1 @@ -0e3030c92d21613a726563f8b94788d1 dkms-2.0.5.2.tar.gz +51606322c10e746ae40a7ebbdeec333d dkms-2.0.6.tar.gz From fedora-extras-commits at redhat.com Mon Sep 5 03:04:04 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sun, 4 Sep 2005 23:04:04 -0400 Subject: rpms/dkms/FC-3 dkms.spec,1.2,1.3 sources,1.2,1.3 Message-ID: <200509050305.j85355hZ020476@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/dkms/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20416/FC-3 Modified Files: dkms.spec sources Log Message: Bump to 2.0.6, fix license text Index: dkms.spec =================================================================== RCS file: /cvs/extras/rpms/dkms/FC-3/dkms.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- dkms.spec 31 May 2005 15:22:12 -0000 1.2 +++ dkms.spec 5 Sep 2005 03:03:56 -0000 1.3 @@ -1,14 +1,14 @@ Summary: Dynamic Kernel Module Support Framework Name: dkms -Version: 2.0.5.2 -Release: 4%{?dist} +Version: 2.0.6 +Release: 1%{?dist} License: GPL Group: System Environment/Base BuildArch: noarch Requires: sed gawk findutils modutils tar cpio gzip grep mktemp Requires: bash > 1.99 Provides: dkms-minimal -Source0: dkms-%version.tar.gz +Source0: http://linux.dell.com/dkms/dkms-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description @@ -84,6 +84,7 @@ %files %defattr(-,root,root) +%doc AUTHORS COPYING %attr(0755,root,root) /usr/sbin/dkms %attr(0755,root,root) /var/lib/dkms %attr(0755,root,root) /etc/init.d/dkms_autoinstaller @@ -100,6 +101,10 @@ %changelog +* Sun Sep 4 2005 Tom "spot" Callaway 2.0.6-1 +- bump to 2.0.6 +- include COPYING AUTHORS in %%doc + * Tue May 31 2005 Tom "spot" Callaway 2.0.5.2-4 - dist tag Index: sources =================================================================== RCS file: /cvs/extras/rpms/dkms/FC-3/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 15 Mar 2005 15:48:34 -0000 1.2 +++ sources 5 Sep 2005 03:03:56 -0000 1.3 @@ -1 +1 @@ -0e3030c92d21613a726563f8b94788d1 dkms-2.0.5.2.tar.gz +51606322c10e746ae40a7ebbdeec333d dkms-2.0.6.tar.gz From fedora-extras-commits at redhat.com Mon Sep 5 03:04:36 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sun, 4 Sep 2005 23:04:36 -0400 Subject: rpms/dkms/devel .cvsignore, 1.2, 1.3 dkms.spec, 1.3, 1.4 sources, 1.2, 1.3 Message-ID: <200509050305.j85356KN020479@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/dkms/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20416/devel Modified Files: .cvsignore dkms.spec sources Log Message: Bump to 2.0.6, fix license text Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/dkms/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 15 Mar 2005 15:48:34 -0000 1.2 +++ .cvsignore 5 Sep 2005 03:04:33 -0000 1.3 @@ -1 +1,2 @@ dkms-2.0.5.2.tar.gz +dkms-2.0.6.tar.gz Index: dkms.spec =================================================================== RCS file: /cvs/extras/rpms/dkms/devel/dkms.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- dkms.spec 31 May 2005 15:22:12 -0000 1.3 +++ dkms.spec 5 Sep 2005 03:04:33 -0000 1.4 @@ -1,14 +1,14 @@ Summary: Dynamic Kernel Module Support Framework Name: dkms -Version: 2.0.5.2 -Release: 4%{?dist} +Version: 2.0.6 +Release: 1%{?dist} License: GPL Group: System Environment/Base BuildArch: noarch Requires: sed gawk findutils modutils tar cpio gzip grep mktemp Requires: bash > 1.99 Provides: dkms-minimal -Source0: dkms-%version.tar.gz +Source0: http://linux.dell.com/dkms/dkms-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description @@ -84,6 +84,7 @@ %files %defattr(-,root,root) +%doc AUTHORS COPYING %attr(0755,root,root) /usr/sbin/dkms %attr(0755,root,root) /var/lib/dkms %attr(0755,root,root) /etc/init.d/dkms_autoinstaller @@ -100,6 +101,10 @@ %changelog +* Sun Sep 4 2005 Tom "spot" Callaway 2.0.6-1 +- bump to 2.0.6 +- include COPYING AUTHORS in %%doc + * Tue May 31 2005 Tom "spot" Callaway 2.0.5.2-4 - dist tag Index: sources =================================================================== RCS file: /cvs/extras/rpms/dkms/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 15 Mar 2005 15:48:34 -0000 1.2 +++ sources 5 Sep 2005 03:04:33 -0000 1.3 @@ -1 +1 @@ -0e3030c92d21613a726563f8b94788d1 dkms-2.0.5.2.tar.gz +51606322c10e746ae40a7ebbdeec333d dkms-2.0.6.tar.gz From fedora-extras-commits at redhat.com Mon Sep 5 08:04:07 2005 From: fedora-extras-commits at redhat.com (Mark Cox (mjc)) Date: Mon, 5 Sep 2005 04:04:07 -0400 Subject: fedora-security/audit fc4,1.53,1.54 Message-ID: <200509050804.j8584b25027668@cvs-int.fedora.redhat.com> Author: mjc Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27649 Modified Files: fc4 Log Message: This weekends updates Index: fc4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc4,v retrieving revision 1.53 retrieving revision 1.54 diff -u -r1.53 -r1.54 --- fc4 29 Aug 2005 13:00:44 -0000 1.53 +++ fc4 5 Sep 2005 08:04:04 -0000 1.54 @@ -1,13 +1,15 @@ -Up to date CVE as of CVE email 20050825 -Up to date FC4 as of 20050825 +Up to date CVE as of CVE email 20050904 +Up to date FC4 as of 20050904 ** are items that need attention +2005-2728 ** httpd 2005-2693 backport (cvs) [since FEDORA-2005-790] 2005-2672 VULNERABLE (lm_sensors) bz#166673 2005-2666 ** openssh (hmm) 2005-2558 ignore (mysql) not an issue 2005-2499 backport (slocate) [since FEDORA-2005-770] +2005-2496 backport (ntp, fixed 4.2.0b) ...0a-20040617-ntpd_guid.patch 2005-2491 VULNERABLE (python pcre) 2005-2491 backport (pcre, fixed 6.2) [since FEDORA-2005-803] 2005-2491 ignore (httpd, pcre uses system pcre) @@ -290,6 +292,7 @@ 2005-0448 VULNERABLE (perl) 2005-0446 version (squid, fixed 2.5.STABLE9) 2005-0404 ignore (kde) won't fix http://bugs.kde.org/show_bug.cgi?id=96020 +2005-0403 version (kernel, not upstream) 2005-0402 version (firefox, fixed 1.0.2) 2005-0401 version (firefox, fixed 1.0.2) 2005-0401 version (mozilla, fixed 1.7.7) @@ -332,7 +335,7 @@ 2005-0205 version (kdenetwork, not 3.3 onwards) 2005-0204 version (kernel, didn't affect upstream) 2005-0202 backport (mailman, fixed 2.1.6) from srpm -2005-0201 version (dbus) +2005-0201 backport (dbus) [since FEDORA-2005-822] 2005-0194 version (squid, fixed 2.5.STABLE8) 2005-0180 version (kernel, fixed 2.6.11) 2005-0179 version (kernel, fixed 2.6.11) From fedora-extras-commits at redhat.com Mon Sep 5 15:12:35 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 5 Sep 2005 11:12:35 -0400 Subject: rpms/gambas/devel gambas-1.0.11-desktopfix.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 gambas.spec, 1.7, 1.8 sources, 1.4, 1.5 Message-ID: <200509051512.j85FCZvx005533@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/gambas/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5465/devel Modified Files: .cvsignore gambas.spec sources Added Files: gambas-1.0.11-desktopfix.patch Log Message: Bump to gambas 1.0.11, add desktop entry, icon. gambas-1.0.11-desktopfix.patch: --- NEW FILE gambas-1.0.11-desktopfix.patch --- --- gambas-1.0.11/debian/gambas.desktop.DESK 2004-09-22 06:10:47.000000000 -0500 +++ gambas-1.0.11/debian/gambas.desktop 2005-09-05 00:01:06.000000000 -0500 @@ -1,14 +1,12 @@ [Desktop Entry] Encoding=UTF-8 -Version=1.0 Exec=gambas -TryExec= Icon=/usr/share/pixmaps/gambas.png -X-GNOME-DocPath= Terminal=false Name=Gambas Name[es_ES]=Gambas -GenericName[es_ES]= +GenericName=Basic IDE +Comment=IDE based on a Basic interpreter Comment[es_ES]=Gambas casi es Visual Basic Type=Application Categories=GNOME;Application;Development; Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gambas/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 13 Jun 2005 16:43:05 -0000 1.2 +++ .cvsignore 5 Sep 2005 15:12:33 -0000 1.3 @@ -1 +1,2 @@ gambas-1.0.6.tar.bz2 +gambas-1.0.11.tar.bz2 Index: gambas.spec =================================================================== RCS file: /cvs/extras/rpms/gambas/devel/gambas.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- gambas.spec 29 Jul 2005 19:17:28 -0000 1.7 +++ gambas.spec 5 Sep 2005 15:12:33 -0000 1.8 @@ -1,7 +1,7 @@ Name: gambas Summary: IDE based on a basic interpreter with object extensions -Version: 1.0.9 -Release: 2%{?dist} +Version: 1.0.11 +Release: 1%{?dist} License: GPL Group: Development/Tools URL: http://gambas.sourceforge.net/ @@ -9,6 +9,9 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: kdelibs-devel, automake, autoconf, SDL-devel BuildRequires: mysql-devel, postgresql-devel, sqlite2-devel +BuildRequires: desktop-file-utils +Requires(post): desktop-file-utils +Requires(postun): desktop-file-utils # Code is not 64 bit clean. ExcludeArch: x86_64 # Code is not endian clean. @@ -16,6 +19,7 @@ Patch0: gambas-1.0.9-gcc4.patch Patch1: gambas-1.0.6-dont-make-links.patch Patch2: gambas-1.0.6-noopt.patch +Patch3: gambas-1.0.11-desktopfix.patch %description Gambas is a free development environment based on a Basic interpreter @@ -55,6 +59,7 @@ %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 %build # Gambas can't deal with -Wp,-D_FORTIFY_SOURCE=2 @@ -81,15 +86,29 @@ rm -rf $RPM_BUILD_ROOT export PATH=$RPM_BUILD_ROOT/usr/bin:$PATH make DESTDIR=$RPM_BUILD_ROOT install -rm -rf $RPM_BUILD_ROOT/%{_libdir}/gambas/*.la +rm -rf $RPM_BUILD_ROOT%{_libdir}/gambas/*.la +mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps +mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications +install -m0644 ./app/gambas/.icon/32.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/gambas.png install src/share/gambas.h $RPM_BUILD_ROOT/%{_includedir} +desktop-file-install --vendor fedora \ + --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ + --add-category X-Fedora \ + debian/gambas.desktop + %clean rm -rf $RPM_BUILD_ROOT -%post -p /sbin/ldconfig - -%postun -p /sbin/ldconfig +%post +/sbin/ldconfig +update-desktop-database %{_datadir}/applications &> /dev/null + +%postun +/sbin/ldconfig +if [ "$1" = "0" ]; then + update-desktop-database %{_datadir}/applications &> /dev/null +fi %files %defattr(-, root, root, 0755) @@ -103,6 +122,8 @@ %{_bindir}/gbi %{_bindir}/gbx %{_bindir}/gambas-database-manager +%{_datadir}/pixmaps/gambas.png +%{_datadir}/applications/*.desktop %files devel %defattr(-, root, root, 0755) @@ -121,6 +142,10 @@ %{_datadir}/gambas/examples %changelog +* Sun Sep 4 2005 Tom "spot" Callaway 1.0.11-1 +- bump to 1.0.11 +- add gambas.desktop, gambas.png + * Fri Jul 29 2005 Tom "spot" Callaway 1.0.9-2 - put in correct patch Index: sources =================================================================== RCS file: /cvs/extras/rpms/gambas/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 29 Jul 2005 19:06:54 -0000 1.4 +++ sources 5 Sep 2005 15:12:33 -0000 1.5 @@ -1,3 +1,4 @@ 608772c93233eea4e488ba3bd1c2ac83 gambas-1.0.6.tar.bz2 730b690c72689e26888698233fdef726 gambas-1.0.8.tar.bz2 888494096dfb4f497dcfed58179980fa gambas-1.0.9.tar.bz2 +819eab8e69f71a76248c2679b3af9946 gambas-1.0.11.tar.bz2 From fedora-extras-commits at redhat.com Mon Sep 5 15:12:29 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 5 Sep 2005 11:12:29 -0400 Subject: rpms/gambas/FC-3 gambas-1.0.11-desktopfix.patch, NONE, 1.1 gambas.spec, 1.7, 1.8 sources, 1.4, 1.5 Message-ID: <200509051512.j85FCxPr005537@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/gambas/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5465/FC-3 Modified Files: gambas.spec sources Added Files: gambas-1.0.11-desktopfix.patch Log Message: Bump to gambas 1.0.11, add desktop entry, icon. gambas-1.0.11-desktopfix.patch: --- NEW FILE gambas-1.0.11-desktopfix.patch --- --- gambas-1.0.11/debian/gambas.desktop.DESK 2004-09-22 06:10:47.000000000 -0500 +++ gambas-1.0.11/debian/gambas.desktop 2005-09-05 00:01:06.000000000 -0500 @@ -1,14 +1,12 @@ [Desktop Entry] Encoding=UTF-8 -Version=1.0 Exec=gambas -TryExec= Icon=/usr/share/pixmaps/gambas.png -X-GNOME-DocPath= Terminal=false Name=Gambas Name[es_ES]=Gambas -GenericName[es_ES]= +GenericName=Basic IDE +Comment=IDE based on a Basic interpreter Comment[es_ES]=Gambas casi es Visual Basic Type=Application Categories=GNOME;Application;Development; Index: gambas.spec =================================================================== RCS file: /cvs/extras/rpms/gambas/FC-3/gambas.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- gambas.spec 29 Jul 2005 19:17:23 -0000 1.7 +++ gambas.spec 5 Sep 2005 15:12:26 -0000 1.8 @@ -1,7 +1,7 @@ Name: gambas Summary: IDE based on a basic interpreter with object extensions -Version: 1.0.9 -Release: 2%{?dist} +Version: 1.0.11 +Release: 1%{?dist} License: GPL Group: Development/Tools URL: http://gambas.sourceforge.net/ @@ -9,6 +9,9 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: kdelibs-devel, automake, autoconf, SDL-devel BuildRequires: mysql-devel, postgresql-devel, sqlite2-devel +BuildRequires: desktop-file-utils +Requires(post): desktop-file-utils +Requires(postun): desktop-file-utils # Code is not 64 bit clean. ExcludeArch: x86_64 # Code is not endian clean. @@ -16,6 +19,7 @@ Patch0: gambas-1.0.9-gcc4.patch Patch1: gambas-1.0.6-dont-make-links.patch Patch2: gambas-1.0.6-noopt.patch +Patch3: gambas-1.0.11-desktopfix.patch %description Gambas is a free development environment based on a Basic interpreter @@ -55,6 +59,7 @@ %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 %build # Gambas can't deal with -Wp,-D_FORTIFY_SOURCE=2 @@ -81,15 +86,29 @@ rm -rf $RPM_BUILD_ROOT export PATH=$RPM_BUILD_ROOT/usr/bin:$PATH make DESTDIR=$RPM_BUILD_ROOT install -rm -rf $RPM_BUILD_ROOT/%{_libdir}/gambas/*.la +rm -rf $RPM_BUILD_ROOT%{_libdir}/gambas/*.la +mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps +mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications +install -m0644 ./app/gambas/.icon/32.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/gambas.png install src/share/gambas.h $RPM_BUILD_ROOT/%{_includedir} +desktop-file-install --vendor fedora \ + --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ + --add-category X-Fedora \ + debian/gambas.desktop + %clean rm -rf $RPM_BUILD_ROOT -%post -p /sbin/ldconfig - -%postun -p /sbin/ldconfig +%post +/sbin/ldconfig +update-desktop-database %{_datadir}/applications &> /dev/null + +%postun +/sbin/ldconfig +if [ "$1" = "0" ]; then + update-desktop-database %{_datadir}/applications &> /dev/null +fi %files %defattr(-, root, root, 0755) @@ -103,6 +122,8 @@ %{_bindir}/gbi %{_bindir}/gbx %{_bindir}/gambas-database-manager +%{_datadir}/pixmaps/gambas.png +%{_datadir}/applications/*.desktop %files devel %defattr(-, root, root, 0755) @@ -121,6 +142,10 @@ %{_datadir}/gambas/examples %changelog +* Sun Sep 4 2005 Tom "spot" Callaway 1.0.11-1 +- bump to 1.0.11 +- add gambas.desktop, gambas.png + * Fri Jul 29 2005 Tom "spot" Callaway 1.0.9-2 - put in correct patch Index: sources =================================================================== RCS file: /cvs/extras/rpms/gambas/FC-3/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 29 Jul 2005 19:06:53 -0000 1.4 +++ sources 5 Sep 2005 15:12:26 -0000 1.5 @@ -1,3 +1,4 @@ 608772c93233eea4e488ba3bd1c2ac83 gambas-1.0.6.tar.bz2 730b690c72689e26888698233fdef726 gambas-1.0.8.tar.bz2 888494096dfb4f497dcfed58179980fa gambas-1.0.9.tar.bz2 +819eab8e69f71a76248c2679b3af9946 gambas-1.0.11.tar.bz2 From fedora-extras-commits at redhat.com Mon Sep 5 15:12:30 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 5 Sep 2005 11:12:30 -0400 Subject: rpms/gambas/FC-4 gambas-1.0.11-desktopfix.patch, NONE, 1.1 gambas.spec, 1.7, 1.8 sources, 1.4, 1.5 Message-ID: <200509051513.j85FD0JD005541@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/gambas/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5465/FC-4 Modified Files: gambas.spec sources Added Files: gambas-1.0.11-desktopfix.patch Log Message: Bump to gambas 1.0.11, add desktop entry, icon. gambas-1.0.11-desktopfix.patch: --- NEW FILE gambas-1.0.11-desktopfix.patch --- --- gambas-1.0.11/debian/gambas.desktop.DESK 2004-09-22 06:10:47.000000000 -0500 +++ gambas-1.0.11/debian/gambas.desktop 2005-09-05 00:01:06.000000000 -0500 @@ -1,14 +1,12 @@ [Desktop Entry] Encoding=UTF-8 -Version=1.0 Exec=gambas -TryExec= Icon=/usr/share/pixmaps/gambas.png -X-GNOME-DocPath= Terminal=false Name=Gambas Name[es_ES]=Gambas -GenericName[es_ES]= +GenericName=Basic IDE +Comment=IDE based on a Basic interpreter Comment[es_ES]=Gambas casi es Visual Basic Type=Application Categories=GNOME;Application;Development; Index: gambas.spec =================================================================== RCS file: /cvs/extras/rpms/gambas/FC-4/gambas.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- gambas.spec 29 Jul 2005 19:17:23 -0000 1.7 +++ gambas.spec 5 Sep 2005 15:12:28 -0000 1.8 @@ -1,7 +1,7 @@ Name: gambas Summary: IDE based on a basic interpreter with object extensions -Version: 1.0.9 -Release: 2%{?dist} +Version: 1.0.11 +Release: 1%{?dist} License: GPL Group: Development/Tools URL: http://gambas.sourceforge.net/ @@ -9,6 +9,9 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: kdelibs-devel, automake, autoconf, SDL-devel BuildRequires: mysql-devel, postgresql-devel, sqlite2-devel +BuildRequires: desktop-file-utils +Requires(post): desktop-file-utils +Requires(postun): desktop-file-utils # Code is not 64 bit clean. ExcludeArch: x86_64 # Code is not endian clean. @@ -16,6 +19,7 @@ Patch0: gambas-1.0.9-gcc4.patch Patch1: gambas-1.0.6-dont-make-links.patch Patch2: gambas-1.0.6-noopt.patch +Patch3: gambas-1.0.11-desktopfix.patch %description Gambas is a free development environment based on a Basic interpreter @@ -55,6 +59,7 @@ %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 %build # Gambas can't deal with -Wp,-D_FORTIFY_SOURCE=2 @@ -81,15 +86,29 @@ rm -rf $RPM_BUILD_ROOT export PATH=$RPM_BUILD_ROOT/usr/bin:$PATH make DESTDIR=$RPM_BUILD_ROOT install -rm -rf $RPM_BUILD_ROOT/%{_libdir}/gambas/*.la +rm -rf $RPM_BUILD_ROOT%{_libdir}/gambas/*.la +mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps +mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications +install -m0644 ./app/gambas/.icon/32.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/gambas.png install src/share/gambas.h $RPM_BUILD_ROOT/%{_includedir} +desktop-file-install --vendor fedora \ + --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ + --add-category X-Fedora \ + debian/gambas.desktop + %clean rm -rf $RPM_BUILD_ROOT -%post -p /sbin/ldconfig - -%postun -p /sbin/ldconfig +%post +/sbin/ldconfig +update-desktop-database %{_datadir}/applications &> /dev/null + +%postun +/sbin/ldconfig +if [ "$1" = "0" ]; then + update-desktop-database %{_datadir}/applications &> /dev/null +fi %files %defattr(-, root, root, 0755) @@ -103,6 +122,8 @@ %{_bindir}/gbi %{_bindir}/gbx %{_bindir}/gambas-database-manager +%{_datadir}/pixmaps/gambas.png +%{_datadir}/applications/*.desktop %files devel %defattr(-, root, root, 0755) @@ -121,6 +142,10 @@ %{_datadir}/gambas/examples %changelog +* Sun Sep 4 2005 Tom "spot" Callaway 1.0.11-1 +- bump to 1.0.11 +- add gambas.desktop, gambas.png + * Fri Jul 29 2005 Tom "spot" Callaway 1.0.9-2 - put in correct patch Index: sources =================================================================== RCS file: /cvs/extras/rpms/gambas/FC-4/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 29 Jul 2005 19:06:53 -0000 1.4 +++ sources 5 Sep 2005 15:12:28 -0000 1.5 @@ -1,3 +1,4 @@ 608772c93233eea4e488ba3bd1c2ac83 gambas-1.0.6.tar.bz2 730b690c72689e26888698233fdef726 gambas-1.0.8.tar.bz2 888494096dfb4f497dcfed58179980fa gambas-1.0.9.tar.bz2 +819eab8e69f71a76248c2679b3af9946 gambas-1.0.11.tar.bz2 From fedora-extras-commits at redhat.com Mon Sep 5 16:38:18 2005 From: fedora-extras-commits at redhat.com (Tim Lauridsen (timlau)) Date: Mon, 5 Sep 2005 12:38:18 -0400 Subject: rpms/yumex/FC-4 .cvsignore, 1.6, 1.7 sources, 1.6, 1.7 yumex.spec, 1.6, 1.7 Message-ID: <200509051638.j85GcIsa007295@cvs-int.fedora.redhat.com> Author: timlau Update of /cvs/extras/rpms/yumex/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7272 Modified Files: .cvsignore sources yumex.spec Log Message: new release 0.42-05 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/yumex/FC-4/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 30 Aug 2005 13:33:15 -0000 1.6 +++ .cvsignore 5 Sep 2005 16:38:16 -0000 1.7 @@ -1 +1 @@ -yumex-0.42-4.tar.gz +yumex-0.42-5.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/yumex/FC-4/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 30 Aug 2005 13:33:15 -0000 1.6 +++ sources 5 Sep 2005 16:38:16 -0000 1.7 @@ -1 +1 @@ -01b20730d2f56c0a836c4d17951871d4 yumex-0.42-4.tar.gz +2f7bf8bb4504308c7cc291e26304288c yumex-0.42-5.tar.gz Index: yumex.spec =================================================================== RCS file: /cvs/extras/rpms/yumex/FC-4/yumex.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- yumex.spec 30 Aug 2005 13:33:15 -0000 1.6 +++ yumex.spec 5 Sep 2005 16:38:16 -0000 1.7 @@ -1,8 +1,8 @@ -%define build_v 4 +%define build_v 5 Name: yumex Version: 0.42 -Release: 4.0%{?dist} +Release: 5.0%{?dist} Summary: Yum Extender graphical package management tool Group: Applications/System @@ -67,6 +67,8 @@ %{_datadir}/applications/fedora-%{name}.desktop %changelog +* Sat Sep 3 2005 Tim Lauridsen - 0.42-5.0 +- Release 0.42-5.0 * Tue Aug 30 2005 Tim Lauridsen - 0.42-4.0 - Release 0.42-4.0 - Fixed delete repo on repos page. (Rightclick + Delete now working) From fedora-extras-commits at redhat.com Mon Sep 5 16:39:58 2005 From: fedora-extras-commits at redhat.com (Tim Lauridsen (timlau)) Date: Mon, 5 Sep 2005 12:39:58 -0400 Subject: rpms/yumex/devel sources,1.4,1.5 yumex.spec,1.4,1.5 Message-ID: <200509051639.j85GdwNq007332@cvs-int.fedora.redhat.com> Author: timlau Update of /cvs/extras/rpms/yumex/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7311 Modified Files: sources yumex.spec Log Message: new release 0.42-05 Index: sources =================================================================== RCS file: /cvs/extras/rpms/yumex/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 3 Sep 2005 05:12:47 -0000 1.4 +++ sources 5 Sep 2005 16:39:56 -0000 1.5 @@ -1 +1 @@ -01b20730d2f56c0a836c4d17951871d4 yumex-0.42-4.tar.gz +2f7bf8bb4504308c7cc291e26304288c yumex-0.42-5.tar.gz Index: yumex.spec =================================================================== RCS file: /cvs/extras/rpms/yumex/devel/yumex.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- yumex.spec 3 Sep 2005 05:12:47 -0000 1.4 +++ yumex.spec 5 Sep 2005 16:39:56 -0000 1.5 @@ -1,8 +1,8 @@ -%define build_v 4 +%define build_v 5 Name: yumex Version: 0.42 -Release: 4.0%{?dist} +Release: 5.0%{?dist} Summary: Yum Extender graphical package management tool Group: Applications/System @@ -67,6 +67,8 @@ %{_datadir}/applications/fedora-%{name}.desktop %changelog +* Sat Sep 3 2005 Tim Lauridsen - 0.42-5.0 +- Release 0.42-5.0 * Tue Aug 30 2005 Tim Lauridsen - 0.42-4.0 - Release 0.42-4.0 - Fixed delete repo on repos page. (Rightclick + Delete now working) From fedora-extras-commits at redhat.com Mon Sep 5 17:26:33 2005 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Mon, 5 Sep 2005 13:26:33 -0400 Subject: rpms/bluefish/devel bluefish.spec, 1.15, 1.16 sources, 1.6, 1.7 .cvsignore, 1.6, 1.7 Message-ID: <200509051726.j85HQXia008859@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/rpms/bluefish/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8834 Modified Files: bluefish.spec sources .cvsignore Log Message: update to 1.0.4 Index: bluefish.spec =================================================================== RCS file: /cvs/extras/rpms/bluefish/devel/bluefish.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- bluefish.spec 21 Aug 2005 12:50:31 -0000 1.15 +++ bluefish.spec 5 Sep 2005 17:26:31 -0000 1.16 @@ -1,5 +1,5 @@ Name: bluefish -Version: 1.0.3 +Version: 1.0.4 Release: 1%{?dist} Summary: GTK2 web development application for experienced users @@ -80,6 +80,9 @@ %changelog +* Mon Sep 5 2005 Paul Howarth - 1.0.4-1 +- update to 1.0.4 + * Sun Aug 21 2005 Paul Howarth - 1.0.3-1 - update to 1.0.3 Index: sources =================================================================== RCS file: /cvs/extras/rpms/bluefish/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 21 Aug 2005 12:50:31 -0000 1.6 +++ sources 5 Sep 2005 17:26:31 -0000 1.7 @@ -1 +1 @@ -f4cda1e21089155383930616ab673d69 bluefish-1.0.3.tar.bz2 +8d5c1b7315cdc935aa024954093d2b32 bluefish-1.0.4.tar.bz2 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/bluefish/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 21 Aug 2005 12:50:31 -0000 1.6 +++ .cvsignore 5 Sep 2005 17:26:31 -0000 1.7 @@ -1 +1 @@ -bluefish-1.0.3.tar.bz2 +bluefish-1.0.4.tar.bz2 From fedora-extras-commits at redhat.com Mon Sep 5 18:41:55 2005 From: fedora-extras-commits at redhat.com (Ed Hill (edhill)) Date: Mon, 5 Sep 2005 14:41:55 -0400 Subject: rpms/nco/FC-4 .cvsignore,1.2,1.3 nco.spec,1.2,1.3 sources,1.2,1.3 Message-ID: <200509051841.j85Ift6f010386@cvs-int.fedora.redhat.com> Author: edhill Update of /cvs/extras/rpms/nco/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10363 Modified Files: .cvsignore nco.spec sources Log Message: update for new upstream ver Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/nco/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 21 Jul 2005 05:43:23 -0000 1.2 +++ .cvsignore 5 Sep 2005 18:41:53 -0000 1.3 @@ -1 +1 @@ -nco-3.0.1.tar.gz +nco-3.0.2.tar.gz Index: nco.spec =================================================================== RCS file: /cvs/extras/rpms/nco/FC-4/nco.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- nco.spec 3 Aug 2005 14:32:20 -0000 1.2 +++ nco.spec 5 Sep 2005 18:41:53 -0000 1.3 @@ -1,6 +1,6 @@ Name: nco -Version: 3.0.1 -Release: 4%{?dist} +Version: 3.0.2 +Release: 1%{?dist} Summary: Suite of programs for manipulating NetCDF/HDF4 files Group: Applications/Engineering License: GPL @@ -10,9 +10,9 @@ # using the following recommended commands: # cvs -d:pserver:anonymous at cvs.sf.net:/cvsroot/nco login # cvs -z3 -d:pserver:anonymous at cvs.sf.net:/cvsroot/nco co \ -# -r nco-3_0_1 -d nco-3.0.1 nco -# tar -czf nco-3.0.1.tar.gz ./nco-3.0.1 -Source0: nco-3.0.1.tar.gz +# -r nco-3_0_2 -d nco-3.0.2 nco +# tar -czf nco-3.0.2.tar.gz ./nco-3.0.2 +Source0: nco-3.0.2.tar.gz Patch0: nco_install_C_headers.patch Patch1: nco-3.0.0-fixudunits.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -106,6 +106,9 @@ %changelog +* Mon Sep 5 2005 Ed Hill - 3.0.2-1 +- update to new upstream 3.0.2 + * Wed Aug 3 2005 Ed Hill - 3.0.1-4 - remove (hopefully only temporarily) opendap support Index: sources =================================================================== RCS file: /cvs/extras/rpms/nco/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 21 Jul 2005 05:43:23 -0000 1.2 +++ sources 5 Sep 2005 18:41:53 -0000 1.3 @@ -1 +1 @@ -72f76553c95bc2b2fdaddcd7cc876f67 nco-3.0.1.tar.gz +46ddd902c9fd86e5d655ddcc8ce647c7 nco-3.0.2.tar.gz From fedora-extras-commits at redhat.com Mon Sep 5 18:42:47 2005 From: fedora-extras-commits at redhat.com (Ed Hill (edhill)) Date: Mon, 5 Sep 2005 14:42:47 -0400 Subject: rpms/nco/devel .cvsignore,1.2,1.3 nco.spec,1.2,1.3 sources,1.2,1.3 Message-ID: <200509051842.j85Igl8D010423@cvs-int.fedora.redhat.com> Author: edhill Update of /cvs/extras/rpms/nco/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10400 Modified Files: .cvsignore nco.spec sources Log Message: update for new upstream ver Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/nco/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 21 Jul 2005 05:43:23 -0000 1.2 +++ .cvsignore 5 Sep 2005 18:42:45 -0000 1.3 @@ -1 +1 @@ -nco-3.0.1.tar.gz +nco-3.0.2.tar.gz Index: nco.spec =================================================================== RCS file: /cvs/extras/rpms/nco/devel/nco.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- nco.spec 3 Aug 2005 18:17:48 -0000 1.2 +++ nco.spec 5 Sep 2005 18:42:45 -0000 1.3 @@ -1,6 +1,6 @@ Name: nco -Version: 3.0.1 -Release: 4%{?dist} +Version: 3.0.2 +Release: 1%{?dist} Summary: Suite of programs for manipulating NetCDF/HDF4 files Group: Applications/Engineering License: GPL @@ -10,9 +10,9 @@ # using the following recommended commands: # cvs -d:pserver:anonymous at cvs.sf.net:/cvsroot/nco login # cvs -z3 -d:pserver:anonymous at cvs.sf.net:/cvsroot/nco co \ -# -r nco-3_0_1 -d nco-3.0.1 nco -# tar -czf nco-3.0.1.tar.gz ./nco-3.0.1 -Source0: nco-3.0.1.tar.gz +# -r nco-3_0_2 -d nco-3.0.2 nco +# tar -czf nco-3.0.2.tar.gz ./nco-3.0.2 +Source0: nco-3.0.2.tar.gz Patch0: nco_install_C_headers.patch Patch1: nco-3.0.0-fixudunits.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -106,6 +106,9 @@ %changelog +* Mon Sep 5 2005 Ed Hill - 3.0.2-1 +- update to new upstream 3.0.2 + * Wed Aug 3 2005 Ed Hill - 3.0.1-4 - remove (hopefully only temporarily) opendap support Index: sources =================================================================== RCS file: /cvs/extras/rpms/nco/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 21 Jul 2005 05:43:23 -0000 1.2 +++ sources 5 Sep 2005 18:42:45 -0000 1.3 @@ -1 +1 @@ -72f76553c95bc2b2fdaddcd7cc876f67 nco-3.0.1.tar.gz +46ddd902c9fd86e5d655ddcc8ce647c7 nco-3.0.2.tar.gz From fedora-extras-commits at redhat.com Mon Sep 5 22:37:35 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Mon, 5 Sep 2005 18:37:35 -0400 Subject: rpms/sylpheed/devel .cvsignore, 1.11, 1.12 sources, 1.11, 1.12 sylpheed.spec, 1.22, 1.23 Message-ID: <200509052237.j85MbZ8h016121@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/sylpheed/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16099 Modified Files: .cvsignore sources sylpheed.spec Log Message: * Mon Sep 5 2005 Michael Schwendt - 2.0.1-1 - Update to 2.0.1. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/sylpheed/devel/.cvsignore,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- .cvsignore 3 Aug 2005 12:55:06 -0000 1.11 +++ .cvsignore 5 Sep 2005 22:37:33 -0000 1.12 @@ -1 +1,2 @@ -sylpheed-2.0.0.tar.bz2 +sylpheed-2.0.1.tar.bz2 +sylpheed-2.0.1.tar.bz2.asc Index: sources =================================================================== RCS file: /cvs/extras/rpms/sylpheed/devel/sources,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- sources 3 Aug 2005 12:55:06 -0000 1.11 +++ sources 5 Sep 2005 22:37:33 -0000 1.12 @@ -1 +1,2 @@ -a7754f8820814089229b1ab5f0e4d855 sylpheed-2.0.0.tar.bz2 +7e8c8fdd427935349c4a57cf33fdf68a sylpheed-2.0.1.tar.bz2 +0128b7872416a7e3143568443edcb079 sylpheed-2.0.1.tar.bz2.asc Index: sylpheed.spec =================================================================== RCS file: /cvs/extras/rpms/sylpheed/devel/sylpheed.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- sylpheed.spec 16 Aug 2005 23:29:10 -0000 1.22 +++ sylpheed.spec 5 Sep 2005 22:37:33 -0000 1.23 @@ -4,8 +4,8 @@ Summary: GTK+ based, lightweight, and fast email client Name: sylpheed -Version: 2.0.0 -Release: 2 +Version: 2.0.1 +Release: 1 License: GPL URL: http://sylpheed.good-day.net/ Group: Applications/Internet @@ -81,6 +81,9 @@ %{_mandir}/man1 %changelog +* Mon Sep 5 2005 Michael Schwendt - 2.0.1-1 +- Update to 2.0.1. + * Wed Aug 17 2005 Michael Schwendt - 2.0.0-2 - rebuilt From fedora-extras-commits at redhat.com Tue Sep 6 00:14:36 2005 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Mon, 5 Sep 2005 20:14:36 -0400 Subject: rpms/perl-BerkeleyDB/devel perl-BerkeleyDB.spec,1.2,1.3 Message-ID: <200509060014.j860Eax0018986@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-BerkeleyDB/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18962 Modified Files: perl-BerkeleyDB.spec Log Message: - Spec cleanup - Include COPYING and Artistic Index: perl-BerkeleyDB.spec =================================================================== RCS file: /cvs/extras/rpms/perl-BerkeleyDB/devel/perl-BerkeleyDB.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-BerkeleyDB.spec 3 Aug 2005 19:06:03 -0000 1.2 +++ perl-BerkeleyDB.spec 6 Sep 2005 00:14:34 -0000 1.3 @@ -1,13 +1,11 @@ -%{!?perl_vendorarch: %define perl_vendorarch %(eval "`%{__perl} -V:installvendorarch`"; echo $installvendorarch)} - Name: perl-BerkeleyDB Version: 0.26 -Release: 3%{?dist} +Release: 4%{?dist} Summary: BerkeleyDB Perl module License: GPL or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/BerkeleyDB/ -Source0: http://www.cpan.org/modules/by-module/BerkeleyDB/BerkeleyDB-0.26.tar.gz +Source0: http://www.cpan.org/modules/by-module/BerkeleyDB/BerkeleyDB-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: db4-devel # For "make test". @@ -44,7 +42,10 @@ chmod -R u+rwX,go+rX,go-w $RPM_BUILD_ROOT/* -%check || : +perldoc -t perlgpl > COPYING +perldoc -t perlartistic > Artistic + +%check make test %clean @@ -52,13 +53,17 @@ %files %defattr(-,root,root,-) -%doc Changes README Todo +%doc Changes README Todo COPYING Artistic %{perl_vendorarch}/BerkeleyDB* %{perl_vendorarch}/auto/* %{_mandir}/man3/* %{_bindir}/* %changelog +* Mon Sep 05 2005 Steven Pritchard 0.26-4 +- Spec cleanup +- Include COPYING and Artistic + * Wed Aug 03 2005 Steven Pritchard 0.26-3 - Move OPTIMIZE to Makefile.PL instead of make From fedora-extras-commits at redhat.com Tue Sep 6 00:21:43 2005 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Mon, 5 Sep 2005 20:21:43 -0400 Subject: rpms/perl-Class-Container/devel perl-Class-Container.spec,1.2,1.3 Message-ID: <200509060021.j860Lhla019027@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Class-Container/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19008 Modified Files: perl-Class-Container.spec Log Message: - Remove explicit core module dependencies - Add COPYING and Artistic Index: perl-Class-Container.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Class-Container/devel/perl-Class-Container.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-Class-Container.spec 17 Aug 2005 22:46:27 -0000 1.2 +++ perl-Class-Container.spec 6 Sep 2005 00:21:40 -0000 1.3 @@ -1,17 +1,15 @@ Name: perl-Class-Container Version: 0.12 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Class::Container Perl module License: GPL or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Class-Container/ -Source0: http://www.cpan.org/modules/by-module/Class/Class-Container-0.12.tar.gz +Source0: http://www.cpan.org/modules/by-module/Class/Class-Container-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(Params::Validate) >= 0.23 -BuildRequires: perl(Scalar::Util) Requires: perl(Params::Validate) >= 0.23 -Requires: perl(Scalar::Util) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description @@ -53,6 +51,9 @@ chmod -R u+rwX,go+rX,go-w $RPM_BUILD_ROOT/* +perldoc -t perlgpl > COPYING +perldoc -t perlartistic > Artistic + %check make test @@ -61,11 +62,15 @@ %files %defattr(-,root,root,-) -%doc Changes README +%doc Changes README COPYING Artistic %{perl_vendorlib}/* %{_mandir}/man3/* %changelog +* Mon Sep 05 2005 Steven Pritchard 0.12-3 +- Remove explicit core module dependencies +- Add COPYING and Artistic + * Wed Aug 17 2005 Steven Pritchard 0.12-2 - Minor spec cleanup From fedora-extras-commits at redhat.com Tue Sep 6 00:27:39 2005 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Mon, 5 Sep 2005 20:27:39 -0400 Subject: rpms/perl-Convert-TNEF/devel perl-Convert-TNEF.spec,1.7,1.8 Message-ID: <200509060027.j860Rd8h019071@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Convert-TNEF/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19052 Modified Files: perl-Convert-TNEF.spec Log Message: - Spec cleanup (closer to FE perl spec template). - Include COPYING and Artistic. Index: perl-Convert-TNEF.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Convert-TNEF/devel/perl-Convert-TNEF.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- perl-Convert-TNEF.spec 6 Apr 2005 22:12:44 -0000 1.7 +++ perl-Convert-TNEF.spec 6 Sep 2005 00:27:37 -0000 1.8 @@ -1,14 +1,12 @@ -%{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)} - Summary: Perl module to read TNEF files Name: perl-Convert-TNEF Version: 0.17 -Release: 4 +Release: 5%{?dist} License: GPL or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Convert-TNEF/ -Source0: http://www.cpan.org/authors/id/D/DO/DOUGW/Convert-TNEF-0.17.tar.gz +Source0: http://www.cpan.org/authors/id/D/DO/DOUGW/Convert-TNEF-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot BuildArch: noarch @@ -39,8 +37,11 @@ find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' chmod -R u+w $RPM_BUILD_ROOT/* +perldoc -t perlgpl > COPYING +perldoc -t perlartistic > Artistic + -%check || : +%check make test @@ -50,12 +51,16 @@ %files %defattr(-,root,root,-) -%doc README +%doc README COPYING Artistic %{perl_vendorlib}/Convert %{_mandir}/man3/Convert::TNEF.3pm* %changelog +* Mon Sep 05 2005 Steven Pritchard 0.17-5 +- Spec cleanup (closer to FE perl spec template). +- Include COPYING and Artistic. + * Fri Apr 7 2005 Michael Schwendt - rebuilt From fedora-extras-commits at redhat.com Tue Sep 6 00:33:54 2005 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Mon, 5 Sep 2005 20:33:54 -0400 Subject: rpms/perl-Exception-Class/devel perl-Exception-Class.spec,1.2,1.3 Message-ID: <200509060033.j860XsKS019115@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Exception-Class/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19096 Modified Files: perl-Exception-Class.spec Log Message: - Remove explicit core module dependencies - Add COPYING and Artistic Index: perl-Exception-Class.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Exception-Class/devel/perl-Exception-Class.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-Exception-Class.spec 17 Aug 2005 23:00:40 -0000 1.2 +++ perl-Exception-Class.spec 6 Sep 2005 00:33:52 -0000 1.3 @@ -1,19 +1,15 @@ Name: perl-Exception-Class Version: 1.21 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Exception::Class Perl module License: GPL or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Exception-Class/ -Source0: http://www.cpan.org/modules/by-module/Exception/Exception-Class-1.21.tar.gz +Source0: http://www.cpan.org/modules/by-module/Exception/Exception-Class-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -BuildRequires: perl(Test::More) >= 0.46 -BuildRequires: perl(Scalar::Util) BuildRequires: perl(Devel::StackTrace) >= 1.1 BuildRequires: perl(Class::Data::Inheritable) >= 0.02 -Requires: perl(Test::More) >= 0.46 -Requires: perl(Scalar::Util) Requires: perl(Devel::StackTrace) >= 1.1 Requires: perl(Class::Data::Inheritable) >= 0.02 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) @@ -40,6 +36,9 @@ chmod -R u+rwX,go+rX,go-w $RPM_BUILD_ROOT/* +perldoc -t perlgpl > COPYING +perldoc -t perlartistic > Artistic + %check make test @@ -48,11 +47,15 @@ %files %defattr(-,root,root,-) -%doc Changes LICENSE README +%doc Changes LICENSE README COPYING Artistic %{perl_vendorlib}/* %{_mandir}/man3/* %changelog +* Mon Sep 05 2005 Steven Pritchard 1.21-3 +- Remove explicit core module dependencies +- Add COPYING and Artistic + * Wed Aug 17 2005 Steven Pritchard 1.21-2 - Minor spec cleanup From fedora-extras-commits at redhat.com Tue Sep 6 00:44:44 2005 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Mon, 5 Sep 2005 20:44:44 -0400 Subject: rpms/perl-IPC-ShareLite/devel perl-IPC-ShareLite.spec,1.7,1.8 Message-ID: <200509060044.j860iiwm019240@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-IPC-ShareLite/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19199 Modified Files: perl-IPC-ShareLite.spec Log Message: - Cleanup (closer to current spec template). - Include COPYING and Artistic. Index: perl-IPC-ShareLite.spec =================================================================== RCS file: /cvs/extras/rpms/perl-IPC-ShareLite/devel/perl-IPC-ShareLite.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- perl-IPC-ShareLite.spec 6 Jul 2005 05:58:41 -0000 1.7 +++ perl-IPC-ShareLite.spec 6 Sep 2005 00:44:41 -0000 1.8 @@ -1,61 +1,59 @@ -%{!?perl_vendorarch: %define perl_vendorarch %(eval "`%{__perl} -V:installvendorarch`"; echo $installvendorarch)} - Name: perl-IPC-ShareLite Version: 0.09 -Release: 5%{?dist} - +Release: 6%{?dist} Summary: Light-weight Perl interface to shared memory - Group: Development/Libraries License: GPL or Artistic URL: http://search.cpan.org/dist/IPC-ShareLite/ -Source0: http://www.cpan.org/authors/id/M/MA/MAURICE/IPC-ShareLite-0.09.tar.gz +Source0: http://www.cpan.org/authors/id/M/MA/MAURICE/IPC-ShareLite-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -BuildRequires: perl >= 1:5.6.1 -Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description IPC::ShareLite provides a simple interface to shared memory, allowing data to be efficiently communicated between processes. - %prep %setup -q -n IPC-ShareLite-%{version} - %build -CFLAGS="$RPM_OPT_FLAGS" %{__perl} Makefile.PL INSTALLDIRS=vendor < /dev/null +%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS" < /dev/null %{__perl} -pi -e 's/^\tLD_RUN_PATH=[^\s]+\s*/\t/' Makefile -make %{?_smp_mflags} 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 -a \( -name .packlist \ - -o \( -name '*.bs' -a -empty \) \) -exec rm -f {} ';' -find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' + +find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \; +find $RPM_BUILD_ROOT -type f -name '*.bs' -size 0 -exec rm -f {} \; +find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null \; + chmod -R u+w $RPM_BUILD_ROOT/* +perldoc -t perlgpl > COPYING +perldoc -t perlartistic > Artistic -%check || : +%check make test - %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) -%doc Changes README TODO +%doc Changes README TODO COPYING Artistic %{perl_vendorarch}/auto/IPC %{perl_vendorarch}/IPC %{_mandir}/man3/*.3* - %changelog +* Mon Sep 05 2005 Steven Pritchard 0.09-6 +- Cleanup (closer to current spec template). +- Include COPYING and Artistic. + * Fri Apr 7 2005 Michael Schwendt - rebuilt From fedora-extras-commits at redhat.com Tue Sep 6 00:49:54 2005 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Mon, 5 Sep 2005 20:49:54 -0400 Subject: rpms/perl-Mail-SPF-Query/devel perl-Mail-SPF-Query.spec,1.1,1.2 Message-ID: <200509060049.j860nsdt019572@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Mail-SPF-Query/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19553 Modified Files: perl-Mail-SPF-Query.spec Log Message: - Spec cleanup - Include COPYING and Artistic Index: perl-Mail-SPF-Query.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Mail-SPF-Query/devel/perl-Mail-SPF-Query.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-Mail-SPF-Query.spec 4 Aug 2005 15:59:58 -0000 1.1 +++ perl-Mail-SPF-Query.spec 6 Sep 2005 00:49:52 -0000 1.2 @@ -1,13 +1,11 @@ -%{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)} - Name: perl-Mail-SPF-Query Version: 1.997 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Mail::SPF::Query Perl module License: GPL or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Mail-SPF-Query/ -Source0: http://www.cpan.org/modules/by-module/Mail/Mail-SPF-Query-1.997.tar.gz +Source0: http://www.cpan.org/modules/by-module/Mail/Mail-SPF-Query-%{version}.tar.gz # From Paul Howarth Patch0: MSQ-fallback.patch Patch1: use-sys-hostname.patch @@ -45,11 +43,14 @@ chmod -R u+rwX,go+rX,go-w $RPM_BUILD_ROOT/* +perldoc -t perlgpl > COPYING +perldoc -t perlartistic > Artistic + # Don't include the spfd and spfquery scripts in _bindir. rm -f $RPM_BUILD_ROOT%{_bindir}/spfd $RPM_BUILD_ROOT%{_bindir}/spfquery # Does a lot of external DNS lookups. -%check || : +%check %{?_with_check:make test} %clean @@ -57,11 +58,15 @@ %files %defattr(-,root,root,-) -%doc Changes README sample spfd spfquery +%doc Changes README sample spfd spfquery COPYING Artistic %{perl_vendorlib}/* %{_mandir}/man3/* %changelog +* Mon Sep 05 2005 Steven Pritchard 1.997-5 +- Spec cleanup +- Include COPYING and Artistic + * Mon Aug 01 2005 Steven Pritchard 1.997-4 - Add some BuildRequires (suggested by Paul Howarth) From fedora-extras-commits at redhat.com Tue Sep 6 01:05:14 2005 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Mon, 5 Sep 2005 21:05:14 -0400 Subject: rpms/perl-Module-Build/devel perl-Module-Build.spec,1.12,1.13 Message-ID: <200509060106.j8616Ftu020858@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Module-Build/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20839 Modified Files: perl-Module-Build.spec Log Message: - Minor spec cleanup. - Add COPYING and Artistic. Index: perl-Module-Build.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Module-Build/devel/perl-Module-Build.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- perl-Module-Build.spec 6 Jul 2005 05:36:18 -0000 1.12 +++ perl-Module-Build.spec 6 Sep 2005 01:04:44 -0000 1.13 @@ -1,59 +1,61 @@ Name: perl-Module-Build Version: 0.2611 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Perl module for building and installing Perl modules - Group: Development/Libraries License: GPL or Artistic URL: http://search.cpan.org/dist/Module-Build/ Source0: http://www.cpan.org/authors/id/K/KW/KWILLIAMS/Module-Build-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - BuildArch: noarch BuildRequires: perl(ExtUtils::ParseXS), perl(YAML) >= 0.35, perl(YAML) < 0.49 Requires: perl(ExtUtils::ParseXS), perl(YAML) >= 0.35, perl(YAML) < 0.49 -Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description Perl module for building and installing Perl modules, a replacement to ExtUtils::MakeMaker. - %prep %setup -q -n Module-Build-%{version} - %build %{__perl} Build.PL installdirs=vendor ./Build - %install rm -rf $RPM_BUILD_ROOT + ./Build install destdir=$RPM_BUILD_ROOT create_packlist=0 -chmod -R u+w $RPM_BUILD_ROOT/* +find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null \; -%check || : -./Build test +chmod -R u+rwX,go+rX,go-w $RPM_BUILD_ROOT/* + +perldoc -t perlgpl > COPYING +perldoc -t perlartistic > Artistic +%check +./Build test %clean rm -rf $RPM_BUILD_ROOT - %files %defattr(-,root,root,-) -%doc Changes README +%doc Changes README COPYING Artistic %{_bindir}/config_data %{perl_vendorlib}/Module %{_mandir}/man1/config_data.1* %{_mandir}/man3/Module::Build*.3* - %changelog +* Mon Sep 05 2005 Steven Pritchard - 0.2611-2 +- Minor spec cleanup. +- Add COPYING and Artistic. + * Wed Jul 06 2005 Steven Pritchard - 0.2611-1 -- Update to 0.2611 +- Update to 0.2611. * Sat May 7 2005 Ville Skytt?? - 0.2610-3 - Rebuild. From fedora-extras-commits at redhat.com Tue Sep 6 01:22:10 2005 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Mon, 5 Sep 2005 21:22:10 -0400 Subject: rpms/perl-Net-CIDR-Lite/devel perl-Net-CIDR-Lite.spec,1.2,1.3 Message-ID: <200509060122.j861MA2Z020948@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Net-CIDR-Lite/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20929 Modified Files: perl-Net-CIDR-Lite.spec Log Message: - Minor spec cleanup - Add COPYING and Artistic Index: perl-Net-CIDR-Lite.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Net-CIDR-Lite/devel/perl-Net-CIDR-Lite.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-Net-CIDR-Lite.spec 1 Aug 2005 23:38:15 -0000 1.2 +++ perl-Net-CIDR-Lite.spec 6 Sep 2005 01:22:08 -0000 1.3 @@ -1,13 +1,11 @@ -%{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)} - Name: perl-Net-CIDR-Lite Version: 0.18 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Net::CIDR::Lite Perl module License: GPL or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Net-CIDR-Lite/ -Source0: http://www.cpan.org/modules/by-module/Net/Net-CIDR-Lite-0.18.tar.gz +Source0: http://www.cpan.org/modules/by-module/Net/Net-CIDR-Lite-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) @@ -23,7 +21,6 @@ %build %{__perl} Makefile.PL INSTALLDIRS=vendor -%{__perl} -pi -e 's/^\tLD_RUN_PATH=[^\s]+\s*/\t/' Makefile make %{?_smp_mflags} %install @@ -36,7 +33,10 @@ chmod -R u+rwX,go+rX,go-w $RPM_BUILD_ROOT/* -%check || : +perldoc -t perlgpl > COPYING +perldoc -t perlartistic > Artistic + +%check make test %clean @@ -44,11 +44,15 @@ %files %defattr(-,root,root,-) -%doc Changes README +%doc Changes README COPYING Artistic %{perl_vendorlib}/* %{_mandir}/man3/* %changelog +* Mon Sep 05 2005 Steven Pritchard 0.18-3 +- Minor spec cleanup +- Add COPYING and Artistic + * Mon Aug 01 2005 Steven Pritchard 0.18-2 - Add BR Test::Pod and Test::Pod::Coverage for make test From fedora-extras-commits at redhat.com Tue Sep 6 01:26:35 2005 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Mon, 5 Sep 2005 21:26:35 -0400 Subject: rpms/perl-Text-Autoformat/devel perl-Text-Autoformat.spec,1.5,1.6 Message-ID: <200509060126.j861QZXv020983@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Text-Autoformat/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20964 Modified Files: perl-Text-Autoformat.spec Log Message: - Minor spec cleanup. - Add Artistic. Index: perl-Text-Autoformat.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Text-Autoformat/devel/perl-Text-Autoformat.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- perl-Text-Autoformat.spec 20 Aug 2005 23:28:02 -0000 1.5 +++ perl-Text-Autoformat.spec 6 Sep 2005 01:26:32 -0000 1.6 @@ -1,8 +1,6 @@ -%{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)} - Name: perl-Text-Autoformat Version: 1.13 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Text::Autoformat Perl module License: Artistic Group: Development/Libraries @@ -48,7 +46,9 @@ chmod -R u+rwX,go+rX,go-w $RPM_BUILD_ROOT/* -%check || : +perldoc -t perlartistic > Artistic + +%check make test %clean @@ -56,11 +56,15 @@ %files %defattr(-,root,root,-) -%doc Changes README +%doc Changes README Artistic %{perl_vendorlib}/* %{_mandir}/man3/* %changelog +* Mon Sep 05 2005 Steven Pritchard 1.13-3 +- Minor spec cleanup. +- Add Artistic. + * Sat Aug 20 2005 Steven Pritchard 1.13-2 - Fix permissions (#166406). From fedora-extras-commits at redhat.com Tue Sep 6 01:36:42 2005 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Mon, 5 Sep 2005 21:36:42 -0400 Subject: rpms/perl-Text-Reform/devel perl-Text-Reform.spec,1.7,1.8 Message-ID: <200509060136.j861agBZ021013@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Text-Reform/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20994 Modified Files: perl-Text-Reform.spec Log Message: - Minor spec cleanup. - Add Artistic. Index: perl-Text-Reform.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Text-Reform/devel/perl-Text-Reform.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- perl-Text-Reform.spec 6 Jul 2005 05:59:38 -0000 1.7 +++ perl-Text-Reform.spec 6 Sep 2005 01:36:40 -0000 1.8 @@ -1,64 +1,62 @@ -%{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)} - Name: perl-Text-Reform Version: 1.11 -Release: 4%{?dist} - +Release: 5%{?dist} Summary: Manual text wrapping and reformatting - Group: Development/Libraries License: Artistic URL: http://search.cpan.org/dist/Text-Reform/ -Source0: http://www.cpan.org/authors/id/D/DC/DCONWAY/Text-Reform-1.11.tar.gz +Source0: http://www.cpan.org/authors/id/D/DC/DCONWAY/Text-Reform-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -BuildRequires: perl >= 1:5.6.1 Requires: perl(TeX::Hyphen) -Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description The module supplies a re-entrant, highly configurable replacement for the built-in Perl format() mechanism. - %prep %setup -q -n Text-Reform-%{version} -perl -pi -e 's,/usr/local/bin/perl,%{__perl},' *.pl +%{__perl} -pi -e 's,/usr/local/bin/perl,%{__perl},' *.pl chmod 644 Changes README lib/Text/*.pm demo*.pl - %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} - %install rm -rf $RPM_BUILD_ROOT + make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT + # demo scripts packaged as documentation files find $RPM_BUILD_ROOT -type f -name 'demo*.pl' -exec rm -f {} \; + find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \; find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null \; -chmod -R u+w $RPM_BUILD_ROOT/* +chmod -R u+rwX,go+rX,go-w $RPM_BUILD_ROOT/* -%check || : -make test +perldoc -t perlartistic > Artistic +%check +make test %clean rm -rf $RPM_BUILD_ROOT - %files %defattr(-,root,root,-) -%doc Changes README demo*.pl +%doc Changes README demo*.pl Artistic %{perl_vendorlib}/Text/ %{_mandir}/man3/*.3* - %changelog +* Mon Sep 05 2005 Steven Pritchard 0.11-5 +- Minor spec cleanup. +- Add Artistic. + * Fri Apr 7 2005 Michael Schwendt - rebuilt From fedora-extras-commits at redhat.com Tue Sep 6 01:47:06 2005 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Mon, 5 Sep 2005 21:47:06 -0400 Subject: rpms/perl-Unix-Syslog/devel perl-Unix-Syslog.spec,1.8,1.9 Message-ID: <200509060147.j861l6Ys021054@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Unix-Syslog/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21035 Modified Files: perl-Unix-Syslog.spec Log Message: - Spec cleanup. - Disable "make test" by default (spams console). Index: perl-Unix-Syslog.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Unix-Syslog/devel/perl-Unix-Syslog.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- perl-Unix-Syslog.spec 6 Apr 2005 22:13:09 -0000 1.8 +++ perl-Unix-Syslog.spec 6 Sep 2005 01:47:04 -0000 1.9 @@ -1,17 +1,14 @@ -%{!?perl_vendorarch: %define perl_vendorarch %(eval "`%{__perl} -V:installvendorarch`"; echo $installvendorarch)} - -Summary: Perl interface to the UNIX syslog(3) calls Name: perl-Unix-Syslog Version: 0.100 -Release: 5 - +Release: 6%{?dist} +Summary: Perl interface to the UNIX syslog(3) calls License: Artistic Group: System Environment/Libraries URL: http://search.cpan.org/dist/Unix-Syslog/ -Source0: http://www.cpan.org/authors/id/M/MH/MHARNISCH/Unix-Syslog-0.100.tar.gz +Source0: http://www.cpan.org/authors/id/M/MH/MHARNISCH/Unix-Syslog-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot -Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description This module provides an interface to the system logger syslogd(8) via @@ -19,35 +16,30 @@ libc-functions of your system, so that anyone being familiar with syslog.h should be able to use this module right away. - %prep %setup -q -n Unix-Syslog-%{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" +%{__perl} -pi -e 's/^\tLD_RUN_PATH=[^\s]+\s*/\t/' Makefile +make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT -make install \ - PERL_INSTALL_ROOT=$RPM_BUILD_ROOT \ - INSTALLARCHLIB=$RPM_BUILD_ROOT%{perl_archlib} -find $RPM_BUILD_ROOT -type f -a \( -name perllocal.pod -o -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/* +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 -type d -depth -exec rmdir {} 2>/dev/null \; -%check || : -make test +chmod -R u+rwX,go+rX,go-w $RPM_BUILD_ROOT/* +%check +%{?_with_check:make test} %clean rm -rf $RPM_BUILD_ROOT - %files %defattr(-,root,root,-) %doc Changes README Artistic @@ -55,8 +47,11 @@ %{perl_vendorarch}/Unix %{_mandir}/man3/Unix::Syslog.3pm* - %changelog +* Mon Sep 05 2005 Steven Pritchard 0.100-6 +- Spec cleanup. +- Disable "make test" by default (spams console). + * Fri Apr 7 2005 Michael Schwendt - rebuilt From fedora-extras-commits at redhat.com Tue Sep 6 10:49:04 2005 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Tue, 6 Sep 2005 06:49:04 -0400 Subject: rpms/squidGuard - New directory Message-ID: <200509061049.j86An4Q7002127@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/rpms/squidGuard In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2107/squidGuard Log Message: Directory /cvs/extras/rpms/squidGuard added to the repository From fedora-extras-commits at redhat.com Tue Sep 6 10:49:04 2005 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Tue, 6 Sep 2005 06:49:04 -0400 Subject: rpms/squidGuard/devel - New directory Message-ID: <200509061049.j86An4pA002132@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/rpms/squidGuard/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2107/squidGuard/devel Log Message: Directory /cvs/extras/rpms/squidGuard/devel added to the repository From fedora-extras-commits at redhat.com Tue Sep 6 10:49:24 2005 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Tue, 6 Sep 2005 06:49:24 -0400 Subject: rpms/squidGuard Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200509061049.j86AnOQY002188@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/rpms/squidGuard In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2152 Added Files: Makefile import.log Log Message: Setup of module squidGuard --- NEW FILE Makefile --- # Top level Makefile for module squidGuard all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Tue Sep 6 10:49:24 2005 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Tue, 6 Sep 2005 06:49:24 -0400 Subject: rpms/squidGuard/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200509061049.j86AnOFk002193@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/rpms/squidGuard/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2152/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module squidGuard --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Tue Sep 6 10:50:43 2005 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Tue, 6 Sep 2005 06:50:43 -0400 Subject: rpms/squidGuard import.log,1.1,1.2 Message-ID: <200509061050.j86AohEr002294@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/rpms/squidGuard In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2253 Modified Files: import.log Log Message: auto-import squidGuard-1.2.0-11 on branch devel from squidGuard-1.2.0-11.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/squidGuard/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 6 Sep 2005 10:49:22 -0000 1.1 +++ import.log 6 Sep 2005 10:50:41 -0000 1.2 @@ -0,0 +1 @@ +squidGuard-1_2_0-11:HEAD:squidGuard-1.2.0-11.src.rpm:1126003831 From fedora-extras-commits at redhat.com Tue Sep 6 10:50:43 2005 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Tue, 6 Sep 2005 06:50:43 -0400 Subject: rpms/squidGuard/devel squid-getlist.html, NONE, 1.1 squid-getlist.html.patch, NONE, 1.1 squidGuard-destdir.patch, NONE, 1.1 squidGuard-paths.patch, NONE, 1.1 squidGuard.logrotate, NONE, 1.1 squidGuard.spec, NONE, 1.1 squidguard-1.2.0-db4.patch, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200509061050.j86Aoh09002299@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/rpms/squidGuard/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2253/devel Modified Files: .cvsignore sources Added Files: squid-getlist.html squid-getlist.html.patch squidGuard-destdir.patch squidGuard-paths.patch squidGuard.logrotate squidGuard.spec squidguard-1.2.0-db4.patch Log Message: auto-import squidGuard-1.2.0-11 on branch devel from squidGuard-1.2.0-11.src.rpm --- NEW FILE squid-getlist.html --- Auto Squidguard Filter Update 

      #!/bin/bash
#-----------------------------------------------------------------
#
# -- Changed - 15 June 2003
# --    Change 
#       "squidguard -C domains" to 
#       "squidguard -C all"
#       old way wasn't doing anything useful
#
#Below is the script that I use. You need to edit the first part
#to tell where your squid and squidguard binaries are, and also
#where your squidguard #blacklists are. This has the recent change
#of address for the squidguard.org-supplied blacklists.
#You will need to obtain and install the utility "wget" for this
#script to work. It is available as an RPM for RedHat. WGet is used
#to get the files. You can #use scripted ftp instead, but it's much
#more of a pain and less reliable.
#-----------------------------------------------------------------
# --------------------------------------------------------------
# Script to Update squidguard Blacklists
# Rick at Matthews.net with mods by morris at maynidea.com
# Last updated 05/31/2003
#
# This script downloads blacklists from two sites, merges and
# de-dupes them, then makes local changes (+/-). It does this
# in all of the categories (except porn) using the standard
# squidguard .diff files. The porn directory is handled
# differently, in part because of the large volume of changes.
#
# The user maintains local changes to the porn category in the
# files < domains_diff.local> and . These files
# use the standard squidguard .diff file format:
# +domain_A.com
# -domain_B.com
#		       SquidGuard is a free CIPA Compliant filter
#                                
#                                current updater at PAISD.net 
#                               -Leif Johnson Feb. 4, 2004 leif at paisd.net
#			         Port Aransas H.S. Texas 78373
#
# setup as a cronjob to run on mobydick (squid server) once a week.
#
# --------------------------------------------------------------
# Set date format for naming files

DATE=`date +%Y-%m-%d`
YEAR=`date +%Y`
DATETIME=`date +"%a %d %h %Y %T %Z"`
UNIQUEDT=`date +"%Y%m%d%H%M%S"`
#UNIQUEDT="xxx"
WGOPTS=-nv
echo ${UNIQUEDT}

# Give location of squid and squidguard programs
SQUID=/usr/sbin/squid
SQUIDGUARD=/usr/local/bin/squidGuard
# --------------------------------------------------------------
# BLACKDIR should be set to equal the dbhome path declaration
# in your squidguard.conf file
BLACKDIR=/var/lib/squidguard/db
BLKDIRADLT=${BLACKDIR}/blacklists
PORN=${BLACKDIR}/blacklists/porn
ADULT=${BLACKDIR}/blacklists/adult
ADS=${BLACKDIR}/blacklists/ads

# --------------------------------------------------------------
# Create statistics file for porn directory
#
mkdir -p ${PORN}/stats
mkdir -p ${PORN}/archive
mkdir -p ${ADULT}/stats
mkdir -p ${ADULT}/archive

touch ${PORN}/stats/${UNIQUEDT}_stats
echo "Blacklist Line Counts for "${DATETIME} \
  >> ${PORN}/stats/${UNIQUEDT}_stats

# --------------------------------------------------------------
# Download the latest blacklist from the squidguard site
#
# Uses wget (http://wget.sunsite.dk/)
#
# Downloads the current blacklist tar.gz file into the
# ${BLACKDIR} directory (defined above) and will name the file
# uniquely with today's date: ${UNIQUEDT}_sg.tar.gz
#

wget ${WGOPTS} --output-document=${BLACKDIR}/${UNIQUEDT}_sg.tar.gz \
  http://ftp.teledanmark.no/pub/www/proxy/squidguard/contrib/blacklists.tar.gz

#
# Download the latest adult.tar.gz file from the
# Universit? Toulouse in France (Seems to be updated daily)
#
# see http://cri.univ-tlse1.fr/documentations/cache/squidguard_en.html
#
# Uses wget (http://wget.sunsite.dk/)
#
# Download the current adult.tar.gz file into the
# ${BLACKDIR} directory (defined above) and will name the file
# uniquely with today's date: ${UNIQUEDT}_fr.tar.gz
#
# If you are inside of a firewall you may need passive ftp.
# For passive ftp change the wget line below to read:
# wget --passive-ftp --output-document=${BLACKDIR}/${UNIQUEDT}_fr.tar.gz \
#

wget ${WGOPTS} --output-document=${BLACKDIR}/${UNIQUEDT}_fr.tar.gz \
  ftp://ftp.univ-tlse1.fr/pub/reseau/cache/squidguard_contrib/adult.tar.gz

# --------------------------------------------------------------
# Install the new squidguard blacklist
#
# Installs the blacklist under the ${BLACKDIR} directory:
#   ${BLACKDIR}/blacklists/ads
# ${BLACKDIR}/blacklists/aggressive
# ${BLACKDIR}/blacklists/audio-video
# ${BLACKDIR}/blacklists/drugs
# ${BLACKDIR}/blacklists/gambling
# ${BLACKDIR}/blacklists/hacking
# ${BLACKDIR}/blacklists/mail
# ${BLACKDIR}/blacklists/porn
# ${BLACKDIR}/blacklists/proxy
# ${BLACKDIR}/blacklists/violence
# ${BLACKDIR}/blacklists/warez
#

gunzip < ${BLACKDIR}/${UNIQUEDT}_sg.tar.gz | (cd ${BLACKDIR}; tar xvf -)

# --------------------------------------------------------------
# Remove the differential diff files that are supplied with the
# squidguard blacklists - they are simply clutter
#

rm -f ${PORN}/domains.*.diff
rm -f ${PORN}/urls.*.diff
rm -f ${ADS}/domains.*.diff
rm -f ${ADS}/urls.*.diff

# --------------------------------------------------------------
# Remove the comment lines from the ${PORN}/domains and
# ${PORN}/urls files so they can be sorted
#

grep -v -e '^#' ${PORN}/domains > ${PORN}/domains.temp
mv -f ${PORN}/domains.temp ${PORN}/domains

grep -v -e '^#' ${PORN}/urls > ${PORN}/urls.temp
mv -f ${PORN}/urls.temp ${PORN}/urls

# --------------------------------------------------------------
# Log item counts to porn statistics file
#

echo " " >> ${PORN}/stats/${UNIQUEDT}_stats
echo "Squidguard blacklist files as downloaded" \
  >> ${PORN}/stats/${UNIQUEDT}_stats
echo "----------------------------------------" \
  >> ${PORN}/stats/${UNIQUEDT}_stats

wc --lines ${PORN}/domains >> ${PORN}/stats/${UNIQUEDT}_stats
wc --lines ${PORN}/urls >> ${PORN}/stats/${UNIQUEDT}_stats

# --------------------------------------------------------------
# Install the new adult blacklist from Universit? Toulouse
#
# Installs the blacklist under the ${BLKDIRADLT} directory:
#   ${BLKDIRADLT}/adult
#
# Also cleans up any entries that begin with a dash (-)
#

# gunzip < ${BLACKDIR}/${UNIQUEDT}_fr.tar.gz | (cd ${BLACKDIR}; tar xvf -)
tar -C ${BLKDIRADLT} -xvzf ${BLACKDIR}/${UNIQUEDT}_fr.tar.gz
perl -pi -e "s#^\-##g" ${BLKDIRADLT}/adult/domains
perl -pi -e "s#^\-##g" ${BLKDIRADLT}/adult/urls

# --------------------------------------------------------------
# Save current files for subsequent processing
# Age older files
# The most recent files will always be domains.0 and urls.0
#

[ -f ${PORN}/archive/domains.-2 ] && mv -f ${PORN}/archive/domains.-2 ${PORN}/archive/domains.-3
[ -f ${PORN}/archive/urls.-2    ] && mv -f ${PORN}/archive/urls.-2 ${PORN}/archive/urls.-3
[ -f ${PORN}/archive/domains.-1 ] && mv -f ${PORN}/archive/domains.-1 ${PORN}/archive/domains.-2
[ -f ${PORN}/archive/urls.-1    ] && mv -f ${PORN}/archive/urls.-1 ${PORN}/archive/urls.-2
[ -f ${PORN}/archive/domains.0  ] && mv -f ${PORN}/archive/domains.0 ${PORN}/archive/domains.-1
[ -f ${PORN}/archive/urls.0     ] && mv -f ${PORN}/archive/urls.0 ${PORN}/archive/urls.-1
cp ${PORN}/domains ${PORN}/archive/domains.0
cp ${PORN}/urls ${PORN}/archive/urls.0

[ -f ${ADULT}/archive/domains.-2 ] && mv -f ${ADULT}/archive/domains.-2 ${ADULT}/archive/domains.-3
[ -f ${ADULT}/archive/urls.-2    ] && mv -f ${ADULT}/archive/urls.-2 ${ADULT}/archive/urls.-3
[ -f ${ADULT}/archive/domains.-1 ] && mv -f ${ADULT}/archive/domains.-1 ${ADULT}/archive/domains.-2
[ -f ${ADULT}/archive/urls.-1    ] && mv -f ${ADULT}/archive/urls.-1 ${ADULT}/archive/urls.-2
[ -f ${ADULT}/archive/domains.0  ] && mv -f ${ADULT}/archive/domains.0 ${ADULT}/archive/domains.-1
[ -f ${ADULT}/archive/urls.0     ] && mv -f ${ADULT}/archive/urls.0 ${ADULT}/archive/urls.-1
cp ${ADULT}/domains ${ADULT}/archive/domains.0
cp ${ADULT}/urls ${ADULT}/archive/urls.0

# --------------------------------------------------------------
# Log item counts to porn statistics file
#

echo " " >> ${PORN}/stats/${UNIQUEDT}_stats
echo "University Toulouse blacklist files as downloaded" \
  >> ${PORN}/stats/${UNIQUEDT}_stats
echo "-------------------------------------------------" \
  >> ${PORN}/stats/${UNIQUEDT}_stats

wc --lines ${ADULT}/domains >> ${PORN}/stats/${UNIQUEDT}_stats
wc --lines ${ADULT}/urls >> ${PORN}/stats/${UNIQUEDT}_stats

# --------------------------------------------------------------
# Sort and de-dupe the _diff.local files
#

cat ${PORN}/domains_diff.local | sort | uniq > ${PORN}/domains.temp
cat ${PORN}/urls_diff.local | sort | uniq > ${PORN}/urls.temp
mv -f ${PORN}/domains.temp ${PORN}/domains_diff.local
mv -f ${PORN}/urls.temp ${PORN}/urls_diff.local

# --------------------------------------------------------------
# Log item counts to porn statistics file
#

echo " " >> ${PORN}/stats/${UNIQUEDT}_stats
echo "Local _diff.local files" >> ${PORN}/stats/${UNIQUEDT}_stats
echo "-----------------------" >> ${PORN}/stats/${UNIQUEDT}_stats

wc --lines ${PORN}/domains_diff.local >> ${PORN}/stats/${UNIQUEDT}_stats
wc --lines ${PORN}/urls_diff.local >> ${PORN}/stats/${UNIQUEDT}_stats

# --------------------------------------------------------------
# Create to_add & to_delete files from the _diff.local files.
# The to_add files contain only the adds, and the to_delete files
# contain only the deletes.
# The _diff.local files are unchanged by this process.
#

grep -e '^+' ${PORN}/domains_diff.local > ${PORN}/domains.to_add
grep -e '^-' ${PORN}/domains_diff.local > ${PORN}/domains.to_delete
grep -e '^+' ${PORN}/urls_diff.local > ${PORN}/urls.to_add
grep -e '^-' ${PORN}/urls_diff.local > ${PORN}/urls.to_delete

# --------------------------------------------------------------
# Remove +/- from the to_add & to_delete files
#

perl -pi -e "s#^\+##g" ${PORN}/urls.to_add
perl -pi -e "s#^\-##g" ${PORN}/urls.to_delete
perl -pi -e "s#^\+##g" ${PORN}/domains.to_add
perl -pi -e "s#^\-##g" ${PORN}/domains.to_delete

# --------------------------------------------------------------
# Log item counts to porn statistics file
#

echo " " >> ${PORN}/stats/${UNIQUEDT}_stats
echo "Local to_add and to_delete files" >> ${PORN}/stats/${UNIQUEDT}_stats
echo "--------------------------------" >> ${PORN}/stats/${UNIQUEDT}_stats

wc --lines ${PORN}/domains.to_add >> ${PORN}/stats/${UNIQUEDT}_stats
wc --lines ${PORN}/domains.to_delete >> ${PORN}/stats/${UNIQUEDT}_stats
wc --lines ${PORN}/urls.to_add >> ${PORN}/stats/${UNIQUEDT}_stats
wc --lines ${PORN}/urls.to_delete >> ${PORN}/stats/${UNIQUEDT}_stats

# --------------------------------------------------------------
# Combine the adult, blacklist and to_add files
# Remove garbage and blanks
# Remove duplicate entries
#

cat ${PORN}/archive/domains.0 ${ADULT}/archive/domains.0 ${PORN}/domains.to_add \
  > ${PORN}/domains.merged.1
cat ${PORN}/domains.merged.1 | tr -d '\000-\011' > ${PORN}/domains.merged.2
cat ${PORN}/domains.merged.2 | tr -d '\013-\037' > ${PORN}/domains.merged.3
cat ${PORN}/domains.merged.3 | tr -d '\177-\377' > ${PORN}/domains.merged.4
sort -u ${PORN}/domains.merged.4 > ${PORN}/domains.merged

cat ${PORN}/archive/urls.0 ${ADULT}/archive/urls.0 ${PORN}/urls.to_add \
  > ${PORN}/urls.merged.1
cat ${PORN}/urls.merged.1 | tr -d '\000-\011' > ${PORN}/urls.merged.2
cat ${PORN}/urls.merged.2 | tr -d '\013-\037' > ${PORN}/urls.merged.3
cat ${PORN}/urls.merged.3 | tr -d '\177-\377' > ${PORN}/urls.merged.4
sort -u ${PORN}/urls.merged.4 > ${PORN}/urls.merged

# --------------------------------------------------------------
# Log item counts to porn statistics file
#

echo " " >> ${PORN}/stats/${UNIQUEDT}_stats
echo "Combined adult, blacklist and to_add files, deduped" \
  >> ${PORN}/stats/${UNIQUEDT}_stats
echo "---------------------------------------------------" \
  >> ${PORN}/stats/${UNIQUEDT}_stats

wc --lines ${PORN}/domains.merged >> ${PORN}/stats/${UNIQUEDT}_stats
wc --lines ${PORN}/urls.merged >> ${PORN}/stats/${UNIQUEDT}_stats

# --------------------------------------------------------------
# Remove entries that match the content of the to_delete files
#

grep -v -x -F --file=${PORN}/domains.to_delete \
  ${PORN}/domains.merged > ${PORN}/domains.adjusted
grep -v -x -F --file=${PORN}/urls.to_delete \
  ${PORN}/urls.merged > ${PORN}/urls.adjusted

# --------------------------------------------------------------
# Log item counts to porn statistics file
#

echo " " >> ${PORN}/stats/${UNIQUEDT}_stats
echo "After removing the contents of the to_delete files" \
  >> ${PORN}/stats/${UNIQUEDT}_stats
echo "--------------------------------------------------" \
  >> ${PORN}/stats/${UNIQUEDT}_stats

wc --lines ${PORN}/domains.adjusted >> ${PORN}/stats/${UNIQUEDT}_stats
wc --lines ${PORN}/urls.adjusted >> ${PORN}/stats/${UNIQUEDT}_stats

# --------------------------------------------------------------
# Install new text files
#

mv -f ${PORN}/domains.adjusted ${PORN}/domains
mv -f ${PORN}/urls.adjusted ${PORN}/urls

# --------------------------------------------------------------
# Log item counts to porn statistics file
#

echo " " >> ${PORN}/stats/${UNIQUEDT}_stats
echo "Final production files" \
  >> ${PORN}/stats/${UNIQUEDT}_stats
echo "----------------------" \
  >> ${PORN}/stats/${UNIQUEDT}_stats

wc --lines ${PORN}/domains >> ${PORN}/stats/${UNIQUEDT}_stats
wc --lines ${PORN}/urls >> ${PORN}/stats/${UNIQUEDT}_stats

# --------------------------------------------------------------
# Create new databases in all categories
#

${SQUIDGUARD} -C all

# --------------------------------------------------------------
# Update databases from your domains.diff and urls.diff files
# NOTE: The -u[pdate] command only looks for domains.diff and
# urls.diff. It does NOT use the incremental files that are
# included in the blacklist file.
# e.g. domains.20011230.diff, urls.20011230.diff
#

${SQUIDGUARD} -u

# --------------------------------------------------------------
# Change ownership of blacklist files
#

chown -R squid.squid ${BLACKDIR}/blacklists

# --------------------------------------------------------------
# Bounce squid and squidguard
#

${SQUID} -k reconfigure

# --------------------------------------------------------------
# Delete work files
#

rm -f ${PORN}/domains.merged
rm -f ${PORN}/domains.merged.*
rm -f ${PORN}/domains.to_add
rm -f ${PORN}/domains.to_delete

rm -f ${PORN}/urls.merged
rm -f ${PORN}/urls.merged.*
rm -f ${PORN}/urls.to_add
rm -f ${PORN}/urls.to_delete

# --------------------------------------------------------------
# Display stats file
#

cat ${PORN}/stats/${UNIQUEDT}_stats

# --------------------------------------------------------------
# Wait for everything to finish, then exit
#

sleep 5s
exit 0

squid-getlist.html.patch:

--- NEW FILE squid-getlist.html.patch ---
--- squid-getlist.html.1	2004-02-05 03:55:15.000000000 +0100
+++ squid-getlist.html	2005-09-05 17:47:18.000000000 +0200
@@ -1,8 +1,16 @@
-Auto Squidguard Filter Update
-
       #!/bin/bash
+
+ENABLED=0
+
+if [ $ENABLED == 0 ]; then exit 0; fi
+
 #-----------------------------------------------------------------
 #
+# -- Changed - 05 September 2005
+# --    Change by Oliver Falk 
+#       Modified paths to work with my RPM
+#       Added ENABLED=0/1 (0 means disabled; default)
+#
 # -- Changed - 15 June 2003
 # --    Change 
 #       "squidguard -C domains" to 
@@ -55,11 +63,11 @@
 
 # Give location of squid and squidguard programs
 SQUID=/usr/sbin/squid
-SQUIDGUARD=/usr/local/bin/squidGuard
+SQUIDGUARD=/usr/bin/squidGuard
 # --------------------------------------------------------------
 # BLACKDIR should be set to equal the dbhome path declaration
 # in your squidguard.conf file
-BLACKDIR=/var/lib/squidguard/db
+BLACKDIR=/var/lib/squidGuard
 BLKDIRADLT=${BLACKDIR}/blacklists
 PORN=${BLACKDIR}/blacklists/porn
 ADULT=${BLACKDIR}/blacklists/adult

squidGuard-destdir.patch:

--- NEW FILE squidGuard-destdir.patch ---
--- squidGuard-1.1.4/src/Makefile.in.destdir	Fri Oct 13 19:44:15 2000
+++ squidGuard-1.1.4/src/Makefile.in	Fri Oct 13 19:45:09 2000
@@ -97,8 +97,8 @@
 
 install.bin:: squidGuard
 	@echo making $@ in `basename \`pwd\``
-	@$(MKDIR) $(bindir) $(logdir) $(cfgdir)
-	$(INSTALL_PROGRAM) squidGuard $(bindir)/squidGuard
+	@$(MKDIR) $(DESTDIR)$(bindir) $(DESTDIR)$(logdir) $(DESTDIR)$(cfgdir)
+	$(INSTALL_PROGRAM) squidGuard $(DESTDIR)$(bindir)/squidGuard
 
 uninstall.bin::
 	@echo making $@ in `basename \`pwd\``

squidGuard-paths.patch:

--- NEW FILE squidGuard-paths.patch ---
--- squidGuard-1.1.4/samples/sample.conf.in	Mon May 10 18:37:13 1999
+++ squidGuard-1.1.4/samples/sample.conf.in.paths	Fri Oct 13 19:47:31 2000
@@ -2,8 +2,8 @@
 # CONFIG FILE FOR SQUIDGUARD
 #
 
-dbhome @prefix@/squidGuard/db
-logdir @prefix@/squidGuard/logs
+dbhome @sg_dbhome@
+logdir @sg_logdir@
 
 #
 # TIME RULES:


--- NEW FILE squidGuard.logrotate ---
/var/log/squid/squidGuard.log {
    weekly
    compress
    notifempty
    missingok
}


--- NEW FILE squidGuard.spec ---
# $Id: squidGuard.spec,v 1.10 2005/09/06 07:39:02 oliver Exp $

%define			_dbhomedir		%{_var}/lib/%{name}

%define			_dbrpmver		%(eval "rpm -q --queryformat \"%{VERSION}\" db4")

Name:			squidGuard
Version:		1.2.0
Release:		11
Summary:		Filter, redirector and access controller plugin for squid

Group:			System Environment/Daemons
License:		GPL

Source0:		http://ftp.teledanmark.no/pub/www/proxy/%{name}/%{name}-%{version}.tar.gz
Source1:		squidGuard.logrotate
Source2:		http://ftp.teledanmark.no/pub/www/proxy/%{name}/contrib/blacklists.tar.gz
Source3:		http://cuda.port-aransas.k12.tx.us/squid-getlist.html

Patch0:			squidGuard-destdir.patch
Patch1:			squidGuard-paths.patch
Patch2:			squidguard-1.2.0-db4.patch
Patch3:			squid-getlist.html.patch
URL:			http://www.squidguard.org/

BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:	db4-devel
Requires:		squid

%description
squidGuard can be used to 
- limit the web access for some users to a list of accepted/well known
  web servers and/or URLs only.
- block access to some listed or blacklisted web servers and/or URLs
  for some users.
- block access to URLs matching a list of regular expressions or words
  for some users.
- enforce the use of domainnames/prohibit the use of IP address in
  URLs.
- redirect blocked URLs to an "intelligent" CGI based info page.
- redirect unregistered user to a registration form.
- redirect popular downloads like Netscape, MSIE etc. to local copies.
- redirect banners to an empty GIF.
- have different access rules based on time of day, day of the week,
  date etc.
- have different rules for different user groups.
- and much more.. 

Neither squidGuard nor Squid can be used to
- filter/censor/edit text inside documents 
- filter/censor/edit embeded scripting languages like JavaScript or
  VBscript inside HTML

%prep
%setup -q
%{__cp} %{SOURCE3} .
%patch0 -p1 -b .destdir
%patch1 -p1 -b .paths
%if "%{_dbrpmver}" != "4.0.14"
%patch2 -p0 -b .db4
%endif
%patch3 -p0

%build
%configure \
	--with-sg-config=%{_sysconfdir}/squid/squidGuard.conf \
	--with-sg-logdir=%{_var}/log/squid \
	--with-sg-dbhome=%{_dbhomedir}
	
%{__make} %{?_smp_mflags} LIBS=-ldb

%install
%{__rm} -rf $RPM_BUILD_ROOT

%{__make} DESTDIR=$RPM_BUILD_ROOT install

%{__install} -p -D -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/squidGuard
%{__install} -p -D -m 0644 samples/sample.conf $RPM_BUILD_ROOT%{_sysconfdir}/squid/squidGuard.conf
%{__install} -p -D -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_dbhomedir}/blacklists.tar.gz

# Don't use SOURCE3, but use the allready patched one #165689, also install it with perm 755 not 750
%{__install} -p -D -m 0755 squid-getlist.html $RPM_BUILD_ROOT%{_sysconfdir}/cron.daily/squidGuard

pushd $RPM_BUILD_ROOT%{_dbhomedir}
tar xfz $RPM_BUILD_ROOT%{_dbhomedir}/blacklists.tar.gz
popd

sed -i "s,dest/adult/,blacklists/porn/,g" $RPM_BUILD_ROOT%{_sysconfdir}/squid/squidGuard.conf

%clean
%{__rm} -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root)
%doc samples/*.conf
%doc samples/*.cgi
%doc samples/dest/blacklists.tar.gz
%doc COPYING GPL
%doc doc/*.txt doc/*.html doc/*.gif
%{_bindir}/*
%config(noreplace) %{_sysconfdir}/squid/squidGuard.conf
%config(noreplace) %{_sysconfdir}/logrotate.d/squidGuard
%config(noreplace) %{_sysconfdir}/cron.daily/squidGuard
%{_dbhomedir}/

%changelog
* Tue Sep 06 2005 Oliver Falk 		- 1.2.0-11
- More bugs from Bug #165689
  Install cron script with perm 755
  Don't use SOURCE3 in install section, we need to use the patched one
  
* Mon Sep 05 2005 Oliver Falk 		- 1.2.0-10
- Include GPL in doc section

* Mon Sep 05 2005 Oliver Falk 		- 1.2.0-9
- More 'bugs' from Bug #165689
  Make changed on squid-getlist.html a patch, as sources should
  match upstream sources, so they are wget-able...

* Mon Sep 05 2005 Oliver Falk 		- 1.2.0-8
- Bug #165689

* Thu May 19 2005 Oliver Falk 		- 1.2.0-7
- Update blacklists
- Cleanup specfile

* Fri Apr 08 2005 Oliver Falk 		- 1.2.0-6
- Fix build on RH 8 with db 4.0.14, by not applying the db4 patch

* Mon Feb 21 2005 Oliver Falk  		- 1.2.0-5
- Specfile cleaning
- Make it build with db4 again, by adding the db4-patch

* Mon Apr 12 2002 Oliver Pitzeier 	- 1.2.0-4
- Tweaks

* Mon Apr 08 2002 Oliver Pitzeier  	- 1.2.0-3
- Rebuild

* Mon Apr 08 2002 Oliver Pitzeier  	- 1.2.0-2
- Updated the blacklists and put it into the right place
  I also descompress them
- Added a new "forbidden" script - the other ones are too
  old and don't work.  

* Fri Apr 05 2002 Oliver Pitzeier  	- 1.2.0-1
- Update to version 1.2.0

* Fri Jun  1 2001 Enrico Scholz 
- cleaned up for rhcontrib

* Fri Oct 13 2000 Enrico Scholz 
- initial build

squidguard-1.2.0-db4.patch:

--- NEW FILE squidguard-1.2.0-db4.patch ---
--- src/sgDb.c.orig	2004-03-09 03:45:59.000000000 +0100
+++ src/sgDb.c	2004-03-09 03:48:43.000000000 +0100
@@ -98,13 +98,13 @@
     if(createdb)
       flag = flag | DB_TRUNCATE;
     if ((ret = 
-	 Db->dbp->open(Db->dbp, dbfile, NULL, DB_BTREE, flag, 0664)) != 0) {
+	 Db->dbp->open(Db->dbp, NULL, dbfile, NULL, DB_BTREE, flag, 0664)) != 0) {
       (void) Db->dbp->close(Db->dbp, 0);
       sgLogFatalError("Error db_open: %s", strerror(ret));
     }
   } else {
     if ((ret = 
-	 Db->dbp->open(Db->dbp, dbfile, NULL, DB_BTREE, DB_CREATE, 0664)) != 0) {
+	 Db->dbp->open(Db->dbp, NULL, dbfile, NULL, DB_BTREE, DB_CREATE, 0664)) != 0) {
       sgLogFatalError("Error db_open: %s", strerror(ret));
     }
   }


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/squidGuard/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	6 Sep 2005 10:49:22 -0000	1.1
+++ .cvsignore	6 Sep 2005 10:50:41 -0000	1.2
@@ -0,0 +1,2 @@
+blacklists.tar.gz
+squidGuard-1.2.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/squidGuard/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	6 Sep 2005 10:49:22 -0000	1.1
+++ sources	6 Sep 2005 10:50:41 -0000	1.2
@@ -0,0 +1,2 @@
+63190e4c21688a4185cc3c0b62aae970  blacklists.tar.gz
+c6e2e9112fdbda0602656f94c1ce31fd  squidGuard-1.2.0.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep  6 10:53:51 2005
From: fedora-extras-commits at redhat.com (Oliver Falk (oliver))
Date: Tue,  6 Sep 2005 06:53:51 -0400
Subject: owners owners.list,1.167,1.168
Message-ID: <200509061053.j86ArpJx002434@cvs-int.fedora.redhat.com>

Author: oliver

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2420

Modified Files:
	owners.list 
Log Message:
* Add squidGuard


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.167
retrieving revision 1.168
diff -u -r1.167 -r1.168
--- owners.list	4 Sep 2005 21:59:46 -0000	1.167
+++ owners.list	6 Sep 2005 10:53:48 -0000	1.168
@@ -874,6 +874,7 @@
 Fedora Extras|splint|An implementation of the lint program|pnasrat at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|sqlite2|Embeddable SQL engine in a C library|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
 Fedora Extras|sqlite|An embeddable SQL engine in a C library|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
+Fedora Extras|squidGuard|Filter, redirector and access controller plugin for squid|oliver at linux-kernel.at|extras-qa at fedoraproject.org|
 Fedora Extras|starfighter|For bugs related to the starfighter component|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|stellarium|A photo-realistic nightsky renderer|Jochen at herr-schmitt.de|extras-qa at fedoraproject.org|
 Fedora Extras|stow|Manage the installation of software packages from source|gauret at free.fr|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Tue Sep  6 14:27:28 2005
From: fedora-extras-commits at redhat.com (Ed Hill (edhill))
Date: Tue,  6 Sep 2005 10:27:28 -0400
Subject: rpms/emacs-auctex/devel emacs-auctex.spec,1.2,1.3
Message-ID: <200509061427.j86ERS6T008228@cvs-int.fedora.redhat.com>

Author: edhill

Update of /cvs/extras/rpms/emacs-auctex/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8191/devel

Modified Files:
	emacs-auctex.spec 
Log Message:
bugzilla 167439



Index: emacs-auctex.spec
===================================================================
RCS file: /cvs/extras/rpms/emacs-auctex/devel/emacs-auctex.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- emacs-auctex.spec	9 Aug 2005 18:23:06 -0000	1.2
+++ emacs-auctex.spec	6 Sep 2005 14:27:26 -0000	1.3
@@ -4,7 +4,7 @@
 Summary: 	Enhanced TeX modes for Emacsen
 Name: 		emacs-auctex
 Version: 	11.55
-Release: 	4%{?dist}
+Release: 	5%{?dist}
 License: 	GPL
 Group: 		Applications/Editors
 URL: 		http://www.gnu.org/software/auctex/
@@ -14,7 +14,7 @@
 Obsoletes:      auctex
 Conflicts:      emacspeak < 18
 Provides:       auctex
-Requires:       emacs emacs-el
+Requires:       emacs emacs-common
 BuildRequires:  emacs tetex tetex-dvips texinfo
 
 %description 
@@ -81,6 +81,9 @@
 %{_datadir}/emacs/site-lisp/tex-site.el
 
 %changelog
+* Tue Sep  6 2005 Ed Hill  - 11.55-5
+- bugzilla 167439
+
 * Tue Aug  9 2005 Ed Hill  - 11.55-4
 - call it BuildArch
 



From fedora-extras-commits at redhat.com  Tue Sep  6 14:27:27 2005
From: fedora-extras-commits at redhat.com (Ed Hill (edhill))
Date: Tue,  6 Sep 2005 10:27:27 -0400
Subject: rpms/emacs-auctex/FC-4 emacs-auctex.spec,1.2,1.3
Message-ID: <200509061427.j86ERR9R008224@cvs-int.fedora.redhat.com>

Author: edhill

Update of /cvs/extras/rpms/emacs-auctex/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8191/FC-4

Modified Files:
	emacs-auctex.spec 
Log Message:
bugzilla 167439



Index: emacs-auctex.spec
===================================================================
RCS file: /cvs/extras/rpms/emacs-auctex/FC-4/emacs-auctex.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- emacs-auctex.spec	9 Aug 2005 18:23:06 -0000	1.2
+++ emacs-auctex.spec	6 Sep 2005 14:27:24 -0000	1.3
@@ -4,7 +4,7 @@
 Summary: 	Enhanced TeX modes for Emacsen
 Name: 		emacs-auctex
 Version: 	11.55
-Release: 	4%{?dist}
+Release: 	5%{?dist}
 License: 	GPL
 Group: 		Applications/Editors
 URL: 		http://www.gnu.org/software/auctex/
@@ -14,7 +14,7 @@
 Obsoletes:      auctex
 Conflicts:      emacspeak < 18
 Provides:       auctex
-Requires:       emacs emacs-el
+Requires:       emacs emacs-common
 BuildRequires:  emacs tetex tetex-dvips texinfo
 
 %description 
@@ -81,6 +81,9 @@
 %{_datadir}/emacs/site-lisp/tex-site.el
 
 %changelog
+* Tue Sep  6 2005 Ed Hill  - 11.55-5
+- bugzilla 167439
+
 * Tue Aug  9 2005 Ed Hill  - 11.55-4
 - call it BuildArch
 



From fedora-extras-commits at redhat.com  Tue Sep  6 14:33:51 2005
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Tue,  6 Sep 2005 10:33:51 -0400
Subject: rpms/erlang - New directory
Message-ID: <200509061433.j86EXpYQ008388@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/erlang
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8378/erlang

Log Message:
Directory /cvs/extras/rpms/erlang added to the repository




From fedora-extras-commits at redhat.com  Tue Sep  6 14:33:53 2005
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Tue,  6 Sep 2005 10:33:53 -0400
Subject: rpms/erlang/devel - New directory
Message-ID: <200509061433.j86EXrkP008407@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/erlang/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8378/erlang/devel

Log Message:
Directory /cvs/extras/rpms/erlang/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Sep  6 14:34:15 2005
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Tue,  6 Sep 2005 10:34:15 -0400
Subject: rpms/erlang Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200509061434.j86EYFWY008452@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/erlang
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8423

Added Files:
	Makefile import.log 
Log Message:
Setup of module erlang


--- NEW FILE Makefile ---
# Top level Makefile for module erlang
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Tue Sep  6 14:34:15 2005
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Tue,  6 Sep 2005 10:34:15 -0400
Subject: rpms/erlang/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200509061434.j86EYF4W008457@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/erlang/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8423/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module erlang


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Tue Sep  6 14:38:21 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue,  6 Sep 2005 10:38:21 -0400
Subject: rpms/logjam/FC-3 logjam.spec,1.7,1.8 sources,1.4,1.5
Message-ID: <200509061438.j86EcLZI008593@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/logjam/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8510/FC-3

Modified Files:
	logjam.spec sources 
Log Message:

4.5.1



Index: logjam.spec
===================================================================
RCS file: /cvs/extras/rpms/logjam/FC-3/logjam.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- logjam.spec	11 Jul 2005 14:43:34 -0000	1.7
+++ logjam.spec	6 Sep 2005 14:38:19 -0000	1.8
@@ -1,17 +1,14 @@
 %define use_xmms 1
 
 Name:		logjam
-Version:	4.5
-Release:	0.1patch8%{?dist}
+Version:	4.5.1
+Release:	1%{?dist}
 Epoch:		1
 Summary:	GTK2 client for LiveJournal
 License:	GPL
 Group:		User Interface/Desktops
 URL:		http://logjam.danga.com/
-#This is where the final builds come from. 
-#Source0:	http://logjam.danga.com/download/logjam-%{version}.tar.bz2
-#This is an arch snapshot
-Source0:	logjam-%{version}-patch8.tar.bz2
+Source0:	http://logjam.danga.com/download/logjam-%{version}.tar.bz2
 Requires:	curl >= 7.9, gtkspell
 %if %{use_xmms}
 BuildRequires:	xmms-devel
@@ -22,7 +19,6 @@
 Obsoletes:	loserjabber, logjam-gnome
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Patch0:		logjam-4.4.1-offline-segfaultfix.patch
-Patch1:		logjam-4.4.1-rupo.patch
 Patch2:		logjam-4.4.1-backdated.patch
 Patch3:		logjam-4.4.1-cleanups.patch
 Patch4:		logjam-4.4.1-fedora-desktop.patch
@@ -44,9 +40,8 @@
 %endif
 
 %prep
-%setup -n %{name}-%{version}-patch8 -q
+%setup -q
 %patch0 -p1 -b .offline-segfaultfix
-%patch1 -p1 -b .rupo
 %patch2 -p1 -b .backdated
 %patch3 -p1 -b .cleanups
 %patch4 -p1 -b .desktop
@@ -57,10 +52,6 @@
 %if %{use_xmms}
 	--with-xmms
 %endif
-cp libtool protocol/liblivejournal
-cd gen
-./regen.sh
-cd ..
 make
 
 %install
@@ -91,6 +82,9 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Tue Sep  6 2005 Tom "spot" Callaway  1:4.5.1-1
+- bump to 4.5.1
+
 * Mon Jul 11 2005 Tom "spot" Callaway  4.5-0.1patch8
 - bump to patch8
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/logjam/FC-3/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	11 Jul 2005 14:46:17 -0000	1.4
+++ sources	6 Sep 2005 14:38:19 -0000	1.5
@@ -1,2 +1,3 @@
 f16f68a4a6b15fb5bb650614f3ff081c  logjam-4.4.1.tar.bz2
 0acb70ccb88d6334af22e56e4b521c6b  logjam-4.5-patch8.tar.bz2
+ccae70dc36644cd1529c581443484ebe  logjam-4.5.1.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep  6 14:38:22 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue,  6 Sep 2005 10:38:22 -0400
Subject: rpms/logjam/devel .cvsignore, 1.3, 1.4 logjam.spec, 1.16,
	1.17 sources, 1.4, 1.5
Message-ID: <200509061438.j86EcMHR008612@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/logjam/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8510/devel

Modified Files:
	.cvsignore logjam.spec sources 
Log Message:

4.5.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/logjam/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	11 Feb 2005 05:39:25 -0000	1.3
+++ .cvsignore	6 Sep 2005 14:38:20 -0000	1.4
@@ -1 +1,2 @@
 logjam-4.4.1.tar.bz2
+logjam-4.5.1.tar.bz2


Index: logjam.spec
===================================================================
RCS file: /cvs/extras/rpms/logjam/devel/logjam.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- logjam.spec	11 Jul 2005 14:43:40 -0000	1.16
+++ logjam.spec	6 Sep 2005 14:38:20 -0000	1.17
@@ -1,17 +1,14 @@
 %define use_xmms 1
 
 Name:		logjam
-Version:	4.5
-Release:	0.1patch8%{?dist}
+Version:	4.5.1
+Release:	1%{?dist}
 Epoch:		1
 Summary:	GTK2 client for LiveJournal
 License:	GPL
 Group:		User Interface/Desktops
 URL:		http://logjam.danga.com/
-#This is where the final builds come from. 
-#Source0:	http://logjam.danga.com/download/logjam-%{version}.tar.bz2
-#This is an arch snapshot
-Source0:	logjam-%{version}-patch8.tar.bz2
+Source0:	http://logjam.danga.com/download/logjam-%{version}.tar.bz2
 Requires:	curl >= 7.9, gtkspell
 %if %{use_xmms}
 BuildRequires:	xmms-devel
@@ -22,7 +19,6 @@
 Obsoletes:	loserjabber, logjam-gnome
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Patch0:		logjam-4.4.1-offline-segfaultfix.patch
-Patch1:		logjam-4.4.1-rupo.patch
 Patch2:		logjam-4.4.1-backdated.patch
 Patch3:		logjam-4.4.1-cleanups.patch
 Patch4:		logjam-4.4.1-fedora-desktop.patch
@@ -44,9 +40,8 @@
 %endif
 
 %prep
-%setup -n %{name}-%{version}-patch8 -q
+%setup -q
 %patch0 -p1 -b .offline-segfaultfix
-%patch1 -p1 -b .rupo
 %patch2 -p1 -b .backdated
 %patch3 -p1 -b .cleanups
 %patch4 -p1 -b .desktop
@@ -57,10 +52,6 @@
 %if %{use_xmms}
 	--with-xmms
 %endif
-cp libtool protocol/liblivejournal
-cd gen
-./regen.sh
-cd ..
 make
 
 %install
@@ -91,6 +82,9 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Tue Sep  6 2005 Tom "spot" Callaway  1:4.5.1-1
+- bump to 4.5.1
+
 * Mon Jul 11 2005 Tom "spot" Callaway  4.5-0.1patch8
 - bump to patch8
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/logjam/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	11 Jul 2005 14:46:23 -0000	1.4
+++ sources	6 Sep 2005 14:38:20 -0000	1.5
@@ -1,2 +1,3 @@
 f16f68a4a6b15fb5bb650614f3ff081c  logjam-4.4.1.tar.bz2
 0acb70ccb88d6334af22e56e4b521c6b  logjam-4.5-patch8.tar.bz2
+ccae70dc36644cd1529c581443484ebe  logjam-4.5.1.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep  6 14:38:22 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue,  6 Sep 2005 10:38:22 -0400
Subject: rpms/logjam/FC-4 logjam.spec,1.16,1.17 sources,1.4,1.5
Message-ID: <200509061438.j86EcMPY008606@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/logjam/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8510/FC-4

Modified Files:
	logjam.spec sources 
Log Message:

4.5.1



Index: logjam.spec
===================================================================
RCS file: /cvs/extras/rpms/logjam/FC-4/logjam.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- logjam.spec	11 Jul 2005 14:43:34 -0000	1.16
+++ logjam.spec	6 Sep 2005 14:38:19 -0000	1.17
@@ -1,17 +1,14 @@
 %define use_xmms 1
 
 Name:		logjam
-Version:	4.5
-Release:	0.1patch8%{?dist}
+Version:	4.5.1
+Release:	1%{?dist}
 Epoch:		1
 Summary:	GTK2 client for LiveJournal
 License:	GPL
 Group:		User Interface/Desktops
 URL:		http://logjam.danga.com/
-#This is where the final builds come from. 
-#Source0:	http://logjam.danga.com/download/logjam-%{version}.tar.bz2
-#This is an arch snapshot
-Source0:	logjam-%{version}-patch8.tar.bz2
+Source0:	http://logjam.danga.com/download/logjam-%{version}.tar.bz2
 Requires:	curl >= 7.9, gtkspell
 %if %{use_xmms}
 BuildRequires:	xmms-devel
@@ -22,7 +19,6 @@
 Obsoletes:	loserjabber, logjam-gnome
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Patch0:		logjam-4.4.1-offline-segfaultfix.patch
-Patch1:		logjam-4.4.1-rupo.patch
 Patch2:		logjam-4.4.1-backdated.patch
 Patch3:		logjam-4.4.1-cleanups.patch
 Patch4:		logjam-4.4.1-fedora-desktop.patch
@@ -44,9 +40,8 @@
 %endif
 
 %prep
-%setup -n %{name}-%{version}-patch8 -q
+%setup -q
 %patch0 -p1 -b .offline-segfaultfix
-%patch1 -p1 -b .rupo
 %patch2 -p1 -b .backdated
 %patch3 -p1 -b .cleanups
 %patch4 -p1 -b .desktop
@@ -57,10 +52,6 @@
 %if %{use_xmms}
 	--with-xmms
 %endif
-cp libtool protocol/liblivejournal
-cd gen
-./regen.sh
-cd ..
 make
 
 %install
@@ -91,6 +82,9 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Tue Sep  6 2005 Tom "spot" Callaway  1:4.5.1-1
+- bump to 4.5.1
+
 * Mon Jul 11 2005 Tom "spot" Callaway  4.5-0.1patch8
 - bump to patch8
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/logjam/FC-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	11 Jul 2005 14:46:18 -0000	1.4
+++ sources	6 Sep 2005 14:38:19 -0000	1.5
@@ -1,2 +1,3 @@
 f16f68a4a6b15fb5bb650614f3ff081c  logjam-4.4.1.tar.bz2
 0acb70ccb88d6334af22e56e4b521c6b  logjam-4.5-patch8.tar.bz2
+ccae70dc36644cd1529c581443484ebe  logjam-4.5.1.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep  6 15:14:38 2005
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Tue,  6 Sep 2005 11:14:38 -0400
Subject: rpms/erlang import.log,1.1,1.2
Message-ID: <200509061515.j86FF8vH010317@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/erlang
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10267

Modified Files:
	import.log 
Log Message:
auto-import erlang-R10B-6.3 on branch devel from erlang-R10B-6.3.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/erlang/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	6 Sep 2005 14:34:13 -0000	1.1
+++ import.log	6 Sep 2005 15:14:36 -0000	1.2
@@ -0,0 +1 @@
+erlang-R10B-6_3:HEAD:erlang-R10B-6.3.src.rpm:1126019665



From fedora-extras-commits at redhat.com  Tue Sep  6 15:14:38 2005
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Tue,  6 Sep 2005 11:14:38 -0400
Subject: rpms/erlang/devel erlang.spec, NONE, 1.1 otp-install.patch, NONE,
	1.1 otp-links.patch, NONE, 1.1 otp-rpath.patch, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200509061514.j86FEcZ5010304@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/erlang/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10267/devel

Modified Files:
	.cvsignore sources 
Added Files:
	erlang.spec otp-install.patch otp-links.patch otp-rpath.patch 
Log Message:
auto-import erlang-R10B-6.3 on branch devel from erlang-R10B-6.3.src.rpm


--- NEW FILE erlang.spec ---
Name:           erlang
Version:        R10B
Release:        6.3
Summary:        General-purpose programming language and runtime environment

Group:          Development/Languages
License:        Erlang Public License
URL:            http://www.erlang.org
Source:         http://www.erlang.org/download/otp_src_R10B-6.tar.gz
Source1:	http://www.erlang.org/download/otp_doc_html_R10B-6.tar.gz
Source2:	http://www.erlang.org/download/otp_doc_man_R10B-6.tar.gz
Patch:		otp-links.patch
Patch1:		otp-install.patch
Patch2:		otp-rpath.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:	ncurses-devel, openssl-devel, flex, unixODBC-devel

%description 
Erlang is a general-purpose programming language and runtime
environment. Erlang has built-in support for concurrency, distribution
and fault tolerance. Erlang is used in several large telecommunication
systems from Ericsson.


%package doc
Summary:	Erlang documentation
Group:		Development/Languages

%description doc
Documentation for Erlang.


%prep
%setup -q -n otp_src_R10B-6
%patch -p1
%patch1 -p1
%patch2 -p1


%build
./configure --prefix=%{_prefix} --exec-prefix=%{_prefix} --bindir=%{_bindir} --libdir=%{_libdir}
chmod -R u+w .
make


%install
rm -rf $RPM_BUILD_ROOT
make INSTALL_PREFIX=$RPM_BUILD_ROOT install

# clean up
find $RPM_BUILD_ROOT%{_libdir}/erlang -perm 0775 | xargs chmod 755
find $RPM_BUILD_ROOT%{_libdir}/erlang -name Makefile | xargs chmod 644
find $RPM_BUILD_ROOT%{_libdir}/erlang -name \*.bat | xargs rm -f
find $RPM_BUILD_ROOT%{_libdir}/erlang -name index.txt.old | xargs rm -f

# doc
mkdir -p erlang_doc
tar -C erlang_doc -zxf %{SOURCE1}
tar -C $RPM_BUILD_ROOT/%{_libdir}/erlang -zxf %{SOURCE2}

# make links to binaries
mkdir -p $RPM_BUILD_ROOT/%{_bindir}
cd $RPM_BUILD_ROOT/%{_bindir}
for file in erl erlc 
do
  ln -sf ../%{_lib}/erlang/bin/$file .
done


%clean
rm -rf $RPM_BUILD_ROOT


%files 
%defattr(-,root,root)
%doc AUTHORS EPLICENCE README
%{_bindir}/*
%{_libdir}/erlang


%files doc
%defattr(-,root,root)
%doc erlang_doc/*


%post
%{_libdir}/erlang/Install -minimal %{_libdir}/erlang > /dev/null


%changelog
* Tue Sep  6 2005 Gerard Milmeister  - R10B-6.3
- Remove perl BuildRequires

* Tue Aug 30 2005 Gerard Milmeister  - R10B-6.2
- change /usr/lib to %%{_libdir}
- redirect output in %%post to /dev/null
- add unixODBC-devel to BuildRequires
- split doc off to erlang-doc package

* Sat Jun 25 2005 Gerard Milmeister  - R10B-6.1
- New Version R10B-6

* Sun Feb 13 2005 Gerard Milmeister  - R10B-3.1
- New Version R10B-3

* Mon Dec 27 2004 Gerard Milmeister  - 0:R10B-2-0.fdr.1
- New Version R10B-2

* Wed Oct  6 2004 Gerard Milmeister  - 0:R10B-0.fdr.1
- New Version R10B

* Thu Oct 16 2003 Gerard Milmeister  - 0:R9B-1.fdr.1
- First Fedora release

otp-install.patch:

--- NEW FILE otp-install.patch ---
--- otp_src_R9C-0/erts/etc/unix/Install.src.install	2003-10-17 12:52:14.000000000 +0200
+++ otp_src_R9C-0/erts/etc/unix/Install.src	2003-10-17 14:26:49.000000000 +0200
@@ -84,7 +84,7 @@
   /bin/rm -f epmd
 fi
 
-ln -s $ERL_ROOT/erts-%I_VSN%/bin/epmd epmd
+ln -s ../erts-%I_VSN%/bin/epmd epmd
 
 cp -p $ERL_ROOT/erts-%I_VSN%/bin/run_erl .
 cp -p $ERL_ROOT/erts-%I_VSN%/bin/to_erl .
@@ -145,16 +145,4 @@
 	(ranlib $library) > /dev/null 2>&1
     done
 fi
-
-
-#
-# Fixing the man pages
-#
-
-if [ -d $ERL_ROOT/man ]
-then
-    cd $ERL_ROOT
-    ./misc/format_man_pages $ERL_ROOT
-fi
-
-
+exit 0

otp-links.patch:

--- NEW FILE otp-links.patch ---
--- otp_src_R9C-0/Makefile.in.links	2003-10-17 12:49:41.000000000 +0200
+++ otp_src_R9C-0/Makefile.in	2003-10-17 12:50:07.000000000 +0200
@@ -505,14 +505,6 @@
 # Erlang base public files
 #
 install.bin:
-	rm -f $(BINDIR)/erl $(BINDIR)/erlc \
-	      $(BINDIR)/ecc $(BINDIR)/elink $(BINDIR)/ear $(BINDIR)/escript
-	${LN_S} $(ERLANG_BINDIR)/erl      $(BINDIR)/erl
-	${LN_S} $(ERLANG_BINDIR)/erlc     $(BINDIR)/erlc
-	${LN_S} $(ERLANG_BINDIR)/ecc      $(BINDIR)/ecc
-	${LN_S} $(ERLANG_BINDIR)/elink    $(BINDIR)/elink
-	${LN_S} $(ERLANG_BINDIR)/ear      $(BINDIR)/ear
-	${LN_S} $(ERLANG_BINDIR)/escript  $(BINDIR)/escript
 
 #
 # Directories needed before we can install

otp-rpath.patch:

--- NEW FILE otp-rpath.patch ---
--- otp_src_R10B-3/lib/crypto/c_src/Makefile.in.rpath	2005-02-13 15:22:29.208560819 +0100
+++ otp_src_R10B-3/lib/crypto/c_src/Makefile.in	2005-02-13 15:22:50.852106461 +0100
@@ -79,7 +79,7 @@
 ifeq ($(HOST_OS),)
 HOST_OS := $(shell $(ERL_TOP)/erts/autoconf/config.guess)
 endif
-LD_R_FLAG=@DED_LD_FLAG_RUNTIME_LIBRARY_PATH@
+LD_R_FLAG=
 ifeq ($(findstring @,$(LD_R_FLAG)),@)
 # Old erts configure used which hasn't replaced
 # @DED_LD_FLAG_RUNTIME_LIBRARY_PATH@; we try our best here instead...
--- otp_src_R10B-3/lib/crypto/priv/Makefile.rpath	2005-02-13 14:46:15.043814168 +0100
+++ otp_src_R10B-3/lib/crypto/priv/Makefile	2005-02-13 14:46:48.575467543 +0100
@@ -60,7 +60,7 @@
 # ----------------------------------------------------
 
 $(SO_DRIVER): $(OBJS)
-	$(SO_LD) $(SO_LDFLAGS) -L$(SO_SSL_LIBDIR) -Wl,-R$(SO_SSL_LIBDIR) \
+	$(SO_LD) $(SO_LDFLAGS) -L$(SO_SSL_LIBDIR) \
 	-o $@ $^ -lcrypto
 
 $(DLL_DRIVER): $(OBJS)
--- otp_src_R10B-3/lib/ssh/c_src/Makefile.in.rpath	2005-02-13 15:23:13.516486079 +0100
+++ otp_src_R10B-3/lib/ssh/c_src/Makefile.in	2005-02-13 15:23:25.130630385 +0100
@@ -75,7 +75,7 @@
 else
 DYN_DRIVER = $(LIBDIR)/ssh_crypto_drv.so
 endif
-LD_R_FLAG=@DED_LD_FLAG_RUNTIME_LIBRARY_PATH@
+LD_R_FLAG=
 ifeq ($(findstring @,$(LD_R_FLAG)),@)
 # Old erts configure used which hasn't replaced
 # @DED_LD_FLAG_RUNTIME_LIBRARY_PATH@; we try our best here instead...
--- otp_src_R10B-3/erts/configure.rpath	2005-02-13 14:44:11.498507144 +0100
+++ otp_src_R10B-3/erts/configure	2005-02-13 14:44:55.858437414 +0100
@@ -1231,7 +1231,7 @@
 CFLAGS="$CFLAGS $extra_flags"
 DEBUG_CFLAGS="-g $extra_flags"
 
-CFLAG_RUNTIME_LIBRARY_PATH="-Wl,-R"
+CFLAG_RUNTIME_LIBRARY_PATH=""
 case $host_os in
   darwin*)
 	CFLAG_RUNTIME_LIBRARY_PATH=


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/erlang/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	6 Sep 2005 14:34:13 -0000	1.1
+++ .cvsignore	6 Sep 2005 15:14:36 -0000	1.2
@@ -0,0 +1,3 @@
+otp_doc_html_R10B-6.tar.gz
+otp_doc_man_R10B-6.tar.gz
+otp_src_R10B-6.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/erlang/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	6 Sep 2005 14:34:13 -0000	1.1
+++ sources	6 Sep 2005 15:14:36 -0000	1.2
@@ -0,0 +1,3 @@
+9f50340fd1c25af5d5a6fcf9f14b2e49  otp_doc_html_R10B-6.tar.gz
+0243d2ff01fb2bac03115bcbe2284b20  otp_doc_man_R10B-6.tar.gz
+6463f70b40e2a6c3587e54653add8414  otp_src_R10B-6.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep  6 15:28:47 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Tue,  6 Sep 2005 11:28:47 -0400
Subject: rpms/abcde/FC-4 .cvsignore, 1.5, 1.6 abcde.spec, 1.6, 1.7 sources,
	1.5, 1.6
Message-ID: <200509061529.j86FTH1J010444@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/abcde/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10400/FC-4

Modified Files:
	.cvsignore abcde.spec sources 
Log Message:
* Mon Sep  5 2005 Ville Skytt??  - 2.3.4-1
- 2.3.4.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/abcde/FC-4/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	28 Aug 2005 20:03:06 -0000	1.5
+++ .cvsignore	6 Sep 2005 15:28:44 -0000	1.6
@@ -1 +1 @@
-abcde_2.3.3.orig.tar.gz
+abcde_2.3.4.orig.tar.gz


Index: abcde.spec
===================================================================
RCS file: /cvs/extras/rpms/abcde/FC-4/abcde.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- abcde.spec	28 Aug 2005 20:03:06 -0000	1.6
+++ abcde.spec	6 Sep 2005 15:28:44 -0000	1.7
@@ -1,5 +1,5 @@
 Name:           abcde
-Version:        2.3.3
+Version:        2.3.4
 Release:        1%{?dist}
 Summary:        A Better CD Encoder
 
@@ -53,6 +53,9 @@
 
 
 %changelog
+* Mon Sep  5 2005 Ville Skytt??  - 2.3.4-1
+- 2.3.4.
+
 * Fri Aug 26 2005 Ville Skytt??  - 2.3.3-1
 - 2.3.3.
 - Reformat specfile.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/abcde/FC-4/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	28 Aug 2005 20:03:06 -0000	1.5
+++ sources	6 Sep 2005 15:28:44 -0000	1.6
@@ -1 +1 @@
-94877d1e410ae420630b1048e82907d3  abcde_2.3.3.orig.tar.gz
+fc7e2364c8e25af34e5721ba9e2eda46  abcde_2.3.4.orig.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep  6 15:28:47 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Tue,  6 Sep 2005 11:28:47 -0400
Subject: rpms/abcde/devel .cvsignore, 1.5, 1.6 abcde.spec, 1.6, 1.7 sources,
	1.5, 1.6
Message-ID: <200509061529.j86FTHRd010449@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/abcde/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10400/devel

Modified Files:
	.cvsignore abcde.spec sources 
Log Message:
* Mon Sep  5 2005 Ville Skytt??  - 2.3.4-1
- 2.3.4.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/abcde/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	28 Aug 2005 20:03:09 -0000	1.5
+++ .cvsignore	6 Sep 2005 15:28:45 -0000	1.6
@@ -1 +1 @@
-abcde_2.3.3.orig.tar.gz
+abcde_2.3.4.orig.tar.gz


Index: abcde.spec
===================================================================
RCS file: /cvs/extras/rpms/abcde/devel/abcde.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- abcde.spec	28 Aug 2005 20:03:09 -0000	1.6
+++ abcde.spec	6 Sep 2005 15:28:45 -0000	1.7
@@ -1,5 +1,5 @@
 Name:           abcde
-Version:        2.3.3
+Version:        2.3.4
 Release:        1%{?dist}
 Summary:        A Better CD Encoder
 
@@ -53,6 +53,9 @@
 
 
 %changelog
+* Mon Sep  5 2005 Ville Skytt??  - 2.3.4-1
+- 2.3.4.
+
 * Fri Aug 26 2005 Ville Skytt??  - 2.3.3-1
 - 2.3.3.
 - Reformat specfile.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/abcde/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	28 Aug 2005 20:03:09 -0000	1.5
+++ sources	6 Sep 2005 15:28:45 -0000	1.6
@@ -1 +1 @@
-94877d1e410ae420630b1048e82907d3  abcde_2.3.3.orig.tar.gz
+fc7e2364c8e25af34e5721ba9e2eda46  abcde_2.3.4.orig.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep  6 15:36:16 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue,  6 Sep 2005 11:36:16 -0400
Subject: rpms/logjam/devel logjam.spec,1.17,1.18
Message-ID: <200509061536.j86FaGu5010553@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/logjam/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10492/devel

Modified Files:
	logjam.spec 
Log Message:

FC-3 branch missing a patch



Index: logjam.spec
===================================================================
RCS file: /cvs/extras/rpms/logjam/devel/logjam.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- logjam.spec	6 Sep 2005 14:38:20 -0000	1.17
+++ logjam.spec	6 Sep 2005 15:36:14 -0000	1.18
@@ -2,7 +2,7 @@
 
 Name:		logjam
 Version:	4.5.1
-Release:	1%{?dist}
+Release:	2%{?dist}
 Epoch:		1
 Summary:	GTK2 client for LiveJournal
 License:	GPL
@@ -82,6 +82,9 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Tue Sep  6 2005 Tom "spot" Callaway  1:4.5.1-2
+- fc3 branch missing a patch
+
 * Tue Sep  6 2005 Tom "spot" Callaway  1:4.5.1-1
 - bump to 4.5.1
 



From fedora-extras-commits at redhat.com  Tue Sep  6 15:36:10 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue,  6 Sep 2005 11:36:10 -0400
Subject: rpms/logjam/FC-3 logjam-4.4.1-cleanups.patch, NONE, 1.1 logjam.spec,
	1.8, 1.9
Message-ID: <200509061536.j86Fae3s010556@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/logjam/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10492/FC-3

Modified Files:
	logjam.spec 
Added Files:
	logjam-4.4.1-cleanups.patch 
Log Message:

FC-3 branch missing a patch


logjam-4.4.1-cleanups.patch:

--- NEW FILE logjam-4.4.1-cleanups.patch ---
--- logjam-4.4.1/src/tools.c.BAD	2005-03-13 17:17:31.000000000 -0600
+++ logjam-4.4.1/src/tools.c	2005-03-13 17:54:53.000000000 -0600
@@ -209,7 +209,7 @@
 
 	while (gtk_dialog_run(GTK_DIALOG(cmd_dlg)) == GTK_RESPONSE_OK) {
 		const gchar *command;
-		const gchar *encoding;
+		const gchar *encoding = 0;
 		GError *err = NULL;
 
 		command = gtk_entry_get_text(GTK_ENTRY(entry));
--- logjam-4.4.1/src/checkfriends-gtk.c.BAD	2005-03-13 17:50:06.000000000 -0600
+++ logjam-4.4.1/src/checkfriends-gtk.c	2005-03-13 17:51:41.000000000 -0600
@@ -255,8 +255,6 @@
 
 static void
 cf_float_destroy(CFFloat *cff) {
-	CFMgr *cfm = cff->cfmgr;
-
 	if (GTK_IS_WIDGET(cff->win))
 		gtk_widget_destroy(cff->win);
 
@@ -277,8 +275,6 @@
 #ifdef USE_DOCK
 static void
 cf_dock_destroy(CFFloat *cff) {
-	CFMgr *cfm = cff->cfmgr;
-
 	g_signal_handlers_disconnect_by_func(G_OBJECT(cff->win),
 			G_CALLBACK(cf_dock_destroyed_cb), NULL);
 	gtk_widget_destroy(GTK_WIDGET(cff->win));
@@ -290,7 +286,11 @@
 cf_dock_destroyed_cb(GtkWidget *widget, CFFloat *cff) {
 	app.docklet = NULL;
 }
-	
+
+/* 
+ * Not currently used.	
+ */
+/*
 static void
 cf_dock_setup(CFFloat *ind) {
 	GtkWidget *docklet = app.docklet;
@@ -303,6 +303,7 @@
 
 	ind->win = docklet;
 }
+*/
 #endif /* USE_DOCK */
 
 void cf_float_decorate_refresh(void) {
--- logjam-4.4.1/src/cmdline.c.BAD	2005-03-13 17:41:34.000000000 -0600
+++ logjam-4.4.1/src/cmdline.c	2005-03-13 17:46:22.000000000 -0600
@@ -664,7 +664,7 @@
 
 static void
 command_dispatch(Cmdline *cmdline, Command *commands, const char *help, int argc, gchar *argv[]) {
-	JamAccount *acc;
+	JamAccount *acc = NULL;
 	Command *command = NULL;
 	char *cmdname;
 	int i;
--- logjam-4.4.1/src/menu.c.BAD	2005-03-13 17:52:10.000000000 -0600
+++ logjam-4.4.1/src/menu.c	2005-03-13 17:52:16.000000000 -0600
@@ -440,7 +440,6 @@
 
 };
 	int itemcount = sizeof(menu_items) / sizeof(menu_items[0]);
-	int i;
 	JamView *view;
 
 	accelgroup = gtk_accel_group_new();


Index: logjam.spec
===================================================================
RCS file: /cvs/extras/rpms/logjam/FC-3/logjam.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- logjam.spec	6 Sep 2005 14:38:19 -0000	1.8
+++ logjam.spec	6 Sep 2005 15:36:08 -0000	1.9
@@ -2,7 +2,7 @@
 
 Name:		logjam
 Version:	4.5.1
-Release:	1%{?dist}
+Release:	2%{?dist}
 Epoch:		1
 Summary:	GTK2 client for LiveJournal
 License:	GPL
@@ -82,6 +82,9 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Tue Sep  6 2005 Tom "spot" Callaway  1:4.5.1-2
+- fc3 branch missing a patch
+
 * Tue Sep  6 2005 Tom "spot" Callaway  1:4.5.1-1
 - bump to 4.5.1
 



From fedora-extras-commits at redhat.com  Tue Sep  6 15:36:11 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue,  6 Sep 2005 11:36:11 -0400
Subject: rpms/logjam/FC-4 logjam.spec,1.17,1.18
Message-ID: <200509061536.j86FafCB010559@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/logjam/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10492/FC-4

Modified Files:
	logjam.spec 
Log Message:

FC-3 branch missing a patch



Index: logjam.spec
===================================================================
RCS file: /cvs/extras/rpms/logjam/FC-4/logjam.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- logjam.spec	6 Sep 2005 14:38:19 -0000	1.17
+++ logjam.spec	6 Sep 2005 15:36:08 -0000	1.18
@@ -2,7 +2,7 @@
 
 Name:		logjam
 Version:	4.5.1
-Release:	1%{?dist}
+Release:	2%{?dist}
 Epoch:		1
 Summary:	GTK2 client for LiveJournal
 License:	GPL
@@ -82,6 +82,9 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Tue Sep  6 2005 Tom "spot" Callaway  1:4.5.1-2
+- fc3 branch missing a patch
+
 * Tue Sep  6 2005 Tom "spot" Callaway  1:4.5.1-1
 - bump to 4.5.1
 



From fedora-extras-commits at redhat.com  Tue Sep  6 16:23:39 2005
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Tue,  6 Sep 2005 12:23:39 -0400
Subject: rpms/supertux/devel supertux.spec, 1.8, 1.9 supertux.desktop, 1.1,
	NONE
Message-ID: <200509061623.j86GNdac012210@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/supertux/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12191

Modified Files:
	supertux.spec 
Removed Files:
	supertux.desktop 
Log Message:
Avoid second .desktop file (#167579)


Index: supertux.spec
===================================================================
RCS file: /cvs/extras/rpms/supertux/devel/supertux.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- supertux.spec	1 Sep 2005 20:29:45 -0000	1.8
+++ supertux.spec	6 Sep 2005 16:23:37 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           supertux
 Version:        0.1.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 
 Summary:        Jump'n run like game similar to Mario Bros
 
@@ -8,7 +8,6 @@
 License:        GPL
 URL:            http://supertux.berlios.de/
 Source0:        http://download.berlios.de/supertux/supertux-%{version}.tar.bz2
-Source1:        %{name}.desktop
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  SDL-devel >= 1.2.4, SDL_image-devel, SDL_mixer-devel
@@ -35,12 +34,11 @@
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
-mkdir -p $RPM_BUILD_ROOT/%{_datadir}/{pixmaps,applications}
-install -m 644 data/images/icon.xpm $RPM_BUILD_ROOT/%{_datadir}/pixmaps/supertux.xpm
+rm -f $RPM_BUILD_ROOT%{_datadir}/applications/supertux.desktop
 desktop-file-install \
 	--vendor fedora \
 	--add-category X-Fedora \
-	--dir $RPM_BUILD_ROOT/%{_datadir}/applications %{SOURCE1}
+	--dir $RPM_BUILD_ROOT%{_datadir}/applications supertux.desktop
 	
 
 %clean
@@ -56,6 +54,9 @@
 %{_datadir}/pixmaps/*
 
 %changelog
+* Tue Sep 06 2005 Steven Pritchard  0.1.3-2
+- Avoid second .desktop file (#167579)
+
 * Thu Sep 01 2005 Steven Pritchard  0.1.3-1
 - Update to 0.1.3
 


--- supertux.desktop DELETED ---



From fedora-extras-commits at redhat.com  Tue Sep  6 16:23:55 2005
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Tue,  6 Sep 2005 12:23:55 -0400
Subject: rpms/supertux/FC-4 supertux.spec,1.8,1.9 supertux.desktop,1.1,NONE
Message-ID: <200509061623.j86GNtl7012271@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/supertux/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12250

Modified Files:
	supertux.spec 
Removed Files:
	supertux.desktop 
Log Message:
Avoid second .desktop file (#167579)


Index: supertux.spec
===================================================================
RCS file: /cvs/extras/rpms/supertux/FC-4/supertux.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- supertux.spec	1 Sep 2005 20:29:38 -0000	1.8
+++ supertux.spec	6 Sep 2005 16:23:53 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           supertux
 Version:        0.1.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 
 Summary:        Jump'n run like game similar to Mario Bros
 
@@ -8,7 +8,6 @@
 License:        GPL
 URL:            http://supertux.berlios.de/
 Source0:        http://download.berlios.de/supertux/supertux-%{version}.tar.bz2
-Source1:        %{name}.desktop
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  SDL-devel >= 1.2.4, SDL_image-devel, SDL_mixer-devel
@@ -35,12 +34,11 @@
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
-mkdir -p $RPM_BUILD_ROOT/%{_datadir}/{pixmaps,applications}
-install -m 644 data/images/icon.xpm $RPM_BUILD_ROOT/%{_datadir}/pixmaps/supertux.xpm
+rm -f $RPM_BUILD_ROOT%{_datadir}/applications/supertux.desktop
 desktop-file-install \
 	--vendor fedora \
 	--add-category X-Fedora \
-	--dir $RPM_BUILD_ROOT/%{_datadir}/applications %{SOURCE1}
+	--dir $RPM_BUILD_ROOT%{_datadir}/applications supertux.desktop
 	
 
 %clean
@@ -56,6 +54,9 @@
 %{_datadir}/pixmaps/*
 
 %changelog
+* Tue Sep 06 2005 Steven Pritchard  0.1.3-2
+- Avoid second .desktop file (#167579)
+
 * Thu Sep 01 2005 Steven Pritchard  0.1.3-1
 - Update to 0.1.3
 


--- supertux.desktop DELETED ---



From fedora-extras-commits at redhat.com  Tue Sep  6 16:24:15 2005
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Tue,  6 Sep 2005 12:24:15 -0400
Subject: rpms/supertux/FC-3 supertux.spec,1.5,1.6 supertux.desktop,1.1,NONE
Message-ID: <200509061624.j86GOFCf012335@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/supertux/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12316

Modified Files:
	supertux.spec 
Removed Files:
	supertux.desktop 
Log Message:
Avoid second .desktop file (#167579)


Index: supertux.spec
===================================================================
RCS file: /cvs/extras/rpms/supertux/FC-3/supertux.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- supertux.spec	1 Sep 2005 20:29:31 -0000	1.5
+++ supertux.spec	6 Sep 2005 16:24:13 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           supertux
 Version:        0.1.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 
 Summary:        Jump'n run like game similar to Mario Bros
 
@@ -8,7 +8,6 @@
 License:        GPL
 URL:            http://supertux.berlios.de/
 Source0:        http://download.berlios.de/supertux/supertux-%{version}.tar.bz2
-Source1:        %{name}.desktop
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  SDL-devel >= 1.2.4, SDL_image-devel, SDL_mixer-devel
@@ -35,12 +34,11 @@
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
-mkdir -p $RPM_BUILD_ROOT/%{_datadir}/{pixmaps,applications}
-install -m 644 data/images/icon.xpm $RPM_BUILD_ROOT/%{_datadir}/pixmaps/supertux.xpm
+rm -f $RPM_BUILD_ROOT%{_datadir}/applications/supertux.desktop
 desktop-file-install \
 	--vendor fedora \
 	--add-category X-Fedora \
-	--dir $RPM_BUILD_ROOT/%{_datadir}/applications %{SOURCE1}
+	--dir $RPM_BUILD_ROOT%{_datadir}/applications supertux.desktop
 	
 
 %clean
@@ -56,6 +54,9 @@
 %{_datadir}/pixmaps/*
 
 %changelog
+* Tue Sep 06 2005 Steven Pritchard  0.1.3-2
+- Avoid second .desktop file (#167579)
+
 * Thu Sep 01 2005 Steven Pritchard  0.1.3-1
 - Update to 0.1.3
 


--- supertux.desktop DELETED ---



From fedora-extras-commits at redhat.com  Tue Sep  6 16:24:18 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue,  6 Sep 2005 12:24:18 -0400
Subject: rpms/logjam/FC-3 logjam-4.4.1-fedora-desktop.patch, NONE,
	1.1 logjam.spec, 1.9, 1.10
Message-ID: <200509061624.j86GOILX012389@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/logjam/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12311/FC-3

Modified Files:
	logjam.spec 
Added Files:
	logjam-4.4.1-fedora-desktop.patch 
Log Message:

one more time. :/


logjam-4.4.1-fedora-desktop.patch:

--- NEW FILE logjam-4.4.1-fedora-desktop.patch ---
--- logjam-4.4.1/data/logjam.desktop.in.BAD	2005-04-14 09:04:52.000000000 -0500
+++ logjam-4.4.1/data/logjam.desktop.in	2005-04-14 09:05:55.000000000 -0500
@@ -1,9 +1,9 @@
 [Desktop Entry]
 _Name=LogJam
-_Comment=Manage journal/weblog
-Exec=logjam
-Icon=logjam.png
+_Comment=LiveJournal Client
+Exec=/usr/bin/logjam
+Icon=/usr/share/pixmaps/logjam_goat.png
 Terminal=false
 Type=Application
-Categories=Application;Network;
+Categories=Application;Network;X-Fedora;
 StartupNotify=true


Index: logjam.spec
===================================================================
RCS file: /cvs/extras/rpms/logjam/FC-3/logjam.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- logjam.spec	6 Sep 2005 15:36:08 -0000	1.9
+++ logjam.spec	6 Sep 2005 16:24:16 -0000	1.10
@@ -2,7 +2,7 @@
 
 Name:		logjam
 Version:	4.5.1
-Release:	2%{?dist}
+Release:	3%{?dist}
 Epoch:		1
 Summary:	GTK2 client for LiveJournal
 License:	GPL
@@ -82,6 +82,9 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Tue Sep  6 2005 Tom "spot" Callaway  1:4.5.1-3
+- fc3 branch missing another patch
+
 * Tue Sep  6 2005 Tom "spot" Callaway  1:4.5.1-2
 - fc3 branch missing a patch
 



From fedora-extras-commits at redhat.com  Tue Sep  6 16:24:18 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue,  6 Sep 2005 12:24:18 -0400
Subject: rpms/logjam/FC-4 logjam.spec,1.18,1.19
Message-ID: <200509061624.j86GOIsM012395@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/logjam/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12311/FC-4

Modified Files:
	logjam.spec 
Log Message:

one more time. :/



Index: logjam.spec
===================================================================
RCS file: /cvs/extras/rpms/logjam/FC-4/logjam.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- logjam.spec	6 Sep 2005 15:36:08 -0000	1.18
+++ logjam.spec	6 Sep 2005 16:24:16 -0000	1.19
@@ -2,7 +2,7 @@
 
 Name:		logjam
 Version:	4.5.1
-Release:	2%{?dist}
+Release:	3%{?dist}
 Epoch:		1
 Summary:	GTK2 client for LiveJournal
 License:	GPL
@@ -82,6 +82,9 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Tue Sep  6 2005 Tom "spot" Callaway  1:4.5.1-3
+- fc3 branch missing another patch
+
 * Tue Sep  6 2005 Tom "spot" Callaway  1:4.5.1-2
 - fc3 branch missing a patch
 



From fedora-extras-commits at redhat.com  Tue Sep  6 16:24:19 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue,  6 Sep 2005 12:24:19 -0400
Subject: rpms/logjam/devel logjam.spec,1.18,1.19
Message-ID: <200509061624.j86GOJIA012401@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/logjam/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12311/devel

Modified Files:
	logjam.spec 
Log Message:

one more time. :/



Index: logjam.spec
===================================================================
RCS file: /cvs/extras/rpms/logjam/devel/logjam.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- logjam.spec	6 Sep 2005 15:36:14 -0000	1.18
+++ logjam.spec	6 Sep 2005 16:24:17 -0000	1.19
@@ -2,7 +2,7 @@
 
 Name:		logjam
 Version:	4.5.1
-Release:	2%{?dist}
+Release:	3%{?dist}
 Epoch:		1
 Summary:	GTK2 client for LiveJournal
 License:	GPL
@@ -82,6 +82,9 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Tue Sep  6 2005 Tom "spot" Callaway  1:4.5.1-3
+- fc3 branch missing another patch
+
 * Tue Sep  6 2005 Tom "spot" Callaway  1:4.5.1-2
 - fc3 branch missing a patch
 



From fedora-extras-commits at redhat.com  Tue Sep  6 17:49:04 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue,  6 Sep 2005 13:49:04 -0400
Subject: rpms/maxima - New directory
Message-ID: <200509061749.j86Hn59G014641@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/maxima
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14617/maxima

Log Message:
Directory /cvs/extras/rpms/maxima added to the repository




From fedora-extras-commits at redhat.com  Tue Sep  6 17:49:15 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue,  6 Sep 2005 13:49:15 -0400
Subject: rpms/maxima Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200509061749.j86HnFw7014693@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/maxima
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14662

Added Files:
	Makefile import.log 
Log Message:
Setup of module maxima


--- NEW FILE Makefile ---
# Top level Makefile for module maxima
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Tue Sep  6 17:49:05 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue,  6 Sep 2005 13:49:05 -0400
Subject: rpms/maxima/devel - New directory
Message-ID: <200509061749.j86Hn5JD014646@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/maxima/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14617/maxima/devel

Log Message:
Directory /cvs/extras/rpms/maxima/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Sep  6 17:49:15 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue,  6 Sep 2005 13:49:15 -0400
Subject: rpms/maxima/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200509061749.j86HnGYt014698@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/maxima/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14662/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module maxima


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Tue Sep  6 17:51:54 2005
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Tue,  6 Sep 2005 13:51:54 -0400
Subject: rpms/perl-Algorithm-Diff - New directory
Message-ID: <200509061751.j86HpsHn014823@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Algorithm-Diff
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14799/perl-Algorithm-Diff

Log Message:
Directory /cvs/extras/rpms/perl-Algorithm-Diff added to the repository




From fedora-extras-commits at redhat.com  Tue Sep  6 17:51:54 2005
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Tue,  6 Sep 2005 13:51:54 -0400
Subject: rpms/perl-Algorithm-Diff/devel - New directory
Message-ID: <200509061751.j86HpsAI014828@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Algorithm-Diff/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14799/perl-Algorithm-Diff/devel

Log Message:
Directory /cvs/extras/rpms/perl-Algorithm-Diff/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Sep  6 17:52:18 2005
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Tue,  6 Sep 2005 13:52:18 -0400
Subject: rpms/perl-Algorithm-Diff Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200509061752.j86HqIlf014879@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Algorithm-Diff
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14844

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-Algorithm-Diff


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Algorithm-Diff
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Tue Sep  6 17:52:19 2005
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Tue,  6 Sep 2005 13:52:19 -0400
Subject: rpms/perl-Algorithm-Diff/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200509061752.j86HqJgB014884@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Algorithm-Diff/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14844/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Algorithm-Diff


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Tue Sep  6 17:53:12 2005
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Tue,  6 Sep 2005 13:53:12 -0400
Subject: owners owners.list,1.168,1.169
Message-ID: <200509061753.j86HrCqX014987@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14952

Modified Files:
	owners.list 
Log Message:
Add perl-Algorithm-Diff.


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.168
retrieving revision 1.169
diff -u -r1.168 -r1.169
--- owners.list	6 Sep 2005 10:53:48 -0000	1.168
+++ owners.list	6 Sep 2005 17:53:10 -0000	1.169
@@ -548,6 +548,7 @@
 Fedora Extras|pdfjam|Utilities for join, rotate and align PDFs|jpo at di.uminho.pt|extras-qa at fedoraproject.org|
 Fedora Extras|pdftk|The PDF Tool Kit|Jochen at herr-schmitt.de|extras-qa at fedoraproject.org|
 Fedora Extras|pdftohtml|A PDF to HTML converter|gauret at free.fr|extras-qa at fedoraproject.org|
+Fedora Extras|perl-Algorithm-Diff|Algorithm::Diff Perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Apache-LogRegex|Perl module for parsing a line from an Apache logfile into a hash|ghenry at suretecsystems.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-AppConfig|Perl module for reading configuration files|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Archive-Zip|Perl library for accessing Zip archives|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Tue Sep  6 17:53:00 2005
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Tue,  6 Sep 2005 13:53:00 -0400
Subject: rpms/perl-Algorithm-Diff import.log,1.1,1.2
Message-ID: <200509061753.j86HrV8C015027@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Algorithm-Diff
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14917

Modified Files:
	import.log 
Log Message:
auto-import perl-Algorithm-Diff-1.1901-1 on branch devel from perl-Algorithm-Diff-1.1901-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Algorithm-Diff/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	6 Sep 2005 17:52:16 -0000	1.1
+++ import.log	6 Sep 2005 17:52:58 -0000	1.2
@@ -0,0 +1 @@
+perl-Algorithm-Diff-1_1901-1:HEAD:perl-Algorithm-Diff-1.1901-1.src.rpm:1126029167



From fedora-extras-commits at redhat.com  Tue Sep  6 17:53:01 2005
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Tue,  6 Sep 2005 13:53:01 -0400
Subject: rpms/perl-Algorithm-Diff/devel perl-Algorithm-Diff.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200509061753.j86HrVxh015031@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Algorithm-Diff/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14917/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Algorithm-Diff.spec 
Log Message:
auto-import perl-Algorithm-Diff-1.1901-1 on branch devel from perl-Algorithm-Diff-1.1901-1.src.rpm


--- NEW FILE perl-Algorithm-Diff.spec ---
Name:           perl-Algorithm-Diff
Version:        1.1901
Release:        1%{?dist}
Summary:        Algorithm::Diff Perl module
License:        GPL or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Algorithm-Diff/
Source0:        http://www.cpan.org/modules/by-module/Algorithm/Algorithm-Diff-1.1901.zip
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
This is a module for computing the difference between two files, two
strings, or any other two lists of things.  It uses an intelligent
algorithm similar to (or identical to) the one used by the Unix "diff"
program.  It is guaranteed to find the *smallest possible* set of
differences.

%prep
%setup -q -n Algorithm-Diff-%{version}
chmod 644 *.pl

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT

make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT

find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null \;

chmod -R u+rwX,go+rX,go-w $RPM_BUILD_ROOT/*

rm -f $RPM_BUILD_ROOT%{perl_vendorlib}/Algorithm/*.pl

perldoc -t perlgpl > COPYING
perldoc -t perlartistic > Artistic

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes README COPYING Artistic *.pl
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Mon Sep 05 2005 Steven Pritchard  1.1901-1
- Updated to 1.1901.

* Sat Sep 03 2005 Steven Pritchard  1.15-2
- Move example files to %%doc.

* Sat Aug 27 2005 Steven Pritchard  1.15-1
- Specfile autogenerated.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Algorithm-Diff/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	6 Sep 2005 17:52:17 -0000	1.1
+++ .cvsignore	6 Sep 2005 17:52:59 -0000	1.2
@@ -0,0 +1 @@
+Algorithm-Diff-1.1901.zip


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Algorithm-Diff/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	6 Sep 2005 17:52:17 -0000	1.1
+++ sources	6 Sep 2005 17:52:59 -0000	1.2
@@ -0,0 +1 @@
+a4f8625182c00847098b05e18268bfb2  Algorithm-Diff-1.1901.zip



From fedora-extras-commits at redhat.com  Tue Sep  6 17:56:04 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue,  6 Sep 2005 13:56:04 -0400
Subject: rpms/maxima import.log,1.1,1.2
Message-ID: <200509061756.j86Hu4ov015122@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/maxima
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15082

Modified Files:
	import.log 
Log Message:
auto-import maxima-5.9.1-4 on branch devel from maxima-5.9.1-4.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/maxima/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	6 Sep 2005 17:49:12 -0000	1.1
+++ import.log	6 Sep 2005 17:56:02 -0000	1.2
@@ -0,0 +1 @@
+maxima-5_9_1-4:HEAD:maxima-5.9.1-4.src.rpm:1126029350



From fedora-extras-commits at redhat.com  Tue Sep  6 17:56:05 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue,  6 Sep 2005 13:56:05 -0400
Subject: rpms/maxima/devel maxima-5.9.0-htmlview.patch, NONE,
	1.1 maxima-modes.el, NONE, 1.1 maxima.el-xemacs.patch, NONE,
	1.1 maxima.png, NONE, 1.1 maxima.spec, NONE,
	1.1 xmaxima.desktop, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <200509061756.j86Hu5PK015131@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/maxima/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15082/devel

Modified Files:
	.cvsignore sources 
Added Files:
	maxima-5.9.0-htmlview.patch maxima-modes.el 
	maxima.el-xemacs.patch maxima.png maxima.spec xmaxima.desktop 
Log Message:
auto-import maxima-5.9.1-4 on branch devel from maxima-5.9.1-4.src.rpm

maxima-5.9.0-htmlview.patch:

--- NEW FILE maxima-5.9.0-htmlview.patch ---
--- maxima-5.9.0/interfaces/xmaxima/Tkmaxima/Menu.tcl.htmlview	2003-02-06 21:13:54.000000000 -0600
+++ maxima-5.9.0/interfaces/xmaxima/Tkmaxima/Menu.tcl	2004-03-26 15:47:44.000000000 -0600
@@ -215,7 +215,7 @@
 	}
     } else {
 	# This is more difficult under Unix - KDE GNOME CDE etc...
-	lappend browse netscape
+	lappend browse htmlview 
     }
     $m add sep
     $m add command -underline 0 -label {Maxima Homepage} \


--- NEW FILE maxima-modes.el ---

(autoload 'emaxima-mode "emaxima" "EMaxima" t)
(add-hook 'emaxima-mode-hook 'emaxima-mark-file-as-emaxima)
(autoload 'maxima-mode "maxima" "Maxima mode" t)
(autoload 'maxima "maxima" "Maxima interaction" t)
;(autoload 'imaxima "imaxima" "Maxima interaction with graphical output" t)
(autoload 'dbl "dbl" "Make a debugger to run lisp, maxima and or gdb in" t)
(autoload 'gcl-mode "gcl" "Major mode for editing maxima code and interacting with debugger" t)
(setq auto-mode-alist (cons '("\\.ma?[cx]\\'" . maxima-mode) auto-mode-alist))
;(setq auto-mode-alist (cons '("\\.li?sp\\'" . gcl-mode) auto-mode-alist))

maxima.el-xemacs.patch:

--- NEW FILE maxima.el-xemacs.patch ---
--- maxima/interfaces/emacs/emaxima/maxima.el	2004-05-20 18:12:56.000000000 +0000
+++ maxima-new/interfaces/emacs/emaxima/maxima.el	2004-08-06 01:56:50.000000000 +0000
@@ -1628,6 +1628,9 @@
           (beginning-of-line)
 	  (while (re-search-forward 
                   (concat "(" maxima-inchar "[0-9]+).*\r") pmark t)
+	    (replace-match "" t t))
+          (beginning-of-line)
+	  (while (re-search-forward "\r" pmark t)
 	    (replace-match "" t t))))))
 
 (defun inferior-maxima-wait-for-output ()


--- NEW FILE maxima.spec ---

## Which runtimes to build/enable?
%define _with_clisp 1
%define _without_cmucl 1
%define _without_gcl 1
%define _without_sbcl 1

#define cvs cvs20050825
#define beta cvs

Summary: Maxima Symbolic Computation Program
Name: 	 maxima
Version: 5.9.1

Release: 4%{?dist} 
License: GPL
Group:	 Applications/Engineering 
URL: 	 http://maxima.sourceforge.net/
Source:  http://dl.sourceforge.net/sourceforge/maxima/maxima-%{version}%{?cvs}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Source1: maxima.png
Source2: xmaxima.desktop
Source6: maxima-modes.el

## Other maxima reference docs
Source10: http://starship.python.net/crew/mike/TixMaxima/macref.pdf
Source11: http://maxima.sourceforge.net/docs/maximabook/maximabook-19-Sept-2004.pdf

Patch1: maxima-5.9.0-htmlview.patch
# (mysterious?) xemacs patch
Patch2: maxima.el-xemacs.patch
# Fix build w/sbcl (5.9.1.1cvs only)
%{?cvs:Patch3: maxima-sbcl.patch}

# Inhibit automatic compressing of info files. Compressed info
# files break maxima's internal help.
%define __spec_install_post %{nil} 

BuildRequires: texinfo
BuildRequires: tetex-latex
BuildRequires: desktop-file-utils
# /usr/bin/wish
BuildRequires: tk
# cvs
%{?cvs:BuildRequires: autoconf automake}

Requires: %{name}-runtime = %{version}
Requires: gnuplot
Requires(post): /sbin/install-info
Requires(postun): /sbin/install-info

%description
Maxima is a full symbolic computation program.  It is full featured
doing symbolic manipulation of polynomials, matrices, rational
functions, integration, Todd-coxeter, graphing, bigfloats.  It has a
symbolic debugger source level debugger for maxima code.  Maxima is
based on the original Macsyma developed at MIT in the 1970's.

%package gui
Summary: Tcl/Tk GUI interface for %{name}
Group:	 Applications/Engineering 
Requires: %{name} = %{version}-%{release} 
Obsoletes: %{name}-xmaxima < %{version}-%{release}
Provides:  %{name}-xmaxima = %{version}-%{release}
Requires: tk
%description gui
Tcl/Tk GUI interface for %{name}

%package src 
Summary: %{name} lisp source code 
Group:   Applications/Engineering
Requires: %{name} = %{version}-%{release}
%description src 
%{name} lisp source code.

%if "%{?_with_clisp:1}" == "1"
%package runtime-clisp
Summary: Maxima compiled with clisp
Group:	 Applications/Engineering
BuildRequires: clisp
%define clisp_ver %{expand:%%(rpm -q --qf '%%{VERSION}' clisp )}
Requires: clisp >= %{clisp_ver}
Requires: %{name} = %{version}
Provides: %{name}-runtime = %{version}
%description runtime-clisp
Maxima compiled with Common Lisp (clisp) 
%endif

%if "%{?_with_cmucl:1}" == "1"
%package runtime-cmucl
Summary: Maxima compiled with CMUCL
Group:	 Applications/Engineering 
BuildRequires: cmucl 
#define cmucl_ver %{expand:%%(rpm -q --qf '%%{VERSION}' cmucl )}
#Requires: cmucl >= %{cmucl_ver}
Requires:  %{name} = %{version}
Obsoletes: %{name}-exec-cmucl 
Provides:  %{name}-runtime = %{version}
%description runtime-cmucl
Maxima compiled with CMU Common Lisp (cmucl) 
%endif

%if "%{?_with_gcl:1}" == "1"
%package runtime-gcl
Summary: Maxima compiled with GCL
Group:   Applications/Engineering
BuildRequires: gcl
Requires:  %{name} = %{version}
#Obsoletes: %{name}-exec-gcl 
Provides:  %{name}-runtime = %{version}
%description runtime-gcl
Maxima compiled with Gnu Common Lisp (gcl)
%endif

%if "%{?_with_sbcl:1}" == "1"
%package runtime-sbcl
Summary: Maxima compiled with SBCL 
Group:   Applications/Engineering
BuildRequires: sbcl 
%define sbcl_ver %{expand:%%(rpm -q --qf '%%{version}' sbcl )}
Requires: sbcl >= %{sbcl_ver}
Requires: %{name} = %{version}
#Obsoletes: %{name}-exec-sbcl
Provides: %{name}-runtime = %{version}
%description runtime-sbcl
Maxima compiled with Steel Bank Common Lisp (sbcl).
%endif


%prep
%setup -q  -n %{name}%{!?cvs:-%{version}%{?beta}}

# Extra docs
install -p -m644 %{SOURCE10} .

%patch1 -p1 -b .htmlview
%patch2 -p1 -b .xemacs
%{?cvs:%patch3 -p1 -b .sbcl}

sed -i -e 's:/usr/local/info:/usr/share/info:' \
  interfaces/emacs/emaxima/maxima.el
sed -i -e \
  's/(defcustom\s+maxima-info-index-file\s+)(\S+)/$1\"maxima.info-16\"/' \
  interfaces/emacs/emaxima/maxima.el

#if "%{?cvs:1}" == "1"
if [ ! -f configure ]; then
aclocal
automake --add-missing --copy
autoconf
fi

# remove CVS crud
find -name CVS -type d | xargs rm -r
#endif


%build
%configure \
  %{?_with_clisp: --enable-clisp }%{?_without_clisp:--disable-clisp } \
  %{?_with_cmucl: --enable-cmucl --with-cmucl-runtime=%{_libdir}/cmucl/bin/lisp }%{?_without_cmucl:--disable-cmucl } \
  %{?_with_gcl: --enable-gcl }%{?_without_gcl: --disable-gcl } \
  %{?_with_sbcl: --enable-sbcl }%{?_without_sbcl: --disable-sbcl }

# docs
pushd doc

 install -p -m644 %{SOURCE11} maximabook/maxima.pdf

 pushd info
  texi2dvi -p maxima.texi
 popd

 pushd intromax
  pdflatex intromax.ltx
 popd

popd

# everything else
make %{?_smp_mflags}


%check || :
make check


%install
rm -rf $RPM_BUILD_ROOT

make install%{!?debug_package:-strip} DESTDIR=$RPM_BUILD_ROOT

# app icon
install -p -D -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}.png

mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
desktop-file-install --vendor fedora \
  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
  --add-category "X-Fedora" \
  %{SOURCE2} 

## emaxima
# LaTeX style
install -d $RPM_BUILD_ROOT%{_datadir}/texmf/tex/latex/emaxima
cp -alf $RPM_BUILD_ROOT%{_datadir}/%{name}/%{version}%{?beta}/emacs/*.sty \
	$RPM_BUILD_ROOT%{_datadir}/texmf/tex/latex/emaxima/
# emacs
install -d $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/{maxima,site-start.d}
cp -alf $RPM_BUILD_ROOT%{_datadir}/%{name}/%{version}%{?beta}/emacs/*.el \
	$RPM_BUILD_ROOT%{_datadir}/%{name}/%{version}%{?beta}/emacs/*.lisp \
	$RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/maxima/
install -D -m644 -p %{SOURCE6} \
	$RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/site-start.d/maxima.el

# xemacs
install -d $RPM_BUILD_ROOT%{_datadir}/xemacs/site-packages/lisp/{maxima,site-start.d}
cp -alf $RPM_BUILD_ROOT%{_datadir}/%{name}/%{version}%{?beta}/emacs/*.el \
	$RPM_BUILD_ROOT%{_datadir}/%{name}/%{version}%{?beta}/emacs/*.lisp \
	$RPM_BUILD_ROOT%{_datadir}/xemacs/site-packages/lisp/maxima/
install -D -m644 -p %{SOURCE6} \
	$RPM_BUILD_ROOT%{_datadir}/xemacs/site-packages/lisp/site-start.d/maxima.el

## unwanted/unpackaged files
rm -f $RPM_BUILD_ROOT%{_infodir}/dir
# until we get/Require rlwrap from http://utopia.knoware.nl/~hlub/uck/rlwrap/
rm -f $RPM_BUILD_ROOT%{_bindir}/rmaxima
# docs
rm -rf $RPM_BUILD_ROOT%{_datadir}/maxima/%{version}%{?beta}/doc/{contributors,implementation,misc,maximabook,EMaximaIntro.ps}

# when --with gcl, this (sometimes) fails to get auto-created, so we'll help out
touch debugfiles.list


%post
/sbin/install-info %{_infodir}/maxima.info %{_infodir}/dir ||:
[ -x /usr/bin/texhash ] && /usr/bin/texhash 2> /dev/null ||:

%postun
if [ $1 -eq 0 ]; then
  /sbin/install-info --delete %{_infodir}/maxima.info %{_infodir}/dir ||:
  [ -x /usr/bin/texhash ] && /usr/bin/texhash 2> /dev/null ||:
fi


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root)
%doc AUTHORS ChangeLog COPYING INSTALL README README.lisps
%doc doc/misc/ doc/implementation/
%doc doc/intromax/intromax.pdf
%doc doc/maximabook/maxima.pdf
%doc macref.pdf
%doc %{_datadir}/maxima/%{version}%{?beta}/doc
%{_bindir}/maxima
%dir %{_datadir}/maxima
%dir %{_datadir}/maxima/%{version}%{?beta}
%{_datadir}/maxima/%{version}%{?beta}/[a-c,f-r,t-w,y-z,A-Z]*
%{_datadir}/maxima/%{version}%{?beta}/demo/
%{_datadir}/maxima/%{version}%{?beta}/share/
%dir %{_libdir}/maxima
%dir %{_libdir}/maxima/%{version}%{?beta}
%{_libexecdir}/maxima
%{_infodir}/*.info*
%{_mandir}/man1/maxima.*
# emaxima     
%{_datadir}/maxima/%{version}%{?beta}/emacs
%{_datadir}/emacs/site-lisp/*
%{_datadir}/xemacs/site-packages/lisp/*
%{_datadir}/texmf/tex/latex/emaxima/

%files src
%defattr(-,root,root)
%{_datadir}/maxima/%{version}%{?beta}/src/

%files gui
%defattr(-,root,root)
%{_bindir}/xmaxima
%{_datadir}/maxima/%{version}%{?beta}/xmaxima
%{_datadir}/applications/*.desktop
%{_datadir}/pixmaps/*.png

%if "%{?_with_clisp:1}" == "1"
%files runtime-clisp
%defattr(-,root,root)
%{_libdir}/maxima/%{version}%{?beta}/binary-clisp
%endif

%if "%{?_with_cmucl:1}" == "1"
%files runtime-cmucl
%defattr(-,root,root)
%{_libdir}/maxima/%{version}%{?beta}/binary-cmucl
%endif

%if "%{?_with_gcl:1}" == "1"
%files runtime-gcl
%defattr(-,root,root)
%{_libdir}/maxima/%{version}%{?beta}/binary-gcl
%endif

%if "%{?_with_sbcl:1}" == "1"
%files runtime-sbcl
%defattr(-,root,root)
%{_libdir}/maxima/%{version}%{?beta}/binary-sbcl
%endif


%changelog
* Tue Sep 06 2005 Rex Dieter  5.9.1-4
- workaround lack of debuginfo.list when building --with gcl

* Mon Aug 29 2005 Rex Dieter  5.9.1-3
- BR: tk (/usr/bin/wish)
- trim %%description
- drop maxima book generation (use pregenerated copy)
- drop emaxima subpkg bits
- -src: lisp source subpkg

* Fri Aug 26 2005 Rex Dieter  5.9.1-2
- re-instate %%debuginfo
- put 'make check' in %%check section

* Wed Aug 17 2005 Rex Dieter  5.9.1-1
- cleanup for Extras

* Fri Jan 28 2005 Rex Dieter  0:5.9.1-0.fdr.6
- -clisp,-cmucl,-sbcl: Req >= lisp version that was used to build it.

* Thu Sep 30 2004 Rex Dieter  0:5.9.1-0.fdr.5
- respin sbcl,clisp

* Wed Sep 29 2004 Rex Dieter  0:5.9.1-0.fdr.4
- fix %%post/%%postun to handle the now-uncompressed info files
- relax runtime Req/Prov to not include %%release (so we don't have
  to rebuild *every* runtime on every package iteration

* Tue Sep 28 2004 Rex Dieter  0:5.9.1-0.fdr.3
- use pregenerated maxima book and macref.pdf from
  http://maxima.sourceforge.net/docs.shtml

* Tue Sep 28 2004 Rex Dieter  0:5.9.1-0.fdr.2
- fix/cleanup build_book=1 option

* Mon Sep 27 2004 Rex Dieter  0:5.9.1-0.fdr.1
- 5.9.1 

* Fri Sep 17 2004 Rex Dieter  0:5.9.0.9-0.fdr.0.7.rc1
- 5.9.0.9rc1

* Wed Aug 18 2004 Rex Dieter  0:5.9.0.9-0.fdr.0.6.beta2
- updated sbcl patch

* Thu Aug 12 2004 Rex Dieter  0:5.9.0.9-0.fdr.0.5.beta2
- -emaxima: renamed emacs -> emaxima 
- -emaxima: cleanup/expand LaTeX,emacs,xemacs bits
- (optionally) build maxima book (pdf)

* Wed Aug 11 2004 Rex Dieter  0:5.9.0.9-0.fdr.0.4.beta2
- enable sbcl build, thanks to patch from
  http://www.math.utexas.edu/pipermail/maxima/2004/007802.html

* Tue Aug 10 2004 Rex Dieter  0:5.9.0.9-0.fdr.0.3.beta2
- fix conflict with gcl-2.6.4

* Fri Aug 06 2004 Rex Dieter  0:5.9.0.9-0.fdr.0.2.beta2
- (re)enable cmucl

* Wed Aug 04 2004 Rex Dieter  0:5.9.0.9-0.fdr.0.1.beta2
- 5.9.0.9beta2 
- allow sbcl, disabled for now
- nix -emacs subpkg (for now)

* Mon Jul 19 2004 Rex Dieter  0:5.9.0-0.fdr.7
- emacs subpkg
- drop cmucl support (cmucl doesn't build on fc2) 
- add desktop Categories: Education;Math;

* Fri Mar 26 2004 Rex Dieter  0:5.9.0-0.fdr.5
- patch xmaxima to use htmlview instead of netscape
- move %%datadir/maxima/5.9.0/xmaxima to -gui pkg

* Thu Mar 25 2004 Rex Dieter  0:5.9.0-0.fdr.4
- desktop-file now default (unless desktop_file=0)

* Thu Dec 18 2003 Rex Dieter  0:5.9.0-0.fdr.3
- make %%post safer
- cleanup --without (clisp|cmucl|gcl) usage.
- use desktop-file-install (on platforms that support it)
- Requires(post,postun): /sbin/install-info

* Wed Oct 01 2003 Rex Dieter  0:5.9.0-0.fdr.2
- runtime-gcl: remove Requires: gcl, not needed after all.
- enable runtime-clisp 
- enable runtime-cmucl 

* Wed Sep 24 2003 Rex Dieter  0:5.9.0-0.fdr.1
- applnk/icon

* Wed Sep 17 2003 Rex Dieter  0:5.9.0-0.fdr.0
- fedora'ize 


--- NEW FILE xmaxima.desktop ---
[Desktop Entry]
Name=xmaxima
Comment=Symbolic Computation Program
Exec=xmaxima
Icon=maxima.png
MimeType=
Type=Application
Categories=Application;Scientific;Education;Math;
Encoding=UTF-8


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/maxima/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	6 Sep 2005 17:49:13 -0000	1.1
+++ .cvsignore	6 Sep 2005 17:56:03 -0000	1.2
@@ -0,0 +1,3 @@
+macref.pdf
+maxima-5.9.1.tar.gz
+maximabook-19-Sept-2004.pdf


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/maxima/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	6 Sep 2005 17:49:13 -0000	1.1
+++ sources	6 Sep 2005 17:56:03 -0000	1.2
@@ -0,0 +1,3 @@
+c101a1ce604d31b02bbc2f37cced280d  macref.pdf
+659acfad1f61444cf5b38f6c28279d40  maxima-5.9.1.tar.gz
+9faa5a513de43b5e7384216a8783f620  maximabook-19-Sept-2004.pdf



From fedora-extras-commits at redhat.com  Tue Sep  6 17:59:22 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue,  6 Sep 2005 13:59:22 -0400
Subject: rpms/maxima/devel maxima.spec,1.1,1.2
Message-ID: <200509061759.j86HxM6a015541@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/maxima/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15428

Modified Files:
	maxima.spec 
Log Message:
exclude ppc since clisp isn't available



Index: maxima.spec
===================================================================
RCS file: /cvs/extras/rpms/maxima/devel/maxima.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- maxima.spec	6 Sep 2005 17:56:03 -0000	1.1
+++ maxima.spec	6 Sep 2005 17:59:20 -0000	1.2
@@ -18,6 +18,7 @@
 URL: 	 http://maxima.sourceforge.net/
 Source:  http://dl.sourceforge.net/sourceforge/maxima/maxima-%{version}%{?cvs}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+ExcludeArch: ppc ppc64
 
 Source1: maxima.png
 Source2: xmaxima.desktop
@@ -311,6 +312,7 @@
 %changelog
 * Tue Sep 06 2005 Rex Dieter  5.9.1-4
 - workaround lack of debuginfo.list when building --with gcl
+- ExcludeArch: ppc ppc64
 
 * Mon Aug 29 2005 Rex Dieter  5.9.1-3
 - BR: tk (/usr/bin/wish)



From fedora-extras-commits at redhat.com  Tue Sep  6 18:03:33 2005
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Tue,  6 Sep 2005 14:03:33 -0400
Subject: rpms/erlang/FC-4 erlang.spec,1.1,1.2
Message-ID: <200509061804.j86I4Jlx016987@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/erlang/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16963

Modified Files:
	erlang.spec 
Log Message:
added dist tag


Index: erlang.spec
===================================================================
RCS file: /cvs/extras/rpms/erlang/FC-4/erlang.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- erlang.spec	6 Sep 2005 15:14:36 -0000	1.1
+++ erlang.spec	6 Sep 2005 18:03:30 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           erlang
 Version:        R10B
-Release:        6.3
+Release:        6.3%{?dist}
 Summary:        General-purpose programming language and runtime environment
 
 Group:          Development/Languages



From fedora-extras-commits at redhat.com  Tue Sep  6 18:04:21 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue,  6 Sep 2005 14:04:21 -0400
Subject: rpms/maxima/devel maxima.spec,1.2,1.3
Message-ID: <200509061804.j86I4qb3017045@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/maxima/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16985

Modified Files:
	maxima.spec 
Log Message:
note clisp/ppc bugzilla entry



Index: maxima.spec
===================================================================
RCS file: /cvs/extras/rpms/maxima/devel/maxima.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- maxima.spec	6 Sep 2005 17:59:20 -0000	1.2
+++ maxima.spec	6 Sep 2005 18:04:19 -0000	1.3
@@ -312,7 +312,7 @@
 %changelog
 * Tue Sep 06 2005 Rex Dieter  5.9.1-4
 - workaround lack of debuginfo.list when building --with gcl
-- ExcludeArch: ppc ppc64
+- ExcludeArch: ppc ppc64 (bug #166347)
 
 * Mon Aug 29 2005 Rex Dieter  5.9.1-3
 - BR: tk (/usr/bin/wish)



From fedora-extras-commits at redhat.com  Tue Sep  6 18:09:46 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue,  6 Sep 2005 14:09:46 -0400
Subject: owners owners.list,1.169,1.170
Message-ID: <200509061809.j86I9kjF017154@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17129

Modified Files:
	owners.list 
Log Message:
Add maxima entry



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.169
retrieving revision 1.170
diff -u -r1.169 -r1.170
--- owners.list	6 Sep 2005 17:53:10 -0000	1.169
+++ owners.list	6 Sep 2005 18:09:44 -0000	1.170
@@ -465,6 +465,7 @@
 Fedora Extras|manedit|GUI editor for creating man pages.|nos at utelsystems.com|extras-qa at fedoraproject.org|
 Fedora Extras|mantis|A web-based bugtracking system|enrico.scholz at informatik.tu-chemnitz.de|extras-qa at fedoraproject.org|
 Fedora Extras|mathml-fonts|Mathematical symbol fonts|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
+Fedora Extras|maxima|Symbolic Computation Program|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|meanwhile| Lotus Sametime Community Client library|jwboyer at jdub.homelinux.org|extras-qa at fedoraproject.org|
 Fedora Extras|meld|Visual diff and merge tool|compton at pcompton.com|extras-qa at fedoraproject.org|
 Fedora Extras|mercurial|A fast, lightweight distributed source control management system|katzj at redhat.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Tue Sep  6 18:30:16 2005
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Tue,  6 Sep 2005 14:30:16 -0400
Subject: rpms/erlang/FC-3 erlang.spec,1.1,1.2
Message-ID: <200509061830.j86IUGuU017268@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/erlang/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17249

Modified Files:
	erlang.spec 
Log Message:
added dist tag


Index: erlang.spec
===================================================================
RCS file: /cvs/extras/rpms/erlang/FC-3/erlang.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- erlang.spec	6 Sep 2005 15:14:36 -0000	1.1
+++ erlang.spec	6 Sep 2005 18:30:13 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           erlang
 Version:        R10B
-Release:        6.3
+Release:        6.3%{?dist}
 Summary:        General-purpose programming language and runtime environment
 
 Group:          Development/Languages



From fedora-extras-commits at redhat.com  Tue Sep  6 18:30:50 2005
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Tue,  6 Sep 2005 14:30:50 -0400
Subject: rpms/erlang/devel erlang.spec,1.1,1.2
Message-ID: <200509061830.j86IUolS017332@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/erlang/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17312

Modified Files:
	erlang.spec 
Log Message:
added dist tag


Index: erlang.spec
===================================================================
RCS file: /cvs/extras/rpms/erlang/devel/erlang.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- erlang.spec	6 Sep 2005 15:14:36 -0000	1.1
+++ erlang.spec	6 Sep 2005 18:30:48 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           erlang
 Version:        R10B
-Release:        6.3
+Release:        6.3%{?dist}
 Summary:        General-purpose programming language and runtime environment
 
 Group:          Development/Languages



From fedora-extras-commits at redhat.com  Tue Sep  6 18:55:09 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue,  6 Sep 2005 14:55:09 -0400
Subject: rpms/maxima/devel maxima.spec,1.3,1.4
Message-ID: <200509061855.j86It9p6017464@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/maxima/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17445

Modified Files:
	maxima.spec 
Log Message:
remove redundant "Maxima" name from Summary



Index: maxima.spec
===================================================================
RCS file: /cvs/extras/rpms/maxima/devel/maxima.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- maxima.spec	6 Sep 2005 18:04:19 -0000	1.3
+++ maxima.spec	6 Sep 2005 18:55:07 -0000	1.4
@@ -8,7 +8,7 @@
 #define cvs cvs20050825
 #define beta cvs
 
-Summary: Maxima Symbolic Computation Program
+Summary: Symbolic Computation Program
 Name: 	 maxima
 Version: 5.9.1
 



From fedora-extras-commits at redhat.com  Tue Sep  6 20:04:20 2005
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Tue,  6 Sep 2005 16:04:20 -0400
Subject: rpms/erlang/devel otp-glibc24.patch,NONE,1.1 erlang.spec,1.2,1.3
Message-ID: <200509062004.j86K4sK7020932@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/erlang/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20910

Modified Files:
	erlang.spec 
Added Files:
	otp-glibc24.patch 
Log Message:
patch for glibc 2.4

otp-glibc24.patch:

--- NEW FILE otp-glibc24.patch ---
--- otp_src_R10B-6/erts/emulator/hipe/hipe_x86_signal.c.glibc24	2005-09-06 22:01:13.000000000 +0200
+++ otp_src_R10B-6/erts/emulator/hipe/hipe_x86_signal.c	2005-09-06 22:01:36.000000000 +0200
@@ -27,7 +27,7 @@
 #include 
 #include "hipe_signal.h"
 
-#if __GLIBC__ == 2 && __GLIBC_MINOR__ == 3
+#if __GLIBC__ == 2 && __GLIBC_MINOR__ == 4
 /* See comment below for glibc 2.2. */
 #define __USE_GNU		/* to un-hide RTLD_NEXT */
 #include 


Index: erlang.spec
===================================================================
RCS file: /cvs/extras/rpms/erlang/devel/erlang.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- erlang.spec	6 Sep 2005 18:30:48 -0000	1.2
+++ erlang.spec	6 Sep 2005 20:04:16 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           erlang
 Version:        R10B
-Release:        6.3%{?dist}
+Release:        6.4%{?dist}
 Summary:        General-purpose programming language and runtime environment
 
 Group:          Development/Languages
@@ -12,6 +12,7 @@
 Patch:		otp-links.patch
 Patch1:		otp-install.patch
 Patch2:		otp-rpath.patch
+Patch3:		otp-glibc24.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	ncurses-devel, openssl-devel, flex, unixODBC-devel
 
@@ -35,6 +36,7 @@
 %patch -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 
 %build
@@ -88,8 +90,9 @@
 
 
 %changelog
-* Tue Sep  6 2005 Gerard Milmeister  - R10B-6.3
+* Tue Sep  6 2005 Gerard Milmeister  - R10B-6.4
 - Remove perl BuildRequires
+- Add patch for glibc 2.4
 
 * Tue Aug 30 2005 Gerard Milmeister  - R10B-6.2
 - change /usr/lib to %%{_libdir}



From fedora-extras-commits at redhat.com  Tue Sep  6 20:33:53 2005
From: fedora-extras-commits at redhat.com (Linus Walleij (snirkel))
Date: Tue,  6 Sep 2005 16:33:53 -0400
Subject: rpms/libnjb/devel .cvsignore, 1.2, 1.3 libnjb.spec, 1.1, 1.2 sources,
	1.2, 1.3
Message-ID: <200509062033.j86KXrKN021131@cvs-int.fedora.redhat.com>

Author: snirkel

Update of /cvs/extras/rpms/libnjb/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21105

Modified Files:
	.cvsignore libnjb.spec sources 
Log Message:
New upstream release of libnjb, 2.2.2.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libnjb/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	11 Aug 2005 19:37:44 -0000	1.2
+++ .cvsignore	6 Sep 2005 20:33:51 -0000	1.3
@@ -1 +1 @@
-libnjb-2.2.1.tar.gz
+libnjb-2.2.2.tar.gz


Index: libnjb.spec
===================================================================
RCS file: /cvs/extras/rpms/libnjb/devel/libnjb.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libnjb.spec	11 Aug 2005 19:37:44 -0000	1.1
+++ libnjb.spec	6 Sep 2005 20:33:51 -0000	1.2
@@ -11,8 +11,8 @@
 #
 
 Name:		libnjb
-Version:	2.2.1
-Release:	7%{?dist}
+Version:	2.2.2
+Release:	1%{?dist}
 Summary:	A software library for talking to the Creative Nomad Jukeboxes and Dell DJs
 URL:		http://libnjb.sourceforge.net/
 
@@ -100,6 +100,8 @@
 
 
 %changelog
+* Tue Sep 6 2005 Linus Walleij  2.2.2-1
+- New upstream release.
 * Wed Aug 11 2005 Linus Walleij  2.2.1-7
 - Forgot one extraneous docdir, removing it.
 * Wed Aug 10 2005 Linus Walleij  2.2.1-6


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libnjb/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	11 Aug 2005 19:37:44 -0000	1.2
+++ sources	6 Sep 2005 20:33:51 -0000	1.3
@@ -1 +1 @@
-ae7974f5a802072f95742e1d59132152  libnjb-2.2.1.tar.gz
+5d17da61ea6a43fd3831789d1d518bc7  libnjb-2.2.2.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep  6 20:34:12 2005
From: fedora-extras-commits at redhat.com (Dawid Gajownik (gajownik))
Date: Tue,  6 Sep 2005 16:34:12 -0400
Subject: rpms/gajim/devel gajim-0.8.po.patch, 1.1,
	NONE gajim-0.8.x86_64.patch, 1.1, NONE
Message-ID: <200509062034.j86KYCl0021152@cvs-int.fedora.redhat.com>

Author: gajownik

Update of /cvs/extras/rpms/gajim/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21134

Removed Files:
	gajim-0.8.po.patch gajim-0.8.x86_64.patch 
Log Message:
Remove obsoleted patches



--- gajim-0.8.po.patch DELETED ---


--- gajim-0.8.x86_64.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Sep  6 20:36:27 2005
From: fedora-extras-commits at redhat.com (Linus Walleij (snirkel))
Date: Tue,  6 Sep 2005 16:36:27 -0400
Subject: rpms/libnjb/FC-4 .cvsignore, 1.2, 1.3 libnjb.spec, 1.1, 1.2 sources,
	1.2, 1.3
Message-ID: <200509062036.j86KaRhx021239@cvs-int.fedora.redhat.com>

Author: snirkel

Update of /cvs/extras/rpms/libnjb/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21216

Modified Files:
	.cvsignore libnjb.spec sources 
Log Message:
New upstream release of libnjb: 2.2.2.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libnjb/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	11 Aug 2005 19:37:44 -0000	1.2
+++ .cvsignore	6 Sep 2005 20:36:25 -0000	1.3
@@ -1 +1 @@
-libnjb-2.2.1.tar.gz
+libnjb-2.2.2.tar.gz


Index: libnjb.spec
===================================================================
RCS file: /cvs/extras/rpms/libnjb/FC-4/libnjb.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libnjb.spec	11 Aug 2005 19:37:44 -0000	1.1
+++ libnjb.spec	6 Sep 2005 20:36:25 -0000	1.2
@@ -11,8 +11,8 @@
 #
 
 Name:		libnjb
-Version:	2.2.1
-Release:	7%{?dist}
+Version:	2.2.2
+Release:	1%{?dist}
 Summary:	A software library for talking to the Creative Nomad Jukeboxes and Dell DJs
 URL:		http://libnjb.sourceforge.net/
 
@@ -100,6 +100,8 @@
 
 
 %changelog
+* Tue Sep 6 2005 Linus Walleij  2.2.2-1
+- New upstream release.
 * Wed Aug 11 2005 Linus Walleij  2.2.1-7
 - Forgot one extraneous docdir, removing it.
 * Wed Aug 10 2005 Linus Walleij  2.2.1-6


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libnjb/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	11 Aug 2005 19:37:44 -0000	1.2
+++ sources	6 Sep 2005 20:36:25 -0000	1.3
@@ -1 +1 @@
-ae7974f5a802072f95742e1d59132152  libnjb-2.2.1.tar.gz
+5d17da61ea6a43fd3831789d1d518bc7  libnjb-2.2.2.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep  6 20:38:02 2005
From: fedora-extras-commits at redhat.com (Dawid Gajownik (gajownik))
Date: Tue,  6 Sep 2005 16:38:02 -0400
Subject: rpms/gajim import.log,1.4,1.5
Message-ID: <200509062038.j86KcWcF021374@cvs-int.fedora.redhat.com>

Author: gajownik

Update of /cvs/extras/rpms/gajim
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21332

Modified Files:
	import.log 
Log Message:
auto-import gajim-0.8.2-1 on branch devel from gajim-0.8.2-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/gajim/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- import.log	3 Sep 2005 10:16:53 -0000	1.4
+++ import.log	6 Sep 2005 20:38:00 -0000	1.5
@@ -1,3 +1,4 @@
 gajim-0_8-2:HEAD:gajim-0.8-2.src.rpm:1124889138
 gajim-0_8_1-1:HEAD:gajim-0.8.1-1.src.rpm:1125742592
 gajim-0_8_1-1:FC-4:gajim-0.8.1-1.src.rpm:1125742792
+gajim-0_8_2-1:HEAD:gajim-0.8.2-1.src.rpm:1126039272



From fedora-extras-commits at redhat.com  Tue Sep  6 20:38:37 2005
From: fedora-extras-commits at redhat.com (Linus Walleij (snirkel))
Date: Tue,  6 Sep 2005 16:38:37 -0400
Subject: rpms/libnjb/FC-3 .cvsignore, 1.2, 1.3 libnjb.spec, 1.1, 1.2 sources,
	1.2, 1.3
Message-ID: <200509062038.j86Kcb4R021402@cvs-int.fedora.redhat.com>

Author: snirkel

Update of /cvs/extras/rpms/libnjb/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21373

Modified Files:
	.cvsignore libnjb.spec sources 
Log Message:
New upstream release of libnjb: 2.2.2.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libnjb/FC-3/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	11 Aug 2005 19:37:44 -0000	1.2
+++ .cvsignore	6 Sep 2005 20:38:34 -0000	1.3
@@ -1 +1 @@
-libnjb-2.2.1.tar.gz
+libnjb-2.2.2.tar.gz


Index: libnjb.spec
===================================================================
RCS file: /cvs/extras/rpms/libnjb/FC-3/libnjb.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libnjb.spec	11 Aug 2005 19:37:44 -0000	1.1
+++ libnjb.spec	6 Sep 2005 20:38:34 -0000	1.2
@@ -11,8 +11,8 @@
 #
 
 Name:		libnjb
-Version:	2.2.1
-Release:	7%{?dist}
+Version:	2.2.2
+Release:	1%{?dist}
 Summary:	A software library for talking to the Creative Nomad Jukeboxes and Dell DJs
 URL:		http://libnjb.sourceforge.net/
 
@@ -100,6 +100,8 @@
 
 
 %changelog
+* Tue Sep 6 2005 Linus Walleij  2.2.2-1
+- New upstream release.
 * Wed Aug 11 2005 Linus Walleij  2.2.1-7
 - Forgot one extraneous docdir, removing it.
 * Wed Aug 10 2005 Linus Walleij  2.2.1-6


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libnjb/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	11 Aug 2005 19:37:44 -0000	1.2
+++ sources	6 Sep 2005 20:38:34 -0000	1.3
@@ -1 +1 @@
-ae7974f5a802072f95742e1d59132152  libnjb-2.2.1.tar.gz
+5d17da61ea6a43fd3831789d1d518bc7  libnjb-2.2.2.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep  6 20:38:02 2005
From: fedora-extras-commits at redhat.com (Dawid Gajownik (gajownik))
Date: Tue,  6 Sep 2005 16:38:02 -0400
Subject: rpms/gajim/devel .cvsignore, 1.3, 1.4 gajim.spec, 1.5, 1.6 sources,
	1.3, 1.4 gajim-0.8.1.remote.patch, 1.1,
	NONE gajim-0.8.cflags.patch, 1.1, NONE
Message-ID: <200509062038.j86KcXiJ021379@cvs-int.fedora.redhat.com>

Author: gajownik

Update of /cvs/extras/rpms/gajim/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21332/devel

Modified Files:
	.cvsignore gajim.spec sources 
Removed Files:
	gajim-0.8.1.remote.patch gajim-0.8.cflags.patch 
Log Message:
auto-import gajim-0.8.2-1 on branch devel from gajim-0.8.2-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gajim/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	3 Sep 2005 10:13:33 -0000	1.3
+++ .cvsignore	6 Sep 2005 20:38:00 -0000	1.4
@@ -1 +1 @@
-gajim-0.8.1.tar.bz2
+gajim-0.8.2.tar.bz2


Index: gajim.spec
===================================================================
RCS file: /cvs/extras/rpms/gajim/devel/gajim.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gajim.spec	3 Sep 2005 10:13:33 -0000	1.5
+++ gajim.spec	6 Sep 2005 20:38:00 -0000	1.6
@@ -2,7 +2,7 @@
 %define         use_internal_modules   0
 
 Name:           gajim
-Version:        0.8.1
+Version:        0.8.2
 Release:        1%{?dist}
 Summary:        Jabber client written in PyGTK
 
@@ -10,11 +10,7 @@
 License:        GPL
 URL:            http://gajim.org/
 Source0:        http://gajim.org/downloads/gajim-%{version}.tar.bz2
-Patch0:         gajim-0.8.cflags.patch
-Patch1:         gajim-0.8.po.patch
-Patch2:         gajim-0.8.1.remote.patch
-Patch3:         gajim-0.8.aplay.patch
-Patch4:         gajim-0.8.x86_64.patch
+Patch0:         gajim-0.8.aplay.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  desktop-file-utils
@@ -44,10 +40,6 @@
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
 
 
 %build
@@ -77,12 +69,6 @@
 	--delete-original \
 	%{buildroot}%{_datadir}/applications/gajim.desktop
 
-# These lines and gajim-0.8.1.remote.patch are a workaround 
-# for broken i18n module import
-mv %{buildroot}%{_datadir}/gajim/scripts/gajim-remote.py \
-	%{buildroot}%{_datadir}/gajim/src/gajim-remote.py
-rmdir %{buildroot}%{_datadir}/gajim/scripts
-
 
 %find_lang %{name}
 
@@ -98,11 +84,14 @@
 %{_libdir}/gajim/
 %{_datadir}/applications/*gajim.desktop
 %{_datadir}/gajim/
-%exclude %{_datadir}/gajim/src/systraywin32.py
 %{_datadir}/pixmaps/gajim*
 %{_mandir}/man1/gajim*
 
 %changelog
+* Tue Sep  6 2005 Dawid Gajownik  - 0.8.2-1
+- new version 0.8.2
+- remove patches .cflags, .po, .x86_64, .remote (pushed upstream)
+
 * Sat Sep  3 2005 Dawid Gajownik  - 0.8.1-1
 - Version 0.8.1
 - drop gajim-remote.py file (included in tarball)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gajim/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	3 Sep 2005 10:13:33 -0000	1.3
+++ sources	6 Sep 2005 20:38:00 -0000	1.4
@@ -1 +1 @@
-d4cbbd64078b9c93fdd1492c27dbcdab  gajim-0.8.1.tar.bz2
+14b00f8ed7d84d90793782db7df40ec1  gajim-0.8.2.tar.bz2


--- gajim-0.8.1.remote.patch DELETED ---


--- gajim-0.8.cflags.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Sep  6 20:40:54 2005
From: fedora-extras-commits at redhat.com (Dawid Gajownik (gajownik))
Date: Tue,  6 Sep 2005 16:40:54 -0400
Subject: rpms/gajim import.log,1.5,1.6
Message-ID: <200509062040.j86KesQ3021564@cvs-int.fedora.redhat.com>

Author: gajownik

Update of /cvs/extras/rpms/gajim
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21526

Modified Files:
	import.log 
Log Message:
auto-import gajim-0.8.2-1 on branch FC-4 from gajim-0.8.2-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/gajim/import.log,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- import.log	6 Sep 2005 20:38:00 -0000	1.5
+++ import.log	6 Sep 2005 20:40:52 -0000	1.6
@@ -2,3 +2,4 @@
 gajim-0_8_1-1:HEAD:gajim-0.8.1-1.src.rpm:1125742592
 gajim-0_8_1-1:FC-4:gajim-0.8.1-1.src.rpm:1125742792
 gajim-0_8_2-1:HEAD:gajim-0.8.2-1.src.rpm:1126039272
+gajim-0_8_2-1:FC-4:gajim-0.8.2-1.src.rpm:1126039444



From fedora-extras-commits at redhat.com  Tue Sep  6 20:40:55 2005
From: fedora-extras-commits at redhat.com (Dawid Gajownik (gajownik))
Date: Tue,  6 Sep 2005 16:40:55 -0400
Subject: rpms/gajim/FC-4 .cvsignore, 1.3, 1.4 gajim.spec, 1.5, 1.6 sources,
	1.3, 1.4 gajim-0.8.1.remote.patch, 1.1,
	NONE gajim-0.8.cflags.patch, 1.1, NONE gajim-0.8.po.patch, 1.1,
	NONE gajim-0.8.x86_64.patch, 1.1, NONE
Message-ID: <200509062041.j86KetOD021572@cvs-int.fedora.redhat.com>

Author: gajownik

Update of /cvs/extras/rpms/gajim/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21526/FC-4

Modified Files:
	.cvsignore gajim.spec sources 
Removed Files:
	gajim-0.8.1.remote.patch gajim-0.8.cflags.patch 
	gajim-0.8.po.patch gajim-0.8.x86_64.patch 
Log Message:
auto-import gajim-0.8.2-1 on branch FC-4 from gajim-0.8.2-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gajim/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	3 Sep 2005 10:16:54 -0000	1.3
+++ .cvsignore	6 Sep 2005 20:40:53 -0000	1.4
@@ -1 +1 @@
-gajim-0.8.1.tar.bz2
+gajim-0.8.2.tar.bz2


Index: gajim.spec
===================================================================
RCS file: /cvs/extras/rpms/gajim/FC-4/gajim.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gajim.spec	3 Sep 2005 10:16:54 -0000	1.5
+++ gajim.spec	6 Sep 2005 20:40:53 -0000	1.6
@@ -2,7 +2,7 @@
 %define         use_internal_modules   0
 
 Name:           gajim
-Version:        0.8.1
+Version:        0.8.2
 Release:        1%{?dist}
 Summary:        Jabber client written in PyGTK
 
@@ -10,11 +10,7 @@
 License:        GPL
 URL:            http://gajim.org/
 Source0:        http://gajim.org/downloads/gajim-%{version}.tar.bz2
-Patch0:         gajim-0.8.cflags.patch
-Patch1:         gajim-0.8.po.patch
-Patch2:         gajim-0.8.1.remote.patch
-Patch3:         gajim-0.8.aplay.patch
-Patch4:         gajim-0.8.x86_64.patch
+Patch0:         gajim-0.8.aplay.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  desktop-file-utils
@@ -44,10 +40,6 @@
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
 
 
 %build
@@ -77,12 +69,6 @@
 	--delete-original \
 	%{buildroot}%{_datadir}/applications/gajim.desktop
 
-# These lines and gajim-0.8.1.remote.patch are a workaround 
-# for broken i18n module import
-mv %{buildroot}%{_datadir}/gajim/scripts/gajim-remote.py \
-	%{buildroot}%{_datadir}/gajim/src/gajim-remote.py
-rmdir %{buildroot}%{_datadir}/gajim/scripts
-
 
 %find_lang %{name}
 
@@ -98,11 +84,14 @@
 %{_libdir}/gajim/
 %{_datadir}/applications/*gajim.desktop
 %{_datadir}/gajim/
-%exclude %{_datadir}/gajim/src/systraywin32.py
 %{_datadir}/pixmaps/gajim*
 %{_mandir}/man1/gajim*
 
 %changelog
+* Tue Sep  6 2005 Dawid Gajownik  - 0.8.2-1
+- new version 0.8.2
+- remove patches .cflags, .po, .x86_64, .remote (pushed upstream)
+
 * Sat Sep  3 2005 Dawid Gajownik  - 0.8.1-1
 - Version 0.8.1
 - drop gajim-remote.py file (included in tarball)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gajim/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	3 Sep 2005 10:16:54 -0000	1.3
+++ sources	6 Sep 2005 20:40:53 -0000	1.4
@@ -1 +1 @@
-d4cbbd64078b9c93fdd1492c27dbcdab  gajim-0.8.1.tar.bz2
+14b00f8ed7d84d90793782db7df40ec1  gajim-0.8.2.tar.bz2


--- gajim-0.8.1.remote.patch DELETED ---


--- gajim-0.8.cflags.patch DELETED ---


--- gajim-0.8.po.patch DELETED ---


--- gajim-0.8.x86_64.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Sep  6 20:51:57 2005
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Tue,  6 Sep 2005 16:51:57 -0400
Subject: rpms/xlockmore/devel .cvsignore, 1.4, 1.5 sources, 1.4,
	1.5 xlockmore.spec, 1.6, 1.7 xlockmore.older-passwd.patch, 1.1, NONE
Message-ID: <200509062051.j86KpvVB021738@cvs-int.fedora.redhat.com>

Author: adrian

Update of /cvs/extras/rpms/xlockmore/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21715

Modified Files:
	.cvsignore sources xlockmore.spec 
Removed Files:
	xlockmore.older-passwd.patch 
Log Message:
* Sun Aug 21 2005 Adrian Reber  - 5.19-1
- updated to 5.19
- upstream included a fix for (BZ #161740), but "GENTOO" needs
  to be defined during compilation



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xlockmore/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	17 Jun 2005 21:28:29 -0000	1.4
+++ .cvsignore	6 Sep 2005 20:51:55 -0000	1.5
@@ -1 +1 @@
-xlockmore-5.18.tar.bz2
+xlockmore-5.19.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xlockmore/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	17 Jun 2005 21:28:29 -0000	1.4
+++ sources	6 Sep 2005 20:51:55 -0000	1.5
@@ -1 +1 @@
-211673f6be51bdec96718b891bf9ebb9  xlockmore-5.18.tar.bz2
+c80ae7689bf8683033ec08b652e24d83  xlockmore-5.19.tar.bz2


Index: xlockmore.spec
===================================================================
RCS file: /cvs/extras/rpms/xlockmore/devel/xlockmore.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- xlockmore.spec	28 Jun 2005 06:34:23 -0000	1.6
+++ xlockmore.spec	6 Sep 2005 20:51:55 -0000	1.7
@@ -1,12 +1,11 @@
 Summary: Screen lock and screen saver
 Name: xlockmore
-Version: 5.18
-Release: 3%{?dist}
+Version: 5.19
+Release: 1%{?dist}
 License: BSD
 Group: Amusements/Graphics
 URL: http://www.tux.org/~bagleyd/xlockmore.html
-Source0: http://www.tux.org/~bagleyd/latest/xlockmore-5.18.tar.bz2
-Patch0: xlockmore.older-passwd.patch
+Source0: http://www.tux.org/~bagleyd/latest/xlockmore-5.19.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: pam-devel esound-devel
 BuildRequires: xorg-x11-Mesa-libGL xorg-x11-Mesa-libGLU
@@ -34,14 +33,13 @@
 
 %prep
 %setup -q
-%patch0 -p1
 
 %{__sed} -i -e "s,/lib,/%{_lib},g" configure
 
 %build
 %configure \
 	--with-crypt --enable-pam --enable-syslog --disable-setuid
-%{__make} %{?_smp_mflags}
+%{__make} %{?_smp_mflags} CFLAGS+=" -DGENTOO "
 
 %install
 %{__rm} -rf %{buildroot}
@@ -106,6 +104,11 @@
 %{_bindir}/xglock
 
 %changelog
+* Sun Aug 21 2005 Adrian Reber  - 5.19-1
+- updated to 5.19
+- upstream included a fix for (BZ #161740), but "GENTOO" needs
+  to be defined during compilation
+
 * Mon Jun 27 2005 Adrian Reber  - 5.18-3
 - included patch to make it work again with PAM (BZ #161740)
 


--- xlockmore.older-passwd.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Sep  6 21:15:20 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue,  6 Sep 2005 17:15:20 -0400
Subject: rpms/GiNaC Makefile,1.1,NONE import.log,1.2,NONE
Message-ID: <200509062115.j86LFKDo023280@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/GiNaC
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23215/GiNaC

Removed Files:
	Makefile import.log 
Log Message:

Nuke GiNaC



--- Makefile DELETED ---


--- import.log DELETED ---



From fedora-extras-commits at redhat.com  Tue Sep  6 21:15:20 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue,  6 Sep 2005 17:15:20 -0400
Subject: rpms/GiNaC/FC-3 .cvsignore, 1.3, NONE GiNaC.spec, 1.12,
	NONE Makefile, 1.1, NONE branch, 1.1, NONE sources, 1.3, NONE
Message-ID: <200509062115.j86LFKpH023285@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/GiNaC/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23215/GiNaC/FC-3

Removed Files:
	.cvsignore GiNaC.spec Makefile branch sources 
Log Message:

Nuke GiNaC



--- .cvsignore DELETED ---


--- GiNaC.spec DELETED ---


--- Makefile DELETED ---


--- branch DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Tue Sep  6 21:15:26 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue,  6 Sep 2005 17:15:26 -0400
Subject: rpms/GiNaC/FC-4 .cvsignore, 1.3, NONE GiNaC.spec, 1.12,
	NONE Makefile, 1.1, NONE branch, 1.1, NONE sources, 1.3, NONE
Message-ID: <200509062115.j86LFQb4023326@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/GiNaC/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23215/GiNaC/FC-4

Removed Files:
	.cvsignore GiNaC.spec Makefile branch sources 
Log Message:

Nuke GiNaC



--- .cvsignore DELETED ---


--- GiNaC.spec DELETED ---


--- Makefile DELETED ---


--- branch DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Tue Sep  6 21:15:26 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue,  6 Sep 2005 17:15:26 -0400
Subject: rpms/GiNaC/devel .cvsignore, 1.3, NONE GiNaC.spec, 1.12,
	NONE Makefile, 1.1, NONE sources, 1.3, NONE
Message-ID: <200509062115.j86LFQYu023331@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/GiNaC/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23215/GiNaC/devel

Removed Files:
	.cvsignore GiNaC.spec Makefile sources 
Log Message:

Nuke GiNaC



--- .cvsignore DELETED ---


--- GiNaC.spec DELETED ---


--- Makefile DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Tue Sep  6 21:18:00 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue,  6 Sep 2005 17:18:00 -0400
Subject: rpms/tetex-beamer/FC-4 .cvsignore, 1.2, NONE Makefile, 1.1,
	NONE branch, 1.1, NONE sources, 1.2, NONE tetex-beamer.spec,
	1.3, NONE
Message-ID: <200509062118.j86LI0Vu023406@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/tetex-beamer/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23376/tetex-beamer/FC-4

Removed Files:
	.cvsignore Makefile branch sources tetex-beamer.spec 
Log Message:

Nuke tetex-beamer FC-4 and devel



--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- branch DELETED ---


--- sources DELETED ---


--- tetex-beamer.spec DELETED ---



From fedora-extras-commits at redhat.com  Tue Sep  6 21:18:00 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue,  6 Sep 2005 17:18:00 -0400
Subject: rpms/tetex-beamer/devel .cvsignore, 1.2, NONE Makefile, 1.1,
	NONE sources, 1.2, NONE tetex-beamer.spec, 1.3, NONE
Message-ID: <200509062118.j86LI0QL023411@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/tetex-beamer/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23376/tetex-beamer/devel

Removed Files:
	.cvsignore Makefile sources tetex-beamer.spec 
Log Message:

Nuke tetex-beamer FC-4 and devel



--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- sources DELETED ---


--- tetex-beamer.spec DELETED ---



From fedora-extras-commits at redhat.com  Tue Sep  6 21:19:48 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue,  6 Sep 2005 17:19:48 -0400
Subject: rpms/tetex-pgf/FC-4 .cvsignore, 1.2, NONE Makefile, 1.1, NONE branch,
	1.1, NONE sources, 1.2, NONE tetex-pgf.spec, 1.3, NONE
Message-ID: <200509062119.j86LJm14023461@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/tetex-pgf/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23437/tetex-pgf/FC-4

Removed Files:
	.cvsignore Makefile branch sources tetex-pgf.spec 
Log Message:

Nuke tetex-pgf FC-4 and devel



--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- branch DELETED ---


--- sources DELETED ---


--- tetex-pgf.spec DELETED ---



From fedora-extras-commits at redhat.com  Tue Sep  6 21:19:48 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue,  6 Sep 2005 17:19:48 -0400
Subject: rpms/tetex-pgf/devel .cvsignore, 1.2, NONE Makefile, 1.1,
	NONE sources, 1.2, NONE tetex-pgf.spec, 1.3, NONE
Message-ID: <200509062119.j86LJmwo023466@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/tetex-pgf/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23437/tetex-pgf/devel

Removed Files:
	.cvsignore Makefile sources tetex-pgf.spec 
Log Message:

Nuke tetex-pgf FC-4 and devel



--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- sources DELETED ---


--- tetex-pgf.spec DELETED ---



From fedora-extras-commits at redhat.com  Tue Sep  6 21:21:13 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue,  6 Sep 2005 17:21:13 -0400
Subject: rpms/tetex-xcolor/FC-4 .cvsignore, 1.3, NONE Makefile, 1.1,
	NONE branch, 1.1, NONE sources, 1.3, NONE tetex-xcolor.spec,
	1.4, NONE
Message-ID: <200509062121.j86LLDPO023516@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/tetex-xcolor/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23492/tetex-xcolor/FC-4

Removed Files:
	.cvsignore Makefile branch sources tetex-xcolor.spec 
Log Message:

tetex-xcolor nukeage FC-4 and devel, buuuuuddy.



--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- branch DELETED ---


--- sources DELETED ---


--- tetex-xcolor.spec DELETED ---



From fedora-extras-commits at redhat.com  Tue Sep  6 21:21:13 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue,  6 Sep 2005 17:21:13 -0400
Subject: rpms/tetex-xcolor/devel .cvsignore, 1.3, NONE Makefile, 1.1,
	NONE sources, 1.3, NONE tetex-xcolor.spec, 1.4, NONE
Message-ID: <200509062121.j86LLD3U023521@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/tetex-xcolor/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23492/tetex-xcolor/devel

Removed Files:
	.cvsignore Makefile sources tetex-xcolor.spec 
Log Message:

tetex-xcolor nukeage FC-4 and devel, buuuuuddy.



--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- sources DELETED ---


--- tetex-xcolor.spec DELETED ---



From fedora-extras-commits at redhat.com  Tue Sep  6 21:22:14 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue,  6 Sep 2005 17:22:14 -0400
Subject: rpms/sqlite/devel .cvsignore, 1.4, NONE Makefile, 1.2, NONE sources,
	1.5, NONE sqlite-3.1.2-doc.patch, 1.1, NONE sqlite.spec, 1.12, NONE
Message-ID: <200509062122.j86LMEHL023562@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/sqlite/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23545/sqlite/devel

Removed Files:
	.cvsignore Makefile sources sqlite-3.1.2-doc.patch sqlite.spec 
Log Message:

nuke sqlite devel branch



--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- sources DELETED ---


--- sqlite-3.1.2-doc.patch DELETED ---


--- sqlite.spec DELETED ---



From fedora-extras-commits at redhat.com  Tue Sep  6 21:23:21 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue,  6 Sep 2005 17:23:21 -0400
Subject: rpms/dd_rescue Makefile,1.1,NONE import.log,1.2,NONE
Message-ID: <200509062123.j86LNLaL023610@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/dd_rescue
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23580/dd_rescue

Removed Files:
	Makefile import.log 
Log Message:

Nuke dd_rescue



--- Makefile DELETED ---


--- import.log DELETED ---



From fedora-extras-commits at redhat.com  Tue Sep  6 21:23:22 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue,  6 Sep 2005 17:23:22 -0400
Subject: rpms/dd_rescue/devel .cvsignore, 1.2, NONE Makefile, 1.1,
	NONE dd_rescue.1, 1.1, NONE dd_rescue.spec, 1.1, NONE sources,
	1.2, NONE
Message-ID: <200509062123.j86LNM3F023615@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/dd_rescue/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23580/dd_rescue/devel

Removed Files:
	.cvsignore Makefile dd_rescue.1 dd_rescue.spec sources 
Log Message:

Nuke dd_rescue



--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- dd_rescue.1 DELETED ---


--- dd_rescue.spec DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Tue Sep  6 21:24:59 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue,  6 Sep 2005 17:24:59 -0400
Subject: rpms/kernel-module-devel-2.6.8-1.521 Makefile, 1.1, NONE import.log,
	1.2, NONE
Message-ID: <200509062124.j86LOx8I023670@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/kernel-module-devel-2.6.8-1.521
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23643/kernel-module-devel-2.6.8-1.521

Removed Files:
	Makefile import.log 
Log Message:

Nuke kernel-module-devel-2.6.8-1.521



--- Makefile DELETED ---


--- import.log DELETED ---



From fedora-extras-commits at redhat.com  Tue Sep  6 21:25:05 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue,  6 Sep 2005 17:25:05 -0400
Subject: rpms/kernel-module-devel-2.6.8-1.521/FC-3 .cvsignore, 1.2,
	NONE Makefile, 1.2, NONE branch, 1.1,
	NONE kernel-module-devel.spec, 1.1, NONE sources, 1.2, NONE
Message-ID: <200509062125.j86LP5rO023706@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/kernel-module-devel-2.6.8-1.521/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23643/kernel-module-devel-2.6.8-1.521/FC-3

Removed Files:
	.cvsignore Makefile branch kernel-module-devel.spec sources 
Log Message:

Nuke kernel-module-devel-2.6.8-1.521



--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- branch DELETED ---


--- kernel-module-devel.spec DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Tue Sep  6 21:25:20 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue,  6 Sep 2005 17:25:20 -0400
Subject: rpms/kernel-module-devel-2.6.8-1.521/FC-4 .cvsignore, 1.2,
	NONE Makefile, 1.2, NONE branch, 1.1,
	NONE kernel-module-devel.spec, 1.2, NONE sources, 1.2, NONE
Message-ID: <200509062125.j86LPKCE023715@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/kernel-module-devel-2.6.8-1.521/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23643/kernel-module-devel-2.6.8-1.521/FC-4

Removed Files:
	.cvsignore Makefile branch kernel-module-devel.spec sources 
Log Message:

Nuke kernel-module-devel-2.6.8-1.521



--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- branch DELETED ---


--- kernel-module-devel.spec DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Tue Sep  6 21:25:00 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue,  6 Sep 2005 17:25:00 -0400
Subject: rpms/kernel-module-devel-2.6.8-1.521/FC-2 .cvsignore, 1.2,
	NONE Makefile, 1.2, NONE branch, 1.1,
	NONE kernel-module-devel.spec, 1.1, NONE sources, 1.2, NONE
Message-ID: <200509062125.j86LP09X023675@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/kernel-module-devel-2.6.8-1.521/FC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23643/kernel-module-devel-2.6.8-1.521/FC-2

Removed Files:
	.cvsignore Makefile branch kernel-module-devel.spec sources 
Log Message:

Nuke kernel-module-devel-2.6.8-1.521



--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- branch DELETED ---


--- kernel-module-devel.spec DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Tue Sep  6 21:25:20 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue,  6 Sep 2005 17:25:20 -0400
Subject: rpms/kernel-module-devel-2.6.8-1.521/devel .cvsignore, 1.2,
	NONE Makefile, 1.2, NONE kernel-module-devel.spec, 1.2,
	NONE sources, 1.2, NONE
Message-ID: <200509062125.j86LPKtM023714@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/kernel-module-devel-2.6.8-1.521/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23643/kernel-module-devel-2.6.8-1.521/devel

Removed Files:
	.cvsignore Makefile kernel-module-devel.spec sources 
Log Message:

Nuke kernel-module-devel-2.6.8-1.521



--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- kernel-module-devel.spec DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Tue Sep  6 21:38:42 2005
From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon))
Date: Tue,  6 Sep 2005 17:38:42 -0400
Subject: rpms/epiphany-extensions/devel .cvsignore, 1.4,
	1.5 epiphany-extensions.spec, 1.3, 1.4 sources, 1.4, 1.5
Message-ID: <200509062138.j86LcgA0023963@cvs-int.fedora.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/epiphany-extensions/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23940

Modified Files:
	.cvsignore epiphany-extensions.spec sources 
Log Message:
* Tue Sep  6 2005 Christopher Aillon  - 1.8.0-1
- Update to 1.8.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/epiphany-extensions/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	10 Aug 2005 17:39:58 -0000	1.4
+++ .cvsignore	6 Sep 2005 21:38:40 -0000	1.5
@@ -1,2 +1,3 @@
 epiphany-extensions-1.7.3.tar.bz2
 epiphany-extensions-1.7.4.tar.bz2
+epiphany-extensions-1.8.0.tar.bz2


Index: epiphany-extensions.spec
===================================================================
RCS file: /cvs/extras/rpms/epiphany-extensions/devel/epiphany-extensions.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- epiphany-extensions.spec	10 Aug 2005 17:39:58 -0000	1.3
+++ epiphany-extensions.spec	6 Sep 2005 21:38:40 -0000	1.4
@@ -1,8 +1,8 @@
-%define ephy_major 1.7
+%define ephy_major 1.8
 
 Summary: Extensions for Epiphany, the GNOME web browser.
 Name: epiphany-extensions
-Version: 1.7.4
+Version: 1.8.0
 Release: 1
 License: GPL
 Group: Applications/Internet
@@ -39,6 +39,9 @@
 %{_libdir}/epiphany
 
 %changelog
+* Tue Sep  6 2005 Christopher Aillon  - 1.8.0-1
+- Update to 1.8.0
+
 * Wed Aug 10 2005 Christopher Aillon  - 1.7.4-1
 - Update to 1.7.4
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/epiphany-extensions/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	10 Aug 2005 17:39:58 -0000	1.4
+++ sources	6 Sep 2005 21:38:40 -0000	1.5
@@ -1 +1 @@
-d175f0747254595d369aa75baa64a0a4  epiphany-extensions-1.7.4.tar.bz2
+312335e8f755995dc486d496f497175e  epiphany-extensions-1.8.0.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep  6 21:58:20 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue,  6 Sep 2005 17:58:20 -0400
Subject: rpms/logjam/FC-3 logjam.spec,1.10,1.11
Message-ID: <200509062158.j86LwKhf024680@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/logjam/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24633/FC-3

Modified Files:
	logjam.spec 
Log Message:

gnutls-devel as a BR:



Index: logjam.spec
===================================================================
RCS file: /cvs/extras/rpms/logjam/FC-3/logjam.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- logjam.spec	6 Sep 2005 16:24:16 -0000	1.10
+++ logjam.spec	6 Sep 2005 21:58:18 -0000	1.11
@@ -2,7 +2,7 @@
 
 Name:		logjam
 Version:	4.5.1
-Release:	3%{?dist}
+Release:	4%{?dist}
 Epoch:		1
 Summary:	GTK2 client for LiveJournal
 License:	GPL
@@ -15,7 +15,7 @@
 %endif
 BuildRequires:	curl-devel, gtk2-devel, gtkspell-devel, gtkhtml3-devel
 BuildRequires:	gettext, desktop-file-utils, aspell-devel, librsvg2-devel
-BuildRequires:	libsoup-devel
+BuildRequires:	libsoup-devel, gnutls-devel
 Obsoletes:	loserjabber, logjam-gnome
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Patch0:		logjam-4.4.1-offline-segfaultfix.patch
@@ -82,6 +82,9 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Tue Sep  6 2005 Tom "spot" Callaway  1:4.5.1-4
+- add BR: gnutls-devel
+
 * Tue Sep  6 2005 Tom "spot" Callaway  1:4.5.1-3
 - fc3 branch missing another patch
 



From fedora-extras-commits at redhat.com  Tue Sep  6 21:58:21 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue,  6 Sep 2005 17:58:21 -0400
Subject: rpms/logjam/devel logjam.spec,1.19,1.20
Message-ID: <200509062158.j86LwLnS024690@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/logjam/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24633/devel

Modified Files:
	logjam.spec 
Log Message:

gnutls-devel as a BR:



Index: logjam.spec
===================================================================
RCS file: /cvs/extras/rpms/logjam/devel/logjam.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- logjam.spec	6 Sep 2005 16:24:17 -0000	1.19
+++ logjam.spec	6 Sep 2005 21:58:19 -0000	1.20
@@ -2,7 +2,7 @@
 
 Name:		logjam
 Version:	4.5.1
-Release:	3%{?dist}
+Release:	4%{?dist}
 Epoch:		1
 Summary:	GTK2 client for LiveJournal
 License:	GPL
@@ -15,7 +15,7 @@
 %endif
 BuildRequires:	curl-devel, gtk2-devel, gtkspell-devel, gtkhtml3-devel
 BuildRequires:	gettext, desktop-file-utils, aspell-devel, librsvg2-devel
-BuildRequires:	libsoup-devel, sqlite-devel
+BuildRequires:	libsoup-devel, sqlite-devel, gnutls-devel
 Obsoletes:	loserjabber, logjam-gnome
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Patch0:		logjam-4.4.1-offline-segfaultfix.patch
@@ -82,6 +82,9 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Tue Sep  6 2005 Tom "spot" Callaway  1:4.5.1-4
+- add BR: gnutls-devel
+
 * Tue Sep  6 2005 Tom "spot" Callaway  1:4.5.1-3
 - fc3 branch missing another patch
 



From fedora-extras-commits at redhat.com  Tue Sep  6 21:58:21 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue,  6 Sep 2005 17:58:21 -0400
Subject: rpms/logjam/FC-4 logjam.spec,1.19,1.20
Message-ID: <200509062158.j86LwLdL024686@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/logjam/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24633/FC-4

Modified Files:
	logjam.spec 
Log Message:

gnutls-devel as a BR:



Index: logjam.spec
===================================================================
RCS file: /cvs/extras/rpms/logjam/FC-4/logjam.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- logjam.spec	6 Sep 2005 16:24:16 -0000	1.19
+++ logjam.spec	6 Sep 2005 21:58:19 -0000	1.20
@@ -2,7 +2,7 @@
 
 Name:		logjam
 Version:	4.5.1
-Release:	3%{?dist}
+Release:	4%{?dist}
 Epoch:		1
 Summary:	GTK2 client for LiveJournal
 License:	GPL
@@ -15,7 +15,7 @@
 %endif
 BuildRequires:	curl-devel, gtk2-devel, gtkspell-devel, gtkhtml3-devel
 BuildRequires:	gettext, desktop-file-utils, aspell-devel, librsvg2-devel
-BuildRequires:	libsoup-devel, sqlite-devel
+BuildRequires:	libsoup-devel, sqlite-devel, gnutls-devel
 Obsoletes:	loserjabber, logjam-gnome
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Patch0:		logjam-4.4.1-offline-segfaultfix.patch
@@ -82,6 +82,9 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Tue Sep  6 2005 Tom "spot" Callaway  1:4.5.1-4
+- add BR: gnutls-devel
+
 * Tue Sep  6 2005 Tom "spot" Callaway  1:4.5.1-3
 - fc3 branch missing another patch
 



From fedora-extras-commits at redhat.com  Tue Sep  6 22:02:57 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue,  6 Sep 2005 18:02:57 -0400
Subject: rpms/logjam/devel logjam.spec,1.20,1.21 sources,1.5,1.6
Message-ID: <200509062203.j86M3SCM026091@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/logjam/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26031/devel

Modified Files:
	logjam.spec sources 
Log Message:

libgcrypt-devel BR



Index: logjam.spec
===================================================================
RCS file: /cvs/extras/rpms/logjam/devel/logjam.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- logjam.spec	6 Sep 2005 21:58:19 -0000	1.20
+++ logjam.spec	6 Sep 2005 22:02:54 -0000	1.21
@@ -2,7 +2,7 @@
 
 Name:		logjam
 Version:	4.5.1
-Release:	4%{?dist}
+Release:	5%{?dist}
 Epoch:		1
 Summary:	GTK2 client for LiveJournal
 License:	GPL
@@ -15,7 +15,7 @@
 %endif
 BuildRequires:	curl-devel, gtk2-devel, gtkspell-devel, gtkhtml3-devel
 BuildRequires:	gettext, desktop-file-utils, aspell-devel, librsvg2-devel
-BuildRequires:	libsoup-devel, sqlite-devel, gnutls-devel
+BuildRequires:	libsoup-devel, sqlite-devel, gnutls-devel, libgcrypt-devel
 Obsoletes:	loserjabber, logjam-gnome
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Patch0:		logjam-4.4.1-offline-segfaultfix.patch
@@ -82,6 +82,9 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Tue Sep  6 2005 Tom "spot" Callaway  1:4.5.1-5
+- add BR: libgcrypt-devel
+
 * Tue Sep  6 2005 Tom "spot" Callaway  1:4.5.1-4
 - add BR: gnutls-devel
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/logjam/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	6 Sep 2005 14:38:20 -0000	1.5
+++ sources	6 Sep 2005 22:02:54 -0000	1.6
@@ -1,3 +1 @@
-f16f68a4a6b15fb5bb650614f3ff081c  logjam-4.4.1.tar.bz2
-0acb70ccb88d6334af22e56e4b521c6b  logjam-4.5-patch8.tar.bz2
 ccae70dc36644cd1529c581443484ebe  logjam-4.5.1.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep  6 22:02:26 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue,  6 Sep 2005 18:02:26 -0400
Subject: rpms/logjam/FC-3 logjam.spec,1.11,1.12 sources,1.5,1.6
Message-ID: <200509062203.j86M3QjY026089@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/logjam/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26031/FC-3

Modified Files:
	logjam.spec sources 
Log Message:

libgcrypt-devel BR



Index: logjam.spec
===================================================================
RCS file: /cvs/extras/rpms/logjam/FC-3/logjam.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- logjam.spec	6 Sep 2005 21:58:18 -0000	1.11
+++ logjam.spec	6 Sep 2005 22:02:24 -0000	1.12
@@ -2,7 +2,7 @@
 
 Name:		logjam
 Version:	4.5.1
-Release:	4%{?dist}
+Release:	5%{?dist}
 Epoch:		1
 Summary:	GTK2 client for LiveJournal
 License:	GPL
@@ -15,7 +15,7 @@
 %endif
 BuildRequires:	curl-devel, gtk2-devel, gtkspell-devel, gtkhtml3-devel
 BuildRequires:	gettext, desktop-file-utils, aspell-devel, librsvg2-devel
-BuildRequires:	libsoup-devel, gnutls-devel
+BuildRequires:	libsoup-devel, gnutls-devel, libgcrypt-devel
 Obsoletes:	loserjabber, logjam-gnome
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Patch0:		logjam-4.4.1-offline-segfaultfix.patch
@@ -82,6 +82,9 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Tue Sep  6 2005 Tom "spot" Callaway  1:4.5.1-5
+- add BR: libgcrypt-devel
+
 * Tue Sep  6 2005 Tom "spot" Callaway  1:4.5.1-4
 - add BR: gnutls-devel
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/logjam/FC-3/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	6 Sep 2005 14:38:19 -0000	1.5
+++ sources	6 Sep 2005 22:02:24 -0000	1.6
@@ -1,3 +1 @@
-f16f68a4a6b15fb5bb650614f3ff081c  logjam-4.4.1.tar.bz2
-0acb70ccb88d6334af22e56e4b521c6b  logjam-4.5-patch8.tar.bz2
 ccae70dc36644cd1529c581443484ebe  logjam-4.5.1.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep  6 22:02:28 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue,  6 Sep 2005 18:02:28 -0400
Subject: rpms/logjam/FC-4 logjam.spec,1.20,1.21 sources,1.5,1.6
Message-ID: <200509062203.j86M3SCa026093@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/logjam/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26031/FC-4

Modified Files:
	logjam.spec sources 
Log Message:

libgcrypt-devel BR



Index: logjam.spec
===================================================================
RCS file: /cvs/extras/rpms/logjam/FC-4/logjam.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- logjam.spec	6 Sep 2005 21:58:19 -0000	1.20
+++ logjam.spec	6 Sep 2005 22:02:26 -0000	1.21
@@ -2,7 +2,7 @@
 
 Name:		logjam
 Version:	4.5.1
-Release:	4%{?dist}
+Release:	5%{?dist}
 Epoch:		1
 Summary:	GTK2 client for LiveJournal
 License:	GPL
@@ -15,7 +15,7 @@
 %endif
 BuildRequires:	curl-devel, gtk2-devel, gtkspell-devel, gtkhtml3-devel
 BuildRequires:	gettext, desktop-file-utils, aspell-devel, librsvg2-devel
-BuildRequires:	libsoup-devel, sqlite-devel, gnutls-devel
+BuildRequires:	libsoup-devel, sqlite-devel, gnutls-devel, libgcrypt-devel
 Obsoletes:	loserjabber, logjam-gnome
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Patch0:		logjam-4.4.1-offline-segfaultfix.patch
@@ -82,6 +82,9 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Tue Sep  6 2005 Tom "spot" Callaway  1:4.5.1-5
+- add BR: libgcrypt-devel
+
 * Tue Sep  6 2005 Tom "spot" Callaway  1:4.5.1-4
 - add BR: gnutls-devel
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/logjam/FC-4/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	6 Sep 2005 14:38:19 -0000	1.5
+++ sources	6 Sep 2005 22:02:26 -0000	1.6
@@ -1,3 +1 @@
-f16f68a4a6b15fb5bb650614f3ff081c  logjam-4.4.1.tar.bz2
-0acb70ccb88d6334af22e56e4b521c6b  logjam-4.5-patch8.tar.bz2
 ccae70dc36644cd1529c581443484ebe  logjam-4.5.1.tar.bz2



From fedora-extras-commits at redhat.com  Wed Sep  7 01:40:39 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Tue,  6 Sep 2005 21:40:39 -0400
Subject: rpms/nautilus-search-tool - New directory
Message-ID: <200509070140.j871edIh030525@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/nautilus-search-tool
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30505/nautilus-search-tool

Log Message:
Directory /cvs/extras/rpms/nautilus-search-tool added to the repository




From fedora-extras-commits at redhat.com  Wed Sep  7 01:40:39 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Tue,  6 Sep 2005 21:40:39 -0400
Subject: rpms/nautilus-search-tool/devel - New directory
Message-ID: <200509070140.j871ednV030530@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/nautilus-search-tool/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30505/nautilus-search-tool/devel

Log Message:
Directory /cvs/extras/rpms/nautilus-search-tool/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Sep  7 01:40:55 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Tue,  6 Sep 2005 21:40:55 -0400
Subject: rpms/nautilus-search-tool Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200509070140.j871ett9030579@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/nautilus-search-tool
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30550

Added Files:
	Makefile import.log 
Log Message:
Setup of module nautilus-search-tool


--- NEW FILE Makefile ---
# Top level Makefile for module nautilus-search-tool
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Wed Sep  7 01:40:55 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Tue,  6 Sep 2005 21:40:55 -0400
Subject: rpms/nautilus-search-tool/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200509070141.j871etHj030584@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/nautilus-search-tool/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30550/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module nautilus-search-tool


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Wed Sep  7 01:41:26 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Tue,  6 Sep 2005 21:41:26 -0400
Subject: rpms/nautilus-search-tool import.log,1.1,1.2
Message-ID: <200509070141.j871fQFp030653@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/nautilus-search-tool
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30618

Modified Files:
	import.log 
Log Message:
auto-import nautilus-search-tool-0.1-1 on branch devel from nautilus-search-tool-0.1-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/nautilus-search-tool/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	7 Sep 2005 01:40:53 -0000	1.1
+++ import.log	7 Sep 2005 01:41:24 -0000	1.2
@@ -0,0 +1 @@
+nautilus-search-tool-0_1-1:HEAD:nautilus-search-tool-0.1-1.src.rpm:1126057541



From fedora-extras-commits at redhat.com  Wed Sep  7 01:41:26 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Tue,  6 Sep 2005 21:41:26 -0400
Subject: rpms/nautilus-search-tool/devel nautilus-search-tool.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200509070141.j871fQgY030660@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/nautilus-search-tool/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30618/devel

Modified Files:
	.cvsignore sources 
Added Files:
	nautilus-search-tool.spec 
Log Message:
auto-import nautilus-search-tool-0.1-1 on branch devel from nautilus-search-tool-0.1-1.src.rpm


--- NEW FILE nautilus-search-tool.spec ---
Name:           nautilus-search-tool
Version:        0.1
Release:        1
Summary:        A Nautilus extension to put "Search for Files" on the context menu of folders

Group:          System Environment/Shells
License:        GPL
URL:            http://saettaz.altervista.org/software/nautilus_search_tool.html
Source0:        http://saettaz.altervista.org/software/nautilus_search_tool/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  gnome-desktop-devel >= 2.10.0 nautilus >= 2.10.0 eel2-devel >= 2.10.0

%description
This package adds an option to the context menu of folders in Nautilus to
search for files.

%prep
%setup -q

%build
%configure --disable-static
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -name \*.la -exec rm {} \;
%find_lang %{name}

%clean
rm -rf $RPM_BUILD_ROOT

%files -f %{name}.lang
%doc AUTHORS COPYING
%defattr(-,root,root,-)
%{_libdir}/nautilus/extensions-1.0/*.so

%changelog
* Tue Sep  3 2005 Ignacio Vazquez-Abrams  0.1-1
- Initial RPM release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nautilus-search-tool/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	7 Sep 2005 01:40:53 -0000	1.1
+++ .cvsignore	7 Sep 2005 01:41:24 -0000	1.2
@@ -0,0 +1 @@
+nautilus-search-tool-0.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nautilus-search-tool/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	7 Sep 2005 01:40:53 -0000	1.1
+++ sources	7 Sep 2005 01:41:24 -0000	1.2
@@ -0,0 +1 @@
+7c0cfad01f4fb46302447d110bf4df1c  nautilus-search-tool-0.1.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep  7 02:39:42 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Tue,  6 Sep 2005 22:39:42 -0400
Subject: rpms/nautilus-search-tool/devel nautilus-search-tool.spec,1.1,1.2
Message-ID: <200509070239.j872dgsu032063@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/nautilus-search-tool/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32044

Modified Files:
	nautilus-search-tool.spec 
Log Message:
Add disttag


Index: nautilus-search-tool.spec
===================================================================
RCS file: /cvs/extras/rpms/nautilus-search-tool/devel/nautilus-search-tool.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nautilus-search-tool.spec	7 Sep 2005 01:41:24 -0000	1.1
+++ nautilus-search-tool.spec	7 Sep 2005 02:39:40 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           nautilus-search-tool
 Version:        0.1
-Release:        1
+Release:        1%{?dist}
 Summary:        A Nautilus extension to put "Search for Files" on the context menu of folders
 
 Group:          System Environment/Shells



From fedora-extras-commits at redhat.com  Wed Sep  7 02:42:10 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Tue,  6 Sep 2005 22:42:10 -0400
Subject: owners owners.list,1.170,1.171
Message-ID: <200509070242.j872gAkY032099@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32080

Modified Files:
	owners.list 
Log Message:
nautilus-search-tool


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.170
retrieving revision 1.171
diff -u -r1.170 -r1.171
--- owners.list	6 Sep 2005 18:09:44 -0000	1.170
+++ owners.list	7 Sep 2005 02:42:08 -0000	1.171
@@ -493,6 +493,7 @@
 Fedora Extras|naim|An ncurses-based console AIM, ICQ, IRC, and Lily client|lmacken at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|namazu|A full-text search engine|tagoh at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|nautilus-open-terminal|Nautilus extension for an open terminal shortcut|stickster at gmail.com|extras-qa at fedoraproject.org|
+Fedora Extras|nautilus-search-tool|A Nautilus extension to put "Search for Files" on the context menu of folders|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
 Fedora Extras|ncftp|Improved console FTP client|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|ncmpc|A curses client for the Music Player Daemon (MPD)|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|nco|Suite of programs for manipulating NetCDF/HDF4 files|ed at eh3.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Wed Sep  7 06:19:17 2005
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Wed,  7 Sep 2005 02:19:17 -0400
Subject: rpms/bluefish/FC-4 bluefish.spec, 1.14, 1.15 sources, 1.6,
	1.7 .cvsignore, 1.6, 1.7
Message-ID: <200509070619.j876JHkH006503@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/bluefish/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6480

Modified Files:
	bluefish.spec sources .cvsignore 
Log Message:
resync with devel



Index: bluefish.spec
===================================================================
RCS file: /cvs/extras/rpms/bluefish/FC-4/bluefish.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- bluefish.spec	21 Aug 2005 15:33:24 -0000	1.14
+++ bluefish.spec	7 Sep 2005 06:19:15 -0000	1.15
@@ -1,5 +1,5 @@
 Name:           bluefish
-Version:        1.0.3
+Version:        1.0.4
 Release:        1%{?dist}
 Summary:        GTK2 web development application for experienced users
 
@@ -80,6 +80,9 @@
 
 
 %changelog
+* Mon Sep  5 2005 Paul Howarth  - 1.0.4-1
+- update to 1.0.4
+
 * Sun Aug 21 2005 Paul Howarth  - 1.0.3-1
 - update to 1.0.3
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/bluefish/FC-4/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	21 Aug 2005 15:33:24 -0000	1.6
+++ sources	7 Sep 2005 06:19:15 -0000	1.7
@@ -1 +1 @@
-f4cda1e21089155383930616ab673d69  bluefish-1.0.3.tar.bz2
+8d5c1b7315cdc935aa024954093d2b32  bluefish-1.0.4.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/bluefish/FC-4/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	21 Aug 2005 15:33:24 -0000	1.6
+++ .cvsignore	7 Sep 2005 06:19:15 -0000	1.7
@@ -1 +1 @@
-bluefish-1.0.3.tar.bz2
+bluefish-1.0.4.tar.bz2



From fedora-extras-commits at redhat.com  Wed Sep  7 06:20:56 2005
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Wed,  7 Sep 2005 02:20:56 -0400
Subject: rpms/bluefish/FC-3 bluefish.spec, 1.11, 1.12 sources, 1.6,
	1.7 .cvsignore, 1.6, 1.7
Message-ID: <200509070620.j876Ku82006576@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/bluefish/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6553

Modified Files:
	bluefish.spec sources .cvsignore 
Log Message:
resync with devel



Index: bluefish.spec
===================================================================
RCS file: /cvs/extras/rpms/bluefish/FC-3/bluefish.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- bluefish.spec	21 Aug 2005 15:35:09 -0000	1.11
+++ bluefish.spec	7 Sep 2005 06:20:53 -0000	1.12
@@ -1,5 +1,5 @@
 Name:           bluefish
-Version:        1.0.3
+Version:        1.0.4
 Release:        1%{?dist}
 Summary:        GTK2 web development application for experienced users
 
@@ -80,6 +80,9 @@
 
 
 %changelog
+* Mon Sep  5 2005 Paul Howarth  - 1.0.4-1
+- update to 1.0.4
+
 * Sun Aug 21 2005 Paul Howarth  - 1.0.3-1
 - update to 1.0.3
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/bluefish/FC-3/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	21 Aug 2005 15:35:09 -0000	1.6
+++ sources	7 Sep 2005 06:20:53 -0000	1.7
@@ -1 +1 @@
-f4cda1e21089155383930616ab673d69  bluefish-1.0.3.tar.bz2
+8d5c1b7315cdc935aa024954093d2b32  bluefish-1.0.4.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/bluefish/FC-3/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	21 Aug 2005 15:35:09 -0000	1.6
+++ .cvsignore	7 Sep 2005 06:20:53 -0000	1.7
@@ -1 +1 @@
-bluefish-1.0.3.tar.bz2
+bluefish-1.0.4.tar.bz2



From fedora-extras-commits at redhat.com  Wed Sep  7 08:25:13 2005
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Wed,  7 Sep 2005 04:25:13 -0400
Subject: rpms/xlockmore/FC-3 .cvsignore, 1.3, 1.4 sources, 1.3,
	1.4 xlockmore.spec, 1.3, 1.4 xlockmore.older-passwd.patch, 1.1, NONE
Message-ID: <200509070825.j878PD1x010066@cvs-int.fedora.redhat.com>

Author: adrian

Update of /cvs/extras/rpms/xlockmore/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10043

Modified Files:
	.cvsignore sources xlockmore.spec 
Removed Files:
	xlockmore.older-passwd.patch 
Log Message:
* Sun Aug 21 2005 Adrian Reber  - 5.19-1
- updated to 5.19
- upstream included a fix for (BZ #161740), but "GENTOO" needs
  to be defined during compilation



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xlockmore/FC-3/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	18 Jun 2005 20:59:31 -0000	1.3
+++ .cvsignore	7 Sep 2005 08:25:11 -0000	1.4
@@ -1 +1 @@
-xlockmore-5.18.tar.bz2
+xlockmore-5.19.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xlockmore/FC-3/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	18 Jun 2005 20:59:31 -0000	1.3
+++ sources	7 Sep 2005 08:25:11 -0000	1.4
@@ -1 +1 @@
-211673f6be51bdec96718b891bf9ebb9  xlockmore-5.18.tar.bz2
+c80ae7689bf8683033ec08b652e24d83  xlockmore-5.19.tar.bz2


Index: xlockmore.spec
===================================================================
RCS file: /cvs/extras/rpms/xlockmore/FC-3/xlockmore.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xlockmore.spec	28 Jun 2005 11:43:12 -0000	1.3
+++ xlockmore.spec	7 Sep 2005 08:25:11 -0000	1.4
@@ -1,12 +1,11 @@
 Summary: Screen lock and screen saver
 Name: xlockmore
-Version: 5.18
-Release: 3%{?dist}
+Version: 5.19
+Release: 1%{?dist}
 License: BSD
 Group: Amusements/Graphics
 URL: http://www.tux.org/~bagleyd/xlockmore.html
-Source0: http://www.tux.org/~bagleyd/latest/xlockmore-5.18.tar.bz2
-Patch0: xlockmore.older-passwd.patch
+Source0: http://www.tux.org/~bagleyd/latest/xlockmore-5.19.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: pam-devel esound-devel
 BuildRequires: xorg-x11-Mesa-libGL xorg-x11-Mesa-libGLU
@@ -34,14 +33,13 @@
 
 %prep
 %setup -q
-%patch0 -p1
 
 %{__sed} -i -e "s,/lib,/%{_lib},g" configure
 
 %build
 %configure \
 	--with-crypt --enable-pam --enable-syslog --disable-setuid
-%{__make} %{?_smp_mflags}
+%{__make} %{?_smp_mflags} CFLAGS+=" -DGENTOO "
 
 %install
 %{__rm} -rf %{buildroot}
@@ -106,6 +104,11 @@
 %{_bindir}/xglock
 
 %changelog
+* Sun Aug 21 2005 Adrian Reber  - 5.19-1
+- updated to 5.19
+- upstream included a fix for (BZ #161740), but "GENTOO" needs
+  to be defined during compilation
+
 * Mon Jun 27 2005 Adrian Reber  - 5.18-3
 - included patch to make it work again with PAM (BZ #161740)
 


--- xlockmore.older-passwd.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Sep  7 08:25:54 2005
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Wed,  7 Sep 2005 04:25:54 -0400
Subject: rpms/xlockmore/FC-4 .cvsignore, 1.4, 1.5 sources, 1.4,
	1.5 xlockmore.spec, 1.5, 1.6 xlockmore.older-passwd.patch, 1.1, NONE
Message-ID: <200509070825.j878PspV010138@cvs-int.fedora.redhat.com>

Author: adrian

Update of /cvs/extras/rpms/xlockmore/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10115

Modified Files:
	.cvsignore sources xlockmore.spec 
Removed Files:
	xlockmore.older-passwd.patch 
Log Message:
* Sun Aug 21 2005 Adrian Reber  - 5.19-1
- updated to 5.19
- upstream included a fix for (BZ #161740), but "GENTOO" needs
  to be defined during compilation



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xlockmore/FC-4/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	18 Jun 2005 14:02:33 -0000	1.4
+++ .cvsignore	7 Sep 2005 08:25:51 -0000	1.5
@@ -1 +1 @@
-xlockmore-5.18.tar.bz2
+xlockmore-5.19.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xlockmore/FC-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	18 Jun 2005 14:02:33 -0000	1.4
+++ sources	7 Sep 2005 08:25:51 -0000	1.5
@@ -1 +1 @@
-211673f6be51bdec96718b891bf9ebb9  xlockmore-5.18.tar.bz2
+c80ae7689bf8683033ec08b652e24d83  xlockmore-5.19.tar.bz2


Index: xlockmore.spec
===================================================================
RCS file: /cvs/extras/rpms/xlockmore/FC-4/xlockmore.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- xlockmore.spec	28 Jun 2005 07:25:49 -0000	1.5
+++ xlockmore.spec	7 Sep 2005 08:25:51 -0000	1.6
@@ -1,12 +1,11 @@
 Summary: Screen lock and screen saver
 Name: xlockmore
-Version: 5.18
-Release: 3%{?dist}
+Version: 5.19
+Release: 1%{?dist}
 License: BSD
 Group: Amusements/Graphics
 URL: http://www.tux.org/~bagleyd/xlockmore.html
-Source0: http://www.tux.org/~bagleyd/latest/xlockmore-5.18.tar.bz2
-Patch0: xlockmore.older-passwd.patch
+Source0: http://www.tux.org/~bagleyd/latest/xlockmore-5.19.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: pam-devel esound-devel
 BuildRequires: xorg-x11-Mesa-libGL xorg-x11-Mesa-libGLU
@@ -34,14 +33,13 @@
 
 %prep
 %setup -q
-%patch0 -p1
 
 %{__sed} -i -e "s,/lib,/%{_lib},g" configure
 
 %build
 %configure \
 	--with-crypt --enable-pam --enable-syslog --disable-setuid
-%{__make} %{?_smp_mflags}
+%{__make} %{?_smp_mflags} CFLAGS+=" -DGENTOO "
 
 %install
 %{__rm} -rf %{buildroot}
@@ -106,6 +104,11 @@
 %{_bindir}/xglock
 
 %changelog
+* Sun Aug 21 2005 Adrian Reber  - 5.19-1
+- updated to 5.19
+- upstream included a fix for (BZ #161740), but "GENTOO" needs
+  to be defined during compilation
+
 * Mon Jun 27 2005 Adrian Reber  - 5.18-3
 - included patch to make it work again with PAM (BZ #161740)
 


--- xlockmore.older-passwd.patch DELETED ---



From rc040203 at freenet.de  Wed Sep  7 08:48:25 2005
From: rc040203 at freenet.de (Ralf Corsepius)
Date: Wed, 07 Sep 2005 10:48:25 +0200
Subject: rpms/xlockmore/FC-4 .cvsignore, 1.4, 1.5 sources, 1.4, 1.5
	xlockmore.spec, 1.5, 1.6 xlockmore.older-passwd.patch, 1.1, NONE
In-Reply-To: <200509070825.j878PspV010138@cvs-int.fedora.redhat.com>
References: <200509070825.j878PspV010138@cvs-int.fedora.redhat.com>
Message-ID: <1126082905.22372.161.camel@mccallum.corsepiu.local>

On Wed, 2005-09-07 at 04:25 -0400, Adrian Reber wrote:
> Author: adrian

> Index: xlockmore.spec

> @@ -34,14 +33,13 @@

> +%{__make} %{?_smp_mflags} CFLAGS+=" -DGENTOO "

Can you explain what CFLAGS+=".." is supposed to do?

It seems to be as if you are trying to append "-DGENTOO" to CFLAGS,
but ... that's not what make does with your command above.

Ralf




From fedora-extras-commits at redhat.com  Wed Sep  7 08:51:35 2005
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  7 Sep 2005 04:51:35 -0400
Subject: rpms/crack - New directory
Message-ID: <200509070851.j878pZle010280@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/crack
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10256/crack

Log Message:
Directory /cvs/extras/rpms/crack added to the repository




From fedora-extras-commits at redhat.com  Wed Sep  7 08:51:35 2005
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  7 Sep 2005 04:51:35 -0400
Subject: rpms/crack/devel - New directory
Message-ID: <200509070851.j878pZxW010285@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/crack/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10256/crack/devel

Log Message:
Directory /cvs/extras/rpms/crack/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Sep  7 08:51:56 2005
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  7 Sep 2005 04:51:56 -0400
Subject: rpms/crack Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200509070851.j878puon010330@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/crack
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10301

Added Files:
	Makefile import.log 
Log Message:
Setup of module crack


--- NEW FILE Makefile ---
# Top level Makefile for module crack
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Wed Sep  7 08:51:56 2005
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  7 Sep 2005 04:51:56 -0400
Subject: rpms/crack/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200509070852.j878puMs010335@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/crack/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10301/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module crack


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Wed Sep  7 08:52:57 2005
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  7 Sep 2005 04:52:57 -0400
Subject: rpms/crack import.log,1.1,1.2
Message-ID: <200509070853.j878rRRT010416@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/crack
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10374

Modified Files:
	import.log 
Log Message:
auto-import crack-5.0a-1 on branch devel from crack-5.0a-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/crack/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	7 Sep 2005 08:51:54 -0000	1.1
+++ import.log	7 Sep 2005 08:52:55 -0000	1.2
@@ -0,0 +1 @@
+crack-5_0a-1:HEAD:crack-5.0a-1.src.rpm:1126083167



From fedora-extras-commits at redhat.com  Wed Sep  7 08:52:58 2005
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  7 Sep 2005 04:52:58 -0400
Subject: rpms/crack/devel crack-chris.patch, NONE, 1.1 crack.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200509070852.j878qwfk010409@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/crack/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10374/devel

Modified Files:
	.cvsignore sources 
Added Files:
	crack-chris.patch crack.spec 
Log Message:
auto-import crack-5.0a-1 on branch devel from crack-5.0a-1.src.rpm

crack-chris.patch:

--- NEW FILE crack-chris.patch ---
--- c50a/src/util/Makefile.chris	1996-12-16 09:27:35.000000000 +0100
+++ c50a/src/util/Makefile	2005-09-06 17:54:34.000000000 +0200
@@ -17,7 +17,7 @@
 EXE=    $(XDIR)/dawg \
 	$(XDIR)/dictfilt \
 	$(XDIR)/kickdict \
-	$(XDIR)/cracker
+	$(XDIR)/stdlib-cracker
 
 #------------------------------------------------------------------
 
@@ -69,7 +69,7 @@
 #------------------------------------------------------------------
 
 # don't you just love dependency graphs?
-$(XDIR)/dictfilt: dictfilt.c $(XLIB) $(XDIR)/cracker
+$(XDIR)/dictfilt: dictfilt.c $(XLIB) $(XDIR)/stdlib-cracker
 	$(CC) $(CFLAGS) -o $(XDIR)/dictfilt dictfilt.c elcid.o $(XLIB)
 
 #------------------------------------------------------------------
--- c50a/src/util/cracker.c.chris	1996-12-16 16:20:03.000000000 +0100
+++ c50a/src/util/cracker.c	2005-09-06 17:54:34.000000000 +0200
@@ -11,6 +11,7 @@
 
 #include "libcrack.h"
 #include "elcid.h"
+#include 
 
 #define CRACK_MEMSMALL          0x0001
 #define CRACK_DISKSMALL         0x0002
@@ -97,18 +98,23 @@
 
 /* ------------------------------------------------------------------ */
 
+#ifdef __GNUC__
 void
-Logger(key, fmt, a, b, c, d, e, f)
-char key;
-char *fmt;
-char *a, *b, *c, *d, *e, *f;
+Logger(char key, const char *fmt, ...)
+    __attribute__ ((format (printf, 2, 3)));
+#endif
+void
+Logger(char key, const char *fmt, ...)
 {
     long t;
+    va_list ap;
 
     time(&t);
 
     fprintf(stdout, "%c:%ld:", key, t);
-    fprintf(stdout, fmt, a, b, c, d, e, f);
+    va_start(ap, fmt);
+    vprintf(fmt, ap);
+    va_end(ap);
 
     fflush(stdout);
     fflush(stderr);		/* and why not ? */
--- c50a/Crack.chris	1996-12-21 02:09:41.000000000 +0100
+++ c50a/Crack	2005-09-06 18:05:42.000000000 +0200
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 ###
 # This program was written by and is copyright Alec Muffett 1991,
 # 1992, 1993, 1994, 1995, and 1996, and is provided as part of the
@@ -12,85 +12,11 @@
 # User-configurable junk for Crack
 ###
 
-# nice, generic path (RedHat Linux, Solaris1, Solaris2)
-CRACK_PATH=/usr/local/bin:/usr/ccs/bin:/usr/sbin:/sbin:/usr/bin:/bin:/usr/ucb:/usr/etc:$PATH
-
-# compiler options for crack 5.0
-#
-# -DUSE_BZERO        /* add this to C5FLAGS if you don't have memset() */
-# -DUSE_MALLOC_H
-# -DUSE_PWD_H
-# -DUSE_SIGNAL_H
-# -DUSE_STDLIB_H
-# -DUSE_STRINGS_H
-# -DUSE_STRING_H
-# -DUSE_SYS_TYPES_H
-# -DUSE_UNISTD_H
-# -DMAXWORDLEN=      /* ignore if you don't read the code */
-# -DNUMWORDS=        /* ignore if you don't read the code */
-# -DSTRINGSIZE=      /* ignore if you don't read the code */
-
-# this set tested on:
-# - solaris 2.5
-# - redhat linux 4.0
-# - digital unix v4.0
-
-C5FLAGS="-DUSE_STRING_H -DUSE_STDLIB_H -DUSE_SIGNAL_H -DUSE_SYS_TYPES_H -DUSE_UNISTD_H -DUSE_PWD_H"
-
-#
-# now pick your compiler
-#
-
-# vanilla unix cc
-CC=cc
-CFLAGS="-g -O $C5FLAGS"
-#LIBS=-lcrypt # uncomment only if necessary to use stdlib crypt(), eg: NetBSD MD5
-
-# gcc 2.7.2
-#CC=gcc
-#CFLAGS="-g -O2 -Wall $C5FLAGS"
-#LIBS=-lcrypt # uncomment only if necessary to use stdlib crypt(), eg: NetBSD MD5
-
-# digital unix v4.0, CFLAGS for ev4/ev5 chipsets (pick one)
-#CC=cc
-#CFLAGS="-O4 -fast -tune ev4 $C5FLAGS"
-#CFLAGS="-O4 -fast -tune ev5 $C5FLAGS"
-#LIBS=
-
-# Uncomment the next two lines if a) you are running Crack in
-# networking mode, and b) your environment's operating system will not
-# necessarily run binaries compiled on other revs of the same
-# operating system which have the same architecture and the same
-# *MAJOR* revision number.
-#
-# eg: if you have Foonix 2.0 boxes as well as Foonix 2.1 boxes; in
-# this example, the major revision number is "2".  If the Foonix 2.1
-# O/S will not run Foonix 2.0 binaries for some reason, or vice-versa,
-# then uncomment these lines.
-
-#STRICT_OSREV=yes
-#export STRICT_OSREV
-
-# Uncomment and/or modify on HP/UX or similar where the UCB "rsh"
-# command has been renamed.  See scripts/crack-rsh also
-#CRACK_RSH=remsh
-#CRACK_RCP=rcp
-
-###########################################################
-###########################################################
-#################### THAT'S ALL, FOLKS ####################
-#### NOW GO CONFIGURE YOUR CRYPT ALGORITHM, EG: LIBDES ####
-###########################################################
-###########################################################
-
 ###
 # security
 ###
 
 umask 077
-export CRACK_PATH                       # So it can be picked up later
-PATH=$CRACK_PATH                        # For temporary use...
-export PATH
 
 ###
 # Defaults
@@ -108,12 +34,9 @@
 # home base
 ###
 
-CRACK_HOME=`echo $0 | sed -e 's/Crack$//'`
+old_wd=`pwd`
 
-if [ "$CRACK_HOME" = "" ]
-then
-	CRACK_HOME=.
-fi
+CRACK_HOME=${CRACK_HOME:-"/var/lib/crack"}
 
 if cd $CRACK_HOME
 then
@@ -126,25 +49,6 @@
 export CRACK_HOME
 
 ###
-# sanity check
-###
-
-if [ ! -f "$CRACK_HOME/Crack" ]
-then
-	echo "Fatal Error: $CRACK_HOME: something weird going down" 1>&2
-	exit 1
-fi
-
-###
-# Hierarchy
-###
-
-for dir in run run/bin
-do
-	test -d $dir || mkdir $dir || exit 1
-done
-
-###
 # Flagwaving
 ###
 
@@ -158,8 +62,6 @@
 # Parse Arguments
 ###
 
-argbackup1="$*"
-
 while [ "x$1" != "x" ]
 do
 	case $1 in
@@ -275,50 +177,24 @@
 	exit 1
 fi
 
-###
-# Sanity test bindir - written in gruntscript for clarity.
-###
-
-bdname=`scripts/binstamp 2>/dev/null`
-
-if [ "x$bdname" = "x" ]
-then
-	echo "Crack: error: cannot continue as binstamp returned empty string" 1>&2
-	exit 0
-fi
-
-echo "Stamp: $bdname"
 echo ""
 
 
 if [ "x$1" != "x" ]
 then
-	if [ "$1" = "-fmt" ]            # use generic name
-	then
-		bindir=run/bin/$bdname
-	elif [ -d run/bin/$1 ]          # have been here before
-	then
-		bindir=run/bin/$1
-		shift
-	elif [ ! -f $1 ]                # use specified name
-	then
-		bindir=run/bin/$1
-		shift
-	else                            # use generic name
-		bindir=run/bin/$bdname
-	fi
+	bindir=bin
 else                                    # supporting "-makeonly"
 	if [ "$makeonlyflag" != "" ]
 	then
-		bindir=run/bin/$bdname
+		bindir=bin
 
 	elif [ "$makedictflag" != "" ]
 	then
-		bindir=run/bin/$bdname
+		bindir=bin
 
 	elif [ "$remoteflag" != "" ]
 	then
-		bindir=run/bin/$bdname
+		bindir=bin
 	else
 		echo $usage 1>&2
 		exit 1
@@ -333,21 +209,6 @@
 export PATH
 
 ###
-# Make the binaries
-###
-
-echo "Crack: making utilities in $bindir"
-
-if [ ! -d $bindir ] # small redundancy, big benefit
-then
-	mkdir $bindir || exit 1
-fi
-
-make clean || exit 1
-
-make ARGS="\"XDIR=../../$bindir\" \"XCFLAGS=$CFLAGS\" \"XCC=$CC\" \"XLIBS=$LIBS\"" utils || exit 1
-
-###
 # Make Only ?
 ###
 
@@ -439,7 +300,6 @@
 	fbmerge
 
 	echo "Crack: Merging password files..."
-	argbackup2="$*"
 
 	(
 		cat run/F-merged        # first the feedback
@@ -451,11 +311,17 @@
 				shift || exit 1
 				deffmt=$1
 
-			elif [ "$deffmt" = "spf" ]
-			then
-				cat $1 1>&3 # skip the sort
 			else
-				${deffmt}2spf $1
+			  theFile=$1
+			  if [ ! -r $theFile ]; then
+			    theFile="$old_wd/$theFile"
+			  fi
+			  if [ "$deffmt" = "spf" ]
+			  then
+			  	  cat $theFile 1>&3 # skip the sort
+			  else
+			  	  ${deffmt}2spf $theFile
+			  fi
 			fi
 
 			shift
--- c50a/Reporter.chris	1996-12-13 20:13:55.000000000 +0100
+++ c50a/Reporter	2005-09-06 17:54:34.000000000 +0200
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 ###
 # This program was written by and is copyright Alec Muffett 1991,
 # 1992, 1993, 1994, 1995, and 1996, and is provided as part of the
@@ -10,6 +10,9 @@
 # document which accompanies distributions of Crack v5.0 and upwards.
 ###
 
+CRACK_HOME=${CRACK_HOME:-"/var/lib/crack"}
+cd $CRACK_HOME
+
 tfile=run/T$$
 date=`date`
 


--- NEW FILE crack.spec ---
Summary:   Password cracker
Name:      crack
Version:   5.0a
Release:   1%{?dist}
License:   Artistic
Group:     Applications/System
Source:    ftp://ftp.cerias.purdue.edu/pub/tools/unix/pwdutils/crack/%{name}5.0.tar.gz
Patch:     %{name}-chris.patch
URL:       http://www.crypticide.com/users/alecm/security/c50-faq.html
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: words

%description
Crack is a password guessing program that is designed to quickly locate
insecurities in Unix (or other) password files by scanning the contents of a
password file, looking for users who have misguidedly chosen a weak login
password.

This package creates a group named "crack" and the Crack program puts all
its results in the /var/lib/crack/run directory, which belongs to that group.
Only users in the crack group can use this package.


%prep
%setup -q -n c50a
# Make sure we do not use libdes
rm -rf src/libdes
# select proper crypt routine and related checks
rm -f src/util/elcid.c
ln src/util/elcid.c,bsd src/util/elcid.c
mkdir run bin
# Try not to pollute bin namespace
sed -i -e 's/Reporter/CrackReporter/g' doc/gui.txt manual.html manual.txt
%patch -p1 -b .chris
sed -i 's|/usr/dict/|/usr/share/dict/|g' conf/dictgrps.conf


%build
C5FLAGS="-D_XOPEN_SOURCE -DUSE_STRING_H -DUSE_STDLIB_H -DUSE_SIGNAL_H -DUSE_SYS_TYPES_H -DUSE_UNISTD_H -DUSE_PWD_H"
make XDIR=../../bin XCC=gcc XCFLAGS="$RPM_OPT_FLAGS $C5FLAGS" XLIBS=-lcrypt utils
CRACK_HOME=. ./Crack -makedict


%install
rm -rf $RPM_BUILD_ROOT
rm -f bin/libc5.a bin/stdlib-cracker
mkdir -p $RPM_BUILD_ROOT/var/lib/crack
cp -a bin conf dict run scripts $RPM_BUILD_ROOT/var/lib/crack
install -D Crack $RPM_BUILD_ROOT%{_bindir}/Crack
install Reporter $RPM_BUILD_ROOT%{_bindir}/CrackReporter


%clean
rm -rf $RPM_BUILD_ROOT


%pre
if [ $1 -eq 1 ]; then
    groupadd -r crack >/dev/null 2>&1 || :
fi


%files
%defattr(-, root, root)
%doc LICENCE manual.* doc
%attr(00750, root, crack) %{_bindir}/*
%dir /var/lib/crack/
/var/lib/crack/bin/
/var/lib/crack/conf/
/var/lib/crack/dict/
/var/lib/crack/scripts/
%attr(02770, root, crack) %dir /var/lib/crack/run/
%attr(02770, root, crack) %dir /var/lib/crack/run/dict/
%attr(00640, root, crack) /var/lib/crack/run/dict/*
%attr(00640, root, crack) /var/lib/crack/run/dict/.dictmade


%changelog
* Tue Sep 06 2005 Tom "spot" Callaway  5.0a-1
- use words to make a richer dict 1

* Tue Sep 06 2005 Christian Iseli  5.0a-0
- Created spec file.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/crack/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	7 Sep 2005 08:51:54 -0000	1.1
+++ .cvsignore	7 Sep 2005 08:52:56 -0000	1.2
@@ -0,0 +1 @@
+crack5.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/crack/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	7 Sep 2005 08:51:54 -0000	1.1
+++ sources	7 Sep 2005 08:52:56 -0000	1.2
@@ -0,0 +1 @@
+6511dca525b7b921ea09eca855cc58f2  crack5.0.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep  7 08:58:41 2005
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  7 Sep 2005 04:58:41 -0400
Subject: owners owners.list,1.171,1.172
Message-ID: <200509070858.j878wfZW010528@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10509

Modified Files:
	owners.list 
Log Message:
Add crack package


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.171
retrieving revision 1.172
diff -u -r1.171 -r1.172
--- owners.list	7 Sep 2005 02:42:08 -0000	1.171
+++ owners.list	7 Sep 2005 08:58:39 -0000	1.172
@@ -98,6 +98,7 @@
 Fedora Extras|cook|A file construction tool|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|cpan2rpm|Perl module packager|ghenry at suretecsystems.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|cproto|Generates function prototypes and variable declarations from C code|jnovy at redhat.com|extras-qa at fedoraproject.org|
+Fedora Extras|crack|Password cracker|Christian.Iseli at licr.org|extras-qa at fedoraproject.org|
 Fedora Extras|cryptplug|Cryptography plugin for mutt & kmail|dennis at dgilmore.net|extras-qa at fedoraproject.org|
 Fedora Extras|csmash|3D tabletennis game|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|ctrlproxy|IRC server with multiserver support|dwmw2 at infradead.org|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Wed Sep  7 09:18:17 2005
From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo))
Date: Wed,  7 Sep 2005 05:18:17 -0400
Subject: rpms/scim-tomoe - New directory
Message-ID: <200509070918.j879IHwU011928@cvs-int.fedora.redhat.com>

Author: ryo

Update of /cvs/extras/rpms/scim-tomoe
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11908/scim-tomoe

Log Message:
Directory /cvs/extras/rpms/scim-tomoe added to the repository




From fedora-extras-commits at redhat.com  Wed Sep  7 09:18:17 2005
From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo))
Date: Wed,  7 Sep 2005 05:18:17 -0400
Subject: rpms/scim-tomoe/devel - New directory
Message-ID: <200509070918.j879IH3t011933@cvs-int.fedora.redhat.com>

Author: ryo

Update of /cvs/extras/rpms/scim-tomoe/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11908/scim-tomoe/devel

Log Message:
Directory /cvs/extras/rpms/scim-tomoe/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Sep  7 09:20:16 2005
From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo))
Date: Wed,  7 Sep 2005 05:20:16 -0400
Subject: rpms/scim-tomoe Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200509070920.j879KGB9011989@cvs-int.fedora.redhat.com>

Author: ryo

Update of /cvs/extras/rpms/scim-tomoe
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11954

Added Files:
	Makefile import.log 
Log Message:
Setup of module scim-tomoe


--- NEW FILE Makefile ---
# Top level Makefile for module scim-tomoe
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Wed Sep  7 09:20:17 2005
From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo))
Date: Wed,  7 Sep 2005 05:20:17 -0400
Subject: rpms/scim-tomoe/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200509070920.j879KHWP011994@cvs-int.fedora.redhat.com>

Author: ryo

Update of /cvs/extras/rpms/scim-tomoe/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11954/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module scim-tomoe


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Wed Sep  7 09:21:40 2005
From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo))
Date: Wed,  7 Sep 2005 05:21:40 -0400
Subject: rpms/scim-tomoe import.log,1.1,1.2
Message-ID: <200509070921.j879LeTM012057@cvs-int.fedora.redhat.com>

Author: ryo

Update of /cvs/extras/rpms/scim-tomoe
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12022

Modified Files:
	import.log 
Log Message:
auto-import scim-tomoe-0.1.0-1 on branch devel from scim-tomoe-0.1.0-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/scim-tomoe/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	7 Sep 2005 09:20:14 -0000	1.1
+++ import.log	7 Sep 2005 09:21:37 -0000	1.2
@@ -0,0 +1 @@
+scim-tomoe-0_1_0-1:HEAD:scim-tomoe-0.1.0-1.src.rpm:1126084873



From fedora-extras-commits at redhat.com  Wed Sep  7 09:21:40 2005
From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo))
Date: Wed,  7 Sep 2005 05:21:40 -0400
Subject: rpms/scim-tomoe/devel scim-tomoe.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200509070921.j879LewV012064@cvs-int.fedora.redhat.com>

Author: ryo

Update of /cvs/extras/rpms/scim-tomoe/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12022/devel

Modified Files:
	.cvsignore sources 
Added Files:
	scim-tomoe.spec 
Log Message:
auto-import scim-tomoe-0.1.0-1 on branch devel from scim-tomoe-0.1.0-1.src.rpm


--- NEW FILE scim-tomoe.spec ---
Name:           scim-tomoe
Version:        0.1.0
Release:        1%{?dist}
Summary:        Tomoe module for SCIM for Japanese handwritten input

Group:          System Environment/Libraries
License:        GPL
URL:            http://scim-imengine.sourceforge.jp/
Source0:        %{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  scim-devel, tomoe-devel

%description
Scim-tomoe allows Japanese handwritten input of characters using SCIM.


%prep
%setup -q


%build
%configure --disable-static
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

rm $RPM_BUILD_ROOT%{_libdir}/scim-1.0/*/*.la

%find_lang %{name}


%clean
rm -rf $RPM_BUILD_ROOT


%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog
%{_libdir}/scim-1.0
%{_datadir}/scim/icons/scim-tomoe.png


%changelog
* Wed Aug 31 2005 Ryo Dairiki  - 0.1-1
- update to 0.1

* Wed Aug 17 2005 Jens Petersen  - 0.0.0-0.20050817
- initial packaging of cvs snapshot


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/scim-tomoe/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	7 Sep 2005 09:20:14 -0000	1.1
+++ .cvsignore	7 Sep 2005 09:21:38 -0000	1.2
@@ -0,0 +1 @@
+scim-tomoe-0.1.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/scim-tomoe/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	7 Sep 2005 09:20:14 -0000	1.1
+++ sources	7 Sep 2005 09:21:38 -0000	1.2
@@ -0,0 +1 @@
+1c39c1e03069a4a6e15fcf5501cb981f  scim-tomoe-0.1.0.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep  7 09:26:38 2005
From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo))
Date: Wed,  7 Sep 2005 05:26:38 -0400
Subject: rpms/tomoe - New directory
Message-ID: <200509070926.j879QcMG012169@cvs-int.fedora.redhat.com>

Author: ryo

Update of /cvs/extras/rpms/tomoe
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12149/tomoe

Log Message:
Directory /cvs/extras/rpms/tomoe added to the repository




From fedora-extras-commits at redhat.com  Wed Sep  7 09:26:38 2005
From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo))
Date: Wed,  7 Sep 2005 05:26:38 -0400
Subject: rpms/tomoe/devel - New directory
Message-ID: <200509070926.j879Qcaf012174@cvs-int.fedora.redhat.com>

Author: ryo

Update of /cvs/extras/rpms/tomoe/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12149/tomoe/devel

Log Message:
Directory /cvs/extras/rpms/tomoe/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Sep  7 09:27:43 2005
From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo))
Date: Wed,  7 Sep 2005 05:27:43 -0400
Subject: rpms/tomoe Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200509070927.j879Rha9012231@cvs-int.fedora.redhat.com>

Author: ryo

Update of /cvs/extras/rpms/tomoe
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12196

Added Files:
	Makefile import.log 
Log Message:
Setup of module tomoe


--- NEW FILE Makefile ---
# Top level Makefile for module tomoe
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Wed Sep  7 09:27:43 2005
From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo))
Date: Wed,  7 Sep 2005 05:27:43 -0400
Subject: rpms/tomoe/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200509070927.j879RhfG012236@cvs-int.fedora.redhat.com>

Author: ryo

Update of /cvs/extras/rpms/tomoe/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12196/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module tomoe


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Wed Sep  7 09:28:48 2005
From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo))
Date: Wed,  7 Sep 2005 05:28:48 -0400
Subject: rpms/tomoe import.log,1.1,1.2
Message-ID: <200509070929.j879TIMZ012302@cvs-int.fedora.redhat.com>

Author: ryo

Update of /cvs/extras/rpms/tomoe
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12264

Modified Files:
	import.log 
Log Message:
auto-import tomoe-0.2.1-3 on branch devel from tomoe-0.2.1-3.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/tomoe/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	7 Sep 2005 09:27:41 -0000	1.1
+++ import.log	7 Sep 2005 09:28:46 -0000	1.2
@@ -0,0 +1 @@
+tomoe-0_2_1-3:HEAD:tomoe-0.2.1-3.src.rpm:1126085306



From fedora-extras-commits at redhat.com  Wed Sep  7 09:28:49 2005
From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo))
Date: Wed,  7 Sep 2005 05:28:49 -0400
Subject: rpms/tomoe/devel tomoe.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <200509070929.j879TJBJ012306@cvs-int.fedora.redhat.com>

Author: ryo

Update of /cvs/extras/rpms/tomoe/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12264/devel

Modified Files:
	.cvsignore sources 
Added Files:
	tomoe.spec 
Log Message:
auto-import tomoe-0.2.1-3 on branch devel from tomoe-0.2.1-3.src.rpm


--- NEW FILE tomoe.spec ---
Name:           tomoe
Version:        0.2.1
Release:        3%{?dist}
Summary:        Japanese handwritten input system

Group:          System Environment/Libraries
License:        LGPL
URL:            http://scim-imengine.sourceforge.jp/
Source0:        %{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description
A program which does Japanese handwriting recognition.


%package devel
Summary:    tomoe
Group:      Development/Libraries
Requires:   %{name} = %{version}-%{release}

%description devel
The tomoe-devel package includes the header files for the tomoe package.
Install this package if you want to develop programs which use tomoe.


%prep
%setup -q


%build
%configure
make %{?_smp_mflags}


%install
%makeinstall

rm $RPM_BUILD_ROOT%{_libdir}/libtomoe.la

%clean
rm -rf $RPM_BUILD_ROOT


%post -p/sbin/ldconfig

%postun -p /sbin/ldconfig


%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog
%{_bindir}/tomoe*
%{_libdir}/libtomoe.so*
%dir %{_datadir}/tomoe
%{_datadir}/tomoe/*


%files devel
%defattr(-,root,root,-)
%dir %{_includedir}/tomoe
%{_includedir}/tomoe/*
%{_libdir}/pkgconfig/tomoe.pc


%changelog
* Sat Sep 3 2005 Warren Togami  - 0.2.1-3
- some spec cleanup

* Sat Sep 2 2005 Ryo Dairiki  - 0.2.1-2
- Sync with Jens's spec file

* Wed Aug 31 2005 Ryo Dairiki  - 0.2.1-1
- Initial packaging for Extras

* Fri Jul  1 2005 Ichiro Nakai 
- (0.2.0-1m)
- version 0.2.0
- add a package tomoe-devel
- add %%post and %%postun sections

* Wed Mar  2 2005 Ichiro Nakai 
- (0.1.1-1m)
- initial package for Momonga Linux
- import %%description from cooker


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tomoe/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	7 Sep 2005 09:27:41 -0000	1.1
+++ .cvsignore	7 Sep 2005 09:28:46 -0000	1.2
@@ -0,0 +1 @@
+tomoe-0.2.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tomoe/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	7 Sep 2005 09:27:41 -0000	1.1
+++ sources	7 Sep 2005 09:28:46 -0000	1.2
@@ -0,0 +1 @@
+95eca127a1d519ff4e836b3d00d7fa84  tomoe-0.2.1.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep  7 10:09:20 2005
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Wed,  7 Sep 2005 06:09:20 -0400
Subject: owners owners.list,1.172,1.173
Message-ID: <200509071009.j87A9oAF014474@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14422

Modified Files:
	owners.list 
Log Message:



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -r1.172 -r1.173
--- owners.list	7 Sep 2005 08:58:39 -0000	1.172
+++ owners.list	7 Sep 2005 10:09:17 -0000	1.173
@@ -149,6 +149,7 @@
 Fedora Extras|epiphany-extensions|Extensions for Epiphany, the GNOME web browser|caillon at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|epydoc|Edward Loper's Python API documentation generation tool|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|epylog|New logs analyzer and parser|icon at linux.duke.edu|extras-qa at fedoraproject.org|
+Fedora Extras|erlang|General-purpose programming language and runtime environment|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|esmtp|User configurable relay-only Mail Transfer Agent (MTA)|pertusus at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|exim-doc|Documentation for the exim mail transfer agent|dwmw2 at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|exim|The exim mail transfer agent|dwmw2 at redhat.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Wed Sep  7 10:15:40 2005
From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc))
Date: Wed,  7 Sep 2005 06:15:40 -0400
Subject: rpms/libtranslate - New directory
Message-ID: <200509071015.j87AFe2x014598@cvs-int.fedora.redhat.com>

Author: buc

Update of /cvs/extras/rpms/libtranslate
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14578/libtranslate

Log Message:
Directory /cvs/extras/rpms/libtranslate added to the repository




From fedora-extras-commits at redhat.com  Wed Sep  7 10:15:41 2005
From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc))
Date: Wed,  7 Sep 2005 06:15:41 -0400
Subject: rpms/libtranslate/devel - New directory
Message-ID: <200509071015.j87AFfwH014603@cvs-int.fedora.redhat.com>

Author: buc

Update of /cvs/extras/rpms/libtranslate/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14578/libtranslate/devel

Log Message:
Directory /cvs/extras/rpms/libtranslate/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Sep  7 10:16:04 2005
From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc))
Date: Wed,  7 Sep 2005 06:16:04 -0400
Subject: rpms/libtranslate Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200509071016.j87AG4HR014658@cvs-int.fedora.redhat.com>

Author: buc

Update of /cvs/extras/rpms/libtranslate
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14623

Added Files:
	Makefile import.log 
Log Message:
Setup of module libtranslate


--- NEW FILE Makefile ---
# Top level Makefile for module libtranslate
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Wed Sep  7 10:16:05 2005
From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc))
Date: Wed,  7 Sep 2005 06:16:05 -0400
Subject: rpms/libtranslate/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200509071016.j87AG5Hu014663@cvs-int.fedora.redhat.com>

Author: buc

Update of /cvs/extras/rpms/libtranslate/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14623/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module libtranslate


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Wed Sep  7 10:16:59 2005
From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc))
Date: Wed,  7 Sep 2005 06:16:59 -0400
Subject: rpms/libtranslate import.log,1.1,1.2
Message-ID: <200509071016.j87AGx2o014748@cvs-int.fedora.redhat.com>

Author: buc

Update of /cvs/extras/rpms/libtranslate
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14709

Modified Files:
	import.log 
Log Message:
auto-import libtranslate-0.99-4 on branch devel from libtranslate-0.99-4.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/libtranslate/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	7 Sep 2005 10:16:02 -0000	1.1
+++ import.log	7 Sep 2005 10:16:57 -0000	1.2
@@ -0,0 +1 @@
+libtranslate-0_99-4:HEAD:libtranslate-0.99-4.src.rpm:1126088208



From fedora-extras-commits at redhat.com  Wed Sep  7 10:16:59 2005
From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc))
Date: Wed,  7 Sep 2005 06:16:59 -0400
Subject: rpms/libtranslate/devel libtranslate-0.99-charsetparse.diff, NONE,
	1.1 libtranslate-0.99-condfix.diff, NONE,
	1.1 libtranslate-add_Promt_service.patch, NONE,
	1.1 libtranslate.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <200509071017.j87AGxjG014763@cvs-int.fedora.redhat.com>

Author: buc

Update of /cvs/extras/rpms/libtranslate/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14709/devel

Modified Files:
	.cvsignore sources 
Added Files:
	libtranslate-0.99-charsetparse.diff 
	libtranslate-0.99-condfix.diff 
	libtranslate-add_Promt_service.patch libtranslate.spec 
Log Message:
auto-import libtranslate-0.99-4 on branch devel from libtranslate-0.99-4.src.rpm

libtranslate-0.99-charsetparse.diff:

--- NEW FILE libtranslate-0.99-charsetparse.diff ---
--- src/modules/translate-generic-service.c.orig	Mon Apr 11 23:08:47 2005
+++ src/modules/translate-generic-service.c	Mon Apr 11 23:15:54 2005
@@ -484,7 +484,7 @@
 
   if (SOUP_STATUS_IS_SUCCESSFUL(message->status_code))
     {
-      const char *charset = NULL;
+      char *charset = NULL;
       
       if (flags & TRANSFER_CONVERT)
 	{
@@ -493,14 +493,31 @@
 	  content_type = translate_generic_service_get_header(message, &info, "Content-Type");
 	  if (content_type)
 	    {
-	      charset = translate_ascii_strcasestr(content_type, "charset=");
-	      if (charset)
-		charset += 8;
+	      const char *tmp;
+	      
+	      tmp = translate_ascii_strcasestr(content_type, "charset=");
+	      if (tmp)
+		{
+		  int len;
+
+		  tmp += 8;
+		  if (*tmp == '\'' || *tmp == '"')
+		    tmp++;
+
+		  len = strlen(tmp);
+		  if (len > 0 && (tmp[len - 1] == '\'' || tmp[len - 1] == '"'))
+		    len--;
+
+		  charset = g_strndup(tmp, len);
+		}
 	    }
 	}
 
       if (charset)
-	response = g_convert(message->response.body, message->response.length, "UTF-8", charset, NULL, NULL, err);
+	{
+	  response = g_convert(message->response.body, message->response.length, "UTF-8", charset, NULL, NULL, err);
+	  g_free(charset);
+	}
       else
 	{
 	  if ((flags & TRANSFER_CONVERT) && ! g_utf8_validate(message->response.body, message->response.length, NULL))

libtranslate-0.99-condfix.diff:

--- NEW FILE libtranslate-0.99-condfix.diff ---
--- src/translate-session.c.orig	Mon Apr 11 22:44:53 2005
+++ src/translate-session.c	Mon Apr 11 22:51:48 2005
@@ -703,7 +703,14 @@
 	  GError *tmp_err = NULL;
 
 	  g_mutex_lock(info->mutex);
-	  ret = info->err != NULL;
+	  if (info->err)
+	    {
+	      ret = TRUE;
+	      if (info->progress_cond)
+		g_cond_signal(info->progress_cond);
+	    }
+	  else
+	    ret = FALSE;
 	  g_mutex_unlock(info->mutex);
 
 	  if (ret)
@@ -728,6 +735,9 @@
 		  else
 		    g_propagate_error(&info->err, tmp_err);
 
+		  if (info->progress_cond)
+		    g_cond_signal(info->progress_cond);
+
 		  g_mutex_unlock(info->mutex);
 
 		  return;
@@ -759,6 +769,9 @@
 	info->err = g_error_new(TRANSLATE_SESSION_ERROR,
 				TRANSLATE_SESSION_ERROR_NO_SERVICE,
 				_("no service could translate chunk"));
+
+      if (info->progress_cond)
+	g_cond_signal(info->progress_cond);
     }
   
   g_mutex_unlock(info->mutex);

libtranslate-add_Promt_service.patch:

--- NEW FILE libtranslate-add_Promt_service.patch ---
--- data/services.xml.in.orig	2005-01-17 19:54:27.000000000 +0300
+++ data/services.xml.in	2005-07-29 18:39:09.000000000 +0400
@@ -244,4 +244,21 @@
       
     
   
+
+  
+    
+      
+      
+      
+      
+      
+      
+      
+      
+	
+	
+	
+      
+    
+  
 


--- NEW FILE libtranslate.spec ---
Name: libtranslate
Summary: Natural language translation library
Version: 0.99
Release: 4%{?dist}
License: BSD
Group: System Environment/Libraries
%define url	http://savannah.nongnu.org/download/libtranslate
Source: %{url}/libtranslate-%{version}.tar.gz
Patch1: %{url}/libtranslate-0.99-charsetparse.diff
Patch2: %{url}/libtranslate-0.99-condfix.diff
Patch10: libtranslate-add_Promt_service.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: pkgconfig >= 1:0.8, gettext
BuildRequires: glib2-devel, libsoup-devel >= 2.2, libxml2-devel
BuildRequires: gnutls-devel, libgcrypt-devel
Requires: libsoup >= 2.2
URL: http://www.nongnu.org/libtranslate

%description 
Libtranslate is a library for translating text and web pages
between natural languages. Its modular infrastructure allows
to implement new translation services separately from the core library.

Libtranslate is shipped with a generic module supporting
web-based translation services such as Babel Fish, Google Language Tools
and SYSTRAN. Moreover, the generic module allows to add new services
simply by adding a few lines to a XML file (see libtranslate(5)).

The libtranslate distribution includes a powerful command line interface
(see translate(1)). GNOME GUI can be found as separate "gnome-translate"
package at the same web source.

%package devel
Summary: Natural language translation library, static libs and headers
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
Requires: pkgconfig >= 1:0.8

%description devel
The static libraries and header files for %{name} library.

%prep
%setup -q -n %{name}-%{version}
%patch1 -p0
%patch2 -p0
%patch10 -p0

%build
%configure
make

pushd docs/man
iconv -f ISO8859-1 -t UTF8  translate.1.new && \
					mv -f translate.1.new translate.1
popd

%install
rm -rf $RPM_BUILD_ROOT

%makeinstall

pushd $RPM_BUILD_ROOT%{_mandir}/man5
mv -f services.xml.5 libtranslate.5
popd

rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
rm -f $RPM_BUILD_ROOT%{_libdir}/libtranslate/modules/*.{la,a}

%find_lang %{name}

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files -f %{name}.lang
%defattr(-, root, root)

%doc AUTHORS COPYING README
%{_libdir}/libtranslate.so.*
%{_libdir}/libtranslate/
%{_datadir}/libtranslate/
%{_bindir}/*
%{_mandir}/*/*

%files devel
%defattr(-, root, root)

%{_libdir}/libtranslate.so
%{_libdir}/*.a
%{_includedir}/libtranslate/
%{_datadir}/gtk-doc/html/*
%{_libdir}/pkgconfig/*

%changelog
* Wed Sep  7 2005 Dmitry Butskoy  - 0.99-4
- even more cleanups

* Fri Aug 19 2005 Dmitry Butskoy  - 0.99-3
- more cleanups

* Thu Aug 18 2005 Tom "spot" Callaway  - 0.99-2
- cleanups

* Mon Aug  8 2005 Dmitry Butskoy  - 0.99-1
- convert translate(1) manual to unicode (it contains non-ascii in examples)
- rename service.xml(5) manual to libtranslate(5)

* Fri Jul 29 2005 Dmitry Butskoy 
- Add Promt (www.online-translator.com) service.

* Fri Jul 22 2005 Dmitry Butskoy  
- Initial release.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libtranslate/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	7 Sep 2005 10:16:03 -0000	1.1
+++ .cvsignore	7 Sep 2005 10:16:57 -0000	1.2
@@ -0,0 +1 @@
+libtranslate-0.99.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libtranslate/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	7 Sep 2005 10:16:03 -0000	1.1
+++ sources	7 Sep 2005 10:16:57 -0000	1.2
@@ -0,0 +1 @@
+1fe75a6a6e8a0c6518890b5fa6984d42  libtranslate-0.99.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep  7 10:24:00 2005
From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc))
Date: Wed,  7 Sep 2005 06:24:00 -0400
Subject: owners owners.list,1.173,1.174
Message-ID: <200509071024.j87AO0b1014843@cvs-int.fedora.redhat.com>

Author: buc

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14819

Modified Files:
	owners.list 
Log Message:



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -r1.173 -r1.174
--- owners.list	7 Sep 2005 10:09:17 -0000	1.173
+++ owners.list	7 Sep 2005 10:23:58 -0000	1.174
@@ -433,6 +433,7 @@
 Fedora Extras|libtabe|Chinese lexicons library for xcin-2.5.3|llch at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|libtar|Tar file manipulation API|anvil at livna.org|extras-qa at fedoraproject.org|
 Fedora Extras|libtasn1|This is the ASN.1 library used in GNUTLS.|enrico.scholz at informatik.tu-chemnitz.de|extras-qa at fedoraproject.org|
+Fedora Extras|libtranslate|Natural language translation library|dmitry at butskoy.name|extras-qa at fedoraproject.org|
 Fedora Extras|libuninameslist|Library that provides Unicode names and annotations|otaylor at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|libvisual|An abstraction library for audio visualisation plugins|gauret at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|libvisual-plugins|Plugins for use with libvisual|mpeters at mac.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Wed Sep  7 11:35:42 2005
From: fedora-extras-commits at redhat.com (Linus Walleij (snirkel))
Date: Wed,  7 Sep 2005 07:35:42 -0400
Subject: rpms/gnomad2/FC-3 .cvsignore, 1.2, 1.3 gnomad2.spec, 1.2,
	1.3 sources, 1.2, 1.3
Message-ID: <200509071135.j87BZg61016367@cvs-int.fedora.redhat.com>

Author: snirkel

Update of /cvs/extras/rpms/gnomad2/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16344

Modified Files:
	.cvsignore gnomad2.spec sources 
Log Message:
New upstream release.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnomad2/FC-3/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	25 Aug 2005 07:21:35 -0000	1.2
+++ .cvsignore	7 Sep 2005 11:35:39 -0000	1.3
@@ -1 +1 @@
-gnomad2-2.8.0.tar.gz
+gnomad2-2.8.1.tar.gz


Index: gnomad2.spec
===================================================================
RCS file: /cvs/extras/rpms/gnomad2/FC-3/gnomad2.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gnomad2.spec	25 Aug 2005 09:41:53 -0000	1.2
+++ gnomad2.spec	7 Sep 2005 11:35:39 -0000	1.3
@@ -9,8 +9,8 @@
 #
 
 Name:		gnomad2
-Version:    	2.8.0
-Release:	5%{?dist}
+Version:    	2.8.1
+Release:	1%{?dist}
 
 Summary:	A GNOME 2.0 client for the Creative Jukeboxes and Dell DJs
 License:	GPL
@@ -77,6 +77,8 @@
 %doc AUTHORS NEWS README COPYING ChangeLog
 
 %changelog
+* Wed Sep 7 2005 Linus Walleij  2.8.1-1
+- New upstream realease.
 * Wed Aug 17 2005 Linus Walleij  2.8.0-5
 - Fixes following remarks from matthias at rpmforge.net
 * Wed Aug 17 2005 Linus Walleij  2.8.0-4


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnomad2/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	25 Aug 2005 07:21:35 -0000	1.2
+++ sources	7 Sep 2005 11:35:39 -0000	1.3
@@ -1 +1 @@
-23872b7d3b9fc434b8152620e309de3a  gnomad2-2.8.0.tar.gz
+6bae2df9f094b06cd5d606a693eb3241  gnomad2-2.8.1.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep  7 11:36:41 2005
From: fedora-extras-commits at redhat.com (Linus Walleij (snirkel))
Date: Wed,  7 Sep 2005 07:36:41 -0400
Subject: rpms/gnomad2/FC-4 .cvsignore, 1.2, 1.3 gnomad2.spec, 1.2,
	1.3 sources, 1.2, 1.3
Message-ID: <200509071136.j87BafvH016435@cvs-int.fedora.redhat.com>

Author: snirkel

Update of /cvs/extras/rpms/gnomad2/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16412

Modified Files:
	.cvsignore gnomad2.spec sources 
Log Message:
New upstream release.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnomad2/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	25 Aug 2005 07:21:35 -0000	1.2
+++ .cvsignore	7 Sep 2005 11:36:39 -0000	1.3
@@ -1 +1 @@
-gnomad2-2.8.0.tar.gz
+gnomad2-2.8.1.tar.gz


Index: gnomad2.spec
===================================================================
RCS file: /cvs/extras/rpms/gnomad2/FC-4/gnomad2.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gnomad2.spec	25 Aug 2005 09:41:53 -0000	1.2
+++ gnomad2.spec	7 Sep 2005 11:36:39 -0000	1.3
@@ -9,8 +9,8 @@
 #
 
 Name:		gnomad2
-Version:    	2.8.0
-Release:	5%{?dist}
+Version:    	2.8.1
+Release:	1%{?dist}
 
 Summary:	A GNOME 2.0 client for the Creative Jukeboxes and Dell DJs
 License:	GPL
@@ -77,6 +77,8 @@
 %doc AUTHORS NEWS README COPYING ChangeLog
 
 %changelog
+* Wed Sep 7 2005 Linus Walleij  2.8.1-1
+- New upstream realease.
 * Wed Aug 17 2005 Linus Walleij  2.8.0-5
 - Fixes following remarks from matthias at rpmforge.net
 * Wed Aug 17 2005 Linus Walleij  2.8.0-4


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnomad2/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	25 Aug 2005 07:21:35 -0000	1.2
+++ sources	7 Sep 2005 11:36:39 -0000	1.3
@@ -1 +1 @@
-23872b7d3b9fc434b8152620e309de3a  gnomad2-2.8.0.tar.gz
+6bae2df9f094b06cd5d606a693eb3241  gnomad2-2.8.1.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep  7 11:37:23 2005
From: fedora-extras-commits at redhat.com (Linus Walleij (snirkel))
Date: Wed,  7 Sep 2005 07:37:23 -0400
Subject: rpms/gnomad2/devel .cvsignore, 1.2, 1.3 gnomad2.spec, 1.2,
	1.3 sources, 1.2, 1.3
Message-ID: <200509071137.j87BbNdg016507@cvs-int.fedora.redhat.com>

Author: snirkel

Update of /cvs/extras/rpms/gnomad2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16484

Modified Files:
	.cvsignore gnomad2.spec sources 
Log Message:
New upstream release.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnomad2/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	25 Aug 2005 07:21:35 -0000	1.2
+++ .cvsignore	7 Sep 2005 11:37:21 -0000	1.3
@@ -1 +1 @@
-gnomad2-2.8.0.tar.gz
+gnomad2-2.8.1.tar.gz


Index: gnomad2.spec
===================================================================
RCS file: /cvs/extras/rpms/gnomad2/devel/gnomad2.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gnomad2.spec	25 Aug 2005 09:41:53 -0000	1.2
+++ gnomad2.spec	7 Sep 2005 11:37:21 -0000	1.3
@@ -9,8 +9,8 @@
 #
 
 Name:		gnomad2
-Version:    	2.8.0
-Release:	5%{?dist}
+Version:    	2.8.1
+Release:	1%{?dist}
 
 Summary:	A GNOME 2.0 client for the Creative Jukeboxes and Dell DJs
 License:	GPL
@@ -77,6 +77,8 @@
 %doc AUTHORS NEWS README COPYING ChangeLog
 
 %changelog
+* Wed Sep 7 2005 Linus Walleij  2.8.1-1
+- New upstream realease.
 * Wed Aug 17 2005 Linus Walleij  2.8.0-5
 - Fixes following remarks from matthias at rpmforge.net
 * Wed Aug 17 2005 Linus Walleij  2.8.0-4


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnomad2/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	25 Aug 2005 07:21:35 -0000	1.2
+++ sources	7 Sep 2005 11:37:21 -0000	1.3
@@ -1 +1 @@
-23872b7d3b9fc434b8152620e309de3a  gnomad2-2.8.0.tar.gz
+6bae2df9f094b06cd5d606a693eb3241  gnomad2-2.8.1.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep  7 12:47:13 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Wed,  7 Sep 2005 08:47:13 -0400
Subject: rpms/gc/FC-3 .cvsignore,1.4,1.5 gc.spec,1.6,1.7 sources,1.4,1.5
Message-ID: <200509071247.j87ClDi9018173@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/gc/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18150

Modified Files:
	.cvsignore gc.spec sources 
Log Message:
* Wed May 25 2005 Rex Dieter  6.5-1
- 6.5



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gc/FC-3/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	29 Jan 2005 16:28:30 -0000	1.4
+++ .cvsignore	7 Sep 2005 12:47:10 -0000	1.5
@@ -1 +1 @@
-gc6.4.tar.gz
+gc6.5.tar.gz


Index: gc.spec
===================================================================
RCS file: /cvs/extras/rpms/gc/FC-3/gc.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gc.spec	29 Jan 2005 16:28:30 -0000	1.6
+++ gc.spec	7 Sep 2005 12:47:10 -0000	1.7
@@ -2,19 +2,16 @@
 
 Summary: C++ Garbage Collector	
 Name:    gc	
-Epoch:	 0
-Version: 6.4
-# For Extras
-Release: 2 
-# For kde-redhat
-#Release: 0.2%{?dist_tag}.kde
-Group:	 System Environment/Libraries
+Version: 6.5
+
+Release: 1%{?dist}
+Group:   System Environment/Libraries
 License: BSD
 Url:     http://www.hpl.hp.com/personal/Hans_Boehm/gc/	
-Source:	 http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/gc6.4.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+Source:  http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/gc6.5.tar.gz 
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Patch1: gc6.4-opendl.patch
+Patch1: gc6.5-opendl.patch
 
 
 %description
@@ -22,11 +19,11 @@
 collecting replacement for C malloc or C++ new.
 
 %package devel
-Summary: Libraries and header files for gc development 
+Summary: Libraries and header files for %{name} development 
 Group:   Development/Libraries
-Requires: %{name} = %{epoch}:%{version}-%{release}
+Requires: %{name} = %{version}-%{release}
 %description devel
-Libraries and header files for gc development.
+Libraries and header files for %{name} development.
 
 
 %prep
@@ -47,6 +44,7 @@
 
 make %{?_smp_mflags}
 
+%check || :
 make check
 
 
@@ -63,10 +61,11 @@
 
 
 %clean
-rm -rf 	"$RPM_BUILD_ROOT"
+rm -rf $RPM_BUILD_ROOT
 
 
 %post   -p /sbin/ldconfig
+
 %postun -p /sbin/ldconfig
 
 
@@ -80,11 +79,16 @@
 %doc doc/*.html
 %{_includedir}/*
 %{_libdir}/lib*.so
-#{_libdir}/lib*.*a
 %{_mandir}/man?/*
 
 
 %changelog
+* Wed May 25 2005 Rex Dieter  6.5-1
+- 6.5
+
+* Fri Apr  7 2005 Michael Schwendt 
+- rebuilt
+
 * Wed Jan 26 2005 Rex Dieter  0:6.4-2
 - --enable-threads unconditionally
 - --enable-parallel-mark only on %%ix86 (#144681)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gc/FC-3/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	29 Jan 2005 16:28:30 -0000	1.4
+++ sources	7 Sep 2005 12:47:10 -0000	1.5
@@ -1 +1 @@
-ef03495e980b834a99c0e27eedaa546e  gc6.4.tar.gz
+00bf95cdcbedfa7321d14e0133b31cdb  gc6.5.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep  7 12:48:11 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Wed,  7 Sep 2005 08:48:11 -0400
Subject: rpms/gc/FC-4 gc6.5-opendl.patch, NONE, 1.1 .cvsignore, 1.4,
	1.5 gc.spec, 1.8, 1.9 sources, 1.4, 1.5 gc6.4-opendl.patch,
	1.1, NONE
Message-ID: <200509071248.j87CmBX0018235@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/gc/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18209

Modified Files:
	.cvsignore gc.spec sources 
Added Files:
	gc6.5-opendl.patch 
Removed Files:
	gc6.4-opendl.patch 
Log Message:
* Wed May 25 2005 Rex Dieter  6.5-1
- 6.5


gc6.5-opendl.patch:

--- NEW FILE gc6.5-opendl.patch ---
--- gc6.5/Makefile.in.opendl	2005-05-16 18:28:28.000000000 -0500
+++ gc6.5/Makefile.in	2005-05-25 10:27:00.341398988 -0500
@@ -336,7 +336,7 @@
 
 # Include THREADDLLIBS here to ensure that the correct versions of
 # linuxthread semaphore functions get linked:
-libgc_la_LIBADD = @addobjs@ $(THREADDLLIBS) $(UNWINDLIBS)
+libgc_la_LIBADD = @addobjs@ $(THREADDLLIBS) $(UNWINDLIBS) $(EXTRA_TEST_LIBS)
 libgc_la_DEPENDENCIES = @addobjs@
 libgc_la_LDFLAGS = -version-info 1:2:0
 EXTRA_libgc_la_SOURCES = alpha_mach_dep.S \
@@ -345,7 +345,7 @@
     sparc_sunos4_mach_dep.s ia64_save_regs_in_stack.s
 
 libgccpp_la_SOURCES = gc_cpp.cc
-libgccpp_la_LIBADD = $(THREADDLLIBS) $(UNWINDLIBS)
+libgccpp_la_LIBADD = $(THREADDLLIBS) $(UNWINDLIBS) $(EXTRA_TEST_LIBS)
 libgccpp_la_LDFLAGS = -version-info 1:2:0
 AM_CXXFLAGS = @GC_CFLAGS@
 AM_CFLAGS = @GC_CFLAGS@
@@ -354,9 +354,9 @@
 
 # gctest_OBJECTS = test.o
 gctest_SOURCES = tests/test.c
-gctest_LDADD = ./libgc.la $(THREADDLLIBS) $(UNWINDLIBS) $(EXTRA_TEST_LIBS)
+gctest_LDADD = ./libgc.la
 test_cpp_SOURCES = tests/test_cpp.cc
-test_cpp_LDADD = ./libgc.la ./libgccpp.la $(THREADDLLIBS) $(UNWINDLIBS) $(EXTRA_TEST_LIBS)
+test_cpp_LDADD = ./libgc.la ./libgccpp.la
 TESTS = gctest $(extra_checks)
 all_objs = @addobjs@ $(libgc_la_OBJECTS)
 LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) \
--- gc6.5/Makefile.am.opendl	2005-05-16 17:11:08.000000000 -0500
+++ gc6.5/Makefile.am	2005-05-25 10:25:35.953868785 -0500
@@ -55,7 +55,7 @@
 
 # Include THREADDLLIBS here to ensure that the correct versions of
 # linuxthread semaphore functions get linked:
-libgc_la_LIBADD = @addobjs@ $(THREADDLLIBS) $(UNWINDLIBS)
+libgc_la_LIBADD = @addobjs@ $(THREADDLLIBS) $(UNWINDLIBS) $(EXTRA_TEST_LIBS)
 libgc_la_DEPENDENCIES = @addobjs@
 libgc_la_LDFLAGS = -version-info 1:2:0
 
@@ -65,7 +65,7 @@
     sparc_sunos4_mach_dep.s ia64_save_regs_in_stack.s
 
 libgccpp_la_SOURCES = gc_cpp.cc
-libgccpp_la_LIBADD = $(THREADDLLIBS) $(UNWINDLIBS)
+libgccpp_la_LIBADD = $(THREADDLLIBS) $(UNWINDLIBS) $(EXTRA_TEST_LIBS)
 libgccpp_la_LDFLAGS = -version-info 1:2:0
 
 EXTRA_DIST += alpha_mach_dep.S mips_sgi_mach_dep.s sparc_mach_dep.S
@@ -91,9 +91,9 @@
 ##     are included in the distribution
 # gctest_OBJECTS = test.o
 gctest_SOURCES = tests/test.c
-gctest_LDADD = ./libgc.la $(THREADDLLIBS) $(UNWINDLIBS) $(EXTRA_TEST_LIBS)
+gctest_LDADD = ./libgc.la 
 test_cpp_SOURCES = tests/test_cpp.cc
-test_cpp_LDADD = ./libgc.la ./libgccpp.la $(THREADDLLIBS) $(UNWINDLIBS) $(EXTRA_TEST_LIBS)
+test_cpp_LDADD = ./libgc.la ./libgccpp.la 
 
 TESTS = gctest $(extra_checks)
 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gc/FC-4/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	29 Jan 2005 16:28:30 -0000	1.4
+++ .cvsignore	7 Sep 2005 12:48:08 -0000	1.5
@@ -1 +1 @@
-gc6.4.tar.gz
+gc6.5.tar.gz


Index: gc.spec
===================================================================
RCS file: /cvs/extras/rpms/gc/FC-4/gc.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- gc.spec	6 Apr 2005 22:11:37 -0000	1.8
+++ gc.spec	7 Sep 2005 12:48:08 -0000	1.9
@@ -1,32 +1,29 @@
 # $Id$
 
-Summary: C++ Garbage Collector
-Name:    gc
-Version: 6.4
-# For Extras
-Release: 3
+Summary: C++ Garbage Collector	
+Name:    gc	
+Version: 6.5
 
-# For kde-redhat
-#Release: 0.2%{?dist_tag}.kde
+Release: 1%{?dist}
 Group:   System Environment/Libraries
 License: BSD
-Url:     http://www.hpl.hp.com/personal/Hans_Boehm/gc/
-Source:  http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/gc6.4.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+Url:     http://www.hpl.hp.com/personal/Hans_Boehm/gc/	
+Source:  http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/gc6.5.tar.gz 
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Patch1: gc6.4-opendl.patch
+Patch1: gc6.5-opendl.patch
 
 
 %description
-The Boehm-Demers-Weiser conservative garbage collector can be used as a garbage
+The Boehm-Demers-Weiser conservative garbage collector can be used as a garbage 
 collecting replacement for C malloc or C++ new.
 
 %package devel
-Summary: Libraries and header files for gc development
+Summary: Libraries and header files for %{name} development 
 Group:   Development/Libraries
 Requires: %{name} = %{version}-%{release}
 %description devel
-Libraries and header files for gc development.
+Libraries and header files for %{name} development.
 
 
 %prep
@@ -47,6 +44,7 @@
 
 make %{?_smp_mflags}
 
+%check || :
 make check
 
 
@@ -55,7 +53,7 @@
 
 make install DESTDIR=$RPM_BUILD_ROOT
 
-install -p -D -m644 doc/gc.man $RPM_BUILD_ROOT%{_mandir}/man3/gc.3
+install -p -D -m644 doc/gc.man	$RPM_BUILD_ROOT%{_mandir}/man3/gc.3
 
 ## Unpackaged files
 rm -rf $RPM_BUILD_ROOT%{_datadir}/gc
@@ -63,14 +61,15 @@
 
 
 %clean
-rm -rf "$RPM_BUILD_ROOT"
+rm -rf $RPM_BUILD_ROOT
 
 
 %post   -p /sbin/ldconfig
+
 %postun -p /sbin/ldconfig
 
 
-%files
+%files 
 %defattr(-,root,root)
 %doc doc/README doc/README.changes doc/README.contributors
 %{_libdir}/lib*.so.*
@@ -80,11 +79,13 @@
 %doc doc/*.html
 %{_includedir}/*
 %{_libdir}/lib*.so
-#{_libdir}/lib*.*a
 %{_mandir}/man?/*
 
 
 %changelog
+* Wed May 25 2005 Rex Dieter  6.5-1
+- 6.5
+
 * Fri Apr  7 2005 Michael Schwendt 
 - rebuilt
 
@@ -117,16 +118,16 @@
 - OK, put manpage in man3.
 
 * Thu Oct 02 2003 Rex Dieter  0:6.2-0.fdr.2
-- drop manpage pending feedback from developer.
+- drop manpage pending feedback from developer. 
 
 * Tue Sep 30 2003 Rex Dieter  0:6.2-0.fdr.1
-- fix manpage location
+- fix manpage location 
 - remove .la file (it appears unnecessary after all, thanks to opendl patch)
 - remove cvs tag from description
 - touchup -devel desc/summary.
 - macro update to support Fedora Core
 
-* Thu Sep 11 2003 Rex Dieter  0:6.2-0.fdr.0
+* Thu Sep 11 2003 Rex Dieter  0:6.2-0.fdr.0 
 - 6.2 release.
 - update license (BSD)
 - Consider building with: --enable-parallel-mark


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gc/FC-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	29 Jan 2005 16:28:30 -0000	1.4
+++ sources	7 Sep 2005 12:48:08 -0000	1.5
@@ -1 +1 @@
-ef03495e980b834a99c0e27eedaa546e  gc6.4.tar.gz
+00bf95cdcbedfa7321d14e0133b31cdb  gc6.5.tar.gz


--- gc6.4-opendl.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Sep  7 12:48:22 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Wed,  7 Sep 2005 08:48:22 -0400
Subject: rpms/gc/FC-3 gc6.5-opendl.patch, NONE, 1.1 gc6.4-opendl.patch, 1.1,
	NONE
Message-ID: <200509071248.j87CmMiR018261@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/gc/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18241

Added Files:
	gc6.5-opendl.patch 
Removed Files:
	gc6.4-opendl.patch 
Log Message:
update opendl patch


gc6.5-opendl.patch:

--- NEW FILE gc6.5-opendl.patch ---
--- gc6.5/Makefile.in.opendl	2005-05-16 18:28:28.000000000 -0500
+++ gc6.5/Makefile.in	2005-05-25 10:27:00.341398988 -0500
@@ -336,7 +336,7 @@
 
 # Include THREADDLLIBS here to ensure that the correct versions of
 # linuxthread semaphore functions get linked:
-libgc_la_LIBADD = @addobjs@ $(THREADDLLIBS) $(UNWINDLIBS)
+libgc_la_LIBADD = @addobjs@ $(THREADDLLIBS) $(UNWINDLIBS) $(EXTRA_TEST_LIBS)
 libgc_la_DEPENDENCIES = @addobjs@
 libgc_la_LDFLAGS = -version-info 1:2:0
 EXTRA_libgc_la_SOURCES = alpha_mach_dep.S \
@@ -345,7 +345,7 @@
     sparc_sunos4_mach_dep.s ia64_save_regs_in_stack.s
 
 libgccpp_la_SOURCES = gc_cpp.cc
-libgccpp_la_LIBADD = $(THREADDLLIBS) $(UNWINDLIBS)
+libgccpp_la_LIBADD = $(THREADDLLIBS) $(UNWINDLIBS) $(EXTRA_TEST_LIBS)
 libgccpp_la_LDFLAGS = -version-info 1:2:0
 AM_CXXFLAGS = @GC_CFLAGS@
 AM_CFLAGS = @GC_CFLAGS@
@@ -354,9 +354,9 @@
 
 # gctest_OBJECTS = test.o
 gctest_SOURCES = tests/test.c
-gctest_LDADD = ./libgc.la $(THREADDLLIBS) $(UNWINDLIBS) $(EXTRA_TEST_LIBS)
+gctest_LDADD = ./libgc.la
 test_cpp_SOURCES = tests/test_cpp.cc
-test_cpp_LDADD = ./libgc.la ./libgccpp.la $(THREADDLLIBS) $(UNWINDLIBS) $(EXTRA_TEST_LIBS)
+test_cpp_LDADD = ./libgc.la ./libgccpp.la
 TESTS = gctest $(extra_checks)
 all_objs = @addobjs@ $(libgc_la_OBJECTS)
 LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) \
--- gc6.5/Makefile.am.opendl	2005-05-16 17:11:08.000000000 -0500
+++ gc6.5/Makefile.am	2005-05-25 10:25:35.953868785 -0500
@@ -55,7 +55,7 @@
 
 # Include THREADDLLIBS here to ensure that the correct versions of
 # linuxthread semaphore functions get linked:
-libgc_la_LIBADD = @addobjs@ $(THREADDLLIBS) $(UNWINDLIBS)
+libgc_la_LIBADD = @addobjs@ $(THREADDLLIBS) $(UNWINDLIBS) $(EXTRA_TEST_LIBS)
 libgc_la_DEPENDENCIES = @addobjs@
 libgc_la_LDFLAGS = -version-info 1:2:0
 
@@ -65,7 +65,7 @@
     sparc_sunos4_mach_dep.s ia64_save_regs_in_stack.s
 
 libgccpp_la_SOURCES = gc_cpp.cc
-libgccpp_la_LIBADD = $(THREADDLLIBS) $(UNWINDLIBS)
+libgccpp_la_LIBADD = $(THREADDLLIBS) $(UNWINDLIBS) $(EXTRA_TEST_LIBS)
 libgccpp_la_LDFLAGS = -version-info 1:2:0
 
 EXTRA_DIST += alpha_mach_dep.S mips_sgi_mach_dep.s sparc_mach_dep.S
@@ -91,9 +91,9 @@
 ##     are included in the distribution
 # gctest_OBJECTS = test.o
 gctest_SOURCES = tests/test.c
-gctest_LDADD = ./libgc.la $(THREADDLLIBS) $(UNWINDLIBS) $(EXTRA_TEST_LIBS)
+gctest_LDADD = ./libgc.la 
 test_cpp_SOURCES = tests/test_cpp.cc
-test_cpp_LDADD = ./libgc.la ./libgccpp.la $(THREADDLLIBS) $(UNWINDLIBS) $(EXTRA_TEST_LIBS)
+test_cpp_LDADD = ./libgc.la ./libgccpp.la 
 
 TESTS = gctest $(extra_checks)
 


--- gc6.4-opendl.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Sep  7 12:51:51 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Wed,  7 Sep 2005 08:51:51 -0400
Subject: rpms/libfac/FC-3 libfac.spec,1.4,1.5
Message-ID: <200509071252.j87CqL0i018417@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/libfac/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18381/FC-3

Modified Files:
	libfac.spec 
Log Message:
cleanup
add %{dist} tag



Index: libfac.spec
===================================================================
RCS file: /cvs/extras/rpms/libfac/FC-3/libfac.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- libfac.spec	4 Dec 2004 09:46:44 -0000	1.4
+++ libfac.spec	7 Sep 2005 12:51:49 -0000	1.5
@@ -1,18 +1,18 @@
 # $Id$
 
-Summary: An extension to Singular-factory
-Name:    libfac	
-Epoch:	 0
+Summary: Extension to Singular-factory
+Name:    libfac
 Version: 2.0.5
-Release: 1%{?dist_tag}
+Release: 3%{?dist}
+
 License: GPL
-Url:     http://www.mathematik.uni-kl.de/ftp/pub/Math/Singular/Libfac/	
+Url:     http://www.mathematik.uni-kl.de/ftp/pub/Math/Singular/Libfac/
 # http://www.mathematik.uni-kl.de/ftp/pub/Math/Singular/Libfac/libfac-2-0-5.tar,gz
-Source:	 libfac-2-0-5.tar.gz
-Group:   System Environment/Libraries	
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+Source:  libfac-2-0-5.tar.gz
+Group:   System Environment/Libraries
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires: factory-devel >= 0:2.0.5
+BuildRequires: factory-devel >= 2.0.5
 #BuildRequires: autoconf >= 2.53
 
 %description
@@ -24,14 +24,14 @@
 
 %package devel
 Summary: An extension to Singular-factory
-Obsoletes: %{name} < %{epoch}:%{version}-%{release}
-Provides:  %{name} = %{epoch}:%{version}-%{release}
+#Obsoletes: %{name} < %{version}-%{release}
+#Provides:  %{name} = %{version}-%{release}
 Group:   Development/Libraries
 %description devel
-Singular-libfac is an extension to Singular-factory which implements 
-factorization of polynomials over finite fields and algorithms for 
+Singular-libfac is an extension to Singular-factory which implements
+factorization of polynomials over finite fields and algorithms for
 manipulation of polynomial ideals via the characteristic set methods
-(e.g., calculating the characteristic set and the irreducible 
+(e.g., calculating the characteristic set and the irreducible
 characteristic series).
 
 
@@ -43,9 +43,9 @@
 
 
 %build
-%configure --with-NOSTREAMIO 
+%configure --with-NOSTREAMIO
 
-make %{?_smp_mflags} 
+make %{?_smp_mflags}
 
 
 %install
@@ -65,14 +65,19 @@
 %files devel
 %defattr(-,root,root)
 %doc 00README ChangeLog COPYING
-#{_libdir}/lib*.so
-%{_libdir}/lib*.*a
+%{_libdir}/lib*.a
 %{_includedir}/*
 
 
 %changelog
+* Sun May 22 2005 Jeremy Katz  - 2.0.5-3
+- rebuild on all arches
+
+* Fri Apr  7 2005 Michael Schwendt 
+- rebuilt
+
 * Fri Oct 1 2004 Rex Dieter  0:2.0.5-1
-- 2.0.5 
+- 2.0.5
 
 * Mon Nov 17 2003 Rex Dieter  0:2.0.4-0.fdr.3.b
 - update macros



From fedora-extras-commits at redhat.com  Wed Sep  7 12:51:51 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Wed,  7 Sep 2005 08:51:51 -0400
Subject: rpms/libfac/FC-4 libfac.spec,1.8,1.9
Message-ID: <200509071252.j87CqMMR018420@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/libfac/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18381/FC-4

Modified Files:
	libfac.spec 
Log Message:
cleanup
add %{dist} tag



Index: libfac.spec
===================================================================
RCS file: /cvs/extras/rpms/libfac/FC-4/libfac.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- libfac.spec	23 May 2005 00:00:21 -0000	1.8
+++ libfac.spec	7 Sep 2005 12:51:49 -0000	1.9
@@ -3,14 +3,14 @@
 Summary: Extension to Singular-factory
 Name:    libfac
 Version: 2.0.5
-Release: 3%{?dist_tag}
+Release: 3%{?dist}
 
 License: GPL
 Url:     http://www.mathematik.uni-kl.de/ftp/pub/Math/Singular/Libfac/
 # http://www.mathematik.uni-kl.de/ftp/pub/Math/Singular/Libfac/libfac-2-0-5.tar,gz
 Source:  libfac-2-0-5.tar.gz
 Group:   System Environment/Libraries
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: factory-devel >= 2.0.5
 #BuildRequires: autoconf >= 2.53
@@ -24,8 +24,8 @@
 
 %package devel
 Summary: An extension to Singular-factory
-Obsoletes: %{name} < %{version}-%{release}
-Provides:  %{name} = %{version}-%{release}
+#Obsoletes: %{name} < %{version}-%{release}
+#Provides:  %{name} = %{version}-%{release}
 Group:   Development/Libraries
 %description devel
 Singular-libfac is an extension to Singular-factory which implements
@@ -65,8 +65,7 @@
 %files devel
 %defattr(-,root,root)
 %doc 00README ChangeLog COPYING
-#{_libdir}/lib*.so
-%{_libdir}/lib*.*a
+%{_libdir}/lib*.a
 %{_includedir}/*
 
 



From fedora-extras-commits at redhat.com  Wed Sep  7 13:09:32 2005
From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields))
Date: Wed,  7 Sep 2005 09:09:32 -0400
Subject: web/html/docs/jargon-buster/stylesheet-images - New directory
Message-ID: <200509071309.j87D9W1p019779@cvs-int.fedora.redhat.com>

Author: pfrields

Update of /cvs/fedora/web/html/docs/jargon-buster/stylesheet-images
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19765/stylesheet-images

Log Message:
Directory /cvs/fedora/web/html/docs/jargon-buster/stylesheet-images added to the repository




From fedora-extras-commits at redhat.com  Wed Sep  7 13:10:44 2005
From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields))
Date: Wed,  7 Sep 2005 09:10:44 -0400
Subject: web/html/docs/jargon-buster fedora.css, NONE, 1.1 rv-revhistory.php,
	NONE, 1.1 fedora-glossary.php, 1.1.1.1, 1.2 index.php, 1.1.1.1,
	1.2 ln-legalnotice.php, 1.1.1.1, 1.2
Message-ID: <200509071310.j87DAiJV019852@cvs-int.fedora.redhat.com>

Author: pfrields

Update of /cvs/fedora/web/html/docs/jargon-buster
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19796

Modified Files:
	fedora-glossary.php index.php ln-legalnotice.php 
Added Files:
	fedora.css rv-revhistory.php 
Log Message:
New jargon-buster build, updated to 1.9.3


--- NEW FILE fedora.css ---
/*

CSS for Red Hat Linux Project docs from the Documentation Project

Written by Tammy Fox and Garrett LeSage

Copyright 2003 Tammy Fox, Garrett LeSage, and Red Hat, Inc.

License: GPL

*/

li p {
	display: inline;
}

div.table table {
	width: 95%;
	background-color: #DCDCDC; 
	color: #000000;
	border-spacing: 0;
}

div.table table th {
	border: 1px solid #A9A9A9;	
	background-color: #A9A9A9;
	color: #000000;
}

div.table table td {
	border: 1px solid #A9A9A9; 
	background-color: #DCDCDC;
	color: #000000;
	padding: 0.5em;
	margin-bottom: 0.5em;
	margin-top: 2px; 

}

div.note table, div.tip table, div.important table, div.caution table, div.warning table {
	width: 95%;
	border: 2px solid #D0D0B0;
	background-color: #FAF9E0;
	color: #000000;
	/* padding inside table area */
	padding: 0.5em;
	margin-bottom: 0.5em;
	margin-top: 0.5em;
}

.qandaset table {
	border-collapse: collapse;
}
.qandaset {
}
.qandaset tr.question {
}
.qandaset tr.question td {
	font-weight: bold;
	padding: 1em 1em 0;
}
.qandaset tr.answer td {
	padding: 0.25em 1em 1.5em;
}
.qandaset tr.question td, .qandaset tr.answer td {
}

hr {
        border: 0;
        border-bottom: 1px solid #ccc;
}

h1, h2, h3, h4 {
        font-family: luxi sans,sans-serif;
	color: #22437f;
	font-weight: bold;
}
h1 {
        font-size: 1.75em;
}
      
h2 {
        font-size: 1.25em;
}

h3 {
        font-size: 1.1em;
}

a:link {
        color: #900;
}
a:visited {
        color: #48468f;
}
a:hover {
        color: #f20;
}

code.screen, pre.screen {
	font-family: monospace;
	font-size: 1em;
	display: block;
	padding: 10px;
	border: 1px solid #bbb;
	background-color: #eee;
	color: #000;
	overflow: auto;
	border-radius: 2.5px;
	-moz-border-radius: 2.5px;
	margin: 0.5em 2em;
}

div.example {
	padding: 10px;
        border: 1px solid #bbb;
	margin: 0.5em 2em;
}

.procedure ol li {
        margin-bottom: 0.5em;
}
.procedure ol li li {
	/* prevent inheritance */
	margin-bottom: 0em;
}

.itemizedlist ul li {
	margin-bottom: 0.5em;
}
.itemizedlist ul li li {
	/* prevent inheritance */
	margin-bottom: 0em;
}


***** Error reading new file: [Errno 2] No such file or directory: 'rv-revhistory.php'

Index: fedora-glossary.php
===================================================================
RCS file: /cvs/fedora/web/html/docs/jargon-buster/fedora-glossary.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- fedora-glossary.php	30 Mar 2005 17:47:23 -0000	1.1.1.1
+++ fedora-glossary.php	7 Sep 2005 13:10:42 -0000	1.2
@@ -7,255 +7,539 @@
 
 ?>
 
-
      Glossary
      Prev???
      Glossary
      Jargon Buster
      alsa
      The Advanced Linux Sound Architecture (ALSA) provides audio and MIDI
-  functionality to the Linux operating system.  Refer to alsa-project.org
      Anaconda
      Anaconda is the installation program for Red Hat
-    distributions. During installation, the system's hardware is
-    identified and configured, and the appropriate file systems for
-    the system's architecture are created. Finally, it allows the user
-    to install the operating system software on the
-    system. Optionally, it can upgrade existing Red Hat
-    installations. Anaconda can run in a fully interactive mode (text
-    or graphical), or in a kickstart mode, which is allows the
-    installation to be scripted for unattended operation. Refer to Red Hat 
      apt-get
       Refer to freshrpms.net. APT (Advanced
- Package Tool) is a dependency tool, well known to Debian users since
- it is used by default with their dpkg packages. But apt has been
- ported to work with RPM packages too, by Conectiva, who has now used
- it for some time in their GNU/Linux distribution. The good news is
- that apt for RPM may be used with any other RPM-based
- distribution. All you need is the tool compiled for your version of
- RPM and at least a repository where RPM packages and their apt
- metadata can be downloaded from.  
      ATrpms 
      This is a 3rd party RPM repository for Red Hat Linux
-  distributions. The original focus laid upon software used in natural
-  sciences, especially in the field of high energy physics, e.g. tools
-  for numerical programming or such for scientific publications. But
-  since then this repository has included many non-scientific software
-  titles, like system tools or multimedia packages, resulting in a far
-  more generic repository. Refer to atrpms.physik.fu-berlin.de
      BitTorrent
      An alternative to a simple FTP or HTTP download. Utilizes multiple
-  channels to download. Refer to BitTorrent website
-  
      
-   Duke.edu 
-   This is the tracker for Fedora Core 1 'Yarrow' release. 
-
      Bluecurve™
      An easy-to-navigate interface with intuitively organized
-  menus. Bluecurve has been upgraded in Red Hat Linux 9 and now extends to more areas of
-  the operating system, including the menu and layout of the desktop.
      Bugzilla
      This is the Red Hat bug-tracking system, our database for
-recording bugs in Red Hat products. For more information about the Bugzilla bug tracking system, please refer to the main Bugzilla home page. 
      Core 1
      The Yarrow version of Fedora. Sometimes abbreviated to FC 1 or fc1,
-  Fedora Core 1. 
      See Also Red Hat Linux Names.
      Core 2
      The Tettnang version of Fedora. Sometimes abbreviated to FC 2
-	    or fc2, Fedora Core 2.
      See Also Red Hat Linux Names.
      cron
      A daemon to execute scheduled commands, for example to check
-  email each day at noon.  Cron searches /var/spool/cron for crontab
-  files which are named after accounts in /etc/passwd; 
      CUPS
      The Common UNIX Printing System ("CUPS") is a cross-platform
- printing solution for all UNIX environments. It is based on the
- "Internet Printing Protocol" and provides complete printing services
- to most PostScript and raster printers.Home page. 
      desktop switcher
      The switchdesk-gnome package provides a GNOME look and feel for the
-Desktop Switcher program provided in the switchdesk package.
-
      eth0
      (Normally) the first ethernet port on your system 
      ethtool
      Ethtool is a Linux net driver diagnostic and tuning tool for
- the Linux 2.4.x (or later) series of kernels. It obtains information
- and diagnostics related to media, link status, driver version, PCI
- (or other) bus location, and more.  
      FAQ
      Frequently Asked Questions, for Fedora see fedora.redhat.com
      FDL
      GNU Free Documentation License (FDL), see gnu.org
      FHS - File System Hierarchy Standard
      A collaborative document that defines the names and locations
-  of many files and directories on a Linux system. Worth getting to
-  know if you want to know what should go where.
- Refer to Red Hat
      FreshRPMS
      A source of RPMs.  Matthias Saou, the host,  says: In late 2000, I
-  started building quite a few RPM packages for my own needs, that
-  couldn't easily be found elsewhere, or at least not so well suited
-  for Red Hat Linux. A few months later, the website on which these
-  packages were hosted changed its name to become what people know
-  today. A long time has passed and I still maintain all the packages
-  I used to, and more of course! A whole community of users, testers
-  and contributors has grown around the website and its packages,
-  which is something I really didn't expect but really enjoy. Refer to
-  freshrpms.net
-
      See Also RPM.
      fsck
       fsck is a command line tool used to check and optionally repair Linux file systems.
      fsh
      Remote command execution via a cryptographically strong method such as
-lsh or ssh is often painfully slow, especially if either of the
-involved computers is slow. The biggest problem is that the client and
-the server perform a lot of complex calculations during connection
-establishment.
      fsh uses lsh or ssh to establish a secure tunnel to the remote
-system. This takes as long as a normal connection establishment, but
-once the tunnel is established, fsh can reuse it to start new sessions
-on the remote system almost instantaneously. You get the security of
-ssh and the speed of rsh.
-
      gimp
      The GIMP is the GNU Image Manipulation Program. It is a freely
-  distributed piece of software suitable for such tasks as photo
-  retouching, image composition and image authoring. Refer to gimp.org 
      glibc
      The GNU C library is used as the C library in the GNU system
-  and most newer systems with the Linux kernel. Refer to gnu.org
      GNOME
      The GNOME Project is an effort to create a complete, free and
-  easy-to-use desktop environment for users, as well as a powerful
-  application development framework for software developers.  Refer to
-Home page  
      GPG
      GnuPG is a complete and free replacement for PGP. Because it
-  does not use the patented IDEA algorithm, it can be used without any
-  restrictions. GnuPG is a RFC2440 (OpenPGP) compliant
-  application. Refer to gnupg.org. You may also see
-  RPM-GPG-KEY referenced, which relates to the keys used for checking
-  packages. E.g. see rpmfind 
      GPL & non-GPL  http://www.fsf.org/licenses/gpl-faq.htm
      Gnu General Public Licence. Refer to fsf.org
      GRUB
      GNU GRand Unified Boot loader or GRUB is a program which
- enables the user to select which installed operating system or kernel
- to load at system boot time. It also allows the user to pass
- arguments to the kernel. Refer to Red Hat
      i386
      i386.  The entire x86 line of computers and processors, from
- the Intel 386 forward all the way to Intel Pentium 4 and Athlon
- chips. All those are compatible with i386 instruction sets, the
- "lowest common denominator". Often used as shorthand for the
- distribution set of files meant for this line of computers or
- processors.
- 
      IRC
       IRC (Internet Relay Chat) channel. IRC is a real-time,
-  text-based form of communication. With it, you can have
-  conversations with multiple people in an open channel or chat with
-  someone privately one-on-one.
-
      ISO
      As an acronym, ISO = International Standards Organization. More
-  usefully, an abbreviation for the format of the downloadable version
-  of the CD images, since the ISO defined the CD format.
       ISO standard ISO 9660:1988 entitled "Information processing -- 
-Volume and file structure of CD-ROM for information interchange" does 
-define the order of bits on a CD-ROM and so an image of an ISO 
-9660:1988 compliant media is called an ISO.
-
-For details see iso.org
      KDE
      KDE is a desktop environment for UNIX workstations. KDE seeks to fill
-  the need for an easy to use desktop for Unix workstations, similar to the
-  desktop environments found under Mac OS or Microsoft? Windows?. Refer to the Home page for more
-  information.
      kernel
      The heart of Linux. The main code derived from Linus's
-    original software.
      kickstart
      Many system administrators would prefer to use an automated
-  installation method to install Red Hat Linux on their machines. To
-  answer this need, Red Hat created the kickstart installation
-  method. Using kickstart, a system administrator can create a single
-  file containing the answers to all the questions that would normally
-  be asked during a typical Red Hat Linux installation.  Refer to Red Hat
-  
      Kudzu
      kudzu is the hardware autodetection & configuration tool, originally
-introduced in Red Hat Linux 6.1. It detects changes in the system's
-hardware configuration, and gives the option of configuring
-added or removed devices. It's set up by default to run at
-each boot. fedora.redhat.com
-for more.
- 
      LDAP
      Lightweight Directory Access Protocol
      lilo
      LILO (LInux LOader) is a basic system program which boots your
- Linux system.  LILO loads the Linux kernel from a floppy or a hard
- drive, boots the kernel and passes control of the system to the
- kernel.  LILO can also boot other operating systems.
      LSB
       Linux standard base.  The goal of the LSB is to develop and
- promote a set of standards that will increase compatability among
- Linux distributions linuxbase.org 
      lspci
      lspci is a utility for displaying information about all PCI
-  buses in the system and all devices connected to them.
-
      Mandrake
      Another Linux distribution 
      md5sum
      md5sum computes a 128-bit checksum (or fingerprint or
- message-digest) for each specified file. Refer to gnu.org
- for Linux man pages. Why is it useful? Having downloaded Fedora,
- you'll mostly see a related file MD5SUM which holds some rather
- strange numbers. Run md5sum against the downloaded file or image, and
- you'll see a match if you are lucky, or if you don't get the match,
- you can be assured that the download is somehow faulty, and you need
- to download again, before you burn the CD. 
      For windows, activestate.com 
      Memtest86
      Memory testing may be performed prior to installing Fedora
-Core by entering  memtest86 at the boot: prompt. This causes the Memtest86 standalone memory testing software to run. Memtest86 memory testing continues until the Esc key is pressed.
      Mount point
       Mounting a CD is the equivalent of telling the Operating
-    System that you want to use it.  In Linux the only file system
-    that is automatically mounted is the root file system which is
-    automatically mounted on the root directory. Other file systems
-    (eg. your floppy drive, cd rom drive, windows partitions, and any
-    linux partitions other than root) can be mounted and unmounted as
-    required. In the case of drives used with portable media (such as
-    floppy drives, cd rom drives, and zip drives) it is necessary to
-    unmount the drive before being able to remove the media from the
-    drive.
-
      Mozilla
      Mozilla is an open-source web browser, designed for standards
-  compliance, performance and portability. Refer to Mozilla.org
      Nautilus
      The graphical desktop includes a file manager called Nautilus
-  that gives you a graphical display of your system and personal
-  files. Nautilus is designed to be much more than a visual listing of
-  files, however. It allows you to configure your desktop, configure
-  your Red Hat Linux system, browse your photo collection, access your
-  network resources, and more all from one integrated interface. In
-  essence, Nautilus becomes a shell for your entire desktop
-  experience. redhat
      package
      An alternate name for an RPM. Usually a number of files which
-  together form an application or other usable software
-  entity. Normally meant for installation by a package manager
      See Also RPM, redhat-config-packages.
      pine
      Pine — a Program for Internet News & Email — is a tool
-  for reading, sending, and managing electronic messages (email). Refer to
-  washington.edu 
      Psyche
      The name given to Red Hat Linux 8 
      See Also Red Hat Linux Names.
      Rawhide
      The bleeding edge, Rawhide is where the next version of
- packages are developed and tested. It is usually sort of stable, but
- on any given day any given package MIGHT be badly broken where the
- programmers are trying to add something or change something. Do not
- use on production machines, use at your own risk, etc. 
      Red Hat Linux Names
      Tettnang, Yarrow, Shrike, Psyche, et al.  Names are given to individual
- versions of Red Hat Linux and Fedora Core for reference and easy memory. People often
- forget whether they are using RHL 8.0 (Psyche), RHL 9 (Shrike), or Fedora Core
- 1 (Yarrow), but the names are harder to forget. Note that other operating
- systems do the same thing, including other Linux distros and Microsoft (various
- versions of Windows have been named Chicago, Cairo, etc.).
- 
      RHEL
      Red Hat Enterprise Linux is the premiere operating system for
-  open source computing. It's sold by annual subscription, runs on
-  seven system architectures, is certified by top enterprise software
-  and hardware vendors, and backed by a Red Hat Network subscription
-  and up to 24x7 support with one-hour response. Refer to Red Hat  for
-  more. 
-
-
-
      redhat-config-packages
      redhat-config-packages is the package manager for Red Hat Linux and Fedora Core.
-It supports installation of packages from CD or other sources 
      Red Hat End User Licence Agreement (RHEULA)
      Each of Red Hat software products is covered by an End User License Agreement. Refer to  Red Hat
      rhgb 
      Red Hat Graphical Boot. 
      Fedora Core 1 now uses a graphical interface while booting. The
-graphical boot screen will appear once the kernel has
-loaded. Graphical booting is controlled by the GRAPHICAL line in the
-/etc/sysconfig/init file; set it to "no" to permanently disable
-graphical booting. In addition, the parameter rhgb must be appended to
-your bootloader command line.
      Systems that have been upgraded to Fedora Core 1 will not be
-configured to include the graphical boot feature. You must install the
-rhgb package, and add the rhgb boot-time parameter to your bootloader
-configuration.
-
      RHN
      Red Hat Network
      RHN Applet
      This applet, although called the rhn-applet really has nothing
- to do with RHN in Fedora.  It is really just the convenient mechanism
- for GUI access to up2date. 
      RPM
      Red Hat Package Manager, or nowadays,  RPM Package
-  Manager. 
      
-  The standard way to build and distribute any application for Red Hat Linux, Fedora Core,
-  and other Linux distributions that now use the same format. This
-  includes Mandrake and possibly others of which I might be
-  unaware. RPM is also the name for the application and command with
-  which you install, upgrade, query, or remove an RPM package, and you
-  often refer to a package as "the Apache RPM" meaning the RPM file
-  for that application. Can also check dependencies between installed
-  and new packages.
-
      Rsync
      rsync is an open source utility that provides fast incremental
-  file transfer. Refer to samba.anu.edu
      SELinux
      
-nsa.gov, from which,
-Security-Enhanced Linux. This version of Linux has a strong, flexible mandatory access control architecture incorporated into the major subsystems of the kernel.
-
-  
      Severn
      The beta version of Fedora, closed off early November 2003, severn was the beta version 0.95 
      Shrike
      The name given to Red Hat Linux 9 
      See Also Red Hat Linux Names.
      Sodipodi
      Sodipodi is general vector illustrating application for
-  Linux/Unix and Windows. It uses W3C SVG as native file and in-memory
-  image format and can do many neat things. Refer to Sourceforge
      SRPMs
      Source RPM, contains the source code for the package 
-in case you want to read it or modify it. You do not need any SRPMS to 
-install or use the software.
- 
      See Also RPM.
      Tettnang
      
-	    "Tettnang" is the second release (version 2) of Fedora Core.
-	  
      See Also Red Hat Linux Names, Core 2.
      Up2date
      up2date is a complete system for managing and updating RPM
- packages on Red Hat Linux and Fedora Core system. It has both command line and gui
- modes. Refer to Red Hat
- site for more detail.
      VMware
      A commercial product, VMware?
- Workstation is virtual machine software for the desktop. Optimized for the
- power user, VMware Workstation runs multiple operating systems, including
- Microsoft Windows, Linux, and Novell?
- NetWare?, simultaneously on a single
- PC in fully networked, portable virtual machines.  VMware Workstation works by
- enabling multiple operating systems and their applications to run concurrently
- on a single physical machine. These operating systems and applications are
- isolated in secure virtual machines that co-exist on a single piece of
- hardware. The VMware virtualization layer maps the physical hardware resources
- to the virtual machine's resources, so each virtual machine has its own CPU,
- memory, disks, I/O devices, etc. Virtual machines are the full equivalent of a
- standard x86 machine. Refer to its home
- page  for more information.
      VNC
      VNC stands for Virtual Network Computing. It is remote control
-  software which allows you to view and interact with one computer
-  (the "server") using a simple program (the "viewer") on another
-  computer anywhere on the Internet. Refer to realvnc.com 
      XFS
      XFS is a journalling filesystem developed by SGI and used in
-  SGI's IRIX operating system. It is now also available under GPL for
-  linux. It is extremely scalable, using btrees extensively to support
-  large and/or sparse files, and extremely large directories. The
-  journalling capability means no more waiting for fsck's or worrying
-  about meta-data corruption. Refer to oss.sgi.com
-  
      Ximian
      Provides a modified version of GNOME, which can be installed on a Linux
-  distributions. Warning: After installing Ximian GNOME, it must be uninstalled
-  before upgrading Red Hat Linux or Fedora Core. Refer to the Release
-  Notes for details.
      
-  Ximian had its genesis in the GNOME project and offers a complete
-  Linux desktop environment and productivity application suite. Refer to
-  the home page.
-  The company was founded by some of the GNOME developers as a
-  commercial entity related to GNOME. This led to the development of
-  Evolution and improvement in GNOME. Bought by Novell Aug 2003
-
-
      X Window System
      Possibly a misnomer, though often used to describe the GUI (Window like
-   ) user interface for Linux. Refer to ntlug.org for the
-   rationale.
      Yarrow
      
-    "Severn" was a beta version of Fedora and "yarrow" is the first
-    release version 1, November 6, 2003
-  
      Also, yarrow - ubiquitous strong-scented mat-forming Eurasian
-herb of wasteland, hedgerow or pasture having narrow serrate leaves
-and small usually white florets; widely naturalized in North
-America. Yarrow is also, like Severn, a river in the UK.
-
      See Also Red Hat Linux Names, Core 1.
      Yum
      Yum is an automatic updater and package installer/remover for
- RPM systems. It automatically computes dependencies and figures out
- what actions should occur to install packages. Refer to Duke University
      Prev?Up?
      Fedora Jargon Buster?Home?
      
+
      Glossary
      Prev   
      Glossary
      Jargon Buster
      ALSA
      
+            The Advanced Linux Sound Architecture (ALSA) provides audio
+	    and MIDI functionality to the Linux operating system. Refer
+	    to http://www.alsa-project.org/ for more
+	    information.
+          
      Anaconda
      
+            Anaconda is the installation
+	    program for Fedora Core. During installation,
+	    Anaconda identifies and
+	    configures the system's hardware, and creates appropriate
+	    file systems. Anaconda also
+	    allows the user to install the operating system software on
+	    the system. Optionally, it upgrades existing Red Hat Linux or Fedora
+	    installations. Anaconda runs in a
+	    fully interactive text or graphical mode, or in a
+	    kickstart mode, which allows the
+	    owner or administrator to automate installation for
+	    unattended operation. Refer to http://fedora.redhat.com/projects/anaconda-installer/ 
+	    for more information.
+          
      apt
      
+	    The apt (Advanced Package Tool) utility
+	    is a dependency tool developed for use with Debian Linux
+	    dpkg packages.  The
+	    apt-rpm utility extends
+	    apt for use with RPM packages.  Since
+	    apt has specific problems with
+	    multilib, however, it is not
+	    recommended for use with Fedora systems.  Use yum instead.
+          
      ATrpms
      
+            ATrpms a third party RPM repository for Fedora
+	    distributions. The original focus for ATrpms was software
+	    used in natural sciences, especially in the field of high
+	    energy physics.  The repository included tools for use in
+	    numerical programming and scientific publications. But since
+	    then this repository has included many non-scientific
+	    software titles, like system tools or multimedia packages,
+	    resulting in a far more generic repository. Refer to http://atrpms.physik.fu-berlin.de/ for more
+	    information.
+          
      BitTorrent
      
+            BitTorrent is a peer-to-peer
+            file sharing which downloads from multiple channels at
+            once.  Refer to http://bitconjurer.org/BitTorrent/ for more
+            information.
+          
      
+            Use BitTorrent to download Fedora Core
+            by downloading and opening a torrent file.  The official
+            Fedora Core torrent tracker is located at http://torrent.dulug.duke.edu/.  Download a torrent
+            file there to begin downloading a release of Fedora Core.
+          
      Bluecurve
      
+            Bluecurve™ is a theme which unifies
+            the look and feel of the Fedora desktop.  Bluecurve was
+            introduced in Red Hat Linux 9 and was used as the default for Fedora Core
+            through release 3.  Bluecurve was replaced in Fedora Core 4 by
+            Clearlooks.  Bluecurve included
+            icons and settings for the menu and layout of the desktop.
+          
      Bugzilla
      
+            Bugzilla is an online database for recording flaws, or
+            bugs, in Fedora software,
+            documentation, and other projects.  Bugzilla also tracks bugs in
+            Red Hat software.  When you encounter a problem with Fedora, you
+            can help the community fix the problem by making a record in
+            Bugzilla.  This procedure is called "entering a bug."  For more
+            information about Bugzilla, refer to http://bugzilla.redhat.com/.
+          
      Clearlooks
      
+	    Clearlooks is the default theme for a GNOME desktop
+	    environment in Fedora Core 4.  The Clearlooks design is based on
+	    the original Bluecurve.
+	  
      Core
      
+	    Core is a numbered release of a subset of Fedora software,
+	    and is usually called "Fedora Core."  Core packages are maintained
+	    mainly by employees of Red Hat, and are made up of free and
+	    open source software produced by the Linux community.
+	  
      
+	    Although the software in Fedora Core is updated regularly, the
+	    original release of Fedora Core does not change.  For this reason,
+	    when users discuss the state of their Fedora system software,
+	    they might refer to "Fedora Core plus updates."  When you request
+	    help from the community, this terminology is the most
+	    accurate.  However, many users simply call the updated
+	    system "Fedora Core."
+          
      CPU
      
+	    The Central Processing Unit, or CPU, is
+	    the "brain" of a computer.  The rest of the computer is
+	    organized around the CPU, so people often refer to computer
+	    systems by the type of processor inside.  Examples of CPUs
+	    include Pentium-4, Athlon64, and PowerPC.
+	  
      cron
      
+            The cron system executes automatic jobs
+	    on behalf of the system or an individual user on a schedule.
+	    An example of a system cron job might
+	    include running yum nightly to update
+	    the system.
+          
      CUPS
      
+            The Common UNIX Printing System, or CUPS,
+	    is a cross-platform printing solution for all UNIX-type
+	    environments, including Linux and Macintosh OS X.  It is
+	    based on the Internet Printing Protocol and provides
+	    complete printing services to most printers.  CUPS drivers
+	    are available at http://www.cups.org/windows/
+	    which allow Windows systems to use printers shared from
+	    Linux systems.  Refer to http://www.cups.org/
+	    for more information about CUPS.
+          
      Desktop Switcher
      
+            The Desktop Switcher tool allows
+	    a user to convert the Fedora desktop between GNOME and KDE.  To
+	    run the Desktop Switcher tool
+	    from the Main Menu, select
+	    Desktop->Preferences->More
+	    Preferences->Desktop
+	    Switcher.  If you do not see this
+	    item in your menu, you may not have the
+	    switchdesk-gui package installed. Refer
+	    to http://fedora.redhat.com/docs/ to learn how to use yum to install software packages.
+	  
      eth0
      
+	    The eth0 name represents the first
+	    discovered Ethernet interface in a
+	    Fedora system.  If your Fedora system has more than one such
+	    interface, the others will be numbered
+	    eth1,
+	    eth2, and so on.
+	  
      Ethernet
      
+            Ethernet is the most common type of network technology for
+            small computer networks.
+          
      ethtool
      
+            The ethtool utility is a Linux network
+            driver diagnostic and tuning tool for a Linux 2.4 or later
+            kernel.  The
+            ethtool utility obtains information and
+            diagnostics related to media, link status, driver version,
+            bus location, and more.
+          
      ext3
      
+	    The ext3 file system is a method of
+	    organizing data on storage devices.  It is based on the
+	    older but still vital ext2 Linux
+	    file system.  Most users do not need to understand file
+	    system internals because Linux translates this system into
+	    understandable concepts such as files and folders.  Refer to
+	    http://e2fsprogs.sourceforge.net/, however,
+	    for more information on ext2 and
+	    ext3.
+	  
      FAQ
      
+            A FAQ is a list of Frequently Asked
+            Questions.  Refer to http://fedora.redhat.com/about/faq/ for a FAQ about
+            the Fedora Project.  Refer to http://fedorafaq.org/ for a FAQ about using Fedora.
+          
      FDL
      
+            The GNU Free Documentation License (FDL)
+	    is a means of ensuring freedom for program documentation.
+	    The Fedora Documentation Project uses the FDL for its official documentation.  In
+	    fact, this document is licensed through the FDL.  As is the
+	    case with all freedoms, the FDL carries both rights and
+	    responsibilities.  You have the right to modify and
+	    redistribute FDL materials, or create other works based on
+	    them.  You then have the responsibility of licensing any
+	    such material under the FDL as well.  In this fashion the
+	    FDL guarantees that documentation cannot be made less free
+	    by a recipient.
+          
      FHS
      
+            The File Hierarchy Standard, or FHS, is a
+            collaborative document that defines the names and locations
+            of many files and directories on a Linux system.  The FHS
+            also sets standards for the types of files that should
+            inhabit specific system directories.  Refer to http://www.pathname.com/fhs/ for more information
+            about the FHS.
+          
      FreshRPMS
      
+            A third-party repository of RPM
+            software packages.  FreshRPMS is soon to be subsumed into
+            the larger RPMForge repository.  Refer to http://www.freshrpms.net/ for more information.
+          
      fsck
      
+            The fsck utility is a command line tool
+	    used to check and repair file systems.  It is normally used
+	    with Linux file systems such as ext3, but also has the ability to make
+	    repairs on some Windows file systems.
+          
      fsh
      
+            Remote command execution via a cryptographically strong
+	    method such as lsh or
+	    ssh is often slow, especially if either
+	    of the involved computers is slow.  The process is slow
+	    because the client and the server must perform a series of
+	    complex calculations during connection establishment.
+          
      
+            The fsh utility uses
+	    lsh or ssh to
+	    establish a secure tunnel to the remote system. This process
+	    takes as long as a normal connection establishment.  Once
+	    the tunnel is established, however, fsh
+	    reuses it to start new sessions on the remote system almost
+	    instantaneously.  With this process, fsh
+	    combines the security of ssh and the speed of rsh.
+          
      GIMP
      
+            The GIMP is the GNU Image Manipulation Program. The GIMP is
+	    graphics software suitable for such tasks as photo
+	    retouching, image composition and image authoring. The GIMP
+	    will read and write graphics files in a variety of formats,
+	    including JPG, PNG, BMP, GIF.  It will also import some
+	    proprietary image formats from other graphics programs.
+	    Refer to http://www.gimp.org/ for more
+	    information about the GIMP.
+          
      glibc
      
+            The GNU C library, or glibc, is
+            used as the C library in Fedora.  Most software programs for
+            your Fedora system rely on glibc for
+            basic common functions.  Refer to http://www.gnu.org/software/libc/libc.html for more
+            information about glibc.
+          
      GNOME
      
+            GNOME is the short name for the GNOME
+	    Desktop, a product of the GNOME Project.  GNOME is a
+	    complete, free and easy-to-use desktop environment for
+	    UNIX-like operating systems such as Fedora.  It is also a
+	    powerful application development framework for software
+	    developers.  GNOME provides a complete set of human
+	    interface guidelines, which means that GNOME strives to have
+	    a consistent look and feel for all its applications.  Read
+	    more about GNOME at http://www.gnome.org/.
+          
      GNU
      
+	    GNU is an acronym that stands for "GNU's
+	    Not UNIX," and is pronounced "guh-NOO."  GNU was originally
+	    intended to be a complete UNIX-like operating system.  It
+	    has become a broader term describing free software licensed
+	    under the GPL.  Because the kernel and much of the other software in a
+	    Linux system are licensed under the GPL, many people call that system
+	    GNU/Linux.
+	  
      GnuPG (GPG)
      
+            GnuPG, the GNU Privacy Guard, is a complete and free
+            replacement for PGP, Pretty Good Privacy.  GnuPG software
+            allows you to digitally sign or encrypt data using public
+            key encryption methods.  GnuPG is OpenPGP compliant, so data
+            signed or encrypted by GnuPG can be exchanged with almost
+            any computer user.  Refer to http://www.gnupg.org/ for more information about
+            GPG.
+          
      GPL
      
+            The GNU General Public Licence, or GPL,
+            is a software license designed to preserve users' rights to
+            share and modify software.  The GPL does this by restricting
+            anyone from denying you those rights.  Use of software is
+            usually subject to the terms under which it is licensed.
+            Many software licenses restrict you from copying, sharing,
+            or even examining the software they cover.  The terms of the
+            GPL, however, allow you very broad rights to share, modify,
+            and redistribute software.  In return the GPL requires you
+            to give others those rights if you share the results.  The
+            GPL encourages software programmers to learn and contribute
+            to each other's work.  Refer to http://www.fsf.org/licenses/licenses/gpl.html for
+            more information about the GPL.  For a FAQ about the GPL, refer to http://www.fsf.org/licensing/licenses/gpl-faq.html.
+          
      GRUB
      
+            The GNU GRand Unified Boot Loader,
+	    or GRUB, is a program which enables the
+	    user to select an operating system or kernel to boot. It
+	    also allows the user to pass arguments to the kernel. Refer
+	    to http://www.gnu.org/software/grub/ for more
+	    information about GRUB.
+          
      i386
      
+            The entire set of computer processors that are compatible
+            with the Intel x86 platform, including Intel Pentium and
+            Celeron, AMD Athlon and Duron, and VIA C3 CPUs, are commonly referred to as
+            i386.  The
+            i386 term is often used as
+            shorthand for the distribution set of files meant for this
+            line of computers or processors.
+          
      IM
      
+	    Instant messaging, or IM, is a real-time,
+	    text-based form of communication.  You can use IM to have
+	    conversations with individuals or groups.  America Online, an
+	    Internet service provider, popularized IM in the 1990's, but
+	    many other providers such as Yahoo and Google offer similar
+	    services.  Fedora has programs such as
+	    gaim that allow you to use IM to
+	    communicate with other Internet users.
+	  
      Inkscape
      
+	    Inkscape is a vector graphics illustration program.  It uses
+	    SVG as the default file format.  For more information about
+	    Inkscape, refer to http://www.inkscape.org/.
+	  
      See Also Sodipodi.
      IRC
      
+            Internet Relay Chat, or IRC, is a
+            real-time, text-based form of communication.  You can use
+            IRC to have conversations with individuals or groups.  IRC
+            is very similar to IM, and offers
+            many of the same capabilities, but predates IM by many
+            years.
+          
      ISO
      
+            ISO is an acronym that stands for
+            International Standards Organization.  It is also used as an
+            abbreviation for the ISO-9660 format of a standard data
+            CD-ROM.  Fedora offers installation CDs for Fedora Core as
+            downloadable files on the Internet, in the form of CD image
+            files sometimes called ISO files.  These files can be burned
+            directly to CD media using a CD-Recordable drive, and the
+            resulting CD will contain all the files on the original Fedora Core
+            media.
+          
      KDE
      
+            KDE is a free and open desktop environment for UNIX-like
+            operating systems such as Fedora.  KDE also offers a complete
+            development framework for writing graphical applications, as
+            well as an office application suite.  Refer to http://www.kde.org/whatiskde/ for more information
+            about KDE.
+          
      kernel
      
+            A kernel is the core of an operating system, responsible for
+            managing memory and conducting hardware operations.  The
+            Linux kernel used in Fedora is free and open source software,
+            originally written by Linux Torvalds.  Many computer
+            scientists and programmers from around the world now
+            contribute to its development.
+          
      kickstart
      
+            Many system administrators prefer to use an automated
+	    installation method to install Fedora on their machines. With
+	    kickstart, a system administrator can create a single file
+	    containing answers to all the questions asked during a Fedora
+	    installation.  Refer to http://fedoraproject.org/wiki/Anaconda for more
+	    information about kickstart.
+          
      kudzu
      
+            The kudzu utility usually runs at boot
+	    time. The kudzu utility detects changes
+	    in the system's hardware configuration, and configures the
+	    devices for use with Fedora software.  Refer to http://fedora.redhat.com/projects/additional-projects/kudzu/
+	    for more information about kudzu.
+          
      LDAP
      
+            The Lightweight Directory Access Protocol, or
+            LDAP, is a standard for hierarchically
+            organizing and accessing collections of information.  This
+            information may be practically anything, but LDAP is most
+            often used to collect information about organizations,
+            including personnel and resource information.  Fedora
+            includes support for OpenLDAP, which is a free and open
+            source implementation of LDAP.  For more information about
+            OpenLDAP, refer to http://www.openldap.org/.
+          
      LILO
      
+            The LInux LOader, or LILO, is a basic
+            system program which boots your Linux system. LILO loads the
+            Linux kernel from a floppy or a hard drive, boots the kernel
+            and passes control of the system to the kernel. LILO can
+            also boot other operating systems.  LILO has been superseded
+            by GRUB in Fedora.
+          
      LSB
      
+            The Linux Standard Base, or LSB, is a
+            project that develops and promotes a set of standards to
+            increase compatibility among Linux distributions.  For more
+            information about LSB, refer to http://www.linuxbase.org/.
+          
      lspci
      
+            The lspci utility displays information
+            about all PCI buses in the system and all devices connected
+            to them.  It is frequently used to diagnose problems with
+            hardware recognition or driver compatibility.
+          
      md5sum
      
+            The md5sum utility computes a 128-bit
+            message digest hash value for any specified files.  A hash
+            value is a "fingerprint" for a given file, created by a
+            computation that makes it very unlikely that any two files
+            will create the same hash value.
+	  
      
+            Download mirrors for Fedora Core ISO image
+            files also include a related MD5SUMS file which contains the
+            hash values for the ISO files.  Run
+            md5sum against the downloaded files to
+            verify the hash value.  If a file's hash value does not
+            match, you should not use that file to burn a CD.  Try
+            downloading the file again.
+          
      
+	    To download an MD5 hash program for Windows operating
+	    systems, refer to http://unxutils.sourceforge.net/.
+          
      memtest86
      
+            The Fedora Core Installation CD 1 includes a memory testing utility
+            called memtest86.  To perform memory
+            testing before you install Fedora Core, or to diagnose a RAM
+            problem, enter memtest86 at the
+            boot: prompt. The tests continue until you
+            press the Esc key.
+          
      mirror
      
+	    A mirror is a complete copy of an online resource.  System
+	    administrators of computers connected to the Internet often
+	    create and provide mirrors for public use.  If a resource
+	    has one or more mirrors, many more users can access its
+	    content without overloading the original resource.
+	  
      mount
      
+            To use a disk device such as a CD, USB drive, or floppy
+            diskette, you must first mount it.  Fedora
+            uses a single unified file system for all attached devices.
+            Windows systems, on the other hand, use a "drive letter" for
+            each disk device, such as A: or
+            C:.  When you
+            mount a disk device, its file system
+            becomes part of the unified file system on Fedora.  The
+            device is mounted on a mount point,
+            which is a directory that points to that device, such as
+            /media/floppy.  You must also unmount
+            the file system before you eject or remove the disk, to
+            insure all file information is safely written to the device.
+          
      
+	    Since these functions are often handled through
+	    user-friendly helpers, you may perform all mounting,
+	    unmounting, and file browsing through the graphical desktop
+	    interface.  For instance, if you use the GNOME Desktop, the Nautilus file management utility makes it
+	    easy to perform these tasks.
+	  
      Mozilla
      
+            The Mozilla Project produces several user applications such
+            as the Firefox web browser and the Thunderbird email client.
+            These programs are designed for standards compliance,
+            performance and portability. For more information about
+            Mozilla software, refer to http://www.mozilla.org/.
+          
      Nautilus
      
+            The GNOME desktop environment
+	    includes a file manager called Nautilus which provides a
+	    graphical display of your system and personal files.
+	    Nautilus also allows you to configure your desktop and
+	    Fedora, browse your photo collection, access your network
+	    resources, and more, all from an integrated interface. In
+	    essence, Nautilus becomes a shell for your entire desktop
+	    experience.  Insert link to Nautilus
+	    resource here.
+          
      package
      
+            Users often refer to a RPM file as a
+            package.
+	  
      See Also RPM.
      Pine
      
+            Pine, short for a Program for Internet
+            News and Email, is a tool for reading, sending, and managing
+            electronic messages. Refer to http://www.washington.edu/pine/ for more information
+            about Pine.
+          
      Rawhide
      
+            Rawhide is a package repository which contains the latest
+	    development versions of packages which will eventually be
+	    included in Fedora.  These latest versions are sometimes
+	    called "bleeding edge" package, since they often
+	    include new and untested technology.  You should consider
+	    the Rawhide repository "unstable," since any Rawhide package
+	    might be badly broken if the
+	    programmers are trying to add, change, or test features.  If
+	    you want to develop programs for Fedora, you may want to
+	    install a system from Rawhide.  If you only want to use a
+	    stable Fedora system, you should use the standard Fedora Core
+	    distribution instead.
+          
      RHEL
      
+            Red Hat Enterprise Linux, or Red Hat Enterprise Linux, is
+            the premiere operating system for open source computing.
+            Red Hat Enterprise Linux runs on many system architectures, is certified by
+            top enterprise software and hardware vendors, and is backed
+            by a Red Hat Network subscription and up to 24x7 support with one-hour
+            response.  Refer to http://www.redhat.com/software/rhel/ for more
+            information about Red Hat Enterprise Linux.
+          
      redhat-config-packages
      
+            The redhat-config-packages
+            utility is a package installation for new Fedora Core systems which
+            have no software updates installed yet.  Since most
+            administrators and users update their system software
+            regularly, redhat-config-packages
+            is not often used.  Users should instead use the yum utility to install new software.
+          
      rhgb
      
+            Red Hat Graphical Boot, or
+            rhgb, is an
+            optional component of the boot process.  The
+            rhgb application produces a boot
+            screen with a progress bar and fewer technical messages.
+            The rhgb application allows you
+            to click a link to see the technical boot messages if
+            desired.  Systems that have been upgraded from Red Hat Linux to Fedora Core
+            are not configured to include
+            rhgb.
+          
      RHN Applet
      
+            The rhn-applet utility was
+            originally designed for use with Red Hat Enterprise Linux and Red Hat Network.
+            It provides a notification and user interface for system
+            updates using up2date.  It allows
+            the user to retrieve and install system updates, but this
+            usage is no longer recommended.  Users should use yum for system updates instead.
+          
      RPM
      
+            RPM stands for RPM Package Manager.  RPM
+            is a robust database system for maintaining software on
+            Fedora systems.  Software packaged for Fedora is distributed
+            in special package files called RPM files, or RPMs.  System
+            owners use the rpm utility to query the
+            RPM database for information about installed software.
+            Although some administrators use rpm to
+            install, update, and remove software, it is recommended that
+            you use yum for these purposes.
+          
      rsync
      
+            The rsync provides fast incremental file
+            transfers.  Administrators frequently use
+            rsync to create a mirror of an online resource.  Refer to
+            http://samba.anu.edu.au/rsync/ for more
+            information about rsync.
+          
      SELinux
      
+	    SELinux is a set of extensions to the Linux kernel that provide extremely strong
+            security.  SELinux is based on role definitions, and allows
+            very granular control over access to system resources based
+            on those roles.  These security measures limit the risk
+            associated with computer intrusions by unauthorized persons.
+            For more information about SELinux, refer to http://www.nsa.gov/selinux/ and http://fedora.redhat.com/docs/selinux-faq.
+          
      Sodipodi
      
+            Sodipodi is a vector graphics illustration application. It
+            uses W3C SVG as its default format. Refer to http://sourceforge.net/projects/sodipodi/ for more
+            information.
+          
      See Also Inkscape.
      SRPM
      
+            A source RPM, or
+            SRPM, contains the source code for a
+            RPM package.  If you want to read or
+            modify a program's source, use its SRPM. You do not need any
+            SRPMs to install or use software.
+          
      See Also RPM.
      up2date
      
+            The up2date application is a
+            complete system for managing and updating software on Red Hat Enterprise Linux
+            and Fedora systems. It has both command line and gui
+            modes. The up2date application is
+            no longer recommended for software management, since it has
+            been superseded by yum.  Refer to http://fedora.redhat.com/docs/yum/ for more
+            information on managing software on your Fedora system.
+          
      vino
      
+	    The vino utility is a variant of VNC used in Fedora Core 4 and beyond.
+	  
      VNC
      
+            VNC stands for Virtual Network
+            Computing. It is remote control software which allows you to
+            view and interact with another computer over the network.
+            Refer to http://www.realvnc.com/ for more
+            information about VNC.
+          
      XFS
      
+            XFS is a journalling filesystem developed by SGI and used in
+            SGI's IRIX operating system. It is also available for Fedora
+            systems.. It is extremely scalable and has a journalling
+            capability to protect against corruption. Refer to http://oss.sgi.com/projects/xfs/faq.html#whatisxfs
+            for more information about XFS.
+          
      X Window System
      
+            The X Window System, or simply "X," is the underlying
+            technology for GNOME, KDE, and other graphical environments
+            used in Fedora.  X is a network-based system for displaying
+            and communicating graphical input and output.  It is very
+            flexible and is suitable for a wide variety of
+            configurations such as remote desktops and thin-client
+            applications.
+          
      yum
      
+            The Yellow Dog Updater, or yum, is a
+            complete software management utility for RPM-based systems
+            such as Fedora. It automatically determines software
+            requirements, or dependencies, and
+            uses this data to install, update, or remove packages.
+            Refer to http://linux.duke.edu/projects/yum/ for more
+            information about yum.
+          
      Prev   
      Fedora Jargon Buster Home 
      
 
 
 
-
      Fedora Jargon Buster
      ???Next
      Fedora Jargon Buster
      Revision History
      Revision 1.07 Nov 2003DaveP
      Initial Release
       
      Revision 1.18 Nov 2003DaveP
      
-	
      More added from Fedora list.
       
-	
      Revision 1.210 Nov 2003DaveP
      
-	  
      More added from Fedora list.
       
-	
      Revision 1.310 Nov 2003DaveP
      
-	  
      More added from various places (e.g. DV).
       
-	
      Revision 1.410 Nov 2003DaveP
      
-	  
      Added LegalNotice and std ents.
       
-	
      Revision 1.511 Nov 2003DaveP
      
-	  
      More additions from list.
       
-	
      Revision 1.611 Nov 2003DaveP
      
-	  
      More additions from list and A-Z toc. Needs art.xsl
       
-	
      Revision 1.719 Dec 2003DaveP
      
-	  
      Update
       
-	
      Revision 1.830 Jan 2004TammyFox
      
-	  
      Modified to build in fedora-docs module, Red Hat is 2 words,
-	  other edits and corrections
       
-	
      Revision 1.97 Mar 2004DaveP,TammyFox
      
-	  
      Added request for input statement, added KDE and VMware terms
-	  (DaveP); added trademark tags around relevant words in new entries and
-	  modified para on contributing (TammyFox)
      
-	
      Revision 1.930 Sept 2004PaulWFrields,TammyFox
      
-	  
      Added Tettnang.
      
-	
      Glossary
      
-  This document attempts to clarify some of the terms used on various
-  lists, Red Hat pages, and IRC, when talking about Linux, Red Hat Linux
-  versions, releases, etc. Many thanks to the people on the fedora-list
-  at Red Hat for their input.
-
      If you would like a word added to this document, please email the mailing list
-. A list to the subscription page is
-available on the project
-home page. If you find a problem with these terms, file a 
-Bugzilla
-report against the fedora-docs component. There is also a bug reporting link on
-the project page as
-well.
      ???Next
      ???Glossary
      
+
      Fedora Jargon Buster
         Next
      Fedora Jargon Buster
      Dave Pawson
      Tammy Fox
      Paul W. Frields
      Copyright © 2003, 2004, 2005 Dave Pawson, Pa!
 ul W. Frields, Red Hat, Inc.
      Glossary
      
+    This document clarifies some of the terms used on various lists, web
+    pages, and IRC, when talking about Fedora. Many thanks to the people
+    on the fedora-list and at Red Hat for their input.
+  
      [Tip]Reporting Document Errors
      
+    To report an error or omission in this document, file a bug report in Bugzilla
+    at http://bugzilla.redhat.com/.  When you file your bug, select "Fedora Documentation" as the
+    Product, and select the title of this document as
+    the Component.  The version of this document is
+    jargon-buster-1.9.3 (2005-09-07).
+  
      
+    The maintainers of this document will automatically receive your bug report.
+    On behalf of the entire Fedora community, thank you for helping us make
+    improvements.
+  
         Next
         Glossary
      
 
 
      
     Garrett LeSage created the admonition graphics (note, tip, important,
-    caution, and warning). They may be freely redistributed with documentation
+    caution, and warning).
+    Tommy Reynolds  created the callout graphics.
+    They all may be freely redistributed with documentation
     produced for the Fedora Project.
     
      
-    jargon-buster-1.9 (2004-09-30)
+    jargon-buster-1.9.3 (2005-09-07)
   
      
     Red Hat, Red Hat Network, the Red Hat "Shadow Man" logo, RPM, Maximum RPM, the RPM logo, Linux
     Library, PowerTools, Linux Undercover, RHmember, RHmember More, Rough Cuts,



From fedora-extras-commits at redhat.com  Wed Sep  7 13:10:45 2005
From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields))
Date: Wed,  7 Sep 2005 09:10:45 -0400
Subject: web/html/docs/jargon-buster/stylesheet-images 1.png, NONE,
	1.1 10.png, NONE, 1.1 11.png, NONE, 1.1 12.png, NONE,
	1.1 13.png, NONE, 1.1 14.png, NONE, 1.1 15.png, NONE,
	1.1 2.png, NONE, 1.1 3.png, NONE, 1.1 4.png, NONE, 1.1 5.png,
	NONE, 1.1 6.png, NONE, 1.1 7.png, NONE, 1.1 8.png, NONE,
	1.1 9.png, NONE, 1.1 caution.png, NONE, 1.1 important.png,
	NONE, 1.1 note.png, NONE, 1.1 tip.png, NONE, 1.1 warning.png,
	NONE, 1.1
Message-ID: <200509071310.j87DAjj4019859@cvs-int.fedora.redhat.com>

Author: pfrields

Update of /cvs/fedora/web/html/docs/jargon-buster/stylesheet-images
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19796/stylesheet-images

Added Files:
	1.png 10.png 11.png 12.png 13.png 14.png 15.png 2.png 3.png 
	4.png 5.png 6.png 7.png 8.png 9.png caution.png important.png 
	note.png tip.png warning.png 
Log Message:
New jargon-buster build, updated to 1.9.3



From fedora-extras-commits at redhat.com  Wed Sep  7 13:17:41 2005
From: fedora-extras-commits at redhat.com (Mark Cox (mjc))
Date: Wed,  7 Sep 2005 09:17:41 -0400
Subject: fedora-security/audit fc4,1.54,1.55
Message-ID: <200509071317.j87DHfqJ019912@cvs-int.fedora.redhat.com>

Author: mjc

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19887

Modified Files:
	fc4 
Log Message:
Deal with some of the issues over the last couple of days, note that
where a new CVE name comes in which is for an old issue (in this case
an issue fixed in the kernel in 2.6.12) we still list which FEDORA
release fixed it, even though the FEDORA errata came out prior to the
CVE name being issued.



Index: fc4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc4,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- fc4	5 Sep 2005 08:04:04 -0000	1.54
+++ fc4	7 Sep 2005 13:17:38 -0000	1.55
@@ -1,15 +1,24 @@
-Up to date CVE as of CVE email 20050904
-Up to date FC4 as of 20050904
+Up to date CVE as of CVE email 20050906
+Up to date FC4 as of 20050906
 
 ** are items that need attention
 
-2005-2728 ** httpd
+2005-2802 version (kernel, fixed 2.6.12) [since FEDORA-2005-510]
+2005-2801 version (kernel, fixed 2.6.11)
+2005-2800 VULNERABLE (kernel)
+2005-2798 VULNERABLE (openssh, fixed 4.2) #167446
+2005-2797 VULNERABLE (openssh, fixed 4.2) #167443
+2005-2796 backport (squid, fixed after 2.5.STABLE10) [since FEDORA-2005-851]
+2005-2794 backport (squid, fixed after 2.5.STABLE10) [since FEDORA-2005-851]
+2005-2728 VULNERABLE (httpd, fixed 2.0.55-dev) #167104
+2005-2700 VULNERABLE (httpd, fixed 2.0.55-dev) #167196
 2005-2693 backport (cvs) [since FEDORA-2005-790]
 2005-2672 VULNERABLE (lm_sensors) bz#166673
 2005-2666 ** openssh (hmm)
 2005-2558 ignore (mysql) not an issue
 2005-2499 backport (slocate) [since FEDORA-2005-770]
 2005-2496 backport (ntp, fixed 4.2.0b) ...0a-20040617-ntpd_guid.patch
+2005-2494 VULNERABLE (kdebase, fixed after 3.4.2) #166997
 2005-2491 VULNERABLE (python pcre)
 2005-2491 backport (pcre, fixed 6.2) [since FEDORA-2005-803]
 2005-2491 ignore (httpd, pcre uses system pcre)



From fedora-extras-commits at redhat.com  Wed Sep  7 13:29:09 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Wed,  7 Sep 2005 09:29:09 -0400
Subject: rpms/gsview/FC-3 gsview.spec,1.6,1.7
Message-ID: <200509071329.j87DTdWT019983@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/gsview/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19947/FC-3

Modified Files:
	gsview.spec 
Log Message:
fix bugzilla reference



Index: gsview.spec
===================================================================
RCS file: /cvs/extras/rpms/gsview/FC-3/gsview.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gsview.spec	5 Aug 2005 17:15:43 -0000	1.6
+++ gsview.spec	7 Sep 2005 13:29:07 -0000	1.7
@@ -31,7 +31,7 @@
 # default to libgs.so.@@SOMAJOR@@ instead of libgs.so
 Patch2: gsview-4.6-libgs.patch
 # attempt to allow/use ghostscript-8.15 reported value of 81500.
-# http://bugs.redhat.com/159912
+# http://bugzilla.redhat.com/159912
 Patch3: gsview-4.7-dllversion.patch
 # Change Paper default A4 -> Letter
 Patch4: gsview-4.7-letterpaper.patch



From fedora-extras-commits at redhat.com  Wed Sep  7 13:29:09 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Wed,  7 Sep 2005 09:29:09 -0400
Subject: rpms/gsview/FC-4 gsview.spec,1.9,1.10
Message-ID: <200509071329.j87DTdQ7019986@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/gsview/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19947/FC-4

Modified Files:
	gsview.spec 
Log Message:
fix bugzilla reference



Index: gsview.spec
===================================================================
RCS file: /cvs/extras/rpms/gsview/FC-4/gsview.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- gsview.spec	5 Aug 2005 17:14:18 -0000	1.9
+++ gsview.spec	7 Sep 2005 13:29:07 -0000	1.10
@@ -31,7 +31,7 @@
 # default to libgs.so.@@SOMAJOR@@ instead of libgs.so
 Patch2: gsview-4.6-libgs.patch
 # attempt to allow/use ghostscript-8.15 reported value of 81500.
-# http://bugs.redhat.com/159912
+# http://bugzilla.redhat.com/159912
 Patch3: gsview-4.7-dllversion.patch
 # Change Paper default A4 -> Letter
 Patch4: gsview-4.7-letterpaper.patch



From fedora-extras-commits at redhat.com  Wed Sep  7 14:13:32 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Wed,  7 Sep 2005 10:13:32 -0400
Subject: rpms/d4x/devel .cvsignore, 1.4, 1.5 d4x.spec, 1.7, 1.8 sources, 1.4,
	1.5 d4x-2.5.0-fixes.patch, 1.1,
	NONE d4x-2.5.0-ifwithnoexpression.patch, 1.1, NONE
Message-ID: <200509071413.j87EDWMv021441@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/d4x/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21416

Modified Files:
	.cvsignore d4x.spec sources 
Removed Files:
	d4x-2.5.0-fixes.patch d4x-2.5.0-ifwithnoexpression.patch 
Log Message:
Update to 2.5.4.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/d4x/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	9 Nov 2004 02:45:16 -0000	1.4
+++ .cvsignore	7 Sep 2005 14:13:30 -0000	1.5
@@ -1 +1 @@
-d4x-2.5.0final.tar.gz
+d4x-2.5.4.tar.bz2


Index: d4x.spec
===================================================================
RCS file: /cvs/extras/rpms/d4x/devel/d4x.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- d4x.spec	3 May 2005 11:38:05 -0000	1.7
+++ d4x.spec	7 Sep 2005 14:13:30 -0000	1.8
@@ -1,22 +1,17 @@
-# $Id$
-# Authority: matthias
-
 #define pre            rc4
-%define final          final
+#define final          final
 
 Summary: Downloader for X that supports resuming and many other features
 Name: d4x
-Version: 2.5.0
-Release: 5%{?pre:.%{pre}}
+Version: 2.5.4
+Release: 1%{?pre:.%{pre}}%{?dist}
 Group: Applications/Internet
 License: Artistic
 URL: http://www.krasu.ru/soft/chuchelo/
-Source: http://www.krasu.ru/soft/chuchelo/files/d4x-%{version}%{?pre}%{?final}.tar.gz
-Patch0: d4x-2.5.0-ifwithnoexpression.patch
-Patch1: d4x-2.5.0-fixes.patch
+Source: http://www.krasu.ru/soft/chuchelo/files/d4x-%{version}%{?pre}%{?final}.tar.bz2
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: gtk2-devel, glib2-devel >= 2.4.0, gcc-c++, libstdc++-devel
-BuildRequires: libao-devel, esound-devel, desktop-file-utils
+BuildRequires: libao-devel, esound-devel, desktop-file-utils, openssl-devel
 
 %description
 This program lets you download files from the internet using either the ftp
@@ -29,8 +24,6 @@
 
 %prep
 %setup -n %{name}-%{version}%{?pre}%{?final}
-%patch0 -p1
-%patch1 -p1
 
 %build
 %configure
@@ -51,6 +44,10 @@
   --add-category Network \
   share/nt.desktop
 
+# Rename the man page to match the binary name
+%{__mv} %{buildroot}%{_mandir}/man1/nt.1 \
+        %{buildroot}%{_mandir}/man1/d4x.1
+
 
 %clean
 %{__rm} -rf %{buildroot}
@@ -60,14 +57,23 @@
 %defattr(-, root, root, 0755)
 %doc AUTHORS ChangeLog* COPYING NEWS PLANS README TODO
 %doc DOC/FAQ* DOC/THANKS DOC/TROUBLES
+%{_bindir}/d4x
 %{_bindir}/nt
 %{_datadir}/applications/fedora-nt.desktop
 %{_datadir}/d4x/
 %{_datadir}/pixmaps/nt.png
-%{_mandir}/man1/nt.1*
+%{_mandir}/man1/d4x.1*
 
 
 %changelog
+* Wed Sep  7 2005 Matthias Saou  2.5.4-1
+- Update to 2.5.4.
+
+* Fri Sep  2 2005 Matthias Saou  2.5.3-1
+- Update to 2.5.3.
+- Use bz2 source instead of gz.
+- Rename man page from nt to d4x.
+
 * Tue May  3 2005 Matthias Saou  2.5.0-5
 - Added gcc4 patch from Debian.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/d4x/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	9 Nov 2004 02:45:16 -0000	1.4
+++ sources	7 Sep 2005 14:13:30 -0000	1.5
@@ -1 +1 @@
-c2b2f5571c2028dd845563e69a1d55c3  d4x-2.5.0final.tar.gz
+c797a933a8de1503b069b6d2499da727  d4x-2.5.4.tar.bz2


--- d4x-2.5.0-fixes.patch DELETED ---


--- d4x-2.5.0-ifwithnoexpression.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Sep  7 14:14:07 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Wed,  7 Sep 2005 10:14:07 -0400
Subject: rpms/factory/FC-3 factory.spec,1.6,1.7
Message-ID: <200509071414.j87EE78r021542@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/factory/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21495/FC-3

Modified Files:
	factory.spec 
Log Message:
cleanup, sync branches



Index: factory.spec
===================================================================
RCS file: /cvs/extras/rpms/factory/FC-3/factory.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- factory.spec	4 Dec 2004 09:54:42 -0000	1.6
+++ factory.spec	7 Sep 2005 14:14:05 -0000	1.7
@@ -1,19 +1,20 @@
 # $Id$
 
-Summary: A C++ class library for multivariate polynomial data	
-Name:    factory	
-Epoch:	 0
+Summary: C++ class library for multivariate polynomial data
+Name:    factory
 Version: 2.0.5
-Release: 3%{?dist_tag}
-License: GPL	
-Url:   	 http://www.mathematik.uni-kl.de/ftp/pub/Math/Factory
-Source:	 http://www.mathematik.uni-kl.de/ftp/pub/Math/Factory/factory-2-0-5.tar.gz
-Group:   System Environment/Libraries	
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+Release: 6
+
+License: GPL
+URL:     http://www.mathematik.uni-kl.de/ftp/pub/Math/Factory
+Source:  http://www.mathematik.uni-kl.de/ftp/pub/Math/Factory/factory-2-0-5.tar.gz
+Group:   System Environment/Libraries
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Patch1: factory-2.0.5-gcc34.patch
+Patch2: factory-64bit.patch
 
-BuildRequires:	gmp-devel
+BuildRequires: gmp-devel
 
 %description
 Factory is a C++ class library that implements a recursive representation
@@ -21,11 +22,9 @@
 
 
 %package devel
-Summary: %{summary}
+Summary: C++ class library for multivariate polynomial data 
 Group:   Development/Libraries
 Requires: gmp-devel
-Obsoletes: %{name} < %{epoch}:%{version}-%{release}
-Provides:  %{name} = %{epoch}:%{version}-%{release}
 %description devel
 Factory is a C++ class library that implements a recursive representation
 of multivariate polynomial data.
@@ -35,46 +34,48 @@
 %setup -q -n %{name}
 
 %patch1 -p1 -b .gcc34
+%patch2 -p1 -b .64bit
 
 
 %build
 # Macaulay2's build instructions say to use --disable-streamio
-# *not* using --disable-streamio requires patching for gcc3 anyway.
+# *not* using --disable-streamio requires patching for gcc3+ anyway.
 %configure --disable-streamio
 
 # smp broken?
-make 
+make
 
 
 %install
-rm -rf "$RPM_BUILD_ROOT"
+rm -rf $RPM_BUILD_ROOT
 
 # make install DESTDIR fails
 %makeinstall
 
 
 %clean
-rm -rf "$RPM_BUILD_ROOT"
-
+rm -rf $RPM_BUILD_ROOT
 
-# We're waiting on a shared-lib configuration
-%if 0
-%files
-%doc README NEWS ChangeLog
-%{_libdir}/lib*.so.*
-%endif
 
 %files devel
 %defattr(-,root,root)
-%doc README NEWS ChangeLog
-#{_libdir}/lib*.so
-%{_libdir}/lib*.*a
+%doc ChangeLog COPYING NEWS README NEWS
+%{_libdir}/lib*.a
 %{_includedir}/*
 
 
 %changelog
+* Thu May 26 2005 Jeremy Katz  - 2.0.5-6
+- fix build on 64bit arches
+
+* Sun May 22 2005 Jeremy Katz  - 2.0.5-5
+- rebuild on all arches
+
+* Fri Apr  7 2005 Michael Schwendt 
+- rebuilt
+
 * Wed Oct 06 2004 Rex Dieter  0:2.0.5-3
-- (2nd try at) gcc34 patch 
+- (2nd try at) gcc34 patch
 
 * Wed Oct 06 2004 Rex Dieter  0:2.0.5-0.fdr.2
 - gcc34 patch



From fedora-extras-commits at redhat.com  Wed Sep  7 14:14:08 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Wed,  7 Sep 2005 10:14:08 -0400
Subject: rpms/factory/FC-4 factory.spec,1.10,1.11
Message-ID: <200509071414.j87EE8Jv021548@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/factory/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21495/FC-4

Modified Files:
	factory.spec 
Log Message:
cleanup, sync branches



Index: factory.spec
===================================================================
RCS file: /cvs/extras/rpms/factory/FC-4/factory.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- factory.spec	26 May 2005 14:36:37 -0000	1.10
+++ factory.spec	7 Sep 2005 14:14:06 -0000	1.11
@@ -9,7 +9,7 @@
 URL:     http://www.mathematik.uni-kl.de/ftp/pub/Math/Factory
 Source:  http://www.mathematik.uni-kl.de/ftp/pub/Math/Factory/factory-2-0-5.tar.gz
 Group:   System Environment/Libraries
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Patch1: factory-2.0.5-gcc34.patch
 Patch2: factory-64bit.patch
@@ -22,11 +22,9 @@
 
 
 %package devel
-Summary: %{summary}
+Summary: C++ class library for multivariate polynomial data 
 Group:   Development/Libraries
 Requires: gmp-devel
-Obsoletes: %{name} < %{version}-%{release}
-Provides:  %{name} = %{version}-%{release}
 %description devel
 Factory is a C++ class library that implements a recursive representation
 of multivariate polynomial data.
@@ -41,7 +39,7 @@
 
 %build
 # Macaulay2's build instructions say to use --disable-streamio
-# *not* using --disable-streamio requires patching for gcc3 anyway.
+# *not* using --disable-streamio requires patching for gcc3+ anyway.
 %configure --disable-streamio
 
 # smp broken?
@@ -49,28 +47,20 @@
 
 
 %install
-rm -rf "$RPM_BUILD_ROOT"
+rm -rf $RPM_BUILD_ROOT
 
 # make install DESTDIR fails
 %makeinstall
 
 
 %clean
-rm -rf "$RPM_BUILD_ROOT"
+rm -rf $RPM_BUILD_ROOT
 
 
-# We're waiting on a shared-lib configuration
-%if 0
-%files
-%doc README NEWS ChangeLog
-%{_libdir}/lib*.so.*
-%endif
-
 %files devel
 %defattr(-,root,root)
-%doc README NEWS ChangeLog
-#{_libdir}/lib*.so
-%{_libdir}/lib*.*a
+%doc ChangeLog COPYING NEWS README NEWS
+%{_libdir}/lib*.a
 %{_includedir}/*
 
 



From fedora-extras-commits at redhat.com  Wed Sep  7 14:14:08 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Wed,  7 Sep 2005 10:14:08 -0400
Subject: rpms/factory/devel factory.spec, 1.11,
	1.12 factory-2.0.5-gcc34.patch, 1.1, NONE
Message-ID: <200509071414.j87EE8cp021552@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/factory/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21495/devel

Modified Files:
	factory.spec 
Removed Files:
	factory-2.0.5-gcc34.patch 
Log Message:
cleanup, sync branches



Index: factory.spec
===================================================================
RCS file: /cvs/extras/rpms/factory/devel/factory.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- factory.spec	8 Aug 2005 15:53:08 -0000	1.11
+++ factory.spec	7 Sep 2005 14:14:06 -0000	1.12
@@ -22,11 +22,9 @@
 
 
 %package devel
-Summary: %{summary}
+Summary: C++ class library for multivariate polynomial data 
 Group:   Development/Libraries
 Requires: gmp-devel
-#Obsoletes: %{name} < %{version}-%{release}
-#Provides:  %{name} = %{version}-%{release}
 %description devel
 Factory is a C++ class library that implements a recursive representation
 of multivariate polynomial data.
@@ -61,7 +59,7 @@
 
 %files devel
 %defattr(-,root,root)
-%doc README NEWS ChangeLog
+%doc ChangeLog COPYING NEWS README NEWS
 %{_libdir}/lib*.a
 %{_includedir}/*
 


--- factory-2.0.5-gcc34.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Sep  7 14:15:00 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Wed,  7 Sep 2005 10:15:00 -0400
Subject: rpms/factory/devel factory-2.0.5-gcc29.patch, NONE,
	1.1 factory-2.0.5-gcc34.patch, 1.2, 1.3
Message-ID: <200509071415.j87EF0oT021592@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/factory/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21565

Added Files:
	factory-2.0.5-gcc29.patch factory-2.0.5-gcc34.patch 
Log Message:
re-add accidentally removed patches


factory-2.0.5-gcc29.patch:

--- NEW FILE factory-2.0.5-gcc29.patch ---
--- factory/memutil.c.gcc29	2004-02-12 06:50:23.000000000 -0600
+++ factory/memutil.c	2004-10-17 21:54:48.000000000 -0500
@@ -87,13 +87,13 @@
 }
 
 void* reallocBlock ( void* block, size_t oldsize, size_t newsize )
-{
+{ void* dummy;
 #if 1
   char* dum = (char*)block - 4;
   int size = *((int*)dum);
   if (newsize <= size) return block;
 #endif
-  void* dummy = getBlock( newsize );
+  dummy = getBlock( newsize );
   memcpy( dummy, block, newsize < oldsize ? newsize : oldsize );
   freeBlock( block, oldsize );
   return dummy;

factory-2.0.5-gcc34.patch:

Index: factory-2.0.5-gcc34.patch
===================================================================
RCS file: factory-2.0.5-gcc34.patch
diff -N factory-2.0.5-gcc34.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ factory-2.0.5-gcc34.patch	7 Sep 2005 14:14:58 -0000	1.3
@@ -0,0 +1,22 @@
+diff -Nur factory-orig/fac_cantzass.cc factory/fac_cantzass.cc
+--- factory-orig/fac_cantzass.cc	2003-02-14 16:53:27.000000000 +0100
++++ factory/fac_cantzass.cc	2004-10-06 22:17:06.453105368 +0200
+@@ -83,10 +83,14 @@
+             G = distinctDegreeFactorFFGF( i.getItem().factor(), q );
+         for ( j = G; j.hasItem(); ++j ) {
+             if ( numext > 0 ) {
+-                if ( numext == 1 )
+-                    HH = CantorZassenhausFactorExt( j.getItem().factor(), j.getItem().exp(), &qq, AlgExtRandomF( alpha ) );
+-                else
+-                    HH = CantorZassenhausFactorExt( j.getItem().factor(), j.getItem().exp(), &qq, AlgExtRandomF( alpha, beta ) );
++	      if ( numext == 1 ) {
++		    AlgExtRandomF tmpalpha( alpha );
++                    HH = CantorZassenhausFactorExt( j.getItem().factor(), j.getItem().exp(), &qq, tmpalpha );
++	      }
++	      else {
++		    AlgExtRandomF tmpalphabeta( alpha, beta );
++                    HH = CantorZassenhausFactorExt( j.getItem().factor(), j.getItem().exp(), &qq, tmpalphabeta );
++	      }
+             }
+             else  if ( galoisfield )
+                 HH = CantorZassenhausFactorFFGF( j.getItem().factor(), j.getItem().exp(), q, GFRandom() );



From fedora-extras-commits at redhat.com  Wed Sep  7 14:58:32 2005
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Wed,  7 Sep 2005 10:58:32 -0400
Subject: extras-buildsys/utils distro-rebuild.py,NONE,1.1
Message-ID: <200509071458.j87EwWqN022311@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys/utils
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22275/utils

Added Files:
	distro-rebuild.py 
Log Message:
2005-09-07  Dan Williams  

    * utils/distro-rebuild.py
		- Script that takes a directory of SRPMs, finds the
			newest ones, adds a ".1" to their Release, then
			queues them up using plague




--- NEW FILE distro-rebuild.py ---
#!/usr/bin/python
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
# GNU Library General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#
# Copyright 2005 Dan Williams  and Red Hat, Inc.


import os, sys
import rpmUtils
import commands
import shutil
import string

class RebuildException(Exception): pass
class EnqueueException(Exception): pass


def first_is_newer(evr1, evr2):
    rc = rpmUtils.miscutils.compareEVR(evr1, evr2)
    if rc == 0:
        # same
        return True
    elif rc > 0:
        return True
    elif rc < 0:
        return False

def find_newest_srpms(path):
    """ Build up a list of the most recent SRPMs in a directory """
    srpm_dict = {}
    for root, dirs, files in os.walk(path):
        for f in files:
            # match the files to what list they should be in
            if not f.endswith('.src.rpm'):
                continue

            fullfile = os.path.join(root, f)
            ts = rpmUtils.transaction.initReadOnlyTransaction()
            hdr = rpmUtils.miscutils.hdrFromPackage(ts, fullfile)
            name = hdr['name']
            ver_dict = { 'name': name, 'evr': (hdr['epoch'], hdr['version'], hdr['release']), 'file': fullfile }
            if not srpm_dict.has_key(name):
                srpm_dict[name] = ver_dict
            else:
                if first_is_newer(ver_dict['evr'], srpm_dict[name]['evr']):
                    srpm_dict[name] = ver_dict
            del hdr
            del ts

    files_dict = {}
    for name in srpm_dict.keys():
        files_dict[name] = srpm_dict[name]['file']
    del srpm_dict
    return files_dict

def rebuild_srpm(name, f):
    # Create a temp dir
    temp_dir = os.path.join("/tmp", "rebuild", name)
    if not os.path.exists(temp_dir):
        os.makedirs(temp_dir)

    # install the srpm in the temp dir
    src_root = os.path.join(temp_dir, "usr", "src", "redhat")
    if not os.path.exists(src_root):
        os.makedirs(src_root)
    cmd = "/bin/rpm -ihv --root %s %s" % (temp_dir, f)
    (s, o) = commands.getstatusoutput(cmd)
    if s != 0:
        raise RebuildError("Could not install srpm %s: %s" % (f, o))

    # find the specfile
    spec_dir = os.path.join(src_root, "SPECS")
    files = os.listdir(spec_dir)
    specfile = None
    for spec in files:
        if spec.endswith(".spec"):
            specfile = os.path.join(spec_dir, spec)
            break
    if not specfile:
        raise RebuildError("Could not locate specfile in %s." % spec_dir)

    src = open(specfile)
    specfile_new = specfile+".new"
    dst = open(specfile_new, "w")
    found = False
    for line in src:
        if line.startswith("Release:"):
            line = string.strip(line) + ".1\n"
            found = True
        dst.write(line)
    dst.close()
    src.close()

    if not found:
        raise RebuildError("Couldn't find Release line in specfile %s." % specfile)

    os.rename(specfile_new, specfile)

    # rebuild the srpm
    cmd = '/usr/bin/rpmbuild -bs --define "_sourcedir %s/usr/src/redhat/SOURCES" ' \
            ' --define "_srcrpmdir %s" %s' % (temp_dir, temp_dir, specfile)
    (s, o) = commands.getstatusoutput(cmd)
    if s != 0:
        raise RebuildException("Could not rebuild srpm %s: %s" % (f, o))

    new_srpm = None
    for line in o.split("\n"):
        if line.startswith("Wrote:"):
            line.replace("\n", "")
            (garbage, path) = line.split(':')
            new_srpm = path.strip()
            break
    if not new_srpm:
        raise RebuildException("Could not find rebuilt SRPM for %s." % specfile)

    # return the file's path
    return (new_srpm, temp_dir)


def enqueue_new_srpm(rebuilt_srpm, target):
    cmd = "/usr/bin/plague-client build %s %s" % (rebuilt_srpm, target)
    (s, o) = commands.getstatusoutput(cmd)
    if s != 0:
        raise EnqueueException("Enqueue command '%s' failed: '\n%s'" % (cmd, o))


def usage(program):
    print "%s  " % program
    print ""


if __name__ == '__main__':
    if len(sys.argv) < 3:
        usage(sys.argv[0])
        sys.exit(1)

    search_dir = os.path.abspath(sys.argv[1])
    if not os.path.exists(search_dir) or not os.access(search_dir, os.R_OK):
        print "Could not access %s" % search_dir
        sys.exit(1)

    target = sys.argv[2]

    # Build up a list of all SRPMs in the specified directory
    files = find_newest_srpms(search_dir)

    # Rebuild and enqueue the packages
    for name in files.keys():
        f = files[name]
        try:
            (rebuilt_srpm, temp_dir_path) = rebuild_srpm(name, f)
        except RebuildException, e:
            shutil.rmtree(temp_dir_path, ignore_errors=True)
            print "RE: %s (%s)" % (f, e)
            continue

        try:
            enqueue_new_srpm(rebuilt_srpm, target)
        except EnqueueException, e:
            shutil.rmtree(temp_dir_path, ignore_errors=True)
            print "EE: %s (%s)" % (rebuilt_srpm, e)
            continue

        shutil.rmtree(temp_dir_path, ignore_errors=True)
        print "OK: %s" % rebuilt_srpm

    sys.exit(0)




From fedora-extras-commits at redhat.com  Wed Sep  7 14:58:31 2005
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Wed,  7 Sep 2005 10:58:31 -0400
Subject: extras-buildsys ChangeLog,1.115,1.116
Message-ID: <200509071459.j87Ex2Fp022356@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22275

Modified Files:
	ChangeLog 
Log Message:
2005-09-07  Dan Williams  

    * utils/distro-rebuild.py
		- Script that takes a directory of SRPMs, finds the
			newest ones, adds a ".1" to their Release, then
			queues them up using plague




Index: ChangeLog
===================================================================
RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -r1.115 -r1.116
--- ChangeLog	1 Sep 2005 20:36:12 -0000	1.115
+++ ChangeLog	7 Sep 2005 14:58:29 -0000	1.116
@@ -1,3 +1,10 @@
+2005-09-07  Dan Williams  
+
+    * utils/distro-rebuild.py
+		- Script that takes a directory of SRPMs, finds the
+			newest ones, adds a ".1" to their Release, then
+			queues them up using plague
+
 2005-09-01  Dan Williams 
 
     * client/client.py



From fedora-extras-commits at redhat.com  Wed Sep  7 15:28:29 2005
From: fedora-extras-commits at redhat.com (Jeff Gilchrist (jeffg))
Date: Wed,  7 Sep 2005 11:28:29 -0400
Subject: rpms/pbzip2 - New directory
Message-ID: <200509071528.j87FSTwe023903@cvs-int.fedora.redhat.com>

Author: jeffg

Update of /cvs/extras/rpms/pbzip2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23883/pbzip2

Log Message:
Directory /cvs/extras/rpms/pbzip2 added to the repository




From fedora-extras-commits at redhat.com  Wed Sep  7 15:28:30 2005
From: fedora-extras-commits at redhat.com (Jeff Gilchrist (jeffg))
Date: Wed,  7 Sep 2005 11:28:30 -0400
Subject: rpms/pbzip2/devel - New directory
Message-ID: <200509071528.j87FSUGK023908@cvs-int.fedora.redhat.com>

Author: jeffg

Update of /cvs/extras/rpms/pbzip2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23883/pbzip2/devel

Log Message:
Directory /cvs/extras/rpms/pbzip2/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Sep  7 15:28:43 2005
From: fedora-extras-commits at redhat.com (Jeff Gilchrist (jeffg))
Date: Wed,  7 Sep 2005 11:28:43 -0400
Subject: rpms/pbzip2 Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200509071528.j87FShPf023963@cvs-int.fedora.redhat.com>

Author: jeffg

Update of /cvs/extras/rpms/pbzip2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23928

Added Files:
	Makefile import.log 
Log Message:
Setup of module pbzip2


--- NEW FILE Makefile ---
# Top level Makefile for module pbzip2
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Wed Sep  7 15:28:43 2005
From: fedora-extras-commits at redhat.com (Jeff Gilchrist (jeffg))
Date: Wed,  7 Sep 2005 11:28:43 -0400
Subject: rpms/pbzip2/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200509071528.j87FShco023968@cvs-int.fedora.redhat.com>

Author: jeffg

Update of /cvs/extras/rpms/pbzip2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23928/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module pbzip2


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Wed Sep  7 15:29:00 2005
From: fedora-extras-commits at redhat.com (Jeff Gilchrist (jeffg))
Date: Wed,  7 Sep 2005 11:29:00 -0400
Subject: rpms/pbzip2 import.log,1.1,1.2
Message-ID: <200509071529.j87FTUZ8024034@cvs-int.fedora.redhat.com>

Author: jeffg

Update of /cvs/extras/rpms/pbzip2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23996

Modified Files:
	import.log 
Log Message:
auto-import pbzip2-0.9.4-2 on branch devel from pbzip2-0.9.4-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/pbzip2/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	7 Sep 2005 15:28:41 -0000	1.1
+++ import.log	7 Sep 2005 15:28:58 -0000	1.2
@@ -0,0 +1 @@
+pbzip2-0_9_4-2:HEAD:pbzip2-0.9.4-2.src.rpm:1126106956



From fedora-extras-commits at redhat.com  Wed Sep  7 15:29:00 2005
From: fedora-extras-commits at redhat.com (Jeff Gilchrist (jeffg))
Date: Wed,  7 Sep 2005 11:29:00 -0400
Subject: rpms/pbzip2/devel pbzip2.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200509071529.j87FTVGL024038@cvs-int.fedora.redhat.com>

Author: jeffg

Update of /cvs/extras/rpms/pbzip2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23996/devel

Modified Files:
	.cvsignore sources 
Added Files:
	pbzip2.spec 
Log Message:
auto-import pbzip2-0.9.4-2 on branch devel from pbzip2-0.9.4-2.src.rpm


--- NEW FILE pbzip2.spec ---
Name:		pbzip2
Version:	0.9.4
Release:	2%{?dist}
Summary:	Parallel implementation of bzip2
URL:		http://www.compression.ca/pbzip2/
License:	BSD
Group:		Applications/File
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:	bzip2-devel
Source0:	http://www.compression.ca/pbzip2/%{name}-%{version}.tar.gz

%description
PBZIP2 is a parallel implementation of the bzip2 block-sorting file
compressor that uses pthreads and achieves near-linear speedup on SMP
machines.  The output of this version is fully compatible with bzip2
v1.0.2 (ie: anything compressed with pbzip2 can be decompressed with
bzip2).


%prep
%setup -q


%build
make


%install
rm -rf %{buildroot}
install -D -m755 %{name} %{buildroot}%{_bindir}/%{name}
install -D -m644 %{name}.1 %{buildroot}%{_mandir}/man1/%{name}.1


%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root)
%doc AUTHORS ChangeLog COPYING README
%{_bindir}/%{name}
%{_mandir}/man1/*


%changelog
* Wed Aug 31 2005 Jeff Gilchrist  - 0.9.4-2
- Release 0.9.4-2

* Tue Aug 30 2005 Jeff Gilchrist  - 0.9.4-1
- Updated RPM spec with suggestions from Oliver Falk

* Fri Jul 29 2005 Bryan Stillwell  - 0.9.3-1
- Release 0.9.3
- Removed non-packaging changelog info
- Added dist macro to release field
- Clean buildroot at the beginning of the install section
- Modified buildroot tag to match with Fedora PackagingGuidelines
- Shortened Requires and BuildRequires list
- Changed description to match with the Debian package

* Sat Mar 12 2005 Jeff Gilchrist  - 0.9.2-1
- Release 0.9.2

* Sat Jan 29 2005 Jeff Gilchrist  - 0.9.1-1
- Release 0.9.1

* Sun Jan 24 2005 Jeff Gilchrist  - 0.9-1
- Release 0.9

* Sun Jan 9 2005 Jeff Gilchrist  - 0.8.3-1
- Release 0.8.3

* Mon Nov 30 2004 Jeff Gilchrist  - 0.8.2-1
- Release 0.8.2

* Sat Nov 27 2004 Jeff Gilchrist  - 0.8.1-1
- Release 0.8.1

* Thu Oct 28 2004 Bryan Stillwell  - 0.8-1
- Initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pbzip2/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	7 Sep 2005 15:28:41 -0000	1.1
+++ .cvsignore	7 Sep 2005 15:28:58 -0000	1.2
@@ -0,0 +1 @@
+pbzip2-0.9.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pbzip2/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	7 Sep 2005 15:28:41 -0000	1.1
+++ sources	7 Sep 2005 15:28:58 -0000	1.2
@@ -0,0 +1 @@
+54d4125b788f5fe7990917256326f844  pbzip2-0.9.4.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep  7 15:34:48 2005
From: fedora-extras-commits at redhat.com (Jeff Gilchrist (jeffg))
Date: Wed,  7 Sep 2005 11:34:48 -0400
Subject: owners owners.list,1.174,1.175
Message-ID: <200509071534.j87FYm9p024114@cvs-int.fedora.redhat.com>

Author: jeffg

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24095

Modified Files:
	owners.list 
Log Message:
Updated file to add new pbzip2 package



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.174
retrieving revision 1.175
diff -u -r1.174 -r1.175
--- owners.list	7 Sep 2005 10:23:58 -0000	1.174
+++ owners.list	7 Sep 2005 15:34:46 -0000	1.175
@@ -548,6 +548,7 @@
 Fedora Extras|pam_ssh|PAM module for use with SSH keys and ssh-agent|pertusus at free.fr|extras-qa at fedoraproject.org|dmitry at butskoy.name
 Fedora Extras|pan|A GNOME/GTK+ news reader for X|mpeters at mac.com|extras-qa at fedoraproject.org|
 Fedora Extras|parchive|Parity archive command line client|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|pbzip2|Parallel implementation of the bzip2 block-sorting file compressor|jeff.gilchrist at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|pcsc-lite|PC/SC Lite smart card framework and applications|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|pcsc-perl|Perl interface to the PC/SC smart card library|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|pdfjam|Utilities for join, rotate and align PDFs|jpo at di.uminho.pt|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Wed Sep  7 17:58:04 2005
From: fedora-extras-commits at redhat.com (Paul P Komkoff Jr (stingray))
Date: Wed,  7 Sep 2005 13:58:04 -0400
Subject: rpms/flow-tools - New directory
Message-ID: <200509071758.j87Hw4uc027560@cvs-int.fedora.redhat.com>

Author: stingray

Update of /cvs/extras/rpms/flow-tools
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27536/flow-tools

Log Message:
Directory /cvs/extras/rpms/flow-tools added to the repository




From fedora-extras-commits at redhat.com  Wed Sep  7 17:58:05 2005
From: fedora-extras-commits at redhat.com (Paul P Komkoff Jr (stingray))
Date: Wed,  7 Sep 2005 13:58:05 -0400
Subject: rpms/flow-tools/devel - New directory
Message-ID: <200509071758.j87Hw5IF027565@cvs-int.fedora.redhat.com>

Author: stingray

Update of /cvs/extras/rpms/flow-tools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27536/flow-tools/devel

Log Message:
Directory /cvs/extras/rpms/flow-tools/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Sep  7 17:58:49 2005
From: fedora-extras-commits at redhat.com (Paul P Komkoff Jr (stingray))
Date: Wed,  7 Sep 2005 13:58:49 -0400
Subject: rpms/flow-tools Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200509071758.j87Hwnhs027616@cvs-int.fedora.redhat.com>

Author: stingray

Update of /cvs/extras/rpms/flow-tools
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27581

Added Files:
	Makefile import.log 
Log Message:
Setup of module flow-tools


--- NEW FILE Makefile ---
# Top level Makefile for module flow-tools
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Wed Sep  7 17:58:49 2005
From: fedora-extras-commits at redhat.com (Paul P Komkoff Jr (stingray))
Date: Wed,  7 Sep 2005 13:58:49 -0400
Subject: rpms/flow-tools/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200509071758.j87HwnV0027621@cvs-int.fedora.redhat.com>

Author: stingray

Update of /cvs/extras/rpms/flow-tools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27581/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module flow-tools


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Wed Sep  7 18:07:48 2005
From: fedora-extras-commits at redhat.com (Paul P Komkoff Jr (stingray))
Date: Wed,  7 Sep 2005 14:07:48 -0400
Subject: rpms/flow-tools/devel flow-tools-0.68a.patch, NONE,
	1.1 flow-tools.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <200509071807.j87I7mDk028973@cvs-int.fedora.redhat.com>

Author: stingray

Update of /cvs/extras/rpms/flow-tools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28931/devel

Modified Files:
	.cvsignore sources 
Added Files:
	flow-tools-0.68a.patch flow-tools.spec 
Log Message:
auto-import flow-tools-0.68-2 on branch devel from flow-tools-0.68-2.src.rpm

flow-tools-0.68a.patch:

--- NEW FILE flow-tools-0.68a.patch ---
diff -urN flow-tools-0.68/bin/flow-log2rrd flow-tools-0.68.new/bin/flow-log2rrd
--- flow-tools-0.68/bin/flow-log2rrd	2005-05-10 20:53:16.000000000 +0400
+++ flow-tools-0.68.new/bin/flow-log2rrd	2005-08-31 12:24:51.000000000 +0400
@@ -1,4 +1,4 @@
-#!/usr/local/bin/python
+#!/bin/env python
 
 import getopt
 import os
diff -urN flow-tools-0.68/bin/flow-rpt2rrd flow-tools-0.68.new/bin/flow-rpt2rrd
--- flow-tools-0.68/bin/flow-rpt2rrd	2005-05-11 04:11:29.000000000 +0400
+++ flow-tools-0.68.new/bin/flow-rpt2rrd	2005-08-31 12:24:28.000000000 +0400
@@ -1,4 +1,4 @@
-#!/usr/local/bin/python
+#!/bin/env python
 
 import getopt
 import os
diff -urN flow-tools-0.68/bin/flow-rptfmt flow-tools-0.68.new/bin/flow-rptfmt
--- flow-tools-0.68/bin/flow-rptfmt	2005-05-11 16:38:37.000000000 +0400
+++ flow-tools-0.68.new/bin/flow-rptfmt	2005-08-31 12:24:28.000000000 +0400
@@ -1,4 +1,4 @@
-#!/usr/local/bin/python
+#!/bin/env python
 
 import sys
 import string
diff -urN flow-tools-0.68/configs/Makefile.am flow-tools-0.68.new/configs/Makefile.am
--- flow-tools-0.68/configs/Makefile.am	2003-11-25 10:01:37.000000000 +0300
+++ flow-tools-0.68.new/configs/Makefile.am	2005-08-31 12:24:28.000000000 +0400
@@ -1,6 +1,6 @@
-ftsymdir=$(localstatedir)/sym
+ftsymdir=$(sysconfdir)/sym
 ftsym_DATA = ip-prot.sym ip-type.sym tcp-port.sym asn.sym tag.sym
 
-ftcfgdir=$(localstatedir)/cfg
+ftcfgdir=$(sysconfdir)/cfg
 ftcfg_DATA = map.cfg tag.cfg filter.cfg stat.cfg mask.cfg xlate.cfg
 
diff -urN flow-tools-0.68/configure.in flow-tools-0.68.new/configure.in
--- flow-tools-0.68/configure.in	2005-05-11 18:15:48.000000000 +0400
+++ flow-tools-0.68.new/configure.in	2005-08-31 12:24:28.000000000 +0400
@@ -1,31 +1,32 @@
 dnl Process this file with autoconf to produce a configure script.
-AC_INIT(lib/bit1024.c)
+AC_INIT(flow-tools, 0.68)
 
-AC_PREFIX_DEFAULT(/usr/local/netflow)
+AC_PREFIX_DEFAULT(/usr/local/flow-tools)
 
-AM_INIT_AUTOMAKE(flow-tools, 0.68)
-AM_CONFIG_HEADER(lib/ftconfig.h:lib/ftconfig.h.in) 
+AM_INIT_AUTOMAKE
+AM_CONFIG_HEADER(lib/ftconfig.h) 
 
-CFLAGS="-g -Wall"
+dnl CFLAGS="-g -Wall"
 
 dnl Checks for programs.
+AC_PROG_LIBTOOL
 AC_PROG_CC
 AC_PROG_INSTALL
 AC_PROG_MAKE_SET
 AC_PROG_YACC
 YACC="$YACC -d"
-AC_PROG_RANLIB
 AM_PROG_LEX
 
 AC_SUBST(YLIB)
 AC_SUBST(MYSQLLIB)
 AC_SUBST(MYSQLCFLAGS)
-AC_SUBST(MYSQLINCLUDE)
+AC_SUBST(MYSQLLDFLAGS)
 AC_SUBST(PGSQLLIB)
 AC_SUBST(PGSQLCFLAGS)
-AC_SUBST(PGSQLINCLUDE)
+AC_SUBST(PGSQLLDFLAGS)
 AC_SUBST(CRYPTOLIB)
 AC_SUBST(OPENSSLINCLUDE)
+AC_SUBST(OPENSSLLDFLAGS)
 
 dnl extra argument: --with-mysql
 WITH_MYSQL=
@@ -66,37 +67,51 @@
 dnl Checks for libraries.
 
 if test "x$WHERE_MYSQL" != "x"; then
-  LIBS="-L$WHERE_MYSQL/lib/mysql"
+  old_LIBS="$LIBS"
+  old_LDFLAGS="$LDFLAGS"
+  LDFLAGS="$LDFLAGS -L$WHERE_MYSQL/lib/mysql"
   AC_CHECK_LIB(mysqlclient, my_init,
     [
-      MYSQLCFLAGS="-L$WHERE_MYSQL/lib/mysql -I$WHERE_MYSQL/include/mysql"
+      MYSQLCFLAGS="-I$WHERE_MYSQL/include/mysql"
+      MYSQLLDFLAGS="-L$WHERE_MYSQL/lib/mysql"
       MYSQLLIB="-lmysqlclient"
       AC_DEFINE(HAVE_MYSQL)
     ]
   )
+  LIBS="$old_LIBS"
+  LDFLAGS="$old_LDFLAGS"
 fi
 
 if test "x$WHERE_OPENSSL" != "x"; then
-  LIBS="-L$WHERE_OPENSSL/lib"
+  old_LIBS="$LIBS"
+  old_LDFLAGS="$LDFLAGS"
+  LDFLAGS="$LDFLAGS -L$WHERE_OPENSSL/lib"
   AC_CHECK_LIB(crypto, EVP_EncryptUpdate,
     [
-      OPENSSLCFLAGS="-L$WHERE_OPENSSL/lib -I$WHERE_OPENSSL/include"
+      OPENSSLCFLAGS="-I$WHERE_OPENSSL/include"
+      OPENSSLLDFLAGS="-L$WHERE_OPENSSL/lib"
       CRYPTOLIB="-lcrypto"
       AC_DEFINE(HAVE_OPENSSL)
     ]
   )
+  LIBS="$old_LIBS"
+  LDFLAGS="$old_LDFLAGS"
 fi
 
-
 if test "x$WHERE_PGSQL" != "x"; then
-  LIBS="-L$WHERE_PGSQL/lib/pgsql"
+  old_LIBS="$LIBS"
+  old_LDFLAGS="$LDFLAGS"
+  LDFLAGS="-L$WHERE_PGSQL/lib/pgsql"
   AC_CHECK_LIB(pq, PQsetdbLogin,
     [
-      PGSQLCFLAGS="-L$WHERE_PGSQL/lib -I$WHERE_PGSQL/include/pgsql"
+      PGSQLCFLAGS="-I$WHERE_PGSQL/include/pgsql"
+      PGSQLLDFLAGS="-L$WHERE_PGSQL/lib"
       PGSQLLIB="-lpq"
       AC_DEFINE(HAVE_PGSQL)
     ]
   )
+  LIBS="$old_LIBS"
+  LDFLAGS="$old_LDFLAGS"
 fi
 
 AC_CHECK_LIB(y, main,YLIB="$YLIB -ly",)
diff -urN flow-tools-0.68/lib/ftchash.c flow-tools-0.68.new/lib/ftchash.c
--- flow-tools-0.68/lib/ftchash.c	2003-08-12 22:04:25.000000000 +0400
+++ flow-tools-0.68.new/lib/ftchash.c	2005-08-31 12:24:35.000000000 +0400
@@ -326,7 +326,7 @@
       (char*)ftch->traverse_chunk->base+ftch->traverse_chunk->next) {
 
       ret = ftch->traverse_rec;
-      (char*)ftch->traverse_rec += ftch->d_size;
+      ftch->traverse_rec = vpadd(ftch->traverse_rec, ftch->d_size);
       return ret;
 
     } else {
diff -urN flow-tools-0.68/lib/ftfile.c flow-tools-0.68.new/lib/ftfile.c
--- flow-tools-0.68/lib/ftfile.c	2003-02-13 05:38:42.000000000 +0300
+++ flow-tools-0.68.new/lib/ftfile.c	2005-08-31 12:24:35.000000000 +0400
@@ -53,7 +53,7 @@
 
 int load_dir(char *prefix, struct ftfile_entries *fte, int flags, int *depth);
 
-extern int debug;
+#define debug 0
 
 /*
  * function: ftfile_entry_new
diff -urN flow-tools-0.68/lib/ftio.c flow-tools-0.68.new/lib/ftio.c
--- flow-tools-0.68/lib/ftio.c	2003-02-24 03:51:47.000000000 +0300
+++ flow-tools-0.68.new/lib/ftio.c	2005-08-31 12:24:35.000000000 +0400
@@ -2267,7 +2267,7 @@
         break;
 
       nleft -= nread;
-      (char*)ptr += nread;
+      ptr = vpadd(ptr, nread);
   }
   return (nbytes - nleft);
 } /* readn */
@@ -2292,7 +2292,7 @@
       return(nwritten); /* error */
 
     nleft -= nwritten;
-    (char*)ptr += nwritten;
+    ptr =  vpadd(ptr,nwritten);
   }
   return(nbytes - nleft);
 } /* writen */
diff -urN flow-tools-0.68/lib/ftlib.h flow-tools-0.68.new/lib/ftlib.h
--- flow-tools-0.68/lib/ftlib.h	2005-05-10 19:51:33.000000000 +0400
+++ flow-tools-0.68.new/lib/ftlib.h	2005-08-31 12:24:35.000000000 +0400
@@ -152,7 +152,6 @@
 #define FT_PDU_V8_12_MAXFLOWS 44  /* max records in V8 DST_PREFIX_TOS packet */
 #define FT_PDU_V8_13_MAXFLOWS 35  /* max records in V8 PREFIX_TOS packet */
 #define FT_PDU_V8_14_MAXFLOWS 35  /* max records in V8 PREFIX_PORT_TOS packet */
-
 #define FT_PDU_V8_1_VERSION    2  /* version of AS packet */
 #define FT_PDU_V8_2_VERSION    2  /* version of PROTO PORT packet */
 #define FT_PDU_V8_3_VERSION    2  /* version of SRC PREFIX packet */
@@ -3029,6 +3028,8 @@
 #define IN_CLASSD_SSM(i) (((u_int32_t)(i) & 0xff000000) == 0xe8000000)
 #endif /* IN_CLASSD_SSM */
 
+void *vpadd(const void* v, const int change);
+
 /* MACHINE DEPENDANT */
 #define fmt_uint fmt_uint32
 
diff -urN flow-tools-0.68/lib/ftpaths.h.in flow-tools-0.68.new/lib/ftpaths.h.in
--- flow-tools-0.68/lib/ftpaths.h.in	2003-11-11 19:49:14.000000000 +0300
+++ flow-tools-0.68.new/lib/ftpaths.h.in	2005-08-31 12:24:28.000000000 +0400
@@ -29,17 +29,17 @@
 #ifndef FTPATHS_H
 #define FTPATHS_H
 
-#define FT_PATH_CFG_MAP             "@localstatedir@/cfg/map.cfg"
-#define FT_PATH_CFG_TAG             "@localstatedir@/cfg/tag.cfg"
-#define FT_PATH_CFG_FILTER          "@localstatedir@/cfg/filter.cfg"
-#define FT_PATH_CFG_STAT            "@localstatedir@/cfg/stat.cfg"
-#define FT_PATH_CFG_MASK            "@localstatedir@/cfg/mask.cfg"
-#define FT_PATH_CFG_XLATE           "@localstatedir@/cfg/xlate.cfg"
+#define FT_PATH_CFG_MAP             "@sysconfdir@/cfg/map.cfg"
+#define FT_PATH_CFG_TAG             "@sysconfdir@/cfg/tag.cfg"
+#define FT_PATH_CFG_FILTER          "@sysconfdir@/cfg/filter.cfg"
+#define FT_PATH_CFG_STAT            "@sysconfdir@/cfg/stat.cfg"
+#define FT_PATH_CFG_MASK            "@sysconfdir@/cfg/mask.cfg"
+#define FT_PATH_CFG_XLATE           "@sysconfdir@/cfg/xlate.cfg"
 
-#define FT_PATH_SYM_IP_PROT         "@localstatedir@/sym/ip-prot.sym"
-#define FT_PATH_SYM_IP_TYPE         "@localstatedir@/sym/ip-type.sym"
-#define FT_PATH_SYM_TCP_PORT        "@localstatedir@/sym/tcp-port.sym"
-#define FT_PATH_SYM_ASN             "@localstatedir@/sym/asn.sym"
-#define FT_PATH_SYM_TAG             "@localstatedir@/sym/tag.sym"
+#define FT_PATH_SYM_IP_PROT         "@sysconfdir@/sym/ip-prot.sym"
+#define FT_PATH_SYM_IP_TYPE         "@sysconfdir@/sym/ip-type.sym"
+#define FT_PATH_SYM_TCP_PORT        "@sysconfdir@/sym/tcp-port.sym"
+#define FT_PATH_SYM_ASN             "@sysconfdir@/sym/asn.sym"
+#define FT_PATH_SYM_TAG             "@sysconfdir@/sym/tag.sym"
 
 #endif /* FTPATHS_H */
diff -urN flow-tools-0.68/lib/fttlv.c flow-tools-0.68.new/lib/fttlv.c
--- flow-tools-0.68/lib/fttlv.c	2003-02-13 05:38:43.000000000 +0300
+++ flow-tools-0.68.new/lib/fttlv.c	2005-08-31 12:24:35.000000000 +0400
@@ -68,10 +68,10 @@
   }
 
   bcopy(&t, buf, 2);
-  (char*)buf+= 2;
+  buf = vpadd(buf, 2);
 
   bcopy(&len, buf, 2);
-  (char*)buf+= 2;
+  buf = vpadd(buf, 2);
 
   bcopy(&v, buf, 4);
 
@@ -107,10 +107,10 @@
   }
 
   bcopy(&t, buf, 2);
-  (char*)buf+= 2;
+  buf = vpadd(buf, 2);
 
   bcopy(&len, buf, 2);
-  (char*)buf+= 2;
+  buf = vpadd(buf, 2);
 
   bcopy(&v, buf, 2);
 
@@ -145,10 +145,10 @@
   }
 
   bcopy(&t, buf, 2);
-  (char*)buf+= 2;
+  buf = vpadd(buf, 2);
 
   bcopy(&len, buf, 2);
-  (char*)buf+= 2;
+  buf = vpadd(buf, 2);
 
   bcopy(&v, buf, 1);
 
@@ -183,10 +183,10 @@
   }
 
   bcopy(&t, buf, 2);
-  (char*)buf+= 2;
+  buf = vpadd(buf, 2);
 
   bcopy(&len, buf, 2);
-  (char*)buf+= 2;
+  buf = vpadd(buf, 2);
 
   bcopy(v, buf, len);
 
@@ -230,16 +230,16 @@
     return -1;
 
   bcopy(&t, buf, 2);
-  (char*)buf+= 2;
+  buf = vpadd(buf, 2);
 
   bcopy(&len, buf, 2);
-  (char*)buf+= 2;
+  buf = vpadd(buf, 2);
 
   bcopy(&ip, buf, 4);
-  (char*)buf += 4;
+  buf = vpadd(buf, 4);
 
   bcopy(&ifIndex, buf, 2);
-  (char*)buf += 2;
+  buf = vpadd(buf, 2);
 
   bcopy(name, buf, n);
 
@@ -287,19 +287,19 @@
   }
 
   bcopy(&t, buf, 2);
-  (char*)buf+= 2;
+  buf = vpadd(buf, 2);
 
   bcopy(&len, buf, 2);
-  (char*)buf+= 2;
+  buf = vpadd(buf, 2);
 
   bcopy(&ip, buf, 4);
-  (char*)buf += 4;
+  buf = vpadd(buf, 4);
 
   bcopy(&entries, buf, 2);
-  (char*)buf += 2;
+  buf = vpadd(buf, 2);
 
   bcopy(ifIndex_list, buf, esize);
-  (char*)buf += esize;
+  buf = vpadd(buf, esize);
 
   bcopy(name, buf, n);
 
diff -urN flow-tools-0.68/lib/Makefile.am flow-tools-0.68.new/lib/Makefile.am
--- flow-tools-0.68/lib/Makefile.am	2005-05-05 20:00:57.000000000 +0400
+++ flow-tools-0.68.new/lib/Makefile.am	2005-08-31 12:24:35.000000000 +0400
@@ -2,17 +2,17 @@
 
 #AM_CFLAGS=-g -Wall -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wredundant-decls -Wnested-externs
 #AM_CFLAGS=-O2
-AM_CFLAGS=-g -Wall
+#AM_CFLAGS=-g -Wall
 
-DEFS=-I. -I$(srcdir)/lib
+#DEFS=-I. -I$(srcdir)/lib
 
 include_HEADERS = ftlib.h ftqueue.h radix.h ftpaths.h ftconfig.h
-lib_LIBRARIES = libft.a
+lib_LTLIBRARIES = libft.la
 
-libft_a_SOURCES = ftio.c ftswap.c ftencode.c ftdecode.c ftprof.c bit1024.c \
+libft_la_SOURCES = ftio.c ftswap.c ftencode.c ftdecode.c ftprof.c bit1024.c \
  fmt.c support.c ftfile.c fttlv.c ftmap.c ftrec.c fterr.c \
  ftchash.c ftsym.c radix.c fttag.c ftfil.c ftstat.c getdate.c ftxfield.c\
  ftmask.c ftvar.c ftxlate.c
 
-libft_a_LIBADD = @LIBOBJS@ 
+libft_la_LIBADD = $(LTLIBOBJS) $(CRYPTOLIB)
 
diff -urN flow-tools-0.68/lib/support.c flow-tools-0.68.new/lib/support.c
--- flow-tools-0.68/lib/support.c	2003-02-13 05:38:43.000000000 +0300
+++ flow-tools-0.68.new/lib/support.c	2005-08-31 12:24:35.000000000 +0400
@@ -736,3 +736,8 @@
   return sum;
 } /* udp_cksum */
 
+// void pointer add
+
+void * vpadd(const void *v, const int change) {
+  return (void *) (((char*) v) + change);
+}
diff -urN flow-tools-0.68/src/Makefile.am flow-tools-0.68.new/src/Makefile.am
--- flow-tools-0.68/src/Makefile.am	2005-05-06 07:43:41.000000000 +0400
+++ flow-tools-0.68.new/src/Makefile.am	2005-08-31 12:24:28.000000000 +0400
@@ -7,7 +7,7 @@
 
 #AM_CFLAGS=-g -Wall -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wredundant-decls -Wnested-externs
 #AM_CFLAGS=-O2
-AM_CFLAGS=-g -Wall
+#AM_CFLAGS=-g -Wall
 
 bin_PROGRAMS = flow-capture flow-cat flow-stat flow-print flow-dscan \
         flow-send flow-receive flow-gen flow-expire \
@@ -101,9 +101,9 @@
 flow_filter_DEPENDENCIES = ftbuild.h
 
 flow_export_SOURCES = flow-export.c
-flow_export_LDFLAGS = -L../lib
-flow_export_CFLAGS = @MYSQLCFLAGS@ @PGSQLCFLAGS@
-flow_export_LDADD =  -lft @MYSQLLIB@ @PGSQLLIB@
+flow_export_LDFLAGS = -L../lib $(MYSQLLDFLAGS) $(PGSQLLDFLAGS)
+flow_export_CFLAGS = $(MYSQLCFLAGS) $(PGSQLCFLAGS)
+flow_export_LDADD =  -lft $(MYSQLLIB) $(PGSQLLIB)
 flow_export_DEPENDENCIES = ftbuild.h
 
 flow_header_SOURCES = flow-header.c
@@ -117,8 +117,8 @@
 flow_split_DEPENDENCIES = ftbuild.h
 
 flow_xlate_SOURCES = flow-xlate.c
-flow_xlate_LDFLAGS = -L../lib
-flow_xlate_LDADD =  -lft @CRYPTOLIB@
+flow_xlate_LDFLAGS = -L../lib $(CRYPTOLDFLAGS)
+flow_xlate_LDADD =  -lft $(CRYPTOLIB)
 flow_xlate_DEPENDENCIES = ftbuild.h
 
 flow_tag_SOURCES = flow-tag.c


--- NEW FILE flow-tools.spec ---
Version: 0.68
Name: flow-tools
Summary: Tool set for working with NetFlow data
Release: 2%{?dist}
Group: Applications/System
License: BSD 
URL: http://www.splintered.net/sw/flow-tools/
Source0: ftp://ftp.eng.oar.net/pub/flow-tools/flow-tools-%{version}.tar.gz
Patch0: flow-tools-0.68a.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: openssl-devel mysql-devel postgresql-devel autoconf

%description
Flow-tools is library and a collection of programs used to collect, 
send, process, and generate reports from NetFlow data. The tools can be 
used together on a single server or distributed to multiple servers for 
large deployments. The flow-toools library provides an API for development 
of custom applications for NetFlow export versions 1,5,6 and the 14 currently 
defined version 8 subversions. A Perl and Python interface have been 
contributed and are included in the distribution.

%package devel
Summary: Development files for flow-tools
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}

%description devel
Flow-tools is library and a collection of programs used to collect,
send, process, and generate reports from NetFlow data. The tools can be
used together on a single server or distributed to multiple servers for
large deployments. The flow-toools library provides an API for development
of custom applications for NetFlow export versions 1,5,6 and the 14 currently
defined version 8 subversions. A Perl and Python interface have been
contributed and are included in the distribution.

This package contains header files required to build applications that use
libft.

%prep
%setup -q
%patch -p1

%build
autoreconf -f -i -s
%configure --localstatedir=%{_localstatedir}/ft --sysconfdir=%{_sysconfdir}/flow-tools --enable-static=no --with-mysql --with-pgsql --with-openssl
make RPM_OPT_FLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
%makeinstall localstatedir=$RPM_BUILD_ROOT%{_localstatedir}/ft sysconfdir=$RPM_BUILD_ROOT%{_sysconfdir}/flow-tools
find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/ft

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files 
%defattr(-,root,root)
%doc README TODO COPYING SECURITY ChangeLog docs/*.html
%{_mandir}/man1/*
%{_bindir}/*
%{_libdir}/*.so.*
%dir %{_sysconfdir}/flow-tools/
%dir %{_sysconfdir}/flow-tools/cfg/
%dir %{_sysconfdir}/flow-tools/sym/
%config(noreplace) %{_sysconfdir}/flow-tools/cfg/*
%config(noreplace) %{_sysconfdir}/flow-tools/sym/*
%{_localstatedir}/ft/

%files devel
%defattr(-,root,root,-)
%{_libdir}/*.so
%{_includedir}/*.h

%changelog
* Tue Sep  6 2005 Tom "spot" Callaway  0.68-2
- simplify %%files
- use more macros
- change Group to Application/System
- own/create %{_localstatedir}/ft/
- add BR: autoconf
- don't need generic INSTALL
- mark config files as such
- own all directories we create
- run ldconfig on post/postun

* Tue Sep  6 2005 Paul P Komkoff Jr  0.68-1
- Submit to fedora-extras
- Change volatile data location to /var/ft and nonvolatile
  to /etc/flow-tools (FHS)
- Make libft shared library
- Split to plain/devel

* Fri Jan  7 2004 William Emmanuel S. Yu 
- updated RPM file for version 0.67

* Tue Aug  8 2003 William Emmanuel S. Yu 
- fixed SQL bug
- update flow-export documentation

* Tue Apr 29 2003 William Emmanuel S. Yu 
- add support for checking null symbols filename

* Fri Apr  4 2003 William Emmanuel S. Yu 
- updated RPM file for version 0.66

* Fri Apr  4 2003 William Emmanuel S. Yu 
- updated RPM file for version 0.65
- included PostgreSQL support patch

* Mon Feb  3 2003 Larry Fahnoe 
- added makefile patches to use RPM_OPT_FLAGS
- added manpages and html files to spec file

* Tue Dec 17 2002 William Emmanuel S. Yu 
- added tagging and ip-port patches

* Thu Dec 12 2002 William Emmanuel S. Yu 
- updated RPM file for version 0.63

* Wed Oct 16 2002 William Emmanuel S. Yu 
- initial creation of RPM file for version 0.62


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/flow-tools/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	7 Sep 2005 17:58:47 -0000	1.1
+++ .cvsignore	7 Sep 2005 18:07:46 -0000	1.2
@@ -0,0 +1 @@
+flow-tools-0.68.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/flow-tools/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	7 Sep 2005 17:58:47 -0000	1.1
+++ sources	7 Sep 2005 18:07:46 -0000	1.2
@@ -0,0 +1 @@
+c9e0a8b53c79611b6bffcb9d510a5a38  flow-tools-0.68.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep  7 18:07:44 2005
From: fedora-extras-commits at redhat.com (Paul P Komkoff Jr (stingray))
Date: Wed,  7 Sep 2005 14:07:44 -0400
Subject: rpms/flow-tools import.log,1.1,1.2
Message-ID: <200509071808.j87I8FQU028978@cvs-int.fedora.redhat.com>

Author: stingray

Update of /cvs/extras/rpms/flow-tools
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28931

Modified Files:
	import.log 
Log Message:
auto-import flow-tools-0.68-2 on branch devel from flow-tools-0.68-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/flow-tools/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	7 Sep 2005 17:58:47 -0000	1.1
+++ import.log	7 Sep 2005 18:07:40 -0000	1.2
@@ -0,0 +1 @@
+flow-tools-0_68-2:HEAD:flow-tools-0.68-2.src.rpm:1126116346



From fedora-extras-commits at redhat.com  Wed Sep  7 18:19:44 2005
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Wed,  7 Sep 2005 14:19:44 -0400
Subject: rpms/yap/FC-4 .cvsignore,1.2,1.3 sources,1.2,1.3 yap.spec,1.8,1.9
Message-ID: <200509071819.j87IJiIe029090@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/yap/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29067

Modified Files:
	.cvsignore sources yap.spec 
Log Message:
new version 5.0.0


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/yap/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	12 Feb 2005 00:25:45 -0000	1.2
+++ .cvsignore	7 Sep 2005 18:19:42 -0000	1.3
@@ -1 +1 @@
-Yap-4.5.5.tar.gz
+Yap-5.0.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/yap/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	12 Feb 2005 00:25:46 -0000	1.2
+++ sources	7 Sep 2005 18:19:42 -0000	1.3
@@ -1 +1 @@
-661e289f4bdac0e6cfc7e59d4421c2a8  Yap-4.5.5.tar.gz
+6afe0d720aa91a1191d4fbb8201062ed  Yap-5.0.0.tar.gz


Index: yap.spec
===================================================================
RCS file: /cvs/extras/rpms/yap/FC-4/yap.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- yap.spec	18 Jun 2005 19:04:09 -0000	1.8
+++ yap.spec	7 Sep 2005 18:19:42 -0000	1.9
@@ -1,17 +1,16 @@
 Name:		yap
-Version:	4.5.5
-Release:	6%{?dist}
+Version:	5.0.0
+Release:	1%{?dist}
 
 Summary:	High-performance Prolog Compiler
 
 Group:		Development/Languages
 License:	Artistic/LGPL
-Source:		http://download.sourceforge.net/yap/Yap-4.5.5.tar.gz
-Patch0:		Yap-fix.patch
+Source:		http://www.ncc.up.pt/~vsc/Yap/Yap-5.0/Yap-5.0.0.tar.gz
 Patch1:		Yap-noni386.patch
 URL: 		http://www.ncc.up.pt/~vsc/Yap
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:	readline-devel, gmp-devel
+BuildRequires:	readline-devel, gmp-devel, texinfo
 Requires(post):	  /sbin/install-info
 Requires(postun): /sbin/install-info
 
@@ -24,7 +23,6 @@
 
 %prep
 %setup -q -n Yap-%{version}
-%patch0 -p1
 %patch1 -p1
 
 %build
@@ -33,6 +31,7 @@
 	--enable-max-performance \
 	--enable-depth-limit
 make %{?_smp_mflags}
+(cd docs; make info)
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -61,6 +60,10 @@
 %doc changes*
 %doc docs/*.html
 %doc docs/yap.pdf
+%doc LGPL/pillow/doc/pillow_doc_html/*
+%doc LGPL/pillow/doc/article.ps.gz
+%doc --parent Logtalk/manuals
+%doc --parent Logtalk/examples
 %{_bindir}/yap
 %{_datadir}/Yap
 %{_includedir}/Yap
@@ -69,6 +72,9 @@
 %{_infodir}/*
 
 %changelog
+* Wed Sep  7 2005 Gerard Milmeister  - 5.0.0-1
+- New Version 5.0.0
+
 * Sat Jun 18 2005 Gerard Milmeister  - 4.5.5-5
 - Use %{_prefix}/lib for x86_64
 



From fedora-extras-commits at redhat.com  Wed Sep  7 18:21:31 2005
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Wed,  7 Sep 2005 14:21:31 -0400
Subject: rpms/yap/FC-3 sources,1.2,1.3 yap.spec,1.2,1.3
Message-ID: <200509071821.j87ILVmp029160@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/yap/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29139

Modified Files:
	sources yap.spec 
Log Message:
new version 5.0.0


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/yap/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	12 Feb 2005 00:25:46 -0000	1.2
+++ sources	7 Sep 2005 18:21:29 -0000	1.3
@@ -1 +1 @@
-661e289f4bdac0e6cfc7e59d4421c2a8  Yap-4.5.5.tar.gz
+6afe0d720aa91a1191d4fbb8201062ed  Yap-5.0.0.tar.gz


Index: yap.spec
===================================================================
RCS file: /cvs/extras/rpms/yap/FC-3/yap.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- yap.spec	23 Feb 2005 03:27:57 -0000	1.2
+++ yap.spec	7 Sep 2005 18:21:29 -0000	1.3
@@ -1,16 +1,16 @@
-### Package needs review + approval.
 Name:		yap
-Version:	4.5.5
-Release:	1
-Epoch:		0
+Version:	5.0.0
+Release:	1%{?dist}
+
 Summary:	High-performance Prolog Compiler
 
 Group:		Development/Languages
 License:	Artistic/LGPL
-Source:		http://download.sourceforge.net/yap/Yap-4.5.5.tar.gz
+Source:		http://www.ncc.up.pt/~vsc/Yap/Yap-5.0/Yap-5.0.0.tar.gz
+Patch1:		Yap-noni386.patch
 URL: 		http://www.ncc.up.pt/~vsc/Yap
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:	readline-devel, gmp-devel
+BuildRequires:	readline-devel, gmp-devel, texinfo
 Requires(post):	  /sbin/install-info
 Requires(postun): /sbin/install-info
 
@@ -23,6 +23,7 @@
 
 %prep
 %setup -q -n Yap-%{version}
+%patch1 -p1
 
 %build
 %configure \
@@ -30,6 +31,7 @@
 	--enable-max-performance \
 	--enable-depth-limit
 make %{?_smp_mflags}
+(cd docs; make info)
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -43,7 +45,7 @@
 /sbin/install-info %{_infodir}/pillow_doc.info --section "Programming Languages" %{_infodir}/dir 2>/dev/null || :
 
 %postun
-if [ $1 = 0 ]; then
+if [ $1 -eq 0 ]; then
   /sbin/install-info --delete %{_infodir}/yap.info %{_infodir}/dir 2>/dev/null || :
   /sbin/install-info --delete %{_infodir}/pillow_doc.info %{_infodir}/dir 2>/dev/null || :
 fi
@@ -58,14 +60,33 @@
 %doc changes*
 %doc docs/*.html
 %doc docs/yap.pdf
+%doc LGPL/pillow/doc/pillow_doc_html/*
+%doc LGPL/pillow/doc/article.ps.gz
+%doc --parent Logtalk/manuals
+%doc --parent Logtalk/examples
 %{_bindir}/yap
 %{_datadir}/Yap
 %{_includedir}/Yap
-%{_libdir}/libYap.a
-%{_libdir}/Yap
+%{_prefix}/lib/libYap.a
+%{_prefix}/lib/Yap
 %{_infodir}/*
 
 %changelog
+* Wed Sep  7 2005 Gerard Milmeister  - 5.0.0-1
+- New Version 5.0.0
+
+* Sat Jun 18 2005 Gerard Milmeister  - 4.5.5-5
+- Use %{_prefix}/lib for x86_64
+
+* Sat Jun 18 2005 Gerard Milmeister  - 4.5.5-4
+- Fix for non-i386 compilers
+
+* Sat Jun 18 2005 Gerard Milmeister  - 4.5.5-3
+- Compiler fix for FC4
+
+* Fri Apr  7 2005 Michael Schwendt 
+- rebuilt
+
 * Sat Feb 12 2005 Gerard Milmeister  - 0:4.5.5-1
 - New Version 4.5.5
 



From fedora-extras-commits at redhat.com  Wed Sep  7 18:22:53 2005
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Wed,  7 Sep 2005 14:22:53 -0400
Subject: rpms/yap/devel sources,1.2,1.3 yap.spec,1.5,1.6
Message-ID: <200509071822.j87IMr8E029225@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/yap/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29204

Modified Files:
	sources yap.spec 
Log Message:
new version 5.0.0


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/yap/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	12 Feb 2005 00:25:46 -0000	1.2
+++ sources	7 Sep 2005 18:22:51 -0000	1.3
@@ -1 +1 @@
-661e289f4bdac0e6cfc7e59d4421c2a8  Yap-4.5.5.tar.gz
+6afe0d720aa91a1191d4fbb8201062ed  Yap-5.0.0.tar.gz


Index: yap.spec
===================================================================
RCS file: /cvs/extras/rpms/yap/devel/yap.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- yap.spec	18 Jun 2005 12:23:21 -0000	1.5
+++ yap.spec	7 Sep 2005 18:22:51 -0000	1.6
@@ -1,16 +1,16 @@
 Name:		yap
-Version:	4.5.5
-Release:	3%{?dist}
+Version:	5.0.0
+Release:	1%{?dist}
 
 Summary:	High-performance Prolog Compiler
 
 Group:		Development/Languages
 License:	Artistic/LGPL
-Source:		http://download.sourceforge.net/yap/Yap-4.5.5.tar.gz
-Patch0:		Yap-fix.patch
+Source:		http://www.ncc.up.pt/~vsc/Yap/Yap-5.0/Yap-5.0.0.tar.gz
+Patch1:		Yap-noni386.patch
 URL: 		http://www.ncc.up.pt/~vsc/Yap
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:	readline-devel, gmp-devel
+BuildRequires:	readline-devel, gmp-devel, texinfo
 Requires(post):	  /sbin/install-info
 Requires(postun): /sbin/install-info
 
@@ -23,7 +23,7 @@
 
 %prep
 %setup -q -n Yap-%{version}
-%patch0 -p1
+%patch1 -p1
 
 %build
 %configure \
@@ -31,6 +31,7 @@
 	--enable-max-performance \
 	--enable-depth-limit
 make %{?_smp_mflags}
+(cd docs; make info)
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -59,14 +60,27 @@
 %doc changes*
 %doc docs/*.html
 %doc docs/yap.pdf
+%doc LGPL/pillow/doc/pillow_doc_html/*
+%doc LGPL/pillow/doc/article.ps.gz
+%doc --parent Logtalk/manuals
+%doc --parent Logtalk/examples
 %{_bindir}/yap
 %{_datadir}/Yap
 %{_includedir}/Yap
-%{_libdir}/libYap.a
-%{_libdir}/Yap
+%{_prefix}/lib/libYap.a
+%{_prefix}/lib/Yap
 %{_infodir}/*
 
 %changelog
+* Wed Sep  7 2005 Gerard Milmeister  - 5.0.0-1
+- New Version 5.0.0
+
+* Sat Jun 18 2005 Gerard Milmeister  - 4.5.5-5
+- Use %{_prefix}/lib for x86_64
+
+* Sat Jun 18 2005 Gerard Milmeister  - 4.5.5-4
+- Fix for non-i386 compilers
+
 * Sat Jun 18 2005 Gerard Milmeister  - 4.5.5-3
 - Compiler fix for FC4
 



From fedora-extras-commits at redhat.com  Wed Sep  7 18:29:35 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Wed,  7 Sep 2005 14:29:35 -0400
Subject: rpms/perl-Class-DBI-mysql - New directory
Message-ID: <200509071829.j87ITZIC029340@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Class-DBI-mysql
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29320/perl-Class-DBI-mysql

Log Message:
Directory /cvs/extras/rpms/perl-Class-DBI-mysql added to the repository




From fedora-extras-commits at redhat.com  Wed Sep  7 18:29:36 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Wed,  7 Sep 2005 14:29:36 -0400
Subject: rpms/perl-Class-DBI-mysql/devel - New directory
Message-ID: <200509071829.j87ITadj029345@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Class-DBI-mysql/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29320/perl-Class-DBI-mysql/devel

Log Message:
Directory /cvs/extras/rpms/perl-Class-DBI-mysql/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Sep  7 18:29:51 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Wed,  7 Sep 2005 14:29:51 -0400
Subject: rpms/perl-Class-DBI-mysql Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200509071829.j87ITpdj029400@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Class-DBI-mysql
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29365

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-Class-DBI-mysql


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Class-DBI-mysql
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Wed Sep  7 18:29:52 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Wed,  7 Sep 2005 14:29:52 -0400
Subject: rpms/perl-Class-DBI-mysql/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200509071829.j87ITqWQ029405@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Class-DBI-mysql/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29365/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Class-DBI-mysql


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Wed Sep  7 18:30:10 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Wed,  7 Sep 2005 14:30:10 -0400
Subject: rpms/perl-Class-DBI-mysql import.log,1.1,1.2
Message-ID: <200509071830.j87IUAdo029476@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Class-DBI-mysql
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29441

Modified Files:
	import.log 
Log Message:
auto-import perl-Class-DBI-mysql-0.23-3 on branch devel from perl-Class-DBI-mysql-0.23-3.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-mysql/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	7 Sep 2005 18:29:49 -0000	1.1
+++ import.log	7 Sep 2005 18:30:08 -0000	1.2
@@ -0,0 +1 @@
+perl-Class-DBI-mysql-0_23-3:HEAD:perl-Class-DBI-mysql-0.23-3.src.rpm:1126117800



From fedora-extras-commits at redhat.com  Wed Sep  7 18:30:10 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Wed,  7 Sep 2005 14:30:10 -0400
Subject: rpms/perl-Class-DBI-mysql/devel perl-Class-DBI-mysql.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200509071830.j87IUAB9029483@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Class-DBI-mysql/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29441/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Class-DBI-mysql.spec 
Log Message:
auto-import perl-Class-DBI-mysql-0.23-3 on branch devel from perl-Class-DBI-mysql-0.23-3.src.rpm


--- NEW FILE perl-Class-DBI-mysql.spec ---
Name:           perl-Class-DBI-mysql
Version:        0.23
Release:        3%{?dist}
Summary:        Extensions to Class::DBI for MySQL
Group:          Development/Libraries
License:        GPL or Artistic
URL:            http://search.cpan.org/dist/Class-DBI-mysql/
Source0:        http://search.cpan.org/CPAN/authors/id/T/TM/TMTM/Class-DBI-mysql-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:	perl(Class::DBI), perl(DBD::mysql)
Requires:  perl(Class::DBI), perl(DBD::mysql), perl(Time::Piece::MySQL)
Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
%{summary}.

%prep
%setup -q -n Class-DBI-mysql-%{version}
perldoc -t perlartistic > Artistic
perldoc -t perlgpl > COPYING

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'
find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';'
chmod -R u+w $RPM_BUILD_ROOT/*

%check
# Needs a running mysql server.
#make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Artistic COPYING Changes
%{perl_vendorlib}/Class/DBI
%{_mandir}/man3/*.3*


%changelog
* Fri Sep  2 2005 Paul Howarth  0.23-3
- remove redundant BR: perl
- honor %%{_smp_mflags}
- include license text
- add perl(DBD::mysql) and perl(Time::Piece::MySQL) deps

* Fri Jul  8 2005 Tom "spot" Callaway  0.23-2
- cleanups

* Wed Jul  6 2005 Tom "spot" Callaway  0.23-1
- Initial package for Fedora Extras


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-mysql/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	7 Sep 2005 18:29:49 -0000	1.1
+++ .cvsignore	7 Sep 2005 18:30:08 -0000	1.2
@@ -0,0 +1 @@
+Class-DBI-mysql-0.23.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-mysql/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	7 Sep 2005 18:29:49 -0000	1.1
+++ sources	7 Sep 2005 18:30:08 -0000	1.2
@@ -0,0 +1 @@
+6e7c969b87643af08e46053bd538308c  Class-DBI-mysql-0.23.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep  7 18:34:03 2005
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Wed,  7 Sep 2005 14:34:03 -0400
Subject: rpms/yap/FC-3 Yap-noni386.patch,NONE,1.1
Message-ID: <200509071834.j87IY3V3029562@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/yap/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29542

Added Files:
	Yap-noni386.patch 
Log Message:


Yap-noni386.patch:

--- NEW FILE Yap-noni386.patch ---
--- Yap-4.5.5/H/absmi.h.noni386	2005-06-18 15:52:24.000000000 +0200
+++ Yap-4.5.5/H/absmi.h	2005-06-18 15:52:34.000000000 +0200
@@ -282,7 +282,7 @@
 
 #define CACHE_A1()	(SREG = (CELL *)ARG1)
 
-#define CACHED_A1()	((CELL)SREG)
+#define CACHED_A1()	SREG
 
 #endif /* S_IN_MEM */
 



From fedora-extras-commits at redhat.com  Wed Sep  7 18:34:47 2005
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Wed,  7 Sep 2005 14:34:47 -0400
Subject: rpms/yap/FC-3 yap.spec,1.3,1.4
Message-ID: <200509071834.j87IYlDZ029587@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/yap/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29568

Modified Files:
	yap.spec 
Log Message:



Index: yap.spec
===================================================================
RCS file: /cvs/extras/rpms/yap/FC-3/yap.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- yap.spec	7 Sep 2005 18:21:29 -0000	1.3
+++ yap.spec	7 Sep 2005 18:34:45 -0000	1.4
@@ -1,13 +1,12 @@
 Name:		yap
 Version:	5.0.0
-Release:	1%{?dist}
+Release:	2%{?dist}
 
 Summary:	High-performance Prolog Compiler
 
 Group:		Development/Languages
 License:	Artistic/LGPL
 Source:		http://www.ncc.up.pt/~vsc/Yap/Yap-5.0/Yap-5.0.0.tar.gz
-Patch1:		Yap-noni386.patch
 URL: 		http://www.ncc.up.pt/~vsc/Yap
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	readline-devel, gmp-devel, texinfo
@@ -23,7 +22,6 @@
 
 %prep
 %setup -q -n Yap-%{version}
-%patch1 -p1
 
 %build
 %configure \



From fedora-extras-commits at redhat.com  Wed Sep  7 18:36:14 2005
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Wed,  7 Sep 2005 14:36:14 -0400
Subject: rpms/yap/devel Yap-noni386.patch,NONE,1.1 yap.spec,1.6,1.7
Message-ID: <200509071836.j87IaEDU029658@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/yap/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29636

Modified Files:
	yap.spec 
Added Files:
	Yap-noni386.patch 
Log Message:


Yap-noni386.patch:

--- NEW FILE Yap-noni386.patch ---
--- Yap-4.5.5/H/absmi.h.noni386	2005-06-18 15:52:24.000000000 +0200
+++ Yap-4.5.5/H/absmi.h	2005-06-18 15:52:34.000000000 +0200
@@ -282,7 +282,7 @@
 
 #define CACHE_A1()	(SREG = (CELL *)ARG1)
 
-#define CACHED_A1()	((CELL)SREG)
+#define CACHED_A1()	SREG
 
 #endif /* S_IN_MEM */
 


Index: yap.spec
===================================================================
RCS file: /cvs/extras/rpms/yap/devel/yap.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- yap.spec	7 Sep 2005 18:22:51 -0000	1.6
+++ yap.spec	7 Sep 2005 18:36:12 -0000	1.7
@@ -1,6 +1,6 @@
 Name:		yap
 Version:	5.0.0
-Release:	1%{?dist}
+Release:	2%{?dist}
 
 Summary:	High-performance Prolog Compiler
 



From fedora-extras-commits at redhat.com  Wed Sep  7 18:45:56 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Wed,  7 Sep 2005 14:45:56 -0400
Subject: owners owners.list,1.175,1.176
Message-ID: <200509071845.j87Ijuhf029946@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29923

Modified Files:
	owners.list 
Log Message:

perl-Class-DBI-mysql



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.175
retrieving revision 1.176
diff -u -r1.175 -r1.176
--- owners.list	7 Sep 2005 15:34:46 -0000	1.175
+++ owners.list	7 Sep 2005 18:45:54 -0000	1.176
@@ -575,6 +575,7 @@
 Fedora Extras|perl-Class-Container|Perl module for building frameworks of classes|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Class-Data-Inheritable|Inheritable, overridable class data|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Class-DBI|Simple Database Abstraction|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Class-DBI-mysql|Extensions to Class::DBI for MySQL|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Class-DBI-Plugin|Abstract base class for Class::DBI plugins|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Class-DBI-Plugin-Type|Determine type information for columns|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Class-DBI-SQLite|Extension to Class::DBI for sqlite|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Wed Sep  7 18:53:27 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Wed,  7 Sep 2005 14:53:27 -0400
Subject: rpms/perl-Class-DBI-Plugin-RetrieveAll - New directory
Message-ID: <200509071853.j87IrRiJ030196@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Class-DBI-Plugin-RetrieveAll
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30176/perl-Class-DBI-Plugin-RetrieveAll

Log Message:
Directory /cvs/extras/rpms/perl-Class-DBI-Plugin-RetrieveAll added to the repository




From fedora-extras-commits at redhat.com  Wed Sep  7 18:53:28 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Wed,  7 Sep 2005 14:53:28 -0400
Subject: rpms/perl-Class-DBI-Plugin-RetrieveAll/devel - New directory
Message-ID: <200509071853.j87IrSiO030201@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Class-DBI-Plugin-RetrieveAll/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30176/perl-Class-DBI-Plugin-RetrieveAll/devel

Log Message:
Directory /cvs/extras/rpms/perl-Class-DBI-Plugin-RetrieveAll/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Sep  7 18:53:41 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Wed,  7 Sep 2005 14:53:41 -0400
Subject: rpms/perl-Class-DBI-Plugin-RetrieveAll Makefile, NONE,
	1.1 import.log, NONE, 1.1
Message-ID: <200509071853.j87IrftA030256@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Class-DBI-Plugin-RetrieveAll
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30221

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-Class-DBI-Plugin-RetrieveAll


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Class-DBI-Plugin-RetrieveAll
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Wed Sep  7 18:53:42 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Wed,  7 Sep 2005 14:53:42 -0400
Subject: rpms/perl-Class-DBI-Plugin-RetrieveAll/devel .cvsignore, NONE,
	1.1 Makefile, NONE, 1.1 sources, NONE, 1.1
Message-ID: <200509071853.j87Irgcn030261@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Class-DBI-Plugin-RetrieveAll/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30221/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Class-DBI-Plugin-RetrieveAll


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Wed Sep  7 18:54:00 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Wed,  7 Sep 2005 14:54:00 -0400
Subject: rpms/perl-Class-DBI-Plugin-RetrieveAll import.log,1.1,1.2
Message-ID: <200509071854.j87IsUO7030328@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Class-DBI-Plugin-RetrieveAll
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30289

Modified Files:
	import.log 
Log Message:
auto-import perl-Class-DBI-Plugin-RetrieveAll-1.01-3 on branch devel from perl-Class-DBI-Plugin-RetrieveAll-1.01-3.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-Plugin-RetrieveAll/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	7 Sep 2005 18:53:39 -0000	1.1
+++ import.log	7 Sep 2005 18:53:58 -0000	1.2
@@ -0,0 +1 @@
+perl-Class-DBI-Plugin-RetrieveAll-1_01-3:HEAD:perl-Class-DBI-Plugin-RetrieveAll-1.01-3.src.rpm:1126119231



From fedora-extras-commits at redhat.com  Wed Sep  7 18:54:00 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Wed,  7 Sep 2005 14:54:00 -0400
Subject: rpms/perl-Class-DBI-Plugin-RetrieveAll/devel
	perl-Class-DBI-Plugin-RetrieveAll.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200509071854.j87IsUNR030332@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Class-DBI-Plugin-RetrieveAll/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30289/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Class-DBI-Plugin-RetrieveAll.spec 
Log Message:
auto-import perl-Class-DBI-Plugin-RetrieveAll-1.01-3 on branch devel from perl-Class-DBI-Plugin-RetrieveAll-1.01-3.src.rpm


--- NEW FILE perl-Class-DBI-Plugin-RetrieveAll.spec ---
Name:           perl-Class-DBI-Plugin-RetrieveAll
Version:        1.01
Release:        3%{?dist}
Summary:        More complex retrieve_all() for Class::DBI
Group:          Development/Libraries
License:        GPL or Artistic
URL:            http://search.cpan.org/dist/Class-DBI-Plugin-RetrieveAll
Source0:        http://search.cpan.org/CPAN/authors/id/T/TM/TMTM/Class-DBI-Plugin-RetrieveAll-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:	perl(Class::DBI::Plugin), perl(DBD::SQLite)
Requires:  perl(Class::DBI::Plugin)
Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
%{summary}.

%prep
%setup -q -n Class-DBI-Plugin-RetrieveAll-%{version}
perldoc -t perlartistic > Artistic
perldoc -t perlgpl > COPYING

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'
find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';'
chmod -R u+w $RPM_BUILD_ROOT/*

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Artistic COPYING Changes
%{perl_vendorlib}/Class/DBI/Plugin/
%{_mandir}/man3/*.3*


%changelog
* Wed Aug 31 2005 Paul Howarth  1.01-3
- remove redundant BR: perl
- use %%{?_smp_mflags} with make in %%build
- include license text
- add BR: for perl(DBD::SQLite) for %%check

* Fri Jul  8 2005 Tom "spot" Callaway  1.01-2
- cleanups

* Wed Jul  6 2005 Tom "spot" Callaway  1.01-1
- Initial package for Fedora Extras


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-Plugin-RetrieveAll/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	7 Sep 2005 18:53:40 -0000	1.1
+++ .cvsignore	7 Sep 2005 18:53:58 -0000	1.2
@@ -0,0 +1 @@
+Class-DBI-Plugin-RetrieveAll-1.01.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-Plugin-RetrieveAll/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	7 Sep 2005 18:53:40 -0000	1.1
+++ sources	7 Sep 2005 18:53:58 -0000	1.2
@@ -0,0 +1 @@
+27dd0db083dd0127a2704bf55c29b8a8  Class-DBI-Plugin-RetrieveAll-1.01.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep  7 18:56:40 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Wed,  7 Sep 2005 14:56:40 -0400
Subject: owners owners.list,1.176,1.177
Message-ID: <200509071856.j87IueNq030534@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30515

Modified Files:
	owners.list 
Log Message:

perl-Class-DBI-Plugin-RetrieveAll|More complex retrieve_all() for Class::DBI



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.176
retrieving revision 1.177
diff -u -r1.176 -r1.177
--- owners.list	7 Sep 2005 18:45:54 -0000	1.176
+++ owners.list	7 Sep 2005 18:56:37 -0000	1.177
@@ -577,6 +577,7 @@
 Fedora Extras|perl-Class-DBI|Simple Database Abstraction|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Class-DBI-mysql|Extensions to Class::DBI for MySQL|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Class-DBI-Plugin|Abstract base class for Class::DBI plugins|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Class-DBI-Plugin-RetrieveAll|More complex retrieve_all() for Class::DBI|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Class-DBI-Plugin-Type|Determine type information for columns|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Class-DBI-SQLite|Extension to Class::DBI for sqlite|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Class-MethodMaker|Create generic methods for OO Perl|dgregor at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Wed Sep  7 21:05:03 2005
From: fedora-extras-commits at redhat.com (Mark Cox (mjc))
Date: Wed,  7 Sep 2005 17:05:03 -0400
Subject: fedora-security/audit fc4,1.55,1.56
Message-ID: <200509072106.j87L6WrP002350@cvs-int.fedora.redhat.com>

Author: mjc

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2325

Modified Files:
	fc4 
Log Message:
Update now httpd is pushed



Index: fc4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc4,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- fc4	7 Sep 2005 13:17:38 -0000	1.55
+++ fc4	7 Sep 2005 21:04:59 -0000	1.56
@@ -3,6 +3,7 @@
 
 ** are items that need attention
 
+2005-2811 version (net-snmp, not upstream gentoo only)
 2005-2802 version (kernel, fixed 2.6.12) [since FEDORA-2005-510]
 2005-2801 version (kernel, fixed 2.6.11)
 2005-2800 VULNERABLE (kernel)
@@ -10,8 +11,8 @@
 2005-2797 VULNERABLE (openssh, fixed 4.2) #167443
 2005-2796 backport (squid, fixed after 2.5.STABLE10) [since FEDORA-2005-851]
 2005-2794 backport (squid, fixed after 2.5.STABLE10) [since FEDORA-2005-851]
-2005-2728 VULNERABLE (httpd, fixed 2.0.55-dev) #167104
-2005-2700 VULNERABLE (httpd, fixed 2.0.55-dev) #167196
+2005-2728 backport (httpd, fixed 2.0.55-dev) [since FEDORA-2005-849]
+2005-2700 backport (httpd, fixed 2.0.55-dev) [since FEDORA-2005-849]
 2005-2693 backport (cvs) [since FEDORA-2005-790]
 2005-2672 VULNERABLE (lm_sensors) bz#166673
 2005-2666 ** openssh (hmm)



From fedora-extras-commits at redhat.com  Wed Sep  7 21:49:34 2005
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Wed,  7 Sep 2005 17:49:34 -0400
Subject: rpms/perl-Class-Singleton - New directory
Message-ID: <200509072149.j87LnYiY002506@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Class-Singleton
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2482/perl-Class-Singleton

Log Message:
Directory /cvs/extras/rpms/perl-Class-Singleton added to the repository




From fedora-extras-commits at redhat.com  Wed Sep  7 21:49:35 2005
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Wed,  7 Sep 2005 17:49:35 -0400
Subject: rpms/perl-Class-Singleton/devel - New directory
Message-ID: <200509072149.j87LnZx6002511@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Class-Singleton/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2482/perl-Class-Singleton/devel

Log Message:
Directory /cvs/extras/rpms/perl-Class-Singleton/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Sep  7 21:50:00 2005
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Wed,  7 Sep 2005 17:50:00 -0400
Subject: rpms/perl-Class-Singleton Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200509072150.j87Lo0t5002556@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Class-Singleton
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2527

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-Class-Singleton


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Class-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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Wed Sep  7 21:50:00 2005
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Wed,  7 Sep 2005 17:50:00 -0400
Subject: rpms/perl-Class-Singleton/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200509072150.j87Lo0pQ002561@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Class-Singleton/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2527/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Class-Singleton


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Wed Sep  7 21:50:47 2005
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Wed,  7 Sep 2005 17:50:47 -0400
Subject: rpms/perl-Class-Singleton import.log,1.1,1.2
Message-ID: <200509072151.j87LpHq6002633@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Class-Singleton
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2595

Modified Files:
	import.log 
Log Message:
auto-import perl-Class-Singleton-1.03-1 on branch devel from perl-Class-Singleton-1.03-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-Singleton/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	7 Sep 2005 21:49:57 -0000	1.1
+++ import.log	7 Sep 2005 21:50:45 -0000	1.2
@@ -0,0 +1 @@
+perl-Class-Singleton-1_03-1:HEAD:perl-Class-Singleton-1.03-1.src.rpm:1126129830



From fedora-extras-commits at redhat.com  Wed Sep  7 21:50:48 2005
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Wed,  7 Sep 2005 17:50:48 -0400
Subject: rpms/perl-Class-Singleton/devel perl-Class-Singleton.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200509072151.j87LpIAc002637@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Class-Singleton/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2595/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Class-Singleton.spec 
Log Message:
auto-import perl-Class-Singleton-1.03-1 on branch devel from perl-Class-Singleton-1.03-1.src.rpm


--- NEW FILE perl-Class-Singleton.spec ---
Name:           perl-Class-Singleton
Version:        1.03
Release:        1%{?dist}
Summary:        Class::Singleton Perl module
License:        Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Class-Singleton/
Source0:        http://www.cpan.org/modules/by-module/Class/Class-Singleton-1.03.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
This is the Class::Singleton module. A Singleton describes an object
class that can have only one instance in any system. An example of a
Singleton might be a print spooler or system registry. This module
implements a Singleton class from which other classes can be derived.
By itself, the Class::Singleton module does very little other than
manage the instantiation of a single object. In deriving a class from
Class::Singleton, your module will inherit the Singleton instantiation
method and can implement whatever specific functionality is required.

%prep
%setup -q -n Class-Singleton-%{version}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT

make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT

find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null \;

chmod -R u+rwX,go+rX,go-w $RPM_BUILD_ROOT/*

perldoc -t perlartistic > Artistic

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes README Artistic
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Wed Aug 31 2005 Steven Pritchard  1.03-1
- Specfile autogenerated.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-Singleton/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	7 Sep 2005 21:49:58 -0000	1.1
+++ .cvsignore	7 Sep 2005 21:50:45 -0000	1.2
@@ -0,0 +1 @@
+Class-Singleton-1.03.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-Singleton/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	7 Sep 2005 21:49:58 -0000	1.1
+++ sources	7 Sep 2005 21:50:45 -0000	1.2
@@ -0,0 +1 @@
+80202a57411cb3e939fec327a87564bf  Class-Singleton-1.03.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep  7 23:12:42 2005
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Wed,  7 Sep 2005 19:12:42 -0400
Subject: rpms/gramps/devel .cvsignore, 1.10, 1.11 gramps.spec, 1.11,
	1.12 sources, 1.10, 1.11
Message-ID: <200509072312.j87NCg28005434@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/gramps/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5411

Modified Files:
	.cvsignore gramps.spec sources 
Log Message:
* Wed Sep  7 2005 Brian Pepple  - 2.0.8-2
- Update to 2.0.8.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gramps/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	15 Aug 2005 19:33:02 -0000	1.10
+++ .cvsignore	7 Sep 2005 23:12:40 -0000	1.11
@@ -1 +1 @@
-gramps-2.0.6.tar.gz
+gramps-2.0.8.tar.gz


Index: gramps.spec
===================================================================
RCS file: /cvs/extras/rpms/gramps/devel/gramps.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- gramps.spec	17 Aug 2005 13:13:33 -0000	1.11
+++ gramps.spec	7 Sep 2005 23:12:40 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           gramps
-Version:        2.0.6
-Release:        3%{?dist}
+Version:        2.0.8
+Release:        2%{?dist}
 Summary:        Genealogical Research and Analysis Management Programming System
 
 Group:          Applications/Productivity
@@ -112,6 +112,9 @@
 
 
 %changelog
+* Wed Sep  7 2005 Brian Pepple  - 2.0.8-2
+- Update to 2.0.8.
+
 * Wed Aug 17 2005 Brian Pepple  - 2.0.6-3
 - Specify ver for python-reportlab.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gramps/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	15 Aug 2005 19:33:02 -0000	1.10
+++ sources	7 Sep 2005 23:12:40 -0000	1.11
@@ -1 +1 @@
-1df757d3a5269767e705857034068805  gramps-2.0.6.tar.gz
+84f2659b292b5e2abc92a8d56148495b  gramps-2.0.8.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep  7 23:13:46 2005
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Wed,  7 Sep 2005 19:13:46 -0400
Subject: rpms/gramps/FC-4 .cvsignore, 1.10, 1.11 gramps.spec, 1.11,
	1.12 sources, 1.10, 1.11
Message-ID: <200509072313.j87NDkCH005512@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/gramps/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5489

Modified Files:
	.cvsignore gramps.spec sources 
Log Message:
* Wed Sep  7 2005 Brian Pepple  - 2.0.8-1
- Update to 2.0.8.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gramps/FC-4/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	15 Aug 2005 19:34:31 -0000	1.10
+++ .cvsignore	7 Sep 2005 23:13:44 -0000	1.11
@@ -1 +1 @@
-gramps-2.0.6.tar.gz
+gramps-2.0.8.tar.gz


Index: gramps.spec
===================================================================
RCS file: /cvs/extras/rpms/gramps/FC-4/gramps.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- gramps.spec	17 Aug 2005 13:11:15 -0000	1.11
+++ gramps.spec	7 Sep 2005 23:13:44 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           gramps
-Version:        2.0.6
-Release:        2%{?dist}
+Version:        2.0.8
+Release:        1%{?dist}
 Summary:        Genealogical Research and Analysis Management Programming System
 
 Group:          Applications/Productivity
@@ -112,6 +112,9 @@
 
 
 %changelog
+* Wed Sep  7 2005 Brian Pepple  - 2.0.8-1
+- Update to 2.0.8.
+
 * Wed Aug 17 2005 Brian Pepple  - 2.0.6-2
 - Specify ver for python-reportlab.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gramps/FC-4/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	15 Aug 2005 19:34:31 -0000	1.10
+++ sources	7 Sep 2005 23:13:44 -0000	1.11
@@ -1 +1 @@
-1df757d3a5269767e705857034068805  gramps-2.0.6.tar.gz
+84f2659b292b5e2abc92a8d56148495b  gramps-2.0.8.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep  8 05:14:31 2005
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Thu,  8 Sep 2005 01:14:31 -0400
Subject: rpms/nethack/devel nethack-3.4.3-x11.patch, NONE, 1.1 nethack.spec,
	1.2, 1.3
Message-ID: <200509080514.j885EV7x013866@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/extras/rpms/nethack/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13844

Modified Files:
	nethack.spec 
Added Files:
	nethack-3.4.3-x11.patch 
Log Message:
- Enable x11 support (Bug #167523)


nethack-3.4.3-x11.patch:

--- NEW FILE nethack-3.4.3-x11.patch ---
--- sys/unix/Makefile.top.orig	2005-06-24 21:11:44.000000000 -0400
+++ sys/unix/Makefile.top	2005-06-24 21:12:06.000000000 -0400
@@ -40,9 +40,8 @@
 SHELLDIR = $(PREFIX)/games
 
 # per discussion in Install.X11 and Install.Qt
-VARDATND = 
 # VARDATND = x11tiles NetHack.ad pet_mark.xbm
-# VARDATND = x11tiles NetHack.ad pet_mark.xbm rip.xpm
+VARDATND = x11tiles NetHack.ad pet_mark.xbm rip.xpm
 # for Atari/Gem
 # VARDATND = nh16.img title.img GEM_RSC.RSC rip.img
 # for BeOS
--- include/config.h.orig	2005-06-24 21:12:38.000000000 -0400
+++ include/config.h	2005-06-24 21:13:36.000000000 -0400
@@ -43,7 +43,7 @@
  * Some combinations make no sense.  See the installation document.
  */
 #define TTY_GRAPHICS	/* good old tty based graphics */
-/* #define X11_GRAPHICS */	/* X11 interface */
+#define X11_GRAPHICS	/* X11 interface */
 /* #define QT_GRAPHICS */	/* Qt interface */
 /* #define GNOME_GRAPHICS */	/* Gnome interface */
 /* #define MSWIN_GRAPHICS */	/* Windows NT, CE, Graphics */
@@ -126,7 +126,7 @@
  * would allow:
  *  xpmtoppm x11tiles_big.xpm
  */
-/* # define USE_XPM */		/* Disable if you do not have the XPM library */
+# define USE_XPM		/* Disable if you do not have the XPM library */
 # ifdef USE_XPM
 #  define GRAPHIC_TOMBSTONE	/* Use graphical tombstone (rip.xpm) */
 # endif
--- sys/unix/Makefile.src.orig	2005-06-24 21:14:49.000000000 -0400
+++ sys/unix/Makefile.src	2005-06-24 21:15:32.000000000 -0400
@@ -214,8 +214,8 @@
 
 #
 #
-WINSRC = $(WINTTYSRC)
-WINOBJ = $(WINTTYOBJ)
+WINSRC = $(WINTTYSRC) $(WINX11SRC)
+WINOBJ = $(WINTTYOBJ) $(WINX11OBJ)
 
 # on some systems the termcap library is in -ltermcap or -lcurses
 # on 386 Xenix, the -ltermlib tputs() seems not to work; use -lcurses instead
@@ -235,7 +235,7 @@
 #
 # libraries for X11
 # If USE_XPM is defined in config.h, you will also need -lXpm here.
-WINX11LIB = -lXaw -lXmu -lXext -lXt -lX11
+WINX11LIB = -lXaw -lXmu -lXext -lXt -lX11 -lXpm
 # WINX11LIB = -lXaw -lXmu -lXt -lX11
 # WINX11LIB = -lXaw -lXmu -lXext -lXt -lXpm -lX11 -lm
 # WINX11LIB = -lXaw -lXmu -lXpm -lXext -lXt -lX11 -lSM -lICE -lm # BSD/OS 2.0
@@ -255,7 +255,7 @@
 # libraries for BeOS 
 WINBELIB = -lbe
 
-WINLIB = $(WINTTYLIB)
+WINLIB = $(WINTTYLIB) $(WINX11LIB)
 
 # any other strange libraries your system needs (for Sysunix only -- the more
 # specialized targets should already be right)


Index: nethack.spec
===================================================================
RCS file: /cvs/extras/rpms/nethack/devel/nethack.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- nethack.spec	16 Aug 2005 17:08:58 -0000	1.2
+++ nethack.spec	8 Sep 2005 05:14:29 -0000	1.3
@@ -3,7 +3,7 @@
 
 Name:           nethack
 Version:        3.4.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A rogue-like single player dungeon exploration game
 
 Group:          Amusements/Games
@@ -13,9 +13,13 @@
 Source1:        %{name}.desktop
 Patch0:         %{name}-%{version}-makefile.patch
 Patch1:         %{name}-%{version}-config.patch
+Patch2:         %{name}-%{version}-x11.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  ncurses-devel, bison, flex, desktop-file-utils
+BuildRequires:  ncurses-devel
+BuildRequires:  bison, flex, desktop-file-utils
+BuildRequires:  xorg-x11-devel, xorg-x11-font-utils
+
 Obsoletes:      nethack-falconseye <= 1.9.4-6.a
 
 
@@ -39,6 +43,7 @@
 %setup -q
 %patch0 -b .makefile
 %patch1 -b .config
+%patch2 -b .x11
 (source sys/unix/setup.sh)
 
 # Set our paths
@@ -81,6 +86,17 @@
         --add-category Game \
         %{SOURCE1}
 
+# Install the fonts for the X11 interface
+cd win/X11
+bdftopcf -o nh10.pcf nh10.bdf
+bdftopcf -o ibm.pcf ibm.bdf
+install -D ibm.pcf $RPM_BUILD_ROOT%{nhgamedir}/fonts/ibm.pcf
+install -D nh10.pcf $RPM_BUILD_ROOT%{nhgamedir}/fonts/nh10.pcf
+mkfontdir $RPM_BUILD_ROOT%{nhgamedir}/fonts
+
+%{__sed} -i -e 's:^!\(NetHack.tile_file.*\):\1:' \
+        $RPM_BUILD_ROOT%{nhgamedir}/NetHack.ad
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -96,6 +112,11 @@
 %{nhgamedir}/nhdat
 %{_bindir}/nethack
 %{_bindir}/nethack-recover
+%{nhgamedir}/NetHack.ad
+%{nhgamedir}/pet_mark.xbm
+%{nhgamedir}/rip.xpm
+%{nhgamedir}/x11tiles
+%{nhgamedir}/fonts/*
 %defattr(0664,root,games)
 %config(noreplace) %{nhdatadir}/record
 %config(noreplace) %{nhdatadir}/perm
@@ -106,5 +127,8 @@
 
 
 %changelog
+* Tue Sep 06 2005 Luke Macken  3.4.3-2
+- Enable x11 support
+
 * Sun Jul 10 2005 Luke Macken  3.4.3-1
 - Initial package for Fedora Extras



From fedora-extras-commits at redhat.com  Thu Sep  8 05:50:35 2005
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Thu,  8 Sep 2005 01:50:35 -0400
Subject: rpms/nethack/devel nethack.spec,1.3,1.4
Message-ID: <200509080550.j885oZ8E014033@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/extras/rpms/nethack/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14011

Modified Files:
	nethack.spec 
Log Message:
- Few minor changes thanks to Ville Skytt??



Index: nethack.spec
===================================================================
RCS file: /cvs/extras/rpms/nethack/devel/nethack.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- nethack.spec	8 Sep 2005 05:14:29 -0000	1.3
+++ nethack.spec	8 Sep 2005 05:50:33 -0000	1.4
@@ -90,8 +90,8 @@
 cd win/X11
 bdftopcf -o nh10.pcf nh10.bdf
 bdftopcf -o ibm.pcf ibm.bdf
-install -D ibm.pcf $RPM_BUILD_ROOT%{nhgamedir}/fonts/ibm.pcf
-install -D nh10.pcf $RPM_BUILD_ROOT%{nhgamedir}/fonts/nh10.pcf
+install -D -p -m 644 ibm.pcf $RPM_BUILD_ROOT%{nhgamedir}/fonts/ibm.pcf
+install -D -p -m 644 nh10.pcf $RPM_BUILD_ROOT%{nhgamedir}/fonts/nh10.pcf
 mkfontdir $RPM_BUILD_ROOT%{nhgamedir}/fonts
 
 %{__sed} -i -e 's:^!\(NetHack.tile_file.*\):\1:' \
@@ -116,7 +116,7 @@
 %{nhgamedir}/pet_mark.xbm
 %{nhgamedir}/rip.xpm
 %{nhgamedir}/x11tiles
-%{nhgamedir}/fonts/*
+%{nhgamedir}/fonts/
 %defattr(0664,root,games)
 %config(noreplace) %{nhdatadir}/record
 %config(noreplace) %{nhdatadir}/perm



From fedora-extras-commits at redhat.com  Thu Sep  8 06:08:20 2005
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Thu,  8 Sep 2005 02:08:20 -0400
Subject: rpms/nethack/devel nethack-3.4.3-makefile.patch,1.2,1.3
Message-ID: <200509080608.j8868Kce015387@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/extras/rpms/nethack/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15345

Modified Files:
	nethack-3.4.3-makefile.patch 
Log Message:
- Add /usr/X11R6/lib64 to LFLAGS to [hopefully] fix compilation errors on x86_64


nethack-3.4.3-makefile.patch:

Index: nethack-3.4.3-makefile.patch
===================================================================
RCS file: /cvs/extras/rpms/nethack/devel/nethack-3.4.3-makefile.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- nethack-3.4.3-makefile.patch	16 Aug 2005 17:08:58 -0000	1.2
+++ nethack-3.4.3-makefile.patch	8 Sep 2005 06:08:18 -0000	1.3
@@ -7,7 +7,7 @@
 -# CFLAGS = -O2 -fomit-frame-pointer -I../include
 -# LFLAGS = -L/usr/X11R6/lib
 +CFLAGS = $(RPM_OPT_FLAGS) -I../include
-+LFLAGS = -L/usr/X11R6/lib
++LFLAGS = -L/usr/X11R6/lib -L/usr/X11R6/lib64
  #   OR compile backwards compatible a.out format
  # CFLAGS = -O2 -b i486-linuxaout -fomit-frame-pointer -I../include
  # LFLAGS = -b i486-linuxaout -L/usr/X11R6/lib



From fedora-extras-commits at redhat.com  Thu Sep  8 06:21:37 2005
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Thu,  8 Sep 2005 02:21:37 -0400
Subject: rpms/nethack/devel nethack-3.4.3-makefile.patch, 1.3,
	1.4 nethack.spec, 1.4, 1.5
Message-ID: <200509080621.j886LbOQ015486@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/extras/rpms/nethack/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15456

Modified Files:
	nethack-3.4.3-makefile.patch nethack.spec 
Log Message:
- Regress hardcoding of lib64 path in makefile, and add correct path using %{_lib} during %prep


nethack-3.4.3-makefile.patch:

Index: nethack-3.4.3-makefile.patch
===================================================================
RCS file: /cvs/extras/rpms/nethack/devel/nethack-3.4.3-makefile.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- nethack-3.4.3-makefile.patch	8 Sep 2005 06:08:18 -0000	1.3
+++ nethack-3.4.3-makefile.patch	8 Sep 2005 06:21:35 -0000	1.4
@@ -7,7 +7,7 @@
 -# CFLAGS = -O2 -fomit-frame-pointer -I../include
 -# LFLAGS = -L/usr/X11R6/lib
 +CFLAGS = $(RPM_OPT_FLAGS) -I../include
-+LFLAGS = -L/usr/X11R6/lib -L/usr/X11R6/lib64
++LFLAGS = -L/usr/X11R6/lib
  #   OR compile backwards compatible a.out format
  # CFLAGS = -O2 -b i486-linuxaout -fomit-frame-pointer -I../include
  # LFLAGS = -b i486-linuxaout -L/usr/X11R6/lib


Index: nethack.spec
===================================================================
RCS file: /cvs/extras/rpms/nethack/devel/nethack.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- nethack.spec	8 Sep 2005 05:50:33 -0000	1.4
+++ nethack.spec	8 Sep 2005 06:21:35 -0000	1.5
@@ -54,6 +54,10 @@
 %{__sed} -i -e "s:/usr/games/lib/nethackdir:%{nhgamedir}:" \
         doc/nethack.6 doc/nethack.txt doc/recover.6 doc/recover.txt
 
+# Point the linker in the right direction
+%{__sed} -i -e "s:-L/usr/X11R6/lib:-L/usr/X11R6/%{_lib}:" \
+        src/Makefile util/Makefile
+
 
 %build
 make all



From fedora-extras-commits at redhat.com  Thu Sep  8 06:37:04 2005
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Thu,  8 Sep 2005 02:37:04 -0400
Subject: rpms/nethack/devel nethack.spec,1.5,1.6
Message-ID: <200509080637.j886b45N015601@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/extras/rpms/nethack/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15582

Modified Files:
	nethack.spec 
Log Message:
- Rev bump



Index: nethack.spec
===================================================================
RCS file: /cvs/extras/rpms/nethack/devel/nethack.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- nethack.spec	8 Sep 2005 06:21:35 -0000	1.5
+++ nethack.spec	8 Sep 2005 06:37:02 -0000	1.6
@@ -3,7 +3,7 @@
 
 Name:           nethack
 Version:        3.4.3
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A rogue-like single player dungeon exploration game
 
 Group:          Amusements/Games
@@ -131,6 +131,9 @@
 
 
 %changelog
+* Thu Sep 08 2005 Luke Macken  3.4.3-3
+- Point linker in the right direction using %{_lib} to fix x86_64 build issues
+
 * Tue Sep 06 2005 Luke Macken  3.4.3-2
 - Enable x11 support
 



From fedora-extras-commits at redhat.com  Thu Sep  8 08:39:54 2005
From: fedora-extras-commits at redhat.com (Paul P Komkoff Jr (stingray))
Date: Thu,  8 Sep 2005 04:39:54 -0400
Subject: owners owners.list,1.177,1.178
Message-ID: <200509080839.j888dsfk018954@cvs-int.fedora.redhat.com>

Author: stingray

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18935

Modified Files:
	owners.list 
Log Message:
Add flow-tools: Tool set for working with NetFlow data



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.177
retrieving revision 1.178
diff -u -r1.177 -r1.178
--- owners.list	7 Sep 2005 18:56:37 -0000	1.177
+++ owners.list	8 Sep 2005 08:39:51 -0000	1.178
@@ -170,6 +170,7 @@
 Fedora Extras|firestarter|The Firestarter firewall tool for GNOME|compton at pcompton.com|extras-qa at fedoraproject.org|
 Fedora Extras|fish|A friendly interactive shell|liljencrantz at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|flim|Emacs library for handling email messages|petersen at redhat.com|extras-qa at fedoraproject.org|
+Fedora Extras|flow-tools|Tool set for working with NetFlow data|i at stingr.net|extras-qa at fedoraproject.org|
 Fedora Extras|fltk|A C++ user interface toolkit for X11, Win32, and MacOS X|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
 Fedora Extras|flumotion|flumotion - the Fluendo Streaming Server|thomas at apestaart.org|extras-qa at fedoraproject.org|
 Fedora Extras|fluxbox|Fluxbox is a windowmanager that is based on Blackbox|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Thu Sep  8 12:51:16 2005
From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten))
Date: Thu,  8 Sep 2005 08:51:16 -0400
Subject: devel/x3270 x3270.spec,1.7,1.8
Message-ID: <200509081251.j88CpGMW025183@cvs-int.fedora.redhat.com>

Author: karsten

Update of /cvs/extras/devel/x3270
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25164

Modified Files:
	x3270.spec 
Log Message:
> - add missing buildrequires so that x3270 will be built with SSL support
>   (#159527)



Index: x3270.spec
===================================================================
RCS file: /cvs/extras/devel/x3270/x3270.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- x3270.spec	20 Jul 2005 12:09:12 -0000	1.7
+++ x3270.spec	8 Sep 2005 12:51:14 -0000	1.8
@@ -5,7 +5,7 @@
 Summary: An X Window System based IBM 3278/3279 terminal emulator
 Name: x3270
 Version: 3.3.4
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: MIT
 Group: Applications/Internet
 URL: http://www.geocities.com/SiliconValley/Peaks/7814
@@ -20,7 +20,7 @@
 Patch4: x3270-3.3-syntax.patch
 Patch5: x3270-3.3-encoding.patch
 Prereq:  %{_prefix}/X11R6/bin/mkfontdir
-BuildPreReq: ncurses-devel readline-devel glibc-devel
+BuildPreReq: ncurses-devel readline-devel glibc-devel openssl-devel
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 %if %{desktop_file}
 Requires: /usr/bin/desktop-file-install
@@ -197,6 +197,10 @@
 %{_mandir}/man1/c3270*
 
 %changelog
+* Thu Sep 08 2005 Karsten Hopp  3.3.4-5
+- add missing buildrequires so that x3270 will be built with SSL support
+  (#159527)
+
 * Wed Jul 20 2005 Karsten Hopp  3.3.4-4
 - buildrequires xorg-x11-font-utils (#160737)
 - add disttag



From fedora-extras-commits at redhat.com  Thu Sep  8 15:08:40 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Thu,  8 Sep 2005 11:08:40 -0400
Subject: rpms/perl-Class-DBI-Pager/devel - New directory
Message-ID: <200509081508.j88F8eJI029620@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Class-DBI-Pager/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29591/perl-Class-DBI-Pager/devel

Log Message:
Directory /cvs/extras/rpms/perl-Class-DBI-Pager/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Sep  8 15:08:37 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Thu,  8 Sep 2005 11:08:37 -0400
Subject: rpms/perl-Class-DBI-Pager - New directory
Message-ID: <200509081508.j88F8bL7029601@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Class-DBI-Pager
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29591/perl-Class-DBI-Pager

Log Message:
Directory /cvs/extras/rpms/perl-Class-DBI-Pager added to the repository




From fedora-extras-commits at redhat.com  Thu Sep  8 15:09:04 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Thu,  8 Sep 2005 11:09:04 -0400
Subject: rpms/perl-Class-DBI-Pager Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200509081509.j88F94eH029681@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Class-DBI-Pager
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29646

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-Class-DBI-Pager


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Class-DBI-Pager
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Thu Sep  8 15:09:04 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Thu,  8 Sep 2005 11:09:04 -0400
Subject: rpms/perl-Class-DBI-Pager/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200509081509.j88F94kn029686@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Class-DBI-Pager/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29646/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Class-DBI-Pager


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Thu Sep  8 15:09:30 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Thu,  8 Sep 2005 11:09:30 -0400
Subject: rpms/perl-Class-DBI-Pager import.log,1.1,1.2
Message-ID: <200509081510.j88FA02V029752@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Class-DBI-Pager
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29714

Modified Files:
	import.log 
Log Message:
auto-import perl-Class-DBI-Pager-0.06-3 on branch devel from perl-Class-DBI-Pager-0.06-3.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-Pager/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	8 Sep 2005 15:09:02 -0000	1.1
+++ import.log	8 Sep 2005 15:09:28 -0000	1.2
@@ -0,0 +1 @@
+perl-Class-DBI-Pager-0_06-3:HEAD:perl-Class-DBI-Pager-0.06-3.src.rpm:1126192162



From fedora-extras-commits at redhat.com  Thu Sep  8 15:09:30 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Thu,  8 Sep 2005 11:09:30 -0400
Subject: rpms/perl-Class-DBI-Pager/devel perl-Class-DBI-Pager.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200509081510.j88FA1JT029756@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Class-DBI-Pager/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29714/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Class-DBI-Pager.spec 
Log Message:
auto-import perl-Class-DBI-Pager-0.06-3 on branch devel from perl-Class-DBI-Pager-0.06-3.src.rpm


--- NEW FILE perl-Class-DBI-Pager.spec ---
Name:           perl-Class-DBI-Pager
Version:        0.06
Release:        3%{?dist}
Summary:        Pager utility for Class::DBI
Group:          Development/Libraries
License:        GPL or Artistic
URL:            http://search.cpan.org/dist/Class-DBI-Pager
Source0:        http://search.cpan.org/CPAN/authors/id/M/MI/MIYAGAWA/Class-DBI-Pager-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:	perl(Class::DBI), perl(Data::Page), perl(Exporter::Lite), perl(DBD::SQLite)
Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
%{summary}.

%prep
%setup -q -n Class-DBI-Pager-%{version}
perldoc -t perlartistic > Artistic
perldoc -t perlgpl > COPYING

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'
find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';'
chmod -R u+w $RPM_BUILD_ROOT/*

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Artistic COPYING Changes
%{perl_vendorlib}/Class/DBI
%{_mandir}/man3/*.3*


%changelog
* Mon Sep  5 2005 Paul Howarth  0.06-3
- remove redundant BR: perl
- add BR: perl(Data::Page), perl(Exporter::Lite), perl(DBD::SQLite)
- honor %%{_smp_mflags}
- include license text
- remove explicit perl(Class::DBI) dep - it's autodetected

* Fri Jul  8 2005 Tom "spot" Callaway  0.06-2
- cleanups

* Wed Jul  6 2005 Tom "spot" Callaway  0.06-1
- Initial package for Fedora Extras


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-Pager/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	8 Sep 2005 15:09:02 -0000	1.1
+++ .cvsignore	8 Sep 2005 15:09:28 -0000	1.2
@@ -0,0 +1 @@
+Class-DBI-Pager-0.06.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-Pager/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	8 Sep 2005 15:09:02 -0000	1.1
+++ sources	8 Sep 2005 15:09:28 -0000	1.2
@@ -0,0 +1 @@
+358429211e6264779d37834ecf728ac1  Class-DBI-Pager-0.06.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep  8 15:14:48 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Thu,  8 Sep 2005 11:14:48 -0400
Subject: rpms/perl-Class-DBI-AbstractSearch - New directory
Message-ID: <200509081514.j88FEmfn030068@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Class-DBI-AbstractSearch
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30044/perl-Class-DBI-AbstractSearch

Log Message:
Directory /cvs/extras/rpms/perl-Class-DBI-AbstractSearch added to the repository




From fedora-extras-commits at redhat.com  Thu Sep  8 15:14:49 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Thu,  8 Sep 2005 11:14:49 -0400
Subject: rpms/perl-Class-DBI-AbstractSearch/devel - New directory
Message-ID: <200509081514.j88FEneA030073@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Class-DBI-AbstractSearch/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30044/perl-Class-DBI-AbstractSearch/devel

Log Message:
Directory /cvs/extras/rpms/perl-Class-DBI-AbstractSearch/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Sep  8 15:14:59 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Thu,  8 Sep 2005 11:14:59 -0400
Subject: rpms/perl-Class-DBI-AbstractSearch Makefile, NONE, 1.1 import.log,
	NONE, 1.1
Message-ID: <200509081514.j88FExpr030124@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Class-DBI-AbstractSearch
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30089

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-Class-DBI-AbstractSearch


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Class-DBI-AbstractSearch
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Thu Sep  8 15:15:00 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Thu,  8 Sep 2005 11:15:00 -0400
Subject: rpms/perl-Class-DBI-AbstractSearch/devel .cvsignore, NONE,
	1.1 Makefile, NONE, 1.1 sources, NONE, 1.1
Message-ID: <200509081515.j88FF06S030129@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Class-DBI-AbstractSearch/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30089/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Class-DBI-AbstractSearch


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Thu Sep  8 15:15:24 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Thu,  8 Sep 2005 11:15:24 -0400
Subject: rpms/perl-Class-DBI-AbstractSearch import.log,1.1,1.2
Message-ID: <200509081515.j88FFO9J030194@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Class-DBI-AbstractSearch
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30159

Modified Files:
	import.log 
Log Message:
auto-import perl-Class-DBI-AbstractSearch-0.05-3 on branch devel from perl-Class-DBI-AbstractSearch-0.05-3.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-AbstractSearch/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	8 Sep 2005 15:14:57 -0000	1.1
+++ import.log	8 Sep 2005 15:15:22 -0000	1.2
@@ -0,0 +1 @@
+perl-Class-DBI-AbstractSearch-0_05-3:HEAD:perl-Class-DBI-AbstractSearch-0.05-3.src.rpm:1126192517



From fedora-extras-commits at redhat.com  Thu Sep  8 15:15:25 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Thu,  8 Sep 2005 11:15:25 -0400
Subject: rpms/perl-Class-DBI-AbstractSearch/devel
	perl-Class-DBI-AbstractSearch.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200509081515.j88FFPAr030201@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Class-DBI-AbstractSearch/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30159/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Class-DBI-AbstractSearch.spec 
Log Message:
auto-import perl-Class-DBI-AbstractSearch-0.05-3 on branch devel from perl-Class-DBI-AbstractSearch-0.05-3.src.rpm


--- NEW FILE perl-Class-DBI-AbstractSearch.spec ---
Name:           perl-Class-DBI-AbstractSearch
Version:        0.05
Release:        3%{?dist}
Summary:        Abstract Class::DBI's SQL with SQL::Abstract
Group:          Development/Libraries
License:        GPL or Artistic
URL:            http://search.cpan.org/dist/Class-DBI-AbstractSearch
Source0:        http://search.cpan.org/CPAN/authors/id/M/MI/MIYAGAWA/Class-DBI-AbstractSearch-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:	perl(Class::DBI), perl(DBD::SQLite), perl(SQL::Abstract)
Requires:  perl(Class::DBI)
Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
%{summary}.

%prep
%setup -q -n Class-DBI-AbstractSearch-%{version}
perldoc -t perlartistic > Artistic
perldoc -t perlgpl > COPYING

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'
find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';'
chmod -R u+w $RPM_BUILD_ROOT/*

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Artistic COPYING Changes
%{perl_vendorlib}/Class/DBI
%{_mandir}/man3/*.3*


%changelog
* Tue Sep  6 2005 Paul Howarth  0.05-3
- remove redundant BR: perl
- honor %%{?_smp_mflags}
- include license text
- add BR: perl(DBD::SQLite) for better test coverage

* Fri Jul  8 2005 Tom "spot" Callaway  0.05-2
- cleanups

* Wed Jul  6 2005 Tom "spot" Callaway  0.05-1
- Initial package for Fedora Extras


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-AbstractSearch/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	8 Sep 2005 15:14:58 -0000	1.1
+++ .cvsignore	8 Sep 2005 15:15:23 -0000	1.2
@@ -0,0 +1 @@
+Class-DBI-AbstractSearch-0.05.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-AbstractSearch/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	8 Sep 2005 15:14:58 -0000	1.1
+++ sources	8 Sep 2005 15:15:23 -0000	1.2
@@ -0,0 +1 @@
+34e35114a22f1281f86c57a4ae54c62e  Class-DBI-AbstractSearch-0.05.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep  8 15:18:51 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Thu,  8 Sep 2005 11:18:51 -0400
Subject: rpms/perl-Class-DBI-FromCGI - New directory
Message-ID: <200509081518.j88FIpDJ030453@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Class-DBI-FromCGI
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30429/perl-Class-DBI-FromCGI

Log Message:
Directory /cvs/extras/rpms/perl-Class-DBI-FromCGI added to the repository




From fedora-extras-commits at redhat.com  Thu Sep  8 15:18:52 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Thu,  8 Sep 2005 11:18:52 -0400
Subject: rpms/perl-Class-DBI-FromCGI/devel - New directory
Message-ID: <200509081518.j88FIqRI030458@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Class-DBI-FromCGI/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30429/perl-Class-DBI-FromCGI/devel

Log Message:
Directory /cvs/extras/rpms/perl-Class-DBI-FromCGI/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Sep  8 15:19:06 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Thu,  8 Sep 2005 11:19:06 -0400
Subject: rpms/perl-Class-DBI-FromCGI Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200509081519.j88FJ6oD030509@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Class-DBI-FromCGI
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30474

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-Class-DBI-FromCGI


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Class-DBI-FromCGI
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Thu Sep  8 15:19:07 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Thu,  8 Sep 2005 11:19:07 -0400
Subject: rpms/perl-Class-DBI-FromCGI/devel .cvsignore, NONE, 1.1 Makefile,
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <200509081519.j88FJ7AL030514@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Class-DBI-FromCGI/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30474/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Class-DBI-FromCGI


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Thu Sep  8 15:19:29 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Thu,  8 Sep 2005 11:19:29 -0400
Subject: rpms/perl-Class-DBI-FromCGI import.log,1.1,1.2
Message-ID: <200509081519.j88FJx4x030583@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Class-DBI-FromCGI
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30545

Modified Files:
	import.log 
Log Message:
auto-import perl-Class-DBI-FromCGI-0.94-3 on branch devel from perl-Class-DBI-FromCGI-0.94-3.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-FromCGI/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	8 Sep 2005 15:19:04 -0000	1.1
+++ import.log	8 Sep 2005 15:19:27 -0000	1.2
@@ -0,0 +1 @@
+perl-Class-DBI-FromCGI-0_94-3:HEAD:perl-Class-DBI-FromCGI-0.94-3.src.rpm:1126192762



From fedora-extras-commits at redhat.com  Thu Sep  8 15:19:29 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Thu,  8 Sep 2005 11:19:29 -0400
Subject: rpms/perl-Class-DBI-FromCGI/devel perl-Class-DBI-FromCGI.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200509081519.j88FJx3x030587@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Class-DBI-FromCGI/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30545/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Class-DBI-FromCGI.spec 
Log Message:
auto-import perl-Class-DBI-FromCGI-0.94-3 on branch devel from perl-Class-DBI-FromCGI-0.94-3.src.rpm


--- NEW FILE perl-Class-DBI-FromCGI.spec ---
Name:           perl-Class-DBI-FromCGI
Version:        0.94
Release:        3%{?dist}
Summary:        Update Class::DBI data using CGI::Untaint
Group:          Development/Libraries
License:        GPL or Artistic
URL:            http://search.cpan.org/dist/Class-DBI-FromCGI
Source0:        http://search.cpan.org/CPAN/authors/id/T/TM/TMTM/Class-DBI-FromCGI-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:	perl(Class::DBI), perl(CGI::Untaint), perl(DBD::SQLite)
Requires:  perl(Class::DBI), perl(CGI::Untaint)
Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
%{summary}.

%prep
%setup -q -n Class-DBI-FromCGI-%{version}
perldoc -t perlartistic > Artistic
perldoc -t perlgpl > COPYING

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'
find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';'
chmod -R u+w $RPM_BUILD_ROOT/*

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Artistic COPYING Changes
%{perl_vendorlib}/Class/DBI
%{_mandir}/man3/*.3*


%changelog
* Wed Sep  7 2005 Paul Howarth  - 0.94-3
- remove redundant BR: perl
- honor %%{_smp_mflags}
- include license text
- add BR: perl(DBD::SQLite) for better test cover

* Fri Jul  8 2005 Tom "spot" Callaway  0.94-2
- cleanups

* Wed Jul  6 2005 Tom "spot" Callaway  0.94-1
- Initial package for Fedora Extras


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-FromCGI/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	8 Sep 2005 15:19:05 -0000	1.1
+++ .cvsignore	8 Sep 2005 15:19:27 -0000	1.2
@@ -0,0 +1 @@
+Class-DBI-FromCGI-0.94.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-FromCGI/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	8 Sep 2005 15:19:05 -0000	1.1
+++ sources	8 Sep 2005 15:19:27 -0000	1.2
@@ -0,0 +1 @@
+126040b7e83218197786de2c6699100f  Class-DBI-FromCGI-0.94.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep  8 15:21:46 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Thu,  8 Sep 2005 11:21:46 -0400
Subject: rpms/perl-Class-DBI-AsForm - New directory
Message-ID: <200509081521.j88FLkhD030837@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Class-DBI-AsForm
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30817/perl-Class-DBI-AsForm

Log Message:
Directory /cvs/extras/rpms/perl-Class-DBI-AsForm added to the repository




From fedora-extras-commits at redhat.com  Thu Sep  8 15:21:47 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Thu,  8 Sep 2005 11:21:47 -0400
Subject: rpms/perl-Class-DBI-AsForm/devel - New directory
Message-ID: <200509081521.j88FLllE030842@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Class-DBI-AsForm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30817/perl-Class-DBI-AsForm/devel

Log Message:
Directory /cvs/extras/rpms/perl-Class-DBI-AsForm/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Sep  8 15:22:02 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Thu,  8 Sep 2005 11:22:02 -0400
Subject: rpms/perl-Class-DBI-AsForm Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200509081522.j88FM2xF030894@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Class-DBI-AsForm
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30862

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-Class-DBI-AsForm


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Class-DBI-AsForm
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Thu Sep  8 15:22:03 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Thu,  8 Sep 2005 11:22:03 -0400
Subject: rpms/perl-Class-DBI-AsForm/devel .cvsignore, NONE, 1.1 Makefile,
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <200509081522.j88FM3XE030900@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Class-DBI-AsForm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30862/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Class-DBI-AsForm


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Thu Sep  8 15:22:26 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Thu,  8 Sep 2005 11:22:26 -0400
Subject: rpms/perl-Class-DBI-AsForm import.log,1.1,1.2
Message-ID: <200509081522.j88FMQhj030969@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Class-DBI-AsForm
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30934

Modified Files:
	import.log 
Log Message:
auto-import perl-Class-DBI-AsForm-2.41-3 on branch devel from perl-Class-DBI-AsForm-2.41-3.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-AsForm/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	8 Sep 2005 15:22:00 -0000	1.1
+++ import.log	8 Sep 2005 15:22:24 -0000	1.2
@@ -0,0 +1 @@
+perl-Class-DBI-AsForm-2_41-3:HEAD:perl-Class-DBI-AsForm-2.41-3.src.rpm:1126192939



From fedora-extras-commits at redhat.com  Thu Sep  8 15:22:26 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Thu,  8 Sep 2005 11:22:26 -0400
Subject: rpms/perl-Class-DBI-AsForm/devel perl-Class-DBI-AsForm.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200509081522.j88FMQRt030976@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Class-DBI-AsForm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30934/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Class-DBI-AsForm.spec 
Log Message:
auto-import perl-Class-DBI-AsForm-2.41-3 on branch devel from perl-Class-DBI-AsForm-2.41-3.src.rpm


--- NEW FILE perl-Class-DBI-AsForm.spec ---
Name:           perl-Class-DBI-AsForm
Version:        2.41
Release:        3%{?dist}
Summary:        Produce HTML form elements for database columns
Group:          Development/Libraries
License:        GPL or Artistic
URL:            http://search.cpan.org/dist/Class-DBI-AsForm
Source0:        http://search.cpan.org/CPAN/authors/id/T/TM/TMTM/Class-DBI-AsForm-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:	perl(Class::DBI), perl(HTML::Element), perl(Class::DBI::Plugin::Type)
BuildRequires:  perl(DBD::SQLite2)
Requires:  perl(Class::DBI)
Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
%{summary}.

%prep
%setup -q -n Class-DBI-AsForm-%{version}
perldoc -t perlartistic > Artistic
perldoc -t perlgpl > COPYING
 

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'
find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';'
chmod -R u+w $RPM_BUILD_ROOT/*

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Artistic COPYING Changes
%{perl_vendorlib}/Class/DBI
%{_mandir}/man3/*.3*


%changelog
* Wed Sep  7 2005 Tom "spot" Callaway  2.41-3
- remove redundant BR: perl
- honor %%{_smp_mflags}
- include license text

* Fri Jul  8 2005 Tom "spot" Callaway  2.41-2
- cleanups

* Wed Jul  6 2005 Tom "spot" Callaway  2.41-1
- Initial package for Fedora Extras


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-AsForm/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	8 Sep 2005 15:22:01 -0000	1.1
+++ .cvsignore	8 Sep 2005 15:22:24 -0000	1.2
@@ -0,0 +1 @@
+Class-DBI-AsForm-2.41.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-AsForm/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	8 Sep 2005 15:22:01 -0000	1.1
+++ sources	8 Sep 2005 15:22:24 -0000	1.2
@@ -0,0 +1 @@
+123ef74dd79a632b881189334cfa6827  Class-DBI-AsForm-2.41.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep  8 15:27:06 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Thu,  8 Sep 2005 11:27:06 -0400
Subject: owners owners.list,1.178,1.179
Message-ID: <200509081527.j88FR6kV031199@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31170

Modified Files:
	owners.list 
Log Message:

perl-Class-DBI-Pager, perl-Class-DBI-AsForm, perl-Class-DBI-AbstractSearch, perl-Class-DBI-FromCGI



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.178
retrieving revision 1.179
diff -u -r1.178 -r1.179
--- owners.list	8 Sep 2005 08:39:51 -0000	1.178
+++ owners.list	8 Sep 2005 15:27:04 -0000	1.179
@@ -576,7 +576,11 @@
 Fedora Extras|perl-Class-Container|Perl module for building frameworks of classes|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Class-Data-Inheritable|Inheritable, overridable class data|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Class-DBI|Simple Database Abstraction|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Class-DBI-AbstractSearch|Abstract Class::DBI's SQL with SQL::Abstract|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Class-DBI-AsForm|Produce HTML form elements for database columns|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Class-DBI-FromCGI|Update Class::DBI data using CGI::Untaint|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Class-DBI-mysql|Extensions to Class::DBI for MySQL|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Class-DBI-Pager|Pager utility for Class::DBI|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Class-DBI-Plugin|Abstract base class for Class::DBI plugins|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Class-DBI-Plugin-RetrieveAll|More complex retrieve_all() for Class::DBI|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Class-DBI-Plugin-Type|Determine type information for columns|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Thu Sep  8 16:29:31 2005
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Thu,  8 Sep 2005 12:29:31 -0400
Subject: rpms/perl-Class-Singleton/devel perl-Class-Singleton.spec,1.1,1.2
Message-ID: <200509081629.j88GTVV6000566@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Class-Singleton/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv547

Modified Files:
	perl-Class-Singleton.spec 
Log Message:
Fix permissions on Singleton.pm.


Index: perl-Class-Singleton.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-Singleton/devel/perl-Class-Singleton.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Class-Singleton.spec	7 Sep 2005 21:50:45 -0000	1.1
+++ perl-Class-Singleton.spec	8 Sep 2005 16:29:29 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-Class-Singleton
 Version:        1.03
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Class::Singleton Perl module
 License:        Artistic
 Group:          Development/Libraries
@@ -22,6 +22,7 @@
 
 %prep
 %setup -q -n Class-Singleton-%{version}
+chmod a-x Singleton.pm
 
 %build
 %{__perl} Makefile.PL INSTALLDIRS=vendor
@@ -52,5 +53,8 @@
 %{_mandir}/man3/*
 
 %changelog
+* Thu Sep 08 2005 Steven Pritchard  1.03-2
+- Fix permissions on Singleton.pm.
+
 * Wed Aug 31 2005 Steven Pritchard  1.03-1
 - Specfile autogenerated.



From fedora-extras-commits at redhat.com  Thu Sep  8 16:36:50 2005
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Thu,  8 Sep 2005 12:36:50 -0400
Subject: owners owners.list,1.179,1.180
Message-ID: <200509081636.j88GaoXK000656@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv637

Modified Files:
	owners.list 
Log Message:
Add perl-Class-Singleton.


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.179
retrieving revision 1.180
diff -u -r1.179 -r1.180
--- owners.list	8 Sep 2005 15:27:04 -0000	1.179
+++ owners.list	8 Sep 2005 16:36:48 -0000	1.180
@@ -587,6 +587,7 @@
 Fedora Extras|perl-Class-DBI-SQLite|Extension to Class::DBI for sqlite|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Class-MethodMaker|Create generic methods for OO Perl|dgregor at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Class-ReturnValue|Class::ReturnValue Perl module|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Class-Singleton|Class::Singleton Perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Class-Trigger|Mixin to add / call inheritable triggers|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Class-Whitehole|Base class to treat unhandled method calls as errors|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Config-General|Generic configuration module for Perl|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Thu Sep  8 17:20:32 2005
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Thu,  8 Sep 2005 13:20:32 -0400
Subject: rpms/nethack/devel nethack.spec,1.6,1.7
Message-ID: <200509081720.j88HKWgZ002231@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/extras/rpms/nethack/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2212

Modified Files:
	nethack.spec 
Log Message:
- don't expand macros in the changelog



Index: nethack.spec
===================================================================
RCS file: /cvs/extras/rpms/nethack/devel/nethack.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- nethack.spec	8 Sep 2005 06:37:02 -0000	1.6
+++ nethack.spec	8 Sep 2005 17:20:30 -0000	1.7
@@ -132,7 +132,7 @@
 
 %changelog
 * Thu Sep 08 2005 Luke Macken  3.4.3-3
-- Point linker in the right direction using %{_lib} to fix x86_64 build issues
+- Point linker in the right direction using %%{_lib} to fix x86_64 build issues
 
 * Tue Sep 06 2005 Luke Macken  3.4.3-2
 - Enable x11 support



From fedora-extras-commits at redhat.com  Thu Sep  8 18:29:36 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Thu,  8 Sep 2005 14:29:36 -0400
Subject: rpms/perl-Class-DBI-Pg - New directory
Message-ID: <200509081829.j88ITaac003692@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Class-DBI-Pg
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3672/perl-Class-DBI-Pg

Log Message:
Directory /cvs/extras/rpms/perl-Class-DBI-Pg added to the repository




From fedora-extras-commits at redhat.com  Thu Sep  8 18:29:36 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Thu,  8 Sep 2005 14:29:36 -0400
Subject: rpms/perl-Class-DBI-Pg/devel - New directory
Message-ID: <200509081829.j88ITafp003697@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Class-DBI-Pg/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3672/perl-Class-DBI-Pg/devel

Log Message:
Directory /cvs/extras/rpms/perl-Class-DBI-Pg/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Sep  8 18:29:51 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Thu,  8 Sep 2005 14:29:51 -0400
Subject: rpms/perl-Class-DBI-Pg Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200509081829.j88ITp1h003746@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Class-DBI-Pg
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3717

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-Class-DBI-Pg


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Class-DBI-Pg
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Thu Sep  8 18:29:52 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Thu,  8 Sep 2005 14:29:52 -0400
Subject: rpms/perl-Class-DBI-Pg/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200509081829.j88ITqHP003751@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Class-DBI-Pg/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3717/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Class-DBI-Pg


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Thu Sep  8 18:30:14 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Thu,  8 Sep 2005 14:30:14 -0400
Subject: rpms/perl-Class-DBI-Pg import.log,1.1,1.2
Message-ID: <200509081830.j88IUEHw003820@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Class-DBI-Pg
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3785

Modified Files:
	import.log 
Log Message:
auto-import perl-Class-DBI-Pg-0.06-3 on branch devel from perl-Class-DBI-Pg-0.06-3.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-Pg/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	8 Sep 2005 18:29:49 -0000	1.1
+++ import.log	8 Sep 2005 18:30:12 -0000	1.2
@@ -0,0 +1 @@
+perl-Class-DBI-Pg-0_06-3:HEAD:perl-Class-DBI-Pg-0.06-3.src.rpm:1126204207



From fedora-extras-commits at redhat.com  Thu Sep  8 18:30:14 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Thu,  8 Sep 2005 14:30:14 -0400
Subject: rpms/perl-Class-DBI-Pg/devel perl-Class-DBI-Pg.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200509081830.j88IUEKs003827@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Class-DBI-Pg/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3785/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Class-DBI-Pg.spec 
Log Message:
auto-import perl-Class-DBI-Pg-0.06-3 on branch devel from perl-Class-DBI-Pg-0.06-3.src.rpm


--- NEW FILE perl-Class-DBI-Pg.spec ---
Name:           perl-Class-DBI-Pg
Version:        0.06
Release:        3%{?dist}
Summary:        Class::DBI extension for PostgreSQL
Group:          Development/Libraries
License:        GPL or Artistic
URL:            http://search.cpan.org/dist/Class-DBI-Pg/
Source0:        http://search.cpan.org/CPAN/authors/id/S/SR/SRI/Class-DBI-Pg-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:	perl(Class::DBI), perl-DBD-Pg
Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
Requires:  perl-DBD-Pg

%description
%{summary}.

%prep
%setup -q -n Class-DBI-Pg-%{version}
perldoc -t perlartistic > Artistic
perldoc -t perlgpl > COPYING

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'
find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';'
chmod -R u+w $RPM_BUILD_ROOT/*

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Artistic COPYING Changes
%{perl_vendorlib}/Class/DBI
%{_mandir}/man3/*.3*


%changelog
* Fri Sep  2 2005 Paul Howarth  0.06-3
- remove redundant BR: perl
- honor %%{_smp_mflags}
- include license text
- add perl-DBD-Pg dep

* Fri Jul  8 2005 Tom "spot" Callaway  0.06-2
- cleanups

* Wed Jul  6 2005 Tom "spot" Callaway  0.06-1
- Initial package for Fedora Extras


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-Pg/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	8 Sep 2005 18:29:50 -0000	1.1
+++ .cvsignore	8 Sep 2005 18:30:12 -0000	1.2
@@ -0,0 +1 @@
+Class-DBI-Pg-0.06.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-Pg/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	8 Sep 2005 18:29:50 -0000	1.1
+++ sources	8 Sep 2005 18:30:12 -0000	1.2
@@ -0,0 +1 @@
+c68f3de33841ecb4c8a577fb63d4ff1e  Class-DBI-Pg-0.06.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep  8 18:36:15 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Thu,  8 Sep 2005 14:36:15 -0400
Subject: owners owners.list,1.180,1.181
Message-ID: <200509081836.j88IaFjs004047@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4028

Modified Files:
	owners.list 
Log Message:

perl-Class-DBI-Pg



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.180
retrieving revision 1.181
diff -u -r1.180 -r1.181
--- owners.list	8 Sep 2005 16:36:48 -0000	1.180
+++ owners.list	8 Sep 2005 18:36:13 -0000	1.181
@@ -581,6 +581,7 @@
 Fedora Extras|perl-Class-DBI-FromCGI|Update Class::DBI data using CGI::Untaint|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Class-DBI-mysql|Extensions to Class::DBI for MySQL|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Class-DBI-Pager|Pager utility for Class::DBI|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Class-DBI-Pg|Class::DBI extension for PostgreSQL|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Class-DBI-Plugin|Abstract base class for Class::DBI plugins|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Class-DBI-Plugin-RetrieveAll|More complex retrieve_all() for Class::DBI|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Class-DBI-Plugin-Type|Determine type information for columns|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Thu Sep  8 21:05:43 2005
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Thu,  8 Sep 2005 17:05:43 -0400
Subject: extras-buildsys/server ArchJob.py, 1.10, 1.10.2.1 PackageJob.py,
	1.21.2.3, 1.21.2.4
Message-ID: <200509082105.j88L5hwU008288@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys/server
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8252/server

Modified Files:
      Tag: STABLE_0_3
	ArchJob.py PackageJob.py 
Log Message:
2005-09-08  Dan Williams  

    * server/PackageJob.py
      server/ArchJob.py
        - Fail job if downloads from builder fail




Index: ArchJob.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/ArchJob.py,v
retrieving revision 1.10
retrieving revision 1.10.2.1
diff -u -r1.10 -r1.10.2.1
--- ArchJob.py	8 Aug 2005 02:54:16 -0000	1.10
+++ ArchJob.py	8 Sep 2005 21:05:22 -0000	1.10.2.1
@@ -50,6 +50,7 @@
         self.arch = arch
         self._builder_gone = False
         self.downloads = {}
+        self._download_failed = False
         self.starttime = time.time()
         self.endtime = 0
         self._die = False
@@ -65,6 +66,9 @@
             return True
         return False
 
+    def download_failed(self):
+        return self._download_failed
+
     def builder_prepping(self):
         if self.builder_status == 'prepping':
             return True
@@ -127,7 +131,7 @@
             files = self._server.files(self.jobid)
         except socket.error, e:
             if not CommonErrors.canIgnoreSocketError(e):
-                print "%s (%s/%s): [ %s ] Unknown error when signalling repo unlocked: '%s'" % (self.par_job.uid,
+                print "%s (%s/%s): [ %s ] Unknown error when getting file list: '%s'" % (self.par_job.uid,
                             self.par_job.package, self.arch, self.bci.address(), e)
         except xmlrpclib.ProtocolError, e:
             pass
@@ -170,6 +174,7 @@
             #   2: error
             #   3: done
             undownloaded = False
+            failed = False
             for url in self.downloads.keys():
                 dl_status = self.downloads[url]
                 if dl_status == 0:
@@ -193,6 +198,7 @@
                     break
                 elif dl_status == 2:
                     # error
+                    failed = True
                     continue
                 elif dl_status == 3:
                     # this one is done
@@ -202,6 +208,8 @@
             if not undownloaded:
                 self._print_downloaded_files()
                 self.endtime = time.time()
+                if failed:
+                    self._download_failed = True
                 self._set_status('done')
                 self.par_job.wake()
 


Index: PackageJob.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/PackageJob.py,v
retrieving revision 1.21.2.3
retrieving revision 1.21.2.4
diff -u -r1.21.2.3 -r1.21.2.4
--- PackageJob.py	31 Aug 2005 01:23:46 -0000	1.21.2.3
+++ PackageJob.py	8 Sep 2005 21:05:22 -0000	1.21.2.4
@@ -536,7 +536,12 @@
                 continue
             if job.get_status() is 'done':
                 if job.builder_failed():
-                    msg = "Job failed on arch %s\n" % (job.arch)
+                    msg = "Job failed on arch %s\n" % job.arch
+                    self._archjobs_lock.release()
+                    raise BuildError(msg, job.arch)
+                elif job.download_failed():
+                    msg = "Job failed on arch %s: couldn't download result files from builder '%s'.\n " \
+                            "Please contact the build system administrator." % (job.arch, builder.address())
                     self._archjobs_lock.release()
                     raise BuildError(msg, job.arch)
                 else:



From fedora-extras-commits at redhat.com  Thu Sep  8 21:05:19 2005
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Thu,  8 Sep 2005 17:05:19 -0400
Subject: extras-buildsys ChangeLog,1.97.2.14,1.97.2.15
Message-ID: <200509082106.j88L68Qk008293@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8252

Modified Files:
      Tag: STABLE_0_3
	ChangeLog 
Log Message:
2005-09-08  Dan Williams  

    * server/PackageJob.py
      server/ArchJob.py
        - Fail job if downloads from builder fail




Index: ChangeLog
===================================================================
RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v
retrieving revision 1.97.2.14
retrieving revision 1.97.2.15
diff -u -r1.97.2.14 -r1.97.2.15
--- ChangeLog	31 Aug 2005 18:28:58 -0000	1.97.2.14
+++ ChangeLog	8 Sep 2005 21:05:16 -0000	1.97.2.15
@@ -1,3 +1,9 @@
+2005-09-08  Dan Williams  
+
+    * server/PackageJob.py
+      server/ArchJob.py
+        - Fail job if downloads from builder fail
+
 2005-08-31  Dan Williams 
 
     * builder/builder.py



From fedora-extras-commits at redhat.com  Thu Sep  8 21:09:08 2005
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Thu,  8 Sep 2005 17:09:08 -0400
Subject: extras-buildsys/utils distro-rebuild.py,1.1,1.2
Message-ID: <200509082109.j88L98jk008357@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys/utils
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8338/utils

Modified Files:
	distro-rebuild.py 
Log Message:
Use nodeps when installing srpm


Index: distro-rebuild.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/distro-rebuild.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- distro-rebuild.py	7 Sep 2005 14:58:30 -0000	1.1
+++ distro-rebuild.py	8 Sep 2005 21:09:05 -0000	1.2
@@ -109,7 +109,7 @@
     os.rename(specfile_new, specfile)
 
     # rebuild the srpm
-    cmd = '/usr/bin/rpmbuild -bs --define "_sourcedir %s/usr/src/redhat/SOURCES" ' \
+    cmd = '/usr/bin/rpmbuild -bs --nodeps --define "_sourcedir %s/usr/src/redhat/SOURCES" ' \
             ' --define "_srcrpmdir %s" %s' % (temp_dir, temp_dir, specfile)
     (s, o) = commands.getstatusoutput(cmd)
     if s != 0:



From fedora-extras-commits at redhat.com  Thu Sep  8 21:10:27 2005
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Thu,  8 Sep 2005 17:10:27 -0400
Subject: extras-buildsys ChangeLog,1.116,1.117
Message-ID: <200509082110.j88LARUU008399@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8365

Modified Files:
	ChangeLog 
Log Message:
2005-09-08  Dan Williams  

    * server/PackageJob.py
      server/ArchJob.py
        - Fail job if downloads from builder fail




Index: ChangeLog
===================================================================
RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -r1.116 -r1.117
--- ChangeLog	7 Sep 2005 14:58:29 -0000	1.116
+++ ChangeLog	8 Sep 2005 21:10:25 -0000	1.117
@@ -1,3 +1,9 @@
+2005-09-08  Dan Williams  
+
+    * server/PackageJob.py
+      server/ArchJob.py
+        - Fail job if downloads from builder fail
+
 2005-09-07  Dan Williams  
 
     * utils/distro-rebuild.py



From fedora-extras-commits at redhat.com  Thu Sep  8 21:10:27 2005
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Thu,  8 Sep 2005 17:10:27 -0400
Subject: extras-buildsys/server PackageJob.py, 1.28, 1.29 ArchJob.py, 1.14,
	1.15
Message-ID: <200509082110.j88LARNG008406@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys/server
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8365/server

Modified Files:
	PackageJob.py ArchJob.py 
Log Message:
2005-09-08  Dan Williams  

    * server/PackageJob.py
      server/ArchJob.py
        - Fail job if downloads from builder fail




Index: PackageJob.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/PackageJob.py,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- PackageJob.py	31 Aug 2005 01:56:43 -0000	1.28
+++ PackageJob.py	8 Sep 2005 21:10:25 -0000	1.29
@@ -544,7 +544,7 @@
             if job.get_status() is 'done':
                 completed_jobs = completed_jobs + 1
 
-                if job.builder_failed():
+                if job.builder_failed() or job.download_failed():
                     failed_jobs = failed_jobs + 1
 
                     # Normal jobs will just stop when a single archjob fails, but
@@ -554,7 +554,12 @@
                     if not job.failure_noticed():
                         job.set_failure_noticed()
                         jobarch = job.arch()
-                        msg = "Job failed on arch %s\n" % (jobarch)
+                        msg = "Job failed."
+                        if job.builder_failed():
+                            msg = "Job failed on arch %s\n" % jobarch
+                        elif job.download_failed():
+                            msg = "Job failed on arch %s: couldn't download result files from builder '%s'.\n " \
+                            "Please contact the build system administrator." % (jobarch, builder.address())
                         self._archjobs_lock.release()
                         raise BuildError(msg, jobarch)
 


Index: ArchJob.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/ArchJob.py,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- ArchJob.py	29 Aug 2005 17:48:19 -0000	1.14
+++ ArchJob.py	8 Sep 2005 21:10:25 -0000	1.15
@@ -38,6 +38,7 @@
         self.status = 'running'
         self.builder_status = ''
         self._failure_noticed = False
+        self._download_failed = False
         self._target_dict = target_dict
         self._builder_gone = False
         self.downloads = {}
@@ -68,6 +69,9 @@
             return True
         return False
 
+    def download_failed(self):
+        return self._download_failed
+
     def builder_prepping(self):
         if self.builder_status == 'prepping':
             return True
@@ -132,7 +136,7 @@
             files = self._server.files(self.jobid)
         except socket.error, e:
             if not CommonErrors.canIgnoreSocketError(e):
-                print "%s (%s/%s): [ %s ] Unknown error when signalling repo unlocked: '%s'" % (self.par_job.uid,
+                print "%s (%s/%s): [ %s ] Unknown error when getting file list: '%s'" % (self.par_job.uid,
                             self.par_job.package, self._target_dict['arch'], self.bci.address(), e)
         except xmlrpclib.ProtocolError, e:
             pass
@@ -175,6 +179,7 @@
             #   2: error
             #   3: done
             undownloaded = False
+            failed = False
             for url in self.downloads.keys():
                 dl_status = self.downloads[url]
                 if dl_status == 0:
@@ -198,6 +203,7 @@
                     break
                 elif dl_status == 2:
                     # error
+                    failed = True
                     continue
                 elif dl_status == 3:
                     # this one is done
@@ -207,6 +213,8 @@
             if not undownloaded:
                 self._print_downloaded_files()
                 self.endtime = time.time()
+                if failed:
+                    self._download_failed = True
                 self._set_status('done')
                 self.par_job.wake()
 



From fedora-extras-commits at redhat.com  Thu Sep  8 21:38:56 2005
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Thu,  8 Sep 2005 17:38:56 -0400
Subject: rpms/plone/FC-4 .cvsignore, 1.5, 1.6 plone.spec, 1.9, 1.10 sources,
	1.5, 1.6
Message-ID: <200509082138.j88Lcur5008525@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/plone/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8462/FC-4

Modified Files:
	.cvsignore plone.spec sources 
Log Message:
- version 2.1 final


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/plone/FC-4/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	11 Aug 2005 09:20:10 -0000	1.5
+++ .cvsignore	8 Sep 2005 21:38:54 -0000	1.6
@@ -1 +1 @@
-Plone-2.1-rc2.tar.gz
+Plone-2.1.tar.gz


Index: plone.spec
===================================================================
RCS file: /cvs/extras/rpms/plone/FC-4/plone.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- plone.spec	11 Aug 2005 09:26:43 -0000	1.9
+++ plone.spec	8 Sep 2005 21:38:54 -0000	1.10
@@ -6,13 +6,12 @@
 
 Name:           plone
 Version:        2.1
-Release:        0.5.rc2%{?dist}
+Release:        1%{?dist}
 Summary:        User friendly and powerful open source Content Management System
 License:        GPL
 Group:          System Environment/Daemons
 URL:            http://www.plone.org/
-#Source0:        http://dl.sf.net/plone/Plone-%{version}.tar.gz
-Source0:        http://dl.sf.net/plone/Plone-2.1-rc2.tar.gz
+Source0:        http://dl.sf.net/plone/Plone-2.1.tar.gz
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -26,7 +25,7 @@
 products.
 
 %prep
-%setup -q -n Plone-%{version}-rc2
+%setup -q -n Plone-%{version}
 # Clean up sources
 find . -type d -name CVS | xargs rm -rf
 find . -type f -name .cvsignore | xargs rm -rf
@@ -55,6 +54,9 @@
 
 
 %changelog
+* Thu Sep 08 2005 Aurelien Bompard  2.1-1
+- version 2.1 final
+
 * Thu Aug 11 2005 Aurelien Bompard 
 - rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/plone/FC-4/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	11 Aug 2005 09:20:10 -0000	1.5
+++ sources	8 Sep 2005 21:38:54 -0000	1.6
@@ -1 +1 @@
-3d5866c3301269b282a7ee375605326a  Plone-2.1-rc2.tar.gz
+a72efb9aace662ac8f81f3f66ad7c44c  Plone-2.1.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep  8 21:38:55 2005
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Thu,  8 Sep 2005 17:38:55 -0400
Subject: rpms/plone/FC-3 .cvsignore, 1.3, 1.4 plone.spec, 1.3, 1.4 sources,
	1.3, 1.4
Message-ID: <200509082138.j88LctI4008517@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/plone/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8462/FC-3

Modified Files:
	.cvsignore plone.spec sources 
Log Message:
- version 2.1 final


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/plone/FC-3/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	15 Jun 2005 13:25:23 -0000	1.3
+++ .cvsignore	8 Sep 2005 21:38:53 -0000	1.4
@@ -1 +1 @@
-Plone-2.1-alpha2.tar.gz
+Plone-2.1.tar.gz


Index: plone.spec
===================================================================
RCS file: /cvs/extras/rpms/plone/FC-3/plone.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- plone.spec	15 Jun 2005 13:25:23 -0000	1.3
+++ plone.spec	8 Sep 2005 21:38:53 -0000	1.4
@@ -6,21 +6,17 @@
 
 Name:           plone
 Version:        2.1
-Release:        0.1.alpha2%{?dist}
-
+Release:        1%{?dist}
 Summary:        User friendly and powerful open source Content Management System
-
 License:        GPL
 Group:          System Environment/Daemons
 URL:            http://www.plone.org/
-#Source0:        http://dl.sf.net/plone/Plone-%{version}.tar.gz
-Source0:        http://dl.sf.net/plone/Plone-2.1-alpha2.tar.gz
+Source0:        http://dl.sf.net/plone/Plone-2.1.tar.gz
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArch:      noarch
 
 Requires:       zope >= %{zope_minver}
-Requires:       python >= %{python_minver}
+Requires:       python >= %{python_minver}, python-imaging
 
 %description
 Plone is a user friendly and powerful content management system based on Zope.
@@ -29,15 +25,12 @@
 products.
 
 %prep
-%setup -q -n Plone-%{version}-alpha2
-# Avoid conflicts
-mv README.txt Plone-README.txt
-mv CONTENTS.txt Plone-CONTENTS.txt
+%setup -q -n Plone-%{version}
 # Clean up sources
 find . -type d -name CVS | xargs rm -rf
 find . -type f -name .cvsignore | xargs rm -rf
+find . -type d -name .svn | xargs rm -rf
 find . -type f -name "*~" | xargs rm -rf
-rm -f Archetypes/content_driver/.DocBook.py.swp
 
 
 %install
@@ -46,6 +39,8 @@
 mkdir -p $RPM_BUILD_ROOT%{software_home}/Products
 cp -pr * $RPM_BUILD_ROOT%{software_home}/Products
 rm -rf $RPM_BUILD_ROOT%{software_home}/Products/BTreeFolder2
+rm -f $RPM_BUILD_ROOT%{software_home}/Products/README.txt
+rm -f $RPM_BUILD_ROOT%{software_home}/Products/CONTENTS.txt
 
 
 %clean
@@ -54,10 +49,25 @@
 
 %files
 %defattr(644,root,root,755)
+%doc README.txt CONTENTS.txt
 %{software_home}/Products/*
 
 
 %changelog
+* Thu Sep 08 2005 Aurelien Bompard  2.1-1
+- version 2.1 final
+
+* Thu Aug 11 2005 Aurelien Bompard 
+- rebuild
+
+* Thu Aug 11 2005 Aurelien Bompard  2.1-0.3.rc2
+- update to rc2
+- drop buildarch: noarch since _libdir depends on arch (on x86_64)
+- put readmes in %%doc
+
+* Mon Aug 01 2005 Aurelien Bompard  2.1-0.2.rc1
+- update to rc1
+
 * Wed Jun 15 2005 Aurelien Bompard  2.1-0.1.alpha2
 - update to 2.1 alpha2 to work with python >= 2.4 and zope >= 2.8
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/plone/FC-3/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	15 Jun 2005 13:25:23 -0000	1.3
+++ sources	8 Sep 2005 21:38:53 -0000	1.4
@@ -1 +1 @@
-8d9b162f3f848ccd133c04e393042f01  Plone-2.1-alpha2.tar.gz
+a72efb9aace662ac8f81f3f66ad7c44c  Plone-2.1.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep  8 21:38:56 2005
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Thu,  8 Sep 2005 17:38:56 -0400
Subject: rpms/plone/devel .cvsignore, 1.5, 1.6 plone.spec, 1.9, 1.10 sources,
	1.5, 1.6
Message-ID: <200509082138.j88LcupP008533@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/plone/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8462/devel

Modified Files:
	.cvsignore plone.spec sources 
Log Message:
- version 2.1 final


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/plone/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	11 Aug 2005 09:20:10 -0000	1.5
+++ .cvsignore	8 Sep 2005 21:38:54 -0000	1.6
@@ -1 +1 @@
-Plone-2.1-rc2.tar.gz
+Plone-2.1.tar.gz


Index: plone.spec
===================================================================
RCS file: /cvs/extras/rpms/plone/devel/plone.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- plone.spec	11 Aug 2005 09:26:44 -0000	1.9
+++ plone.spec	8 Sep 2005 21:38:54 -0000	1.10
@@ -6,13 +6,12 @@
 
 Name:           plone
 Version:        2.1
-Release:        0.5.rc2%{?dist}
+Release:        1%{?dist}
 Summary:        User friendly and powerful open source Content Management System
 License:        GPL
 Group:          System Environment/Daemons
 URL:            http://www.plone.org/
-#Source0:        http://dl.sf.net/plone/Plone-%{version}.tar.gz
-Source0:        http://dl.sf.net/plone/Plone-2.1-rc2.tar.gz
+Source0:        http://dl.sf.net/plone/Plone-2.1.tar.gz
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -26,7 +25,7 @@
 products.
 
 %prep
-%setup -q -n Plone-%{version}-rc2
+%setup -q -n Plone-%{version}
 # Clean up sources
 find . -type d -name CVS | xargs rm -rf
 find . -type f -name .cvsignore | xargs rm -rf
@@ -55,6 +54,9 @@
 
 
 %changelog
+* Thu Sep 08 2005 Aurelien Bompard  2.1-1
+- version 2.1 final
+
 * Thu Aug 11 2005 Aurelien Bompard 
 - rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/plone/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	11 Aug 2005 09:20:10 -0000	1.5
+++ sources	8 Sep 2005 21:38:54 -0000	1.6
@@ -1 +1 @@
-3d5866c3301269b282a7ee375605326a  Plone-2.1-rc2.tar.gz
+a72efb9aace662ac8f81f3f66ad7c44c  Plone-2.1.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep  8 23:11:32 2005
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Thu,  8 Sep 2005 19:11:32 -0400
Subject: rpms/python-durus/devel .cvsignore, 1.3, 1.4 python-durus.spec, 1.5,
	1.6 sources, 1.3, 1.4
Message-ID: <200509082311.j88NBWvn011615@cvs-int.fedora.redhat.com>

Author: shahms

Update of /cvs/extras/rpms/python-durus/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11554/devel

Modified Files:
	.cvsignore python-durus.spec sources 
Log Message:
Update to new upstream version 2.1.  Skipped the 2.0 update as there
were no code changes, just a minor license change.




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-durus/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	13 Apr 2005 18:59:38 -0000	1.3
+++ .cvsignore	8 Sep 2005 23:11:30 -0000	1.4
@@ -1 +1 @@
-Durus-1.5.tar.gz
+Durus-3.0.tar.gz


Index: python-durus.spec
===================================================================
RCS file: /cvs/extras/rpms/python-durus/devel/python-durus.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- python-durus.spec	22 Apr 2005 15:48:52 -0000	1.5
+++ python-durus.spec	8 Sep 2005 23:11:30 -0000	1.6
@@ -3,8 +3,8 @@
 %define srcname Durus
 
 Name:           python-durus
-Version:        1.5
-Release:        2
+Version:        3.0
+Release:        1%{?dist}
 Summary:        A Python Object Database
 
 Group:          Development/Libraries
@@ -53,6 +53,10 @@
 %{_bindir}/durus
 
 %changelog
+* Thu Sep 08 2005 Shahms E. King  3.0-1
+- Update to upstream 3.0 (2.0 was only a license change, no code)
+- Add dist tag
+
 * Fri Apr 22 2005 Shahms E. King  1.5-2
 - Increment Release to fix EVR problem
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-durus/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	13 Apr 2005 18:59:38 -0000	1.3
+++ sources	8 Sep 2005 23:11:30 -0000	1.4
@@ -1 +1 @@
-c7bf836616cff8e5b8e7b01db3665e11  Durus-1.5.tar.gz
+de1830c7f7f7e63b0c8783ee1c806c91  Durus-3.0.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep  8 23:11:26 2005
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Thu,  8 Sep 2005 19:11:26 -0400
Subject: rpms/python-durus/FC-3 .cvsignore, 1.3, 1.4 python-durus.spec, 1.2,
	1.3 sources, 1.3, 1.4
Message-ID: <200509082311.j88NBvTm011620@cvs-int.fedora.redhat.com>

Author: shahms

Update of /cvs/extras/rpms/python-durus/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11554/FC-3

Modified Files:
	.cvsignore python-durus.spec sources 
Log Message:
Update to new upstream version 2.1.  Skipped the 2.0 update as there
were no code changes, just a minor license change.




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-durus/FC-3/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	13 Apr 2005 18:57:41 -0000	1.3
+++ .cvsignore	8 Sep 2005 23:11:24 -0000	1.4
@@ -1 +1 @@
-Durus-1.5.tar.gz
+Durus-3.0.tar.gz


Index: python-durus.spec
===================================================================
RCS file: /cvs/extras/rpms/python-durus/FC-3/python-durus.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- python-durus.spec	13 Apr 2005 18:57:41 -0000	1.2
+++ python-durus.spec	8 Sep 2005 23:11:24 -0000	1.3
@@ -3,14 +3,14 @@
 %define srcname Durus
 
 Name:           python-durus
-Version:        1.5
-Release:        1
+Version:        3.0
+Release:        1%{?dist}
 Summary:        A Python Object Database
 
 Group:          Development/Libraries
 License:        CNRI
 URL:            http://www.mems-exchange.org/software/durus/
-Source0:        http://www.mems-exchange.org/software/files/durus/Durus-1.5.tar.gz
+Source0:        http://www.mems-exchange.org/software/files/durus/Durus-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python-devel
@@ -53,9 +53,19 @@
 %{_bindir}/durus
 
 %changelog
-* Fri Mar 25 2005 Shahms E. King  1.5-1
+* Thu Sep 08 2005 Shahms E. King  3.0-1
+- Update to upstream 3.0 (2.0 was only a license change, no code)
+- Add dist tag
+
+* Fri Apr 22 2005 Shahms E. King  1.5-2
+- Increment Release to fix EVR problem
+
+* Wed Apr 13 2005 Shahms E. King  1.5-1
 - New upstream version
 - Remove unnecessary python_sitelib define
 
+* Fri Apr  7 2005 Michael Schwendt 
+- rebuilt
+
 * Tue Mar 01 2005 Shahms E. King  1.4-1
 - Initial Release


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-durus/FC-3/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	13 Apr 2005 18:57:41 -0000	1.3
+++ sources	8 Sep 2005 23:11:24 -0000	1.4
@@ -1 +1 @@
-c7bf836616cff8e5b8e7b01db3665e11  Durus-1.5.tar.gz
+de1830c7f7f7e63b0c8783ee1c806c91  Durus-3.0.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep  8 23:11:27 2005
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Thu,  8 Sep 2005 19:11:27 -0400
Subject: rpms/python-durus/FC-4 .cvsignore, 1.3, 1.4 python-durus.spec, 1.5,
	1.6 sources, 1.3, 1.4
Message-ID: <200509082311.j88NBvV6011625@cvs-int.fedora.redhat.com>

Author: shahms

Update of /cvs/extras/rpms/python-durus/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11554/FC-4

Modified Files:
	.cvsignore python-durus.spec sources 
Log Message:
Update to new upstream version 2.1.  Skipped the 2.0 update as there
were no code changes, just a minor license change.




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-durus/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	13 Apr 2005 18:59:38 -0000	1.3
+++ .cvsignore	8 Sep 2005 23:11:25 -0000	1.4
@@ -1 +1 @@
-Durus-1.5.tar.gz
+Durus-3.0.tar.gz


Index: python-durus.spec
===================================================================
RCS file: /cvs/extras/rpms/python-durus/FC-4/python-durus.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- python-durus.spec	22 Apr 2005 15:48:52 -0000	1.5
+++ python-durus.spec	8 Sep 2005 23:11:25 -0000	1.6
@@ -3,8 +3,8 @@
 %define srcname Durus
 
 Name:           python-durus
-Version:        1.5
-Release:        2
+Version:        3.0
+Release:        1%{?dist}
 Summary:        A Python Object Database
 
 Group:          Development/Libraries
@@ -53,6 +53,10 @@
 %{_bindir}/durus
 
 %changelog
+* Thu Sep 08 2005 Shahms E. King  3.0-1
+- Update to upstream 3.0 (2.0 was only a license change, no code)
+- Add dist tag
+
 * Fri Apr 22 2005 Shahms E. King  1.5-2
 - Increment Release to fix EVR problem
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-durus/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	13 Apr 2005 18:59:38 -0000	1.3
+++ sources	8 Sep 2005 23:11:25 -0000	1.4
@@ -1 +1 @@
-c7bf836616cff8e5b8e7b01db3665e11  Durus-1.5.tar.gz
+de1830c7f7f7e63b0c8783ee1c806c91  Durus-3.0.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep  8 23:14:12 2005
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Thu,  8 Sep 2005 19:14:12 -0400
Subject: rpms/python-quixote/FC-4 .cvsignore, 1.3, 1.4 python-quixote.spec,
	1.4, 1.5 sources, 1.3, 1.4
Message-ID: <200509082314.j88NEhRw011697@cvs-int.fedora.redhat.com>

Author: shahms

Update of /cvs/extras/rpms/python-quixote/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11655/FC-4

Modified Files:
	.cvsignore python-quixote.spec sources 
Log Message:
Update to new upstream version 2.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-quixote/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	13 Apr 2005 20:09:53 -0000	1.3
+++ .cvsignore	8 Sep 2005 23:14:10 -0000	1.4
@@ -1 +1 @@
-Quixote-2.0.tar.gz
+Quixote-2.1.tar.gz


Index: python-quixote.spec
===================================================================
RCS file: /cvs/extras/rpms/python-quixote/FC-4/python-quixote.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- python-quixote.spec	13 Apr 2005 20:09:53 -0000	1.4
+++ python-quixote.spec	8 Sep 2005 23:14:10 -0000	1.5
@@ -3,8 +3,8 @@
 %define srcname Quixote
 
 Name:           python-quixote
-Version:        2.0
-Release:        1
+Version:        2.1
+Release:        1%{?dist}
 Summary:        A highly Pythonic Web application framework
 
 Group:          Development/Libraries
@@ -70,6 +70,10 @@
 %ghost %{python_sitearch}/quixote/html/*.pyo
 
 %changelog
+* Thu Sep 08 2005 Shahms E. King  2.1-1
+- update to new upstream 2.1
+- add dist tag
+
 * Wed Apr 13 2005 Shahms E. King  2.0-1
 - update to Quixote 2.0
 - removed unused python_sitelib


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-quixote/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	13 Apr 2005 20:09:53 -0000	1.3
+++ sources	8 Sep 2005 23:14:10 -0000	1.4
@@ -1 +1 @@
-2c22a99db4ebe1e876a51d800e417f6f  Quixote-2.0.tar.gz
+21134661449e3b2e26139a0acc4d3b52  Quixote-2.1.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep  8 23:14:13 2005
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Thu,  8 Sep 2005 19:14:13 -0400
Subject: rpms/python-quixote/devel .cvsignore, 1.3, 1.4 python-quixote.spec,
	1.4, 1.5 sources, 1.3, 1.4
Message-ID: <200509082314.j88NEhX4011702@cvs-int.fedora.redhat.com>

Author: shahms

Update of /cvs/extras/rpms/python-quixote/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11655/devel

Modified Files:
	.cvsignore python-quixote.spec sources 
Log Message:
Update to new upstream version 2.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-quixote/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	13 Apr 2005 20:09:53 -0000	1.3
+++ .cvsignore	8 Sep 2005 23:14:11 -0000	1.4
@@ -1 +1 @@
-Quixote-2.0.tar.gz
+Quixote-2.1.tar.gz


Index: python-quixote.spec
===================================================================
RCS file: /cvs/extras/rpms/python-quixote/devel/python-quixote.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- python-quixote.spec	13 Apr 2005 20:09:53 -0000	1.4
+++ python-quixote.spec	8 Sep 2005 23:14:11 -0000	1.5
@@ -3,8 +3,8 @@
 %define srcname Quixote
 
 Name:           python-quixote
-Version:        2.0
-Release:        1
+Version:        2.1
+Release:        1%{?dist}
 Summary:        A highly Pythonic Web application framework
 
 Group:          Development/Libraries
@@ -70,6 +70,10 @@
 %ghost %{python_sitearch}/quixote/html/*.pyo
 
 %changelog
+* Thu Sep 08 2005 Shahms E. King  2.1-1
+- update to new upstream 2.1
+- add dist tag
+
 * Wed Apr 13 2005 Shahms E. King  2.0-1
 - update to Quixote 2.0
 - removed unused python_sitelib


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-quixote/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	13 Apr 2005 20:09:53 -0000	1.3
+++ sources	8 Sep 2005 23:14:11 -0000	1.4
@@ -1 +1 @@
-2c22a99db4ebe1e876a51d800e417f6f  Quixote-2.0.tar.gz
+21134661449e3b2e26139a0acc4d3b52  Quixote-2.1.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep  8 23:20:55 2005
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Thu,  8 Sep 2005 19:20:55 -0400
Subject: rpms/python-psycopg/FC-3 .cvsignore, 1.2, 1.3 python-psycopg.spec,
	1.3, 1.4 sources, 1.2, 1.3
Message-ID: <200509082320.j88NKtXD011904@cvs-int.fedora.redhat.com>

Author: shahms

Update of /cvs/extras/rpms/python-psycopg/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11850/FC-3

Modified Files:
	.cvsignore python-psycopg.spec sources 
Log Message:
Update to new upstream version 1.1.19



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-psycopg/FC-3/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	15 Mar 2005 20:52:06 -0000	1.2
+++ .cvsignore	8 Sep 2005 23:20:53 -0000	1.3
@@ -1 +1 @@
-psycopg-1.1.18.tar.gz
+psycopg-1.1.19.tar.gz


Index: python-psycopg.spec
===================================================================
RCS file: /cvs/extras/rpms/python-psycopg/FC-3/python-psycopg.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- python-psycopg.spec	12 May 2005 14:51:01 -0000	1.3
+++ python-psycopg.spec	8 Sep 2005 23:20:53 -0000	1.4
@@ -3,15 +3,15 @@
 %define srcname psycopg
 
 Name:           python-psycopg
-Version:        1.1.18
-Release:        4%{?dist}
+Version:        1.1.19
+Release:        1%{?dist}
 
 Summary:        PostgreSQL database adapter for Python
 
 Group:          Development/Libraries
 License:        GPL
 URL:            http://www.initd.org/software/initd/psycopg
-Source0:        http://initd.org/pub/software/psycopg/psycopg-1.1.18.tar.gz
+Source0:        http://initd.org/pub/software/psycopg/%{srcname}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python-devel postgresql-devel mx
@@ -54,6 +54,9 @@
 %{python_sitearch}/*.so
 
 %changelog
+* Thu Sep 08 2005 Shahms E. King  1.1.19-1
+- update to new upstream version
+
 * Thu May 12 2005 Shahms E. King  1.1.18-4
 - rebuilt, added disttag
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-psycopg/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	15 Mar 2005 20:52:06 -0000	1.2
+++ sources	8 Sep 2005 23:20:53 -0000	1.3
@@ -1 +1 @@
-8e5cd2925a25a5aa80cd83418d6a5f09  psycopg-1.1.18.tar.gz
+7b811c624f49a4b9d31936d3b101fa7a  psycopg-1.1.19.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep  8 23:20:56 2005
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Thu,  8 Sep 2005 19:20:56 -0400
Subject: rpms/python-psycopg/FC-4 .cvsignore, 1.2, 1.3 python-psycopg.spec,
	1.4, 1.5 sources, 1.2, 1.3
Message-ID: <200509082320.j88NKukr011913@cvs-int.fedora.redhat.com>

Author: shahms

Update of /cvs/extras/rpms/python-psycopg/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11850/FC-4

Modified Files:
	.cvsignore python-psycopg.spec sources 
Log Message:
Update to new upstream version 1.1.19



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-psycopg/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	15 Mar 2005 20:52:06 -0000	1.2
+++ .cvsignore	8 Sep 2005 23:20:54 -0000	1.3
@@ -1 +1 @@
-psycopg-1.1.18.tar.gz
+psycopg-1.1.19.tar.gz


Index: python-psycopg.spec
===================================================================
RCS file: /cvs/extras/rpms/python-psycopg/FC-4/python-psycopg.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- python-psycopg.spec	12 May 2005 14:50:24 -0000	1.4
+++ python-psycopg.spec	8 Sep 2005 23:20:54 -0000	1.5
@@ -3,15 +3,15 @@
 %define srcname psycopg
 
 Name:           python-psycopg
-Version:        1.1.18
-Release:        4%{?dist}
+Version:        1.1.19
+Release:        1%{?dist}
 
 Summary:        PostgreSQL database adapter for Python
 
 Group:          Development/Libraries
 License:        GPL
 URL:            http://www.initd.org/software/initd/psycopg
-Source0:        http://initd.org/pub/software/psycopg/psycopg-1.1.18.tar.gz
+Source0:        http://initd.org/pub/software/psycopg/%{srcname}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python-devel postgresql-devel mx
@@ -54,6 +54,9 @@
 %{python_sitearch}/*.so
 
 %changelog
+* Thu Sep 08 2005 Shahms E. King  1.1.19-1
+- update to new upstream version
+
 * Thu May 12 2005 Shahms E. King  1.1.18-4
 - rebuilt, added disttag
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-psycopg/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	15 Mar 2005 20:52:06 -0000	1.2
+++ sources	8 Sep 2005 23:20:54 -0000	1.3
@@ -1 +1 @@
-8e5cd2925a25a5aa80cd83418d6a5f09  psycopg-1.1.18.tar.gz
+7b811c624f49a4b9d31936d3b101fa7a  psycopg-1.1.19.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep  8 23:20:56 2005
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Thu,  8 Sep 2005 19:20:56 -0400
Subject: rpms/python-psycopg/devel .cvsignore, 1.2, 1.3 python-psycopg.spec,
	1.4, 1.5 sources, 1.2, 1.3
Message-ID: <200509082320.j88NKula011921@cvs-int.fedora.redhat.com>

Author: shahms

Update of /cvs/extras/rpms/python-psycopg/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11850/devel

Modified Files:
	.cvsignore python-psycopg.spec sources 
Log Message:
Update to new upstream version 1.1.19



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-psycopg/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	15 Mar 2005 20:52:06 -0000	1.2
+++ .cvsignore	8 Sep 2005 23:20:54 -0000	1.3
@@ -1 +1 @@
-psycopg-1.1.18.tar.gz
+psycopg-1.1.19.tar.gz


Index: python-psycopg.spec
===================================================================
RCS file: /cvs/extras/rpms/python-psycopg/devel/python-psycopg.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- python-psycopg.spec	12 May 2005 14:50:24 -0000	1.4
+++ python-psycopg.spec	8 Sep 2005 23:20:54 -0000	1.5
@@ -3,15 +3,15 @@
 %define srcname psycopg
 
 Name:           python-psycopg
-Version:        1.1.18
-Release:        4%{?dist}
+Version:        1.1.19
+Release:        1%{?dist}
 
 Summary:        PostgreSQL database adapter for Python
 
 Group:          Development/Libraries
 License:        GPL
 URL:            http://www.initd.org/software/initd/psycopg
-Source0:        http://initd.org/pub/software/psycopg/psycopg-1.1.18.tar.gz
+Source0:        http://initd.org/pub/software/psycopg/%{srcname}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python-devel postgresql-devel mx
@@ -54,6 +54,9 @@
 %{python_sitearch}/*.so
 
 %changelog
+* Thu Sep 08 2005 Shahms E. King  1.1.19-1
+- update to new upstream version
+
 * Thu May 12 2005 Shahms E. King  1.1.18-4
 - rebuilt, added disttag
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-psycopg/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	15 Mar 2005 20:52:06 -0000	1.2
+++ sources	8 Sep 2005 23:20:54 -0000	1.3
@@ -1 +1 @@
-8e5cd2925a25a5aa80cd83418d6a5f09  psycopg-1.1.18.tar.gz
+7b811c624f49a4b9d31936d3b101fa7a  psycopg-1.1.19.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep  9 00:13:35 2005
From: fedora-extras-commits at redhat.com (Joshua W. Boyer (jwboyer))
Date: Thu,  8 Sep 2005 20:13:35 -0400
Subject: rpms/gquilt/FC-3 .cvsignore, 1.4, 1.5 gquilt-pygtk-2.4-compat.patch,
	1.1, 1.2 gquilt.spec, 1.4, 1.5 sources, 1.4, 1.5
Message-ID: <200509090013.j890DZLg013616@cvs-int.fedora.redhat.com>

Author: jwboyer

Update of /cvs/extras/rpms/gquilt/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13557/FC-3

Modified Files:
	.cvsignore gquilt-pygtk-2.4-compat.patch gquilt.spec sources 
Log Message:
Update to gquilt-0.14


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gquilt/FC-3/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	28 Aug 2005 17:43:35 -0000	1.4
+++ .cvsignore	9 Sep 2005 00:13:33 -0000	1.5
@@ -1 +1 @@
-gquilt-0.13.tar.gz
+gquilt-0.14.tar.gz

gquilt-pygtk-2.4-compat.patch:

Index: gquilt-pygtk-2.4-compat.patch
===================================================================
RCS file: /cvs/extras/rpms/gquilt/FC-3/gquilt-pygtk-2.4-compat.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gquilt-pygtk-2.4-compat.patch	30 Aug 2005 03:19:13 -0000	1.1
+++ gquilt-pygtk-2.4-compat.patch	9 Sep 2005 00:13:33 -0000	1.2
@@ -1,8 +1,8 @@
-Index: gquilt-0.13/gquilt.py
+Index: gquilt-0.14/gquilt.py
 ===================================================================
---- gquilt-0.13.orig/gquilt.py
-+++ gquilt-0.13/gquilt.py
-@@ -340,8 +340,8 @@ class gquilt(gtk.Window):
+--- gquilt-0.14.orig/gquilt.py
++++ gquilt-0.14/gquilt.py
+@@ -367,8 +367,8 @@ class gquilt(gtk.Window):
          self.playground_files.set_size_request(240, 320)
          self.playground_files.view.get_selection().set_mode(gtk.SELECTION_MULTIPLE)
          self.playground_files.append_selection_menu_item("_Add", "Add a the selected files to the top patch", gtk.STOCK_ADD, self._add_playground_selection_to_patch)
@@ -13,7 +13,7 @@
          self.playground_files.append_menu_item("_New", "Add a new file to the top patch", gtk.STOCK_NEW, self._add_new_file_to_patch)
          return self.playground_files
      def _create_patch_file_tree(self):
-@@ -352,7 +352,7 @@ class gquilt(gtk.Window):
+@@ -379,7 +379,7 @@ class gquilt(gtk.Window):
          self.patch_files.append_menu_item("_Diff", "Display diff for selected files", gquilt_icons.diff, self._display_diff)
          self.patch_files.append_conditional_menu_item("_Meld", "Display diff for selected files using \"meld\"", gquilt_icons.meld, self._display_diff_with_meld, self._unique_selection_and_meld)
          self.patch_files.append_menu_item("_New", "Add a new file to the top patch", gtk.STOCK_NEW, self._add_new_file_to_patch)
@@ -22,7 +22,7 @@
          self.patch_files.append_selection_menu_item("_Remove", "Remove the selected files from the top patch", gtk.STOCK_REMOVE, self._remove_files_from_patch)
          self.patch_files.append_selection_menu_item("_Delete", "Delete the selected files from the playground", gtk.STOCK_DELETE, self._delete_selected_files)
          return self.patch_files
-@@ -360,8 +360,8 @@ class gquilt(gtk.Window):
+@@ -387,8 +387,8 @@ class gquilt(gtk.Window):
          self.patches = gquilt_patch_list()
          self.patches.set_tooltips(self.tooltips)
          self.patches.set_size_request(240, 320)
@@ -33,10 +33,10 @@
          self.patches.append_unique_selection_menu_item("D_iff", "Displa the diff for the selected patch", gquilt_icons.diff, self._display_patch_diff)
          self.patches.append_unique_selection_menu_item("Re_name", "Rename the selected patch", None, self._rename_patch)
          self.patches.append_unique_selection_menu_item("_Delete", "Delete the selected patch from the series", gtk.STOCK_DELETE, self._delete_patch)
-Index: gquilt-0.13/gquilt_gtk.py
+Index: gquilt-0.14/gquilt_gtk.py
 ===================================================================
---- gquilt-0.13.orig/gquilt_gtk.py
-+++ gquilt-0.13/gquilt_gtk.py
+--- gquilt-0.14.orig/gquilt_gtk.py
++++ gquilt-0.14/gquilt_gtk.py
 @@ -402,11 +402,11 @@ class dir_file_tree(file_tree):
          dirs, files = self._dir_contents(dir)
          dirs.sort()


Index: gquilt.spec
===================================================================
RCS file: /cvs/extras/rpms/gquilt/FC-3/gquilt.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gquilt.spec	30 Aug 2005 03:19:13 -0000	1.4
+++ gquilt.spec	9 Sep 2005 00:13:33 -0000	1.5
@@ -1,6 +1,6 @@
 Name:		gquilt
-Version:	0.13
-Release:	2%{?dist}
+Version:	0.14
+Release:	1%{?dist}
 License:	GPL
 Group:		Development/Tools
 Summary:	PyGTK GUI wrapper for quilt
@@ -53,6 +53,9 @@
 rm -rf "$RPM_BUILD_ROOT"
 
 %changelog
+* Thu Sep 8 2005 Josh Boyer  0.14-1
+- Update to latest release
+
 * Sun Aug 29 2005 Josh Boyer  0.13-2
 - Fix gtk 2.4 problems
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gquilt/FC-3/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	28 Aug 2005 17:43:35 -0000	1.4
+++ sources	9 Sep 2005 00:13:33 -0000	1.5
@@ -1 +1 @@
-d69cbca85d12c299b189e531c65be1e4  gquilt-0.13.tar.gz
+3d4d853033f7b4b470ea8e3bc55737c8  gquilt-0.14.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep  9 00:13:36 2005
From: fedora-extras-commits at redhat.com (Joshua W. Boyer (jwboyer))
Date: Thu,  8 Sep 2005 20:13:36 -0400
Subject: rpms/gquilt/devel .cvsignore, 1.4, 1.5 gquilt.spec, 1.3, 1.4 sources,
	1.4, 1.5
Message-ID: <200509090013.j890DaAE013633@cvs-int.fedora.redhat.com>

Author: jwboyer

Update of /cvs/extras/rpms/gquilt/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13557/devel

Modified Files:
	.cvsignore gquilt.spec sources 
Log Message:
Update to gquilt-0.14


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gquilt/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	28 Aug 2005 17:39:13 -0000	1.4
+++ .cvsignore	9 Sep 2005 00:13:34 -0000	1.5
@@ -1 +1 @@
-gquilt-0.13.tar.gz
+gquilt-0.14.tar.gz


Index: gquilt.spec
===================================================================
RCS file: /cvs/extras/rpms/gquilt/devel/gquilt.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gquilt.spec	28 Aug 2005 17:39:13 -0000	1.3
+++ gquilt.spec	9 Sep 2005 00:13:34 -0000	1.4
@@ -1,5 +1,5 @@
 Name:		gquilt
-Version:	0.13
+Version:	0.14
 Release:	1%{?dist}
 License:	GPL
 Group:		Development/Tools
@@ -51,6 +51,9 @@
 rm -rf "$RPM_BUILD_ROOT"
 
 %changelog
+* Thu Sep 8 2005 Josh Boyer  0.14-1
+- Update to latest release
+
 * Sun Aug 28 2005 Josh Boyer  0.13-1
 - Update to latest release
 - Remove COPYING file (included upstream)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gquilt/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	28 Aug 2005 17:39:13 -0000	1.4
+++ sources	9 Sep 2005 00:13:34 -0000	1.5
@@ -1 +1 @@
-d69cbca85d12c299b189e531c65be1e4  gquilt-0.13.tar.gz
+3d4d853033f7b4b470ea8e3bc55737c8  gquilt-0.14.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep  9 00:13:36 2005
From: fedora-extras-commits at redhat.com (Joshua W. Boyer (jwboyer))
Date: Thu,  8 Sep 2005 20:13:36 -0400
Subject: rpms/gquilt/FC-4 .cvsignore, 1.4, 1.5 gquilt.spec, 1.3, 1.4 sources,
	1.4, 1.5
Message-ID: <200509090013.j890Da3m013625@cvs-int.fedora.redhat.com>

Author: jwboyer

Update of /cvs/extras/rpms/gquilt/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13557/FC-4

Modified Files:
	.cvsignore gquilt.spec sources 
Log Message:
Update to gquilt-0.14


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gquilt/FC-4/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	28 Aug 2005 17:42:38 -0000	1.4
+++ .cvsignore	9 Sep 2005 00:13:34 -0000	1.5
@@ -1 +1 @@
-gquilt-0.13.tar.gz
+gquilt-0.14.tar.gz


Index: gquilt.spec
===================================================================
RCS file: /cvs/extras/rpms/gquilt/FC-4/gquilt.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gquilt.spec	28 Aug 2005 17:42:38 -0000	1.3
+++ gquilt.spec	9 Sep 2005 00:13:34 -0000	1.4
@@ -1,5 +1,5 @@
 Name:		gquilt
-Version:	0.13
+Version:	0.14
 Release:	1%{?dist}
 License:	GPL
 Group:		Development/Tools
@@ -51,6 +51,9 @@
 rm -rf "$RPM_BUILD_ROOT"
 
 %changelog
+* Thu Sep 8 2005 Josh Boyer  0.14-1
+- Update to latest release
+
 * Sun Aug 28 2005 Josh Boyer  0.13-1
 - Update to latest release
 - Remove COPYING file (included upstream)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gquilt/FC-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	28 Aug 2005 17:42:38 -0000	1.4
+++ sources	9 Sep 2005 00:13:34 -0000	1.5
@@ -1 +1 @@
-d69cbca85d12c299b189e531c65be1e4  gquilt-0.13.tar.gz
+3d4d853033f7b4b470ea8e3bc55737c8  gquilt-0.14.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep  9 04:09:58 2005
From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon))
Date: Fri,  9 Sep 2005 00:09:58 -0400
Subject: rpms/libxml++/FC-4 .cvsignore, 1.3, 1.4 libxml++.spec, 1.9,
	1.10 sources, 1.3, 1.4
Message-ID: <200509090409.j8949w7a019417@cvs-int.fedora.redhat.com>

Author: icon

Update of /cvs/extras/rpms/libxml++/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19394

Modified Files:
	.cvsignore libxml++.spec sources 
Log Message:
Version 2.12.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libxml++/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	21 Jul 2005 18:02:23 -0000	1.3
+++ .cvsignore	9 Sep 2005 04:09:56 -0000	1.4
@@ -1 +1 @@
-libxml++-2.10.0.tar.bz2
+libxml++-2.12.0.tar.bz2


Index: libxml++.spec
===================================================================
RCS file: /cvs/extras/rpms/libxml++/FC-4/libxml++.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- libxml++.spec	21 Jul 2005 18:02:23 -0000	1.9
+++ libxml++.spec	9 Sep 2005 04:09:56 -0000	1.10
@@ -1,12 +1,12 @@
 Name:           libxml++
-Version:        2.10.0
+Version:        2.12.0
 Release:        1%{?dist}
 Summary:        C++ wrapper for the libxml2 XML parser library
 
 Group:          System Environment/Libraries
 License:        LGPL
 URL:            http://libxmlplusplus.sourceforge.net/
-Source:         http://ftp.gnome.org/pub/GNOME/sources/libxml++/2.10/libxml++-%{version}.tar.bz2
+Source:         http://ftp.gnome.org/pub/GNOME/sources/libxml++/%{version}/libxml++-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libxml2-devel >= 2.6.1, doxygen, glibmm24-devel >= 2.4.0
@@ -32,14 +32,13 @@
 
 
 %build
-%configure
+%configure --disable-static
 make %{?_smp_mflags}
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
 %makeinstall
-find $RPM_BUILD_ROOT -name "*.la" -o -name '*.a' | xargs rm -f {}
 # Modify temporary working directories for files section.
 rm -rf _reference _examples _manual
 mkdir -m 755 _reference _examples _manual
@@ -78,6 +77,10 @@
 
 
 %changelog
+* Thu Sep 08 2005 Konstantin Ryabitsev  - 2.12.0-1
+- Version 2.12.0
+- Use --disable-static for configure and don't hunt static libs.
+
 * Thu Jul 21 2005 Konstantin Ryabitsev  - 2.10.0-1
 - Version 2.10.0
 - Rearrange and conform to new FE standards


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libxml++/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	21 Jul 2005 18:02:24 -0000	1.3
+++ sources	9 Sep 2005 04:09:56 -0000	1.4
@@ -1 +1 @@
-1494b12a2cf5e337d7717af4557a7711  libxml++-2.10.0.tar.bz2
+062653883d0ce38a3c7b4ec85b2bfe4b  libxml++-2.12.0.tar.bz2



From fedora-extras-commits at redhat.com  Fri Sep  9 04:21:54 2005
From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon))
Date: Fri,  9 Sep 2005 00:21:54 -0400
Subject: rpms/libxml++/FC-4 libxml++.spec,1.10,1.11
Message-ID: <200509090421.j894LsZY019448@cvs-int.fedora.redhat.com>

Author: icon

Update of /cvs/extras/rpms/libxml++/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19429

Modified Files:
	libxml++.spec 
Log Message:
Apparently --disable-static can't be trusted to always work. :(



Index: libxml++.spec
===================================================================
RCS file: /cvs/extras/rpms/libxml++/FC-4/libxml++.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- libxml++.spec	9 Sep 2005 04:09:56 -0000	1.10
+++ libxml++.spec	9 Sep 2005 04:21:52 -0000	1.11
@@ -39,6 +39,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 %makeinstall
+find $RPM_BUILD_ROOT -name "*.la" -o -name '*.a' | xargs rm -f {}
 # Modify temporary working directories for files section.
 rm -rf _reference _examples _manual
 mkdir -m 755 _reference _examples _manual
@@ -79,7 +80,7 @@
 %changelog
 * Thu Sep 08 2005 Konstantin Ryabitsev  - 2.12.0-1
 - Version 2.12.0
-- Use --disable-static for configure and don't hunt static libs.
+- Use --disable-static for configure.
 
 * Thu Jul 21 2005 Konstantin Ryabitsev  - 2.10.0-1
 - Version 2.10.0



From fedora-extras-commits at redhat.com  Fri Sep  9 04:26:52 2005
From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon))
Date: Fri,  9 Sep 2005 00:26:52 -0400
Subject: rpms/libxml++/devel .cvsignore, 1.3, 1.4 libxml++.spec, 1.9,
	1.10 sources, 1.3, 1.4
Message-ID: <200509090426.j894QqFm019540@cvs-int.fedora.redhat.com>

Author: icon

Update of /cvs/extras/rpms/libxml++/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19517

Modified Files:
	.cvsignore libxml++.spec sources 
Log Message:
Version 2.12.0.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libxml++/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	21 Jul 2005 18:06:12 -0000	1.3
+++ .cvsignore	9 Sep 2005 04:26:50 -0000	1.4
@@ -1 +1 @@
-libxml++-2.10.0.tar.bz2
+libxml++-2.12.0.tar.bz2


Index: libxml++.spec
===================================================================
RCS file: /cvs/extras/rpms/libxml++/devel/libxml++.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- libxml++.spec	21 Jul 2005 18:06:12 -0000	1.9
+++ libxml++.spec	9 Sep 2005 04:26:50 -0000	1.10
@@ -1,12 +1,12 @@
 Name:           libxml++
-Version:        2.10.0
+Version:        2.12.0
 Release:        1%{?dist}
 Summary:        C++ wrapper for the libxml2 XML parser library
 
 Group:          System Environment/Libraries
 License:        LGPL
 URL:            http://libxmlplusplus.sourceforge.net/
-Source:         http://ftp.gnome.org/pub/GNOME/sources/libxml++/2.10/libxml++-%{version}.tar.bz2
+Source:         http://ftp.gnome.org/pub/GNOME/sources/libxml++/%{version}/libxml++-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libxml2-devel >= 2.6.1, doxygen, glibmm24-devel >= 2.4.0
@@ -32,7 +32,7 @@
 
 
 %build
-%configure
+%configure --disable-static
 make %{?_smp_mflags}
 
 
@@ -78,6 +78,10 @@
 
 
 %changelog
+* Thu Sep 08 2005 Konstantin Ryabitsev  - 2.12.0-1
+- Version 2.12.0
+- Use --disable-static for configure.
+
 * Thu Jul 21 2005 Konstantin Ryabitsev  - 2.10.0-1
 - Version 2.10.0
 - Rearrange and conform to new FE standards


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libxml++/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	21 Jul 2005 18:06:20 -0000	1.3
+++ sources	9 Sep 2005 04:26:50 -0000	1.4
@@ -1 +1 @@
-1494b12a2cf5e337d7717af4557a7711  libxml++-2.10.0.tar.bz2
+062653883d0ce38a3c7b4ec85b2bfe4b  libxml++-2.12.0.tar.bz2



From fedora-extras-commits at redhat.com  Fri Sep  9 05:47:25 2005
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Fri,  9 Sep 2005 01:47:25 -0400
Subject: rpms/scim/FC-4 scim-add-restart.patch, NONE,
	1.1 scim-gtk-langs-167090.patch, NONE, 1.1 scim.spec, 1.20, 1.21
Message-ID: <200509090547.j895lPwf020961@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/scim/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20934

Modified Files:
	scim.spec 
Added Files:
	scim-add-restart.patch scim-gtk-langs-167090.patch 
Log Message:
- improve scim-restart script to take account of the config module in use
  (Liu Cougar)
- add scim-restart script to make it easier to restart scim after updating
  IMEs with scim-add-restart.patch
- add scim-gtk-langs-167090.patch to set gtk immodule language list empty
  for now so that rhgb doesn't load scim (Warren Togami, #167088)



scim-add-restart.patch:

--- NEW FILE scim-add-restart.patch ---
--- scim-1.4.2/src/scim-restart.in.1-restart	2005-09-02 12:05:35.000000000 +0900
+++ scim-1.4.2/src/scim-restart.in	2005-08-25 22:52:29.000000000 +0900
@@ -0,1 +1,6 @@
+#!/bin/sh
+
+COMMAND="@SCIM_LIBEXECDIR@/scim-launcher -d -c `scim-config-agent -c global -g "/DefaultConfigModule"` -e all -f socket --no-stay"
+
+pkill -f "${COMMAND}" && ${COMMAND}
--- scim-1.4.2/src/Makefile.am.1-restart	2005-07-10 22:32:23.000000000 +0900
+++ scim-1.4.2/src/Makefile.am	2005-09-02 11:42:57.000000000 +0900
@@ -141,6 +141,7 @@
 
 
 bin_PROGRAMS		= scim scim-config-agent
+bin_SCRIPTS		= scim-restart
 
 scim_SOURCES	 	= scim.cpp 
 scim_LDADD		= libscim-1.0.la
--- scim-1.4.2/configure.ac.1-restart	2005-08-16 15:56:59.000000000 +0900
+++ scim-1.4.2/configure.ac	2005-09-02 11:42:57.000000000 +0900
@@ -516,6 +516,7 @@
 		 intl/Makefile
 		 po/Makefile.in
 		 src/Makefile
+		 src/scim-restart
 		 src/scim_types.h
 		 utils/Makefile
 		 data/Makefile

scim-gtk-langs-167090.patch:

--- NEW FILE scim-gtk-langs-167090.patch ---
--- scim-1.4.2/extras/gtk2_immodule/imscim.cpp~	2005-01-10 17:15:07.000000000 +0900
+++ scim-1.4.2/extras/gtk2_immodule/imscim.cpp	2005-09-01 15:21:08.000000000 +0900
@@ -33,7 +33,7 @@
   "SCIM Input Method",		/* Human readable name */
   "scim",			/* Translation domain */
   SCIM_LOCALEDIR,		/* Dir for bindtextdomain (not strictly needed for "gtk+") */
-  "*"				/* Languages for which this module is the default */
+  ""				/* Languages for which this module is the default */
 };
 
 static const GtkIMContextInfo *info_list[] = {


Index: scim.spec
===================================================================
RCS file: /cvs/extras/rpms/scim/FC-4/scim.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- scim.spec	22 Aug 2005 05:32:55 -0000	1.20
+++ scim.spec	9 Sep 2005 05:47:23 -0000	1.21
@@ -1,7 +1,7 @@
 Name:      scim
 Version:   1.4.2
 # must be less than the release number of scim in Core
-Release:   0%{?dist}
+Release:   1%{?dist}
 Summary:   Smart Common Input Method platform
 
 License:   LGPL
@@ -13,6 +13,10 @@
 
 PreReq:    %{_bindir}/update-gtk-immodules
 BuildRequires: gtk2-devel, desktop-file-utils
+# for autoreconf
+Buildrequires: gettext-devel
+Patch1:    scim-add-restart.patch
+Patch2:    scim-gtk-langs-167090.patch
 
 %description
 SCIM is a user friendly and full featured input method user interface and
@@ -40,6 +44,10 @@
 
 %prep
 %setup -q
+%patch1 -p1 -b .1-restart
+%patch2 -p1 -b .2-langs
+# patch1 touches configure.ac and src/Makefile.am
+autoreconf
 
 
 %build
@@ -130,6 +138,16 @@
 
 
 %changelog
+* Fri Sep  9 2005 Jens Petersen  - 1.4.2-1
+- improve scim-restart script to take account of the config module in use
+  (Liu Cougar)
+
+* Fri Sep  2 2005 Jens Petersen 
+- add scim-restart script to make it easier to restart scim after updating
+  IMEs with scim-add-restart.patch
+- add scim-gtk-langs-167090.patch to set gtk immodule language list empty
+  for now so that rhgb doesn't load scim (Warren Togami, #167088)
+
 * Mon Aug 22 2005 Jens Petersen  - 1.4.2-0
 - update to 1.4.2 release
 - source scim-qtimm script if present from scim xinput script



From fedora-extras-commits at redhat.com  Fri Sep  9 06:27:05 2005
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Fri,  9 Sep 2005 02:27:05 -0400
Subject: rpms/scim/FC-4 scim-add-restart.patch, 1.1, 1.2 update-xinput-scim,
	1.3, NONE
Message-ID: <200509090627.j896R5jY022389@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/scim/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22367

Modified Files:
	scim-add-restart.patch 
Removed Files:
	update-xinput-scim 
Log Message:
fix scim-restart patch


scim-add-restart.patch:

Index: scim-add-restart.patch
===================================================================
RCS file: /cvs/extras/rpms/scim/FC-4/scim-add-restart.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- scim-add-restart.patch	9 Sep 2005 05:47:23 -0000	1.1
+++ scim-add-restart.patch	9 Sep 2005 06:27:03 -0000	1.2
@@ -1,6 +1,6 @@
 --- scim-1.4.2/src/scim-restart.in.1-restart	2005-09-02 12:05:35.000000000 +0900
 +++ scim-1.4.2/src/scim-restart.in	2005-08-25 22:52:29.000000000 +0900
-@@ -0,1 +1,6 @@
+@@ -0,0 +1,5 @@
 +#!/bin/sh
 +
 +COMMAND="@SCIM_LIBEXECDIR@/scim-launcher -d -c `scim-config-agent -c global -g "/DefaultConfigModule"` -e all -f socket --no-stay"


--- update-xinput-scim DELETED ---



From fedora-extras-commits at redhat.com  Fri Sep  9 06:39:56 2005
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Fri,  9 Sep 2005 02:39:56 -0400
Subject: rpms/scim/FC-3 scim-add-restart.patch, NONE,
	1.1 scim-gtk-langs-167090.patch, NONE, 1.1 scim.spec, 1.14,
	1.15 update-xinput-scim, 1.1, NONE
Message-ID: <200509090639.j896duPY022485@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/scim/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22460

Modified Files:
	scim.spec 
Added Files:
	scim-add-restart.patch scim-gtk-langs-167090.patch 
Removed Files:
	update-xinput-scim 
Log Message:
- improve scim-restart script to take account of the config module in use
  (Liu Cougar)
- add scim-restart script to make it easier to restart scim after updating
  IMEs with scim-add-restart.patch
- add scim-gtk-langs-167090.patch to set gtk immodule language list empty
  for now so that rhgb doesn't load scim (Warren Togami, #167088)



scim-add-restart.patch:

--- NEW FILE scim-add-restart.patch ---
--- scim-1.4.2/src/scim-restart.in.1-restart	2005-09-02 12:05:35.000000000 +0900
+++ scim-1.4.2/src/scim-restart.in	2005-08-25 22:52:29.000000000 +0900
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+COMMAND="@SCIM_LIBEXECDIR@/scim-launcher -d -c `scim-config-agent -c global -g "/DefaultConfigModule"` -e all -f socket --no-stay"
+
+pkill -f "${COMMAND}" && ${COMMAND}
--- scim-1.4.2/src/Makefile.am.1-restart	2005-07-10 22:32:23.000000000 +0900
+++ scim-1.4.2/src/Makefile.am	2005-09-02 11:42:57.000000000 +0900
@@ -141,6 +141,7 @@
 
 
 bin_PROGRAMS		= scim scim-config-agent
+bin_SCRIPTS		= scim-restart
 
 scim_SOURCES	 	= scim.cpp 
 scim_LDADD		= libscim-1.0.la
--- scim-1.4.2/configure.ac.1-restart	2005-08-16 15:56:59.000000000 +0900
+++ scim-1.4.2/configure.ac	2005-09-02 11:42:57.000000000 +0900
@@ -516,6 +516,7 @@
 		 intl/Makefile
 		 po/Makefile.in
 		 src/Makefile
+		 src/scim-restart
 		 src/scim_types.h
 		 utils/Makefile
 		 data/Makefile

scim-gtk-langs-167090.patch:

--- NEW FILE scim-gtk-langs-167090.patch ---
--- scim-1.4.2/extras/gtk2_immodule/imscim.cpp~	2005-01-10 17:15:07.000000000 +0900
+++ scim-1.4.2/extras/gtk2_immodule/imscim.cpp	2005-09-01 15:21:08.000000000 +0900
@@ -33,7 +33,7 @@
   "SCIM Input Method",		/* Human readable name */
   "scim",			/* Translation domain */
   SCIM_LOCALEDIR,		/* Dir for bindtextdomain (not strictly needed for "gtk+") */
-  "*"				/* Languages for which this module is the default */
+  ""				/* Languages for which this module is the default */
 };
 
 static const GtkIMContextInfo *info_list[] = {


Index: scim.spec
===================================================================
RCS file: /cvs/extras/rpms/scim/FC-3/scim.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- scim.spec	26 Aug 2005 08:07:03 -0000	1.14
+++ scim.spec	9 Sep 2005 06:39:54 -0000	1.15
@@ -1,7 +1,7 @@
 Name:      scim
 Version:   1.4.2
 # must be less than the release number of scim in Core
-Release:   0%{?dist}.1
+Release:   1%{?dist}
 Summary:   Smart Common Input Method platform
 
 License:   LGPL
@@ -13,6 +13,10 @@
 
 PreReq:    %{_bindir}/update-gtk-immodules
 BuildRequires: gtk2-devel, desktop-file-utils
+# for autoreconf
+Buildrequires: gettext-devel
+Patch1:    scim-add-restart.patch
+Patch2:    scim-gtk-langs-167090.patch
 
 %description
 SCIM is a user friendly and full featured input method user interface and
@@ -40,11 +44,14 @@
 
 %prep
 %setup -q
+%patch1 -p1 -b .1-restart
+%patch2 -p1 -b .2-langs
+# patch1 touches configure.ac and src/Makefile.am
+autoreconf
 
 
 %build
-%configure --disable-static \
- 	--enable-ld-version-script
+%configure --disable-static --enable-ld-version-script
 make %{?_smp_mflags}
 
 
@@ -130,6 +137,16 @@
 
 
 %changelog
+* Fri Sep  9 2005 Jens Petersen  - 1.4.2-1
+- improve scim-restart script to take account of the config module in use
+  (Liu Cougar)
+
+* Fri Sep  2 2005 Jens Petersen 
+- add scim-restart script to make it easier to restart scim after updating
+  IMEs with scim-add-restart.patch
+- add scim-gtk-langs-167090.patch to set gtk immodule language list empty
+  for now so that rhgb doesn't load scim (Warren Togami, #167088)
+
 * Thu Aug 25 2005 Warren Togami 
 - --enable-ld-version-script
 


--- update-xinput-scim DELETED ---



From fedora-extras-commits at redhat.com  Fri Sep  9 08:07:40 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri,  9 Sep 2005 04:07:40 -0400
Subject: rpms/fluxbox/FC-3 Xclients.fluxbox,1.2,1.3 fluxbox.spec,1.9,1.10
Message-ID: <200509090808.j8988CWj025658@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/fluxbox/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25604/FC-3

Modified Files:
	Xclients.fluxbox fluxbox.spec 
Log Message:
- fix #167601



Index: Xclients.fluxbox
===================================================================
RCS file: /cvs/extras/rpms/fluxbox/FC-3/Xclients.fluxbox,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Xclients.fluxbox	8 Nov 2004 04:19:32 -0000	1.2
+++ Xclients.fluxbox	9 Sep 2005 08:07:38 -0000	1.3
@@ -1,3 +1,3 @@
 #!/bin/bash
 
-exec /usr/X11R6/bin/fluxbox
+exec /usr/bin/fluxbox


Index: fluxbox.spec
===================================================================
RCS file: /cvs/extras/rpms/fluxbox/FC-3/fluxbox.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- fluxbox.spec	16 Jun 2005 06:29:33 -0000	1.9
+++ fluxbox.spec	9 Sep 2005 08:07:38 -0000	1.10
@@ -1,21 +1,23 @@
-Name:       fluxbox
-Version:    0.9.13
-Release:    3%{?dist}
-Summary:    Fluxbox is a windowmanager that is based on Blackbox.
-
-Group:      User Interface/Desktops 
-License:    MIT
-URL:        http://fluxbox.sourceforge.net
-Source0:    http://download.sourceforge.net/fluxbox/fluxbox-0.9.13.tar.bz2 
-Source1:    Xclients.%{name}
-Source2:    FluxBox
-Source3:    fluxbox.desktop
-Source4:    artwiz-aleczapka.tar.bz2
+Name:           fluxbox
+Version:        0.9.13
+Release:        4%{?dist}
+
+Summary:	Window Manager based on Blackbox
+
+Group:          User Interface/Desktops
+License:        MIT
+URL:            http://fluxbox.sourceforge.net
+
+Source0:        http://download.sourceforge.net/fluxbox/fluxbox-0.9.13.tar.bz2
+Source1:        Xclients.%{name}
+Source2:        FluxBox
+Source3:        fluxbox.desktop
+Source4:        artwiz-aleczapka.tar.bz2
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-buildroot
 BuildRequires:	xorg-x11-devel
-Buildrequires:  zlib-devel
-Requires(post): chkfontpath
+Buildrequires:	zlib-devel
+Requires(post):   chkfontpath
 Requires(postun): chkfontpath
 
 
@@ -33,10 +35,7 @@
 %setup -q
 
 %build
-
-%configure      --bindir=%{_prefix}/X11R6/bin \
-                --mandir=%{_prefix}/X11R6/man \
-                --enable-xft \
+%configure      --enable-xft \
                 --enable-gnome \
                 --enable-kde \
                 --enable-xinerama \
@@ -47,8 +46,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%makeinstall     bindir=$RPM_BUILD_ROOT/%{_prefix}/X11R6/bin \
-                 mandir=$RPM_BUILD_ROOT/%{_prefix}/X11R6/man
+%makeinstall
 
 # make gdm users happy
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/apps/switchdesk/
@@ -62,32 +60,32 @@
 install -m 0755 %SOURCE3 $RPM_BUILD_ROOT%{_sysconfdir}/X11/dm/Sessions/
 
 # artwiz fonts
-mkdir -p $RPM_BUILD_ROOT%{_prefix}/X11R6/lib/X11/fonts/
-tar xjf %SOURCE4 -C $RPM_BUILD_ROOT%{_prefix}/X11R6/lib/X11/fonts/
+mkdir -p $RPM_BUILD_ROOT%{_libdir}/X11/fonts/
+tar xjf %SOURCE4 -C $RPM_BUILD_ROOT%{_libdir}/X11/fonts/
 
 %post
 # New menu-system
-%{_prefix}/X11R6/bin/fluxbox-generate_menu \
-	-kg -in -ds \
+%{_bindir}/fluxbox-generate_menu \
+	-kg -in -ds\
 	-p %{_usr} \
 	-o %{_datadir}/fluxbox/menu \
 	-m Fluxbox-0.9.13 2>&1 > /dev/null
 
 
 #artwiz fontz
-cd %{_prefix}/X11R6/lib/X11/fonts/artwiz-aleczapka
+cd %{_libdir}/X11/fonts/artwiz-aleczapka
 fc-cache -f ./
-%{_sbindir}/chkfontpath -q -a %{_prefix}/X11R6/lib/X11/fonts/artwiz-aleczapka:unscaled
+%{_sbindir}/chkfontpath -q -a %{_libdir}/X11/fonts/artwiz-aleczapka:unscaled
 
-tmp=`fgrep "
      %{_prefix}/X11R6/lib/X11/fonts/artwiz-aleczapka" %{_sysconfdir}/fonts/local.conf`
+tmp=`fgrep "%{_libdir}/X11/fonts/artwiz-aleczapka" %{_sysconfdir}/fonts/local.conf`
 if [ -z "$tmp" ];
-	then sed -i "s,,%{_prefix}/X11R6/lib/X11/fonts/artwiz-aleczapka\n," %{_sysconfdir}/fonts/local.conf 
+	then sed -i "s,,%{_libdir}/X11/fonts/artwiz-aleczapka\n," %{_sysconfdir}/fonts/local.conf
 fi
 
 %postun
 if [ "$1" -eq "0" ]; then # complete removal, not upgrade
-	%{_sbindir}/chkfontpath -q -r %{_prefix}/X11R6/lib/X11/fonts/artwiz-aleczapka;
-	sed -i "\%%{_prefix}/X11R6/lib/X11/fonts/artwiz-aleczapka%d" %{_sysconfdir}/fonts/local.conf
+	%{_sbindir}/chkfontpath -q -r %{_libdir}/X11/fonts/artwiz-aleczapka;
+	sed -i "\%%{_libdir}/X11/fonts/artwiz-aleczapka%d" %{_sysconfdir}/fonts/local.conf
 fi
 
 
@@ -97,28 +95,38 @@
 %files
 %defattr(-,root,root,755)
 %doc AUTHORS COPYING ChangeLog INSTALL NEWS README TODO
-%{_prefix}/X11R6/bin/*
-%{_prefix}/X11R6/man/man1/*
+%{_bindir}/*
+%{_mandir}/man1/*
 %{_datadir}/%{name}
 %{_datadir}/apps/switchdesk/Xclients.fluxbox
 
 %{_sysconfdir}/X11/gdm/Sessions/FluxBox
 %{_sysconfdir}/X11/dm/Sessions/fluxbox.desktop
 
-%{_prefix}/X11R6/lib/X11/fonts/artwiz-aleczapka
+%{_libdir}/X11/fonts/artwiz-aleczapka
 
 %changelog
+* Tue Sep 06 2005 Andreas Bierfert 
+0.9.13-4
+- remove X11R6 path stuff #167601
+
 * Thu Jun 16 2005 Andreas Bierfert 
-0.9.13-3.fc3
-- fix #160614 
+0.9.13-3.fc4
+- fix #160614
 
 * Wed Jun 08 2005 Andreas Bierfert 
-0.9.13-2.fc3
+0.9.13-2.fc4
 - fix generate menu bug and revisit switches
 
 * Tue May 31 2005 Andreas Bierfert 
 - upgrade to 0.9.13
 
+* Wed Apr 13 2005 Michael Schwendt  - 0.9.9-4
+- Fix build for GCC 4.
+
+* Fri Apr  7 2005 Michael Schwendt 
+- rebuilt
+
 * Sat Nov 13 2004 Michael Schwendt  - 0.9.9-2
 - Fix build for GCC 3.4.
 



From fedora-extras-commits at redhat.com  Fri Sep  9 08:07:58 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri,  9 Sep 2005 04:07:58 -0400
Subject: rpms/fluxbox/devel Xclients.fluxbox,1.2,1.3 fluxbox.spec,1.11,1.12
Message-ID: <200509090808.j8988UCk025670@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/fluxbox/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25604/devel

Modified Files:
	Xclients.fluxbox fluxbox.spec 
Log Message:
- fix #167601



Index: Xclients.fluxbox
===================================================================
RCS file: /cvs/extras/rpms/fluxbox/devel/Xclients.fluxbox,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Xclients.fluxbox	8 Nov 2004 04:19:32 -0000	1.2
+++ Xclients.fluxbox	9 Sep 2005 08:07:56 -0000	1.3
@@ -1,3 +1,3 @@
 #!/bin/bash
 
-exec /usr/X11R6/bin/fluxbox
+exec /usr/bin/fluxbox


Index: fluxbox.spec
===================================================================
RCS file: /cvs/extras/rpms/fluxbox/devel/fluxbox.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- fluxbox.spec	21 Jun 2005 05:32:04 -0000	1.11
+++ fluxbox.spec	9 Sep 2005 08:07:56 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           fluxbox
 Version:        0.9.13
-Release:        3%{?dist}
+Release:        4%{?dist}
 
 Summary:	Window Manager based on Blackbox
 
@@ -35,10 +35,7 @@
 %setup -q
 
 %build
-
-%configure      --bindir=%{_prefix}/X11R6/bin \
-                --mandir=%{_prefix}/X11R6/man \
-                --enable-xft \
+%configure      --enable-xft \
                 --enable-gnome \
                 --enable-kde \
                 --enable-xinerama \
@@ -49,8 +46,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%makeinstall     bindir=$RPM_BUILD_ROOT/%{_prefix}/X11R6/bin \
-                 mandir=$RPM_BUILD_ROOT/%{_prefix}/X11R6/man
+%makeinstall
 
 # make gdm users happy
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/apps/switchdesk/
@@ -64,12 +60,12 @@
 install -m 0755 %SOURCE3 $RPM_BUILD_ROOT%{_sysconfdir}/X11/dm/Sessions/
 
 # artwiz fonts
-mkdir -p $RPM_BUILD_ROOT%{_prefix}/X11R6/lib/X11/fonts/
-tar xjf %SOURCE4 -C $RPM_BUILD_ROOT%{_prefix}/X11R6/lib/X11/fonts/
+mkdir -p $RPM_BUILD_ROOT%{_libdir}/X11/fonts/
+tar xjf %SOURCE4 -C $RPM_BUILD_ROOT%{_libdir}/X11/fonts/
 
 %post
 # New menu-system
-%{_prefix}/X11R6/bin/fluxbox-generate_menu \
+%{_bindir}/fluxbox-generate_menu \
 	-kg -in -ds\
 	-p %{_usr} \
 	-o %{_datadir}/fluxbox/menu \
@@ -77,19 +73,19 @@
 
 
 #artwiz fontz
-cd %{_prefix}/X11R6/lib/X11/fonts/artwiz-aleczapka
+cd %{_libdir}/X11/fonts/artwiz-aleczapka
 fc-cache -f ./
-%{_sbindir}/chkfontpath -q -a %{_prefix}/X11R6/lib/X11/fonts/artwiz-aleczapka:unscaled
+%{_sbindir}/chkfontpath -q -a %{_libdir}/X11/fonts/artwiz-aleczapka:unscaled
 
-tmp=`fgrep "%{_prefix}/X11R6/lib/X11/fonts/artwiz-aleczapka" %{_sysconfdir}/fonts/local.conf`
+tmp=`fgrep "%{_libdir}/X11/fonts/artwiz-aleczapka" %{_sysconfdir}/fonts/local.conf`
 if [ -z "$tmp" ];
-	then sed -i "s,,%{_prefix}/X11R6/lib/X11/fonts/artwiz-aleczapka\n," %{_sysconfdir}/fonts/local.conf
+	then sed -i "s,,%{_libdir}/X11/fonts/artwiz-aleczapka\n," %{_sysconfdir}/fonts/local.conf
 fi
 
 %postun
 if [ "$1" -eq "0" ]; then # complete removal, not upgrade
-	%{_sbindir}/chkfontpath -q -r %{_prefix}/X11R6/lib/X11/fonts/artwiz-aleczapka;
-	sed -i "\%%{_prefix}/X11R6/lib/X11/fonts/artwiz-aleczapka%d" %{_sysconfdir}/fonts/local.conf
+	%{_sbindir}/chkfontpath -q -r %{_libdir}/X11/fonts/artwiz-aleczapka;
+	sed -i "\%%{_libdir}/X11/fonts/artwiz-aleczapka%d" %{_sysconfdir}/fonts/local.conf
 fi
 
 
@@ -99,23 +95,27 @@
 %files
 %defattr(-,root,root,755)
 %doc AUTHORS COPYING ChangeLog INSTALL NEWS README TODO
-%{_prefix}/X11R6/bin/*
-%{_prefix}/X11R6/man/man1/*
+%{_bindir}/*
+%{_mandir}/man1/*
 %{_datadir}/%{name}
 %{_datadir}/apps/switchdesk/Xclients.fluxbox
 
 %{_sysconfdir}/X11/gdm/Sessions/FluxBox
 %{_sysconfdir}/X11/dm/Sessions/fluxbox.desktop
 
-%{_prefix}/X11R6/lib/X11/fonts/artwiz-aleczapka
+%{_libdir}/X11/fonts/artwiz-aleczapka
 
 %changelog
-* Tue Jun 21 2005 Andreas Bierfert 
-0.9.13-3.fc5
+* Tue Sep 06 2005 Andreas Bierfert 
+0.9.13-4
+- remove X11R6 path stuff #167601
+
+* Thu Jun 16 2005 Andreas Bierfert 
+0.9.13-3.fc4
 - fix #160614
 
 * Wed Jun 08 2005 Andreas Bierfert 
-0.9.13-2.fc5
+0.9.13-2.fc4
 - fix generate menu bug and revisit switches
 
 * Tue May 31 2005 Andreas Bierfert 



From fedora-extras-commits at redhat.com  Fri Sep  9 08:07:56 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri,  9 Sep 2005 04:07:56 -0400
Subject: rpms/fluxbox/FC-4 Xclients.fluxbox,1.2,1.3 fluxbox.spec,1.13,1.14
Message-ID: <200509090808.j8988Q0k025668@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/fluxbox/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25604/FC-4

Modified Files:
	Xclients.fluxbox fluxbox.spec 
Log Message:
- fix #167601



Index: Xclients.fluxbox
===================================================================
RCS file: /cvs/extras/rpms/fluxbox/FC-4/Xclients.fluxbox,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Xclients.fluxbox	8 Nov 2004 04:19:32 -0000	1.2
+++ Xclients.fluxbox	9 Sep 2005 08:07:40 -0000	1.3
@@ -1,3 +1,3 @@
 #!/bin/bash
 
-exec /usr/X11R6/bin/fluxbox
+exec /usr/bin/fluxbox


Index: fluxbox.spec
===================================================================
RCS file: /cvs/extras/rpms/fluxbox/FC-4/fluxbox.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- fluxbox.spec	16 Jun 2005 06:29:10 -0000	1.13
+++ fluxbox.spec	9 Sep 2005 08:07:40 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           fluxbox
 Version:        0.9.13
-Release:        3%{?dist}
+Release:        4%{?dist}
 
 Summary:	Window Manager based on Blackbox
 
@@ -35,10 +35,7 @@
 %setup -q
 
 %build
-
-%configure      --bindir=%{_prefix}/X11R6/bin \
-                --mandir=%{_prefix}/X11R6/man \
-                --enable-xft \
+%configure      --enable-xft \
                 --enable-gnome \
                 --enable-kde \
                 --enable-xinerama \
@@ -49,8 +46,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%makeinstall     bindir=$RPM_BUILD_ROOT/%{_prefix}/X11R6/bin \
-                 mandir=$RPM_BUILD_ROOT/%{_prefix}/X11R6/man
+%makeinstall
 
 # make gdm users happy
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/apps/switchdesk/
@@ -64,12 +60,12 @@
 install -m 0755 %SOURCE3 $RPM_BUILD_ROOT%{_sysconfdir}/X11/dm/Sessions/
 
 # artwiz fonts
-mkdir -p $RPM_BUILD_ROOT%{_prefix}/X11R6/lib/X11/fonts/
-tar xjf %SOURCE4 -C $RPM_BUILD_ROOT%{_prefix}/X11R6/lib/X11/fonts/
+mkdir -p $RPM_BUILD_ROOT%{_libdir}/X11/fonts/
+tar xjf %SOURCE4 -C $RPM_BUILD_ROOT%{_libdir}/X11/fonts/
 
 %post
 # New menu-system
-%{_prefix}/X11R6/bin/fluxbox-generate_menu \
+%{_bindir}/fluxbox-generate_menu \
 	-kg -in -ds\
 	-p %{_usr} \
 	-o %{_datadir}/fluxbox/menu \
@@ -77,19 +73,19 @@
 
 
 #artwiz fontz
-cd %{_prefix}/X11R6/lib/X11/fonts/artwiz-aleczapka
+cd %{_libdir}/X11/fonts/artwiz-aleczapka
 fc-cache -f ./
-%{_sbindir}/chkfontpath -q -a %{_prefix}/X11R6/lib/X11/fonts/artwiz-aleczapka:unscaled
+%{_sbindir}/chkfontpath -q -a %{_libdir}/X11/fonts/artwiz-aleczapka:unscaled
 
-tmp=`fgrep "%{_prefix}/X11R6/lib/X11/fonts/artwiz-aleczapka" %{_sysconfdir}/fonts/local.conf`
+tmp=`fgrep "%{_libdir}/X11/fonts/artwiz-aleczapka" %{_sysconfdir}/fonts/local.conf`
 if [ -z "$tmp" ];
-	then sed -i "s,,%{_prefix}/X11R6/lib/X11/fonts/artwiz-aleczapka\n," %{_sysconfdir}/fonts/local.conf
+	then sed -i "s,,%{_libdir}/X11/fonts/artwiz-aleczapka\n," %{_sysconfdir}/fonts/local.conf
 fi
 
 %postun
 if [ "$1" -eq "0" ]; then # complete removal, not upgrade
-	%{_sbindir}/chkfontpath -q -r %{_prefix}/X11R6/lib/X11/fonts/artwiz-aleczapka;
-	sed -i "\%%{_prefix}/X11R6/lib/X11/fonts/artwiz-aleczapka%d" %{_sysconfdir}/fonts/local.conf
+	%{_sbindir}/chkfontpath -q -r %{_libdir}/X11/fonts/artwiz-aleczapka;
+	sed -i "\%%{_libdir}/X11/fonts/artwiz-aleczapka%d" %{_sysconfdir}/fonts/local.conf
 fi
 
 
@@ -99,17 +95,21 @@
 %files
 %defattr(-,root,root,755)
 %doc AUTHORS COPYING ChangeLog INSTALL NEWS README TODO
-%{_prefix}/X11R6/bin/*
-%{_prefix}/X11R6/man/man1/*
+%{_bindir}/*
+%{_mandir}/man1/*
 %{_datadir}/%{name}
 %{_datadir}/apps/switchdesk/Xclients.fluxbox
 
 %{_sysconfdir}/X11/gdm/Sessions/FluxBox
 %{_sysconfdir}/X11/dm/Sessions/fluxbox.desktop
 
-%{_prefix}/X11R6/lib/X11/fonts/artwiz-aleczapka
+%{_libdir}/X11/fonts/artwiz-aleczapka
 
 %changelog
+* Tue Sep 06 2005 Andreas Bierfert 
+0.9.13-4
+- remove X11R6 path stuff #167601
+
 * Thu Jun 16 2005 Andreas Bierfert 
 0.9.13-3.fc4
 - fix #160614



From fedora-extras-commits at redhat.com  Fri Sep  9 08:26:46 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri,  9 Sep 2005 04:26:46 -0400
Subject: rpms/sylpheed-claws/FC-4 .cvsignore, 1.8, 1.9 sources, 1.9,
	1.10 sylpheed-claws.spec, 1.21, 1.22
Message-ID: <200509090826.j898Qkvb026176@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/sylpheed-claws/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26137/FC-4

Modified Files:
	.cvsignore sources sylpheed-claws.spec 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws/FC-4/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	31 Jul 2005 10:15:10 -0000	1.8
+++ .cvsignore	9 Sep 2005 08:26:44 -0000	1.9
@@ -1 +1 @@
-sylpheed-claws-1.9.13.tar.bz2
+sylpheed-claws-1.9.14.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws/FC-4/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	31 Jul 2005 10:15:10 -0000	1.9
+++ sources	9 Sep 2005 08:26:44 -0000	1.10
@@ -1 +1 @@
-afd3b82ca210520f0ad241b77c5e673a  sylpheed-claws-1.9.13.tar.bz2
+f61666e1b829daf116996136e7728ac8  sylpheed-claws-1.9.14.tar.bz2


Index: sylpheed-claws.spec
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws/FC-4/sylpheed-claws.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sylpheed-claws.spec	15 Aug 2005 10:26:56 -0000	1.21
+++ sylpheed-claws.spec	9 Sep 2005 08:26:44 -0000	1.22
@@ -1,13 +1,13 @@
 %define         openssl_pc  %(if test -z `rpm -ql openssl-devel | grep pkgconfig` ; then echo 0; else echo 1; fi )
 
 Name:           sylpheed-claws
-Version:        1.9.13
-Release:        4%{?dist}
+Version:        1.9.14
+Release:        1%{?dist}
 Summary:        The bleeding edge branch of Sylpheed
 Group:          Applications/Internet
 License:        GPL
 URL:            http://claws.sylpheed.org
-Source0:        http://dl.sf.net/sylpheed-claws/sylpheed-claws-1.9.13.tar.bz2
+Source0:        http://dl.sf.net/sylpheed-claws/sylpheed-claws-1.9.14.tar.bz2
 Source1:        sylpheed-claws.desktop
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires:  flex, bison
@@ -113,6 +113,10 @@
 %{_libdir}/sylpheed-claws/plugins/*deps
 
 %changelog
+* Fri Sep 09 2005 Andreas Bierfert 
+1.9.14-1
+- version upgrade
+
 * Mon Aug 15 2005 Andreas Bierfert 
 1.9.13-4
 - fix files



From fedora-extras-commits at redhat.com  Fri Sep  9 08:26:46 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri,  9 Sep 2005 04:26:46 -0400
Subject: rpms/sylpheed-claws/devel .cvsignore, 1.8, 1.9 sources, 1.9,
	1.10 sylpheed-claws.spec, 1.22, 1.23
Message-ID: <200509090826.j898Qk5b026184@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/sylpheed-claws/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26137/devel

Modified Files:
	.cvsignore sources sylpheed-claws.spec 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	31 Jul 2005 10:16:28 -0000	1.8
+++ .cvsignore	9 Sep 2005 08:26:44 -0000	1.9
@@ -1 +1 @@
-sylpheed-claws-1.9.13.tar.bz2
+sylpheed-claws-1.9.14.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	31 Jul 2005 10:16:28 -0000	1.9
+++ sources	9 Sep 2005 08:26:44 -0000	1.10
@@ -1 +1 @@
-afd3b82ca210520f0ad241b77c5e673a  sylpheed-claws-1.9.13.tar.bz2
+f61666e1b829daf116996136e7728ac8  sylpheed-claws-1.9.14.tar.bz2


Index: sylpheed-claws.spec
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws/devel/sylpheed-claws.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- sylpheed-claws.spec	20 Aug 2005 12:11:29 -0000	1.22
+++ sylpheed-claws.spec	9 Sep 2005 08:26:44 -0000	1.23
@@ -1,13 +1,13 @@
 %define         openssl_pc  %(if test -z `rpm -ql openssl-devel | grep pkgconfig` ; then echo 0; else echo 1; fi )
 
 Name:           sylpheed-claws
-Version:        1.9.13
-Release:        5%{?dist}
+Version:        1.9.14
+Release:        1%{?dist}
 Summary:        The bleeding edge branch of Sylpheed
 Group:          Applications/Internet
 License:        GPL
 URL:            http://claws.sylpheed.org
-Source0:        http://dl.sf.net/sylpheed-claws/sylpheed-claws-1.9.13.tar.bz2
+Source0:        http://dl.sf.net/sylpheed-claws/sylpheed-claws-1.9.14.tar.bz2
 Source1:        sylpheed-claws.desktop
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires:  flex, bison
@@ -113,9 +113,9 @@
 %{_libdir}/sylpheed-claws/plugins/*deps
 
 %changelog
-* Sat Aug 20 2005 Andreas Bierfert 
-1.9.14-5
-- bump release for rebuild
+* Fri Sep 09 2005 Andreas Bierfert 
+1.9.14-1
+- version upgrade
 
 * Mon Aug 15 2005 Andreas Bierfert 
 1.9.13-4



From fedora-extras-commits at redhat.com  Fri Sep  9 09:33:11 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri,  9 Sep 2005 05:33:11 -0400
Subject: rpms/perl-Glib/devel .cvsignore, 1.5, 1.6 perl-Glib.spec, 1.9,
	1.10 sources, 1.5, 1.6
Message-ID: <200509090933.j899XBR4027762@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Glib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27739

Modified Files:
	.cvsignore perl-Glib.spec sources 
Log Message:
Update to 1.100.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Glib/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	27 Jun 2005 16:17:42 -0000	1.5
+++ .cvsignore	9 Sep 2005 09:33:09 -0000	1.6
@@ -1 +1 @@
-Glib-1.082.tar.gz
+Glib-1.100.tar.gz


Index: perl-Glib.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Glib/devel/perl-Glib.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- perl-Glib.spec	27 Jun 2005 16:17:42 -0000	1.9
+++ perl-Glib.spec	9 Sep 2005 09:33:09 -0000	1.10
@@ -1,12 +1,12 @@
 Name:           perl-Glib
-Version:        1.082
+Version:        1.100
 Release:        1%{?dist}
 Summary:        Perl interface to GLib
 
 Group:          Development/Libraries
 License:        LGPL
 URL:            http://search.cpan.org/dist/Glib/
-Source0:        http://www.cpan.org/authors/id/T/TS/TSCH/Glib-1.082.tar.gz
+Source0:        http://www.cpan.org/authors/id/T/TS/TSCH/Glib-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  perl >= 2:5.8.0
@@ -28,7 +28,6 @@
 
 %build
 CFLAGS="$RPM_OPT_FLAGS" %{__perl} Makefile.PL INSTALLDIRS=vendor
-%{__perl} -pi -e 's/^\tLD_RUN_PATH=[^\s]+\s*/\t/' Makefile
 make %{?_smp_mflags} OPTIMIZE="$RPM_OPT_FLAGS"
 
 
@@ -41,7 +40,7 @@
 chmod -R u+w $RPM_BUILD_ROOT/*
 
 
-%check || :
+%check
 make test
 
 
@@ -58,6 +57,9 @@
 
 
 %changelog
+* Thu Sep  8 2005 Jose Pedro Oliveira  - 1.100-1
+- Update to 1.100.
+
 * Mon Jun 27 2005 Jose Pedro Oliveira  - 1.082-1
 - Update to 1.082.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Glib/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	27 Jun 2005 16:17:42 -0000	1.5
+++ sources	9 Sep 2005 09:33:09 -0000	1.6
@@ -1 +1 @@
-6f3c675acf177763f51394b7e087d507  Glib-1.082.tar.gz
+6ceb3f19dcc30ac96e4ff3dc82346d74  Glib-1.100.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep  9 09:35:52 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri,  9 Sep 2005 05:35:52 -0400
Subject: rpms/perl-Gtk2/devel .cvsignore, 1.6, 1.7 perl-Gtk2.spec, 1.10,
	1.11 sources, 1.6, 1.7
Message-ID: <200509090935.j899ZqSi027841@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Gtk2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27818

Modified Files:
	.cvsignore perl-Gtk2.spec sources 
Log Message:
Update to 1.100.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Gtk2/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	29 Jul 2005 19:27:35 -0000	1.6
+++ .cvsignore	9 Sep 2005 09:35:50 -0000	1.7
@@ -1 +1 @@
-Gtk2-1.083.tar.gz
+Gtk2-1.100.tar.gz


Index: perl-Gtk2.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Gtk2/devel/perl-Gtk2.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- perl-Gtk2.spec	29 Jul 2005 19:27:35 -0000	1.10
+++ perl-Gtk2.spec	9 Sep 2005 09:35:50 -0000	1.11
@@ -1,5 +1,5 @@
 Name:           perl-Gtk2
-Version:        1.083
+Version:        1.100
 Release:        1%{?dist}
 Summary:        Perl interface to the 2.x series of the Gimp Toolkit library
 
@@ -10,9 +10,9 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  perl >= 2:5.8.0
-BuildRequires:  gtk2-devel, perl-Glib >= 1.082
+BuildRequires:  gtk2-devel, perl-Glib >= 1.100
 BuildRequires:  perl(ExtUtils::Depends), perl(ExtUtils::PkgConfig)
-Requires:       perl-Glib >= 1.082
+Requires:       perl-Glib >= 1.100
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
@@ -40,7 +40,7 @@
 chmod -R u+w $RPM_BUILD_ROOT/*
 
 
-%check || :
+%check
 # Testing requires X
 %{?_with_tests:make test}
 
@@ -59,6 +59,9 @@
 
 
 %changelog
+* Thu Sep  8 2005 Jose Pedro Oliveira  - 1.100-1
+- Update to 1.100.
+
 * Fri Jul 29 2005 Jose Pedro Oliveira  - 1.083-1
 - Update to 1.083.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Gtk2/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	29 Jul 2005 19:27:35 -0000	1.6
+++ sources	9 Sep 2005 09:35:50 -0000	1.7
@@ -1 +1 @@
-4ccec16a8a87bbf0b058c92ac44d60ae  Gtk2-1.083.tar.gz
+498eb71cedb0fc619654cebf43a41f8e  Gtk2-1.100.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep  9 10:35:41 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri,  9 Sep 2005 06:35:41 -0400
Subject: rpms/perl-XML-Simple/FC-3 .cvsignore, 1.3, 1.4 perl-XML-Simple.spec,
	1.4, 1.5 sources, 1.3, 1.4
Message-ID: <200509091036.j89AaBEB029438@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-XML-Simple/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29377/FC-3

Modified Files:
	.cvsignore perl-XML-Simple.spec sources 
Log Message:
Update to 2.14.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-XML-Simple/FC-3/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	4 Dec 2004 13:23:25 -0000	1.3
+++ .cvsignore	9 Sep 2005 10:35:39 -0000	1.4
@@ -1 +1 @@
-XML-Simple-2.13.tar.gz
+XML-Simple-2.14.tar.gz


Index: perl-XML-Simple.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-XML-Simple/FC-3/perl-XML-Simple.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-XML-Simple.spec	4 Dec 2004 13:23:25 -0000	1.4
+++ perl-XML-Simple.spec	9 Sep 2005 10:35:39 -0000	1.5
@@ -1,21 +1,18 @@
-%{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)}
-
 Name:           perl-XML-Simple
-Version:        2.13
-Release:        1
-Epoch:          0
+Version:        2.14
+Release:        1%{?dist}
 Summary:        Easy API to maintain XML in Perl
 
 Group:          Development/Libraries
 License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/XML-Simple/
-Source0:      http://www.cpan.org/authors/id/G/GR/GRANTM/XML-Simple-2.13.tar.gz
+Source0:        http://www.cpan.org/authors/id/G/GR/GRANTM/XML-Simple-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
 BuildRequires:  perl >= 1:5.6.1
-BuildRequires:  perl(XML::SAX), perl(XML::NamespaceSupport), perl(XML::Parser)
-BuildRequires:  perl(Tie::IxHash), perl(Storable)
+BuildRequires:  perl(Tie::IxHash), perl(XML::NamespaceSupport)
+BuildRequires:  perl(XML::Parser), perl(XML::SAX)
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 # XML-SAX-ExpatXS up to 0.98 has known namespace bugs, and will cause the
 # tests to fail if it is installed as the default SAX parser.
@@ -44,7 +41,7 @@
 chmod -R u+w $RPM_BUILD_ROOT/*
 
 
-%check || :
+%check
 make test
 
 
@@ -54,12 +51,20 @@
 
 %files
 %defattr(-,root,root,-)
+# For license text(s), see the perl package.
 %doc Changes README
-%{perl_vendorlib}/XML
+%{perl_vendorlib}/XML/
 %{_mandir}/man3/*.3*
 
 
 %changelog
+* Fri Sep  9 2005 Jose Pedro Oliveira  - 2.14-1
+- Update to 2.14.
+- Added the dist tag.
+
+* Fri Apr  7 2005 Michael Schwendt  - 2.13-2
+- rebuilt
+
 * Sat Nov 27 2004 Jose Pedro Oliveira  - 0:2.13-1
 - Update to 2.13.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-XML-Simple/FC-3/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	4 Dec 2004 13:23:25 -0000	1.3
+++ sources	9 Sep 2005 10:35:39 -0000	1.4
@@ -1 +1 @@
-3891139e5e2e2134e596aa1404e866df  XML-Simple-2.13.tar.gz
+f321058271815de28d214c8efb9091f9  XML-Simple-2.14.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep  9 10:35:42 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri,  9 Sep 2005 06:35:42 -0400
Subject: rpms/perl-XML-Simple/devel .cvsignore, 1.3, 1.4 perl-XML-Simple.spec,
	1.6, 1.7 sources, 1.3, 1.4
Message-ID: <200509091036.j89AaCOQ029446@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-XML-Simple/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29377/devel

Modified Files:
	.cvsignore perl-XML-Simple.spec sources 
Log Message:
Update to 2.14.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-XML-Simple/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	4 Dec 2004 13:23:25 -0000	1.3
+++ .cvsignore	9 Sep 2005 10:35:40 -0000	1.4
@@ -1 +1 @@
-XML-Simple-2.13.tar.gz
+XML-Simple-2.14.tar.gz


Index: perl-XML-Simple.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-XML-Simple/devel/perl-XML-Simple.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- perl-XML-Simple.spec	6 Apr 2005 22:13:29 -0000	1.6
+++ perl-XML-Simple.spec	9 Sep 2005 10:35:40 -0000	1.7
@@ -1,21 +1,18 @@
-%{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)}
-
 Name:           perl-XML-Simple
-Version:        2.13
-Release:        2
-
+Version:        2.14
+Release:        1%{?dist}
 Summary:        Easy API to maintain XML in Perl
 
 Group:          Development/Libraries
 License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/XML-Simple/
-Source0:      http://www.cpan.org/authors/id/G/GR/GRANTM/XML-Simple-2.13.tar.gz
+Source0:        http://www.cpan.org/authors/id/G/GR/GRANTM/XML-Simple-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
 BuildRequires:  perl >= 1:5.6.1
-BuildRequires:  perl(XML::SAX), perl(XML::NamespaceSupport), perl(XML::Parser)
-BuildRequires:  perl(Tie::IxHash), perl(Storable)
+BuildRequires:  perl(Tie::IxHash), perl(XML::NamespaceSupport)
+BuildRequires:  perl(XML::Parser), perl(XML::SAX)
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 # XML-SAX-ExpatXS up to 0.98 has known namespace bugs, and will cause the
 # tests to fail if it is installed as the default SAX parser.
@@ -44,7 +41,7 @@
 chmod -R u+w $RPM_BUILD_ROOT/*
 
 
-%check || :
+%check
 make test
 
 
@@ -54,13 +51,18 @@
 
 %files
 %defattr(-,root,root,-)
+# For license text(s), see the perl package.
 %doc Changes README
-%{perl_vendorlib}/XML
+%{perl_vendorlib}/XML/
 %{_mandir}/man3/*.3*
 
 
 %changelog
-* Fri Apr  7 2005 Michael Schwendt 
+* Fri Sep  9 2005 Jose Pedro Oliveira  - 2.14-1
+- Update to 2.14.
+- Added the dist tag.
+
+* Fri Apr  7 2005 Michael Schwendt  - 2.13-2
 - rebuilt
 
 * Sat Nov 27 2004 Jose Pedro Oliveira  - 0:2.13-1


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-XML-Simple/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	4 Dec 2004 13:23:25 -0000	1.3
+++ sources	9 Sep 2005 10:35:40 -0000	1.4
@@ -1 +1 @@
-3891139e5e2e2134e596aa1404e866df  XML-Simple-2.13.tar.gz
+f321058271815de28d214c8efb9091f9  XML-Simple-2.14.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep  9 10:35:41 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri,  9 Sep 2005 06:35:41 -0400
Subject: rpms/perl-XML-Simple/FC-4 .cvsignore, 1.3, 1.4 perl-XML-Simple.spec,
	1.6, 1.7 sources, 1.3, 1.4
Message-ID: <200509091036.j89AaCd4029443@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-XML-Simple/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29377/FC-4

Modified Files:
	.cvsignore perl-XML-Simple.spec sources 
Log Message:
Update to 2.14.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-XML-Simple/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	4 Dec 2004 13:23:25 -0000	1.3
+++ .cvsignore	9 Sep 2005 10:35:39 -0000	1.4
@@ -1 +1 @@
-XML-Simple-2.13.tar.gz
+XML-Simple-2.14.tar.gz


Index: perl-XML-Simple.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-XML-Simple/FC-4/perl-XML-Simple.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- perl-XML-Simple.spec	6 Apr 2005 22:13:29 -0000	1.6
+++ perl-XML-Simple.spec	9 Sep 2005 10:35:39 -0000	1.7
@@ -1,21 +1,18 @@
-%{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)}
-
 Name:           perl-XML-Simple
-Version:        2.13
-Release:        2
-
+Version:        2.14
+Release:        1%{?dist}
 Summary:        Easy API to maintain XML in Perl
 
 Group:          Development/Libraries
 License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/XML-Simple/
-Source0:      http://www.cpan.org/authors/id/G/GR/GRANTM/XML-Simple-2.13.tar.gz
+Source0:        http://www.cpan.org/authors/id/G/GR/GRANTM/XML-Simple-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
 BuildRequires:  perl >= 1:5.6.1
-BuildRequires:  perl(XML::SAX), perl(XML::NamespaceSupport), perl(XML::Parser)
-BuildRequires:  perl(Tie::IxHash), perl(Storable)
+BuildRequires:  perl(Tie::IxHash), perl(XML::NamespaceSupport)
+BuildRequires:  perl(XML::Parser), perl(XML::SAX)
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 # XML-SAX-ExpatXS up to 0.98 has known namespace bugs, and will cause the
 # tests to fail if it is installed as the default SAX parser.
@@ -44,7 +41,7 @@
 chmod -R u+w $RPM_BUILD_ROOT/*
 
 
-%check || :
+%check
 make test
 
 
@@ -54,13 +51,18 @@
 
 %files
 %defattr(-,root,root,-)
+# For license text(s), see the perl package.
 %doc Changes README
-%{perl_vendorlib}/XML
+%{perl_vendorlib}/XML/
 %{_mandir}/man3/*.3*
 
 
 %changelog
-* Fri Apr  7 2005 Michael Schwendt 
+* Fri Sep  9 2005 Jose Pedro Oliveira  - 2.14-1
+- Update to 2.14.
+- Added the dist tag.
+
+* Fri Apr  7 2005 Michael Schwendt  - 2.13-2
 - rebuilt
 
 * Sat Nov 27 2004 Jose Pedro Oliveira  - 0:2.13-1


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-XML-Simple/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	4 Dec 2004 13:23:25 -0000	1.3
+++ sources	9 Sep 2005 10:35:39 -0000	1.4
@@ -1 +1 @@
-3891139e5e2e2134e596aa1404e866df  XML-Simple-2.13.tar.gz
+f321058271815de28d214c8efb9091f9  XML-Simple-2.14.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep  9 10:55:23 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri,  9 Sep 2005 06:55:23 -0400
Subject: rpms/perl-Hook-LexWrap/devel perl-Hook-LexWrap.spec,1.1,1.2
Message-ID: <200509091055.j89AtNJn029614@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Hook-LexWrap/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29595

Modified Files:
	perl-Hook-LexWrap.spec 
Log Message:
Comment about license files location.


Index: perl-Hook-LexWrap.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Hook-LexWrap/devel/perl-Hook-LexWrap.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Hook-LexWrap.spec	2 Sep 2005 22:50:32 -0000	1.1
+++ perl-Hook-LexWrap.spec	9 Sep 2005 10:55:21 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-Hook-LexWrap
 Version:        0.20
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Lexically scoped subroutine wrappers
 
 Group:          Development/Libraries
@@ -10,7 +10,6 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
-BuildRequires:  perl
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
@@ -48,11 +47,15 @@
 
 %files
 %defattr(-,root,root,-)
+# For license text(s), see the perl package.
 %doc Changes README
 %{perl_vendorlib}/Hook/
 %{_mandir}/man3/*.3*
 
 
 %changelog
+* Fri Sep  9 2005 Jose Pedro Oliveira  - 0.20-2
+- Comment about license files location.
+
 * Fri Aug 26 2005 Jose Pedro Oliveira  - 0.20-1
 - First build.



From fedora-extras-commits at redhat.com  Fri Sep  9 10:57:44 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri,  9 Sep 2005 06:57:44 -0400
Subject: rpms/perl-Locale-Maketext-Fuzzy/devel
	perl-Locale-Maketext-Fuzzy.spec, 1.1, 1.2
Message-ID: <200509091057.j89Avi4r029649@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Locale-Maketext-Fuzzy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29630

Modified Files:
	perl-Locale-Maketext-Fuzzy.spec 
Log Message:
Comment about license files location.


Index: perl-Locale-Maketext-Fuzzy.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Locale-Maketext-Fuzzy/devel/perl-Locale-Maketext-Fuzzy.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Locale-Maketext-Fuzzy.spec	2 Sep 2005 22:46:24 -0000	1.1
+++ perl-Locale-Maketext-Fuzzy.spec	9 Sep 2005 10:57:41 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-Locale-Maketext-Fuzzy
 Version:        0.02
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Maketext from already interpolated strings
 
 Group:          Development/Libraries
@@ -48,12 +48,16 @@
 
 %files
 %defattr(-,root,root,-)
+# For license text(s), see the perl package.
 %doc Changes README
 %{perl_vendorlib}/Locale/
 %{_mandir}/man3/*.3*
 
 
 %changelog
+* Fri Sep  9 2005 Jose Pedro Oliveira  - 0.02-2
+- Comment about license files location.
+
 * Thu Aug 11 2005 Jose Pedro Oliveira  - 0.02-1
 - Update to Fedora Extras template.
 



From fedora-extras-commits at redhat.com  Fri Sep  9 11:26:15 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Fri,  9 Sep 2005 07:26:15 -0400
Subject: rpms/prozilla/FC-3 prozilla.spec,1.8,1.9
Message-ID: <200509091126.j89BQF8r031598@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/prozilla/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31545/FC-3

Modified Files:
	prozilla.spec 
Log Message:
%%{_bindir}/proz.


Index: prozilla.spec
===================================================================
RCS file: /cvs/extras/rpms/prozilla/FC-3/prozilla.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- prozilla.spec	26 Aug 2005 02:35:56 -0000	1.8
+++ prozilla.spec	9 Sep 2005 11:26:13 -0000	1.9
@@ -45,10 +45,13 @@
 %doc ANNOUNCE AUTHORS ChangeLog COPYING CREDITS FAQ NEWS README TODO
 %config(noreplace) %verify(not size mtime md5) /etc/prozilla.conf
 %config(noreplace) %verify(not size mtime md5) /etc/prozilla.conf-sample
-%{_prefix}/bin/proz
+%{_bindir}/proz
 %{_mandir}/man1/proz*
 
 %changelog
+* Fri Sep 09 2005 Ralf Corsepius 
+- %%{_bindir}/proz.
+
 * Thu Aug 25 2005 Warren Togami  - 0:1.3.7.4-1
 - 1.3.7.4 Security (#166789)
 



From fedora-extras-commits at redhat.com  Fri Sep  9 11:26:09 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Fri,  9 Sep 2005 07:26:09 -0400
Subject: rpms/prozilla/devel prozilla.spec,1.10,1.11
Message-ID: <200509091126.j89BQetx031603@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/prozilla/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31545/devel

Modified Files:
	prozilla.spec 
Log Message:
%%{_bindir}/proz.


Index: prozilla.spec
===================================================================
RCS file: /cvs/extras/rpms/prozilla/devel/prozilla.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- prozilla.spec	26 Aug 2005 02:33:34 -0000	1.10
+++ prozilla.spec	9 Sep 2005 11:26:07 -0000	1.11
@@ -45,10 +45,13 @@
 %doc ANNOUNCE AUTHORS ChangeLog COPYING CREDITS FAQ NEWS README TODO
 %config(noreplace) %verify(not size mtime md5) /etc/prozilla.conf
 %config(noreplace) %verify(not size mtime md5) /etc/prozilla.conf-sample
-%{_prefix}/bin/proz
+%{_bindir}/proz
 %{_mandir}/man1/proz*
 
 %changelog
+* Fri Sep 09 2005 Ralf Corsepius 
+- %%{_bindir}/proz.
+
 * Thu Aug 25 2005 Warren Togami  - 0:1.3.7.4-1
 - 1.3.7.4 Security (#166789)
 



From fedora-extras-commits at redhat.com  Fri Sep  9 11:26:10 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Fri,  9 Sep 2005 07:26:10 -0400
Subject: rpms/prozilla/FC-4 prozilla.spec,1.10,1.11
Message-ID: <200509091126.j89BQeZB031606@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/prozilla/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31545/FC-4

Modified Files:
	prozilla.spec 
Log Message:
%%{_bindir}/proz.


Index: prozilla.spec
===================================================================
RCS file: /cvs/extras/rpms/prozilla/FC-4/prozilla.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- prozilla.spec	26 Aug 2005 02:34:40 -0000	1.10
+++ prozilla.spec	9 Sep 2005 11:26:08 -0000	1.11
@@ -45,10 +45,13 @@
 %doc ANNOUNCE AUTHORS ChangeLog COPYING CREDITS FAQ NEWS README TODO
 %config(noreplace) %verify(not size mtime md5) /etc/prozilla.conf
 %config(noreplace) %verify(not size mtime md5) /etc/prozilla.conf-sample
-%{_prefix}/bin/proz
+%{_bindir}/proz
 %{_mandir}/man1/proz*
 
 %changelog
+* Fri Sep 09 2005 Ralf Corsepius 
+- %%{_bindir}/proz.
+
 * Thu Aug 25 2005 Warren Togami  - 0:1.3.7.4-1
 - 1.3.7.4 Security (#166789)
 



From fedora-extras-commits at redhat.com  Fri Sep  9 12:16:12 2005
From: fedora-extras-commits at redhat.com (Oliver Falk (oliver))
Date: Fri,  9 Sep 2005 08:16:12 -0400
Subject: rpms/squidGuard/devel squidGuard-perlwarning.patch, NONE,
	1.1 squidGuard-sed.patch, NONE, 1.1 squidGuard.conf, NONE,
	1.1 squidGuard.fc, NONE, 1.1 squidGuard.te, NONE,
	1.1 squidguard, NONE, 1.1 transparent-proxying, NONE,
	1.1 update_squidguard_blacklists, NONE, 1.1 squidGuard.spec,
	1.1, 1.2
Message-ID: <200509091216.j89CGCt5000531@cvs-int.fedora.redhat.com>

Author: oliver

Update of /cvs/extras/rpms/squidGuard/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv501

Modified Files:
	squidGuard.spec 
Added Files:
	squidGuard-perlwarning.patch squidGuard-sed.patch 
	squidGuard.conf squidGuard.fc squidGuard.te squidguard 
	transparent-proxying update_squidguard_blacklists 
Log Message:

* Fri Sep 09 2005 Oliver Falk       - 1.2.0-12
- Make it K12LTSP compatible, so a possible upgrade doesn't break
  anything/much...
  - Add SELinux stuff
  - Move dbdir to /var/squidGuard/blacklists, instead of /var/lib/squidGuard
  - Added update script and template config from/for K12
  - Add perlwarnings and sed patch
  - Install cgis in /var/www/cgi-bin
  - Added initrd stuff
- Remove questionable -ldb from make
- Remove questionable db version check



squidGuard-perlwarning.patch:

--- NEW FILE squidGuard-perlwarning.patch ---
--- ./squidGuard-1.2.0/samples/squidGuard.cgi.in.orig   2003-04-12 14:58:38.000000000 -0700
+++ ./squidGuard-1.2.0/samples/squidGuard.cgi.in    2003-04-12 14:58:59.000000000 -0700
@@ -1,4 +1,4 @@
-#! @PERL@ -w
+#! @PERL@ 
 #
 # Explain to the user that the URL is blocked and by which rule set
 #

squidGuard-sed.patch:

--- NEW FILE squidGuard-sed.patch ---
diff -Naur squidGuard-1.2.0/src/sgDiv.c squidGuard-1.2.0-patch/src/sgDiv.c
--- squidGuard-1.2.0/src/sgDiv.c	Tue May 15 05:01:37 2001
+++ squidGuard-1.2.0-patch/src/sgDiv.c	Tue Aug  6 14:39:55 2002
@@ -500,13 +500,13 @@
 #endif
 {
   struct sgRegExp *re;
-  regmatch_t pm;
+  regmatch_t pm[10];
   static char newstring[MAX_BUF];
   char *result = NULL, *p;
   int substlen;
   *newstring='\0';
   for(re = regexp; re != NULL; re = re->next){
-    if (regexec (re->compiled, pattern, 1, &pm, 0) != 0){
+    if (regexec (re->compiled, pattern, sizeof(pm) / sizeof(pm[0]), pm, 0) != 0){
       result = NULL;
     } else {
       substlen = strlen(re->substitute);
@@ -516,14 +516,65 @@
 	*newstring = '\0';
       p = newstring;
       do {
-	if((p - newstring)+ pm.rm_so  >= MAX_BUF)
+	if((p - newstring)+ pm[0].rm_so  >= MAX_BUF)
 	  break;
-	p = strncat(newstring,pattern,pm.rm_so);
-	if((p - newstring)+ substlen  >= MAX_BUF)
-	  break;
-	p = strcat(newstring,re->substitute);	
-	pattern = pattern + pm.rm_eo;
-      } while(regexec (re->compiled, pattern, 1, &pm, REG_NOTBOL)== 0 &&
+      p = strncat(newstring,pattern,pm[0].rm_so);
+      {
+          char *p_cur;
+          char *p_next;
+
+          for (p_next = p_cur = re->substitute;
+              p_next < (re->substitute + substlen);
+              p_next++)
+          {
+              if (*p_next == '\\')
+              {
+                  if (p_cur < p_next)
+                  {
+                      if (((p - newstring) + (p_next - p_cur)) >= MAX_BUF)
+                          goto err;
+                      p = strncat(newstring, p_cur, p_next - p_cur);
+                  }
+                  p_next++;
+                  if (p_next < (re->substitute + substlen)
+                      && '0' <= *p_next && *p_next <= '9')
+                  {
+                      int i = *p_next - '0';
+                      if ((p - newstring) + (pm[i].rm_eo - pm[i].rm_so) >= MAX_BUF)
+                          goto err;
+                      p = strncat(newstring, pattern + pm[i].rm_so, pm[i].rm_eo - pm[i].rm_so);
+                  }
+                  else
+                  {
+                      if ((p - newstring + 1) >= MAX_BUF)
+                          goto err;
+                      p = strncat(newstring, p_next, 1);
+                  }
+                  p_cur = p_next + 1;
+              }
+              else if (*p_next == '&')
+              {
+                  if (p_cur < p_next)
+                  {
+                      if (((p - newstring) + (p_next - p_cur)) >= MAX_BUF)
+                          goto err;
+                      p = strncat(newstring, p_cur, p_next - p_cur);
+                  }
+                  if (((p - newstring) + (pm[0].rm_eo - pm[0].rm_so)) >= MAX_BUF)
+                      goto err;
+                  p = strncat(newstring, pattern + pm[0].rm_so, pm[0].rm_eo - pm[0].rm_so);
+                  p_cur = p_next + 1;
+              }
+          }
+          if (p_cur < p_next)
+          {
+              if (((p - newstring) + (p_next - p_cur)) >= MAX_BUF)
+                  goto err;
+              p = strncat(newstring, p_cur, p_next - p_cur);
+          }
+      }
+      pattern = pattern + pm[0].rm_eo;
+     } while(regexec (re->compiled, pattern, sizeof(pm) / sizeof(pm[0]), pm, REG_NOTBOL)== 0 &&
 	      re->global);
       if((p - newstring)+ strlen(pattern)  <= MAX_BUF)
 	p = strcat(newstring,pattern);
@@ -531,6 +582,7 @@
       break;
     }
   }
+err:
   return result;
 }


--- NEW FILE squidGuard.conf ---
#
# CONFIG FILE FOR SQUIDGUARD
#
# See http://www.squidguard.org/config/ for more examples
#

dbhome /var/squidGuard/blacklists
logdir /var/log/squidGuard

dest ads {
    log        ads
    domainlist    ads/domains
    urllist        ads/urls
}

dest audio-video {
    log        audio-video
    domainlist    audio-video/domains
    urllist        audio-video/urls
}

dest aggressive {
    log        aggressive
    domainlist    aggressive/domains
    urllist        aggressive/urls
}

dest drugs {
    log        drugs
    domainlist    drugs/domains
    urllist        drugs/urls
}

dest gambling{
    log        gambling
    domainlist    gambling/domains
    urllist        gambling/urls
}

dest hacking {
    log        hacking
    domainlist    hacking/domains
    urllist        hacking/urls
}

dest mail {
    log        mail
    domainlist    mail/domains
    urllist        mail/urls
}

dest porn{
    log        porn
    domainlist    porn/domains
    urllist        porn/urls
}

dest proxy{
    log        proxy
    domainlist    proxy/domains
    urllist        proxy/urls
}

dest violence{
    log        violence
    domainlist    violence/domains
    urllist        violence/urls
}

dest warez{
    log        warez
    domainlist    warez/domains
    urllist        warez/urls
}

dest local-ok{
    domainlist      local-ok/domains
    urllist         local-ok/urls
}

dest local-block{
    log             local-block
    domainlist      local-block/domains
    urllist         local-block/urls
}

rewrite google {
    s@(google.com/search.*q=.*)@\1\&safe=active at i
    s@(google.com/images.*q=.*)@\1\&safe=active at i
    s@(google.com/groups.*q=.*)@\1\&safe=active at i
    s@(google.com/news.*q=.*)@\1\&safe=active at i
    # log google
}

acl {
    default {
	# for google to be in "safe mode"
	rewrite google

	# the default categories are conservative, please add any additional
	# categories listed above or simply comment out this line and uncomment
	# out the line below it.
        pass local-ok !local-block !gambling !porn !warez all
#        pass local-ok !local-block !aggressive !drugs !gambling !hacking !porn !proxy !violence !warez all

        redirect     302:http://SERVERNAME/cgi-bin/squidGuard.cgi?clientaddr=%a&clientname=%n&clientident=%i&srcclass=%s&targetgroup=%t&url=%u
        # redirect     302:http://SERVERNAME/cgi-bin/squidGuard-simple.cgi?clientaddr=%a&clientname=%n&clientident=%i&srcclass=%s&targetclass=%t&url=%u
    }
}


--- NEW FILE squidGuard.fc ---
# squid

/usr/sbin/squidGuard   --        system_u:object_r:squid_exec_t
/var/log/squidGuard(/.*)?        system_u:object_r:squid_log_t
/var/squidGuard/blacklists(/.*)? system_u:object_r:squid_cache_t


--- NEW FILE squidGuard.te ---
allow squid_t usr_t:lnk_file read;


--- NEW FILE squidguard ---
#!/bin/bash
# squid-filtering	This shell script takes care of starting and stopping
#		Squid Internet Object Cache and squidGuard web filter
#
# chkconfig: - 91 25
# description: SquidGuard - web filtering system for the Squid proxy server. \
#	Squid - Internet Object Cache. Internet object caching is \
# 	a way to store requested Internet objects (i.e., data available \
# 	via the HTTP, FTP, and gopher protocols) on a system closer to the \
#	requesting site than to the source. Web browsers can then use the \
#	local Squid cache as a proxy HTTP server, reducing access time as \
#	well as bandwidth consumption.
# pidfile: /var/run/squid.pid
# config: /etc/squid/squid-squidGuard.conf

PATH=/usr/bin:/sbin:/bin:/usr/sbin
export PATH

# Source function library.
. /etc/rc.d/init.d/functions

# Source networking configuration.
. /etc/sysconfig/network

# Check that networking is up.
[ ${NETWORKING} = "no" ] && exit 0

# check if the squid-squidGuard.conf file is present
[ -f /etc/squid/squid-squidGuard.conf ] || exit 0

if [ -f /etc/sysconfig/squid ]; then
  . /etc/sysconfig/squid
fi

# don't raise an error if the config file is incomplete 
# set defaults instead:
SQUID_OPTS=${SQUID_OPTS:-"-D"}
SQUID_PIDFILE_TIMEOUT=${SQUID_PIDFILE_TIMEOUT:-20}
SQUID_SHUTDOWN_TIMEOUT=${SQUID_SHUTDOWN_TIMEOUT:-100}

# determine the name of the squid binary
[ -f /usr/sbin/squid ] && SQUID=squid
[ -z "$SQUID" ] && exit 0

prog="$SQUID"

# determine which one is the cache_swap directory
CACHE_SWAP=`sed -e 's/#.*//g' /etc/squid/squid-squidGuard.conf | \
	grep cache_dir |  awk '{ print $3 }'`
[ -z "$CACHE_SWAP" ] && CACHE_SWAP=/var/spool/squid

RETVAL=0

start() {
    for adir in $CACHE_SWAP; do
        if [ ! -d $adir/00 ]; then 
	     echo -n "init_cache_dir $adir... "
	     $SQUID -f /etc/squid/squid-squidGuard.conf -z -F -D 2>/dev/null
	fi
    done
    echo -n $"Starting $prog: "
    $SQUID $SQUID_OPTS -f /etc/squid/squid-squidGuard.conf 2> /dev/null
    RETVAL=$?
    if [ $RETVAL -eq 0 ]; then 
       timeout=0;
       while : ; do
          [ ! -f /var/run/squid.pid ] || break
	  if [ $timeout -ge $SQUID_PIDFILE_TIMEOUT ]; then
	     RETVAL=1
	     break
	  fi
	  sleep 1 && echo -n "."
	  timeout=$((timeout+1))
       done
    fi
    [ $RETVAL -eq 0 ] && touch /var/lock/subsys/$SQUID
    [ $RETVAL -eq 0 ] && echo_success
    [ $RETVAL -ne 0 ] && echo_failure
    echo
    return $RETVAL
}

stop() {
    echo -n  $"Stopping $prog: "
    $SQUID -k check -f /etc/squid/squid-squidGuard.conf >/dev/null 2>&1
    RETVAL=$?
    if [ $RETVAL -eq 0 ] ; then
        $SQUID -k shutdown -f /etc/squid/squid-squidGuard.conf &
    	rm -f /var/lock/subsys/$SQUID
	timeout=0
 	while : ; do
		[ -f /var/run/squid.pid ] || break
		if [ $timeout -ge $SQUID_SHUTDOWN_TIMEOUT ]; then
		    echo
		    return 1
		fi
		sleep 2 && echo -n "." 
		timeout=$((timeout+2))
    	done
	echo_success
	echo 
    else
    	echo_failure
	echo
    fi
    return $RETVAL
}    

reload() {
    $SQUID $SQUID_OPTS -k reconfigure -f /etc/squid/squid-squidGuard.conf
}

restart() {
    stop
    start
}    

condrestart() {
    [ -e /var/lock/subsys/squid ] && restart || :
}

rhstatus() { 
    status $SQUID
    $SQUID -k check -f /etc/squid/squid-squidGuard.conf
}

probe() {
    return 0
}    

case "$1" in
start)
    start
    ;;

stop)
    stop
    ;;

reload)
    reload
    ;;

restart)
    restart
    ;;

condrestart)
    condrestart
    ;;

status)
    rhstatus
    ;;

probe)
    exit 0
    ;;

*)
    echo $"Usage: $0 {start|stop|status|reload|restart|condrestart}"
    exit 1
esac

exit $?


--- NEW FILE transparent-proxying ---
#!/bin/bash
# transparent_proxying  This shell script takes care of starting and stopping
#               transparent proxying
#
# chkconfig: - 91 24
# description: transparent proxying: this will force all web traffic to be \
#	redirected to the squid proxy server. It will only work if squid \
#	is running
# pidfile: /var/run/squid.pid
	
# Source function library.
. /etc/init.d/functions

start() {
	echo -n "Starting transparent proxying: "
	if [ -f /var/run/squid.pid ]
	then
		# Turn on IP forwarding
		echo 1 > /proc/sys/net/ipv4/ip_forward

		# Turn on transparent proxy redirect
		/sbin/iptables -t nat -A PREROUTING -p tcp --dport 80 -j REDIRECT --to-port 3128
       		echo_success
	else
		echo -n "Squid is not running! "
       		echo_failure
	fi
	echo
	return 0
}	
stop() {
	echo -n "Stopping transparent proxying: "
	echo 0 > /proc/sys/net/ipv4/ip_forward
	# Turn off transparent proxy redirect
	/sbin/iptables -t nat -D PREROUTING -p tcp --dport 80 -j REDIRECT --to-port 3128
  	echo_success
	echo
	return 0
}	
status() {
	if [ "`/sbin/iptables -L -n -t nat | grep '80 redir ports 3128'`" ]
	then
		echo "Transparent proxying is active"
		return 0
	else
		echo "Transparent proxying is inactive"
		return 0
	fi
}	


restart() {
	    stop
	    start
}

case "$1" in
  start)
  	start
	;;
  status)
  	status
	;;
  stop)
  	stop
	;;
  restart|reload)
  	restart
	;;
  *)
	echo "*** Usage: {start|stop|restart}"
	exit 1
esac

exit $?


--- NEW FILE update_squidguard_blacklists ---
#!/bin/sh

TARGET=/var/squidGuard/blacklists

cd $TARGET || exit

# only run if squidGuard is active!
[ "`ps auxw | grep squid[G]uard`" ] || exit

rsync -az squidguard.mesd.k12.or.us::filtering $TARGET

for DIR in `ls $TARGET`
do
        if [ -f $DIR/domains.include ]
        then
                TMP=$RANDOM
                cat $DIR/domains $DIR/domains.include | sort | uniq > $DIR/domains.$TMP
                mv -f $DIR/domains.$TMP $DIR/domains
        fi
        if [ -f $DIR/urls.include ]
        then
                TMP=$RANDOM
                cat $DIR/urls $DIR/urls.include | sort | uniq > $DIR/urls.$TMP
                mv -f $DIR/urls.$TMP $DIR/urls
        fi
done

/usr/sbin/squidGuard -c /etc/squid/squidGuard.conf  -C all
# /usr/sbin/squidGuard -c /etc/squid/squidGuard.conf  -u

chown -R squid.squid $TARGET
chown -R squid.squid /var/log/squidGuard/

sleep 5s

/usr/bin/killall -HUP squid



Index: squidGuard.spec
===================================================================
RCS file: /cvs/extras/rpms/squidGuard/devel/squidGuard.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- squidGuard.spec	6 Sep 2005 10:50:41 -0000	1.1
+++ squidGuard.spec	9 Sep 2005 12:16:10 -0000	1.2
@@ -1,12 +1,11 @@
 # $Id$
 
-%define			_dbhomedir		%{_var}/lib/%{name}
-
-%define			_dbrpmver		%(eval "rpm -q --queryformat \"%{VERSION}\" db4")
+%define			_dbhomedir		%{_var}/%{name}/blacklists
+%define			_cgibin			/var/www/cgi-bin
 
 Name:			squidGuard
 Version:		1.2.0
-Release:		11
+Release:		12%{?dist}
 Summary:		Filter, redirector and access controller plugin for squid
 
 Group:			System Environment/Daemons
@@ -17,15 +16,30 @@
 Source2:		http://ftp.teledanmark.no/pub/www/proxy/%{name}/contrib/blacklists.tar.gz
 Source3:		http://cuda.port-aransas.k12.tx.us/squid-getlist.html
 
+# K12LTSP stuff
+Source100:		squidGuard.conf
+Source101:		update_squidguard_blacklists
+Source102:		squidguard
+Source103:		transparent-proxying
+
+# SELinux (taken from K12LTSP package)
+Source200:		squidGuard.te
+Source201:		squidGuard.fc
+
 Patch0:			squidGuard-destdir.patch
 Patch1:			squidGuard-paths.patch
 Patch2:			squidguard-1.2.0-db4.patch
 Patch3:			squid-getlist.html.patch
+Patch4:			squidGuard-perlwarning.patch
+Patch5:			squidGuard-sed.patch
+
 URL:			http://www.squidguard.org/
 
 BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	db4-devel
 Requires:		squid
+Requires(post):	%{_bindir}/chcon
+Requires(post):	/sbin/chkconfig
 
 %description
 squidGuard can be used to 
@@ -56,10 +70,13 @@
 %{__cp} %{SOURCE3} .
 %patch0 -p1 -b .destdir
 %patch1 -p1 -b .paths
-%if "%{_dbrpmver}" != "4.0.14"
 %patch2 -p0 -b .db4
-%endif
 %patch3 -p0
+%patch4 -p2
+%patch5 -p1
+
+%{__cp} %{SOURCE100} ./squidGuard.conf.k12ltsp.template
+%{__cp} %{SOURCE101} ./update_squidguard_blacklists.k12ltsp.sh
 
 %build
 %configure \
@@ -67,7 +84,11 @@
 	--with-sg-logdir=%{_var}/log/squid \
 	--with-sg-dbhome=%{_dbhomedir}
 	
-%{__make} %{?_smp_mflags} LIBS=-ldb
+%{__make} %{?_smp_mflags}
+
+pushd contrib
+%{__make} %{?_smp_mflags}
+popd
 
 %install
 %{__rm} -rf $RPM_BUILD_ROOT
@@ -78,9 +99,21 @@
 %{__install} -p -D -m 0644 samples/sample.conf $RPM_BUILD_ROOT%{_sysconfdir}/squid/squidGuard.conf
 %{__install} -p -D -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_dbhomedir}/blacklists.tar.gz
 
-# Don't use SOURCE3, but use the allready patched one #165689, also install it with perm 755 not 750
+# Don't use SOURCE3, but use the allready patched one #165689
 %{__install} -p -D -m 0755 squid-getlist.html $RPM_BUILD_ROOT%{_sysconfdir}/cron.daily/squidGuard
 
+%{__install} -p -D %{SOURCE200} $RPM_BUILD_ROOT%{_sysconfdir}/selinux/targeted/src/policy/domains/program/squidGuard.te
+%{__install} -p -D %{SOURCE201} $RPM_BUILD_ROOT%{_sysconfdir}/selinux/targeted/src/policy/file_contexts/program/squidGuard.fc
+
+%{__install} -p -d $RPM_BUILD_ROOT%{_cgibin}
+%{__install} samples/squid*cgi $RPM_BUILD_ROOT%{_cgibin}
+
+%{__install} contrib/hostbyname/hostbyname $RPM_BUILD_ROOT%{_bindir}
+%{__install} contrib/sgclean/sgclean $RPM_BUILD_ROOT%{_bindir}
+
+%{__install} -p -D -m 0755 %{SOURCE102} $RPM_BUILD_ROOT%{_initrddir}/squidGuard
+%{__install} -p -D -m 0755 %{SOURCE103} $RPM_BUILD_ROOT%{_initrddir}/transparent-proxying
+
 pushd $RPM_BUILD_ROOT%{_dbhomedir}
 tar xfz $RPM_BUILD_ROOT%{_dbhomedir}/blacklists.tar.gz
 popd
@@ -90,20 +123,71 @@
 %clean
 %{__rm} -rf $RPM_BUILD_ROOT
 
+%post
+# fix SELinux bits
+%{_bindir}/chcon -R system_u:object_r:squid_cache_t /var/squidGuard >/dev/null 2>&1
+%{_bindir}/chcon -R system_u:object_r:squid_log_t /var/log/squidGuard >/dev/null 2>&1
+
+# do we need a new config file?
+if [ -s %{_sysconfdir}/squid/squidGuard.conf ]; then
+	CONFFILE="%{_sysconfdir}/squid/squidGuard.conf.rpmnew"
+    echo "/etc/squid/squidGuard.conf created as /etc/squid/squidGuard.conf.rpmnew"
+else
+	CONFFILE="/etc/squid/squidGuard.conf"
+fi
+cat %{_docdir}/%{name}-%{version}/squidGuard.conf.k12ltsp.template | \
+	sed s/SERVERNAME/$HOSTNAME/g > $CONFFILE
+
+/sbin/chkconfig --add squidGuard
+/sbin/chkconfig --add transparent-proxying
+
+# reload SELinux policies
+echo "Loading new SELinux policy"
+pushd %{_sysconfdir}/selinux/targeted/src/policy/
+%{__make} load &> /dev/null
+popd
+
+#### End of %post
+
+%preun
+if [ $1 = 0 ] ; then
+    service squidGuard stop >/dev/null 2>&1
+    /sbin/chkconfig --del squidGuard
+	/sbin/chkconfig --del transparent-proxying
+fi
+
 %files
 %defattr(-,root,root)
 %doc samples/*.conf
 %doc samples/*.cgi
 %doc samples/dest/blacklists.tar.gz
-%doc COPYING GPL
+%doc COPYING GPL 
 %doc doc/*.txt doc/*.html doc/*.gif
+%doc squidGuard.conf.k12ltsp.template
 %{_bindir}/*
 %config(noreplace) %{_sysconfdir}/squid/squidGuard.conf
 %config(noreplace) %{_sysconfdir}/logrotate.d/squidGuard
 %config(noreplace) %{_sysconfdir}/cron.daily/squidGuard
 %{_dbhomedir}/
+%{_sysconfdir}/selinux/targeted/src/policy/domains/program/squidGuard.te
+%{_sysconfdir}/selinux/targeted/src/policy/file_contexts/program/squidGuard.fc
+%attr(07550,root,root) %{_cgibin}/*.cgi
+%{_initrddir}/squidGuard
+%{_initrddir}/transparent-proxying
 
 %changelog
+* Fri Sep 09 2005 Oliver Falk 		- 1.2.0-12
+- Make it K12LTSP compatible, so a possible upgrade doesn't break
+  anything/much...
+  - Add SELinux stuff
+  - Move dbdir to /var/squidGuard/blacklists, instead of /var/lib/squidGuard
+  - Added update script and template config from/for K12
+  - Add perlwarnings and sed patch
+  - Install cgis in /var/www/cgi-bin
+  - Added initrd stuff
+- Remove questionable -ldb from make
+- Remove questionable db version check
+
 * Tue Sep 06 2005 Oliver Falk 		- 1.2.0-11
 - More bugs from Bug #165689
   Install cron script with perm 755



From fedora-extras-commits at redhat.com  Fri Sep  9 12:26:05 2005
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Fri,  9 Sep 2005 08:26:05 -0400
Subject: rpms/cppunit - New directory
Message-ID: <200509091226.j89CQ518000623@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/cppunit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv603/cppunit

Log Message:
Directory /cvs/extras/rpms/cppunit added to the repository




From fedora-extras-commits at redhat.com  Fri Sep  9 12:26:06 2005
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Fri,  9 Sep 2005 08:26:06 -0400
Subject: rpms/cppunit/devel - New directory
Message-ID: <200509091226.j89CQ6IM000628@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/cppunit/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv603/cppunit/devel

Log Message:
Directory /cvs/extras/rpms/cppunit/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Sep  9 12:38:43 2005
From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo))
Date: Fri,  9 Sep 2005 08:38:43 -0400
Subject: owners owners.list,1.181,1.182
Message-ID: <200509091238.j89CchvQ000696@cvs-int.fedora.redhat.com>

Author: ryo

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv677

Modified Files:
	owners.list 
Log Message:
add tomoe and scim-tomoe



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.181
retrieving revision 1.182
diff -u -r1.181 -r1.182
--- owners.list	8 Sep 2005 18:36:13 -0000	1.181
+++ owners.list	9 Sep 2005 12:38:41 -0000	1.182
@@ -857,6 +857,7 @@
 Fedora Extras|scim-pinyin|Chinese input method for SCIM|ryo-dairiki at mbm.nifty.com|extras-qa at fedoraproject.org|petersen at redhat.com
 Fedora Extras|scim-qtimm|SCIM Qt Input Method module|petersen at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|scim-tables|SCIM Generic Table IMEngine and its data files|ryo-dairiki at mbm.nifty.com|extras-qa at fedoraproject.org|
+Fedora Extras|scim-tomoe|Tomoe module for SCIM for Japanese handwritten input|ryo-dairiki at mbm.nifty.com|extras-qa at fedoraproject.org|
 Fedora Extras|scmxx|Exchange data with Siemens mobile phones|andreas at bawue.net|extras-qa at fedoraproject.org|
 Fedora Extras|scons|An Open Source software construction tool|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|scorched3d|A game based loosely on the classic DOS game Scorched Earth|pmatilai at laiskiainen.org|extras-qa at fedoraproject.org|
@@ -939,6 +940,7 @@
 Fedora Extras|tkcvs|TkCVS and TkDiff|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|tktable|Table/matrix widget extension to Tcl/Tk|jfontain at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|tla|The Low-Budget arch Revision Control System|shahms at shahms.com|extras-qa at fedoraproject.org|
+Fedora Extras|tomoe|Japanese handwritten input system|ryo-dairiki at mbm.nifty.com|extras-qa at fedoraproject.org|
 Fedora Extras|torcs|An OpenGL 3d racing game|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|torcs-data|The Open Racing Car Simulator data files|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|tpb|IBM ThinkPad button support utility|ville.skytta at iki.fi|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Fri Sep  9 12:39:13 2005
From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo))
Date: Fri,  9 Sep 2005 08:39:13 -0400
Subject: rpms/tomoe/FC-3 tomoe.spec,1.1,1.2
Message-ID: <200509091239.j89CdD8R000722@cvs-int.fedora.redhat.com>

Author: ryo

Update of /cvs/extras/rpms/tomoe/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv703

Modified Files:
	tomoe.spec 
Log Message:



Index: tomoe.spec
===================================================================
RCS file: /cvs/extras/rpms/tomoe/FC-3/tomoe.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tomoe.spec	7 Sep 2005 09:28:46 -0000	1.1
+++ tomoe.spec	9 Sep 2005 12:39:11 -0000	1.2
@@ -41,7 +41,7 @@
 rm -rf $RPM_BUILD_ROOT
 
 
-%post -p/sbin/ldconfig
+%post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
 



From fedora-extras-commits at redhat.com  Fri Sep  9 12:39:31 2005
From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo))
Date: Fri,  9 Sep 2005 08:39:31 -0400
Subject: rpms/tomoe/FC-4 tomoe.spec,1.1,1.2
Message-ID: <200509091239.j89CdVDk000761@cvs-int.fedora.redhat.com>

Author: ryo

Update of /cvs/extras/rpms/tomoe/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv728/FC-4

Modified Files:
	tomoe.spec 
Log Message:



Index: tomoe.spec
===================================================================
RCS file: /cvs/extras/rpms/tomoe/FC-4/tomoe.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tomoe.spec	7 Sep 2005 09:28:46 -0000	1.1
+++ tomoe.spec	9 Sep 2005 12:39:29 -0000	1.2
@@ -41,7 +41,7 @@
 rm -rf $RPM_BUILD_ROOT
 
 
-%post -p/sbin/ldconfig
+%post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
 



From fedora-extras-commits at redhat.com  Fri Sep  9 12:39:32 2005
From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo))
Date: Fri,  9 Sep 2005 08:39:32 -0400
Subject: rpms/tomoe/devel tomoe.spec,1.1,1.2
Message-ID: <200509091239.j89CdW89000767@cvs-int.fedora.redhat.com>

Author: ryo

Update of /cvs/extras/rpms/tomoe/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv728/devel

Modified Files:
	tomoe.spec 
Log Message:



Index: tomoe.spec
===================================================================
RCS file: /cvs/extras/rpms/tomoe/devel/tomoe.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tomoe.spec	7 Sep 2005 09:28:46 -0000	1.1
+++ tomoe.spec	9 Sep 2005 12:39:30 -0000	1.2
@@ -41,7 +41,7 @@
 rm -rf $RPM_BUILD_ROOT
 
 
-%post -p/sbin/ldconfig
+%post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
 



From fedora-extras-commits at redhat.com  Fri Sep  9 12:49:24 2005
From: fedora-extras-commits at redhat.com (Jeff Carlson (jcarlson))
Date: Fri,  9 Sep 2005 08:49:24 -0400
Subject: rpms/up-imapproxy - New directory
Message-ID: <200509091249.j89CnOXr000956@cvs-int.fedora.redhat.com>

Author: jcarlson

Update of /cvs/extras/rpms/up-imapproxy
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv936/up-imapproxy

Log Message:
Directory /cvs/extras/rpms/up-imapproxy added to the repository




From fedora-extras-commits at redhat.com  Fri Sep  9 12:49:24 2005
From: fedora-extras-commits at redhat.com (Jeff Carlson (jcarlson))
Date: Fri,  9 Sep 2005 08:49:24 -0400
Subject: rpms/up-imapproxy/devel - New directory
Message-ID: <200509091249.j89CnOBx000961@cvs-int.fedora.redhat.com>

Author: jcarlson

Update of /cvs/extras/rpms/up-imapproxy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv936/up-imapproxy/devel

Log Message:
Directory /cvs/extras/rpms/up-imapproxy/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Sep  9 12:49:42 2005
From: fedora-extras-commits at redhat.com (Jeff Carlson (jcarlson))
Date: Fri,  9 Sep 2005 08:49:42 -0400
Subject: rpms/up-imapproxy Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200509091249.j89CngCL000998@cvs-int.fedora.redhat.com>

Author: jcarlson

Update of /cvs/extras/rpms/up-imapproxy
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv984

Added Files:
	Makefile import.log 
Log Message:
Setup of module up-imapproxy


--- NEW FILE Makefile ---
# Top level Makefile for module up-imapproxy
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Fri Sep  9 12:49:44 2005
From: fedora-extras-commits at redhat.com (Jeff Carlson (jcarlson))
Date: Fri,  9 Sep 2005 08:49:44 -0400
Subject: rpms/up-imapproxy/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200509091249.j89CnioF001011@cvs-int.fedora.redhat.com>

Author: jcarlson

Update of /cvs/extras/rpms/up-imapproxy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv984/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module up-imapproxy


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Fri Sep  9 12:50:24 2005
From: fedora-extras-commits at redhat.com (Jeff Carlson (jcarlson))
Date: Fri,  9 Sep 2005 08:50:24 -0400
Subject: rpms/up-imapproxy/devel imapproxy.init, NONE, 1.1 up-imapproxy.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200509091250.j89CoOl4001091@cvs-int.fedora.redhat.com>

Author: jcarlson

Update of /cvs/extras/rpms/up-imapproxy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1058/devel

Modified Files:
	.cvsignore sources 
Added Files:
	imapproxy.init up-imapproxy.spec 
Log Message:
auto-import up-imapproxy-1.2.3-6 on branch devel from up-imapproxy-1.2.3-6.src.rpm


--- NEW FILE imapproxy.init ---
#!/bin/bash
#
# up-imapproxy: Starts the University of Pittsburgh IMAP Proxy
#
# chkconfig: - 75 25
# description: imapproxy was written to compensate for webmail clients that \
#              are unable to maintain persistent connections to an IMAP \
#              server. Most webmail clients need to log in to an IMAP server \
#              for nearly every single transaction. This behaviour can cause \
#              tragic performance problems on the IMAP server. imapproxy \
#              tries to deal with this problem by leaving server connections \
#              open for a short time after a webmail client logs out. When \
#              the webmail client connects again, imapproxy will determine if \
#              there's a cached connection available and reuse it if possible.
# processname: in.imapproxyd
# config: /etc/imapproxy.conf

# Source function library.
. /etc/init.d/functions

. /etc/sysconfig/network

# Check that networking is configured.
[ ${NETWORKING} = "no" ] && exit 0

start() {
	echo -n $"Starting imapproxyd: "
	daemon /usr/sbin/in.imapproxyd
	RETVAL=$?
	echo
	touch $lockfile
	return $RETVAL
}

stop() {
	echo -n $"Shutting down imapproxyd: "
	killproc /usr/sbin/in.imapproxyd
	RETVAL=$?
	if [ $RETVAL -eq 0 ] ; then
	    rm -f $lockfile
	fi
	echo
	return $RETVAL
}

restart() {
	stop
	start
}

RETVAL=0
lockfile=/var/lock/subsys/imapproxy

# See how we were called.
case "$1" in
  start)
	start
	;;
  stop)
	stop
	;;
  status)
	status in.imapproxyd
	;;
  restart|reload)
	restart
	;;
  condrestart)
        [ -f /var/lock/subsys/in.imapproxyd ] && restart || :
	;;
  *)
	echo $"Usage: $0 {start|stop|status|restart|condrestart}"
	exit 1
esac

exit $?


--- NEW FILE up-imapproxy.spec ---
Summary: University of Pittsburgh IMAP Proxy
Name: up-imapproxy
Version: 1.2.3
Release: 6%{?dist}
License: GPL
Group: System Environment/Daemons
URL: http://www.imapproxy.org
Source0: http://www.imapproxy.org/downloads/up-imapproxy-%{version}.tar.gz
Source1: imapproxy.init
# Source1 can be downloaded from
# https://bugzilla.redhat.com/bugzilla/attachment.cgi?id=118632
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires(post): /sbin/chkconfig
Requires(preun): /sbin/chkconfig, /sbin/service
Requires(postun): /sbin/service
BuildRequires: openssl-devel tcp_wrappers ncurses-devel

%description
imapproxy was written to compensate for webmail clients that are
unable to maintain persistent connections to an IMAP server. Most
webmail clients need to log in to an IMAP server for nearly every
single transaction. This behaviour can cause tragic performance
problems on the IMAP server. imapproxy tries to deal with this problem
by leaving server connections open for a short time after a webmail
client logs out. When the webmail client connects again, imapproxy
will determine if there's a cached connection available and reuse it
if possible.

%prep
%setup -q

%build
%configure
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
# The install-* Makefile targets don't support DESTDIR syntax, so work around.
install -D -m 0644 -p scripts/imapproxy.conf \
	$RPM_BUILD_ROOT%{_sysconfdir}/imapproxy.conf
install -D -m 0755 -p %{SOURCE1} \
	$RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/imapproxy
install -d -m 0755 $RPM_BUILD_ROOT%{_sbindir}
install -m 0755 bin/* $RPM_BUILD_ROOT%{_sbindir}
install -d -m 0755 $RPM_BUILD_ROOT%{_localstatedir}/run
touch $RPM_BUILD_ROOT%{_localstatedir}/run/pimpstats

%clean
rm -rf $RPM_BUILD_ROOT

%post
if [ $1 == 1 ] ; then
    /sbin/chkconfig --add imapproxy &> /dev/null || :
fi

%preun
if [ $1 == 0 ] ; then
    /sbin/service imapproxy stop &> /dev/null || :
    /sbin/chkconfig --del imapproxy || :
fi

%postun
/sbin/service imapproxy condrestart &> /dev/null || :

%files
%defattr(-,root,root,-)
%doc COPYING ChangeLog README README.debian README.known_issues README.ssl
%config(noreplace) %{_sysconfdir}/imapproxy.conf
%ghost %{_localstatedir}/run/pimpstats
     %{_sysconfdir}/rc.d/init.d/*
     %{_sbindir}/*

%changelog
* Fri Sep  9 2005 Jeff Carlson  - 1.2.3-6
- Another change to the init script.

* Sat Sep  3 2005 Jeff Carlson  - 1.2.3-5
- Preserve certain timestamps.

* Thu Sep  1 2005 Jeff Carlson  - 1.2.3-4
- Fix rpmlint complaints.
- Paul also provided a replacement init script.
- Fixed some redundant BuildReqs.
- Tuned Requires, install, and files.
- Many thanks to Paul Howarth.

* Wed Aug 31 2005 Jeff Carlson  - 1.2.3-3
- Added BuildRequires.

* Fri Aug 12 2005 Jeff Carlson  - 1.2.3-2
- Multiple fixups recommended by spot.

* Mon Jul 18 2005 Jeff Carlson  - 1.2.3-1
- Initial build.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/up-imapproxy/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	9 Sep 2005 12:49:42 -0000	1.1
+++ .cvsignore	9 Sep 2005 12:50:22 -0000	1.2
@@ -0,0 +1 @@
+up-imapproxy-1.2.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/up-imapproxy/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Sep 2005 12:49:42 -0000	1.1
+++ sources	9 Sep 2005 12:50:22 -0000	1.2
@@ -0,0 +1 @@
+ad4dafd1417903feb1e09ec569ff1ad5  up-imapproxy-1.2.3.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep  9 12:50:23 2005
From: fedora-extras-commits at redhat.com (Jeff Carlson (jcarlson))
Date: Fri,  9 Sep 2005 08:50:23 -0400
Subject: rpms/up-imapproxy import.log,1.1,1.2
Message-ID: <200509091250.j89CorqZ001098@cvs-int.fedora.redhat.com>

Author: jcarlson

Update of /cvs/extras/rpms/up-imapproxy
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1058

Modified Files:
	import.log 
Log Message:
auto-import up-imapproxy-1.2.3-6 on branch devel from up-imapproxy-1.2.3-6.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/up-imapproxy/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	9 Sep 2005 12:49:40 -0000	1.1
+++ import.log	9 Sep 2005 12:50:21 -0000	1.2
@@ -0,0 +1 @@
+up-imapproxy-1_2_3-6:HEAD:up-imapproxy-1.2.3-6.src.rpm:1126270218



From fedora-extras-commits at redhat.com  Fri Sep  9 12:53:04 2005
From: fedora-extras-commits at redhat.com (Jeff Carlson (jcarlson))
Date: Fri,  9 Sep 2005 08:53:04 -0400
Subject: owners owners.list,1.182,1.183
Message-ID: <200509091253.j89Cr47T001153@cvs-int.fedora.redhat.com>

Author: jcarlson

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1134

Modified Files:
	owners.list 
Log Message:
Added up-imapproxy.



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.182
retrieving revision 1.183
diff -u -r1.182 -r1.183
--- owners.list	9 Sep 2005 12:38:41 -0000	1.182
+++ owners.list	9 Sep 2005 12:53:02 -0000	1.183
@@ -960,6 +960,7 @@
 Fedora Extras|umfpack|Routines for solving unsymmetric sparse linear systems|qspencer at ieee.org|extras-qa at fedoraproject.org|
 Fedora Extras|unison|File synchronization tool|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|unrtf|RTF to other formats converter|gauret at free.fr|extras-qa at fedoraproject.org|
+Fedora Extras|up-imapproxy|University of Pittsburgh IMAP Proxy|jeff at ultimateevil.org|extras-qa at fedoraproject.org|
 Fedora Extras|upx|The Ultimate Packer for eXecutables|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|uqm-content|Base content files for The Ur-Quan Masters|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|uqm|The Ur-Quan Masters|ville.skytta at iki.fi|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Fri Sep  9 14:16:17 2005
From: fedora-extras-commits at redhat.com (Jeff Carlson (jcarlson))
Date: Fri,  9 Sep 2005 10:16:17 -0400
Subject: rpms/up-imapproxy/devel up-imapproxy.spec,1.1,1.2
Message-ID: <200509091416.j89EGHNA003977@cvs-int.fedora.redhat.com>

Author: jcarlson

Update of /cvs/extras/rpms/up-imapproxy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3958

Modified Files:
	up-imapproxy.spec 
Log Message:
* Fri Sep  9 2005 Jeff Carlson  - 1.2.4-1
- Bump to current upstream release.
- Upstream includes a new doc (copyright), included.




Index: up-imapproxy.spec
===================================================================
RCS file: /cvs/extras/rpms/up-imapproxy/devel/up-imapproxy.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- up-imapproxy.spec	9 Sep 2005 12:50:22 -0000	1.1
+++ up-imapproxy.spec	9 Sep 2005 14:16:15 -0000	1.2
@@ -1,7 +1,7 @@
 Summary: University of Pittsburgh IMAP Proxy
 Name: up-imapproxy
-Version: 1.2.3
-Release: 6%{?dist}
+Version: 1.2.4
+Release: 1%{?dist}
 License: GPL
 Group: System Environment/Daemons
 URL: http://www.imapproxy.org
@@ -65,12 +65,17 @@
 %files
 %defattr(-,root,root,-)
 %doc COPYING ChangeLog README README.debian README.known_issues README.ssl
+%doc copyright
 %config(noreplace) %{_sysconfdir}/imapproxy.conf
 %ghost %{_localstatedir}/run/pimpstats
-     %{_sysconfdir}/rc.d/init.d/*
-     %{_sbindir}/*
+%{_sysconfdir}/rc.d/init.d/*
+%{_sbindir}/*
 
 %changelog
+* Fri Sep  9 2005 Jeff Carlson  - 1.2.4-1
+- Bump to current upstream release.
+- Upstream includes a new doc (copyright), included.
+
 * Fri Sep  9 2005 Jeff Carlson  - 1.2.3-6
 - Another change to the init script.
 



From fedora-extras-commits at redhat.com  Fri Sep  9 15:10:19 2005
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Fri,  9 Sep 2005 11:10:19 -0400
Subject: extras-buildsys/server DBManager.py, NONE, 1.1 BuildMaster.py, 1.34,
	1.35 BuilderManager.py, 1.15, 1.16 Config.py, 1.5,
	1.6 Makefile, 1.9, 1.10 UserInterface.py, 1.54, 1.55 main.py,
	1.13, 1.14
Message-ID: <200509091510.j89FAJww005450@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys/server
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5408/server

Modified Files:
	BuildMaster.py BuilderManager.py Config.py Makefile 
	UserInterface.py main.py 
Added Files:
	DBManager.py 
Log Message:
2005-09-09  Dan Williams  

    * Add support for PostgreSQL as the database backend.
        Databases are now abstracted and support for others,
        like MySQL, need to be added to server/DBManager.py.
        Should be really easy though.

    NOTE: sqlite support might be broken right now due to
        SQL statement quoting changes




--- NEW FILE DBManager.py ---
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
# GNU Library General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
# copyright 2005 Duke University
#
# Copyright 2005 Dan Williams  and Red Hat, Inc.

import os, sys
import types
import exceptions
from plague import BaseConfig
import Config


class ResultSet:
    """ Partially taken from sqlite's python DB-API module """

    def __init__(self, result, desc):
        self.__dict__['_dbresult'] = result
        self.__dict__['_desc'] = desc
        self.__dict__['_xlatekey'] = {}

        # set up key translation of field name -> index
        for _i in range(len(desc)):
            self.__dict__['_xlatekey'][desc[_i][0].upper()] = _i

    def __getattr__(self, key):
        key = key.upper()
        if self.__dict__['_xlatekey'].has_key(key):
            return self.__dict__['_dbresult'][self.__dict__['_xlatekey'][key]]
        raise AttributeError, key

    def __len__(self):
        return len(self.__dict__['_dbresult'])

    def __getitem__(self, key):
        if isinstance(key, types.StringType):
            key = self.__dict__['_xlatekey'][key.upper()]
        return self.__dict__['_dbresult'][key]

    def __contains__(self, key):
        return self.__dict__['_xlatekey'].has_key(key.upper())

    def __repr__(self):
        return repr(self.__dict__['_dbresult'])

    def __str__(self):
        return str(self.__dict__['_dbresult'])

    def __cmp__(self, other):
        return cmp(self.__dict__['_dbresult'], other)

    def description(self):
        return self.__dict__['_desc']

    def keys(self):
        _k = []
        for _i in self.__dict__['_desc']:
            _k.append(_i[0])
        return _k

    def values(self):
        return self.__dict__['_dbresult']

    def items(self):
        _items = []
        for i in range(len(self.__dict__['_dbresult'])):
            _items.append((self.__dict__['_desc'][i][0], self.__dict__['_dbresult'][i]))
        return _items

    def has_key(self, key):
        return self.__dict__['_xlatekey'].has_key(key.upper())


class BaseDBEngineClass:
    def __init__(self, cfg):
        self._cfg = cfg
        self._dbcx = self._connect()

    def cursor(self):
        return self._dbcx.cursor()

    def commit(self):
        self._dbcx.commit()

    def get_uid_field_type(self):
        raise Exception("Need to implement this function for derived classes.")

    def get_uid_field_for_insert(self):
        raise Exception("Need to implement this function for derived classes.")

    def get_uid_value_for_insert(self):
        raise Exception("Need to implement this function for derived classes.")

    def fetchall(self, cursor):
        raise Exception("Need to implement this function for derived classes.")

    def fetchone(self, cursor):
        raise Exception("Need to implement this function for derived classes.")

class sqliteEngineClass(BaseDBEngineClass):

    """ sqlite will autoincrement the primary key on insert when you
        specify the field and a value of NULL """

    def get_uid_field_type(self):
        return "INTEGER PRIMARY KEY"

    def get_uid_field_for_insert(self):
        return "uid,"

    def get_uid_value_for_insert(self):
        return "NULL,"

    def fetchall(self, cursor):
        """ sqlite returns the items in a dict-like class already """
        return cursor.fetchall()

    def fetchone(self, cursor):
        """ sqlite returns the items in a dict-like class already """
        return cursor.fetchone()

    def _connect(self):
        try:
            dbloc = self._cfg.get_str("sqlite Engine", "database")
        except BaseConfig.ConfigError, e:
            print "Error: bad sqlite config options.  '%s'" % e
            os._exit(1)

        try:
            tm = self._cfg.get_int("sqlite Engine", "timeout")
        except BaseConfig.ConfigError, e:
            tm = 3

        try:
            dbcx = sqlite.connect(dbloc, encoding="utf-8", timeout=tm)
        except StandardError, e:
            print "Error: %s" % e
            os._exit(1)
        return dbcx


class pgdbEngineClass(BaseDBEngineClass):

    """ postgres will autoincrement SERIAL fields on insert automatically,
        you don't need to specify its value in INSERT statements """

    def get_uid_field_type(self):
        return "SERIAL PRIMARY KEY"

    def get_uid_field_for_insert(self):
        return ""

    def get_uid_value_for_insert(self):
        return ""

    def fetchall(self, cursor):
        """ We need to convert the returned data to a ResultSet object so
            we can access it as a dict 
        """
        rows = cursor.fetchall()
        return [ResultSet(row, cursor.description) for row in rows]

    def fetchone(self, cursor):
        """ We need to convert the returned data to a ResultSet object so
            we can access it as a dict 
        """
        row = cursor.fetchone()
        if not row:
            return None
        return ResultSet(row, cursor.description)

    def _connect(self):
        try:
            host = self._cfg.get_str("pgdb Engine", "host")
            database = self._cfg.get_str("pgdb Engine", "database")
            user = self._cfg.get_str("pgdb Engine", "user")
            password = self._cfg.get_str("pgdb Engine", "password")
        except BaseConfig.ConfigError, e:
            print "Error: bad pgdb config options.  '%s'" % e
            os._exit(1)

        try:
            dbcx = pgdb.connect(host=host, database=database, user=user, password=password)
        except StandardError, e:
            print "Error: %s" % e
            os._exit(1)

        return dbcx




db_engines = {
    'sqlite':   sqliteEngineClass,
    'pgdb':    pgdbEngineClass
}

# Import our database engines, if any engine
# isn't present, remove its class entry from
# the db engine dict
try:
    import sqlite
except ImportError, e:
    db_engines['sqlite'] = None

try:
    import pgdb
except ImportError, e:
    db_engines['pgdb'] = None



class DBManager:
    def __init__(self, cfg):
        self._cfg = cfg
        try:
            engine = self._cfg.get_str("Database", "engine")
            self._db_engine_class = db_engines[engine]
        except KeyError:
            print "Error: unrecognized database engine '%s'.  Must be " \
                    "one of: %s" % (engine, db_engines.keys())
            os._exit(1)

        if not self._db_engine_class:
            print "Error: database engine '%s' could not be loaded.  " \
                    "Perhaps you need the python module for it?" % engine
            os._exit(1)

        print "Using database engine %s." % engine

        # Make sure our database structure is what we want
        dbcx = self.dbcx()
        if not dbcx:
            os._exit(1)
        self._ensure_tables(dbcx)
        del dbcx

    def dbcx(self):
        try:
            dbcx = self._db_engine_class(self._cfg)
        except StandardError, e:
            dbcx = None
            print "DB Error: %s" % e

        return dbcx

    def _ensure_tables(self, dbcx):
        """ Create database tables if they don't exist """

        curs = dbcx.cursor()
        try:
            curs.execute('SELECT * FROM jobs LIMIT 4')
        except Exception, e:
            # If table wasn't created, try to create it
            try:
                uid_type = dbcx.get_uid_field_type()
                dbcx.commit()
                curs.execute('CREATE TABLE jobs ('  \
                    'uid %s, '                      \
                    'username VARCHAR(20), '        \
                    'package VARCHAR(50), '         \
                    'source VARCHAR(255), '         \
                    'target_distro VARCHAR(20), '   \
                    'target_target VARCHAR(20), '   \
                    'target_repo VARCHAR(20), '     \
                    'buildreq VARCHAR(75), '        \
                    'starttime BIGINT, '            \
                    'endtime BIGINT, '              \
                    'status VARCHAR(15), '          \
                    'result VARCHAR(15), '          \
                    'epoch VARCHAR(4), '            \
                    'version VARCHAR(25), '         \
                    'release VARCHAR(25), '         \
                    'archlist VARCHAR(75), '        \
                    'result_msg TEXT'               \
                    ')' % uid_type)
                dbcx.commit()
            except StandardError, e:
                print "Could not access the job database.  Reason: '%s'.  Exiting..." % e
                os._exit(1)

        # Create the archjobs table
        try:
            curs.execute('SELECT * FROM archjobs LIMIT 4')
        except Exception, e:
            # If table wasn't created, try to create it
            try:
                dbcx.commit()
                curs.execute('CREATE TABLE archjobs ('  \
                    'jobid VARCHAR(40) PRIMARY KEY, '   \
                    'parent_uid INTEGER, '              \
                    'starttime BIGINT, '                \
                    'endtime BIGINT, '                  \
                    'arch VARCHAR(15), '                \
                    'builder_addr VARCHAR(100), '       \
                    'status VARCHAR(15), '              \
                    'builder_status VARCHAR(15)'        \
                    ')')
                dbcx.commit()
            except StandardError, e:
                print "Could not access the job database.  Reason: '%s'.  Exiting..." % e
                os._exit(1)



Index: BuildMaster.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/BuildMaster.py,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- BuildMaster.py	29 Aug 2005 17:48:19 -0000	1.34
+++ BuildMaster.py	9 Sep 2005 15:10:17 -0000	1.35
@@ -18,7 +18,7 @@
 
 import time
 import PackageJob
-import sqlite
+import DBManager
 import threading
 import os
 import Repo
@@ -26,85 +26,13 @@
 import Config
 
 
-# Load in the config
-CONFIG_LOCATION = "/etc/plague/server/"
-
-
-def ensure_job_db_tables(dbcx):
-    """ Central routine to create the database table structure """
-
-    curs = dbcx.cursor()
-    try:
-        curs.execute('SELECT * FROM jobs')
-        dbcx.commit()
-    except Exception, e:
-        # If DB wasn't created, try to create it
-        try:
-            curs.execute('CREATE TABLE jobs ('  \
-                'uid INTEGER PRIMARY KEY, '     \
-                'username VARCHAR(20), '        \
-                'package VARCHAR(50), '         \
-                'source VARCHAR(255), '         \
-                'target_distro VARCHAR(20), '   \
-                'target_target VARCHAR(20), '   \
-                'target_repo VARCHAR(20), '     \
-                'buildreq VARCHAR(75), '        \
-                'starttime BIGINT, '            \
-                'endtime BIGINT, '              \
-                'status VARCHAR(15), '          \
-                'result VARCHAR(15), '          \
-                'epoch VARCHAR(4), '            \
-                'version VARCHAR(25), '         \
-                'release VARCHAR(25), '         \
-                'archlist VARCHAR(75), '        \
-                'result_msg TEXT'               \
-                ')')
-        except sqlite.OperationalError, e:
-            print "Could not access the job database.  Reason: '%s'.  Exiting..." % e
-            os._exit(1)
-        except sqlite.DatabaseError, e:
-            s = "%s" % e
-            if s != "table jobs already exists":
-                print "Could not access the job database.  Reason: '%s'.  Exiting..." % e
-                os._exit(1)
-        else:
-            dbcx.commit()
-
-    # Create the archjobs table
-    try:
-        curs.execute('SELECT * FROM archjobs')
-        dbcx.commit()
-    except Exception, e:
-        # If DB wasn't created, try to create it
-        try:
-            curs.execute('CREATE TABLE archjobs ('  \
-                'jobid VARCHAR(40) PRIMARY KEY, '   \
-                'parent_uid INTEGER, '              \
-                'starttime BIGINT, '                \
-                'endtime BIGINT, '                  \
-                'arch VARCHAR(15), '                \
-                'builder_addr VARCHAR(100), '       \
-                'status VARCHAR(15), '              \
-                'builder_status VARCHAR(15)'        \
-                ')')
-        except sqlite.OperationalError, e:
-            print "Could not access the job database.  Reason: '%s'.  Exiting..." % e
-            os._exit(1)
-        except sqlite.DatabaseError, e:
-            s = "%s" % e
-            if s != "table archjobs already exists":
-                print "Could not access the job database.  Reason: '%s'.  Exiting..." % e
-                os._exit(1)
-        else:
-            dbcx.commit()
-
-
 class BuildMaster(threading.Thread):
 
     MAX_CHECKOUT_JOBS = 5
 
-    def __init__(self, builder_manager, cfg):
+    def __init__(self, builder_manager, db_manager, cfg):
         self.builder_manager = builder_manager
+        self._db_manager = db_manager
         self.hostname = cfg.get_str("General", "hostname")
         self.should_stop = False
         self._paused = False
@@ -136,22 +64,16 @@
         self._building_jobs = {}
         self._building_jobs_lock = threading.Lock()
 
-        try:
-            self.dbcx = sqlite.connect(CONFIG_LOCATION + "jobdb", encoding="utf-8", timeout=3)
-        except sqlite.DatabaseError, e:
-            print "Error: sqlite could not open the job database.  Reason: %s" % e
-            os._exit(1)
-        self.curs = self.dbcx.cursor()
-        ensure_job_db_tables(self.dbcx)
+        self._dbcx = self._db_manager.dbcx()
+        self._cursor = self._dbcx.cursor()
 
         self._requeue_interrupted_jobs()
         threading.Thread.__init__(self)
 
     def _requeue_interrupted_jobs(self):
         """ Restart interrupted jobs from our db. """
-        self.curs.execute('SELECT uid FROM jobs WHERE (status!="needsign" AND status!="failed" AND status!="finished") ORDER BY uid')
-        self.dbcx.commit()
-        uids = self.curs.fetchall()
+        self._cursor.execute("SELECT uid FROM jobs WHERE (status!='needsign' AND status!='failed' AND status!='finished') ORDER BY uid")
+        uids = self._dbcx.fetchall(self._cursor)
 
         if len(uids) == 0:
             return
@@ -178,9 +100,8 @@
         if len(uids) == 0:
             return
 
-        self.curs.execute('SELECT * FROM jobs WHERE %s ORDER BY uid' % uids)
-        self.dbcx.commit()
-        jobs = self.curs.fetchall()
+        self._cursor.execute('SELECT * FROM jobs WHERE %s ORDER BY uid' % uids)
+        jobs = self._dbcx.fetchall(self._cursor)
 
         if len(jobs) == 0:
             return
@@ -188,13 +109,13 @@
         for row in jobs:
             uid = row['uid']
             # Kill any archjobs that are left around
-            self.curs.execute('DELETE FROM archjobs WHERE parent_uid=%d' % uid)
-            self.dbcx.commit()
+            self._cursor.execute('DELETE FROM archjobs WHERE parent_uid=%d' % uid)
+            self._dbcx.commit()
 
             # Clear out old time/result information
-            self.curs.execute('UPDATE jobs SET starttime=%d, endtime=0, ' \
-                              'result_msg="" WHERE uid=%d' % (time.time(), uid))
-            self.dbcx.commit()
+            self._cursor.execute("UPDATE jobs SET starttime=%d, endtime=0, " \
+                              "result_msg='' WHERE uid=%d" % (time.time(), uid))
+            self._dbcx.commit()
 
             # Now requeue the job
             target_str = Config.make_target_string(row['target_distro'],
@@ -299,10 +220,10 @@
 
             # Update job end time
             try:
-                self.curs.execute('UPDATE jobs SET endtime=%d WHERE uid=%d' % (job.endtime, uid))
-            except sqlite.OperationalError, e:
+                self._cursor.execute('UPDATE jobs SET endtime=%d WHERE uid=%d' % (job.endtime, uid))
+            except StandardError, e:
                 print "DB Error: could not access jobs database. Reason: '%s'" % e
-            self.dbcx.commit()
+            self._dbcx.commit()
 
             print "%s (%s): Job finished." % (uid, job.package)
 
@@ -314,45 +235,42 @@
         self._done_queue_lock.release()
 
     def _write_job_status_to_db(self, uid, attrdict):
-        sql = 'status="%s"' % attrdict['status']
+        sql = "status='%s'" % attrdict['status']
         if attrdict.has_key('epoch') and attrdict.has_key('version') and attrdict.has_key('release'):
-            sql = sql + ', epoch="%s", version="%s", release="%s"' % (attrdict['epoch'],
+            sql = sql + ", epoch='%s', version='%s', release='%s'" % (attrdict['epoch'],
                     attrdict['version'], attrdict['release'])
         if attrdict.has_key('result_msg'):
             import urllib
-            sql = sql + ', result_msg="%s"' % (urllib.quote(attrdict['result_msg']))
+            sql = sql + ", result_msg='%s'" % (urllib.quote(attrdict['result_msg']))
         if attrdict.has_key('result'):
-            sql = sql + ', result="%s"' % attrdict['result']
+            sql = sql + ", result='%s'" % attrdict['result']
 
         sql = 'UPDATE jobs SET ' + sql + ' WHERE uid=%d' % uid
         try:
-            self.curs.execute(sql)
-        except sqlite.OperationalError, e:
+            self._cursor.execute(sql)
+        except StandardError, e:
             print "DB Error: could not access jobs database. Reason: '%s'" % e
-
-        self.dbcx.commit()
+        self._dbcx.commit()
 
     def _write_archjob_status_to_db(self, uid, attrdict):
-        self.curs.execute('SELECT parent_uid FROM archjobs WHERE jobid="%s"' % uid)
-        self.dbcx.commit()
-        if len(self.curs.fetchall()) == 0:
+        self._cursor.execute("SELECT parent_uid FROM archjobs WHERE jobid='%s'" % uid)
+        if len(self._dbcx.fetchall(self._cursor)) == 0:
             try:
-                self.curs.execute('INSERT INTO archjobs (jobid, parent_uid, starttime, '    \
-                    'endtime, arch, builder_addr, status, builder_status) '   \
-                    'VALUES ("%s", %d, %d, %d, "%s", "%s", "%s", "%s")' % (uid, attrdict['parent_uid'], \
+                self._cursor.execute("INSERT INTO archjobs (jobid, parent_uid, starttime, "    \
+                    "endtime, arch, builder_addr, status, builder_status) "   \
+                    "VALUES ('%s', %d, %d, %d, '%s', '%s', '%s', '%s')" % (uid, attrdict['parent_uid'], \
                     attrdict['starttime'], attrdict['endtime'], attrdict['arch'],                       \
                     attrdict['builder_addr'], attrdict['status'], attrdict['builder_status']))
-            except sqlite.OperationalError, e:
+            except StandardError, e:
                 print "DB Error: could not access jobs database. Reason: '%s'" % e
         else:            
             try:
-                self.curs.execute('UPDATE archjobs SET status="%s", builder_status="%s", endtime=%d ' \
-                    'WHERE jobid="%s" AND parent_uid=%d' % (attrdict['status'], 
+                self._cursor.execute("UPDATE archjobs SET status='%s', builder_status='%s', endtime=%d " \
+                    "WHERE jobid='%s' AND parent_uid=%d" % (attrdict['status'], 
                     attrdict['builder_status'], attrdict['endtime'], uid, attrdict['parent_uid']))
-            except sqlite.OperationalError, e:
+            except StandardError, e:
                 print "DB Error: could not access jobs database. Reason: '%s'" % e
-
-        self.dbcx.commit()
+        self._dbcx.commit()
 
     def _save_job_status(self):
         # Write new job status to the database
@@ -373,27 +291,28 @@
     def _start_new_jobs(self):
         self._new_queue_lock.acquire()
 
+        uid_field = self._dbcx.get_uid_field_for_insert()
+        uid_value = self._dbcx.get_uid_value_for_insert()
         for item in self._new_queue:
-            self.curs.execute('INSERT INTO jobs (uid, username, package,' \
-                    ' source, target_distro, target_target, target_repo, buildreq,' \
-                    ' starttime, endtime, status, result)' \
-                    ' VALUES (NULL, "%s", "%s", "%s", "%s", "%s", "%s", "%s", %d, 0, "%s", "")' \
-                    % (item['email'], item['package'], item['source'], item['target_distro'], \
+            self._cursor.execute("INSERT INTO jobs (%s username, package," \
+                    " source, target_distro, target_target, target_repo, buildreq," \
+                    " starttime, endtime, status, result)" \
+                    " VALUES (%s '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, 0, '%s', '')" \
+                    % (uid_field, uid_value, item['email'], item['package'], item['source'], item['target_distro'], \
                     item['target_target'], item['target_repo'], item['buildreq'], \
                     item['time'], 'initialize'))
-            self.dbcx.commit()
+            self._dbcx.commit()
 
             # Find the UID
-            self.curs.execute('SELECT uid FROM jobs WHERE username="%s" AND' \
-                    ' package="%s" AND source="%s" AND target_distro="%s" AND' \
-                    ' target_target="%s" AND target_repo = "%s" AND' \
-                    ' buildreq="%s" AND starttime=%d AND status="initialize"' \
+            self._cursor.execute("SELECT uid FROM jobs WHERE username='%s' AND" \
+                    " package='%s' AND source='%s' AND target_distro='%s' AND" \
+                    " target_target='%s' AND target_repo = '%s' AND" \
+                    " buildreq='%s' AND starttime=%d AND status='initialize'" \
                     % (item['email'], item['package'], item['source'], \
                     item['target_distro'], item['target_target'], item['target_repo'], \
                     item['buildreq'], item['time']))
-            self.dbcx.commit()
 
-            data = self.curs.fetchall()
+            data = self._dbcx.fetchall(self._cursor)
             # If two of the same job are submitted close together, we need
             # to make sure we pick the last result to get the correct one
             row = data[len(data) - 1]


Index: BuilderManager.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/BuilderManager.py,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- BuilderManager.py	31 Aug 2005 19:55:30 -0000	1.15
+++ BuilderManager.py	9 Sep 2005 15:10:17 -0000	1.16
@@ -153,7 +153,6 @@
 
             # Use the builder with the most free build slots
             builder_list.sort(key=self._builder_sort_func, reverse=True)
-            print builder_list
             for builder in builder_list:
                 try:
                     job = builder.start_job(parent, req['target_dict'], req['srpm_url'])


Index: Config.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/Config.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Config.py	31 Aug 2005 14:13:03 -0000	1.5
+++ Config.py	9 Sep 2005 15:10:17 -0000	1.6
@@ -125,6 +125,20 @@
         self.set_option("UI", "guest_allowed", "yes")
         self.set_option("UI", "log_url", "http://www.foo.com/logs/")
 
+        self.add_section("Database")
+        self.set_option("Database", "engine", "sqlite")
+
+        self.add_section("sqlite Engine")
+        self.set_option("sqlite Engine", "database", "/etc/plague/server/jobdb")
+        self.set_option("sqlite Engine", "timeout", "3")
+
+        self.add_section("pgdb Engine")
+        self.set_option("pgdb Engine", "host", "localhost")
+        self.set_option("pgdb Engine", "database", "plague")
+        self.set_option("pgdb Engine", "user", "plague")
+        self.set_option("pgdb Engine", "password", "")
+
+
         self.save()
 
 


Index: Makefile
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/Makefile,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Makefile	25 Aug 2005 18:15:14 -0000	1.9
+++ Makefile	9 Sep 2005 15:10:17 -0000	1.10
@@ -15,6 +15,7 @@
 	Builder.py \
 	BuildMaster.py \
 	Config.py \
+	DBManager.py \
 	EmailUtils.py \
 	PackageJob.py \
 	Repo.py \


Index: UserInterface.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/UserInterface.py,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- UserInterface.py	1 Sep 2005 20:36:12 -0000	1.54
+++ UserInterface.py	9 Sep 2005 15:10:17 -0000	1.55
@@ -15,7 +15,6 @@
 # Copyright 2005 Dan Williams  and Red Hat, Inc.
 
 
-import sqlite
 import EmailUtils
 import time
 import sys
@@ -25,22 +24,14 @@
 import BuildMaster
 import PackageJob
 import Config
+import DBManager
 from plague import AuthedXMLRPCServer
 
 
-CONFIG_LOCATION = "/etc/plague/server/"
-
 # API version #, just increment each time an incompatible API change is made
 XMLRPC_API_VERSION = 100
 
 
-def get_dbcx():
-    dbcx = None
-    dbcx = sqlite.connect(CONFIG_LOCATION + "jobdb", encoding="utf-8", timeout=3)
-    curs = dbcx.cursor()
-    return (dbcx, curs)
-
-
 def validate_email(email):
     safe_list = ['@', '_', '-', '.', '+']
     for c in email:
@@ -101,9 +92,10 @@
     Base UserInterface class. NO AUTHENTICATION.  Subclass this to provide some.
     """
 
-    def __init__(self, builder_manager, build_master, cfg):
+    def __init__(self, builder_manager, build_master, db_manager, cfg):
         self._builder_manager = builder_manager
         self._bm = build_master
+        self._db_manager = db_manager
         self._cfg = cfg
 
     def email_result(self, to, source, resultstring):
@@ -185,25 +177,28 @@
         if not uid:
             return (-1, "Error: Invalid job UID.")
 
-        sql = 'SELECT uid, username, status, result FROM jobs WHERE uid=%d' % uid
+        sql = "SELECT uid, username, status, result FROM jobs WHERE uid=%d" % uid
 
         # Run the query for the job
         try:
-            dbcx, curs = get_dbcx()
-        except sqlite.DatabaseError, e:
-            return (-1, "Unable to access job database.")
+            dbcx = self._db_manager.dbcx()
+            curs = dbcx.cursor()
+        except StandardError, e:
+            return (-1, "Unable to access job database: '%s'" % e)
         curs.execute(sql)
-        job = curs.fetchone()
+        job = dbcx.fetchone(curs)
+        result = None
         if not job:
-            return (-1, "Error: Invalid job UID.")
-
-        # Ensure the job failed or was killed
-        if job['result'] != 'failed' and job['result'] != 'killed':
-            return (-1, "Error: Job %d must be either 'failed' or 'killed' to requeue." % uid)
+            result = (-1, "Error: Invalid job UID.")
+        elif job['result'] != 'failed' and job['result'] != 'killed':
+            result = (-1, "Error: Job %d must be either 'failed' or 'killed' to requeue." % uid)
+        else:
+            self._bm.requeue_job(uid)
+            resutl = (0, "Success: Job %d has been requeued." % uid)
 
-        self._bm.requeue_job(uid)
-        return (0, "Success: Job %d has been requeued." % uid)
-        
+        del cursor
+        del dbcx
+        return result        
 
     def _kill_job(self, email, job, jobid):
         if not job:
@@ -216,13 +211,13 @@
     def list_jobs(self, args_dict):
         """ Query job information and return it to the user """
 
-        sql = 'SELECT uid, username, package, source, target_distro, target_target, ' \
-                    'target_repo, starttime, endtime, status, result FROM jobs WHERE '
+        sql = "SELECT uid, username, package, source, target_distro, target_target, " \
+                    "target_repo, starttime, endtime, status, result FROM jobs WHERE "
         sql_args = []
 
         if args_dict.has_key('email') and args_dict['email']:
             if validate_email(args_dict['email']):
-                sql_args.append('username LIKE "%%%s%%"' % args_dict['email'])
+                sql_args.append("username LIKE '%%%s%%'" % args_dict['email'])
             else:
                 return (-1, "Error: Invalid email address.", [])
 
@@ -235,16 +230,16 @@
                 if not PackageJob.is_package_job_stage_valid(status):
                     return (-1, "Error: Invalid job status.", [])
                 if len(status_sql) > 0:
-                    status_sql = status_sql + ' OR status="%s"' % status
+                    status_sql = status_sql + " OR status='%s'" % status
                 else:
-                    status_sql = 'status="%s"' % status
+                    status_sql = "status='%s'" % status
             status_sql = '(' + status_sql + ')'
             sql_args.append(status_sql)
 
         if args_dict.has_key('result') and args_dict['result']:
             result = args_dict['result']
             if PackageJob.is_package_job_result_valid(result):
-                sql_args.append('result="%s"' % result)
+                sql_args.append("result='%s'" % result)
             else:
                 return (-1, "Error: Invalid job result.", [])
 
@@ -271,9 +266,9 @@
             if not target_cfg:
                 return (-1, "Error: Invalid target.", [])
 
-            sql_args.append('target_distro="%s"' % target_cfg.distro())
-            sql_args.append('target_target="%s"' % target_cfg.target())
-            sql_args.append('target_repo="%s"' % target_cfg.repo())
+            sql_args.append("target_distro='%s'" % target_cfg.distro())
+            sql_args.append("target_target='%s'" % target_cfg.target())
+            sql_args.append("target_repo='%s'" % target_cfg.repo())
 
         if not len(sql_args):
             return (-1, "Error: Invalid query.", [])
@@ -320,11 +315,12 @@
 
         # Run the query for the job
         try:
-            dbcx, curs = get_dbcx()
-        except sqlite.DatabaseError, e:
-            return (-1, "Unable to access job database.", [])
+            dbcx = self._db_manager.dbcx()
+            curs = dbcx.cursor()
+        except StandardError, e:
+            return (-1, "Unable to access job database: '%s'" % e, [])
         curs.execute(sql)
-        data = curs.fetchall()
+        data = dbcx.fetchall(curs)
         jobs = []
         for row in data:
             jobrec = {}
@@ -355,7 +351,7 @@
             sql = "SELECT jobid, parent_uid, starttime, endtime, arch, builder_addr, "  \
                     "status, builder_status FROM archjobs WHERE " + uids
             curs.execute(sql)
-            data = curs.fetchall()
+            data = dbcx.fetchall(curs)
             for row in data:
                 ajrec = {}
                 ajrec['jobid'] = row['jobid']
@@ -372,7 +368,6 @@
 
         del curs
         del dbcx
-
         return (0, "Success.", jobs)
 
 
@@ -389,12 +384,15 @@
 
         # Run the query for the job
         try:
-            dbcx, curs = get_dbcx()
-        except sqlite.DatabaseError, e:
-            return (-1, "Unable to access job database.", {})
+            dbcx = self._db_manager.dbcx()
+            curs = dbcx.cursor()
+        except StandardError, e:
+            return (-1, "Unable to access job database: '%s'" % e, {})
         curs.execute(sql)
-        job = curs.fetchone()
+        job = dbcx.fetchone(curs)
         if not job:
+            del curs
+            del dbcx
             return (-1, "Error: Invalid job UID.", {})
         jobrec = {}
         jobrec['uid'] = job['uid']
@@ -426,7 +424,7 @@
         sql = "SELECT jobid, parent_uid, starttime, endtime, arch, builder_addr, "    \
                 "status, builder_status FROM archjobs WHERE parent_uid=%d " % uid
         curs.execute(sql)
-        data = curs.fetchall()
+        data = dbcx.fetchall(curs)
         for row in data:
             ajrec = {}
             ajrec['jobid'] = row['jobid']
@@ -439,10 +437,10 @@
             ajrec['builder_status'] = row['builder_status']
             jobrec['archjobs'].append(ajrec)
 
+        ret_job = copy.deepcopy(jobrec)
+
         del curs
         del dbcx
-
-        ret_job = copy.deepcopy(jobrec)
         return (0, "Success.", ret_job)
 
 
@@ -489,14 +487,18 @@
                 uids = uids + " OR uid=%d" % uid
 
         if len(uids):
-            sql = 'UPDATE jobs SET status="finished" WHERE %s' % uids
+            sql = "UPDATE jobs SET status='finished' WHERE %s" % uids
 
             try:
-                dbcx, curs = get_dbcx()
-            except sqlite.DatabaseError, e:
-                return (-1, "Unable to access job database.")
+                dbcx = self._db_manager.dbcx()
+                curs = dbcx.cursor()
+            except StandardError, e:
+                return (-1, "Unable to access job database: '%s'" % e)
             curs.execute(sql)
             dbcx.commit()
+            del curs
+            del dbcx
+
         return (0, "Success.")
 
     def srpm_upload_dir(self, target_alias):
@@ -536,20 +538,25 @@
 
         # Run the query for the job
         try:
-            dbcx, curs = get_dbcx()
-        except sqlite.DatabaseError, e:
-            return (-1, "Unable to access job database.")
+            dbcx = self._db_manager.dbcx()
+            curs = dbcx.cursor()
+        except StandardError, e:
+            return (-1, "Unable to access job database: '%s'" % e)
+
         curs.execute(sql)
-        job = curs.fetchone()
-        if not job:
-            return (-1, "Error: Invalid job UID.")
+        job = dbcx.fetchone(curs)
 
-        # Ensure matching usernames
-        if job['username'] != user.email and not user.job_admin:
-            return (-1, "Error: You are not the original submitter for Job %d." % uid)
-            
-        return UserInterface.requeue(self, uid)
+        result = None
+        if not job:
+            result = (-1, "Error: Invalid job UID.")
+        elif job['username'] != user.email and not user.job_admin:
+            result = (-1, "Error: You are not the original submitter for Job %d." % uid)
+        else:
+            result = UserInterface.requeue(self, uid)
 
+        del curs
+        del dbcx
+        return result
 
     def kill_job(self, email, jobid):
         user = AuthedXMLRPCServer.get_authinfo()
@@ -620,31 +627,44 @@
         sql = 'SELECT uid, username, status FROM jobs WHERE %s' % uids
 
         try:
-            dbcx, curs = get_dbcx()
-        except sqlite.DatabaseError, e:
-            return (-1, "Unable to access job database.")
+            dbcx = self._db_manager.dbcx()
+            curs = dbcx.cursor()
+        except StandardError, e:
+            return (-1, "Unable to access job database: '%s'" % e)
+
         curs.execute(sql)
-        data = curs.fetchall()
+        data = dbcx.fetchall(curs)
 
         # Ensure that the user can actually finish the jobs they requested
         final_uid_list = []
+        error = None
         for row in data:
             uid = row['uid']
             username = row['username']
             status = row['status']
 
             if status != 'needsign' and status != 'failed':
-                return (-1, "Error: Job %d must be either 'needsign' or 'failed' to finish it." % uid)
+                error = (-1, "Error: Job %d must be either 'needsign' or 'failed' to finish it." % uid)
+                break
 
             # Marking 'needsign' jobs as finished requires admin privs
             if status == 'needsign' and not user.job_admin:
-                return (-1, "Insufficient privileges to finish job %d." % uid)
+                error = (-1, "Insufficient privileges to finish job %d." % uid)
+                break
+
             # 'failed' jobs can only be finished by the job owner or a job_admin user
             if status == 'failed' and user != user.email and not user.job_admin:
-                return (-1, "Insufficient privileges to finish job %d." % uid)
+                error = (-1, "Insufficient privileges to finish job %d." % uid)
+                break
 
             final_uid_list.append(uid)
 
+        del curs
+        del dbcx
+
+        if error:
+            return error
+
         return UserInterface.finish(self, final_uid_list)
 
     def srpm_upload_dir(self, target_alias):


Index: main.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/main.py,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- main.py	25 Aug 2005 18:15:14 -0000	1.13
+++ main.py	9 Sep 2005 15:10:17 -0000	1.14
@@ -30,6 +30,7 @@
 import User
 import BuildMaster
 import BuilderManager
+import DBManager
 import Config
 from UserInterface import UserInterfaceSSLAuth
 from UserInterface import UserInterfaceNoAuth
@@ -95,11 +96,13 @@
         print "You need at least one target to do anything useful."
         sys.exit(3)
 
+    dbm = DBManager.DBManager(cfg)
+
     builder_manager = BuilderManager.BuilderManager(cfg)
 
     # Create the BuildMaster thread
     hostname = cfg.get_str("General", "hostname")
-    bm = BuildMaster.BuildMaster(builder_manager, cfg)
+    bm = BuildMaster.BuildMaster(builder_manager, dbm, cfg)
     bm.start()
 
     # Create the BuildMaster XMLRPC server
@@ -111,10 +114,10 @@
             ui_certs['key_and_cert'] = cfg.get_str("SSL", "server_key_and_cert")
             ui_certs['ca_cert'] = cfg.get_str("SSL", "ca_cert")
             ui_certs['peer_ca_cert'] = cfg.get_str("UI", "client_ca_cert")
-            ui = UserInterfaceSSLAuth(builder_manager, bm, cfg)
+            ui = UserInterfaceSSLAuth(builder_manager, bm, dbm, cfg)
             bm_server = AuthenticatedSSLXMLRPCServer((hostname, port), ui_certs, cfg)
         else:
-            ui = UserInterfaceNoAuth(builder_manager, bm, cfg)
+            ui = UserInterfaceNoAuth(builder_manager, bm, dbm, cfg)
             bm_server = AuthedXMLRPCServer.AuthedXMLRPCServer((hostname, port))
     except socket.error, e:
         if e[0] == 98:      # Address already in use



From fedora-extras-commits at redhat.com  Fri Sep  9 15:10:10 2005
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Fri,  9 Sep 2005 11:10:10 -0400
Subject: extras-buildsys ChangeLog,1.117,1.118
Message-ID: <200509091510.j89FAilQ005459@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5408

Modified Files:
	ChangeLog 
Log Message:
2005-09-09  Dan Williams  

    * Add support for PostgreSQL as the database backend.
        Databases are now abstracted and support for others,
        like MySQL, need to be added to server/DBManager.py.
        Should be really easy though.

    NOTE: sqlite support might be broken right now due to
        SQL statement quoting changes




Index: ChangeLog
===================================================================
RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -r1.117 -r1.118
--- ChangeLog	8 Sep 2005 21:10:25 -0000	1.117
+++ ChangeLog	9 Sep 2005 15:10:04 -0000	1.118
@@ -1,3 +1,13 @@
+2005-09-09  Dan Williams  
+
+    * Add support for PostgreSQL as the database backend.
+        Databases are now abstracted and support for others,
+        like MySQL, need to be added to server/DBManager.py.
+        Should be really easy though.
+
+    NOTE: sqlite support might be broken right now due to
+        SQL statement quoting changes
+
 2005-09-08  Dan Williams  
 
     * server/PackageJob.py



From fedora-extras-commits at redhat.com  Fri Sep  9 15:47:37 2005
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Fri,  9 Sep 2005 11:47:37 -0400
Subject: extras-buildsys ChangeLog,1.97.2.15,1.97.2.16
Message-ID: <200509091547.j89FlbDB005626@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5597

Modified Files:
      Tag: STABLE_0_3
	ChangeLog 
Log Message:
2005-09-09  Dan Williams  

    * server/UserInterface.py
        - Allow '+' in CVS tags




Index: ChangeLog
===================================================================
RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v
retrieving revision 1.97.2.15
retrieving revision 1.97.2.16
diff -u -r1.97.2.15 -r1.97.2.16
--- ChangeLog	8 Sep 2005 21:05:16 -0000	1.97.2.15
+++ ChangeLog	9 Sep 2005 15:47:35 -0000	1.97.2.16
@@ -1,3 +1,8 @@
+2005-09-09  Dan Williams  
+
+    * server/UserInterface.py
+        - Allow '+' in CVS tags
+
 2005-09-08  Dan Williams  
 
     * server/PackageJob.py



From fedora-extras-commits at redhat.com  Fri Sep  9 15:47:38 2005
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Fri,  9 Sep 2005 11:47:38 -0400
Subject: extras-buildsys/server UserInterface.py,1.44.2.3,1.44.2.4
Message-ID: <200509091547.j89Flceh005632@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys/server
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5597/server

Modified Files:
      Tag: STABLE_0_3
	UserInterface.py 
Log Message:
2005-09-09  Dan Williams  

    * server/UserInterface.py
        - Allow '+' in CVS tags




Index: UserInterface.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/UserInterface.py,v
retrieving revision 1.44.2.3
retrieving revision 1.44.2.4
diff -u -r1.44.2.3 -r1.44.2.4
--- UserInterface.py	24 Aug 2005 19:16:39 -0000	1.44.2.3
+++ UserInterface.py	9 Sep 2005 15:47:36 -0000	1.44.2.4
@@ -69,7 +69,7 @@
     return True
 
 def validate_cvs_tag(tag):
-    safe_list = ['-', '_', '.', ':', '~', '[', ']']
+    safe_list = ['-', '_', '.', ':', '~', '[', ']', '+']
     for c in tag:
         if not (c in safe_list) and not c.isalnum():
             return False



From fedora-extras-commits at redhat.com  Fri Sep  9 15:48:26 2005
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Fri,  9 Sep 2005 11:48:26 -0400
Subject: extras-buildsys ChangeLog,1.97.2.16,1.97.2.17
Message-ID: <200509091548.j89FmQwC005672@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5643

Modified Files:
      Tag: STABLE_0_3
	ChangeLog 
Log Message:
2005-09-09  Dan Williams  

    * builder/builder.py
        - Fix hostname handling to allow binding to all addresses
            _and_ returning correct URL to server




Index: ChangeLog
===================================================================
RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v
retrieving revision 1.97.2.16
retrieving revision 1.97.2.17
diff -u -r1.97.2.16 -r1.97.2.17
--- ChangeLog	9 Sep 2005 15:47:35 -0000	1.97.2.16
+++ ChangeLog	9 Sep 2005 15:48:24 -0000	1.97.2.17
@@ -1,5 +1,11 @@
 2005-09-09  Dan Williams  
 
+    * builder/builder.py
+        - Fix hostname handling to allow binding to all addresses
+            _and_ returning correct URL to server
+
+2005-09-09  Dan Williams  
+
     * server/UserInterface.py
         - Allow '+' in CVS tags
 



From fedora-extras-commits at redhat.com  Fri Sep  9 15:48:26 2005
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Fri,  9 Sep 2005 11:48:26 -0400
Subject: extras-buildsys/builder builder.py,1.31.2.3,1.31.2.4
Message-ID: <200509091548.j89FmQh2005678@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys/builder
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5643/builder

Modified Files:
      Tag: STABLE_0_3
	builder.py 
Log Message:
2005-09-09  Dan Williams  

    * builder/builder.py
        - Fix hostname handling to allow binding to all addresses
            _and_ returning correct URL to server




Index: builder.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/builder/builder.py,v
retrieving revision 1.31.2.3
retrieving revision 1.31.2.4
diff -u -r1.31.2.3 -r1.31.2.4
--- builder.py	31 Aug 2005 18:28:59 -0000	1.31.2.3
+++ builder.py	9 Sep 2005 15:48:24 -0000	1.31.2.4
@@ -40,6 +40,14 @@
 from optparse import OptionParser
 
 
+def get_hostname(bind_all):
+    cfg_hostname = config_opts['hostname']
+    if cfg_hostname and len(cfg_hostname):
+        return cfg_hostname
+    elif bind_all:
+        return ''
+    return socket.gethostname()
+
 certs = {}
 
 def get_url_for_file(file_path):
@@ -54,7 +62,7 @@
         method = "https://"
     else:
         method = "http://"
-    full_url = method + config_opts['hostname'] + ":" + port + "/" + file_part
+    full_url = method + get_hostname(False) + ":" + port + "/" + file_part
     return urllib.quote(full_url)
 
 
@@ -773,8 +781,9 @@
 
     # Start up the HTTP server thread which the build server
     # pulls completed RPMs from
+    bind_hostname = get_hostname(True)
     port = config_opts['fileserver_port']
-    http_server = HTTPServer.PlgHTTPServerManager((config_opts['hostname'], port), work_dir, certs)
+    http_server = HTTPServer.PlgHTTPServerManager((bind_hostname, port), work_dir, certs)
     http_server.start()
 
     # Stop running as root
@@ -786,16 +795,16 @@
             pass
         os._exit(1)
 
-    print "Binding to address '%s' with arches: [%s]" % (config_opts['hostname'], string.join(config_opts['arches']))
+    print "Binding to address '%s' with arches: [%s]" % (bind_hostname, string.join(config_opts['arches']))
     xmlrpc_port = config_opts['xmlrpc_port']
     try:
         if config_opts['ssl_buildserver']:
-            xmlserver = AuthedXMLRPCServer.AuthedSSLXMLRPCServer((config_opts['hostname'], xmlrpc_port), None, certs)
+            xmlserver = AuthedXMLRPCServer.AuthedSSLXMLRPCServer((bind_hostname, xmlrpc_port), None, certs)
         else:
-            xmlserver = AuthedXMLRPCServer.AuthedXMLRPCServer((config_opts['hostname'], xmlrpc_port), None)
+            xmlserver = AuthedXMLRPCServer.AuthedXMLRPCServer((bind_hostname, xmlrpc_port), None)
     except socket.error, e:
         if e[0] == 98:
-            print "Error: couldn't bind to address '%s:%s'.  Is the builder already running?" % (config_opts['hostname'], xmlrpc_port)
+            print "Error: couldn't bind to address '%s:%s'.  Is the builder already running?" % (bind_hostname, xmlrpc_port)
             os._exit(1)
 
     bcs = XMLRPCBuilderServer(target_arch_dict)



From fedora-extras-commits at redhat.com  Fri Sep  9 15:50:00 2005
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Fri,  9 Sep 2005 11:50:00 -0400
Subject: extras-buildsys ChangeLog,1.118,1.119
Message-ID: <200509091550.j89FoVEl005725@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5689

Modified Files:
	ChangeLog 
Log Message:
2005-09-09  Dan Williams  

    * server/UserInterface.py
        - Allow '+' in CVS tags




Index: ChangeLog
===================================================================
RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -r1.118 -r1.119
--- ChangeLog	9 Sep 2005 15:10:04 -0000	1.118
+++ ChangeLog	9 Sep 2005 15:49:58 -0000	1.119
@@ -1,5 +1,10 @@
 2005-09-09  Dan Williams  
 
+    * server/UserInterface.py
+        - Allow '+' in CVS tags
+
+2005-09-09  Dan Williams  
+
     * Add support for PostgreSQL as the database backend.
         Databases are now abstracted and support for others,
         like MySQL, need to be added to server/DBManager.py.



From fedora-extras-commits at redhat.com  Fri Sep  9 15:50:01 2005
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Fri,  9 Sep 2005 11:50:01 -0400
Subject: extras-buildsys/server UserInterface.py,1.55,1.56
Message-ID: <200509091550.j89FoVeX005728@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys/server
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5689/server

Modified Files:
	UserInterface.py 
Log Message:
2005-09-09  Dan Williams  

    * server/UserInterface.py
        - Allow '+' in CVS tags




Index: UserInterface.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/UserInterface.py,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- UserInterface.py	9 Sep 2005 15:10:17 -0000	1.55
+++ UserInterface.py	9 Sep 2005 15:49:59 -0000	1.56
@@ -59,7 +59,7 @@
     return True
 
 def validate_cvs_tag(tag):
-    safe_list = ['-', '_', '.', ':', '~', '[', ']']
+    safe_list = ['-', '_', '.', ':', '~', '[', ']', '+']
     for c in tag:
         if not (c in safe_list) and not c.isalnum():
             return False



From fedora-extras-commits at redhat.com  Fri Sep  9 19:23:41 2005
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Fri,  9 Sep 2005 15:23:41 -0400
Subject: rpms/gcl/FC-4 gcl-pers.patch, NONE, 1.1 .cvsignore, 1.2,
	1.3 gcl.spec, 1.12, 1.13 sources, 1.2, 1.3
Message-ID: <200509091923.j89JNfCq011308@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/gcl/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11284

Modified Files:
	.cvsignore gcl.spec sources 
Added Files:
	gcl-pers.patch 
Log Message:
new version 2.6.7

gcl-pers.patch:

--- NEW FILE gcl-pers.patch ---
--- gcl-2.6.7/o/main.c.pers	2005-09-09 20:36:46.000000000 +0200
+++ gcl-2.6.7/o/main.c	2005-09-09 21:07:51.000000000 +0200
@@ -117,11 +117,9 @@
 #endif
 #endif
 
-#ifdef NEED_NONRANDOM_SBRK
 #include 
-#include 
+#include 
 #include 
-#endif
 
 int
 main(int argc, char **argv, char **envp) {
@@ -131,14 +129,25 @@
 #endif
 #endif
 
-#ifdef NEED_NONRANDOM_SBRK
-#if SIZEOF_LONG == 4
-	if (!syscall(SYS_personality,PER_LINUX32))
-#else
-        if (!syscall(SYS_personality,PER_LINUX))
-#endif
-	  execvp(argv[0],argv);
-#endif
+	long pers = personality(-1);
+	/* 0x40000 aka. ADDR_NO_RANDOMIZE */
+	if (!(pers & 0x40000)) {
+	  if (personality(pers | 0x40000) != -1) {
+	    /* Use /proc/self/exe instead of trying to figure out the
+	     * executable path from PATH and argv[0], since that's reliable.
+	     */
+	    char buf[PATH_MAX+1];
+	    int rc = readlink("/proc/self/exe", buf, PATH_MAX);
+	    if ( rc > 0 ) {
+	      buf[rc]=0;
+	      execve(buf, argv, envp);
+	    }
+	  }
+	  /* Either changing the personality or execve() failed. Either
+	   * way we might as well continue, and hope that the random
+	   * memory maps are ok this time around.
+	   */
+	}
 
 #if defined(DARWIN)
     extern void init_darwin_zone_compat ();
--- gcl-2.6.7/configure.pers	2005-09-09 20:51:26.000000000 +0200
+++ gcl-2.6.7/configure	2005-09-09 21:06:56.000000000 +0200
@@ -3887,17 +3887,18 @@
 #line 3888 "configure"
 #include "confdefs.h"
 #include 
-			    #include 
+			    #include 
 	         	    #include 
 			    #include 
 			    int main(int argc,char * argv[]) {
 				FILE *f;
-				#if SIZEOF_LONG == 4
-				if (!syscall(SYS_personality,PER_LINUX32))
-				#else
-				if (!syscall(SYS_personality,PER_LINUX))
-				#endif
-					execvp(argv[0],argv);
+                                long pers = personality(-1);
+                                if (!(pers & 0x40000)) {
+                                  if (personality(pers | 0x40000) != -1) {
+                                    execvp(argv[0],argv);
+                                   }
+                                }
+
 				if (!(f=fopen("conftest1","w")))
 					return -1;
 				fprintf(f,"%u",sbrk(0));
@@ -3927,17 +3928,17 @@
 #line 3928 "configure"
 #include "confdefs.h"
 #include 
-			    #include 
+			    #include 
 			    #include 
 			    #include 
 			    int main(int argc,char * argv[]) {
 				FILE *f;
-				#if SIZEOF_LONG == 4
-				if (!syscall(SYS_personality,PER_LINUX32))
-				#else
-				if (!syscall(SYS_personality,PER_LINUX))
-				#endif
-					execvp(argv[0],argv);
+                                long pers = personality(-1);
+                                if (!(pers & 0x40000)) {
+                                  if (personality(pers | 0x40000) != -1) {
+                                    execvp(argv[0],argv);
+                                   }
+                                }
 				if (!(f=fopen("conftest1","w")))
 					return -1;
 				fprintf(f,"%u",sbrk(0));
@@ -3989,25 +3990,22 @@
 #include "confdefs.h"
 #include 
             #include 
-	    #ifdef NEED_NONRANDOM_SBRK
 		   #include 
-		   #include 
+		   #include 
 		   #include 
-	   #endif
 int
 main(int argc,char * argv[])
 {
   char *b;
   FILE *fp;
 
-#ifdef NEED_NONRANDOM_SBRK
-#if SIZEOF_LONG == 4
-if (!syscall(SYS_personality,PER_LINUX32))
-#else
-if (!syscall(SYS_personality,PER_LINUX))
-#endif
-     execvp(argv[0],argv);
-#endif  
+  long pers = personality(-1);
+  if (!(pers & 0x40000)) {
+    if (personality(pers | 0x40000) != -1) {
+      execvp(argv[0],argv);
+    }
+  }
+
   b = (void *) malloc(1000);
   fp = fopen("conftest1","w");
 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gcl/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	7 Apr 2005 16:50:14 -0000	1.2
+++ .cvsignore	9 Sep 2005 19:23:39 -0000	1.3
@@ -1 +1 @@
-gcl-2.6.6.tar.gz
+gcl-2.6.7.tar.gz


Index: gcl.spec
===================================================================
RCS file: /cvs/extras/rpms/gcl/FC-4/gcl.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- gcl.spec	16 May 2005 12:12:25 -0000	1.12
+++ gcl.spec	9 Sep 2005 19:23:39 -0000	1.13
@@ -1,12 +1,13 @@
 Name:           gcl
-Version:        2.6.6
-Release:        3
+Version:        2.6.7
+Release:        1%{?dist}
 Summary:        GNU Common Lisp
 
 Group:          Development/Languages
 License:        GPL, LGPL
 URL:            http://www.gnu.org/software/gcl
-Source:         ftp://ftp.gnu.org/pub/gnu/gcl/gcl-2.6.6.tar.gz
+Source:         ftp://ftp.gnu.org/pub/gnu/gcl/gcl-2.6.7.tar.gz
+Patch0:		gcl-pers.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  readline-devel, tk-devel, tcl-devel, gmp-devel
 BuildRequires:	tetex, texinfo
@@ -23,6 +24,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 
 %build
@@ -54,6 +56,7 @@
 (autoload 'run "gcl" "Run GCL." t)
 (autoload 'gcl-mode "gcl" "GCL mode." t)
 EOF
+find $RPM_BUILD_ROOT%{_libdir}/gcl* -name '*.l*sp' | xargs chmod 0644
 
 
 %clean
@@ -87,6 +90,9 @@
 
 
 %changelog
+* Fri Sep  9 2005 Gerard Milmeister  - 2.6.7-1
+- New Version 2.6.7
+
 * Sun Apr 17 2005 Gerard Milmeister  - 2.6.6-2
 - Added buildreq tetex and texinfo
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gcl/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	7 Apr 2005 16:50:14 -0000	1.2
+++ sources	9 Sep 2005 19:23:39 -0000	1.3
@@ -1 +1 @@
-45d67331b29cafc3e9b1eacb488044ec  gcl-2.6.6.tar.gz
+c0f42e1f391162e5ac90912a70e8ecc3  gcl-2.6.7.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep  9 19:29:13 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri,  9 Sep 2005 15:29:13 -0400
Subject: rpms/gc/devel .cvsignore,1.5,1.6 gc.spec,1.10,1.11 sources,1.5,1.6
Message-ID: <200509091929.j89JTDMn011391@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/gc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11368

Modified Files:
	.cvsignore gc.spec sources 
Log Message:
* Fri Sep 09 2005 Rex Dieter  6.6-1
- 6.6



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gc/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	8 Aug 2005 15:42:01 -0000	1.5
+++ .cvsignore	9 Sep 2005 19:29:11 -0000	1.6
@@ -1 +1 @@
-gc6.5.tar.gz
+gc6.6.tar.gz


Index: gc.spec
===================================================================
RCS file: /cvs/extras/rpms/gc/devel/gc.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- gc.spec	8 Aug 2005 16:48:56 -0000	1.10
+++ gc.spec	9 Sep 2005 19:29:11 -0000	1.11
@@ -2,13 +2,13 @@
 
 Summary: C++ Garbage Collector	
 Name:    gc	
-Version: 6.5
+Version: 6.6
 
 Release: 1%{?dist}
 Group:   System Environment/Libraries
 License: BSD
 Url:     http://www.hpl.hp.com/personal/Hans_Boehm/gc/	
-Source:  http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/gc6.5.tar.gz 
+Source:  http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/gc6.6.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Patch1: gc6.5-opendl.patch
@@ -83,6 +83,9 @@
 
 
 %changelog
+* Fri Sep 09 2005 Rex Dieter  6.6-1
+- 6.6
+
 * Wed May 25 2005 Rex Dieter  6.5-1
 - 6.5
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gc/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	8 Aug 2005 15:42:01 -0000	1.5
+++ sources	9 Sep 2005 19:29:11 -0000	1.6
@@ -1 +1 @@
-00bf95cdcbedfa7321d14e0133b31cdb  gc6.5.tar.gz
+c7c301e8fab8ce152c908b05bc8d452c  gc6.6.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep  9 19:42:11 2005
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Fri,  9 Sep 2005 15:42:11 -0400
Subject: rpms/gcl/FC-4 gcl.spec,1.13,1.14
Message-ID: <200509091942.j89JgB7d011470@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/gcl/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11451

Modified Files:
	gcl.spec 
Log Message:
%{_prefix}/lib instead of %{_libdir} for x86_64


Index: gcl.spec
===================================================================
RCS file: /cvs/extras/rpms/gcl/FC-4/gcl.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- gcl.spec	9 Sep 2005 19:23:39 -0000	1.13
+++ gcl.spec	9 Sep 2005 19:42:09 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           gcl
 Version:        2.6.7
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        GNU Common Lisp
 
 Group:          Development/Languages
@@ -41,7 +41,7 @@
 rm -f $RPM_BUILD_ROOT%{_infodir}/dir
 rm -rf $RPM_BUILD_ROOT%{_datadir}/doc
 rm -rf $RPM_BUILD_ROOT%{_datadir}/emacs
-rm -rf $RPM_BUILD_ROOT%{_libdir}/gcl-*/info
+rm -rf $RPM_BUILD_ROOT%{_prefix}/lib/gcl-*/info
 mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
 cp -f man/man1/* $RPM_BUILD_ROOT%{_mandir}/man1
 mkdir -p html
@@ -56,7 +56,7 @@
 (autoload 'run "gcl" "Run GCL." t)
 (autoload 'gcl-mode "gcl" "GCL mode." t)
 EOF
-find $RPM_BUILD_ROOT%{_libdir}/gcl* -name '*.l*sp' | xargs chmod 0644
+find $RPM_BUILD_ROOT%{_prefix}/lib/gcl* -name '*.l*sp' | xargs chmod 0644
 
 
 %clean
@@ -80,7 +80,7 @@
 %files
 %defattr(-,root,root,-)
 %{_bindir}/*
-%{_libdir}/gcl*
+%{_prefix}/lib/gcl*
 %{_infodir}/*
 %{_mandir}/man*/*
 %{_datadir}/emacs/site-lisp/gcl



From fedora-extras-commits at redhat.com  Fri Sep  9 19:45:06 2005
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Fri,  9 Sep 2005 15:45:06 -0400
Subject: rpms/gcl/devel gcl-pers.patch, NONE, 1.1 gcl.spec, 1.12,
	1.13 sources, 1.2, 1.3
Message-ID: <200509091945.j89Jj6XC011545@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/gcl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11521

Modified Files:
	gcl.spec sources 
Added Files:
	gcl-pers.patch 
Log Message:
new version 2.6.7

gcl-pers.patch:

--- NEW FILE gcl-pers.patch ---
--- gcl-2.6.7/o/main.c.pers	2005-09-09 20:36:46.000000000 +0200
+++ gcl-2.6.7/o/main.c	2005-09-09 21:07:51.000000000 +0200
@@ -117,11 +117,9 @@
 #endif
 #endif
 
-#ifdef NEED_NONRANDOM_SBRK
 #include 
-#include 
+#include 
 #include 
-#endif
 
 int
 main(int argc, char **argv, char **envp) {
@@ -131,14 +129,25 @@
 #endif
 #endif
 
-#ifdef NEED_NONRANDOM_SBRK
-#if SIZEOF_LONG == 4
-	if (!syscall(SYS_personality,PER_LINUX32))
-#else
-        if (!syscall(SYS_personality,PER_LINUX))
-#endif
-	  execvp(argv[0],argv);
-#endif
+	long pers = personality(-1);
+	/* 0x40000 aka. ADDR_NO_RANDOMIZE */
+	if (!(pers & 0x40000)) {
+	  if (personality(pers | 0x40000) != -1) {
+	    /* Use /proc/self/exe instead of trying to figure out the
+	     * executable path from PATH and argv[0], since that's reliable.
+	     */
+	    char buf[PATH_MAX+1];
+	    int rc = readlink("/proc/self/exe", buf, PATH_MAX);
+	    if ( rc > 0 ) {
+	      buf[rc]=0;
+	      execve(buf, argv, envp);
+	    }
+	  }
+	  /* Either changing the personality or execve() failed. Either
+	   * way we might as well continue, and hope that the random
+	   * memory maps are ok this time around.
+	   */
+	}
 
 #if defined(DARWIN)
     extern void init_darwin_zone_compat ();
--- gcl-2.6.7/configure.pers	2005-09-09 20:51:26.000000000 +0200
+++ gcl-2.6.7/configure	2005-09-09 21:06:56.000000000 +0200
@@ -3887,17 +3887,18 @@
 #line 3888 "configure"
 #include "confdefs.h"
 #include 
-			    #include 
+			    #include 
 	         	    #include 
 			    #include 
 			    int main(int argc,char * argv[]) {
 				FILE *f;
-				#if SIZEOF_LONG == 4
-				if (!syscall(SYS_personality,PER_LINUX32))
-				#else
-				if (!syscall(SYS_personality,PER_LINUX))
-				#endif
-					execvp(argv[0],argv);
+                                long pers = personality(-1);
+                                if (!(pers & 0x40000)) {
+                                  if (personality(pers | 0x40000) != -1) {
+                                    execvp(argv[0],argv);
+                                   }
+                                }
+
 				if (!(f=fopen("conftest1","w")))
 					return -1;
 				fprintf(f,"%u",sbrk(0));
@@ -3927,17 +3928,17 @@
 #line 3928 "configure"
 #include "confdefs.h"
 #include 
-			    #include 
+			    #include 
 			    #include 
 			    #include 
 			    int main(int argc,char * argv[]) {
 				FILE *f;
-				#if SIZEOF_LONG == 4
-				if (!syscall(SYS_personality,PER_LINUX32))
-				#else
-				if (!syscall(SYS_personality,PER_LINUX))
-				#endif
-					execvp(argv[0],argv);
+                                long pers = personality(-1);
+                                if (!(pers & 0x40000)) {
+                                  if (personality(pers | 0x40000) != -1) {
+                                    execvp(argv[0],argv);
+                                   }
+                                }
 				if (!(f=fopen("conftest1","w")))
 					return -1;
 				fprintf(f,"%u",sbrk(0));
@@ -3989,25 +3990,22 @@
 #include "confdefs.h"
 #include 
             #include 
-	    #ifdef NEED_NONRANDOM_SBRK
 		   #include 
-		   #include 
+		   #include 
 		   #include 
-	   #endif
 int
 main(int argc,char * argv[])
 {
   char *b;
   FILE *fp;
 
-#ifdef NEED_NONRANDOM_SBRK
-#if SIZEOF_LONG == 4
-if (!syscall(SYS_personality,PER_LINUX32))
-#else
-if (!syscall(SYS_personality,PER_LINUX))
-#endif
-     execvp(argv[0],argv);
-#endif  
+  long pers = personality(-1);
+  if (!(pers & 0x40000)) {
+    if (personality(pers | 0x40000) != -1) {
+      execvp(argv[0],argv);
+    }
+  }
+
   b = (void *) malloc(1000);
   fp = fopen("conftest1","w");
 


Index: gcl.spec
===================================================================
RCS file: /cvs/extras/rpms/gcl/devel/gcl.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- gcl.spec	16 May 2005 12:12:25 -0000	1.12
+++ gcl.spec	9 Sep 2005 19:45:04 -0000	1.13
@@ -1,12 +1,13 @@
 Name:           gcl
-Version:        2.6.6
-Release:        3
+Version:        2.6.7
+Release:        2%{?dist}
 Summary:        GNU Common Lisp
 
 Group:          Development/Languages
 License:        GPL, LGPL
 URL:            http://www.gnu.org/software/gcl
-Source:         ftp://ftp.gnu.org/pub/gnu/gcl/gcl-2.6.6.tar.gz
+Source:         ftp://ftp.gnu.org/pub/gnu/gcl/gcl-2.6.7.tar.gz
+Patch0:		gcl-pers.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  readline-devel, tk-devel, tcl-devel, gmp-devel
 BuildRequires:	tetex, texinfo
@@ -23,6 +24,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 
 %build
@@ -39,7 +41,7 @@
 rm -f $RPM_BUILD_ROOT%{_infodir}/dir
 rm -rf $RPM_BUILD_ROOT%{_datadir}/doc
 rm -rf $RPM_BUILD_ROOT%{_datadir}/emacs
-rm -rf $RPM_BUILD_ROOT%{_libdir}/gcl-*/info
+rm -rf $RPM_BUILD_ROOT%{_prefix}/lib/gcl-*/info
 mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
 cp -f man/man1/* $RPM_BUILD_ROOT%{_mandir}/man1
 mkdir -p html
@@ -54,6 +56,7 @@
 (autoload 'run "gcl" "Run GCL." t)
 (autoload 'gcl-mode "gcl" "GCL mode." t)
 EOF
+find $RPM_BUILD_ROOT%{_prefix}/lib/gcl* -name '*.l*sp' | xargs chmod 0644
 
 
 %clean
@@ -77,7 +80,7 @@
 %files
 %defattr(-,root,root,-)
 %{_bindir}/*
-%{_libdir}/gcl*
+%{_prefix}/lib/gcl*
 %{_infodir}/*
 %{_mandir}/man*/*
 %{_datadir}/emacs/site-lisp/gcl
@@ -87,6 +90,9 @@
 
 
 %changelog
+* Fri Sep  9 2005 Gerard Milmeister  - 2.6.7-1
+- New Version 2.6.7
+
 * Sun Apr 17 2005 Gerard Milmeister  - 2.6.6-2
 - Added buildreq tetex and texinfo
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gcl/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	7 Apr 2005 16:50:14 -0000	1.2
+++ sources	9 Sep 2005 19:45:04 -0000	1.3
@@ -1 +1 @@
-45d67331b29cafc3e9b1eacb488044ec  gcl-2.6.6.tar.gz
+c0f42e1f391162e5ac90912a70e8ecc3  gcl-2.6.7.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep  9 20:15:05 2005
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Fri,  9 Sep 2005 16:15:05 -0400
Subject: rpms/gcl/FC-4 gcl.spec,1.14,1.15
Message-ID: <200509092015.j89KF5WF012922@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/gcl/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12903

Modified Files:
	gcl.spec 
Log Message:



Index: gcl.spec
===================================================================
RCS file: /cvs/extras/rpms/gcl/FC-4/gcl.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- gcl.spec	9 Sep 2005 19:42:09 -0000	1.14
+++ gcl.spec	9 Sep 2005 20:15:03 -0000	1.15
@@ -1,6 +1,6 @@
 Name:           gcl
 Version:        2.6.7
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        GNU Common Lisp
 
 Group:          Development/Languages
@@ -24,7 +24,9 @@
 
 %prep
 %setup -q
+%ifarch i386 x86_64
 %patch0 -p1
+%endif
 
 
 %build



From fedora-extras-commits at redhat.com  Fri Sep  9 20:34:19 2005
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Fri,  9 Sep 2005 16:34:19 -0400
Subject: rpms/gcl/FC-4 gcl.spec,1.15,1.16
Message-ID: <200509092034.j89KYJeC013100@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/gcl/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13081

Modified Files:
	gcl.spec 
Log Message:



Index: gcl.spec
===================================================================
RCS file: /cvs/extras/rpms/gcl/FC-4/gcl.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- gcl.spec	9 Sep 2005 20:15:03 -0000	1.15
+++ gcl.spec	9 Sep 2005 20:34:17 -0000	1.16
@@ -1,6 +1,6 @@
 Name:           gcl
 Version:        2.6.7
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        GNU Common Lisp
 
 Group:          Development/Languages
@@ -13,6 +13,7 @@
 BuildRequires:	tetex, texinfo
 Requires(post): /sbin/install-info
 Requires(postun): /sbin/install-info
+ExcludeArch:	ppc ppc64
 
 
 %description
@@ -24,9 +25,7 @@
 
 %prep
 %setup -q
-%ifarch i386 x86_64
 %patch0 -p1
-%endif
 
 
 %build



From fedora-extras-commits at redhat.com  Fri Sep  9 20:38:57 2005
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Fri,  9 Sep 2005 16:38:57 -0400
Subject: rpms/gcl/devel gcl.spec,1.13,1.14
Message-ID: <200509092038.j89KcvPj013186@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/gcl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13167

Modified Files:
	gcl.spec 
Log Message:



Index: gcl.spec
===================================================================
RCS file: /cvs/extras/rpms/gcl/devel/gcl.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- gcl.spec	9 Sep 2005 19:45:04 -0000	1.13
+++ gcl.spec	9 Sep 2005 20:38:55 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           gcl
 Version:        2.6.7
-Release:        2%{?dist}
+Release:        4%{?dist}
 Summary:        GNU Common Lisp
 
 Group:          Development/Languages
@@ -13,6 +13,7 @@
 BuildRequires:	tetex, texinfo
 Requires(post): /sbin/install-info
 Requires(postun): /sbin/install-info
+ExcludeArch:	ppc ppc64
 
 
 %description



From fedora-extras-commits at redhat.com  Fri Sep  9 21:12:23 2005
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Fri,  9 Sep 2005 17:12:23 -0400
Subject: rpms/gcl/FC-3 gcl-pers.patch,NONE,1.1 gcl.spec,1.2,1.3
Message-ID: <200509092112.j89LCNMG014643@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/gcl/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14621

Modified Files:
	gcl.spec 
Added Files:
	gcl-pers.patch 
Log Message:
new version 2.6.7

gcl-pers.patch:

--- NEW FILE gcl-pers.patch ---
--- gcl-2.6.7/o/main.c.pers	2005-09-09 20:36:46.000000000 +0200
+++ gcl-2.6.7/o/main.c	2005-09-09 21:07:51.000000000 +0200
@@ -117,11 +117,9 @@
 #endif
 #endif
 
-#ifdef NEED_NONRANDOM_SBRK
 #include 
-#include 
+#include 
 #include 
-#endif
 
 int
 main(int argc, char **argv, char **envp) {
@@ -131,14 +129,25 @@
 #endif
 #endif
 
-#ifdef NEED_NONRANDOM_SBRK
-#if SIZEOF_LONG == 4
-	if (!syscall(SYS_personality,PER_LINUX32))
-#else
-        if (!syscall(SYS_personality,PER_LINUX))
-#endif
-	  execvp(argv[0],argv);
-#endif
+	long pers = personality(-1);
+	/* 0x40000 aka. ADDR_NO_RANDOMIZE */
+	if (!(pers & 0x40000)) {
+	  if (personality(pers | 0x40000) != -1) {
+	    /* Use /proc/self/exe instead of trying to figure out the
+	     * executable path from PATH and argv[0], since that's reliable.
+	     */
+	    char buf[PATH_MAX+1];
+	    int rc = readlink("/proc/self/exe", buf, PATH_MAX);
+	    if ( rc > 0 ) {
+	      buf[rc]=0;
+	      execve(buf, argv, envp);
+	    }
+	  }
+	  /* Either changing the personality or execve() failed. Either
+	   * way we might as well continue, and hope that the random
+	   * memory maps are ok this time around.
+	   */
+	}
 
 #if defined(DARWIN)
     extern void init_darwin_zone_compat ();
--- gcl-2.6.7/configure.pers	2005-09-09 20:51:26.000000000 +0200
+++ gcl-2.6.7/configure	2005-09-09 21:06:56.000000000 +0200
@@ -3887,17 +3887,18 @@
 #line 3888 "configure"
 #include "confdefs.h"
 #include 
-			    #include 
+			    #include 
 	         	    #include 
 			    #include 
 			    int main(int argc,char * argv[]) {
 				FILE *f;
-				#if SIZEOF_LONG == 4
-				if (!syscall(SYS_personality,PER_LINUX32))
-				#else
-				if (!syscall(SYS_personality,PER_LINUX))
-				#endif
-					execvp(argv[0],argv);
+                                long pers = personality(-1);
+                                if (!(pers & 0x40000)) {
+                                  if (personality(pers | 0x40000) != -1) {
+                                    execvp(argv[0],argv);
+                                   }
+                                }
+
 				if (!(f=fopen("conftest1","w")))
 					return -1;
 				fprintf(f,"%u",sbrk(0));
@@ -3927,17 +3928,17 @@
 #line 3928 "configure"
 #include "confdefs.h"
 #include 
-			    #include 
+			    #include 
 			    #include 
 			    #include 
 			    int main(int argc,char * argv[]) {
 				FILE *f;
-				#if SIZEOF_LONG == 4
-				if (!syscall(SYS_personality,PER_LINUX32))
-				#else
-				if (!syscall(SYS_personality,PER_LINUX))
-				#endif
-					execvp(argv[0],argv);
+                                long pers = personality(-1);
+                                if (!(pers & 0x40000)) {
+                                  if (personality(pers | 0x40000) != -1) {
+                                    execvp(argv[0],argv);
+                                   }
+                                }
 				if (!(f=fopen("conftest1","w")))
 					return -1;
 				fprintf(f,"%u",sbrk(0));
@@ -3989,25 +3990,22 @@
 #include "confdefs.h"
 #include 
             #include 
-	    #ifdef NEED_NONRANDOM_SBRK
 		   #include 
-		   #include 
+		   #include 
 		   #include 
-	   #endif
 int
 main(int argc,char * argv[])
 {
   char *b;
   FILE *fp;
 
-#ifdef NEED_NONRANDOM_SBRK
-#if SIZEOF_LONG == 4
-if (!syscall(SYS_personality,PER_LINUX32))
-#else
-if (!syscall(SYS_personality,PER_LINUX))
-#endif
-     execvp(argv[0],argv);
-#endif  
+  long pers = personality(-1);
+  if (!(pers & 0x40000)) {
+    if (personality(pers | 0x40000) != -1) {
+      execvp(argv[0],argv);
+    }
+  }
+
   b = (void *) malloc(1000);
   fp = fopen("conftest1","w");
 


Index: gcl.spec
===================================================================
RCS file: /cvs/extras/rpms/gcl/FC-3/gcl.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gcl.spec	16 Apr 2005 23:58:05 -0000	1.2
+++ gcl.spec	9 Sep 2005 21:12:21 -0000	1.3
@@ -1,17 +1,19 @@
 Name:           gcl
-Version:        2.6.6
-Release:        2
+Version:        2.6.7
+Release:        4%{?dist}
 Summary:        GNU Common Lisp
 
 Group:          Development/Languages
 License:        GPL, LGPL
 URL:            http://www.gnu.org/software/gcl
-Source:         ftp://ftp.gnu.org/pub/gnu/gcl/gcl-2.6.6.tar.gz
+Source:         ftp://ftp.gnu.org/pub/gnu/gcl/gcl-2.6.7.tar.gz
+Patch0:		gcl-pers.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  readline-devel, tk-devel, tcl-devel, gmp-devel
 BuildRequires:	tetex, texinfo
 Requires(post): /sbin/install-info
 Requires(postun): /sbin/install-info
+ExcludeArch:	ppc ppc64
 
 
 %description
@@ -23,6 +25,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 
 %build
@@ -39,7 +42,7 @@
 rm -f $RPM_BUILD_ROOT%{_infodir}/dir
 rm -rf $RPM_BUILD_ROOT%{_datadir}/doc
 rm -rf $RPM_BUILD_ROOT%{_datadir}/emacs
-rm -rf $RPM_BUILD_ROOT%{_libdir}/gcl-*/info
+rm -rf $RPM_BUILD_ROOT%{_prefix}/lib/gcl-*/info
 mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
 cp -f man/man1/* $RPM_BUILD_ROOT%{_mandir}/man1
 mkdir -p html
@@ -54,6 +57,7 @@
 (autoload 'run "gcl" "Run GCL." t)
 (autoload 'gcl-mode "gcl" "GCL mode." t)
 EOF
+find $RPM_BUILD_ROOT%{_prefix}/lib/gcl* -name '*.l*sp' | xargs chmod 0644
 
 
 %clean
@@ -77,7 +81,7 @@
 %files
 %defattr(-,root,root,-)
 %{_bindir}/*
-%{_libdir}/gcl*
+%{_prefix}/lib/gcl*
 %{_infodir}/*
 %{_mandir}/man*/*
 %{_datadir}/emacs/site-lisp/gcl
@@ -87,6 +91,9 @@
 
 
 %changelog
+* Fri Sep  9 2005 Gerard Milmeister  - 2.6.7-1
+- New Version 2.6.7
+
 * Sun Apr 17 2005 Gerard Milmeister  - 2.6.6-2
 - Added buildreq tetex and texinfo
 
@@ -95,4 +102,3 @@
 
 * Fri Feb 18 2005 Gerard Milmeister  - 0:2.6.5-1
 - First Fedora release
-



From fedora-extras-commits at redhat.com  Fri Sep  9 21:16:08 2005
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Fri,  9 Sep 2005 17:16:08 -0400
Subject: rpms/gcl/FC-3 gcl.spec,1.3,1.4 sources,1.2,1.3
Message-ID: <200509092116.j89LG8Si014856@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/gcl/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14835

Modified Files:
	gcl.spec sources 
Log Message:



Index: gcl.spec
===================================================================
RCS file: /cvs/extras/rpms/gcl/FC-3/gcl.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gcl.spec	9 Sep 2005 21:12:21 -0000	1.3
+++ gcl.spec	9 Sep 2005 21:16:06 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           gcl
 Version:        2.6.7
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        GNU Common Lisp
 
 Group:          Development/Languages


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gcl/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	7 Apr 2005 16:50:14 -0000	1.2
+++ sources	9 Sep 2005 21:16:06 -0000	1.3
@@ -1 +1 @@
-45d67331b29cafc3e9b1eacb488044ec  gcl-2.6.6.tar.gz
+c0f42e1f391162e5ac90912a70e8ecc3  gcl-2.6.7.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep  9 22:36:55 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri,  9 Sep 2005 18:36:55 -0400
Subject: rpms/jam - New directory
Message-ID: <200509092236.j89MatDI016406@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/jam
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16386/jam

Log Message:
Directory /cvs/extras/rpms/jam added to the repository




From fedora-extras-commits at redhat.com  Fri Sep  9 22:36:55 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri,  9 Sep 2005 18:36:55 -0400
Subject: rpms/jam/devel - New directory
Message-ID: <200509092237.j89MatLt016411@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/jam/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16386/jam/devel

Log Message:
Directory /cvs/extras/rpms/jam/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Sep  9 22:37:13 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri,  9 Sep 2005 18:37:13 -0400
Subject: rpms/jam Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200509092237.j89MbDxV016466@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/jam
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16431

Added Files:
	Makefile import.log 
Log Message:
Setup of module jam


--- NEW FILE Makefile ---
# Top level Makefile for module jam
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Fri Sep  9 22:37:14 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri,  9 Sep 2005 18:37:14 -0400
Subject: rpms/jam/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200509092237.j89MbEfl016471@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/jam/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16431/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module jam


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Fri Sep  9 22:37:56 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri,  9 Sep 2005 18:37:56 -0400
Subject: rpms/jam import.log,1.1,1.2
Message-ID: <200509092238.j89McQ0a016739@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/jam
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16694

Modified Files:
	import.log 
Log Message:
auto-import jam-2.5-2 on branch devel from jam-2.5-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/jam/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	9 Sep 2005 22:37:11 -0000	1.1
+++ import.log	9 Sep 2005 22:37:54 -0000	1.2
@@ -0,0 +1 @@
+jam-2_5-2:HEAD:jam-2.5-2.src.rpm:1126305468



From fedora-extras-commits at redhat.com  Fri Sep  9 22:37:56 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri,  9 Sep 2005 18:37:56 -0400
Subject: rpms/jam/devel jam.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1,
	1.2
Message-ID: <200509092238.j89McRwa016743@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/jam/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16694/devel

Modified Files:
	.cvsignore sources 
Added Files:
	jam.spec 
Log Message:
auto-import jam-2.5-2 on branch devel from jam-2.5-2.src.rpm


--- NEW FILE jam.spec ---
Name:		jam
Version:	2.5
Release:	2%{?dist}
License:	Distributable
Group:		Development/Tools
Summary:	Program construction tool, similar to make
URL:		http://public.perforce.com/public/jam/index.html
Source0:	ftp://ftp.perforce.com/pub/jam/%{name}-%{version}.tar
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:	bison

%description
Jam is a program construction tool, like make. Jam recursively builds target 
files from source files, using dependency information and updating actions 
expressed in the Jambase file, which is written in jam's own interpreted 
language. The default Jambase is compiled into jam and provides a boilerplate 
for common use, relying on a user-provide file "Jamfile" to enumerate actual 
targets and sources. 

%prep
%setup -q

%build
make CFLAGS="$RPM_OPT_FLAGS" CCFLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT/%{_bindir}
install -m0755 bin.linux*/jam $RPM_BUILD_ROOT/%{_bindir}
install -m0755 bin.linux*/mkjambase $RPM_BUILD_ROOT/%{_bindir}

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,0755)
%doc README RELNOTES *.html
%{_bindir}/jam
%{_bindir}/mkjambase

%changelog
* Fri Sep  9 2005 Tom "spot" Callaway  2.5-2
- use smp_mflags
- use name and version in source field

* Fri Aug 19 2005 Tom "spot" Callaway  2.5-1
- initial package for Fedora Extras


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jam/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	9 Sep 2005 22:37:12 -0000	1.1
+++ .cvsignore	9 Sep 2005 22:37:54 -0000	1.2
@@ -0,0 +1 @@
+jam-2.5.tar


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jam/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Sep 2005 22:37:12 -0000	1.1
+++ sources	9 Sep 2005 22:37:54 -0000	1.2
@@ -0,0 +1 @@
+c7eb7719d8523c0f819116479492d367  jam-2.5.tar



From fedora-extras-commits at redhat.com  Fri Sep  9 22:38:33 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri,  9 Sep 2005 18:38:33 -0400
Subject: owners owners.list,1.183,1.184
Message-ID: <200509092238.j89McX6j016790@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16738

Modified Files:
	owners.list 
Log Message:

jam



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.183
retrieving revision 1.184
diff -u -r1.183 -r1.184
--- owners.list	9 Sep 2005 12:53:02 -0000	1.183
+++ owners.list	9 Sep 2005 22:38:31 -0000	1.184
@@ -335,6 +335,7 @@
 Fedora Extras|irssi|Modular text mode IRC client with Perl scripting|anvil at livna.org|extras-qa at fedoraproject.org|
 Fedora Extras|istanbul|Desktop Session Recorder|jspaleta at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|jabberd|OpenSource server implementation of the Jabber protocols|adrian at lisas.de|extras-qa at fedoraproject.org|
+Fedora Extras|jam|Program construction tool, similar to make|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|jasper|Implementation of the JPEG-2000 standard, Part 1|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|jed|A fast, compact editor based on the S-Lang screen library.|notting at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|jhead|Tool for displaying EXIF data embedded in JPEG images|adrian at lisas.de|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sat Sep 10 01:27:00 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri,  9 Sep 2005 21:27:00 -0400
Subject: owners owners.list,1.184,1.185
Message-ID: <200509100127.j8A1R0uL021963@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21944

Modified Files:
	owners.list 
Log Message:
New packages: perl-Locale-Maketext-Fuzzy and perl-Hook-LexWrap



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.184
retrieving revision 1.185
diff -u -r1.184 -r1.185
--- owners.list	9 Sep 2005 22:38:31 -0000	1.184
+++ owners.list	10 Sep 2005 01:26:58 -0000	1.185
@@ -603,7 +603,7 @@
 Fedora Extras|perl-Crypt-CBC|Encrypt Data with Cipher Block Chaining Mode|andreas at bawue.net|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Data-Page|Help when paging through sets of results|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Date-Simple|Simple date object for perl|paul at city-fan.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
-Fedora Extras|perl-DBD-SQLite|Self Contained RDBMS in a DBI Driver|jpo at di.uminho.pt|extras-qa at fedoraproject.org|
+Fedora Extras|perl-DBD-SQLite|Self Contained RDBMS in a DBI Driver|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-DBD-SQLite2|Self Contained RDBMS in a DBI Driver (sqlite 2.x)|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-DBIx-ContextualFetch|Add contextual fetches to DBI|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Devel-Cycle|Find memory cycles in objects|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
@@ -631,6 +631,7 @@
 Fedora Extras|perl-Graph|A Perl module for dealing with graphs, the abstract data structures|thm at duke.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Gtk2|Perl interface to the 2.x series of the Gimp Toolkit library|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Heap|A collection of routines for managing a heap data structure|thm at duke.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Hook-LexWrap|Lexically scoped subroutine wrappers|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-HTML-Format|HTML formatter modules|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-HTML-Scrubber|Library for scrubbing/sanitizing html|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-HTML-Template|Perl module to use HTML Templates|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
@@ -657,6 +658,7 @@
 Fedora Extras|perl-libintl|Internationalization library for Perl, compatible with gettext|matthias at rpmforge.net|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Lingua-EN-Inflect|Convert singular to plural, select "a" or "an"|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Lingua-EN-Inflect-Number|Force number of words to singular or plural|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Locale-Maketext-Fuzzy|Maketext from already interpolated strings|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Locale-gettext|Interface to gettext family of functions|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Mail-Alias|For bugs related to the perl-Mail-Alias component|oliver at linux-kernel.at|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Mail-Sendmail|Simple platform independent mailer for Perl|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Sat Sep 10 02:13:48 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Fri,  9 Sep 2005 22:13:48 -0400
Subject: rpms/perl-File-Slurp - New directory
Message-ID: <200509100213.j8A2Dmcs023589@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-File-Slurp
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23565/perl-File-Slurp

Log Message:
Directory /cvs/extras/rpms/perl-File-Slurp added to the repository




From fedora-extras-commits at redhat.com  Sat Sep 10 02:13:48 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Fri,  9 Sep 2005 22:13:48 -0400
Subject: rpms/perl-File-Slurp/devel - New directory
Message-ID: <200509100213.j8A2Dmn3023594@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-File-Slurp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23565/perl-File-Slurp/devel

Log Message:
Directory /cvs/extras/rpms/perl-File-Slurp/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Sep 10 02:14:24 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Fri,  9 Sep 2005 22:14:24 -0400
Subject: rpms/perl-File-Slurp Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200509100214.j8A2EOvT023645@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-File-Slurp
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23610

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-File-Slurp


--- NEW FILE Makefile ---
# Top level Makefile for module perl-File-Slurp
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Sat Sep 10 02:14:24 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Fri,  9 Sep 2005 22:14:24 -0400
Subject: rpms/perl-File-Slurp/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200509100214.j8A2EO9h023650@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-File-Slurp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23610/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-File-Slurp


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Sat Sep 10 02:15:29 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Fri,  9 Sep 2005 22:15:29 -0400
Subject: rpms/perl-File-Slurp import.log,1.1,1.2
Message-ID: <200509100215.j8A2FU1c023715@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-File-Slurp
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23680

Modified Files:
	import.log 
Log Message:
auto-import perl-File-Slurp-9999.09-1 on branch devel from perl-File-Slurp-9999.09-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-File-Slurp/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	10 Sep 2005 02:14:22 -0000	1.1
+++ import.log	10 Sep 2005 02:15:27 -0000	1.2
@@ -0,0 +1 @@
+perl-File-Slurp-9999_09-1:HEAD:perl-File-Slurp-9999.09-1.src.rpm:1126318513



From fedora-extras-commits at redhat.com  Sat Sep 10 02:15:30 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Fri,  9 Sep 2005 22:15:30 -0400
Subject: rpms/perl-File-Slurp/devel perl-File-Slurp.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200509100215.j8A2FUS6023722@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-File-Slurp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23680/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-File-Slurp.spec 
Log Message:
auto-import perl-File-Slurp-9999.09-1 on branch devel from perl-File-Slurp-9999.09-1.src.rpm


--- NEW FILE perl-File-Slurp.spec ---
Name: 		perl-File-Slurp
Version: 	9999.09
Release: 	1%{?dist}
Summary: 	Efficient Reading/Writing of Complete Files
License: 	GPL or Artistic
Group: 		Development/Libraries
URL: 		http://search.cpan.org/dist/File-Slurp/
Source0: 	http://www.cpan.org/modules/by-module/File/File-Slurp-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
BuildArch: noarch

%description
This module provides subs that allow you to read or write entire files with
one simple call. They are designed to be simple to use, have flexible ways
to pass in or get the file contents and to be very efficient. There is also
a sub to read in all the files in a directory other than . and ..

These slurp/spew subs work for files, pipes and sockets, and stdio, 
pseudo-files, and DATA.

%prep
%setup -q -n File-Slurp-%{version}
chmod 0644 lib/File/Slurp.pm

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'
find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';'
chmod -R u+w $RPM_BUILD_ROOT/*

%clean
rm -rf $RPM_BUILD_ROOT

%check
make test

%files
%defattr(-,root,root,-)
%doc Changes README
%{perl_vendorlib}/File
%{_mandir}/man3/*

%changelog
* Thu Sep 01 2005 Ralf Corsepius  - 9999.09-1
- FE submission.

* Tue Jun 28 2005 Ralf Corsepius  - 9999.09-0.pm.1
- Initial packman version.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-File-Slurp/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	10 Sep 2005 02:14:22 -0000	1.1
+++ .cvsignore	10 Sep 2005 02:15:28 -0000	1.2
@@ -0,0 +1 @@
+File-Slurp-9999.09.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-File-Slurp/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	10 Sep 2005 02:14:22 -0000	1.1
+++ sources	10 Sep 2005 02:15:28 -0000	1.2
@@ -0,0 +1 @@
+b2bd4e917b6fafe03145f3977ba8bd7a  File-Slurp-9999.09.tar.gz



From fedora-extras-commits at redhat.com  Sat Sep 10 02:19:52 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Fri,  9 Sep 2005 22:19:52 -0400
Subject: rpms/perl-File-Slurp/devel perl-File-Slurp.spec,1.1,1.2
Message-ID: <200509100219.j8A2Jq5S023806@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-File-Slurp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23787

Modified Files:
	perl-File-Slurp.spec 
Log Message:
Cleanup.


Index: perl-File-Slurp.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-File-Slurp/devel/perl-File-Slurp.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-File-Slurp.spec	10 Sep 2005 02:15:28 -0000	1.1
+++ perl-File-Slurp.spec	10 Sep 2005 02:19:50 -0000	1.2
@@ -1,6 +1,6 @@
 Name: 		perl-File-Slurp
 Version: 	9999.09
-Release: 	1%{?dist}
+Release: 	2%{?dist}
 Summary: 	Efficient Reading/Writing of Complete Files
 License: 	GPL or Artistic
 Group: 		Development/Libraries
@@ -22,7 +22,8 @@
 
 %prep
 %setup -q -n File-Slurp-%{version}
-chmod 0644 lib/File/Slurp.pm
+chmod 0644 lib/File/Slurp.pm extras/slurp_bench.pl
+%{__perl} -pi -e 's|^#!/usr/local/bin/perl\b|#!%{__perl}|' extras/slurp_bench.pl
 
 %build
 %{__perl} Makefile.PL INSTALLDIRS=vendor
@@ -43,13 +44,14 @@
 
 %files
 %defattr(-,root,root,-)
-%doc Changes README
+# For license text(s), see the perl package.
+%doc Changes README extras/
 %{perl_vendorlib}/File
 %{_mandir}/man3/*
 
 %changelog
+* Sat Sep 10 2005 Ralf Corsepius  - 9999.09-2
+- Apply JPO's patch (PR #167282).
+
 * Thu Sep 01 2005 Ralf Corsepius  - 9999.09-1
 - FE submission.
-
-* Tue Jun 28 2005 Ralf Corsepius  - 9999.09-0.pm.1
-- Initial packman version.



From fedora-extras-commits at redhat.com  Sat Sep 10 02:20:09 2005
From: fedora-extras-commits at redhat.com (Jeff Carlson (jcarlson))
Date: Fri,  9 Sep 2005 22:20:09 -0400
Subject: rpms/up-imapproxy/devel .cvsignore,1.2,1.3 sources,1.2,1.3
Message-ID: <200509100220.j8A2K9ku023865@cvs-int.fedora.redhat.com>

Author: jcarlson

Update of /cvs/extras/rpms/up-imapproxy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23783/devel

Modified Files:
	.cvsignore sources 
Log Message:
Uploaded new source for 1.2.4.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/up-imapproxy/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	9 Sep 2005 12:50:22 -0000	1.2
+++ .cvsignore	10 Sep 2005 02:20:07 -0000	1.3
@@ -1 +1 @@
-up-imapproxy-1.2.3.tar.gz
+up-imapproxy-1.2.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/up-imapproxy/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	9 Sep 2005 12:50:22 -0000	1.2
+++ sources	10 Sep 2005 02:20:07 -0000	1.3
@@ -1 +1 @@
-ad4dafd1417903feb1e09ec569ff1ad5  up-imapproxy-1.2.3.tar.gz
+ad68dd2258255ac6ef87165f518390e9  up-imapproxy-1.2.4.tar.gz



From fedora-extras-commits at redhat.com  Sat Sep 10 02:20:04 2005
From: fedora-extras-commits at redhat.com (Jeff Carlson (jcarlson))
Date: Fri,  9 Sep 2005 22:20:04 -0400
Subject: rpms/up-imapproxy/FC-3 .cvsignore,1.2,1.3 sources,1.2,1.3
Message-ID: <200509100220.j8A2KYgq023869@cvs-int.fedora.redhat.com>

Author: jcarlson

Update of /cvs/extras/rpms/up-imapproxy/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23783/FC-3

Modified Files:
	.cvsignore sources 
Log Message:
Uploaded new source for 1.2.4.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/up-imapproxy/FC-3/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	9 Sep 2005 12:50:22 -0000	1.2
+++ .cvsignore	10 Sep 2005 02:20:02 -0000	1.3
@@ -1 +1 @@
-up-imapproxy-1.2.3.tar.gz
+up-imapproxy-1.2.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/up-imapproxy/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	9 Sep 2005 12:50:22 -0000	1.2
+++ sources	10 Sep 2005 02:20:02 -0000	1.3
@@ -1 +1 @@
-ad4dafd1417903feb1e09ec569ff1ad5  up-imapproxy-1.2.3.tar.gz
+ad68dd2258255ac6ef87165f518390e9  up-imapproxy-1.2.4.tar.gz



From fedora-extras-commits at redhat.com  Sat Sep 10 02:20:04 2005
From: fedora-extras-commits at redhat.com (Jeff Carlson (jcarlson))
Date: Fri,  9 Sep 2005 22:20:04 -0400
Subject: rpms/up-imapproxy/FC-4 .cvsignore,1.2,1.3 sources,1.2,1.3
Message-ID: <200509100220.j8A2KYSk023873@cvs-int.fedora.redhat.com>

Author: jcarlson

Update of /cvs/extras/rpms/up-imapproxy/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23783/FC-4

Modified Files:
	.cvsignore sources 
Log Message:
Uploaded new source for 1.2.4.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/up-imapproxy/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	9 Sep 2005 12:50:22 -0000	1.2
+++ .cvsignore	10 Sep 2005 02:20:02 -0000	1.3
@@ -1 +1 @@
-up-imapproxy-1.2.3.tar.gz
+up-imapproxy-1.2.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/up-imapproxy/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	9 Sep 2005 12:50:22 -0000	1.2
+++ sources	10 Sep 2005 02:20:02 -0000	1.3
@@ -1 +1 @@
-ad4dafd1417903feb1e09ec569ff1ad5  up-imapproxy-1.2.3.tar.gz
+ad68dd2258255ac6ef87165f518390e9  up-imapproxy-1.2.4.tar.gz



From fedora-extras-commits at redhat.com  Sat Sep 10 02:27:18 2005
From: fedora-extras-commits at redhat.com (Jeff Carlson (jcarlson))
Date: Fri,  9 Sep 2005 22:27:18 -0400
Subject: rpms/up-imapproxy/devel up-imapproxy.spec,1.2,1.3
Message-ID: <200509100227.j8A2RI93024057@cvs-int.fedora.redhat.com>

Author: jcarlson

Update of /cvs/extras/rpms/up-imapproxy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24004/devel

Modified Files:
	up-imapproxy.spec 
Log Message:
No-op release bump to get a new buildsys tag.



Index: up-imapproxy.spec
===================================================================
RCS file: /cvs/extras/rpms/up-imapproxy/devel/up-imapproxy.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- up-imapproxy.spec	9 Sep 2005 14:16:15 -0000	1.2
+++ up-imapproxy.spec	10 Sep 2005 02:27:15 -0000	1.3
@@ -1,7 +1,7 @@
 Summary: University of Pittsburgh IMAP Proxy
 Name: up-imapproxy
 Version: 1.2.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Group: System Environment/Daemons
 URL: http://www.imapproxy.org
@@ -72,6 +72,9 @@
 %{_sbindir}/*
 
 %changelog
+* Fri Sep  9 2005 Jeff Carlson  - 1.2.4-2
+- No-op release bump to get a new buildsys tag.
+
 * Fri Sep  9 2005 Jeff Carlson  - 1.2.4-1
 - Bump to current upstream release.
 - Upstream includes a new doc (copyright), included.



From fedora-extras-commits at redhat.com  Sat Sep 10 02:27:12 2005
From: fedora-extras-commits at redhat.com (Jeff Carlson (jcarlson))
Date: Fri,  9 Sep 2005 22:27:12 -0400
Subject: rpms/up-imapproxy/FC-3 up-imapproxy.spec,1.2,1.3
Message-ID: <200509100227.j8A2Rgvt024068@cvs-int.fedora.redhat.com>

Author: jcarlson

Update of /cvs/extras/rpms/up-imapproxy/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24004/FC-3

Modified Files:
	up-imapproxy.spec 
Log Message:
No-op release bump to get a new buildsys tag.



Index: up-imapproxy.spec
===================================================================
RCS file: /cvs/extras/rpms/up-imapproxy/FC-3/up-imapproxy.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- up-imapproxy.spec	9 Sep 2005 14:16:15 -0000	1.2
+++ up-imapproxy.spec	10 Sep 2005 02:27:10 -0000	1.3
@@ -1,7 +1,7 @@
 Summary: University of Pittsburgh IMAP Proxy
 Name: up-imapproxy
 Version: 1.2.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Group: System Environment/Daemons
 URL: http://www.imapproxy.org
@@ -72,6 +72,9 @@
 %{_sbindir}/*
 
 %changelog
+* Fri Sep  9 2005 Jeff Carlson  - 1.2.4-2
+- No-op release bump to get a new buildsys tag.
+
 * Fri Sep  9 2005 Jeff Carlson  - 1.2.4-1
 - Bump to current upstream release.
 - Upstream includes a new doc (copyright), included.



From fedora-extras-commits at redhat.com  Sat Sep 10 02:27:12 2005
From: fedora-extras-commits at redhat.com (Jeff Carlson (jcarlson))
Date: Fri,  9 Sep 2005 22:27:12 -0400
Subject: rpms/up-imapproxy/FC-4 up-imapproxy.spec,1.2,1.3
Message-ID: <200509100227.j8A2RgKx024069@cvs-int.fedora.redhat.com>

Author: jcarlson

Update of /cvs/extras/rpms/up-imapproxy/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24004/FC-4

Modified Files:
	up-imapproxy.spec 
Log Message:
No-op release bump to get a new buildsys tag.



Index: up-imapproxy.spec
===================================================================
RCS file: /cvs/extras/rpms/up-imapproxy/FC-4/up-imapproxy.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- up-imapproxy.spec	9 Sep 2005 14:16:15 -0000	1.2
+++ up-imapproxy.spec	10 Sep 2005 02:27:10 -0000	1.3
@@ -1,7 +1,7 @@
 Summary: University of Pittsburgh IMAP Proxy
 Name: up-imapproxy
 Version: 1.2.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Group: System Environment/Daemons
 URL: http://www.imapproxy.org
@@ -72,6 +72,9 @@
 %{_sbindir}/*
 
 %changelog
+* Fri Sep  9 2005 Jeff Carlson  - 1.2.4-2
+- No-op release bump to get a new buildsys tag.
+
 * Fri Sep  9 2005 Jeff Carlson  - 1.2.4-1
 - Bump to current upstream release.
 - Upstream includes a new doc (copyright), included.



From fedora-extras-commits at redhat.com  Sat Sep 10 02:30:05 2005
From: fedora-extras-commits at redhat.com (Jeff Carlson (jcarlson))
Date: Fri,  9 Sep 2005 22:30:05 -0400
Subject: rpms/up-imapproxy/devel up-imapproxy.spec,1.3,1.4
Message-ID: <200509100230.j8A2UZKw024224@cvs-int.fedora.redhat.com>

Author: jcarlson

Update of /cvs/extras/rpms/up-imapproxy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24167/devel

Modified Files:
	up-imapproxy.spec 
Log Message:
Same as 1.2.4-2.



Index: up-imapproxy.spec
===================================================================
RCS file: /cvs/extras/rpms/up-imapproxy/devel/up-imapproxy.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- up-imapproxy.spec	10 Sep 2005 02:27:15 -0000	1.3
+++ up-imapproxy.spec	10 Sep 2005 02:30:03 -0000	1.4
@@ -1,7 +1,7 @@
 Summary: University of Pittsburgh IMAP Proxy
 Name: up-imapproxy
 Version: 1.2.4
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPL
 Group: System Environment/Daemons
 URL: http://www.imapproxy.org
@@ -72,6 +72,9 @@
 %{_sbindir}/*
 
 %changelog
+* Fri Sep  9 2005 Jeff Carlson  - 1.2.4-3
+- Same as -2.
+
 * Fri Sep  9 2005 Jeff Carlson  - 1.2.4-2
 - No-op release bump to get a new buildsys tag.
 



From fedora-extras-commits at redhat.com  Sat Sep 10 02:30:04 2005
From: fedora-extras-commits at redhat.com (Jeff Carlson (jcarlson))
Date: Fri,  9 Sep 2005 22:30:04 -0400
Subject: rpms/up-imapproxy/FC-3 up-imapproxy.spec,1.3,1.4
Message-ID: <200509100230.j8A2UYWP024220@cvs-int.fedora.redhat.com>

Author: jcarlson

Update of /cvs/extras/rpms/up-imapproxy/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24167/FC-3

Modified Files:
	up-imapproxy.spec 
Log Message:
Same as 1.2.4-2.



Index: up-imapproxy.spec
===================================================================
RCS file: /cvs/extras/rpms/up-imapproxy/FC-3/up-imapproxy.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- up-imapproxy.spec	10 Sep 2005 02:27:10 -0000	1.3
+++ up-imapproxy.spec	10 Sep 2005 02:30:02 -0000	1.4
@@ -1,7 +1,7 @@
 Summary: University of Pittsburgh IMAP Proxy
 Name: up-imapproxy
 Version: 1.2.4
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPL
 Group: System Environment/Daemons
 URL: http://www.imapproxy.org
@@ -72,6 +72,9 @@
 %{_sbindir}/*
 
 %changelog
+* Fri Sep  9 2005 Jeff Carlson  - 1.2.4-3
+- Same as -2.
+
 * Fri Sep  9 2005 Jeff Carlson  - 1.2.4-2
 - No-op release bump to get a new buildsys tag.
 



From fedora-extras-commits at redhat.com  Sat Sep 10 02:30:04 2005
From: fedora-extras-commits at redhat.com (Jeff Carlson (jcarlson))
Date: Fri,  9 Sep 2005 22:30:04 -0400
Subject: rpms/up-imapproxy/FC-4 up-imapproxy.spec,1.3,1.4
Message-ID: <200509100230.j8A2UZqC024223@cvs-int.fedora.redhat.com>

Author: jcarlson

Update of /cvs/extras/rpms/up-imapproxy/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24167/FC-4

Modified Files:
	up-imapproxy.spec 
Log Message:
Same as 1.2.4-2.



Index: up-imapproxy.spec
===================================================================
RCS file: /cvs/extras/rpms/up-imapproxy/FC-4/up-imapproxy.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- up-imapproxy.spec	10 Sep 2005 02:27:10 -0000	1.3
+++ up-imapproxy.spec	10 Sep 2005 02:30:02 -0000	1.4
@@ -1,7 +1,7 @@
 Summary: University of Pittsburgh IMAP Proxy
 Name: up-imapproxy
 Version: 1.2.4
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPL
 Group: System Environment/Daemons
 URL: http://www.imapproxy.org
@@ -72,6 +72,9 @@
 %{_sbindir}/*
 
 %changelog
+* Fri Sep  9 2005 Jeff Carlson  - 1.2.4-3
+- Same as -2.
+
 * Fri Sep  9 2005 Jeff Carlson  - 1.2.4-2
 - No-op release bump to get a new buildsys tag.
 



From fedora-extras-commits at redhat.com  Sat Sep 10 02:40:37 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Fri,  9 Sep 2005 22:40:37 -0400
Subject: owners owners.list,1.185,1.186
Message-ID: <200509100240.j8A2ebML024384@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24365

Modified Files:
	owners.list 
Log Message:
Add perl-File-Slurp


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.185
retrieving revision 1.186
diff -u -r1.185 -r1.186
--- owners.list	10 Sep 2005 01:26:58 -0000	1.185
+++ owners.list	10 Sep 2005 02:40:35 -0000	1.186
@@ -619,6 +619,7 @@
 Fedora Extras|perl-ExtUtils-XSBuilder| Modules that parse C header files and create XS glue code|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-File-BOM|Utilities for reading Byte Order Marks|mpeters at mac.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-File-Find-Rule|Perl module implementing an alternative interface to File::Find|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-File-Slurp|Efficient Reading/Writing of Complete Files|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-File-Tail|Perl extension for reading from continously updated files|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Font-AFM|Perl interface to Adobe Font Metrics files|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-FreezeThaw|Convert Perl structures to strings and back|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Sat Sep 10 08:22:36 2005
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Sat, 10 Sep 2005 04:22:36 -0400
Subject: rpms/amarok/FC-4 amarok-1.3.1-alsa-gst.patch, NONE, 1.1 .cvsignore,
	1.10, 1.11 amarok-1.3-engines-cfg.patch, 1.1, 1.2 amarok.spec,
	1.26, 1.27 sources, 1.10, 1.11
Message-ID: <200509100823.j8A8N7we000713@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/amarok/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv659/FC-4

Modified Files:
	.cvsignore amarok-1.3-engines-cfg.patch amarok.spec sources 
Added Files:
	amarok-1.3.1-alsa-gst.patch 
Log Message:
- version 1.3.1
- add patch from upstream to fix alsasink in gstreamer
- default to autoaudiosink for gstreamer



amarok-1.3.1-alsa-gst.patch:

--- NEW FILE amarok-1.3.1-alsa-gst.patch ---
--- ./amarok/src/engine/gst/gstengine.cpp.alsa-gst	2005-09-04 22:47:19.000000000 +0200
+++ ./amarok/src/engine/gst/gstengine.cpp	2005-09-09 19:32:11.000000000 +0200
@@ -806,7 +806,6 @@
 
                     if ( g_strrstr ( factory->details.klass, classname ) ) {
                         name = g_strdup ( GST_OBJECT_NAME ( factory ) );
-                        if ( name != "alsasink" )
                         results << name;
                     }
                 }
@@ -830,7 +829,7 @@
 
     destroyPipeline();
 
-    if ( GstConfig::soundOutput().isEmpty() || GstConfig::soundOutput() == "alsasink" ) {
+    if ( GstConfig::soundOutput().isEmpty() ) {
         QTimer::singleShot( 0, this, SLOT( errorNoOutput() ) );
         return false;
     }
@@ -853,7 +852,6 @@
     }
 
     m_gst_audiobin = gst_bin_new( "audiobin" );
-    gst_bin_add( GST_BIN( m_gst_audiobin ), m_gst_audiosink );
 
     /* setting device property for AudioSink*/
     if ( GstConfig::useCustomSoundDevice() && !GstConfig::soundDevice().isEmpty() )
@@ -872,6 +870,7 @@
     gst_element_link_many( m_gst_audioconvert, m_gst_equalizer, m_gst_identity,
                            m_gst_volume, m_gst_audioscale, m_gst_audiosink, NULL );
 
+    gst_bin_add( GST_BIN( m_gst_audiobin ), m_gst_audiosink );
     gst_element_set_state( m_gst_audiobin, GST_STATE_PAUSED );
 
     m_pipelineFilled = true;


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/amarok/FC-4/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	22 Aug 2005 13:35:51 -0000	1.10
+++ .cvsignore	10 Sep 2005 08:22:34 -0000	1.11
@@ -1 +1 @@
-amarok-1.3.tar.bz2
+amarok-1.3.1.tar.bz2

amarok-1.3-engines-cfg.patch:

Index: amarok-1.3-engines-cfg.patch
===================================================================
RCS file: /cvs/extras/rpms/amarok/FC-4/amarok-1.3-engines-cfg.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- amarok-1.3-engines-cfg.patch	22 Aug 2005 13:35:51 -0000	1.1
+++ amarok-1.3-engines-cfg.patch	10 Sep 2005 08:22:34 -0000	1.2
@@ -6,7 +6,7 @@
              
              Select the sound output plugin ("sink"). Their availability depends on the system configuration.
 -            osssink
-+            alsasink
++            autoaudiosink
          
          
              


Index: amarok.spec
===================================================================
RCS file: /cvs/extras/rpms/amarok/FC-4/amarok.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- amarok.spec	23 Aug 2005 22:33:18 -0000	1.26
+++ amarok.spec	10 Sep 2005 08:22:34 -0000	1.27
@@ -6,17 +6,18 @@
 
 Name:       amarok
 Summary:    Media player for KDE
-Version:    1.3
-Release:    6%{?dist}
+Version:    1.3.1
+Release:    2%{?dist}
 
 Group: 	    Applications/Multimedia
 License:    GPL
 Url:        http://amarok.kde.org
-Source0:    http://dl.sf.net/amarok/amarok-1.3.tar.bz2
+Source0:    http://dl.sf.net/amarok/amarok-1.3.1.tar.bz2
 Patch0:     amarok-1.2.4-gcc4bl.patch
 #Patch1:     amarok-1.2.4-forward-decl.patch
 Patch2:     amarok-1.3-engines-cfg.patch
 Patch3:     amarok-1.3-endian.patch
+Patch4:     amarok-1.3.1-alsa-gst.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  kdemultimedia-devel >= 6:3.2
@@ -101,10 +102,11 @@
 #%patch1 -p1 -b .forward-decl
 %patch2 -p1 -b .engines-cfg
 %patch3 -p1 -b .endian
+%patch4 -p1 -b .alsa-gst
 
 
 %build
-unset QTDIR && . /etc/profile.d/qt.sh
+unset QTDIR && . %{_sysconfdir}/profile.d/qt.sh
 # work around an improper ${kdelibsuff}
 export QTLIB=${QTDIR}/lib QTINC=${QTDIR}/include
 %configure \
@@ -152,18 +154,18 @@
 %post
 /sbin/ldconfig
 # update icon themes if necessary
-if [ -x /usr/bin/gtk-update-icon-cache ]; then
-    /usr/bin/gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+    %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg || :
     # needed because amarok 1.2 puts icon in hicolor
     # and the RPM did not update the cache on uninstall
-    /usr/bin/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor
+    %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 fi
 
 %postun
 /sbin/ldconfig
 # update icon themes if necessary
-if [ -x /usr/bin/gtk-update-icon-cache ]; then
-    /usr/bin/gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+    %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg || :
 fi
 
 
@@ -231,6 +233,13 @@
 
 
 %changelog
+* Sat Sep 10 2005 Aurelien Bompard  1.3.1-2
+- add patch from upstream to fix alsasink in gstreamer
+- default to autoaudiosink for gstreamer
+
+* Mon Sep 05 2005 Aurelien Bompard  1.3.1-1
+- version 1.3.1
+
 * Tue Aug 23 2005 Aurelien Bompard  1.3-6
 - add version to obsoletes
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/amarok/FC-4/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	22 Aug 2005 13:35:51 -0000	1.10
+++ sources	10 Sep 2005 08:22:34 -0000	1.11
@@ -1 +1 @@
-2dd100584795fb20c621fdbc96cbee1e  amarok-1.3.tar.bz2
+31f504e5fe985bbdb3c99f0e72d08fa1  amarok-1.3.1.tar.bz2



From fedora-extras-commits at redhat.com  Sat Sep 10 08:22:37 2005
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Sat, 10 Sep 2005 04:22:37 -0400
Subject: rpms/amarok/devel amarok-1.3.1-alsa-gst.patch, NONE, 1.1 .cvsignore,
	1.10, 1.11 amarok-1.3-engines-cfg.patch, 1.1, 1.2 amarok.spec,
	1.23, 1.24 sources, 1.10, 1.11
Message-ID: <200509100823.j8A8N7S5000722@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/amarok/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv659/devel

Modified Files:
	.cvsignore amarok-1.3-engines-cfg.patch amarok.spec sources 
Added Files:
	amarok-1.3.1-alsa-gst.patch 
Log Message:
- version 1.3.1
- add patch from upstream to fix alsasink in gstreamer
- default to autoaudiosink for gstreamer



amarok-1.3.1-alsa-gst.patch:

--- NEW FILE amarok-1.3.1-alsa-gst.patch ---
--- ./amarok/src/engine/gst/gstengine.cpp.alsa-gst	2005-09-04 22:47:19.000000000 +0200
+++ ./amarok/src/engine/gst/gstengine.cpp	2005-09-09 19:32:11.000000000 +0200
@@ -806,7 +806,6 @@
 
                     if ( g_strrstr ( factory->details.klass, classname ) ) {
                         name = g_strdup ( GST_OBJECT_NAME ( factory ) );
-                        if ( name != "alsasink" )
                         results << name;
                     }
                 }
@@ -830,7 +829,7 @@
 
     destroyPipeline();
 
-    if ( GstConfig::soundOutput().isEmpty() || GstConfig::soundOutput() == "alsasink" ) {
+    if ( GstConfig::soundOutput().isEmpty() ) {
         QTimer::singleShot( 0, this, SLOT( errorNoOutput() ) );
         return false;
     }
@@ -853,7 +852,6 @@
     }
 
     m_gst_audiobin = gst_bin_new( "audiobin" );
-    gst_bin_add( GST_BIN( m_gst_audiobin ), m_gst_audiosink );
 
     /* setting device property for AudioSink*/
     if ( GstConfig::useCustomSoundDevice() && !GstConfig::soundDevice().isEmpty() )
@@ -872,6 +870,7 @@
     gst_element_link_many( m_gst_audioconvert, m_gst_equalizer, m_gst_identity,
                            m_gst_volume, m_gst_audioscale, m_gst_audiosink, NULL );
 
+    gst_bin_add( GST_BIN( m_gst_audiobin ), m_gst_audiosink );
     gst_element_set_state( m_gst_audiobin, GST_STATE_PAUSED );
 
     m_pipelineFilled = true;


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/amarok/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	22 Aug 2005 13:35:52 -0000	1.10
+++ .cvsignore	10 Sep 2005 08:22:35 -0000	1.11
@@ -1 +1 @@
-amarok-1.3.tar.bz2
+amarok-1.3.1.tar.bz2

amarok-1.3-engines-cfg.patch:

Index: amarok-1.3-engines-cfg.patch
===================================================================
RCS file: /cvs/extras/rpms/amarok/devel/amarok-1.3-engines-cfg.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- amarok-1.3-engines-cfg.patch	22 Aug 2005 13:35:52 -0000	1.1
+++ amarok-1.3-engines-cfg.patch	10 Sep 2005 08:22:35 -0000	1.2
@@ -6,7 +6,7 @@
              
              Select the sound output plugin ("sink"). Their availability depends on the system configuration.
 -            osssink
-+            alsasink
++            autoaudiosink
          
          
              


Index: amarok.spec
===================================================================
RCS file: /cvs/extras/rpms/amarok/devel/amarok.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- amarok.spec	26 Aug 2005 13:08:01 -0000	1.23
+++ amarok.spec	10 Sep 2005 08:22:35 -0000	1.24
@@ -6,17 +6,18 @@
 
 Name:       amarok
 Summary:    Media player for KDE
-Version:    1.3
-Release:    6%{?dist}
+Version:    1.3.1
+Release:    2%{?dist}
 
 Group: 	    Applications/Multimedia
 License:    GPL
 Url:        http://amarok.kde.org
-Source0:    http://dl.sf.net/amarok/amarok-1.3.tar.bz2
+Source0:    http://dl.sf.net/amarok/amarok-1.3.1.tar.bz2
 Patch0:     amarok-1.2.4-gcc4bl.patch
 #Patch1:     amarok-1.2.4-forward-decl.patch
 Patch2:     amarok-1.3-engines-cfg.patch
 Patch3:     amarok-1.3-endian.patch
+Patch4:     amarok-1.3.1-alsa-gst.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  kdemultimedia-devel >= 6:3.2
@@ -101,10 +102,11 @@
 #%patch1 -p1 -b .forward-decl
 %patch2 -p1 -b .engines-cfg
 %patch3 -p1 -b .endian
+%patch4 -p1 -b .alsa-gst
 
 
 %build
-unset QTDIR && . /etc/profile.d/qt.sh
+unset QTDIR && . %{_sysconfdir}/profile.d/qt.sh
 # work around an improper ${kdelibsuff}
 export QTLIB=${QTDIR}/lib QTINC=${QTDIR}/include
 %configure \
@@ -231,6 +233,13 @@
 
 
 %changelog
+* Sat Sep 10 2005 Aurelien Bompard  1.3.1-2
+- add patch from upstream to fix alsasink in gstreamer
+- default to autoaudiosink for gstreamer
+
+* Mon Sep 05 2005 Aurelien Bompard  1.3.1-1
+- version 1.3.1
+
 * Tue Aug 23 2005 Aurelien Bompard  1.3-6
 - add version to obsoletes
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/amarok/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	22 Aug 2005 13:35:52 -0000	1.10
+++ sources	10 Sep 2005 08:22:35 -0000	1.11
@@ -1 +1 @@
-2dd100584795fb20c621fdbc96cbee1e  amarok-1.3.tar.bz2
+31f504e5fe985bbdb3c99f0e72d08fa1  amarok-1.3.1.tar.bz2



From fedora-extras-commits at redhat.com  Sat Sep 10 09:29:52 2005
From: fedora-extras-commits at redhat.com (Marc Maurer (uwog))
Date: Sat, 10 Sep 2005 05:29:52 -0400
Subject: rpms/abiword/devel .cvsignore, 1.8, 1.9 abiword.spec, 1.17,
	1.18 sources, 1.8, 1.9 abiword-2.3.4-pangographics.patch, 1.2, NONE
Message-ID: <200509100929.j8A9Tq2D002257@cvs-int.fedora.redhat.com>

Author: uwog

Update of /cvs/extras/rpms/abiword/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2232

Modified Files:
	.cvsignore abiword.spec sources 
Removed Files:
	abiword-2.3.4-pangographics.patch 
Log Message:
2.3.6 release




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/abiword/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	21 Aug 2005 12:40:16 -0000	1.8
+++ .cvsignore	10 Sep 2005 09:29:50 -0000	1.9
@@ -1 +1 @@
-abiword-2.3.5.tar.bz2
+abiword-2.3.6.tar.bz2


Index: abiword.spec
===================================================================
RCS file: /cvs/extras/rpms/abiword/devel/abiword.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- abiword.spec	2 Sep 2005 22:30:21 -0000	1.17
+++ abiword.spec	10 Sep 2005 09:29:50 -0000	1.18
@@ -2,8 +2,8 @@
 
 Summary: The AbiWord word processor
 Name: abiword
-Version: 2.3.5
-Release: 3
+Version: 2.3.6
+Release: 1
 Epoch: 1
 Group: Applications/Editors
 License: GPL
@@ -42,7 +42,6 @@
 
 Patch0: abiword-2.0.9-windowshelppaths.patch
 Patch1: abiword-2.2.6-desktop.patch
-Patch2: abiword-2.3.4-pangographics.patch
 
 %description
 AbiWord is a cross-platform Open Source word processor. The goal is to make
@@ -52,7 +51,6 @@
 %setup -q 
 %patch0 -p1 -b .windowshelppaths
 %patch1 -p1 -b .desktop
-%patch2 -p1 -b .pangographics
 
 %build
 cd abi
@@ -133,6 +131,10 @@
 %{_datadir}/icons/*png
 
 %changelog
+* Sat Sep 10 2005 Marc Maurer  - 1:2.3.6-1
+- Update to 2.3.6
+- Drop the pango patch
+
 * Sat Sep 3 2005 Marc Maurer  - 1:2.3.5-3
 - Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/abiword/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	21 Aug 2005 12:40:16 -0000	1.8
+++ sources	10 Sep 2005 09:29:50 -0000	1.9
@@ -1 +1 @@
-2b2f2b5f5379b6dd7fe4145b3f7a28d4  abiword-2.3.5.tar.bz2
+8a1fc6a2a9cec61ed15231d2fa1b3110  abiword-2.3.6.tar.bz2


--- abiword-2.3.4-pangographics.patch DELETED ---



From fedora-extras-commits at redhat.com  Sat Sep 10 09:33:18 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Sat, 10 Sep 2005 05:33:18 -0400
Subject: rpms/cvsutils - New directory
Message-ID: <200509100933.j8A9XIJK002359@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/cvsutils
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2339/cvsutils

Log Message:
Directory /cvs/extras/rpms/cvsutils added to the repository




From fedora-extras-commits at redhat.com  Sat Sep 10 09:33:19 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Sat, 10 Sep 2005 05:33:19 -0400
Subject: rpms/cvsutils/devel - New directory
Message-ID: <200509100933.j8A9XJgC002364@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/cvsutils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2339/cvsutils/devel

Log Message:
Directory /cvs/extras/rpms/cvsutils/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Sep 10 09:33:50 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Sat, 10 Sep 2005 05:33:50 -0400
Subject: rpms/cvsutils Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200509100933.j8A9Xoxd002413@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/cvsutils
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2384

Added Files:
	Makefile import.log 
Log Message:
Setup of module cvsutils


--- NEW FILE Makefile ---
# Top level Makefile for module cvsutils
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Sat Sep 10 09:33:50 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Sat, 10 Sep 2005 05:33:50 -0400
Subject: rpms/cvsutils/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200509100933.j8A9Xo10002418@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/cvsutils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2384/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module cvsutils


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Sat Sep 10 09:35:12 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Sat, 10 Sep 2005 05:35:12 -0400
Subject: rpms/cvsutils import.log,1.1,1.2
Message-ID: <200509100935.j8A9Zg9q002491@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/cvsutils
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2453

Modified Files:
	import.log 
Log Message:
auto-import cvsutils-0.2.3-2 on branch devel from cvsutils-0.2.3-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/cvsutils/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	10 Sep 2005 09:33:48 -0000	1.1
+++ import.log	10 Sep 2005 09:35:10 -0000	1.2
@@ -0,0 +1 @@
+cvsutils-0_2_3-2:HEAD:cvsutils-0.2.3-2.src.rpm:1126344896



From fedora-extras-commits at redhat.com  Sat Sep 10 09:35:12 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Sat, 10 Sep 2005 05:35:12 -0400
Subject: rpms/cvsutils/devel cvsutils.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200509100935.j8A9ZgIN002495@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/cvsutils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2453/devel

Modified Files:
	.cvsignore sources 
Added Files:
	cvsutils.spec 
Log Message:
auto-import cvsutils-0.2.3-2 on branch devel from cvsutils-0.2.3-2.src.rpm


--- NEW FILE cvsutils.spec ---
Summary: 	CVS Utilities
Name: 		cvsutils
Version: 	0.2.3
Release: 	2%{?dist}
License: 	GPL
Group: 		Development/Tools
URL: 		http://www.red-bean.com/cvsutils
Source: 	http://www.red-bean.com/cvsutils/cvsutils-%{version}.tar.gz
Requires: 	cvs
BuildArch: 	noarch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description
CVS Utilities is a collection of tools to facilitate working with
Concurrent Versions System (CVS).

%prep
%setup -q

%build
%configure
make %{?_smp_mflags}

%install
rm -rf ${RPM_BUILD_ROOT}
make install DESTDIR="${RPM_BUILD_ROOT}"

for f in ${RPM_BUILD_ROOT}%{_bindir}/*; do
  echo ".so man1/cvsutils.1" > \
          ${RPM_BUILD_ROOT}%{_mandir}/man1/$(basename $f).1 
done

%clean
rm -rf ${RPM_BUILD_ROOT}

%files
%defattr(-,root,root)
%doc NEWS README COPYING
%{_bindir}/*
%{_mandir}/man1/*

%changelog
* Mon Sep 10 2005 Ralf Cors??pius  - 0.2.3-2
- Cleanup.

* Mon Sep 05 2005 Ralf Cors??pius  - 0.2.3-1
- FE submission preps.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cvsutils/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	10 Sep 2005 09:33:48 -0000	1.1
+++ .cvsignore	10 Sep 2005 09:35:10 -0000	1.2
@@ -0,0 +1 @@
+cvsutils-0.2.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cvsutils/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	10 Sep 2005 09:33:48 -0000	1.1
+++ sources	10 Sep 2005 09:35:10 -0000	1.2
@@ -0,0 +1 @@
+709a3e298c654c22b41ca06d9fc4df76  cvsutils-0.2.3.tar.gz



From fedora-extras-commits at redhat.com  Sat Sep 10 09:39:24 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Sat, 10 Sep 2005 05:39:24 -0400
Subject: rpms/cvsutils/devel cvsutils.spec,1.1,1.2
Message-ID: <200509100939.j8A9dOmH002557@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/cvsutils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2538

Modified Files:
	cvsutils.spec 
Log Message:
Add AUTHORS, TODO


Index: cvsutils.spec
===================================================================
RCS file: /cvs/extras/rpms/cvsutils/devel/cvsutils.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cvsutils.spec	10 Sep 2005 09:35:10 -0000	1.1
+++ cvsutils.spec	10 Sep 2005 09:39:22 -0000	1.2
@@ -1,7 +1,7 @@
 Summary: 	CVS Utilities
 Name: 		cvsutils
 Version: 	0.2.3
-Release: 	2%{?dist}
+Release: 	3%{?dist}
 License: 	GPL
 Group: 		Development/Tools
 URL: 		http://www.red-bean.com/cvsutils
@@ -35,11 +35,14 @@
 
 %files
 %defattr(-,root,root)
-%doc NEWS README COPYING
+%doc NEWS README COPYING AUTHORS TODO
 %{_bindir}/*
 %{_mandir}/man1/*
 
 %changelog
+* Mon Sep 10 2005 Ralf Cors??pius  - 0.2.3-3
+- Add AUTHORS, TODO.
+
 * Mon Sep 10 2005 Ralf Cors??pius  - 0.2.3-2
 - Cleanup.
 



From fedora-extras-commits at redhat.com  Sat Sep 10 10:28:59 2005
From: fedora-extras-commits at redhat.com (Duncan Ferguson (duncs))
Date: Sat, 10 Sep 2005 06:28:59 -0400
Subject: rpms/perl-X11-Protocol - New directory
Message-ID: <200509101028.j8AASxRX005912@cvs-int.fedora.redhat.com>

Author: duncs

Update of /cvs/extras/rpms/perl-X11-Protocol
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5888/perl-X11-Protocol

Log Message:
Directory /cvs/extras/rpms/perl-X11-Protocol added to the repository




From fedora-extras-commits at redhat.com  Sat Sep 10 10:28:59 2005
From: fedora-extras-commits at redhat.com (Duncan Ferguson (duncs))
Date: Sat, 10 Sep 2005 06:28:59 -0400
Subject: rpms/perl-X11-Protocol/devel - New directory
Message-ID: <200509101028.j8AASxFU005917@cvs-int.fedora.redhat.com>

Author: duncs

Update of /cvs/extras/rpms/perl-X11-Protocol/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5888/perl-X11-Protocol/devel

Log Message:
Directory /cvs/extras/rpms/perl-X11-Protocol/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Sep 10 10:29:12 2005
From: fedora-extras-commits at redhat.com (Duncan Ferguson (duncs))
Date: Sat, 10 Sep 2005 06:29:12 -0400
Subject: rpms/perl-X11-Protocol Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200509101029.j8AATCBQ005962@cvs-int.fedora.redhat.com>

Author: duncs

Update of /cvs/extras/rpms/perl-X11-Protocol
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5933

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-X11-Protocol


--- NEW FILE Makefile ---
# Top level Makefile for module perl-X11-Protocol
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Sat Sep 10 10:29:12 2005
From: fedora-extras-commits at redhat.com (Duncan Ferguson (duncs))
Date: Sat, 10 Sep 2005 06:29:12 -0400
Subject: rpms/perl-X11-Protocol/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200509101029.j8AATCwB005965@cvs-int.fedora.redhat.com>

Author: duncs

Update of /cvs/extras/rpms/perl-X11-Protocol/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5933/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-X11-Protocol


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Sat Sep 10 10:29:53 2005
From: fedora-extras-commits at redhat.com (Duncan Ferguson (duncs))
Date: Sat, 10 Sep 2005 06:29:53 -0400
Subject: rpms/perl-X11-Protocol import.log,1.1,1.2
Message-ID: <200509101030.j8AAUNIv006039@cvs-int.fedora.redhat.com>

Author: duncs

Update of /cvs/extras/rpms/perl-X11-Protocol
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6001

Modified Files:
	import.log 
Log Message:
auto-import perl-X11-Protocol-0.54-2 on branch devel from perl-X11-Protocol-0.54-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-X11-Protocol/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	10 Sep 2005 10:29:10 -0000	1.1
+++ import.log	10 Sep 2005 10:29:50 -0000	1.2
@@ -0,0 +1 @@
+perl-X11-Protocol-0_54-2:HEAD:perl-X11-Protocol-0.54-2.src.rpm:1126348188



From fedora-extras-commits at redhat.com  Sat Sep 10 10:29:53 2005
From: fedora-extras-commits at redhat.com (Duncan Ferguson (duncs))
Date: Sat, 10 Sep 2005 06:29:53 -0400
Subject: rpms/perl-X11-Protocol/devel perl-X11-Protocol.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200509101030.j8AAUNq4006043@cvs-int.fedora.redhat.com>

Author: duncs

Update of /cvs/extras/rpms/perl-X11-Protocol/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6001/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-X11-Protocol.spec 
Log Message:
auto-import perl-X11-Protocol-0.54-2 on branch devel from perl-X11-Protocol-0.54-2.src.rpm


--- NEW FILE perl-X11-Protocol.spec ---
Name:           perl-X11-Protocol
Version:        0.54
Release:        2%{?dist}
Summary:        X11-Protocol - Raw interface to X Window System servers

Group:          Development/Libraries
License:        GPL or Artistic
URL:            http://search.cpan.org/dist/X11-Protocol/
Source0:        http://search.cpan.org/CPAN/authors/id/S/SM/SMCCAM/X11-Protocol-0.54.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:	noarch
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
X11::Protocol is a client-side interface to the X11 Protocol (see X(1) for
information about X11), allowing perl programs to display windows and
graphics on X11 servers.

A full description of the protocol is beyond the scope of this documentation;
for complete information, see the I,
available as Postscript or *roff source from C, or
I of O'Reilly & Associates's series of
books about X (ISBN 1-56592-083-X, C), which contains
most of the same information.

%prep
%setup -q -n X11-Protocol-%{version}

# Testing requires X - use "rpmbuild --with X"
%{!?_with_X:\
%{__perl} -pi -e 'print "print \"Remaining tests require X\n\"; exit 0;"
			if /Insert your test code below/;' test.pl \
}

perldoc -t perlartistic > Artistic
perldoc -t perlgpl > COPYING

# Remove shebangs from module code
find . -name '*.pm' -exec sed -i -e '/^#!\/usr\/bin\/perl$/d' {} ';'


%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'
find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';'
chmod -R u+w $RPM_BUILD_ROOT/*


%check
make test


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc README Changes Todo eg COPYING Artistic
%{perl_vendorlib}/X11/
%{_mandir}/man3/*.3*


%changelog
* Fri Aug 26 2005 Paul Howarth  0.54-2
- remove redundant BR: perl
- remove compiler optimization flags, redundant for noarch package
- require "rpmbuild --with X" to run tests requiring X
- include examples as %%doc
- include license text

* Thu Aug 18 2005 Duncan Ferguson  0.54-1
- Initial build


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-X11-Protocol/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	10 Sep 2005 10:29:10 -0000	1.1
+++ .cvsignore	10 Sep 2005 10:29:51 -0000	1.2
@@ -0,0 +1 @@
+X11-Protocol-0.54.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-X11-Protocol/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	10 Sep 2005 10:29:10 -0000	1.1
+++ sources	10 Sep 2005 10:29:51 -0000	1.2
@@ -0,0 +1 @@
+b2ad4dc41755f2b08f9cd2899636346c  X11-Protocol-0.54.tar.gz



From fedora-extras-commits at redhat.com  Sat Sep 10 10:36:08 2005
From: fedora-extras-commits at redhat.com (Duncan Ferguson (duncs))
Date: Sat, 10 Sep 2005 06:36:08 -0400
Subject: owners owners.list,1.186,1.187
Message-ID: <200509101036.j8AAa8uJ006127@cvs-int.fedora.redhat.com>

Author: duncs

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6108

Modified Files:
	owners.list 
Log Message:
perl-X11-Protocol added



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.186
retrieving revision 1.187
diff -u -r1.186 -r1.187
--- owners.list	10 Sep 2005 02:40:35 -0000	1.186
+++ owners.list	10 Sep 2005 10:36:06 -0000	1.187
@@ -1049,3 +1049,4 @@
 Fedora Extras|zoo|File archiving utility with compression|Nicolas.Mailhot at laPoste.net|extras-qa at fedoraproject.org|
 Fedora Extras|zope|Application server in Python|gauret at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|zziplib|Lightweight library to easily extract data from zip files|matthias at rpmforge.net|extras-qa at fedoraproject.org|
+Fedora Extras|perl-X11-Protocol|Perl interface to X11|duncan_j_ferguson at yahoo.co.uk|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sat Sep 10 11:20:28 2005
From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2))
Date: Sat, 10 Sep 2005 07:20:28 -0400
Subject: rpms/clamav/devel clamav.spec,1.27,1.28
Message-ID: <200509101120.j8ABKSWL007643@cvs-int.fedora.redhat.com>

Author: dwmw2

Update of /cvs/extras/rpms/clamav/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7624

Modified Files:
	clamav.spec 
Log Message:
add clamav-exim subpackage


Index: clamav.spec
===================================================================
RCS file: /cvs/extras/rpms/clamav/devel/clamav.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- clamav.spec	29 Jul 2005 16:29:09 -0000	1.27
+++ clamav.spec	10 Sep 2005 11:20:26 -0000	1.28
@@ -14,6 +14,9 @@
 %global milterlog	%_var/log/clamd.milter
 %global milteruser	clamilt
 %global milterstatedir	%_var/run/clamav-milter
+%global clameximlog	%_var/log/clamd.exim
+%global clameximuser	clamexim
+%global clameximstatedir %_var/run/clamd.exim
 %global pkgdatadir	%_datadir/%name
 
 
@@ -22,7 +25,7 @@
 Summary:	End-user tools for the Clam Antivirus scanner
 Name:		clamav
 Version:	0.86.2
-Release:	%release_func 4
+Release:	%release_func 5
 
 License:	GPL
 Group:		Applications/File
@@ -107,6 +110,21 @@
 Requires(pre):		fedora-usermgmt >= 0.7
 Requires(postun):	fedora-usermgmt >= 0.7
 
+%package exim
+Summary:	Exim d??mon configuration for the Clam Antivirus scanner
+Group:		System Environment/Daemons
+## For now, use this as a placeholder. Later, generate separate -sysv
+## and -minit subpackages
+Requires:	init(clamav-exim)
+Provides:	init(clamav-exim)
+Requires(pre):		exim
+Requires(pre):		%_initrddir
+Requires(postun):	%_initrddir initscripts
+Requires(post):		chkconfig coreutils
+Requires(preun):	chkconfig initscripts
+Requires(pre):		fedora-usermgmt >= 0.7
+Requires(postun):	fedora-usermgmt >= 0.7
+
 
 %description
 Clam AntiVirus is an anti-virus toolkit for UNIX. The main purpose of this
@@ -159,6 +177,22 @@
 
 THIS PACKAGE IS TO BE CONSIDERED AS EXPERIMENTAL!
 
+%description exim
+This package contains files which are needed to run the clamav d??mon for use
+by the Exim MTA. It can be activated by adding
+
+   av_scanner = clamd:%clameximstatedir/clamd.sock 
+
+to your exim.conf, and using the 'malware' condition in the data ACL, 
+as follows:
+
+   deny message = This message contains malware ($malware_name)
+      demime = *
+      malware = *
+
+For further details of Exim content scanning, see chapter 40 of the Exim 
+specification: http://www.exim.org/exim-html-4.50/doc/html/spec_40.html
+
 ## ------------------------------------------------------------
 
 %prep
@@ -226,6 +260,7 @@
 	${RPM_BUILD_ROOT}%{_sysconfdir}/{clamd.d,cron.d,logrotate.d,sysconfig} \
 	${RPM_BUILD_ROOT}%{_var}/log \
 	${RPM_BUILD_ROOT}%milterstatedir \
+	${RPM_BUILD_ROOT}%clameximstatedir \
 	${RPM_BUILD_ROOT}%pkgdatadir/template \
 	${RPM_BUILD_ROOT}%{_initrddir}
 
@@ -268,15 +303,34 @@
    $RPM_BUILD_ROOT%pkgdatadir/freshclam-sleep
 
 
-%if 0%{!?_without_milter:1}
-#### The milter stuff
+#### The Exim stuff
 
 function subst() {
-	sed -e 's!!milter!g;s!!%milteruser!g;'"$3" "$1" >"$RPM_BUILD_ROOT$2"
+	sed -e "s!!$3!g;s!!$4!g;""$5" "$1" >"$RPM_BUILD_ROOT$2"
 }
 
+subst etc/clamd.conf %_sysconfdir/clamd.d/exim.conf exim %clameximuser \
+	's!^##*\(\(LogFile\|LocalSocket\|PidFile\|User\)\s\|\(StreamSaveToDisk\|ScanMail\|LogTime\|ScanArchive\)$\)!\1!;s!^Example!#Example!;'
 
-subst etc/clamd.conf /etc/clamd.d/milter.conf \
+
+subst %{SOURCE7} %_initrddir/clamd.exim exim %clameximuser ''
+chmod 0755 $RPM_BUILD_ROOT%_initrddir/clamd.exim
+subst %{SOURCE3} %_sysconfdir/logrotate.d/clamd.exim exim %clameximuser ''
+
+cat <$RPM_BUILD_ROOT%_sysconfdir/sysconfig/clamd.exim
+CLAMD_CONFIG='%_sysconfdir/clamd.d/exim.conf'
+CLAMD_SOCKET=%clameximstatedir/clamd.sock
+EOF
+
+mkdir -p $RPM_BUILD_ROOT/%clameximstatedir
+ln -sf clamd $RPM_BUILD_ROOT%_sbindir/clamd.exim
+
+touch $RPM_BUILD_ROOT%clameximstatedir/clamd.sock $RPM_BUILD_ROOT%clameximlog
+
+%if 0%{!?_without_milter:1}
+#### The milter stuff
+
+subst etc/clamd.conf /etc/clamd.d/milter.conf milter %milteruser \
 	's!^##*\(\(LogFile\|LocalSocket\|PidFile\|User\)\s\|\(StreamSaveToDisk\|ScanMail\)$\)!\1!;'
 
 
@@ -337,6 +391,26 @@
 test "$1" != 0 || /usr/sbin/fedora-groupdel %{milteruser} &>/dev/null || :
 test "$1"  = 0 || %{_initrddir}/clamav-milter condrestart >/dev/null || :
 
+%pre exim
+/usr/sbin/fedora-useradd  5 -r -s /sbin/nologin -d %clameximstatedir -M \
+                            -c 'Clamav Exim User' -g exim %clameximuser &>/dev/null || :
+
+%post exim
+/sbin/chkconfig --add clamd.exim
+test -e %clameximlog || {
+	touch %clameximlog
+	chmod 0620             %clameximlog
+	chown root:exim %clameximlog
+}
+
+%preun exim
+test "$1" != 0 || %{_initrddir}/clamd.exim stop &>/dev/null || :
+test "$1" != 0 || /sbin/chkconfig --del clamd.exim
+
+%postun exim
+test "$1" != 0 || /usr/sbin/fedora-userdel  %{clameximuser} &>/dev/null || :
+test "$1"  = 0 || %{_initrddir}/clamd.exim condrestart >/dev/null || :
+
 
 %post   lib -p /sbin/ldconfig
 %postun lib -p /sbin/ldconfig
@@ -414,6 +488,19 @@
 
 ## -----------------------
 
+%files exim
+%defattr(-,root,root,-)
+%_sbindir/clamd.exim
+%config %{_initrddir}/clamd.exim
+%config(noreplace) %verify(not mtime) %{_sysconfdir}/clamd.d/exim.conf
+%config(noreplace) %verify(not mtime) %{_sysconfdir}/sysconfig/clamd.exim
+%config(noreplace) %verify(not mtime) %{_sysconfdir}/logrotate.d/clamd.exim
+%attr(0750,%clameximuser,exim) %dir %clameximstatedir
+%ghost %clameximstatedir/*
+%ghost %attr(0620,root,exim) %verify(not size md5 mtime) %clameximlog
+
+## -----------------------
+
 %files milter
 %defattr(-,root,root,-)
 %doc clamav-milter/INSTALL
@@ -428,6 +515,9 @@
 %endif	# _without_milter
 
 %changelog
+* 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



From fedora-extras-commits at redhat.com  Sat Sep 10 11:20:34 2005
From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2))
Date: Sat, 10 Sep 2005 07:20:34 -0400
Subject: rpms/clamav/FC-4 clamav.spec,1.26,1.27
Message-ID: <200509101120.j8ABKYig007665@cvs-int.fedora.redhat.com>

Author: dwmw2

Update of /cvs/extras/rpms/clamav/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7646

Modified Files:
	clamav.spec 
Log Message:
add clamav-exim subpackage


Index: clamav.spec
===================================================================
RCS file: /cvs/extras/rpms/clamav/FC-4/clamav.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- clamav.spec	29 Jul 2005 16:37:45 -0000	1.26
+++ clamav.spec	10 Sep 2005 11:20:32 -0000	1.27
@@ -14,6 +14,9 @@
 %global milterlog	%_var/log/clamd.milter
 %global milteruser	clamilt
 %global milterstatedir	%_var/run/clamav-milter
+%global clameximlog	%_var/log/clamd.exim
+%global clameximuser	clamexim
+%global clameximstatedir %_var/run/clamd.exim
 %global pkgdatadir	%_datadir/%name
 
 
@@ -22,7 +25,7 @@
 Summary:	End-user tools for the Clam Antivirus scanner
 Name:		clamav
 Version:	0.86.2
-Release:	%release_func 4
+Release:	%release_func 5
 
 License:	GPL
 Group:		Applications/File
@@ -107,6 +110,21 @@
 Requires(pre):		fedora-usermgmt >= 0.7
 Requires(postun):	fedora-usermgmt >= 0.7
 
+%package exim
+Summary:	Exim d??mon configuration for the Clam Antivirus scanner
+Group:		System Environment/Daemons
+## For now, use this as a placeholder. Later, generate separate -sysv
+## and -minit subpackages
+Requires:	init(clamav-exim)
+Provides:	init(clamav-exim)
+Requires(pre):		exim
+Requires(pre):		%_initrddir
+Requires(postun):	%_initrddir initscripts
+Requires(post):		chkconfig coreutils
+Requires(preun):	chkconfig initscripts
+Requires(pre):		fedora-usermgmt >= 0.7
+Requires(postun):	fedora-usermgmt >= 0.7
+
 
 %description
 Clam AntiVirus is an anti-virus toolkit for UNIX. The main purpose of this
@@ -159,6 +177,22 @@
 
 THIS PACKAGE IS TO BE CONSIDERED AS EXPERIMENTAL!
 
+%description exim
+This package contains files which are needed to run the clamav d??mon for use
+by the Exim MTA. It can be activated by adding
+
+   av_scanner = clamd:%clameximstatedir/clamd.sock 
+
+to your exim.conf, and using the 'malware' condition in the data ACL, 
+as follows:
+
+   deny message = This message contains malware ($malware_name)
+      demime = *
+      malware = *
+
+For further details of Exim content scanning, see chapter 40 of the Exim 
+specification: http://www.exim.org/exim-html-4.50/doc/html/spec_40.html
+
 ## ------------------------------------------------------------
 
 %prep
@@ -226,6 +260,7 @@
 	${RPM_BUILD_ROOT}%{_sysconfdir}/{clamd.d,cron.d,logrotate.d,sysconfig} \
 	${RPM_BUILD_ROOT}%{_var}/log \
 	${RPM_BUILD_ROOT}%milterstatedir \
+	${RPM_BUILD_ROOT}%clameximstatedir \
 	${RPM_BUILD_ROOT}%pkgdatadir/template \
 	${RPM_BUILD_ROOT}%{_initrddir}
 
@@ -268,15 +303,34 @@
    $RPM_BUILD_ROOT%pkgdatadir/freshclam-sleep
 
 
-%if 0%{!?_without_milter:1}
-#### The milter stuff
+#### The Exim stuff
 
 function subst() {
-	sed -e 's!!milter!g;s!!%milteruser!g;'"$3" "$1" >"$RPM_BUILD_ROOT$2"
+	sed -e "s!!$3!g;s!!$4!g;""$5" "$1" >"$RPM_BUILD_ROOT$2"
 }
 
+subst etc/clamd.conf %_sysconfdir/clamd.d/exim.conf exim %clameximuser \
+	's!^##*\(\(LogFile\|LocalSocket\|PidFile\|User\)\s\|\(StreamSaveToDisk\|ScanMail\|LogTime\|ScanArchive\)$\)!\1!;s!^Example!#Example!;'
 
-subst etc/clamd.conf /etc/clamd.d/milter.conf \
+
+subst %{SOURCE7} %_initrddir/clamd.exim exim %clameximuser ''
+chmod 0755 $RPM_BUILD_ROOT%_initrddir/clamd.exim
+subst %{SOURCE3} %_sysconfdir/logrotate.d/clamd.exim exim %clameximuser ''
+
+cat <$RPM_BUILD_ROOT%_sysconfdir/sysconfig/clamd.exim
+CLAMD_CONFIG='%_sysconfdir/clamd.d/exim.conf'
+CLAMD_SOCKET=%clameximstatedir/clamd.sock
+EOF
+
+mkdir -p $RPM_BUILD_ROOT/%clameximstatedir
+ln -sf clamd $RPM_BUILD_ROOT%_sbindir/clamd.exim
+
+touch $RPM_BUILD_ROOT%clameximstatedir/clamd.sock $RPM_BUILD_ROOT%clameximlog
+
+%if 0%{!?_without_milter:1}
+#### The milter stuff
+
+subst etc/clamd.conf /etc/clamd.d/milter.conf milter %milteruser \
 	's!^##*\(\(LogFile\|LocalSocket\|PidFile\|User\)\s\|\(StreamSaveToDisk\|ScanMail\)$\)!\1!;'
 
 
@@ -337,6 +391,26 @@
 test "$1" != 0 || /usr/sbin/fedora-groupdel %{milteruser} &>/dev/null || :
 test "$1"  = 0 || %{_initrddir}/clamav-milter condrestart >/dev/null || :
 
+%pre exim
+/usr/sbin/fedora-useradd  5 -r -s /sbin/nologin -d %clameximstatedir -M \
+                            -c 'Clamav Exim User' -g exim %clameximuser &>/dev/null || :
+
+%post exim
+/sbin/chkconfig --add clamd.exim
+test -e %clameximlog || {
+	touch %clameximlog
+	chmod 0620             %clameximlog
+	chown root:exim %clameximlog
+}
+
+%preun exim
+test "$1" != 0 || %{_initrddir}/clamd.exim stop &>/dev/null || :
+test "$1" != 0 || /sbin/chkconfig --del clamd.exim
+
+%postun exim
+test "$1" != 0 || /usr/sbin/fedora-userdel  %{clameximuser} &>/dev/null || :
+test "$1"  = 0 || %{_initrddir}/clamd.exim condrestart >/dev/null || :
+
 
 %post   lib -p /sbin/ldconfig
 %postun lib -p /sbin/ldconfig
@@ -414,6 +488,19 @@
 
 ## -----------------------
 
+%files exim
+%defattr(-,root,root,-)
+%_sbindir/clamd.exim
+%config %{_initrddir}/clamd.exim
+%config(noreplace) %verify(not mtime) %{_sysconfdir}/clamd.d/exim.conf
+%config(noreplace) %verify(not mtime) %{_sysconfdir}/sysconfig/clamd.exim
+%config(noreplace) %verify(not mtime) %{_sysconfdir}/logrotate.d/clamd.exim
+%attr(0750,%clameximuser,exim) %dir %clameximstatedir
+%ghost %clameximstatedir/*
+%ghost %attr(0620,root,exim) %verify(not size md5 mtime) %clameximlog
+
+## -----------------------
+
 %files milter
 %defattr(-,root,root,-)
 %doc clamav-milter/INSTALL
@@ -428,6 +515,9 @@
 %endif	# _without_milter
 
 %changelog
+* 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



From fedora-extras-commits at redhat.com  Sat Sep 10 11:20:53 2005
From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2))
Date: Sat, 10 Sep 2005 07:20:53 -0400
Subject: common tobuild,1.2213,1.2214
Message-ID: <200509101120.j8ABKrsB007715@cvs-int.fedora.redhat.com>

Author: dwmw2

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7696

Modified Files:
	tobuild 
Log Message:
request build of rpms/clamav/FC-4 clamav-0_86_2-5_fc4 for fc4


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.2213
retrieving revision 1.2214
diff -u -r1.2213 -r1.2214
--- tobuild	29 Aug 2005 10:10:28 -0000	1.2213
+++ tobuild	10 Sep 2005 11:20:51 -0000	1.2214
@@ -37,3 +37,4 @@
 joost	rpms/fpc/FC-3	fpc-2_0_0-1	fc3
 gemi	rpms/clisp/FC-3	clisp-2_34-5_fc3	fc3
 katzj	rpms/perl-Class-Trigger/devel	perl-Class-Trigger-0_09-3_fc5	devel
+dwmw2	rpms/clamav/FC-4	clamav-0_86_2-5_fc4	fc4



From fedora-extras-commits at redhat.com  Sat Sep 10 13:20:43 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sat, 10 Sep 2005 09:20:43 -0400
Subject: owners owners.list,1.187,1.188
Message-ID: <200509101320.j8ADKhtX010782@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10762

Modified Files:
	owners.list 
Log Message:
+keychain, fix sorting


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.187
retrieving revision 1.188
diff -u -r1.187 -r1.188
--- owners.list	10 Sep 2005 10:36:06 -0000	1.187
+++ owners.list	10 Sep 2005 13:20:40 -0000	1.188
@@ -351,6 +351,7 @@
 Fedora Extras|kannel|WAP and SMS gateway|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|kasumi|Anthy dictionary management tool|tagoh at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|kernel-module-thinkpad|IBM ThinkPad support kernel modules|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
+Fedora Extras|keychain|Agent manager for OpenSSH, ssh.com, Sun SSH, and GnuPG|ad+rh-bugzilla at uni-x.org|extras-qa at fedoraproject.org|
 Fedora Extras|kickpim|KDE kicker applet to access addressbook|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|kid3|Efficient ID3 tagger|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|kile|LaTeX source editor and TeX shell|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
@@ -743,6 +744,7 @@
 Fedora Extras|perl-Unix-Syslog|Perl interface to the UNIX syslog(3) calls|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Want|Perl module implementing a generalisation of wantarray|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-WWW-Mechanize|Automates web page form & link interaction|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-X11-Protocol|Perl interface to X11|duncan_j_ferguson at yahoo.co.uk|extras-qa at fedoraproject.org|
 Fedora Extras|perl-XML-LibXSLT|Perl module for interfacing to GNOME's libxslt|shishz at hotpop.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-XML-RSS|Perl module for managing RDF Site Summary (RSS) files|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-XML-Simple|Easy API to maintain XML in Perl|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
@@ -1049,4 +1051,3 @@
 Fedora Extras|zoo|File archiving utility with compression|Nicolas.Mailhot at laPoste.net|extras-qa at fedoraproject.org|
 Fedora Extras|zope|Application server in Python|gauret at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|zziplib|Lightweight library to easily extract data from zip files|matthias at rpmforge.net|extras-qa at fedoraproject.org|
-Fedora Extras|perl-X11-Protocol|Perl interface to X11|duncan_j_ferguson at yahoo.co.uk|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sat Sep 10 15:57:02 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sat, 10 Sep 2005 11:57:02 -0400
Subject: rpms/keychain/FC-3 keychain.spec,1.2,1.3
Message-ID: <200509101557.j8AFv2wX013987@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/keychain/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13940/FC-3

Modified Files:
	keychain.spec 
Log Message:
Add disttag.


Index: keychain.spec
===================================================================
RCS file: /cvs/extras/rpms/keychain/FC-3/keychain.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- keychain.spec	16 Aug 2005 20:55:11 -0000	1.2
+++ keychain.spec	10 Sep 2005 15:57:00 -0000	1.3
@@ -1,7 +1,7 @@
 Name:		keychain
 Summary:	Agent manager for OpenSSH, ssh.com, Sun SSH, and GnuPG
 Version:	2.5.5
-Release:	2
+Release:	2%{?dist}
 License:	GPL
 Group:		Applications/Internet
 URL:		http://www.gentoo.org/proj/en/keychain/



From fedora-extras-commits at redhat.com  Sat Sep 10 15:57:02 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sat, 10 Sep 2005 11:57:02 -0400
Subject: rpms/keychain/FC-4 keychain.spec,1.2,1.3
Message-ID: <200509101557.j8AFv20I013993@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/keychain/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13940/FC-4

Modified Files:
	keychain.spec 
Log Message:
Add disttag.


Index: keychain.spec
===================================================================
RCS file: /cvs/extras/rpms/keychain/FC-4/keychain.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- keychain.spec	16 Aug 2005 20:55:11 -0000	1.2
+++ keychain.spec	10 Sep 2005 15:57:00 -0000	1.3
@@ -1,7 +1,7 @@
 Name:		keychain
 Summary:	Agent manager for OpenSSH, ssh.com, Sun SSH, and GnuPG
 Version:	2.5.5
-Release:	2
+Release:	2%{?dist}
 License:	GPL
 Group:		Applications/Internet
 URL:		http://www.gentoo.org/proj/en/keychain/



From fedora-extras-commits at redhat.com  Sat Sep 10 15:57:03 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sat, 10 Sep 2005 11:57:03 -0400
Subject: rpms/keychain/devel keychain.spec,1.2,1.3
Message-ID: <200509101557.j8AFv3ch013999@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/keychain/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13940/devel

Modified Files:
	keychain.spec 
Log Message:
Add disttag.


Index: keychain.spec
===================================================================
RCS file: /cvs/extras/rpms/keychain/devel/keychain.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- keychain.spec	16 Aug 2005 20:55:11 -0000	1.2
+++ keychain.spec	10 Sep 2005 15:57:01 -0000	1.3
@@ -1,7 +1,7 @@
 Name:		keychain
 Summary:	Agent manager for OpenSSH, ssh.com, Sun SSH, and GnuPG
 Version:	2.5.5
-Release:	2
+Release:	2%{?dist}
 License:	GPL
 Group:		Applications/Internet
 URL:		http://www.gentoo.org/proj/en/keychain/



From fedora-extras-commits at redhat.com  Sat Sep 10 19:26:31 2005
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Sat, 10 Sep 2005 15:26:31 -0400
Subject: rpms/lablgtk/FC-4 lablgtk.spec,1.9,1.10
Message-ID: <200509101926.j8AJQVaT019577@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/lablgtk/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19558

Modified Files:
	lablgtk.spec 
Log Message:
include META file


Index: lablgtk.spec
===================================================================
RCS file: /cvs/extras/rpms/lablgtk/FC-4/lablgtk.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- lablgtk.spec	26 May 2005 18:38:34 -0000	1.9
+++ lablgtk.spec	10 Sep 2005 19:26:29 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           lablgtk
 Version:        2.4.0
-Release: 5
+Release:	6%{?dist}
 
 Summary:        Objective Caml interface to gtk+
 
@@ -8,7 +8,7 @@
 License:        LGPL
 URL:            http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/lablgtk.html
 Source:         http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/dist/lablgtk-2.4.0.tar.gz
-Patch0: lablgtk-gcc4.patch
+Patch0:		lablgtk-gcc4.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:       ocaml >= 3.08
 %{?_with_gl:Requires: lablgl >= 1.00}
@@ -33,6 +33,8 @@
 %prep
 %setup -q
 %patch0 -p1 -b .gcc4
+# version information in META file is wrong
+perl -pi -e 's|version="1.3.1"|version="2.4.0"|' META
 
 %build
 %configure %{?_with_gl: --with-gl} %{!?_with_gl: --without-gl} --enable-debug
@@ -41,9 +43,16 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT%{_bindir} $RPM_BUILD_ROOT%{_libdir} $RPM_BUILD_ROOT%{_libdir}/ocaml/lablgtk2 $RPM_BUILD_ROOT%{_libdir}/ocaml/stublibs
-make install BINDIR=$RPM_BUILD_ROOT%{_bindir} LIBDIR=$RPM_BUILD_ROOT%{_libdir} INSTALLDIR=$RPM_BUILD_ROOT%{_libdir}/ocaml/lablgtk2 DLLDIR=$RPM_BUILD_ROOT%{_libdir}/ocaml/stublibs
-
+mkdir -p $RPM_BUILD_ROOT%{_bindir} \
+      $RPM_BUILD_ROOT%{_libdir} \
+      $RPM_BUILD_ROOT%{_libdir}/ocaml/lablgtk2 \
+      $RPM_BUILD_ROOT%{_libdir}/ocaml/stublibs
+make install \
+     BINDIR=$RPM_BUILD_ROOT%{_bindir} \
+     LIBDIR=$RPM_BUILD_ROOT%{_libdir} \
+     INSTALLDIR=$RPM_BUILD_ROOT%{_libdir}/ocaml/lablgtk2 \
+     DLLDIR=$RPM_BUILD_ROOT%{_libdir}/ocaml/stublibs
+cp META $RPM_BUILD_ROOT%{_libdir}/ocaml/lablgtk2
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -61,6 +70,9 @@
 %doc examples
 
 %changelog
+* Sat Sep 10 2005 Gerard Milmeister  - 2.4.0-6
+- include META file
+
 * Sun May 22 2005 Toshio Kuratomi  - 2.4.0-5
 - Removed gnome-1.x BuildRequires
 - Removed BuildRequires not explicitly mentioned in the configure script



From fedora-extras-commits at redhat.com  Sat Sep 10 19:27:25 2005
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Sat, 10 Sep 2005 15:27:25 -0400
Subject: rpms/lablgtk/devel lablgtk.spec,1.9,1.10
Message-ID: <200509101927.j8AJRPUQ019636@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/lablgtk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19617

Modified Files:
	lablgtk.spec 
Log Message:
include META file


Index: lablgtk.spec
===================================================================
RCS file: /cvs/extras/rpms/lablgtk/devel/lablgtk.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- lablgtk.spec	26 May 2005 18:38:34 -0000	1.9
+++ lablgtk.spec	10 Sep 2005 19:27:23 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           lablgtk
 Version:        2.4.0
-Release: 5
+Release:	6%{?dist}
 
 Summary:        Objective Caml interface to gtk+
 
@@ -8,7 +8,7 @@
 License:        LGPL
 URL:            http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/lablgtk.html
 Source:         http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/dist/lablgtk-2.4.0.tar.gz
-Patch0: lablgtk-gcc4.patch
+Patch0:		lablgtk-gcc4.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:       ocaml >= 3.08
 %{?_with_gl:Requires: lablgl >= 1.00}
@@ -33,6 +33,8 @@
 %prep
 %setup -q
 %patch0 -p1 -b .gcc4
+# version information in META file is wrong
+perl -pi -e 's|version="1.3.1"|version="2.4.0"|' META
 
 %build
 %configure %{?_with_gl: --with-gl} %{!?_with_gl: --without-gl} --enable-debug
@@ -41,9 +43,16 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT%{_bindir} $RPM_BUILD_ROOT%{_libdir} $RPM_BUILD_ROOT%{_libdir}/ocaml/lablgtk2 $RPM_BUILD_ROOT%{_libdir}/ocaml/stublibs
-make install BINDIR=$RPM_BUILD_ROOT%{_bindir} LIBDIR=$RPM_BUILD_ROOT%{_libdir} INSTALLDIR=$RPM_BUILD_ROOT%{_libdir}/ocaml/lablgtk2 DLLDIR=$RPM_BUILD_ROOT%{_libdir}/ocaml/stublibs
-
+mkdir -p $RPM_BUILD_ROOT%{_bindir} \
+      $RPM_BUILD_ROOT%{_libdir} \
+      $RPM_BUILD_ROOT%{_libdir}/ocaml/lablgtk2 \
+      $RPM_BUILD_ROOT%{_libdir}/ocaml/stublibs
+make install \
+     BINDIR=$RPM_BUILD_ROOT%{_bindir} \
+     LIBDIR=$RPM_BUILD_ROOT%{_libdir} \
+     INSTALLDIR=$RPM_BUILD_ROOT%{_libdir}/ocaml/lablgtk2 \
+     DLLDIR=$RPM_BUILD_ROOT%{_libdir}/ocaml/stublibs
+cp META $RPM_BUILD_ROOT%{_libdir}/ocaml/lablgtk2
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -61,6 +70,9 @@
 %doc examples
 
 %changelog
+* Sat Sep 10 2005 Gerard Milmeister  - 2.4.0-6
+- include META file
+
 * Sun May 22 2005 Toshio Kuratomi  - 2.4.0-5
 - Removed gnome-1.x BuildRequires
 - Removed BuildRequires not explicitly mentioned in the configure script



From fedora-extras-commits at redhat.com  Sat Sep 10 19:28:06 2005
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Sat, 10 Sep 2005 15:28:06 -0400
Subject: rpms/lablgtk/FC-3 lablgtk.spec,1.5,1.6
Message-ID: <200509101928.j8AJS6md019695@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/lablgtk/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19676

Modified Files:
	lablgtk.spec 
Log Message:
include META file


Index: lablgtk.spec
===================================================================
RCS file: /cvs/extras/rpms/lablgtk/FC-3/lablgtk.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- lablgtk.spec	12 Feb 2005 11:03:42 -0000	1.5
+++ lablgtk.spec	10 Sep 2005 19:28:04 -0000	1.6
@@ -1,21 +1,24 @@
 Name:           lablgtk
 Version:        2.4.0
-Release:        2
-Epoch:          0
-Summary:        An Objective Caml interface to gtk+
+Release:	6%{?dist}
+
+Summary:        Objective Caml interface to gtk+
 
 Group:          System Environment/Libraries
 License:        LGPL
 URL:            http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/lablgtk.html
 Source:         http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/dist/lablgtk-2.4.0.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires:       ocaml >= 0:3.08
-%{?_with_gl:Requires: lablgl >= 0:1.00}
-BuildRequires:  ocaml >= 0:3.08, camlp4 >= 0:3.08
-%{?_with_gl:BuildRequires: lablgl >= 0:1.00, gtkglarea2-devel}
-BuildRequires:  gtk2-devel, libglade-devel, gdk-pixbuf-devel
-BuildRequires:	librsvg2-devel, libcroco-devel
-BuildRequires:  libbonobo-devel, bonobo-activation-devel, GConf2-devel
+Requires:       ocaml >= 3.08
+%{?_with_gl:Requires: lablgl >= 1.00}
+BuildRequires:  ocaml >= 3.08, camlp4 >= 3.08
+# lablgtk can generate quite extensive documentation.
+# Probably should enable this and create a subpackage for it.
+#BuildRequires:  ocaml-ocamldoc
+%{?_with_gl:BuildRequires: lablgl >= 1.00, gtkglarea2-devel}
+BuildRequires:  gtk2-devel
+BuildRequires:  libglade2-devel
+BuildRequires:  librsvg2-devel
 BuildRequires:  libgnomeui-devel, libgnomecanvas-devel, gnome-panel-devel
 
 %description
@@ -28,6 +31,8 @@
 
 %prep
 %setup -q
+# version information in META file is wrong
+perl -pi -e 's|version="1.3.1"|version="2.4.0"|' META
 
 %build
 %configure %{?_with_gl: --with-gl} %{!?_with_gl: --without-gl} --enable-debug
@@ -36,9 +41,16 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT%{_bindir} $RPM_BUILD_ROOT%{_libdir} $RPM_BUILD_ROOT%{_libdir}/ocaml/lablgtk2 $RPM_BUILD_ROOT%{_libdir}/ocaml/stublibs
-make install BINDIR=$RPM_BUILD_ROOT%{_bindir} LIBDIR=$RPM_BUILD_ROOT%{_libdir} INSTALLDIR=$RPM_BUILD_ROOT%{_libdir}/ocaml/lablgtk2 DLLDIR=$RPM_BUILD_ROOT%{_libdir}/ocaml/stublibs
-
+mkdir -p $RPM_BUILD_ROOT%{_bindir} \
+      $RPM_BUILD_ROOT%{_libdir} \
+      $RPM_BUILD_ROOT%{_libdir}/ocaml/lablgtk2 \
+      $RPM_BUILD_ROOT%{_libdir}/ocaml/stublibs
+make install \
+     BINDIR=$RPM_BUILD_ROOT%{_bindir} \
+     LIBDIR=$RPM_BUILD_ROOT%{_libdir} \
+     INSTALLDIR=$RPM_BUILD_ROOT%{_libdir}/ocaml/lablgtk2 \
+     DLLDIR=$RPM_BUILD_ROOT%{_libdir}/ocaml/stublibs
+cp META $RPM_BUILD_ROOT%{_libdir}/ocaml/lablgtk2
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -56,6 +68,9 @@
 %doc examples
 
 %changelog
+* Sat Sep 10 2005 Gerard Milmeister  - 2.4.0-6
+- include META file
+
 * Sat Feb 12 2005 Gerard Milmeister  - 0:2.4.0-2
 - Remove %{_smp_mflags} as it breaks the build
 



From fedora-extras-commits at redhat.com  Sun Sep 11 02:45:57 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Sat, 10 Sep 2005 22:45:57 -0400
Subject: owners owners.list,1.188,1.189
Message-ID: <200509110245.j8B2jvJD029598@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29581

Modified Files:
	owners.list 
Log Message:
Add cvsutils


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.188
retrieving revision 1.189
diff -u -r1.188 -r1.189
--- owners.list	10 Sep 2005 13:20:40 -0000	1.188
+++ owners.list	11 Sep 2005 02:45:54 -0000	1.189
@@ -107,6 +107,7 @@
 Fedora Extras|cvsplot|Cvsplot collects statistics from CVS controlled files|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|cvsps|Patchset tool for CVS|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|cvsup|CVS-Optimized General-Purpose Network File Distribution System client|adrian at lisas.de|extras-qa at fedoraproject.org|
+Fedora Extras|cvsutils|CVS Utilities|rc040203 at freenet.de|extras-qa at fedoraproject.org|
 Fedora Extras|cvsweb|Web interface for CVS repositories|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|cyrus-imapd|A high-performance mail server with IMAP, POP3, NNTP and SIEVE support|jdennis at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|d4x|Downloader for X that supports resuming and many other features|matthias at rpmforge.net|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sun Sep 11 03:29:35 2005
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Sat, 10 Sep 2005 23:29:35 -0400
Subject: extras-buildsys ChangeLog,1.119,1.120
Message-ID: <200509110329.j8B3Tanp030966@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30933

Modified Files:
	ChangeLog 
Log Message:
2005-09-10  Dan Williams  

    * server/BuilderManager.py
        - Fix python < 2.4 issues with sequence sort() call




Index: ChangeLog
===================================================================
RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -r1.119 -r1.120
--- ChangeLog	9 Sep 2005 15:49:58 -0000	1.119
+++ ChangeLog	11 Sep 2005 03:29:33 -0000	1.120
@@ -1,3 +1,8 @@
+2005-09-10  Dan Williams  
+
+    * server/BuilderManager.py
+        - Fix python < 2.4 issues with sequence sort() call
+
 2005-09-09  Dan Williams  
 
     * server/UserInterface.py



From fedora-extras-commits at redhat.com  Sun Sep 11 03:29:36 2005
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Sat, 10 Sep 2005 23:29:36 -0400
Subject: extras-buildsys/server BuilderManager.py,1.16,1.17
Message-ID: <200509110329.j8B3Taso030972@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys/server
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30933/server

Modified Files:
	BuilderManager.py 
Log Message:
2005-09-10  Dan Williams  

    * server/BuilderManager.py
        - Fix python < 2.4 issues with sequence sort() call




Index: BuilderManager.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/BuilderManager.py,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- BuilderManager.py	9 Sep 2005 15:10:17 -0000	1.16
+++ BuilderManager.py	11 Sep 2005 03:29:34 -0000	1.17
@@ -127,6 +127,15 @@
     def _builder_sort_func(self, builder):
         return builder.free_slots()
 
+    def _builder_cmp_func(self, builder1, builder2):
+        if builder1.free_slots() > builder2.free_slots():
+            return 1
+        elif builder1.free_slots() == builder2.free_slots():
+            return 0
+        elif builder1.free_slots() < builder2.free_slots():
+            return -1
+        return 1
+
     def process(self, paused):
         self._have_work = False
 
@@ -152,7 +161,12 @@
                     print "Appending builder %s" % builder.address()
 
             # Use the builder with the most free build slots
-            builder_list.sort(key=self._builder_sort_func, reverse=True)
+            if sys.version_info[:3] >= (2, 4, 0):
+                builder_list.sort(key=self._builder_sort_func, reverse=True)
+            else:
+                builder_list.sort(self._builder_cmp_func)
+                builder_list.reverse()
+
             for builder in builder_list:
                 try:
                     job = builder.start_job(parent, req['target_dict'], req['srpm_url'])



From fedora-extras-commits at redhat.com  Sun Sep 11 03:34:01 2005
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Sat, 10 Sep 2005 23:34:01 -0400
Subject: extras-buildsys ChangeLog,1.120,1.121
Message-ID: <200509110334.j8B3YVnY031020@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30984

Modified Files:
	ChangeLog 
Log Message:
2005-09-10  Dan Williams  

    * utils/distro-rebuild.py
        - Don't delete the rebuilt SRPM until after everything
            has been queued




Index: ChangeLog
===================================================================
RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -r1.120 -r1.121
--- ChangeLog	11 Sep 2005 03:29:33 -0000	1.120
+++ ChangeLog	11 Sep 2005 03:33:58 -0000	1.121
@@ -1,5 +1,11 @@
 2005-09-10  Dan Williams  
 
+    * utils/distro-rebuild.py
+        - Don't delete the rebuilt SRPM until after everything
+            has been queued
+
+2005-09-10  Dan Williams  
+
     * server/BuilderManager.py
         - Fix python < 2.4 issues with sequence sort() call
 



From fedora-extras-commits at redhat.com  Sun Sep 11 03:34:01 2005
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Sat, 10 Sep 2005 23:34:01 -0400
Subject: extras-buildsys/utils distro-rebuild.py,1.2,1.3
Message-ID: <200509110334.j8B3YVh0031023@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys/utils
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30984/utils

Modified Files:
	distro-rebuild.py 
Log Message:
2005-09-10  Dan Williams  

    * utils/distro-rebuild.py
        - Don't delete the rebuilt SRPM until after everything
            has been queued




Index: distro-rebuild.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/distro-rebuild.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- distro-rebuild.py	8 Sep 2005 21:09:05 -0000	1.2
+++ distro-rebuild.py	11 Sep 2005 03:33:59 -0000	1.3
@@ -18,6 +18,7 @@
 
 
 import os, sys
+import time
 import rpmUtils
 import commands
 import shutil
@@ -156,6 +157,8 @@
     # Build up a list of all SRPMs in the specified directory
     files = find_newest_srpms(search_dir)
 
+    temp_dirs = []
+    
     # Rebuild and enqueue the packages
     for name in files.keys():
         f = files[name]
@@ -173,8 +176,14 @@
             print "EE: %s (%s)" % (rebuilt_srpm, e)
             continue
 
-        shutil.rmtree(temp_dir_path, ignore_errors=True)
+        temp_dirs.append(temp_dir_path)
         print "OK: %s" % rebuilt_srpm
 
+    print "Sleeping before cleanup..."
+    time.sleep(30)
+    for path in temp_dirs:
+        shutil.rmtree(path, ignore_errors=True)
+
+    print "All done."
     sys.exit(0)
 



From fedora-extras-commits at redhat.com  Sun Sep 11 04:00:14 2005
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Sun, 11 Sep 2005 00:00:14 -0400
Subject: extras-buildsys/utils distro-rebuild.py,1.3,1.4
Message-ID: <200509110400.j8B40EpE031064@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys/utils
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31045

Modified Files:
	distro-rebuild.py 
Log Message:
RebuildError -> RebuildException


Index: distro-rebuild.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/distro-rebuild.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- distro-rebuild.py	11 Sep 2005 03:33:59 -0000	1.3
+++ distro-rebuild.py	11 Sep 2005 04:00:12 -0000	1.4
@@ -79,7 +79,7 @@
     cmd = "/bin/rpm -ihv --root %s %s" % (temp_dir, f)
     (s, o) = commands.getstatusoutput(cmd)
     if s != 0:
-        raise RebuildError("Could not install srpm %s: %s" % (f, o))
+        raise RebuildException("Could not install srpm %s: %s" % (f, o))
 
     # find the specfile
     spec_dir = os.path.join(src_root, "SPECS")
@@ -90,7 +90,7 @@
             specfile = os.path.join(spec_dir, spec)
             break
     if not specfile:
-        raise RebuildError("Could not locate specfile in %s." % spec_dir)
+        raise RebuildException("Could not locate specfile in %s." % spec_dir)
 
     src = open(specfile)
     specfile_new = specfile+".new"
@@ -105,7 +105,7 @@
     src.close()
 
     if not found:
-        raise RebuildError("Couldn't find Release line in specfile %s." % specfile)
+        raise RebuildException("Couldn't find Release line in specfile %s." % specfile)
 
     os.rename(specfile_new, specfile)
 



From fedora-extras-commits at redhat.com  Sun Sep 11 10:10:04 2005
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Sun, 11 Sep 2005 06:10:04 -0400
Subject: rpms/ocaml/FC-4 .cvsignore, 1.4, 1.5 ocaml.spec, 1.16, 1.17 sources,
	1.4, 1.5
Message-ID: <200509111010.j8BAA4S5012167@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/ocaml/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12144

Modified Files:
	.cvsignore ocaml.spec sources 
Log Message:
new version 3.08.4


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ocaml/FC-4/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	26 Mar 2005 18:22:49 -0000	1.4
+++ .cvsignore	11 Sep 2005 10:10:01 -0000	1.5
@@ -1,4 +1,4 @@
-ocaml-3.08.3.tar.bz2
+ocaml-3.08.4.tar.bz2
 ocaml-3.08-refman.html.tar.gz
 ocaml-3.08-refman.info.tar.gz
 ocaml-3.08-refman.ps.gz


Index: ocaml.spec
===================================================================
RCS file: /cvs/extras/rpms/ocaml/FC-4/ocaml.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- ocaml.spec	25 May 2005 14:00:12 -0000	1.16
+++ ocaml.spec	11 Sep 2005 10:10:01 -0000	1.17
@@ -1,19 +1,18 @@
 Name:		ocaml
-Version:	3.08.3
-Release: 5
+Version:	3.08.4
+Release: 	1%{?dist}
 
 Summary:	Objective Caml compiler and programming environment
 
 Group:		Development/Languages
 License:	QPL/LGPL
 URL:		http://www.ocaml.org
-Source0:	http://caml.inria.fr/distrib/ocaml-3.08/ocaml-3.08.3.tar.bz2
+Source0:	http://caml.inria.fr/distrib/ocaml-3.08/ocaml-3.08.4.tar.bz2
 Source1:	http://caml.inria.fr/distrib/ocaml-3.08/ocaml-3.08-refman.html.tar.gz
 Source2:	http://caml.inria.fr/distrib/ocaml-3.08/ocaml-3.08-refman.ps.gz
 Source3:	http://caml.inria.fr/distrib/ocaml-3.08/ocaml-3.08-refman.info.tar.gz
 Patch0:		ocaml-rpath.patch
 Patch1:		ocaml-user-cflags.patch
-Patch2:		ocaml-num-gcc4.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	ncurses-devel, gdbm-devel, xorg-x11-devel
 BuildRequires:	tcl-devel, tk-devel
@@ -79,7 +78,6 @@
 %setup -q -T -D -a 3
 %patch0 -p1
 %patch1 -p1 -b .cflags
-%patch2 -p1 -b .x86_32
 
 cp %{SOURCE2} refman.ps.gz
 
@@ -181,6 +179,9 @@
 %doc emacs/README
 
 %changelog
+* Sun Sep 11 2005 Gerard Milmeister  - 3.08.4-1
+- New Version 3.08.4
+
 * Wed May 25 2005 Toshio Kuratomi  - 3.08.3-5
 - Bump and re-release as last build failed due to rawhide syncing.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ocaml/FC-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	26 Mar 2005 18:22:49 -0000	1.4
+++ sources	11 Sep 2005 10:10:01 -0000	1.5
@@ -1,4 +1,4 @@
-8277bb1537051fe5151dc31c350d64cd  ocaml-3.08.3.tar.bz2
+96b8edeb6190d9f15c086c7decd277a9  ocaml-3.08.4.tar.bz2
 0daee5643db6960682c1a7d84467885f  ocaml-3.08-refman.html.tar.gz
 49b68ec07ccd7ce45eb6bd3f3fdee140  ocaml-3.08-refman.info.tar.gz
 35a5d4318456c0982e72ee3f33364bf5  ocaml-3.08-refman.ps.gz



From fedora-extras-commits at redhat.com  Sun Sep 11 10:11:24 2005
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Sun, 11 Sep 2005 06:11:24 -0400
Subject: rpms/ocaml/devel ocaml.spec,1.16,1.17 sources,1.4,1.5
Message-ID: <200509111011.j8BABOoQ012234@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/ocaml/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12213

Modified Files:
	ocaml.spec sources 
Log Message:
new version 3.08.4


Index: ocaml.spec
===================================================================
RCS file: /cvs/extras/rpms/ocaml/devel/ocaml.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- ocaml.spec	25 May 2005 14:00:12 -0000	1.16
+++ ocaml.spec	11 Sep 2005 10:11:22 -0000	1.17
@@ -1,19 +1,18 @@
 Name:		ocaml
-Version:	3.08.3
-Release: 5
+Version:	3.08.4
+Release: 	1%{?dist}
 
 Summary:	Objective Caml compiler and programming environment
 
 Group:		Development/Languages
 License:	QPL/LGPL
 URL:		http://www.ocaml.org
-Source0:	http://caml.inria.fr/distrib/ocaml-3.08/ocaml-3.08.3.tar.bz2
+Source0:	http://caml.inria.fr/distrib/ocaml-3.08/ocaml-3.08.4.tar.bz2
 Source1:	http://caml.inria.fr/distrib/ocaml-3.08/ocaml-3.08-refman.html.tar.gz
 Source2:	http://caml.inria.fr/distrib/ocaml-3.08/ocaml-3.08-refman.ps.gz
 Source3:	http://caml.inria.fr/distrib/ocaml-3.08/ocaml-3.08-refman.info.tar.gz
 Patch0:		ocaml-rpath.patch
 Patch1:		ocaml-user-cflags.patch
-Patch2:		ocaml-num-gcc4.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	ncurses-devel, gdbm-devel, xorg-x11-devel
 BuildRequires:	tcl-devel, tk-devel
@@ -79,7 +78,6 @@
 %setup -q -T -D -a 3
 %patch0 -p1
 %patch1 -p1 -b .cflags
-%patch2 -p1 -b .x86_32
 
 cp %{SOURCE2} refman.ps.gz
 
@@ -181,6 +179,9 @@
 %doc emacs/README
 
 %changelog
+* Sun Sep 11 2005 Gerard Milmeister  - 3.08.4-1
+- New Version 3.08.4
+
 * Wed May 25 2005 Toshio Kuratomi  - 3.08.3-5
 - Bump and re-release as last build failed due to rawhide syncing.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ocaml/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	26 Mar 2005 18:22:49 -0000	1.4
+++ sources	11 Sep 2005 10:11:22 -0000	1.5
@@ -1,4 +1,4 @@
-8277bb1537051fe5151dc31c350d64cd  ocaml-3.08.3.tar.bz2
+96b8edeb6190d9f15c086c7decd277a9  ocaml-3.08.4.tar.bz2
 0daee5643db6960682c1a7d84467885f  ocaml-3.08-refman.html.tar.gz
 49b68ec07ccd7ce45eb6bd3f3fdee140  ocaml-3.08-refman.info.tar.gz
 35a5d4318456c0982e72ee3f33364bf5  ocaml-3.08-refman.ps.gz



From fedora-extras-commits at redhat.com  Sun Sep 11 10:13:16 2005
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Sun, 11 Sep 2005 06:13:16 -0400
Subject: rpms/ocaml/FC-3 ocaml.spec,1.10,1.11 sources,1.4,1.5
Message-ID: <200509111013.j8BADG6i012299@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/ocaml/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12278

Modified Files:
	ocaml.spec sources 
Log Message:
new version 3.08.4


Index: ocaml.spec
===================================================================
RCS file: /cvs/extras/rpms/ocaml/FC-3/ocaml.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ocaml.spec	26 Mar 2005 19:28:02 -0000	1.10
+++ ocaml.spec	11 Sep 2005 10:13:14 -0000	1.11
@@ -1,16 +1,18 @@
 Name:		ocaml
-Version:	3.08.3
-Release:	1
+Version:	3.08.4
+Release: 	1%{?dist}
+
 Summary:	Objective Caml compiler and programming environment
 
 Group:		Development/Languages
 License:	QPL/LGPL
 URL:		http://www.ocaml.org
-Source0:	http://caml.inria.fr/distrib/ocaml-3.08/ocaml-3.08.3.tar.bz2
+Source0:	http://caml.inria.fr/distrib/ocaml-3.08/ocaml-3.08.4.tar.bz2
 Source1:	http://caml.inria.fr/distrib/ocaml-3.08/ocaml-3.08-refman.html.tar.gz
 Source2:	http://caml.inria.fr/distrib/ocaml-3.08/ocaml-3.08-refman.ps.gz
 Source3:	http://caml.inria.fr/distrib/ocaml-3.08/ocaml-3.08-refman.info.tar.gz
-Patch:		ocaml-rpath.patch
+Patch0:		ocaml-rpath.patch
+Patch1:		ocaml-user-cflags.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	ncurses-devel, gdbm-devel, xorg-x11-devel
 BuildRequires:	tcl-devel, tk-devel
@@ -74,12 +76,13 @@
 %setup -q -T -b 0
 %setup -q -T -D -a 1
 %setup -q -T -D -a 3
-%patch -p1
+%patch0 -p1
+%patch1 -p1 -b .cflags
+
 cp %{SOURCE2} refman.ps.gz
 
 %build
-./configure \
-    -ccoption "gcc $RPM_OPT_FLAGS" \
+CFLAGS="$RPM_OPT_FLAGS" ./configure \
     -bindir %{_bindir} \
     -libdir %{_libdir}/ocaml \
     -x11lib %{_prefix}/X11R6/%{_lib} \
@@ -176,6 +179,9 @@
 %doc emacs/README
 
 %changelog
+* Sun Sep 11 2005 Gerard Milmeister  - 3.08.4-1
+- New Version 3.08.4
+
 * Sat Mar 26 2005 Gerard Milmeister  - 3.08.3-1
 - New Version 3.08.3
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ocaml/FC-3/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	26 Mar 2005 19:28:02 -0000	1.4
+++ sources	11 Sep 2005 10:13:14 -0000	1.5
@@ -1,4 +1,4 @@
-8277bb1537051fe5151dc31c350d64cd  ocaml-3.08.3.tar.bz2
+96b8edeb6190d9f15c086c7decd277a9  ocaml-3.08.4.tar.bz2
 0daee5643db6960682c1a7d84467885f  ocaml-3.08-refman.html.tar.gz
 49b68ec07ccd7ce45eb6bd3f3fdee140  ocaml-3.08-refman.info.tar.gz
 35a5d4318456c0982e72ee3f33364bf5  ocaml-3.08-refman.ps.gz



From fedora-extras-commits at redhat.com  Sun Sep 11 10:18:28 2005
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Sun, 11 Sep 2005 06:18:28 -0400
Subject: rpms/ocaml/FC-3 ocaml-user-cflags.patch, NONE, 1.1 ocaml.spec, 1.11,
	1.12
Message-ID: <200509111018.j8BAISfF012410@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/ocaml/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12388

Modified Files:
	ocaml.spec 
Added Files:
	ocaml-user-cflags.patch 
Log Message:


ocaml-user-cflags.patch:

--- NEW FILE ocaml-user-cflags.patch ---
--- ocaml-3.08.3/configure.opt	2005-05-08 19:00:34.000000000 -0400
+++ ocaml-3.08.3/configure	2005-05-08 19:54:50.000000000 -0400
@@ -1455,6 +1455,10 @@
     nativecccompopts="$nativecccompopts -fomit-frame-pointer";;
 esac
 
+# Allow user defined C Compiler flags
+bytecccompopts="$bytecccompopts $CFLAGS"
+nativecccompopts="$nativecccompopts $CFLAGS"
+
 # Finish generated files
 
 cclibs="$cclibs $mathlib"


Index: ocaml.spec
===================================================================
RCS file: /cvs/extras/rpms/ocaml/FC-3/ocaml.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ocaml.spec	11 Sep 2005 10:13:14 -0000	1.11
+++ ocaml.spec	11 Sep 2005 10:18:26 -0000	1.12
@@ -1,6 +1,6 @@
 Name:		ocaml
 Version:	3.08.4
-Release: 	1%{?dist}
+Release: 	2%{?dist}
 
 Summary:	Objective Caml compiler and programming environment
 



From fedora-extras-commits at redhat.com  Sun Sep 11 11:34:20 2005
From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters))
Date: Sun, 11 Sep 2005 07:34:20 -0400
Subject: rpms/pan import.log,1.3,1.4
Message-ID: <200509111134.j8BBYKTK013927@cvs-int.fedora.redhat.com>

Author: mpeters

Update of /cvs/extras/rpms/pan
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13893

Modified Files:
	import.log 
Log Message:
auto-import pan-0.14.2.91-3.1 on branch FC-4 from pan-0.14.2.91-3.1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/pan/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	21 Jun 2005 19:44:17 -0000	1.3
+++ import.log	11 Sep 2005 11:34:18 -0000	1.4
@@ -1,2 +1,3 @@
 pan-0_14_2-8:HEAD:pan-0.14.2-8.src.rpm:1119378939
 pan-0_14_2_91-2:HEAD:pan-0.14.2.91-2.src.rpm:1119383013
+pan-0_14_2_91-3_1:FC-4:pan-0.14.2.91-3.1.src.rpm:1126438396



From fedora-extras-commits at redhat.com  Sun Sep 11 11:34:21 2005
From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters))
Date: Sun, 11 Sep 2005 07:34:21 -0400
Subject: rpms/pan/FC-4 pan-0.14.2.91-linewrap.patch, NONE, 1.1 pan.spec, 1.3,
	1.4
Message-ID: <200509111134.j8BBYLxi013935@cvs-int.fedora.redhat.com>

Author: mpeters

Update of /cvs/extras/rpms/pan/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13893/FC-4

Modified Files:
	pan.spec 
Added Files:
	pan-0.14.2.91-linewrap.patch 
Log Message:
auto-import pan-0.14.2.91-3.1 on branch FC-4 from pan-0.14.2.91-3.1.src.rpm

pan-0.14.2.91-linewrap.patch:

--- NEW FILE pan-0.14.2.91-linewrap.patch ---
--- patch-text-massager.c::wrap begins here ---
--- pan/base/text-massager.c.orig	Mon Jan 26 00:51:26 2004
+++ pan/base/text-massager.c	Mon Jan 26 00:55:48 2004
@@ -250,23 +250,29 @@
 	char * pch;
 	char * line_start;
 	char * end;
+	int    pos;
 
 	/* walk through the entire string */
 	linefeed_here = NULL;
-	for (line_start=pch=str->str, end=line_start+str->len; pch!=end; )
+	for (pos = 0, line_start=pch=str->str, end=line_start+str->len; pch=column && linefeed_here!=NULL)
+		if (pos>=column && linefeed_here!=NULL)
 		{
 			*linefeed_here = '\n';
 			pch = line_start = linefeed_here + 1;
 			linefeed_here = NULL;
+			pos = 0;
+		}
+		else 
+		{
+			pch = g_utf8_next_char (pch);
+			++ pos;
 		}
-		else ++pch;
 	}
 }
 
--- patch-text-massager.c::wrap ends here ---


Index: pan.spec
===================================================================
RCS file: /cvs/extras/rpms/pan/FC-4/pan.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- pan.spec	22 Jun 2005 05:18:14 -0000	1.3
+++ pan.spec	11 Sep 2005 11:34:19 -0000	1.4
@@ -1,7 +1,7 @@
 Summary: A GNOME/GTK+ news reader for X
 Name: pan
 Version: 0.14.2.91
-Release: 2.1%{?dist}
+Release: 3.1%{?dist}
 Epoch: 1
 License: GPL
 Group: Applications/Internet
@@ -15,6 +15,7 @@
 #Patch9: pan-0.14.2-gmime-crash-120007.patch
 #Patch10: pan-desktop-rh-119909.patch
 Patch11: pan-0.14.2.91-gcc4-2.patch
+Patch12: pan-0.14.2.91-linewrap.patch
 URL: http://pan.rebelbase.com/
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libxml2-devel >= 2.4.22
@@ -46,6 +47,8 @@
 # add rh defs to upstream desktop file
 #%patch10 -p1 -b .rh
 %patch11 -p1 -b .gcc4
+%patch12 -p0 -b .linewrap
+
 echo "StartupNotify=true" >> pan.desktop.in
 
 
@@ -80,6 +83,9 @@
 %{_datadir}/applications/fedora-pan.desktop
 
 %changelog
+* Sun Sep 11 2005 Michael A. Peters  - 1:0.14.2.91-3.1
+- added patch12 to fix bug 165626
+
 * Tue Jun 21 2005 Michael A. Peters  - 1:0.14.2.91-2.1
 - added gettext BuildRequires
 



From fedora-extras-commits at redhat.com  Sun Sep 11 11:38:18 2005
From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters))
Date: Sun, 11 Sep 2005 07:38:18 -0400
Subject: rpms/pan/devel pan.spec,1.3,1.4
Message-ID: <200509111138.j8BBcIeQ013995@cvs-int.fedora.redhat.com>

Author: mpeters

Update of /cvs/extras/rpms/pan/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13975/devel

Modified Files:
	pan.spec 
Log Message:
sync with FC-4 fix



Index: pan.spec
===================================================================
RCS file: /cvs/extras/rpms/pan/devel/pan.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- pan.spec	22 Jun 2005 05:18:14 -0000	1.3
+++ pan.spec	11 Sep 2005 11:38:16 -0000	1.4
@@ -1,7 +1,7 @@
 Summary: A GNOME/GTK+ news reader for X
 Name: pan
 Version: 0.14.2.91
-Release: 2.1%{?dist}
+Release: 3.1%{?dist}
 Epoch: 1
 License: GPL
 Group: Applications/Internet
@@ -15,6 +15,7 @@
 #Patch9: pan-0.14.2-gmime-crash-120007.patch
 #Patch10: pan-desktop-rh-119909.patch
 Patch11: pan-0.14.2.91-gcc4-2.patch
+Patch12: pan-0.14.2.91-linewrap.patch
 URL: http://pan.rebelbase.com/
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libxml2-devel >= 2.4.22
@@ -46,6 +47,8 @@
 # add rh defs to upstream desktop file
 #%patch10 -p1 -b .rh
 %patch11 -p1 -b .gcc4
+%patch12 -p0 -b .linewrap
+
 echo "StartupNotify=true" >> pan.desktop.in
 
 
@@ -80,6 +83,9 @@
 %{_datadir}/applications/fedora-pan.desktop
 
 %changelog
+* Sun Sep 11 2005 Michael A. Peters  - 1:0.14.2.91-3.1
+- added patch12 to fix bug 165626
+
 * Tue Jun 21 2005 Michael A. Peters  - 1:0.14.2.91-2.1
 - added gettext BuildRequires
 



From fedora-extras-commits at redhat.com  Sun Sep 11 14:19:26 2005
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sun, 11 Sep 2005 10:19:26 -0400
Subject: rpms .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 import.log, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200509111419.j8BEJQEO018661@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18640/rpms

Added Files:
	.cvsignore Makefile import.log sources 
Log Message:
Setup of module cppunit


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE import.log ---


--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Sun Sep 11 14:25:40 2005
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sun, 11 Sep 2005 10:25:40 -0400
Subject: rpms Makefile,1.1,NONE import.log,1.1,NONE sources,1.1,NONE
Message-ID: <200509111425.j8BEPevO018736@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18719

Removed Files:
	Makefile import.log sources 
Log Message:
Files imported in this directory by mistake



--- Makefile DELETED ---


--- import.log DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Sun Sep 11 14:28:11 2005
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sun, 11 Sep 2005 10:28:11 -0400
Subject: rpms/cppunit Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200509111428.j8BESBG3018812@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/cppunit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18777

Added Files:
	Makefile import.log 
Log Message:
Setup of module cppunit


--- NEW FILE Makefile ---
# Top level Makefile for module cppunit
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Sun Sep 11 14:28:12 2005
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sun, 11 Sep 2005 10:28:12 -0400
Subject: rpms/cppunit/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200509111428.j8BESCQ2018817@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/cppunit/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18777/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module cppunit


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Sun Sep 11 14:30:05 2005
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sun, 11 Sep 2005 10:30:05 -0400
Subject: rpms/cppunit import.log,1.1,1.2
Message-ID: <200509111430.j8BEUZeH018903@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/cppunit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18865

Modified Files:
	import.log 
Log Message:
auto-import cppunit-1.11.0-2 on branch devel from cppunit-1.11.0-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/cppunit/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	11 Sep 2005 14:28:09 -0000	1.1
+++ import.log	11 Sep 2005 14:30:03 -0000	1.2
@@ -0,0 +1 @@
+cppunit-1_11_0-2:HEAD:cppunit-1.11.0-2.src.rpm:1126448772



From fedora-extras-commits at redhat.com  Sun Sep 11 14:30:06 2005
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sun, 11 Sep 2005 10:30:06 -0400
Subject: rpms/cppunit/devel cppunit.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200509111430.j8BEUa4d018907@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/cppunit/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18865/devel

Modified Files:
	.cvsignore sources 
Added Files:
	cppunit.spec 
Log Message:
auto-import cppunit-1.11.0-2 on branch devel from cppunit-1.11.0-2.src.rpm


--- NEW FILE cppunit.spec ---
Name: cppunit
Version: 1.11.0
Release: 2

Summary: C++ unit testing framework
License: LGPL
Group: Development/Libraries
Url: http://cppunit.sourceforge.net/
Source: http://dl.sourceforge.net/sourceforge/cppunit/cppunit-%{version}.tar.gz

BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: doxygen, graphviz

%description
CppUnit is the C++ port of the famous JUnit framework for unit testing.
Test output is in XML for automatic testing and GUI based for supervised tests.

%package devel
Summary: Libraries and headers for cppunit development
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}

%description devel
This package contains the libraries and headers necessary for developing
programs that use cppunit.

%package doc
Summary: HTML formatted API documention for cppunit
Group: Documentation
Requires: %{name} = %{version}-%{release}

%description doc
The cppunit-doc package contains HTML formatted API documention generated by
the popular doxygen documentation generation tool.

%prep
%setup -q

%build
%configure --enable-doxygen
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la
# remove double of doc
rm -rf $RPM_BUILD_ROOT/%{_datadir}/cppunit

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%{_bindir}/DllPlugInTester
%{_mandir}/man1/*
%{_datadir}/aclocal/*
%{_libdir}/libcppunit*.so.*
%doc AUTHORS COPYING NEWS README THANKS ChangeLog TODO BUGS doc/FAQ

%files devel
%defattr(-,root,root,-)
%{_bindir}/cppunit-config
%{_includedir}/cppunit
%{_libdir}/libcppunit.a
%{_libdir}/libcppunit.so

%files doc
%defattr(-,root,root,-)
%doc doc/html/*

%changelog
* Mon Aug 15 2005 Tom "spot" Callaway  1.11.0-2
- various cleanups

* Mon Jul  4 2005 Patrice Dumas  1.11.0-1
- update using the fedora template 
 
* Sat Apr 14 2001 Bastiaan Bakker 
- Initial release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cppunit/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	11 Sep 2005 14:28:10 -0000	1.1
+++ .cvsignore	11 Sep 2005 14:30:04 -0000	1.2
@@ -0,0 +1 @@
+cppunit-1.11.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cppunit/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	11 Sep 2005 14:28:10 -0000	1.1
+++ sources	11 Sep 2005 14:30:04 -0000	1.2
@@ -0,0 +1 @@
+7b256f622158d3c932b3c5025ef5e2ed  cppunit-1.11.0.tar.gz



From fedora-extras-commits at redhat.com  Sun Sep 11 16:31:22 2005
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Sun, 11 Sep 2005 12:31:22 -0400
Subject: rpms/zope/FC-4 .cvsignore, 1.7, 1.8 sources, 1.7, 1.8 zope.init.in,
	1.2, 1.3 zope.spec, 1.13, 1.14
Message-ID: <200509111631.j8BGVMYH024324@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/zope/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24285/FC-4

Modified Files:
	.cvsignore sources zope.init.in zope.spec 
Log Message:
- version 2.8.1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/zope/FC-4/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	11 Jun 2005 20:50:47 -0000	1.7
+++ .cvsignore	11 Sep 2005 16:31:20 -0000	1.8
@@ -1 +1 @@
-Zope-2.8.0-final.tar.gz
+Zope-2.8.1-final.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/zope/FC-4/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	11 Jun 2005 20:50:47 -0000	1.7
+++ sources	11 Sep 2005 16:31:20 -0000	1.8
@@ -1 +1 @@
-f734fa4c55f36b5038f36be9a6d4e61e  Zope-2.8.0-final.tar.gz
+0ec441a35175bb8d8c557b7d3c63f6f6  Zope-2.8.1-final.tgz


Index: zope.init.in
===================================================================
RCS file: /cvs/extras/rpms/zope/FC-4/zope.init.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- zope.init.in	12 Mar 2005 08:45:13 -0000	1.2
+++ zope.init.in	11 Sep 2005 16:31:20 -0000	1.3
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Startup script for Zope
 #
-# chkconfig: 345 80 20
+# chkconfig: - 80 20
 # description: Zope, a web application server
 #
 # config: $instance/etc/zope.conf


Index: zope.spec
===================================================================
RCS file: /cvs/extras/rpms/zope/FC-4/zope.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- zope.spec	12 Jun 2005 14:44:02 -0000	1.13
+++ zope.spec	11 Sep 2005 16:31:20 -0000	1.14
@@ -1,4 +1,4 @@
-%define python_minver 2.3.3
+%define python_minver 2.4
 
 %define zope_user      zope
 %define zope_group     %{zope_user}
@@ -12,12 +12,12 @@
 
 Name:    zope
 Summary: Web application server for flexible content management applications
-Version: 2.8.0
-Release: 2%{?dist}
+Version: 2.8.1
+Release: 1%{?dist}
 License: ZPL
 Group: 	 System Environment/Daemons
 URL:     http://www.zope.org/
-Source0: http://zope.org/Products/Zope/2.8.0/Zope-2.8.0-final.tar.gz
+Source0: http://zope.org/Products/Zope/2.8.1/Zope-2.8.1-final.tgz
 #Source10: http://www.zope.org/Products/Zope/Hotfix-2005-04-05/Hotfix-20050405/Hotfix_20050405.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -177,6 +177,9 @@
 
 
 %changelog
+* Sat Sep 10 2005 Aurelien Bompard  2.8.1-1
+- version 2.8.1
+
 * Sun Jun 12 2005 Aurelien Bompard  2.8.0-2
 - rebuild
 



From fedora-extras-commits at redhat.com  Sun Sep 11 16:31:23 2005
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Sun, 11 Sep 2005 12:31:23 -0400
Subject: rpms/zope/devel .cvsignore, 1.7, 1.8 sources, 1.7, 1.8 zope.init.in,
	1.2, 1.3 zope.spec, 1.13, 1.14
Message-ID: <200509111631.j8BGVNHa024338@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/zope/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24285/devel

Modified Files:
	.cvsignore sources zope.init.in zope.spec 
Log Message:
- version 2.8.1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/zope/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	11 Jun 2005 20:50:52 -0000	1.7
+++ .cvsignore	11 Sep 2005 16:31:21 -0000	1.8
@@ -1 +1 @@
-Zope-2.8.0-final.tar.gz
+Zope-2.8.1-final.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/zope/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	11 Jun 2005 20:50:52 -0000	1.7
+++ sources	11 Sep 2005 16:31:21 -0000	1.8
@@ -1 +1 @@
-f734fa4c55f36b5038f36be9a6d4e61e  Zope-2.8.0-final.tar.gz
+0ec441a35175bb8d8c557b7d3c63f6f6  Zope-2.8.1-final.tgz


Index: zope.init.in
===================================================================
RCS file: /cvs/extras/rpms/zope/devel/zope.init.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- zope.init.in	12 Mar 2005 08:45:13 -0000	1.2
+++ zope.init.in	11 Sep 2005 16:31:21 -0000	1.3
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Startup script for Zope
 #
-# chkconfig: 345 80 20
+# chkconfig: - 80 20
 # description: Zope, a web application server
 #
 # config: $instance/etc/zope.conf


Index: zope.spec
===================================================================
RCS file: /cvs/extras/rpms/zope/devel/zope.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- zope.spec	12 Jun 2005 15:33:34 -0000	1.13
+++ zope.spec	11 Sep 2005 16:31:21 -0000	1.14
@@ -1,4 +1,4 @@
-%define python_minver 2.3.3
+%define python_minver 2.4
 
 %define zope_user      zope
 %define zope_group     %{zope_user}
@@ -12,12 +12,12 @@
 
 Name:    zope
 Summary: Web application server for flexible content management applications
-Version: 2.8.0
-Release: 2%{?dist}
+Version: 2.8.1
+Release: 1%{?dist}
 License: ZPL
 Group: 	 System Environment/Daemons
 URL:     http://www.zope.org/
-Source0: http://zope.org/Products/Zope/2.8.0/Zope-2.8.0-final.tar.gz
+Source0: http://zope.org/Products/Zope/2.8.1/Zope-2.8.1-final.tgz
 #Source10: http://www.zope.org/Products/Zope/Hotfix-2005-04-05/Hotfix-20050405/Hotfix_20050405.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -177,6 +177,9 @@
 
 
 %changelog
+* Sat Sep 10 2005 Aurelien Bompard  2.8.1-1
+- version 2.8.1
+
 * Sun Jun 12 2005 Aurelien Bompard  2.8.0-2
 - rebuild
 



From fedora-extras-commits at redhat.com  Sun Sep 11 16:31:48 2005
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sun, 11 Sep 2005 12:31:48 -0400
Subject: rpms/cppunit/devel cppunit.spec,1.1,1.2
Message-ID: <200509111631.j8BGVmWm024367@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/cppunit/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24348

Modified Files:
	cppunit.spec 
Log Message:
Add dist tag



Index: cppunit.spec
===================================================================
RCS file: /cvs/extras/rpms/cppunit/devel/cppunit.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cppunit.spec	11 Sep 2005 14:30:04 -0000	1.1
+++ cppunit.spec	11 Sep 2005 16:31:46 -0000	1.2
@@ -1,6 +1,6 @@
 Name: cppunit
 Version: 1.11.0
-Release: 2
+Release: 2%{?dist}
 
 Summary: C++ unit testing framework
 License: LGPL



From fedora-extras-commits at redhat.com  Sun Sep 11 20:35:37 2005
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Sun, 11 Sep 2005 16:35:37 -0400
Subject: rpms/kawa - New directory
Message-ID: <200509112035.j8BKZbQq030411@cvs-int.fedora.redhat.com>

Author: green

Update of /cvs/extras/rpms/kawa
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30387/kawa

Log Message:
Directory /cvs/extras/rpms/kawa added to the repository




From fedora-extras-commits at redhat.com  Sun Sep 11 20:35:37 2005
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Sun, 11 Sep 2005 16:35:37 -0400
Subject: rpms/kawa/devel - New directory
Message-ID: <200509112035.j8BKZbN9030416@cvs-int.fedora.redhat.com>

Author: green

Update of /cvs/extras/rpms/kawa/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30387/kawa/devel

Log Message:
Directory /cvs/extras/rpms/kawa/devel added to the repository




From fedora-extras-commits at redhat.com  Sun Sep 11 20:36:08 2005
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Sun, 11 Sep 2005 16:36:08 -0400
Subject: rpms/kawa/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200509112036.j8BKa8fe030466@cvs-int.fedora.redhat.com>

Author: green

Update of /cvs/extras/rpms/kawa/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30432/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module kawa


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Sun Sep 11 20:36:08 2005
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Sun, 11 Sep 2005 16:36:08 -0400
Subject: rpms/kawa Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200509112036.j8BKa8KT030461@cvs-int.fedora.redhat.com>

Author: green

Update of /cvs/extras/rpms/kawa
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30432

Added Files:
	Makefile import.log 
Log Message:
Setup of module kawa


--- NEW FILE Makefile ---
# Top level Makefile for module kawa
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Sun Sep 11 20:37:40 2005
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Sun, 11 Sep 2005 16:37:40 -0400
Subject: rpms/kawa import.log,1.1,1.2
Message-ID: <200509112038.j8BKcALm030538@cvs-int.fedora.redhat.com>

Author: green

Update of /cvs/extras/rpms/kawa
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30500

Modified Files:
	import.log 
Log Message:
auto-import kawa-1.8.beta-5 on branch devel from kawa-1.8.beta-5.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/kawa/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	11 Sep 2005 20:36:05 -0000	1.1
+++ import.log	11 Sep 2005 20:37:38 -0000	1.2
@@ -0,0 +1 @@
+kawa-1_8_beta-5:HEAD:kawa-1.8.beta-5.src.rpm:1126471049



From fedora-extras-commits at redhat.com  Sun Sep 11 20:37:40 2005
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Sun, 11 Sep 2005 16:37:40 -0400
Subject: rpms/kawa/devel kawa.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <200509112038.j8BKcBaY030542@cvs-int.fedora.redhat.com>

Author: green

Update of /cvs/extras/rpms/kawa/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30500/devel

Modified Files:
	.cvsignore sources 
Added Files:
	kawa.spec 
Log Message:
auto-import kawa-1.8.beta-5 on branch devel from kawa-1.8.beta-5.src.rpm


--- NEW FILE kawa.spec ---
Summary: Kawa scheme implementation
Name: kawa

Version: 1.8.beta
%define nversion 1.8beta

Release: 5%{?dist}
License: GPL
Group: Development/Languages
URL: http://www.gnu.org/software/kawa/
Source0: %{name}-%{nversion}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{nversion}-%{release}-root
BuildPrereq: gcc-java >= 3.3.0
Requires: libgcj >= 3.3.0
BuildRequires:    texinfo
BuildRequires:    readline-devel
BuildRequires:    ant >= 1.6
BuildRequires:    servletapi5
Requires:         servletapi5
BuildRequires:    java-gcj-compat-devel >= 1.0.31
Requires(post):   java-gcj-compat >= 1.0.31
Requires(postun): java-gcj-compat >= 1.0.31

%description
Kawa is an implementation of the Scheme programming language.
It is implemented in Java, and compiles Scheme into Java byte-codes.

%package        javadoc
Summary:        Javadoc for %{name}
Group:          Development/Documentation
#BuildRequires:  java-javadoc

%description    javadoc
%{summary}.

%prep
%setup -q -n %{name}-%{nversion}

%build
./configure --prefix=%{_prefix} --mandir=%{_mandir} --infodir=%{_infodir} --enable-kawa-frontend
export CLASSPATH=$(build-classpath servletapi5)
ant

# Override the Makefile for generating kawa.1, since it should be
# unformatted man page source.
cp doc/kawa.man doc/kawa.1

%install
rm -rf $RPM_BUILD_ROOT
make install install-javadoc-html JAVA=/usr/bin/java DESTDIR=$RPM_BUILD_ROOT JAVADOC_DIR=$RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
rm -f $RPM_BUILD_ROOT/usr/share/info/dir
ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
aot-compile-rpm

%clean
rm -rf $RPM_BUILD_ROOT

%post
/sbin/install-info %{_infodir}/kawa.info.gz %{_infodir}/dir
%{_bindir}/rebuild-gcj-db

%postun
if [ $1 = 0 ]; then
  /sbin/install-info --delete %{_infodir}/kawa.info.gz %{_infodir}/dir
fi
%{_bindir}/rebuild-gcj-db

%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING INSTALL NEWS README TODO
%{_bindir}/*
%{_datadir}/java/*
%{_libdir}/gcj/*
%{_mandir}/man1/kawa.1*
%{_infodir}/kawa*

%files javadoc
%defattr(644,root,root,755)
%doc %{_javadocdir}/%{name}-%{version}
%doc %{_javadocdir}/%{name}

%changelog
* Sun Sep 11 2005 Anthony Green  - 1.8beta-5
- Remove Requires for realine.  This is handled automagically.
- Remove ldconfig.

* Sun Sep 11 2005 Anthony Green  - 1.8beta-4
- Install unformatted man page source.
- Remove BuildRequires groff.
- Force kawa binary to use /usr/bin/java.
- Add javadoc package.
- Happy birthday, spec file!

* Sat Sep 10 2005 Anthony Green  - 1.8beta-3
- Add BuildRequires for groff and readline-devel.
- Add Requires for readline.
- Configure with --enable-kawa-frontend.

* Sat Sep 10 2005 Anthony Green  - 1.8beta-2
- Add BuildRequires for ant, texinfo and servletapi5.
- Add Requires for servletapi5.
- Add servletapi5.jar to classpath.

* Wed Sep  7 2005 Anthony Green  - 1.8beta-1
- Updgrade to 1.8beta

* Sat Sep  7 2005 Anthony Green  - 1.7-2
- Build for Fedora Extras.

* Sat Sep 11 2004 Anthony Green  - 1.7-1
- Initial build.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kawa/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	11 Sep 2005 20:36:06 -0000	1.1
+++ .cvsignore	11 Sep 2005 20:37:38 -0000	1.2
@@ -0,0 +1 @@
+kawa-1.8beta.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kawa/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	11 Sep 2005 20:36:06 -0000	1.1
+++ sources	11 Sep 2005 20:37:38 -0000	1.2
@@ -0,0 +1 @@
+c7fbacc3297adab1858f7f4beb6ab7ca  kawa-1.8beta.tar.gz



From fedora-extras-commits at redhat.com  Sun Sep 11 20:45:14 2005
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Sun, 11 Sep 2005 16:45:14 -0400
Subject: owners owners.list,1.189,1.190
Message-ID: <200509112045.j8BKjEMn030663@cvs-int.fedora.redhat.com>

Author: green

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30642

Modified Files:
	owners.list 
Log Message:
Add entry for kawa.



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.189
retrieving revision 1.190
diff -u -r1.189 -r1.190
--- owners.list	11 Sep 2005 02:45:54 -0000	1.189
+++ owners.list	11 Sep 2005 20:45:12 -0000	1.190
@@ -351,6 +351,7 @@
 Fedora Extras|kakasi|A Japanese character set conversion filter|tagoh at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|kannel|WAP and SMS gateway|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|kasumi|Anthy dictionary management tool|tagoh at redhat.com|extras-qa at fedoraproject.org|
+Fedora Extras|kawa|Kawa scheme implementation|green at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|kernel-module-thinkpad|IBM ThinkPad support kernel modules|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|keychain|Agent manager for OpenSSH, ssh.com, Sun SSH, and GnuPG|ad+rh-bugzilla at uni-x.org|extras-qa at fedoraproject.org|
 Fedora Extras|kickpim|KDE kicker applet to access addressbook|rdieter at math.unl.edu|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Mon Sep 12 00:11:24 2005
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Sun, 11 Sep 2005 20:11:24 -0400
Subject: rpms/lablgl/FC-4 lablgl.spec,1.9,1.10
Message-ID: <200509120011.j8C0BOmY003801@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/lablgl/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3782

Modified Files:
	lablgl.spec 
Log Message:



Index: lablgl.spec
===================================================================
RCS file: /cvs/extras/rpms/lablgl/FC-4/lablgl.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- lablgl.spec	26 May 2005 18:54:23 -0000	1.9
+++ lablgl.spec	12 Sep 2005 00:11:22 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           lablgl
 Version:        1.01
-Release: 6
+Release:	7%{?dist}
 
 Summary:        LablGL is an OpenGL interface for Objective Caml
 
@@ -10,9 +10,9 @@
 Source:         http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/dist/lablgl-1.01.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  XFree86-devel, freeglut-devel 
-BuildRequires:	ocaml = 3.08.3, labltk = 3.08.3, camlp4 = 3.08.3
+BuildRequires:	ocaml >= 3.08, labltk >= 3.08, camlp4 >= 3.08
 BuildRequires:	tcl-devel, tk-devel
-Requires:       ocaml = 3.08.3, labltk = 3.08.3
+Requires:       ocaml >= 3.08.3, labltk >= 3.08
 
 %description
 LablGL is is an Objective Caml interface to OpenGL. Support is
@@ -65,6 +65,9 @@
 %{_libdir}/ocaml/stublibs/*.so
 
 %changelog
+* Sun Sep 11 2005 Gerard Milmeister  - 1.01-7
+- Rebuild with new ocaml
+
 * Thu May 26 2005 Toshio Kuratomi  - 1.01-6
 - Bump and rebuild with new ocaml.
   



From fedora-extras-commits at redhat.com  Mon Sep 12 00:12:48 2005
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Sun, 11 Sep 2005 20:12:48 -0400
Subject: rpms/lablgl/FC-3 lablgl.spec,1.5,1.6
Message-ID: <200509120012.j8C0CmQP003864@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/lablgl/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3845/FC-3

Modified Files:
	lablgl.spec 
Log Message:



Index: lablgl.spec
===================================================================
RCS file: /cvs/extras/rpms/lablgl/FC-3/lablgl.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- lablgl.spec	1 Apr 2005 17:04:38 -0000	1.5
+++ lablgl.spec	12 Sep 2005 00:12:46 -0000	1.6
@@ -1,6 +1,7 @@
 Name:           lablgl
 Version:        1.01
-Release:        3
+Release:	7%{?dist}
+
 Summary:        LablGL is an OpenGL interface for Objective Caml
 
 Group:          System Environment/Libraries
@@ -9,9 +10,9 @@
 Source:         http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/dist/lablgl-1.01.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  XFree86-devel, freeglut-devel 
-BuildRequires:	ocaml = 3.08.3, labltk = 3.08.3, camlp4 = 3.08.3
+BuildRequires:	ocaml >= 3.08, labltk >= 3.08, camlp4 >= 3.08
 BuildRequires:	tcl-devel, tk-devel
-Requires:       ocaml = 3.08.3, labltk = 3.08.3
+Requires:       ocaml >= 3.08.3, labltk >= 3.08
 
 %description
 LablGL is is an Objective Caml interface to OpenGL. Support is
@@ -64,6 +65,9 @@
 %{_libdir}/ocaml/stublibs/*.so
 
 %changelog
+* Sun Sep 11 2005 Gerard Milmeister  - 1.01-7
+- Rebuild with new ocaml
+
 * Fri Apr  1 2005 Gerard Milmeister  - 1.01-3
 - Rebuild for ocaml 3.08.3
 



From fedora-extras-commits at redhat.com  Mon Sep 12 00:13:42 2005
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Sun, 11 Sep 2005 20:13:42 -0400
Subject: rpms/lablgl/devel lablgl.spec,1.9,1.10
Message-ID: <200509120013.j8C0Dgm0003927@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/lablgl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3908

Modified Files:
	lablgl.spec 
Log Message:



Index: lablgl.spec
===================================================================
RCS file: /cvs/extras/rpms/lablgl/devel/lablgl.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- lablgl.spec	26 May 2005 18:54:23 -0000	1.9
+++ lablgl.spec	12 Sep 2005 00:13:40 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           lablgl
 Version:        1.01
-Release: 6
+Release:	7%{?dist}
 
 Summary:        LablGL is an OpenGL interface for Objective Caml
 
@@ -10,9 +10,9 @@
 Source:         http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/dist/lablgl-1.01.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  XFree86-devel, freeglut-devel 
-BuildRequires:	ocaml = 3.08.3, labltk = 3.08.3, camlp4 = 3.08.3
+BuildRequires:	ocaml >= 3.08, labltk >= 3.08, camlp4 >= 3.08
 BuildRequires:	tcl-devel, tk-devel
-Requires:       ocaml = 3.08.3, labltk = 3.08.3
+Requires:       ocaml >= 3.08.3, labltk >= 3.08
 
 %description
 LablGL is is an Objective Caml interface to OpenGL. Support is
@@ -65,6 +65,9 @@
 %{_libdir}/ocaml/stublibs/*.so
 
 %changelog
+* Sun Sep 11 2005 Gerard Milmeister  - 1.01-7
+- Rebuild with new ocaml
+
 * Thu May 26 2005 Toshio Kuratomi  - 1.01-6
 - Bump and rebuild with new ocaml.
   



From fedora-extras-commits at redhat.com  Mon Sep 12 06:26:22 2005
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Mon, 12 Sep 2005 02:26:22 -0400
Subject: rpms/svgalib/FC-4 svgalib.spec,1.5,1.6
Message-ID: <200509120626.j8C6QMB9012245@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/svgalib/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12226

Modified Files:
	svgalib.spec 
Log Message:
No complaints about version in devel so release for FC4, never been in FC4 before so set release to 1.


Index: svgalib.spec
===================================================================
RCS file: /cvs/extras/rpms/svgalib/FC-4/svgalib.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- svgalib.spec	16 Aug 2005 11:55:30 -0000	1.5
+++ svgalib.spec	12 Sep 2005 06:26:20 -0000	1.6
@@ -1,6 +1,6 @@
 Name:		svgalib
 Version:	1.9.21
-Release:	5
+Release:	1
 Exclusivearch:	%{ix86} x86_64
 Summary:	Low-level fullscreen SVGA graphics library
 
@@ -129,6 +129,10 @@
 %{_mandir}/man3/*
 
 %changelog
+* Mon Sep 12 2005 Hans de Goede  1.9.21-1
+- No complaints about version in devel so release for FC4, never
+  been in FC4 before so set release to 1 .
+
 * Tue Aug 16 2005 Hans de Goede  1.9.21-5
 - Merge with upstream, drop merged patches, fix dark vga modes on radeon.
 



From fedora-extras-commits at redhat.com  Mon Sep 12 07:02:55 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Mon, 12 Sep 2005 03:02:55 -0400
Subject: rpms/openct/FC-4 .cvsignore, 1.3, 1.4 openct.spec, 1.5, 1.6 sources,
	1.3, 1.4
Message-ID: <200509120703.j8C73hak013623@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/openct/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13600

Modified Files:
	.cvsignore openct.spec sources 
Log Message:
* Sun Sep 11 2005 Ville Skytt??  - 0.6.6-1
- 0.6.6.
- Improve description.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/openct/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	17 May 2005 18:53:41 -0000	1.3
+++ .cvsignore	12 Sep 2005 07:02:32 -0000	1.4
@@ -1 +1 @@
-openct-0.6.5.tar.gz
+openct-0.6.6.tar.gz


Index: openct.spec
===================================================================
RCS file: /cvs/extras/rpms/openct/FC-4/openct.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- openct.spec	17 May 2005 18:53:41 -0000	1.5
+++ openct.spec	12 Sep 2005 07:02:53 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           openct
-Version:        0.6.5
-Release:        2
+Version:        0.6.6
+Release:        1%{?dist}
 Summary:        Middleware framework for smart card terminals
 
 Group:          System Environment/Libraries
@@ -12,23 +12,28 @@
 Source3:        %{name}-reader.conf
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  pcsc-lite-devel libusb-devel sed
+BuildRequires:  pcsc-lite-devel
+BuildRequires:  libusb-devel
+BuildRequires:  libtool-ltdl-devel
+BuildRequires:  sed
 Requires:       hotplug
-Requires(post): /sbin/chkconfig /sbin/ldconfig
+Requires(post): /sbin/chkconfig
+Requires(post): /sbin/ldconfig
 Requires(preun): /sbin/chkconfig
 Requires(postun): /sbin/ldconfig
 
 %description
-OpenCT is a middleware framework for smart card terminals.  It
-provides a library with rich set of functions for driver writers,
-protocol drivers for T=0 and T=1, serial and USB functionality,
-including USB hotplugging.  See openct.html in the included
-documentation for configuration notes.
+OpenCT implements drivers for several smart card readers.  It comes as
+driver in ifdhandler format for PC/SC-Lite, as CT-API driver, or as a
+small and lean middleware, so applications can use it with minimal
+overhead.  OpenCT also has a primitive mechanism to export smart card
+readers to remote machines via TCP/IP.
 
 %package        devel
 Summary:        OpenCT development files
 Group:          Development/Libraries
-Requires:       %{name} = %{version}-%{release}, pkgconfig
+Requires:       %{name} = %{version}-%{release}
+Requires:       pkgconfig
 
 %description    devel
 %{summary}.
@@ -61,17 +66,22 @@
 rm -rf $RPM_BUILD_ROOT
 install -dm 755 $RPM_BUILD_ROOT%{_sysconfdir}/hotplug/usb
 make install DESTDIR=$RPM_BUILD_ROOT
+
 ln -sf %{_libdir}/openct-ifd.so \
   $RPM_BUILD_ROOT%{_libdir}/pcsc/drivers/openct-ifd.bundle/Contents/*/
+
 install -pm 644 etc/openct.conf $RPM_BUILD_ROOT%{_sysconfdir}/openct.conf
 install -Dpm 755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/openct
 install -Dpm 644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/openct
 install -Dpm 644 %{name}-reader.conf \
   $RPM_BUILD_ROOT%{_sysconfdir}/reader.conf.d/%{name}.conf
+
 install -dm 755 $RPM_BUILD_ROOT%{_localstatedir}/run/openct
 touch $RPM_BUILD_ROOT%{_localstatedir}/run/openct/status
 chmod 644 $RPM_BUILD_ROOT%{_localstatedir}/run/openct/status
 
+rm -f $RPM_BUILD_ROOT%{_libdir}/{*.la,{libopenctapi,openct-ifd}.a}
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -114,7 +124,6 @@
 %{_sbindir}/ifdproxy
 %{_sbindir}/openct-control
 %{_libdir}/libopenct.so.*
-%{_libdir}/libifd.so.*
 %{_libdir}/libopenctapi.so
 %dir %{_localstatedir}/run/openct/
 %ghost %{_localstatedir}/run/openct/status
@@ -122,25 +131,24 @@
 
 %files devel
 %defattr(-,root,root,-)
+%doc doc/api/*
 %{_includedir}/openct/
 %{_libdir}/pkgconfig/libopenct.pc
 %{_libdir}/libopenct.a
 %{_libdir}/libopenct.so
-%{_libdir}/libifd.a
-%{_libdir}/libifd.so
-%exclude %{_libdir}/libopenctapi.a
-%exclude %{_libdir}/lib*.la
 
 %files -n pcsc-lite-%{name}
 %defattr(-,root,root,-)
 %config(noreplace) %{_sysconfdir}/reader.conf.d/%{name}.conf
 %{_libdir}/openct-ifd.so
 %{_libdir}/pcsc/drivers/openct-ifd.bundle/
-%exclude %{_libdir}/openct-ifd.a
-%exclude %{_libdir}/openct-ifd.la
 
 
 %changelog
+* Sun Sep 11 2005 Ville Skytt??  - 0.6.6-1
+- 0.6.6.
+- Improve description.
+
 * Tue May 17 2005 Ville Skytt??  - 0.6.5-2
 - 0.6.5.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/openct/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	17 May 2005 18:53:41 -0000	1.3
+++ sources	12 Sep 2005 07:02:53 -0000	1.4
@@ -1 +1 @@
-86bafd61788139f28671872da287fa0a  openct-0.6.5.tar.gz
+a9de3bef8e5e2827b8d72a2a50d0bc66  openct-0.6.6.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 12 07:06:39 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Mon, 12 Sep 2005 03:06:39 -0400
Subject: rpms/openct/devel .cvsignore, 1.3, 1.4 openct.spec, 1.5, 1.6 sources,
	1.3, 1.4
Message-ID: <200509120707.j8C77A4I013681@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/openct/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13643

Modified Files:
	.cvsignore openct.spec sources 
Log Message:
* Sun Sep 11 2005 Ville Skytt??  - 0.6.6-2
- 0.6.6.
- Improve description.
- Don't ship static libs.

TODO: probably needs adjusting to new udev/hotplug in devel, patches welcome.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/openct/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	17 May 2005 18:53:41 -0000	1.3
+++ .cvsignore	12 Sep 2005 07:06:13 -0000	1.4
@@ -1 +1 @@
-openct-0.6.5.tar.gz
+openct-0.6.6.tar.gz


Index: openct.spec
===================================================================
RCS file: /cvs/extras/rpms/openct/devel/openct.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- openct.spec	17 May 2005 18:53:41 -0000	1.5
+++ openct.spec	12 Sep 2005 07:06:13 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           openct
-Version:        0.6.5
-Release:        2
+Version:        0.6.6
+Release:        2%{?dist}
 Summary:        Middleware framework for smart card terminals
 
 Group:          System Environment/Libraries
@@ -12,23 +12,28 @@
 Source3:        %{name}-reader.conf
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  pcsc-lite-devel libusb-devel sed
+BuildRequires:  pcsc-lite-devel
+BuildRequires:  libusb-devel
+BuildRequires:  libtool-ltdl-devel
+BuildRequires:  sed
 Requires:       hotplug
-Requires(post): /sbin/chkconfig /sbin/ldconfig
+Requires(post): /sbin/chkconfig
+Requires(post): /sbin/ldconfig
 Requires(preun): /sbin/chkconfig
 Requires(postun): /sbin/ldconfig
 
 %description
-OpenCT is a middleware framework for smart card terminals.  It
-provides a library with rich set of functions for driver writers,
-protocol drivers for T=0 and T=1, serial and USB functionality,
-including USB hotplugging.  See openct.html in the included
-documentation for configuration notes.
+OpenCT implements drivers for several smart card readers.  It comes as
+driver in ifdhandler format for PC/SC-Lite, as CT-API driver, or as a
+small and lean middleware, so applications can use it with minimal
+overhead.  OpenCT also has a primitive mechanism to export smart card
+readers to remote machines via TCP/IP.
 
 %package        devel
 Summary:        OpenCT development files
 Group:          Development/Libraries
-Requires:       %{name} = %{version}-%{release}, pkgconfig
+Requires:       %{name} = %{version}-%{release}
+Requires:       pkgconfig
 
 %description    devel
 %{summary}.
@@ -53,6 +58,7 @@
 %build
 %configure \
   --disable-dependency-tracking \
+  --disable-static \
   --with-bundle-dir=%{_libdir}/pcsc/drivers
 make %{?_smp_mflags}
 
@@ -61,17 +67,22 @@
 rm -rf $RPM_BUILD_ROOT
 install -dm 755 $RPM_BUILD_ROOT%{_sysconfdir}/hotplug/usb
 make install DESTDIR=$RPM_BUILD_ROOT
+
 ln -sf %{_libdir}/openct-ifd.so \
   $RPM_BUILD_ROOT%{_libdir}/pcsc/drivers/openct-ifd.bundle/Contents/*/
+
 install -pm 644 etc/openct.conf $RPM_BUILD_ROOT%{_sysconfdir}/openct.conf
 install -Dpm 755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/openct
 install -Dpm 644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/openct
 install -Dpm 644 %{name}-reader.conf \
   $RPM_BUILD_ROOT%{_sysconfdir}/reader.conf.d/%{name}.conf
+
 install -dm 755 $RPM_BUILD_ROOT%{_localstatedir}/run/openct
 touch $RPM_BUILD_ROOT%{_localstatedir}/run/openct/status
 chmod 644 $RPM_BUILD_ROOT%{_localstatedir}/run/openct/status
 
+rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -114,7 +125,6 @@
 %{_sbindir}/ifdproxy
 %{_sbindir}/openct-control
 %{_libdir}/libopenct.so.*
-%{_libdir}/libifd.so.*
 %{_libdir}/libopenctapi.so
 %dir %{_localstatedir}/run/openct/
 %ghost %{_localstatedir}/run/openct/status
@@ -122,25 +132,24 @@
 
 %files devel
 %defattr(-,root,root,-)
+%doc doc/api/*
 %{_includedir}/openct/
 %{_libdir}/pkgconfig/libopenct.pc
-%{_libdir}/libopenct.a
 %{_libdir}/libopenct.so
-%{_libdir}/libifd.a
-%{_libdir}/libifd.so
-%exclude %{_libdir}/libopenctapi.a
-%exclude %{_libdir}/lib*.la
 
 %files -n pcsc-lite-%{name}
 %defattr(-,root,root,-)
 %config(noreplace) %{_sysconfdir}/reader.conf.d/%{name}.conf
 %{_libdir}/openct-ifd.so
 %{_libdir}/pcsc/drivers/openct-ifd.bundle/
-%exclude %{_libdir}/openct-ifd.a
-%exclude %{_libdir}/openct-ifd.la
 
 
 %changelog
+* Sun Sep 11 2005 Ville Skytt??  - 0.6.6-2
+- 0.6.6.
+- Improve description.
+- Don't ship static libs.
+
 * Tue May 17 2005 Ville Skytt??  - 0.6.5-2
 - 0.6.5.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/openct/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	17 May 2005 18:53:41 -0000	1.3
+++ sources	12 Sep 2005 07:06:13 -0000	1.4
@@ -1 +1 @@
-86bafd61788139f28671872da287fa0a  openct-0.6.5.tar.gz
+a9de3bef8e5e2827b8d72a2a50d0bc66  openct-0.6.6.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 12 09:26:44 2005
From: fedora-extras-commits at redhat.com (Marc Maurer (uwog))
Date: Mon, 12 Sep 2005 05:26:44 -0400
Subject: rpms/gtkmathview/devel gtkmathview.spec,1.1,1.2
Message-ID: <200509120926.j8C9QieO017178@cvs-int.fedora.redhat.com>

Author: uwog

Update of /cvs/extras/rpms/gtkmathview/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17159

Modified Files:
	gtkmathview.spec 
Log Message:
update to 0.7.4




Index: gtkmathview.spec
===================================================================
RCS file: /cvs/extras/rpms/gtkmathview/devel/gtkmathview.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gtkmathview.spec	30 Aug 2005 22:10:42 -0000	1.1
+++ gtkmathview.spec	12 Sep 2005 09:26:42 -0000	1.2
@@ -1,7 +1,7 @@
 Summary: A MathML rendering library
 Name: gtkmathview
-Version: 0.7.3
-Release: 5
+Version: 0.7.4
+Release: 1
 Group: System Environment/Libraries
 License: GPL
 Source: http://helm.cs.unibo.it/mml-widget/sources/gtkmathview-%{version}.tar.gz
@@ -75,6 +75,9 @@
 rm -r $RPM_BUILD_ROOT
 
 %changelog
+* Mon Sep 12 2005 Marc Maurer  - 0.7.4-1
+- Update to 0.7.4
+
 * Tue Aug 30 2005 Marc Maurer  - 0.7.3-5
 - Drop more unneeded Requires
 



From fedora-extras-commits at redhat.com  Mon Sep 12 09:27:39 2005
From: fedora-extras-commits at redhat.com (Marc Maurer (uwog))
Date: Mon, 12 Sep 2005 05:27:39 -0400
Subject: rpms/gtkmathview/devel .cvsignore,1.2,1.3 sources,1.2,1.3
Message-ID: <200509120927.j8C9Rdws017212@cvs-int.fedora.redhat.com>

Author: uwog

Update of /cvs/extras/rpms/gtkmathview/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17191

Modified Files:
	.cvsignore sources 
Log Message:
Update to 0.7.4




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gtkmathview/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	30 Aug 2005 22:10:42 -0000	1.2
+++ .cvsignore	12 Sep 2005 09:27:37 -0000	1.3
@@ -1 +1 @@
-gtkmathview-0.7.3.tar.gz
+gtkmathview-0.7.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gtkmathview/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	30 Aug 2005 22:10:42 -0000	1.2
+++ sources	12 Sep 2005 09:27:37 -0000	1.3
@@ -1 +1 @@
-23c2af18dae0f2b7af109fc3a47b44d8  gtkmathview-0.7.3.tar.gz
+3309357cfc4d09854da046773f14d919  gtkmathview-0.7.4.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 12 11:37:08 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Mon, 12 Sep 2005 07:37:08 -0400
Subject: rpms/perl-Log-Dispatch - New directory
Message-ID: <200509121137.j8CBb8F6021523@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Log-Dispatch
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21503/perl-Log-Dispatch

Log Message:
Directory /cvs/extras/rpms/perl-Log-Dispatch added to the repository




From fedora-extras-commits at redhat.com  Mon Sep 12 11:37:08 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Mon, 12 Sep 2005 07:37:08 -0400
Subject: rpms/perl-Log-Dispatch/devel - New directory
Message-ID: <200509121137.j8CBb81O021528@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Log-Dispatch/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21503/perl-Log-Dispatch/devel

Log Message:
Directory /cvs/extras/rpms/perl-Log-Dispatch/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Sep 12 11:37:30 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Mon, 12 Sep 2005 07:37:30 -0400
Subject: rpms/perl-Log-Dispatch Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200509121137.j8CBbUdC021583@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Log-Dispatch
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21548

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-Log-Dispatch


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Log-Dispatch
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Mon Sep 12 11:37:30 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Mon, 12 Sep 2005 07:37:30 -0400
Subject: rpms/perl-Log-Dispatch/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200509121137.j8CBbUFo021588@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Log-Dispatch/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21548/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Log-Dispatch


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Mon Sep 12 11:38:18 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Mon, 12 Sep 2005 07:38:18 -0400
Subject: rpms/perl-Log-Dispatch import.log,1.1,1.2
Message-ID: <200509121138.j8CBcINc021663@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Log-Dispatch
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21626

Modified Files:
	import.log 
Log Message:
auto-import perl-Log-Dispatch-2.11-1 on branch devel from perl-Log-Dispatch-2.11-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Log-Dispatch/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	12 Sep 2005 11:37:28 -0000	1.1
+++ import.log	12 Sep 2005 11:38:16 -0000	1.2
@@ -0,0 +1 @@
+perl-Log-Dispatch-2_11-1:HEAD:perl-Log-Dispatch-2.11-1.src.rpm:1126525077



From fedora-extras-commits at redhat.com  Mon Sep 12 11:38:19 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Mon, 12 Sep 2005 07:38:19 -0400
Subject: rpms/perl-Log-Dispatch/devel
	Log-Dispatch-2.11-enable-mail-tests.patch, NONE,
	1.1 Log-Dispatch-2.11-mod_perl2.patch, NONE,
	1.1 perl-Log-Dispatch.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200509121138.j8CBcJZU021674@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Log-Dispatch/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21626/devel

Modified Files:
	.cvsignore sources 
Added Files:
	Log-Dispatch-2.11-enable-mail-tests.patch 
	Log-Dispatch-2.11-mod_perl2.patch perl-Log-Dispatch.spec 
Log Message:
auto-import perl-Log-Dispatch-2.11-1 on branch devel from perl-Log-Dispatch-2.11-1.src.rpm

Log-Dispatch-2.11-enable-mail-tests.patch:

--- NEW FILE Log-Dispatch-2.11-enable-mail-tests.patch ---
diff -ruN Log-Dispatch-2.11-orig/t/01-basic.t Log-Dispatch-2.11/t/01-basic.t
--- Log-Dispatch-2.11-orig/t/01-basic.t	2005-07-27 15:47:09.000000000 +0100
+++ Log-Dispatch-2.11/t/01-basic.t	2005-09-10 22:37:37.000000000 +0100
@@ -27,6 +27,14 @@
                     syslog_file   => '/var/log/messages',
                   );
 }
+else
+{
+    # Fedora Extras: mail tests coverage
+
+    %TestConfig = ( email_address => 'root at localhost.localdomain',
+                    syslog_file   => '/var/log/messages',
+                  );
+}
 
 use Log::Dispatch::File;
 use Log::Dispatch::Handle;

Log-Dispatch-2.11-mod_perl2.patch:

--- NEW FILE Log-Dispatch-2.11-mod_perl2.patch ---
diff -ruN Log-Dispatch-2.11-orig/lib/Log/Dispatch/ApacheLog.pm Log-Dispatch-2.11/lib/Log/Dispatch/ApacheLog.pm
--- Log-Dispatch-2.11-orig/lib/Log/Dispatch/ApacheLog.pm	2005-07-27 15:47:09.000000000 +0100
+++ Log-Dispatch-2.11/lib/Log/Dispatch/ApacheLog.pm	2005-09-11 15:47:07.000000000 +0100
@@ -9,7 +9,7 @@
 use Params::Validate qw(validate);
 Params::Validate::validation_options( allow_extra => 1 );
 
-use Apache::Log;
+use Apache2::Log;
 
 use vars qw[ $VERSION ];
 
diff -ruN Log-Dispatch-2.11-orig/t/01-basic.t Log-Dispatch-2.11/t/01-basic.t
--- Log-Dispatch-2.11-orig/t/01-basic.t	2005-07-27 15:47:09.000000000 +0100
+++ Log-Dispatch-2.11/t/01-basic.t	2005-09-11 15:47:54.000000000 +0100
@@ -34,7 +34,7 @@
 
 use IO::File;
 
-if ( eval { require mod_perl } )
+if ( eval { require mod_perl2 } )
 {
     require Log::Dispatch::ApacheLog;
 }


--- NEW FILE perl-Log-Dispatch.spec ---
# Build switch:
#   --with mailtests         Enable mail tests

# set mod_perl2 to
#   1  for enabling mod_perl >= 2.0.0RC5 support
#   0  for enabling mod_perl < 2.0.0RC5 support

%define mod_perl2      1
%define mailtests      0

%{?_with_mailtests:%define mailtests 1}


Name:           perl-Log-Dispatch
Version:        2.11
Release:        1%{?dist}
Summary:        Dispatches messages to one or more outputs

Group:          Development/Libraries
License:        GPL or Artistic
URL:            http://search.cpan.org/dist/Log-Dispatch/
Source0:        http://www.cpan.org/authors/id/D/DR/DROLSKY/Log-Dispatch-%{version}.tar.gz
Patch0:         Log-Dispatch-2.11-mod_perl2.patch
Patch1:         Log-Dispatch-2.11-enable-mail-tests.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  perl(Module::Build)
BuildRequires:  perl(Params::Validate)
%if %{mailtests}
BuildRequires:  perl(Mail::Send), perl(Mail::Sender)
BuildRequires:  perl(Mail::Sendmail), perl(MIME::Lite)
%endif
BuildRequires:  perl(File::Find::Rule), perl(Test::Pod)
BuildRequires:  mod_perl
Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
Log::Dispatch is a suite of OO modules for logging messages to
multiple outputs, each of which can have a minimum and maximum log
level.  It is designed to be easily subclassed, both for creating a
new dispatcher object and particularly for creating new outputs.


%prep
%setup -q -n Log-Dispatch-%{version}
%if %{mod_perl2}
%patch0 -p1
%endif
%if %{mailtests}
%patch1 -p1
%endif


%build
%{__perl} Build.PL installdirs=vendor
./Build


%install
rm -rf $RPM_BUILD_ROOT
./Build install destdir=$RPM_BUILD_ROOT create_packlist=0
chmod -R u+w $RPM_BUILD_ROOT/*


%check
./Build test


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc Changes LICENSE README
%{perl_vendorlib}/Log/
%{_mandir}/man3/*.3*


%changelog
* Fri Sep 09 2005 Jose Pedro Oliveira  - 2.11-1
- First build.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Log-Dispatch/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	12 Sep 2005 11:37:28 -0000	1.1
+++ .cvsignore	12 Sep 2005 11:38:16 -0000	1.2
@@ -0,0 +1 @@
+Log-Dispatch-2.11.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Log-Dispatch/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	12 Sep 2005 11:37:28 -0000	1.1
+++ sources	12 Sep 2005 11:38:16 -0000	1.2
@@ -0,0 +1 @@
+85b9478df97e2e00b5d54befd6944001  Log-Dispatch-2.11.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 12 12:11:05 2005
From: fedora-extras-commits at redhat.com (Mark Cox (mjc))
Date: Mon, 12 Sep 2005 08:11:05 -0400
Subject: fedora-security/audit fc4,1.56,1.57
Message-ID: <200509121211.j8CCB5dm023079@cvs-int.fedora.redhat.com>

Author: mjc

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23058

Modified Files:
	fc4 
Log Message:
Catch up with fc4 stuff after the busy Friday



Index: fc4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc4,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- fc4	7 Sep 2005 21:04:59 -0000	1.56
+++ fc4	12 Sep 2005 12:11:02 -0000	1.57
@@ -1,8 +1,13 @@
-Up to date CVE as of CVE email 20050906
-Up to date FC4 as of 20050906
+Up to date CVE as of CVE email 20050911
+Up to date FC4 as of 20050911
 
 ** are items that need attention
 
+2005-2873 ** kernel
+2005-2872 ** kernel
+2005-2871 backport (firefox) [since FEDORA-2005-871]
+2005-2871 backport (mozilla) [since FEDORA-2005-873]
+2005-2871 VULNERABLE (thunderbird) (moderate only)
 2005-2811 version (net-snmp, not upstream gentoo only)
 2005-2802 version (kernel, fixed 2.6.12) [since FEDORA-2005-510]
 2005-2801 version (kernel, fixed 2.6.11)
@@ -290,7 +295,7 @@
 2005-0524 version (php, fixed 5.0.4)
 2005-0504 version (kernel, doesn't build in 2.6)
 2005-0490 version (curl, fixed 7.13.1)
-2005-0488 VULNERABLE (telnet) bz#159299
+2005-0488 backport (telnet) since ga
 2005-0488 backport (krb5) [since FEDORA-2005-553]
 2005-0473 version (gaim, fixed 1.1.3)
 2005-0472 version (gaim, fixed 1.1.3)



From fedora-extras-commits at redhat.com  Mon Sep 12 12:29:33 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon, 12 Sep 2005 08:29:33 -0400
Subject: rpms/maxima/FC-3 maxima.spec,1.4,1.5
Message-ID: <200509121229.j8CCTXhg023175@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/maxima/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23128/FC-3

Modified Files:
	maxima.spec 
Log Message:
* Fri Sep 09 2005 Rex Dieter  5.9.1-5
- add more Obsoletes: maxima-exec- for cleaner upgrade from customized,
  rebuilt upstream rpms.
- (re)disable debuginfo.  No point in having empty -debuginfo pkgs.
- a few cleanups getting ready for 5.9.1.1cvs/5.9.2rc



Index: maxima.spec
===================================================================
RCS file: /cvs/extras/rpms/maxima/FC-3/maxima.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- maxima.spec	6 Sep 2005 18:55:07 -0000	1.4
+++ maxima.spec	12 Sep 2005 12:29:31 -0000	1.5
@@ -5,14 +5,14 @@
 %define _without_gcl 1
 %define _without_sbcl 1
 
-#define cvs cvs20050825
+#define cvs .20050908
 #define beta cvs
 
 Summary: Symbolic Computation Program
 Name: 	 maxima
-Version: 5.9.1
+Version: 5.9.1%{?beta}
 
-Release: 4%{?dist} 
+Release: 5%{?dist} 
 License: GPL
 Group:	 Applications/Engineering 
 URL: 	 http://maxima.sourceforge.net/
@@ -31,12 +31,12 @@
 Patch1: maxima-5.9.0-htmlview.patch
 # (mysterious?) xemacs patch
 Patch2: maxima.el-xemacs.patch
-# Fix build w/sbcl (5.9.1.1cvs only)
-%{?cvs:Patch3: maxima-sbcl.patch}
 
 # Inhibit automatic compressing of info files. Compressed info
 # files break maxima's internal help.
 %define __spec_install_post %{nil} 
+# debuginfo is empty/blank, disable
+%define debug_package   %{nil}
 
 BuildRequires: texinfo
 BuildRequires: tetex-latex
@@ -83,6 +83,7 @@
 %define clisp_ver %{expand:%%(rpm -q --qf '%%{VERSION}' clisp )}
 Requires: clisp >= %{clisp_ver}
 Requires: %{name} = %{version}
+Obsoletes: maxima-exec-lisp
 Provides: %{name}-runtime = %{version}
 %description runtime-clisp
 Maxima compiled with Common Lisp (clisp) 
@@ -96,7 +97,7 @@
 #define cmucl_ver %{expand:%%(rpm -q --qf '%%{VERSION}' cmucl )}
 #Requires: cmucl >= %{cmucl_ver}
 Requires:  %{name} = %{version}
-Obsoletes: %{name}-exec-cmucl 
+Obsoletes: maxima-exec-cmucl 
 Provides:  %{name}-runtime = %{version}
 %description runtime-cmucl
 Maxima compiled with CMU Common Lisp (cmucl) 
@@ -108,7 +109,7 @@
 Group:   Applications/Engineering
 BuildRequires: gcl
 Requires:  %{name} = %{version}
-#Obsoletes: %{name}-exec-gcl 
+Obsoletes: maxima-exec-gcl 
 Provides:  %{name}-runtime = %{version}
 %description runtime-gcl
 Maxima compiled with Gnu Common Lisp (gcl)
@@ -122,7 +123,7 @@
 %define sbcl_ver %{expand:%%(rpm -q --qf '%%{version}' sbcl )}
 Requires: sbcl >= %{sbcl_ver}
 Requires: %{name} = %{version}
-#Obsoletes: %{name}-exec-sbcl
+#Obsoletes: maxima-exec-sbcl
 Provides: %{name}-runtime = %{version}
 %description runtime-sbcl
 Maxima compiled with Steel Bank Common Lisp (sbcl).
@@ -130,14 +131,13 @@
 
 
 %prep
-%setup -q  -n %{name}%{!?cvs:-%{version}%{?beta}}
+%setup -q  -n %{name}%{!?cvs:-%{version}}
 
 # Extra docs
 install -p -m644 %{SOURCE10} .
 
 %patch1 -p1 -b .htmlview
 %patch2 -p1 -b .xemacs
-%{?cvs:%patch3 -p1 -b .sbcl}
 
 sed -i -e 's:/usr/local/info:/usr/share/info:' \
   interfaces/emacs/emaxima/maxima.el
@@ -204,20 +204,20 @@
 ## emaxima
 # LaTeX style
 install -d $RPM_BUILD_ROOT%{_datadir}/texmf/tex/latex/emaxima
-cp -alf $RPM_BUILD_ROOT%{_datadir}/%{name}/%{version}%{?beta}/emacs/*.sty \
+cp -alf $RPM_BUILD_ROOT%{_datadir}/%{name}/%{version}/emacs/*.sty \
 	$RPM_BUILD_ROOT%{_datadir}/texmf/tex/latex/emaxima/
 # emacs
 install -d $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/{maxima,site-start.d}
-cp -alf $RPM_BUILD_ROOT%{_datadir}/%{name}/%{version}%{?beta}/emacs/*.el \
-	$RPM_BUILD_ROOT%{_datadir}/%{name}/%{version}%{?beta}/emacs/*.lisp \
+cp -alf $RPM_BUILD_ROOT%{_datadir}/%{name}/%{version}/emacs/*.el \
+	$RPM_BUILD_ROOT%{_datadir}/%{name}/%{version}/emacs/*.lisp \
 	$RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/maxima/
 install -D -m644 -p %{SOURCE6} \
 	$RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/site-start.d/maxima.el
 
 # xemacs
 install -d $RPM_BUILD_ROOT%{_datadir}/xemacs/site-packages/lisp/{maxima,site-start.d}
-cp -alf $RPM_BUILD_ROOT%{_datadir}/%{name}/%{version}%{?beta}/emacs/*.el \
-	$RPM_BUILD_ROOT%{_datadir}/%{name}/%{version}%{?beta}/emacs/*.lisp \
+cp -alf $RPM_BUILD_ROOT%{_datadir}/%{name}/%{version}/emacs/*.el \
+	$RPM_BUILD_ROOT%{_datadir}/%{name}/%{version}/emacs/*.lisp \
 	$RPM_BUILD_ROOT%{_datadir}/xemacs/site-packages/lisp/maxima/
 install -D -m644 -p %{SOURCE6} \
 	$RPM_BUILD_ROOT%{_datadir}/xemacs/site-packages/lisp/site-start.d/maxima.el
@@ -227,7 +227,7 @@
 # until we get/Require rlwrap from http://utopia.knoware.nl/~hlub/uck/rlwrap/
 rm -f $RPM_BUILD_ROOT%{_bindir}/rmaxima
 # docs
-rm -rf $RPM_BUILD_ROOT%{_datadir}/maxima/%{version}%{?beta}/doc/{contributors,implementation,misc,maximabook,EMaximaIntro.ps}
+rm -rf $RPM_BUILD_ROOT%{_datadir}/maxima/%{version}/doc/{contributors,implementation,misc,maximabook,EMaximaIntro.ps}
 
 # when --with gcl, this (sometimes) fails to get auto-created, so we'll help out
 touch debugfiles.list
@@ -255,61 +255,67 @@
 %doc doc/intromax/intromax.pdf
 %doc doc/maximabook/maxima.pdf
 %doc macref.pdf
-%doc %{_datadir}/maxima/%{version}%{?beta}/doc
+%doc %{_datadir}/maxima/%{version}/doc
 %{_bindir}/maxima
 %dir %{_datadir}/maxima
-%dir %{_datadir}/maxima/%{version}%{?beta}
-%{_datadir}/maxima/%{version}%{?beta}/[a-c,f-r,t-w,y-z,A-Z]*
-%{_datadir}/maxima/%{version}%{?beta}/demo/
-%{_datadir}/maxima/%{version}%{?beta}/share/
+%dir %{_datadir}/maxima/%{version}
+%{_datadir}/maxima/%{version}/[a-c,f-r,t-w,y-z,A-Z]*
+%{_datadir}/maxima/%{version}/demo/
+%{_datadir}/maxima/%{version}/share/
 %dir %{_libdir}/maxima
-%dir %{_libdir}/maxima/%{version}%{?beta}
+%dir %{_libdir}/maxima/%{version}
 %{_libexecdir}/maxima
 %{_infodir}/*.info*
 %{_mandir}/man1/maxima.*
 # emaxima     
-%{_datadir}/maxima/%{version}%{?beta}/emacs
+%{_datadir}/maxima/%{version}/emacs
 %{_datadir}/emacs/site-lisp/*
 %{_datadir}/xemacs/site-packages/lisp/*
 %{_datadir}/texmf/tex/latex/emaxima/
 
 %files src
 %defattr(-,root,root)
-%{_datadir}/maxima/%{version}%{?beta}/src/
+%{_datadir}/maxima/%{version}/src/
 
 %files gui
 %defattr(-,root,root)
 %{_bindir}/xmaxima
-%{_datadir}/maxima/%{version}%{?beta}/xmaxima
+%{_datadir}/maxima/%{version}/xmaxima
 %{_datadir}/applications/*.desktop
 %{_datadir}/pixmaps/*.png
 
 %if "%{?_with_clisp:1}" == "1"
 %files runtime-clisp
 %defattr(-,root,root)
-%{_libdir}/maxima/%{version}%{?beta}/binary-clisp
+%{_libdir}/maxima/%{version}/binary-clisp
 %endif
 
 %if "%{?_with_cmucl:1}" == "1"
 %files runtime-cmucl
 %defattr(-,root,root)
-%{_libdir}/maxima/%{version}%{?beta}/binary-cmucl
+%{_libdir}/maxima/%{version}/binary-cmucl
 %endif
 
 %if "%{?_with_gcl:1}" == "1"
 %files runtime-gcl
 %defattr(-,root,root)
-%{_libdir}/maxima/%{version}%{?beta}/binary-gcl
+%{_libdir}/maxima/%{version}/binary-gcl
 %endif
 
 %if "%{?_with_sbcl:1}" == "1"
 %files runtime-sbcl
 %defattr(-,root,root)
-%{_libdir}/maxima/%{version}%{?beta}/binary-sbcl
+%{_libdir}/maxima/%{version}/binary-sbcl
 %endif
 
 
 %changelog
+* Fri Sep 09 2005 Rex Dieter  5.9.1-5
+- add more Obsoletes: maxima-exec- for cleaner upgrade from customized,
+  rebuilt upstream rpms.
+- (re)disable debuginfo.  No point in having empty -debuginfo pkgs.
+- a few cleanups getting ready for 5.9.1.1cvs/5.9.2rc
+
 * Tue Sep 06 2005 Rex Dieter  5.9.1-4
 - workaround lack of debuginfo.list when building --with gcl
 - ExcludeArch: ppc ppc64 (bug #166347)



From fedora-extras-commits at redhat.com  Mon Sep 12 12:29:34 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon, 12 Sep 2005 08:29:34 -0400
Subject: rpms/maxima/devel maxima.spec,1.4,1.5
Message-ID: <200509121229.j8CCTYnH023187@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/maxima/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23128/devel

Modified Files:
	maxima.spec 
Log Message:
* Fri Sep 09 2005 Rex Dieter  5.9.1-5
- add more Obsoletes: maxima-exec- for cleaner upgrade from customized,
  rebuilt upstream rpms.
- (re)disable debuginfo.  No point in having empty -debuginfo pkgs.
- a few cleanups getting ready for 5.9.1.1cvs/5.9.2rc



Index: maxima.spec
===================================================================
RCS file: /cvs/extras/rpms/maxima/devel/maxima.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- maxima.spec	6 Sep 2005 18:55:07 -0000	1.4
+++ maxima.spec	12 Sep 2005 12:29:32 -0000	1.5
@@ -5,14 +5,14 @@
 %define _without_gcl 1
 %define _without_sbcl 1
 
-#define cvs cvs20050825
+#define cvs .20050908
 #define beta cvs
 
 Summary: Symbolic Computation Program
 Name: 	 maxima
-Version: 5.9.1
+Version: 5.9.1%{?beta}
 
-Release: 4%{?dist} 
+Release: 5%{?dist} 
 License: GPL
 Group:	 Applications/Engineering 
 URL: 	 http://maxima.sourceforge.net/
@@ -31,12 +31,12 @@
 Patch1: maxima-5.9.0-htmlview.patch
 # (mysterious?) xemacs patch
 Patch2: maxima.el-xemacs.patch
-# Fix build w/sbcl (5.9.1.1cvs only)
-%{?cvs:Patch3: maxima-sbcl.patch}
 
 # Inhibit automatic compressing of info files. Compressed info
 # files break maxima's internal help.
 %define __spec_install_post %{nil} 
+# debuginfo is empty/blank, disable
+%define debug_package   %{nil}
 
 BuildRequires: texinfo
 BuildRequires: tetex-latex
@@ -83,6 +83,7 @@
 %define clisp_ver %{expand:%%(rpm -q --qf '%%{VERSION}' clisp )}
 Requires: clisp >= %{clisp_ver}
 Requires: %{name} = %{version}
+Obsoletes: maxima-exec-lisp
 Provides: %{name}-runtime = %{version}
 %description runtime-clisp
 Maxima compiled with Common Lisp (clisp) 
@@ -96,7 +97,7 @@
 #define cmucl_ver %{expand:%%(rpm -q --qf '%%{VERSION}' cmucl )}
 #Requires: cmucl >= %{cmucl_ver}
 Requires:  %{name} = %{version}
-Obsoletes: %{name}-exec-cmucl 
+Obsoletes: maxima-exec-cmucl 
 Provides:  %{name}-runtime = %{version}
 %description runtime-cmucl
 Maxima compiled with CMU Common Lisp (cmucl) 
@@ -108,7 +109,7 @@
 Group:   Applications/Engineering
 BuildRequires: gcl
 Requires:  %{name} = %{version}
-#Obsoletes: %{name}-exec-gcl 
+Obsoletes: maxima-exec-gcl 
 Provides:  %{name}-runtime = %{version}
 %description runtime-gcl
 Maxima compiled with Gnu Common Lisp (gcl)
@@ -122,7 +123,7 @@
 %define sbcl_ver %{expand:%%(rpm -q --qf '%%{version}' sbcl )}
 Requires: sbcl >= %{sbcl_ver}
 Requires: %{name} = %{version}
-#Obsoletes: %{name}-exec-sbcl
+#Obsoletes: maxima-exec-sbcl
 Provides: %{name}-runtime = %{version}
 %description runtime-sbcl
 Maxima compiled with Steel Bank Common Lisp (sbcl).
@@ -130,14 +131,13 @@
 
 
 %prep
-%setup -q  -n %{name}%{!?cvs:-%{version}%{?beta}}
+%setup -q  -n %{name}%{!?cvs:-%{version}}
 
 # Extra docs
 install -p -m644 %{SOURCE10} .
 
 %patch1 -p1 -b .htmlview
 %patch2 -p1 -b .xemacs
-%{?cvs:%patch3 -p1 -b .sbcl}
 
 sed -i -e 's:/usr/local/info:/usr/share/info:' \
   interfaces/emacs/emaxima/maxima.el
@@ -204,20 +204,20 @@
 ## emaxima
 # LaTeX style
 install -d $RPM_BUILD_ROOT%{_datadir}/texmf/tex/latex/emaxima
-cp -alf $RPM_BUILD_ROOT%{_datadir}/%{name}/%{version}%{?beta}/emacs/*.sty \
+cp -alf $RPM_BUILD_ROOT%{_datadir}/%{name}/%{version}/emacs/*.sty \
 	$RPM_BUILD_ROOT%{_datadir}/texmf/tex/latex/emaxima/
 # emacs
 install -d $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/{maxima,site-start.d}
-cp -alf $RPM_BUILD_ROOT%{_datadir}/%{name}/%{version}%{?beta}/emacs/*.el \
-	$RPM_BUILD_ROOT%{_datadir}/%{name}/%{version}%{?beta}/emacs/*.lisp \
+cp -alf $RPM_BUILD_ROOT%{_datadir}/%{name}/%{version}/emacs/*.el \
+	$RPM_BUILD_ROOT%{_datadir}/%{name}/%{version}/emacs/*.lisp \
 	$RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/maxima/
 install -D -m644 -p %{SOURCE6} \
 	$RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/site-start.d/maxima.el
 
 # xemacs
 install -d $RPM_BUILD_ROOT%{_datadir}/xemacs/site-packages/lisp/{maxima,site-start.d}
-cp -alf $RPM_BUILD_ROOT%{_datadir}/%{name}/%{version}%{?beta}/emacs/*.el \
-	$RPM_BUILD_ROOT%{_datadir}/%{name}/%{version}%{?beta}/emacs/*.lisp \
+cp -alf $RPM_BUILD_ROOT%{_datadir}/%{name}/%{version}/emacs/*.el \
+	$RPM_BUILD_ROOT%{_datadir}/%{name}/%{version}/emacs/*.lisp \
 	$RPM_BUILD_ROOT%{_datadir}/xemacs/site-packages/lisp/maxima/
 install -D -m644 -p %{SOURCE6} \
 	$RPM_BUILD_ROOT%{_datadir}/xemacs/site-packages/lisp/site-start.d/maxima.el
@@ -227,7 +227,7 @@
 # until we get/Require rlwrap from http://utopia.knoware.nl/~hlub/uck/rlwrap/
 rm -f $RPM_BUILD_ROOT%{_bindir}/rmaxima
 # docs
-rm -rf $RPM_BUILD_ROOT%{_datadir}/maxima/%{version}%{?beta}/doc/{contributors,implementation,misc,maximabook,EMaximaIntro.ps}
+rm -rf $RPM_BUILD_ROOT%{_datadir}/maxima/%{version}/doc/{contributors,implementation,misc,maximabook,EMaximaIntro.ps}
 
 # when --with gcl, this (sometimes) fails to get auto-created, so we'll help out
 touch debugfiles.list
@@ -255,61 +255,67 @@
 %doc doc/intromax/intromax.pdf
 %doc doc/maximabook/maxima.pdf
 %doc macref.pdf
-%doc %{_datadir}/maxima/%{version}%{?beta}/doc
+%doc %{_datadir}/maxima/%{version}/doc
 %{_bindir}/maxima
 %dir %{_datadir}/maxima
-%dir %{_datadir}/maxima/%{version}%{?beta}
-%{_datadir}/maxima/%{version}%{?beta}/[a-c,f-r,t-w,y-z,A-Z]*
-%{_datadir}/maxima/%{version}%{?beta}/demo/
-%{_datadir}/maxima/%{version}%{?beta}/share/
+%dir %{_datadir}/maxima/%{version}
+%{_datadir}/maxima/%{version}/[a-c,f-r,t-w,y-z,A-Z]*
+%{_datadir}/maxima/%{version}/demo/
+%{_datadir}/maxima/%{version}/share/
 %dir %{_libdir}/maxima
-%dir %{_libdir}/maxima/%{version}%{?beta}
+%dir %{_libdir}/maxima/%{version}
 %{_libexecdir}/maxima
 %{_infodir}/*.info*
 %{_mandir}/man1/maxima.*
 # emaxima     
-%{_datadir}/maxima/%{version}%{?beta}/emacs
+%{_datadir}/maxima/%{version}/emacs
 %{_datadir}/emacs/site-lisp/*
 %{_datadir}/xemacs/site-packages/lisp/*
 %{_datadir}/texmf/tex/latex/emaxima/
 
 %files src
 %defattr(-,root,root)
-%{_datadir}/maxima/%{version}%{?beta}/src/
+%{_datadir}/maxima/%{version}/src/
 
 %files gui
 %defattr(-,root,root)
 %{_bindir}/xmaxima
-%{_datadir}/maxima/%{version}%{?beta}/xmaxima
+%{_datadir}/maxima/%{version}/xmaxima
 %{_datadir}/applications/*.desktop
 %{_datadir}/pixmaps/*.png
 
 %if "%{?_with_clisp:1}" == "1"
 %files runtime-clisp
 %defattr(-,root,root)
-%{_libdir}/maxima/%{version}%{?beta}/binary-clisp
+%{_libdir}/maxima/%{version}/binary-clisp
 %endif
 
 %if "%{?_with_cmucl:1}" == "1"
 %files runtime-cmucl
 %defattr(-,root,root)
-%{_libdir}/maxima/%{version}%{?beta}/binary-cmucl
+%{_libdir}/maxima/%{version}/binary-cmucl
 %endif
 
 %if "%{?_with_gcl:1}" == "1"
 %files runtime-gcl
 %defattr(-,root,root)
-%{_libdir}/maxima/%{version}%{?beta}/binary-gcl
+%{_libdir}/maxima/%{version}/binary-gcl
 %endif
 
 %if "%{?_with_sbcl:1}" == "1"
 %files runtime-sbcl
 %defattr(-,root,root)
-%{_libdir}/maxima/%{version}%{?beta}/binary-sbcl
+%{_libdir}/maxima/%{version}/binary-sbcl
 %endif
 
 
 %changelog
+* Fri Sep 09 2005 Rex Dieter  5.9.1-5
+- add more Obsoletes: maxima-exec- for cleaner upgrade from customized,
+  rebuilt upstream rpms.
+- (re)disable debuginfo.  No point in having empty -debuginfo pkgs.
+- a few cleanups getting ready for 5.9.1.1cvs/5.9.2rc
+
 * Tue Sep 06 2005 Rex Dieter  5.9.1-4
 - workaround lack of debuginfo.list when building --with gcl
 - ExcludeArch: ppc ppc64 (bug #166347)



From fedora-extras-commits at redhat.com  Mon Sep 12 12:29:34 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon, 12 Sep 2005 08:29:34 -0400
Subject: rpms/maxima/FC-4 maxima.spec,1.4,1.5
Message-ID: <200509121229.j8CCTYRc023181@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/maxima/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23128/FC-4

Modified Files:
	maxima.spec 
Log Message:
* Fri Sep 09 2005 Rex Dieter  5.9.1-5
- add more Obsoletes: maxima-exec- for cleaner upgrade from customized,
  rebuilt upstream rpms.
- (re)disable debuginfo.  No point in having empty -debuginfo pkgs.
- a few cleanups getting ready for 5.9.1.1cvs/5.9.2rc



Index: maxima.spec
===================================================================
RCS file: /cvs/extras/rpms/maxima/FC-4/maxima.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- maxima.spec	6 Sep 2005 18:55:07 -0000	1.4
+++ maxima.spec	12 Sep 2005 12:29:32 -0000	1.5
@@ -5,14 +5,14 @@
 %define _without_gcl 1
 %define _without_sbcl 1
 
-#define cvs cvs20050825
+#define cvs .20050908
 #define beta cvs
 
 Summary: Symbolic Computation Program
 Name: 	 maxima
-Version: 5.9.1
+Version: 5.9.1%{?beta}
 
-Release: 4%{?dist} 
+Release: 5%{?dist} 
 License: GPL
 Group:	 Applications/Engineering 
 URL: 	 http://maxima.sourceforge.net/
@@ -31,12 +31,12 @@
 Patch1: maxima-5.9.0-htmlview.patch
 # (mysterious?) xemacs patch
 Patch2: maxima.el-xemacs.patch
-# Fix build w/sbcl (5.9.1.1cvs only)
-%{?cvs:Patch3: maxima-sbcl.patch}
 
 # Inhibit automatic compressing of info files. Compressed info
 # files break maxima's internal help.
 %define __spec_install_post %{nil} 
+# debuginfo is empty/blank, disable
+%define debug_package   %{nil}
 
 BuildRequires: texinfo
 BuildRequires: tetex-latex
@@ -83,6 +83,7 @@
 %define clisp_ver %{expand:%%(rpm -q --qf '%%{VERSION}' clisp )}
 Requires: clisp >= %{clisp_ver}
 Requires: %{name} = %{version}
+Obsoletes: maxima-exec-lisp
 Provides: %{name}-runtime = %{version}
 %description runtime-clisp
 Maxima compiled with Common Lisp (clisp) 
@@ -96,7 +97,7 @@
 #define cmucl_ver %{expand:%%(rpm -q --qf '%%{VERSION}' cmucl )}
 #Requires: cmucl >= %{cmucl_ver}
 Requires:  %{name} = %{version}
-Obsoletes: %{name}-exec-cmucl 
+Obsoletes: maxima-exec-cmucl 
 Provides:  %{name}-runtime = %{version}
 %description runtime-cmucl
 Maxima compiled with CMU Common Lisp (cmucl) 
@@ -108,7 +109,7 @@
 Group:   Applications/Engineering
 BuildRequires: gcl
 Requires:  %{name} = %{version}
-#Obsoletes: %{name}-exec-gcl 
+Obsoletes: maxima-exec-gcl 
 Provides:  %{name}-runtime = %{version}
 %description runtime-gcl
 Maxima compiled with Gnu Common Lisp (gcl)
@@ -122,7 +123,7 @@
 %define sbcl_ver %{expand:%%(rpm -q --qf '%%{version}' sbcl )}
 Requires: sbcl >= %{sbcl_ver}
 Requires: %{name} = %{version}
-#Obsoletes: %{name}-exec-sbcl
+#Obsoletes: maxima-exec-sbcl
 Provides: %{name}-runtime = %{version}
 %description runtime-sbcl
 Maxima compiled with Steel Bank Common Lisp (sbcl).
@@ -130,14 +131,13 @@
 
 
 %prep
-%setup -q  -n %{name}%{!?cvs:-%{version}%{?beta}}
+%setup -q  -n %{name}%{!?cvs:-%{version}}
 
 # Extra docs
 install -p -m644 %{SOURCE10} .
 
 %patch1 -p1 -b .htmlview
 %patch2 -p1 -b .xemacs
-%{?cvs:%patch3 -p1 -b .sbcl}
 
 sed -i -e 's:/usr/local/info:/usr/share/info:' \
   interfaces/emacs/emaxima/maxima.el
@@ -204,20 +204,20 @@
 ## emaxima
 # LaTeX style
 install -d $RPM_BUILD_ROOT%{_datadir}/texmf/tex/latex/emaxima
-cp -alf $RPM_BUILD_ROOT%{_datadir}/%{name}/%{version}%{?beta}/emacs/*.sty \
+cp -alf $RPM_BUILD_ROOT%{_datadir}/%{name}/%{version}/emacs/*.sty \
 	$RPM_BUILD_ROOT%{_datadir}/texmf/tex/latex/emaxima/
 # emacs
 install -d $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/{maxima,site-start.d}
-cp -alf $RPM_BUILD_ROOT%{_datadir}/%{name}/%{version}%{?beta}/emacs/*.el \
-	$RPM_BUILD_ROOT%{_datadir}/%{name}/%{version}%{?beta}/emacs/*.lisp \
+cp -alf $RPM_BUILD_ROOT%{_datadir}/%{name}/%{version}/emacs/*.el \
+	$RPM_BUILD_ROOT%{_datadir}/%{name}/%{version}/emacs/*.lisp \
 	$RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/maxima/
 install -D -m644 -p %{SOURCE6} \
 	$RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/site-start.d/maxima.el
 
 # xemacs
 install -d $RPM_BUILD_ROOT%{_datadir}/xemacs/site-packages/lisp/{maxima,site-start.d}
-cp -alf $RPM_BUILD_ROOT%{_datadir}/%{name}/%{version}%{?beta}/emacs/*.el \
-	$RPM_BUILD_ROOT%{_datadir}/%{name}/%{version}%{?beta}/emacs/*.lisp \
+cp -alf $RPM_BUILD_ROOT%{_datadir}/%{name}/%{version}/emacs/*.el \
+	$RPM_BUILD_ROOT%{_datadir}/%{name}/%{version}/emacs/*.lisp \
 	$RPM_BUILD_ROOT%{_datadir}/xemacs/site-packages/lisp/maxima/
 install -D -m644 -p %{SOURCE6} \
 	$RPM_BUILD_ROOT%{_datadir}/xemacs/site-packages/lisp/site-start.d/maxima.el
@@ -227,7 +227,7 @@
 # until we get/Require rlwrap from http://utopia.knoware.nl/~hlub/uck/rlwrap/
 rm -f $RPM_BUILD_ROOT%{_bindir}/rmaxima
 # docs
-rm -rf $RPM_BUILD_ROOT%{_datadir}/maxima/%{version}%{?beta}/doc/{contributors,implementation,misc,maximabook,EMaximaIntro.ps}
+rm -rf $RPM_BUILD_ROOT%{_datadir}/maxima/%{version}/doc/{contributors,implementation,misc,maximabook,EMaximaIntro.ps}
 
 # when --with gcl, this (sometimes) fails to get auto-created, so we'll help out
 touch debugfiles.list
@@ -255,61 +255,67 @@
 %doc doc/intromax/intromax.pdf
 %doc doc/maximabook/maxima.pdf
 %doc macref.pdf
-%doc %{_datadir}/maxima/%{version}%{?beta}/doc
+%doc %{_datadir}/maxima/%{version}/doc
 %{_bindir}/maxima
 %dir %{_datadir}/maxima
-%dir %{_datadir}/maxima/%{version}%{?beta}
-%{_datadir}/maxima/%{version}%{?beta}/[a-c,f-r,t-w,y-z,A-Z]*
-%{_datadir}/maxima/%{version}%{?beta}/demo/
-%{_datadir}/maxima/%{version}%{?beta}/share/
+%dir %{_datadir}/maxima/%{version}
+%{_datadir}/maxima/%{version}/[a-c,f-r,t-w,y-z,A-Z]*
+%{_datadir}/maxima/%{version}/demo/
+%{_datadir}/maxima/%{version}/share/
 %dir %{_libdir}/maxima
-%dir %{_libdir}/maxima/%{version}%{?beta}
+%dir %{_libdir}/maxima/%{version}
 %{_libexecdir}/maxima
 %{_infodir}/*.info*
 %{_mandir}/man1/maxima.*
 # emaxima     
-%{_datadir}/maxima/%{version}%{?beta}/emacs
+%{_datadir}/maxima/%{version}/emacs
 %{_datadir}/emacs/site-lisp/*
 %{_datadir}/xemacs/site-packages/lisp/*
 %{_datadir}/texmf/tex/latex/emaxima/
 
 %files src
 %defattr(-,root,root)
-%{_datadir}/maxima/%{version}%{?beta}/src/
+%{_datadir}/maxima/%{version}/src/
 
 %files gui
 %defattr(-,root,root)
 %{_bindir}/xmaxima
-%{_datadir}/maxima/%{version}%{?beta}/xmaxima
+%{_datadir}/maxima/%{version}/xmaxima
 %{_datadir}/applications/*.desktop
 %{_datadir}/pixmaps/*.png
 
 %if "%{?_with_clisp:1}" == "1"
 %files runtime-clisp
 %defattr(-,root,root)
-%{_libdir}/maxima/%{version}%{?beta}/binary-clisp
+%{_libdir}/maxima/%{version}/binary-clisp
 %endif
 
 %if "%{?_with_cmucl:1}" == "1"
 %files runtime-cmucl
 %defattr(-,root,root)
-%{_libdir}/maxima/%{version}%{?beta}/binary-cmucl
+%{_libdir}/maxima/%{version}/binary-cmucl
 %endif
 
 %if "%{?_with_gcl:1}" == "1"
 %files runtime-gcl
 %defattr(-,root,root)
-%{_libdir}/maxima/%{version}%{?beta}/binary-gcl
+%{_libdir}/maxima/%{version}/binary-gcl
 %endif
 
 %if "%{?_with_sbcl:1}" == "1"
 %files runtime-sbcl
 %defattr(-,root,root)
-%{_libdir}/maxima/%{version}%{?beta}/binary-sbcl
+%{_libdir}/maxima/%{version}/binary-sbcl
 %endif
 
 
 %changelog
+* Fri Sep 09 2005 Rex Dieter  5.9.1-5
+- add more Obsoletes: maxima-exec- for cleaner upgrade from customized,
+  rebuilt upstream rpms.
+- (re)disable debuginfo.  No point in having empty -debuginfo pkgs.
+- a few cleanups getting ready for 5.9.1.1cvs/5.9.2rc
+
 * Tue Sep 06 2005 Rex Dieter  5.9.1-4
 - workaround lack of debuginfo.list when building --with gcl
 - ExcludeArch: ppc ppc64 (bug #166347)



From fedora-extras-commits at redhat.com  Mon Sep 12 12:35:07 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon, 12 Sep 2005 08:35:07 -0400
Subject: rpms/sbcl - New directory
Message-ID: <200509121235.j8CCZ7f2023399@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/sbcl
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23379/sbcl

Log Message:
Directory /cvs/extras/rpms/sbcl added to the repository




From fedora-extras-commits at redhat.com  Mon Sep 12 12:35:07 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon, 12 Sep 2005 08:35:07 -0400
Subject: rpms/sbcl/devel - New directory
Message-ID: <200509121235.j8CCZ70g023404@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/sbcl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23379/sbcl/devel

Log Message:
Directory /cvs/extras/rpms/sbcl/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Sep 12 12:35:20 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon, 12 Sep 2005 08:35:20 -0400
Subject: rpms/sbcl Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200509121235.j8CCZKeL023459@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/sbcl
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23424

Added Files:
	Makefile import.log 
Log Message:
Setup of module sbcl


--- NEW FILE Makefile ---
# Top level Makefile for module sbcl
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Mon Sep 12 12:35:20 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon, 12 Sep 2005 08:35:20 -0400
Subject: rpms/sbcl/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200509121235.j8CCZKvg023464@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/sbcl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23424/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module sbcl


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Mon Sep 12 12:36:46 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon, 12 Sep 2005 08:36:46 -0400
Subject: rpms/sbcl import.log,1.1,1.2
Message-ID: <200509121237.j8CCbGSu023569@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/sbcl
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23518

Modified Files:
	import.log 
Log Message:
auto-import sbcl-0.9.4-4 on branch devel from sbcl-0.9.4-4.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/sbcl/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	12 Sep 2005 12:35:18 -0000	1.1
+++ import.log	12 Sep 2005 12:36:44 -0000	1.2
@@ -0,0 +1 @@
+sbcl-0_9_4-4:HEAD:sbcl-0.9.4-4.src.rpm:1126528604



From fedora-extras-commits at redhat.com  Mon Sep 12 12:36:47 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon, 12 Sep 2005 08:36:47 -0400
Subject: rpms/sbcl/devel sbcl-0.8.18-default-sbcl-home.patch, NONE,
	1.1 sbcl-0.9.4-ADDR_NO_RANDOMIZE.patch, NONE,
	1.1 sbcl-0.9.4-optflags.patch, NONE, 1.1 sbcl.sh, NONE,
	1.1 sbcl.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200509121236.j8CCaloO023558@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/sbcl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23518/devel

Modified Files:
	.cvsignore sources 
Added Files:
	sbcl-0.8.18-default-sbcl-home.patch 
	sbcl-0.9.4-ADDR_NO_RANDOMIZE.patch sbcl-0.9.4-optflags.patch 
	sbcl.sh sbcl.spec 
Log Message:
auto-import sbcl-0.9.4-4 on branch devel from sbcl-0.9.4-4.src.rpm

sbcl-0.8.18-default-sbcl-home.patch:

--- NEW FILE sbcl-0.8.18-default-sbcl-home.patch ---
Index: make-target-1.sh
===================================================================
RCS file: /cvsroot/sbcl/sbcl/make-target-1.sh,v
retrieving revision 1.12
diff -u -r1.12 make-target-1.sh
--- make-target-1.sh	10 Sep 2004 15:36:17 -0000	1.12
+++ make-target-1.sh	3 Jan 2005 06:44:55 -0000
@@ -15,6 +15,29 @@
 
 echo //entering make-target-1.sh
 
+# Allow the definition of INSTALL_ROOT and/or SBCL_HOME to correctly
+# set the hard-coded SBCL_HOME macro in src/runtime/runtime.c
+
+DEFAULT_SBCL_HOME=${DEFAULT_SBCL_HOME:-/usr/local/lib/sbcl/}
+
+# Strip off any trailing / on the name; we'll add this later but don't
+# need two
+DEFAULT_SBCL_HOME=${DEFAULT_SBCL_HOME%/}
+
+export DEFAULT_SBCL_HOME
+
+file=src/runtime/sbcl-home.h
+echo "/* This is a machine-generated file.            */" > $file
+echo "/* Please do not edit it by hand.               */" >> $file
+echo "/* Change the default SBCL_HOME by setting the  */" >> $file
+echo "/* DEFAULT_SBCL_HOME environment variable prior */" >> $file
+echo "/* to building. See make-target-1.sh for more   */" >> $file
+echo "/* information.                                 */" >> $file
+echo "#ifndef SBCL_HOME" >> $file
+echo "#define SBCL_HOME \"$DEFAULT_SBCL_HOME/\"" >> $file
+echo "#endif" >> $file
+
+
 # Build the runtime system and symbol table (.nm) file.
 #
 # (This C build has to come after the first genesis in order to get
Index: src/runtime/runtime.c
===================================================================
RCS file: /cvsroot/sbcl/sbcl/src/runtime/runtime.c,v
retrieving revision 1.43
diff -u -r1.43 runtime.c
--- src/runtime/runtime.c	29 Oct 2004 09:00:39 -0000	1.43
+++ src/runtime/runtime.c	3 Jan 2005 06:47:51 -0000
@@ -61,9 +61,7 @@
 #include "interr.h"
 #endif
 
-#ifndef SBCL_HOME
-#define SBCL_HOME "/usr/local/lib/sbcl/"
-#endif
+#include "sbcl-home.h"
 
 
 /* SIGINT handler that invokes the monitor (for when Lisp isn't up to it) */

sbcl-0.9.4-ADDR_NO_RANDOMIZE.patch:

--- NEW FILE sbcl-0.9.4-ADDR_NO_RANDOMIZE.patch ---
--- sbcl-0.9.4/src/runtime/os.h.ADDR_NO_RANDOMIZE	2005-07-14 10:41:20.000000000 -0500
+++ sbcl-0.9.4/src/runtime/os.h	2005-08-30 12:16:42.781282788 -0500
@@ -50,7 +50,7 @@
 
 /* Do anything we need to do when starting up the runtime environment
  * in this OS. */
-extern void os_init(void);
+extern void os_init(char *argv[], char *envp[]);
 
 /* Install any OS-dependent low-level signal handlers which are needed
  * by the runtime environment. E.g. the signals raised by a violation
--- sbcl-0.9.4/src/runtime/linux-os.c.ADDR_NO_RANDOMIZE	2005-08-12 14:08:19.000000000 -0500
+++ sbcl-0.9.4/src/runtime/linux-os.c	2005-08-30 12:17:31.208291595 -0500
@@ -44,6 +44,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include "validate.h"
 #include "thread.h"
@@ -92,7 +93,7 @@
 int linux_no_threads_p = 0;
 
 void
-os_init(void)
+os_init(char *argv[], char *envp[])
 {
     /* Conduct various version checks: do we have enough mmap(), is
      * this a sparc running 2.2, can we do threads? */
@@ -117,7 +118,7 @@
         FSHOW((stderr,"linux kernel %d.%d predates 2.4;\n enabling workarounds for SPARC kernel bugs in signal handling.\n", major_version,minor_version));
         linux_sparc_siginfo_bug = 1;
 #endif
-    }
+    }   
 #ifdef LISP_FEATURE_SB_THREAD
     futex_wait(futex,-1);
     if(errno==ENOSYS)  linux_no_threads_p = 1;
@@ -125,6 +126,36 @@
         fprintf(stderr,"Linux with NPTL support (e.g. kernel 2.6 or newer) required for \nthread-enabled SBCL.  Disabling thread support.\n\n");
 #endif
     os_vm_page_size = getpagesize();
+   
+    /* KLUDGE: Disable memory randomization on new Linux kernels
+     * by setting a personality flag and re-executing. (We need
+     * to re-execute, since the memory maps that can conflict with
+     * the SBCL spaces have already been done at this point).
+     */
+#if defined(LISP_FEATURE_X86)
+    if ((major_version == 2) && (minor_version >= 6) || (major_version >= 3)) {
+       long pers = personality(-1);
+       /* 0x40000 aka. ADDR_NO_RANDOMIZE */
+       if (!(pers & 0x40000)) {
+	 if (personality(pers | 0x40000) != -1) {
+	     /* Use /proc/self/exe instead of trying to figure out the
+	      * executable path from PATH and argv[0], since that's reliable.
+	      */
+	     char buf[PATH_MAX+1];
+	     int rc = readlink("/proc/self/exe", buf, PATH_MAX);
+             if ( rc > 0 ) {
+	       buf[rc]=0;
+	       execve(buf, argv, envp);
+	     }
+	  }
+	  /* Either changing the personality or execve() failed. Either
+	   * way we might as well continue, and hope that the random
+	   * memory maps are ok this time around.
+	   */
+	  fprintf(stderr, "WARNING: Couldn't re-execute SBCL with the proper personality flags (maybe /proc isn't mounted?). Trying to continue anyway.\n");
+       }
+    }     
+#endif   
 }
 
 
--- sbcl-0.9.4/src/runtime/osf1-os.c.ADDR_NO_RANDOMIZE	2005-07-14 10:41:20.000000000 -0500
+++ sbcl-0.9.4/src/runtime/osf1-os.c	2005-08-30 12:16:42.783282706 -0500
@@ -51,7 +51,8 @@
 
 
 
-void os_init(void)
+void
+os_init(char *argv[], char *envp[])
 {
     os_vm_page_size = getpagesize();
 }
--- sbcl-0.9.4/src/runtime/bsd-os.c.ADDR_NO_RANDOMIZE	2005-07-14 10:41:11.000000000 -0500
+++ sbcl-0.9.4/src/runtime/bsd-os.c	2005-08-30 12:16:42.784282665 -0500
@@ -51,7 +51,8 @@
 static void netbsd_init();
 #endif /* __NetBSD__ */
 
-void os_init(void)
+void
+os_init(char *argv[], char *envp[])
 {
     os_vm_page_size = getpagesize();
 
--- sbcl-0.9.4/src/runtime/runtime.c.ADDR_NO_RANDOMIZE	2005-08-30 12:16:42.778282911 -0500
+++ sbcl-0.9.4/src/runtime/runtime.c	2005-08-30 12:16:42.785282623 -0500
@@ -194,7 +194,7 @@
     /* KLUDGE: os_vm_page_size is set by os_init(), and on some
      * systems (e.g. Alpha) arch_init() needs need os_vm_page_size, so
      * it must follow os_init(). -- WHN 2000-01-26 */
-    os_init();
+    os_init(argv, envp);
     arch_init();
     gc_init();
     validate();
--- sbcl-0.9.4/src/runtime/sunos-os.c.ADDR_NO_RANDOMIZE	2005-08-19 07:15:16.000000000 -0500
+++ sbcl-0.9.4/src/runtime/sunos-os.c	2005-08-30 12:16:42.786282582 -0500
@@ -53,7 +53,8 @@
 int KLUDGE_MAYBE_MAP_ANON = 0x0;
 int kludge_mmap_fd = -1; /* default for MAP_ANON */
 
-void os_init(void)
+void
+os_init(char *argv[], char *envp[])
 {
     struct utsname name;
     int major_version;

sbcl-0.9.4-optflags.patch:

--- NEW FILE sbcl-0.9.4-optflags.patch ---
--- sbcl-0.9.4/src/runtime/GNUmakefile.optflags	2005-08-19 07:15:15.000000000 -0500
+++ sbcl-0.9.4/src/runtime/GNUmakefile	2005-08-30 10:24:17.010651427 -0500
@@ -22,7 +22,8 @@
 DEPEND_FLAGS = -MM
 GREP = grep
 
-CFLAGS = -g -Wall -O3
+#CFLAGS = -g -Wall -O3
+CFLAGS = $(RPM_OPT_FLAGS)
 ASFLAGS = $(CFLAGS)
 CPPFLAGS = -I.
 


--- NEW FILE sbcl.sh ---
#!/bin/sh

if [ -z "$SBCL_HOME" ] ; then
SBCL_HOME=/usr/lib/sbcl
export SBCL_HOME
fi

if [ -z "$SBCL_SETARCH" ] ; then
BCL_SETARCH="setarch i386 -R"
fi

exec ${SBCL_SETARCH} ${SBCL_HOME}/sbcl ${1+"$@"}


--- NEW FILE sbcl.spec ---
# $Id: sbcl.spec,v 1.8 2003/11/12 16:47:44 rexdieter Exp $

## Default to using a local bootstrap, 
## define one of the following to override 
## (non sbcl bootstraps untested)
#define bootstrap sbcl
#define bootstrap cmucl
#define bootstrap clisp

%if "%{?fedora}" >= "3"
BuildRequires:setarch
Requires:setarch
%define setarch setarch %{_target_cpu}
%endif

#  Could test for setarch >= 1.7 instead
%if "%{?fedora}" >= "4"
%define setarch setarch %{_target_cpu} -R
%endif

Name: 	 sbcl
Summary: Steel Bank Common Lisp
Version: 0.9.4
Release: 4%{?dist}

License: BSD/MIT
Group: 	 Development/Languages
URL:	 http://sbcl.sourceforge.net/
Source0:  http://dl.sourceforge.net/sourceforge/sbcl/sbcl-%{version}-source.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
#ExclusiveArch: %{ix86} x86_64

Source1: sbcl.sh

%if "%{?bootstrap}" == "%{nil}"
# local Bootstrap binaries
Source10: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-%{version}-x86-linux-binary.tar.bz2
%ifarch %{ix86}
%define bootstrap_src -a 10 
%endif
Source11: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-%{version}-x86-64-linux-binary.tar.bz2
%ifarch %{x86_64}
%define bootstrap_src -a 11 
%endif
# Latest powerpc-linux bootstrap (untested)
Source12: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.8.15-powerpc-linux-binary.tar.bz2
%ifarch ppc 
%define bootstrap_src -a 12
%endif

%endif

Patch1: sbcl-0.8.18-default-sbcl-home.patch
# See http://sourceforge.net/mailarchive/message.php?msg_id=12787069
Patch2: sbcl-0.9.4-ADDR_NO_RANDOMIZE.patch
Patch3: sbcl-0.9.4-optflags.patch

%{?bootstrap:BuildRequires: %{?bootstrap}}

Requires(post): /sbin/install-info
Requires(preun): /sbin/install-info
# doc generation
BuildRequires: ghostscript
BuildRequires: texinfo

%description
Steel Bank Common Lisp (SBCL) is a Open Source development environment
for Common Lisp. It includes an integrated native compiler,
interpreter, and debugger.


%prep
%setup -q %{?bootstrap_src} 

#sed -i -e "s|/usr/local/lib/sbcl/|%{_libdir}/sbcl/|" src/runtime/runtime.c
#or patch to use SBCL_HOME env var
%patch1 -p0 -b .default-sbcl-home
%patch2 -p1 -b .ADDR_NO_RANDOMIZE
%patch3 -p1 -b .optflags

# http://article.gmane.org/gmane.lisp.steel-bank.general/340
# enable threads (was only for >= 2.6, but code has checks to disable for <= 2.4)
## FIXME(?): per section 2.2 of INSTALL, should create/use customize-target-features.lisp
## to customize features -- Rex
#define kernel_ver %(uname -r | cut -d- -f1 | cut -d. -f-2 )
#if "%{?kernel_ver}" >= "2.6"
%ifarch %{ix86} %{x86_64}
sed -i -e "s|; :sb-thread|:sb-thread|" base-target-features.lisp-expr
%endif
#endif

%if "%{?bootstrap}" == "%{nil}"
mkdir sbcl-bootstrap
pushd sbcl-%{version}-*-linux
chmod +x install.sh
INSTALL_ROOT=`pwd`/../sbcl-bootstrap ./install.sh
popd
%endif


%build
export DEFAULT_SBCL_HOME=%{_libdir}/sbcl

%if "%{?bootstrap}" == "%{nil}"
export SBCL_HOME=`pwd`/sbcl-bootstrap/lib/sbcl
export PATH=`pwd`/sbcl-bootstrap/bin:${PATH}
%endif

%{?setarch} ./make.sh %{?bootstrap}

# docs
make -C doc/manual html info


%check || :
%if "%{?_with_check:1}" == "1"
pushd tests 
%{?setarch} sh ./run-tests.sh 
popd
%endif


%install
rm -rf $RPM_BUILD_ROOT

mkdir -p $RPM_BUILD_ROOT{%{_bindir},%{_libdir},%{_mandir}}
export INSTALL_ROOT=$RPM_BUILD_ROOT%{_prefix}
unset SBCL_HOME ||:
%{?setarch} sh ./install.sh

# app-wrapper for using setarch
%if 0
%if "%{?setarch}" != "%{nil}"
mv $RPM_BUILD_ROOT%{_bindir}/sbcl $RPM_BUILD_ROOT%{_libdir}/sbcl/sbcl
install -p -m755 %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/sbcl
sed -i -e "s|^SBCL_SETARCH=.*|SBCL_SETARCH=\"%{setarch}\"|" $RPM_BUILD_ROOT%{_bindir}/sbcl
%endif
%endif

## Unpackaged files
rm -rf $RPM_BUILD_ROOT%{_docdir}/sbcl
rm -f  $RPM_BUILD_ROOT%{_infodir}/dir

# CVS crud
find $RPM_BUILD_ROOT -name CVS -type d | xargs rm -rf
find $RPM_BUILD_ROOT -name '.cvsignore' | xargs rm -f
# from make check
find $RPM_BUILD_ROOT -name 'test-passed' | xargs rm -f
# 
find $RPM_BUILD_ROOT -name '*.c' | xargs chmod 644 


%post
/sbin/install-info %{_infodir}/sbcl.info %{_infodir}/dir ||:
/sbin/install-info %{_infodir}/asdf.info %{_infodir}/dir ||:


%postun
if [ $1 -eq 0 ]; then
  /sbin/install-info --delete %{_infodir}/sbcl.info %{_infodir}/dir ||:
  /sbin/install-info --delete %{_infodir}/asdf.info %{_infodir}/dir ||:
fi


%files
%defattr(-,root,root)
%doc BUGS COPYING README CREDITS NEWS TLA TODO
%doc SUPPORT STYLE PRINCIPLES
%doc doc/manual/sbcl
%doc doc/manual/asdf
%{_bindir}/*
%{_libdir}/sbcl/
%{_mandir}/man?/*
%{_infodir}/*


%clean
rm -rf $RPM_BUILD_ROOT


%changelog
* Tue Aug 30 2005 Rex Dieter  0.9.4-4
- safer NO_ADDR_RANDOMIZE patch
- use %%{?setarch} in %%check too

* Tue Aug 30 2005 Rex Dieter  0.9.4-3
- patch to avoid need to use setarch/app-wrapper
- fix app-wrapper (quote SBCL_SETARCH)
- include ppc bootstrap (oldish 0.8.15, untested)

* Mon Aug 29 2005 Rex Dieter  0.9.4-2
- rm -f /usr/share/info/dir
- fix perms on packaged .c files
- include all bootstrap binaries
- Requires(post,preun): /sbin/install-info
- sbcl.sh app-wrapper (when using setarch)

* Sat Aug 27 2005 Rex Dieter  0.9.4-1
- 0.9.4

* Fri Aug 26 2005 Rex Dieter  0.9.3-2
- fc3: setarch %%{target_cpu}
- fc4: setarch %%{target_cpu} -R

* Thu Aug 25 2005 Rex Dieter 
- run tests
- allow for sbcl_local, sbcl, clisp bootstrap

* Wed Aug 17 2005 Gerard Milmeister  - 0.9.3-1
- New Version 0.9.3

* Wed Jun 29 2005 Gerard Milmeister  - 0.9.2-1
- New Version 0.9.2

* Thu Jun 16 2005 Gerard Milmeister  - 0.9.1-1
- New Version 0.9.1

* Thu Apr 28 2005 Gerard Milmeister  - 0.9.0-1
- New Version 0.9.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sbcl/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	12 Sep 2005 12:35:18 -0000	1.1
+++ .cvsignore	12 Sep 2005 12:36:44 -0000	1.2
@@ -0,0 +1,4 @@
+sbcl-0.8.15-powerpc-linux-binary.tar.bz2
+sbcl-0.9.4-source.tar.bz2
+sbcl-0.9.4-x86-64-linux-binary.tar.bz2
+sbcl-0.9.4-x86-linux-binary.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sbcl/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	12 Sep 2005 12:35:18 -0000	1.1
+++ sources	12 Sep 2005 12:36:44 -0000	1.2
@@ -0,0 +1,4 @@
+3a72d0785ce0a8e02f9af632c2a4f217  sbcl-0.8.15-powerpc-linux-binary.tar.bz2
+a0420dc6236efece72c1c80ee15873c9  sbcl-0.9.4-source.tar.bz2
+67ec41e624a3f2ad7f6f3cde1bd001d3  sbcl-0.9.4-x86-64-linux-binary.tar.bz2
+947d1cde2c1c80416b5f9fb4e4c81383  sbcl-0.9.4-x86-linux-binary.tar.bz2



From fedora-extras-commits at redhat.com  Mon Sep 12 12:39:40 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon, 12 Sep 2005 08:39:40 -0400
Subject: rpms/sbcl/devel sbcl.sh,1.1,1.2
Message-ID: <200509121239.j8CCdeid023631@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/sbcl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23609

Modified Files:
	sbcl.sh 
Log Message:
BCL_SETARCH -> SBCL_SETARCH (typo)
support global /etc/sysconfig/sbcl config



Index: sbcl.sh
===================================================================
RCS file: /cvs/extras/rpms/sbcl/devel/sbcl.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sbcl.sh	12 Sep 2005 12:36:44 -0000	1.1
+++ sbcl.sh	12 Sep 2005 12:39:38 -0000	1.2
@@ -1,12 +1,17 @@
 #!/bin/sh
 
+# Source global config, if it exists
+if [ -f /etc/sysconfig/sbcl ]; then
+  source /etc/sysconfig/sbcl
+fi
+
 if [ -z "$SBCL_HOME" ] ; then
 SBCL_HOME=/usr/lib/sbcl
 export SBCL_HOME
 fi
 
 if [ -z "$SBCL_SETARCH" ] ; then
-BCL_SETARCH="setarch i386 -R"
+SBCL_SETARCH="setarch i386 -R"
 fi
 
 exec ${SBCL_SETARCH} ${SBCL_HOME}/sbcl ${1+"$@"}



From fedora-extras-commits at redhat.com  Mon Sep 12 14:22:14 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 12 Sep 2005 10:22:14 -0400
Subject: rpms/check - New directory
Message-ID: <200509121422.j8CEMEID026536@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/check
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26515/check

Log Message:
Directory /cvs/extras/rpms/check added to the repository




From fedora-extras-commits at redhat.com  Mon Sep 12 14:22:15 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 12 Sep 2005 10:22:15 -0400
Subject: rpms/check/devel - New directory
Message-ID: <200509121422.j8CEMF5B026541@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/check/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26515/check/devel

Log Message:
Directory /cvs/extras/rpms/check/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Sep 12 14:22:39 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 12 Sep 2005 10:22:39 -0400
Subject: rpms/check Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200509121422.j8CEMdqg026596@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/check
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26561

Added Files:
	Makefile import.log 
Log Message:
Setup of module check


--- NEW FILE Makefile ---
# Top level Makefile for module check
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Mon Sep 12 14:22:40 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 12 Sep 2005 10:22:40 -0400
Subject: rpms/check/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200509121422.j8CEMefT026601@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/check/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26561/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module check


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Mon Sep 12 14:23:08 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 12 Sep 2005 10:23:08 -0400
Subject: rpms/check import.log,1.1,1.2
Message-ID: <200509121423.j8CEN8hW026676@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/check
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26639

Modified Files:
	import.log 
Log Message:
auto-import check-0.9.3-1 on branch devel from check-0.9.3-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/check/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	12 Sep 2005 14:22:37 -0000	1.1
+++ import.log	12 Sep 2005 14:23:06 -0000	1.2
@@ -0,0 +1 @@
+check-0_9_3-1:HEAD:check-0.9.3-1.src.rpm:1126534980



From fedora-extras-commits at redhat.com  Mon Sep 12 14:23:09 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 12 Sep 2005 10:23:09 -0400
Subject: rpms/check/devel check-0.9.2-fPIC.patch, NONE,
	1.1 check-0.9.2-shared.patch, NONE, 1.1 check.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200509121423.j8CEN9UD026687@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/check/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26639/devel

Modified Files:
	.cvsignore sources 
Added Files:
	check-0.9.2-fPIC.patch check-0.9.2-shared.patch check.spec 
Log Message:
auto-import check-0.9.3-1 on branch devel from check-0.9.3-1.src.rpm

check-0.9.2-fPIC.patch:

--- NEW FILE check-0.9.2-fPIC.patch ---
--- check-0.9.2/configure.BAD	2005-08-14 16:01:27.000000000 -0500
+++ check-0.9.2/configure	2005-08-14 16:01:41.000000000 -0500
@@ -1181,7 +1181,7 @@
 fi
 
 if test -n "$GCC"; then
-   CFLAGS="$CFLAGS -Wall -Wstrict-prototypes -Wmissing-prototypes -Wwrite-strings"
+   CFLAGS="$CFLAGS -Wall -Wstrict-prototypes -Wmissing-prototypes -Wwrite-strings -fPIC"
 fi
 # Extract the first word of "docbook2html", so it can be a program name with args.
 set dummy docbook2html; ac_word=$2

check-0.9.2-shared.patch:

--- NEW FILE check-0.9.2-shared.patch ---
--- check-0.9.2/src/Makefile.in.BAD	2005-08-14 15:53:24.000000000 -0500
+++ check-0.9.2/src/Makefile.in	2005-08-14 15:52:45.000000000 -0500
@@ -74,7 +74,10 @@
 VERSION = @VERSION@
 have_docbook2html = @have_docbook2html@
 
-lib_LIBRARIES = libcheck.a
+lib_LIBRARIES_static = libcheck.a
+lib_LIBRARIES_shared = libcheck.so.0.0.0
+
+lib_LIBRARIES = $(lib_LIBRARIES_static) $(lib_LIBRARIES_shared)
 
 include_HEADERS = check.h
 
@@ -144,7 +147,7 @@
 	  else :; fi; \
 	done
 	@$(POST_INSTALL)
-	@list='$(lib_LIBRARIES)'; for p in $$list; do \
+	@list='$(lib_LIBRARIES_static)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    echo " $(RANLIB) $(DESTDIR)$(libdir)/$$p"; \
 	    $(RANLIB) $(DESTDIR)$(libdir)/$$p; \
@@ -181,6 +184,10 @@
 	$(AR) cru libcheck.a $(libcheck_a_OBJECTS) $(libcheck_a_LIBADD)
 	$(RANLIB) libcheck.a
 
+libcheck.so.0.0.0: $(libcheck_a_OBJECTS) $(libcheck_a_DEPENDENCIES)
+	-rm -f libcheck.so.0.0.0
+	$(COMPILE) -shared -Wl,-soname,libcheck.so.0 -o $@ $?
+
 install-includeHEADERS: $(include_HEADERS)
 	@$(NORMAL_INSTALL)
 	$(mkinstalldirs) $(DESTDIR)$(includedir)


--- NEW FILE check.spec ---
Name:		check
Version:	0.9.3
Release:	1%{?dist}
Summary:	A unit test framework for C
Source0:	http://download.sourceforge.net/check/%{name}-%{version}.tar.gz
Group:		Development/Tools
License:	LGPL
URL:		http://check.sourceforge.net/
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:	docbook-utils
Patch0:		check-0.9.2-shared.patch
Patch1:		check-0.9.2-fPIC.patch

%description
Check is a unit test framework for C. It features a simple interface for 
defining unit tests, putting little in the way of the developer. Tests 
are run in a separate address space, so Check can catch both assertion 
failures and code errors that cause segmentation faults or other signals. 
The output from unit tests can be used within source code editors and IDEs.

%package devel
Summary:	Libraries and headers for developing programs with check
Group:		Development/Libraries
Requires:	%{name} = %{version}-%{release}

%description devel
%{summary}.

%prep
%setup -q
%patch0 -p1
%patch1 -p1

%build
%configure
make

%install
rm -rf $RPM_BUILD_ROOT
make DESTDIR=$RPM_BUILD_ROOT install
cd $RPM_BUILD_ROOT/%{_libdir}
chmod +x libcheck.so.0.0.0
ln -s libcheck.so.0.0.0 libcheck.so.0
ln -s libcheck.so.0.0.0 libcheck.so

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%{_libdir}/libcheck.so.*
%{_datadir}/doc/%{name}-%{version}
%{_datadir}/aclocal/check.m4

%files devel
%defattr(-,root,root,-)
%{_includedir}/check.h
%{_libdir}/libcheck.a
%{_libdir}/libcheck.so

%changelog
* Sun Aug 14 2005 Tom "spot" Callaway  0.9.2-1
- initial package for Fedora Extras


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/check/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	12 Sep 2005 14:22:38 -0000	1.1
+++ .cvsignore	12 Sep 2005 14:23:07 -0000	1.2
@@ -0,0 +1 @@
+check-0.9.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/check/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	12 Sep 2005 14:22:38 -0000	1.1
+++ sources	12 Sep 2005 14:23:07 -0000	1.2
@@ -0,0 +1 @@
+6e5870f7c9c5414572158d8005e91d68  check-0.9.3.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 12 14:26:21 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 12 Sep 2005 10:26:21 -0400
Subject: owners owners.list,1.190,1.191
Message-ID: <200509121426.j8CEQL6n026949@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26930

Modified Files:
	owners.list 
Log Message:

check



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.190
retrieving revision 1.191
diff -u -r1.190 -r1.191
--- owners.list	11 Sep 2005 20:45:12 -0000	1.190
+++ owners.list	12 Sep 2005 14:26:19 -0000	1.191
@@ -80,6 +80,7 @@
 Fedora Extras|cfengine|GNU cfengine - a systems administration tool for networks|sheltren at cs.ucsb.edu|extras-qa at fedoraproject.org|
 Fedora Extras|cfs|An userspace crypto-filesystem|enrico.scholz at informatik.tu-chemnitz.de|extras-qa at fedoraproject.org|
 Fedora Extras|cgoban|X board for playing go|compton at pcompton.com|extras-qa at fedoraproject.org|
+Fedora Extras|check|A unit test framework for C|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|chkrootkit|A tool to locally check for signs of a rootkit|bugs.michael at gmx.net|extras-qa at fedoraproject.org|
 Fedora Extras|cksfv|Utility to manipulate SFV files|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|clamav|End-user tools for the Clam Antivirus scanner|enrico.scholz at informatik.tu-chemnitz.de|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Mon Sep 12 14:40:54 2005
From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo))
Date: Mon, 12 Sep 2005 10:40:54 -0400
Subject: rpms/scim-skk - New directory
Message-ID: <200509121440.j8CEes2d027293@cvs-int.fedora.redhat.com>

Author: ryo

Update of /cvs/extras/rpms/scim-skk
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27269/scim-skk

Log Message:
Directory /cvs/extras/rpms/scim-skk added to the repository




From fedora-extras-commits at redhat.com  Mon Sep 12 14:40:54 2005
From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo))
Date: Mon, 12 Sep 2005 10:40:54 -0400
Subject: rpms/scim-skk/devel - New directory
Message-ID: <200509121440.j8CEes97027298@cvs-int.fedora.redhat.com>

Author: ryo

Update of /cvs/extras/rpms/scim-skk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27269/scim-skk/devel

Log Message:
Directory /cvs/extras/rpms/scim-skk/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Sep 12 14:41:20 2005
From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo))
Date: Mon, 12 Sep 2005 10:41:20 -0400
Subject: rpms/scim-skk Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200509121441.j8CEfKIY027343@cvs-int.fedora.redhat.com>

Author: ryo

Update of /cvs/extras/rpms/scim-skk
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27314

Added Files:
	Makefile import.log 
Log Message:
Setup of module scim-skk


--- NEW FILE Makefile ---
# Top level Makefile for module scim-skk
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Mon Sep 12 14:41:21 2005
From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo))
Date: Mon, 12 Sep 2005 10:41:21 -0400
Subject: rpms/scim-skk/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200509121441.j8CEfL0b027348@cvs-int.fedora.redhat.com>

Author: ryo

Update of /cvs/extras/rpms/scim-skk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27314/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module scim-skk


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Mon Sep 12 14:42:08 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 12 Sep 2005 10:42:08 -0400
Subject: owners owners.list,1.191,1.192
Message-ID: <200509121442.j8CEg8Rw027396@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27377

Modified Files:
	owners.list 
Log Message:

perl-Apache-Session-Wrapper|A simple wrapper around Apache::Session



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.191
retrieving revision 1.192
diff -u -r1.191 -r1.192
--- owners.list	12 Sep 2005 14:26:19 -0000	1.191
+++ owners.list	12 Sep 2005 14:42:06 -0000	1.192
@@ -562,6 +562,7 @@
 Fedora Extras|pdftohtml|A PDF to HTML converter|gauret at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|perl-Algorithm-Diff|Algorithm::Diff Perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Apache-LogRegex|Perl module for parsing a line from an Apache logfile into a hash|ghenry at suretecsystems.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Apache-Session-Wrapper|A simple wrapper around Apache::Session|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-AppConfig|Perl module for reading configuration files|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Archive-Zip|Perl library for accessing Zip archives|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Array-Compare|Perl extension for comparing arrays|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Mon Sep 12 14:42:36 2005
From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo))
Date: Mon, 12 Sep 2005 10:42:36 -0400
Subject: rpms/scim-skk import.log,1.1,1.2
Message-ID: <200509121443.j8CEh7Do027455@cvs-int.fedora.redhat.com>

Author: ryo

Update of /cvs/extras/rpms/scim-skk
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27412

Modified Files:
	import.log 
Log Message:
auto-import scim-skk-0.3.0-2 on branch devel from scim-skk-0.3.0-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/scim-skk/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	12 Sep 2005 14:41:18 -0000	1.1
+++ import.log	12 Sep 2005 14:42:34 -0000	1.2
@@ -0,0 +1 @@
+scim-skk-0_3_0-2:HEAD:scim-skk-0.3.0-2.src.rpm:1126536144



From fedora-extras-commits at redhat.com  Mon Sep 12 14:42:36 2005
From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo))
Date: Mon, 12 Sep 2005 10:42:36 -0400
Subject: rpms/scim-skk/devel no-dictionary.diff, NONE, 1.1 scim-skk.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200509121443.j8CEh7m3027456@cvs-int.fedora.redhat.com>

Author: ryo

Update of /cvs/extras/rpms/scim-skk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27412/devel

Modified Files:
	.cvsignore sources 
Added Files:
	no-dictionary.diff scim-skk.spec 
Log Message:
auto-import scim-skk-0.3.0-2 on branch devel from scim-skk-0.3.0-2.src.rpm

no-dictionary.diff:

--- NEW FILE no-dictionary.diff ---
--- src/scim_skk_dictionary-old.cpp	2005-08-27 11:05:52.000000000 +0900
+++ src/scim_skk_dictionary.cpp	2005-08-27 11:07:38.000000000 +0900
@@ -233,6 +233,10 @@
 
     converter.convert(key_s, key);
 
+	if(indice.size() == 0) {
+		return;
+	}
+	
     ub = indice.size();
     lb = 0;
 


--- NEW FILE scim-skk.spec ---
Name:		scim-skk
Version:	0.3.0
Release:	2%{?dist}
Summary:	SCIM IMEngine module for skk

Group:		System Environment/Libraries
License:	GPL
URL:            http://scim-imengine.sourceforge.jp/
Source0:        http://sourceforge.jp/projects/scim-imengine/files/%{name}-%{version}.tar.gz
Patch0:         no-dictionary.diff
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:       skkdic
BuildRequires:  scim-devel

%description
Scim-skk is a SCIM IMEngine module for skk to support Japanese input.


%prep
%setup -q
%patch0 -p0


%build
%configure --disable-static
make  %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make DESTDIR=${RPM_BUILD_ROOT} install

rm $RPM_BUILD_ROOT%{_libdir}/scim-1.0/{IMEngine,SetupUI}/*.la

%find_lang %{name}


%clean
rm -rf $RPM_BUILD_ROOT


%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING NEWS README ChangeLog
%{_libdir}/scim-1.0/IMEngine/skk.so
%{_libdir}/scim-1.0/SetupUI/skk-imengine-setup.so
%{_datadir}/scim/icons/scim-skk.png


%changelog
* Tue Sep  6 2005 Ryo Dairiki  - 0.3.0-2
- initial packaging for Fedora Extras
- cleanup specfile (Jens Petersen)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/scim-skk/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	12 Sep 2005 14:41:19 -0000	1.1
+++ .cvsignore	12 Sep 2005 14:42:34 -0000	1.2
@@ -0,0 +1 @@
+scim-skk-0.3.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/scim-skk/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	12 Sep 2005 14:41:19 -0000	1.1
+++ sources	12 Sep 2005 14:42:34 -0000	1.2
@@ -0,0 +1 @@
+8ff1eebd49f62a5d19d21513d884402c  scim-skk-0.3.0.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 12 14:43:59 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 12 Sep 2005 10:43:59 -0400
Subject: rpms/perl-Apache-Session-Wrapper - New directory
Message-ID: <200509121443.j8CEhx37027559@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Apache-Session-Wrapper
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27535/perl-Apache-Session-Wrapper

Log Message:
Directory /cvs/extras/rpms/perl-Apache-Session-Wrapper added to the repository




From fedora-extras-commits at redhat.com  Mon Sep 12 14:43:59 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 12 Sep 2005 10:43:59 -0400
Subject: rpms/perl-Apache-Session-Wrapper/devel - New directory
Message-ID: <200509121444.j8CEhxSI027564@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Apache-Session-Wrapper/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27535/perl-Apache-Session-Wrapper/devel

Log Message:
Directory /cvs/extras/rpms/perl-Apache-Session-Wrapper/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Sep 12 14:44:15 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 12 Sep 2005 10:44:15 -0400
Subject: rpms/perl-Apache-Session-Wrapper Makefile, NONE, 1.1 import.log,
	NONE, 1.1
Message-ID: <200509121444.j8CEiFn2027616@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Apache-Session-Wrapper
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27584

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-Apache-Session-Wrapper


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Apache-Session-Wrapper
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Mon Sep 12 14:44:15 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 12 Sep 2005 10:44:15 -0400
Subject: rpms/perl-Apache-Session-Wrapper/devel .cvsignore, NONE,
	1.1 Makefile, NONE, 1.1 sources, NONE, 1.1
Message-ID: <200509121444.j8CEiFu9027621@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Apache-Session-Wrapper/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27584/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Apache-Session-Wrapper


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Mon Sep 12 14:44:41 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 12 Sep 2005 10:44:41 -0400
Subject: rpms/perl-Apache-Session-Wrapper import.log,1.1,1.2
Message-ID: <200509121444.j8CEifkk027690@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Apache-Session-Wrapper
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27655

Modified Files:
	import.log 
Log Message:
auto-import perl-Apache-Session-Wrapper-0.25-2 on branch devel from perl-Apache-Session-Wrapper-0.25-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Apache-Session-Wrapper/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	12 Sep 2005 14:44:13 -0000	1.1
+++ import.log	12 Sep 2005 14:44:39 -0000	1.2
@@ -0,0 +1 @@
+perl-Apache-Session-Wrapper-0_25-2:HEAD:perl-Apache-Session-Wrapper-0.25-2.src.rpm:1126536272



From fedora-extras-commits at redhat.com  Mon Sep 12 14:44:42 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 12 Sep 2005 10:44:42 -0400
Subject: rpms/perl-Apache-Session-Wrapper/devel
	perl-Apache-Session-Wrapper.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200509121444.j8CEigLS027697@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Apache-Session-Wrapper/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27655/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Apache-Session-Wrapper.spec 
Log Message:
auto-import perl-Apache-Session-Wrapper-0.25-2 on branch devel from perl-Apache-Session-Wrapper-0.25-2.src.rpm


--- NEW FILE perl-Apache-Session-Wrapper.spec ---
Name:           perl-Apache-Session-Wrapper
Version:        0.25
Release:        2%{?dist}
Summary:        A simple wrapper around Apache::Session
Group:          Development/Libraries
License:        GPL or Artistic
URL:            http://search.cpan.org/dist/Apache-Session-Wrapper
Source0:        http://search.cpan.org/CPAN/authors/id/D/DR/DROLSKY/Apache-Session-Wrapper-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:	perl(Apache2::Cookie), perl(Apache::Session), perl(Class::Container), perl(Exception::Class)
BuildRequires:	perl(Params::Validate), perl(Module::Build), perl(Test::Pod)
Requires:	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
Requires:	perl(Class::Container)

%description
%{summary}.

%prep
%setup -q -n Apache-Session-Wrapper-%{version}

%build
%{__perl} Build.PL installdirs=vendor
./Build

%install
rm -rf $RPM_BUILD_ROOT
./Build install destdir=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'
find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';'
chmod -R u+w $RPM_BUILD_ROOT/*

%check
./Build test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes LICENSE
%{perl_vendorlib}/Apache/Session/
%{_mandir}/man3/*.3*


%changelog
* Mon Sep 12 2005 Paul Howarth  0.25-2
- Use Module::Build
- Add dep perl(Class::Container)
- Add BR: perl(Test::Pod) for better test coverage


* Wed Sep  7 2005 Tom "spot" Callaway  0.25-1
- Initial package for Fedora Extras


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Apache-Session-Wrapper/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	12 Sep 2005 14:44:13 -0000	1.1
+++ .cvsignore	12 Sep 2005 14:44:40 -0000	1.2
@@ -0,0 +1 @@
+Apache-Session-Wrapper-0.25.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Apache-Session-Wrapper/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	12 Sep 2005 14:44:13 -0000	1.1
+++ sources	12 Sep 2005 14:44:40 -0000	1.2
@@ -0,0 +1 @@
+fb9b36ff0bef82c537a0f05edd846832  Apache-Session-Wrapper-0.25.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 12 15:00:02 2005
From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc))
Date: Mon, 12 Sep 2005 11:00:02 -0400
Subject: rpms/gnome-translate - New directory
Message-ID: <200509121500.j8CF02ew028169@cvs-int.fedora.redhat.com>

Author: buc

Update of /cvs/extras/rpms/gnome-translate
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28145/gnome-translate

Log Message:
Directory /cvs/extras/rpms/gnome-translate added to the repository




From fedora-extras-commits at redhat.com  Mon Sep 12 15:00:02 2005
From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc))
Date: Mon, 12 Sep 2005 11:00:02 -0400
Subject: rpms/gnome-translate/devel - New directory
Message-ID: <200509121500.j8CF02e3028174@cvs-int.fedora.redhat.com>

Author: buc

Update of /cvs/extras/rpms/gnome-translate/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28145/gnome-translate/devel

Log Message:
Directory /cvs/extras/rpms/gnome-translate/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Sep 12 15:00:20 2005
From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc))
Date: Mon, 12 Sep 2005 11:00:20 -0400
Subject: rpms/gnome-translate Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200509121500.j8CF0Kxb028227@cvs-int.fedora.redhat.com>

Author: buc

Update of /cvs/extras/rpms/gnome-translate
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28191

Added Files:
	Makefile import.log 
Log Message:
Setup of module gnome-translate


--- NEW FILE Makefile ---
# Top level Makefile for module gnome-translate
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Mon Sep 12 15:00:20 2005
From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc))
Date: Mon, 12 Sep 2005 11:00:20 -0400
Subject: rpms/gnome-translate/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200509121500.j8CF0Kp4028232@cvs-int.fedora.redhat.com>

Author: buc

Update of /cvs/extras/rpms/gnome-translate/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28191/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module gnome-translate


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Mon Sep 12 15:01:02 2005
From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc))
Date: Mon, 12 Sep 2005 11:01:02 -0400
Subject: rpms/gnome-translate import.log,1.1,1.2
Message-ID: <200509121501.j8CF1Weh029579@cvs-int.fedora.redhat.com>

Author: buc

Update of /cvs/extras/rpms/gnome-translate
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28266

Modified Files:
	import.log 
Log Message:
auto-import gnome-translate-0.99-3 on branch devel from gnome-translate-0.99-3.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/gnome-translate/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	12 Sep 2005 15:00:17 -0000	1.1
+++ import.log	12 Sep 2005 15:01:00 -0000	1.2
@@ -0,0 +1 @@
+gnome-translate-0_99-3:HEAD:gnome-translate-0.99-3.src.rpm:1126537250



From fedora-extras-commits at redhat.com  Mon Sep 12 15:01:02 2005
From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc))
Date: Mon, 12 Sep 2005 11:01:02 -0400
Subject: rpms/gnome-translate/devel gnome-translate.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200509121501.j8CF121l029374@cvs-int.fedora.redhat.com>

Author: buc

Update of /cvs/extras/rpms/gnome-translate/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28266/devel

Modified Files:
	.cvsignore sources 
Added Files:
	gnome-translate.spec 
Log Message:
auto-import gnome-translate-0.99-3 on branch devel from gnome-translate-0.99-3.src.rpm


--- NEW FILE gnome-translate.spec ---
Name: gnome-translate
Summary: GNOME interface to libtranslate -- Natural language translator
Version: 0.99
Release: 3%{?dist}
Group: User Interface/Desktops
License: GPL 
URL: http://www.nongnu.org/libtranslate/gnome-translate
Source: http://savannah.nongnu.org/download/libtranslate/gnome-translate-%{version}.tar.gz

BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires: gtk2 >= 2.4.0, GConf2 >= 2.4.0, eel2 >= 2.6.0, pango >= 1.2.0
BuildRequires: gtk2-devel >= 2.4.0, GConf2-devel >= 2.4.0
BuildRequires: eel2-devel >= 2.6.0, libtranslate-devel, aspell-devel

BuildRequires: desktop-file-utils >= 0.2.90
BuildRequires: startup-notification-devel >= 0.5
BuildRequires: scrollkeeper gettext

# For intltool:
BuildRequires: perl-XML-Parser >= 2.31-16

Requires(pre): GConf2
Requires(post): GConf2, scrollkeeper
Requires(preun): GConf2
Requires(postun): scrollkeeper


%description
GNOME Translate is a GNOME interface to libtranslate library.
It can translate a text or web page between several natural languages,
and it can automatically detect the source language as you type.


%prep
%setup -q


%build

%configure
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT

export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
make install DESTDIR=$RPM_BUILD_ROOT
unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL

desktop-file-install --vendor fedora --delete-original      \
  --dir $RPM_BUILD_ROOT%{_datadir}/applications             \
  --add-only-show-in GNOME                                  \
  --add-category X-Fedora                                   \
  $RPM_BUILD_ROOT%{_datadir}/applications/*

%find_lang %{name}


%clean
rm -rf $RPM_BUILD_ROOT


%pre
if [ "$1" -gt 1 ]; then
    export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
    gconftool-2 --makefile-uninstall-rule \
      %{_sysconfdir}/gconf/schemas/%{name}.schemas >/dev/null || :
    killall -HUP gconfd-2 || :
fi


%post
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null || :
killall -HUP gconfd-2 || :

touch --no-create %{_datadir}/icons/hicolor || :
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi

scrollkeeper-update -q -o %{_datadir}/omf/%{name} || :


%preun
if [ "$1" -eq 0 ]; then
    export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
    gconftool-2 --makefile-uninstall-rule \
      %{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null || :
    killall -HUP gconfd-2 || :
fi


%postun
touch --no-create %{_datadir}/icons/hicolor || :
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi

scrollkeeper-update -q || :


%files -f %{name}.lang
%defattr(-,root,root,-)

%doc AUTHORS COPYING README

%{_bindir}/*
%{_datadir}/%{name}
%{_datadir}/pixmaps/*
%{_datadir}/icons/hicolor/*/apps/*
%{_datadir}/gnome/help/%{name}
%{_datadir}/omf/%{name}
%{_datadir}/applications/*
%{_sysconfdir}/gconf/schemas/%{name}.schemas

%changelog
* Mon Sep 12 2005 Dmitry Butskoy  - 0.99-3
- more spec file cleanups
- accepted for Fedora Extra
  (review by Aurelien Bompard )

* Sat Sep 10 2005 Dmitry Butskoy  - 0.99-2
- clenups (#165960)

* Fri Aug 19 2005 Dmitry Butskoy  - 0.99-1
- Initial release.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-translate/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	12 Sep 2005 15:00:18 -0000	1.1
+++ .cvsignore	12 Sep 2005 15:01:00 -0000	1.2
@@ -0,0 +1 @@
+gnome-translate-0.99.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-translate/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	12 Sep 2005 15:00:18 -0000	1.1
+++ sources	12 Sep 2005 15:01:00 -0000	1.2
@@ -0,0 +1 @@
+359f1bb7edc818034b08ca6c1bd254d0  gnome-translate-0.99.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 12 15:09:01 2005
From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc))
Date: Mon, 12 Sep 2005 11:09:01 -0400
Subject: owners owners.list,1.192,1.193
Message-ID: <200509121509.j8CF9Vha029668@cvs-int.fedora.redhat.com>

Author: buc

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29624

Modified Files:
	owners.list 
Log Message:



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.192
retrieving revision 1.193
diff -u -r1.192 -r1.193
--- owners.list	12 Sep 2005 14:42:06 -0000	1.192
+++ owners.list	12 Sep 2005 15:08:54 -0000	1.193
@@ -255,6 +255,7 @@
 Fedora Extras|gnome-theme-clearlooks|An attractive GTK+ 2 engine with a focus on usability|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
 Fedora Extras|gnome-theme-clearlooks-bigpack|Additional Clearlooks color schemes|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
 Fedora Extras|gnome-themes-extras|Collection of metathemes for the GNOME desktop environment|compton at pcompton.com|extras-qa at fedoraproject.org|
+Fedora Extras|gnome-translate|GNOME interface to libtranslate -- Natural language translator|dmitry at butskoy.name|extras-qa at fedoraproject.org|
 Fedora Extras|gnome-vfsmm26|C++ wrapper for gnome-vfs|denisleroy at yahoo.com|extras-qa at fedoraproject.org|
 Fedora Extras|gnotime|Tracks and reports time spent|toshio at tiki-lounge.com|extras-qa at fedoraproject.org|
 Fedora Extras|gnuchess|The GNU chess program|kaboom at oobleck.net|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Mon Sep 12 15:11:50 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Mon, 12 Sep 2005 11:11:50 -0400
Subject: rpms/perl-Mail-Sender - New directory
Message-ID: <200509121511.j8CFBoVG029766@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Mail-Sender
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29746/perl-Mail-Sender

Log Message:
Directory /cvs/extras/rpms/perl-Mail-Sender added to the repository




From fedora-extras-commits at redhat.com  Mon Sep 12 15:11:50 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Mon, 12 Sep 2005 11:11:50 -0400
Subject: rpms/perl-Mail-Sender/devel - New directory
Message-ID: <200509121511.j8CFBoG4029771@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Mail-Sender/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29746/perl-Mail-Sender/devel

Log Message:
Directory /cvs/extras/rpms/perl-Mail-Sender/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Sep 12 15:12:12 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Mon, 12 Sep 2005 11:12:12 -0400
Subject: rpms/perl-Mail-Sender Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200509121512.j8CFCCam029826@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Mail-Sender
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29791

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-Mail-Sender


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Mail-Sender
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Mon Sep 12 15:12:13 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Mon, 12 Sep 2005 11:12:13 -0400
Subject: rpms/perl-Mail-Sender/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200509121512.j8CFCDHN029831@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Mail-Sender/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29791/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Mail-Sender


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Mon Sep 12 15:12:42 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Mon, 12 Sep 2005 11:12:42 -0400
Subject: rpms/perl-Mail-Sender import.log,1.1,1.2
Message-ID: <200509121512.j8CFCghi029894@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Mail-Sender
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29859

Modified Files:
	import.log 
Log Message:
auto-import perl-Mail-Sender-0.8.10-2 on branch devel from perl-Mail-Sender-0.8.10-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Mail-Sender/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	12 Sep 2005 15:12:10 -0000	1.1
+++ import.log	12 Sep 2005 15:12:40 -0000	1.2
@@ -0,0 +1 @@
+perl-Mail-Sender-0_8_10-2:HEAD:perl-Mail-Sender-0.8.10-2.src.rpm:1126537952



From fedora-extras-commits at redhat.com  Mon Sep 12 15:12:42 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Mon, 12 Sep 2005 11:12:42 -0400
Subject: rpms/perl-Mail-Sender/devel perl-Mail-Sender.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200509121512.j8CFCgDU029901@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Mail-Sender/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29859/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Mail-Sender.spec 
Log Message:
auto-import perl-Mail-Sender-0.8.10-2 on branch devel from perl-Mail-Sender-0.8.10-2.src.rpm


--- NEW FILE perl-Mail-Sender.spec ---
Name:           perl-Mail-Sender
Version:        0.8.10
Release:        2%{?dist}
Summary:        Module for sending mails with attachments through an SMTP server

Group:          Development/Libraries
License:        Distributable
URL:            http://search.cpan.org/dist/Mail-Sender/
Source0:        http://www.cpan.org/authors/id/J/JE/JENDA/Mail-Sender-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
%{summary}.


%prep
%setup -q -n Mail-Sender-%{version}
%{__perl} -pi -e 's/\r\n/\n/' README


%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags} < /dev/null


%install
rm -rf $RPM_BUILD_ROOT
make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'
find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';'
chmod -R u+w $RPM_BUILD_ROOT/*

# Remove the Win32 module in order to avoid requiring perl(Win32API::Registry)
find $RPM_BUILD_ROOT -type f -name Win32.pm -exec rm -f {} ';'


%check
make test


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
# License: perl + spam exception.
# See the main POD page for the copyright information.
# For the Artistic and GPL license text(s), see the perl package.
%doc Changes README
%{perl_vendorlib}/Mail/
%{_mandir}/man3/*.3*


%changelog
* Mon Sep 12 2005 Jose Pedro Oliveira  - 0.8.10-2
- License clarification.

* Sat Sep 10 2005 Jose Pedro Oliveira  - 0.8.10-1
- First build.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Mail-Sender/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	12 Sep 2005 15:12:11 -0000	1.1
+++ .cvsignore	12 Sep 2005 15:12:40 -0000	1.2
@@ -0,0 +1 @@
+Mail-Sender-0.8.10.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Mail-Sender/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	12 Sep 2005 15:12:11 -0000	1.1
+++ sources	12 Sep 2005 15:12:40 -0000	1.2
@@ -0,0 +1 @@
+4dac1115bacca2ed0b8403c3874975da  Mail-Sender-0.8.10.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 12 15:19:37 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Mon, 12 Sep 2005 11:19:37 -0400
Subject: owners owners.list,1.193,1.194
Message-ID: <200509121519.j8CFJbC7029976@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29957

Modified Files:
	owners.list 
Log Message:
New packages: perl-Log-Dispatch and perl-Mail-Sender


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.193
retrieving revision 1.194
diff -u -r1.193 -r1.194
--- owners.list	12 Sep 2005 15:08:54 -0000	1.193
+++ owners.list	12 Sep 2005 15:19:35 -0000	1.194
@@ -667,7 +667,9 @@
 Fedora Extras|perl-Lingua-EN-Inflect-Number|Force number of words to singular or plural|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Locale-Maketext-Fuzzy|Maketext from already interpolated strings|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Locale-gettext|Interface to gettext family of functions|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Log-Dispatch|Dispatches messages to one or more outputs|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Mail-Alias|For bugs related to the perl-Mail-Alias component|oliver at linux-kernel.at|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Mail-Sender|Module for sending mails with attachments through an SMTP server|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Mail-Sendmail|Simple platform independent mailer for Perl|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Mail-SPF-Query|Mail::SPF::Query determines the legitimacy of an SMTP client IP|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-MailTools|MailTools module for Perl|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
@@ -936,7 +938,7 @@
 Fedora Extras|tetex-font-kerkis|The Kerkis type 1 fonts for LaTeX|paskalis at di.uoa.gr|extras-qa at fedoraproject.org|
 Fedora Extras|tetex-font-tipa|The TIPA fonts for LaTeX|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|tetex-lgrind|Source-code pretty-printer for LaTeX|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
-Fedora Extras|tetex-perltex| Define LaTeX macros in terms of Perl code|jpo at di.uminho.pt|extras-qa at fedoraproject.org|
+Fedora Extras|tetex-perltex|Define LaTeX macros in terms of Perl code|jpo at di.uminho.pt|extras-qa at fedoraproject.org|
 Fedora Extras|tetex-pgf|Create PostScript and PDF graphics in TeX|jpo at di.uminho.pt|extras-qa at fedoraproject.org|
 Fedora Extras|tetex-prosper|LaTeX class for writing transparencies|mpeters at mac.com|extras-qa at fedoraproject.org|
 Fedora Extras|tetex-unicode|Unicode support for LaTeX|gauret at free.fr|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Mon Sep 12 15:37:22 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Mon, 12 Sep 2005 11:37:22 -0400
Subject: rpms/perl-Log-Dispatch/FC-3 perl-Log-Dispatch.spec,1.1,1.2
Message-ID: <200509121537.j8CFbMAn030785@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Log-Dispatch/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30766

Modified Files:
	perl-Log-Dispatch.spec 
Log Message:
Hardcoding value for FC-3


Index: perl-Log-Dispatch.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Log-Dispatch/FC-3/perl-Log-Dispatch.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Log-Dispatch.spec	12 Sep 2005 11:38:16 -0000	1.1
+++ perl-Log-Dispatch.spec	12 Sep 2005 15:37:20 -0000	1.2
@@ -5,7 +5,7 @@
 #   1  for enabling mod_perl >= 2.0.0RC5 support
 #   0  for enabling mod_perl < 2.0.0RC5 support
 
-%define mod_perl2      1
+%define mod_perl2      0
 %define mailtests      0
 
 %{?_with_mailtests:%define mailtests 1}



From fedora-extras-commits at redhat.com  Mon Sep 12 16:38:44 2005
From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj))
Date: Mon, 12 Sep 2005 12:38:44 -0400
Subject: web/html/download/mirrors fedora-extras-4,1.1,1.2
Message-ID: <200509121638.j8CGciSC032487@cvs-int.fedora.redhat.com>

Author: katzj

Update of /cvs/fedora/web/html/download/mirrors
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32468

Modified Files:
	fedora-extras-4 
Log Message:
updated list of mirrors for FE4 from Aurelian Bompard



Index: fedora-extras-4
===================================================================
RCS file: /cvs/fedora/web/html/download/mirrors/fedora-extras-4,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fedora-extras-4	7 Jun 2005 16:23:45 -0000	1.1
+++ fedora-extras-4	12 Sep 2005 16:38:42 -0000	1.2
@@ -1 +1,16 @@
 http://download.fedora.redhat.com/pub/fedora/linux/extras/4/$ARCH/
+http://mirrors.kernel.org/fedora/extras/4/$ARCH/
+http://fedora.cat.pdx.edu/linux/extras/4/$ARCH/
+http://fedora.gtlib.cc.gatech.edu/pub/fedora.redhat/linux/extras/4/$ARCH/
+http://fr2.rpmfind.net/linux/fedora/extras/4/$ARCH/
+http://fr.rpmfind.net/linux/fedora/extras/4/$ARCH/
+http://ftp.chg.ru/pub/Linux/fedora/linux/extras/4/$ARCH/
+http://ftp.kddilabs.jp/Linux/packages/fedora/extras/4/$ARCH/
+http://ftp.lug.ro/fedora/linux/extras/4/$ARCH/
+http://ftp-stud.fht-esslingen.de/pub/Mirrors/fedora.redhat.com/linux/extras/4/$ARCH/
+http://ftp.uni-bayreuth.de/linux/fedora/linux/extras/4/$ARCH/
+http://gd.tuwien.ac.at/opsys/linux/fedora/extras/4/$ARCH/
+http://mirror.hiwaay.net/redhat/fedora/linux/extras/4/$ARCH/
+http://mirror.switch.ch/ftp/mirror/fedora/linux/extras/4/$ARCH/
+http://mirror.web-ster.com/fedora/extras/4/$ARCH/
+http://www.mirrorservice.org/sites/download.fedora.redhat.com/pub/fedora/linux/extras/4/$ARCH/



From fedora-extras-commits at redhat.com  Mon Sep 12 17:48:54 2005
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Mon, 12 Sep 2005 13:48:54 -0400
Subject: rpms/nethack/FC-3 nethack-3.4.3-x11.patch, NONE, 1.1 nethack.spec,
	1.2, 1.3
Message-ID: <200509121749.j8CHnOSV001647@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/extras/rpms/nethack/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1605/FC-3

Modified Files:
	nethack.spec 
Added Files:
	nethack-3.4.3-x11.patch 
Log Message:
- Build with x11 support (Bug #167523)


nethack-3.4.3-x11.patch:

--- NEW FILE nethack-3.4.3-x11.patch ---
--- sys/unix/Makefile.top.orig	2005-06-24 21:11:44.000000000 -0400
+++ sys/unix/Makefile.top	2005-06-24 21:12:06.000000000 -0400
@@ -40,9 +40,8 @@
 SHELLDIR = $(PREFIX)/games
 
 # per discussion in Install.X11 and Install.Qt
-VARDATND = 
 # VARDATND = x11tiles NetHack.ad pet_mark.xbm
-# VARDATND = x11tiles NetHack.ad pet_mark.xbm rip.xpm
+VARDATND = x11tiles NetHack.ad pet_mark.xbm rip.xpm
 # for Atari/Gem
 # VARDATND = nh16.img title.img GEM_RSC.RSC rip.img
 # for BeOS
--- include/config.h.orig	2005-06-24 21:12:38.000000000 -0400
+++ include/config.h	2005-06-24 21:13:36.000000000 -0400
@@ -43,7 +43,7 @@
  * Some combinations make no sense.  See the installation document.
  */
 #define TTY_GRAPHICS	/* good old tty based graphics */
-/* #define X11_GRAPHICS */	/* X11 interface */
+#define X11_GRAPHICS	/* X11 interface */
 /* #define QT_GRAPHICS */	/* Qt interface */
 /* #define GNOME_GRAPHICS */	/* Gnome interface */
 /* #define MSWIN_GRAPHICS */	/* Windows NT, CE, Graphics */
@@ -126,7 +126,7 @@
  * would allow:
  *  xpmtoppm x11tiles_big.xpm
  */
-/* # define USE_XPM */		/* Disable if you do not have the XPM library */
+# define USE_XPM		/* Disable if you do not have the XPM library */
 # ifdef USE_XPM
 #  define GRAPHIC_TOMBSTONE	/* Use graphical tombstone (rip.xpm) */
 # endif
--- sys/unix/Makefile.src.orig	2005-06-24 21:14:49.000000000 -0400
+++ sys/unix/Makefile.src	2005-06-24 21:15:32.000000000 -0400
@@ -214,8 +214,8 @@
 
 #
 #
-WINSRC = $(WINTTYSRC)
-WINOBJ = $(WINTTYOBJ)
+WINSRC = $(WINTTYSRC) $(WINX11SRC)
+WINOBJ = $(WINTTYOBJ) $(WINX11OBJ)
 
 # on some systems the termcap library is in -ltermcap or -lcurses
 # on 386 Xenix, the -ltermlib tputs() seems not to work; use -lcurses instead
@@ -235,7 +235,7 @@
 #
 # libraries for X11
 # If USE_XPM is defined in config.h, you will also need -lXpm here.
-WINX11LIB = -lXaw -lXmu -lXext -lXt -lX11
+WINX11LIB = -lXaw -lXmu -lXext -lXt -lX11 -lXpm
 # WINX11LIB = -lXaw -lXmu -lXt -lX11
 # WINX11LIB = -lXaw -lXmu -lXext -lXt -lXpm -lX11 -lm
 # WINX11LIB = -lXaw -lXmu -lXpm -lXext -lXt -lX11 -lSM -lICE -lm # BSD/OS 2.0
@@ -255,7 +255,7 @@
 # libraries for BeOS 
 WINBELIB = -lbe
 
-WINLIB = $(WINTTYLIB)
+WINLIB = $(WINTTYLIB) $(WINX11LIB)
 
 # any other strange libraries your system needs (for Sysunix only -- the more
 # specialized targets should already be right)


Index: nethack.spec
===================================================================
RCS file: /cvs/extras/rpms/nethack/FC-3/nethack.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- nethack.spec	16 Aug 2005 17:08:58 -0000	1.2
+++ nethack.spec	12 Sep 2005 17:48:52 -0000	1.3
@@ -3,7 +3,7 @@
 
 Name:           nethack
 Version:        3.4.3
-Release:        1%{?dist}
+Release:        3%{?dist}
 Summary:        A rogue-like single player dungeon exploration game
 
 Group:          Amusements/Games
@@ -13,9 +13,13 @@
 Source1:        %{name}.desktop
 Patch0:         %{name}-%{version}-makefile.patch
 Patch1:         %{name}-%{version}-config.patch
+Patch2:         %{name}-%{version}-x11.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  ncurses-devel, bison, flex, desktop-file-utils
+BuildRequires:  ncurses-devel
+BuildRequires:  bison, flex, desktop-file-utils
+BuildRequires:  xorg-x11-devel, xorg-x11-font-utils
+
 Obsoletes:      nethack-falconseye <= 1.9.4-6.a
 
 
@@ -39,6 +43,7 @@
 %setup -q
 %patch0 -b .makefile
 %patch1 -b .config
+%patch2 -b .x11
 (source sys/unix/setup.sh)
 
 # Set our paths
@@ -49,6 +54,10 @@
 %{__sed} -i -e "s:/usr/games/lib/nethackdir:%{nhgamedir}:" \
         doc/nethack.6 doc/nethack.txt doc/recover.6 doc/recover.txt
 
+# Point the linker in the right direction
+%{__sed} -i -e "s:-L/usr/X11R6/lib:-L/usr/X11R6/%{_lib}:" \
+        src/Makefile util/Makefile
+
 
 %build
 make all
@@ -81,6 +90,17 @@
         --add-category Game \
         %{SOURCE1}
 
+# Install the fonts for the X11 interface
+cd win/X11
+bdftopcf -o nh10.pcf nh10.bdf
+bdftopcf -o ibm.pcf ibm.bdf
+install -D -p -m 644 ibm.pcf $RPM_BUILD_ROOT%{nhgamedir}/fonts/ibm.pcf
+install -D -p -m 644 nh10.pcf $RPM_BUILD_ROOT%{nhgamedir}/fonts/nh10.pcf
+mkfontdir $RPM_BUILD_ROOT%{nhgamedir}/fonts
+
+%{__sed} -i -e 's:^!\(NetHack.tile_file.*\):\1:' \
+        $RPM_BUILD_ROOT%{nhgamedir}/NetHack.ad
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -96,6 +116,11 @@
 %{nhgamedir}/nhdat
 %{_bindir}/nethack
 %{_bindir}/nethack-recover
+%{nhgamedir}/NetHack.ad
+%{nhgamedir}/pet_mark.xbm
+%{nhgamedir}/rip.xpm
+%{nhgamedir}/x11tiles
+%{nhgamedir}/fonts/
 %defattr(0664,root,games)
 %config(noreplace) %{nhdatadir}/record
 %config(noreplace) %{nhdatadir}/perm
@@ -106,5 +131,11 @@
 
 
 %changelog
+* Thu Sep 08 2005 Luke Macken  3.4.3-3
+- Point linker in the right direction using %%{_lib} to fix x86_64 build issues
+
+* Tue Sep 06 2005 Luke Macken  3.4.3-2
+- Enable x11 support
+
 * Sun Jul 10 2005 Luke Macken  3.4.3-1
 - Initial package for Fedora Extras



From fedora-extras-commits at redhat.com  Mon Sep 12 17:48:54 2005
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Mon, 12 Sep 2005 13:48:54 -0400
Subject: rpms/nethack/FC-4 nethack-3.4.3-x11.patch, NONE, 1.1 nethack.spec,
	1.2, 1.3
Message-ID: <200509121749.j8CHnPfR001650@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/extras/rpms/nethack/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1605/FC-4

Modified Files:
	nethack.spec 
Added Files:
	nethack-3.4.3-x11.patch 
Log Message:
- Build with x11 support (Bug #167523)


nethack-3.4.3-x11.patch:

--- NEW FILE nethack-3.4.3-x11.patch ---
--- sys/unix/Makefile.top.orig	2005-06-24 21:11:44.000000000 -0400
+++ sys/unix/Makefile.top	2005-06-24 21:12:06.000000000 -0400
@@ -40,9 +40,8 @@
 SHELLDIR = $(PREFIX)/games
 
 # per discussion in Install.X11 and Install.Qt
-VARDATND = 
 # VARDATND = x11tiles NetHack.ad pet_mark.xbm
-# VARDATND = x11tiles NetHack.ad pet_mark.xbm rip.xpm
+VARDATND = x11tiles NetHack.ad pet_mark.xbm rip.xpm
 # for Atari/Gem
 # VARDATND = nh16.img title.img GEM_RSC.RSC rip.img
 # for BeOS
--- include/config.h.orig	2005-06-24 21:12:38.000000000 -0400
+++ include/config.h	2005-06-24 21:13:36.000000000 -0400
@@ -43,7 +43,7 @@
  * Some combinations make no sense.  See the installation document.
  */
 #define TTY_GRAPHICS	/* good old tty based graphics */
-/* #define X11_GRAPHICS */	/* X11 interface */
+#define X11_GRAPHICS	/* X11 interface */
 /* #define QT_GRAPHICS */	/* Qt interface */
 /* #define GNOME_GRAPHICS */	/* Gnome interface */
 /* #define MSWIN_GRAPHICS */	/* Windows NT, CE, Graphics */
@@ -126,7 +126,7 @@
  * would allow:
  *  xpmtoppm x11tiles_big.xpm
  */
-/* # define USE_XPM */		/* Disable if you do not have the XPM library */
+# define USE_XPM		/* Disable if you do not have the XPM library */
 # ifdef USE_XPM
 #  define GRAPHIC_TOMBSTONE	/* Use graphical tombstone (rip.xpm) */
 # endif
--- sys/unix/Makefile.src.orig	2005-06-24 21:14:49.000000000 -0400
+++ sys/unix/Makefile.src	2005-06-24 21:15:32.000000000 -0400
@@ -214,8 +214,8 @@
 
 #
 #
-WINSRC = $(WINTTYSRC)
-WINOBJ = $(WINTTYOBJ)
+WINSRC = $(WINTTYSRC) $(WINX11SRC)
+WINOBJ = $(WINTTYOBJ) $(WINX11OBJ)
 
 # on some systems the termcap library is in -ltermcap or -lcurses
 # on 386 Xenix, the -ltermlib tputs() seems not to work; use -lcurses instead
@@ -235,7 +235,7 @@
 #
 # libraries for X11
 # If USE_XPM is defined in config.h, you will also need -lXpm here.
-WINX11LIB = -lXaw -lXmu -lXext -lXt -lX11
+WINX11LIB = -lXaw -lXmu -lXext -lXt -lX11 -lXpm
 # WINX11LIB = -lXaw -lXmu -lXt -lX11
 # WINX11LIB = -lXaw -lXmu -lXext -lXt -lXpm -lX11 -lm
 # WINX11LIB = -lXaw -lXmu -lXpm -lXext -lXt -lX11 -lSM -lICE -lm # BSD/OS 2.0
@@ -255,7 +255,7 @@
 # libraries for BeOS 
 WINBELIB = -lbe
 
-WINLIB = $(WINTTYLIB)
+WINLIB = $(WINTTYLIB) $(WINX11LIB)
 
 # any other strange libraries your system needs (for Sysunix only -- the more
 # specialized targets should already be right)


Index: nethack.spec
===================================================================
RCS file: /cvs/extras/rpms/nethack/FC-4/nethack.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- nethack.spec	16 Aug 2005 17:08:58 -0000	1.2
+++ nethack.spec	12 Sep 2005 17:48:52 -0000	1.3
@@ -3,7 +3,7 @@
 
 Name:           nethack
 Version:        3.4.3
-Release:        1%{?dist}
+Release:        3%{?dist}
 Summary:        A rogue-like single player dungeon exploration game
 
 Group:          Amusements/Games
@@ -13,9 +13,13 @@
 Source1:        %{name}.desktop
 Patch0:         %{name}-%{version}-makefile.patch
 Patch1:         %{name}-%{version}-config.patch
+Patch2:         %{name}-%{version}-x11.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  ncurses-devel, bison, flex, desktop-file-utils
+BuildRequires:  ncurses-devel
+BuildRequires:  bison, flex, desktop-file-utils
+BuildRequires:  xorg-x11-devel, xorg-x11-font-utils
+
 Obsoletes:      nethack-falconseye <= 1.9.4-6.a
 
 
@@ -39,6 +43,7 @@
 %setup -q
 %patch0 -b .makefile
 %patch1 -b .config
+%patch2 -b .x11
 (source sys/unix/setup.sh)
 
 # Set our paths
@@ -49,6 +54,10 @@
 %{__sed} -i -e "s:/usr/games/lib/nethackdir:%{nhgamedir}:" \
         doc/nethack.6 doc/nethack.txt doc/recover.6 doc/recover.txt
 
+# Point the linker in the right direction
+%{__sed} -i -e "s:-L/usr/X11R6/lib:-L/usr/X11R6/%{_lib}:" \
+        src/Makefile util/Makefile
+
 
 %build
 make all
@@ -81,6 +90,17 @@
         --add-category Game \
         %{SOURCE1}
 
+# Install the fonts for the X11 interface
+cd win/X11
+bdftopcf -o nh10.pcf nh10.bdf
+bdftopcf -o ibm.pcf ibm.bdf
+install -D -p -m 644 ibm.pcf $RPM_BUILD_ROOT%{nhgamedir}/fonts/ibm.pcf
+install -D -p -m 644 nh10.pcf $RPM_BUILD_ROOT%{nhgamedir}/fonts/nh10.pcf
+mkfontdir $RPM_BUILD_ROOT%{nhgamedir}/fonts
+
+%{__sed} -i -e 's:^!\(NetHack.tile_file.*\):\1:' \
+        $RPM_BUILD_ROOT%{nhgamedir}/NetHack.ad
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -96,6 +116,11 @@
 %{nhgamedir}/nhdat
 %{_bindir}/nethack
 %{_bindir}/nethack-recover
+%{nhgamedir}/NetHack.ad
+%{nhgamedir}/pet_mark.xbm
+%{nhgamedir}/rip.xpm
+%{nhgamedir}/x11tiles
+%{nhgamedir}/fonts/
 %defattr(0664,root,games)
 %config(noreplace) %{nhdatadir}/record
 %config(noreplace) %{nhdatadir}/perm
@@ -106,5 +131,11 @@
 
 
 %changelog
+* Thu Sep 08 2005 Luke Macken  3.4.3-3
+- Point linker in the right direction using %%{_lib} to fix x86_64 build issues
+
+* Tue Sep 06 2005 Luke Macken  3.4.3-2
+- Enable x11 support
+
 * Sun Jul 10 2005 Luke Macken  3.4.3-1
 - Initial package for Fedora Extras



From fedora-extras-commits at redhat.com  Mon Sep 12 17:54:38 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon, 12 Sep 2005 13:54:38 -0400
Subject: rpms/sbcl/devel sbcl.spec,1.1,1.2
Message-ID: <200509121754.j8CHscrZ001756@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/sbcl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1737

Modified Files:
	sbcl.spec 
Log Message:
* Mon Sep 12 2005 Rex Dieter  0.9.4-5
- diagnose bootstrap snafu on buildsystem 



Index: sbcl.spec
===================================================================
RCS file: /cvs/extras/rpms/sbcl/devel/sbcl.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sbcl.spec	12 Sep 2005 12:36:44 -0000	1.1
+++ sbcl.spec	12 Sep 2005 17:54:36 -0000	1.2
@@ -21,7 +21,7 @@
 Name: 	 sbcl
 Summary: Steel Bank Common Lisp
 Version: 0.9.4
-Release: 4%{?dist}
+Release: 5%{?dist}
 
 License: BSD/MIT
 Group: 	 Development/Languages
@@ -47,7 +47,6 @@
 %ifarch ppc 
 %define bootstrap_src -a 12
 %endif
-
 %endif
 
 Patch1: sbcl-0.8.18-default-sbcl-home.patch
@@ -70,7 +69,7 @@
 
 
 %prep
-%setup -q %{?bootstrap_src} 
+%setup %{?bootstrap_src} 
 
 #sed -i -e "s|/usr/local/lib/sbcl/|%{_libdir}/sbcl/|" src/runtime/runtime.c
 #or patch to use SBCL_HOME env var
@@ -91,12 +90,16 @@
 
 %if "%{?bootstrap}" == "%{nil}"
 mkdir sbcl-bootstrap
-pushd sbcl-%{version}-*-linux
+pushd sbcl-*-linux
 chmod +x install.sh
 INSTALL_ROOT=`pwd`/../sbcl-bootstrap ./install.sh
 popd
 %endif
 
+# CVS crud 
+find . -name CVS -type d | xargs rm -rf
+find . -name '.cvsignore' | xargs rm -f
+
 
 %build
 export DEFAULT_SBCL_HOME=%{_libdir}/sbcl
@@ -140,10 +143,9 @@
 ## Unpackaged files
 rm -rf $RPM_BUILD_ROOT%{_docdir}/sbcl
 rm -f  $RPM_BUILD_ROOT%{_infodir}/dir
-
-# CVS crud
-find $RPM_BUILD_ROOT -name CVS -type d | xargs rm -rf
-find $RPM_BUILD_ROOT -name '.cvsignore' | xargs rm -f
+# CVS crud 
+#find $RPM_BUILD_ROOT -name CVS -type d | xargs rm -rf
+#find $RPM_BUILD_ROOT -name '.cvsignore' | xargs rm -f
 # from make check
 find $RPM_BUILD_ROOT -name 'test-passed' | xargs rm -f
 # 
@@ -179,6 +181,9 @@
 
 
 %changelog
+* Mon Sep 12 2005 Rex Dieter  0.9.4-5
+- diagnose bootstrap snafu on buildsystem 
+
 * Tue Aug 30 2005 Rex Dieter  0.9.4-4
 - safer NO_ADDR_RANDOMIZE patch
 - use %%{?setarch} in %%check too



From fedora-extras-commits at redhat.com  Mon Sep 12 18:11:42 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon, 12 Sep 2005 14:11:42 -0400
Subject: rpms/sbcl/devel sbcl.spec,1.2,1.3
Message-ID: <200509121811.j8CIBgrM003155@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/sbcl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3136

Modified Files:
	sbcl.spec 
Log Message:
rename bootstrap -> sbcl_bootstrap



Index: sbcl.spec
===================================================================
RCS file: /cvs/extras/rpms/sbcl/devel/sbcl.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sbcl.spec	12 Sep 2005 17:54:36 -0000	1.2
+++ sbcl.spec	12 Sep 2005 18:11:40 -0000	1.3
@@ -3,9 +3,9 @@
 ## Default to using a local bootstrap, 
 ## define one of the following to override 
 ## (non sbcl bootstraps untested)
-#define bootstrap sbcl
-#define bootstrap cmucl
-#define bootstrap clisp
+#define sbcl_bootstrap sbcl
+#define sbcl_bootstrap cmucl
+#define sbcl_bootstrap clisp
 
 %if "%{?fedora}" >= "3"
 BuildRequires:setarch
@@ -21,7 +21,7 @@
 Name: 	 sbcl
 Summary: Steel Bank Common Lisp
 Version: 0.9.4
-Release: 5%{?dist}
+Release: 6%{?dist}
 
 License: BSD/MIT
 Group: 	 Development/Languages
@@ -32,20 +32,20 @@
 
 Source1: sbcl.sh
 
-%if "%{?bootstrap}" == "%{nil}"
+%if "%{?sbcl_bootstrap}" == "%{nil}"
 # local Bootstrap binaries
 Source10: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-%{version}-x86-linux-binary.tar.bz2
 %ifarch %{ix86}
-%define bootstrap_src -a 10 
+%define sbcl_bootstrap_src -a 10 
 %endif
 Source11: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-%{version}-x86-64-linux-binary.tar.bz2
 %ifarch %{x86_64}
-%define bootstrap_src -a 11 
+%define sbcl_bootstrap_src -a 11 
 %endif
 # Latest powerpc-linux bootstrap (untested)
 Source12: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.8.15-powerpc-linux-binary.tar.bz2
 %ifarch ppc 
-%define bootstrap_src -a 12
+%define sbcl_bootstrap_src -a 12
 %endif
 %endif
 
@@ -54,7 +54,7 @@
 Patch2: sbcl-0.9.4-ADDR_NO_RANDOMIZE.patch
 Patch3: sbcl-0.9.4-optflags.patch
 
-%{?bootstrap:BuildRequires: %{?bootstrap}}
+%{?sbcl_bootstrap:BuildRequires: %{?sbcl_bootstrap}}
 
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
@@ -69,7 +69,7 @@
 
 
 %prep
-%setup %{?bootstrap_src} 
+%setup %{?sbcl_bootstrap_src} 
 
 #sed -i -e "s|/usr/local/lib/sbcl/|%{_libdir}/sbcl/|" src/runtime/runtime.c
 #or patch to use SBCL_HOME env var
@@ -88,7 +88,7 @@
 %endif
 #endif
 
-%if "%{?bootstrap}" == "%{nil}"
+%if "%{?sbcl_bootstrap}" == "%{nil}"
 mkdir sbcl-bootstrap
 pushd sbcl-*-linux
 chmod +x install.sh
@@ -104,7 +104,7 @@
 %build
 export DEFAULT_SBCL_HOME=%{_libdir}/sbcl
 
-%if "%{?bootstrap}" == "%{nil}"
+%if "%{?sbcl_bootstrap}" == "%{nil}"
 export SBCL_HOME=`pwd`/sbcl-bootstrap/lib/sbcl
 export PATH=`pwd`/sbcl-bootstrap/bin:${PATH}
 %endif
@@ -181,7 +181,7 @@
 
 
 %changelog
-* Mon Sep 12 2005 Rex Dieter  0.9.4-5
+* Mon Sep 12 2005 Rex Dieter  0.9.4-6
 - diagnose bootstrap snafu on buildsystem 
 
 * Tue Aug 30 2005 Rex Dieter  0.9.4-4



From fedora-extras-commits at redhat.com  Mon Sep 12 18:20:21 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 12 Sep 2005 14:20:21 -0400
Subject: rpms/dkms/devel dkms.spec,1.4,1.5
Message-ID: <200509121820.j8CIKLqj003303@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/dkms/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3250/devel

Modified Files:
	dkms.spec 
Log Message:

Resolve Bugzilla 162308



Index: dkms.spec
===================================================================
RCS file: /cvs/extras/rpms/dkms/devel/dkms.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- dkms.spec	5 Sep 2005 03:04:33 -0000	1.4
+++ dkms.spec	12 Sep 2005 18:20:19 -0000	1.5
@@ -1,7 +1,7 @@
 Summary: Dynamic Kernel Module Support Framework
 Name: dkms
 Version: 2.0.6
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Group: System Environment/Base
 BuildArch: noarch
@@ -10,6 +10,7 @@
 Provides: dkms-minimal
 Source0: http://linux.dell.com/dkms/dkms-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Requires: kernel-devel
 
 %description
 This package contains the framework for the Dynamic
@@ -101,6 +102,9 @@
 
 
 %changelog
+* Mon Sep 12 2005 Tom "spot" Callaway  2.0.6-2
+- requires kernel-devel
+
 * Sun Sep  4 2005 Tom "spot" Callaway  2.0.6-1
 - bump to 2.0.6
 - include COPYING AUTHORS in %%doc



From fedora-extras-commits at redhat.com  Mon Sep 12 18:20:16 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 12 Sep 2005 14:20:16 -0400
Subject: rpms/dkms/FC-3 dkms.spec,1.3,1.4
Message-ID: <200509121820.j8CIKksc003306@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/dkms/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3250/FC-3

Modified Files:
	dkms.spec 
Log Message:

Resolve Bugzilla 162308



Index: dkms.spec
===================================================================
RCS file: /cvs/extras/rpms/dkms/FC-3/dkms.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- dkms.spec	5 Sep 2005 03:03:56 -0000	1.3
+++ dkms.spec	12 Sep 2005 18:20:13 -0000	1.4
@@ -1,7 +1,7 @@
 Summary: Dynamic Kernel Module Support Framework
 Name: dkms
 Version: 2.0.6
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Group: System Environment/Base
 BuildArch: noarch
@@ -10,6 +10,7 @@
 Provides: dkms-minimal
 Source0: http://linux.dell.com/dkms/dkms-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Requires: kernel-devel
 
 %description
 This package contains the framework for the Dynamic
@@ -101,6 +102,9 @@
 
 
 %changelog
+* Mon Sep 12 2005 Tom "spot" Callaway  2.0.6-2
+- requires kernel-devel
+
 * Sun Sep  4 2005 Tom "spot" Callaway  2.0.6-1
 - bump to 2.0.6
 - include COPYING AUTHORS in %%doc



From fedora-extras-commits at redhat.com  Mon Sep 12 18:20:16 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 12 Sep 2005 14:20:16 -0400
Subject: rpms/dkms/FC-4 dkms.spec,1.3,1.4
Message-ID: <200509121820.j8CIKkbl003309@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/dkms/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3250/FC-4

Modified Files:
	dkms.spec 
Log Message:

Resolve Bugzilla 162308



Index: dkms.spec
===================================================================
RCS file: /cvs/extras/rpms/dkms/FC-4/dkms.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- dkms.spec	5 Sep 2005 03:04:05 -0000	1.3
+++ dkms.spec	12 Sep 2005 18:20:14 -0000	1.4
@@ -1,7 +1,7 @@
 Summary: Dynamic Kernel Module Support Framework
 Name: dkms
 Version: 2.0.6
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Group: System Environment/Base
 BuildArch: noarch
@@ -10,6 +10,7 @@
 Provides: dkms-minimal
 Source0: http://linux.dell.com/dkms/dkms-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Requires: kernel-devel
 
 %description
 This package contains the framework for the Dynamic
@@ -101,6 +102,9 @@
 
 
 %changelog
+* Mon Sep 12 2005 Tom "spot" Callaway  2.0.6-2
+- requires kernel-devel
+
 * Sun Sep  4 2005 Tom "spot" Callaway  2.0.6-1
 - bump to 2.0.6
 - include COPYING AUTHORS in %%doc



From fedora-extras-commits at redhat.com  Mon Sep 12 18:27:45 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon, 12 Sep 2005 14:27:45 -0400
Subject: rpms/sbcl/devel sbcl.spec,1.3,1.4
Message-ID: <200509121827.j8CIRjTJ003473@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/sbcl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3452

Modified Files:
	sbcl.spec 
Log Message:
* Mon Sep 12 2005 Rex Dieter  0.9.4-7
- %{x86_64} -> x86_64



Index: sbcl.spec
===================================================================
RCS file: /cvs/extras/rpms/sbcl/devel/sbcl.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sbcl.spec	12 Sep 2005 18:11:40 -0000	1.3
+++ sbcl.spec	12 Sep 2005 18:27:43 -0000	1.4
@@ -21,7 +21,7 @@
 Name: 	 sbcl
 Summary: Steel Bank Common Lisp
 Version: 0.9.4
-Release: 6%{?dist}
+Release: 7%{?dist}
 
 License: BSD/MIT
 Group: 	 Development/Languages
@@ -39,7 +39,7 @@
 %define sbcl_bootstrap_src -a 10 
 %endif
 Source11: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-%{version}-x86-64-linux-binary.tar.bz2
-%ifarch %{x86_64}
+%ifarch x86_64
 %define sbcl_bootstrap_src -a 11 
 %endif
 # Latest powerpc-linux bootstrap (untested)
@@ -83,7 +83,7 @@
 ## to customize features -- Rex
 #define kernel_ver %(uname -r | cut -d- -f1 | cut -d. -f-2 )
 #if "%{?kernel_ver}" >= "2.6"
-%ifarch %{ix86} %{x86_64}
+%ifarch %{ix86} x86_64
 sed -i -e "s|; :sb-thread|:sb-thread|" base-target-features.lisp-expr
 %endif
 #endif
@@ -181,8 +181,8 @@
 
 
 %changelog
-* Mon Sep 12 2005 Rex Dieter  0.9.4-6
-- diagnose bootstrap snafu on buildsystem 
+* Mon Sep 12 2005 Rex Dieter  0.9.4-7
+- %{x86_64} -> x86_64
 
 * Tue Aug 30 2005 Rex Dieter  0.9.4-4
 - safer NO_ADDR_RANDOMIZE patch



From fedora-extras-commits at redhat.com  Mon Sep 12 18:45:14 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon, 12 Sep 2005 14:45:14 -0400
Subject: rpms/gc/FC-4 .cvsignore,1.5,1.6 gc.spec,1.9,1.10 sources,1.5,1.6
Message-ID: <200509121845.j8CIjiSI003704@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/gc/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3657/FC-4

Modified Files:
	.cvsignore gc.spec sources 
Log Message:
* Fri Sep 09 2005 Rex Dieter  6.6-1
- 6.6



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gc/FC-4/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	7 Sep 2005 12:48:08 -0000	1.5
+++ .cvsignore	12 Sep 2005 18:45:12 -0000	1.6
@@ -1 +1 @@
-gc6.5.tar.gz
+gc6.6.tar.gz


Index: gc.spec
===================================================================
RCS file: /cvs/extras/rpms/gc/FC-4/gc.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- gc.spec	7 Sep 2005 12:48:08 -0000	1.9
+++ gc.spec	12 Sep 2005 18:45:12 -0000	1.10
@@ -2,13 +2,13 @@
 
 Summary: C++ Garbage Collector	
 Name:    gc	
-Version: 6.5
+Version: 6.6
 
 Release: 1%{?dist}
 Group:   System Environment/Libraries
 License: BSD
 Url:     http://www.hpl.hp.com/personal/Hans_Boehm/gc/	
-Source:  http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/gc6.5.tar.gz 
+Source:  http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/gc6.6.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Patch1: gc6.5-opendl.patch
@@ -83,6 +83,9 @@
 
 
 %changelog
+* Fri Sep 09 2005 Rex Dieter  6.6-1
+- 6.6
+
 * Wed May 25 2005 Rex Dieter  6.5-1
 - 6.5
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gc/FC-4/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	7 Sep 2005 12:48:08 -0000	1.5
+++ sources	12 Sep 2005 18:45:12 -0000	1.6
@@ -1 +1 @@
-00bf95cdcbedfa7321d14e0133b31cdb  gc6.5.tar.gz
+c7c301e8fab8ce152c908b05bc8d452c  gc6.6.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 12 18:45:14 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon, 12 Sep 2005 14:45:14 -0400
Subject: rpms/gc/FC-3 .cvsignore,1.5,1.6 gc.spec,1.7,1.8 sources,1.5,1.6
Message-ID: <200509121845.j8CIjitg003699@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/gc/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3657/FC-3

Modified Files:
	.cvsignore gc.spec sources 
Log Message:
* Fri Sep 09 2005 Rex Dieter  6.6-1
- 6.6



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gc/FC-3/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	7 Sep 2005 12:47:10 -0000	1.5
+++ .cvsignore	12 Sep 2005 18:45:11 -0000	1.6
@@ -1 +1 @@
-gc6.5.tar.gz
+gc6.6.tar.gz


Index: gc.spec
===================================================================
RCS file: /cvs/extras/rpms/gc/FC-3/gc.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- gc.spec	7 Sep 2005 12:47:10 -0000	1.7
+++ gc.spec	12 Sep 2005 18:45:11 -0000	1.8
@@ -2,13 +2,13 @@
 
 Summary: C++ Garbage Collector	
 Name:    gc	
-Version: 6.5
+Version: 6.6
 
 Release: 1%{?dist}
 Group:   System Environment/Libraries
 License: BSD
 Url:     http://www.hpl.hp.com/personal/Hans_Boehm/gc/	
-Source:  http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/gc6.5.tar.gz 
+Source:  http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/gc6.6.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Patch1: gc6.5-opendl.patch
@@ -83,6 +83,9 @@
 
 
 %changelog
+* Fri Sep 09 2005 Rex Dieter  6.6-1
+- 6.6
+
 * Wed May 25 2005 Rex Dieter  6.5-1
 - 6.5
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gc/FC-3/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	7 Sep 2005 12:47:10 -0000	1.5
+++ sources	12 Sep 2005 18:45:12 -0000	1.6
@@ -1 +1 @@
-00bf95cdcbedfa7321d14e0133b31cdb  gc6.5.tar.gz
+c7c301e8fab8ce152c908b05bc8d452c  gc6.6.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 12 18:49:19 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Mon, 12 Sep 2005 14:49:19 -0400
Subject: rpms/perl-Log-Dispatch/devel perl-Log-Dispatch.spec,1.1,1.2
Message-ID: <200509121849.j8CInJun003747@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Log-Dispatch/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3725

Modified Files:
	perl-Log-Dispatch.spec 
Log Message:
Better mod_perl handling.


Index: perl-Log-Dispatch.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Log-Dispatch/devel/perl-Log-Dispatch.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Log-Dispatch.spec	12 Sep 2005 11:38:16 -0000	1.1
+++ perl-Log-Dispatch.spec	12 Sep 2005 18:49:17 -0000	1.2
@@ -1,11 +1,6 @@
 # Build switch:
 #   --with mailtests         Enable mail tests
 
-# set mod_perl2 to
-#   1  for enabling mod_perl >= 2.0.0RC5 support
-#   0  for enabling mod_perl < 2.0.0RC5 support
-
-%define mod_perl2      1
 %define mailtests      0
 
 %{?_with_mailtests:%define mailtests 1}
@@ -13,7 +8,7 @@
 
 Name:           perl-Log-Dispatch
 Version:        2.11
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Dispatches messages to one or more outputs
 
 Group:          Development/Libraries
@@ -44,9 +39,9 @@
 
 %prep
 %setup -q -n Log-Dispatch-%{version}
-%if %{mod_perl2}
+if %{__perl} -e 'use Apache2::Log' ; then
 %patch0 -p1
-%endif
+fi
 %if %{mailtests}
 %patch1 -p1
 %endif
@@ -79,5 +74,8 @@
 
 
 %changelog
+* Mon Sep 12 2005 Jose Pedro Oliveira  - 2.11-2
+- Better mod_perl handling.
+
 * Fri Sep 09 2005 Jose Pedro Oliveira  - 2.11-1
 - First build.



From fedora-extras-commits at redhat.com  Mon Sep 12 18:58:25 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Mon, 12 Sep 2005 14:58:25 -0400
Subject: rpms/perl-Log-Dispatch/FC-3 perl-Log-Dispatch.spec,1.2,1.3
Message-ID: <200509121858.j8CIwtEu003881@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Log-Dispatch/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3844/FC-3

Modified Files:
	perl-Log-Dispatch.spec 
Log Message:
Sync with devel


Index: perl-Log-Dispatch.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Log-Dispatch/FC-3/perl-Log-Dispatch.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Log-Dispatch.spec	12 Sep 2005 15:37:20 -0000	1.2
+++ perl-Log-Dispatch.spec	12 Sep 2005 18:58:23 -0000	1.3
@@ -1,11 +1,6 @@
 # Build switch:
 #   --with mailtests         Enable mail tests
 
-# set mod_perl2 to
-#   1  for enabling mod_perl >= 2.0.0RC5 support
-#   0  for enabling mod_perl < 2.0.0RC5 support
-
-%define mod_perl2      0
 %define mailtests      0
 
 %{?_with_mailtests:%define mailtests 1}
@@ -13,7 +8,7 @@
 
 Name:           perl-Log-Dispatch
 Version:        2.11
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Dispatches messages to one or more outputs
 
 Group:          Development/Libraries
@@ -44,9 +39,9 @@
 
 %prep
 %setup -q -n Log-Dispatch-%{version}
-%if %{mod_perl2}
+if %{__perl} -e 'use Apache2::Log' ; then
 %patch0 -p1
-%endif
+fi
 %if %{mailtests}
 %patch1 -p1
 %endif
@@ -79,5 +74,8 @@
 
 
 %changelog
+* Mon Sep 12 2005 Jose Pedro Oliveira  - 2.11-2
+- Better mod_perl handling.
+
 * Fri Sep 09 2005 Jose Pedro Oliveira  - 2.11-1
 - First build.



From fedora-extras-commits at redhat.com  Mon Sep 12 18:58:25 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Mon, 12 Sep 2005 14:58:25 -0400
Subject: rpms/perl-Log-Dispatch/FC-4 perl-Log-Dispatch.spec,1.1,1.2
Message-ID: <200509121859.j8CIwt2l003886@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Log-Dispatch/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3844/FC-4

Modified Files:
	perl-Log-Dispatch.spec 
Log Message:
Sync with devel


Index: perl-Log-Dispatch.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Log-Dispatch/FC-4/perl-Log-Dispatch.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Log-Dispatch.spec	12 Sep 2005 11:38:16 -0000	1.1
+++ perl-Log-Dispatch.spec	12 Sep 2005 18:58:23 -0000	1.2
@@ -1,11 +1,6 @@
 # Build switch:
 #   --with mailtests         Enable mail tests
 
-# set mod_perl2 to
-#   1  for enabling mod_perl >= 2.0.0RC5 support
-#   0  for enabling mod_perl < 2.0.0RC5 support
-
-%define mod_perl2      1
 %define mailtests      0
 
 %{?_with_mailtests:%define mailtests 1}
@@ -13,7 +8,7 @@
 
 Name:           perl-Log-Dispatch
 Version:        2.11
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Dispatches messages to one or more outputs
 
 Group:          Development/Libraries
@@ -44,9 +39,9 @@
 
 %prep
 %setup -q -n Log-Dispatch-%{version}
-%if %{mod_perl2}
+if %{__perl} -e 'use Apache2::Log' ; then
 %patch0 -p1
-%endif
+fi
 %if %{mailtests}
 %patch1 -p1
 %endif
@@ -79,5 +74,8 @@
 
 
 %changelog
+* Mon Sep 12 2005 Jose Pedro Oliveira  - 2.11-2
+- Better mod_perl handling.
+
 * Fri Sep 09 2005 Jose Pedro Oliveira  - 2.11-1
 - First build.



From fedora-extras-commits at redhat.com  Mon Sep 12 19:16:53 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon, 12 Sep 2005 15:16:53 -0400
Subject: rpms/sbcl/devel sbcl.spec,1.4,1.5
Message-ID: <200509121916.j8CJGrvY005370@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/sbcl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5351

Modified Files:
	sbcl.spec 
Log Message:
* Mon Sep 13 2005 Rex Dieter  0.9.4-8
- use/define LIB_DIR instead of hard-coded INSTALL_ROOT/lib



Index: sbcl.spec
===================================================================
RCS file: /cvs/extras/rpms/sbcl/devel/sbcl.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sbcl.spec	12 Sep 2005 18:27:43 -0000	1.4
+++ sbcl.spec	12 Sep 2005 19:16:51 -0000	1.5
@@ -21,7 +21,7 @@
 Name: 	 sbcl
 Summary: Steel Bank Common Lisp
 Version: 0.9.4
-Release: 7%{?dist}
+Release: 8%{?dist}
 
 License: BSD/MIT
 Group: 	 Development/Languages
@@ -53,6 +53,7 @@
 # See http://sourceforge.net/mailarchive/message.php?msg_id=12787069
 Patch2: sbcl-0.9.4-ADDR_NO_RANDOMIZE.patch
 Patch3: sbcl-0.9.4-optflags.patch
+Patch4: sbcl-0.9.4-LIB_DIR.patch
 
 %{?sbcl_bootstrap:BuildRequires: %{?sbcl_bootstrap}}
 
@@ -76,6 +77,7 @@
 %patch1 -p0 -b .default-sbcl-home
 %patch2 -p1 -b .ADDR_NO_RANDOMIZE
 %patch3 -p1 -b .optflags
+%patch4 -p1 -b .LIB_DIR
 
 # http://article.gmane.org/gmane.lisp.steel-bank.general/340
 # enable threads (was only for >= 2.6, but code has checks to disable for <= 2.4)
@@ -99,6 +101,8 @@
 # CVS crud 
 find . -name CVS -type d | xargs rm -rf
 find . -name '.cvsignore' | xargs rm -f
+# fix permissions (some have eXecute bit set)
+find . -name '*.c' | xargs chmod 644
 
 
 %build
@@ -116,19 +120,20 @@
 
 
 %check || :
-%if "%{?_with_check:1}" == "1"
+#if "%{?_with_check:1}" == "1"
 pushd tests 
 %{?setarch} sh ./run-tests.sh 
 popd
-%endif
+#endif
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
 mkdir -p $RPM_BUILD_ROOT{%{_bindir},%{_libdir},%{_mandir}}
-export INSTALL_ROOT=$RPM_BUILD_ROOT%{_prefix}
 unset SBCL_HOME ||:
+export INSTALL_ROOT=$RPM_BUILD_ROOT%{_prefix}
+export LIB_DIR=$RPM_BUILD_ROOT%{_libdir}
 %{?setarch} sh ./install.sh
 
 # app-wrapper for using setarch
@@ -143,13 +148,8 @@
 ## Unpackaged files
 rm -rf $RPM_BUILD_ROOT%{_docdir}/sbcl
 rm -f  $RPM_BUILD_ROOT%{_infodir}/dir
-# CVS crud 
-#find $RPM_BUILD_ROOT -name CVS -type d | xargs rm -rf
-#find $RPM_BUILD_ROOT -name '.cvsignore' | xargs rm -f
 # from make check
 find $RPM_BUILD_ROOT -name 'test-passed' | xargs rm -f
-# 
-find $RPM_BUILD_ROOT -name '*.c' | xargs chmod 644 
 
 
 %post
@@ -181,6 +181,9 @@
 
 
 %changelog
+* Mon Sep 13 2005 Rex Dieter  0.9.4-8
+- use/define LIB_DIR instead of hard-coded INSTALL_ROOT/lib
+
 * Mon Sep 12 2005 Rex Dieter  0.9.4-7
 - %{x86_64} -> x86_64
 



From fedora-extras-commits at redhat.com  Mon Sep 12 19:18:20 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon, 12 Sep 2005 15:18:20 -0400
Subject: rpms/sbcl/devel sbcl-0.9.4-LIB_DIR.patch, NONE, 1.1 sbcl.spec, 1.5,
	1.6
Message-ID: <200509121918.j8CJIK9k005447@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/sbcl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5425

Modified Files:
	sbcl.spec 
Added Files:
	sbcl-0.9.4-LIB_DIR.patch 
Log Message:
forgot LIB_DIR patch


sbcl-0.9.4-LIB_DIR.patch:

--- NEW FILE sbcl-0.9.4-LIB_DIR.patch ---
--- sbcl-0.9.4/install.sh.lib64	2005-05-28 04:00:34.000000000 -0500
+++ sbcl-0.9.4/install.sh	2005-09-12 14:00:27.310267719 -0500
@@ -13,10 +13,11 @@
 MAN_DIR=${MAN_DIR-$INSTALL_ROOT/share/man}
 INFO_DIR=${INFO_DIR-$INSTALL_ROOT/share/info}
 DOC_DIR=${DOC_DIR-$INSTALL_ROOT/share/doc/sbcl}
+LIB_DIR=${LIB_DIR-$INSTALL_ROOT/lib}}
 
 # Does the environment look sane?
 SBCL_SOURCE=`pwd`
-if [ -n "$SBCL_HOME" -a "$INSTALL_ROOT/lib/sbcl" != "$SBCL_HOME" ];then
+if [ -n "$SBCL_HOME" -a "$LIB_DIR/sbcl" != "$SBCL_HOME" ];then
    echo SBCL_HOME environment variable is set, and conflicts with INSTALL_ROOT.
    echo Aborting installation.  Unset one or reset the other, then try again
    echo INSTALL_ROOT="$INSTALL_ROOT"
@@ -37,10 +38,10 @@
     exit 1
 fi
 
-SBCL_HOME=$INSTALL_ROOT/lib/sbcl
+SBCL_HOME=$LIB_DIR/sbcl
 export SBCL_HOME INSTALL_ROOT
 ensure_dirs $BUILD_ROOT$INSTALL_ROOT $BUILD_ROOT$INSTALL_ROOT/bin \
-    $BUILD_ROOT$INSTALL_ROOT/lib  \
+    $BUILD_ROOT$LIB_DIR  \
     $BUILD_ROOT$MAN_DIR $BUILD_ROOT$MAN_DIR/man1 \
     $BUILD_ROOT$INFO_DIR $BUILD_ROOT$DOC_DIR \
     $BUILD_ROOT$DOC_DIR/html \
@@ -76,7 +77,7 @@
 echo
 echo "SBCL has been installed:"
 echo " binary $BUILD_ROOT$INSTALL_ROOT/bin/sbcl"
-echo " core and contribs in $BUILD_ROOT$INSTALL_ROOT/lib/sbcl/"
+echo " core and contribs in $BUILD_ROOT$LIB_DIR"
 
 # Installing manual & misc bits of documentation
 #


Index: sbcl.spec
===================================================================
RCS file: /cvs/extras/rpms/sbcl/devel/sbcl.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sbcl.spec	12 Sep 2005 19:16:51 -0000	1.5
+++ sbcl.spec	12 Sep 2005 19:18:18 -0000	1.6
@@ -21,7 +21,7 @@
 Name: 	 sbcl
 Summary: Steel Bank Common Lisp
 Version: 0.9.4
-Release: 8%{?dist}
+Release: 9%{?dist}
 
 License: BSD/MIT
 Group: 	 Development/Languages
@@ -181,7 +181,7 @@
 
 
 %changelog
-* Mon Sep 13 2005 Rex Dieter  0.9.4-8
+* Mon Sep 13 2005 Rex Dieter  0.9.4-9
 - use/define LIB_DIR instead of hard-coded INSTALL_ROOT/lib
 
 * Mon Sep 12 2005 Rex Dieter  0.9.4-7



From fedora-extras-commits at redhat.com  Mon Sep 12 19:58:58 2005
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Mon, 12 Sep 2005 15:58:58 -0400
Subject: rpms/libnet/devel .cvsignore, 1.3, 1.4 Makefile, 1.3, 1.4 sources,
	1.3, 1.4
Message-ID: <200509121958.j8CJww4P005647@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/libnet/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5623/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup devel branch for libnet



Index: .cvsignore
===================================================================
RCS file: .cvsignore
diff -N .cvsignore


Index: Makefile
===================================================================
RCS file: Makefile
diff -N Makefile
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ Makefile	12 Sep 2005 19:58:55 -0000	1.4
@@ -0,0 +1,21 @@
+# Makefile for source rpm: cppunit
+# $Id$
+NAME := libnet
+SPECFILE = $(firstword $(wildcard *.spec))
+
+define find-makefile-common
+for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
+endef
+
+MAKEFILE_COMMON := $(shell $(find-makefile-common))
+
+ifeq ($(MAKEFILE_COMMON),)
+# attept a checkout
+define checkout-makefile-common
+test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
+endef
+
+MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
+endif
+
+include $(MAKEFILE_COMMON)


Index: sources
===================================================================
RCS file: sources
diff -N sources



From fedora-extras-commits at redhat.com  Mon Sep 12 20:00:00 2005
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Mon, 12 Sep 2005 16:00:00 -0400
Subject: rpms/libnet import.log,1.3,1.4
Message-ID: <200509122000.j8CK00Gu005722@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/libnet
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5687

Modified Files:
	import.log 
Log Message:
auto-import libnet-1.1.2.1-5 on branch devel from libnet-1.1.2.1-5.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/libnet/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	8 Nov 2004 04:45:40 -0000	1.3
+++ import.log	12 Sep 2005 19:59:58 -0000	1.4
@@ -1,2 +1,3 @@
 libnet-1_0_2a-0_fdr_1_rh80:HEAD:libnet-1.0.2a-0.fdr.1.rh80.src.rpm:1099889134
 libnet-1_0_2a_rh90-0_fdr_1:HEAD:libnet-1.0.2a.rh90-0.fdr.1.src.rpm:1099889140
+libnet-1_1_2_1-5:HEAD:libnet-1.1.2.1-5.src.rpm:1126554961



From fedora-extras-commits at redhat.com  Mon Sep 12 20:00:00 2005
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Mon, 12 Sep 2005 16:00:00 -0400
Subject: rpms/libnet/devel libnet.spec, 1.3, 1.4 .cvsignore, 1.4, 1.5 sources,
	1.4, 1.5
Message-ID: <200509122000.j8CK0096005729@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/libnet/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5687/devel

Modified Files:
	.cvsignore sources 
Added Files:
	libnet.spec 
Log Message:
auto-import libnet-1.1.2.1-5 on branch devel from libnet-1.1.2.1-5.src.rpm


Index: libnet.spec
===================================================================
RCS file: libnet.spec
diff -N libnet.spec
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ libnet.spec	12 Sep 2005 19:59:58 -0000	1.4
@@ -0,0 +1,96 @@
+Summary:        C library for portable packet creation and injection
+Name:           libnet
+Version:        1.1.2.1
+Release:        5
+License:        BSD
+Group:          System Environment/Libraries
+URL:            http://www.packetfactory.net/libnet/
+Source0:        http://www.packetfactory.net/libnet/dist/libnet-%{version}.tar.gz
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+%description
+Libnet is an API to help with the construction and handling of network packets.
+It provides a portable framework for low-level network packet writing and
+handling (use libnet in conjunction with libpcap and you can write some really
+cool stuff).  Libnet includes packet creation at the IP layer and at the link
+layer as well as a host of supplementary and complementary functionality.
+Libnet is very handy with which to write network tools and network test code.
+See the manpage and sample test code for more detailed information.
+
+%package devel
+Summary:        Development files for libnet
+Group:          Development/Libraries
+Provides:       %{name} = %{version}-%{release}
+
+%description devel
+Libnet is an API to help with the construction and handling of network packets.
+It provides a portable framework for low-level network packet writing and
+handling (use libnet in conjunction with libpcap and you can write some really
+cool stuff).  Libnet includes packet creation at the IP layer and at the link
+layer as well as a host of supplementary and complementary functionality.
+Libnet is very handy with which to write network tools and network test code.
+See the manpage and sample test code for more detailed information.
+
+
+%prep
+%setup -q -n libnet
+sed -i -e 's/\r$//' doc/CHANGELOG doc/CONTRIB
+find . -depth -type d -name CVS -exec rm -rf {} ';'
+rm -rf sample/win32
+rm -f sample/.\#* sample/.*.swp
+
+%build
+%configure
+make %{?_smp_mflags}
+
+%install
+rm -rf %{buildroot}
+make DESTDIR=%{buildroot} install
+
+install -D --mode=0755 libnet-config %{buildroot}%{_bindir}/libnet-config
+
+install -d --mode=0755 %{buildroot}%{_mandir}/man3
+install -D --mode=0644 doc/man/man3/libnet*.3 %{buildroot}%{_mandir}/man3/
+
+make -C sample clean
+
+%clean
+rm -rf %{buildroot}
+
+%files devel
+%defattr(-,root,root,-)
+%doc README VERSION
+%doc doc/BUGS doc/CHANGELOG doc/CONTRIB doc/COPYING doc/DESIGN_NOTES
+%doc doc/MIGRATION doc/PACKET_BUILDING doc/PORTED doc/RAWSOCKET_NON_SEQUITUR
+%doc doc/TODO doc/html/ sample/
+
+%{_bindir}/libnet-config
+%{_includedir}/libnet/
+%{_includedir}/libnet.h
+%{_libdir}/libnet.a
+%{_mandir}/man3/libnet*
+
+%changelog
+* Tue Aug 30 2005 Paul Howarth  1.1.2.1-5
+- spec file cleanup
+
+* Fri Aug 26 2005 Patrice Dumas  1.1.2.1-4
+- use pushd and popd (from Oliver Falk) 
+
+* Mon Aug 22 2005 Patrice Dumas  1.1.2.1-3
+- Correct dos end of lines
+- add in devel: Provides: %{name} = %{version}-%{release} 
+
+* Fri Aug 12 2005 Patrice Dumas  1.1.2.1-2
+- put everything in a devel subpackage
+- add smpflags
+- clean in sample
+
+* Fri Aug 12 2005 Patrice Dumas  1.1.2.1-1
+- rebuild changing only name
+
+* Wed Jun 02 2004 Marcin Garski  1.1.2.1-2.fc2
+- Rebuild for Fedora Core 2
+
+* Sat May 08 2004 Marcin Garski  1.1.2.1-1
+- Initial specfile


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libnet/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	12 Sep 2005 19:58:55 -0000	1.4
+++ .cvsignore	12 Sep 2005 19:59:58 -0000	1.5
@@ -0,0 +1 @@
+libnet-1.1.2.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libnet/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	12 Sep 2005 19:58:55 -0000	1.4
+++ sources	12 Sep 2005 19:59:58 -0000	1.5
@@ -0,0 +1 @@
+be845c41170d72c7db524f3411b50256  libnet-1.1.2.1.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 12 20:07:15 2005
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Mon, 12 Sep 2005 16:07:15 -0400
Subject: rpms/libnet/devel libnet.spec,1.4,1.5
Message-ID: <200509122007.j8CK7m32007146@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/libnet/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7124

Modified Files:
	libnet.spec 
Log Message:
Add dist tag and bump release (made the mistake of make tag before commit)



Index: libnet.spec
===================================================================
RCS file: /cvs/extras/rpms/libnet/devel/libnet.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- libnet.spec	12 Sep 2005 19:59:58 -0000	1.4
+++ libnet.spec	12 Sep 2005 20:07:13 -0000	1.5
@@ -1,7 +1,7 @@
 Summary:        C library for portable packet creation and injection
 Name:           libnet
 Version:        1.1.2.1
-Release:        5
+Release:        6%{?dist}
 License:        BSD
 Group:          System Environment/Libraries
 URL:            http://www.packetfactory.net/libnet/
@@ -71,6 +71,9 @@
 %{_mandir}/man3/libnet*
 
 %changelog
+* Mon Sep 12 2005 Patrice Dumas  1.1.2.1-6
+- bump release and add dist tag
+
 * Tue Aug 30 2005 Paul Howarth  1.1.2.1-5
 - spec file cleanup
 



From fedora-extras-commits at redhat.com  Mon Sep 12 20:17:00 2005
From: fedora-extras-commits at redhat.com (Elliot Lee (sopwith))
Date: Mon, 12 Sep 2005 16:17:00 -0400
Subject: CVSROOT avail,1.11,1.12
Message-ID: <200509122017.j8CKH0pd007263@cvs-int.fedora.redhat.com>

Author: sopwith

Update of /cvs/fedora/CVSROOT
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7244

Modified Files:
	avail 
Log Message:
Add cfeist


Index: avail
===================================================================
RCS file: /cvs/fedora/CVSROOT/avail,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- avail	17 Aug 2005 13:57:35 -0000	1.11
+++ avail	12 Sep 2005 20:16:57 -0000	1.12
@@ -42,6 +42,7 @@
 avail | riel | web/html/projects/virtualisation
 avail | ezannoni | web/html/projects/systemtap
 avail | harald | web/html/docs/udev
+avail | cfeist | web/html/projects/cluster
 
 unavail | | fedora-security
 avail | mjc,bressers,jorton,notting,sopwith,katzj | fedora-security



From fedora-extras-commits at redhat.com  Mon Sep 12 20:17:10 2005
From: fedora-extras-commits at redhat.com (Elliot Lee (sopwith))
Date: Mon, 12 Sep 2005 16:17:10 -0400
Subject: web/html/projects/cluster - New directory
Message-ID: <200509122017.j8CKHAqR007283@cvs-int.fedora.redhat.com>

Author: sopwith

Update of /cvs/fedora/web/html/projects/cluster
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7269/cluster

Log Message:
Directory /cvs/fedora/web/html/projects/cluster added to the repository




From fedora-extras-commits at redhat.com  Mon Sep 12 20:27:51 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Mon, 12 Sep 2005 16:27:51 -0400
Subject: rpms/gputils/devel man-fr.diff, NONE, 1.1 .cvsignore, 1.2,
	1.3 gputils.spec, 1.5, 1.6 sources, 1.2, 1.3
Message-ID: <200509122027.j8CKRpoM007603@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/gputils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7579

Modified Files:
	.cvsignore gputils.spec sources 
Added Files:
	man-fr.diff 
Log Message:
Update by proxy (Alain Portal)

man-fr.diff:

--- NEW FILE man-fr.diff ---
Index: gputils/man/fr/gpasm.1
===================================================================
RCS file: /cvsroot/gputils/gputils/man/fr/gpasm.1,v
retrieving revision 1.5
diff -u -r1.5 gpasm.1
--- gputils/man/fr/gpasm.1	15 Jun 2005 01:12:32 -0000	1.5
+++ gputils/man/fr/gpasm.1	12 Sep 2005 07:36:03 -0000
@@ -117,7 +117,7 @@
 .PP
 Ce document est une traduction r??alis??e par Alain Portal
  le 14 octobre 2004 et r??vis??e
-le 24 mai 2005.
+le 9 juin 2005.
 .PP
 L'??quipe de traduction a fait le maximum pour r??aliser une adaptation
 fran??aise de qualit??. La version anglaise la plus ?? jour de ce document est
Index: gputils/man/fr/gpdasm.1
===================================================================
RCS file: /cvsroot/gputils/gputils/man/fr/gpdasm.1,v
retrieving revision 1.5
diff -u -r1.5 gpdasm.1
--- gputils/man/fr/gpdasm.1	15 Jun 2005 01:12:32 -0000	1.5
+++ gputils/man/fr/gpdasm.1	12 Sep 2005 07:36:03 -0000
@@ -60,7 +60,7 @@
 .PP
 Ce document est une traduction r??alis??e par Alain Portal
  le 14 octobre 2004 et r??vis??e
-le 24 mai 2005.
+le 9 juin 2005.
 .PP
 L'??quipe de traduction a fait le maximum pour r??aliser une adaptation
 fran??aise de qualit??. La version anglaise la plus ?? jour de ce document est
Index: gputils/man/fr/gplib.1
===================================================================
RCS file: /cvsroot/gputils/gputils/man/fr/gplib.1,v
retrieving revision 1.5
diff -u -r1.5 gplib.1
--- gputils/man/fr/gplib.1	15 Jun 2005 01:12:32 -0000	1.5
+++ gputils/man/fr/gplib.1	12 Sep 2005 07:36:03 -0000
@@ -62,7 +62,7 @@
 .PP
 Ce document est une traduction r??alis??e par Alain Portal
  le 14 octobre 2004 et r??vis??e
-le 24 mai 2005.
+le 9 juin 2005.
 .PP
 L'??quipe de traduction a fait le maximum pour r??aliser une adaptation
 fran??aise de qualit??. La version anglaise la plus ?? jour de ce document est
Index: gputils/man/fr/gplink.1
===================================================================
RCS file: /cvsroot/gputils/gputils/man/fr/gplink.1,v
retrieving revision 1.5
diff -u -r1.5 gplink.1
--- gputils/man/fr/gplink.1	15 Jun 2005 01:12:32 -0000	1.5
+++ gputils/man/fr/gplink.1	12 Sep 2005 07:36:03 -0000
@@ -75,7 +75,7 @@
 .PP
 Ce document est une traduction r??alis??e par Alain Portal
  le 14 octobre 2004 et r??vis??e
-le 24 mai 2005.
+le 9 juin 2005.
 .PP
 L'??quipe de traduction a fait le maximum pour r??aliser une adaptation
 fran??aise de qualit??. La version anglaise la plus ?? jour de ce document est
Index: gputils/man/fr/gpstrip.1
===================================================================
RCS file: /cvsroot/gputils/gputils/man/fr/gpstrip.1,v
retrieving revision 1.2
diff -u -r1.2 gpstrip.1
--- gputils/man/fr/gpstrip.1	15 Jun 2005 01:12:32 -0000	1.2
+++ gputils/man/fr/gpstrip.1	12 Sep 2005 07:36:03 -0000
@@ -63,7 +63,9 @@
 .SH TRADUCTION
 .PP
 Ce document est une traduction r??alis??e par Alain Portal
- le 24 mai 2005.
+ le 24 mai 2005 et r??vis??e
+le 9 juin 2005.
+
 .PP
 L'??quipe de traduction a fait le maximum pour r??aliser une adaptation
 fran??aise de qualit??. La version anglaise la plus ?? jour de ce document est
Index: gputils/man/fr/gputils.1
===================================================================
RCS file: /cvsroot/gputils/gputils/man/fr/gputils.1,v
retrieving revision 1.4
diff -u -r1.4 gputils.1
--- gputils/man/fr/gputils.1	27 May 2005 03:14:36 -0000	1.4
+++ gputils/man/fr/gputils.1	12 Sep 2005 07:36:03 -0000
@@ -19,7 +19,7 @@
 .PP
 Ce document est une traduction r??alis??e par Alain Portal
  le 14 octobre 2004 et r??vis??e
-le 24 mai 2005.
+le 9 juin 2005.
 .PP
 L'??quipe de traduction a fait le maximum pour r??aliser une adaptation
 fran??aise de qualit??. La version anglaise la plus ?? jour de ce document est
Index: gputils/man/fr/gpvc.1
===================================================================
RCS file: /cvsroot/gputils/gputils/man/fr/gpvc.1,v
retrieving revision 1.5
diff -u -r1.5 gpvc.1
--- gputils/man/fr/gpvc.1	15 Jun 2005 01:12:32 -0000	1.5
+++ gputils/man/fr/gpvc.1	12 Sep 2005 07:36:03 -0000
@@ -56,7 +56,7 @@
 .PP
 Ce document est une traduction r??alis??e par Alain Portal
  le 14 octobre 2004 et r??vis??e
-le 24 mai 2005.
+le 9 juin 2005.
 .PP
 L'??quipe de traduction a fait le maximum pour r??aliser une adaptation
 fran??aise de qualit??. La version anglaise la plus ?? jour de ce document est
Index: gputils/man/fr/gpvo.1
===================================================================
RCS file: /cvsroot/gputils/gputils/man/fr/gpvo.1,v
retrieving revision 1.5
diff -u -r1.5 gpvo.1
--- gputils/man/fr/gpvo.1	15 Jun 2005 01:12:32 -0000	1.5
+++ gputils/man/fr/gpvo.1	12 Sep 2005 07:36:03 -0000
@@ -63,7 +63,7 @@
 .PP
 Ce document est une traduction r??alis??e par Alain Portal
  le 14 octobre 2004 et r??vis??e
-le 24 mai 2005.
+le 9 juin 2005.
 .PP
 L'??quipe de traduction a fait le maximum pour r??aliser une adaptation
 fran??aise de qualit??. La version anglaise la plus ?? jour de ce document est


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gputils/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 04:30:22 -0000	1.2
+++ .cvsignore	12 Sep 2005 20:27:49 -0000	1.3
@@ -1 +1 @@
-gputils-0.12.4.tar.gz
+gputils-0.13.3.tar.gz


Index: gputils.spec
===================================================================
RCS file: /cvs/extras/rpms/gputils/devel/gputils.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gputils.spec	6 Apr 2005 22:11:39 -0000	1.5
+++ gputils.spec	12 Sep 2005 20:27:49 -0000	1.6
@@ -1,13 +1,13 @@
 Name:		gputils
-Version:	0.12.4
-Release:	3
-
+Version:	0.13.3
+Release:	1%{?dist}
 Summary:	Development utilities for Microchip (TM) PIC (TM) microcontrollers
 
 Group:		Development/Languages
 License:	GPL
 URL:		http://gputils.sourceforge.net
-Source:		http://prdownloads.sourceforge.net/gputils/gputils-0.12.4.tar.gz
+Source:		http://prdownloads.sourceforge.net/gputils/gputils-%{version}.tar.gz
+Patch:		man-fr.diff
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -20,30 +20,42 @@
 an up-to-date list of what gputils can do.
 
 %prep
-%setup
+%setup -q
+%patch -p1
 
 %build
 %configure
 make %{?_smp_mflags}
 
 %install
-make DESTDIR=$RPM_BUILD_ROOT install
+rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT
 
 %clean
 rm -rf $RPM_BUILD_ROOT
-rm -rf $RPM_BUILD_DIR/%{name}
 
 %files
-%defattr(-, root, root)
+%defattr(-,root,root,-)
+%doc AUTHORS ChangeLog COPYING README TODO
+%doc doc/%{name}.pdf doc/%{name}.ps
 %{_bindir}/*
-%{_mandir}/man1/*
 %{_datadir}/%{name}/
-%doc AUTHORS ChangeLog COPYING NEWS README TODO
-%doc doc/%{name}.pdf doc/%{name}.ps
+%{_mandir}/man1/*
+%{_mandir}/fr/man1/*
 
 %changelog
-* Fri Apr  7 2005 Michael Schwendt 
-- rebuilt
+* Mon Sep 12 2005 Alain Portal  0.13.3-1
+  - New version
+  - Patch to update french man pages
+
+* Mon May 23 2005 Alain Portal  0.13.2-1
+  - New version
+
+* Thu Jan 6 2005 Alain Portal  0:0.13.0-0.fdr.2
+  - Patch to update french man pages
+
+* Tue Jan 4 2005 Alain Portal  0:0.13.0-0.fdr.1
+  - New version
 
 * Thu Oct 7 2004 Alain Portal  0:0.12.4-0.fdr.2
   - Use Licence instead of copyright


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gputils/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 04:30:22 -0000	1.2
+++ sources	12 Sep 2005 20:27:49 -0000	1.3
@@ -1 +1 @@
-3ed60ae402009cec21c6dc8132302172  gputils-0.12.4.tar.gz
+9703abd149565d6f5e926dda15eef8c2  gputils-0.13.3.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 12 20:29:00 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon, 12 Sep 2005 16:29:00 -0400
Subject: rpms/gc/FC-4 gc.spec,1.10,1.11
Message-ID: <200509122029.j8CKT0jb007673@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/gc/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7653

Modified Files:
	gc.spec 
Log Message:
* Mon Sep 12 2005 Rex Dieter  6.6-2
- drop opendl patch (doesn't appear to be needed anymore)



Index: gc.spec
===================================================================
RCS file: /cvs/extras/rpms/gc/FC-4/gc.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- gc.spec	12 Sep 2005 18:45:12 -0000	1.10
+++ gc.spec	12 Sep 2005 20:28:58 -0000	1.11
@@ -4,7 +4,7 @@
 Name:    gc	
 Version: 6.6
 
-Release: 1%{?dist}
+Release: 2%{?dist}
 Group:   System Environment/Libraries
 License: BSD
 Url:     http://www.hpl.hp.com/personal/Hans_Boehm/gc/	
@@ -29,7 +29,7 @@
 %prep
 %setup -n %{name}%{version}
 
-%patch1 -p1 -b .opendl
+#patch1 -p1 -b .opendl
 
 
 %build
@@ -83,7 +83,10 @@
 
 
 %changelog
-* Fri Sep 09 2005 Rex Dieter  6.6-1
+* Mon Sep 12 2005 Rex Dieter  6.6-2
+- drop opendl patch (doesn't appear to be needed anymore)
+
+* Fri Sep 09 2005 Rex Dieter  6.6-1
 - 6.6
 
 * Wed May 25 2005 Rex Dieter  6.5-1



From fedora-extras-commits at redhat.com  Mon Sep 12 20:36:20 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon, 12 Sep 2005 16:36:20 -0400
Subject: rpms/sbcl/devel sbcl.spec,1.6,1.7
Message-ID: <200509122036.j8CKaKl1007769@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/sbcl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7750

Modified Files:
	sbcl.spec 
Log Message:
ExclusiveArch: %{ix86} (for now)



Index: sbcl.spec
===================================================================
RCS file: /cvs/extras/rpms/sbcl/devel/sbcl.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sbcl.spec	12 Sep 2005 19:18:18 -0000	1.6
+++ sbcl.spec	12 Sep 2005 20:36:18 -0000	1.7
@@ -21,14 +21,14 @@
 Name: 	 sbcl
 Summary: Steel Bank Common Lisp
 Version: 0.9.4
-Release: 9%{?dist}
+Release: 10%{?dist}
 
 License: BSD/MIT
 Group: 	 Development/Languages
 URL:	 http://sbcl.sourceforge.net/
 Source0:  http://dl.sourceforge.net/sourceforge/sbcl/sbcl-%{version}-source.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-#ExclusiveArch: %{ix86} x86_64
+ExclusiveArch: %{ix86}
 
 Source1: sbcl.sh
 
@@ -181,8 +181,9 @@
 
 
 %changelog
-* Mon Sep 13 2005 Rex Dieter  0.9.4-9
+* Mon Sep 13 2005 Rex Dieter  0.9.4-10
 - use/define LIB_DIR instead of hard-coded INSTALL_ROOT/lib
+- ExclusiveArch: %{ix86} (for now)
 
 * Mon Sep 12 2005 Rex Dieter  0.9.4-7
 - %{x86_64} -> x86_64



From fedora-extras-commits at redhat.com  Mon Sep 12 20:41:23 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Mon, 12 Sep 2005 16:41:23 -0400
Subject: rpms/gputils/FC-3 man-fr.diff, NONE, 1.1 .cvsignore, 1.2,
	1.3 gputils.spec, 1.3, 1.4 sources, 1.2, 1.3
Message-ID: <200509122041.j8CKfNl2007870@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/gputils/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7829/FC-3

Modified Files:
	.cvsignore gputils.spec sources 
Added Files:
	man-fr.diff 
Log Message:
Sync with devel

man-fr.diff:

--- NEW FILE man-fr.diff ---
Index: gputils/man/fr/gpasm.1
===================================================================
RCS file: /cvsroot/gputils/gputils/man/fr/gpasm.1,v
retrieving revision 1.5
diff -u -r1.5 gpasm.1
--- gputils/man/fr/gpasm.1	15 Jun 2005 01:12:32 -0000	1.5
+++ gputils/man/fr/gpasm.1	12 Sep 2005 07:36:03 -0000
@@ -117,7 +117,7 @@
 .PP
 Ce document est une traduction r??alis??e par Alain Portal
  le 14 octobre 2004 et r??vis??e
-le 24 mai 2005.
+le 9 juin 2005.
 .PP
 L'??quipe de traduction a fait le maximum pour r??aliser une adaptation
 fran??aise de qualit??. La version anglaise la plus ?? jour de ce document est
Index: gputils/man/fr/gpdasm.1
===================================================================
RCS file: /cvsroot/gputils/gputils/man/fr/gpdasm.1,v
retrieving revision 1.5
diff -u -r1.5 gpdasm.1
--- gputils/man/fr/gpdasm.1	15 Jun 2005 01:12:32 -0000	1.5
+++ gputils/man/fr/gpdasm.1	12 Sep 2005 07:36:03 -0000
@@ -60,7 +60,7 @@
 .PP
 Ce document est une traduction r??alis??e par Alain Portal
  le 14 octobre 2004 et r??vis??e
-le 24 mai 2005.
+le 9 juin 2005.
 .PP
 L'??quipe de traduction a fait le maximum pour r??aliser une adaptation
 fran??aise de qualit??. La version anglaise la plus ?? jour de ce document est
Index: gputils/man/fr/gplib.1
===================================================================
RCS file: /cvsroot/gputils/gputils/man/fr/gplib.1,v
retrieving revision 1.5
diff -u -r1.5 gplib.1
--- gputils/man/fr/gplib.1	15 Jun 2005 01:12:32 -0000	1.5
+++ gputils/man/fr/gplib.1	12 Sep 2005 07:36:03 -0000
@@ -62,7 +62,7 @@
 .PP
 Ce document est une traduction r??alis??e par Alain Portal
  le 14 octobre 2004 et r??vis??e
-le 24 mai 2005.
+le 9 juin 2005.
 .PP
 L'??quipe de traduction a fait le maximum pour r??aliser une adaptation
 fran??aise de qualit??. La version anglaise la plus ?? jour de ce document est
Index: gputils/man/fr/gplink.1
===================================================================
RCS file: /cvsroot/gputils/gputils/man/fr/gplink.1,v
retrieving revision 1.5
diff -u -r1.5 gplink.1
--- gputils/man/fr/gplink.1	15 Jun 2005 01:12:32 -0000	1.5
+++ gputils/man/fr/gplink.1	12 Sep 2005 07:36:03 -0000
@@ -75,7 +75,7 @@
 .PP
 Ce document est une traduction r??alis??e par Alain Portal
  le 14 octobre 2004 et r??vis??e
-le 24 mai 2005.
+le 9 juin 2005.
 .PP
 L'??quipe de traduction a fait le maximum pour r??aliser une adaptation
 fran??aise de qualit??. La version anglaise la plus ?? jour de ce document est
Index: gputils/man/fr/gpstrip.1
===================================================================
RCS file: /cvsroot/gputils/gputils/man/fr/gpstrip.1,v
retrieving revision 1.2
diff -u -r1.2 gpstrip.1
--- gputils/man/fr/gpstrip.1	15 Jun 2005 01:12:32 -0000	1.2
+++ gputils/man/fr/gpstrip.1	12 Sep 2005 07:36:03 -0000
@@ -63,7 +63,9 @@
 .SH TRADUCTION
 .PP
 Ce document est une traduction r??alis??e par Alain Portal
- le 24 mai 2005.
+ le 24 mai 2005 et r??vis??e
+le 9 juin 2005.
+
 .PP
 L'??quipe de traduction a fait le maximum pour r??aliser une adaptation
 fran??aise de qualit??. La version anglaise la plus ?? jour de ce document est
Index: gputils/man/fr/gputils.1
===================================================================
RCS file: /cvsroot/gputils/gputils/man/fr/gputils.1,v
retrieving revision 1.4
diff -u -r1.4 gputils.1
--- gputils/man/fr/gputils.1	27 May 2005 03:14:36 -0000	1.4
+++ gputils/man/fr/gputils.1	12 Sep 2005 07:36:03 -0000
@@ -19,7 +19,7 @@
 .PP
 Ce document est une traduction r??alis??e par Alain Portal
  le 14 octobre 2004 et r??vis??e
-le 24 mai 2005.
+le 9 juin 2005.
 .PP
 L'??quipe de traduction a fait le maximum pour r??aliser une adaptation
 fran??aise de qualit??. La version anglaise la plus ?? jour de ce document est
Index: gputils/man/fr/gpvc.1
===================================================================
RCS file: /cvsroot/gputils/gputils/man/fr/gpvc.1,v
retrieving revision 1.5
diff -u -r1.5 gpvc.1
--- gputils/man/fr/gpvc.1	15 Jun 2005 01:12:32 -0000	1.5
+++ gputils/man/fr/gpvc.1	12 Sep 2005 07:36:03 -0000
@@ -56,7 +56,7 @@
 .PP
 Ce document est une traduction r??alis??e par Alain Portal
  le 14 octobre 2004 et r??vis??e
-le 24 mai 2005.
+le 9 juin 2005.
 .PP
 L'??quipe de traduction a fait le maximum pour r??aliser une adaptation
 fran??aise de qualit??. La version anglaise la plus ?? jour de ce document est
Index: gputils/man/fr/gpvo.1
===================================================================
RCS file: /cvsroot/gputils/gputils/man/fr/gpvo.1,v
retrieving revision 1.5
diff -u -r1.5 gpvo.1
--- gputils/man/fr/gpvo.1	15 Jun 2005 01:12:32 -0000	1.5
+++ gputils/man/fr/gpvo.1	12 Sep 2005 07:36:03 -0000
@@ -63,7 +63,7 @@
 .PP
 Ce document est une traduction r??alis??e par Alain Portal
  le 14 octobre 2004 et r??vis??e
-le 24 mai 2005.
+le 9 juin 2005.
 .PP
 L'??quipe de traduction a fait le maximum pour r??aliser une adaptation
 fran??aise de qualit??. La version anglaise la plus ?? jour de ce document est


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gputils/FC-3/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 04:30:22 -0000	1.2
+++ .cvsignore	12 Sep 2005 20:41:21 -0000	1.3
@@ -1 +1 @@
-gputils-0.12.4.tar.gz
+gputils-0.13.3.tar.gz


Index: gputils.spec
===================================================================
RCS file: /cvs/extras/rpms/gputils/FC-3/gputils.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gputils.spec	10 Dec 2004 22:03:03 -0000	1.3
+++ gputils.spec	12 Sep 2005 20:41:21 -0000	1.4
@@ -1,52 +1,68 @@
 Name:		gputils
-Version:	0.12.4
-Release:	2
-Epoch:		0
+Version:	0.13.3
+Release:	1%{?dist}
 Summary:	Development utilities for Microchip (TM) PIC (TM) microcontrollers
 
 Group:		Development/Languages
 License:	GPL
 URL:		http://gputils.sourceforge.net
-Source:		http://prdownloads.sourceforge.net/gputils/gputils-0.12.4.tar.gz
-BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Source:		http://prdownloads.sourceforge.net/gputils/gputils-%{version}.tar.gz
+Patch:		man-fr.diff
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
-This is a collection of development tools for Microchip (TM) PIC (TM) 
+This is a collection of development tools for Microchip (TM) PIC (TM)
 microcontrollers.
 
 This is ALPHA software: there may be serious bugs in it, and it's
 nowhere near complete.  gputils currently only implements a subset of
-the features available with Microchip's tools.  See the documentation for 
+the features available with Microchip's tools.  See the documentation for
 an up-to-date list of what gputils can do.
 
 %prep
-%setup
+%setup -q
+%patch -p1
 
 %build
 %configure
 make %{?_smp_mflags}
 
 %install
-make DESTDIR=$RPM_BUILD_ROOT install
+rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT
 
 %clean
 rm -rf $RPM_BUILD_ROOT
-rm -rf $RPM_BUILD_DIR/%{name}
 
 %files
-%defattr(-, root, root)
+%defattr(-,root,root,-)
+%doc AUTHORS ChangeLog COPYING README TODO
+%doc doc/%{name}.pdf doc/%{name}.ps
 %{_bindir}/*
-%{_mandir}/man1/*
 %{_datadir}/%{name}/
-%doc AUTHORS ChangeLog COPYING NEWS README TODO
-%doc doc/%{name}.pdf doc/%{name}.ps
+%{_mandir}/man1/*
+%{_mandir}/fr/man1/*
 
 %changelog
+* Mon Sep 12 2005 Alain Portal  0.13.3-1
+  - New version
+  - Patch to update french man pages
+
+* Mon May 23 2005 Alain Portal  0.13.2-1
+  - New version
+
+* Thu Jan 6 2005 Alain Portal  0:0.13.0-0.fdr.2
+  - Patch to update french man pages
+
+* Tue Jan 4 2005 Alain Portal  0:0.13.0-0.fdr.1
+  - New version
+
 * Thu Oct 7 2004 Alain Portal  0:0.12.4-0.fdr.2
   - Use Licence instead of copyright
   - Use full name and release in Source URL instead of macro
   - Package should own full directory /usr/share/gputils
   - Remove usefulness generic file INSTALL
   - Remove doc source file gputils.lyx
+
 * Wed Oct 6 2004 Alain Portal  0:0.12.4-0.fdr.1
   - Initial Fedora RPM


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gputils/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 04:30:22 -0000	1.2
+++ sources	12 Sep 2005 20:41:21 -0000	1.3
@@ -1 +1 @@
-3ed60ae402009cec21c6dc8132302172  gputils-0.12.4.tar.gz
+9703abd149565d6f5e926dda15eef8c2  gputils-0.13.3.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 12 20:41:24 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Mon, 12 Sep 2005 16:41:24 -0400
Subject: rpms/gputils/FC-4 man-fr.diff, NONE, 1.1 .cvsignore, 1.2,
	1.3 gputils.spec, 1.5, 1.6 sources, 1.2, 1.3
Message-ID: <200509122041.j8CKfOK7007880@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/gputils/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7829/FC-4

Modified Files:
	.cvsignore gputils.spec sources 
Added Files:
	man-fr.diff 
Log Message:
Sync with devel

man-fr.diff:

--- NEW FILE man-fr.diff ---
Index: gputils/man/fr/gpasm.1
===================================================================
RCS file: /cvsroot/gputils/gputils/man/fr/gpasm.1,v
retrieving revision 1.5
diff -u -r1.5 gpasm.1
--- gputils/man/fr/gpasm.1	15 Jun 2005 01:12:32 -0000	1.5
+++ gputils/man/fr/gpasm.1	12 Sep 2005 07:36:03 -0000
@@ -117,7 +117,7 @@
 .PP
 Ce document est une traduction r??alis??e par Alain Portal
  le 14 octobre 2004 et r??vis??e
-le 24 mai 2005.
+le 9 juin 2005.
 .PP
 L'??quipe de traduction a fait le maximum pour r??aliser une adaptation
 fran??aise de qualit??. La version anglaise la plus ?? jour de ce document est
Index: gputils/man/fr/gpdasm.1
===================================================================
RCS file: /cvsroot/gputils/gputils/man/fr/gpdasm.1,v
retrieving revision 1.5
diff -u -r1.5 gpdasm.1
--- gputils/man/fr/gpdasm.1	15 Jun 2005 01:12:32 -0000	1.5
+++ gputils/man/fr/gpdasm.1	12 Sep 2005 07:36:03 -0000
@@ -60,7 +60,7 @@
 .PP
 Ce document est une traduction r??alis??e par Alain Portal
  le 14 octobre 2004 et r??vis??e
-le 24 mai 2005.
+le 9 juin 2005.
 .PP
 L'??quipe de traduction a fait le maximum pour r??aliser une adaptation
 fran??aise de qualit??. La version anglaise la plus ?? jour de ce document est
Index: gputils/man/fr/gplib.1
===================================================================
RCS file: /cvsroot/gputils/gputils/man/fr/gplib.1,v
retrieving revision 1.5
diff -u -r1.5 gplib.1
--- gputils/man/fr/gplib.1	15 Jun 2005 01:12:32 -0000	1.5
+++ gputils/man/fr/gplib.1	12 Sep 2005 07:36:03 -0000
@@ -62,7 +62,7 @@
 .PP
 Ce document est une traduction r??alis??e par Alain Portal
  le 14 octobre 2004 et r??vis??e
-le 24 mai 2005.
+le 9 juin 2005.
 .PP
 L'??quipe de traduction a fait le maximum pour r??aliser une adaptation
 fran??aise de qualit??. La version anglaise la plus ?? jour de ce document est
Index: gputils/man/fr/gplink.1
===================================================================
RCS file: /cvsroot/gputils/gputils/man/fr/gplink.1,v
retrieving revision 1.5
diff -u -r1.5 gplink.1
--- gputils/man/fr/gplink.1	15 Jun 2005 01:12:32 -0000	1.5
+++ gputils/man/fr/gplink.1	12 Sep 2005 07:36:03 -0000
@@ -75,7 +75,7 @@
 .PP
 Ce document est une traduction r??alis??e par Alain Portal
  le 14 octobre 2004 et r??vis??e
-le 24 mai 2005.
+le 9 juin 2005.
 .PP
 L'??quipe de traduction a fait le maximum pour r??aliser une adaptation
 fran??aise de qualit??. La version anglaise la plus ?? jour de ce document est
Index: gputils/man/fr/gpstrip.1
===================================================================
RCS file: /cvsroot/gputils/gputils/man/fr/gpstrip.1,v
retrieving revision 1.2
diff -u -r1.2 gpstrip.1
--- gputils/man/fr/gpstrip.1	15 Jun 2005 01:12:32 -0000	1.2
+++ gputils/man/fr/gpstrip.1	12 Sep 2005 07:36:03 -0000
@@ -63,7 +63,9 @@
 .SH TRADUCTION
 .PP
 Ce document est une traduction r??alis??e par Alain Portal
- le 24 mai 2005.
+ le 24 mai 2005 et r??vis??e
+le 9 juin 2005.
+
 .PP
 L'??quipe de traduction a fait le maximum pour r??aliser une adaptation
 fran??aise de qualit??. La version anglaise la plus ?? jour de ce document est
Index: gputils/man/fr/gputils.1
===================================================================
RCS file: /cvsroot/gputils/gputils/man/fr/gputils.1,v
retrieving revision 1.4
diff -u -r1.4 gputils.1
--- gputils/man/fr/gputils.1	27 May 2005 03:14:36 -0000	1.4
+++ gputils/man/fr/gputils.1	12 Sep 2005 07:36:03 -0000
@@ -19,7 +19,7 @@
 .PP
 Ce document est une traduction r??alis??e par Alain Portal
  le 14 octobre 2004 et r??vis??e
-le 24 mai 2005.
+le 9 juin 2005.
 .PP
 L'??quipe de traduction a fait le maximum pour r??aliser une adaptation
 fran??aise de qualit??. La version anglaise la plus ?? jour de ce document est
Index: gputils/man/fr/gpvc.1
===================================================================
RCS file: /cvsroot/gputils/gputils/man/fr/gpvc.1,v
retrieving revision 1.5
diff -u -r1.5 gpvc.1
--- gputils/man/fr/gpvc.1	15 Jun 2005 01:12:32 -0000	1.5
+++ gputils/man/fr/gpvc.1	12 Sep 2005 07:36:03 -0000
@@ -56,7 +56,7 @@
 .PP
 Ce document est une traduction r??alis??e par Alain Portal
  le 14 octobre 2004 et r??vis??e
-le 24 mai 2005.
+le 9 juin 2005.
 .PP
 L'??quipe de traduction a fait le maximum pour r??aliser une adaptation
 fran??aise de qualit??. La version anglaise la plus ?? jour de ce document est
Index: gputils/man/fr/gpvo.1
===================================================================
RCS file: /cvsroot/gputils/gputils/man/fr/gpvo.1,v
retrieving revision 1.5
diff -u -r1.5 gpvo.1
--- gputils/man/fr/gpvo.1	15 Jun 2005 01:12:32 -0000	1.5
+++ gputils/man/fr/gpvo.1	12 Sep 2005 07:36:03 -0000
@@ -63,7 +63,7 @@
 .PP
 Ce document est une traduction r??alis??e par Alain Portal
  le 14 octobre 2004 et r??vis??e
-le 24 mai 2005.
+le 9 juin 2005.
 .PP
 L'??quipe de traduction a fait le maximum pour r??aliser une adaptation
 fran??aise de qualit??. La version anglaise la plus ?? jour de ce document est


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gputils/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 04:30:22 -0000	1.2
+++ .cvsignore	12 Sep 2005 20:41:22 -0000	1.3
@@ -1 +1 @@
-gputils-0.12.4.tar.gz
+gputils-0.13.3.tar.gz


Index: gputils.spec
===================================================================
RCS file: /cvs/extras/rpms/gputils/FC-4/gputils.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gputils.spec	6 Apr 2005 22:11:39 -0000	1.5
+++ gputils.spec	12 Sep 2005 20:41:22 -0000	1.6
@@ -1,13 +1,13 @@
 Name:		gputils
-Version:	0.12.4
-Release:	3
-
+Version:	0.13.3
+Release:	1%{?dist}
 Summary:	Development utilities for Microchip (TM) PIC (TM) microcontrollers
 
 Group:		Development/Languages
 License:	GPL
 URL:		http://gputils.sourceforge.net
-Source:		http://prdownloads.sourceforge.net/gputils/gputils-0.12.4.tar.gz
+Source:		http://prdownloads.sourceforge.net/gputils/gputils-%{version}.tar.gz
+Patch:		man-fr.diff
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -20,30 +20,42 @@
 an up-to-date list of what gputils can do.
 
 %prep
-%setup
+%setup -q
+%patch -p1
 
 %build
 %configure
 make %{?_smp_mflags}
 
 %install
-make DESTDIR=$RPM_BUILD_ROOT install
+rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT
 
 %clean
 rm -rf $RPM_BUILD_ROOT
-rm -rf $RPM_BUILD_DIR/%{name}
 
 %files
-%defattr(-, root, root)
+%defattr(-,root,root,-)
+%doc AUTHORS ChangeLog COPYING README TODO
+%doc doc/%{name}.pdf doc/%{name}.ps
 %{_bindir}/*
-%{_mandir}/man1/*
 %{_datadir}/%{name}/
-%doc AUTHORS ChangeLog COPYING NEWS README TODO
-%doc doc/%{name}.pdf doc/%{name}.ps
+%{_mandir}/man1/*
+%{_mandir}/fr/man1/*
 
 %changelog
-* Fri Apr  7 2005 Michael Schwendt 
-- rebuilt
+* Mon Sep 12 2005 Alain Portal  0.13.3-1
+  - New version
+  - Patch to update french man pages
+
+* Mon May 23 2005 Alain Portal  0.13.2-1
+  - New version
+
+* Thu Jan 6 2005 Alain Portal  0:0.13.0-0.fdr.2
+  - Patch to update french man pages
+
+* Tue Jan 4 2005 Alain Portal  0:0.13.0-0.fdr.1
+  - New version
 
 * Thu Oct 7 2004 Alain Portal  0:0.12.4-0.fdr.2
   - Use Licence instead of copyright


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gputils/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 04:30:22 -0000	1.2
+++ sources	12 Sep 2005 20:41:22 -0000	1.3
@@ -1 +1 @@
-3ed60ae402009cec21c6dc8132302172  gputils-0.12.4.tar.gz
+9703abd149565d6f5e926dda15eef8c2  gputils-0.13.3.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 12 21:03:45 2005
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Mon, 12 Sep 2005 17:03:45 -0400
Subject: rpms/libnet/FC-4 Makefile, 1.3, 1.4 libnet.spec, 1.3, 1.4 sources,
	1.3, 1.4
Message-ID: <200509122104.j8CL4GMt009286@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/libnet/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9263

Added Files:
	Makefile libnet.spec sources 
Log Message:
Initial files import



Index: Makefile
===================================================================
RCS file: Makefile
diff -N Makefile
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ Makefile	12 Sep 2005 21:03:43 -0000	1.4
@@ -0,0 +1,21 @@
+# Makefile for source rpm: cppunit
+# $Id$
+NAME := libnet
+SPECFILE = $(firstword $(wildcard *.spec))
+
+define find-makefile-common
+for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
+endef
+
+MAKEFILE_COMMON := $(shell $(find-makefile-common))
+
+ifeq ($(MAKEFILE_COMMON),)
+# attept a checkout
+define checkout-makefile-common
+test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
+endef
+
+MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
+endif
+
+include $(MAKEFILE_COMMON)


Index: libnet.spec
===================================================================
RCS file: libnet.spec
diff -N libnet.spec
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ libnet.spec	12 Sep 2005 21:03:43 -0000	1.4
@@ -0,0 +1,99 @@
+Summary:        C library for portable packet creation and injection
+Name:           libnet
+Version:        1.1.2.1
+Release:        6%{?dist}
+License:        BSD
+Group:          System Environment/Libraries
+URL:            http://www.packetfactory.net/libnet/
+Source0:        http://www.packetfactory.net/libnet/dist/libnet-%{version}.tar.gz
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+%description
+Libnet is an API to help with the construction and handling of network packets.
+It provides a portable framework for low-level network packet writing and
+handling (use libnet in conjunction with libpcap and you can write some really
+cool stuff).  Libnet includes packet creation at the IP layer and at the link
+layer as well as a host of supplementary and complementary functionality.
+Libnet is very handy with which to write network tools and network test code.
+See the manpage and sample test code for more detailed information.
+
+%package devel
+Summary:        Development files for libnet
+Group:          Development/Libraries
+Provides:       %{name} = %{version}-%{release}
+
+%description devel
+Libnet is an API to help with the construction and handling of network packets.
+It provides a portable framework for low-level network packet writing and
+handling (use libnet in conjunction with libpcap and you can write some really
+cool stuff).  Libnet includes packet creation at the IP layer and at the link
+layer as well as a host of supplementary and complementary functionality.
+Libnet is very handy with which to write network tools and network test code.
+See the manpage and sample test code for more detailed information.
+
+
+%prep
+%setup -q -n libnet
+sed -i -e 's/\r$//' doc/CHANGELOG doc/CONTRIB
+find . -depth -type d -name CVS -exec rm -rf {} ';'
+rm -rf sample/win32
+rm -f sample/.\#* sample/.*.swp
+
+%build
+%configure
+make %{?_smp_mflags}
+
+%install
+rm -rf %{buildroot}
+make DESTDIR=%{buildroot} install
+
+install -D --mode=0755 libnet-config %{buildroot}%{_bindir}/libnet-config
+
+install -d --mode=0755 %{buildroot}%{_mandir}/man3
+install -D --mode=0644 doc/man/man3/libnet*.3 %{buildroot}%{_mandir}/man3/
+
+make -C sample clean
+
+%clean
+rm -rf %{buildroot}
+
+%files devel
+%defattr(-,root,root,-)
+%doc README VERSION
+%doc doc/BUGS doc/CHANGELOG doc/CONTRIB doc/COPYING doc/DESIGN_NOTES
+%doc doc/MIGRATION doc/PACKET_BUILDING doc/PORTED doc/RAWSOCKET_NON_SEQUITUR
+%doc doc/TODO doc/html/ sample/
+
+%{_bindir}/libnet-config
+%{_includedir}/libnet/
+%{_includedir}/libnet.h
+%{_libdir}/libnet.a
+%{_mandir}/man3/libnet*
+
+%changelog
+* Mon Sep 12 2005 Patrice Dumas  1.1.2.1-6
+- bump release and add dist tag
+
+* Tue Aug 30 2005 Paul Howarth  1.1.2.1-5
+- spec file cleanup
+
+* Fri Aug 26 2005 Patrice Dumas  1.1.2.1-4
+- use pushd and popd (from Oliver Falk) 
+
+* Mon Aug 22 2005 Patrice Dumas  1.1.2.1-3
+- Correct dos end of lines
+- add in devel: Provides: %{name} = %{version}-%{release} 
+
+* Fri Aug 12 2005 Patrice Dumas  1.1.2.1-2
+- put everything in a devel subpackage
+- add smpflags
+- clean in sample
+
+* Fri Aug 12 2005 Patrice Dumas  1.1.2.1-1
+- rebuild changing only name
+
+* Wed Jun 02 2004 Marcin Garski  1.1.2.1-2.fc2
+- Rebuild for Fedora Core 2
+
+* Sat May 08 2004 Marcin Garski  1.1.2.1-1
+- Initial specfile


Index: sources
===================================================================
RCS file: sources
diff -N sources
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ sources	12 Sep 2005 21:03:43 -0000	1.4
@@ -0,0 +1 @@
+be845c41170d72c7db524f3411b50256  libnet-1.1.2.1.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 12 21:14:08 2005
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Mon, 12 Sep 2005 17:14:08 -0400
Subject: rpms/libnet/FC-4 .cvsignore,1.3,1.4
Message-ID: <200509122114.j8CLE83d009437@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/libnet/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9418

Added Files:
	.cvsignore 
Log Message:
Add .cvsignore for FC-4/libnet



Index: .cvsignore
===================================================================
RCS file: .cvsignore
diff -N .cvsignore
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ .cvsignore	12 Sep 2005 21:14:06 -0000	1.4
@@ -0,0 +1 @@
+libnet-1.1.2.1.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 12 21:14:50 2005
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Mon, 12 Sep 2005 17:14:50 -0400
Subject: rpms/libnet/FC-3 .cvsignore, 1.3, 1.4 Makefile, 1.3, 1.4 libnet.spec,
	1.3, 1.4 sources, 1.3, 1.4
Message-ID: <200509122114.j8CLEoaA009473@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/libnet/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9448

Added Files:
	.cvsignore Makefile libnet.spec sources 
Log Message:
Add libnet files for FC-3 branch



Index: .cvsignore
===================================================================
RCS file: .cvsignore
diff -N .cvsignore
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ .cvsignore	12 Sep 2005 21:14:48 -0000	1.4
@@ -0,0 +1 @@
+libnet-1.1.2.1.tar.gz


Index: Makefile
===================================================================
RCS file: Makefile
diff -N Makefile
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ Makefile	12 Sep 2005 21:14:48 -0000	1.4
@@ -0,0 +1,21 @@
+# Makefile for source rpm: cppunit
+# $Id$
+NAME := libnet
+SPECFILE = $(firstword $(wildcard *.spec))
+
+define find-makefile-common
+for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
+endef
+
+MAKEFILE_COMMON := $(shell $(find-makefile-common))
+
+ifeq ($(MAKEFILE_COMMON),)
+# attept a checkout
+define checkout-makefile-common
+test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
+endef
+
+MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
+endif
+
+include $(MAKEFILE_COMMON)


Index: libnet.spec
===================================================================
RCS file: libnet.spec
diff -N libnet.spec
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ libnet.spec	12 Sep 2005 21:14:48 -0000	1.4
@@ -0,0 +1,99 @@
+Summary:        C library for portable packet creation and injection
+Name:           libnet
+Version:        1.1.2.1
+Release:        6%{?dist}
+License:        BSD
+Group:          System Environment/Libraries
+URL:            http://www.packetfactory.net/libnet/
+Source0:        http://www.packetfactory.net/libnet/dist/libnet-%{version}.tar.gz
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+%description
+Libnet is an API to help with the construction and handling of network packets.
+It provides a portable framework for low-level network packet writing and
+handling (use libnet in conjunction with libpcap and you can write some really
+cool stuff).  Libnet includes packet creation at the IP layer and at the link
+layer as well as a host of supplementary and complementary functionality.
+Libnet is very handy with which to write network tools and network test code.
+See the manpage and sample test code for more detailed information.
+
+%package devel
+Summary:        Development files for libnet
+Group:          Development/Libraries
+Provides:       %{name} = %{version}-%{release}
+
+%description devel
+Libnet is an API to help with the construction and handling of network packets.
+It provides a portable framework for low-level network packet writing and
+handling (use libnet in conjunction with libpcap and you can write some really
+cool stuff).  Libnet includes packet creation at the IP layer and at the link
+layer as well as a host of supplementary and complementary functionality.
+Libnet is very handy with which to write network tools and network test code.
+See the manpage and sample test code for more detailed information.
+
+
+%prep
+%setup -q -n libnet
+sed -i -e 's/\r$//' doc/CHANGELOG doc/CONTRIB
+find . -depth -type d -name CVS -exec rm -rf {} ';'
+rm -rf sample/win32
+rm -f sample/.\#* sample/.*.swp
+
+%build
+%configure
+make %{?_smp_mflags}
+
+%install
+rm -rf %{buildroot}
+make DESTDIR=%{buildroot} install
+
+install -D --mode=0755 libnet-config %{buildroot}%{_bindir}/libnet-config
+
+install -d --mode=0755 %{buildroot}%{_mandir}/man3
+install -D --mode=0644 doc/man/man3/libnet*.3 %{buildroot}%{_mandir}/man3/
+
+make -C sample clean
+
+%clean
+rm -rf %{buildroot}
+
+%files devel
+%defattr(-,root,root,-)
+%doc README VERSION
+%doc doc/BUGS doc/CHANGELOG doc/CONTRIB doc/COPYING doc/DESIGN_NOTES
+%doc doc/MIGRATION doc/PACKET_BUILDING doc/PORTED doc/RAWSOCKET_NON_SEQUITUR
+%doc doc/TODO doc/html/ sample/
+
+%{_bindir}/libnet-config
+%{_includedir}/libnet/
+%{_includedir}/libnet.h
+%{_libdir}/libnet.a
+%{_mandir}/man3/libnet*
+
+%changelog
+* Mon Sep 12 2005 Patrice Dumas  1.1.2.1-6
+- bump release and add dist tag
+
+* Tue Aug 30 2005 Paul Howarth  1.1.2.1-5
+- spec file cleanup
+
+* Fri Aug 26 2005 Patrice Dumas  1.1.2.1-4
+- use pushd and popd (from Oliver Falk) 
+
+* Mon Aug 22 2005 Patrice Dumas  1.1.2.1-3
+- Correct dos end of lines
+- add in devel: Provides: %{name} = %{version}-%{release} 
+
+* Fri Aug 12 2005 Patrice Dumas  1.1.2.1-2
+- put everything in a devel subpackage
+- add smpflags
+- clean in sample
+
+* Fri Aug 12 2005 Patrice Dumas  1.1.2.1-1
+- rebuild changing only name
+
+* Wed Jun 02 2004 Marcin Garski  1.1.2.1-2.fc2
+- Rebuild for Fedora Core 2
+
+* Sat May 08 2004 Marcin Garski  1.1.2.1-1
+- Initial specfile


Index: sources
===================================================================
RCS file: sources
diff -N sources
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ sources	12 Sep 2005 21:14:48 -0000	1.4
@@ -0,0 +1 @@
+be845c41170d72c7db524f3411b50256  libnet-1.1.2.1.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 12 21:17:37 2005
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Mon, 12 Sep 2005 17:17:37 -0400
Subject: rpms/pl/devel pl.spec,1.16,1.17
Message-ID: <200509122117.j8CLHbRk009543@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/pl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9524

Modified Files:
	pl.spec 
Log Message:



Index: pl.spec
===================================================================
RCS file: /cvs/extras/rpms/pl/devel/pl.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- pl.spec	22 Jun 2005 19:48:03 -0000	1.16
+++ pl.spec	12 Sep 2005 21:17:35 -0000	1.17
@@ -1,6 +1,6 @@
 Name:		pl
 Version:	5.4.7
-Release:	1%{?dist}
+Release:	2%{?dist}
 
 Summary:	SWI-Prolog - Edinburgh compatible Prolog compiler
 
@@ -19,7 +19,7 @@
 BuildRequires:  unixODBC-devel
 
 # x86_64 excluded due to build failure: https://bugzilla.redhat.com/149038
-ExcludeArch: x86_64
+#ExcludeArch: x86_64
 
 %description
 ISO/Edinburgh-style Prolog compiler including modules, autoload,



From fedora-extras-commits at redhat.com  Mon Sep 12 21:27:14 2005
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Mon, 12 Sep 2005 17:27:14 -0400
Subject: owners owners.list,1.194,1.195
Message-ID: <200509122127.j8CLREW2009631@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9612

Modified Files:
	owners.list 
Log Message:
Add libnet



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.194
retrieving revision 1.195
diff -u -r1.194 -r1.195
--- owners.list	12 Sep 2005 15:19:35 -0000	1.194
+++ owners.list	12 Sep 2005 21:27:12 -0000	1.195
@@ -417,6 +417,7 @@
 Fedora Extras|libmatroska|An open Audio/Video container format|anvil at livna.org|extras-qa at fedoraproject.org|
 Fedora Extras|libmodplug|Modplug mod music file format library|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|libnet10|High-level API (toolkit) allowing the application programmer to construct and inject network packets|compton at pcompton.com|extras-qa at fedoraproject.org|
+Fedora Extras|libnet|C library for portable packet creation and injection|pertusus at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|libnjb|Library for managing digital audio players|triad at df.lth.se|extras-qa at fedoraproject.org|
 Fedora Extras|liboggz|Simple programming interface for Ogg files and streams|thomas at apestaart.org|extras-qa at fedoraproject.org|
 Fedora Extras|liboil|Library of Optimized Inner Loops, CPU optimized functions|matthias at rpmforge.net|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Tue Sep 13 02:17:09 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Mon, 12 Sep 2005 22:17:09 -0400
Subject: rpms/perl-prefork - New directory
Message-ID: <200509130217.j8D2H9Ex016982@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-prefork
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16962/perl-prefork

Log Message:
Directory /cvs/extras/rpms/perl-prefork added to the repository




From fedora-extras-commits at redhat.com  Tue Sep 13 02:17:09 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Mon, 12 Sep 2005 22:17:09 -0400
Subject: rpms/perl-prefork/devel - New directory
Message-ID: <200509130217.j8D2H9iG016987@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-prefork/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16962/perl-prefork/devel

Log Message:
Directory /cvs/extras/rpms/perl-prefork/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Sep 13 02:17:45 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Mon, 12 Sep 2005 22:17:45 -0400
Subject: rpms/perl-prefork Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200509130217.j8D2HjxU017021@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-prefork
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17007

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-prefork


--- NEW FILE Makefile ---
# Top level Makefile for module perl-prefork
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Tue Sep 13 02:17:54 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Mon, 12 Sep 2005 22:17:54 -0400
Subject: rpms/perl-prefork/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200509130217.j8D2HskW017036@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-prefork/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17007/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-prefork


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Tue Sep 13 02:20:51 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Mon, 12 Sep 2005 22:20:51 -0400
Subject: rpms/perl-prefork/devel perl-prefork.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200509130221.j8D2LPPN017144@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-prefork/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17099/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-prefork.spec 
Log Message:
auto-import perl-prefork-1.00-1 on branch devel from perl-prefork-1.00-1.src.rpm


--- NEW FILE perl-prefork.spec ---
Name: 		perl-prefork
Version: 	1.00
Release: 	1%{?dist}
Summary: 	Optimized module loading for forking or non-forking processes
License: 	GPL or Artistic
Group: 		Development/Libraries
URL: 		http://search.cpan.org/dist/prefork/
Source0: 	http://search.cpan.org/CPAN/authors/id/A/AD/ADAMK/prefork-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
BuildArch: noarch

BuildRequires: perl(Test::More) >= 0.47
BuildRequires: perl(File::Spec) >= 0.80
BuildRequires: perl(Scalar::Util) >= 1.10

# Required by tests
BuildRequires: perl(Test::Pod) >= 1.00

%description
Optimized module loading for forking or non-forking processes

%prep
%setup -q -n prefork-%{version}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'
find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';'
chmod -R u+w $RPM_BUILD_ROOT/*

%clean
rm -rf $RPM_BUILD_ROOT

%check
make test

%files
%defattr(-,root,root,-)
%doc Changes README LICENSE
%{perl_vendorlib}/prefork*
%{_mandir}/man3/*

%changelog
* Sat Sep 10 2005 Ralf Corsepius  - 1.00-1
- FE submission.

* Sat Sep 10 2005 Ralf Corsepius  - 1.00-0.pm.1
- Update to 1.00.

* Tue Jun 28 2005 Ralf Corsepius  - 0.04-0.pm.1
- Initial packman version.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-prefork/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	13 Sep 2005 02:17:49 -0000	1.1
+++ .cvsignore	13 Sep 2005 02:20:49 -0000	1.2
@@ -0,0 +1 @@
+prefork-1.00.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-prefork/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	13 Sep 2005 02:17:49 -0000	1.1
+++ sources	13 Sep 2005 02:20:49 -0000	1.2
@@ -0,0 +1 @@
+41e19e56aca6ae7f36bcbfe420a0eb4c  prefork-1.00.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep 13 02:20:29 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Mon, 12 Sep 2005 22:20:29 -0400
Subject: rpms/perl-prefork import.log,1.1,1.2
Message-ID: <200509130221.j8D2LgAv017150@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-prefork
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17099

Modified Files:
	import.log 
Log Message:
auto-import perl-prefork-1.00-1 on branch devel from perl-prefork-1.00-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-prefork/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	13 Sep 2005 02:17:43 -0000	1.1
+++ import.log	13 Sep 2005 02:20:26 -0000	1.2
@@ -0,0 +1 @@
+perl-prefork-1_00-1:HEAD:perl-prefork-1.00-1.src.rpm:1126577940



From fedora-extras-commits at redhat.com  Tue Sep 13 02:26:33 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Mon, 12 Sep 2005 22:26:33 -0400
Subject: rpms/perl-prefork/devel perl-prefork.spec,1.1,1.2
Message-ID: <200509130226.j8D2QXEG017221@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-prefork/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17202

Modified Files:
	perl-prefork.spec 
Log Message:
Spec file cleanup.


Index: perl-prefork.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-prefork/devel/perl-prefork.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-prefork.spec	13 Sep 2005 02:20:49 -0000	1.1
+++ perl-prefork.spec	13 Sep 2005 02:26:31 -0000	1.2
@@ -1,6 +1,6 @@
 Name: 		perl-prefork
 Version: 	1.00
-Release: 	1%{?dist}
+Release: 	2%{?dist}
 Summary: 	Optimized module loading for forking or non-forking processes
 License: 	GPL or Artistic
 Group: 		Development/Libraries
@@ -21,6 +21,10 @@
 %description
 Optimized module loading for forking or non-forking processes
 
+prefork.pm is intended to serve as a central and optional marshalling
+point for state detection (are we running in compile-time or run-time
+mode) and to act as a relatively light-weight module loader.
+
 %prep
 %setup -q -n prefork-%{version}
 
@@ -48,6 +52,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Tue Sep 13 2005 Ralf Corsepius  - 1.00-2
+- Spec file cleanup.
+
 * Sat Sep 10 2005 Ralf Corsepius  - 1.00-1
 - FE submission.
 



From fedora-extras-commits at redhat.com  Tue Sep 13 03:12:12 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Mon, 12 Sep 2005 23:12:12 -0400
Subject: owners owners.list,1.195,1.196
Message-ID: <200509130312.j8D3CCx5018634@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18615

Modified Files:
	owners.list 
Log Message:
Add perl-prefork


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.195
retrieving revision 1.196
diff -u -r1.195 -r1.196
--- owners.list	12 Sep 2005 21:27:12 -0000	1.195
+++ owners.list	13 Sep 2005 03:12:10 -0000	1.196
@@ -695,6 +695,7 @@
 Fedora Extras|perl-PAR-Dist|Toolkit for creating and manipulating Perl PAR distributions|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Params-Validate|Params-Validate Perl module|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-pmtools|A suite of small programs to help manage Perl modules|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-prefork|Optimized module loading for forking or non-forking processes|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Pod-Coverage|Checks if the documentation of a module is comprehensive|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Pod-Escapes|Perl module for resolving POD escape sequences|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Pod-POM|Object-oriented interface to Perl POD documents|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Tue Sep 13 07:31:20 2005
From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl))
Date: Tue, 13 Sep 2005 03:31:20 -0400
Subject: rpms/baobab - New directory
Message-ID: <200509130731.j8D7VKei024645@cvs-int.fedora.redhat.com>

Author: thl

Update of /cvs/extras/rpms/baobab
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24625/baobab

Log Message:
Directory /cvs/extras/rpms/baobab added to the repository




From fedora-extras-commits at redhat.com  Tue Sep 13 07:31:20 2005
From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl))
Date: Tue, 13 Sep 2005 03:31:20 -0400
Subject: rpms/baobab/devel - New directory
Message-ID: <200509130731.j8D7VKng024650@cvs-int.fedora.redhat.com>

Author: thl

Update of /cvs/extras/rpms/baobab/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24625/baobab/devel

Log Message:
Directory /cvs/extras/rpms/baobab/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Sep 13 07:32:10 2005
From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl))
Date: Tue, 13 Sep 2005 03:32:10 -0400
Subject: rpms/baobab Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200509130732.j8D7WAiL024705@cvs-int.fedora.redhat.com>

Author: thl

Update of /cvs/extras/rpms/baobab
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24670

Added Files:
	Makefile import.log 
Log Message:
Setup of module baobab


--- NEW FILE Makefile ---
# Top level Makefile for module baobab
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Tue Sep 13 07:32:11 2005
From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl))
Date: Tue, 13 Sep 2005 03:32:11 -0400
Subject: rpms/baobab/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200509130732.j8D7WBDH024710@cvs-int.fedora.redhat.com>

Author: thl

Update of /cvs/extras/rpms/baobab/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24670/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module baobab


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Tue Sep 13 07:33:24 2005
From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl))
Date: Tue, 13 Sep 2005 03:33:24 -0400
Subject: rpms/baobab import.log,1.1,1.2
Message-ID: <200509130733.j8D7XtKu024776@cvs-int.fedora.redhat.com>

Author: thl

Update of /cvs/extras/rpms/baobab
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24738

Modified Files:
	import.log 
Log Message:
auto-import baobab-1.1.0-2 on branch devel from baobab-1.1.0-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/baobab/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	13 Sep 2005 07:32:08 -0000	1.1
+++ import.log	13 Sep 2005 07:33:22 -0000	1.2
@@ -0,0 +1 @@
+baobab-1_1_0-2:HEAD:baobab-1.1.0-2.src.rpm:1126596946



From fedora-extras-commits at redhat.com  Tue Sep 13 07:33:25 2005
From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl))
Date: Tue, 13 Sep 2005 03:33:25 -0400
Subject: rpms/baobab/devel baobab.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200509130734.j8D7XtMW024780@cvs-int.fedora.redhat.com>

Author: thl

Update of /cvs/extras/rpms/baobab/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24738/devel

Modified Files:
	.cvsignore sources 
Added Files:
	baobab.spec 
Log Message:
auto-import baobab-1.1.0-2 on branch devel from baobab-1.1.0-2.src.rpm


--- NEW FILE baobab.spec ---
Name:           baobab
Version:        1.1.0
Release:        2
Summary:        Graphical tool to analyse directory trees 

Group:          Applications/System
License:        GPL
URL:            http://www.marzocca.net/linux/baobab.html
Source0:        http://www.marzocca.net/linux/downloads/baobab-1.1.0.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  gtk2-devel >= 2.6
BuildRequires:  libgnomeui-devel
BuildRequires:  gnome-vfs2-devel
BuildRequires:  GConf2-devel
BuildRequires:  libgtop2-devel >= 2.10
BuildRequires:	desktop-file-utils
BuildRequires:	gettext

%description
Baobab is able to scan either specific directories or the whole filesystem, 
in order to give the user a graphical tree representation including 
each directory size or percentage in the branch.


%prep
%setup -q


%build
%configure
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
%find_lang %{name}
desktop-file-install --vendor fedora \
  --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \
  --add-category X-Fedora \
  --delete-original \
  $RPM_BUILD_ROOT%{_datadir}/applications/baobab.desktop


%clean
rm -rf $RPM_BUILD_ROOT


%files -f %{name}.lang
%defattr(-,root,root,-)
%doc COPYING INSTALL README AUTHORS
%{_bindir}/%{name}
%{_datadir}/applications/*-%{name}.desktop
%{_datadir}/%{name}/
%{_mandir}/man1/%{name}.1.gz


%changelog
* Sat Sep 10 2005 Thorsten Leemhuis  - 1.1.0-2
- Remove pre and post-run of update-desktop-database

* Thu Sep 08 2005 Thorsten Leemhuis  - 1.1.0-1
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/baobab/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	13 Sep 2005 07:32:09 -0000	1.1
+++ .cvsignore	13 Sep 2005 07:33:23 -0000	1.2
@@ -0,0 +1 @@
+baobab-1.1.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/baobab/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	13 Sep 2005 07:32:09 -0000	1.1
+++ sources	13 Sep 2005 07:33:23 -0000	1.2
@@ -0,0 +1 @@
+7387ab6621beaba07daaa02c85cbe1a0  baobab-1.1.0.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep 13 08:59:45 2005
From: fedora-extras-commits at redhat.com (Mark Cox (mjc))
Date: Tue, 13 Sep 2005 04:59:45 -0400
Subject: fedora-security/audit fc4,1.57,1.58
Message-ID: <200509130859.j8D8xjUu027323@cvs-int.fedora.redhat.com>

Author: mjc

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27304

Modified Files:
	fc4 
Log Message:
Catchup on yesterday



Index: fc4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc4,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- fc4	12 Sep 2005 12:11:02 -0000	1.57
+++ fc4	13 Sep 2005 08:59:42 -0000	1.58
@@ -12,8 +12,8 @@
 2005-2802 version (kernel, fixed 2.6.12) [since FEDORA-2005-510]
 2005-2801 version (kernel, fixed 2.6.11)
 2005-2800 VULNERABLE (kernel)
-2005-2798 VULNERABLE (openssh, fixed 4.2) #167446
-2005-2797 VULNERABLE (openssh, fixed 4.2) #167443
+2005-2798 version (openssh, fixed 4.2) [since FEDORA-2005-860]
+2005-2797 version (openssh, fixed 4.2) [since FEDORA-2005-860]
 2005-2796 backport (squid, fixed after 2.5.STABLE10) [since FEDORA-2005-851]
 2005-2794 backport (squid, fixed after 2.5.STABLE10) [since FEDORA-2005-851]
 2005-2728 backport (httpd, fixed 2.0.55-dev) [since FEDORA-2005-849]



From fedora-extras-commits at redhat.com  Tue Sep 13 09:01:55 2005
From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl))
Date: Tue, 13 Sep 2005 05:01:55 -0400
Subject: owners owners.list,1.196,1.197
Message-ID: <200509130902.j8D92QjD028633@cvs-int.fedora.redhat.com>

Author: thl

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28614

Modified Files:
	owners.list 
Log Message:
add baobab


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.196
retrieving revision 1.197
diff -u -r1.196 -r1.197
--- owners.list	13 Sep 2005 03:12:10 -0000	1.196
+++ owners.list	13 Sep 2005 09:01:53 -0000	1.197
@@ -42,6 +42,7 @@
 Fedora Extras|awstats|Advanced Web Statistics|gauret at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|balsa|Balsa Mail Client|pawsa at theochem.kth.se|extras-qa at fedoraproject.org|
 Fedora Extras|banner|Prints a short string to the console in very large letters|oliver at linux-kernel.at|extras-qa at fedoraproject.org|
+Fedora Extras|baobab|Graphical tool to analyse directory trees|fedora at leemhuis.info|extras-qa at fedoraproject.org|
 Fedora Extras|barcode|Generates barcodes from text strings|andreas at bawue.net|extras-qa at fedoraproject.org|
 Fedora Extras|bash-completion|Programmable completion for Bash|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|bazaar|A distributed revision control system|shahms at shahms.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Tue Sep 13 10:48:31 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Tue, 13 Sep 2005 06:48:31 -0400
Subject: rpms/unshield - New directory
Message-ID: <200509131048.j8DAmV12030147@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/unshield
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30127/unshield

Log Message:
Directory /cvs/extras/rpms/unshield added to the repository




From fedora-extras-commits at redhat.com  Tue Sep 13 10:48:31 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Tue, 13 Sep 2005 06:48:31 -0400
Subject: rpms/unshield/devel - New directory
Message-ID: <200509131048.j8DAmV1G030152@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/unshield/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30127/unshield/devel

Log Message:
Directory /cvs/extras/rpms/unshield/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Sep 13 10:48:52 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Tue, 13 Sep 2005 06:48:52 -0400
Subject: rpms/unshield Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200509131048.j8DAmqGf030201@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/unshield
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30172

Added Files:
	Makefile import.log 
Log Message:
Setup of module unshield


--- NEW FILE Makefile ---
# Top level Makefile for module unshield
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Tue Sep 13 10:48:52 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Tue, 13 Sep 2005 06:48:52 -0400
Subject: rpms/unshield/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200509131048.j8DAmqRN030206@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/unshield/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30172/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module unshield


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Tue Sep 13 10:49:31 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Tue, 13 Sep 2005 06:49:31 -0400
Subject: rpms/unshield import.log,1.1,1.2
Message-ID: <200509131050.j8DAo1dT030283@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/unshield
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30240

Modified Files:
	import.log 
Log Message:
auto-import unshield-0.5-1 on branch devel from unshield-0.5-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/unshield/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	13 Sep 2005 10:48:50 -0000	1.1
+++ import.log	13 Sep 2005 10:49:29 -0000	1.2
@@ -0,0 +1 @@
+unshield-0_5-1:HEAD:unshield-0.5-1.src.rpm:1126608560



From fedora-extras-commits at redhat.com  Tue Sep 13 10:49:31 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Tue, 13 Sep 2005 06:49:31 -0400
Subject: rpms/unshield/devel unshield.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200509131050.j8DAo2kQ030287@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/unshield/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30240/devel

Modified Files:
	.cvsignore sources 
Added Files:
	unshield.spec 
Log Message:
auto-import unshield-0.5-1 on branch devel from unshield-0.5-1.src.rpm


--- NEW FILE unshield.spec ---
Name:           unshield
Version:        0.5
Release:        1
Summary:        Install InstallShield applications on a Pocket PC

Group:          Applications/Communications
License:        MIT
URL:            http://synce.sourceforge.net/
Source0:        http://dl.sf.net/synce/unshield-0.5.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  zlib-devel

%description
To install a Pocket PC application remotely, an installable
Microsoft Cabinet File is copied to the /Windows/AppMgr/Install
directory on the PDA and then the wceload.exe is executed to
perform the actual install. That is a very simple procedure.

Unfortunately, many applications for Pocket PC are distributed as
InstallShield installers for Microsoft Windows, and not as
individual Microsoft Cabinet Files. That is very impractical for
users of other operating systems, such as Linux or FreeBSD.

%package devel
Group:          Development/Libraries
Summary:        Files needed for software development with %{name}
Requires:       %{name} = %{version}

%description devel
The %{name}-devel package contains the files needed for development with
%{name}

%prep
%setup -q


%build
%configure --disable-static --disable-rpath
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

rm -f $RPM_BUILD_ROOT%{_libdir}/libunshield.la

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%doc README LICENSE
%{_bindir}/unshield
%{_libdir}/libunshield.so.*

%files devel
%defattr(-,root,root,-)
%{_libdir}/libunshield.so
%{_includedir}/libunshield.h
%{_datadir}/aclocal/unshield.m4

%changelog
* Tue Aug 23 2005 Andreas Bierfert 
0.5-1
- Initial Release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/unshield/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	13 Sep 2005 10:48:50 -0000	1.1
+++ .cvsignore	13 Sep 2005 10:49:29 -0000	1.2
@@ -0,0 +1 @@
+unshield-0.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/unshield/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	13 Sep 2005 10:48:50 -0000	1.1
+++ sources	13 Sep 2005 10:49:29 -0000	1.2
@@ -0,0 +1 @@
+ff6bb0fbe962bc00e230592c910b90ce  unshield-0.5.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep 13 10:59:09 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Tue, 13 Sep 2005 06:59:09 -0400
Subject: rpms/unshield/devel unshield.spec,1.1,1.2
Message-ID: <200509131059.j8DAx98w030429@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/unshield/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30403

Modified Files:
	unshield.spec 
Log Message:
- add dist
- change devel Require from V to V-R



Index: unshield.spec
===================================================================
RCS file: /cvs/extras/rpms/unshield/devel/unshield.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- unshield.spec	13 Sep 2005 10:49:29 -0000	1.1
+++ unshield.spec	13 Sep 2005 10:59:06 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           unshield
 Version:        0.5
-Release:        1
+Release:        2%{?dist}
 Summary:        Install InstallShield applications on a Pocket PC
 
 Group:          Applications/Communications
@@ -25,7 +25,7 @@
 %package devel
 Group:          Development/Libraries
 Summary:        Files needed for software development with %{name}
-Requires:       %{name} = %{version}
+Requires:       %{name} = %{version}-%{release}
 
 %description devel
 The %{name}-devel package contains the files needed for development with
@@ -66,6 +66,11 @@
 %{_datadir}/aclocal/unshield.m4
 
 %changelog
+* Tue Sep 13 2005 Andreas Bierfert 
+0.5-2
+- add dist
+- change devel Require from V to V-R
+
 * Tue Aug 23 2005 Andreas Bierfert 
 0.5-1
 - Initial Release



From fedora-extras-commits at redhat.com  Tue Sep 13 11:46:53 2005
From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc))
Date: Tue, 13 Sep 2005 07:46:53 -0400
Subject: rpms/gnome-translate/devel gnome-translate-0.99-configure.patch,
	NONE, 1.1 gnome-translate.spec, 1.1, 1.2
Message-ID: <200509131146.j8DBkrSb031956@cvs-int.fedora.redhat.com>

Author: buc

Update of /cvs/extras/rpms/gnome-translate/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31934

Modified Files:
	gnome-translate.spec 
Added Files:
	gnome-translate-0.99-configure.patch 
Log Message:


gnome-translate-0.99-configure.patch:

--- NEW FILE gnome-translate-0.99-configure.patch ---
diff -Nrbu gnome-translate-0.99/configure gnome-translate-0.99-OK/configure
--- gnome-translate-0.99/configure	2005-01-28 16:10:15.000000000 +0300
+++ gnome-translate-0.99-OK/configure	2005-09-13 15:43:23.000000000 +0400
@@ -6897,7 +6897,7 @@
         echo "$as_me:$LINENO: checking for gthread-2.0 gconf-2.0 >= 2.4.0 libgnomeui-2.0 gnome-vfs-2.0 libglade-2.0 eel-2.0 >= 2.6.0 libxml-2.0" >&5
 echo $ECHO_N "checking for gthread-2.0 gconf-2.0 >= 2.4.0 libgnomeui-2.0 gnome-vfs-2.0 libglade-2.0 eel-2.0 >= 2.6.0 libxml-2.0... $ECHO_C" >&6
 
-        if $PKG_CONFIG --exists "gthread-2.0 gconf-2.0 >= 2.4.0 libgnomeui-2.0 gnome-vfs-2.0 libglade-2.0 eel-2.0 >= 2.6.0 libxml-2.0" ; then
+        if $PKG_CONFIG --exists --print-errors "gthread-2.0 gconf-2.0 >= 2.4.0 libgnomeui-2.0 gnome-vfs-2.0 libglade-2.0 eel-2.0 >= 2.6.0 libxml-2.0" ; then
             echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6
             succeeded=yes


Index: gnome-translate.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-translate/devel/gnome-translate.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gnome-translate.spec	12 Sep 2005 15:01:00 -0000	1.1
+++ gnome-translate.spec	13 Sep 2005 11:46:51 -0000	1.2
@@ -6,6 +6,7 @@
 License: GPL 
 URL: http://www.nongnu.org/libtranslate/gnome-translate
 Source: http://savannah.nongnu.org/download/libtranslate/gnome-translate-%{version}.tar.gz
+Patch1: gnome-translate-0.99-configure.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -34,6 +35,7 @@
 
 %prep
 %setup -q
+%patch1 -p1
 
 
 %build
@@ -117,6 +119,9 @@
 %{_sysconfdir}/gconf/schemas/%{name}.schemas
 
 %changelog
+* Tue Sep 13 2005 Dmitry Butskoy 
+- add configure patch to build under upcoming FC5
+
 * Mon Sep 12 2005 Dmitry Butskoy  - 0.99-3
 - more spec file cleanups
 - accepted for Fedora Extra



From fedora-extras-commits at redhat.com  Tue Sep 13 11:57:50 2005
From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc))
Date: Tue, 13 Sep 2005 07:57:50 -0400
Subject: rpms/gnome-translate/devel gnome-translate.spec,1.2,1.3
Message-ID: <200509131157.j8DBvofC031996@cvs-int.fedora.redhat.com>

Author: buc

Update of /cvs/extras/rpms/gnome-translate/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31977

Modified Files:
	gnome-translate.spec 
Log Message:



Index: gnome-translate.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-translate/devel/gnome-translate.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gnome-translate.spec	13 Sep 2005 11:46:51 -0000	1.2
+++ gnome-translate.spec	13 Sep 2005 11:57:48 -0000	1.3
@@ -1,7 +1,7 @@
 Name: gnome-translate
 Summary: GNOME interface to libtranslate -- Natural language translator
 Version: 0.99
-Release: 3%{?dist}
+Release: 3.1%{?dist}
 Group: User Interface/Desktops
 License: GPL 
 URL: http://www.nongnu.org/libtranslate/gnome-translate
@@ -119,7 +119,7 @@
 %{_sysconfdir}/gconf/schemas/%{name}.schemas
 
 %changelog
-* Tue Sep 13 2005 Dmitry Butskoy 
+* Tue Sep 13 2005 Dmitry Butskoy  - 0.99-3.1
 - add configure patch to build under upcoming FC5
 
 * Mon Sep 12 2005 Dmitry Butskoy  - 0.99-3



From fedora-extras-commits at redhat.com  Tue Sep 13 12:20:08 2005
From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc))
Date: Tue, 13 Sep 2005 08:20:08 -0400
Subject: rpms/gnome-translate/devel gnome-translate.spec, 1.3,
	1.4 gnome-translate-0.99-configure.patch, 1.1, NONE
Message-ID: <200509131220.j8DCK8Yu000959@cvs-int.fedora.redhat.com>

Author: buc

Update of /cvs/extras/rpms/gnome-translate/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv940

Modified Files:
	gnome-translate.spec 
Removed Files:
	gnome-translate-0.99-configure.patch 
Log Message:



Index: gnome-translate.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-translate/devel/gnome-translate.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gnome-translate.spec	13 Sep 2005 11:57:48 -0000	1.3
+++ gnome-translate.spec	13 Sep 2005 12:20:05 -0000	1.4
@@ -1,18 +1,20 @@
 Name: gnome-translate
 Summary: GNOME interface to libtranslate -- Natural language translator
 Version: 0.99
-Release: 3.1%{?dist}
+Release: 4%{?dist}
 Group: User Interface/Desktops
 License: GPL 
 URL: http://www.nongnu.org/libtranslate/gnome-translate
 Source: http://savannah.nongnu.org/download/libtranslate/gnome-translate-%{version}.tar.gz
-Patch1: gnome-translate-0.99-configure.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires: gtk2 >= 2.4.0, GConf2 >= 2.4.0, eel2 >= 2.6.0, pango >= 1.2.0
 BuildRequires: gtk2-devel >= 2.4.0, GConf2-devel >= 2.4.0
 BuildRequires: eel2-devel >= 2.6.0, libtranslate-devel, aspell-devel
+%if "%{?dist}" == ".fc5"
+BuildRequires: gnome-keyring-devel
+%endif
 
 BuildRequires: desktop-file-utils >= 0.2.90
 BuildRequires: startup-notification-devel >= 0.5
@@ -35,7 +37,6 @@
 
 %prep
 %setup -q
-%patch1 -p1
 
 
 %build
@@ -119,8 +120,9 @@
 %{_sysconfdir}/gconf/schemas/%{name}.schemas
 
 %changelog
-* Tue Sep 13 2005 Dmitry Butskoy  - 0.99-3.1
-- add configure patch to build under upcoming FC5
+* Tue Sep 13 2005 Dmitry Butskoy  - 0.99-4
+- Hack: add an extra dependency -- gnome-keyring-devel,
+  due to missing one in current rawhide's libgnomeui-devel
 
 * Mon Sep 12 2005 Dmitry Butskoy  - 0.99-3
 - more spec file cleanups


--- gnome-translate-0.99-configure.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Sep 13 12:37:24 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 13 Sep 2005 08:37:24 -0400
Subject: rpms/gc/FC-3 gc.spec,1.8,1.9
Message-ID: <200509131237.j8DCbO7G001068@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/gc/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1035/FC-3

Modified Files:
	gc.spec 
Log Message:
* Mon Sep 12 2005 Rex Dieter  6.6-2
- drop opendl patch (doesn't appear to be needed anymore)



Index: gc.spec
===================================================================
RCS file: /cvs/extras/rpms/gc/FC-3/gc.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- gc.spec	12 Sep 2005 18:45:11 -0000	1.8
+++ gc.spec	13 Sep 2005 12:37:22 -0000	1.9
@@ -4,7 +4,7 @@
 Name:    gc	
 Version: 6.6
 
-Release: 1%{?dist}
+Release: 2%{?dist}
 Group:   System Environment/Libraries
 License: BSD
 Url:     http://www.hpl.hp.com/personal/Hans_Boehm/gc/	
@@ -29,7 +29,7 @@
 %prep
 %setup -n %{name}%{version}
 
-%patch1 -p1 -b .opendl
+#patch1 -p1 -b .opendl
 
 
 %build
@@ -83,7 +83,10 @@
 
 
 %changelog
-* Fri Sep 09 2005 Rex Dieter  6.6-1
+* Mon Sep 12 2005 Rex Dieter  6.6-2
+- drop opendl patch (doesn't appear to be needed anymore)
+
+* Fri Sep 09 2005 Rex Dieter  6.6-1
 - 6.6
 
 * Wed May 25 2005 Rex Dieter  6.5-1



From fedora-extras-commits at redhat.com  Tue Sep 13 12:37:25 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 13 Sep 2005 08:37:25 -0400
Subject: rpms/gc/devel gc.spec,1.11,1.12
Message-ID: <200509131237.j8DCbPX4001074@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/gc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1035/devel

Modified Files:
	gc.spec 
Log Message:
* Mon Sep 12 2005 Rex Dieter  6.6-2
- drop opendl patch (doesn't appear to be needed anymore)



Index: gc.spec
===================================================================
RCS file: /cvs/extras/rpms/gc/devel/gc.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- gc.spec	9 Sep 2005 19:29:11 -0000	1.11
+++ gc.spec	13 Sep 2005 12:37:23 -0000	1.12
@@ -4,7 +4,7 @@
 Name:    gc	
 Version: 6.6
 
-Release: 1%{?dist}
+Release: 2%{?dist}
 Group:   System Environment/Libraries
 License: BSD
 Url:     http://www.hpl.hp.com/personal/Hans_Boehm/gc/	
@@ -29,7 +29,7 @@
 %prep
 %setup -n %{name}%{version}
 
-%patch1 -p1 -b .opendl
+#patch1 -p1 -b .opendl
 
 
 %build
@@ -83,7 +83,10 @@
 
 
 %changelog
-* Fri Sep 09 2005 Rex Dieter  6.6-1
+* Mon Sep 12 2005 Rex Dieter  6.6-2
+- drop opendl patch (doesn't appear to be needed anymore)
+
+* Fri Sep 09 2005 Rex Dieter  6.6-1
 - 6.6
 
 * Wed May 25 2005 Rex Dieter  6.5-1



From fedora-extras-commits at redhat.com  Tue Sep 13 13:56:42 2005
From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl))
Date: Tue, 13 Sep 2005 09:56:42 -0400
Subject: rpms/baobab/FC-4 baobab.spec,1.1,1.2
Message-ID: <200509131356.j8DDugJh003396@cvs-int.fedora.redhat.com>

Author: thl

Update of /cvs/extras/rpms/baobab/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3362/FC-4

Modified Files:
	baobab.spec 
Log Message:
Add dist again an remove INSTALL from doc


Index: baobab.spec
===================================================================
RCS file: /cvs/extras/rpms/baobab/FC-4/baobab.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- baobab.spec	13 Sep 2005 07:33:23 -0000	1.1
+++ baobab.spec	13 Sep 2005 13:56:40 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           baobab
 Version:        1.1.0
-Release:        2
+Release:        3%{?dist}
 Summary:        Graphical tool to analyse directory trees 
 
 Group:          Applications/System
@@ -49,7 +49,7 @@
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc COPYING INSTALL README AUTHORS
+%doc COPYING README AUTHORS
 %{_bindir}/%{name}
 %{_datadir}/applications/*-%{name}.desktop
 %{_datadir}/%{name}/
@@ -57,6 +57,9 @@
 
 
 %changelog
+* Sat Sep 10 2005 Thorsten Leemhuis  - 1.1.0-3
+- Don't ship INSTALL in doc as suggested by adrianr in #167940
+
 * Sat Sep 10 2005 Thorsten Leemhuis  - 1.1.0-2
 - Remove pre and post-run of update-desktop-database
 



From fedora-extras-commits at redhat.com  Tue Sep 13 13:56:43 2005
From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl))
Date: Tue, 13 Sep 2005 09:56:43 -0400
Subject: rpms/baobab/devel baobab.spec,1.1,1.2
Message-ID: <200509131356.j8DDuhHr003402@cvs-int.fedora.redhat.com>

Author: thl

Update of /cvs/extras/rpms/baobab/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3362/devel

Modified Files:
	baobab.spec 
Log Message:
Add dist again an remove INSTALL from doc


Index: baobab.spec
===================================================================
RCS file: /cvs/extras/rpms/baobab/devel/baobab.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- baobab.spec	13 Sep 2005 07:33:23 -0000	1.1
+++ baobab.spec	13 Sep 2005 13:56:41 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           baobab
 Version:        1.1.0
-Release:        2
+Release:        3%{?dist}
 Summary:        Graphical tool to analyse directory trees 
 
 Group:          Applications/System
@@ -49,7 +49,7 @@
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc COPYING INSTALL README AUTHORS
+%doc COPYING README AUTHORS
 %{_bindir}/%{name}
 %{_datadir}/applications/*-%{name}.desktop
 %{_datadir}/%{name}/
@@ -57,6 +57,9 @@
 
 
 %changelog
+* Sat Sep 10 2005 Thorsten Leemhuis  - 1.1.0-3
+- Don't ship INSTALL in doc as suggested by adrianr in #167940
+
 * Sat Sep 10 2005 Thorsten Leemhuis  - 1.1.0-2
 - Remove pre and post-run of update-desktop-database
 



From fedora-extras-commits at redhat.com  Tue Sep 13 14:14:19 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue, 13 Sep 2005 10:14:19 -0400
Subject: rpms/dkms/FC-3 dkms.spec,1.4,1.5
Message-ID: <200509131414.j8DEEJVC004924@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/dkms/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4877/FC-3

Modified Files:
	dkms.spec 
Log Message:

FC-3 has no kernel-devel



Index: dkms.spec
===================================================================
RCS file: /cvs/extras/rpms/dkms/FC-3/dkms.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- dkms.spec	12 Sep 2005 18:20:13 -0000	1.4
+++ dkms.spec	13 Sep 2005 14:14:17 -0000	1.5
@@ -1,7 +1,7 @@
 Summary: Dynamic Kernel Module Support Framework
 Name: dkms
 Version: 2.0.6
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPL
 Group: System Environment/Base
 BuildArch: noarch
@@ -10,7 +10,6 @@
 Provides: dkms-minimal
 Source0: http://linux.dell.com/dkms/dkms-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires: kernel-devel
 
 %description
 This package contains the framework for the Dynamic
@@ -102,6 +101,9 @@
 
 
 %changelog
+* Tue Sep 13 2005 Tom "spot" Callaway  2.0.6-3
+- no kernel-devel for FC-3
+
 * Mon Sep 12 2005 Tom "spot" Callaway  2.0.6-2
 - requires kernel-devel
 



From fedora-extras-commits at redhat.com  Tue Sep 13 14:14:20 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue, 13 Sep 2005 10:14:20 -0400
Subject: rpms/dkms/FC-4 dkms.spec,1.4,1.5
Message-ID: <200509131414.j8DEEKt0004930@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/dkms/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4877/FC-4

Modified Files:
	dkms.spec 
Log Message:

FC-3 has no kernel-devel



Index: dkms.spec
===================================================================
RCS file: /cvs/extras/rpms/dkms/FC-4/dkms.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- dkms.spec	12 Sep 2005 18:20:14 -0000	1.4
+++ dkms.spec	13 Sep 2005 14:14:17 -0000	1.5
@@ -1,7 +1,7 @@
 Summary: Dynamic Kernel Module Support Framework
 Name: dkms
 Version: 2.0.6
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPL
 Group: System Environment/Base
 BuildArch: noarch
@@ -102,6 +102,9 @@
 
 
 %changelog
+* Tue Sep 13 2005 Tom "spot" Callaway  2.0.6-3
+- no kernel-devel for FC-3
+
 * Mon Sep 12 2005 Tom "spot" Callaway  2.0.6-2
 - requires kernel-devel
 



From fedora-extras-commits at redhat.com  Tue Sep 13 14:14:20 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue, 13 Sep 2005 10:14:20 -0400
Subject: rpms/dkms/devel dkms.spec,1.5,1.6
Message-ID: <200509131414.j8DEEKOD004934@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/dkms/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4877/devel

Modified Files:
	dkms.spec 
Log Message:

FC-3 has no kernel-devel



Index: dkms.spec
===================================================================
RCS file: /cvs/extras/rpms/dkms/devel/dkms.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- dkms.spec	12 Sep 2005 18:20:19 -0000	1.5
+++ dkms.spec	13 Sep 2005 14:14:18 -0000	1.6
@@ -1,7 +1,7 @@
 Summary: Dynamic Kernel Module Support Framework
 Name: dkms
 Version: 2.0.6
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPL
 Group: System Environment/Base
 BuildArch: noarch
@@ -102,6 +102,9 @@
 
 
 %changelog
+* Tue Sep 13 2005 Tom "spot" Callaway  2.0.6-3
+- no kernel-devel for FC-3
+
 * Mon Sep 12 2005 Tom "spot" Callaway  2.0.6-2
 - requires kernel-devel
 



From fedora-extras-commits at redhat.com  Tue Sep 13 14:22:55 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue, 13 Sep 2005 10:22:55 -0400
Subject: rpms/perl-GnuPG-Interface - New directory
Message-ID: <200509131422.j8DEMtuD005143@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-GnuPG-Interface
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5123/perl-GnuPG-Interface

Log Message:
Directory /cvs/extras/rpms/perl-GnuPG-Interface added to the repository




From fedora-extras-commits at redhat.com  Tue Sep 13 14:22:55 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue, 13 Sep 2005 10:22:55 -0400
Subject: rpms/perl-GnuPG-Interface/devel - New directory
Message-ID: <200509131423.j8DEMtkK005148@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-GnuPG-Interface/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5123/perl-GnuPG-Interface/devel

Log Message:
Directory /cvs/extras/rpms/perl-GnuPG-Interface/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Sep 13 14:23:09 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue, 13 Sep 2005 10:23:09 -0400
Subject: rpms/perl-GnuPG-Interface Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200509131423.j8DEN9sB005197@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-GnuPG-Interface
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5168

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-GnuPG-Interface


--- NEW FILE Makefile ---
# Top level Makefile for module perl-GnuPG-Interface
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Tue Sep 13 14:23:09 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue, 13 Sep 2005 10:23:09 -0400
Subject: rpms/perl-GnuPG-Interface/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200509131423.j8DEN9vJ005202@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-GnuPG-Interface/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5168/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-GnuPG-Interface


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Tue Sep 13 14:23:32 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue, 13 Sep 2005 10:23:32 -0400
Subject: rpms/perl-GnuPG-Interface import.log,1.1,1.2
Message-ID: <200509131424.j8DEO2WF005293@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-GnuPG-Interface
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5249

Modified Files:
	import.log 
Log Message:
auto-import perl-GnuPG-Interface-0.33-3 on branch devel from perl-GnuPG-Interface-0.33-3.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-GnuPG-Interface/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	13 Sep 2005 14:23:07 -0000	1.1
+++ import.log	13 Sep 2005 14:23:30 -0000	1.2
@@ -0,0 +1 @@
+perl-GnuPG-Interface-0_33-3:HEAD:perl-GnuPG-Interface-0.33-3.src.rpm:1126621407



From fedora-extras-commits at redhat.com  Tue Sep 13 14:23:33 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue, 13 Sep 2005 10:23:33 -0400
Subject: rpms/perl-GnuPG-Interface/devel
	GnuPG-Interface-0.33.tru-record-type.txt, NONE,
	1.1 perl-GnuPG-Interface.spec, NONE,
	1.1 secret-key-output-1.patch, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200509131424.j8DEO37r005297@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-GnuPG-Interface/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5249/devel

Modified Files:
	.cvsignore sources 
Added Files:
	GnuPG-Interface-0.33.tru-record-type.txt 
	perl-GnuPG-Interface.spec secret-key-output-1.patch 
Log Message:
auto-import perl-GnuPG-Interface-0.33-3 on branch devel from perl-GnuPG-Interface-0.33-3.src.rpm


--- NEW FILE GnuPG-Interface-0.33.tru-record-type.txt ---
--- lib/GnuPG/Interface.pm.orig	2004-12-05 11:09:00.000000000 +0100
+++ lib/GnuPG/Interface.pm	2004-12-05 11:09:46.000000000 +0100
@@ -543,7 +543,7 @@
 	    
 	    $current_key->push_subkeys( $current_signed_item );
 	}
-	else
+	elsif ( $record_type ne 'tru' )
 	{
 	    warn "unknown record type $record_type"; 
 	}


--- NEW FILE perl-GnuPG-Interface.spec ---
Name:           perl-GnuPG-Interface
Version:        0.33
Release:        3%{?dist}
Summary:        Perl interface to GnuPG
Group:          Development/Libraries
License:        GPL or Artistic
URL:            http://search.cpan.org/dist/GnuPG-Interface
Source0:        http://search.cpan.org/CPAN/authors/id/F/FT/FTOBIN/GnuPG-Interface-%{version}.tar.gz
Patch0:		GnuPG-Interface-0.33.tru-record-type.txt
Patch1:		secret-key-output-1.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  gpg, perl(Class::MethodMaker)
Requires:  gpg, perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))



%description
%{summary}.

%prep
%setup -q -n GnuPG-Interface-%{version}
perldoc -t perlgpl > GPL
perldoc -t perlartistic > Artistic

%patch0 -p0
%patch1 -p1

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'
find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';'
chmod -R u+w $RPM_BUILD_ROOT/*

%check
chmod 0700 test
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc ChangeLog README NEWS THANKS COPYING GPL Artistic
%{perl_vendorlib}/GnuPG
%{perl_vendorlib}/auto/GnuPG
%{_mandir}/man3/*.3*


%changelog
* Sun Sep 11 2005 Matt Domsch  0.33-3
- use perldoc -t and %_smp_mflags

* Sun Aug 28 2005 Matt Domsch  0.33-2
- add Requires: gpg, always apply secret-key-output-1.patch, as it works on
  both gpg 1.4 and gpg2.

* Thu Aug 25 2005 Matt Domsch  0.33-1
- specfile changes per Paul Howarth's comments
- added GnuPG-Interface-0.33.tru-record-type.txt patch,
  borrowed from Mail-GPG-1.0.1

* Wed Aug 24 2005 Matt Domsch  0.33-0
- Initial package for Fedora Extras

secret-key-output-1.patch:

--- NEW FILE secret-key-output-1.patch ---
Binary files GnuPG-Interface-0.33/test/pubring.gpg and GnuPG-Interface-0.33-new/test/pubring.gpg differ
diff -urNp --exclude '*.orig' --exclude='*~' GnuPG-Interface-0.33/test/secret-keys/1.0.test GnuPG-Interface-0.33-new/test/secret-keys/1.0.test
--- GnuPG-Interface-0.33/test/secret-keys/1.0.test	2000-06-18 02:37:02.000000000 -0500
+++ GnuPG-Interface-0.33-new/test/secret-keys/1.0.test	2005-08-24 12:53:14.000000000 -0500
@@ -1,6 +1,7 @@
 test/secring.gpg
 ----------------
-sec  1024D/F950DA9C 2000-02-06 GnuPG test key (for testing purposes only)
-uid                            Foo Bar (1)
-ssb   768g/2E854A6B 2000-02-06
+sec   1024D/F950DA9C 2000-02-06 [expires: 2006-02-05]
+uid                  GnuPG test key (for testing purposes only)
+uid                  Foo Bar (1)
+ssb    768g/2E854A6B 2000-02-06
 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-GnuPG-Interface/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	13 Sep 2005 14:23:07 -0000	1.1
+++ .cvsignore	13 Sep 2005 14:23:31 -0000	1.2
@@ -0,0 +1 @@
+GnuPG-Interface-0.33.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-GnuPG-Interface/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	13 Sep 2005 14:23:07 -0000	1.1
+++ sources	13 Sep 2005 14:23:31 -0000	1.2
@@ -0,0 +1 @@
+7349795ec874c2af78eec7f274d96bc8  GnuPG-Interface-0.33.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep 13 14:26:34 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue, 13 Sep 2005 10:26:34 -0400
Subject: owners owners.list,1.197,1.198
Message-ID: <200509131426.j8DEQYxA005364@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5344

Modified Files:
	owners.list 
Log Message:

perl-GnuPG-Interface: Perl interface to GnuPG (I'm just holding this for Matt Domsch until his paperwork is done) 



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.197
retrieving revision 1.198
diff -u -r1.197 -r1.198
--- owners.list	13 Sep 2005 09:01:53 -0000	1.197
+++ owners.list	13 Sep 2005 14:26:32 -0000	1.198
@@ -637,6 +637,7 @@
 Fedora Extras|perl-GD-SVG|GD SVG enables SVG output from scripts written using GD|thm at duke.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-GDTextUtil|Text utilities for use with GD|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Glib|Perl interface to GLib|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-GnuPG-Interface|Perl interface to GnuPG|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Graph|A Perl module for dealing with graphs, the abstract data structures|thm at duke.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Gtk2|Perl interface to the 2.x series of the Gimp Toolkit library|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Heap|A collection of routines for managing a heap data structure|thm at duke.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Tue Sep 13 14:34:07 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Tue, 13 Sep 2005 10:34:07 -0400
Subject: rpms/lighttpd/devel favicon.ico, NONE, 1.1 light_button.png, NONE,
	1.1 light_logo.png, NONE, 1.1 lighttpd-1.4.3-stat_cache.patch,
	NONE, 1.1 index.html, 1.1, 1.2 lighttpd.spec, 1.13,
	1.14 lighttpd.png, 1.1, NONE
Message-ID: <200509131434.j8DEY7As005737@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/lighttpd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5719

Modified Files:
	index.html lighttpd.spec 
Added Files:
	favicon.ico light_button.png light_logo.png 
	lighttpd-1.4.3-stat_cache.patch 
Removed Files:
	lighttpd.png 
Log Message:
Add stat_cache patch to fix memleak and cosmetic changes for the default page.



--- NEW FILE favicon.ico ---

wOQ<0r
Tc!??;;;;A????????????????H_"?r;???s^
E?????0?U??;;???8?6????s;u?9q????X=?????sNt/,([???;??wPV?n????????	?h;;????B??N????L?E????????????ab???Z??N?s?K???????????????a?????vr??s|??~?????????p????W?t??Kyd?)?}????}R?pU??C&????zE?	?????QR????Z?D?;*E?g????G????g?!j\W?s?????????atx???q?????=n?)?AuU????G=???J ?o'???}???ao?????}???????X???????
lighttpd-1.4.3-stat_cache.patch:

--- NEW FILE lighttpd-1.4.3-stat_cache.patch ---
diff -Naupr lighttpd-1.4.3.orig/src/stat_cache.c lighttpd-1.4.3/src/stat_cache.c
--- lighttpd-1.4.3.orig/src/stat_cache.c	2005-08-29 12:39:34.000000000 +0200
+++ lighttpd-1.4.3/src/stat_cache.c	2005-09-13 13:55:03.000000000 +0200
@@ -215,13 +215,15 @@ static int stat_cache_attr_get(buffer *b
 }
 #endif
 
-static int hashme(buffer *str) {
-	int hash = 0;
+static uint32_t hashme(buffer *str) {
+	uint32_t hash = 0;
 	const char *s;
 	for (s = str->ptr; *s; s++) {
 		hash = hash * 53 + *s;
 	}
 
+	hash &= ~(1 << 31); /* strip the highest bit */
+
 	return hash;
 }
 


Index: index.html
===================================================================
RCS file: /cvs/extras/rpms/lighttpd/devel/index.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- index.html	23 Feb 2005 00:12:23 -0000	1.1
+++ index.html	13 Sep 2005 14:33:57 -0000	1.2
@@ -1,27 +1,28 @@
-
+
 
 
 
 
 
   Powered by lighttpd
+  
+  
   
 
-
-
-
      lighttpd - Lightning fast, light system requirements
      
+
 
 
      
-Powered by lighttpd
+LIGHTTPD - fly light.
 
      
 
 
      
-Powered by Fedora
+Powered by Fedora
      
+Powered by Lighttpd
 
      
 
 


Index: lighttpd.spec
===================================================================
RCS file: /cvs/extras/rpms/lighttpd/devel/lighttpd.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- lighttpd.spec	2 Sep 2005 10:45:33 -0000	1.13
+++ lighttpd.spec	13 Sep 2005 14:33:57 -0000	1.14
@@ -3,7 +3,7 @@
 Summary: Lightning fast webserver with light system requirements
 Name: lighttpd
 Version: 1.4.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: BSD
 Group: System Environment/Daemons
 URL: http://www.lighttpd.net/
@@ -11,9 +11,12 @@
 Source1: lighttpd.logrotate
 Source2: php.d-lighttpd.ini
 Source10: index.html
-Source11: lighttpd.png
+Source11: http://www.lighttpd.net/favicon.ico
 Source12: powered_by_fedora.png
+Source13: http://www.lighttpd.net/light_button.png
+Source14: http://www.lighttpd.net/light_logo.png
 Patch0: lighttpd-1.3.10-defaultconf.patch
+Patch1: lighttpd-1.4.3-stat_cache.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires(pre): /usr/sbin/useradd
 Requires(post): /sbin/chkconfig
@@ -64,6 +67,7 @@
 %prep
 %setup
 %patch0 -p1 -b .defaultconf
+%patch1 -p1 -b .stat_cache
 
 
 %build
@@ -103,7 +107,8 @@
 
 # Install our own default web page and images
 %{__mkdir_p} %{buildroot}%{webroot}
-%{__install} -p -m 0644 %{SOURCE10} %{SOURCE11} %{SOURCE12} \
+%{__install} -p -m 0644 %{SOURCE10} %{SOURCE11} %{SOURCE12} %{SOURCE13} \
+    %{SOURCE14} \
     %{buildroot}%{webroot}/
 
 # Install empty log directory to include
@@ -168,6 +173,13 @@
 
 
 %changelog
+* Tue Sep 13 2005 Matthias Saou  1.4.3-2
+- Include lighttpd-1.4.3-stat_cache.patch to fix memleak.
+
+* Fri Sep  2 2005 Matthias Saou  1.4.3-1.1
+- Rearrange the included index.html to include the new logo, button and
+  favicon from lighttpd.net.
+
 * Fri Sep  2 2005 Matthias Saou  1.4.3-1
 - Update to 1.4.3.
 - No longer override libdir at make install stage, use DESTDIR instead, as



From fedora-extras-commits at redhat.com  Tue Sep 13 14:49:51 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue, 13 Sep 2005 10:49:51 -0400
Subject: rpms/perl-GnuPG-Interface/devel perl-GnuPG-Interface.spec,1.1,1.2
Message-ID: <200509131449.j8DEnp6a005924@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-GnuPG-Interface/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5866/devel

Modified Files:
	perl-GnuPG-Interface.spec 
Log Message:

don't use patch1 for FC-3



Index: perl-GnuPG-Interface.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-GnuPG-Interface/devel/perl-GnuPG-Interface.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-GnuPG-Interface.spec	13 Sep 2005 14:23:31 -0000	1.1
+++ perl-GnuPG-Interface.spec	13 Sep 2005 14:49:49 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-GnuPG-Interface
 Version:        0.33
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Perl interface to GnuPG
 Group:          Development/Libraries
 License:        GPL or Artistic
@@ -53,6 +53,9 @@
 
 
 %changelog
+* Tue Sep 13 2005 Tom "spot" Callaway  0.33-4
+- FC-3 doesn't use the patch1
+
 * Sun Sep 11 2005 Matt Domsch  0.33-3
 - use perldoc -t and %_smp_mflags
 



From fedora-extras-commits at redhat.com  Tue Sep 13 14:49:45 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue, 13 Sep 2005 10:49:45 -0400
Subject: rpms/perl-GnuPG-Interface/FC-3 perl-GnuPG-Interface.spec,1.1,1.2
Message-ID: <200509131450.j8DEoFhJ005927@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-GnuPG-Interface/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5866/FC-3

Modified Files:
	perl-GnuPG-Interface.spec 
Log Message:

don't use patch1 for FC-3



Index: perl-GnuPG-Interface.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-GnuPG-Interface/FC-3/perl-GnuPG-Interface.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-GnuPG-Interface.spec	13 Sep 2005 14:23:31 -0000	1.1
+++ perl-GnuPG-Interface.spec	13 Sep 2005 14:49:43 -0000	1.2
@@ -1,13 +1,12 @@
 Name:           perl-GnuPG-Interface
 Version:        0.33
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Perl interface to GnuPG
 Group:          Development/Libraries
 License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/GnuPG-Interface
 Source0:        http://search.cpan.org/CPAN/authors/id/F/FT/FTOBIN/GnuPG-Interface-%{version}.tar.gz
 Patch0:		GnuPG-Interface-0.33.tru-record-type.txt
-Patch1:		secret-key-output-1.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  gpg, perl(Class::MethodMaker)
@@ -24,7 +23,6 @@
 perldoc -t perlartistic > Artistic
 
 %patch0 -p0
-%patch1 -p1
 
 %build
 %{__perl} Makefile.PL INSTALLDIRS=vendor
@@ -53,6 +51,9 @@
 
 
 %changelog
+* Tue Sep 13 2005 Tom "spot" Callaway  0.33-4
+- FC-3 doesn't use the patch1
+
 * Sun Sep 11 2005 Matt Domsch  0.33-3
 - use perldoc -t and %_smp_mflags
 



From fedora-extras-commits at redhat.com  Tue Sep 13 14:49:45 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue, 13 Sep 2005 10:49:45 -0400
Subject: rpms/perl-GnuPG-Interface/FC-4 perl-GnuPG-Interface.spec,1.1,1.2
Message-ID: <200509131450.j8DEoG0D005930@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-GnuPG-Interface/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5866/FC-4

Modified Files:
	perl-GnuPG-Interface.spec 
Log Message:

don't use patch1 for FC-3



Index: perl-GnuPG-Interface.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-GnuPG-Interface/FC-4/perl-GnuPG-Interface.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-GnuPG-Interface.spec	13 Sep 2005 14:23:31 -0000	1.1
+++ perl-GnuPG-Interface.spec	13 Sep 2005 14:49:43 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-GnuPG-Interface
 Version:        0.33
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Perl interface to GnuPG
 Group:          Development/Libraries
 License:        GPL or Artistic
@@ -53,6 +53,9 @@
 
 
 %changelog
+* Tue Sep 13 2005 Tom "spot" Callaway  0.33-4
+- FC-3 doesn't use the patch1
+
 * Sun Sep 11 2005 Matt Domsch  0.33-3
 - use perldoc -t and %_smp_mflags
 



From fedora-extras-commits at redhat.com  Tue Sep 13 14:55:43 2005
From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl))
Date: Tue, 13 Sep 2005 10:55:43 -0400
Subject: rpms/icu/FC-4 .cvsignore,1.3,1.4 icu.spec,1.3,1.4 sources,1.3,1.4
Message-ID: <200509131455.j8DEthlJ006079@cvs-int.fedora.redhat.com>

Author: thl

Update of /cvs/extras/rpms/icu/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6056

Modified Files:
	.cvsignore icu.spec sources 
Log Message:
Update to 3.4 and build with GCC4


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/icu/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	15 May 2005 18:08:49 -0000	1.3
+++ .cvsignore	13 Sep 2005 14:55:41 -0000	1.4
@@ -1,2 +1 @@
-icu-3.2.tgz
-icu-3.2-patch.tgz
+icu-3.4.tgz


Index: icu.spec
===================================================================
RCS file: /cvs/extras/rpms/icu/FC-4/icu.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- icu.spec	15 May 2005 18:08:49 -0000	1.3
+++ icu.spec	13 Sep 2005 14:55:41 -0000	1.4
@@ -1,21 +1,15 @@
-%define gcc32 1
-
 Name:           icu
-Version:        3.2
-Release:        3
+Version:        3.4
+Release:        3.1
 Summary:        International Components for Unicode
 
 Group:          Applications/Text
 License:        X License
 URL:            http://www.ibm.com/software/globalization/icu/
 Source0:        ftp://ftp.software.ibm.com/software/globalization/icu/%{version}/%{name}-%{version}.tgz
-Source1:        ftp://ftp.software.ibm.com/software/globalization/icu/3.2/icu-3.2-patch.tgz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  doxygen graphviz
-%if %{gcc32}
-BuildRequires:  compat-gcc-32-c++
-%endif
+BuildRequires:  doxygen
 
 %description
 The International Components for Unicode (ICU) libraries provide
@@ -53,18 +47,11 @@
 
 
 %prep
-%setup -q -n %{name} -a 1
-%{__patch} -p0 < icu-3.2-patch
-find . -name CVS -o -name .cvsignore | xargs -r rm -rf
-%{__perl} -pi -e 's/^(HAVE_DOT\b.*=).*$/$1 YES/' source/Doxyfile.in
-
+%setup -q -n %{name}
 
 %build
 cd source
-%if %{gcc32}
-%{expand: %%define optflags %(echo %{optflags} | sed -e s/-mtune=/-mcpu=/)}
-export CC=gcc32 CXX=g++32
-%endif
+export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
 %configure --enable-static --with-data-packaging=library --disable-samples
 make # %{?_smp_mflags} # -j(X>1) may "break" man pages as of 3.2, b.f.u #2357
 make doc
@@ -134,6 +121,21 @@
 
 
 %changelog
+* Tue Sep 13 2005 Thorsten Leemhuis  - 3.4-3.1
+- build with gcc 4 by using -fno-strict-aliasing
+
+* Wed Aug 31 2005 Thorsten Leemhuis  - 3.4-3
+- Use dist
+- gcc32 does not understand -fstack-protector and 
+  --param=ssp-buffer-size=4
+
+* Tue Aug  2 2005 Ville Skytt??  - 3.4-2
+- 3.4.
+
+* Sun Jul 31 2005 Ville Skytt??  - 3.4-0.2.d02
+- 3.4-d02.
+- Don't ship static libraries.
+
 * Wed Apr 27 2005 Ville Skytt??  - 3.2-3
 - Apply upstream case mapping mutex lock removal patch.
 - Build with gcc 3.2 as a temporary workaround for #152495.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/icu/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	15 May 2005 18:08:49 -0000	1.3
+++ sources	13 Sep 2005 14:55:41 -0000	1.4
@@ -1,2 +1 @@
-55a85d2365338ece483d275119fd990c  icu-3.2.tgz
-304f6cb1659967c7fbdeebca4f9c0e39  icu-3.2-patch.tgz
+b19f3b9eec1c44fba86b07f287801084  icu-3.4.tgz



From fedora-extras-commits at redhat.com  Tue Sep 13 15:09:12 2005
From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl))
Date: Tue, 13 Sep 2005 11:09:12 -0400
Subject: rpms/mail-notification/FC-4 mail-notification.spec,1.8,1.9
Message-ID: <200509131509.j8DF9CUU007538@cvs-int.fedora.redhat.com>

Author: thl

Update of /cvs/extras/rpms/mail-notification/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7516

Modified Files:
	mail-notification.spec 
Log Message:
rebuild for new icu


Index: mail-notification.spec
===================================================================
RCS file: /cvs/extras/rpms/mail-notification/FC-4/mail-notification.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- mail-notification.spec	16 Aug 2005 06:05:42 -0000	1.8
+++ mail-notification.spec	13 Sep 2005 15:09:09 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           mail-notification
 Version:        2.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Status icon that informs you if you have new mail
 
 Group:          Applications/Internet
@@ -113,6 +113,9 @@
 
 
 %changelog
+* Tue Sep 13 2005 Thorsten Leemhuis  - 2.0-2
+- rebuild for new icu
+
 * Wed Aug 10 2005 Thorsten Leemhuis  - 2.0-1
 - Update to 2.0 -- build without evolution support for now (seems it
   needs the whole evo-source)



From fedora-extras-commits at redhat.com  Tue Sep 13 15:27:28 2005
From: fedora-extras-commits at redhat.com (Robert Theisen (trobert))
Date: Tue, 13 Sep 2005 11:27:28 -0400
Subject: web/html/download mirrors.php,1.26,1.27
Message-ID: <200509131527.j8DFRSwG007829@cvs-int.fedora.redhat.com>

Author: trobert

Update of /cvs/fedora/web/html/download
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7803

Modified Files:
	mirrors.php 
Log Message:
Added new mirror http://mirror.hosting-concepts.com/pub/os/linux/fedora/



Index: mirrors.php
===================================================================
RCS file: /cvs/fedora/web/html/download/mirrors.php,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- mirrors.php	18 Jul 2005 17:31:53 -0000	1.26
+++ mirrors.php	13 Sep 2005 15:27:26 -0000	1.27
@@ -328,6 +328,7 @@
 	    
    7. rsync://ftp.surfnet.nl/fedora
      8. 
 	    
    8. ftp://ftp.easynet.nl/mirror/fedora/
      9. 
 	    
    9. ftp://ftp.eu.uu.net/pub/linux/fedora/
      10. 
+	    
    10. http://mirror.hosting-concepts.com/pub/os/linux/fedora/
      11. 
 	
 	
 	
    11. Norway



From fedora-extras-commits at redhat.com  Tue Sep 13 15:27:32 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Tue, 13 Sep 2005 11:27:32 -0400
Subject: rpms/perl-Class-Inspector - New directory
Message-ID: <200509131527.j8DFRWoe007851@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Class-Inspector
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7825/perl-Class-Inspector

Log Message:
Directory /cvs/extras/rpms/perl-Class-Inspector added to the repository




From fedora-extras-commits at redhat.com  Tue Sep 13 15:27:32 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Tue, 13 Sep 2005 11:27:32 -0400
Subject: rpms/perl-Class-Inspector/devel - New directory
Message-ID: <200509131527.j8DFRWoW007856@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Class-Inspector/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7825/perl-Class-Inspector/devel

Log Message:
Directory /cvs/extras/rpms/perl-Class-Inspector/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Sep 13 15:28:07 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Tue, 13 Sep 2005 11:28:07 -0400
Subject: rpms/perl-Class-Inspector Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200509131528.j8DFS7Co007910@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Class-Inspector
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7881

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-Class-Inspector


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Class-Inspector
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Tue Sep 13 15:28:07 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Tue, 13 Sep 2005 11:28:07 -0400
Subject: rpms/perl-Class-Inspector/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200509131528.j8DFS7sr007913@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Class-Inspector/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7881/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Class-Inspector


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Tue Sep 13 15:29:12 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Tue, 13 Sep 2005 11:29:12 -0400
Subject: rpms/perl-Class-Inspector import.log,1.1,1.2
Message-ID: <200509131529.j8DFTC38007988@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Class-Inspector
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7953

Modified Files:
	import.log 
Log Message:
auto-import perl-Class-Inspector-1.12-1 on branch devel from perl-Class-Inspector-1.12-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-Inspector/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	13 Sep 2005 15:28:05 -0000	1.1
+++ import.log	13 Sep 2005 15:29:10 -0000	1.2
@@ -0,0 +1 @@
+perl-Class-Inspector-1_12-1:HEAD:perl-Class-Inspector-1.12-1.src.rpm:1126625334



From fedora-extras-commits at redhat.com  Tue Sep 13 15:29:12 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Tue, 13 Sep 2005 11:29:12 -0400
Subject: rpms/perl-Class-Inspector/devel perl-Class-Inspector.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200509131529.j8DFTCPJ007995@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Class-Inspector/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7953/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Class-Inspector.spec 
Log Message:
auto-import perl-Class-Inspector-1.12-1 on branch devel from perl-Class-Inspector-1.12-1.src.rpm


--- NEW FILE perl-Class-Inspector.spec ---
Name: 		perl-Class-Inspector
Version: 	1.12
Release: 	1%{?dist}
Summary: 	Get information about a class and it's structur
License: 	GPL or Artistic
Group: 		Development/Libraries
URL: 		http://search.cpan.org/dist/Class-Inspector/
Source0: 	http://search.cpan.org/CPAN/authors/id/A/AD/ADAMK/Class-Inspector-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
BuildArch: noarch

# For better test coverage
BuildRequires: perl(Test::Pod) >= 1.00

%description
Class::Inspector allows you to get information about a loaded class.
Most or all of this information can be found in other ways, but they aren't
always very friendly, and usually involve a relatively high level of Perl
wizardry, or strange and unusual looking code. Class::Inspector attempts to
provide an easier, more friendly interface to this information.

%prep
%setup -q -n Class-Inspector-%{version}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'
find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';'
chmod -R u+w $RPM_BUILD_ROOT/*

%clean
rm -rf $RPM_BUILD_ROOT

%check
make test

%files
%defattr(-,root,root,-)
%doc Changes LICENSE
%{perl_vendorlib}/Class
%{_mandir}/man3/*

%changelog
* Tue Sep 13 2005 Ralf Corsepius  - 1.12-1
- FE submission.

* Tue Sep 13 2005 Ralf Corsepius  - 1.12-0
- Upstream update.

* Wed Jun 22 2005 Ralf Corsepius  - 1.08-0.pm.0
- Initial packman version.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-Inspector/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	13 Sep 2005 15:28:05 -0000	1.1
+++ .cvsignore	13 Sep 2005 15:29:10 -0000	1.2
@@ -0,0 +1 @@
+Class-Inspector-1.12.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-Inspector/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	13 Sep 2005 15:28:05 -0000	1.1
+++ sources	13 Sep 2005 15:29:10 -0000	1.2
@@ -0,0 +1 @@
+c49feb019c32a720d64c887b05022a4b  Class-Inspector-1.12.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep 13 15:31:10 2005
From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer))
Date: Tue, 13 Sep 2005 11:31:10 -0400
Subject: rpms/glpk/devel glpk.spec,1.2,1.3
Message-ID: <200509131531.j8DFVAhU008056@cvs-int.fedora.redhat.com>

Author: qspencer

Update of /cvs/extras/rpms/glpk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8032

Modified Files:
	glpk.spec 
Log Message:
Remove dependency on base package that (currently) doesn't exist.



Index: glpk.spec
===================================================================
RCS file: /cvs/extras/rpms/glpk/devel/glpk.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- glpk.spec	9 Aug 2005 17:52:21 -0000	1.2
+++ glpk.spec	13 Sep 2005 15:31:07 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           glpk
 Version:        4.8
-Release:        2
+Release:        3
 Summary:        GNU Linear Programming Kit
 
 Group:          System Environment/Libraries
@@ -31,6 +31,7 @@
 %package devel
 Summary:        Development headers and files for GLPK
 Group:          Development/Libraries
+#Requires:       %{name} = %{version}-%{release}
 
 %description devel
 The glpk-devel package contains libraries and headers for developing
@@ -40,7 +41,7 @@
 %package utils
 Summary:        GLPK-related utilities and examples
 Group:          Development/Libraries
-Requires:       %{name} = %{version}-%{release}
+#Requires:       %{name} = %{version}-%{release}
 
 %description utils
 The glpk-utils package contains the standalone solver programs glpksol
@@ -85,6 +86,10 @@
 %{_bindir}/*
 
 %changelog
+* Tue Aug 09 2005 Quentin Spencer  4.8-3
+- Remove utils dependency on base package, since it doesn't exist until
+  shared libraries are enabled.
+
 * Tue Aug 09 2005 Quentin Spencer  4.8-2
 - Add -fPIC to compile flags.
 



From fedora-extras-commits at redhat.com  Tue Sep 13 15:32:58 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Tue, 13 Sep 2005 11:32:58 -0400
Subject: rpms/perl-Class-Inspector/devel perl-Class-Inspector.spec,1.1,1.2
Message-ID: <200509131532.j8DFWwRb008138@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Class-Inspector/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8118

Modified Files:
	perl-Class-Inspector.spec 
Log Message:
Spec file cleanup


Index: perl-Class-Inspector.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-Inspector/devel/perl-Class-Inspector.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Class-Inspector.spec	13 Sep 2005 15:29:10 -0000	1.1
+++ perl-Class-Inspector.spec	13 Sep 2005 15:32:56 -0000	1.2
@@ -1,7 +1,7 @@
 Name: 		perl-Class-Inspector
 Version: 	1.12
-Release: 	1%{?dist}
-Summary: 	Get information about a class and it's structur
+Release: 	2%{?dist}
+Summary: 	Get information about a class and it's structure
 License: 	GPL or Artistic
 Group: 		Development/Libraries
 URL: 		http://search.cpan.org/dist/Class-Inspector/
@@ -43,16 +43,14 @@
 
 %files
 %defattr(-,root,root,-)
-%doc Changes LICENSE
+%doc Changes LICENSE README
 %{perl_vendorlib}/Class
 %{_mandir}/man3/*
 
 %changelog
+* Tue Sep 13 2005 Ralf Corsepius  - 1.12-2
+- Fix typo in %%summary.
+- Spec file cleanup.
+
 * Tue Sep 13 2005 Ralf Corsepius  - 1.12-1
 - FE submission.
-
-* Tue Sep 13 2005 Ralf Corsepius  - 1.12-0
-- Upstream update.
-
-* Wed Jun 22 2005 Ralf Corsepius  - 1.08-0.pm.0
-- Initial packman version.



From fedora-extras-commits at redhat.com  Tue Sep 13 15:34:27 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Tue, 13 Sep 2005 11:34:27 -0400
Subject: rpms/hddtemp/devel hddtemp.db,1.6,1.7 hddtemp.spec,1.12,1.13
Message-ID: <200509131535.j8DFYvjX008222@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/hddtemp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8182/devel

Modified Files:
	hddtemp.db hddtemp.spec 
Log Message:
* Sun Sep 11 2005 Ville Skytt??  - 0.3-0.6.beta13
- Update drive database to 2005-09-11.



Index: hddtemp.db
===================================================================
RCS file: /cvs/extras/rpms/hddtemp/devel/hddtemp.db,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- hddtemp.db	12 Jun 2005 19:40:33 -0000	1.6
+++ hddtemp.db	13 Sep 2005 15:34:25 -0000	1.7
@@ -17,7 +17,6 @@
 # FUJITSU FUJITSU MPG3409AH EF 40.0GB
 # HITACHI HITACHI_DK23CA-10 9.8GB
 # HITACHI HITACHI_DK23CA-15 14.7GB
-# HITACHI HITACHI_DK23CA-30 29.3GB
 # SAMSUNG SAMSUNG SV3012H 29.4GB
 # SEAGATE ST310210A 10.0GB
 # SEAGATE ST310211A 9.8GB
@@ -45,6 +44,7 @@
 ########################################
 # "ExcelStor Technology CT215"    ??? ? "ExcelStor CT215"
 "ExcelStor Technology J3.0" 194 C "ExcelStor Technology 3xy (xy GB)"
+"ExcelStor Technology J6.0" 194 C "ExcelStor Technology 6xy (xy GB)"
 
 
 ########################################
@@ -76,8 +76,11 @@
 ########################################
 ############# Hitachi drives
 ########################################
+"HITACHI_DK13FA-40B"		194  C  "Hitachi DK13FA-40B"
 "HITACHI_DK228A-65"		0    C  "Hitachi DK228A-65"
+"HITACHI_DK23CA-15"		194  C  "Hitachi DK23CA-15"
 "HITACHI_DK23CA-20"		194  C  "Hitachi DK23CA-20"
+"HITACHI_DK23CA-30"		194  C  "Hitachi DK23CA-30"
 "HITACHI_DK23CA-30B"		194  C  "Hitachi DK23CA-30B"
 "HITACHI_DK23CA-75"		194  C  "Hitachi DK23CA-75"
 "HITACHI_DK23DA-[234]0"		194  C  "Hitachi DK23DA series"
@@ -94,11 +97,13 @@
 
 "HDS728080PLAT20"               194  C  "Hitachi Deskstar 7K80 80GB"
 
-"HDS722525VLSA80"		194  C  "Hitachi Deskstar 7K250 250GB, 7200RPM, 8MB, Serial-ATA"
+"HDS722525VLSA80"		194  C  "Hitachi Deskstar 7K250 250GB, 7200RPM, 8MB, SATA"
 
-"HDT722525DLAT80"               194  C  "Hitachi Deskstar T7K250 250GB, 7200RPM, 8MB, Parallel-ATA"
+"HDT722525DLAT80"               194  C  "Hitachi Deskstar T7K250 250GB, 7200RPM, 8MB, PATA"
+"HDT722516DLA380 V43O"		194  C  "Hitachi T7K250 SATA"
 
 "HTE726060M9AT00"               194  C  "Hitachi Travelstar 60GB (7200RPM)"
+"HTS424030M9AT00"               194  C  "Hitachi Travelstar 30GB (4200RPM)"
 "HTS424040M9AT00"               194  C  "Hitachi Travelstar 4K40 40GB 2MB cache (4200RPM)"
 "HTS541040G9AT00"		194  C  "Hitachi Travelstar 40GB (5400RPM)"
 "HTS541080G9AT00"		194  C  "Hitachi Travelstar 80GB (5400RPM)"
@@ -109,7 +114,6 @@
 "HTS548080M9AT00"		194  C  "Hitachi Travelstar 80GB (5400RPM)"
 "HTS726060M9AT00"		194  C  "Hitachi Travelstar 60GB"
 
-
 ########################################
 ############# IBM drives
 ########################################
@@ -134,7 +138,7 @@
 "IBM-DTLA-30[57]0[123467][05]"  194  C  "IBM Deskstar 40GV & 75GXP series"
 "IC25N0[1234]0ATCS04-0"		194  C  "IBM Travelstar 40GN serie"
 "IC25N0[24]0ATC[SX]05-0"	194  C  "IBM Travelstar 40GNX serie"
-"IC25N0(15|20|30)ATDA04-0"	194  C  "IBM Travelstar 30GN serie"
+"IC25N0(10|15|20|30)ATDA04-0"	194  C  "IBM Travelstar 30GN serie"
 "IC25N0[23468]0ATMR04*"		194  C  "Hitachi Travelstar 80GN"
 "IC25T048ATDA05-0"              194  C  "IBM Travelstar 48GH serie"
 "IC25T060ATC[SX]05-0"		194  C  "IBM Travelstar 60GH serie"
@@ -143,7 +147,6 @@
 "IC35L[01][23689]0AVV207*"	194  C  "IBM Deskstar 180GXP serie"
 
 
-
 ########################################
 ############# Maxtor drives
 ########################################
@@ -165,12 +168,15 @@
 "Maxtor 6B(08|12|16|20|25|30)0[RSPM]0"			194  C  "Maxtor DiamondMax Plus 10"
 "Maxtor 6E0[234]0L0"					194  C  "Maxtor DiamondMax Plus 8"
 "MAXTOR 6L0[2468]0[LJ][1234]"				194  C  "Maxtor DiamondMax Plus D740X family"
+"Maxtor 6L250R0"					194  C  "Maxtor DiamondMax 10 250GB 16MB buffer 7200rpm"
 "Maxtor 6Y(06|08|12|16|20|25)0[LPM]0"			194  C  "Maxtor DiamondMax Plus 9" 
 "Maxtor 7L300R0"					194  C  "Maxtor 7L300R0 MaxLine+III 300GB 7200rpm"
 "Maxtor 7Y250[PM]0"					194  C	"Maxtor MaXLine Plus II 250GB 7200RPM"
 "Maxtor 94098U8"			 		11   C  "Maxtor DiamondMax 40 94098U8"
 
 
+
+
 ########################################
 ############# Quantum drives
 ########################################
@@ -187,10 +193,12 @@
 ########################################
 # somenone reported a problem with the SP8004H which reports a temperature
 # 10?C below the ambient temperature
+"SAMSUNG HA(200|250)JC"					194  C  "Samsung SpinPoint V120CE series"
 "SAMSUNG MP0(302|402|603|804)H"				194  C  "Samsung SpinPoint M40 2.5inch"
 "SAMSUNG SW0434A"					0    C  "Samsung SW0434A"
 "SAMSUNG SP(2001|4002|6003|8004|40A2)H"			194  C  "Samsung SpinPoint P40 serie"
 "SAMSUNG SP(0612|0802|1203|1604|0812|1213|1614)N"	194  C  "Samsung SpinPoint P80 serie"
+#"SAMSUNG SP2014N"					194  C	"Samsung SpinPoint 200GB, 7200RPM, 8MB cache"
 "SAMSUNG SP(0612|0802|1203|1604|0812|1213|1614)C"	194  C  "Samsung SpinPoint P80 series - SATA"
 "SAMSUNG SP0411N"					194  C  "Samsung SpinPoint PL40 serie"
 "SAMSUNG SP(0812|1213|1614)C"				194  C  "Samsung Spinpoint 160G SATA"
@@ -201,6 +209,7 @@
 #"SAMSUNG SV1204H"					194  C  "Samsung 120G"
 "SAMSUNG SV(0401|0802|1203|1604)N"			194  C  "Samsung SpinPoint V80 serie"
 "SAMSUNG SV4012H"					194  C  "Samsung 40GB, 5400RPM, 2MB cache"
+"SAMSUNG SP(2014|2514)N"				194  C	"Samsung SpinPoint P120 series (7200RPM, 8MB cache)"
 
 
 ########################################
@@ -237,6 +246,7 @@
 "ST360020A"				194  C  "Seagate U Series 60020"
 "ST360021A"				194  C  "Seagate Barracuda IV ST360021A"
 "ST380011A"				194  C  "Seagate Barracuda 7200.7 80GB"
+"ST380012A"                             194  C  "Seagate ST380012A 80GB"
 "ST380013A"				194  C  "Seagate Barracuda 7200.7 80GB" 
 "ST380013AS"				194  C  "Seagate Barracuda 7200.7 80GB (Serial ATA)"
 "ST380020A"				194  C  "Seagate U Series 80020 (80Gb, Ultra ATA/100, 5400 rpm)"
@@ -252,6 +262,7 @@
 "ST3160021A"				194  C  "Seagate Barracuda 7200.7 - ST3160021A"
 "ST3160023(A|AS)"			194  C  "Seagate Barracuda V ST3160023A and AS (160Gb, ATA100 and Serial ATA)"
 "ST3200822A"                            194  C  "Seagate Barracuda 7200.7 Plus 200GB"
+"ST3200826A"                            194  C  "Seagate Barracuda 7200.8 200Gb"
 "ST3250823A"				194  C  "Seagate Barracuda 7200.8 250GB"
 "ST3250823A"                            194  C  "Seagate Barracuda 7200.7 Plus 250GB"
 "ST3300831A"				194  C  "Seagate 300GB ST3300831A"
@@ -261,7 +272,6 @@
 "ST960821A"                             194  C  "Seagate ST960821A"
 "ST960822A"                             194  C  "Seagate Momentus 5400.2 60GB"
 
-
 ########################################
 ############# TOSHIBA Laptops
 ########################################
@@ -273,6 +283,7 @@
 "TOSHIBA MK3021GAS"			194  C  "Toshiba MK3021GAS"
 "TOSHIBA MK3025GAS"                     194  C  "Toshiba MK3025GAS" 
 #"TOSHIBA MK4019GAX"			222  C  "Toshiba MK4019GAX"
+"TOSHIBA MK4021GAS"			194  C  "Toshiba MK4021GAS"
 "TOSHIBA MK4025GAS"			194  C  "Toshiba MK4025GAS 40 Go"
 "TOSHIBA MK6021GAS"			194  C	"Toshiba MK6021GAS"
 "TOSHIBA MK6022GAX"			194  C	"Toshiba MK6022GAX"
@@ -287,6 +298,10 @@
 ########################################
 # WDC AC310100B and WDC AC2850F are reported not working
 # no more informations were given
+"WDC AC22000L"						  0 C "Western Digital Caviar AC22000"
+"WDC AC420400D"                 			231 C "Western Digital Caviar AC420400D"
+"WDC AC418000D"						231 C "Western Digital AC418000D"
+
 "WDC WD100EB-00BHF0"            			  0 C "Western Digital 100EB-00BHF0"
 "WDC WD200BB-00AUA1"            			  0 C "Western Digital Caviar WD200BB"
 #"WDC WD200BB-60DGA0"					  0 C "Western Digital Caviar WD200BB"
@@ -299,9 +314,12 @@
 "WDC WD400BB-75FJA1"					194 C "Western Digital Caviar WD400BB"
 "WDC WD400EB-00CPF0"					  0 C "Western Digital 400EB-00CPF0"
 "WDC WD400JB-00(JJ|FM|FS)A0"				194 C "Western Digital Caviar 40GB Special Edition 8MB" 
+"WDC WD400JB-00JJC0"					194 C "Western Digital 400JB-00JJC0 40GB"
 "WDC WD600BB-32BSA0"					  0 C "Western Digital 600BB-32BSA0"
 "WDC WD600JB-00ETA0"					194 C "Western Digital 600JB-00ETA0"
 "WDC WD600LB-00DNA0"            			194 C "Western Digital 60GB"
+"WDC WD740GD-00FL21.0"					194 C "Western Digital SATA Raptor"
+"WDC WD740GD-(00FLC0|75FLA1)"				194 C "Western Digital SATA Raptor 74GB 8MB"
 "WDC WD800BB-00CAA1"					  0 C "Western Digital WD800BB-00CAA1"
 "WDC WD800BB-(00|22)DKA0"				194 C "Western Digital WD800BB 80 Go"
 "WDC WD800BB-32CCB0"					194 C "Western Digital 800BB-32CCB0"
@@ -316,20 +334,19 @@
 "WDC WD800LB-(00|55)DNA0"				194 C "Western Digital Caviar WD800LB 80 Go ATA-100"
 "WDC WD1200BB-00(FTA|GUA)0"				194 C "Western Digital Caviar EIDE 2MB Cache"
 "WDC WD1200JB-00(EV|FU|GV)A0"   			194 C "Western Digital Caviar 120GB Special Edition 8MB" 
+"WDC WD1200JB-22GVA0"                                   194 C "Western Digital Caviar 120GB"
 "WDC WD1200JD-00GBB0"           			194 C "Western Digital WD1200JD"
 "WDC WD1200LB-55EDA0"					194 C "Western Digital WD1220LB"
 "WDC WD1600BB-00DWA0"					194 C "Western Digital Caviar WD1600BB"
-"WDC WD1600JB-00(EV|FU|GV)A0"   			194 C "Western Digital Caviar 160GB Special Edition 8MB"
+"WDC WD1600JB-(00EV|00FU|00GV|75GV)A0"   		194 C "Western Digital Caviar 160GB Special Edition 8MB"
 "WDC WD2000JB-(00EV|34EV|00FU|00GV|55GV|98GV)A0"	194 C "Western Digital Caviar 200GB Special Edition 8MB"
 "WDC WD2500JB-(00FU|32FU|00GV|55GV)A0"			194 C "Western Digital Caviar 250GB Special Edition 8MB"
+"WDC WD2500JB-00GVC0"					194 C "Western Digital 250GB"
+"WDC WD2500JD-00GBB0"					194 C "Western Digital SATA Caviar 250GB Special Edition 8MB"
 "WDC WD2500PB-98FBA0"					194 C "Western Digital Caviar 250GB Special Edition 8MB"
-"WDC AC420400D"                 			231 C "Western Digital Caviar AC420400D"
-"WDC AC418000D"						231 C "Western Digital AC418000D"
 "WDC WD135BA"						231 C "Western Digital WD135BA"
 
+
 # not sure for next
 # "WDC WD1200JB-00CRA1"		9   C "Western Digital 1200JB-00CRA1"
 # "WDC WD273BA"			9   C "Western Digital WD273BA"
-
-# SATA drive with libata passthru
-"WDC WD740GD-00FL21.0"				194 C "Western Digital SATA Raptor"


Index: hddtemp.spec
===================================================================
RCS file: /cvs/extras/rpms/hddtemp/devel/hddtemp.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- hddtemp.spec	12 Jun 2005 19:40:33 -0000	1.12
+++ hddtemp.spec	13 Sep 2005 15:34:25 -0000	1.13
@@ -2,7 +2,7 @@
 
 Name:           hddtemp
 Version:        0.3
-Release:        0.5.%{beta}
+Release:        0.6.%{beta}%{?dist}
 Summary:        Hard disk temperature tool
 
 Group:          Applications/System
@@ -16,8 +16,10 @@
 Source5:        %{name}.consoleapp
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  %{__perl}, gettext
-Requires:       /sbin/chkconfig, usermode
+BuildRequires:  %{__perl}
+BuildRequires:  gettext
+Requires:       /sbin/chkconfig
+Requires:       %{_bindir}/consolehelper
 
 %description
 hddtemp is a tool that gives you the temperature of your hard drive by
@@ -94,6 +96,9 @@
 
 
 %changelog
+* Sun Sep 11 2005 Ville Skytt??  - 0.3-0.6.beta13
+- Update drive database to 2005-09-11.
+
 * Thu Jun  9 2005 Ville Skytt??  - 0.3-0.5.beta13
 - Update drive database to 2005-06-08.
 



From fedora-extras-commits at redhat.com  Tue Sep 13 15:34:27 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Tue, 13 Sep 2005 11:34:27 -0400
Subject: rpms/hddtemp/FC-4 hddtemp.db,1.6,1.7 hddtemp.spec,1.12,1.13
Message-ID: <200509131534.j8DFYvMO008220@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/hddtemp/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8182/FC-4

Modified Files:
	hddtemp.db hddtemp.spec 
Log Message:
* Sun Sep 11 2005 Ville Skytt??  - 0.3-0.6.beta13
- Update drive database to 2005-09-11.



Index: hddtemp.db
===================================================================
RCS file: /cvs/extras/rpms/hddtemp/FC-4/hddtemp.db,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- hddtemp.db	12 Jun 2005 19:40:32 -0000	1.6
+++ hddtemp.db	13 Sep 2005 15:34:24 -0000	1.7
@@ -17,7 +17,6 @@
 # FUJITSU FUJITSU MPG3409AH EF 40.0GB
 # HITACHI HITACHI_DK23CA-10 9.8GB
 # HITACHI HITACHI_DK23CA-15 14.7GB
-# HITACHI HITACHI_DK23CA-30 29.3GB
 # SAMSUNG SAMSUNG SV3012H 29.4GB
 # SEAGATE ST310210A 10.0GB
 # SEAGATE ST310211A 9.8GB
@@ -45,6 +44,7 @@
 ########################################
 # "ExcelStor Technology CT215"    ??? ? "ExcelStor CT215"
 "ExcelStor Technology J3.0" 194 C "ExcelStor Technology 3xy (xy GB)"
+"ExcelStor Technology J6.0" 194 C "ExcelStor Technology 6xy (xy GB)"
 
 
 ########################################
@@ -76,8 +76,11 @@
 ########################################
 ############# Hitachi drives
 ########################################
+"HITACHI_DK13FA-40B"		194  C  "Hitachi DK13FA-40B"
 "HITACHI_DK228A-65"		0    C  "Hitachi DK228A-65"
+"HITACHI_DK23CA-15"		194  C  "Hitachi DK23CA-15"
 "HITACHI_DK23CA-20"		194  C  "Hitachi DK23CA-20"
+"HITACHI_DK23CA-30"		194  C  "Hitachi DK23CA-30"
 "HITACHI_DK23CA-30B"		194  C  "Hitachi DK23CA-30B"
 "HITACHI_DK23CA-75"		194  C  "Hitachi DK23CA-75"
 "HITACHI_DK23DA-[234]0"		194  C  "Hitachi DK23DA series"
@@ -94,11 +97,13 @@
 
 "HDS728080PLAT20"               194  C  "Hitachi Deskstar 7K80 80GB"
 
-"HDS722525VLSA80"		194  C  "Hitachi Deskstar 7K250 250GB, 7200RPM, 8MB, Serial-ATA"
+"HDS722525VLSA80"		194  C  "Hitachi Deskstar 7K250 250GB, 7200RPM, 8MB, SATA"
 
-"HDT722525DLAT80"               194  C  "Hitachi Deskstar T7K250 250GB, 7200RPM, 8MB, Parallel-ATA"
+"HDT722525DLAT80"               194  C  "Hitachi Deskstar T7K250 250GB, 7200RPM, 8MB, PATA"
+"HDT722516DLA380 V43O"		194  C  "Hitachi T7K250 SATA"
 
 "HTE726060M9AT00"               194  C  "Hitachi Travelstar 60GB (7200RPM)"
+"HTS424030M9AT00"               194  C  "Hitachi Travelstar 30GB (4200RPM)"
 "HTS424040M9AT00"               194  C  "Hitachi Travelstar 4K40 40GB 2MB cache (4200RPM)"
 "HTS541040G9AT00"		194  C  "Hitachi Travelstar 40GB (5400RPM)"
 "HTS541080G9AT00"		194  C  "Hitachi Travelstar 80GB (5400RPM)"
@@ -109,7 +114,6 @@
 "HTS548080M9AT00"		194  C  "Hitachi Travelstar 80GB (5400RPM)"
 "HTS726060M9AT00"		194  C  "Hitachi Travelstar 60GB"
 
-
 ########################################
 ############# IBM drives
 ########################################
@@ -134,7 +138,7 @@
 "IBM-DTLA-30[57]0[123467][05]"  194  C  "IBM Deskstar 40GV & 75GXP series"
 "IC25N0[1234]0ATCS04-0"		194  C  "IBM Travelstar 40GN serie"
 "IC25N0[24]0ATC[SX]05-0"	194  C  "IBM Travelstar 40GNX serie"
-"IC25N0(15|20|30)ATDA04-0"	194  C  "IBM Travelstar 30GN serie"
+"IC25N0(10|15|20|30)ATDA04-0"	194  C  "IBM Travelstar 30GN serie"
 "IC25N0[23468]0ATMR04*"		194  C  "Hitachi Travelstar 80GN"
 "IC25T048ATDA05-0"              194  C  "IBM Travelstar 48GH serie"
 "IC25T060ATC[SX]05-0"		194  C  "IBM Travelstar 60GH serie"
@@ -143,7 +147,6 @@
 "IC35L[01][23689]0AVV207*"	194  C  "IBM Deskstar 180GXP serie"
 
 
-
 ########################################
 ############# Maxtor drives
 ########################################
@@ -165,12 +168,15 @@
 "Maxtor 6B(08|12|16|20|25|30)0[RSPM]0"			194  C  "Maxtor DiamondMax Plus 10"
 "Maxtor 6E0[234]0L0"					194  C  "Maxtor DiamondMax Plus 8"
 "MAXTOR 6L0[2468]0[LJ][1234]"				194  C  "Maxtor DiamondMax Plus D740X family"
+"Maxtor 6L250R0"					194  C  "Maxtor DiamondMax 10 250GB 16MB buffer 7200rpm"
 "Maxtor 6Y(06|08|12|16|20|25)0[LPM]0"			194  C  "Maxtor DiamondMax Plus 9" 
 "Maxtor 7L300R0"					194  C  "Maxtor 7L300R0 MaxLine+III 300GB 7200rpm"
 "Maxtor 7Y250[PM]0"					194  C	"Maxtor MaXLine Plus II 250GB 7200RPM"
 "Maxtor 94098U8"			 		11   C  "Maxtor DiamondMax 40 94098U8"
 
 
+
+
 ########################################
 ############# Quantum drives
 ########################################
@@ -187,10 +193,12 @@
 ########################################
 # somenone reported a problem with the SP8004H which reports a temperature
 # 10?C below the ambient temperature
+"SAMSUNG HA(200|250)JC"					194  C  "Samsung SpinPoint V120CE series"
 "SAMSUNG MP0(302|402|603|804)H"				194  C  "Samsung SpinPoint M40 2.5inch"
 "SAMSUNG SW0434A"					0    C  "Samsung SW0434A"
 "SAMSUNG SP(2001|4002|6003|8004|40A2)H"			194  C  "Samsung SpinPoint P40 serie"
 "SAMSUNG SP(0612|0802|1203|1604|0812|1213|1614)N"	194  C  "Samsung SpinPoint P80 serie"
+#"SAMSUNG SP2014N"					194  C	"Samsung SpinPoint 200GB, 7200RPM, 8MB cache"
 "SAMSUNG SP(0612|0802|1203|1604|0812|1213|1614)C"	194  C  "Samsung SpinPoint P80 series - SATA"
 "SAMSUNG SP0411N"					194  C  "Samsung SpinPoint PL40 serie"
 "SAMSUNG SP(0812|1213|1614)C"				194  C  "Samsung Spinpoint 160G SATA"
@@ -201,6 +209,7 @@
 #"SAMSUNG SV1204H"					194  C  "Samsung 120G"
 "SAMSUNG SV(0401|0802|1203|1604)N"			194  C  "Samsung SpinPoint V80 serie"
 "SAMSUNG SV4012H"					194  C  "Samsung 40GB, 5400RPM, 2MB cache"
+"SAMSUNG SP(2014|2514)N"				194  C	"Samsung SpinPoint P120 series (7200RPM, 8MB cache)"
 
 
 ########################################
@@ -237,6 +246,7 @@
 "ST360020A"				194  C  "Seagate U Series 60020"
 "ST360021A"				194  C  "Seagate Barracuda IV ST360021A"
 "ST380011A"				194  C  "Seagate Barracuda 7200.7 80GB"
+"ST380012A"                             194  C  "Seagate ST380012A 80GB"
 "ST380013A"				194  C  "Seagate Barracuda 7200.7 80GB" 
 "ST380013AS"				194  C  "Seagate Barracuda 7200.7 80GB (Serial ATA)"
 "ST380020A"				194  C  "Seagate U Series 80020 (80Gb, Ultra ATA/100, 5400 rpm)"
@@ -252,6 +262,7 @@
 "ST3160021A"				194  C  "Seagate Barracuda 7200.7 - ST3160021A"
 "ST3160023(A|AS)"			194  C  "Seagate Barracuda V ST3160023A and AS (160Gb, ATA100 and Serial ATA)"
 "ST3200822A"                            194  C  "Seagate Barracuda 7200.7 Plus 200GB"
+"ST3200826A"                            194  C  "Seagate Barracuda 7200.8 200Gb"
 "ST3250823A"				194  C  "Seagate Barracuda 7200.8 250GB"
 "ST3250823A"                            194  C  "Seagate Barracuda 7200.7 Plus 250GB"
 "ST3300831A"				194  C  "Seagate 300GB ST3300831A"
@@ -261,7 +272,6 @@
 "ST960821A"                             194  C  "Seagate ST960821A"
 "ST960822A"                             194  C  "Seagate Momentus 5400.2 60GB"
 
-
 ########################################
 ############# TOSHIBA Laptops
 ########################################
@@ -273,6 +283,7 @@
 "TOSHIBA MK3021GAS"			194  C  "Toshiba MK3021GAS"
 "TOSHIBA MK3025GAS"                     194  C  "Toshiba MK3025GAS" 
 #"TOSHIBA MK4019GAX"			222  C  "Toshiba MK4019GAX"
+"TOSHIBA MK4021GAS"			194  C  "Toshiba MK4021GAS"
 "TOSHIBA MK4025GAS"			194  C  "Toshiba MK4025GAS 40 Go"
 "TOSHIBA MK6021GAS"			194  C	"Toshiba MK6021GAS"
 "TOSHIBA MK6022GAX"			194  C	"Toshiba MK6022GAX"
@@ -287,6 +298,10 @@
 ########################################
 # WDC AC310100B and WDC AC2850F are reported not working
 # no more informations were given
+"WDC AC22000L"						  0 C "Western Digital Caviar AC22000"
+"WDC AC420400D"                 			231 C "Western Digital Caviar AC420400D"
+"WDC AC418000D"						231 C "Western Digital AC418000D"
+
 "WDC WD100EB-00BHF0"            			  0 C "Western Digital 100EB-00BHF0"
 "WDC WD200BB-00AUA1"            			  0 C "Western Digital Caviar WD200BB"
 #"WDC WD200BB-60DGA0"					  0 C "Western Digital Caviar WD200BB"
@@ -299,9 +314,12 @@
 "WDC WD400BB-75FJA1"					194 C "Western Digital Caviar WD400BB"
 "WDC WD400EB-00CPF0"					  0 C "Western Digital 400EB-00CPF0"
 "WDC WD400JB-00(JJ|FM|FS)A0"				194 C "Western Digital Caviar 40GB Special Edition 8MB" 
+"WDC WD400JB-00JJC0"					194 C "Western Digital 400JB-00JJC0 40GB"
 "WDC WD600BB-32BSA0"					  0 C "Western Digital 600BB-32BSA0"
 "WDC WD600JB-00ETA0"					194 C "Western Digital 600JB-00ETA0"
 "WDC WD600LB-00DNA0"            			194 C "Western Digital 60GB"
+"WDC WD740GD-00FL21.0"					194 C "Western Digital SATA Raptor"
+"WDC WD740GD-(00FLC0|75FLA1)"				194 C "Western Digital SATA Raptor 74GB 8MB"
 "WDC WD800BB-00CAA1"					  0 C "Western Digital WD800BB-00CAA1"
 "WDC WD800BB-(00|22)DKA0"				194 C "Western Digital WD800BB 80 Go"
 "WDC WD800BB-32CCB0"					194 C "Western Digital 800BB-32CCB0"
@@ -316,20 +334,19 @@
 "WDC WD800LB-(00|55)DNA0"				194 C "Western Digital Caviar WD800LB 80 Go ATA-100"
 "WDC WD1200BB-00(FTA|GUA)0"				194 C "Western Digital Caviar EIDE 2MB Cache"
 "WDC WD1200JB-00(EV|FU|GV)A0"   			194 C "Western Digital Caviar 120GB Special Edition 8MB" 
+"WDC WD1200JB-22GVA0"                                   194 C "Western Digital Caviar 120GB"
 "WDC WD1200JD-00GBB0"           			194 C "Western Digital WD1200JD"
 "WDC WD1200LB-55EDA0"					194 C "Western Digital WD1220LB"
 "WDC WD1600BB-00DWA0"					194 C "Western Digital Caviar WD1600BB"
-"WDC WD1600JB-00(EV|FU|GV)A0"   			194 C "Western Digital Caviar 160GB Special Edition 8MB"
+"WDC WD1600JB-(00EV|00FU|00GV|75GV)A0"   		194 C "Western Digital Caviar 160GB Special Edition 8MB"
 "WDC WD2000JB-(00EV|34EV|00FU|00GV|55GV|98GV)A0"	194 C "Western Digital Caviar 200GB Special Edition 8MB"
 "WDC WD2500JB-(00FU|32FU|00GV|55GV)A0"			194 C "Western Digital Caviar 250GB Special Edition 8MB"
+"WDC WD2500JB-00GVC0"					194 C "Western Digital 250GB"
+"WDC WD2500JD-00GBB0"					194 C "Western Digital SATA Caviar 250GB Special Edition 8MB"
 "WDC WD2500PB-98FBA0"					194 C "Western Digital Caviar 250GB Special Edition 8MB"
-"WDC AC420400D"                 			231 C "Western Digital Caviar AC420400D"
-"WDC AC418000D"						231 C "Western Digital AC418000D"
 "WDC WD135BA"						231 C "Western Digital WD135BA"
 
+
 # not sure for next
 # "WDC WD1200JB-00CRA1"		9   C "Western Digital 1200JB-00CRA1"
 # "WDC WD273BA"			9   C "Western Digital WD273BA"
-
-# SATA drive with libata passthru
-"WDC WD740GD-00FL21.0"				194 C "Western Digital SATA Raptor"


Index: hddtemp.spec
===================================================================
RCS file: /cvs/extras/rpms/hddtemp/FC-4/hddtemp.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- hddtemp.spec	12 Jun 2005 19:40:32 -0000	1.12
+++ hddtemp.spec	13 Sep 2005 15:34:24 -0000	1.13
@@ -2,7 +2,7 @@
 
 Name:           hddtemp
 Version:        0.3
-Release:        0.4.%{beta}.1
+Release:        0.6.%{beta}%{?dist}
 Summary:        Hard disk temperature tool
 
 Group:          Applications/System
@@ -16,8 +16,10 @@
 Source5:        %{name}.consoleapp
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  %{__perl}, gettext
-Requires:       /sbin/chkconfig, usermode
+BuildRequires:  %{__perl}
+BuildRequires:  gettext
+Requires:       /sbin/chkconfig
+Requires:       %{_bindir}/consolehelper
 
 %description
 hddtemp is a tool that gives you the temperature of your hard drive by
@@ -94,7 +96,10 @@
 
 
 %changelog
-* Thu Jun  9 2005 Ville Skytt??  - 0.3-0.4.beta13.1
+* Sun Sep 11 2005 Ville Skytt??  - 0.3-0.6.beta13
+- Update drive database to 2005-09-11.
+
+* Thu Jun  9 2005 Ville Skytt??  - 0.3-0.5.beta13
 - Update drive database to 2005-06-08.
 
 * Sat May 28 2005 Ville Skytt??  - 0.3-0.4.beta13



From fedora-extras-commits at redhat.com  Tue Sep 13 15:55:59 2005
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Tue, 13 Sep 2005 11:55:59 -0400
Subject: extras-buildsys/utils distro-rebuild.py,1.4,1.5
Message-ID: <200509131555.j8DFtxn6008520@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys/utils
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8501

Modified Files:
	distro-rebuild.py 
Log Message:
Alphabetize packages for enqueue


Index: distro-rebuild.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/distro-rebuild.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- distro-rebuild.py	11 Sep 2005 04:00:12 -0000	1.4
+++ distro-rebuild.py	13 Sep 2005 15:55:56 -0000	1.5
@@ -160,7 +160,9 @@
     temp_dirs = []
     
     # Rebuild and enqueue the packages
-    for name in files.keys():
+    names = files.keys()
+    names.sort()
+    for name in names:
         f = files[name]
         try:
             (rebuilt_srpm, temp_dir_path) = rebuild_srpm(name, f)



From fedora-extras-commits at redhat.com  Tue Sep 13 16:17:38 2005
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Tue, 13 Sep 2005 12:17:38 -0400
Subject: rpms/perl-Apache-Session - New directory
Message-ID: <200509131617.j8DGHcTq010029@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Apache-Session
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10009/perl-Apache-Session

Log Message:
Directory /cvs/extras/rpms/perl-Apache-Session added to the repository




From fedora-extras-commits at redhat.com  Tue Sep 13 16:17:38 2005
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Tue, 13 Sep 2005 12:17:38 -0400
Subject: rpms/perl-Apache-Session/devel - New directory
Message-ID: <200509131617.j8DGHcoT010034@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Apache-Session/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10009/perl-Apache-Session/devel

Log Message:
Directory /cvs/extras/rpms/perl-Apache-Session/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Sep 13 16:18:00 2005
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Tue, 13 Sep 2005 12:18:00 -0400
Subject: rpms/perl-Apache-Session Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200509131618.j8DGI0wF010089@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Apache-Session
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10054

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-Apache-Session


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Apache-Session
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Tue Sep 13 16:18:01 2005
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Tue, 13 Sep 2005 12:18:01 -0400
Subject: rpms/perl-Apache-Session/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200509131618.j8DGI1jB010094@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Apache-Session/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10054/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Apache-Session


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Tue Sep 13 16:18:45 2005
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Tue, 13 Sep 2005 12:18:45 -0400
Subject: rpms/perl-Apache-Session import.log,1.1,1.2
Message-ID: <200509131619.j8DGJFwB010168@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Apache-Session
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10127

Modified Files:
	import.log 
Log Message:
auto-import perl-Apache-Session-1.6-2 on branch devel from perl-Apache-Session-1.6-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Apache-Session/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	13 Sep 2005 16:17:58 -0000	1.1
+++ import.log	13 Sep 2005 16:18:42 -0000	1.2
@@ -0,0 +1 @@
+perl-Apache-Session-1_6-2:HEAD:perl-Apache-Session-1.6-2.src.rpm:1126628314



From fedora-extras-commits at redhat.com  Tue Sep 13 16:18:45 2005
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Tue, 13 Sep 2005 12:18:45 -0400
Subject: rpms/perl-Apache-Session/devel Apache-Session-mp2.patch, NONE,
	1.1 perl-Apache-Session.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200509131619.j8DGJFuB010172@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Apache-Session/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10127/devel

Modified Files:
	.cvsignore sources 
Added Files:
	Apache-Session-mp2.patch perl-Apache-Session.spec 
Log Message:
auto-import perl-Apache-Session-1.6-2 on branch devel from perl-Apache-Session-1.6-2.src.rpm

Apache-Session-mp2.patch:

--- NEW FILE Apache-Session-mp2.patch ---
 - make Session::Generate::ModUsertrack work with MP2.

--- ./Session/Generate/ModUsertrack.pm	2001-10-11 10:43:32.000000000 -0700
+++ ./Session/Generate/ModUsertrack.pm.mp2	2005-09-07 16:01:11.798128185 -0700
@@ -15,8 +15,14 @@
 
     if (!exists $cookies{$name} && MOD_PERL) {
 	# no cookies, try to steal from notes
-	require Apache;
-	my $r = Apache->request;
+	my $r;
+	if ( $ENV{MOD_PERL_API_VERION} == 2 ) {
+	    require Apache2::RequestUtil;
+	    $r = Apache2::RequestUtil->request;
+	} else {
+	    require Apache;
+	    $r = Apache->request;
+	}
 	%cookies = CGI::Cookie->parse($r->notes('cookie'));
     }
 


--- NEW FILE perl-Apache-Session.spec ---
Name:           perl-Apache-Session
Version:        1.6
Release:        2%{?dist}
Summary:        Apache::Session Perl module
License:        Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Apache-Session/
Source0:        http://www.cpan.org/modules/by-module/Apache/Apache-Session-1.6.tar.gz
# https://bugzilla.redhat.com/bugzilla/attachment.cgi?id=118577, from Chris Grau
Patch0:         Apache-Session-mp2.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(DBI)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
These modules provide persistent storage for arbitrary data, in arbitrary
backing stores.  The details of interacting with the backing store are
abstracted to make all backing stores behave alike.  The programmer simply
interacts with a tied hash.

%prep
%setup -q -n Apache-Session-%{version}
%patch0 -p0

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT

make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT

find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null \;

chmod -R u+rwX,go+rX,go-w $RPM_BUILD_ROOT/*

perldoc -t perlartistic > Artistic

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc CHANGES README TODO Artistic
%{perl_vendorlib}/Apache
%{_mandir}/man3/Apache*

%changelog
* Thu Sep 08 2005 Steven Pritchard  1.6-2
- Add patch for mod_perl2 compatibility from Chris Grau (#167753, comment #3).
- Re-enable "make test".

* Wed Aug 31 2005 Steven Pritchard  1.6-1
- Specfile autogenerated.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Apache-Session/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	13 Sep 2005 16:17:58 -0000	1.1
+++ .cvsignore	13 Sep 2005 16:18:43 -0000	1.2
@@ -0,0 +1 @@
+Apache-Session-1.6.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Apache-Session/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	13 Sep 2005 16:17:58 -0000	1.1
+++ sources	13 Sep 2005 16:18:43 -0000	1.2
@@ -0,0 +1 @@
+3a373102e3ba49f93a76994c6599e1ff  Apache-Session-1.6.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep 13 16:20:44 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Tue, 13 Sep 2005 12:20:44 -0400
Subject: rpms/perl-Class-Inspector/FC-3 perl-Class-Inspector.spec,1.2,1.3
Message-ID: <200509131620.j8DGKiHd010282@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Class-Inspector/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10226/FC-3

Modified Files:
	perl-Class-Inspector.spec 
Log Message:
Fix another typo in %%summary.


Index: perl-Class-Inspector.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-Inspector/FC-3/perl-Class-Inspector.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Class-Inspector.spec	13 Sep 2005 15:32:56 -0000	1.2
+++ perl-Class-Inspector.spec	13 Sep 2005 16:20:42 -0000	1.3
@@ -1,7 +1,7 @@
 Name: 		perl-Class-Inspector
 Version: 	1.12
 Release: 	2%{?dist}
-Summary: 	Get information about a class and it's structure
+Summary: 	Get information about a class and its structure
 License: 	GPL or Artistic
 Group: 		Development/Libraries
 URL: 		http://search.cpan.org/dist/Class-Inspector/
@@ -48,6 +48,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Tue Sep 13 2005 Ralf Corsepius 
+- Fix another typo in %%summary.
+
 * Tue Sep 13 2005 Ralf Corsepius  - 1.12-2
 - Fix typo in %%summary.
 - Spec file cleanup.



From fedora-extras-commits at redhat.com  Tue Sep 13 16:20:45 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Tue, 13 Sep 2005 12:20:45 -0400
Subject: rpms/perl-Class-Inspector/FC-4 perl-Class-Inspector.spec,1.2,1.3
Message-ID: <200509131620.j8DGKjS3010288@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Class-Inspector/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10226/FC-4

Modified Files:
	perl-Class-Inspector.spec 
Log Message:
Fix another typo in %%summary.


Index: perl-Class-Inspector.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-Inspector/FC-4/perl-Class-Inspector.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Class-Inspector.spec	13 Sep 2005 15:32:56 -0000	1.2
+++ perl-Class-Inspector.spec	13 Sep 2005 16:20:43 -0000	1.3
@@ -1,7 +1,7 @@
 Name: 		perl-Class-Inspector
 Version: 	1.12
 Release: 	2%{?dist}
-Summary: 	Get information about a class and it's structure
+Summary: 	Get information about a class and its structure
 License: 	GPL or Artistic
 Group: 		Development/Libraries
 URL: 		http://search.cpan.org/dist/Class-Inspector/
@@ -48,6 +48,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Tue Sep 13 2005 Ralf Corsepius 
+- Fix another typo in %%summary.
+
 * Tue Sep 13 2005 Ralf Corsepius  - 1.12-2
 - Fix typo in %%summary.
 - Spec file cleanup.



From fedora-extras-commits at redhat.com  Tue Sep 13 16:20:45 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Tue, 13 Sep 2005 12:20:45 -0400
Subject: rpms/perl-Class-Inspector/devel perl-Class-Inspector.spec,1.2,1.3
Message-ID: <200509131620.j8DGKjUJ010297@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Class-Inspector/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10226/devel

Modified Files:
	perl-Class-Inspector.spec 
Log Message:
Fix another typo in %%summary.


Index: perl-Class-Inspector.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-Inspector/devel/perl-Class-Inspector.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Class-Inspector.spec	13 Sep 2005 15:32:56 -0000	1.2
+++ perl-Class-Inspector.spec	13 Sep 2005 16:20:43 -0000	1.3
@@ -1,7 +1,7 @@
 Name: 		perl-Class-Inspector
 Version: 	1.12
 Release: 	2%{?dist}
-Summary: 	Get information about a class and it's structure
+Summary: 	Get information about a class and its structure
 License: 	GPL or Artistic
 Group: 		Development/Libraries
 URL: 		http://search.cpan.org/dist/Class-Inspector/
@@ -48,6 +48,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Tue Sep 13 2005 Ralf Corsepius 
+- Fix another typo in %%summary.
+
 * Tue Sep 13 2005 Ralf Corsepius  - 1.12-2
 - Fix typo in %%summary.
 - Spec file cleanup.



From fedora-extras-commits at redhat.com  Tue Sep 13 16:20:45 2005
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Tue, 13 Sep 2005 12:20:45 -0400
Subject: owners owners.list,1.198,1.199
Message-ID: <200509131621.j8DGLFc9010311@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10224

Modified Files:
	owners.list 
Log Message:
Adding perl-Apache-Session.


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.198
retrieving revision 1.199
diff -u -r1.198 -r1.199
--- owners.list	13 Sep 2005 14:26:32 -0000	1.198
+++ owners.list	13 Sep 2005 16:20:43 -0000	1.199
@@ -565,6 +565,7 @@
 Fedora Extras|pdftohtml|A PDF to HTML converter|gauret at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|perl-Algorithm-Diff|Algorithm::Diff Perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Apache-LogRegex|Perl module for parsing a line from an Apache logfile into a hash|ghenry at suretecsystems.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Apache-Session|Apache::Session Perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Apache-Session-Wrapper|A simple wrapper around Apache::Session|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-AppConfig|Perl module for reading configuration files|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Archive-Zip|Perl library for accessing Zip archives|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Tue Sep 13 16:23:48 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Tue, 13 Sep 2005 12:23:48 -0400
Subject: owners owners.list,1.199,1.200
Message-ID: <200509131623.j8DGNmvL010377@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10351

Modified Files:
	owners.list 
Log Message:
Add perl-Class-Inspector


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.199
retrieving revision 1.200
diff -u -r1.199 -r1.200
--- owners.list	13 Sep 2005 16:20:43 -0000	1.199
+++ owners.list	13 Sep 2005 16:23:45 -0000	1.200
@@ -596,6 +596,7 @@
 Fedora Extras|perl-Class-DBI-Plugin-RetrieveAll|More complex retrieve_all() for Class::DBI|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Class-DBI-Plugin-Type|Determine type information for columns|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Class-DBI-SQLite|Extension to Class::DBI for sqlite|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Class-Inspector|Get information about a class and its structure|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Class-MethodMaker|Create generic methods for OO Perl|dgregor at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Class-ReturnValue|Class::ReturnValue Perl module|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Class-Singleton|Class::Singleton Perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Tue Sep 13 16:42:52 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Tue, 13 Sep 2005 12:42:52 -0400
Subject: rpms/perl-File-Remove - New directory
Message-ID: <200509131642.j8DGgqLU010716@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-File-Remove
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10696/perl-File-Remove

Log Message:
Directory /cvs/extras/rpms/perl-File-Remove added to the repository




From fedora-extras-commits at redhat.com  Tue Sep 13 16:42:52 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Tue, 13 Sep 2005 12:42:52 -0400
Subject: rpms/perl-File-Remove/devel - New directory
Message-ID: <200509131642.j8DGgqC2010721@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-File-Remove/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10696/perl-File-Remove/devel

Log Message:
Directory /cvs/extras/rpms/perl-File-Remove/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Sep 13 16:43:23 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Tue, 13 Sep 2005 12:43:23 -0400
Subject: rpms/perl-File-Remove Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200509131643.j8DGhNC1010776@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-File-Remove
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10741

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-File-Remove


--- NEW FILE Makefile ---
# Top level Makefile for module perl-File-Remove
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Tue Sep 13 16:43:24 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Tue, 13 Sep 2005 12:43:24 -0400
Subject: rpms/perl-File-Remove/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200509131643.j8DGhOLg010781@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-File-Remove/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10741/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-File-Remove


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Tue Sep 13 16:44:08 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Tue, 13 Sep 2005 12:44:08 -0400
Subject: rpms/perl-File-Remove import.log,1.1,1.2
Message-ID: <200509131644.j8DGi8PT010849@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-File-Remove
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10809

Modified Files:
	import.log 
Log Message:
auto-import perl-File-Remove-0.30-1 on branch devel from perl-File-Remove-0.30-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-File-Remove/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	13 Sep 2005 16:43:21 -0000	1.1
+++ import.log	13 Sep 2005 16:44:06 -0000	1.2
@@ -0,0 +1 @@
+perl-File-Remove-0_30-1:HEAD:perl-File-Remove-0.30-1.src.rpm:1126629832



From fedora-extras-commits at redhat.com  Tue Sep 13 16:44:08 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Tue, 13 Sep 2005 12:44:08 -0400
Subject: rpms/perl-File-Remove/devel perl-File-Remove.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200509131644.j8DGi8Di010856@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-File-Remove/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10809/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-File-Remove.spec 
Log Message:
auto-import perl-File-Remove-0.30-1 on branch devel from perl-File-Remove-0.30-1.src.rpm


--- NEW FILE perl-File-Remove.spec ---
Name: 		perl-File-Remove
Version:	0.30
Release:	1%{?dist}
Summary:	Remove files and directories
License:	GPL or Artistic
Group:		Development/Libraries
URL: 		http://search.cpan.org/dist/File-Remove/
Source0: 	http://search.cpan.org/CPAN/authors/id/R/RS/RSOD/File-Remove-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:  	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
BuildArch: 	noarch

%description
Remove files and directories

%prep
%setup -q -n File-Remove-%{version}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'
find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';'
chmod -R u+w $RPM_BUILD_ROOT/*

%clean
rm -rf $RPM_BUILD_ROOT

%check
make test

%files
%defattr(-,root,root,-)
# For license text(s), see the perl package.
%doc Changes README
%{perl_vendorlib}/File
%{_mandir}/man3/*

%changelog
* Tue Sep 13 2005 Ralf Corsepius  - 0.30-1
- FE submission.

* Fri Sep 02 2005 Ralf Corsepius  - 0.30-0
- FE submission preps.

* Tue Jun 28 2005 Ralf Corsepius  - 0.29-0.pm.1
- Initial packman version.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-File-Remove/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	13 Sep 2005 16:43:22 -0000	1.1
+++ .cvsignore	13 Sep 2005 16:44:06 -0000	1.2
@@ -0,0 +1 @@
+File-Remove-0.30.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-File-Remove/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	13 Sep 2005 16:43:22 -0000	1.1
+++ sources	13 Sep 2005 16:44:06 -0000	1.2
@@ -0,0 +1 @@
+3973fd86f5d82a52255bde3c1fd63486  File-Remove-0.30.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep 13 16:47:54 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Tue, 13 Sep 2005 12:47:54 -0400
Subject: rpms/perl-File-Remove/devel perl-File-Remove.spec,1.1,1.2
Message-ID: <200509131647.j8DGlsbj010936@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-File-Remove/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10917

Modified Files:
	perl-File-Remove.spec 
Log Message:
spec file cleanup


Index: perl-File-Remove.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-File-Remove/devel/perl-File-Remove.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-File-Remove.spec	13 Sep 2005 16:44:06 -0000	1.1
+++ perl-File-Remove.spec	13 Sep 2005 16:47:52 -0000	1.2
@@ -1,7 +1,7 @@
 Name: 		perl-File-Remove
 Version:	0.30
-Release:	1%{?dist}
-Summary:	Remove files and directories
+Release:	2%{?dist}
+Summary:	Convenience module for removing files and directories
 License:	GPL or Artistic
 Group:		Development/Libraries
 URL: 		http://search.cpan.org/dist/File-Remove/
@@ -12,7 +12,7 @@
 BuildArch: 	noarch
 
 %description
-Remove files and directories
+%{summary}
 
 %prep
 %setup -q -n File-Remove-%{version}
@@ -42,11 +42,8 @@
 %{_mandir}/man3/*
 
 %changelog
-* Tue Sep 13 2005 Ralf Corsepius  - 0.30-1
-- FE submission.
-
-* Fri Sep 02 2005 Ralf Corsepius  - 0.30-0
-- FE submission preps.
+* Tue Sep 13 2005 Ralf Corsepius  - 0.30-2
+- Change %%summary according to Ville's preference.
 
-* Tue Jun 28 2005 Ralf Corsepius  - 0.29-0.pm.1
-- Initial packman version.
+* Tue Sep 13 2005 Ralf Corsepius  - 0.30-1
+- FE submission.



From fedora-extras-commits at redhat.com  Tue Sep 13 16:50:46 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 13 Sep 2005 12:50:46 -0400
Subject: rpms/sbcl/devel sbcl-0.9.4-ADDR_NO_RANDOMIZE-argv0.patch, NONE,
	1.1 sbcl-0.9.4-ADDR_NO_RANDOMIZE-proc.patch, NONE,
	1.1 sbcl.sysconfig, NONE, 1.1 sbcl-0.9.4-LIB_DIR.patch, 1.1,
	1.2 sbcl.sh, 1.2, 1.3 sbcl.spec, 1.7,
	1.8 sbcl-0.9.4-ADDR_NO_RANDOMIZE.patch, 1.1, NONE
Message-ID: <200509131650.j8DGokKw011016@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/sbcl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10989

Modified Files:
	sbcl-0.9.4-LIB_DIR.patch sbcl.sh sbcl.spec 
Added Files:
	sbcl-0.9.4-ADDR_NO_RANDOMIZE-argv0.patch 
	sbcl-0.9.4-ADDR_NO_RANDOMIZE-proc.patch sbcl.sysconfig 
Removed Files:
	sbcl-0.9.4-ADDR_NO_RANDOMIZE.patch 
Log Message:
* Tue Sep 13 2005 Rex Dieter  0.9.4-11
- fix botched NO_ADDR_RANDOMIZE patch
- fix botched LIB_DIR patch


sbcl-0.9.4-ADDR_NO_RANDOMIZE-argv0.patch:

--- NEW FILE sbcl-0.9.4-ADDR_NO_RANDOMIZE-argv0.patch ---
--- sbcl-0.9.4/src/runtime/os.h.ADDR_NO_RANDOMIZE	2005-07-14 10:41:20.000000000 -0500
+++ sbcl-0.9.4/src/runtime/os.h	2005-09-13 11:23:31.319884384 -0500
@@ -50,7 +50,7 @@
 
 /* Do anything we need to do when starting up the runtime environment
  * in this OS. */
-extern void os_init(void);
+extern void os_init(char *argv[], char *envp[]);
 
 /* Install any OS-dependent low-level signal handlers which are needed
  * by the runtime environment. E.g. the signals raised by a violation
--- sbcl-0.9.4/src/runtime/linux-os.c.ADDR_NO_RANDOMIZE	2005-08-12 14:08:19.000000000 -0500
+++ sbcl-0.9.4/src/runtime/linux-os.c	2005-09-13 11:26:47.110833967 -0500
@@ -44,6 +44,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include "validate.h"
 #include "thread.h"
@@ -92,7 +93,7 @@
 int linux_no_threads_p = 0;
 
 void
-os_init(void)
+os_init(char *argv[], char *envp[])
 {
     /* Conduct various version checks: do we have enough mmap(), is
      * this a sparc running 2.2, can we do threads? */
@@ -117,7 +118,7 @@
         FSHOW((stderr,"linux kernel %d.%d predates 2.4;\n enabling workarounds for SPARC kernel bugs in signal handling.\n", major_version,minor_version));
         linux_sparc_siginfo_bug = 1;
 #endif
-    }
+    }   
 #ifdef LISP_FEATURE_SB_THREAD
     futex_wait(futex,-1);
     if(errno==ENOSYS)  linux_no_threads_p = 1;
@@ -125,6 +126,28 @@
         fprintf(stderr,"Linux with NPTL support (e.g. kernel 2.6 or newer) required for \nthread-enabled SBCL.  Disabling thread support.\n\n");
 #endif
     os_vm_page_size = getpagesize();
+   
+    /* KLUDGE: Disable memory randomization on new Linux kernels
+     * by setting a personality flag and re-executing. (We need
+     * to re-execute, since the memory maps that can conflict with
+     * the SBCL spaces have already been done at this point).
+     */
+#if defined(LISP_FEATURE_X86)
+    if ((major_version == 2) && (minor_version >= 6) || (major_version >= 3)) {
+       long pers = personality(-1);
+       /* 0x40000 aka. ADDR_NO_RANDOMIZE */
+       if (!(pers & 0x40000)) {
+	 if (personality(pers | 0x40000) != -1) {
+	   execve(argv[0], argv, envp);
+	 }
+	 /* Either changing the personality or execve() failed. Either
+	  * way we might as well continue, and hope that the random
+	  * memory maps are ok this time around.
+	  */
+	 fprintf(stderr, "WARNING: Couldn't re-execute SBCL with the proper personality flags.  Trying to continue anyway.\n");
+       }
+    }     
+#endif   
 }
 
 
--- sbcl-0.9.4/src/runtime/osf1-os.c.ADDR_NO_RANDOMIZE	2005-07-14 10:41:20.000000000 -0500
+++ sbcl-0.9.4/src/runtime/osf1-os.c	2005-09-13 11:23:31.321884302 -0500
@@ -51,7 +51,8 @@
 
 
 
-void os_init(void)
+void
+os_init(char *argv[], char *envp[])
 {
     os_vm_page_size = getpagesize();
 }
--- sbcl-0.9.4/src/runtime/bsd-os.c.ADDR_NO_RANDOMIZE	2005-07-14 10:41:11.000000000 -0500
+++ sbcl-0.9.4/src/runtime/bsd-os.c	2005-09-13 11:23:31.322884261 -0500
@@ -51,7 +51,8 @@
 static void netbsd_init();
 #endif /* __NetBSD__ */
 
-void os_init(void)
+void
+os_init(char *argv[], char *envp[])
 {
     os_vm_page_size = getpagesize();
 
--- sbcl-0.9.4/src/runtime/runtime.c.ADDR_NO_RANDOMIZE	2005-09-13 11:23:31.315884548 -0500
+++ sbcl-0.9.4/src/runtime/runtime.c	2005-09-13 11:23:31.323884220 -0500
@@ -194,7 +194,7 @@
     /* KLUDGE: os_vm_page_size is set by os_init(), and on some
      * systems (e.g. Alpha) arch_init() needs need os_vm_page_size, so
      * it must follow os_init(). -- WHN 2000-01-26 */
-    os_init();
+    os_init(argv, envp);
     arch_init();
     gc_init();
     validate();
--- sbcl-0.9.4/src/runtime/sunos-os.c.ADDR_NO_RANDOMIZE	2005-08-19 07:15:16.000000000 -0500
+++ sbcl-0.9.4/src/runtime/sunos-os.c	2005-09-13 11:23:31.324884178 -0500
@@ -53,7 +53,8 @@
 int KLUDGE_MAYBE_MAP_ANON = 0x0;
 int kludge_mmap_fd = -1; /* default for MAP_ANON */
 
-void os_init(void)
+void
+os_init(char *argv[], char *envp[])
 {
     struct utsname name;
     int major_version;

sbcl-0.9.4-ADDR_NO_RANDOMIZE-proc.patch:

--- NEW FILE sbcl-0.9.4-ADDR_NO_RANDOMIZE-proc.patch ---
--- sbcl-0.9.4/src/runtime/os.h.ADDR_NO_RANDOMIZE	2005-07-14 10:41:20.000000000 -0500
+++ sbcl-0.9.4/src/runtime/os.h	2005-08-30 12:16:42.781282788 -0500
@@ -50,7 +50,7 @@
 
 /* Do anything we need to do when starting up the runtime environment
  * in this OS. */
-extern void os_init(void);
+extern void os_init(char *argv[], char *envp[]);
 
 /* Install any OS-dependent low-level signal handlers which are needed
  * by the runtime environment. E.g. the signals raised by a violation
--- sbcl-0.9.4/src/runtime/linux-os.c.ADDR_NO_RANDOMIZE	2005-08-12 14:08:19.000000000 -0500
+++ sbcl-0.9.4/src/runtime/linux-os.c	2005-08-30 12:17:31.208291595 -0500
@@ -44,6 +44,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include "validate.h"
 #include "thread.h"
@@ -92,7 +93,7 @@
 int linux_no_threads_p = 0;
 
 void
-os_init(void)
+os_init(char *argv[], char *envp[])
 {
     /* Conduct various version checks: do we have enough mmap(), is
      * this a sparc running 2.2, can we do threads? */
@@ -117,7 +118,7 @@
         FSHOW((stderr,"linux kernel %d.%d predates 2.4;\n enabling workarounds for SPARC kernel bugs in signal handling.\n", major_version,minor_version));
         linux_sparc_siginfo_bug = 1;
 #endif
-    }
+    }   
 #ifdef LISP_FEATURE_SB_THREAD
     futex_wait(futex,-1);
     if(errno==ENOSYS)  linux_no_threads_p = 1;
@@ -125,6 +126,36 @@
         fprintf(stderr,"Linux with NPTL support (e.g. kernel 2.6 or newer) required for \nthread-enabled SBCL.  Disabling thread support.\n\n");
 #endif
     os_vm_page_size = getpagesize();
+   
+    /* KLUDGE: Disable memory randomization on new Linux kernels
+     * by setting a personality flag and re-executing. (We need
+     * to re-execute, since the memory maps that can conflict with
+     * the SBCL spaces have already been done at this point).
+     */
+#if defined(LISP_FEATURE_X86)
+    if ((major_version == 2) && (minor_version >= 6) || (major_version >= 3)) {
+       long pers = personality(-1);
+       /* 0x40000 aka. ADDR_NO_RANDOMIZE */
+       if (!(pers & 0x40000)) {
+	 if (personality(pers | 0x40000) != -1) {
+	     /* Use /proc/self/exe instead of trying to figure out the
+	      * executable path from PATH and argv[0], since that's reliable.
+	      */
+	     char buf[PATH_MAX+1];
+	     int rc = readlink("/proc/self/exe", buf, PATH_MAX);
+             if ( rc > 0 ) {
+	       buf[rc]=0;
+	       execve(buf, argv, envp);
+	     }
+	  }
+	  /* Either changing the personality or execve() failed. Either
+	   * way we might as well continue, and hope that the random
+	   * memory maps are ok this time around.
+	   */
+	  fprintf(stderr, "WARNING: Couldn't re-execute SBCL with the proper personality flags (maybe /proc isn't mounted?). Trying to continue anyway.\n");
+       }
+    }     
+#endif   
 }
 
 
--- sbcl-0.9.4/src/runtime/osf1-os.c.ADDR_NO_RANDOMIZE	2005-07-14 10:41:20.000000000 -0500
+++ sbcl-0.9.4/src/runtime/osf1-os.c	2005-08-30 12:16:42.783282706 -0500
@@ -51,7 +51,8 @@
 
 
 
-void os_init(void)
+void
+os_init(char *argv[], char *envp[])
 {
     os_vm_page_size = getpagesize();
 }
--- sbcl-0.9.4/src/runtime/bsd-os.c.ADDR_NO_RANDOMIZE	2005-07-14 10:41:11.000000000 -0500
+++ sbcl-0.9.4/src/runtime/bsd-os.c	2005-08-30 12:16:42.784282665 -0500
@@ -51,7 +51,8 @@
 static void netbsd_init();
 #endif /* __NetBSD__ */
 
-void os_init(void)
+void
+os_init(char *argv[], char *envp[])
 {
     os_vm_page_size = getpagesize();
 
--- sbcl-0.9.4/src/runtime/runtime.c.ADDR_NO_RANDOMIZE	2005-08-30 12:16:42.778282911 -0500
+++ sbcl-0.9.4/src/runtime/runtime.c	2005-08-30 12:16:42.785282623 -0500
@@ -194,7 +194,7 @@
     /* KLUDGE: os_vm_page_size is set by os_init(), and on some
      * systems (e.g. Alpha) arch_init() needs need os_vm_page_size, so
      * it must follow os_init(). -- WHN 2000-01-26 */
-    os_init();
+    os_init(argv, envp);
     arch_init();
     gc_init();
     validate();
--- sbcl-0.9.4/src/runtime/sunos-os.c.ADDR_NO_RANDOMIZE	2005-08-19 07:15:16.000000000 -0500
+++ sbcl-0.9.4/src/runtime/sunos-os.c	2005-08-30 12:16:42.786282582 -0500
@@ -53,7 +53,8 @@
 int KLUDGE_MAYBE_MAP_ANON = 0x0;
 int kludge_mmap_fd = -1; /* default for MAP_ANON */
 
-void os_init(void)
+void
+os_init(char *argv[], char *envp[])
 {
     struct utsname name;
     int major_version;


--- NEW FILE sbcl.sysconfig ---
# /etc/sysconfig/sbcl

SBCL_HOME=/usr/lib/sbcl

sbcl-0.9.4-LIB_DIR.patch:

Index: sbcl-0.9.4-LIB_DIR.patch
===================================================================
RCS file: /cvs/extras/rpms/sbcl/devel/sbcl-0.9.4-LIB_DIR.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sbcl-0.9.4-LIB_DIR.patch	12 Sep 2005 19:18:17 -0000	1.1
+++ sbcl-0.9.4-LIB_DIR.patch	13 Sep 2005 16:50:44 -0000	1.2
@@ -4,7 +4,7 @@
  MAN_DIR=${MAN_DIR-$INSTALL_ROOT/share/man}
  INFO_DIR=${INFO_DIR-$INSTALL_ROOT/share/info}
  DOC_DIR=${DOC_DIR-$INSTALL_ROOT/share/doc/sbcl}
-+LIB_DIR=${LIB_DIR-$INSTALL_ROOT/lib}}
++LIB_DIR=${LIB_DIR-$INSTALL_ROOT/lib}
  
  # Does the environment look sane?
  SBCL_SOURCE=`pwd`


Index: sbcl.sh
===================================================================
RCS file: /cvs/extras/rpms/sbcl/devel/sbcl.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sbcl.sh	12 Sep 2005 12:39:38 -0000	1.2
+++ sbcl.sh	13 Sep 2005 16:50:44 -0000	1.3
@@ -5,13 +5,4 @@
   source /etc/sysconfig/sbcl
 fi
 
-if [ -z "$SBCL_HOME" ] ; then
-SBCL_HOME=/usr/lib/sbcl
-export SBCL_HOME
-fi
-
-if [ -z "$SBCL_SETARCH" ] ; then
-SBCL_SETARCH="setarch i386 -R"
-fi
-
-exec ${SBCL_SETARCH} ${SBCL_HOME}/sbcl ${1+"$@"}
+exec ${SBCL_HOME}/sbcl ${1+"$@"}


Index: sbcl.spec
===================================================================
RCS file: /cvs/extras/rpms/sbcl/devel/sbcl.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sbcl.spec	12 Sep 2005 20:36:18 -0000	1.7
+++ sbcl.spec	13 Sep 2005 16:50:44 -0000	1.8
@@ -13,24 +13,31 @@
 %define setarch setarch %{_target_cpu}
 %endif
 
-#  Could test for setarch >= 1.7 instead
 %if "%{?fedora}" >= "4"
 %define setarch setarch %{_target_cpu} -R
 %endif
 
+%if "%{?rhel}" >= "4"
+BuildRequires:setarch
+Requires:setarch
+%define setarch setarch %{_target_cpu}
+%endif
+
 Name: 	 sbcl
 Summary: Steel Bank Common Lisp
 Version: 0.9.4
-Release: 10%{?dist}
+Release: 11%{?dist}
 
 License: BSD/MIT
 Group: 	 Development/Languages
 URL:	 http://sbcl.sourceforge.net/
 Source0:  http://dl.sourceforge.net/sourceforge/sbcl/sbcl-%{version}-source.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-ExclusiveArch: %{ix86}
 
+# App-wrapper
 Source1: sbcl.sh
+# /etc/sysconfig/sbcl
+Source2: sbcl.sysconfig
 
 %if "%{?sbcl_bootstrap}" == "%{nil}"
 # local Bootstrap binaries
@@ -51,7 +58,10 @@
 
 Patch1: sbcl-0.8.18-default-sbcl-home.patch
 # See http://sourceforge.net/mailarchive/message.php?msg_id=12787069
-Patch2: sbcl-0.9.4-ADDR_NO_RANDOMIZE.patch
+# use /proc/self/exe
+#Patch2: sbcl-0.9.4-ADDR_NO_RANDOMIZE-proc.patch
+# use argv[0]
+Patch2: sbcl-0.9.4-ADDR_NO_RANDOMIZE-argv0.patch
 Patch3: sbcl-0.9.4-optflags.patch
 Patch4: sbcl-0.9.4-LIB_DIR.patch
 
@@ -70,12 +80,12 @@
 
 
 %prep
-%setup %{?sbcl_bootstrap_src} 
+%setup -q %{?sbcl_bootstrap_src} 
 
 #sed -i -e "s|/usr/local/lib/sbcl/|%{_libdir}/sbcl/|" src/runtime/runtime.c
 #or patch to use SBCL_HOME env var
 %patch1 -p0 -b .default-sbcl-home
-%patch2 -p1 -b .ADDR_NO_RANDOMIZE
+%{?setarch:%patch2 -p1 -b .ADDR_NO_RANDOMIZE}
 %patch3 -p1 -b .optflags
 %patch4 -p1 -b .LIB_DIR
 
@@ -120,11 +130,11 @@
 
 
 %check || :
-#if "%{?_with_check:1}" == "1"
 pushd tests 
-%{?setarch} sh ./run-tests.sh 
+# still need setarch if using ADDR_NO_RANDOMIZE-proc patch, since /proc isn't available on buildsystem/mock.
+#{?setarch} sh ./run-tests.sh 
+sh ./run-tests.sh
 popd
-#endif
 
 
 %install
@@ -134,15 +144,15 @@
 unset SBCL_HOME ||:
 export INSTALL_ROOT=$RPM_BUILD_ROOT%{_prefix}
 export LIB_DIR=$RPM_BUILD_ROOT%{_libdir}
-%{?setarch} sh ./install.sh
+# (may) still need setarch if using ADDR_NO_RANDOMIZE-proc patch
+sh ./install.sh
 
-# app-wrapper for using setarch
+# app-wrapper 
 %if 0
-%if "%{?setarch}" != "%{nil}"
 mv $RPM_BUILD_ROOT%{_bindir}/sbcl $RPM_BUILD_ROOT%{_libdir}/sbcl/sbcl
-install -p -m755 %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/sbcl
-sed -i -e "s|^SBCL_SETARCH=.*|SBCL_SETARCH=\"%{setarch}\"|" $RPM_BUILD_ROOT%{_bindir}/sbcl
-%endif
+install -p -m755 -D %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/sbcl
+install -p -m644 -D %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/sbcl
+#{?setarch:echo "SBCL_SETARCH=\"%{setarch}\"|" >> $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/sbcl 
 %endif
 
 ## Unpackaged files
@@ -181,7 +191,11 @@
 
 
 %changelog
-* Mon Sep 13 2005 Rex Dieter  0.9.4-10
+* Tue Sep 13 2005 Rex Dieter  0.9.4-11
+- fix botched NO_ADDR_RANDOMIZE patch
+- fix botched LIB_DIR patch
+
+* Mon Sep 12 2005 Rex Dieter  0.9.4-10
 - use/define LIB_DIR instead of hard-coded INSTALL_ROOT/lib
 - ExclusiveArch: %{ix86} (for now)
 


--- sbcl-0.9.4-ADDR_NO_RANDOMIZE.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Sep 13 16:54:35 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 13 Sep 2005 12:54:35 -0400
Subject: owners owners.list,1.200,1.201
Message-ID: <200509131654.j8DGsZJt011113@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11094

Modified Files:
	owners.list 
Log Message:



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.200
retrieving revision 1.201
diff -u -r1.200 -r1.201
--- owners.list	13 Sep 2005 16:23:45 -0000	1.200
+++ owners.list	13 Sep 2005 16:54:33 -0000	1.201
@@ -867,6 +867,7 @@
 Fedora Extras|rzip|A large-file compression program|i at stingr.net|extras-qa at fedoraproject.org|
 Fedora Extras|s3switch|Manage the output device on S3 Savage chips|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|sabayon|Tool to maintain user profiles in a GNOME desktop|markmc at redhat.com|extras-qa at fedoraproject.org|
+Fedora Extras|sbcl|Steel Bank Common Lisp|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|scalapack|A subset of LAPACK routines redesigned for distributed memory MIMD parallel computers|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|scanssh|Fast SSH server and open proxy scanner|oliver at linux-kernel.at|extras-qa at fedoraproject.org|
 Fedora Extras|scim|Smart Common Input Method|petersen at redhat.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Tue Sep 13 17:04:28 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 13 Sep 2005 13:04:28 -0400
Subject: rpms/sbcl/devel sbcl.spec,1.8,1.9
Message-ID: <200509131705.j8DH5G7D012589@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/sbcl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12569

Modified Files:
	sbcl.spec 
Log Message:
* Tue Sep 13 2005 Rex Dieter  0.9.4-12
- omit ppc (for now, broken buildsystem)



Index: sbcl.spec
===================================================================
RCS file: /cvs/extras/rpms/sbcl/devel/sbcl.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sbcl.spec	13 Sep 2005 16:50:44 -0000	1.8
+++ sbcl.spec	13 Sep 2005 17:04:26 -0000	1.9
@@ -26,13 +26,14 @@
 Name: 	 sbcl
 Summary: Steel Bank Common Lisp
 Version: 0.9.4
-Release: 11%{?dist}
+Release: 12%{?dist}
 
 License: BSD/MIT
 Group: 	 Development/Languages
 URL:	 http://sbcl.sourceforge.net/
 Source0:  http://dl.sourceforge.net/sourceforge/sbcl/sbcl-%{version}-source.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+ExclusiveArch: %{ix86} x86_64
 
 # App-wrapper
 Source1: sbcl.sh
@@ -191,6 +192,9 @@
 
 
 %changelog
+* Tue Sep 13 2005 Rex Dieter  0.9.4-12
+- omit ppc (for now, broken buildsystem)
+
 * Tue Sep 13 2005 Rex Dieter  0.9.4-11
 - fix botched NO_ADDR_RANDOMIZE patch
 - fix botched LIB_DIR patch



From fedora-extras-commits at redhat.com  Tue Sep 13 18:27:04 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Tue, 13 Sep 2005 14:27:04 -0400
Subject: rpms/perl-SNMP_Session - New directory
Message-ID: <200509131827.j8DIR4eD014702@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-SNMP_Session
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14682/perl-SNMP_Session

Log Message:
Directory /cvs/extras/rpms/perl-SNMP_Session added to the repository




From fedora-extras-commits at redhat.com  Tue Sep 13 18:27:04 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Tue, 13 Sep 2005 14:27:04 -0400
Subject: rpms/perl-SNMP_Session/devel - New directory
Message-ID: <200509131827.j8DIR4QX014707@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-SNMP_Session/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14682/perl-SNMP_Session/devel

Log Message:
Directory /cvs/extras/rpms/perl-SNMP_Session/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Sep 13 18:27:26 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Tue, 13 Sep 2005 14:27:26 -0400
Subject: rpms/perl-SNMP_Session Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200509131827.j8DIRQ6w014766@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-SNMP_Session
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14727

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-SNMP_Session


--- NEW FILE Makefile ---
# Top level Makefile for module perl-SNMP_Session
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Tue Sep 13 18:27:26 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Tue, 13 Sep 2005 14:27:26 -0400
Subject: rpms/perl-SNMP_Session/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200509131827.j8DIRQbC014771@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-SNMP_Session/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14727/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-SNMP_Session


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Tue Sep 13 18:28:01 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Tue, 13 Sep 2005 14:28:01 -0400
Subject: rpms/perl-SNMP_Session import.log,1.1,1.2
Message-ID: <200509131828.j8DIS1u6014834@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-SNMP_Session
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14799

Modified Files:
	import.log 
Log Message:
auto-import perl-SNMP_Session-1.07-1 on branch devel from perl-SNMP_Session-1.07-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-SNMP_Session/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	13 Sep 2005 18:27:24 -0000	1.1
+++ import.log	13 Sep 2005 18:27:58 -0000	1.2
@@ -0,0 +1 @@
+perl-SNMP_Session-1_07-1:HEAD:perl-SNMP_Session-1.07-1.src.rpm:1126636070



From fedora-extras-commits at redhat.com  Tue Sep 13 18:28:01 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Tue, 13 Sep 2005 14:28:01 -0400
Subject: rpms/perl-SNMP_Session/devel perl-SNMP_Session.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200509131828.j8DIS1O8014841@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-SNMP_Session/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14799/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-SNMP_Session.spec 
Log Message:
auto-import perl-SNMP_Session-1.07-1 on branch devel from perl-SNMP_Session-1.07-1.src.rpm


--- NEW FILE perl-SNMP_Session.spec ---
Name:           perl-SNMP_Session
Version:        1.07
Release:        1%{?dist}
Summary:        SNMP support for Perl 5

Group:          Development/Libraries
License:        Artistic
URL:            http://www.switch.ch/misc/leinen/snmp/perl/
Source0:        http://www.switch.ch/misc/leinen/snmp/perl/dist/SNMP_Session-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  perl
Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
Pure Perl SNMP v1 and SNMP v2 support for Perl 5.

The SNMP operations currently supported are "get", "get-next", "get-bulk"
and "set", as well as trap generation and reception. 


%prep
%setup -q -n SNMP_Session-%{version}
%{__perl} -pi -e 's{^#!/usr/local/bin/perl\b}{#!%{__perl}}' test/*
chmod 644 test/*


%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'
find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';'
chmod -R u+w $RPM_BUILD_ROOT/*


%check
make test


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc Artistic README README.SNMP_util index.html test/
%{perl_vendorlib}/*


%changelog
* Wed Aug 10 2005 Jose Pedro Oliveira  - 1.07-1
- Update to Fedora Extras template.

* Wed Nov 24 2004 Jose Pedro Oliveira  - 0:1.07-0.fdr.1
- Update to 1.07.

* Sun Oct  3 2004 Jose Pedro Oliveira  - 0:1.06-0.fdr.1
- Update to 1.06.

* Wed Aug 25 2004 Jose Pedro Oliveira  - 0:1.05-0.fdr.2
- The homepage changed placed in 2004-08-23.
- The author repackaged the files using the same tar.gz version (1.05).

* Wed Jul 21 2004 Jose Pedro Oliveira  - 0:1.05-0.fdr.1
- Update to 1.05.

* Tue May 18 2004 Jose Pedro Oliveira  - 0:1.03-0.fdr.1
- First build.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-SNMP_Session/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	13 Sep 2005 18:27:24 -0000	1.1
+++ .cvsignore	13 Sep 2005 18:27:59 -0000	1.2
@@ -0,0 +1 @@
+SNMP_Session-1.07.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-SNMP_Session/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	13 Sep 2005 18:27:24 -0000	1.1
+++ sources	13 Sep 2005 18:27:59 -0000	1.2
@@ -0,0 +1 @@
+496725e254c98cf1863703c4184f783e  SNMP_Session-1.07.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep 13 18:32:08 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Tue, 13 Sep 2005 14:32:08 -0400
Subject: rpms/perl-SNMP_Session/devel perl-SNMP_Session.spec,1.1,1.2
Message-ID: <200509131832.j8DIW8TF014920@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-SNMP_Session/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14901

Modified Files:
	perl-SNMP_Session.spec 
Log Message:
Removed superfluous perl BR.


Index: perl-SNMP_Session.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-SNMP_Session/devel/perl-SNMP_Session.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-SNMP_Session.spec	13 Sep 2005 18:27:59 -0000	1.1
+++ perl-SNMP_Session.spec	13 Sep 2005 18:32:06 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-SNMP_Session
 Version:        1.07
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        SNMP support for Perl 5
 
 Group:          Development/Libraries
@@ -10,7 +10,6 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
-BuildRequires:  perl
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
@@ -54,6 +53,9 @@
 
 
 %changelog
+* Tue Sep 13 2005 Jose Pedro Oliveira  - 1.07-2
+- Removed superfluous perl BR.
+
 * Wed Aug 10 2005 Jose Pedro Oliveira  - 1.07-1
 - Update to Fedora Extras template.
 



From fedora-extras-commits at redhat.com  Tue Sep 13 18:39:00 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Tue, 13 Sep 2005 14:39:00 -0400
Subject: owners owners.list,1.201,1.202
Message-ID: <200509131839.j8DId0ST015017@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14998

Modified Files:
	owners.list 
Log Message:
New package: perl-SNMP_Session


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.201
retrieving revision 1.202
diff -u -r1.201 -r1.202
--- owners.list	13 Sep 2005 16:54:33 -0000	1.201
+++ owners.list	13 Sep 2005 18:38:58 -0000	1.202
@@ -707,6 +707,7 @@
 Fedora Extras|perl-Razor-Agent|Use a Razor catalogue server to filter spam messages|wtogami at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Regexp-Common|Regexp::Common Perl module|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Set-IntSpan|Perl module for managing sets of integers|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-SNMP_Session|SNMP support for Perl 5|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-SOAP-Lite|Provides the Simple Object Access Protocol (SOAP)|thm at duke.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Sort-Versions|Perl module for sorting of revision-like numbers|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Spreadsheet-WriteExcel|Write formatted text and numbers to a cross-platform Excel binary file|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Tue Sep 13 18:43:03 2005
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Tue, 13 Sep 2005 14:43:03 -0400
Subject: extras-buildsys ChangeLog,1.121,1.122
Message-ID: <200509131843.j8DIh3hO015070@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15037

Modified Files:
	ChangeLog 
Log Message:
2005-09-13  Dan Williams  

    * builder/builder.py
        - Try to tighten up child process handling to not
            leave defunct mock processes around




Index: ChangeLog
===================================================================
RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -r1.121 -r1.122
--- ChangeLog	11 Sep 2005 03:33:58 -0000	1.121
+++ ChangeLog	13 Sep 2005 18:43:00 -0000	1.122
@@ -1,3 +1,9 @@
+2005-09-13  Dan Williams  
+
+    * builder/builder.py
+        - Try to tighten up child process handling to not
+            leave defunct mock processes around
+
 2005-09-10  Dan Williams  
 
     * utils/distro-rebuild.py



From fedora-extras-commits at redhat.com  Tue Sep 13 18:43:03 2005
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Tue, 13 Sep 2005 14:43:03 -0400
Subject: extras-buildsys/builder builder.py,1.41,1.42
Message-ID: <200509131843.j8DIh3c9015076@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys/builder
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15037/builder

Modified Files:
	builder.py 
Log Message:
2005-09-13  Dan Williams  

    * builder/builder.py
        - Try to tighten up child process handling to not
            leave defunct mock processes around




Index: builder.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/builder/builder.py,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- builder.py	1 Sep 2005 19:54:49 -0000	1.41
+++ builder.py	13 Sep 2005 18:43:01 -0000	1.42
@@ -82,6 +82,7 @@
         self.buildarch = buildarch
         self._starttime = time.time()
         self._endtime = 0
+        self._mockstarttime = 0
         self._uniqid = uniqid
         self._status = 'init'
         self._die = False
@@ -136,28 +137,34 @@
     def endtime(self):
         return self._endtime
 
-    def die(self, sig=15):
+    def die(self):
         if self.is_done_status() or self._done_status == 'killed':
             return True
         self._die = True
         return True
 
     def _handle_death(self):
-        self._log("Killing build process...\n")
         self._die = False
+        self._done_status = 'killed'
+        self._log("Killing build process...\n")
+
         # Don't try to kill a running cleanup process
         if self._status != 'cleanup' and self._childpid:
             try:
-                os.kill(self._childpid, 15)
+                os.kill(self._childpid, 9)
             except OSError, e:
                 self._log("Couldn't kill process %d: %s\n" % (self._childpid, e))
-
-        self._log("Killed.\n");
-        self._done_status = 'killed'
-
-        # Don't start cleanup over top of an existing cleanup process
-        if self._status != 'cleanup':
+            else:
+                # Ensure child process is reaped
+                self._log("Waiting for mock process %d to exit...\n" % self._childpid)
+                try:
+                    (pid, status) = os.waitpid(self._childpid, 0)
+                except OSError, e:
+                    pass
+                self._log("Mock process %d exited.\n" % self._childpid)
+            self._childpid = 0
             self._start_cleanup()
+        self._log("Killed.\n");
 
     def _log(self, string):
         if string and self._log_fd:
@@ -169,14 +176,6 @@
                 sys.stdout.write(s + string)
                 sys.stdout.flush()
 
-    def _start_srpm_download(self):
-        self._status = 'downloading'
-        self._log("Starting download of %s.\n" % self._srpm_url)
-        target_dir = os.path.dirname(self._srpm_path)
-        dl_thread = FileDownloader.FileDownloader(self.dl_callback, self._srpm_url, self._srpm_url,
-                        target_dir, ['.src.rpm'], certs)
-        dl_thread.start()
-
     def dl_callback(self, dl_status, cb_data):
         url = cb_data
         if dl_status == 'done':
@@ -230,45 +229,9 @@
 
         self._mock_log = os.path.join(self._result_dir, "mock-output.log")
         self._childpid = ExecUtils.exec_with_redirect(cmd, args, None, self._mock_log, self._mock_log)
+        self._mockstarttime = time.time()
         self._status = 'prepping'
 
-        # Poll a bit to wait for mock to write out the status file if
-        # its not there yet.
-        start_time = time.time()
-        mockstatusfile = os.path.join(self._state_dir, 'status')
-        while not os.path.exists(mockstatusfile):
-            try:
-                time.sleep(0.5)
-            except KeyboardInterrupt:
-                pass
-
-            # if mock exited with an error report that error and not
-            # the missing status file.
-            (aux_pid, status) = os.waitpid(self._childpid, os.WNOHANG)
-            status = os.WEXITSTATUS(status)
-            if aux_pid:
-                # If mock exits anywhere here, something is wrong no matter
-                # what it's exit status
-                self._childpid = 0
-                self._copy_mock_output_to_log()
-                self._status = 'failed'
-                break
-
-            # Kill mock after 15s if it didn't dump the status file
-            if time.time() - start_time > 15:
-                self._copy_mock_output_to_log()
-                self._log("Timed out waiting for the mock status file!  %s\n" % mockstatusfile)
-                try:
-                    self._log("Killing mock...\n")
-                    os.kill(self._childpid, 15)
-                except OSError, e:
-                    self._log("Couldn't kill mock process %d: %s\n" % (self._childpid, e))
-                else:
-                    self._log("Killed.\n")
-
-                self._status = 'failed'
-                break
-
     def _start_cleanup(self):
         self._log("Cleaning up the buildroot...\n")
 
@@ -288,7 +251,6 @@
 
         self._log("   %s\n" % string.join(args))
         self._childpid = ExecUtils.exec_with_redirect(cmd, args, None, None, None)
-
         self._status = 'cleanup'
 
     def _mock_is_prepping(self):
@@ -377,8 +339,7 @@
         if self._status == 'done':
             self._log("Job completed successfully.\n")
         elif self._status == 'failed':
-            if self._childpid:
-                self._log("Job failed due to mock errors!  Please see output in root.log and build.log\n")
+            self._log("Job failed due to mock errors!  Please see output in root.log and build.log\n")
         elif self._status == 'killed':
             self._log("Job failed because it was killed.\n")
 
@@ -387,7 +348,12 @@
             self._log_fd = None
 
     def _status_init(self):
-        self._start_srpm_download()
+        self._log("Starting download of %s.\n" % self._srpm_url)
+        self._status = 'downloading'
+        target_dir = os.path.dirname(self._srpm_path)
+        dl_thread = FileDownloader.FileDownloader(self.dl_callback, self._srpm_url, self._srpm_url,
+                        target_dir, ['.src.rpm'], certs)
+        dl_thread.start()
 
     def _status_downloading(self):
         pass
@@ -403,27 +369,44 @@
                 self._log("Waiting for repository to unlock before starting the build...\n")
                 self._repo_locked_msg = True
 
-    def _status_prepping(self):
-        if not self._mock_config and self._mock_is_prepping():
-            self._mock_config = self._read_mock_config()
-        if not self._mock_using_repo():
-            self._status = 'building'
-
-    def _status_building(self):
+    def _watch_mock(self, good_exit, bad_exit):
         (aux_pid, status) = os.waitpid(self._childpid, os.WNOHANG)
         status = os.WEXITSTATUS(status)
         if aux_pid:
             self._childpid = 0
             if status == 0:
-                self._done_status = 'done'
+                self._done_status = good_exit
             elif status > 0:
-                self._done_status = 'failed'
+                self._done_status = bad_exit
 
+            self._copy_mock_output_to_log()
             self._start_cleanup()
 
+    def _status_prepping(self):
+        self._watch_mock('failed', 'failed')
+
+        # We need to make sure that mock has dumped the status file withing a certain
+        # amount of time, otherwise we can't tell what it's doing
+        mockstatusfile = os.path.join(self._state_dir, 'status')
+        if not os.path.exists(mockstatusfile):
+            # something is wrong if mock takes more than 15s to write the status file
+            if time.time() > self._mockstarttime + 15:
+                self._mockstarttime = 0
+                self._log("Timed out waiting for the mock status file!  %s\n" % mockstatusfile)
+                self.die()
+        else:
+            if not self._mock_config and self._mock_is_prepping():
+                self._mock_config = self._read_mock_config()
+            if not self._mock_using_repo():
+                self._status = 'building'
+
+    def _status_building(self):
+        self._watch_mock('done', 'failed')
+
     def _status_cleanup(self):
         (aux_pid, status) = os.waitpid(self._childpid, os.WNOHANG)
         if aux_pid:
+            self._childpid = 0
             # Mock exited
             self._status = self._done_status
             if self._mock_config:
@@ -461,6 +444,8 @@
             time.sleep(3)
 
         self._endtime = time.time()
+        if self._childpid:
+            self._log("ERROR: childpid was !NULL  (%d)" % self._childpid)
         self._controller.notify_job_done(self)
 
     def _find_files(self):
@@ -790,8 +775,6 @@
 
 
 if __name__ == '__main__':
-#    state={'opts': True, 'host': None, 'archs': [],
-#      'daemon': False, 'pidfile': None, 'logfile': None}
 
     usage = "Usage: %s  [-p ] [-l ] [-d] -c " % sys.argv[0]
     parser = OptionParser(usage=usage)



From fedora-extras-commits at redhat.com  Tue Sep 13 19:03:06 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 13 Sep 2005 15:03:06 -0400
Subject: rpms/sbcl/devel sbcl.spec,1.9,1.10
Message-ID: <200509131903.j8DJ3cP4016571@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/sbcl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16552

Modified Files:
	sbcl.spec 
Log Message:
* Tue Sep 13 2005 Rex Dieter  0.9.4-13
- don't enable sb-thread



Index: sbcl.spec
===================================================================
RCS file: /cvs/extras/rpms/sbcl/devel/sbcl.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sbcl.spec	13 Sep 2005 17:04:26 -0000	1.9
+++ sbcl.spec	13 Sep 2005 19:03:04 -0000	1.10
@@ -26,7 +26,7 @@
 Name: 	 sbcl
 Summary: Steel Bank Common Lisp
 Version: 0.9.4
-Release: 12%{?dist}
+Release: 13%{?dist}
 
 License: BSD/MIT
 Group: 	 Development/Languages
@@ -97,7 +97,7 @@
 #define kernel_ver %(uname -r | cut -d- -f1 | cut -d. -f-2 )
 #if "%{?kernel_ver}" >= "2.6"
 %ifarch %{ix86} x86_64
-sed -i -e "s|; :sb-thread|:sb-thread|" base-target-features.lisp-expr
+#sed -i -e "s|; :sb-thread|:sb-thread|" base-target-features.lisp-expr
 %endif
 #endif
 
@@ -192,6 +192,9 @@
 
 
 %changelog
+* Tue Sep 13 2005 Rex Dieter  0.9.4-13
+- don't enable sb-thread
+
 * Tue Sep 13 2005 Rex Dieter  0.9.4-12
 - omit ppc (for now, broken buildsystem)
 



From fedora-extras-commits at redhat.com  Tue Sep 13 20:46:34 2005
From: fedora-extras-commits at redhat.com (Robert Theisen (trobert))
Date: Tue, 13 Sep 2005 16:46:34 -0400
Subject: web/html/download mirrors.php,1.27,1.28
Message-ID: <200509132047.j8DKl4ac018301@cvs-int.fedora.redhat.com>

Author: trobert

Update of /cvs/fedora/web/html/download
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18282

Modified Files:
	mirrors.php 
Log Message:
Added new site ftp://ftp.fu-berlin.de/linux/fedora/core/



Index: mirrors.php
===================================================================
RCS file: /cvs/fedora/web/html/download/mirrors.php,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- mirrors.php	13 Sep 2005 15:27:26 -0000	1.27
+++ mirrors.php	13 Sep 2005 20:46:32 -0000	1.28
@@ -273,6 +273,7 @@
 	    
    12. http://ftp.uni-koeln.de/mirrors/fedora/linux/core/
      13. 
 	    
    13. ftp://ftp.uni-koeln.de/mirrors/fedora/linux/core/
      14. 
 	    
    14. http://download.atrpms.net/mirrors/fedoracore/
      15. 
+	    
    15. ftp://ftp.fu-berlin.de/linux/fedora/core/
      16. 
 	
 	
 	
    16. Greece



From fedora-extras-commits at redhat.com  Tue Sep 13 22:56:18 2005
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Tue, 13 Sep 2005 18:56:18 -0400
Subject: rpms/perl-Apache-Session/FC-3 perl-Apache-Session.spec, 1.1,
	1.2 Apache-Session-mp2.patch, 1.1, NONE
Message-ID: <200509132256.j8DMuIir023840@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Apache-Session/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23821

Modified Files:
	perl-Apache-Session.spec 
Removed Files:
	Apache-Session-mp2.patch 
Log Message:
Backport to FC3.


Index: perl-Apache-Session.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Apache-Session/FC-3/perl-Apache-Session.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Apache-Session.spec	13 Sep 2005 16:18:43 -0000	1.1
+++ perl-Apache-Session.spec	13 Sep 2005 22:56:15 -0000	1.2
@@ -1,13 +1,11 @@
 Name:           perl-Apache-Session
 Version:        1.6
-Release:        2%{?dist}
+Release:        1
 Summary:        Apache::Session Perl module
 License:        Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/Apache-Session/
 Source0:        http://www.cpan.org/modules/by-module/Apache/Apache-Session-1.6.tar.gz
-# https://bugzilla.redhat.com/bugzilla/attachment.cgi?id=118577, from Chris Grau
-Patch0:         Apache-Session-mp2.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  perl(DBI)
@@ -21,7 +19,6 @@
 
 %prep
 %setup -q -n Apache-Session-%{version}
-%patch0 -p0
 
 %build
 %{__perl} Makefile.PL INSTALLDIRS=vendor
@@ -52,9 +49,5 @@
 %{_mandir}/man3/Apache*
 
 %changelog
-* Thu Sep 08 2005 Steven Pritchard  1.6-2
-- Add patch for mod_perl2 compatibility from Chris Grau (#167753, comment #3).
-- Re-enable "make test".
-
-* Wed Aug 31 2005 Steven Pritchard  1.6-1
-- Specfile autogenerated.
+* Tue Sep 13 2005 Steven Pritchard  1.6-1
+- Backport to FC3.


--- Apache-Session-mp2.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Sep 14 18:34:00 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Wed, 14 Sep 2005 14:34:00 -0400
Subject: owners owners.list,1.206,1.207
Message-ID: <200509141834.j8EIY0It023501@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23482

Modified Files:
	owners.list 
Log Message:

perl-Class-DBI-Loader and perl-Class-DBI-Loader-Relationship



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.206
retrieving revision 1.207
diff -u -r1.206 -r1.207
--- owners.list	14 Sep 2005 12:48:42 -0000	1.206
+++ owners.list	14 Sep 2005 18:33:58 -0000	1.207
@@ -590,6 +590,8 @@
 Fedora Extras|perl-Class-DBI-AsForm|Produce HTML form elements for database columns|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Class-DBI-FromCGI|Update Class::DBI data using CGI::Untaint|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Class-DBI-mysql|Extensions to Class::DBI for MySQL|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Class-DBI-Loader|Dynamic definition of Class::DBI sub classes|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Class-DBI-Loader-Relationship|Easier relationship specification in CDBI::L|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Class-DBI-Pager|Pager utility for Class::DBI|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Class-DBI-Pg|Class::DBI extension for PostgreSQL|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Class-DBI-Plugin|Abstract base class for Class::DBI plugins|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Wed Sep 14 02:48:09 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Tue, 13 Sep 2005 22:48:09 -0400
Subject: owners owners.list,1.202,1.203
Message-ID: <200509140248.j8E2m9cH030228@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30209

Modified Files:
	owners.list 
Log Message:
Add perl-File-Remove


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.202
retrieving revision 1.203
diff -u -r1.202 -r1.203
--- owners.list	13 Sep 2005 18:38:58 -0000	1.202
+++ owners.list	14 Sep 2005 02:48:07 -0000	1.203
@@ -629,6 +629,7 @@
 Fedora Extras|perl-ExtUtils-XSBuilder| Modules that parse C header files and create XS glue code|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-File-BOM|Utilities for reading Byte Order Marks|mpeters at mac.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-File-Find-Rule|Perl module implementing an alternative interface to File::Find|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-File-Remove|Convenience module for removing files and directories|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-File-Slurp|Efficient Reading/Writing of Complete Files|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-File-Tail|Perl extension for reading from continously updated files|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Font-AFM|Perl interface to Adobe Font Metrics files|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Wed Sep 14 19:32:25 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Wed, 14 Sep 2005 15:32:25 -0400
Subject: rpms/lapack/FC-4 lapack.spec,1.2,1.3
Message-ID: <200509141932.j8EJWPlu025500@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/lapack/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25467/FC-4

Modified Files:
	lapack.spec 
Log Message:

typo.



Index: lapack.spec
===================================================================
RCS file: /cvs/extras/rpms/lapack/FC-4/lapack.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- lapack.spec	14 Sep 2005 19:31:04 -0000	1.2
+++ lapack.spec	14 Sep 2005 19:32:23 -0000	1.3
@@ -53,7 +53,7 @@
 Group: Development/Libraries
 Requires: blas = %{version}-%{release}
 
-%description blas-devel
+%description -n blas-devel
 BLAS development libraries for applications that link statically.
 
 %prep



From fedora-extras-commits at redhat.com  Wed Sep 14 19:31:07 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Wed, 14 Sep 2005 15:31:07 -0400
Subject: rpms/lapack/devel lapack.spec,1.1,1.2
Message-ID: <200509141931.j8EJVbHs025461@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/lapack/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25422/devel

Modified Files:
	lapack.spec 
Log Message:

make -devel packages for lapack/blas, special _pic static lib for ATLAS



Index: lapack.spec
===================================================================
RCS file: /cvs/extras/rpms/lapack/devel/lapack.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- lapack.spec	15 Apr 2005 02:04:38 -0000	1.1
+++ lapack.spec	14 Sep 2005 19:31:05 -0000	1.2
@@ -1,7 +1,7 @@
 Summary: The LAPACK libraries for numerical linear algebra.
 Name: lapack
 Version: 3.0
-Release: 29
+Release: 30%{?dist}
 License: Freely distributable
 Group: Development/Libraries
 URL: http://www.netlib.org/lapack/
@@ -30,6 +30,14 @@
 real and complex matrices in both single and double precision. LAPACK
 is coded in Fortran77 and built with gcc.
 
+%package devel
+Summary: LAPACK development libraries
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+
+%description devel
+LAPACK development libraries for applications that link statically.
+
 %package -n blas
 Summary: The BLAS (Basic Linear Algebra Subprograms) library.
 Group: Development/Libraries
@@ -40,6 +48,14 @@
 provides a number of basic algorithms for numerical algebra. Man
 pages for blas are available in the blas-man package.
 
+%package -n blas-devel
+Summary: LAPACK development libraries
+Group: Development/Libraries
+Requires: blas = %{version}-%{release}
+
+%description blas-devel
+BLAS development libraries for applications that link statically.
+
 %prep
 %setup -q -n LAPACK
 %setup -q -D -T -a 1 -n LAPACK
@@ -75,6 +91,11 @@
 FFLAGS="$RPM_OPT_SIZE_FLAGS -fPIC" make dlamch.o slamch.o dgeev.o
 FFLAGS="$RPM_OPT_FLAGS -fPIC" make shared
 cp liblapack.so.3.0.3 ..
+make clean
+FFLAGS="$RPM_OPT_SIZE_FLAGS -fPIC" make dlamch.o slamch.o dgeev.o
+FFLAGS="$RPM_OPT_FLAGS -fPIC" make static
+cp liblapack.a ../liblapack_pic.a
+
 cd ..
 cp %{SOURCE4} lapackqref.ps
 cp %{SOURCE5} blasqr.ps
@@ -120,14 +141,29 @@
 %files -f lapackmans
 %defattr(-,root,root)
 %doc README lapackqref.ps
-%{_libdir}/liblapack.*
+%{_libdir}/liblapack.so.*
+
+%files devel
+%defattr(-,root,root,-)
+%{_libdir}/liblapack.so
+%{_libdir}/liblapack*.a
 
 %files -n blas -f blasmans
 %defattr(-,root,root)
 %doc blasqr.ps
-%{_libdir}/libblas.*
+%{_libdir}/libblas.so.*
+
+%files -n blas-devel
+%defattr(-,root,root,-)
+%{_libdir}/libblas.so
+%{_libdir}/libblas*.a
 
 %changelog
+* Wed Sep 14 2005 Tom "spot" Callaway  3.0-30
+- make -devel packages
+- make liblapack_pic.a package
+- use dist tag
+
 * Thu Apr 14 2005 Tom "spot" Callaway  3.0-29
 - package moves to Fedora Extras, gcc4
 



From fedora-extras-commits at redhat.com  Wed Sep 14 19:31:07 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Wed, 14 Sep 2005 15:31:07 -0400
Subject: rpms/lapack/FC-4 lapack.spec,1.1,1.2
Message-ID: <200509141931.j8EJVbnB025458@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/lapack/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25422/FC-4

Modified Files:
	lapack.spec 
Log Message:

make -devel packages for lapack/blas, special _pic static lib for ATLAS



Index: lapack.spec
===================================================================
RCS file: /cvs/extras/rpms/lapack/FC-4/lapack.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- lapack.spec	15 Apr 2005 02:04:38 -0000	1.1
+++ lapack.spec	14 Sep 2005 19:31:04 -0000	1.2
@@ -1,7 +1,7 @@
 Summary: The LAPACK libraries for numerical linear algebra.
 Name: lapack
 Version: 3.0
-Release: 29
+Release: 30%{?dist}
 License: Freely distributable
 Group: Development/Libraries
 URL: http://www.netlib.org/lapack/
@@ -30,6 +30,14 @@
 real and complex matrices in both single and double precision. LAPACK
 is coded in Fortran77 and built with gcc.
 
+%package devel
+Summary: LAPACK development libraries
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+
+%description devel
+LAPACK development libraries for applications that link statically.
+
 %package -n blas
 Summary: The BLAS (Basic Linear Algebra Subprograms) library.
 Group: Development/Libraries
@@ -40,6 +48,14 @@
 provides a number of basic algorithms for numerical algebra. Man
 pages for blas are available in the blas-man package.
 
+%package -n blas-devel
+Summary: LAPACK development libraries
+Group: Development/Libraries
+Requires: blas = %{version}-%{release}
+
+%description blas-devel
+BLAS development libraries for applications that link statically.
+
 %prep
 %setup -q -n LAPACK
 %setup -q -D -T -a 1 -n LAPACK
@@ -75,6 +91,11 @@
 FFLAGS="$RPM_OPT_SIZE_FLAGS -fPIC" make dlamch.o slamch.o dgeev.o
 FFLAGS="$RPM_OPT_FLAGS -fPIC" make shared
 cp liblapack.so.3.0.3 ..
+make clean
+FFLAGS="$RPM_OPT_SIZE_FLAGS -fPIC" make dlamch.o slamch.o dgeev.o
+FFLAGS="$RPM_OPT_FLAGS -fPIC" make static
+cp liblapack.a ../liblapack_pic.a
+
 cd ..
 cp %{SOURCE4} lapackqref.ps
 cp %{SOURCE5} blasqr.ps
@@ -120,14 +141,29 @@
 %files -f lapackmans
 %defattr(-,root,root)
 %doc README lapackqref.ps
-%{_libdir}/liblapack.*
+%{_libdir}/liblapack.so.*
+
+%files devel
+%defattr(-,root,root,-)
+%{_libdir}/liblapack.so
+%{_libdir}/liblapack*.a
 
 %files -n blas -f blasmans
 %defattr(-,root,root)
 %doc blasqr.ps
-%{_libdir}/libblas.*
+%{_libdir}/libblas.so.*
+
+%files -n blas-devel
+%defattr(-,root,root,-)
+%{_libdir}/libblas.so
+%{_libdir}/libblas*.a
 
 %changelog
+* Wed Sep 14 2005 Tom "spot" Callaway  3.0-30
+- make -devel packages
+- make liblapack_pic.a package
+- use dist tag
+
 * Thu Apr 14 2005 Tom "spot" Callaway  3.0-29
 - package moves to Fedora Extras, gcc4
 



From fedora-extras-commits at redhat.com  Wed Sep 14 19:32:26 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Wed, 14 Sep 2005 15:32:26 -0400
Subject: rpms/lapack/devel lapack.spec,1.2,1.3
Message-ID: <200509141932.j8EJWQBk025506@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/lapack/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25467/devel

Modified Files:
	lapack.spec 
Log Message:

typo.



Index: lapack.spec
===================================================================
RCS file: /cvs/extras/rpms/lapack/devel/lapack.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- lapack.spec	14 Sep 2005 19:31:05 -0000	1.2
+++ lapack.spec	14 Sep 2005 19:32:24 -0000	1.3
@@ -53,7 +53,7 @@
 Group: Development/Libraries
 Requires: blas = %{version}-%{release}
 
-%description blas-devel
+%description -n blas-devel
 BLAS development libraries for applications that link statically.
 
 %prep



From fedora-extras-commits at redhat.com  Wed Sep 14 18:49:11 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 14 Sep 2005 14:49:11 -0400
Subject: rpms/libol/devel libol.spec,1.10,1.11
Message-ID: <200509141849.j8EInf5K023982@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/libol/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23940/devel

Modified Files:
	libol.spec 
Log Message:
- Added the dist tag.
- Excluded the .la file.



Index: libol.spec
===================================================================
RCS file: /cvs/extras/rpms/libol/devel/libol.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- libol.spec	6 May 2005 23:59:30 -0000	1.10
+++ libol.spec	14 Sep 2005 18:49:09 -0000	1.11
@@ -6,13 +6,13 @@
 
 Name:           libol
 Version:        0.3.16
-Release:        1.fc4
+Release:        2%{?dist}
 Summary:        Support library for syslog-ng
 
 Group:          Development/Libraries
 License:        GPL
 Url:            http://www.balabit.com/products/syslog-ng/
-Source:         http://www.balabit.com/downloads/syslog-ng/libol/0.3/libol-0.3.16.tar.gz
+Source:         http://www.balabit.com/downloads/syslog-ng/libol/0.3/libol-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 %if %{with_scheme_preprocessor}
 BuildRequires:  scsh
@@ -65,16 +65,20 @@
 %endif
 %{_bindir}/libol-config
 %{_libdir}/libol.a
-%{_libdir}/libol.la
+%exclude %{_libdir}/libol.la
 %{_libdir}/libol.so
 %{_includedir}/libol
 
 
 %changelog
-* Tue May 03 2005 Jose Pedro Oliveira  - 0.3.16-1.fc4
+* Wed Sep 14 2005 Jose Pedro Oliveira  - 0.3.16-2
+- Added the dist tag.
+- Excluded the .la file.
+
+* Tue May 03 2005 Jose Pedro Oliveira  - 0.3.16-1
 - Update to 0.3.16.
 
-* Fri Apr  7 2005 Michael Schwendt 
+* Fri Apr  7 2005 Michael Schwendt  - 0.3.15-2
 - rebuilt
 
 * Tue Mar 01 2005 Ville Skytt??  - 0:0.3.15-2



From fedora-extras-commits at redhat.com  Wed Sep 14 18:25:37 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Wed, 14 Sep 2005 14:25:37 -0400
Subject: rpms/perl-Class-DBI-Loader/devel - New directory
Message-ID: <200509141825.j8EIPb2a022853@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Class-DBI-Loader/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22824/perl-Class-DBI-Loader/devel

Log Message:
Directory /cvs/extras/rpms/perl-Class-DBI-Loader/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Sep 14 18:21:22 2005
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Wed, 14 Sep 2005 14:21:22 -0400
Subject: extras-buildsys/server Config.py,1.6,1.7 PackageJob.py,1.30,1.31
Message-ID: <200509141821.j8EILqvm022771@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys/server
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22728/server

Modified Files:
	Config.py PackageJob.py 
Log Message:
2005-09-14  Dan Williams  

    * server/PackageJob.py
      server/Config.py
        - Rename "scratch" targets to "testing" targets to make their
            purpose clearer
        - Don't delete packages from the repodir if their target
            is a testing target




Index: Config.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/Config.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Config.py	9 Sep 2005 15:10:17 -0000	1.6
+++ Config.py	14 Sep 2005 18:21:20 -0000	1.7
@@ -202,7 +202,7 @@
         self.set_option("General", "distro", "fedora")
         self.set_option("General", "target", "development")
         self.set_option("General", "repo", "core")
-        self.set_option("General", "scratch", "no")
+        self.set_option("General", "testing", "no")
         self.set_option("General", "repo_script", "")
 
         self.add_section("Arches")


Index: PackageJob.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/PackageJob.py,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- PackageJob.py	14 Sep 2005 11:50:29 -0000	1.30
+++ PackageJob.py	14 Sep 2005 18:21:20 -0000	1.31
@@ -526,9 +526,9 @@
             msg = "%s\n-------------------------------------------------\n\n%s\n" % (msg, logtail)
             self.email_result(self.username, resultstring=msg, subject=subj)
 
-            # Only non-scratch targets kill remaining jobs and file the entire
+            # Only non-testing targets kill remaining jobs and file the entire
             # build when one archjob fails
-            if self._target_cfg.get_bool("General", "scratch") == False:
+            if self._target_cfg.get_bool("General", "testing") == False:
                 # Kill remaining jobs on other arches
                 self._kill_all_archjobs()
                 self._stage_failed(e.msg)
@@ -548,8 +548,8 @@
                     failed_jobs = failed_jobs + 1
 
                     # Normal jobs will just stop when a single archjob fails, but
-                    # scratch targets don't kill the build when one fails.  However,
-                    # even for scratch targets, we still want to notify the user if
+                    # testing targets don't kill the build when one fails.  However,
+                    # even for testing targets, we still want to notify the user if
                     # a particular arch fails.
                     if not job.failure_noticed():
                         job.set_failure_noticed()
@@ -566,8 +566,8 @@
         self._archjobs_lock.release()
 
         if completed_jobs == len(self.archjobs):
-            # Scratch targets don't contribute packages to the repo
-            if self._target_cfg.get_bool("General", "scratch") == True:
+            # Testing targets don't contribute packages to the repo
+            if self._target_cfg.get_bool("General", "testing") == True:
                 if failed_jobs > 0:
                     self._stage_failed("Job failed on one or more architectures.")
                 else:
@@ -592,6 +592,12 @@
         if not self.result_dir or not self.srpm_http_path:
             return
 
+        # If its a testing target, we keep the RPMs around since they don't
+        # get copied to the repository, they only live in the repodir
+        testing_target = self._target_cfg.get_bool("General", "testing")
+        if self.result == 'success' and testing_target == True:
+            return
+
         srpm_file = os.path.join(self.result_dir, os.path.basename(self.srpm_http_path))
 
         # Delete any RPMs in the arch dirs



From fedora-extras-commits at redhat.com  Wed Sep 14 18:29:51 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Wed, 14 Sep 2005 14:29:51 -0400
Subject: rpms/perl-Class-DBI-Loader-Relationship/devel - New directory
Message-ID: <200509141829.j8EITp66023307@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Class-DBI-Loader-Relationship/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23282/perl-Class-DBI-Loader-Relationship/devel

Log Message:
Directory /cvs/extras/rpms/perl-Class-DBI-Loader-Relationship/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Sep 14 18:30:10 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Wed, 14 Sep 2005 14:30:10 -0400
Subject: rpms/perl-Class-DBI-Loader-Relationship/devel .cvsignore, NONE,
	1.1 Makefile, NONE, 1.1 sources, NONE, 1.1
Message-ID: <200509141830.j8EIUADP023361@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Class-DBI-Loader-Relationship/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23327/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Class-DBI-Loader-Relationship


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Wed Sep 14 18:26:16 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Wed, 14 Sep 2005 14:26:16 -0400
Subject: rpms/perl-Class-DBI-Loader import.log,1.1,1.2
Message-ID: <200509141826.j8EIQG8h022993@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Class-DBI-Loader
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22958

Modified Files:
	import.log 
Log Message:
auto-import perl-Class-DBI-Loader-0.22-4 on branch devel from perl-Class-DBI-Loader-0.22-4.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-Loader/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	14 Sep 2005 18:25:48 -0000	1.1
+++ import.log	14 Sep 2005 18:26:14 -0000	1.2
@@ -0,0 +1 @@
+perl-Class-DBI-Loader-0_22-4:HEAD:perl-Class-DBI-Loader-0.22-4.src.rpm:1126722368



From fedora-extras-commits at redhat.com  Wed Sep 14 18:29:50 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Wed, 14 Sep 2005 14:29:50 -0400
Subject: rpms/perl-Class-DBI-Loader-Relationship - New directory
Message-ID: <200509141829.j8EIToNY023302@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Class-DBI-Loader-Relationship
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23282/perl-Class-DBI-Loader-Relationship

Log Message:
Directory /cvs/extras/rpms/perl-Class-DBI-Loader-Relationship added to the repository




From fedora-extras-commits at redhat.com  Wed Sep 14 18:25:36 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Wed, 14 Sep 2005 14:25:36 -0400
Subject: rpms/perl-Class-DBI-Loader - New directory
Message-ID: <200509141825.j8EIPav1022848@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Class-DBI-Loader
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22824/perl-Class-DBI-Loader

Log Message:
Directory /cvs/extras/rpms/perl-Class-DBI-Loader added to the repository




From fedora-extras-commits at redhat.com  Wed Sep 14 18:21:22 2005
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Wed, 14 Sep 2005 14:21:22 -0400
Subject: extras-buildsys ChangeLog,1.123,1.124
Message-ID: <200509141821.j8EILq4j022767@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22728

Modified Files:
	ChangeLog 
Log Message:
2005-09-14  Dan Williams  

    * server/PackageJob.py
      server/Config.py
        - Rename "scratch" targets to "testing" targets to make their
            purpose clearer
        - Don't delete packages from the repodir if their target
            is a testing target




Index: ChangeLog
===================================================================
RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -r1.123 -r1.124
--- ChangeLog	14 Sep 2005 16:53:29 -0000	1.123
+++ ChangeLog	14 Sep 2005 18:21:20 -0000	1.124
@@ -1,5 +1,14 @@
 2005-09-14  Dan Williams  
 
+    * server/PackageJob.py
+      server/Config.py
+        - Rename "scratch" targets to "testing" targets to make their
+            purpose clearer
+        - Don't delete packages from the repodir if their target
+            is a testing target
+
+2005-09-14  Dan Williams  
+
     * utils/distro-rebuild.py
         - Optionally add a changelog entry to rebuilt specfile
 



From fedora-extras-commits at redhat.com  Wed Sep 14 18:30:36 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Wed, 14 Sep 2005 14:30:36 -0400
Subject: rpms/perl-Class-DBI-Loader-Relationship import.log,1.1,1.2
Message-ID: <200509141831.j8EIV6Aw023434@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Class-DBI-Loader-Relationship
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23395

Modified Files:
	import.log 
Log Message:
auto-import perl-Class-DBI-Loader-Relationship-1.2-4 on branch devel from perl-Class-DBI-Loader-Relationship-1.2-4.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-Loader-Relationship/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	14 Sep 2005 18:30:07 -0000	1.1
+++ import.log	14 Sep 2005 18:30:34 -0000	1.2
@@ -0,0 +1 @@
+perl-Class-DBI-Loader-Relationship-1_2-4:HEAD:perl-Class-DBI-Loader-Relationship-1.2-4.src.rpm:1126722626



From fedora-extras-commits at redhat.com  Wed Sep 14 18:49:10 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 14 Sep 2005 14:49:10 -0400
Subject: rpms/libol/FC-4 libol.spec,1.10,1.11
Message-ID: <200509141849.j8EInfUr023979@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/libol/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23940/FC-4

Modified Files:
	libol.spec 
Log Message:
- Added the dist tag.
- Excluded the .la file.



Index: libol.spec
===================================================================
RCS file: /cvs/extras/rpms/libol/FC-4/libol.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- libol.spec	6 May 2005 23:59:30 -0000	1.10
+++ libol.spec	14 Sep 2005 18:49:08 -0000	1.11
@@ -6,13 +6,13 @@
 
 Name:           libol
 Version:        0.3.16
-Release:        1.fc4
+Release:        2%{?dist}
 Summary:        Support library for syslog-ng
 
 Group:          Development/Libraries
 License:        GPL
 Url:            http://www.balabit.com/products/syslog-ng/
-Source:         http://www.balabit.com/downloads/syslog-ng/libol/0.3/libol-0.3.16.tar.gz
+Source:         http://www.balabit.com/downloads/syslog-ng/libol/0.3/libol-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 %if %{with_scheme_preprocessor}
 BuildRequires:  scsh
@@ -65,16 +65,20 @@
 %endif
 %{_bindir}/libol-config
 %{_libdir}/libol.a
-%{_libdir}/libol.la
+%exclude %{_libdir}/libol.la
 %{_libdir}/libol.so
 %{_includedir}/libol
 
 
 %changelog
-* Tue May 03 2005 Jose Pedro Oliveira  - 0.3.16-1.fc4
+* Wed Sep 14 2005 Jose Pedro Oliveira  - 0.3.16-2
+- Added the dist tag.
+- Excluded the .la file.
+
+* Tue May 03 2005 Jose Pedro Oliveira  - 0.3.16-1
 - Update to 0.3.16.
 
-* Fri Apr  7 2005 Michael Schwendt 
+* Fri Apr  7 2005 Michael Schwendt  - 0.3.15-2
 - rebuilt
 
 * Tue Mar 01 2005 Ville Skytt??  - 0:0.3.15-2



From fedora-extras-commits at redhat.com  Wed Sep 14 18:30:36 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Wed, 14 Sep 2005 14:30:36 -0400
Subject: rpms/perl-Class-DBI-Loader-Relationship/devel
	perl-Class-DBI-Loader-Relationship.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200509141831.j8EIV7Jc023438@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Class-DBI-Loader-Relationship/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23395/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Class-DBI-Loader-Relationship.spec 
Log Message:
auto-import perl-Class-DBI-Loader-Relationship-1.2-4 on branch devel from perl-Class-DBI-Loader-Relationship-1.2-4.src.rpm


--- NEW FILE perl-Class-DBI-Loader-Relationship.spec ---
Name:           perl-Class-DBI-Loader-Relationship
Version:        1.2
Release:        4%{?dist}
Summary:        Easier relationship specification in CDBI::L
Group:          Development/Libraries
License:        Distributable
URL:            http://search.cpan.org/dist/Class-DBI-Loader-Relationship/
Source0:        http://search.cpan.org/CPAN/authors/id/S/SI/SIMON/Class-DBI-Loader-Relationship-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:	perl(Class::DBI::Loader), perl(Lingua::EN::Inflect::Number)
Requires:  perl(Class::DBI::Loader), perl(Lingua::EN::Inflect::Number)
Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
%{summary}.

%prep
%setup -q -n Class-DBI-Loader-Relationship-%{version}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'
find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';'
chmod -R u+w $RPM_BUILD_ROOT/*

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes
%{perl_vendorlib}/Class/DBI/Loader
%{_mandir}/man3/*.3*


%changelog
* Wed Sep 14 2005 Tom "spot" Callaway  1.2-4
- set license to Distributable

* Wed Sep  7 2005 Tom "spot" Callaway  1.2-3
- remove redundant BR: perl
- honor %%{_smp_mflags}
- include license text

* Fri Jul  8 2005 Tom "spot" Callaway  1.2-2
- cleanups

* Wed Jul  6 2005 Tom "spot" Callaway  1.2-1
- Initial package for Fedora Extras


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-Loader-Relationship/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	14 Sep 2005 18:30:08 -0000	1.1
+++ .cvsignore	14 Sep 2005 18:30:34 -0000	1.2
@@ -0,0 +1 @@
+Class-DBI-Loader-Relationship-1.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-Loader-Relationship/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	14 Sep 2005 18:30:08 -0000	1.1
+++ sources	14 Sep 2005 18:30:34 -0000	1.2
@@ -0,0 +1 @@
+d5a3262146ee4c63a46a5c87205c5619  Class-DBI-Loader-Relationship-1.2.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep 14 17:55:23 2005
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Wed, 14 Sep 2005 13:55:23 -0400
Subject: rpms/python-myghty/devel python-myghty.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200509141755.j8EHtrUq021256@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/extras/rpms/python-myghty/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21214/devel

Modified Files:
	.cvsignore sources 
Added Files:
	python-myghty.spec 
Log Message:
auto-import python-myghty-0.98c-1 on branch devel from python-myghty-0.98c-1.src.rpm


--- NEW FILE python-myghty.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name:           python-myghty
Version:        0.98c
Release:        1
Summary:        A Python-based templating system derived from HTML::Mason

Group:          Development/Libraries
License:        LGPL
URL:            http://www.myghty.org
Source0:        http://dl.sf.net/Myghty/Myghty-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

BuildRequires:  python

%description
Myghty is a Python based web and templating framework originally based on
HTML::Mason, the enterprise-level framework used by Amazon.com, del.icio.us
and Salon.com, among many others. Myghty fully implements Mason's templating
language, component-based architecture, and caching system, and goes beyond,
adding new paradigms such the Module Components controller paradigm, full
Python whitespace syntax, threading support, WSGI support, session support,
and much more.

%prep
%setup -q -n Myghty-%{version}


%build
%{__python} setup.py build


%install
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
(cd doc ; %{__python} genhtml.py)
find ./doc ./examples -type f -perm +001 | xargs chmod -x


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc doc/html/* examples LICENSE
%{python_sitelib}/*


%changelog
* Mon Sep 12 2005 Luke Macken  0.98c-1
- Bump to version 0.98c

* Tue Aug 16 2005 Luke Macken  0.98a-1
- Packaged for Fedora Extras


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-myghty/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	14 Sep 2005 17:33:35 -0000	1.1
+++ .cvsignore	14 Sep 2005 17:55:21 -0000	1.2
@@ -0,0 +1 @@
+Myghty-0.98c.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-myghty/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	14 Sep 2005 17:33:35 -0000	1.1
+++ sources	14 Sep 2005 17:55:21 -0000	1.2
@@ -0,0 +1 @@
+73d5ee5302ffb610059928c8353f2201  Myghty-0.98c.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep 14 18:25:51 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Wed, 14 Sep 2005 14:25:51 -0400
Subject: rpms/perl-Class-DBI-Loader/devel .cvsignore, NONE, 1.1 Makefile,
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <200509141825.j8EIPpm7022906@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Class-DBI-Loader/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22872/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Class-DBI-Loader


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Wed Sep 14 18:25:50 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Wed, 14 Sep 2005 14:25:50 -0400
Subject: rpms/perl-Class-DBI-Loader Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200509141825.j8EIPoG8022901@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Class-DBI-Loader
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22872

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-Class-DBI-Loader


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Class-DBI-Loader
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Wed Sep 14 18:30:09 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Wed, 14 Sep 2005 14:30:09 -0400
Subject: rpms/perl-Class-DBI-Loader-Relationship Makefile, NONE,
	1.1 import.log, NONE, 1.1
Message-ID: <200509141830.j8EIU9qH023356@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Class-DBI-Loader-Relationship
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23327

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-Class-DBI-Loader-Relationship


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Class-DBI-Loader-Relationship
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Wed Sep 14 17:55:23 2005
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Wed, 14 Sep 2005 13:55:23 -0400
Subject: rpms/python-myghty import.log,1.1,1.2
Message-ID: <200509141755.j8EHtrOl021252@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/extras/rpms/python-myghty
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21214

Modified Files:
	import.log 
Log Message:
auto-import python-myghty-0.98c-1 on branch devel from python-myghty-0.98c-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/python-myghty/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	14 Sep 2005 17:33:35 -0000	1.1
+++ import.log	14 Sep 2005 17:55:20 -0000	1.2
@@ -0,0 +1 @@
+python-myghty-0_98c-1:HEAD:python-myghty-0.98c-1.src.rpm:1126720515



From fedora-extras-commits at redhat.com  Wed Sep 14 17:33:16 2005
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Wed, 14 Sep 2005 13:33:16 -0400
Subject: rpms/python-myghty - New directory
Message-ID: <200509141733.j8EHXGGF021077@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/extras/rpms/python-myghty
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21057/python-myghty

Log Message:
Directory /cvs/extras/rpms/python-myghty added to the repository




From fedora-extras-commits at redhat.com  Wed Sep 14 17:33:16 2005
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Wed, 14 Sep 2005 13:33:16 -0400
Subject: rpms/python-myghty - New directory
Message-ID: <200509141733.j8EHXGGF021077@cvs-int.fedora.redhat.com>

<<< No Message Collected >>>



From fedora-extras-commits at redhat.com  Wed Sep 14 17:55:23 2005
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Wed, 14 Sep 2005 13:55:23 -0400
Subject: rpms/python-myghty import.log,1.1,1.2
Message-ID: <200509141755.j8EHtrOl021252@cvs-int.fedora.redhat.com>

<<< No Message Collected >>>



From fedora-extras-commits at redhat.com  Wed Sep 14 18:26:17 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Wed, 14 Sep 2005 14:26:17 -0400
Subject: rpms/perl-Class-DBI-Loader/devel perl-Class-DBI-Loader.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200509141826.j8EIQHO4022998@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Class-DBI-Loader/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22958/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Class-DBI-Loader.spec 
Log Message:
auto-import perl-Class-DBI-Loader-0.22-4 on branch devel from perl-Class-DBI-Loader-0.22-4.src.rpm


--- NEW FILE perl-Class-DBI-Loader.spec ---
Name:           perl-Class-DBI-Loader
Version:        0.22
Release:        4%{?dist}
Summary:        Dynamic definition of Class::DBI sub classes
Group:          Development/Libraries
License:        GPL or Artistic
URL:            http://search.cpan.org/dist/Class-DBI-Loader
Source0:        http://search.cpan.org/CPAN/authors/id/S/SR/SRI/Class-DBI-Loader-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:	perl(Lingua::EN::Inflect), perl(Test::Pod::Coverage), perl(Test::Pod)
BuildRequires:  perl(Class::DBI::mysql), perl(Class::DBI::Pg), perl(Class::DBI::SQLite)
Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
%{summary}.

%prep
%setup -q -n Class-DBI-Loader-%{version}
perldoc -t perlartistic > Artistic
perldoc -t perlgpl > COPYING

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'
find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';'
chmod -R u+w $RPM_BUILD_ROOT/*

%check
# Coverage test fails
mv t/03podcoverage.t .
TEST_POD=1 make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Artistic COPYING Changes
%{perl_vendorlib}/Class/DBI
%{_mandir}/man3/*.3*


%changelog
* Fri Sep  9 2005 Paul Howarth  0.22-4
- include POD tests in %%check, but disable failing POD coverage test
- remove explicit Class::DBI dep because it's pulled in by other deps
  that are autodetected

* Wed Sep  7 2005 Tom "spot" Callaway  0.22-3
- remove redundant BR: perl
- honor %%{_smp_mflags}
- include license text

* Fri Jul  8 2005 Tom "spot" Callaway  0.22-2
- cleanups

* Wed Jul  6 2005 Tom "spot" Callaway  0.22-1
- Initial package for Fedora Extras


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-Loader/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	14 Sep 2005 18:25:48 -0000	1.1
+++ .cvsignore	14 Sep 2005 18:26:15 -0000	1.2
@@ -0,0 +1 @@
+Class-DBI-Loader-0.22.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-Loader/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	14 Sep 2005 18:25:48 -0000	1.1
+++ sources	14 Sep 2005 18:26:15 -0000	1.2
@@ -0,0 +1 @@
+fdb246040add571cffc1134184e9ca0f  Class-DBI-Loader-0.22.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep 14 17:33:37 2005
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Wed, 14 Sep 2005 13:33:37 -0400
Subject: rpms/python-myghty Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200509141733.j8EHXbi7021131@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/extras/rpms/python-myghty
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21102

Added Files:
	Makefile import.log 
Log Message:
Setup of module python-myghty


--- NEW FILE Makefile ---
# Top level Makefile for module python-myghty
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Wed Sep 14 17:33:17 2005
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Wed, 14 Sep 2005 13:33:17 -0400
Subject: rpms/python-myghty/devel - New directory
Message-ID: <200509141733.j8EHXHuB021082@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/extras/rpms/python-myghty/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21057/python-myghty/devel

Log Message:
Directory /cvs/extras/rpms/python-myghty/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Sep 14 17:33:37 2005
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Wed, 14 Sep 2005 13:33:37 -0400
Subject: rpms/python-myghty/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200509141733.j8EHXbYS021136@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/extras/rpms/python-myghty/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21102/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module python-myghty


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Wed Sep 14 16:53:31 2005
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Wed, 14 Sep 2005 12:53:31 -0400
Subject: extras-buildsys/utils distro-rebuild.py,1.5,1.6
Message-ID: <200509141653.j8EGrVRw019602@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys/utils
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19563/utils

Modified Files:
	distro-rebuild.py 
Log Message:
2005-09-14  Dan Williams  

    * utils/distro-rebuild.py
        - Optionally add a changelog entry to rebuilt specfile




Index: distro-rebuild.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/distro-rebuild.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- distro-rebuild.py	13 Sep 2005 15:55:56 -0000	1.5
+++ distro-rebuild.py	14 Sep 2005 16:53:29 -0000	1.6
@@ -66,7 +66,13 @@
     del srpm_dict
     return files_dict
 
-def rebuild_srpm(name, f):
+def rebuild_srpm(name, f, user=None):
+    ts = rpmUtils.transaction.initReadOnlyTransaction()
+    hdr = rpmUtils.miscutils.hdrFromPackage(ts, f)
+    chlog_ver = "%s-%s.1" % (hdr['version'], hdr['release'])
+    del ts
+    del hdr
+
     # Create a temp dir
     temp_dir = os.path.join("/tmp", "rebuild", name)
     if not os.path.exists(temp_dir):
@@ -96,10 +102,19 @@
     specfile_new = specfile+".new"
     dst = open(specfile_new, "w")
     found = False
+    changelog = False
     for line in src:
         if line.startswith("Release:"):
             line = string.strip(line) + ".1\n"
             found = True
+        if line.startswith("%changelog"):
+            changelog = True
+        elif changelog and user:
+            # Add a changelog entry for the rebuild
+            t = time.strftime("%a %b %e %Y")
+            entry = "* %s %s - %s\n- Rebuild\n\n" % (t, user, chlog_ver)
+            dst.write(entry)
+            changelog = False
         dst.write(line)
     dst.close()
     src.close()
@@ -138,12 +153,12 @@
 
 
 def usage(program):
-    print "%s  " % program
+    print "%s   [changelog user]" % program
     print ""
 
 
 if __name__ == '__main__':
-    if len(sys.argv) < 3:
+    if len(sys.argv) < 4:
         usage(sys.argv[0])
         sys.exit(1)
 
@@ -153,6 +168,9 @@
         sys.exit(1)
 
     target = sys.argv[2]
+    user = None
+    if len(sys.argv > 3)
+        user = sys.argv[3]
 
     # Build up a list of all SRPMs in the specified directory
     files = find_newest_srpms(search_dir)
@@ -163,9 +181,9 @@
     names = files.keys()
     names.sort()
     for name in names:
-        f = files[name]
+        f = names[name]
         try:
-            (rebuilt_srpm, temp_dir_path) = rebuild_srpm(name, f)
+            (rebuilt_srpm, temp_dir_path) = rebuild_srpm(name, f, user)
         except RebuildException, e:
             shutil.rmtree(temp_dir_path, ignore_errors=True)
             print "RE: %s (%s)" % (f, e)



From fedora-extras-commits at redhat.com  Wed Sep 14 16:53:31 2005
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Wed, 14 Sep 2005 12:53:31 -0400
Subject: extras-buildsys ChangeLog,1.122,1.123
Message-ID: <200509141653.j8EGrVn0019594@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19563

Modified Files:
	ChangeLog 
Log Message:
2005-09-14  Dan Williams  

    * utils/distro-rebuild.py
        - Optionally add a changelog entry to rebuilt specfile




Index: ChangeLog
===================================================================
RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -r1.122 -r1.123
--- ChangeLog	13 Sep 2005 18:43:00 -0000	1.122
+++ ChangeLog	14 Sep 2005 16:53:29 -0000	1.123
@@ -1,3 +1,8 @@
+2005-09-14  Dan Williams  
+
+    * utils/distro-rebuild.py
+        - Optionally add a changelog entry to rebuilt specfile
+
 2005-09-13  Dan Williams  
 
     * builder/builder.py



From fedora-extras-commits at redhat.com  Wed Sep 14 15:42:01 2005
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Wed, 14 Sep 2005 11:42:01 -0400
Subject: extras-buildsys/server Builder.py,1.19,1.20
Message-ID: <200509141542.j8EFg1no017999@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys/server
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17978/server

Modified Files:
	Builder.py 
Log Message:
Don't kill the server when a builder faults


Index: Builder.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/Builder.py,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- Builder.py	31 Aug 2005 19:55:20 -0000	1.19
+++ Builder.py	14 Sep 2005 15:41:59 -0000	1.20
@@ -156,6 +156,10 @@
             jobid = self._server.start_new_job(target_dict, srpm_url)
         except (socket.error, socket.timeout, OpenSSL.SSL.SysCallError, xmlrpclib.ProtocolError):
             jobid = 0
+        except xmlrpclib.Fault, e:
+            print "Builder Error (%s): builder replied '%s'" % (self.address, e)
+            time.sleep(0.5)
+            jobid = 0
 
         if jobid == 0:
             self._server_lock.release()



From fedora-extras-commits at redhat.com  Wed Sep 14 14:55:52 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Wed, 14 Sep 2005 10:55:52 -0400
Subject: rpms/Macaulay2/devel Macaulay2.spec,1.9,1.10
Message-ID: <200509141455.j8EEtq7c016602@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/Macaulay2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16583

Modified Files:
	Macaulay2.spec 
Log Message:
* Wed Sep 14 2005 Rex Dieter  - 0.9.2-18
- rebuild against gc-6.6



Index: Macaulay2.spec
===================================================================
RCS file: /cvs/extras/rpms/Macaulay2/devel/Macaulay2.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Macaulay2.spec	8 Aug 2005 15:59:58 -0000	1.9
+++ Macaulay2.spec	14 Sep 2005 14:55:50 -0000	1.10
@@ -6,7 +6,7 @@
 Summary: System for algebraic geometry and commutative algebra
 Name:    Macaulay2
 Version: 0.9.2
-Release: 17%{?dist}
+Release: 18%{?dist}
 License: GPL
 Group:   Applications/Engineering
 URL:     http://www.math.uiuc.edu/Macaulay2/
@@ -25,7 +25,7 @@
 Patch5: Macaulay2-0.9.2-gcc4.patch
 
 BuildRequires: desktop-file-utils
-BuildRequires: gc-devel >= 6.5
+BuildRequires: gc-devel >= 6.6
 BuildRequires: factory-devel >= 2.0.5
 BuildRequires: libfac-devel >= 2.0.5
 BuildRequires: gdbm-devel
@@ -161,6 +161,9 @@
 
 
 %changelog
+* Wed Sep 14 2005 Rex Dieter  - 0.9.2-18
+- rebuild against gc-6.6
+
 * Thu May 26 2005 Michael Schwendt  - 0.9.2-17
 - rebuild (build system x86_64 repository access failed for 0.9.2-16)
 - fix build for GCC 4 (#156223)



From fedora-extras-commits at redhat.com  Wed Sep 14 11:53:44 2005
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Wed, 14 Sep 2005 07:53:44 -0400
Subject: extras-buildsys/server BuilderManager.py,1.17,1.18
Message-ID: <200509141153.j8EBrilM011735@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys/server
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11716/server

Modified Files:
	BuilderManager.py 
Log Message:
Remove debug print


Index: BuilderManager.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/BuilderManager.py,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- BuilderManager.py	11 Sep 2005 03:29:34 -0000	1.17
+++ BuilderManager.py	14 Sep 2005 11:53:42 -0000	1.18
@@ -158,7 +158,6 @@
             for builder in self._builders:
                 if builder.available() and builder.can_build_for_target(req['target_dict']):
                     builder_list.append(builder)
-                    print "Appending builder %s" % builder.address()
 
             # Use the builder with the most free build slots
             if sys.version_info[:3] >= (2, 4, 0):



From fedora-extras-commits at redhat.com  Wed Sep 14 12:31:29 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 14 Sep 2005 08:31:29 -0400
Subject: rpms/perl-Test-WWW-Mechanize import.log,1.1,1.2
Message-ID: <200509141231.j8ECVTt9013571@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Test-WWW-Mechanize
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13534

Modified Files:
	import.log 
Log Message:
auto-import perl-Test-WWW-Mechanize-1.06-1 on branch devel from perl-Test-WWW-Mechanize-1.06-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-WWW-Mechanize/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	14 Sep 2005 12:30:53 -0000	1.1
+++ import.log	14 Sep 2005 12:31:27 -0000	1.2
@@ -0,0 +1 @@
+perl-Test-WWW-Mechanize-1_06-1:HEAD:perl-Test-WWW-Mechanize-1.06-1.src.rpm:1126701079



From fedora-extras-commits at redhat.com  Wed Sep 14 11:50:31 2005
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Wed, 14 Sep 2005 07:50:31 -0400
Subject: extras-buildsys/server PackageJob.py,1.29,1.30
Message-ID: <200509141150.j8EBoV0f011704@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys/server
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11685/server

Modified Files:
	PackageJob.py 
Log Message:
Fix traceback on failed downloads from builder.


Index: PackageJob.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/PackageJob.py,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- PackageJob.py	8 Sep 2005 21:10:25 -0000	1.29
+++ PackageJob.py	14 Sep 2005 11:50:29 -0000	1.30
@@ -559,7 +559,7 @@
                             msg = "Job failed on arch %s\n" % jobarch
                         elif job.download_failed():
                             msg = "Job failed on arch %s: couldn't download result files from builder '%s'.\n " \
-                            "Please contact the build system administrator." % (jobarch, builder.address())
+                            "Please contact the build system administrator." % (jobarch, job.builder.address())
                         self._archjobs_lock.release()
                         raise BuildError(msg, jobarch)
 



From fedora-extras-commits at redhat.com  Wed Sep 14 12:30:55 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 14 Sep 2005 08:30:55 -0400
Subject: rpms/perl-Test-WWW-Mechanize/devel .cvsignore, NONE, 1.1 Makefile,
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <200509141231.j8ECUtYi013468@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Test-WWW-Mechanize/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13422/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Test-WWW-Mechanize


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Wed Sep 14 12:48:44 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 14 Sep 2005 08:48:44 -0400
Subject: owners owners.list,1.205,1.206
Message-ID: <200509141248.j8ECmiSj013732@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13712

Modified Files:
	owners.list 
Log Message:
New package: perl-Test-WWW-Mechanize


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.205
retrieving revision 1.206
diff -u -r1.205 -r1.206
--- owners.list	14 Sep 2005 09:49:46 -0000	1.205
+++ owners.list	14 Sep 2005 12:48:42 -0000	1.206
@@ -732,6 +732,7 @@
 Fedora Extras|perl-Test-Pod|Perl module for checking for POD errors in files|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Test-Taint|Tools to test taintedness|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Test-Warn|Perl extension to test methods for warnings|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Test-WWW-Mechanize|Testing-specific WWW::Mechanize subclass|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-TeX-Hyphen|Hyphenate words using TeX's patterns|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Text-Autoformat|Perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Text-Glob|Perl module to match globbing patterns against text|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Wed Sep 14 12:31:30 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 14 Sep 2005 08:31:30 -0400
Subject: rpms/perl-Test-WWW-Mechanize/devel perl-Test-WWW-Mechanize.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200509141231.j8ECVUUD013582@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Test-WWW-Mechanize/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13534/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Test-WWW-Mechanize.spec 
Log Message:
auto-import perl-Test-WWW-Mechanize-1.06-1 on branch devel from perl-Test-WWW-Mechanize-1.06-1.src.rpm


--- NEW FILE perl-Test-WWW-Mechanize.spec ---
Name:           perl-Test-WWW-Mechanize
Version:        1.06
Release:        1%{?dist}
Summary:        Testing-specific WWW::Mechanize subclass

Group:          Development/Libraries
License:        GPL or Artistic
URL:            http://search.cpan.org/dist/Test-WWW-Mechanize/
Source0:        http://www.cpan.org/authors/id/P/PE/PETDANCE/Test-WWW-Mechanize-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  perl(Test::Builder::Tester), perl(Test::LongString)
BuildRequires:  perl(Test::Pod), perl(Test::Pod::Coverage)
BuildRequires:  perl(URI::file), perl(WWW::Mechanize)
BuildRequires:  perl(Carp::Assert::More), perl(HTTP::Server::Simple)
Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
Test::WWW::Mechanize is a subclass of WWW::Mechanize that incorporates
features for web application testing.


%prep
%setup -q -n Test-WWW-Mechanize-%{version}


%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'
find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';'
chmod -R u+w $RPM_BUILD_ROOT/*


%check
make test


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
# For license text(s), see the perl package.
%doc Changes README
%{perl_vendorlib}/Test/
%{_mandir}/man3/*.3*


%changelog
* Thu Aug 11 2005 Jose Pedro Oliveira  - 1.06-1
- Update to 1.06.

* Tue Mar 22 2005 Jose Pedro Oliveira  - 1.04-1
- First build.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-WWW-Mechanize/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	14 Sep 2005 12:30:53 -0000	1.1
+++ .cvsignore	14 Sep 2005 12:31:28 -0000	1.2
@@ -0,0 +1 @@
+Test-WWW-Mechanize-1.06.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-WWW-Mechanize/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	14 Sep 2005 12:30:53 -0000	1.1
+++ sources	14 Sep 2005 12:31:28 -0000	1.2
@@ -0,0 +1 @@
+f806b2b0601c49d12f3b0a36e81bd3dd  Test-WWW-Mechanize-1.06.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep 14 12:30:35 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 14 Sep 2005 08:30:35 -0400
Subject: rpms/perl-Test-WWW-Mechanize - New directory
Message-ID: <200509141230.j8ECUZWc013374@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Test-WWW-Mechanize
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13350/perl-Test-WWW-Mechanize

Log Message:
Directory /cvs/extras/rpms/perl-Test-WWW-Mechanize added to the repository




From fedora-extras-commits at redhat.com  Wed Sep 14 09:49:48 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Wed, 14 Sep 2005 05:49:48 -0400
Subject: owners owners.list,1.204,1.205
Message-ID: <200509140949.j8E9nmNA008720@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8701

Modified Files:
	owners.list 
Log Message:
Add perl-Test-ClassAPI


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.204
retrieving revision 1.205
diff -u -r1.204 -r1.205
--- owners.list	14 Sep 2005 05:17:52 -0000	1.204
+++ owners.list	14 Sep 2005 09:49:46 -0000	1.205
@@ -721,6 +721,7 @@
 Fedora Extras|perl-Template-Toolkit|Template processing system|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Tree-Simple|Tree::Simple Perl module|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Test-Builder-Tester|For bugs related to the perl-Test-Builder-Tester component|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Test-ClassAPI|Provides basic first-pass API testing for large class trees|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Test-Exception|Library of test functions for exception based Perl code|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Test-LongString|Perl module to test long strings|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Test-Manifest|Test case module for Perl|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Wed Sep 14 12:30:35 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 14 Sep 2005 08:30:35 -0400
Subject: rpms/perl-Test-WWW-Mechanize/devel - New directory
Message-ID: <200509141230.j8ECUZai013380@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Test-WWW-Mechanize/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13350/perl-Test-WWW-Mechanize/devel

Log Message:
Directory /cvs/extras/rpms/perl-Test-WWW-Mechanize/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Sep 14 11:12:11 2005
From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc))
Date: Wed, 14 Sep 2005 07:12:11 -0400
Subject: rpms/libtranslate/FC-3 libtranslate.spec,1.1,1.2
Message-ID: <200509141112.j8EBCfAS011562@cvs-int.fedora.redhat.com>

Author: buc

Update of /cvs/extras/rpms/libtranslate/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11535

Modified Files:
	libtranslate.spec 
Log Message:



Index: libtranslate.spec
===================================================================
RCS file: /cvs/extras/rpms/libtranslate/FC-3/libtranslate.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libtranslate.spec	7 Sep 2005 10:16:57 -0000	1.1
+++ libtranslate.spec	14 Sep 2005 11:12:05 -0000	1.2
@@ -97,6 +97,8 @@
 %changelog
 * Wed Sep  7 2005 Dmitry Butskoy  - 0.99-4
 - even more cleanups
+- Accepted for Fedora Extra
+  (review by Tom "spot" Callaway )
 
 * Fri Aug 19 2005 Dmitry Butskoy  - 0.99-3
 - more cleanups



From fedora-extras-commits at redhat.com  Wed Sep 14 12:30:55 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 14 Sep 2005 08:30:55 -0400
Subject: rpms/perl-Test-WWW-Mechanize Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200509141230.j8ECUt4N013462@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Test-WWW-Mechanize
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13422

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-Test-WWW-Mechanize


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Test-WWW-Mechanize
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Wed Sep 14 09:36:28 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Wed, 14 Sep 2005 05:36:28 -0400
Subject: rpms/perl-Test-ClassAPI/devel - New directory
Message-ID: <200509140936.j8E9aSDZ008416@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Test-ClassAPI/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8387/perl-Test-ClassAPI/devel

Log Message:
Directory /cvs/extras/rpms/perl-Test-ClassAPI/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Sep 14 04:50:10 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Wed, 14 Sep 2005 00:50:10 -0400
Subject: rpms/wesnoth/devel .cvsignore, 1.8, 1.9 sources, 1.8,
	1.9 wesnoth.spec, 1.18, 1.19
Message-ID: <200509140450.j8E4oAqc000519@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/wesnoth/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv496

Modified Files:
	.cvsignore sources wesnoth.spec 
Log Message:
* Wed Sep 14 2005 Michael Schwendt  - 0.9.7-1
- update to 0.9.7



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wesnoth/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	29 Aug 2005 10:06:34 -0000	1.8
+++ .cvsignore	14 Sep 2005 04:50:08 -0000	1.9
@@ -1 +1 @@
-wesnoth-0.9.6.tar.gz
+wesnoth-0.9.7.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wesnoth/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	29 Aug 2005 10:06:34 -0000	1.8
+++ sources	14 Sep 2005 04:50:08 -0000	1.9
@@ -1 +1 @@
-d3bb0d492ac01e30c02f882f8d45d9fc  wesnoth-0.9.6.tar.gz
+c2c863c58a3eb7de5fce882d8a1944e1  wesnoth-0.9.7.tar.gz


Index: wesnoth.spec
===================================================================
RCS file: /cvs/extras/rpms/wesnoth/devel/wesnoth.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- wesnoth.spec	31 Aug 2005 10:22:51 -0000	1.18
+++ wesnoth.spec	14 Sep 2005 04:50:08 -0000	1.19
@@ -1,6 +1,6 @@
 Name:           wesnoth
-Version:        0.9.6
-Release:        2%{?dist}
+Version:        0.9.7
+Release:        1%{?dist}
 Summary:        Turn-based strategy game with a fantasy theme
 
 Group:          Amusements/Games
@@ -156,6 +156,9 @@
 %ghost /var/run/wesnothd/socket
 
 %changelog
+* Wed Sep 14 2005 Michael Schwendt  - 0.9.7-1
+- update to 0.9.7
+
 * Wed Aug 31 2005 Michael Schwendt  - 0.9.6-2
 - update summary and description
 - move and specify server package scriptlet requirements



From fedora-extras-commits at redhat.com  Wed Sep 14 09:37:47 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Wed, 14 Sep 2005 05:37:47 -0400
Subject: rpms/perl-Test-ClassAPI import.log,1.1,1.2
Message-ID: <200509140937.j8E9blq3008535@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Test-ClassAPI
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8500

Modified Files:
	import.log 
Log Message:
auto-import perl-Test-ClassAPI-1.02-1 on branch devel from perl-Test-ClassAPI-1.02-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-ClassAPI/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	14 Sep 2005 09:36:49 -0000	1.1
+++ import.log	14 Sep 2005 09:37:45 -0000	1.2
@@ -0,0 +1 @@
+perl-Test-ClassAPI-1_02-1:HEAD:perl-Test-ClassAPI-1.02-1.src.rpm:1126690649



From fedora-extras-commits at redhat.com  Wed Sep 14 11:10:55 2005
From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc))
Date: Wed, 14 Sep 2005 07:10:55 -0400
Subject: rpms/libtranslate/FC-4 libtranslate.spec,1.1,1.2
Message-ID: <200509141111.j8EBBcXY011529@cvs-int.fedora.redhat.com>

Author: buc

Update of /cvs/extras/rpms/libtranslate/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11506

Modified Files:
	libtranslate.spec 
Log Message:



Index: libtranslate.spec
===================================================================
RCS file: /cvs/extras/rpms/libtranslate/FC-4/libtranslate.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libtranslate.spec	7 Sep 2005 10:16:57 -0000	1.1
+++ libtranslate.spec	14 Sep 2005 11:10:52 -0000	1.2
@@ -97,6 +97,8 @@
 %changelog
 * Wed Sep  7 2005 Dmitry Butskoy  - 0.99-4
 - even more cleanups
+- Accepted for Fedora Extra
+  (review by Tom "spot" Callaway )
 
 * Fri Aug 19 2005 Dmitry Butskoy  - 0.99-3
 - more cleanups



From fedora-extras-commits at redhat.com  Wed Sep 14 11:09:35 2005
From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc))
Date: Wed, 14 Sep 2005 07:09:35 -0400
Subject: rpms/libtranslate/devel libtranslate.spec,1.1,1.2
Message-ID: <200509141110.j8EBA5Rx011492@cvs-int.fedora.redhat.com>

Author: buc

Update of /cvs/extras/rpms/libtranslate/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11456

Modified Files:
	libtranslate.spec 
Log Message:



Index: libtranslate.spec
===================================================================
RCS file: /cvs/extras/rpms/libtranslate/devel/libtranslate.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libtranslate.spec	7 Sep 2005 10:16:57 -0000	1.1
+++ libtranslate.spec	14 Sep 2005 11:09:33 -0000	1.2
@@ -97,6 +97,8 @@
 %changelog
 * Wed Sep  7 2005 Dmitry Butskoy  - 0.99-4
 - even more cleanups
+- Accepted for Fedora Extra
+  (review by Tom "spot" Callaway )
 
 * Fri Aug 19 2005 Dmitry Butskoy  - 0.99-3
 - more cleanups



From fedora-extras-commits at redhat.com  Wed Sep 14 05:17:54 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Wed, 14 Sep 2005 01:17:54 -0400
Subject: owners owners.list,1.203,1.204
Message-ID: <200509140517.j8E5HsIQ002071@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2052

Modified Files:
	owners.list 
Log Message:
- add unshield



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.203
retrieving revision 1.204
diff -u -r1.203 -r1.204
--- owners.list	14 Sep 2005 02:48:07 -0000	1.203
+++ owners.list	14 Sep 2005 05:17:52 -0000	1.204
@@ -982,6 +982,7 @@
 Fedora Extras|umfpack|Routines for solving unsymmetric sparse linear systems|qspencer at ieee.org|extras-qa at fedoraproject.org|
 Fedora Extras|unison|File synchronization tool|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|unrtf|RTF to other formats converter|gauret at free.fr|extras-qa at fedoraproject.org|
+Fedora Extras|unshield|Install InstallShield applications on a Pocket PC|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|up-imapproxy|University of Pittsburgh IMAP Proxy|jeff at ultimateevil.org|extras-qa at fedoraproject.org|
 Fedora Extras|upx|The Ultimate Packer for eXecutables|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|uqm-content|Base content files for The Ur-Quan Masters|ville.skytta at iki.fi|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Wed Sep 14 09:36:51 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Wed, 14 Sep 2005 05:36:51 -0400
Subject: rpms/perl-Test-ClassAPI/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200509140936.j8E9apGE008466@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Test-ClassAPI/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8432/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Test-ClassAPI


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Wed Sep 14 09:36:28 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Wed, 14 Sep 2005 05:36:28 -0400
Subject: rpms/perl-Test-ClassAPI - New directory
Message-ID: <200509140936.j8E9aS4L008411@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Test-ClassAPI
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8387/perl-Test-ClassAPI

Log Message:
Directory /cvs/extras/rpms/perl-Test-ClassAPI added to the repository




From fedora-extras-commits at redhat.com  Wed Sep 14 09:43:14 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Wed, 14 Sep 2005 05:43:14 -0400
Subject: rpms/perl-Test-ClassAPI/devel perl-Test-ClassAPI.spec,1.1,1.2
Message-ID: <200509140943.j8E9hEC8008630@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Test-ClassAPI/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8611

Modified Files:
	perl-Test-ClassAPI.spec 
Log Message:
Misc. cleanups.


Index: perl-Test-ClassAPI.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-ClassAPI/devel/perl-Test-ClassAPI.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Test-ClassAPI.spec	14 Sep 2005 09:37:45 -0000	1.1
+++ perl-Test-ClassAPI.spec	14 Sep 2005 09:43:11 -0000	1.2
@@ -1,11 +1,11 @@
 Name: 		perl-Test-ClassAPI
 Version: 	1.02
-Release: 	1%{?dist}
-Summary: 	Test::ClassAPI Perl module
+Release: 	2%{?dist}
+Summary: 	Provides basic first-pass API testing for large class trees
 License: 	GPL or Artistic
 Group: 		Development/Libraries
 URL: 		http://search.cpan.org/dist/Test-ClassAPI/
-Source0: 	http://www.cpan.org/modules/by-module/Test/Test-ClassAPI-%{version}.tar.gz
+Source0: 	http://search.cpan.org/CPAN/authors/id/A/AD/ADAMK/Test-ClassAPI-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:  	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
@@ -15,7 +15,12 @@
 BuildRequires: 	perl(Class::Inspector) >= 1.06
 
 %description
-Provides basic first-pass API testing for large class trees
+Provides basic first-pass API testing for large class trees.
+
+For many APIs with large numbers of classes, it can be very useful to be 
+able to do a quick once-over to make sure that classes, methods, and 
+inheritance is correct, before doing more comprehensive testing.
+This module aims to provide such a capability.
 
 %prep
 %setup -q -n Test-ClassAPI-%{version}
@@ -39,11 +44,16 @@
 
 %files
 %defattr(-,root,root,-)
-%doc Changes README LICENSE
+%doc Changes LICENSE
 %{perl_vendorlib}/Test
 %{_mandir}/man3/*
 
 %changelog
+* Tue Sep 14 2005 Ralf Corsepius  - 1.02-2
+- New %%summary.
+- Extend %%description.
+- Don't put README into %%doc (Redundant to man page).
+
 * Tue Sep 13 2005 Ralf Corsepius  - 1.02-1
 - Spec file cleanup.
 - FE submission.



From fedora-extras-commits at redhat.com  Wed Sep 14 04:52:47 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Wed, 14 Sep 2005 00:52:47 -0400
Subject: rpms/wesnoth/FC-3 .cvsignore, 1.7, 1.8 sources, 1.7,
	1.8 wesnoth.spec, 1.8, 1.9
Message-ID: <200509140453.j8E4rHjL000605@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/wesnoth/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv563/FC-3

Modified Files:
	.cvsignore sources wesnoth.spec 
Log Message:
* Wed Sep 14 2005 Michael Schwendt  - 0.9.7-1
- update to 0.9.7



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wesnoth/FC-3/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	29 Aug 2005 10:06:05 -0000	1.7
+++ .cvsignore	14 Sep 2005 04:52:44 -0000	1.8
@@ -1 +1 @@
-wesnoth-0.9.6.tar.gz
+wesnoth-0.9.7.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wesnoth/FC-3/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	29 Aug 2005 10:06:05 -0000	1.7
+++ sources	14 Sep 2005 04:52:44 -0000	1.8
@@ -1 +1 @@
-d3bb0d492ac01e30c02f882f8d45d9fc  wesnoth-0.9.6.tar.gz
+c2c863c58a3eb7de5fce882d8a1944e1  wesnoth-0.9.7.tar.gz


Index: wesnoth.spec
===================================================================
RCS file: /cvs/extras/rpms/wesnoth/FC-3/wesnoth.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- wesnoth.spec	29 Aug 2005 10:06:05 -0000	1.8
+++ wesnoth.spec	14 Sep 2005 04:52:44 -0000	1.9
@@ -1,7 +1,7 @@
 Name:           wesnoth
-Version:        0.9.6
+Version:        0.9.7
 Release:        1%{?dist}
-Summary:        Battle for Wesnoth, a fantasy turn-based strategy game
+Summary:        Turn-based strategy game with a fantasy theme
 
 Group:          Amusements/Games
 License:        GPL
@@ -17,21 +17,32 @@
 BuildRequires:  libpng-devel
 BuildRequires:  desktop-file-utils, gettext
 
-Requires:       /sbin/chkconfig
 
 %description
-%{summary}.
+The Battle for Wesnoth is a turn-based strategy game with a fantasy theme.
 
-Battle for control of villages, using variety of units which have advantages
-and disadvantages in different types of terrains and against different types
-of attacks. Units gain experience and advance levels, and are carried over
-from one scenario to the next campaign.
+Build up a great army, gradually turning raw recruits into hardened
+veterans. In later games, recall your toughest warriors and form a deadly
+host against whom none can stand. Choose units from a large pool of
+specialists, and hand-pick a force with the right strengths to fight well
+on different terrains against all manner of opposition.
+
+Fight to regain the throne of Wesnoth, of which you are the legitimate
+heir, or use your dread power over the Undead to dominate the land of
+mortals, or lead your glorious Orcish tribe to victory against the humans
+who dared despoil your lands. Wesnoth has many different sagas waiting to
+be played out. You can create your own custom units, and write your own
+scenarios--or even full-blown campaigns. You can also challenge your
+friends--or strangers--and fight multi-player epic fantasy battles.
 
 
 %package server
 Summary:	%{summary}
 Group:		Amusements/Games
 Requires:	%{name} = %{version}-%{release}
+Requires(post): /sbin/chkconfig
+Requires(preun): /sbin/chkconfig
+Requires(pre): /usr/sbin/useradd
 
 %description server
 This package contains the binaries for running a Wesnoth server
@@ -145,6 +156,13 @@
 %ghost /var/run/wesnothd/socket
 
 %changelog
+* Wed Sep 14 2005 Michael Schwendt  - 0.9.7-1
+- update to 0.9.7
+
+* Wed Aug 31 2005 Michael Schwendt  - 0.9.6-2
+- update summary and description
+- move and specify server package scriptlet requirements
+
 * Sun Aug 28 2005 Michael Schwendt  - 0.9.6-1
 - update to 0.9.6
 



From fedora-extras-commits at redhat.com  Wed Sep 14 07:40:57 2005
From: fedora-extras-commits at redhat.com (Gavin Henry (ghenry))
Date: Wed, 14 Sep 2005 03:40:57 -0400
Subject: rpms/rdiff-backup/devel .cvsignore, 1.2, 1.3 rdiff-backup.spec, 1.8,
	1.9 sources, 1.3, 1.4
Message-ID: <200509140740.j8E7ev4n004971@cvs-int.fedora.redhat.com>

Author: ghenry

Update of /cvs/extras/rpms/rdiff-backup/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4939

Modified Files:
	.cvsignore rdiff-backup.spec sources 
Log Message:

Committing in .
 
Modified Files:
	.cvsignore rdiff-backup.spec sources 

New version of rdiff-backup



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rdiff-backup/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 05:17:55 -0000	1.2
+++ .cvsignore	14 Sep 2005 07:40:55 -0000	1.3
@@ -1 +1 @@
-rdiff-backup-0.12.6.tar.gz
+rdiff-backup-1.0.1.tar.gz


Index: rdiff-backup.spec
===================================================================
RCS file: /cvs/extras/rpms/rdiff-backup/devel/rdiff-backup.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- rdiff-backup.spec	12 May 2005 02:56:28 -0000	1.8
+++ rdiff-backup.spec	14 Sep 2005 07:40:55 -0000	1.9
@@ -1,9 +1,9 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
-Version: 0.12.7
+Version: 1.0.1
 Summary: Convenient and transparent local/remote incremental mirror/backup
 Name: rdiff-backup
-Release: 3
+Release: 1%{?dist}
 
 URL: http://www.nongnu.org/rdiff-backup/
 Source: http://savannah.nongnu.org/download/%{name}/%{name}-%{version}.tar.gz
@@ -53,6 +53,12 @@
 %ghost %{python_sitearch}/rdiff_backup/*.pyo
 
 %changelog
+* Wed Sep 14 2005 Gavin Henry  - 0:1.0.1-1
+- New version
+
+* Thu Aug 15 2005 Gavin Henry  - 0:1.0.0-1
+- Latest version
+
 * Wed May 11 2005 Bill Nottingham  - 0:0.12.7-3
 - rebuilt
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rdiff-backup/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	22 Jan 2005 20:27:02 -0000	1.3
+++ sources	14 Sep 2005 07:40:55 -0000	1.4
@@ -1 +1 @@
-12fb0085861483eab379cb578fa9c849  rdiff-backup-0.12.7.tar.gz
+765e8c97c696eeb7b19006d9ed0967be  rdiff-backup-1.0.1.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep 14 04:52:47 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Wed, 14 Sep 2005 00:52:47 -0400
Subject: rpms/wesnoth/FC-4 .cvsignore, 1.7, 1.8 sources, 1.7,
	1.8 wesnoth.spec, 1.12, 1.13
Message-ID: <200509140453.j8E4rHbm000610@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/wesnoth/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv563/FC-4

Modified Files:
	.cvsignore sources wesnoth.spec 
Log Message:
* Wed Sep 14 2005 Michael Schwendt  - 0.9.7-1
- update to 0.9.7



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wesnoth/FC-4/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	29 Aug 2005 10:06:32 -0000	1.7
+++ .cvsignore	14 Sep 2005 04:52:45 -0000	1.8
@@ -1 +1 @@
-wesnoth-0.9.6.tar.gz
+wesnoth-0.9.7.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wesnoth/FC-4/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	29 Aug 2005 10:06:32 -0000	1.7
+++ sources	14 Sep 2005 04:52:45 -0000	1.8
@@ -1 +1 @@
-d3bb0d492ac01e30c02f882f8d45d9fc  wesnoth-0.9.6.tar.gz
+c2c863c58a3eb7de5fce882d8a1944e1  wesnoth-0.9.7.tar.gz


Index: wesnoth.spec
===================================================================
RCS file: /cvs/extras/rpms/wesnoth/FC-4/wesnoth.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- wesnoth.spec	29 Aug 2005 10:06:32 -0000	1.12
+++ wesnoth.spec	14 Sep 2005 04:52:45 -0000	1.13
@@ -1,7 +1,7 @@
 Name:           wesnoth
-Version:        0.9.6
+Version:        0.9.7
 Release:        1%{?dist}
-Summary:        Battle for Wesnoth, a fantasy turn-based strategy game
+Summary:        Turn-based strategy game with a fantasy theme
 
 Group:          Amusements/Games
 License:        GPL
@@ -17,21 +17,32 @@
 BuildRequires:  libpng-devel
 BuildRequires:  desktop-file-utils, gettext
 
-Requires:       /sbin/chkconfig
 
 %description
-%{summary}.
+The Battle for Wesnoth is a turn-based strategy game with a fantasy theme.
 
-Battle for control of villages, using variety of units which have advantages
-and disadvantages in different types of terrains and against different types
-of attacks. Units gain experience and advance levels, and are carried over
-from one scenario to the next campaign.
+Build up a great army, gradually turning raw recruits into hardened
+veterans. In later games, recall your toughest warriors and form a deadly
+host against whom none can stand. Choose units from a large pool of
+specialists, and hand-pick a force with the right strengths to fight well
+on different terrains against all manner of opposition.
+
+Fight to regain the throne of Wesnoth, of which you are the legitimate
+heir, or use your dread power over the Undead to dominate the land of
+mortals, or lead your glorious Orcish tribe to victory against the humans
+who dared despoil your lands. Wesnoth has many different sagas waiting to
+be played out. You can create your own custom units, and write your own
+scenarios--or even full-blown campaigns. You can also challenge your
+friends--or strangers--and fight multi-player epic fantasy battles.
 
 
 %package server
 Summary:	%{summary}
 Group:		Amusements/Games
 Requires:	%{name} = %{version}-%{release}
+Requires(post): /sbin/chkconfig
+Requires(preun): /sbin/chkconfig
+Requires(pre): /usr/sbin/useradd
 
 %description server
 This package contains the binaries for running a Wesnoth server
@@ -145,6 +156,13 @@
 %ghost /var/run/wesnothd/socket
 
 %changelog
+* Wed Sep 14 2005 Michael Schwendt  - 0.9.7-1
+- update to 0.9.7
+
+* Wed Aug 31 2005 Michael Schwendt  - 0.9.6-2
+- update summary and description
+- move and specify server package scriptlet requirements
+
 * Sun Aug 28 2005 Michael Schwendt  - 0.9.6-1
 - update to 0.9.6
 



From fedora-extras-commits at redhat.com  Wed Sep 14 09:36:51 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Wed, 14 Sep 2005 05:36:51 -0400
Subject: rpms/perl-Test-ClassAPI Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200509140936.j8E9ap4j008461@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Test-ClassAPI
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8432

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-Test-ClassAPI


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Test-ClassAPI
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Wed Sep 14 09:37:47 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Wed, 14 Sep 2005 05:37:47 -0400
Subject: rpms/perl-Test-ClassAPI/devel perl-Test-ClassAPI.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200509140937.j8E9bl7o008542@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Test-ClassAPI/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8500/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Test-ClassAPI.spec 
Log Message:
auto-import perl-Test-ClassAPI-1.02-1 on branch devel from perl-Test-ClassAPI-1.02-1.src.rpm


--- NEW FILE perl-Test-ClassAPI.spec ---
Name: 		perl-Test-ClassAPI
Version: 	1.02
Release: 	1%{?dist}
Summary: 	Test::ClassAPI Perl module
License: 	GPL or Artistic
Group: 		Development/Libraries
URL: 		http://search.cpan.org/dist/Test-ClassAPI/
Source0: 	http://www.cpan.org/modules/by-module/Test/Test-ClassAPI-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:  	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
BuildArch: 	noarch

BuildRequires: 	perl(Config::Tiny) >= 2.00
BuildRequires: 	perl(Class::Inspector) >= 1.06

%description
Provides basic first-pass API testing for large class trees

%prep
%setup -q -n Test-ClassAPI-%{version}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'
find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';'
chmod -R u+w $RPM_BUILD_ROOT/*

%clean
rm -rf $RPM_BUILD_ROOT

%check
make test

%files
%defattr(-,root,root,-)
%doc Changes README LICENSE
%{perl_vendorlib}/Test
%{_mandir}/man3/*

%changelog
* Tue Sep 13 2005 Ralf Corsepius  - 1.02-1
- Spec file cleanup.
- FE submission.

* Wed Jun 22 2005 Ralf Corsepius  - 1.02-0.pm.0
- Initial packman version.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-ClassAPI/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	14 Sep 2005 09:36:49 -0000	1.1
+++ .cvsignore	14 Sep 2005 09:37:45 -0000	1.2
@@ -0,0 +1 @@
+Test-ClassAPI-1.02.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-ClassAPI/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	14 Sep 2005 09:36:49 -0000	1.1
+++ sources	14 Sep 2005 09:37:45 -0000	1.2
@@ -0,0 +1 @@
+f242a7d8ca652d7207a50461e328dafc  Test-ClassAPI-1.02.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep 14 07:39:51 2005
From: fedora-extras-commits at redhat.com (Gavin Henry (ghenry))
Date: Wed, 14 Sep 2005 03:39:51 -0400
Subject: rpms/rdiff-backup/FC-4 .cvsignore, 1.3, 1.4 rdiff-backup.spec, 1.9,
	1.10 sources, 1.4, 1.5
Message-ID: <200509140739.j8E7dpPA004931@cvs-int.fedora.redhat.com>

Author: ghenry

Update of /cvs/extras/rpms/rdiff-backup/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4905

Modified Files:
	.cvsignore rdiff-backup.spec sources 
Log Message:

Committing in .
 
Modified Files:
    .cvsignore rdiff-backup.spec sources 

New version of rdiff-backup



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rdiff-backup/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	18 Aug 2005 11:07:41 -0000	1.3
+++ .cvsignore	14 Sep 2005 07:39:49 -0000	1.4
@@ -1 +1 @@
-rdiff-backup-1.0.0.tar.gz
+rdiff-backup-1.0.1.tar.gz


Index: rdiff-backup.spec
===================================================================
RCS file: /cvs/extras/rpms/rdiff-backup/FC-4/rdiff-backup.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- rdiff-backup.spec	18 Aug 2005 11:07:41 -0000	1.9
+++ rdiff-backup.spec	14 Sep 2005 07:39:49 -0000	1.10
@@ -1,6 +1,6 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
-Version: 1.0.0
+Version: 1.0.1
 Summary: Convenient and transparent local/remote incremental mirror/backup
 Name: rdiff-backup
 Release: 1%{?dist}
@@ -53,6 +53,9 @@
 %ghost %{python_sitearch}/rdiff_backup/*.pyo
 
 %changelog
+* Wed Sep 14 2005 Gavin Henry  - 0:1.0.1-1
+- New version
+
 * Thu Aug 15 2005 Gavin Henry  - 0:1.0.0-1
 - Latest version
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rdiff-backup/FC-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	18 Aug 2005 11:07:41 -0000	1.4
+++ sources	14 Sep 2005 07:39:49 -0000	1.5
@@ -1 +1 @@
-bfd0cd4361a8c34423f12a69fdd31517  rdiff-backup-1.0.0.tar.gz
+765e8c97c696eeb7b19006d9ed0967be  rdiff-backup-1.0.1.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep 14 22:36:14 2005
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Wed, 14 Sep 2005 18:36:14 -0400
Subject: rpms/gforth - New directory
Message-ID: <200509142236.j8EMaEYo030522@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/gforth
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30502/gforth

Log Message:
Directory /cvs/extras/rpms/gforth added to the repository




From fedora-extras-commits at redhat.com  Wed Sep 14 22:36:15 2005
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Wed, 14 Sep 2005 18:36:15 -0400
Subject: rpms/gforth/devel - New directory
Message-ID: <200509142236.j8EMaFxk030527@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/gforth/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30502/gforth/devel

Log Message:
Directory /cvs/extras/rpms/gforth/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Sep 14 22:36:35 2005
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Wed, 14 Sep 2005 18:36:35 -0400
Subject: rpms/gforth Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200509142236.j8EMaZ4M030576@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/gforth
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30547

Added Files:
	Makefile import.log 
Log Message:
Setup of module gforth


--- NEW FILE Makefile ---
# Top level Makefile for module gforth
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Wed Sep 14 22:36:36 2005
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Wed, 14 Sep 2005 18:36:36 -0400
Subject: rpms/gforth/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200509142236.j8EMaaL5030581@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/gforth/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30547/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module gforth


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Wed Sep 14 22:38:37 2005
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Wed, 14 Sep 2005 18:38:37 -0400
Subject: rpms/gforth import.log,1.1,1.2
Message-ID: <200509142238.j8EMcb0L030667@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/gforth
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30630

Modified Files:
	import.log 
Log Message:
auto-import gforth-0.6.2-5 on branch devel from gforth-0.6.2-5.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/gforth/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	14 Sep 2005 22:36:33 -0000	1.1
+++ import.log	14 Sep 2005 22:38:35 -0000	1.2
@@ -0,0 +1 @@
+gforth-0_6_2-5:HEAD:gforth-0.6.2-5.src.rpm:1126737507



From fedora-extras-commits at redhat.com  Wed Sep 14 22:38:37 2005
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Wed, 14 Sep 2005 18:38:37 -0400
Subject: rpms/gforth/devel gforth-shebang.patch, NONE, 1.1 gforth.patch, NONE,
	1.1 gforth.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200509142238.j8EMcbS1030677@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/gforth/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30630/devel

Modified Files:
	.cvsignore sources 
Added Files:
	gforth-shebang.patch gforth.patch gforth.spec 
Log Message:
auto-import gforth-0.6.2-5 on branch devel from gforth-0.6.2-5.src.rpm

gforth-shebang.patch:

--- NEW FILE gforth-shebang.patch ---
--- gforth-0.6.2/filedump.fs.shebang	2005-09-13 00:57:01.000000000 +0200
+++ gforth-0.6.2/filedump.fs	2005-09-13 00:59:15.000000000 +0200
@@ -1,4 +1,4 @@
-#! /usr/local/lib/gforth/0.2.0/kernel.fi
+#! /usr/bin/gforth
 \ file hex dump
 
 \ Copyright (C) 1997,2002,2003 Free Software Foundation, Inc.
--- gforth-0.6.2/httpd.fs.shebang	2005-09-13 00:57:11.000000000 +0200
+++ gforth-0.6.2/httpd.fs	2005-09-13 01:00:01.000000000 +0200
@@ -1,4 +1,4 @@
-#! /usr/local/bin/gforth
+#! /usr/bin/gforth
 
 \ Copyright (C) 2000,2002,2003 Free Software Foundation, Inc.
 
@@ -22,7 +22,7 @@
 
 require string.fs
 
-Variable DocumentRoot  s" /usr/local/httpd/htdocs/" DocumentRoot $!
+Variable DocumentRoot  s" /var/www/html/" DocumentRoot $!
 Variable UserDir       s" .html-data/"              UserDir      $!
 
 Variable url
--- gforth-0.6.2/sieve.fs.shebang	2005-09-13 00:57:27.000000000 +0200
+++ gforth-0.6.2/sieve.fs	2005-09-13 01:00:15.000000000 +0200
@@ -1,4 +1,4 @@
-#! /usr/stud/paysan/bin/forth
+#! /usr/bin/gforth
 
 DECIMAL
 : SECS TIME&DATE  2DROP DROP  60 * + 60 * + ;
--- gforth-0.6.2/siev.fs.shebang	2005-09-13 00:57:35.000000000 +0200
+++ gforth-0.6.2/siev.fs	2005-09-13 01:00:27.000000000 +0200
@@ -1,4 +1,4 @@
-\ #! /usr/stud/paysan/bin/forth
+\ #! /usr/bin/gforth
 
 DECIMAL
 \ : SECS TIME&DATE  SWAP 60 * + SWAP 3600 * +  NIP NIP NIP ;

gforth.patch:

--- NEW FILE gforth.patch ---
--- gforth-0.6.2/comp-i.fs.fix	2004-11-22 17:15:09.292698638 +0100
+++ gforth-0.6.2/comp-i.fs	2004-11-22 17:16:06.122803737 +0100
@@ -43,7 +43,7 @@
     if
 	." : images have the same base address; producing only a data-relocatable image" cr
     else
-	offset abs expected-offset <> abort" images produced by different engines"
+	\ offset abs expected-offset <> abort" images produced by different engines"
 	."  offset=" offset . cr
 	0 image1 i-field + ! 0 image2 i-field + !
     endif


--- NEW FILE gforth.spec ---
Name:           gforth
Version:        0.6.2
Release:        5
Summary:        Fast and portable implementation of the ANS Forth language

Group:          Development/Languages
License:        GPL
URL:            http://www.jwdt.com/~paysan/gforth.html
Source:         http://www.complang.tuwien.ac.at/forth/gforth/gforth-0.6.2.tar.gz
Patch0:		gforth.patch
Patch1:		gforth-shebang.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires(post): /sbin/install-info
Requires(postun): /sbin/install-info

%description
Gforth is a fast and portable implementation of the ANS Forth
language. It works nicely with the Emacs editor, offers some nice
features such as input completion and history, backtraces, a
decompiler and a powerful locals facility, and it even has a
manual. Gforth combines traditional implementation techniques with
newer techniques for portability and performance performance: its
inner innerpreter is direct threaded with several optimizations, but
you can also use a traditional-style indirect threaded interpreter.

%define emacs_sitestart_d  %{_datadir}/emacs/site-lisp/site-start.d
%define emacs_site_lisp  %{_datadir}/emacs/site-lisp
%define xemacs_sitestart_d %{_datadir}/xemacs/site-packages/lisp/site-start.d
%define xemacs_site_lisp %{_datadir}/xemacs/site-packages/lisp
%define gforth_datadir %{_datadir}/gforth

%prep
%setup -q
%patch0 -p1
%patch1 -p1


%build
%configure
# %{_smp_mflags} breaks the build
make libdir=%{_libdir}


%install
rm -rf $RPM_BUILD_ROOT
%makeinstall
cat > $RPM_BUILD_ROOT%{gforth_datadir}/site-forth/siteinit.fs < $RPM_BUILD_ROOT%{gforth_datadir}/emacs/gforth-init.el </dev/null || :


%postun
if [ $1 = 0 ]; then
    /sbin/install-info --delete %{_infodir}/%{name}.info.gz %{_infodir}/dir 2>/dev/null || :
fi


%clean
rm -rf $RPM_BUILD_ROOT


%triggerin -- emacs-common
if [ -d %{emacs_sitestart_d} ]; then
  ln -sf %{gforth_datadir}/emacs/gforth-init.el %{emacs_sitestart_d} || :
  ln -sf %{gforth_datadir}/emacs/gforth.el %{emacs_site_lisp} || :
fi

%triggerin -- xemacs-common
if [ -d %{xemacs_sitestart_d} ]; then
  ln -sf %{gforth_datadir}/emacs/gforth-init.el %{xemacs_sitestart_d} || :
  ln -sf %{gforth_datadir}/emacs/gforth.el %{xemacs_site_lisp} || :
fi


%triggerun -- emacs-common
if [ $2 = 0 ]; then
  rm -f %{emacs_sitestart_d}/gforth-init.el* || :
  rm -f %{emacs_site_lisp}/gforth.el* || :
fi


%triggerun -- xemacs-common
if [ $2 = 0 ]; then
  rm -f %{xemacs_sitestart_d}/gforth-init.el* || :
  rm -f %{xemacs_site_lisp}/gforth.el* || :
fi


%files 
%defattr(-, root, root)
%doc COPYING COPYING.DOC README README.vmgen NEWS NEWS.vmgen AUTHORS BUGS ChangeLog
%{_bindir}/*
%{_infodir}/*
%{_datadir}/gforth
%{_libdir}/gforth
%{_mandir}/man1/*
%ghost %{_datadir}/*emacs


%changelog
* Wed Sep 14 2005 Gerard Milmeister  - 0.6.2-5
- changes to the trigger code

* Wed Sep 14 2005 Gerard Milmeister  - 0.6.2-4
- use triggers to install (x)emacs files
- create not-empty siteinit.fs

* Tue Sep 13 2005 Gerard Milmeister  - 0.6.2-3
- fix for building on x86_64
- patch fixing shebang executable path

* Sat Mar 19 2005 Gerard Milmeister  - 0.6.2-2
- Included gforth.el

* Sun Feb 13 2005 Gerard Milmeister  - 0:0.6.2-1
- Included patch for exec-shield

* Wed Oct 15 2003 Gerard Milmeister  - 0:0.6.2-0.fdr.1
- First Fedora release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gforth/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	14 Sep 2005 22:36:34 -0000	1.1
+++ .cvsignore	14 Sep 2005 22:38:35 -0000	1.2
@@ -0,0 +1 @@
+gforth-0.6.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gforth/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	14 Sep 2005 22:36:34 -0000	1.1
+++ sources	14 Sep 2005 22:38:35 -0000	1.2
@@ -0,0 +1 @@
+869112bd762b07fc4d2038a2d9965148  gforth-0.6.2.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep 14 22:41:39 2005
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Wed, 14 Sep 2005 18:41:39 -0400
Subject: rpms/gforth/devel gforth.spec,1.1,1.2
Message-ID: <200509142241.j8EMfdvf030754@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/gforth/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30735

Modified Files:
	gforth.spec 
Log Message:



Index: gforth.spec
===================================================================
RCS file: /cvs/extras/rpms/gforth/devel/gforth.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gforth.spec	14 Sep 2005 22:38:35 -0000	1.1
+++ gforth.spec	14 Sep 2005 22:41:37 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           gforth
 Version:        0.6.2
-Release:        5
+Release:        5%{?dist}
 Summary:        Fast and portable implementation of the ANS Forth language
 
 Group:          Development/Languages



From fedora-extras-commits at redhat.com  Thu Sep 15 00:44:14 2005
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Wed, 14 Sep 2005 20:44:14 -0400
Subject: owners owners.list,1.207,1.208
Message-ID: <200509150044.j8F0iEdE001856@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1837

Modified Files:
	owners.list 
Log Message:
- Add python-myghty



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.207
retrieving revision 1.208
diff -u -r1.207 -r1.208
--- owners.list	14 Sep 2005 18:33:58 -0000	1.207
+++ owners.list	15 Sep 2005 00:44:12 -0000	1.208
@@ -821,6 +821,7 @@
 Fedora Extras|python-kid|A simple and pythonic XML template language|icon at linux.duke.edu|extras-qa at fedoraproject.org|
 Fedora Extras|python-logilab-common|Common libraries for Logilab projects|icon at linux.duke.edu|extras-qa at fedoraproject.org|
 Fedora Extras|python-matplotlib|Python plotting library|orion at cora.nwra.com|extras-qa at fedoraproject.org|
+Fedora Extras|python-myghty|A Python-based templating system derived from HTML::Mason|lmacken at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|python-numarray|Python array manipulation and computational library|orion at cora.nwra.com|extras-qa at fedoraproject.org|
 Fedora Extras|python-numeric|Fast multidimensional array functions for Python|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|python-protocols|PyProtocols 'adapt()' implementation|shahms at shahms.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Thu Sep 15 00:47:19 2005
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Wed, 14 Sep 2005 20:47:19 -0400
Subject: owners owners.list,1.208,1.209
Message-ID: <200509150047.j8F0lJ5C001903@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1884

Modified Files:
	owners.list 
Log Message:
Taking over orphaned packages.


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.208
retrieving revision 1.209
diff -u -r1.208 -r1.209
--- owners.list	15 Sep 2005 00:44:12 -0000	1.208
+++ owners.list	15 Sep 2005 00:47:17 -0000	1.209
@@ -231,7 +231,7 @@
 Fedora Extras|gkrellm-volume|GKrellM volume plugin|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|gkrellm-weather|GKrellWeather is a weather plugin for GKrellM|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|gktools|GUI utilities for KerberosV tickets|nos at utelsystems.com|extras-qa at fedoraproject.org|
-Fedora Extras|gl-117|GL-117 is an action flight simulator|pmatilai at laiskiainen.org|extras-qa at fedoraproject.org|
+Fedora Extras|gl-117|GL-117 is an action flight simulator|steve at silug.org|extras-qa at fedoraproject.org|
 Fedora Extras|glabels|A program for creating labels and business cards for GNOME|jspaleta at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|glibmm24|A C++ interface for GTK2 (a GUI library for X)|denisleroy at yahoo.com|extras-qa at fedoraproject.org|
 Fedora Extras|Glide3|Glide3 runtime for the 3Dfx Voodoo family of cards|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
@@ -925,7 +925,7 @@
 Fedora Extras|straw|GNOME desktop news aggregator|colin at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|stripesnoop|Magnetic Stripe Reader|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|suck|Suck - download news from remote NNTP server|Jochen at herr-schmitt.de|extras-qa at fedoraproject.org|
-Fedora Extras|supertux|SuperTux is a jump'n run like game similar to Mario Bros|pmatilai at laiskiainen.org|extras-qa at fedoraproject.org|
+Fedora Extras|supertux|SuperTux is a jump'n run like game similar to Mario Bros|steve at silug.org|extras-qa at fedoraproject.org|
 Fedora Extras|svgalib|Low-level fullscreen SVGA graphics library|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|swatch|A tool for actively monitoring log files|jpo at di.uminho.pt|extras-qa at fedoraproject.org|
 Fedora Extras|sword|Free Bible Software Project|mpeters at mac.com|extras-qa at fedoraproject.org|
@@ -975,8 +975,8 @@
 Fedora Extras|treecc|Tree Compiler Compiler|compton at pcompton.com|extras-qa at fedoraproject.org|
 Fedora Extras|tripwire|An IDS (Intrusion Detection System)|tripwire-devel at genesis-x.nildram.co.uk|extras-qa at fedoraproject.org|
 Fedora Extras|ttf2pt1|TrueType to Adobe Type 1 converter|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
-Fedora Extras|tuxpaint|Drawing program designed for young children|pmatilai at laiskiainen.org|extras-qa at fedoraproject.org|
-Fedora Extras|tuxtype2|Tux Typing is an educational typing tutor for children|pmatilai at laiskiainen.org|extras-qa at fedoraproject.org|
+Fedora Extras|tuxpaint|Drawing program designed for young children|steve at silug.org|extras-qa at fedoraproject.org|
+Fedora Extras|tuxtype2|Tux Typing is an educational typing tutor for children|steve at silug.org|extras-qa at fedoraproject.org|
 Fedora Extras|ucarp|Common Address Redundancy Protocol (CARP) for Unix|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|ucl|Portable lossless data compression library|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|udftools|Linux UDF Filesystem userspace utilities|matthias at rpmforge.net|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Thu Sep 15 02:35:32 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 14 Sep 2005 22:35:32 -0400
Subject: rpms/srecord - New directory
Message-ID: <200509150235.j8F2ZWlu005143@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/srecord
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5123/srecord

Log Message:
Directory /cvs/extras/rpms/srecord added to the repository




From fedora-extras-commits at redhat.com  Thu Sep 15 02:35:32 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 14 Sep 2005 22:35:32 -0400
Subject: rpms/srecord/devel - New directory
Message-ID: <200509150235.j8F2ZWdn005148@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/srecord/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5123/srecord/devel

Log Message:
Directory /cvs/extras/rpms/srecord/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Sep 15 02:35:51 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 14 Sep 2005 22:35:51 -0400
Subject: rpms/srecord Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200509150235.j8F2Zpr9005203@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/srecord
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5168

Added Files:
	Makefile import.log 
Log Message:
Setup of module srecord


--- NEW FILE Makefile ---
# Top level Makefile for module srecord
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Thu Sep 15 02:35:51 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 14 Sep 2005 22:35:51 -0400
Subject: rpms/srecord/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200509150235.j8F2ZpMV005208@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/srecord/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5168/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module srecord


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Thu Sep 15 02:36:27 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 14 Sep 2005 22:36:27 -0400
Subject: rpms/srecord import.log,1.1,1.2
Message-ID: <200509150236.j8F2aRJY005271@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/srecord
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5236

Modified Files:
	import.log 
Log Message:
auto-import srecord-1.22-2 on branch devel from srecord-1.22-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/srecord/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	15 Sep 2005 02:35:49 -0000	1.1
+++ import.log	15 Sep 2005 02:36:25 -0000	1.2
@@ -0,0 +1 @@
+srecord-1_22-2:HEAD:srecord-1.22-2.src.rpm:1126751776



From fedora-extras-commits at redhat.com  Thu Sep 15 02:36:27 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 14 Sep 2005 22:36:27 -0400
Subject: rpms/srecord/devel srecord.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200509150236.j8F2aRXP005278@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/srecord/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5236/devel

Modified Files:
	.cvsignore sources 
Added Files:
	srecord.spec 
Log Message:
auto-import srecord-1.22-2 on branch devel from srecord-1.22-2.src.rpm


--- NEW FILE srecord.spec ---
Name:           srecord
Version:        1.22
Release:        2%{?dist}
Summary:        Manipulate EPROM load files

Group:          Development/Tools
License:        GPL
URL:            http://srecord.sourceforge.net/
Source:         http://srecord.sourceforge.net/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  diffutils, sharutils, groff

%description
The SRecord package is a collection of powerful tools for manipulating
EPROM load files.

* The SRecord package understands a number of file formats: Motorola
  S-Record, Intel, Tektronix, Binary.  These file formats may be read
  and written.  Also C array definitions, for output only.

* The SRecord package has a number of tools: srec_cat for copying and
  and converting files, srec_cmp for comparing files and srec_info for
  printing summaries.

* The SRecord package has a number for filters: checksum to add checksums
  to the data, crop to keep address ranges, exclude to remove address
  ranges, fill to plug holes in the data, length to insert the data
  length, maximum to insert the data address maximum, minimum to insert
  the data address minimum, offset to adjust addresses, and split for
  wide data buses and memory striping.

More than one filter may be applied to each input file.  Different filters
may be applied to each input file.  All filters may be applied to all
file formats.


%prep
%setup -q

%build
%configure
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

%check
# Test scripts requirements: cmp, diff, uudecode
make sure

%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr (-,root,root,-)
%doc LICENSE BUILDING README
%{_bindir}/*
%{_mandir}/man1/*.1*
%{_mandir}/man5/*.5*


%changelog
* Thu Sep 15 2005 Jose Pedro Oliveira  - 1.22-2
- Updated the source tarball (PATCHLEVEL "1.22.D002").
  The author repackages updates without changing the tarball version (ARGH!).

* Mon Sep 12 2005 Jose Pedro Oliveira  - 1.22-1
- Update to 1.22.

* Sun Aug  7 2005 Jose Pedro Oliveira  - 1.21-1
- Version 1.21.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/srecord/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	15 Sep 2005 02:35:49 -0000	1.1
+++ .cvsignore	15 Sep 2005 02:36:25 -0000	1.2
@@ -0,0 +1 @@
+srecord-1.22.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/srecord/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	15 Sep 2005 02:35:49 -0000	1.1
+++ sources	15 Sep 2005 02:36:25 -0000	1.2
@@ -0,0 +1 @@
+d67c70be352486db6a9c0929a4d8f08e  srecord-1.22.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep 15 02:40:10 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 14 Sep 2005 22:40:10 -0400
Subject: owners owners.list,1.209,1.210
Message-ID: <200509150240.j8F2eAnI005387@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5368

Modified Files:
	owners.list 
Log Message:
New package: srecord


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.209
retrieving revision 1.210
diff -u -r1.209 -r1.210
--- owners.list	15 Sep 2005 00:47:17 -0000	1.209
+++ owners.list	15 Sep 2005 02:40:08 -0000	1.210
@@ -919,6 +919,7 @@
 Fedora Extras|sqlite2|Embeddable SQL engine in a C library|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
 Fedora Extras|sqlite|An embeddable SQL engine in a C library|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
 Fedora Extras|squidGuard|Filter, redirector and access controller plugin for squid|oliver at linux-kernel.at|extras-qa at fedoraproject.org|
+Fedora Extras|srecord|Manipulate EPROM load files|jpo at di.uminho.pt|extras-qa at fedoraproject.org|
 Fedora Extras|starfighter|For bugs related to the starfighter component|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|stellarium|A photo-realistic nightsky renderer|Jochen at herr-schmitt.de|extras-qa at fedoraproject.org|
 Fedora Extras|stow|Manage the installation of software packages from source|gauret at free.fr|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Thu Sep 15 02:56:27 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Wed, 14 Sep 2005 22:56:27 -0400
Subject: rpms/perl-Params-Util - New directory
Message-ID: <200509150256.j8F2uRej005676@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Params-Util
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5652/perl-Params-Util

Log Message:
Directory /cvs/extras/rpms/perl-Params-Util added to the repository




From fedora-extras-commits at redhat.com  Thu Sep 15 02:56:27 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Wed, 14 Sep 2005 22:56:27 -0400
Subject: rpms/perl-Params-Util/devel - New directory
Message-ID: <200509150256.j8F2uRCq005681@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Params-Util/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5652/perl-Params-Util/devel

Log Message:
Directory /cvs/extras/rpms/perl-Params-Util/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Sep 15 02:56:57 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Wed, 14 Sep 2005 22:56:57 -0400
Subject: rpms/perl-Params-Util Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200509150256.j8F2uvLU005726@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Params-Util
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5697

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-Params-Util


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Params-Util
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Thu Sep 15 02:56:58 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Wed, 14 Sep 2005 22:56:58 -0400
Subject: rpms/perl-Params-Util/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200509150256.j8F2uwX3005731@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Params-Util/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5697/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Params-Util


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Thu Sep 15 02:57:55 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Wed, 14 Sep 2005 22:57:55 -0400
Subject: rpms/perl-Params-Util import.log,1.1,1.2
Message-ID: <200509150258.j8F2wP2e005804@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Params-Util
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5765

Modified Files:
	import.log 
Log Message:
auto-import perl-Params-Util-0.05-2 on branch devel from perl-Params-Util-0.05-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Params-Util/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	15 Sep 2005 02:56:55 -0000	1.1
+++ import.log	15 Sep 2005 02:57:52 -0000	1.2
@@ -0,0 +1 @@
+perl-Params-Util-0_05-2:HEAD:perl-Params-Util-0.05-2.src.rpm:1126753059



From fedora-extras-commits at redhat.com  Thu Sep 15 02:57:55 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Wed, 14 Sep 2005 22:57:55 -0400
Subject: rpms/perl-Params-Util/devel perl-Params-Util.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200509150258.j8F2wP1c005808@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Params-Util/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5765/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Params-Util.spec 
Log Message:
auto-import perl-Params-Util-0.05-2 on branch devel from perl-Params-Util-0.05-2.src.rpm


--- NEW FILE perl-Params-Util.spec ---
Name: 		perl-Params-Util
Version: 	0.05
Release: 	2%{?dist}
Summary: 	Simple standalone param-checking functions
License: 	GPL or Artistic
Group: 		Development/Libraries
URL: 		http://search.cpan.org/dist/Params-Util/
Source0: 	http://search.cpan.org/CPAN/authors/id/A/AD/ADAMK/Params-Util-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:  	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
BuildArch: 	noarch

BuildRequires:	perl(Test::More) >= 0.47
BuildRequires:	perl(File::Spec) >= 0.82
BuildRequires:  perl(Scalar::Util) >= 1.11
BuildRequires:	perl(ExtUtils::AutoInstall) >= 0.49

# Required by the tests
BuildRequires:  perl(Test::Pod) >= 1.00

%description
Params::Util provides a basic set of importable functions that 
makes checking parameters a hell of a lot easier.

%prep
%setup -q -n Params-Util-%{version}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'
find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';'
chmod -R u+w $RPM_BUILD_ROOT/*

%clean
rm -rf $RPM_BUILD_ROOT

%check
make test

%files
%defattr(-,root,root,-)
%doc Changes LICENSE
%{perl_vendorlib}/Params
%{_mandir}/man3/*

%changelog
* Tue Sep 14 2005 Ralf Corsepius  - 0.05-2
- Add BR: perl(ExtUtils::AutoInstall) and core deps.

* Tue Sep 14 2005 Ralf Corsepius  - 0.05-1
- Initial version.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Params-Util/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	15 Sep 2005 02:56:56 -0000	1.1
+++ .cvsignore	15 Sep 2005 02:57:53 -0000	1.2
@@ -0,0 +1 @@
+Params-Util-0.05.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Params-Util/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	15 Sep 2005 02:56:56 -0000	1.1
+++ sources	15 Sep 2005 02:57:53 -0000	1.2
@@ -0,0 +1 @@
+5d3f1abd93c0fec2e7cfe37d30ce48dc  Params-Util-0.05.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep 15 03:07:28 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Wed, 14 Sep 2005 23:07:28 -0400
Subject: rpms/perl-ExtUtils-AutoInstall - New directory
Message-ID: <200509150307.j8F37S40007223@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-ExtUtils-AutoInstall
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7203/perl-ExtUtils-AutoInstall

Log Message:
Directory /cvs/extras/rpms/perl-ExtUtils-AutoInstall added to the repository




From fedora-extras-commits at redhat.com  Thu Sep 15 03:07:29 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Wed, 14 Sep 2005 23:07:29 -0400
Subject: rpms/perl-ExtUtils-AutoInstall/devel - New directory
Message-ID: <200509150307.j8F37TDH007228@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-ExtUtils-AutoInstall/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7203/perl-ExtUtils-AutoInstall/devel

Log Message:
Directory /cvs/extras/rpms/perl-ExtUtils-AutoInstall/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Sep 15 03:08:09 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Wed, 14 Sep 2005 23:08:09 -0400
Subject: rpms/perl-ExtUtils-AutoInstall Makefile, NONE, 1.1 import.log, NONE,
	1.1
Message-ID: <200509150308.j8F389mt007262@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-ExtUtils-AutoInstall
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7248

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-ExtUtils-AutoInstall


--- NEW FILE Makefile ---
# Top level Makefile for module perl-ExtUtils-AutoInstall
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Thu Sep 15 03:08:26 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Wed, 14 Sep 2005 23:08:26 -0400
Subject: rpms/perl-ExtUtils-AutoInstall/devel .cvsignore, NONE, 1.1 Makefile,
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <200509150308.j8F38Qk6007288@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-ExtUtils-AutoInstall/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7248/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-ExtUtils-AutoInstall


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Thu Sep 15 03:10:24 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Wed, 14 Sep 2005 23:10:24 -0400
Subject: rpms/perl-ExtUtils-AutoInstall import.log,1.1,1.2
Message-ID: <200509150310.j8F3AsFc007387@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-ExtUtils-AutoInstall
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7337

Modified Files:
	import.log 
Log Message:
auto-import perl-ExtUtils-AutoInstall-0.63-2 on branch devel from perl-ExtUtils-AutoInstall-0.63-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-ExtUtils-AutoInstall/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	15 Sep 2005 03:08:07 -0000	1.1
+++ import.log	15 Sep 2005 03:10:19 -0000	1.2
@@ -0,0 +1 @@
+perl-ExtUtils-AutoInstall-0_63-2:HEAD:perl-ExtUtils-AutoInstall-0.63-2.src.rpm:1126753775



From fedora-extras-commits at redhat.com  Thu Sep 15 03:10:29 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Wed, 14 Sep 2005 23:10:29 -0400
Subject: rpms/perl-ExtUtils-AutoInstall/devel perl-ExtUtils-AutoInstall.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200509150310.j8F3AxfQ007391@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-ExtUtils-AutoInstall/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7337/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-ExtUtils-AutoInstall.spec 
Log Message:
auto-import perl-ExtUtils-AutoInstall-0.63-2 on branch devel from perl-ExtUtils-AutoInstall-0.63-2.src.rpm


--- NEW FILE perl-ExtUtils-AutoInstall.spec ---
Name: 		perl-ExtUtils-AutoInstall
Version: 	0.63
Release: 	2%{?dist}
Summary: 	Automatic install of dependencies via CPAN
License: 	GPL or Artistic
Group: 		Development/Libraries
URL: 		http://search.cpan.org/dist/ExtUtils-AutoInstall/
Source: 	http://search.cpan.org/CPAN/authors/id/A/AU/AUTRIJUS/ExtUtils-AutoInstall-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:  	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
BuildArch: 	noarch

%{?_with_perl_CPANPLUS:BuildRequires:  perl(CPANPLUS) >= 0.043}
BuildRequires:  perl(Sort::Versions) >= 1.2
BuildRequires:	perl(LWP::Simple)

%description
ExtUtils::AutoInstall lets module writers specify a more sophisticated
form of dependency information than the PREREQ_PM option offered by 
ExtUtils::MakeMaker.

%prep
%setup -q -n ExtUtils-AutoInstall-%{version}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor --defaultdeps
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'
find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';'
chmod -R u+w $RPM_BUILD_ROOT/*

%clean
rm -rf $RPM_BUILD_ROOT

%check
make test

%files
%defattr(-,root,root,-)
# For license text(s), see the perl package
%doc Changes AUTHORS README TODO
%{perl_vendorlib}/ExtUtils
%{_mandir}/man3/*

%changelog
* Tue Sep 13 2005 Ralf Corsepius  - 0.63-1
- FE submission.

* Tue Sep 13 2005 Ralf Corsepius  - 0.63-0
- Update to 0.63.
- FE submission preps.

* Wed Jun 29 2005 Ralf Corsepius  - 0.61-0.pm.2
- Add Sort::Versions.

* Tue Jun 28 2005 Ralf Corsepius  - 0.61-0.pm.1
- Initial packman version.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-ExtUtils-AutoInstall/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	15 Sep 2005 03:08:24 -0000	1.1
+++ .cvsignore	15 Sep 2005 03:10:24 -0000	1.2
@@ -0,0 +1 @@
+ExtUtils-AutoInstall-0.63.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-ExtUtils-AutoInstall/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	15 Sep 2005 03:08:24 -0000	1.1
+++ sources	15 Sep 2005 03:10:24 -0000	1.2
@@ -0,0 +1 @@
+87ce9c44a8ab52e9b0553a2e46805525  ExtUtils-AutoInstall-0.63.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep 15 03:14:12 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Wed, 14 Sep 2005 23:14:12 -0400
Subject: rpms/perl-ExtUtils-AutoInstall/devel perl-ExtUtils-AutoInstall.spec,
	1.1, 1.2
Message-ID: <200509150314.j8F3ECmm007447@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-ExtUtils-AutoInstall/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7428

Modified Files:
	perl-ExtUtils-AutoInstall.spec 
Log Message:
Spec file cleanup


Index: perl-ExtUtils-AutoInstall.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-ExtUtils-AutoInstall/devel/perl-ExtUtils-AutoInstall.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-ExtUtils-AutoInstall.spec	15 Sep 2005 03:10:24 -0000	1.1
+++ perl-ExtUtils-AutoInstall.spec	15 Sep 2005 03:14:10 -0000	1.2
@@ -1,6 +1,6 @@
 Name: 		perl-ExtUtils-AutoInstall
 Version: 	0.63
-Release: 	2%{?dist}
+Release: 	3%{?dist}
 Summary: 	Automatic install of dependencies via CPAN
 License: 	GPL or Artistic
 Group: 		Development/Libraries
@@ -48,15 +48,15 @@
 %{_mandir}/man3/*
 
 %changelog
+* Tue Sep 14 2005 Ralf Corsepius  - 0.63-3
+- Further spec file cleanup.
+
+* Tue Sep 14 2005 Ralf Corsepius  - 0.63-2
+- Spec file cleanup.
+
 * Tue Sep 13 2005 Ralf Corsepius  - 0.63-1
 - FE submission.
 
 * Tue Sep 13 2005 Ralf Corsepius  - 0.63-0
 - Update to 0.63.
 - FE submission preps.
-
-* Wed Jun 29 2005 Ralf Corsepius  - 0.61-0.pm.2
-- Add Sort::Versions.
-
-* Tue Jun 28 2005 Ralf Corsepius  - 0.61-0.pm.1
-- Initial packman version.



From fedora-extras-commits at redhat.com  Thu Sep 15 03:48:12 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Wed, 14 Sep 2005 23:48:12 -0400
Subject: rpms/perl-Class-Autouse - New directory
Message-ID: <200509150348.j8F3mCFD007721@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Class-Autouse
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7701/perl-Class-Autouse

Log Message:
Directory /cvs/extras/rpms/perl-Class-Autouse added to the repository




From fedora-extras-commits at redhat.com  Thu Sep 15 03:48:13 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Wed, 14 Sep 2005 23:48:13 -0400
Subject: rpms/perl-Class-Autouse/devel - New directory
Message-ID: <200509150348.j8F3mDjx007726@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Class-Autouse/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7701/perl-Class-Autouse/devel

Log Message:
Directory /cvs/extras/rpms/perl-Class-Autouse/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Sep 15 03:48:38 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Wed, 14 Sep 2005 23:48:38 -0400
Subject: rpms/perl-Class-Autouse Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200509150348.j8F3mcMg007775@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Class-Autouse
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7746

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-Class-Autouse


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Class-Autouse
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Thu Sep 15 03:48:39 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Wed, 14 Sep 2005 23:48:39 -0400
Subject: rpms/perl-Class-Autouse/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200509150348.j8F3mdKa007780@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Class-Autouse/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7746/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Class-Autouse


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Thu Sep 15 03:49:34 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Wed, 14 Sep 2005 23:49:34 -0400
Subject: rpms/perl-Class-Autouse import.log,1.1,1.2
Message-ID: <200509150349.j8F3nYbs007849@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Class-Autouse
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7814

Modified Files:
	import.log 
Log Message:
auto-import perl-Class-Autouse-1.20-1 on branch devel from perl-Class-Autouse-1.20-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-Autouse/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	15 Sep 2005 03:48:36 -0000	1.1
+++ import.log	15 Sep 2005 03:49:32 -0000	1.2
@@ -0,0 +1 @@
+perl-Class-Autouse-1_20-1:HEAD:perl-Class-Autouse-1.20-1.src.rpm:1126756158



From fedora-extras-commits at redhat.com  Thu Sep 15 03:49:35 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Wed, 14 Sep 2005 23:49:35 -0400
Subject: rpms/perl-Class-Autouse/devel perl-Class-Autouse.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200509150349.j8F3nZjP007856@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Class-Autouse/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7814/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Class-Autouse.spec 
Log Message:
auto-import perl-Class-Autouse-1.20-1 on branch devel from perl-Class-Autouse-1.20-1.src.rpm


--- NEW FILE perl-Class-Autouse.spec ---
Name: 		perl-Class-Autouse
Version: 	1.20
Release: 	1%{?dist}
Summary: 	Run-time class loading on first method call
License: 	GPL or Artistic
Group: 		Development/Libraries
URL: 		http://search.cpan.org/dist/Class-Autouse/
Source0: 	http://search.cpan.org/CPAN/authors/id/A/AD/ADAMK/Class-Autouse-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:  	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
BuildArch: 	noarch

BuildRequires: 	perl(Test::More) >= 0.47
BuildRequires: 	perl(Carp) >= 1.03
BuildRequires: 	perl(File::Spec) >= 0.82
BuildRequires: 	perl(List::Util) >= 1.11

# for improved tests
BuildRequires: 	perl(Test::Pod) >= 1.00

%description
Class::Autouse allows you to specify a class the will only load when a
method of that class is called. For large classes that might not be used
during the running of a program, such as Date::Manip, this can save you
large amounts of memory, and decrease the script load time.

%prep
%setup -q -n Class-Autouse-%{version}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'
find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';'
chmod -R u+w $RPM_BUILD_ROOT/*

%clean
rm -rf $RPM_BUILD_ROOT

%check
make test

%files
%defattr(-,root,root,-)
%doc Changes README LICENSE
%{perl_vendorlib}/Class
%{_mandir}/man3/*

%changelog
* Tue Sep 13 2005 Ralf Corsepius  - 1.20-1
- Spec cleanup.
- FE submission.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-Autouse/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	15 Sep 2005 03:48:37 -0000	1.1
+++ .cvsignore	15 Sep 2005 03:49:33 -0000	1.2
@@ -0,0 +1 @@
+Class-Autouse-1.20.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-Autouse/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	15 Sep 2005 03:48:37 -0000	1.1
+++ sources	15 Sep 2005 03:49:33 -0000	1.2
@@ -0,0 +1 @@
+746a4f415dd8c7267bcec07841022275  Class-Autouse-1.20.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep 15 03:54:33 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Wed, 14 Sep 2005 23:54:33 -0400
Subject: rpms/perl-Class-Autouse/devel perl-Class-Autouse.spec,1.1,1.2
Message-ID: <200509150354.j8F3sXiq008221@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Class-Autouse/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8202

Modified Files:
	perl-Class-Autouse.spec 
Log Message:
Spec cleanup.


Index: perl-Class-Autouse.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-Autouse/devel/perl-Class-Autouse.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Class-Autouse.spec	15 Sep 2005 03:49:33 -0000	1.1
+++ perl-Class-Autouse.spec	15 Sep 2005 03:54:30 -0000	1.2
@@ -1,6 +1,6 @@
 Name: 		perl-Class-Autouse
 Version: 	1.20
-Release: 	1%{?dist}
+Release: 	2%{?dist}
 Summary: 	Run-time class loading on first method call
 License: 	GPL or Artistic
 Group: 		Development/Libraries
@@ -18,6 +18,7 @@
 
 # for improved tests
 BuildRequires: 	perl(Test::Pod) >= 1.00
+BuildRequires:	perl(prefork)
 
 %description
 Class::Autouse allows you to specify a class the will only load when a
@@ -47,11 +48,14 @@
 
 %files
 %defattr(-,root,root,-)
-%doc Changes README LICENSE
+%doc Changes LICENSE
 %{perl_vendorlib}/Class
 %{_mandir}/man3/*
 
 %changelog
+* Thu Sep 15 2005 Ralf Corsepius  - 1.20-2
+- Spec cleanup.
+
 * Tue Sep 13 2005 Ralf Corsepius  - 1.20-1
 - Spec cleanup.
 - FE submission.



From fedora-extras-commits at redhat.com  Thu Sep 15 08:35:04 2005
From: fedora-extras-commits at redhat.com (Mark Cox (mjc))
Date: Thu, 15 Sep 2005 04:35:04 -0400
Subject: fedora-security/audit fc4,1.58,1.59
Message-ID: <200509150835.j8F8Z4Vl016362@cvs-int.fedora.redhat.com>

Author: mjc

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16337

Modified Files:
	fc4 
Log Message:
Catch up with email and fix my bad sorting of the names



Index: fc4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc4,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- fc4	13 Sep 2005 08:59:42 -0000	1.58
+++ fc4	15 Sep 2005 08:35:02 -0000	1.59
@@ -1,15 +1,16 @@
-Up to date CVE as of CVE email 20050911
-Up to date FC4 as of 20050911
+Up to date CVE as of CVE email 20050914
+Up to date FC4 as of 20050914
 
 ** are items that need attention
 
+2005-2876 backport (util-linux) [since FEDORA-2005-887]
+2005-2874 version (cups, fixed 1.1.23)
 2005-2873 ** kernel
-2005-2872 ** kernel
+2005-2872 version (kernel, fixed 2.6.12) [since FEDORA-2005-510]
 2005-2871 backport (firefox) [since FEDORA-2005-871]
 2005-2871 backport (mozilla) [since FEDORA-2005-873]
 2005-2871 VULNERABLE (thunderbird) (moderate only)
 2005-2811 version (net-snmp, not upstream gentoo only)
-2005-2802 version (kernel, fixed 2.6.12) [since FEDORA-2005-510]
 2005-2801 version (kernel, fixed 2.6.11)
 2005-2800 VULNERABLE (kernel)
 2005-2798 version (openssh, fixed 4.2) [since FEDORA-2005-860]
@@ -21,19 +22,12 @@
 2005-2693 backport (cvs) [since FEDORA-2005-790]
 2005-2672 VULNERABLE (lm_sensors) bz#166673
 2005-2666 ** openssh (hmm)
-2005-2558 ignore (mysql) not an issue
-2005-2499 backport (slocate) [since FEDORA-2005-770]
-2005-2496 backport (ntp, fixed 4.2.0b) ...0a-20040617-ntpd_guid.patch
-2005-2494 VULNERABLE (kdebase, fixed after 3.4.2) #166997
-2005-2491 VULNERABLE (python pcre)
-2005-2491 backport (pcre, fixed 6.2) [since FEDORA-2005-803]
-2005-2491 ignore (httpd, pcre uses system pcre)
-2005-2491 ignore (php, pcre uses system pcre)
 2005-2642 version (mutt, openbsd only)
 2005-2641 VULNERABLE (pam_ldap) bz#166164
 2005-2617 version (kernel, fixed 2.6.12.5) [since FEDORA-2005-820]
 2005-2602 VULNERABLE (firefox) probably
 2005-2602 VULNERABLE (thunderbird) probably
+2005-2558 ignore (mysql) not an issue
 2005-2558 VULNERABLE (mysql, fixed 4.1.13) probably
 2005-2555 backport (kernel, fixed 2.6.12.6pre) [since FEDORA-2005-820] patch-2.6.12.6pre.patch
 2005-2553 version (kernel, not 2.6)
@@ -43,7 +37,16 @@
 2005-2547 version (bluez-pin, fixed 2.19) not before 2.16
 2005-2541 ignore (tar) is documented behaviour
 2005-2500 version (kernel, flaw introduced after 2.6.12)
+2005-2499 backport (slocate) [since FEDORA-2005-770]
 2005-2498 version (php xml_rpc, fixed 1.4.0) [since FEDORA-2005-810]
+2005-2496 backport (ntp, fixed 4.2.0b) ...0a-20040617-ntpd_guid.patch
+2005-2494 VULNERABLE (kdebase, fixed after 3.4.2) bz#166997
+2005-2491 ignore (python, fc4 python does not contain pcre)
+2005-2491 backport (pcre, fixed 6.2) [since FEDORA-2005-803]
+2005-2491 ignore (httpd, pcre uses system pcre)
+2005-2491 ignore (php, pcre uses system pcre)
+2005-2492 VULNERABLE (kernel, fixed 2.6.13.1)
+2005-2490 VULNERABLE (kernel, fixed 2.6.13.1) bz#166249
 2005-2475 VULNERABLE (unzip) bz#164928
 2005-2471 backport (netpbm) [since FEDORA-2005-728]
 2005-2459 ignore (kernel, fixed 2.6.12.5) dropped as code path not possible



From fedora-extras-commits at redhat.com  Thu Sep 15 08:46:13 2005
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Thu, 15 Sep 2005 04:46:13 -0400
Subject: owners owners.list,1.210,1.211
Message-ID: <200509150846.j8F8kDmN016422@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16403

Modified Files:
	owners.list 
Log Message:



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.210
retrieving revision 1.211
diff -u -r1.210 -r1.211
--- owners.list	15 Sep 2005 02:40:08 -0000	1.210
+++ owners.list	15 Sep 2005 08:46:11 -0000	1.211
@@ -216,6 +216,7 @@
 Fedora Extras|general|For bugs not specific to any single component.|dkl at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|gentoo|Graphical file management program in GTK+ for Linux|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|geomview|An interactive 3D viewing program|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
+Fedora Extras|gforth|Fast and portable implementation of the ANS Forth language|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|ghasher|GUI hasher for GTK+ 2|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
 Fedora Extras|ghc|Glasgow Haskell Compiler|petersen at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|ghex|A binary editor for GNOME|fedora at leemhuis.info|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Thu Sep 15 10:07:00 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 15 Sep 2005 06:07:00 -0400
Subject: rpms/libnet/FC-3 Makefile,1.4,1.5
Message-ID: <200509151007.j8FA7VJi019636@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/libnet/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19581/FC-3

Modified Files:
	Makefile 
Log Message:
s/cppunit/libnet/g in Fedora Extras CVS framework Makefiles


Index: Makefile
===================================================================
RCS file: /cvs/extras/rpms/libnet/FC-3/Makefile,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Makefile	12 Sep 2005 21:14:48 -0000	1.4
+++ Makefile	15 Sep 2005 10:06:58 -0000	1.5
@@ -1,4 +1,4 @@
-# Makefile for source rpm: cppunit
+# Makefile for source rpm: libnet
 # $Id$
 NAME := libnet
 SPECFILE = $(firstword $(wildcard *.spec))



From fedora-extras-commits at redhat.com  Thu Sep 15 10:07:05 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 15 Sep 2005 06:07:05 -0400
Subject: rpms/libnet/FC-4 Makefile,1.4,1.5
Message-ID: <200509151007.j8FA7b7q019643@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/libnet/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19581/FC-4

Modified Files:
	Makefile 
Log Message:
s/cppunit/libnet/g in Fedora Extras CVS framework Makefiles


Index: Makefile
===================================================================
RCS file: /cvs/extras/rpms/libnet/FC-4/Makefile,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Makefile	12 Sep 2005 21:03:43 -0000	1.4
+++ Makefile	15 Sep 2005 10:07:03 -0000	1.5
@@ -1,4 +1,4 @@
-# Makefile for source rpm: cppunit
+# Makefile for source rpm: libnet
 # $Id$
 NAME := libnet
 SPECFILE = $(firstword $(wildcard *.spec))



From fedora-extras-commits at redhat.com  Thu Sep 15 10:07:31 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 15 Sep 2005 06:07:31 -0400
Subject: rpms/libnet/devel Makefile,1.4,1.5
Message-ID: <200509151007.j8FA7VCG019642@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/libnet/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19581/devel

Modified Files:
	Makefile 
Log Message:
s/cppunit/libnet/g in Fedora Extras CVS framework Makefiles


Index: Makefile
===================================================================
RCS file: /cvs/extras/rpms/libnet/devel/Makefile,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Makefile	12 Sep 2005 19:58:55 -0000	1.4
+++ Makefile	15 Sep 2005 10:07:29 -0000	1.5
@@ -1,4 +1,4 @@
-# Makefile for source rpm: cppunit
+# Makefile for source rpm: libnet
 # $Id$
 NAME := libnet
 SPECFILE = $(firstword $(wildcard *.spec))



From fedora-extras-commits at redhat.com  Thu Sep 15 10:08:04 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Thu, 15 Sep 2005 06:08:04 -0400
Subject: owners owners.list,1.211,1.212
Message-ID: <200509151008.j8FA84f9019666@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19590

Modified Files:
	owners.list 
Log Message:
Add perl-Class-Autouse


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.211
retrieving revision 1.212
diff -u -r1.211 -r1.212
--- owners.list	15 Sep 2005 08:46:11 -0000	1.211
+++ owners.list	15 Sep 2005 10:07:46 -0000	1.212
@@ -584,6 +584,7 @@
 Fedora Extras|perl-Chart|Perl modules for producing many types of charts|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Class-Accessor|Automated accessor generation|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Class-Accessor-Chained|Make chained accessors|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Class-Autouse|Run-time class loading on first method call|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Class-Container|Perl module for building frameworks of classes|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Class-Data-Inheritable|Inheritable, overridable class data|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Class-DBI|Simple Database Abstraction|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Thu Sep 15 10:10:20 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Thu, 15 Sep 2005 06:10:20 -0400
Subject: owners owners.list,1.212,1.213
Message-ID: <200509151010.j8FAAKFu019727@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19703

Modified Files:
	owners.list 
Log Message:
Add perl-Params-Util


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.212
retrieving revision 1.213
diff -u -r1.212 -r1.213
--- owners.list	15 Sep 2005 10:07:46 -0000	1.212
+++ owners.list	15 Sep 2005 10:10:18 -0000	1.213
@@ -703,6 +703,7 @@
 Fedora Extras|perl-OLE-Storage_Lite|Simple Class for OLE document interface|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-PAR-Dist|Toolkit for creating and manipulating Perl PAR distributions|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Params-Validate|Params-Validate Perl module|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Params-Util|Simple standalone param-checking functions|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-pmtools|A suite of small programs to help manage Perl modules|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-prefork|Optimized module loading for forking or non-forking processes|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Pod-Coverage|Checks if the documentation of a module is comprehensive|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Thu Sep 15 10:12:23 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Thu, 15 Sep 2005 06:12:23 -0400
Subject: owners owners.list,1.213,1.214
Message-ID: <200509151012.j8FACNTO019758@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19739

Modified Files:
	owners.list 
Log Message:
Add perl-ExtUtils-AutoInstall


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.213
retrieving revision 1.214
diff -u -r1.213 -r1.214
--- owners.list	15 Sep 2005 10:10:18 -0000	1.213
+++ owners.list	15 Sep 2005 10:12:21 -0000	1.214
@@ -626,6 +626,7 @@
 Fedora Extras|perl-Error|Error Perl module|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Exception-Class|Declare hierarchies of exception classes|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Exporter-Lite|Lightweight exporting of variables|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-ExtUtils-AutoInstall|Automatic install of dependencies via CPAN|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-ExtUtils-CBuilder|Compile and link C code for Perl modules|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-ExtUtils-Depends|Easily build XS extensions that depend on XS extensions|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-ExtUtils-ParseXS|Module and a script for converting Perl XS code into C code|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Thu Sep 15 10:19:16 2005
From: fedora-extras-commits at redhat.com (Marcin Garski (mgarski))
Date: Thu, 15 Sep 2005 06:19:16 -0400
Subject: owners owners.list,1.214,1.215
Message-ID: <200509151019.j8FAJGTB019824@cvs-int.fedora.redhat.com>

Author: mgarski

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19805

Modified Files:
	owners.list 
Log Message:
Add digikam.



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.214
retrieving revision 1.215
diff -u -r1.214 -r1.215
--- owners.list	15 Sep 2005 10:12:21 -0000	1.214
+++ owners.list	15 Sep 2005 10:19:13 -0000	1.215
@@ -126,6 +126,7 @@
 Fedora Extras|diag-ether|Diagnostic program for Ethernet adapters under Linux|anvil at livna.org|extras-qa at fedoraproject.org|
 Fedora Extras|diction|Identifies diction and style errors|icon at linux.duke.edu|extras-qa at fedoraproject.org|
 Fedora Extras|dietlibc|Small libc implementation|enrico.scholz at informatik.tu-chemnitz.de|extras-qa at fedoraproject.org|
+Fedora Extras|digikam|A digital camera accessing & photo management application|mgarski at post.pl|extras-qa at fedoraproject.org|
 Fedora Extras|dillo|Very small and fast GUI web browser|nos at utelsystems.com|extras-qa at fedoraproject.org|
 Fedora Extras|diradmin|User control management tool for LDAP directories|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|directfb|Graphics abstraction library for the Linux Framebuffer Device|thomas at apestaart.org|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Thu Sep 15 10:22:16 2005
From: fedora-extras-commits at redhat.com (Marcin Garski (mgarski))
Date: Thu, 15 Sep 2005 06:22:16 -0400
Subject: rpms/digikam - New directory
Message-ID: <200509151022.j8FAMG4L019918@cvs-int.fedora.redhat.com>

Author: mgarski

Update of /cvs/extras/rpms/digikam
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19894/digikam

Log Message:
Directory /cvs/extras/rpms/digikam added to the repository




From fedora-extras-commits at redhat.com  Thu Sep 15 10:22:17 2005
From: fedora-extras-commits at redhat.com (Marcin Garski (mgarski))
Date: Thu, 15 Sep 2005 06:22:17 -0400
Subject: rpms/digikam/devel - New directory
Message-ID: <200509151022.j8FAMHUS019923@cvs-int.fedora.redhat.com>

Author: mgarski

Update of /cvs/extras/rpms/digikam/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19894/digikam/devel

Log Message:
Directory /cvs/extras/rpms/digikam/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Sep 15 10:22:38 2005
From: fedora-extras-commits at redhat.com (Marcin Garski (mgarski))
Date: Thu, 15 Sep 2005 06:22:38 -0400
Subject: rpms/digikam Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200509151022.j8FAMc7Z019974@cvs-int.fedora.redhat.com>

Author: mgarski

Update of /cvs/extras/rpms/digikam
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19939

Added Files:
	Makefile import.log 
Log Message:
Setup of module digikam


--- NEW FILE Makefile ---
# Top level Makefile for module digikam
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Thu Sep 15 10:22:39 2005
From: fedora-extras-commits at redhat.com (Marcin Garski (mgarski))
Date: Thu, 15 Sep 2005 06:22:39 -0400
Subject: rpms/digikam/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200509151022.j8FAMdse019979@cvs-int.fedora.redhat.com>

Author: mgarski

Update of /cvs/extras/rpms/digikam/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19939/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module digikam


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Thu Sep 15 10:23:36 2005
From: fedora-extras-commits at redhat.com (Marcin Garski (mgarski))
Date: Thu, 15 Sep 2005 06:23:36 -0400
Subject: rpms/digikam import.log,1.1,1.2
Message-ID: <200509151024.j8FAO6m7020052@cvs-int.fedora.redhat.com>

Author: mgarski

Update of /cvs/extras/rpms/digikam
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20013

Modified Files:
	import.log 
Log Message:
auto-import digikam-0.7.4-2 on branch devel from digikam-0.7.4-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/digikam/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	15 Sep 2005 10:22:36 -0000	1.1
+++ import.log	15 Sep 2005 10:23:33 -0000	1.2
@@ -0,0 +1 @@
+digikam-0_7_4-2:HEAD:digikam-0.7.4-2.src.rpm:1126779845



From fedora-extras-commits at redhat.com  Thu Sep 15 10:23:36 2005
From: fedora-extras-commits at redhat.com (Marcin Garski (mgarski))
Date: Thu, 15 Sep 2005 06:23:36 -0400
Subject: rpms/digikam/devel digikam.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200509151023.j8FANa8Y020045@cvs-int.fedora.redhat.com>

Author: mgarski

Update of /cvs/extras/rpms/digikam/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20013/devel

Modified Files:
	.cvsignore sources 
Added Files:
	digikam.spec 
Log Message:
auto-import digikam-0.7.4-2 on branch devel from digikam-0.7.4-2.src.rpm


--- NEW FILE digikam.spec ---
Name:		digikam
Version:	0.7.4
Release:	2%{?dist}
Summary:	A digital camera accessing & photo management application

Group:		Applications/Multimedia
License:	GPL
URL:		http://www.digikam.org/
Source0:	http://dl.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	gphoto2-devel >= 2.0.0 imlib2-devel gdbm-devel >= 1.8.0
BuildRequires:	libkexif-devel >= 0.2 libkipi-devel >= 0.1 desktop-file-utils
BuildRequires:	gettext
Requires(post):	desktop-file-utils
Requires(postun): desktop-file-utils

%description
digiKam is an easy to use and powerful digital photo management application,
which makes importing, organizing and manipulating digital photos a "snap".
The photos can be organized in albums which are automatically sorted
chronologically. An easy to use interface is provided to connect to your
digital camera, preview the images and download and/or delete them.

digiKam buildin image editor makes the common photo correction a simple task.
The image editor is extensible via plugins.

%package devel
Summary:	Development files for %{name}
Group:		Development/Libraries
Requires:	%{name} = %{version}-%{release}

%description devel
This package contains the libraries, include files and other resources
needed to develop applications using %{name}.

%prep
%setup -q

%build
unset QTDIR || : ; . /etc/profile.d/qt.sh
export QTLIB=${QTDIR}/lib QTINC=${QTDIR}/include

%configure \
	--disable-rpath \
	--disable-debug
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT 

desktop-file-install --vendor fedora --delete-original \
	--dir $RPM_BUILD_ROOT%{_datadir}/applications \
	--add-category X-Fedora \
	--add-category Application \
	--add-category Photograph \
	--add-category Graphics \
	$RPM_BUILD_ROOT%{_datadir}/applnk/Graphics/%{name}.desktop

desktop-file-install --vendor fedora --delete-original \
	--dir $RPM_BUILD_ROOT%{_datadir}/applications \
	--add-category X-Fedora \
	--add-category Application \
	--add-category Photograph \
	--add-category Graphics \
	$RPM_BUILD_ROOT%{_datadir}/applications/kde/showfoto.desktop

%find_lang %{name}

%post
/sbin/ldconfig
update-desktop-database &> /dev/null ||:

touch --no-create %{_datadir}/icons/hicolor || :
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
	%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi

%postun
/sbin/ldconfig
update-desktop-database &> /dev/null ||:

touch --no-create %{_datadir}/icons/hicolor || :
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
	%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi

%clean
rm -rf $RPM_BUILD_ROOT

%files -f %name.lang
%defattr(-, root, root)
%doc AUTHORS ChangeLog COPYING HACKING README
%{_bindir}/*
%{_libdir}/libdigikam.la
%{_libdir}/libdigikam.so.*
%{_libdir}/kde3/digikamimageplugin_core.la
%{_libdir}/kde3/digikamimageplugin_core.so
%{_libdir}/kde3/kio_digikam*.la
%{_libdir}/kde3/kio_digikam*.so
%{_datadir}/applications/*.desktop
%{_datadir}/apps/digikam/
%{_datadir}/apps/showfoto/
%{_datadir}/icons/hicolor/*
%{_datadir}/services/digikam*
%{_datadir}/servicetypes/digikamimageplugin.desktop

%files devel
%defattr(-, root, root)
%{_includedir}/digikam/
%{_includedir}/digikam_export.h
%{_libdir}/libdigikam.so

%changelog
* Tue Sep 13 2005 Marcin Garski  0.7.4-2
- Spec improvements

* Mon Sep 12 2005 Marcin Garski  0.7.4-1
- Updated to version 0.7.4 & clean up for Fedora Extras

* Sat Jun 26 2004 Marcin Garski  0.6.2-1.fc2
- Updated to version 0.6.2

* Wed Jun 09 2004 Marcin Garski  0.6.2RC-1.fc2
- Initial specfile


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/digikam/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	15 Sep 2005 10:22:36 -0000	1.1
+++ .cvsignore	15 Sep 2005 10:23:34 -0000	1.2
@@ -0,0 +1 @@
+digikam-0.7.4.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/digikam/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	15 Sep 2005 10:22:37 -0000	1.1
+++ sources	15 Sep 2005 10:23:34 -0000	1.2
@@ -0,0 +1 @@
+3df53700ff78caca60cab4ea4116c7c5  digikam-0.7.4.tar.bz2



From fedora-extras-commits at redhat.com  Thu Sep 15 11:32:43 2005
From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters))
Date: Thu, 15 Sep 2005 07:32:43 -0400
Subject: rpms/gnomesword import.log,1.2,1.3
Message-ID: <200509151133.j8FBXDmJ021656@cvs-int.fedora.redhat.com>

Author: mpeters

Update of /cvs/extras/rpms/gnomesword
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21617

Modified Files:
	import.log 
Log Message:
auto-import gnomesword-2.1.2-2.2 on branch FC-4 from gnomesword-2.1.2-2.2.src.rpm
patch for x86_64


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/gnomesword/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	7 Jun 2005 12:04:30 -0000	1.2
+++ import.log	15 Sep 2005 11:32:40 -0000	1.3
@@ -1 +1,2 @@
 gnomesword-2_1_2-1:HEAD:gnomesword-2.1.2-1.src.rpm:1118145807
+gnomesword-2_1_2-2_2:FC-4:gnomesword-2.1.2-2.2.src.rpm:1126783889



From fedora-extras-commits at redhat.com  Thu Sep 15 11:32:43 2005
From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters))
Date: Thu, 15 Sep 2005 07:32:43 -0400
Subject: rpms/gnomesword/FC-4 gnomesword-2.1.2-gettext64.patch, NONE,
	1.1 gnomesword.spec, 1.3, 1.4
Message-ID: <200509151133.j8FBXDfx021659@cvs-int.fedora.redhat.com>

Author: mpeters

Update of /cvs/extras/rpms/gnomesword/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21617/FC-4

Modified Files:
	gnomesword.spec 
Added Files:
	gnomesword-2.1.2-gettext64.patch 
Log Message:
auto-import gnomesword-2.1.2-2.2 on branch FC-4 from gnomesword-2.1.2-2.2.src.rpm
patch for x86_64

gnomesword-2.1.2-gettext64.patch:

--- NEW FILE gnomesword-2.1.2-gettext64.patch ---
--- gnomesword-2.1.2/aclocal.m4.BAD	2005-09-04 15:56:31.000000000 -0500
+++ gnomesword-2.1.2/aclocal.m4	2005-09-04 15:56:47.000000000 -0500
@@ -144,7 +144,7 @@
         	[AC_TRY_LINK([
 #include 
 ],
-	          [return (int) dgettext ("","")],
+	          [return dgettext ("","") != 0],
 		  gt_cv_func_dgettext_libc=yes,
 	          gt_cv_func_dgettext_libc=no)
         	])
--- gnomesword-2.1.2/configure.BAD	2005-09-04 15:57:32.000000000 -0500
+++ gnomesword-2.1.2/configure	2005-09-04 16:00:29.000000000 -0500
@@ -22807,7 +22807,7 @@
 int
 main ()
 {
-return (int) dgettext ("","")
+return dgettext ("","") != 0
   ;
   return 0;
 }


Index: gnomesword.spec
===================================================================
RCS file: /cvs/extras/rpms/gnomesword/FC-4/gnomesword.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gnomesword.spec	13 Jun 2005 07:00:52 -0000	1.3
+++ gnomesword.spec	15 Sep 2005 11:32:41 -0000	1.4
@@ -1,12 +1,13 @@
 Name:           gnomesword           
 Version:        2.1.2
-Release:        2.1%{?dist}
+Release:        2.2%{?dist}
 Summary:        GNOME-based Bible research tool
 
 Group:          Applications/Text
 License:        GPL
 URL:            http://gnomesword.sourceforge.net/
 Source0:        http://easynews.dl.sourceforge.net/sourceforge/gnomesword/gnomesword-%{version}.tar.gz
+Patch0:         gnomesword-2.1.2-gettext64.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  sed >= 3.95
@@ -19,7 +20,7 @@
 BuildRequires:  libgnomeui-devel
 BuildRequires:  scrollkeeper
 # currently broken on x86_64
-ExcludeArch:    x86_64
+# ExcludeArch:    x86_64
 Requires(post):   scrollkeeper
 Requires(postun): scrollkeeper
 Obsoletes:      gnomesword2
@@ -33,7 +34,10 @@
 and other texts using your computer.
 
 %prep
-%setup -q 
+%setup -q
+%ifarch x86_64
+%patch0 -p1 -b .gettext64 
+%endif
 %{__sed} -i 's?\r??' doc/help/C/legal.xml
 %{__sed} -i 's?\r??' doc/help/fr/legal.xml
 
@@ -79,6 +83,10 @@
 
 
 %changelog
+* Thu Sep 15 2005 Michael A. Peters  - 2.1.2-2.2
+- trying patch suggested by Tom 'spot' Callaway to fix x86_64 bug
+- 160186
+
 * Sun Jun 12 2005 Michael A. Peters  - 2.1.2-2.1
 - Exclude x86_64 for now
 



From fedora-extras-commits at redhat.com  Thu Sep 15 11:40:02 2005
From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters))
Date: Thu, 15 Sep 2005 07:40:02 -0400
Subject: rpms/gnomesword/devel gnomesword-2.1.2-gettext64.patch, NONE,
	1.1 gnomesword.spec, 1.3, 1.4
Message-ID: <200509151140.j8FBe2Gk021804@cvs-int.fedora.redhat.com>

Author: mpeters

Update of /cvs/extras/rpms/gnomesword/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21762/devel

Modified Files:
	gnomesword.spec 
Added Files:
	gnomesword-2.1.2-gettext64.patch 
Log Message:
auto-import gnomesword-2.1.2-2.2 on branch devel from gnomesword-2.1.2-2.2.src.rpm
patch for x86_64

gnomesword-2.1.2-gettext64.patch:

--- NEW FILE gnomesword-2.1.2-gettext64.patch ---
--- gnomesword-2.1.2/aclocal.m4.BAD	2005-09-04 15:56:31.000000000 -0500
+++ gnomesword-2.1.2/aclocal.m4	2005-09-04 15:56:47.000000000 -0500
@@ -144,7 +144,7 @@
         	[AC_TRY_LINK([
 #include 
 ],
-	          [return (int) dgettext ("","")],
+	          [return dgettext ("","") != 0],
 		  gt_cv_func_dgettext_libc=yes,
 	          gt_cv_func_dgettext_libc=no)
         	])
--- gnomesword-2.1.2/configure.BAD	2005-09-04 15:57:32.000000000 -0500
+++ gnomesword-2.1.2/configure	2005-09-04 16:00:29.000000000 -0500
@@ -22807,7 +22807,7 @@
 int
 main ()
 {
-return (int) dgettext ("","")
+return dgettext ("","") != 0
   ;
   return 0;
 }


Index: gnomesword.spec
===================================================================
RCS file: /cvs/extras/rpms/gnomesword/devel/gnomesword.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gnomesword.spec	13 Jun 2005 07:00:52 -0000	1.3
+++ gnomesword.spec	15 Sep 2005 11:39:59 -0000	1.4
@@ -1,12 +1,13 @@
 Name:           gnomesword           
 Version:        2.1.2
-Release:        2.1%{?dist}
+Release:        2.2%{?dist}
 Summary:        GNOME-based Bible research tool
 
 Group:          Applications/Text
 License:        GPL
 URL:            http://gnomesword.sourceforge.net/
 Source0:        http://easynews.dl.sourceforge.net/sourceforge/gnomesword/gnomesword-%{version}.tar.gz
+Patch0:         gnomesword-2.1.2-gettext64.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  sed >= 3.95
@@ -19,7 +20,7 @@
 BuildRequires:  libgnomeui-devel
 BuildRequires:  scrollkeeper
 # currently broken on x86_64
-ExcludeArch:    x86_64
+# ExcludeArch:    x86_64
 Requires(post):   scrollkeeper
 Requires(postun): scrollkeeper
 Obsoletes:      gnomesword2
@@ -33,7 +34,10 @@
 and other texts using your computer.
 
 %prep
-%setup -q 
+%setup -q
+%ifarch x86_64
+%patch0 -p1 -b .gettext64 
+%endif
 %{__sed} -i 's?\r??' doc/help/C/legal.xml
 %{__sed} -i 's?\r??' doc/help/fr/legal.xml
 
@@ -79,6 +83,10 @@
 
 
 %changelog
+* Thu Sep 15 2005 Michael A. Peters  - 2.1.2-2.2
+- trying patch suggested by Tom 'spot' Callaway to fix x86_64 bug
+- 160186
+
 * Sun Jun 12 2005 Michael A. Peters  - 2.1.2-2.1
 - Exclude x86_64 for now
 



From fedora-extras-commits at redhat.com  Thu Sep 15 11:40:01 2005
From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters))
Date: Thu, 15 Sep 2005 07:40:01 -0400
Subject: rpms/gnomesword import.log,1.3,1.4
Message-ID: <200509151140.j8FBe1vC021796@cvs-int.fedora.redhat.com>

Author: mpeters

Update of /cvs/extras/rpms/gnomesword
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21762

Modified Files:
	import.log 
Log Message:
auto-import gnomesword-2.1.2-2.2 on branch devel from gnomesword-2.1.2-2.2.src.rpm
patch for x86_64


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/gnomesword/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	15 Sep 2005 11:32:40 -0000	1.3
+++ import.log	15 Sep 2005 11:39:59 -0000	1.4
@@ -1,2 +1,3 @@
 gnomesword-2_1_2-1:HEAD:gnomesword-2.1.2-1.src.rpm:1118145807
 gnomesword-2_1_2-2_2:FC-4:gnomesword-2.1.2-2.2.src.rpm:1126783889
+gnomesword-2_1_2-2_2:HEAD:gnomesword-2.1.2-2.2.src.rpm:1126784329



From fedora-extras-commits at redhat.com  Thu Sep 15 12:28:16 2005
From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters))
Date: Thu, 15 Sep 2005 08:28:16 -0400
Subject: rpms/gnomesword/FC-4 gnomesword.spec,1.4,1.5
Message-ID: <200509151228.j8FCSGZO023215@cvs-int.fedora.redhat.com>

Author: mpeters

Update of /cvs/extras/rpms/gnomesword/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23196

Modified Files:
	gnomesword.spec 
Log Message:
rerun aclocal, auto*, etc, on x86_64



Index: gnomesword.spec
===================================================================
RCS file: /cvs/extras/rpms/gnomesword/FC-4/gnomesword.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gnomesword.spec	15 Sep 2005 11:32:41 -0000	1.4
+++ gnomesword.spec	15 Sep 2005 12:28:14 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           gnomesword           
 Version:        2.1.2
-Release:        2.2%{?dist}
+Release:        2.3%{?dist}
 Summary:        GNOME-based Bible research tool
 
 Group:          Applications/Text
@@ -21,6 +21,10 @@
 BuildRequires:  scrollkeeper
 # currently broken on x86_64
 # ExcludeArch:    x86_64
+# for x86_64
+%ifarch x86_64
+BuildRequires:  libtool automake autoconf
+%endif
 Requires(post):   scrollkeeper
 Requires(postun): scrollkeeper
 Obsoletes:      gnomesword2
@@ -42,6 +46,9 @@
 %{__sed} -i 's?\r??' doc/help/fr/legal.xml
 
 %build
+%ifarch x86_64
+libtoolize -c --force && aclocal-1.9 && autoheader && automake-1.9 && autoconf
+%endif
 %configure
 make %{?_smp_mflags}
 
@@ -83,9 +90,10 @@
 
 
 %changelog
-* Thu Sep 15 2005 Michael A. Peters  - 2.1.2-2.2
+* Thu Sep 15 2005 Michael A. Peters  - 2.1.2-2.3
 - trying patch suggested by Tom 'spot' Callaway to fix x86_64 bug
 - 160186
+- libtool, aclocal, autoheader, automake, autoconf on x86_64
 
 * Sun Jun 12 2005 Michael A. Peters  - 2.1.2-2.1
 - Exclude x86_64 for now



From fedora-extras-commits at redhat.com  Thu Sep 15 12:48:32 2005
From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters))
Date: Thu, 15 Sep 2005 08:48:32 -0400
Subject: rpms/gnomesword/devel gnomesword.spec,1.4,1.5
Message-ID: <200509151248.j8FCmWPc023368@cvs-int.fedora.redhat.com>

Author: mpeters

Update of /cvs/extras/rpms/gnomesword/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23349

Modified Files:
	gnomesword.spec 
Log Message:
sync with FC4 spec file



Index: gnomesword.spec
===================================================================
RCS file: /cvs/extras/rpms/gnomesword/devel/gnomesword.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gnomesword.spec	15 Sep 2005 11:39:59 -0000	1.4
+++ gnomesword.spec	15 Sep 2005 12:48:30 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           gnomesword           
 Version:        2.1.2
-Release:        2.2%{?dist}
+Release:        2.3%{?dist}
 Summary:        GNOME-based Bible research tool
 
 Group:          Applications/Text
@@ -21,6 +21,10 @@
 BuildRequires:  scrollkeeper
 # currently broken on x86_64
 # ExcludeArch:    x86_64
+# for x86_64
+%ifarch x86_64
+BuildRequires:  libtool automake autoconf
+%endif
 Requires(post):   scrollkeeper
 Requires(postun): scrollkeeper
 Obsoletes:      gnomesword2
@@ -42,6 +46,9 @@
 %{__sed} -i 's?\r??' doc/help/fr/legal.xml
 
 %build
+%ifarch x86_64
+libtoolize -c --force && aclocal-1.9 && autoheader && automake-1.9 && autoconf
+%endif
 %configure
 make %{?_smp_mflags}
 
@@ -83,9 +90,10 @@
 
 
 %changelog
-* Thu Sep 15 2005 Michael A. Peters  - 2.1.2-2.2
+* Thu Sep 15 2005 Michael A. Peters  - 2.1.2-2.3
 - trying patch suggested by Tom 'spot' Callaway to fix x86_64 bug
 - 160186
+- libtool, aclocal, autoheader, automake, autoconf on x86_64
 
 * Sun Jun 12 2005 Michael A. Peters  - 2.1.2-2.1
 - Exclude x86_64 for now



From fedora-extras-commits at redhat.com  Thu Sep 15 13:41:07 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Thu, 15 Sep 2005 09:41:07 -0400
Subject: rpms/wmweather+ - New directory
Message-ID: <200509151341.j8FDf7Ji024979@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/wmweather+
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24955/wmweather+

Log Message:
Directory /cvs/extras/rpms/wmweather+ added to the repository




From fedora-extras-commits at redhat.com  Thu Sep 15 13:41:07 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Thu, 15 Sep 2005 09:41:07 -0400
Subject: rpms/wmweather+/devel - New directory
Message-ID: <200509151341.j8FDf7bv024984@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/wmweather+/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24955/wmweather+/devel

Log Message:
Directory /cvs/extras/rpms/wmweather+/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Sep 15 13:41:23 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Thu, 15 Sep 2005 09:41:23 -0400
Subject: rpms/wmweather+ Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200509151341.j8FDfN9M025035@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/wmweather+
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25000

Added Files:
	Makefile import.log 
Log Message:
Setup of module wmweather+


--- NEW FILE Makefile ---
# Top level Makefile for module wmweather+
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Thu Sep 15 13:41:24 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Thu, 15 Sep 2005 09:41:24 -0400
Subject: rpms/wmweather+/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200509151341.j8FDfOr0025040@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/wmweather+/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25000/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module wmweather+


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Thu Sep 15 13:42:12 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Thu, 15 Sep 2005 09:42:12 -0400
Subject: rpms/wmweather+ import.log,1.1,1.2
Message-ID: <200509151342.j8FDgDx2025110@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/wmweather+
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25073

Modified Files:
	import.log 
Log Message:
auto-import wmweather+-2.9-1 on branch devel from wmweather+-2.9-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/wmweather+/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	15 Sep 2005 13:41:21 -0000	1.1
+++ import.log	15 Sep 2005 13:42:10 -0000	1.2
@@ -0,0 +1 @@
+wmweather+-2_9-1:HEAD:wmweather+-2.9-1.src.rpm:1126791721



From fedora-extras-commits at redhat.com  Thu Sep 15 13:42:13 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Thu, 15 Sep 2005 09:42:13 -0400
Subject: rpms/wmweather+/devel wmweather+-configure.patch, NONE,
	1.1 wmweather+.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <200509151342.j8FDgD1p025119@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/wmweather+/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25073/devel

Modified Files:
	.cvsignore sources 
Added Files:
	wmweather+-configure.patch wmweather+.spec 
Log Message:
auto-import wmweather+-2.9-1 on branch devel from wmweather+-2.9-1.src.rpm

wmweather+-configure.patch:

--- NEW FILE wmweather+-configure.patch ---
--- configure.orig	2005-06-03 15:15:10.000000000 +0200
+++ configure	2005-06-03 15:23:34.000000000 +0200
@@ -3067,124 +3067,9 @@
 
 # Checks for libraries.
 
-#
-# Handle user hints
-#
-         echo "$as_me:$LINENO: checking if libpcre is wanted" >&5
-echo $ECHO_N "checking if libpcre is wanted... $ECHO_C" >&6
-
-# Check whether --with-libpcre or --without-libpcre was given.
-if test "${with_libpcre+set}" = set; then
-  withval="$with_libpcre"
-  if test "$withval" != no ; then
-                          LIBPCRE_HOME="$withval"
-                          echo "$as_me:$LINENO: result: yes: libraries ${LIBPCRE_HOME}/lib  includes ${LIBPCRE_HOME}/include" >&5
-echo "${ECHO_T}yes: libraries ${LIBPCRE_HOME}/lib  includes ${LIBPCRE_HOME}/include" >&6
-                      else
-                          echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-                      fi
-else
-  LIBPCRE_HOME=/usr/local
-                      if test ! -f "${LIBPCRE_HOME}/include/pcre.h"
-                      then
-                         LIBPCRE_HOME=/usr
-                      fi
-                      echo "$as_me:$LINENO: result: yes: libraries ${LIBPCRE_HOME}/lib  includes ${LIBPCRE_HOME}/include" >&5
-echo "${ECHO_T}yes: libraries ${LIBPCRE_HOME}/lib  includes ${LIBPCRE_HOME}/include" >&6
-
-fi;
-
-#
-# Locate libpcre, if wanted
-#
-         if test -n "${LIBPCRE_HOME}"
-         then
-             LDFLAGS="$LDFLAGS -L${LIBPCRE_HOME}/lib"
-             CPPFLAGS="$CPPFLAGS -I${LIBPCRE_HOME}/include"
-
-echo "$as_me:$LINENO: checking for pcre_compile in -lpcre" >&5
-echo $ECHO_N "checking for pcre_compile in -lpcre... $ECHO_C" >&6
-if test "${ac_cv_lib_pcre_pcre_compile+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lpcre  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char pcre_compile ();
-int
-main ()
-{
-pcre_compile ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_pcre_pcre_compile=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_pcre_pcre_compile=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_pcre_pcre_compile" >&5
-echo "${ECHO_T}$ac_cv_lib_pcre_pcre_compile" >&6
-if test $ac_cv_lib_pcre_pcre_compile = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBPCRE 1
-_ACEOF
-
-  LIBS="-lpcre $LIBS"
-
-else
-  { { echo "$as_me:$LINENO: error: libpcre is required" >&5
-echo "$as_me: error: libpcre is required" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-         else
-             { { echo "$as_me:$LINENO: error: libpcre is required" >&5
-echo "$as_me: error: libpcre is required" >&2;}
-   { (exit 1); exit 1; }; }
-         fi
-
+LDFLAGS="$LDFLAGS -L$/usr/lib"
+CPPFLAGS="$CPPFLAGS `pcre-config --cflags`"
+LIBS="-lpcre $LIBS"
 
 # Check whether --with-libwww-prefix or --without-libwww-prefix was given.
 if test "${with_libwww_prefix+set}" = set; then


--- NEW FILE wmweather+.spec ---
Name:           wmweather+
Version:        2.9
Release:        1
Summary:        Weather status dockapp

Group:          User Interface/X
License:        GPL
URL:            http://sourceforge.net/projects/wmweatherplus/
Source0:        http://dl.sf.net/wmweatherplus/wmweather+-2.9.tar.gz
Patch0:         wmweather+-configure.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  xorg-x11-devel
BuildRequires:  WindowMaker-devel
BuildRequires:  pcre-devel
BuildRequires:  w3c-libwww-devel
BuildRequires:  openssl-devel

%description
wmweather+ will download the National Weather Serivce METAR bulletins; AVN,
ETA, and MRF forecasts; and any weather map for display in a WindowMaker
dockapp. Think wmweather with a smaller font, forecasts, a weather map, and a
sky condition display.

%prep
%setup -q
%patch0

%build
%configure
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc ChangeLog COPYING README
%{_bindir}/wmweather+
%{_mandir}/man1/*

%changelog
* Fri Jun 03 2005 Andreas Bierfert 
2.9-1
- Initial Release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wmweather+/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	15 Sep 2005 13:41:22 -0000	1.1
+++ .cvsignore	15 Sep 2005 13:42:11 -0000	1.2
@@ -0,0 +1 @@
+wmweather+-2.9.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wmweather+/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	15 Sep 2005 13:41:22 -0000	1.1
+++ sources	15 Sep 2005 13:42:11 -0000	1.2
@@ -0,0 +1 @@
+ede58d7ed589d5c41b9b68a2703a8f7d  wmweather+-2.9.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep 15 13:43:42 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Thu, 15 Sep 2005 09:43:42 -0400
Subject: rpms/wmapmload - New directory
Message-ID: <200509151343.j8FDhgJH025217@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/wmapmload
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25197/wmapmload

Log Message:
Directory /cvs/extras/rpms/wmapmload added to the repository




From fedora-extras-commits at redhat.com  Thu Sep 15 13:43:42 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Thu, 15 Sep 2005 09:43:42 -0400
Subject: rpms/wmapmload/devel - New directory
Message-ID: <200509151343.j8FDhgvD025222@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/wmapmload/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25197/wmapmload/devel

Log Message:
Directory /cvs/extras/rpms/wmapmload/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Sep 15 13:44:03 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Thu, 15 Sep 2005 09:44:03 -0400
Subject: rpms/wmapmload Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200509151344.j8FDi3BF025277@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/wmapmload
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25242

Added Files:
	Makefile import.log 
Log Message:
Setup of module wmapmload


--- NEW FILE Makefile ---
# Top level Makefile for module wmapmload
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Thu Sep 15 13:44:03 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Thu, 15 Sep 2005 09:44:03 -0400
Subject: rpms/wmapmload/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200509151344.j8FDi3Ye025282@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/wmapmload/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25242/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module wmapmload


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Thu Sep 15 13:44:34 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Thu, 15 Sep 2005 09:44:34 -0400
Subject: rpms/wmapmload import.log,1.1,1.2
Message-ID: <200509151345.j8FDj5pV025350@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/wmapmload
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25310

Modified Files:
	import.log 
Log Message:
auto-import wmapmload-0.3.4-1 on branch devel from wmapmload-0.3.4-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/wmapmload/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	15 Sep 2005 13:44:01 -0000	1.1
+++ import.log	15 Sep 2005 13:44:32 -0000	1.2
@@ -0,0 +1 @@
+wmapmload-0_3_4-1:HEAD:wmapmload-0.3.4-1.src.rpm:1126791864



From fedora-extras-commits at redhat.com  Thu Sep 15 13:44:35 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Thu, 15 Sep 2005 09:44:35 -0400
Subject: rpms/wmapmload/devel wmapmload.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200509151345.j8FDj5BJ025354@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/wmapmload/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25310/devel

Modified Files:
	.cvsignore sources 
Added Files:
	wmapmload.spec 
Log Message:
auto-import wmapmload-0.3.4-1 on branch devel from wmapmload-0.3.4-1.src.rpm


--- NEW FILE wmapmload.spec ---
Name:           wmapmload
Version:        0.3.4
Release:        1
Summary:        Wmapmload monitors your apm status in an lcd display fashion

Group:          User Interface/X
License:        GPL
URL:     	http://tnemeth.free.fr/projets/dockapps.html
Source0:        http://tnemeth.free.fr/projets/programmes/wmapmload-0.3.4.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  xorg-x11-devel

%description
%{summary}

%prep
%setup -q

%build
%configure
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT


%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING THANKS TODO
%{_bindir}/wmapmload
%{_mandir}/man1/*

%changelog
* Fri Jun 03 2005 Andreas Bierfert 
0.3.4-1
- Initial Release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wmapmload/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	15 Sep 2005 13:44:01 -0000	1.1
+++ .cvsignore	15 Sep 2005 13:44:33 -0000	1.2
@@ -0,0 +1 @@
+wmapmload-0.3.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wmapmload/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	15 Sep 2005 13:44:01 -0000	1.1
+++ sources	15 Sep 2005 13:44:33 -0000	1.2
@@ -0,0 +1 @@
+8239e46cf4b193b75835578b688b326c  wmapmload-0.3.4.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep 15 13:55:03 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Thu, 15 Sep 2005 09:55:03 -0400
Subject: rpms/wmweather+/devel wmweather+.spec,1.1,1.2
Message-ID: <200509151355.j8FDt36X025498@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/wmweather+/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25477

Modified Files:
	wmweather+.spec 
Log Message:
- add dist
- don't doc ChangeLog



Index: wmweather+.spec
===================================================================
RCS file: /cvs/extras/rpms/wmweather+/devel/wmweather+.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wmweather+.spec	15 Sep 2005 13:42:11 -0000	1.1
+++ wmweather+.spec	15 Sep 2005 13:55:01 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           wmweather+
 Version:        2.9
-Release:        1
+Release:        2%{?dist}
 Summary:        Weather status dockapp
 
 Group:          User Interface/X
@@ -42,11 +42,16 @@
 
 %files
 %defattr(-,root,root,-)
-%doc ChangeLog COPYING README
+%doc COPYING README
 %{_bindir}/wmweather+
 %{_mandir}/man1/*
 
 %changelog
+* Thu Sep 15 2005 Andreas Bierfert 
+2.9-2
+- add dist tag
+- don't doc ChangeLog
+
 * Fri Jun 03 2005 Andreas Bierfert 
 2.9-1
 - Initial Release



From fedora-extras-commits at redhat.com  Thu Sep 15 13:56:20 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Thu, 15 Sep 2005 09:56:20 -0400
Subject: rpms/wmapmload/devel wmapmload.spec,1.1,1.2
Message-ID: <200509151356.j8FDuKu3025574@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/wmapmload/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25555

Modified Files:
	wmapmload.spec 
Log Message:
- add dist



Index: wmapmload.spec
===================================================================
RCS file: /cvs/extras/rpms/wmapmload/devel/wmapmload.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wmapmload.spec	15 Sep 2005 13:44:33 -0000	1.1
+++ wmapmload.spec	15 Sep 2005 13:56:18 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           wmapmload
 Version:        0.3.4
-Release:        1
+Release:        2%{?dist}
 Summary:        Wmapmload monitors your apm status in an lcd display fashion
 
 Group:          User Interface/X
@@ -36,6 +36,10 @@
 %{_mandir}/man1/*
 
 %changelog
+* Thu Sep 15 2005 Andreas Bierfert 
+0.3.4-2
+- add dist
+
 * Fri Jun 03 2005 Andreas Bierfert 
 0.3.4-1
 - Initial Release



From fedora-extras-commits at redhat.com  Thu Sep 15 14:28:46 2005
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Thu, 15 Sep 2005 10:28:46 -0400
Subject: rpms/gnumeric/FC-4 gnumeric.spec,1.2,1.3
Message-ID: <200509151428.j8FESkt5027029@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/gnumeric/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27010

Modified Files:
	gnumeric.spec 
Log Message:
add pygtk2-devel to buildrequires, this fixes bug 168052


Index: gnumeric.spec
===================================================================
RCS file: /cvs/extras/rpms/gnumeric/FC-4/gnumeric.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gnumeric.spec	15 Mar 2005 08:15:57 -0000	1.2
+++ gnumeric.spec	15 Sep 2005 14:28:44 -0000	1.3
@@ -4,7 +4,7 @@
 Summary:        A spreadsheet program for GNOME.
 Name:     	gnumeric
 Version: 	1.4.3
-Release: 	2
+Release: 	2.1
 Epoch:		1
 License:	GPL
 Group:		Applications/Productivity
@@ -28,6 +28,7 @@
 BuildRequires:  intltool scrollkeeper gettext desktop-file-utils
 BuildRequires:  libgnomedb-devel >= 1.0.4
 BuildRequires:  pango-devel >= 1.4.0
+BuildRequires:  pygtk2-devel
 Patch0: gnumeric-1.4.1-desktop.patch
 Patch1: gnumeric-1.4.1-excelcrash.patch
 Patch2: gnumeric-1.4.1-configure.patch
@@ -138,6 +139,9 @@
 %dir %{_libdir}/gnumeric/%{gnumeric_version}
 
 %changelog
+* Thu Sep 15 2005 Caolan McNamara  1.4.3-2.1
+- add pygtk2-devel to buildrequires, this fixes bug 168052
+
 * Tue Mar 15 2005 Caolan McNamara  1.4.3-2
 - add libgnomedb to extras and gnumeric's requires
 



From fedora-extras-commits at redhat.com  Thu Sep 15 14:58:56 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Thu, 15 Sep 2005 10:58:56 -0400
Subject: rpms/gtk+extra - New directory
Message-ID: <200509151458.j8FEwu6A027688@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/gtk+extra
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27668/gtk+extra

Log Message:
Directory /cvs/extras/rpms/gtk+extra added to the repository




From fedora-extras-commits at redhat.com  Thu Sep 15 14:58:57 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Thu, 15 Sep 2005 10:58:57 -0400
Subject: rpms/gtk+extra/devel - New directory
Message-ID: <200509151458.j8FEwvgP027691@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/gtk+extra/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27668/gtk+extra/devel

Log Message:
Directory /cvs/extras/rpms/gtk+extra/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Sep 15 14:59:42 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Thu, 15 Sep 2005 10:59:42 -0400
Subject: rpms/gtk+extra Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200509151459.j8FExhRs027746@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/gtk+extra
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27717

Added Files:
	Makefile import.log 
Log Message:
Setup of module gtk+extra


--- NEW FILE Makefile ---
# Top level Makefile for module gtk+extra
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Thu Sep 15 14:59:43 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Thu, 15 Sep 2005 10:59:43 -0400
Subject: rpms/gtk+extra/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200509151459.j8FExhtc027751@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/gtk+extra/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27717/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module gtk+extra


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Thu Sep 15 15:00:53 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Thu, 15 Sep 2005 11:00:53 -0400
Subject: rpms/gtk+extra import.log,1.1,1.2
Message-ID: <200509151500.j8FF0rOi027821@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/gtk+extra
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27786

Modified Files:
	import.log 
Log Message:
auto-import gtk+extra-1.1.0-3 on branch devel from gtk+extra-1.1.0-3.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/gtk+extra/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	15 Sep 2005 14:59:40 -0000	1.1
+++ import.log	15 Sep 2005 15:00:51 -0000	1.2
@@ -0,0 +1 @@
+gtk+extra-1_1_0-3:HEAD:gtk+extra-1.1.0-3.src.rpm:1126796442



From fedora-extras-commits at redhat.com  Thu Sep 15 15:00:54 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Thu, 15 Sep 2005 11:00:54 -0400
Subject: rpms/gtk+extra/devel gtk+extra.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200509151500.j8FF0sUw027828@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/gtk+extra/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27786/devel

Modified Files:
	.cvsignore sources 
Added Files:
	gtk+extra.spec 
Log Message:
auto-import gtk+extra-1.1.0-3 on branch devel from gtk+extra-1.1.0-3.src.rpm


--- NEW FILE gtk+extra.spec ---
Name:		gtk+extra
Version:	1.1.0
Release:	3%{?dist}
Summary:	A library of gtk+ widgets
Summary(fr):	Une biblioth??que de widgets gtk+

Group:		System Environment/Libraries
License:	LGPL
URL:		http://www.dattalo.com/gnupic/gpsim.html
Source:		http://www.dattalo.com/gnupic/gtk+extra-%{version}.tar.gz
BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	gtk2-devel

%description
A library of dynamically linked gtk+ widgets including:
GtkSheet, GtkPlot, and GtkIconList

%description -l fr
Une biblioth??que de widgets gtk+ li??s dynamiquement incluant :
GtkSheet, GtkPlot et GtkIconList

%package devel
Summary:	A library of gtk+ widgets
Summary(fr):	Une biblioth??que de widgets gtk+
Group:		Development/Libraries
Requires:       %{name} = %{version}-%{release}
Requires:       gtk2-devel

%description devel
The %{name}-devel package includes the static libraries, header files,
and documentation for compiling programs that use gtk+extra widgets.

%description -l fr devel
Le paquetage %{name}-devel contient les biblioth??ques statiques, les fichiers
d'en-t??tes et la documentation n??cessaires ?? la compilation des programmes
qui utilisent les widgets gtk+extra.

%prep
%setup -q
%{__sed} -i 's/\r//' docs/{gtk*.ChangeLog,HELP,README,TODO,VERSION}
%{__sed} -i 's/\r//' docs/reference/*.html
%{__sed} -i 's/\r//' docs/tutorial/{*.html,gtksheet/*.{c,html}}

%build
%configure
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig


%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING README
%{_libdir}/libgtkextra*.so.*

%files devel
%defattr(-,root,root,-)
%doc docs/{gtk*.ChangeLog,COPYING,HELP,README,TODO,VERSION}
%doc docs/reference/ docs/tutorial/
%{_libdir}/*.a
%exclude %{_libdir}/*.la
%{_libdir}/*.so
%{_libdir}/pkgconfig/*
%{_includedir}/*


%changelog
* Thu Sep 15 2005 Alain Portal  1.1.0-3
  - BuildRequires is gtk2-devel, not gtk+-devel
  - Add Requires gtk2-devel for package devel
  - Exclude .la files
  - Add a lot of documentation
  - Move gtk*.ChangeLog in devel package
  - Convert DOS format end-of-line to Unix-like format
  - Contributions of Jose Pedro Oliveira 
    Thanks to him.

* Tue Sep 13 2005 Alain Portal  1.1.0-2
  - Add french summary and description

* Mon Sep 12 2005 Alain Portal  1.1.0-1
  - New version

* Fri Oct 29 2004 Alain Portal  0:0.99.17-0.fdr.2
  - Add BuildRequires gtk+-devel

* Wed Oct 27 2004 Alain Portal  0:0.99.17-0.fdr.1
  - Initial Fedora RPM


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gtk+extra/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	15 Sep 2005 14:59:41 -0000	1.1
+++ .cvsignore	15 Sep 2005 15:00:52 -0000	1.2
@@ -0,0 +1 @@
+gtk+extra-1.1.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gtk+extra/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	15 Sep 2005 14:59:41 -0000	1.1
+++ sources	15 Sep 2005 15:00:52 -0000	1.2
@@ -0,0 +1 @@
+886bbd0c54d59a9159df097c125f54cd  gtk+extra-1.1.0.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep 15 15:08:06 2005
From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon))
Date: Thu, 15 Sep 2005 11:08:06 -0400
Subject: rpms/qscintilla - New directory
Message-ID: <200509151508.j8FF86Ma029288@cvs-int.fedora.redhat.com>

Author: icon

Update of /cvs/extras/rpms/qscintilla
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29262/qscintilla

Log Message:
Directory /cvs/extras/rpms/qscintilla added to the repository




From fedora-extras-commits at redhat.com  Thu Sep 15 15:08:06 2005
From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon))
Date: Thu, 15 Sep 2005 11:08:06 -0400
Subject: rpms/qscintilla/devel - New directory
Message-ID: <200509151508.j8FF86nY029289@cvs-int.fedora.redhat.com>

Author: icon

Update of /cvs/extras/rpms/qscintilla/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29262/qscintilla/devel

Log Message:
Directory /cvs/extras/rpms/qscintilla/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Sep 15 15:09:35 2005
From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon))
Date: Thu, 15 Sep 2005 11:09:35 -0400
Subject: rpms/qscintilla/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200509151509.j8FF9ZD9029361@cvs-int.fedora.redhat.com>

Author: icon

Update of /cvs/extras/rpms/qscintilla/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29328/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module qscintilla


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Thu Sep 15 15:09:40 2005
From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon))
Date: Thu, 15 Sep 2005 11:09:40 -0400
Subject: rpms/qscintilla Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200509151509.j8FF9eB0029378@cvs-int.fedora.redhat.com>

Author: icon

Update of /cvs/extras/rpms/qscintilla
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29328

Added Files:
	Makefile import.log 
Log Message:
Setup of module qscintilla


--- NEW FILE Makefile ---
# Top level Makefile for module qscintilla
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Thu Sep 15 15:10:46 2005
From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon))
Date: Thu, 15 Sep 2005 11:10:46 -0400
Subject: rpms/qscintilla import.log,1.1,1.2
Message-ID: <200509151511.j8FFBG0d029459@cvs-int.fedora.redhat.com>

Author: icon

Update of /cvs/extras/rpms/qscintilla
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29413

Modified Files:
	import.log 
Log Message:
auto-import qscintilla-1.6-3.fc4 on branch devel from qscintilla-1.6-3.fc4.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/qscintilla/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	15 Sep 2005 15:09:23 -0000	1.1
+++ import.log	15 Sep 2005 15:10:43 -0000	1.2
@@ -0,0 +1 @@
+qscintilla-1_6-3_fc4:HEAD:qscintilla-1.6-3.fc4.src.rpm:1126796976



From fedora-extras-commits at redhat.com  Thu Sep 15 15:10:46 2005
From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon))
Date: Thu, 15 Sep 2005 11:10:46 -0400
Subject: rpms/qscintilla/devel
	qscintilla-1.61-gpl-1.4-designer-incpath.patch, NONE,
	1.1 qscintilla.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <200509151510.j8FFAkfw029449@cvs-int.fedora.redhat.com>

Author: icon

Update of /cvs/extras/rpms/qscintilla/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29413/devel

Modified Files:
	.cvsignore sources 
Added Files:
	qscintilla-1.61-gpl-1.4-designer-incpath.patch qscintilla.spec 
Log Message:
auto-import qscintilla-1.6-3.fc4 on branch devel from qscintilla-1.6-3.fc4.src.rpm

qscintilla-1.61-gpl-1.4-designer-incpath.patch:

--- NEW FILE qscintilla-1.61-gpl-1.4-designer-incpath.patch ---
--- qscintilla-1.61-gpl-1.4/designer/designer.pro.designer-incpath	2004-09-16 15:09:24.000000000 -0500
+++ qscintilla-1.61-gpl-1.4/designer/designer.pro	2004-09-16 15:08:31.000000000 -0500
@@ -9,4 +9,6 @@
 
 SOURCES += qscintillaplugin.cpp
 
-LIBS += -lqscintilla
+LIBS += -L$(DESTDIR)../../lib -lqscintilla
+
+INCPATH = $(DESTDIR)../../include ../qt


--- NEW FILE qscintilla.spec ---
%define         scintilla_ver   1.65
%define         qtdir           %{_libdir}/qt-3.3

Name:	        qscintilla 
Version:        1.6
Release:        3%{?dist}
Summary:        A Scintilla port to Qt

License:        GPL
Group:          Development/Tools
Url:            http://www.riverbankcomputing.co.uk/qscintilla/
Source:         http://www.river-bank.demon.co.uk/download/QScintilla/qscintilla-%{scintilla_ver}-gpl-%{version}.tar.gz
Patch1:         qscintilla-1.61-gpl-1.4-designer-incpath.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  qt-devel >= 1:3.3, qt-devel < 1:3.4

%description
QScintilla is a port or Scintilla to the Qt GUI toolkit from Trolltech 
and runs on any operating system supported by Qt (eg. Windows, UNIX/Linux, 
MacOS/X).  Qt v3 or later is required.

This version of QScintilla is based on Scintilla v%{scintilla_ver}.


%package designer
Summary:        QScintilla designer plugin 
Group:          Development/Tools
Requires:       %{name} = %{version}-%{release}
Requires:       qt-designer >= 1:3.3, qt-designer < 1:3.4

%description designer
QScintillla designer plugin.


%package devel
Summary:        QScintilla Development Files
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}
Requires:       qt-devel >= 1:3.3, qt-devel < 1:3.4

%description devel
These are the development files for QScintilla, needed to build against
QScintilla.


%prep
%setup -q -n %{name}-%{scintilla_ver}-gpl-%{version}
%patch1 -p1 -b .designer-incpath
# fixups to support RPM_BUILD_ROOT/DESTDIR
sed -i "s/^DESTDIR = \$(QTDIR)/DESTDIR = \$(INSTALL_ROOT)\$(QTDIR)/" */*.pro
# fix permissions on doc files
find doc example -type f -exec chmod 0644 {} ';'


%build
pushd qt
qmake qscintilla
echo 'build: $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS) $(OBJCOMP)' >> Makefile
make %{?_smp_mflags} build
popd

pushd designer
qmake designer
echo 'build: $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS) $(OBJCOMP)' >> Makefile
make %{?_smp_mflags} build
popd


%install
rm -rf $RPM_BUILD_ROOT
pushd qt
make install INSTALL_ROOT=$RPM_BUILD_ROOT
popd
pushd designer
make INSTALL_ROOT=$RPM_BUILD_ROOT
popd


%clean
rm -rf $RPM_BUILD_ROOT


%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig


%files
%defattr(-,root,root,-)
%doc ChangeLog LICENSE NEWS README
%{qtdir}/lib/*.so.*
%{qtdir}/translations/*


%files designer
%defattr(-,root,root,-)
%{qtdir}/plugins/designer/*


%files devel
%defattr(-,root,root,-)
%doc doc/html doc/Scintilla example
%{qtdir}/lib/*.so
%{qtdir}/include/*


%changelog
* Wed Sep 14 2005 Konstantin Ryabitsev  - 1.6-3
- Fix permissions in prep, not in install.

* Tue Sep 13 2005 Konstantin Ryabitsev  - 1.6-2
- Fix permissions on doc files to be 0644.

* Sun Sep 11 2005 Konstantin Ryabitsev  1.6-1
- Update to 1.65-gpl-1.6
- Use the patch from Aurelien Bompard to build sanely in buildroot
- Include docs and examples for the -devel package

* Sat Aug 27 2005 Konstantin Ryabitsev  1.5.1-1
- Adapt for Fedora Extras
- Drop 0-Epoch
- Make specfile simpler
- Move .so to devel

* Mon Mar 09 2005 Rex Dieter 0:1.5.1-0.0.kde
- 1.5.1

* Thu Sep 16 2004 Rex Dieter  0:1.4-0.1.kde
- updated designer-incpath patch: don't require an already installed
  qscintilla-devel
- BuildConflicts: qscintilla-devel != %%version

* Thu Sep 16 2004 Rex Dieter  0:1.4-0.0.kde
- 1.4
- include designer plugin
- Prereq: %%qtdir

* Fri May 28 2004 Rex Dieter  0:1.3-0.fdr.0
- 1.3

* Thu Mar 11 2004 Rex Dieter  0:1.2-0.fdr.6
- dynamically determine version for qt dependancy.

* Wed Mar 10 2004 Rex Dieter  0:1.2-0.fdr.5
- (re)build against qt-3.3.1

* Wed Dec 03 2003 Rex Dieter  0:1.2-0.fdr.4
- remove extraneous macros
- (re)build against qt-3.2.3

* Mon Nov 10 2003 Rex Dieter  0:1.2-0.fdr.3
- (re)build against qt-3.2.2

* Wed Sep 17 2003 Rex Dieter  0:1.2-0.fdr.2
- use Epoch's in Requires

* Tue Aug 19 2003 Rex Dieter  0:1.2-0.fdr.1
- 1.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/qscintilla/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	15 Sep 2005 15:09:29 -0000	1.1
+++ .cvsignore	15 Sep 2005 15:10:44 -0000	1.2
@@ -0,0 +1 @@
+qscintilla-1.65-gpl-1.6.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/qscintilla/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	15 Sep 2005 15:09:29 -0000	1.1
+++ sources	15 Sep 2005 15:10:44 -0000	1.2
@@ -0,0 +1 @@
+8dbebef07cd2c934fbec3ee1bdfecfa3  qscintilla-1.65-gpl-1.6.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep 15 15:14:57 2005
From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon))
Date: Thu, 15 Sep 2005 11:14:57 -0400
Subject: owners owners.list,1.215,1.216
Message-ID: <200509151514.j8FFEvEQ029529@cvs-int.fedora.redhat.com>

Author: icon

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29510

Modified Files:
	owners.list 
Log Message:
Added qscintilla.



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.215
retrieving revision 1.216
diff -u -r1.215 -r1.216
--- owners.list	15 Sep 2005 10:19:13 -0000	1.215
+++ owners.list	15 Sep 2005 15:14:55 -0000	1.216
@@ -853,6 +853,7 @@
 Fedora Extras|qiv|Quick Image Viewer|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|qof|QOF provides a query engine library for C objects|toshio at tiki-lounge.com|extras-qa at fedoraproject.org|
 Fedora Extras|qps|Visual process status monitor|gajownik at gmail.com|extras-qa at fedoraproject.org|
+Fedora Extras|qscintilla|A Scintilla port to Qt|icon at linux.duke.edu|extras-qa at fedoraproject.org|
 Fedora Extras|qtparted|Partition Magic clone written in C++ using the Qt toolkit|steve at silug.org|extras-qa at fedoraproject.org|
 Fedora Extras|QuantLib| QuantLib is a free/open-source library for modeling, trading, and risk management in real-life|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|quilt|Patch management tool|jwboyer at jdub.homelinux.org|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Thu Sep 15 15:30:48 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Thu, 15 Sep 2005 11:30:48 -0400
Subject: owners owners.list,1.216,1.217
Message-ID: <200509151530.j8FFUmdo029605@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29586

Modified Files:
	owners.list 
Log Message:
New package: gtk+extra
Maintainer: Alain Portal 



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.216
retrieving revision 1.217
diff -u -r1.216 -r1.217
--- owners.list	15 Sep 2005 15:14:55 -0000	1.216
+++ owners.list	15 Sep 2005 15:30:45 -0000	1.217
@@ -283,6 +283,7 @@
 Fedora Extras|grisbi|Personal finances manager|gauret at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|gstreamer-python|Python bindings for GStreamer|thomas at apestaart.org|extras-qa at fedoraproject.org|
 Fedora Extras|gsview|PostScript and PDF previewer|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
+Fedora Extras|gtk+extra|A library of gtk+ widgets|aportal at univ-montp2.fr|extras-qa at fedoraproject.org|
 Fedora Extras|GtkAda|An Ada95 graphical toolkit based on Gtk+|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|gtkglarea2|An OpenGL GTK widget|anvil at livna.org|extras-qa at fedoraproject.org|
 Fedora Extras|gtkglext|OpenGL Extension to GTK|rc040203 at freenet.de|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Thu Sep 15 16:16:24 2005
From: fedora-extras-commits at redhat.com (José Abílio Oliveira Matos (jamatos))
Date: Thu, 15 Sep 2005 12:16:24 -0400
Subject: rpms/rpy - New directory
Message-ID: <200509151616.j8FGGOho031100@cvs-int.fedora.redhat.com>

Author: jamatos

Update of /cvs/extras/rpms/rpy
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31080/rpy

Log Message:
Directory /cvs/extras/rpms/rpy added to the repository




From fedora-extras-commits at redhat.com  Thu Sep 15 16:16:24 2005
From: fedora-extras-commits at redhat.com (José Abílio Oliveira Matos (jamatos))
Date: Thu, 15 Sep 2005 12:16:24 -0400
Subject: rpms/rpy/devel - New directory
Message-ID: <200509151616.j8FGGO4E031105@cvs-int.fedora.redhat.com>

Author: jamatos

Update of /cvs/extras/rpms/rpy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31080/rpy/devel

Log Message:
Directory /cvs/extras/rpms/rpy/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Sep 15 16:16:46 2005
From: fedora-extras-commits at redhat.com (José Abílio Oliveira Matos (jamatos))
Date: Thu, 15 Sep 2005 12:16:46 -0400
Subject: rpms/rpy Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200509151616.j8FGGkAP031154@cvs-int.fedora.redhat.com>

Author: jamatos

Update of /cvs/extras/rpms/rpy
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31125

Added Files:
	Makefile import.log 
Log Message:
Setup of module rpy


--- NEW FILE Makefile ---
# Top level Makefile for module rpy
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Thu Sep 15 16:16:46 2005
From: fedora-extras-commits at redhat.com (José Abílio Oliveira Matos (jamatos))
Date: Thu, 15 Sep 2005 12:16:46 -0400
Subject: rpms/rpy/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200509151616.j8FGGkhF031159@cvs-int.fedora.redhat.com>

Author: jamatos

Update of /cvs/extras/rpms/rpy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31125/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module rpy


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Thu Sep 15 16:17:25 2005
From: fedora-extras-commits at redhat.com (José Abílio Oliveira Matos (jamatos))
Date: Thu, 15 Sep 2005 12:17:25 -0400
Subject: rpms/rpy import.log,1.1,1.2
Message-ID: <200509151617.j8FGHtIW031235@cvs-int.fedora.redhat.com>

Author: jamatos

Update of /cvs/extras/rpms/rpy
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31193

Modified Files:
	import.log 
Log Message:
auto-import rpy-0.4.6-1 on branch devel from rpy-0.4.6-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/rpy/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	15 Sep 2005 16:16:44 -0000	1.1
+++ import.log	15 Sep 2005 16:17:23 -0000	1.2
@@ -0,0 +1 @@
+rpy-0_4_6-1:HEAD:rpy-0.4.6-1.src.rpm:1126801034



From fedora-extras-commits at redhat.com  Thu Sep 15 16:17:25 2005
From: fedora-extras-commits at redhat.com (José Abílio Oliveira Matos (jamatos))
Date: Thu, 15 Sep 2005 12:17:25 -0400
Subject: rpms/rpy/devel rpy.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1,
	1.2
Message-ID: <200509151618.j8FGHt4A031239@cvs-int.fedora.redhat.com>

Author: jamatos

Update of /cvs/extras/rpms/rpy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31193/devel

Modified Files:
	.cvsignore sources 
Added Files:
	rpy.spec 
Log Message:
auto-import rpy-0.4.6-1 on branch devel from rpy-0.4.6-1.src.rpm


--- NEW FILE rpy.spec ---
%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}

Name: 		rpy
Summary: 	Python interface to the R language
Version:	0.4.6
Release:	1%{?dist}
Url:		http://rpy.sourceforge.net
Source0:	http://dl.sf.net/%{name}/%{name}-%{version}.tar.gz
License:	GPL
Group:		Development/Libraries
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	R, python-numeric, python-devel
Requires:	R, python-numeric

%description
RPy provides a robust Python interface to the R
programming language.  It can manage all kinds of R objects and can
execute arbitrary R functions. All the errors from the R language are
converted to Python exceptions.

%prep
%setup


%build
env CFLAGS="$RPM_OPT_FLAGS" python setup.py build


%install
rm -rf $RPM_BUILD_ROOT
python setup.py install -O1 --skip-build --root=$RPM_BUILD_ROOT


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root)
%doc COPYING NEWS README examples/ doc/
%{python_sitearch}/*


%changelog
* Thu Sep 15 2005 Jose Matos  - 0.4.6-1
- Initial package for Fedora Extras


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rpy/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	15 Sep 2005 16:16:44 -0000	1.1
+++ .cvsignore	15 Sep 2005 16:17:23 -0000	1.2
@@ -0,0 +1 @@
+rpy-0.4.6.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rpy/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	15 Sep 2005 16:16:44 -0000	1.1
+++ sources	15 Sep 2005 16:17:23 -0000	1.2
@@ -0,0 +1 @@
+8b5411b275c66a5409a4a3aad711d860  rpy-0.4.6.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep 15 16:36:08 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu, 15 Sep 2005 12:36:08 -0400
Subject: rpms/perl-File-Tail/devel .cvsignore, 1.2, 1.3 perl-File-Tail.spec,
	1.6, 1.7 sources, 1.2, 1.3
Message-ID: <200509151636.j8FGa9W0031491@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/perl-File-Tail/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31468

Modified Files:
	.cvsignore perl-File-Tail.spec sources 
Log Message:
* Thu Sep 15 2005 Ville Skytt??  - 0.99.3-1
- 0.99.3.
- Specfile cleanups.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-File-Tail/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 05:00:29 -0000	1.2
+++ .cvsignore	15 Sep 2005 16:36:06 -0000	1.3
@@ -1 +1 @@
-File-Tail-0.98.tar.gz
+File-Tail-0.99.3.tar.gz


Index: perl-File-Tail.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-File-Tail/devel/perl-File-Tail.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- perl-File-Tail.spec	6 Apr 2005 22:12:44 -0000	1.6
+++ perl-File-Tail.spec	15 Sep 2005 16:36:06 -0000	1.7
@@ -1,15 +1,12 @@
-%{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)}
-
 Name:           perl-File-Tail
-Version:        0.98
-Release:        4
-
+Version:        0.99.3
+Release:        1%{?dist}
 Summary:        Perl extension for reading from continously updated files
 
 Group:          Development/Libraries
 License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/File-Tail/
-Source0:     http://www.cpan.org/authors/id/M/MG/MGRABNAR/File-Tail-0.98.tar.gz
+Source0:        http://www.cpan.org/authors/id/M/MG/MGRABNAR/File-Tail-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -25,22 +22,19 @@
 
 
 %build
-CFLAGS="$RPM_OPT_FLAGS" %{__perl} Makefile.PL INSTALLDIRS=vendor
-make %{?_smp_mflags} OPTIMIZE="$RPM_OPT_FLAGS"
+%{__perl} Makefile.PL INSTALLDIRS=vendor
+make %{?_smp_mflags}
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install \
-  PERL_INSTALL_ROOT=$RPM_BUILD_ROOT \
-  INSTALLARCHLIB=$RPM_BUILD_ROOT%{perl_archlib}
-find $RPM_BUILD_ROOT -type f -a \( -name perllocal.pod -o -name .packlist \
-  -o \( -name '*.bs' -a -empty \) \) -exec rm -f {} ';'
+make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
+find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'
 find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';'
 chmod -R u+w $RPM_BUILD_ROOT/*
 
 
-%check || :
+%check
 make test
 
 
@@ -51,13 +45,16 @@
 %files
 %defattr(-,root,root,-)
 %doc Changes README
-%{perl_vendorlib}/auto/File
-%{perl_vendorlib}/File
-%{_mandir}/man3/*.3*
+%{perl_vendorlib}/File/
+%{_mandir}/man3/File::Tail.3*
 
 
 %changelog
-* Fri Apr  7 2005 Michael Schwendt 
+* Thu Sep 15 2005 Ville Skytt??  - 0.99.3-1
+- 0.99.3.
+- Specfile cleanups.
+
+* Fri Apr  7 2005 Michael Schwendt  - 0.98-4
 - rebuilt
 
 * Sun Feb  8 2004 Ville Skytt??  - 0:0.98-0.fdr.3


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-File-Tail/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 05:00:29 -0000	1.2
+++ sources	15 Sep 2005 16:36:06 -0000	1.3
@@ -1 +1 @@
-d16d67052577a5cdcde03d5cd2dc5569  File-Tail-0.98.tar.gz
+ef0fb7bcb4181ba593f4a09940f61d1c  File-Tail-0.99.3.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep 15 18:13:22 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu, 15 Sep 2005 14:13:22 -0400
Subject: owners owners.list,1.217,1.218
Message-ID: <200509151813.j8FIDMQR002001@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1982

Modified Files:
	owners.list 
Log Message:
perl-File-Tail -> Jose


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.217
retrieving revision 1.218
diff -u -r1.217 -r1.218
--- owners.list	15 Sep 2005 15:30:45 -0000	1.217
+++ owners.list	15 Sep 2005 18:13:19 -0000	1.218
@@ -638,7 +638,7 @@
 Fedora Extras|perl-File-Find-Rule|Perl module implementing an alternative interface to File::Find|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-File-Remove|Convenience module for removing files and directories|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-File-Slurp|Efficient Reading/Writing of Complete Files|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
-Fedora Extras|perl-File-Tail|Perl extension for reading from continously updated files|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-File-Tail|Perl extension for reading from continously updated files|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Font-AFM|Perl interface to Adobe Font Metrics files|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-FreezeThaw|Convert Perl structures to strings and back|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-GDGraph3d|3D graph generation package for Perl|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Thu Sep 15 18:18:21 2005
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Thu, 15 Sep 2005 14:18:21 -0400
Subject: extras-buildsys/utils distro-rebuild.py,1.6,1.7
Message-ID: <200509151818.j8FIILFI002034@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys/utils
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2015

Modified Files:
	distro-rebuild.py 
Log Message:
Fix syntax error


Index: distro-rebuild.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/distro-rebuild.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- distro-rebuild.py	14 Sep 2005 16:53:29 -0000	1.6
+++ distro-rebuild.py	15 Sep 2005 18:18:19 -0000	1.7
@@ -169,7 +169,7 @@
 
     target = sys.argv[2]
     user = None
-    if len(sys.argv > 3)
+    if len(sys.argv) > 3:
         user = sys.argv[3]
 
     # Build up a list of all SRPMs in the specified directory



From fedora-extras-commits at redhat.com  Thu Sep 15 18:20:28 2005
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Thu, 15 Sep 2005 14:20:28 -0400
Subject: extras-buildsys/utils distro-rebuild.py,1.7,1.8
Message-ID: <200509151820.j8FIKS7k002077@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys/utils
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2058

Modified Files:
	distro-rebuild.py 
Log Message:
Fix another error


Index: distro-rebuild.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/distro-rebuild.py,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- distro-rebuild.py	15 Sep 2005 18:18:19 -0000	1.7
+++ distro-rebuild.py	15 Sep 2005 18:20:26 -0000	1.8
@@ -181,7 +181,7 @@
     names = files.keys()
     names.sort()
     for name in names:
-        f = names[name]
+        f = files[name]
         try:
             (rebuilt_srpm, temp_dir_path) = rebuild_srpm(name, f, user)
         except RebuildException, e:



From fedora-extras-commits at redhat.com  Thu Sep 15 18:43:47 2005
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Thu, 15 Sep 2005 14:43:47 -0400
Subject: rpms/grip/devel grip.desktop.patch,NONE,1.1 grip.spec,1.8,1.9
Message-ID: <200509151843.j8FIhleC002204@cvs-int.fedora.redhat.com>

Author: adrian

Update of /cvs/extras/rpms/grip/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2182

Modified Files:
	grip.spec 
Added Files:
	grip.desktop.patch 
Log Message:
* Wed Sep 14 2005 Adrian Reber  - 1:3.2.0-8
- added .desktop patch from Chong Kai Xiong (#167989)


grip.desktop.patch:

--- NEW FILE grip.desktop.patch ---
--- grip.desktop	2004-04-16 01:51:47.000000000 +0800
+++ grip.desktop	2005-09-13 10:54:09.000000000 +0800
@@ -1,21 +1,20 @@
 [Desktop Entry]
+Encoding=UTF-8
 Name=Grip
 Name[ca]=Grip
 Name[es]=Grip
+Name[de]=Grip
 Name[fi]=Grip
-Name[zh_CN]=Grip MP3 ?<88>???<9C>??<8B>??<8F>
-Name[zh_CN.GB2312]=Grip MP3 ?<88>???<9C>??<8B>??<8F>
-Name[zh_TW]=Grip MP3 ?????<9C>??<8B>??<8F>
-Name[zh_TW.Big5]=Grip MP3 ?????<9C>??<8B>??<8F>
+Name[zh_CN]=Grip
+Name[zh_TW]=Grip
 Comment=CD player/ripper
 Comment[ca]=Reproductor/extractor de CD d'audio
 Comment[es]=Reproductor/extractor de CDs de audio
+Comment[de]=Audio-CDs rippen und OGGs kodieren
 Comment[fr]=Lecteur/extracteur de CD audio
 Comment[fi]=CD-audion soitto- ja kopiointiohjelma
-Comment[zh_CN]=Grip ????<82>?????<9D>??<88>???<9C> MP3 ?<96><87>???
-Comment[zh_CN.GB2312]=Grip ????<82>?????<9D>??<88>???<9C> MP3 ?<96><87>???
-Comment[zh_TW]=Grip ??<93>?<82>???<95>??<86>?????<9C> MP3 ??<94>
-Comment[zh_TW.Big5]=Grip ??<93>?<82>???<95>??<86>?????<9C> MP3 ??<94>
+Comment[zh_CN]=CD ??????/?????????
+Comment[zh_TW]=CD ??????/????????????
 Exec=grip
 Icon=gripicon.png
 Type=Application


Index: grip.spec
===================================================================
RCS file: /cvs/extras/rpms/grip/devel/grip.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- grip.spec	23 Aug 2005 15:13:07 -0000	1.8
+++ grip.spec	15 Sep 2005 18:43:45 -0000	1.9
@@ -1,7 +1,7 @@
 Summary: Front-end for CD rippers and Ogg Vorbis encoders
 Name: grip
 Version: 3.2.0
-Release: 7%{?dist}
+Release: 8%{?dist}
 Epoch: 1
 License: GPL
 Group: Applications/Multimedia
@@ -10,6 +10,7 @@
 Patch1: grip-3.2.0-default.patch
 Patch2: grip-cell-renderer.patch
 Patch3: grip-3.2.0-id3.c.patch
+Patch4: grip.desktop.patch
 URL: http://www.nostatic.org/grip/
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: vorbis-tools
@@ -29,6 +30,7 @@
 %patch1 -p1 -b .rh-default-encoder
 %patch2 -p1 -b .cell-renderer
 %patch3 -p1 -b .id3
+%patch4
 
 %build
 %configure
@@ -44,14 +46,7 @@
 
 cat >> %{buildroot}%{_datadir}/applications/grip.desktop << EOF
 StartupWMClass=Grip
-Encoding=UTF-8
 EOF
-iconv -f ISO-8859-1 -t UTF-8 \
-	$RPM_BUILD_ROOT%{_datadir}/applications/grip.desktop > \
-	$RPM_BUILD_ROOT%{_datadir}/applications/grip.desktop.new
-
-mv	$RPM_BUILD_ROOT%{_datadir}/applications/grip.desktop.new \
-	$RPM_BUILD_ROOT%{_datadir}/applications/grip.desktop
 
 desktop-file-install \
 	--vendor=fedora \
@@ -77,6 +72,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Wed Sep 14 2005 Adrian Reber  - 1:3.2.0-8
+- added .desktop patch from Chong Kai Xiong (#167989)
+
 * Sat Aug 20 2005 Adrian Reber  - 1:3.2.0-7
 - rebuilt
 



From fedora-extras-commits at redhat.com  Thu Sep 15 19:37:58 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu, 15 Sep 2005 15:37:58 -0400
Subject: rpms/mathml-fonts/devel .cvsignore, 1.2, 1.3 find_symbol_font.sh,
	1.2, 1.3 mathml-fonts.spec, 1.8, 1.9 sources, 1.2, 1.3
Message-ID: <200509151937.j8FJbwQg003793@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/mathml-fonts/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3728/devel

Modified Files:
	.cvsignore find_symbol_font.sh mathml-fonts.spec sources 
Log Message:
* Thu Sep 15 2005 Rex Dieter  1.0-18
- replace latex-xft-fonts with bakoma4lyx
- remove non-distributable Math'ca fonts (#168405)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mathml-fonts/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 04:51:17 -0000	1.2
+++ .cvsignore	15 Sep 2005 19:37:56 -0000	1.3
@@ -1,3 +1,3 @@
 cmbx10.ttf
-latex-xft-fonts-0.1.tar.gz
+BaKoMa4LyX.zip
 mtextra.ttf


Index: find_symbol_font.sh
===================================================================
RCS file: /cvs/extras/rpms/mathml-fonts/devel/find_symbol_font.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- find_symbol_font.sh	5 Aug 2005 16:06:29 -0000	1.2
+++ find_symbol_font.sh	15 Sep 2005 19:37:56 -0000	1.3
@@ -1,6 +1,10 @@
 #!/bin/bash
 # $Id$
 
+if [ -f /etc/sysconfig/mathml-fonts ]; then
+ source /etc/sysconfig/mathml-fonts
+fi
+
 fontdir=${MATHML_FONTS_DIR:-/usr/share/fonts/mathml}
 
 while true


Index: mathml-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/mathml-fonts/devel/mathml-fonts.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- mathml-fonts.spec	5 Aug 2005 16:42:46 -0000	1.8
+++ mathml-fonts.spec	15 Sep 2005 19:37:56 -0000	1.9
@@ -5,8 +5,8 @@
 
 Summary: Mathematical symbol fonts
 Name:    mathml-fonts
-Version: 1.0
-Release: 17%{?dist}
+Version: 1.0 
+Release: 18%{?dist}
 
 URL:     http://www.mozilla.org/projects/mathml/fonts/
 License: Distributable
@@ -21,16 +21,17 @@
 %define find_symbol_font %{find_symbol_dir}/find_symbol_font.sh
 
 ## Mathematica fonts
-Source10: http://support.wolfram.com/mathematica/systems/windows/general/MathFonts_TrueType.exe
+#  License: http://support.wolfram.com/mathematica/systems/windows/general/latestfonts.html (non-distributable)
+%{?_with_mathematica:Source10: http://support.wolfram.com/mathematica/systems/windows/general/MathFonts_TrueType.exe}
 ## TeX fonts
 #Source20: ftp://tug.ctan.org/tex-archive/fonts/cm/ps-type1/bakoma/ttf.tar.gz
 Source20: ftp://tug.ctan.org/tex-archive/fonts/cm/ps-type1/bakoma/ttf/cmbx10.ttf
 # Reference: http://wiki.lyx.org/LyX/Troubleshooting 
-Source21: http://movementarian.org/latex-xft-fonts-0.1.tar.gz 
+Source21: ftp://ftp.lyx.org/pub/lyx/contrib/BaKoMa4LyX.zip
 ## Design Science fonts
-#  License: http://www.dessci.com/en/support/eula/mtextralic.htm
+#  License: http://www.dessci.com/en/support/eula/fonts/mtextralic.htm
 #  URL: http://www.dessci.com/en/dl/fonts/
-# extracted from MTW_Truetype.exe
+# extracted from MathTypeTrueTypeFonts.exe (rename from http://www.dessci.com/en/dl/MathTypeTrueTypeFonts.asp)
 # (couldn't figure out how extract at build-time -- Rex)
 Source30: mtextra.ttf
 
@@ -40,11 +41,14 @@
 # in %%post,%%postun,%%triggers 
 Prereq: fontconfig
 
-Provides: latex-xft-fonts = 0:0.1
+# Provide lyx upstream contrib rpms
+Provides: latex-xft-fonts = 0.1
+Provides: latex-bakoma4lyx-fonts = 1
 
 %description
 This package contains fonts required to display mathematical
 symbols.  Applications supported include:
+
 * mozilla (and netscape >= 7) to display MathML
 * lyx
 * kformula (koffice)
@@ -54,11 +58,12 @@
 %setup -T -c -n %{name}
 
 ## Math'ca
-unzip %{SOURCE10}
+%{?_with_mathematica:unzip %{SOURCE10}}
 
 ## TeX fonts
 #setup -T -D -n %{name} -a 20
 cp -a %{SOURCE20} .
+
 %setup -T -D -n %{name} -a 21
 
 ## dessci
@@ -74,11 +79,9 @@
 
 install -d $RPM_BUILD_ROOT%{fontdir}
 
-# Ignore warnings about duplicate files/fonts, they're indentical anyway.
 install -p -m644 \
-  math{1,2,4}___.ttf \
-  latex-xft-fonts*/*.ttf \
-  cmbx10.ttf mtextra.ttf \
+  %{?_with_mathematica:math{1,2,4}___.ttf} \
+  *10.ttf mtextra.ttf \
   $RPM_BUILD_ROOT%{fontdir}/
 
 # find_symbol_font
@@ -108,6 +111,7 @@
 
 %files
 %defattr(-,root,root)
+%doc Readme.txt
 %dir %{find_symbol_dir}
 %{find_symbol_font}
 %dir %{fontdir}
@@ -122,8 +126,12 @@
 
 
 %changelog
+* Thu Sep 15 2005 Rex Dieter  1.0-18
+- replace latex-xft-fonts with bakoma4lyx
+- remove non-distributable Math'ca fonts (#168405)
+
 * Wed Aug  3 2005 Rex Dieter  1.0-17
-- update for acroread7 (and SY_____.PFB) (bug #133709)
+- update for acroread7 (and SY_____.PFB) (#133709)
 - include/use find_symbol_font.sh helper script
 - readd %%postun
 - update latex-xft-fonts URL


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mathml-fonts/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 04:51:17 -0000	1.2
+++ sources	15 Sep 2005 19:37:56 -0000	1.3
@@ -1,3 +1,3 @@
 19f80def73f72679e916fa8143f9be02  cmbx10.ttf
-0f3275e403be5fdbd14117dd8a26675f  latex-xft-fonts-0.1.tar.gz
+46d1caf4e2bf294d641cf1c37be19082  BaKoMa4LyX.zip
 fe5c714162bf1b9c936b2bc5e66da03e  mtextra.ttf



From fedora-extras-commits at redhat.com  Thu Sep 15 19:37:52 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu, 15 Sep 2005 15:37:52 -0400
Subject: rpms/mathml-fonts/FC-3 .cvsignore, 1.2, 1.3 find_symbol_font.sh, 1.2,
	1.3 mathml-fonts.spec, 1.4, 1.5 sources, 1.2, 1.3
Message-ID: <200509151938.j8FJcMT0003799@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/mathml-fonts/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3728/FC-3

Modified Files:
	.cvsignore find_symbol_font.sh mathml-fonts.spec sources 
Log Message:
* Thu Sep 15 2005 Rex Dieter  1.0-18
- replace latex-xft-fonts with bakoma4lyx
- remove non-distributable Math'ca fonts (#168405)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mathml-fonts/FC-3/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 04:51:17 -0000	1.2
+++ .cvsignore	15 Sep 2005 19:37:50 -0000	1.3
@@ -1,3 +1,3 @@
 cmbx10.ttf
-latex-xft-fonts-0.1.tar.gz
+BaKoMa4LyX.zip
 mtextra.ttf


Index: find_symbol_font.sh
===================================================================
RCS file: /cvs/extras/rpms/mathml-fonts/FC-3/find_symbol_font.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- find_symbol_font.sh	5 Aug 2005 16:44:53 -0000	1.2
+++ find_symbol_font.sh	15 Sep 2005 19:37:50 -0000	1.3
@@ -1,6 +1,10 @@
 #!/bin/bash
 # $Id$
 
+if [ -f /etc/sysconfig/mathml-fonts ]; then
+ source /etc/sysconfig/mathml-fonts
+fi
+
 fontdir=${MATHML_FONTS_DIR:-/usr/share/fonts/mathml}
 
 while true


Index: mathml-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/mathml-fonts/FC-3/mathml-fonts.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- mathml-fonts.spec	5 Aug 2005 16:44:53 -0000	1.4
+++ mathml-fonts.spec	15 Sep 2005 19:37:50 -0000	1.5
@@ -5,8 +5,8 @@
 
 Summary: Mathematical symbol fonts
 Name:    mathml-fonts
-Version: 1.0
-Release: 17%{?dist}
+Version: 1.0 
+Release: 18%{?dist}
 
 URL:     http://www.mozilla.org/projects/mathml/fonts/
 License: Distributable
@@ -21,16 +21,17 @@
 %define find_symbol_font %{find_symbol_dir}/find_symbol_font.sh
 
 ## Mathematica fonts
-Source10: http://support.wolfram.com/mathematica/systems/windows/general/MathFonts_TrueType.exe
+#  License: http://support.wolfram.com/mathematica/systems/windows/general/latestfonts.html (non-distributable)
+%{?_with_mathematica:Source10: http://support.wolfram.com/mathematica/systems/windows/general/MathFonts_TrueType.exe}
 ## TeX fonts
 #Source20: ftp://tug.ctan.org/tex-archive/fonts/cm/ps-type1/bakoma/ttf.tar.gz
 Source20: ftp://tug.ctan.org/tex-archive/fonts/cm/ps-type1/bakoma/ttf/cmbx10.ttf
 # Reference: http://wiki.lyx.org/LyX/Troubleshooting 
-Source21: http://movementarian.org/latex-xft-fonts-0.1.tar.gz 
+Source21: ftp://ftp.lyx.org/pub/lyx/contrib/BaKoMa4LyX.zip
 ## Design Science fonts
-#  License: http://www.dessci.com/en/support/eula/mtextralic.htm
+#  License: http://www.dessci.com/en/support/eula/fonts/mtextralic.htm
 #  URL: http://www.dessci.com/en/dl/fonts/
-# extracted from MTW_Truetype.exe
+# extracted from MathTypeTrueTypeFonts.exe (rename from http://www.dessci.com/en/dl/MathTypeTrueTypeFonts.asp)
 # (couldn't figure out how extract at build-time -- Rex)
 Source30: mtextra.ttf
 
@@ -40,11 +41,14 @@
 # in %%post,%%postun,%%triggers 
 Prereq: fontconfig
 
-Provides: latex-xft-fonts = 0:0.1
+# Provide lyx upstream contrib rpms
+Provides: latex-xft-fonts = 0.1
+Provides: latex-bakoma4lyx-fonts = 1
 
 %description
 This package contains fonts required to display mathematical
 symbols.  Applications supported include:
+
 * mozilla (and netscape >= 7) to display MathML
 * lyx
 * kformula (koffice)
@@ -54,11 +58,12 @@
 %setup -T -c -n %{name}
 
 ## Math'ca
-unzip %{SOURCE10}
+%{?_with_mathematica:unzip %{SOURCE10}}
 
 ## TeX fonts
 #setup -T -D -n %{name} -a 20
 cp -a %{SOURCE20} .
+
 %setup -T -D -n %{name} -a 21
 
 ## dessci
@@ -74,11 +79,9 @@
 
 install -d $RPM_BUILD_ROOT%{fontdir}
 
-# Ignore warnings about duplicate files/fonts, they're indentical anyway.
 install -p -m644 \
-  math{1,2,4}___.ttf \
-  latex-xft-fonts*/*.ttf \
-  cmbx10.ttf mtextra.ttf \
+  %{?_with_mathematica:math{1,2,4}___.ttf} \
+  *10.ttf mtextra.ttf \
   $RPM_BUILD_ROOT%{fontdir}/
 
 # find_symbol_font
@@ -108,6 +111,7 @@
 
 %files
 %defattr(-,root,root)
+%doc Readme.txt
 %dir %{find_symbol_dir}
 %{find_symbol_font}
 %dir %{fontdir}
@@ -122,8 +126,12 @@
 
 
 %changelog
+* Thu Sep 15 2005 Rex Dieter  1.0-18
+- replace latex-xft-fonts with bakoma4lyx
+- remove non-distributable Math'ca fonts (#168405)
+
 * Wed Aug  3 2005 Rex Dieter  1.0-17
-- update for acroread7 (and SY_____.PFB) (bug #133709)
+- update for acroread7 (and SY_____.PFB) (#133709)
 - include/use find_symbol_font.sh helper script
 - readd %%postun
 - update latex-xft-fonts URL


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mathml-fonts/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 04:51:17 -0000	1.2
+++ sources	15 Sep 2005 19:37:50 -0000	1.3
@@ -1,3 +1,3 @@
 19f80def73f72679e916fa8143f9be02  cmbx10.ttf
-0f3275e403be5fdbd14117dd8a26675f  latex-xft-fonts-0.1.tar.gz
+46d1caf4e2bf294d641cf1c37be19082  BaKoMa4LyX.zip
 fe5c714162bf1b9c936b2bc5e66da03e  mtextra.ttf



From fedora-extras-commits at redhat.com  Thu Sep 15 19:37:52 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu, 15 Sep 2005 15:37:52 -0400
Subject: rpms/mathml-fonts/FC-4 .cvsignore, 1.2, 1.3 find_symbol_font.sh, 1.2,
	1.3 mathml-fonts.spec, 1.8, 1.9 sources, 1.2, 1.3
Message-ID: <200509151938.j8FJcMc2003805@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/mathml-fonts/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3728/FC-4

Modified Files:
	.cvsignore find_symbol_font.sh mathml-fonts.spec sources 
Log Message:
* Thu Sep 15 2005 Rex Dieter  1.0-18
- replace latex-xft-fonts with bakoma4lyx
- remove non-distributable Math'ca fonts (#168405)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mathml-fonts/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 04:51:17 -0000	1.2
+++ .cvsignore	15 Sep 2005 19:37:50 -0000	1.3
@@ -1,3 +1,3 @@
 cmbx10.ttf
-latex-xft-fonts-0.1.tar.gz
+BaKoMa4LyX.zip
 mtextra.ttf


Index: find_symbol_font.sh
===================================================================
RCS file: /cvs/extras/rpms/mathml-fonts/FC-4/find_symbol_font.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- find_symbol_font.sh	5 Aug 2005 16:41:14 -0000	1.2
+++ find_symbol_font.sh	15 Sep 2005 19:37:50 -0000	1.3
@@ -1,6 +1,10 @@
 #!/bin/bash
 # $Id$
 
+if [ -f /etc/sysconfig/mathml-fonts ]; then
+ source /etc/sysconfig/mathml-fonts
+fi
+
 fontdir=${MATHML_FONTS_DIR:-/usr/share/fonts/mathml}
 
 while true


Index: mathml-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/mathml-fonts/FC-4/mathml-fonts.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- mathml-fonts.spec	5 Aug 2005 16:44:16 -0000	1.8
+++ mathml-fonts.spec	15 Sep 2005 19:37:50 -0000	1.9
@@ -5,8 +5,8 @@
 
 Summary: Mathematical symbol fonts
 Name:    mathml-fonts
-Version: 1.0
-Release: 17%{?dist}
+Version: 1.0 
+Release: 18%{?dist}
 
 URL:     http://www.mozilla.org/projects/mathml/fonts/
 License: Distributable
@@ -21,16 +21,17 @@
 %define find_symbol_font %{find_symbol_dir}/find_symbol_font.sh
 
 ## Mathematica fonts
-Source10: http://support.wolfram.com/mathematica/systems/windows/general/MathFonts_TrueType.exe
+#  License: http://support.wolfram.com/mathematica/systems/windows/general/latestfonts.html (non-distributable)
+%{?_with_mathematica:Source10: http://support.wolfram.com/mathematica/systems/windows/general/MathFonts_TrueType.exe}
 ## TeX fonts
 #Source20: ftp://tug.ctan.org/tex-archive/fonts/cm/ps-type1/bakoma/ttf.tar.gz
 Source20: ftp://tug.ctan.org/tex-archive/fonts/cm/ps-type1/bakoma/ttf/cmbx10.ttf
 # Reference: http://wiki.lyx.org/LyX/Troubleshooting 
-Source21: http://movementarian.org/latex-xft-fonts-0.1.tar.gz 
+Source21: ftp://ftp.lyx.org/pub/lyx/contrib/BaKoMa4LyX.zip
 ## Design Science fonts
-#  License: http://www.dessci.com/en/support/eula/mtextralic.htm
+#  License: http://www.dessci.com/en/support/eula/fonts/mtextralic.htm
 #  URL: http://www.dessci.com/en/dl/fonts/
-# extracted from MTW_Truetype.exe
+# extracted from MathTypeTrueTypeFonts.exe (rename from http://www.dessci.com/en/dl/MathTypeTrueTypeFonts.asp)
 # (couldn't figure out how extract at build-time -- Rex)
 Source30: mtextra.ttf
 
@@ -40,11 +41,14 @@
 # in %%post,%%postun,%%triggers 
 Prereq: fontconfig
 
-Provides: latex-xft-fonts = 0:0.1
+# Provide lyx upstream contrib rpms
+Provides: latex-xft-fonts = 0.1
+Provides: latex-bakoma4lyx-fonts = 1
 
 %description
 This package contains fonts required to display mathematical
 symbols.  Applications supported include:
+
 * mozilla (and netscape >= 7) to display MathML
 * lyx
 * kformula (koffice)
@@ -54,11 +58,12 @@
 %setup -T -c -n %{name}
 
 ## Math'ca
-unzip %{SOURCE10}
+%{?_with_mathematica:unzip %{SOURCE10}}
 
 ## TeX fonts
 #setup -T -D -n %{name} -a 20
 cp -a %{SOURCE20} .
+
 %setup -T -D -n %{name} -a 21
 
 ## dessci
@@ -74,11 +79,9 @@
 
 install -d $RPM_BUILD_ROOT%{fontdir}
 
-# Ignore warnings about duplicate files/fonts, they're indentical anyway.
 install -p -m644 \
-  math{1,2,4}___.ttf \
-  latex-xft-fonts*/*.ttf \
-  cmbx10.ttf mtextra.ttf \
+  %{?_with_mathematica:math{1,2,4}___.ttf} \
+  *10.ttf mtextra.ttf \
   $RPM_BUILD_ROOT%{fontdir}/
 
 # find_symbol_font
@@ -108,6 +111,7 @@
 
 %files
 %defattr(-,root,root)
+%doc Readme.txt
 %dir %{find_symbol_dir}
 %{find_symbol_font}
 %dir %{fontdir}
@@ -122,8 +126,12 @@
 
 
 %changelog
+* Thu Sep 15 2005 Rex Dieter  1.0-18
+- replace latex-xft-fonts with bakoma4lyx
+- remove non-distributable Math'ca fonts (#168405)
+
 * Wed Aug  3 2005 Rex Dieter  1.0-17
-- update for acroread7 (and SY_____.PFB) (bug #133709)
+- update for acroread7 (and SY_____.PFB) (#133709)
 - include/use find_symbol_font.sh helper script
 - readd %%postun
 - update latex-xft-fonts URL


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mathml-fonts/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 04:51:17 -0000	1.2
+++ sources	15 Sep 2005 19:37:50 -0000	1.3
@@ -1,3 +1,3 @@
 19f80def73f72679e916fa8143f9be02  cmbx10.ttf
-0f3275e403be5fdbd14117dd8a26675f  latex-xft-fonts-0.1.tar.gz
+46d1caf4e2bf294d641cf1c37be19082  BaKoMa4LyX.zip
 fe5c714162bf1b9c936b2bc5e66da03e  mtextra.ttf



From fedora-extras-commits at redhat.com  Thu Sep 15 19:45:02 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu, 15 Sep 2005 15:45:02 -0400
Subject: rpms/mathml-fonts/devel MathFonts_TrueType.exe,1.1,NONE
Message-ID: <200509151945.j8FJj2Xd003983@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/mathml-fonts/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3928/devel

Removed Files:
	MathFonts_TrueType.exe 
Log Message:



--- MathFonts_TrueType.exe DELETED ---



From fedora-extras-commits at redhat.com  Thu Sep 15 19:45:00 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu, 15 Sep 2005 15:45:00 -0400
Subject: rpms/mathml-fonts/FC-3 MathFonts_TrueType.exe,1.1,NONE
Message-ID: <200509151945.j8FJj0uN003970@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/mathml-fonts/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3928/FC-3

Removed Files:
	MathFonts_TrueType.exe 
Log Message:



--- MathFonts_TrueType.exe DELETED ---



From fedora-extras-commits at redhat.com  Thu Sep 15 19:45:01 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu, 15 Sep 2005 15:45:01 -0400
Subject: rpms/mathml-fonts/FC-4 MathFonts_TrueType.exe,1.1,NONE
Message-ID: <200509151945.j8FJj1ib003976@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/mathml-fonts/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3928/FC-4

Removed Files:
	MathFonts_TrueType.exe 
Log Message:



--- MathFonts_TrueType.exe DELETED ---



From fedora-extras-commits at redhat.com  Thu Sep 15 20:10:28 2005
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Thu, 15 Sep 2005 16:10:28 -0400
Subject: rpms/grip/FC-4 grip.desktop.patch,NONE,1.1 grip.spec,1.7,1.8
Message-ID: <200509152010.j8FKASw5005436@cvs-int.fedora.redhat.com>

Author: adrian

Update of /cvs/extras/rpms/grip/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5413

Modified Files:
	grip.spec 
Added Files:
	grip.desktop.patch 
Log Message:
* Wed Sep 14 2005 Adrian Reber  - 1:3.2.0-8
- added .desktop patch from Chong Kai Xiong (#167989)


grip.desktop.patch:

--- NEW FILE grip.desktop.patch ---
--- grip.desktop	2004-04-16 01:51:47.000000000 +0800
+++ grip.desktop	2005-09-13 10:54:09.000000000 +0800
@@ -1,21 +1,20 @@
 [Desktop Entry]
+Encoding=UTF-8
 Name=Grip
 Name[ca]=Grip
 Name[es]=Grip
+Name[de]=Grip
 Name[fi]=Grip
-Name[zh_CN]=Grip MP3 ?<88>???<9C>??<8B>??<8F>
-Name[zh_CN.GB2312]=Grip MP3 ?<88>???<9C>??<8B>??<8F>
-Name[zh_TW]=Grip MP3 ?????<9C>??<8B>??<8F>
-Name[zh_TW.Big5]=Grip MP3 ?????<9C>??<8B>??<8F>
+Name[zh_CN]=Grip
+Name[zh_TW]=Grip
 Comment=CD player/ripper
 Comment[ca]=Reproductor/extractor de CD d'audio
 Comment[es]=Reproductor/extractor de CDs de audio
+Comment[de]=Audio-CDs rippen und OGGs kodieren
 Comment[fr]=Lecteur/extracteur de CD audio
 Comment[fi]=CD-audion soitto- ja kopiointiohjelma
-Comment[zh_CN]=Grip ????<82>?????<9D>??<88>???<9C> MP3 ?<96><87>???
-Comment[zh_CN.GB2312]=Grip ????<82>?????<9D>??<88>???<9C> MP3 ?<96><87>???
-Comment[zh_TW]=Grip ??<93>?<82>???<95>??<86>?????<9C> MP3 ??<94>
-Comment[zh_TW.Big5]=Grip ??<93>?<82>???<95>??<86>?????<9C> MP3 ??<94>
+Comment[zh_CN]=CD ??????/?????????
+Comment[zh_TW]=CD ??????/????????????
 Exec=grip
 Icon=gripicon.png
 Type=Application


Index: grip.spec
===================================================================
RCS file: /cvs/extras/rpms/grip/FC-4/grip.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- grip.spec	23 Aug 2005 15:13:07 -0000	1.7
+++ grip.spec	15 Sep 2005 20:10:26 -0000	1.8
@@ -1,7 +1,7 @@
 Summary: Front-end for CD rippers and Ogg Vorbis encoders
 Name: grip
 Version: 3.2.0
-Release: 6%{?dist}
+Release: 8%{?dist}
 Epoch: 1
 License: GPL
 Group: Applications/Multimedia
@@ -10,6 +10,7 @@
 Patch1: grip-3.2.0-default.patch
 Patch2: grip-cell-renderer.patch
 Patch3: grip-3.2.0-id3.c.patch
+Patch4: grip.desktop.patch
 URL: http://www.nostatic.org/grip/
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: vorbis-tools
@@ -29,6 +30,7 @@
 %patch1 -p1 -b .rh-default-encoder
 %patch2 -p1 -b .cell-renderer
 %patch3 -p1 -b .id3
+%patch4
 
 %build
 %configure
@@ -44,14 +46,7 @@
 
 cat >> %{buildroot}%{_datadir}/applications/grip.desktop << EOF
 StartupWMClass=Grip
-Encoding=UTF-8
 EOF
-iconv -f ISO-8859-1 -t UTF-8 \
-	$RPM_BUILD_ROOT%{_datadir}/applications/grip.desktop > \
-	$RPM_BUILD_ROOT%{_datadir}/applications/grip.desktop.new
-
-mv	$RPM_BUILD_ROOT%{_datadir}/applications/grip.desktop.new \
-	$RPM_BUILD_ROOT%{_datadir}/applications/grip.desktop
 
 desktop-file-install \
 	--vendor=fedora \
@@ -77,6 +72,12 @@
 %{_mandir}/man1/*
 
 %changelog
+* Wed Sep 14 2005 Adrian Reber  - 1:3.2.0-8
+- added .desktop patch from Chong Kai Xiong (#167989)
+
+* Sat Aug 20 2005 Adrian Reber  - 1:3.2.0-7
+- rebuilt
+
 * Thu Aug 04 2005 Adrian Reber  - 1:3.2.0-6
 - added patch for buffer overflow in id3.c (#160671)
 



From fedora-extras-commits at redhat.com  Thu Sep 15 23:33:49 2005
From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters))
Date: Thu, 15 Sep 2005 19:33:49 -0400
Subject: rpms/gnomesword import.log,1.4,1.5
Message-ID: <200509152333.j8FNXn5f010159@cvs-int.fedora.redhat.com>

Author: mpeters

Update of /cvs/extras/rpms/gnomesword
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10125

Modified Files:
	import.log 
Log Message:
auto-import gnomesword-2.1.2-2.3.fc4 on branch FC-3 from gnomesword-2.1.2-2.3.fc4.src.rpm
patch for x86_64


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/gnomesword/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- import.log	15 Sep 2005 11:39:59 -0000	1.4
+++ import.log	15 Sep 2005 23:33:47 -0000	1.5
@@ -1,3 +1,4 @@
 gnomesword-2_1_2-1:HEAD:gnomesword-2.1.2-1.src.rpm:1118145807
 gnomesword-2_1_2-2_2:FC-4:gnomesword-2.1.2-2.2.src.rpm:1126783889
 gnomesword-2_1_2-2_2:HEAD:gnomesword-2.1.2-2.2.src.rpm:1126784329
+gnomesword-2_1_2-2_3_fc4:FC-3:gnomesword-2.1.2-2.3.fc4.src.rpm:1126827156



From fedora-extras-commits at redhat.com  Thu Sep 15 23:33:50 2005
From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters))
Date: Thu, 15 Sep 2005 19:33:50 -0400
Subject: rpms/gnomesword/FC-3 gnomesword-2.1.2-gettext64.patch, NONE,
	1.1 gnomesword.spec, 1.4, 1.5
Message-ID: <200509152333.j8FNXoEg010167@cvs-int.fedora.redhat.com>

Author: mpeters

Update of /cvs/extras/rpms/gnomesword/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10125/FC-3

Modified Files:
	gnomesword.spec 
Added Files:
	gnomesword-2.1.2-gettext64.patch 
Log Message:
auto-import gnomesword-2.1.2-2.3.fc4 on branch FC-3 from gnomesword-2.1.2-2.3.fc4.src.rpm
patch for x86_64

gnomesword-2.1.2-gettext64.patch:

--- NEW FILE gnomesword-2.1.2-gettext64.patch ---
--- gnomesword-2.1.2/aclocal.m4.BAD	2005-09-04 15:56:31.000000000 -0500
+++ gnomesword-2.1.2/aclocal.m4	2005-09-04 15:56:47.000000000 -0500
@@ -144,7 +144,7 @@
         	[AC_TRY_LINK([
 #include 
 ],
-	          [return (int) dgettext ("","")],
+	          [return dgettext ("","") != 0],
 		  gt_cv_func_dgettext_libc=yes,
 	          gt_cv_func_dgettext_libc=no)
         	])
--- gnomesword-2.1.2/configure.BAD	2005-09-04 15:57:32.000000000 -0500
+++ gnomesword-2.1.2/configure	2005-09-04 16:00:29.000000000 -0500
@@ -22807,7 +22807,7 @@
 int
 main ()
 {
-return (int) dgettext ("","")
+return dgettext ("","") != 0
   ;
   return 0;
 }


Index: gnomesword.spec
===================================================================
RCS file: /cvs/extras/rpms/gnomesword/FC-3/gnomesword.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gnomesword.spec	13 Jun 2005 09:55:12 -0000	1.4
+++ gnomesword.spec	15 Sep 2005 23:33:47 -0000	1.5
@@ -1,12 +1,13 @@
 Name:           gnomesword           
 Version:        2.1.2
-Release:        2.2%{?dist}
+Release:        2.3%{?dist}
 Summary:        GNOME-based Bible research tool
 
 Group:          Applications/Text
 License:        GPL
 URL:            http://gnomesword.sourceforge.net/
 Source0:        http://easynews.dl.sourceforge.net/sourceforge/gnomesword/gnomesword-%{version}.tar.gz
+Patch0:         gnomesword-2.1.2-gettext64.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  sed >= 3.95
@@ -18,6 +19,8 @@
 BuildRequires:  curl-devel
 BuildRequires:  libgnomeui-devel
 BuildRequires:  scrollkeeper
+# currently broken on x86_64
+# ExcludeArch:    x86_64
 # for x86_64
 %ifarch x86_64
 BuildRequires:  libtool automake autoconf
@@ -35,7 +38,10 @@
 and other texts using your computer.
 
 %prep
-%setup -q 
+%setup -q
+%ifarch x86_64
+%patch0 -p1 -b .gettext64 
+%endif
 %{__sed} -i 's?\r??' doc/help/C/legal.xml
 %{__sed} -i 's?\r??' doc/help/fr/legal.xml
 
@@ -84,8 +90,10 @@
 
 
 %changelog
-* Mon Jun 13 2005 Michael A. Peters  - 2.1.2-2.2
-- Attempting fix for x86_64 base on lock-keys-applet fix
+* Thu Sep 15 2005 Michael A. Peters  - 2.1.2-2.3
+- trying patch suggested by Tom 'spot' Callaway to fix x86_64 bug
+- 160186
+- libtool, aclocal, autoheader, automake, autoconf on x86_64
 
 * Sun Jun 12 2005 Michael A. Peters  - 2.1.2-2.1
 - Exclude x86_64 for now



From fedora-extras-commits at redhat.com  Fri Sep 16 02:03:12 2005
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Thu, 15 Sep 2005 22:03:12 -0400
Subject: rpms/perl-HTML-Mason - New directory
Message-ID: <200509160203.j8G23CYq015364@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-HTML-Mason
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15354/perl-HTML-Mason

Log Message:
Directory /cvs/extras/rpms/perl-HTML-Mason added to the repository




From fedora-extras-commits at redhat.com  Fri Sep 16 02:03:15 2005
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Thu, 15 Sep 2005 22:03:15 -0400
Subject: rpms/perl-HTML-Mason/devel - New directory
Message-ID: <200509160203.j8G23Fqw015374@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-HTML-Mason/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15354/perl-HTML-Mason/devel

Log Message:
Directory /cvs/extras/rpms/perl-HTML-Mason/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Sep 16 02:04:35 2005
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Thu, 15 Sep 2005 22:04:35 -0400
Subject: rpms/perl-HTML-Mason Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200509160204.j8G24ZL2015423@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-HTML-Mason
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15409

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-HTML-Mason


--- NEW FILE Makefile ---
# Top level Makefile for module perl-HTML-Mason
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Fri Sep 16 02:05:07 2005
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Thu, 15 Sep 2005 22:05:07 -0400
Subject: rpms/perl-HTML-Mason/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200509160205.j8G257RA015444@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-HTML-Mason/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15409/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-HTML-Mason


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Fri Sep 16 02:06:52 2005
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Thu, 15 Sep 2005 22:06:52 -0400
Subject: owners owners.list,1.218,1.219
Message-ID: <200509160207.j8G27MFY015508@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15477

Modified Files:
	owners.list 
Log Message:
Add perl-HTML-Mason.


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.218
retrieving revision 1.219
diff -u -r1.218 -r1.219
--- owners.list	15 Sep 2005 18:13:19 -0000	1.218
+++ owners.list	16 Sep 2005 02:06:49 -0000	1.219
@@ -653,6 +653,7 @@
 Fedora Extras|perl-Heap|A collection of routines for managing a heap data structure|thm at duke.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Hook-LexWrap|Lexically scoped subroutine wrappers|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-HTML-Format|HTML formatter modules|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-HTML-Mason|HTML::Mason Perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-HTML-Scrubber|Library for scrubbing/sanitizing html|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-HTML-Template|Perl module to use HTML Templates|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-HTML-Template-Expr|Expression support extension for HTML::Template|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Fri Sep 16 02:09:57 2005
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Thu, 15 Sep 2005 22:09:57 -0400
Subject: rpms/perl-HTML-Mason import.log,1.1,1.2
Message-ID: <200509160209.j8G29vGN015582@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-HTML-Mason
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15544

Modified Files:
	import.log 
Log Message:
auto-import perl-HTML-Mason-1.3101-3 on branch devel from perl-HTML-Mason-1.3101-3.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-HTML-Mason/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	16 Sep 2005 02:04:33 -0000	1.1
+++ import.log	16 Sep 2005 02:09:55 -0000	1.2
@@ -0,0 +1 @@
+perl-HTML-Mason-1_3101-3:HEAD:perl-HTML-Mason-1.3101-3.src.rpm:1126836562



From fedora-extras-commits at redhat.com  Fri Sep 16 02:10:16 2005
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Thu, 15 Sep 2005 22:10:16 -0400
Subject: rpms/perl-HTML-Mason/devel filter-provides.sh, NONE,
	1.1 filter-requires.sh, NONE, 1.1 perl-HTML-Mason.conf, NONE,
	1.1 perl-HTML-Mason.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200509160210.j8G2AGXH015589@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-HTML-Mason/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15544/devel

Modified Files:
	.cvsignore sources 
Added Files:
	filter-provides.sh filter-requires.sh perl-HTML-Mason.conf 
	perl-HTML-Mason.spec 
Log Message:
auto-import perl-HTML-Mason-1.3101-3 on branch devel from perl-HTML-Mason-1.3101-3.src.rpm


--- NEW FILE filter-provides.sh ---
#!/bin/sh

/usr/lib/rpm/perl.prov $* | grep -v '^perl(MyApp::'


--- NEW FILE filter-requires.sh ---
#!/bin/sh

/usr/lib/rpm/perl.req $* | grep -v '^perl(MasonX::Request::PlusApacheSession)$'


--- NEW FILE perl-HTML-Mason.conf ---
#
# perl-HTML-Mason.conf - HTML::Mason httpd 2.0.x configuration
#

#
# For more information on configuring Mason, see
# http://www.masonhq.com/docs/manual/Params.html
#
# PerlModule HTML::Mason::ApacheHandler

#
# The component root marks the top of your component hierarchy and defines how
# component paths are translated into real file paths. For example, if your
# component root is /usr/local/httpd/docs, a component path of
# /products/index.html translates to the file
# /usr/local/httpd/docs/products/index.html.
#
# Uncomment the following line to set a single component root:
#
# PerlSetVar MasonCompRoot "/var/www/mason"
#
# Uncomment the following lines to set multiple component roots:
#
# PerlAddVar MasonCompRoot "main    => /var/www/html"
# PerlAddVar MasonCompRoot "private => /var/www/mason"
#

#
# The data directory is a writable directory that Mason uses for various
# features and optimizations: for example, component object files and data
# cache files. Mason will create the directory on startup, if necessary, and
# set its permissions according to the web server User/Group.
#
# PerlSetVar MasonDataDir "/var/cache/mason"

#
# The error mode indicates how errors are returned to the caller.  The default
# under Apache and CGI is output, causing the error to be displayed in the
# browser. Uncomment the following line to make Mason die with an error
# instead.
#
# PerlSetVar MasonErrorMode fatal

#
# To use the Apache args method with Mason, make sure you have libapreq2
# installed and loaded, and uncomment the following lines.
#
# PerlOptions +GlobalRequest
# PerlModule Apache2::Request
# PerlSetVar MasonArgsMethod mod_perl

#
# If you do not have libapreq2 installed, you may use the CGI args method with
# Mason. To do so, uncomment the following lines.
#
# PerlModule CGI
# PerlSetVar MasonArgsMethod CGI

#
# The following configuration will tell Apache to serve certain files in your
# document root using HTML::Mason.
#
#
#    DefaultType text/html
#    SetHandler modperl
#    PerlResponseHandler HTML::Mason::ApacheHandler
#

#
#    DefaultType text/plain
#    SetHandler modperl
#    PerlResponseHandler HTML::Mason::ApacheHandler
#



--- NEW FILE perl-HTML-Mason.spec ---
Name:           perl-HTML-Mason
Version:        1.3101
Release:        3%{?dist}
Summary:        HTML::Mason Perl module
License:        GPL or Artistic
Group:          Development/Libraries
URL:            http://www.masonhq.com/
Source0:        http://www.cpan.org/authors/id/D/DR/DROLSKY/HTML-Mason-%{version}.tar.gz
Source1:        perl-HTML-Mason.conf

# Filter perl(MasonX::Request::PlusApacheSession).
Source2:        filter-requires.sh
%define __perl_requires %{SOURCE2}

# Filter perl(MyApp::Mason) and perl(MyApp::MasonPlusSession).
Source3:        filter-provides.sh
%define __perl_provides %{SOURCE3}

BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(Cache::Cache) >= 1
BuildRequires:  perl(Class::Container) >= 0.07
BuildRequires:  perl(Exception::Class) >= 1.15
BuildRequires:  perl(Module::Build::Compat) >= 0.02
BuildRequires:  perl(Params::Validate) >= 0.7
BuildRequires:  perl(mod_perl2)
Requires:       perl(Cache::Cache) >= 1
Requires:       perl(Class::Container) >= 0.07
Requires:       perl(Exception::Class) >= 1.15
Requires:       perl(Params::Validate) >= 0.7
Requires:       perl(mod_perl2)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
Requires:       %{_sysconfdir}/httpd/conf.d

%description
Mason is a powerful Perl-based web site development and delivery
engine. With Mason you can embed Perl code in your HTML and construct
pages from shared, reusable components.  Mason solves the common
problems of site development: caching, debugging, templating,
maintaining development and production sites, and more.

%prep
%setup -q -n HTML-Mason-%{version}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT

# make: *** No rule to make target `pure_install'.  Stop.
make install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT

find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null \;

chmod -R u+rwX,go+rX,go-w $RPM_BUILD_ROOT/*

mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/httpd/conf.d
install -p -m 0644 %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/httpd/conf.d/

mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/www/mason
mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/cache/mason

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc CREDITS Changes LICENSE README UPGRADE
%doc htdocs/ eg/ samples/
%{perl_vendorlib}/*
%{_mandir}/man3/*
%config(noreplace) %{_sysconfdir}/httpd/conf.d/perl-HTML-Mason.conf
%dir %attr(775,root,apache) %{_localstatedir}/cache/mason
%dir %{_localstatedir}/www/mason

%changelog
* Thu Sep 15 2005 Steven Pritchard  1.3101-3
- Filter bogus provides/requires introduced by eg/ and samples/

* Thu Sep 15 2005 Steven Pritchard  1.3101-2
- More spec cleanup (jpo)

* Mon Aug 29 2005 Steven Pritchard  1.3101-1
- Update to 1.3101
- Spec cleanup (jpo)
- Include sample config file from Chris Grau

* Wed Aug 24 2005 Steven Pritchard  1.31-3
- Use /var/www/mason instead of /var/www/comp
- Spec cleanup

* Tue Aug 23 2005 Steven Pritchard  1.31-2
- Add some missing dependencies

* Tue Aug 23 2005 Steven Pritchard  1.31-1
- Update to 1.31
- Use /var/cache/mason instead of /var/www/mason
- Fix perl-HTML-Mason.conf
- Fix URL

* Thu Aug 11 2005 Steven Pritchard  1.30-1
- Specfile autogenerated.
- Add perl-HTML-Mason.conf and /var/www/*


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-HTML-Mason/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	16 Sep 2005 02:05:04 -0000	1.1
+++ .cvsignore	16 Sep 2005 02:09:55 -0000	1.2
@@ -0,0 +1 @@
+HTML-Mason-1.3101.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-HTML-Mason/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	16 Sep 2005 02:05:04 -0000	1.1
+++ sources	16 Sep 2005 02:09:55 -0000	1.2
@@ -0,0 +1 @@
+4904681296efeb9c58bf0d9926d37407  HTML-Mason-1.3101.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep 16 06:52:28 2005
From: fedora-extras-commits at redhat.com (Chris Wright (chrisw))
Date: Fri, 16 Sep 2005 02:52:28 -0400
Subject: rpms/cogito - New directory
Message-ID: <200509160652.j8G6qS4a021834@cvs-int.fedora.redhat.com>

Author: chrisw

Update of /cvs/extras/rpms/cogito
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21810/cogito

Log Message:
Directory /cvs/extras/rpms/cogito added to the repository




From fedora-extras-commits at redhat.com  Fri Sep 16 06:52:29 2005
From: fedora-extras-commits at redhat.com (Chris Wright (chrisw))
Date: Fri, 16 Sep 2005 02:52:29 -0400
Subject: rpms/cogito/devel - New directory
Message-ID: <200509160652.j8G6qTY0021839@cvs-int.fedora.redhat.com>

Author: chrisw

Update of /cvs/extras/rpms/cogito/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21810/cogito/devel

Log Message:
Directory /cvs/extras/rpms/cogito/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Sep 16 06:52:43 2005
From: fedora-extras-commits at redhat.com (Chris Wright (chrisw))
Date: Fri, 16 Sep 2005 02:52:43 -0400
Subject: rpms/cogito Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200509160652.j8G6qhum021884@cvs-int.fedora.redhat.com>

Author: chrisw

Update of /cvs/extras/rpms/cogito
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21855

Added Files:
	Makefile import.log 
Log Message:
Setup of module cogito


--- NEW FILE Makefile ---
# Top level Makefile for module cogito
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Fri Sep 16 06:52:43 2005
From: fedora-extras-commits at redhat.com (Chris Wright (chrisw))
Date: Fri, 16 Sep 2005 02:52:43 -0400
Subject: rpms/cogito/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200509160652.j8G6qhXq021889@cvs-int.fedora.redhat.com>

Author: chrisw

Update of /cvs/extras/rpms/cogito/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21855/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module cogito


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Fri Sep 16 06:53:09 2005
From: fedora-extras-commits at redhat.com (Chris Wright (chrisw))
Date: Fri, 16 Sep 2005 02:53:09 -0400
Subject: rpms/cogito import.log,1.1,1.2
Message-ID: <200509160653.j8G6rdh3021961@cvs-int.fedora.redhat.com>

Author: chrisw

Update of /cvs/extras/rpms/cogito
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21923

Modified Files:
	import.log 
Log Message:
auto-import cogito-0.14.1-1 on branch devel from cogito-0.14.1-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/cogito/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	16 Sep 2005 06:52:41 -0000	1.1
+++ import.log	16 Sep 2005 06:53:07 -0000	1.2
@@ -0,0 +1 @@
+cogito-0_14_1-1:HEAD:cogito-0.14.1-1.src.rpm:1126853582



From fedora-extras-commits at redhat.com  Fri Sep 16 06:53:10 2005
From: fedora-extras-commits at redhat.com (Chris Wright (chrisw))
Date: Fri, 16 Sep 2005 02:53:10 -0400
Subject: rpms/cogito/devel cogito.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200509160653.j8G6remL021965@cvs-int.fedora.redhat.com>

Author: chrisw

Update of /cvs/extras/rpms/cogito/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21923/devel

Modified Files:
	.cvsignore sources 
Added Files:
	cogito.spec 
Log Message:
auto-import cogito-0.14.1-1 on branch devel from cogito-0.14.1-1.src.rpm


--- NEW FILE cogito.spec ---
Name: 		cogito
Version: 	0.14.1
Release: 	1
Summary:  	The Cogito Version Control System
License: 	GPL
Group: 		Development/Tools
URL: 		http://kernel.org/pub/software/scm/cogito/
Source: 	http://kernel.org/pub/software/scm/cogito/%{name}-%{version}.tar.gz
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: 	git-core >= 0.99.3
BuildArch:	noarch

%description
Cogito is a version control system layered on top of the git tree history
storage system. It aims at seamless user interface and ease of use, providing
generally smoother user experience than the "raw" Core GIT itself and indeed
many other version control systems.

%prep
%setup -q

%build

make

%install
rm -rf $RPM_BUILD_ROOT
make DESTDIR=$RPM_BUILD_ROOT prefix=%{_prefix} install

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root)
%{_bindir}/*
%dir %{_libdir}/cogito
%{_libdir}/cogito/*
%doc README COPYING Documentation/*

%changelog
* Thu Sep 15 2005 Chris Wright  0.14.1-1
- Update to 0.14.1

* Mon Aug 15 2005 Chris Wright  0.13-3
- Update Buildroot, Requires and drop Vendor
- use %{_libdir}

* Wed Aug 10 2005 Pavel Roskin  0.13-1
- Update summary and description
- Make architecture-independent

* Wed Jul 6 2005 Chris Wright  0.12-1
- update spec file

* Thu Jun 9 2005 Chris Wright  0.11.3-1
- Add openssl patch from Dan Holmsand 
- Add cg-Xlib patch to fix showdate output
- Update %files with changes inspired by Neil Horman 

* Mon May 9 2005 H. Peter Anvin  0.10-1
- New upstream revision
- Rename spec file to cogito.spec

* Wed Apr 27 2005 Terje Rosten  0.8-2
- Doc files
- Use %%{_prefix} macro
- Rename spec file
- Drop -n option to %%setup macro

* Mon Apr 25 2005 Chris Wright  0.8-1
- Update to cogito, rename package, move to /usr/bin, update prereqs

* Mon Apr 25 2005 Chris Wright  0.7-1
- Update to 0.7

* Thu Apr 21 2005 Chris Wright  0.6.3-1
- Initial rpm build


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cogito/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	16 Sep 2005 06:52:41 -0000	1.1
+++ .cvsignore	16 Sep 2005 06:53:08 -0000	1.2
@@ -0,0 +1 @@
+cogito-0.14.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cogito/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	16 Sep 2005 06:52:41 -0000	1.1
+++ sources	16 Sep 2005 06:53:08 -0000	1.2
@@ -0,0 +1 @@
+e998a8d8146bd0c2b86fbb4b278cc4fc  cogito-0.14.1.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep 16 11:05:36 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Fri, 16 Sep 2005 07:05:36 -0400
Subject: rpms/d4x/devel .cvsignore,1.5,1.6 d4x.spec,1.8,1.9 sources,1.5,1.6
Message-ID: <200509161106.j8GB6TEK029675@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/d4x/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29647

Modified Files:
	.cvsignore d4x.spec sources 
Log Message:
Update to 2.5.5.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/d4x/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	7 Sep 2005 14:13:30 -0000	1.5
+++ .cvsignore	16 Sep 2005 11:05:33 -0000	1.6
@@ -1 +1 @@
-d4x-2.5.4.tar.bz2
+d4x-2.5.5.tar.bz2


Index: d4x.spec
===================================================================
RCS file: /cvs/extras/rpms/d4x/devel/d4x.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- d4x.spec	7 Sep 2005 14:13:30 -0000	1.8
+++ d4x.spec	16 Sep 2005 11:05:33 -0000	1.9
@@ -3,7 +3,7 @@
 
 Summary: Downloader for X that supports resuming and many other features
 Name: d4x
-Version: 2.5.4
+Version: 2.5.5
 Release: 1%{?pre:.%{pre}}%{?dist}
 Group: Applications/Internet
 License: Artistic
@@ -66,6 +66,9 @@
 
 
 %changelog
+* Fri Sep 16 2005 Matthias Saou  2.5.5-1
+- Update to 2.5.5.
+
 * Wed Sep  7 2005 Matthias Saou  2.5.4-1
 - Update to 2.5.4.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/d4x/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	7 Sep 2005 14:13:30 -0000	1.5
+++ sources	16 Sep 2005 11:05:33 -0000	1.6
@@ -1 +1 @@
-c797a933a8de1503b069b6d2499da727  d4x-2.5.4.tar.bz2
+ee3c7dc4618b6ead77a22685195fcf24  d4x-2.5.5.tar.bz2



From fedora-extras-commits at redhat.com  Fri Sep 16 11:19:41 2005
From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc))
Date: Fri, 16 Sep 2005 07:19:41 -0400
Subject: rpms/enca - New directory
Message-ID: <200509161119.j8GBJfcL029857@cvs-int.fedora.redhat.com>

Author: buc

Update of /cvs/extras/rpms/enca
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29836/enca

Log Message:
Directory /cvs/extras/rpms/enca added to the repository




From fedora-extras-commits at redhat.com  Fri Sep 16 11:19:42 2005
From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc))
Date: Fri, 16 Sep 2005 07:19:42 -0400
Subject: rpms/enca/devel - New directory
Message-ID: <200509161119.j8GBJglm029862@cvs-int.fedora.redhat.com>

Author: buc

Update of /cvs/extras/rpms/enca/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29836/enca/devel

Log Message:
Directory /cvs/extras/rpms/enca/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Sep 16 11:20:14 2005
From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc))
Date: Fri, 16 Sep 2005 07:20:14 -0400
Subject: rpms/enca Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200509161120.j8GBKEPC029911@cvs-int.fedora.redhat.com>

Author: buc

Update of /cvs/extras/rpms/enca
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29882

Added Files:
	Makefile import.log 
Log Message:
Setup of module enca


--- NEW FILE Makefile ---
# Top level Makefile for module enca
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Fri Sep 16 11:20:15 2005
From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc))
Date: Fri, 16 Sep 2005 07:20:15 -0400
Subject: rpms/enca/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200509161120.j8GBKFmI029916@cvs-int.fedora.redhat.com>

Author: buc

Update of /cvs/extras/rpms/enca/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29882/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module enca


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Fri Sep 16 11:21:03 2005
From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc))
Date: Fri, 16 Sep 2005 07:21:03 -0400
Subject: rpms/enca import.log,1.1,1.2
Message-ID: <200509161121.j8GBL3jx029986@cvs-int.fedora.redhat.com>

Author: buc

Update of /cvs/extras/rpms/enca
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29951

Modified Files:
	import.log 
Log Message:
auto-import enca-1.7-4 on branch devel from enca-1.7-4.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/enca/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	16 Sep 2005 11:20:12 -0000	1.1
+++ import.log	16 Sep 2005 11:21:01 -0000	1.2
@@ -0,0 +1 @@
+enca-1_7-4:HEAD:enca-1.7-4.src.rpm:1126869651



From fedora-extras-commits at redhat.com  Fri Sep 16 11:21:04 2005
From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc))
Date: Fri, 16 Sep 2005 07:21:04 -0400
Subject: rpms/enca/devel enca.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <200509161121.j8GBL4u0029992@cvs-int.fedora.redhat.com>

Author: buc

Update of /cvs/extras/rpms/enca/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29951/devel

Modified Files:
	.cvsignore sources 
Added Files:
	enca.spec 
Log Message:
auto-import enca-1.7-4 on branch devel from enca-1.7-4.src.rpm


--- NEW FILE enca.spec ---
Name: enca
Summary: Character set analyzer and detector
Version: 1.7
Release: 4%{?dist}
License: GPL
Group: Applications/Text
Source: http://trific.ath.cx/Ftp/enca/enca-1.7.tar.bz2
URL: http://trific.ath.cx/software/enca/
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)


%description
Enca is an Extremely Naive Charset Analyser. It detects character set and
encoding of text files and can also convert them to other encodings using
either a built-in converter or external libraries and tools like libiconv,
librecode, or cstocs.

Currently, it has support for Belarussian, Bulgarian, Croatian, Czech,
Estonian, Latvian, Lithuanian, Polish, Russian, Slovak, Slovene, and
Ukrainian and some multibyte encodings (mostly variants of Unicode)
independently on the language.

This package also contains shared Enca library other programs can make use of.

Install %{name} if you need to cope with text files of dubious origin
and unknown encoding and convert them to some reasonable encoding.


%package devel
Summary: Header files and libraries for %{name} charset analyzer
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
Requires: pkgconfig

%description devel
The %{name}-devel package contains the static libraries and header files
for writing programs using the Extremely Naive Charset Analyser library,
and its API documentation.

Install %{name}-devel if you are going to create applications using the Enca
library.


%prep
%setup -q


%build

%configure \
	--disable-dependency-tracking \
	--without-librecode \
	--disable-external \
	%{!?_with_static:--disable-static} \
	--disable-gtk-doc
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT

make install DESTDIR=$RPM_BUILD_ROOT HTML_DIR=/tmp/html

rm -rf $RPM_BUILD_ROOT/tmp/html
rm -rf $RPM_BUILD_ROOT/%{_libexecdir}
rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la


%check
make check


%clean
rm -rf $RPM_BUILD_ROOT


%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig


%files
%defattr(-,root,root)
%{_bindir}/*
%{_libdir}/libenca.so.*
%{_mandir}/*/*
%doc AUTHORS COPYING FAQ NEWS README THANKS TODO

%files devel
%defattr(-,root,root)
%{_includedir}/*
%{_libdir}/pkgconfig/*
%{?_with_static: %{_libdir}/*.a}
%{_libdir}/*.so
%doc devel-docs/html/*.html README.devel


%changelog
* Fri Sep 16 2005 Dmitry Butskoy  - 0.7-4
- clenup in docs
- Accepted for Fedora Extra (review by Ville Skytta )

* Thu Sep  9 2005 Dmitry Butskoy  - 0.7-3
- build static libs conditionally
- disable external converters (#167820)

* Thu Sep  8 2005 Dmitry Butskoy  - 0.7-2
- more cleanups (#167820)

* Thu Sep  8 2005 Dmitry Butskoy  - 0.7-1
- spec cleanups for Fedora Extra
- avoid build with librecode, use just glibc's iconv 
- avoid any gtk dependencies, html docs are already present in the source

* Mon May 17 2004 David Necas (Yeti) 
- doubled percents in changelog

* Mon Dec 22 2003 David Necas (Yeti) 
- moved wrappers to libexec

* Thu Nov  6 2003 David Necas (Yeti) 
- added b-piconv
- fixed HTML doc install paths

* Tue Oct 14 2003 David Necas (Yeti) 
- testing whether $RPM_BUILD_ROOT is not /
- updated for new HTML doc location
- changed make -> %%__make, rm -> %%__rm

* Sat Aug  2 2003 David Necas (Yeti) 
- cleaning $RPM_BUILD_ROOT in %%install

* Sat Jun 28 2003 David Necas (Yeti) 
- removed --disable-gtk-doc, no longer needed

* Fri Jun 20 2003 David Necas (Yeti) 
- added enca.pc to devel package

* Sat Jun 14 2003 David Necas (Yeti) 
- updated description
- added --disable-gtk-doc

* Mon Dec 23 2002 David Necas (Yeti) 
- added libenca.so

* Fri Dec 20 2002 David Necas (Yeti) 
- fixed URL and Source to trific.ath.cx

* Mon Oct 21 2002 David Necas (Yeti) 
- added FAQ to docs

* Thu Oct 10 2002 David Necas (Yeti) 
- removed twice-listed %%{docdir}/html

* Sat Sep 21 2002 David Necas (Yeti) 
- added b-umap

* Sun Sep 15 2002 David Necas (Yeti) 
- added enconv

* Thu Aug 29 2002 David Necas (Yeti) 
- removed bzip2-devel buildprereq

* Sat Aug 24 2002 David Necas (Yeti) 
- added postinstall and postuninstall scriptlets

* Wed Aug 21 2002 David Necas (Yeti) 
- updated to enca-0.10.0-pre2
- added libenca
- split into enca and enca-devel
- removed cache
- fixed HTML_DIR

* Tue Jul 10 2001 David Necas (Yeti) 
- changed rpm macros in Source and URL to autoconf macros to ease debian/
  stuff generation

* Sun May 20 2001 David Necas (Yeti) 
- added BuildPrereq: bzip2-devel

* Wed May  2 2001 David Necas (Yeti) 
- changed group to standard (but much less appropriate) Applications/Text
- rpm macros are used instead of autoconf macros (after the first definition)

* Sun Mar 11 2001 David Necas (Yeti) 
- added defattr, doc attributes
- uses global configure cache
- heavy use of predefined directories
- configure moved to build section as is usual

* Sun Feb 25 2001 David Necas (Yeti) 
- updated to enca-0.9.0pre4 (including files and descriptions)
- added sed dependency

* Sun Oct 25 2000 David Necas (Yeti) 
- updated to enca-0.7.5

* Sun Oct 11 2000 David Necas (Yeti) 
- removed redundant Provides: enca

* Sun Oct  1 2000 David Necas (Yeti) 
- updated to enca-0.7.1
- man page forced to be intstalled to ${prefix}/share/man

* Tue Sep 26 2000 David Necas (Yeti) 
- updated to enca-0.7.0
- spec autogenerated by configure

* Tue Sep 19 2000 David Necas (Yeti) 
- fixed not installing bcstocs

* Wed Sep 13 2000 David Necas (Yeti) 
- first packaged (0.6.2)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/enca/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	16 Sep 2005 11:20:13 -0000	1.1
+++ .cvsignore	16 Sep 2005 11:21:02 -0000	1.2
@@ -0,0 +1 @@
+enca-1.7.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/enca/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	16 Sep 2005 11:20:13 -0000	1.1
+++ sources	16 Sep 2005 11:21:02 -0000	1.2
@@ -0,0 +1 @@
+01dd5dbd4154c85cbf4a42d3580c517f  enca-1.7.tar.bz2



From fedora-extras-commits at redhat.com  Fri Sep 16 11:22:09 2005
From: fedora-extras-commits at redhat.com (Oliver Falk (oliver))
Date: Fri, 16 Sep 2005 07:22:09 -0400
Subject: rpms/syck/devel syck.spec,1.1,1.2
Message-ID: <200509161122.j8GBM9Vd030055@cvs-int.fedora.redhat.com>

Author: oliver

Update of /cvs/extras/rpms/syck/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30035

Modified Files:
	syck.spec 
Log Message:
* Recompile against php 5.0.5


Index: syck.spec
===================================================================
RCS file: /cvs/extras/rpms/syck/devel/syck.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- syck.spec	26 Aug 2005 08:15:11 -0000	1.1
+++ syck.spec	16 Sep 2005 11:22:07 -0000	1.2
@@ -7,7 +7,7 @@
 Summary:		YAML for C, Python, and PHP
 
 Version:		0.55
-Release:		5%{?dist}
+Release:		6%{?dist}
 
 License:		BSD
 Group:			System Environment/Libraries
@@ -185,6 +185,9 @@
 %{php_extdir}/*.so
 
 %changelog
+* Fri Sep 16 2005 Oliver Falk 		- 0.55-6
+- Compile against PHP 5.0.5
+
 * Thu Aug 25 2005 Toshio Kuratomi  - 0.55-5
 - Stop using a dynamically generated php-version in the BR.
 - Create a devel package



From fedora-extras-commits at redhat.com  Fri Sep 16 11:23:09 2005
From: fedora-extras-commits at redhat.com (Oliver Falk (oliver))
Date: Fri, 16 Sep 2005 07:23:09 -0400
Subject: rpms/syck/FC-4 syck.spec,1.1,1.2
Message-ID: <200509161123.j8GBN9Oh030161@cvs-int.fedora.redhat.com>

Author: oliver

Update of /cvs/extras/rpms/syck/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30142

Modified Files:
	syck.spec 
Log Message:
* Recompile against php 5.0.5


Index: syck.spec
===================================================================
RCS file: /cvs/extras/rpms/syck/FC-4/syck.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- syck.spec	26 Aug 2005 08:15:11 -0000	1.1
+++ syck.spec	16 Sep 2005 11:23:06 -0000	1.2
@@ -7,7 +7,7 @@
 Summary:		YAML for C, Python, and PHP
 
 Version:		0.55
-Release:		5%{?dist}
+Release:		6%{?dist}
 
 License:		BSD
 Group:			System Environment/Libraries
@@ -185,6 +185,9 @@
 %{php_extdir}/*.so
 
 %changelog
+* Fri Sep 16 2005 Oliver Falk 		- 0.55-6
+- Compile against PHP 5.0.5
+
 * Thu Aug 25 2005 Toshio Kuratomi  - 0.55-5
 - Stop using a dynamically generated php-version in the BR.
 - Create a devel package



From fedora-extras-commits at redhat.com  Fri Sep 16 12:05:51 2005
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Fri, 16 Sep 2005 08:05:51 -0400
Subject: rpms/libgnomedb/FC-4 libgnomedb.spec,1.2,1.3
Message-ID: <200509161206.j8GC6LRw031611@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/libgnomedb/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31592

Modified Files:
	libgnomedb.spec 
Log Message:
rebuild to fix hardcoded libtool .la dependencies on ppc


Index: libgnomedb.spec
===================================================================
RCS file: /cvs/extras/rpms/libgnomedb/FC-4/libgnomedb.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libgnomedb.spec	5 Aug 2005 17:56:57 -0000	1.2
+++ libgnomedb.spec	16 Sep 2005 12:05:26 -0000	1.3
@@ -1,7 +1,7 @@
 Summary:         Library for writing gnome database programs
 Name:            libgnomedb
 Version:         1.2.0
-Release:         3
+Release:         3.1
 Epoch:           1
 Source:          %{name}-%{version}.tar.bz2
 URL:             http://www.gnome-db.org/
@@ -99,6 +99,9 @@
 
 
 %changelog
+* Wed Mar 02 2005 Caolan McNamara  1.2.0-3.1
+- rebuild to fix hardcoded libtool .la dependencies on ppc
+
 * Wed Mar 02 2005 Caolan McNamara  1.2.0-3
 - rebuild with gcc4
 



From fedora-extras-commits at redhat.com  Fri Sep 16 12:17:09 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri, 16 Sep 2005 08:17:09 -0400
Subject: rpms/mathml-fonts/FC-3 mathml-fonts.spec,1.5,1.6
Message-ID: <200509161217.j8GCHdOw031797@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/mathml-fonts/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31741/FC-3

Modified Files:
	mathml-fonts.spec 
Log Message:
BaKoMa: update Lyx wiki reference, add Licence.txt



Index: mathml-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/mathml-fonts/FC-3/mathml-fonts.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- mathml-fonts.spec	15 Sep 2005 19:37:50 -0000	1.5
+++ mathml-fonts.spec	16 Sep 2005 12:17:07 -0000	1.6
@@ -26,7 +26,7 @@
 ## TeX fonts
 #Source20: ftp://tug.ctan.org/tex-archive/fonts/cm/ps-type1/bakoma/ttf.tar.gz
 Source20: ftp://tug.ctan.org/tex-archive/fonts/cm/ps-type1/bakoma/ttf/cmbx10.ttf
-# Reference: http://wiki.lyx.org/LyX/Troubleshooting 
+# Reference: http://wiki.lyx.org/Windows/LyX136 
 Source21: ftp://ftp.lyx.org/pub/lyx/contrib/BaKoMa4LyX.zip
 ## Design Science fonts
 #  License: http://www.dessci.com/en/support/eula/fonts/mtextralic.htm
@@ -111,7 +111,7 @@
 
 %files
 %defattr(-,root,root)
-%doc Readme.txt
+%doc Licence.txt Readme.txt
 %dir %{find_symbol_dir}
 %{find_symbol_font}
 %dir %{fontdir}



From fedora-extras-commits at redhat.com  Fri Sep 16 12:17:10 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri, 16 Sep 2005 08:17:10 -0400
Subject: rpms/mathml-fonts/FC-4 mathml-fonts.spec,1.9,1.10
Message-ID: <200509161217.j8GCHeIp031800@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/mathml-fonts/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31741/FC-4

Modified Files:
	mathml-fonts.spec 
Log Message:
BaKoMa: update Lyx wiki reference, add Licence.txt



Index: mathml-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/mathml-fonts/FC-4/mathml-fonts.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- mathml-fonts.spec	15 Sep 2005 19:37:50 -0000	1.9
+++ mathml-fonts.spec	16 Sep 2005 12:17:08 -0000	1.10
@@ -26,7 +26,7 @@
 ## TeX fonts
 #Source20: ftp://tug.ctan.org/tex-archive/fonts/cm/ps-type1/bakoma/ttf.tar.gz
 Source20: ftp://tug.ctan.org/tex-archive/fonts/cm/ps-type1/bakoma/ttf/cmbx10.ttf
-# Reference: http://wiki.lyx.org/LyX/Troubleshooting 
+# Reference: http://wiki.lyx.org/Windows/LyX136 
 Source21: ftp://ftp.lyx.org/pub/lyx/contrib/BaKoMa4LyX.zip
 ## Design Science fonts
 #  License: http://www.dessci.com/en/support/eula/fonts/mtextralic.htm
@@ -111,7 +111,7 @@
 
 %files
 %defattr(-,root,root)
-%doc Readme.txt
+%doc Licence.txt Readme.txt
 %dir %{find_symbol_dir}
 %{find_symbol_font}
 %dir %{fontdir}



From fedora-extras-commits at redhat.com  Fri Sep 16 12:17:10 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri, 16 Sep 2005 08:17:10 -0400
Subject: rpms/mathml-fonts/devel mathml-fonts.spec,1.9,1.10
Message-ID: <200509161217.j8GCHeCY031803@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/mathml-fonts/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31741/devel

Modified Files:
	mathml-fonts.spec 
Log Message:
BaKoMa: update Lyx wiki reference, add Licence.txt



Index: mathml-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/mathml-fonts/devel/mathml-fonts.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- mathml-fonts.spec	15 Sep 2005 19:37:56 -0000	1.9
+++ mathml-fonts.spec	16 Sep 2005 12:17:08 -0000	1.10
@@ -26,7 +26,7 @@
 ## TeX fonts
 #Source20: ftp://tug.ctan.org/tex-archive/fonts/cm/ps-type1/bakoma/ttf.tar.gz
 Source20: ftp://tug.ctan.org/tex-archive/fonts/cm/ps-type1/bakoma/ttf/cmbx10.ttf
-# Reference: http://wiki.lyx.org/LyX/Troubleshooting 
+# Reference: http://wiki.lyx.org/Windows/LyX136 
 Source21: ftp://ftp.lyx.org/pub/lyx/contrib/BaKoMa4LyX.zip
 ## Design Science fonts
 #  License: http://www.dessci.com/en/support/eula/fonts/mtextralic.htm
@@ -111,7 +111,7 @@
 
 %files
 %defattr(-,root,root)
-%doc Readme.txt
+%doc Licence.txt Readme.txt
 %dir %{find_symbol_dir}
 %{find_symbol_font}
 %dir %{fontdir}



From fedora-extras-commits at redhat.com  Fri Sep 16 15:40:27 2005
From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo))
Date: Fri, 16 Sep 2005 11:40:27 -0400
Subject: rpms/scim-skk/devel scim-skk.spec,1.1,1.2
Message-ID: <200509161540.j8GFeRKu003919@cvs-int.fedora.redhat.com>

Author: ryo

Update of /cvs/extras/rpms/scim-skk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3894

Modified Files:
	scim-skk.spec 
Log Message:
cleanup specfile



Index: scim-skk.spec
===================================================================
RCS file: /cvs/extras/rpms/scim-skk/devel/scim-skk.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- scim-skk.spec	12 Sep 2005 14:42:34 -0000	1.1
+++ scim-skk.spec	16 Sep 2005 15:40:25 -0000	1.2
@@ -1,20 +1,20 @@
 Name:		scim-skk
 Version:	0.3.0
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	SCIM IMEngine module for skk
 
 Group:		System Environment/Libraries
 License:	GPL
-URL:            http://scim-imengine.sourceforge.jp/
-Source0:        http://sourceforge.jp/projects/scim-imengine/files/%{name}-%{version}.tar.gz
-Patch0:         no-dictionary.diff
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+URL:		http://scim-imengine.sourceforge.jp/
+Source0:	http://sourceforge.jp/projects/scim-imengine/files/%{name}-%{version}.tar.gz
+Patch0:		no-dictionary.diff
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Requires:       skkdic
-BuildRequires:  scim-devel
+Requires		skkdic
+BuildRequires:	scim-devel
 
 %description
-Scim-skk is a SCIM IMEngine module for skk to support Japanese input.
+Scim-skk is a SCIM IMEngine module for skk to support Japanese input
 
 
 %prep
@@ -43,12 +43,18 @@
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING NEWS README ChangeLog
+%dir %{_libdir}/scim-1.0/IMEngine
 %{_libdir}/scim-1.0/IMEngine/skk.so
+%dir %{_libdir}/scim-1.0/SetupUI
 %{_libdir}/scim-1.0/SetupUI/skk-imengine-setup.so
 %{_datadir}/scim/icons/scim-skk.png
+%{_datadir}/scim/icons/scim-skk.png
 
 
 %changelog
+* Sat Sep 17 2005 Ryo Dairiki  - 0.3.0-3
+- a bit more cleanup (Thanks, Jens)
+
 * Tue Sep  6 2005 Ryo Dairiki  - 0.3.0-2
 - initial packaging for Fedora Extras
 - cleanup specfile (Jens Petersen)



From fedora-extras-commits at redhat.com  Fri Sep 16 15:42:07 2005
From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo))
Date: Fri, 16 Sep 2005 11:42:07 -0400
Subject: rpms/scim-skk/FC-3 scim-skk.spec,1.1,1.2
Message-ID: <200509161542.j8GFg7qm003948@cvs-int.fedora.redhat.com>

Author: ryo

Update of /cvs/extras/rpms/scim-skk/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3925

Modified Files:
	scim-skk.spec 
Log Message:
cleanup specfile



Index: scim-skk.spec
===================================================================
RCS file: /cvs/extras/rpms/scim-skk/FC-3/scim-skk.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- scim-skk.spec	12 Sep 2005 14:42:34 -0000	1.1
+++ scim-skk.spec	16 Sep 2005 15:42:05 -0000	1.2
@@ -1,20 +1,20 @@
 Name:		scim-skk
 Version:	0.3.0
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	SCIM IMEngine module for skk
 
 Group:		System Environment/Libraries
 License:	GPL
-URL:            http://scim-imengine.sourceforge.jp/
-Source0:        http://sourceforge.jp/projects/scim-imengine/files/%{name}-%{version}.tar.gz
-Patch0:         no-dictionary.diff
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+URL:		http://scim-imengine.sourceforge.jp/
+Source0:	http://sourceforge.jp/projects/scim-imengine/files/%{name}-%{version}.tar.gz
+Patch0:		no-dictionary.diff
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Requires:       skkdic
-BuildRequires:  scim-devel
+Requires		skkdic
+BuildRequires:	scim-devel
 
 %description
-Scim-skk is a SCIM IMEngine module for skk to support Japanese input.
+Scim-skk is a SCIM IMEngine module for skk to support Japanese input
 
 
 %prep
@@ -43,12 +43,18 @@
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING NEWS README ChangeLog
+%dir %{_libdir}/scim-1.0/IMEngine
 %{_libdir}/scim-1.0/IMEngine/skk.so
+%dir %{_libdir}/scim-1.0/SetupUI
 %{_libdir}/scim-1.0/SetupUI/skk-imengine-setup.so
 %{_datadir}/scim/icons/scim-skk.png
+%{_datadir}/scim/icons/scim-skk.png
 
 
 %changelog
+* Sat Sep 17 2005 Ryo Dairiki  - 0.3.0-3
+- a bit more cleanup (Thanks, Jens)
+
 * Tue Sep  6 2005 Ryo Dairiki  - 0.3.0-2
 - initial packaging for Fedora Extras
 - cleanup specfile (Jens Petersen)



From fedora-extras-commits at redhat.com  Fri Sep 16 15:42:29 2005
From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo))
Date: Fri, 16 Sep 2005 11:42:29 -0400
Subject: rpms/scim-skk/FC-4 scim-skk.spec,1.1,1.2
Message-ID: <200509161542.j8GFgTD0003973@cvs-int.fedora.redhat.com>

Author: ryo

Update of /cvs/extras/rpms/scim-skk/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3954

Modified Files:
	scim-skk.spec 
Log Message:
cleanup specfile



Index: scim-skk.spec
===================================================================
RCS file: /cvs/extras/rpms/scim-skk/FC-4/scim-skk.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- scim-skk.spec	12 Sep 2005 14:42:34 -0000	1.1
+++ scim-skk.spec	16 Sep 2005 15:42:27 -0000	1.2
@@ -1,20 +1,20 @@
 Name:		scim-skk
 Version:	0.3.0
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	SCIM IMEngine module for skk
 
 Group:		System Environment/Libraries
 License:	GPL
-URL:            http://scim-imengine.sourceforge.jp/
-Source0:        http://sourceforge.jp/projects/scim-imengine/files/%{name}-%{version}.tar.gz
-Patch0:         no-dictionary.diff
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+URL:		http://scim-imengine.sourceforge.jp/
+Source0:	http://sourceforge.jp/projects/scim-imengine/files/%{name}-%{version}.tar.gz
+Patch0:		no-dictionary.diff
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Requires:       skkdic
-BuildRequires:  scim-devel
+Requires		skkdic
+BuildRequires:	scim-devel
 
 %description
-Scim-skk is a SCIM IMEngine module for skk to support Japanese input.
+Scim-skk is a SCIM IMEngine module for skk to support Japanese input
 
 
 %prep
@@ -43,12 +43,18 @@
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING NEWS README ChangeLog
+%dir %{_libdir}/scim-1.0/IMEngine
 %{_libdir}/scim-1.0/IMEngine/skk.so
+%dir %{_libdir}/scim-1.0/SetupUI
 %{_libdir}/scim-1.0/SetupUI/skk-imengine-setup.so
 %{_datadir}/scim/icons/scim-skk.png
+%{_datadir}/scim/icons/scim-skk.png
 
 
 %changelog
+* Sat Sep 17 2005 Ryo Dairiki  - 0.3.0-3
+- a bit more cleanup (Thanks, Jens)
+
 * Tue Sep  6 2005 Ryo Dairiki  - 0.3.0-2
 - initial packaging for Fedora Extras
 - cleanup specfile (Jens Petersen)



From fedora-extras-commits at redhat.com  Fri Sep 16 15:55:14 2005
From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo))
Date: Fri, 16 Sep 2005 11:55:14 -0400
Subject: owners owners.list,1.219,1.220
Message-ID: <200509161555.j8GFtEBU004027@cvs-int.fedora.redhat.com>

Author: ryo

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4008

Modified Files:
	owners.list 
Log Message:
add scim-skk entry



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.219
retrieving revision 1.220
diff -u -r1.219 -r1.220
--- owners.list	16 Sep 2005 02:06:49 -0000	1.219
+++ owners.list	16 Sep 2005 15:55:11 -0000	1.220
@@ -891,6 +891,7 @@
 Fedora Extras|scim-hangul|SCIM IMEngine for Korean Hangul|tagoh at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|scim-pinyin|Chinese input method for SCIM|ryo-dairiki at mbm.nifty.com|extras-qa at fedoraproject.org|petersen at redhat.com
 Fedora Extras|scim-qtimm|SCIM Qt Input Method module|petersen at redhat.com|extras-qa at fedoraproject.org|
+Fedora Extras|scim-skk|Scim-skk is a SCIM IMEngine module for skk to support Japanese input|ryo-dairiki at users.sourceforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|scim-tables|SCIM Generic Table IMEngine and its data files|ryo-dairiki at mbm.nifty.com|extras-qa at fedoraproject.org|
 Fedora Extras|scim-tomoe|Tomoe module for SCIM for Japanese handwritten input|ryo-dairiki at mbm.nifty.com|extras-qa at fedoraproject.org|
 Fedora Extras|scmxx|Exchange data with Siemens mobile phones|andreas at bawue.net|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Fri Sep 16 16:06:47 2005
From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo))
Date: Fri, 16 Sep 2005 12:06:47 -0400
Subject: owners owners.list,1.220,1.221
Message-ID: <200509161607.j8GG7Nnp005418@cvs-int.fedora.redhat.com>

Author: ryo

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5393

Modified Files:
	owners.list 
Log Message:
change my address from *@mbm.nifty.com to *@users.sourceforge.net



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.220
retrieving revision 1.221
diff -u -r1.220 -r1.221
--- owners.list	16 Sep 2005 15:55:11 -0000	1.220
+++ owners.list	16 Sep 2005 16:06:45 -0000	1.221
@@ -889,11 +889,11 @@
 Fedora Extras|scim-anthy|SCIM IMEngine for Japanese input with anthy|tagoh at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|scim-chewing|SCIM IMEngine for Traditional Chinese|petersen at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|scim-hangul|SCIM IMEngine for Korean Hangul|tagoh at redhat.com|extras-qa at fedoraproject.org|
-Fedora Extras|scim-pinyin|Chinese input method for SCIM|ryo-dairiki at mbm.nifty.com|extras-qa at fedoraproject.org|petersen at redhat.com
+Fedora Extras|scim-pinyin|Chinese input method for SCIM|ryo-dairiki at users.sourceforge.net|extras-qa at fedoraproject.org|petersen at redhat.com
 Fedora Extras|scim-qtimm|SCIM Qt Input Method module|petersen at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|scim-skk|Scim-skk is a SCIM IMEngine module for skk to support Japanese input|ryo-dairiki at users.sourceforge.net|extras-qa at fedoraproject.org|
-Fedora Extras|scim-tables|SCIM Generic Table IMEngine and its data files|ryo-dairiki at mbm.nifty.com|extras-qa at fedoraproject.org|
-Fedora Extras|scim-tomoe|Tomoe module for SCIM for Japanese handwritten input|ryo-dairiki at mbm.nifty.com|extras-qa at fedoraproject.org|
+Fedora Extras|scim-tables|SCIM Generic Table IMEngine and its data files|ryo-dairiki at users.sourceforge.net|extras-qa at fedoraproject.org|
+Fedora Extras|scim-tomoe|Tomoe module for SCIM for Japanese handwritten input|ryo-dairiki at users.sourceforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|scmxx|Exchange data with Siemens mobile phones|andreas at bawue.net|extras-qa at fedoraproject.org|
 Fedora Extras|scons|An Open Source software construction tool|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|scorched3d|A game based loosely on the classic DOS game Scorched Earth|pmatilai at laiskiainen.org|extras-qa at fedoraproject.org|
@@ -977,7 +977,7 @@
 Fedora Extras|tkcvs|TkCVS and TkDiff|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|tktable|Table/matrix widget extension to Tcl/Tk|jfontain at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|tla|The Low-Budget arch Revision Control System|shahms at shahms.com|extras-qa at fedoraproject.org|
-Fedora Extras|tomoe|Japanese handwritten input system|ryo-dairiki at mbm.nifty.com|extras-qa at fedoraproject.org|
+Fedora Extras|tomoe|Japanese handwritten input system|ryo-dairiki at users.sourceforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|torcs|An OpenGL 3d racing game|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|torcs-data|The Open Racing Car Simulator data files|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|tpb|IBM ThinkPad button support utility|ville.skytta at iki.fi|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Fri Sep 16 16:07:50 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri, 16 Sep 2005 12:07:50 -0400
Subject: rpms/gc/devel gc-6.6-no-undefined.patch, NONE, 1.1 gc.spec, 1.12,
	1.13 gc6.5-opendl.patch, 1.1, NONE
Message-ID: <200509161608.j8GG8f9x005447@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/gc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5425

Modified Files:
	gc.spec 
Added Files:
	gc-6.6-no-undefined.patch 
Removed Files:
	gc6.5-opendl.patch 
Log Message:
* Wed Sep 14 2005 Rex Dieter  6.6-3
- no-undefined patch, libtool madness (#166344)


gc-6.6-no-undefined.patch:

--- NEW FILE gc-6.6-no-undefined.patch ---
--- gc6.6/Makefile.in.no-undefined	2005-09-09 11:34:45.000000000 -0500
+++ gc6.6/Makefile.in	2005-09-16 10:35:48.700954361 -0500
@@ -340,15 +340,15 @@
 # linuxthread semaphore functions get linked:
 libgc_la_LIBADD = @addobjs@ $(THREADDLLIBS) $(UNWINDLIBS)
 libgc_la_DEPENDENCIES = @addobjs@
-libgc_la_LDFLAGS = -version-info 1:2:0
+libgc_la_LDFLAGS = -version-info 1:2:0 -no-undefined -Wl,--no-undefined
 EXTRA_libgc_la_SOURCES = alpha_mach_dep.S \
     mips_sgi_mach_dep.s mips_ultrix_mach_dep.s powerpc_darwin_mach_dep.s \
     rs6000_mach_dep.s sparc_mach_dep.S sparc_netbsd_mach_dep.s \
     sparc_sunos4_mach_dep.s ia64_save_regs_in_stack.s
 
 libgccpp_la_SOURCES = gc_cpp.cc
-libgccpp_la_LIBADD = $(THREADDLLIBS) $(UNWINDLIBS)
-libgccpp_la_LDFLAGS = -version-info 1:2:0
+libgccpp_la_LIBADD = ./libgc.la
+libgccpp_la_LDFLAGS = -version-info 1:2:0 -no-undefined -Wl,--no-undefined
 AM_CXXFLAGS = @GC_CFLAGS@
 AM_CFLAGS = @GC_CFLAGS@
 @CPLUSPLUS_FALSE at extra_checks = 
@@ -356,9 +356,9 @@
 
 # gctest_OBJECTS = test.o
 gctest_SOURCES = tests/test.c
-gctest_LDADD = ./libgc.la $(THREADDLLIBS) $(UNWINDLIBS) $(EXTRA_TEST_LIBS)
+gctest_LDADD = ./libgc.la $(EXTRA_TEST_LIBS)
 test_cpp_SOURCES = tests/test_cpp.cc
-test_cpp_LDADD = ./libgc.la ./libgccpp.la $(THREADDLLIBS) $(UNWINDLIBS) $(EXTRA_TEST_LIBS)
+test_cpp_LDADD = ./libgccpp.la $(EXTRA_TEST_LIBS)
 TESTS = gctest $(extra_checks)
 all_objs = @addobjs@ $(libgc_la_OBJECTS)
 @COMPILER_XLC_FALSE at ASM_CPP_OPTIONS = -Wp,-P -x assembler-with-cpp
--- gc6.6/Makefile.am.no-undefined	2005-05-28 23:54:12.000000000 -0500
+++ gc6.6/Makefile.am	2005-09-16 10:35:02.816840997 -0500
@@ -57,7 +57,7 @@
 # linuxthread semaphore functions get linked:
 libgc_la_LIBADD = @addobjs@ $(THREADDLLIBS) $(UNWINDLIBS)
 libgc_la_DEPENDENCIES = @addobjs@
-libgc_la_LDFLAGS = -version-info 1:2:0
+libgc_la_LDFLAGS = -version-info 1:2:0 -no-undefined -Wl,--no-undefined
 
 EXTRA_libgc_la_SOURCES = alpha_mach_dep.S \
     mips_sgi_mach_dep.s mips_ultrix_mach_dep.s powerpc_darwin_mach_dep.s \
@@ -65,8 +65,8 @@
     sparc_sunos4_mach_dep.s ia64_save_regs_in_stack.s
 
 libgccpp_la_SOURCES = gc_cpp.cc
-libgccpp_la_LIBADD = $(THREADDLLIBS) $(UNWINDLIBS)
-libgccpp_la_LDFLAGS = -version-info 1:2:0
+libgccpp_la_LIBADD = ./libgc.la
+libgccpp_la_LDFLAGS = -version-info 1:2:0 -no-undefined -Wl,--no-undefined
 
 EXTRA_DIST += alpha_mach_dep.S mips_sgi_mach_dep.s sparc_mach_dep.S
 
@@ -91,9 +91,9 @@
 ##     are included in the distribution
 # gctest_OBJECTS = test.o
 gctest_SOURCES = tests/test.c
-gctest_LDADD = ./libgc.la $(THREADDLLIBS) $(UNWINDLIBS) $(EXTRA_TEST_LIBS)
+gctest_LDADD = ./libgc.la $(EXTRA_TEST_LIBS)
 test_cpp_SOURCES = tests/test_cpp.cc
-test_cpp_LDADD = ./libgc.la ./libgccpp.la $(THREADDLLIBS) $(UNWINDLIBS) $(EXTRA_TEST_LIBS)
+test_cpp_LDADD = ./libgccpp.la $(EXTRA_TEST_LIBS)
 
 TESTS = gctest $(extra_checks)
 


Index: gc.spec
===================================================================
RCS file: /cvs/extras/rpms/gc/devel/gc.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- gc.spec	13 Sep 2005 12:37:23 -0000	1.12
+++ gc.spec	16 Sep 2005 16:07:48 -0000	1.13
@@ -4,14 +4,16 @@
 Name:    gc	
 Version: 6.6
 
-Release: 2%{?dist}
+Release: 3%{?dist}
 Group:   System Environment/Libraries
 License: BSD
 Url:     http://www.hpl.hp.com/personal/Hans_Boehm/gc/	
 Source:  http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/gc6.6.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Patch1: gc6.5-opendl.patch
+# force no undefined symbols (#166344)
+Patch1: gc-6.6-no-undefined.patch
+BuildRequires: libtool automake autoconf
 
 
 %description
@@ -27,9 +29,16 @@
 
 
 %prep
-%setup -n %{name}%{version}
+%setup -q -n %{name}%{version}
 
-#patch1 -p1 -b .opendl
+%patch1 -p1 -b .no-undefined
+
+cp -f %{_datadir}/aclocal/libtool.m4 .
+libtoolize --copy --force
+aclocal
+automake
+autoconf
+#autoheader
 
 
 %build
@@ -44,6 +53,7 @@
 
 make %{?_smp_mflags}
 
+
 %check || :
 make check
 
@@ -51,7 +61,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT 
 
 install -p -D -m644 doc/gc.man	$RPM_BUILD_ROOT%{_mandir}/man3/gc.3
 
@@ -71,7 +81,8 @@
 
 %files 
 %defattr(-,root,root)
-%doc doc/README doc/README.changes doc/README.contributors
+%doc doc/README doc/README.changes doc/README.contributors 
+%doc doc/README.environment doc/README.linux
 %{_libdir}/lib*.so.*
 
 %files devel
@@ -83,6 +94,9 @@
 
 
 %changelog
+* Wed Sep 14 2005 Rex Dieter  6.6-3
+- no-undefined patch, libtool madness (#166344)
+
 * Mon Sep 12 2005 Rex Dieter  6.6-2
 - drop opendl patch (doesn't appear to be needed anymore)
 


--- gc6.5-opendl.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Sep 16 17:49:28 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri, 16 Sep 2005 13:49:28 -0400
Subject: rpms/gc/FC-3 gc-6.6-no-undefined.patch, NONE, 1.1 gc.spec, 1.9,
	1.10 gc6.5-opendl.patch, 1.1, NONE
Message-ID: <200509161749.j8GHnw8h007277@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/gc/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7228/FC-3

Modified Files:
	gc.spec 
Added Files:
	gc-6.6-no-undefined.patch 
Removed Files:
	gc6.5-opendl.patch 
Log Message:
* Wed Sep 14 2005 Rex Dieter  6.6-3
- no-undefined patch, libtool madness (#166344)


gc-6.6-no-undefined.patch:

--- NEW FILE gc-6.6-no-undefined.patch ---
--- gc6.6/Makefile.in.no-undefined	2005-09-09 11:34:45.000000000 -0500
+++ gc6.6/Makefile.in	2005-09-16 10:35:48.700954361 -0500
@@ -340,15 +340,15 @@
 # linuxthread semaphore functions get linked:
 libgc_la_LIBADD = @addobjs@ $(THREADDLLIBS) $(UNWINDLIBS)
 libgc_la_DEPENDENCIES = @addobjs@
-libgc_la_LDFLAGS = -version-info 1:2:0
+libgc_la_LDFLAGS = -version-info 1:2:0 -no-undefined -Wl,--no-undefined
 EXTRA_libgc_la_SOURCES = alpha_mach_dep.S \
     mips_sgi_mach_dep.s mips_ultrix_mach_dep.s powerpc_darwin_mach_dep.s \
     rs6000_mach_dep.s sparc_mach_dep.S sparc_netbsd_mach_dep.s \
     sparc_sunos4_mach_dep.s ia64_save_regs_in_stack.s
 
 libgccpp_la_SOURCES = gc_cpp.cc
-libgccpp_la_LIBADD = $(THREADDLLIBS) $(UNWINDLIBS)
-libgccpp_la_LDFLAGS = -version-info 1:2:0
+libgccpp_la_LIBADD = ./libgc.la
+libgccpp_la_LDFLAGS = -version-info 1:2:0 -no-undefined -Wl,--no-undefined
 AM_CXXFLAGS = @GC_CFLAGS@
 AM_CFLAGS = @GC_CFLAGS@
 @CPLUSPLUS_FALSE at extra_checks = 
@@ -356,9 +356,9 @@
 
 # gctest_OBJECTS = test.o
 gctest_SOURCES = tests/test.c
-gctest_LDADD = ./libgc.la $(THREADDLLIBS) $(UNWINDLIBS) $(EXTRA_TEST_LIBS)
+gctest_LDADD = ./libgc.la $(EXTRA_TEST_LIBS)
 test_cpp_SOURCES = tests/test_cpp.cc
-test_cpp_LDADD = ./libgc.la ./libgccpp.la $(THREADDLLIBS) $(UNWINDLIBS) $(EXTRA_TEST_LIBS)
+test_cpp_LDADD = ./libgccpp.la $(EXTRA_TEST_LIBS)
 TESTS = gctest $(extra_checks)
 all_objs = @addobjs@ $(libgc_la_OBJECTS)
 @COMPILER_XLC_FALSE at ASM_CPP_OPTIONS = -Wp,-P -x assembler-with-cpp
--- gc6.6/Makefile.am.no-undefined	2005-05-28 23:54:12.000000000 -0500
+++ gc6.6/Makefile.am	2005-09-16 10:35:02.816840997 -0500
@@ -57,7 +57,7 @@
 # linuxthread semaphore functions get linked:
 libgc_la_LIBADD = @addobjs@ $(THREADDLLIBS) $(UNWINDLIBS)
 libgc_la_DEPENDENCIES = @addobjs@
-libgc_la_LDFLAGS = -version-info 1:2:0
+libgc_la_LDFLAGS = -version-info 1:2:0 -no-undefined -Wl,--no-undefined
 
 EXTRA_libgc_la_SOURCES = alpha_mach_dep.S \
     mips_sgi_mach_dep.s mips_ultrix_mach_dep.s powerpc_darwin_mach_dep.s \
@@ -65,8 +65,8 @@
     sparc_sunos4_mach_dep.s ia64_save_regs_in_stack.s
 
 libgccpp_la_SOURCES = gc_cpp.cc
-libgccpp_la_LIBADD = $(THREADDLLIBS) $(UNWINDLIBS)
-libgccpp_la_LDFLAGS = -version-info 1:2:0
+libgccpp_la_LIBADD = ./libgc.la
+libgccpp_la_LDFLAGS = -version-info 1:2:0 -no-undefined -Wl,--no-undefined
 
 EXTRA_DIST += alpha_mach_dep.S mips_sgi_mach_dep.s sparc_mach_dep.S
 
@@ -91,9 +91,9 @@
 ##     are included in the distribution
 # gctest_OBJECTS = test.o
 gctest_SOURCES = tests/test.c
-gctest_LDADD = ./libgc.la $(THREADDLLIBS) $(UNWINDLIBS) $(EXTRA_TEST_LIBS)
+gctest_LDADD = ./libgc.la $(EXTRA_TEST_LIBS)
 test_cpp_SOURCES = tests/test_cpp.cc
-test_cpp_LDADD = ./libgc.la ./libgccpp.la $(THREADDLLIBS) $(UNWINDLIBS) $(EXTRA_TEST_LIBS)
+test_cpp_LDADD = ./libgccpp.la $(EXTRA_TEST_LIBS)
 
 TESTS = gctest $(extra_checks)
 


Index: gc.spec
===================================================================
RCS file: /cvs/extras/rpms/gc/FC-3/gc.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- gc.spec	13 Sep 2005 12:37:22 -0000	1.9
+++ gc.spec	16 Sep 2005 17:49:26 -0000	1.10
@@ -4,14 +4,16 @@
 Name:    gc	
 Version: 6.6
 
-Release: 2%{?dist}
+Release: 3%{?dist}
 Group:   System Environment/Libraries
 License: BSD
 Url:     http://www.hpl.hp.com/personal/Hans_Boehm/gc/	
 Source:  http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/gc6.6.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Patch1: gc6.5-opendl.patch
+# force no undefined symbols (#166344)
+Patch1: gc-6.6-no-undefined.patch
+BuildRequires: libtool automake autoconf
 
 
 %description
@@ -27,9 +29,16 @@
 
 
 %prep
-%setup -n %{name}%{version}
+%setup -q -n %{name}%{version}
 
-#patch1 -p1 -b .opendl
+%patch1 -p1 -b .no-undefined
+
+cp -f %{_datadir}/aclocal/libtool.m4 .
+libtoolize --copy --force
+aclocal
+automake
+autoconf
+#autoheader
 
 
 %build
@@ -44,6 +53,7 @@
 
 make %{?_smp_mflags}
 
+
 %check || :
 make check
 
@@ -51,7 +61,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT 
 
 install -p -D -m644 doc/gc.man	$RPM_BUILD_ROOT%{_mandir}/man3/gc.3
 
@@ -71,7 +81,8 @@
 
 %files 
 %defattr(-,root,root)
-%doc doc/README doc/README.changes doc/README.contributors
+%doc doc/README doc/README.changes doc/README.contributors 
+%doc doc/README.environment doc/README.linux
 %{_libdir}/lib*.so.*
 
 %files devel
@@ -83,6 +94,9 @@
 
 
 %changelog
+* Wed Sep 14 2005 Rex Dieter  6.6-3
+- no-undefined patch, libtool madness (#166344)
+
 * Mon Sep 12 2005 Rex Dieter  6.6-2
 - drop opendl patch (doesn't appear to be needed anymore)
 


--- gc6.5-opendl.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Sep 16 17:49:29 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri, 16 Sep 2005 13:49:29 -0400
Subject: rpms/gc/FC-4 gc-6.6-no-undefined.patch, NONE, 1.1 gc.spec, 1.11,
	1.12 gc6.5-opendl.patch, 1.1, NONE
Message-ID: <200509161749.j8GHnxFq007280@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/gc/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7228/FC-4

Modified Files:
	gc.spec 
Added Files:
	gc-6.6-no-undefined.patch 
Removed Files:
	gc6.5-opendl.patch 
Log Message:
* Wed Sep 14 2005 Rex Dieter  6.6-3
- no-undefined patch, libtool madness (#166344)


gc-6.6-no-undefined.patch:

--- NEW FILE gc-6.6-no-undefined.patch ---
--- gc6.6/Makefile.in.no-undefined	2005-09-09 11:34:45.000000000 -0500
+++ gc6.6/Makefile.in	2005-09-16 10:35:48.700954361 -0500
@@ -340,15 +340,15 @@
 # linuxthread semaphore functions get linked:
 libgc_la_LIBADD = @addobjs@ $(THREADDLLIBS) $(UNWINDLIBS)
 libgc_la_DEPENDENCIES = @addobjs@
-libgc_la_LDFLAGS = -version-info 1:2:0
+libgc_la_LDFLAGS = -version-info 1:2:0 -no-undefined -Wl,--no-undefined
 EXTRA_libgc_la_SOURCES = alpha_mach_dep.S \
     mips_sgi_mach_dep.s mips_ultrix_mach_dep.s powerpc_darwin_mach_dep.s \
     rs6000_mach_dep.s sparc_mach_dep.S sparc_netbsd_mach_dep.s \
     sparc_sunos4_mach_dep.s ia64_save_regs_in_stack.s
 
 libgccpp_la_SOURCES = gc_cpp.cc
-libgccpp_la_LIBADD = $(THREADDLLIBS) $(UNWINDLIBS)
-libgccpp_la_LDFLAGS = -version-info 1:2:0
+libgccpp_la_LIBADD = ./libgc.la
+libgccpp_la_LDFLAGS = -version-info 1:2:0 -no-undefined -Wl,--no-undefined
 AM_CXXFLAGS = @GC_CFLAGS@
 AM_CFLAGS = @GC_CFLAGS@
 @CPLUSPLUS_FALSE at extra_checks = 
@@ -356,9 +356,9 @@
 
 # gctest_OBJECTS = test.o
 gctest_SOURCES = tests/test.c
-gctest_LDADD = ./libgc.la $(THREADDLLIBS) $(UNWINDLIBS) $(EXTRA_TEST_LIBS)
+gctest_LDADD = ./libgc.la $(EXTRA_TEST_LIBS)
 test_cpp_SOURCES = tests/test_cpp.cc
-test_cpp_LDADD = ./libgc.la ./libgccpp.la $(THREADDLLIBS) $(UNWINDLIBS) $(EXTRA_TEST_LIBS)
+test_cpp_LDADD = ./libgccpp.la $(EXTRA_TEST_LIBS)
 TESTS = gctest $(extra_checks)
 all_objs = @addobjs@ $(libgc_la_OBJECTS)
 @COMPILER_XLC_FALSE at ASM_CPP_OPTIONS = -Wp,-P -x assembler-with-cpp
--- gc6.6/Makefile.am.no-undefined	2005-05-28 23:54:12.000000000 -0500
+++ gc6.6/Makefile.am	2005-09-16 10:35:02.816840997 -0500
@@ -57,7 +57,7 @@
 # linuxthread semaphore functions get linked:
 libgc_la_LIBADD = @addobjs@ $(THREADDLLIBS) $(UNWINDLIBS)
 libgc_la_DEPENDENCIES = @addobjs@
-libgc_la_LDFLAGS = -version-info 1:2:0
+libgc_la_LDFLAGS = -version-info 1:2:0 -no-undefined -Wl,--no-undefined
 
 EXTRA_libgc_la_SOURCES = alpha_mach_dep.S \
     mips_sgi_mach_dep.s mips_ultrix_mach_dep.s powerpc_darwin_mach_dep.s \
@@ -65,8 +65,8 @@
     sparc_sunos4_mach_dep.s ia64_save_regs_in_stack.s
 
 libgccpp_la_SOURCES = gc_cpp.cc
-libgccpp_la_LIBADD = $(THREADDLLIBS) $(UNWINDLIBS)
-libgccpp_la_LDFLAGS = -version-info 1:2:0
+libgccpp_la_LIBADD = ./libgc.la
+libgccpp_la_LDFLAGS = -version-info 1:2:0 -no-undefined -Wl,--no-undefined
 
 EXTRA_DIST += alpha_mach_dep.S mips_sgi_mach_dep.s sparc_mach_dep.S
 
@@ -91,9 +91,9 @@
 ##     are included in the distribution
 # gctest_OBJECTS = test.o
 gctest_SOURCES = tests/test.c
-gctest_LDADD = ./libgc.la $(THREADDLLIBS) $(UNWINDLIBS) $(EXTRA_TEST_LIBS)
+gctest_LDADD = ./libgc.la $(EXTRA_TEST_LIBS)
 test_cpp_SOURCES = tests/test_cpp.cc
-test_cpp_LDADD = ./libgc.la ./libgccpp.la $(THREADDLLIBS) $(UNWINDLIBS) $(EXTRA_TEST_LIBS)
+test_cpp_LDADD = ./libgccpp.la $(EXTRA_TEST_LIBS)
 
 TESTS = gctest $(extra_checks)
 


Index: gc.spec
===================================================================
RCS file: /cvs/extras/rpms/gc/FC-4/gc.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- gc.spec	12 Sep 2005 20:28:58 -0000	1.11
+++ gc.spec	16 Sep 2005 17:49:26 -0000	1.12
@@ -4,14 +4,16 @@
 Name:    gc	
 Version: 6.6
 
-Release: 2%{?dist}
+Release: 3%{?dist}
 Group:   System Environment/Libraries
 License: BSD
 Url:     http://www.hpl.hp.com/personal/Hans_Boehm/gc/	
 Source:  http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/gc6.6.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Patch1: gc6.5-opendl.patch
+# force no undefined symbols (#166344)
+Patch1: gc-6.6-no-undefined.patch
+BuildRequires: libtool automake autoconf
 
 
 %description
@@ -27,9 +29,16 @@
 
 
 %prep
-%setup -n %{name}%{version}
+%setup -q -n %{name}%{version}
 
-#patch1 -p1 -b .opendl
+%patch1 -p1 -b .no-undefined
+
+cp -f %{_datadir}/aclocal/libtool.m4 .
+libtoolize --copy --force
+aclocal
+automake
+autoconf
+#autoheader
 
 
 %build
@@ -44,6 +53,7 @@
 
 make %{?_smp_mflags}
 
+
 %check || :
 make check
 
@@ -51,7 +61,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT 
 
 install -p -D -m644 doc/gc.man	$RPM_BUILD_ROOT%{_mandir}/man3/gc.3
 
@@ -71,7 +81,8 @@
 
 %files 
 %defattr(-,root,root)
-%doc doc/README doc/README.changes doc/README.contributors
+%doc doc/README doc/README.changes doc/README.contributors 
+%doc doc/README.environment doc/README.linux
 %{_libdir}/lib*.so.*
 
 %files devel
@@ -83,6 +94,9 @@
 
 
 %changelog
+* Wed Sep 14 2005 Rex Dieter  6.6-3
+- no-undefined patch, libtool madness (#166344)
+
 * Mon Sep 12 2005 Rex Dieter  6.6-2
 - drop opendl patch (doesn't appear to be needed anymore)
 


--- gc6.5-opendl.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Sep 16 18:03:36 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Fri, 16 Sep 2005 14:03:36 -0400
Subject: rpms/perl-Config-General/devel .cvsignore, 1.3,
	1.4 perl-Config-General.spec, 1.7, 1.8 sources, 1.3, 1.4
Message-ID: <200509161804.j8GI4U4w008696@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/perl-Config-General/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8651/devel

Modified Files:
	.cvsignore perl-Config-General.spec sources 
Log Message:
* Fri Sep 16 2005 Ville Skytt??  - 2.30-1
- 2.30.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Config-General/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	18 May 2005 15:42:49 -0000	1.3
+++ .cvsignore	16 Sep 2005 18:03:33 -0000	1.4
@@ -1 +1 @@
-Config-General-2.28.tar.gz
+Config-General-2.30.tar.gz


Index: perl-Config-General.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Config-General/devel/perl-Config-General.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- perl-Config-General.spec	18 May 2005 15:42:49 -0000	1.7
+++ perl-Config-General.spec	16 Sep 2005 18:03:34 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           perl-Config-General
-Version:        2.28
-Release:        2
+Version:        2.30
+Release:        1%{?dist}
 Summary:        Generic configuration module for Perl
 
 Group:          Development/Libraries
@@ -47,7 +47,7 @@
 chmod -R u+w $RPM_BUILD_ROOT/*
 
 
-%check || :
+%check
 make test
 
 
@@ -57,12 +57,15 @@
 
 %files
 %defattr(-,root,root,-)
-%doc Changelog README
+%doc Changelog README example.cfg
 %{perl_vendorlib}/Config/
 %{_mandir}/man3/Config::*.3*
 
 
 %changelog
+* Fri Sep 16 2005 Ville Skytt??  - 2.30-1
+- 2.30.
+
 * Wed May 18 2005 Ville Skytt??  - 2.28-2
 - 2.28.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Config-General/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	18 May 2005 15:42:49 -0000	1.3
+++ sources	16 Sep 2005 18:03:34 -0000	1.4
@@ -1 +1 @@
-6f284f7fd06efd7ea1a1e66f1047fad2  Config-General-2.28.tar.gz
+289037b40ef5a78bd59f894bcc1d4f51  Config-General-2.30.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep 16 18:03:07 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Fri, 16 Sep 2005 14:03:07 -0400
Subject: rpms/perl-Config-General/FC-4 .cvsignore, 1.3,
	1.4 perl-Config-General.spec, 1.7, 1.8 sources, 1.3, 1.4
Message-ID: <200509161804.j8GI4cTg008703@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/perl-Config-General/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8651/FC-4

Modified Files:
	.cvsignore perl-Config-General.spec sources 
Log Message:
* Fri Sep 16 2005 Ville Skytt??  - 2.30-1
- 2.30.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Config-General/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	18 May 2005 15:42:49 -0000	1.3
+++ .cvsignore	16 Sep 2005 18:03:04 -0000	1.4
@@ -1 +1 @@
-Config-General-2.28.tar.gz
+Config-General-2.30.tar.gz


Index: perl-Config-General.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Config-General/FC-4/perl-Config-General.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- perl-Config-General.spec	18 May 2005 15:42:49 -0000	1.7
+++ perl-Config-General.spec	16 Sep 2005 18:03:04 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           perl-Config-General
-Version:        2.28
-Release:        2
+Version:        2.30
+Release:        1%{?dist}
 Summary:        Generic configuration module for Perl
 
 Group:          Development/Libraries
@@ -47,7 +47,7 @@
 chmod -R u+w $RPM_BUILD_ROOT/*
 
 
-%check || :
+%check
 make test
 
 
@@ -57,12 +57,15 @@
 
 %files
 %defattr(-,root,root,-)
-%doc Changelog README
+%doc Changelog README example.cfg
 %{perl_vendorlib}/Config/
 %{_mandir}/man3/Config::*.3*
 
 
 %changelog
+* Fri Sep 16 2005 Ville Skytt??  - 2.30-1
+- 2.30.
+
 * Wed May 18 2005 Ville Skytt??  - 2.28-2
 - 2.28.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Config-General/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	18 May 2005 15:42:49 -0000	1.3
+++ sources	16 Sep 2005 18:03:05 -0000	1.4
@@ -1 +1 @@
-6f284f7fd06efd7ea1a1e66f1047fad2  Config-General-2.28.tar.gz
+289037b40ef5a78bd59f894bcc1d4f51  Config-General-2.30.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep 16 18:11:21 2005
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Fri, 16 Sep 2005 14:11:21 -0400
Subject: extras-buildsys/common FileDownloader.py,1.14,1.15
Message-ID: <200509161811.j8GIBLx1008963@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8896/common

Modified Files:
	FileDownloader.py 
Log Message:
2005-09-16  Dan Williams  

    * builder/builder.py
      common/FileDownloader.py
      server/ArchJob.py
        - Rename FileNameError -> FileNameException

    * builder/builder.py
        - Clean up exception handling on job creation so that we
            don't end up calling start() before Thread.__init__() got
            called.




Index: FileDownloader.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/common/FileDownloader.py,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- FileDownloader.py	26 Jul 2005 17:47:19 -0000	1.14
+++ FileDownloader.py	16 Sep 2005 18:11:19 -0000	1.15
@@ -25,13 +25,7 @@
 import exceptions
 
 
-class FileNameError(exceptions.Exception):
-    def __init__(self, args=None):
-        exceptions.Exception.__init__(self)
-        self.args = args
-    def __str__(self):
-        return self.args
-
+class FileNameException(exceptions.Exception): pass
 
 def get_base_filename_from_url(url, legal_exts):
     """ Safely unquotes a URL and gets the base file name from it.
@@ -51,12 +45,12 @@
     # If after 5 iterations of unquoting, the strings still aren't the same,
     # something is wrong.
     if (count == 0) and (unquoted != last_unquoted):
-        raise FileNameError("URL quoting level too deep.")
+        raise FileNameException("URL quoting level too deep.")
 
     # Try to grab the filename off the end of the URL
     index = url.rfind('/')
     if index is -1:
-        raise FileNameError("No separator in URL.")
+        raise FileNameException("No separator in URL.")
     filename = url[index+1:]
 
     # Only accept certain file extensions
@@ -67,7 +61,7 @@
             break
 
     if not ext_ok:
-        raise FileNameError("Extension was not allowed.")
+        raise FileNameException("Extension was not allowed.")
 
     # FIXME: what other validation can we do here?
     safe_list = ['_', '-', '.', '+']
@@ -76,7 +70,7 @@
         if c in safe_list or c.isalnum():
             pass
         else:
-            raise FileNameError("Illegal character '%s' encountered." % c)
+            raise FileNameException("Illegal character '%s' encountered." % c)
 
     return filename
 
@@ -88,10 +82,9 @@
         self._cb_data = cb_data
         self._url = url
         self._target_dir = target_dir
-        try:
-            self._filename = get_base_filename_from_url(self._url, legal_exts)
-        except FileNameError, e:
-            print "Couldn't get base filename from url!! Error: '%s'  URL: %s." % (e, url)
+
+        # May fail with FileNameException, trapped elsewhere
+        self._filename = get_base_filename_from_url(self._url, legal_exts)
 
         if certs and len(certs) > 0:
             self._opener = HTTPSURLopener.HTTPSURLopener(certs)



From fedora-extras-commits at redhat.com  Fri Sep 16 18:11:22 2005
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Fri, 16 Sep 2005 14:11:22 -0400
Subject: extras-buildsys/server ArchJob.py,1.15,1.16
Message-ID: <200509161811.j8GIBM3o008969@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys/server
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8896/server

Modified Files:
	ArchJob.py 
Log Message:
2005-09-16  Dan Williams  

    * builder/builder.py
      common/FileDownloader.py
      server/ArchJob.py
        - Rename FileNameError -> FileNameException

    * builder/builder.py
        - Clean up exception handling on job creation so that we
            don't end up calling start() before Thread.__init__() got
            called.




Index: ArchJob.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/ArchJob.py,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- ArchJob.py	8 Sep 2005 21:10:25 -0000	1.15
+++ ArchJob.py	16 Sep 2005 18:11:20 -0000	1.16
@@ -187,15 +187,20 @@
                     target_dir = os.path.join(self.par_job.get_stage_dir(), self._target_dict['arch'])
                     if not os.path.exists(target_dir):
                         os.makedirs(target_dir)
-                    if self._use_ssl:
-                        dl_thread = FileDownloader.FileDownloader(self.dl_callback, url, url,
-                                    target_dir, ['.rpm', '.log'], self._certs)
-                    else:
-                        dl_thread = FileDownloader.FileDownloader(self.dl_callback, url, url,
-                                    target_dir, ['.rpm', '.log'], None)
-                    dl_thread.start()
-                    undownloaded = True
-                    self.downloads[url] = 1
+                    try:
+                        if self._use_ssl:
+                            dl_thread = FileDownloader.FileDownloader(self.dl_callback, url, url,
+                                        target_dir, ['.rpm', '.log'], self._certs)
+                        else:
+                            dl_thread = FileDownloader.FileDownloader(self.dl_callback, url, url,
+                                        target_dir, ['.rpm', '.log'], None)
+                        dl_thread.start()
+                        undownloaded = True
+                        self.downloads[url] = 1 # In Progress
+                    except FileDownloader.FileNameException, e:
+                        print "%s (%s/%s): [ %s ] Bad file name error when getting %s: '%s'" % (self.par_job.uid,
+                                    self.par_job.package, self._target_dict['arch'], self.bci.address(), url, e)
+                        self.downloads[url] = 2 # Error
                     break
                 elif dl_status == 1:
                     # in progress
@@ -251,7 +256,7 @@
                 fname = FileDownloader.get_base_filename_from_url(url, ['.rpm', '.log'])
                 if self.downloads[url] == 3:
                     files.append(fname)
-            except FileDownloader.FileNameError, e:
+            except FileDownloader.FileNameException, e:
                 # Just ignore the file then
                 print "%s (%s/%s): Illegal file name.  Error: '%s', URL: %s" % (self.par_job.uid,
                         self.par_job.package, self._target_dict['arch'], e, url)



From fedora-extras-commits at redhat.com  Fri Sep 16 18:10:59 2005
From: fedora-extras-commits at redhat.com (Chris Wright (chrisw))
Date: Fri, 16 Sep 2005 14:10:59 -0400
Subject: rpms/git-core import.log,1.2,1.3
Message-ID: <200509161811.j8GIBTq8008972@cvs-int.fedora.redhat.com>

Author: chrisw

Update of /cvs/extras/rpms/git-core
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8848

Modified Files:
	import.log 
Log Message:
auto-import git-core-0.99.6-1 on branch devel from git-core-0.99.6-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/git-core/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	30 Aug 2005 00:37:24 -0000	1.2
+++ import.log	16 Sep 2005 18:10:57 -0000	1.3
@@ -1 +1,2 @@
 git-core-0_99_4-4:HEAD:git-core-0.99.4-4.src.rpm:1125362230
+git-core-0_99_6-1:HEAD:git-core-0.99.6-1.src.rpm:1126894247



From fedora-extras-commits at redhat.com  Fri Sep 16 18:11:00 2005
From: fedora-extras-commits at redhat.com (Chris Wright (chrisw))
Date: Fri, 16 Sep 2005 14:11:00 -0400
Subject: rpms/git-core/devel .cvsignore, 1.2, 1.3 git-core.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <200509161811.j8GIBUYi008977@cvs-int.fedora.redhat.com>

Author: chrisw

Update of /cvs/extras/rpms/git-core/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8848/devel

Modified Files:
	.cvsignore git-core.spec sources 
Log Message:
auto-import git-core-0.99.6-1 on branch devel from git-core-0.99.6-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/git-core/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	30 Aug 2005 00:37:24 -0000	1.2
+++ .cvsignore	16 Sep 2005 18:10:58 -0000	1.3
@@ -1 +1 @@
-git-core-0.99.4.tar.gz
+git-core-0.99.6.tar.gz


Index: git-core.spec
===================================================================
RCS file: /cvs/extras/rpms/git-core/devel/git-core.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- git-core.spec	30 Aug 2005 00:37:24 -0000	1.1
+++ git-core.spec	16 Sep 2005 18:10:58 -0000	1.2
@@ -1,7 +1,7 @@
 # Pass --without docs to rpmbuild if you don't want the documetnation
 Name: 		git-core
-Version: 	0.99.4
-Release: 	4%{?dist}
+Version: 	0.99.6
+Release: 	1%{?dist}
 Summary:  	Git core and tools
 License: 	GPL
 Group: 		Development/Tools
@@ -24,12 +24,11 @@
 
 %build
 make COPTS="$RPM_OPT_FLAGS" prefix=%{_prefix} all %{!?_without_docs: doc}
-make COPTS="$RPM_OPT_FLAGS" -C tools all
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make dest=$RPM_BUILD_ROOT prefix=%{_prefix} mandir=%{_mandir} \
-     install install-tools %{!?_without_docs: install-doc}
+make DESTDIR=$RPM_BUILD_ROOT prefix=%{_prefix} mandir=%{_mandir} \
+     install %{!?_without_docs: install-doc}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -44,6 +43,9 @@
 %{!?_without_docs: %{_mandir}/man7/*.7.gz}
 
 %changelog
+* Fri Sep 16 2005 Chris Wright  0.99.6-1
+- update to 0.99.6
+
 * Thu Aug 18 2005 Chris Wright  0.99.4-4
 - drop sh_utils, sh-utils, diffutils, mktemp, and openssl Requires
 - use RPM_OPT_FLAGS in spec file, drop patch0


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/git-core/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	30 Aug 2005 00:37:24 -0000	1.2
+++ sources	16 Sep 2005 18:10:58 -0000	1.3
@@ -1 +1 @@
-06935e265e7a556d8819a097dcb44f35  git-core-0.99.4.tar.gz
+ca2f17bc1550909a2675386e8be46f0f  git-core-0.99.6.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep 16 18:11:15 2005
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Fri, 16 Sep 2005 14:11:15 -0400
Subject: extras-buildsys ChangeLog,1.124,1.125
Message-ID: <200509161811.j8GIBkcP009009@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8896

Modified Files:
	ChangeLog 
Log Message:
2005-09-16  Dan Williams  

    * builder/builder.py
      common/FileDownloader.py
      server/ArchJob.py
        - Rename FileNameError -> FileNameException

    * builder/builder.py
        - Clean up exception handling on job creation so that we
            don't end up calling start() before Thread.__init__() got
            called.




Index: ChangeLog
===================================================================
RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -r1.124 -r1.125
--- ChangeLog	14 Sep 2005 18:21:20 -0000	1.124
+++ ChangeLog	16 Sep 2005 18:11:13 -0000	1.125
@@ -1,3 +1,15 @@
+2005-09-16  Dan Williams  
+
+    * builder/builder.py
+      common/FileDownloader.py
+      server/ArchJob.py
+        - Rename FileNameError -> FileNameException
+
+    * builder/builder.py
+        - Clean up exception handling on job creation so that we
+            don't end up calling start() before Thread.__init__() got
+            called.
+
 2005-09-14  Dan Williams  
 
     * server/PackageJob.py



From fedora-extras-commits at redhat.com  Fri Sep 16 18:11:16 2005
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Fri, 16 Sep 2005 14:11:16 -0400
Subject: extras-buildsys/builder builder.py,1.42,1.43
Message-ID: <200509161811.j8GIBkgM009012@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys/builder
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8896/builder

Modified Files:
	builder.py 
Log Message:
2005-09-16  Dan Williams  

    * builder/builder.py
      common/FileDownloader.py
      server/ArchJob.py
        - Rename FileNameError -> FileNameException

    * builder/builder.py
        - Clean up exception handling on job creation so that we
            don't end up calling start() before Thread.__init__() got
            called.




Index: builder.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/builder/builder.py,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- builder.py	13 Sep 2005 18:43:01 -0000	1.42
+++ builder.py	16 Sep 2005 18:11:14 -0000	1.43
@@ -111,24 +111,6 @@
         logfile = os.path.join(self._result_dir, "job.log")
         self._log_fd = open(logfile, "w+")
 
-        target_dict = self._target_cfg.target_dict()
-        target_str = "%s-%s-%s-%s" % (target_dict['distro'], target_dict['target'], target_dict['arch'], target_dict['repo'])
-        self._log("""Starting job:
-   Time: %s
-   Target: %s
-   UID: %s
-   Architecture: %s
-   SRPM: %s\n\n""" % (time.asctime(time.localtime(self._starttime)), target_str, self._uniqid, self.buildarch, srpm_url))
-
-        try:
-            srpm_filename = FileDownloader.get_base_filename_from_url(srpm_url, ['.src.rpm'])
-        except FileDownloader.FileNameError, e:
-            self._status = 'failed'
-            self._srpm_path = None
-            self._log("Failed to extract SRPM filename.  Error: '%s'   URL: %s\n" % (e, srpm_url))
-            return
-
-        self._srpm_path = os.path.join(work_dir, self._uniqid, "source", srpm_filename)
         threading.Thread.__init__(self)
 
     def starttime(self):
@@ -153,7 +135,7 @@
             try:
                 os.kill(self._childpid, 9)
             except OSError, e:
-                self._log("Couldn't kill process %d: %s\n" % (self._childpid, e))
+                self._log("ERROR: Couldn't kill process %d: %s\n" % (self._childpid, e))
             else:
                 # Ensure child process is reaped
                 self._log("Waiting for mock process %d to exit...\n" % self._childpid)
@@ -186,7 +168,7 @@
             # and a download error ocurred
             if not self.is_done_status():
                 self._status = 'failed'
-                self._log("Failed to retrieve %s.\n" % url)
+                self._log("ERROR: Failed to retrieve %s.\n" % url)
 
     def _copy_mock_output_to_log(self):
         if self._mock_log and os.path.exists(self._mock_log):
@@ -323,38 +305,18 @@
         f.close()
         return contents
 
-    def _mock_done(self):
-        # Ensure child process is reaped
-        if self._childpid:
-            try:
-                (pid, status) = os.waitpid(self._childpid, 0)
-            except OSError, e:
-                self._childpid = 0
-                pass
-
-        self._copy_mock_output_to_log()
-
-        self._files = self._find_files()
-        self._log("\n\n-----------------------\n\n")
-        if self._status == 'done':
-            self._log("Job completed successfully.\n")
-        elif self._status == 'failed':
-            self._log("Job failed due to mock errors!  Please see output in root.log and build.log\n")
-        elif self._status == 'killed':
-            self._log("Job failed because it was killed.\n")
-
-        if self._log_fd:
-            self._log_fd.close()
-            self._log_fd = None
-
     def _status_init(self):
         self._log("Starting download of %s.\n" % self._srpm_url)
         self._status = 'downloading'
         target_dir = os.path.dirname(self._srpm_path)
-        dl_thread = FileDownloader.FileDownloader(self.dl_callback, self._srpm_url, self._srpm_url,
+        try:
+            dl_thread = FileDownloader.FileDownloader(self.dl_callback, self._srpm_url, self._srpm_url,
                         target_dir, ['.src.rpm'], certs)
-        dl_thread.start()
-
+            dl_thread.start()
+        except FileDownloader.FileNameException, e:
+            self._status = 'failed'
+            self._log("ERROR: Failed to begin SRPM download.  Error: '%s'   URL: %s\n" % (e, self._srpm_url))
+            
     def _status_downloading(self):
         pass
 
@@ -392,7 +354,7 @@
             # something is wrong if mock takes more than 15s to write the status file
             if time.time() > self._mockstarttime + 15:
                 self._mockstarttime = 0
-                self._log("Timed out waiting for the mock status file!  %s\n" % mockstatusfile)
+                self._log("ERROR: Timed out waiting for the mock status file!  %s\n" % mockstatusfile)
                 self.die()
         else:
             if not self._mock_config and self._mock_is_prepping():
@@ -424,8 +386,51 @@
                 if source_dir.endswith(os.path.join(self._uniqid, "source")):
                     shutil.rmtree(source_dir, ignore_errors=True)
 
+    def _job_done(self):
+        # Ensure child process is reaped, if any
+        if self._childpid:
+            try:
+                self._log("Waiting for child process %d to exit." % self._childpid)
+                (pid, status) = os.waitpid(self._childpid, 0)
+            except OSError, e:
+                self._childpid = 0
+                pass
+
+        self._copy_mock_output_to_log()
+
+        self._files = self._find_files()
+        self._log("\n\n-----------------------\n\n")
+        if self._status == 'done':
+            self._log("Job completed successfully.\n")
+        elif self._status == 'failed':
+            self._log("Job failed due to build errors!  Please see build logs.\n")
+        elif self._status == 'killed':
+            self._log("Job failed because it was killed.\n")
+
+        if self._log_fd:
+            self._log_fd.close()
+            self._log_fd = None
+
     def run(self):
-        while True:
+        # Print out a nice message at the start of the job
+        target_dict = self._target_cfg.target_dict()
+        target_str = "%s-%s-%s-%s" % (target_dict['distro'], target_dict['target'], target_dict['arch'], target_dict['repo'])
+        self._log("""Starting job:
+   Time: %s
+   Target: %s
+   UID: %s
+   Architecture: %s
+   SRPM: %s\n\n""" % (time.asctime(time.localtime(self._starttime)), target_str, self._uniqid, self.buildarch, self._srpm_url))
+
+        try:
+            srpm_filename = FileDownloader.get_base_filename_from_url(self._srpm_url, ['.src.rpm'])
+            self._srpm_path = os.path.join(work_dir, self._uniqid, "source", srpm_filename)
+        except FileDownloader.FileNameException, e:
+            self._log("ERROR: SRPM file name was invalid.  Message: '%s'" % e)
+            self._status = 'failed'
+
+        # Main build job work loop
+        while not self.is_done_status():
             if self._die:
                 self._handle_death()
 
@@ -433,16 +438,12 @@
             try:
                 func = getattr(self, "_status_%s" % self._status)
                 func()
+                time.sleep(3)
             except AttributeError:
                 self._log("ERROR: internal builder inconsistency, didn't recognize status '%s'." % self._status)
                 self._status = 'failed'
 
-            if self.is_done_status():
-                self._mock_done()
-                break
-
-            time.sleep(3)
-
+        self._job_done()
         self._endtime = time.time()
         if self._childpid:
             self._log("ERROR: childpid was !NULL  (%d)" % self._childpid)
@@ -460,6 +461,7 @@
                 self._log("  Output File: %s\n" % urllib.unquote(file_url))
             else:
                 self._log("  Error: Couldn't get file URL for file %s" % f)
+        self._log("-----------------\n")
         return file_list
 
     def status(self):
@@ -607,10 +609,10 @@
             self._building_jobs_lock.acquire()
             self._building_jobs.append(job)
             self._building_jobs_lock.release()
-            job.start()
             filename = os.path.basename(srpm_url)
             self._log("%s: started %s on %s arch %s at time %d" % (uniqid, filename,
                         target_str, target_dict['arch'], job.starttime()))
+            job.start()
         else:
             self._log("%s: Failed request for %s on %s UNSUPPORTED arch %s" %
                         (uniqid, srpm_url, target_str, target_dict['arch'], cur_time))



From fedora-extras-commits at redhat.com  Fri Sep 16 18:13:24 2005
From: fedora-extras-commits at redhat.com (Chris Wright (chrisw))
Date: Fri, 16 Sep 2005 14:13:24 -0400
Subject: rpms/git-core import.log,1.3,1.4
Message-ID: <200509161813.j8GIDtPt009100@cvs-int.fedora.redhat.com>

Author: chrisw

Update of /cvs/extras/rpms/git-core
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9060

Modified Files:
	import.log 
Log Message:
auto-import git-core-0.99.6-1 on branch FC-3 from git-core-0.99.6-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/git-core/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	16 Sep 2005 18:10:57 -0000	1.3
+++ import.log	16 Sep 2005 18:13:22 -0000	1.4
@@ -1,2 +1,3 @@
 git-core-0_99_4-4:HEAD:git-core-0.99.4-4.src.rpm:1125362230
 git-core-0_99_6-1:HEAD:git-core-0.99.6-1.src.rpm:1126894247
+git-core-0_99_6-1:FC-3:git-core-0.99.6-1.src.rpm:1126894397



From fedora-extras-commits at redhat.com  Fri Sep 16 18:13:25 2005
From: fedora-extras-commits at redhat.com (Chris Wright (chrisw))
Date: Fri, 16 Sep 2005 14:13:25 -0400
Subject: rpms/git-core/FC-3 .cvsignore, 1.2, 1.3 git-core.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <200509161813.j8GIDtmw009105@cvs-int.fedora.redhat.com>

Author: chrisw

Update of /cvs/extras/rpms/git-core/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9060/FC-3

Modified Files:
	.cvsignore git-core.spec sources 
Log Message:
auto-import git-core-0.99.6-1 on branch FC-3 from git-core-0.99.6-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/git-core/FC-3/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	30 Aug 2005 00:37:24 -0000	1.2
+++ .cvsignore	16 Sep 2005 18:13:23 -0000	1.3
@@ -1 +1 @@
-git-core-0.99.4.tar.gz
+git-core-0.99.6.tar.gz


Index: git-core.spec
===================================================================
RCS file: /cvs/extras/rpms/git-core/FC-3/git-core.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- git-core.spec	30 Aug 2005 00:37:24 -0000	1.1
+++ git-core.spec	16 Sep 2005 18:13:23 -0000	1.2
@@ -1,7 +1,7 @@
 # Pass --without docs to rpmbuild if you don't want the documetnation
 Name: 		git-core
-Version: 	0.99.4
-Release: 	4%{?dist}
+Version: 	0.99.6
+Release: 	1%{?dist}
 Summary:  	Git core and tools
 License: 	GPL
 Group: 		Development/Tools
@@ -24,12 +24,11 @@
 
 %build
 make COPTS="$RPM_OPT_FLAGS" prefix=%{_prefix} all %{!?_without_docs: doc}
-make COPTS="$RPM_OPT_FLAGS" -C tools all
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make dest=$RPM_BUILD_ROOT prefix=%{_prefix} mandir=%{_mandir} \
-     install install-tools %{!?_without_docs: install-doc}
+make DESTDIR=$RPM_BUILD_ROOT prefix=%{_prefix} mandir=%{_mandir} \
+     install %{!?_without_docs: install-doc}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -44,6 +43,9 @@
 %{!?_without_docs: %{_mandir}/man7/*.7.gz}
 
 %changelog
+* Fri Sep 16 2005 Chris Wright  0.99.6-1
+- update to 0.99.6
+
 * Thu Aug 18 2005 Chris Wright  0.99.4-4
 - drop sh_utils, sh-utils, diffutils, mktemp, and openssl Requires
 - use RPM_OPT_FLAGS in spec file, drop patch0


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/git-core/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	30 Aug 2005 00:37:24 -0000	1.2
+++ sources	16 Sep 2005 18:13:23 -0000	1.3
@@ -1 +1 @@
-06935e265e7a556d8819a097dcb44f35  git-core-0.99.4.tar.gz
+ca2f17bc1550909a2675386e8be46f0f  git-core-0.99.6.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep 16 18:24:18 2005
From: fedora-extras-commits at redhat.com (Chris Wright (chrisw))
Date: Fri, 16 Sep 2005 14:24:18 -0400
Subject: owners owners.list,1.221,1.222
Message-ID: <200509161824.j8GIOIgB009217@cvs-int.fedora.redhat.com>

Author: chrisw

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9198/owners

Modified Files:
	owners.list 
Log Message:
Add git-core to owners.list



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.221
retrieving revision 1.222
diff -u -r1.221 -r1.222
--- owners.list	16 Sep 2005 16:06:45 -0000	1.221
+++ owners.list	16 Sep 2005 18:24:16 -0000	1.222
@@ -225,6 +225,7 @@
 Fedora Extras|gif2png|A GIF to PNG converter|enrico.scholz at informatik.tu-chemnitz.de|extras-qa at fedoraproject.org|
 Fedora Extras|GiNaC|C++ library for symbolic calculation|qspencer at ieee.org|extras-qa at fedoraproject.org|
 Fedora Extras|ginac|C++ library for symbolic calculation|qspencer at ieee.org|extras-qa at fedoraproject.org|
+Fedora Extras|git-core|A distributed SCM|chrisw at osdl.org|extras-qa at fedoraproject.org|
 Fedora Extras|gkrellm-aclock|Analog clock plugin for GKrellM|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|gkrellm-freq|CPU frequency display plugin for GKrellM|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|gkrellm-hddtemp|Hard disk temperature plugin for GKrellM|ville.skytta at iki.fi|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Fri Sep 16 18:44:12 2005
From: fedora-extras-commits at redhat.com (Chris Wright (chrisw))
Date: Fri, 16 Sep 2005 14:44:12 -0400
Subject: rpms/git-core import.log,1.4,1.5
Message-ID: <200509161844.j8GIiCwT009366@cvs-int.fedora.redhat.com>

Author: chrisw

Update of /cvs/extras/rpms/git-core
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9331

Modified Files:
	import.log 
Log Message:
auto-import git-core-0.99.6-1 on branch FC-4 from git-core-0.99.6-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/git-core/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- import.log	16 Sep 2005 18:13:22 -0000	1.4
+++ import.log	16 Sep 2005 18:44:10 -0000	1.5
@@ -1,3 +1,4 @@
 git-core-0_99_4-4:HEAD:git-core-0.99.4-4.src.rpm:1125362230
 git-core-0_99_6-1:HEAD:git-core-0.99.6-1.src.rpm:1126894247
 git-core-0_99_6-1:FC-3:git-core-0.99.6-1.src.rpm:1126894397
+git-core-0_99_6-1:FC-4:git-core-0.99.6-1.src.rpm:1126896244



From fedora-extras-commits at redhat.com  Fri Sep 16 18:44:13 2005
From: fedora-extras-commits at redhat.com (Chris Wright (chrisw))
Date: Fri, 16 Sep 2005 14:44:13 -0400
Subject: rpms/git-core/FC-4 .cvsignore, 1.2, 1.3 git-core.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <200509161844.j8GIiDc3009374@cvs-int.fedora.redhat.com>

Author: chrisw

Update of /cvs/extras/rpms/git-core/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9331/FC-4

Modified Files:
	.cvsignore git-core.spec sources 
Log Message:
auto-import git-core-0.99.6-1 on branch FC-4 from git-core-0.99.6-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/git-core/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	30 Aug 2005 00:37:24 -0000	1.2
+++ .cvsignore	16 Sep 2005 18:44:11 -0000	1.3
@@ -1 +1 @@
-git-core-0.99.4.tar.gz
+git-core-0.99.6.tar.gz


Index: git-core.spec
===================================================================
RCS file: /cvs/extras/rpms/git-core/FC-4/git-core.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- git-core.spec	30 Aug 2005 00:37:24 -0000	1.1
+++ git-core.spec	16 Sep 2005 18:44:11 -0000	1.2
@@ -1,7 +1,7 @@
 # Pass --without docs to rpmbuild if you don't want the documetnation
 Name: 		git-core
-Version: 	0.99.4
-Release: 	4%{?dist}
+Version: 	0.99.6
+Release: 	1%{?dist}
 Summary:  	Git core and tools
 License: 	GPL
 Group: 		Development/Tools
@@ -24,12 +24,11 @@
 
 %build
 make COPTS="$RPM_OPT_FLAGS" prefix=%{_prefix} all %{!?_without_docs: doc}
-make COPTS="$RPM_OPT_FLAGS" -C tools all
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make dest=$RPM_BUILD_ROOT prefix=%{_prefix} mandir=%{_mandir} \
-     install install-tools %{!?_without_docs: install-doc}
+make DESTDIR=$RPM_BUILD_ROOT prefix=%{_prefix} mandir=%{_mandir} \
+     install %{!?_without_docs: install-doc}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -44,6 +43,9 @@
 %{!?_without_docs: %{_mandir}/man7/*.7.gz}
 
 %changelog
+* Fri Sep 16 2005 Chris Wright  0.99.6-1
+- update to 0.99.6
+
 * Thu Aug 18 2005 Chris Wright  0.99.4-4
 - drop sh_utils, sh-utils, diffutils, mktemp, and openssl Requires
 - use RPM_OPT_FLAGS in spec file, drop patch0


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/git-core/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	30 Aug 2005 00:37:24 -0000	1.2
+++ sources	16 Sep 2005 18:44:11 -0000	1.3
@@ -1 +1 @@
-06935e265e7a556d8819a097dcb44f35  git-core-0.99.4.tar.gz
+ca2f17bc1550909a2675386e8be46f0f  git-core-0.99.6.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep 16 18:53:03 2005
From: fedora-extras-commits at redhat.com (Chris Wright (chrisw))
Date: Fri, 16 Sep 2005 14:53:03 -0400
Subject: owners owners.list,1.222,1.223
Message-ID: <200509161853.j8GIr3hA009572@cvs-int.fedora.redhat.com>

Author: chrisw

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9553

Modified Files:
	owners.list 
Log Message:
Add asciidoc to owners.list



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.222
retrieving revision 1.223
diff -u -r1.222 -r1.223
--- owners.list	16 Sep 2005 18:24:16 -0000	1.222
+++ owners.list	16 Sep 2005 18:53:01 -0000	1.223
@@ -33,6 +33,7 @@
 Fedora Extras|apt|Debian's Advanced Packaging Tool with RPM support|pmatilai at laiskiainen.org|extras-qa at fedoraproject.org|
 Fedora Extras|aqhbci-qt-tools|Setup wizard and debugger for the HBCI backend for the Aqbanking library|notting at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|arc|Arc archiver|Nicolas.Mailhot at laPoste.net|extras-qa at fedoraproject.org|
+Fedora Extras|asciidoc|AsciiDoc text document fomatter|chrisw at osdl.org|extras-qa at fedoraproject.org|
 Fedora Extras|aterm|Aterm (Afterstep XVT) - a VT102 emulator for the X window system|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|athcool|Enables/disables Powersaving mode for AMD processors|gajownik at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|atitvout|ATI Rage/Radeon TV Out configuration program|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Fri Sep 16 18:55:52 2005
From: fedora-extras-commits at redhat.com (Chris Wright (chrisw))
Date: Fri, 16 Sep 2005 14:55:52 -0400
Subject: owners owners.list,1.223,1.224
Message-ID: <200509161855.j8GItqCd009630@cvs-int.fedora.redhat.com>

Author: chrisw

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9607

Modified Files:
	owners.list 
Log Message:
Add cogito to owners.list



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.223
retrieving revision 1.224
diff -u -r1.223 -r1.224
--- owners.list	16 Sep 2005 18:53:01 -0000	1.223
+++ owners.list	16 Sep 2005 18:55:50 -0000	1.224
@@ -88,6 +88,7 @@
 Fedora Extras|clamav|End-user tools for the Clam Antivirus scanner|enrico.scholz at informatik.tu-chemnitz.de|extras-qa at fedoraproject.org|
 Fedora Extras|clisp|Common Lisp (ANSI CL) implementation|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|cln|Class Library for Numbers|qspencer at ieee.org|extras-qa at fedoraproject.org|
+Fedora Extras|cogito|Cogito SCM based on git-core|chrisw at osdl.org|extras-qa at fedoraproject.org|
 Fedora Extras|Coin2|A high-level 3D visualization library|rc040203 at freenet.de|extras-qa at fedoraproject.org|
 Fedora Extras|colordiff|Color terminal highlighter for diff files|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|comical|GUI comic book viewer|tcallawa at redhat.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Fri Sep 16 19:15:47 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri, 16 Sep 2005 15:15:47 -0400
Subject: rpms/sbcl/devel sbcl.sh,1.3,1.4 sbcl.spec,1.10,1.11
Message-ID: <200509161915.j8GJFl9q011146@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/sbcl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11125

Modified Files:
	sbcl.sh sbcl.spec 
Log Message:
* Fri Sep 16 2005 Rex Dieter  0.9.4-14
- re-enable ppc
- drop Req: setarch
- drop extraneous app-wrapper bits



Index: sbcl.sh
===================================================================
RCS file: /cvs/extras/rpms/sbcl/devel/sbcl.sh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sbcl.sh	13 Sep 2005 16:50:44 -0000	1.3
+++ sbcl.sh	16 Sep 2005 19:15:45 -0000	1.4
@@ -1,8 +1,8 @@
 #!/bin/sh
 
 # Source global config, if it exists
-if [ -f /etc/sysconfig/sbcl ]; then
-  source /etc/sysconfig/sbcl
+if [  -f /etc/sbcl.conf ]; then
+  source /etc/sbcl.conf
 fi
 
 exec ${SBCL_HOME}/sbcl ${1+"$@"}


Index: sbcl.spec
===================================================================
RCS file: /cvs/extras/rpms/sbcl/devel/sbcl.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sbcl.spec	13 Sep 2005 19:03:04 -0000	1.10
+++ sbcl.spec	16 Sep 2005 19:15:45 -0000	1.11
@@ -9,7 +9,6 @@
 
 %if "%{?fedora}" >= "3"
 BuildRequires:setarch
-Requires:setarch
 %define setarch setarch %{_target_cpu}
 %endif
 
@@ -17,28 +16,22 @@
 %define setarch setarch %{_target_cpu} -R
 %endif
 
-%if "%{?rhel}" >= "4"
+%if "%{?rhel}" >= "3"
 BuildRequires:setarch
-Requires:setarch
 %define setarch setarch %{_target_cpu}
 %endif
 
 Name: 	 sbcl
 Summary: Steel Bank Common Lisp
 Version: 0.9.4
-Release: 13%{?dist}
+Release: 14%{?dist}
 
 License: BSD/MIT
 Group: 	 Development/Languages
 URL:	 http://sbcl.sourceforge.net/
 Source0:  http://dl.sourceforge.net/sourceforge/sbcl/sbcl-%{version}-source.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-ExclusiveArch: %{ix86} x86_64
-
-# App-wrapper
-Source1: sbcl.sh
-# /etc/sysconfig/sbcl
-Source2: sbcl.sysconfig
+ExclusiveArch: %{ix86} x86_64 ppc 
 
 %if "%{?sbcl_bootstrap}" == "%{nil}"
 # local Bootstrap binaries
@@ -148,14 +141,6 @@
 # (may) still need setarch if using ADDR_NO_RANDOMIZE-proc patch
 sh ./install.sh
 
-# app-wrapper 
-%if 0
-mv $RPM_BUILD_ROOT%{_bindir}/sbcl $RPM_BUILD_ROOT%{_libdir}/sbcl/sbcl
-install -p -m755 -D %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/sbcl
-install -p -m644 -D %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/sbcl
-#{?setarch:echo "SBCL_SETARCH=\"%{setarch}\"|" >> $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/sbcl 
-%endif
-
 ## Unpackaged files
 rm -rf $RPM_BUILD_ROOT%{_docdir}/sbcl
 rm -f  $RPM_BUILD_ROOT%{_infodir}/dir
@@ -192,6 +177,11 @@
 
 
 %changelog
+* Fri Sep 16 2005 Rex Dieter  0.9.4-14
+- re-enable ppc
+- drop Req: setarch
+- drop extraneous app-wrapper bits
+
 * Tue Sep 13 2005 Rex Dieter  0.9.4-13
 - don't enable sb-thread
 



From fedora-extras-commits at redhat.com  Fri Sep 16 19:22:20 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri, 16 Sep 2005 15:22:20 -0400
Subject: rpms/sbcl/FC-3 sbcl.spec, 1.9, 1.10 sbcl.sh, 1.3,
	NONE sbcl.sysconfig, 1.1, NONE
Message-ID: <200509161922.j8GJMKLU011319@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/sbcl/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11273/FC-3

Modified Files:
	sbcl.spec 
Removed Files:
	sbcl.sh sbcl.sysconfig 
Log Message:
* Fri Sep 16 2005 Rex Dieter  0.9.4-14
- re-enable ppc
- drop Req: setarch
- drop extraneous app-wrapper bits

* Tue Sep 13 2005 Rex Dieter  0.9.4-13
- don't enable sb-thread



Index: sbcl.spec
===================================================================
RCS file: /cvs/extras/rpms/sbcl/FC-3/sbcl.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sbcl.spec	13 Sep 2005 17:04:26 -0000	1.9
+++ sbcl.spec	16 Sep 2005 19:22:18 -0000	1.10
@@ -9,7 +9,6 @@
 
 %if "%{?fedora}" >= "3"
 BuildRequires:setarch
-Requires:setarch
 %define setarch setarch %{_target_cpu}
 %endif
 
@@ -17,28 +16,22 @@
 %define setarch setarch %{_target_cpu} -R
 %endif
 
-%if "%{?rhel}" >= "4"
+%if "%{?rhel}" >= "3"
 BuildRequires:setarch
-Requires:setarch
 %define setarch setarch %{_target_cpu}
 %endif
 
 Name: 	 sbcl
 Summary: Steel Bank Common Lisp
 Version: 0.9.4
-Release: 12%{?dist}
+Release: 14%{?dist}
 
 License: BSD/MIT
 Group: 	 Development/Languages
 URL:	 http://sbcl.sourceforge.net/
 Source0:  http://dl.sourceforge.net/sourceforge/sbcl/sbcl-%{version}-source.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-ExclusiveArch: %{ix86} x86_64
-
-# App-wrapper
-Source1: sbcl.sh
-# /etc/sysconfig/sbcl
-Source2: sbcl.sysconfig
+ExclusiveArch: %{ix86} x86_64 ppc 
 
 %if "%{?sbcl_bootstrap}" == "%{nil}"
 # local Bootstrap binaries
@@ -97,7 +90,7 @@
 #define kernel_ver %(uname -r | cut -d- -f1 | cut -d. -f-2 )
 #if "%{?kernel_ver}" >= "2.6"
 %ifarch %{ix86} x86_64
-sed -i -e "s|; :sb-thread|:sb-thread|" base-target-features.lisp-expr
+#sed -i -e "s|; :sb-thread|:sb-thread|" base-target-features.lisp-expr
 %endif
 #endif
 
@@ -148,14 +141,6 @@
 # (may) still need setarch if using ADDR_NO_RANDOMIZE-proc patch
 sh ./install.sh
 
-# app-wrapper 
-%if 0
-mv $RPM_BUILD_ROOT%{_bindir}/sbcl $RPM_BUILD_ROOT%{_libdir}/sbcl/sbcl
-install -p -m755 -D %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/sbcl
-install -p -m644 -D %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/sbcl
-#{?setarch:echo "SBCL_SETARCH=\"%{setarch}\"|" >> $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/sbcl 
-%endif
-
 ## Unpackaged files
 rm -rf $RPM_BUILD_ROOT%{_docdir}/sbcl
 rm -f  $RPM_BUILD_ROOT%{_infodir}/dir
@@ -192,6 +177,14 @@
 
 
 %changelog
+* Fri Sep 16 2005 Rex Dieter  0.9.4-14
+- re-enable ppc
+- drop Req: setarch
+- drop extraneous app-wrapper bits
+
+* Tue Sep 13 2005 Rex Dieter  0.9.4-13
+- don't enable sb-thread
+
 * Tue Sep 13 2005 Rex Dieter  0.9.4-12
 - omit ppc (for now, broken buildsystem)
 


--- sbcl.sh DELETED ---


--- sbcl.sysconfig DELETED ---



From fedora-extras-commits at redhat.com  Fri Sep 16 19:22:21 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri, 16 Sep 2005 15:22:21 -0400
Subject: rpms/sbcl/devel sbcl.sh,1.4,NONE sbcl.sysconfig,1.1,NONE
Message-ID: <200509161922.j8GJMLjx011330@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/sbcl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11273/devel

Removed Files:
	sbcl.sh sbcl.sysconfig 
Log Message:
* Fri Sep 16 2005 Rex Dieter  0.9.4-14
- re-enable ppc
- drop Req: setarch
- drop extraneous app-wrapper bits

* Tue Sep 13 2005 Rex Dieter  0.9.4-13
- don't enable sb-thread



--- sbcl.sh DELETED ---


--- sbcl.sysconfig DELETED ---



From fedora-extras-commits at redhat.com  Fri Sep 16 19:22:21 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri, 16 Sep 2005 15:22:21 -0400
Subject: rpms/sbcl/FC-4 sbcl.spec, 1.9, 1.10 sbcl.sh, 1.3,
	NONE sbcl.sysconfig, 1.1, NONE
Message-ID: <200509161922.j8GJMLqR011325@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/sbcl/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11273/FC-4

Modified Files:
	sbcl.spec 
Removed Files:
	sbcl.sh sbcl.sysconfig 
Log Message:
* Fri Sep 16 2005 Rex Dieter  0.9.4-14
- re-enable ppc
- drop Req: setarch
- drop extraneous app-wrapper bits

* Tue Sep 13 2005 Rex Dieter  0.9.4-13
- don't enable sb-thread



Index: sbcl.spec
===================================================================
RCS file: /cvs/extras/rpms/sbcl/FC-4/sbcl.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sbcl.spec	13 Sep 2005 17:04:26 -0000	1.9
+++ sbcl.spec	16 Sep 2005 19:22:18 -0000	1.10
@@ -9,7 +9,6 @@
 
 %if "%{?fedora}" >= "3"
 BuildRequires:setarch
-Requires:setarch
 %define setarch setarch %{_target_cpu}
 %endif
 
@@ -17,28 +16,22 @@
 %define setarch setarch %{_target_cpu} -R
 %endif
 
-%if "%{?rhel}" >= "4"
+%if "%{?rhel}" >= "3"
 BuildRequires:setarch
-Requires:setarch
 %define setarch setarch %{_target_cpu}
 %endif
 
 Name: 	 sbcl
 Summary: Steel Bank Common Lisp
 Version: 0.9.4
-Release: 12%{?dist}
+Release: 14%{?dist}
 
 License: BSD/MIT
 Group: 	 Development/Languages
 URL:	 http://sbcl.sourceforge.net/
 Source0:  http://dl.sourceforge.net/sourceforge/sbcl/sbcl-%{version}-source.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-ExclusiveArch: %{ix86} x86_64
-
-# App-wrapper
-Source1: sbcl.sh
-# /etc/sysconfig/sbcl
-Source2: sbcl.sysconfig
+ExclusiveArch: %{ix86} x86_64 ppc 
 
 %if "%{?sbcl_bootstrap}" == "%{nil}"
 # local Bootstrap binaries
@@ -97,7 +90,7 @@
 #define kernel_ver %(uname -r | cut -d- -f1 | cut -d. -f-2 )
 #if "%{?kernel_ver}" >= "2.6"
 %ifarch %{ix86} x86_64
-sed -i -e "s|; :sb-thread|:sb-thread|" base-target-features.lisp-expr
+#sed -i -e "s|; :sb-thread|:sb-thread|" base-target-features.lisp-expr
 %endif
 #endif
 
@@ -148,14 +141,6 @@
 # (may) still need setarch if using ADDR_NO_RANDOMIZE-proc patch
 sh ./install.sh
 
-# app-wrapper 
-%if 0
-mv $RPM_BUILD_ROOT%{_bindir}/sbcl $RPM_BUILD_ROOT%{_libdir}/sbcl/sbcl
-install -p -m755 -D %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/sbcl
-install -p -m644 -D %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/sbcl
-#{?setarch:echo "SBCL_SETARCH=\"%{setarch}\"|" >> $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/sbcl 
-%endif
-
 ## Unpackaged files
 rm -rf $RPM_BUILD_ROOT%{_docdir}/sbcl
 rm -f  $RPM_BUILD_ROOT%{_infodir}/dir
@@ -192,6 +177,14 @@
 
 
 %changelog
+* Fri Sep 16 2005 Rex Dieter  0.9.4-14
+- re-enable ppc
+- drop Req: setarch
+- drop extraneous app-wrapper bits
+
+* Tue Sep 13 2005 Rex Dieter  0.9.4-13
+- don't enable sb-thread
+
 * Tue Sep 13 2005 Rex Dieter  0.9.4-12
 - omit ppc (for now, broken buildsystem)
 


--- sbcl.sh DELETED ---


--- sbcl.sysconfig DELETED ---



From fedora-extras-commits at redhat.com  Fri Sep 16 19:54:37 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri, 16 Sep 2005 15:54:37 -0400
Subject: rpms/sbcl/FC-3 sbcl.spec,1.10,1.11
Message-ID: <200509161955.j8GJt74c011460@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/sbcl/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11407/FC-3

Modified Files:
	sbcl.spec 
Log Message:
* Sat Sep 16 2005 Rex Dieter  0.9.4-15
- disable ppc (probably related to #166347)



Index: sbcl.spec
===================================================================
RCS file: /cvs/extras/rpms/sbcl/FC-3/sbcl.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sbcl.spec	16 Sep 2005 19:22:18 -0000	1.10
+++ sbcl.spec	16 Sep 2005 19:54:35 -0000	1.11
@@ -24,14 +24,14 @@
 Name: 	 sbcl
 Summary: Steel Bank Common Lisp
 Version: 0.9.4
-Release: 14%{?dist}
+Release: 15%{?dist}
 
 License: BSD/MIT
 Group: 	 Development/Languages
 URL:	 http://sbcl.sourceforge.net/
 Source0:  http://dl.sourceforge.net/sourceforge/sbcl/sbcl-%{version}-source.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-ExclusiveArch: %{ix86} x86_64 ppc 
+ExclusiveArch: %{ix86} x86_64
 
 %if "%{?sbcl_bootstrap}" == "%{nil}"
 # local Bootstrap binaries
@@ -177,6 +177,9 @@
 
 
 %changelog
+* Sat Sep 16 2005 Rex Dieter  0.9.4-15
+- disable ppc (probably related to #166347)
+
 * Fri Sep 16 2005 Rex Dieter  0.9.4-14
 - re-enable ppc
 - drop Req: setarch



From fedora-extras-commits at redhat.com  Fri Sep 16 19:54:38 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri, 16 Sep 2005 15:54:38 -0400
Subject: rpms/sbcl/devel sbcl.spec,1.11,1.12
Message-ID: <200509161955.j8GJt8ZM011464@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/sbcl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11407/devel

Modified Files:
	sbcl.spec 
Log Message:
* Sat Sep 16 2005 Rex Dieter  0.9.4-15
- disable ppc (probably related to #166347)



Index: sbcl.spec
===================================================================
RCS file: /cvs/extras/rpms/sbcl/devel/sbcl.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sbcl.spec	16 Sep 2005 19:15:45 -0000	1.11
+++ sbcl.spec	16 Sep 2005 19:54:36 -0000	1.12
@@ -24,14 +24,14 @@
 Name: 	 sbcl
 Summary: Steel Bank Common Lisp
 Version: 0.9.4
-Release: 14%{?dist}
+Release: 15%{?dist}
 
 License: BSD/MIT
 Group: 	 Development/Languages
 URL:	 http://sbcl.sourceforge.net/
 Source0:  http://dl.sourceforge.net/sourceforge/sbcl/sbcl-%{version}-source.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-ExclusiveArch: %{ix86} x86_64 ppc 
+ExclusiveArch: %{ix86} x86_64
 
 %if "%{?sbcl_bootstrap}" == "%{nil}"
 # local Bootstrap binaries
@@ -177,6 +177,9 @@
 
 
 %changelog
+* Sat Sep 16 2005 Rex Dieter  0.9.4-15
+- disable ppc (probably related to #166347)
+
 * Fri Sep 16 2005 Rex Dieter  0.9.4-14
 - re-enable ppc
 - drop Req: setarch



From fedora-extras-commits at redhat.com  Fri Sep 16 19:54:37 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri, 16 Sep 2005 15:54:37 -0400
Subject: rpms/sbcl/FC-4 sbcl.spec,1.10,1.11
Message-ID: <200509161955.j8GJt8Fk011463@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/sbcl/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11407/FC-4

Modified Files:
	sbcl.spec 
Log Message:
* Sat Sep 16 2005 Rex Dieter  0.9.4-15
- disable ppc (probably related to #166347)



Index: sbcl.spec
===================================================================
RCS file: /cvs/extras/rpms/sbcl/FC-4/sbcl.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sbcl.spec	16 Sep 2005 19:22:18 -0000	1.10
+++ sbcl.spec	16 Sep 2005 19:54:35 -0000	1.11
@@ -24,14 +24,14 @@
 Name: 	 sbcl
 Summary: Steel Bank Common Lisp
 Version: 0.9.4
-Release: 14%{?dist}
+Release: 15%{?dist}
 
 License: BSD/MIT
 Group: 	 Development/Languages
 URL:	 http://sbcl.sourceforge.net/
 Source0:  http://dl.sourceforge.net/sourceforge/sbcl/sbcl-%{version}-source.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-ExclusiveArch: %{ix86} x86_64 ppc 
+ExclusiveArch: %{ix86} x86_64
 
 %if "%{?sbcl_bootstrap}" == "%{nil}"
 # local Bootstrap binaries
@@ -177,6 +177,9 @@
 
 
 %changelog
+* Sat Sep 16 2005 Rex Dieter  0.9.4-15
+- disable ppc (probably related to #166347)
+
 * Fri Sep 16 2005 Rex Dieter  0.9.4-14
 - re-enable ppc
 - drop Req: setarch



From fedora-extras-commits at redhat.com  Fri Sep 16 20:13:57 2005
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Fri, 16 Sep 2005 16:13:57 -0400
Subject: rpms/perl-DateTime - New directory
Message-ID: <200509162013.j8GKDvb1013083@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-DateTime
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13059/perl-DateTime

Log Message:
Directory /cvs/extras/rpms/perl-DateTime added to the repository




From fedora-extras-commits at redhat.com  Fri Sep 16 20:13:57 2005
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Fri, 16 Sep 2005 16:13:57 -0400
Subject: rpms/perl-DateTime/devel - New directory
Message-ID: <200509162014.j8GKDvnm013088@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-DateTime/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13059/perl-DateTime/devel

Log Message:
Directory /cvs/extras/rpms/perl-DateTime/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Sep 16 20:14:18 2005
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Fri, 16 Sep 2005 16:14:18 -0400
Subject: rpms/perl-DateTime Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200509162014.j8GKEINV013133@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-DateTime
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13104

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-DateTime


--- NEW FILE Makefile ---
# Top level Makefile for module perl-DateTime
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Fri Sep 16 20:14:19 2005
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Fri, 16 Sep 2005 16:14:19 -0400
Subject: rpms/perl-DateTime/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200509162014.j8GKEJZo013138@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-DateTime/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13104/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-DateTime


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Fri Sep 16 20:15:08 2005
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Fri, 16 Sep 2005 16:15:08 -0400
Subject: rpms/perl-DateTime/devel perl-DateTime.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200509162015.j8GKF8JR013216@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-DateTime/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13177/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-DateTime.spec 
Log Message:
auto-import perl-DateTime-0.2901-2 on branch devel from perl-DateTime-0.2901-2.src.rpm


--- NEW FILE perl-DateTime.spec ---
%define DTTimeZone_version 0.37
%define DTLocale_version 0.22

Name:           perl-DateTime
Version:        0.2901
Release:        2%{?dist}
Summary:        DateTime Perl module
License:        GPL or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/DateTime/
Source0:        http://www.cpan.org/modules/by-module/DateTime/DateTime-0.2901.tar.gz
Source1:        http://www.cpan.org/modules/by-module/DateTime/DateTime-TimeZone-%{DTTimeZone_version}.tar.gz
Source2:        http://www.cpan.org/modules/by-module/DateTime/DateTime-Locale-%{DTLocale_version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  perl(Module::Build)
BuildRequires:  perl(Params::Validate) >= 0.76
BuildRequires:  perl(Class::Singleton) >= 1.03
BuildRequires:  perl(Pod::Man) >= 1.14
BuildRequires:  perl(File::Find::Rule)
BuildRequires:  perl(Test::Pod)
Requires:       perl(Params::Validate) >= 0.76
Requires:       perl(Class::Singleton) >= 1.03
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
Provides:       perl-DateTime-TimeZone = %{DTTimeZone_version}
Provides:       perl-DateTime-Locale = %{DTLocale_version}
Provides:       perl(DateTime::TimeZoneCatalog)
Provides:       perl(DateTimePP)
Provides:       perl(DateTimePPExtra)

%description
The DateTime.pm module aims to provide a complete, correct, and easy to use
date/time object implementation. Currently it handles many date
calculations, date math (addition and subtraction), and provides convenient
methods for retrieving portions of a date/time.

%prep
%setup -q -T -c -n DateTimeBundle -a 0
%setup -q -T -D -n DateTimeBundle -a 1
%setup -q -T -D -n DateTimeBundle -a 2

cat > filter-provides.sh << EOF
#!/bin/sh
# Remove redundant unversioned provides of perl(DateTime) and perl(DateTime::TimeZone)
exec %{__perl_provides} $* | egrep -v '^perl[(]DateTime(::TimeZone)?[)]$'
EOF
%define __perl_provides %{_builddir}/DateTimeBundle/filter-provides.sh
chmod 755 filter-provides.sh

%build
cd DateTime-Locale-%{DTLocale_version}
%{__perl} Build.PL installdirs=vendor
./Build
cd -

cd DateTime-TimeZone-%{DTTimeZone_version}
%{__perl} Build.PL installdirs=vendor
./Build
cd -

cd DateTime-%{version}
PERLLIB=../DateTime-Locale-%{DTLocale_version}/blib/lib
PERLLIB=$PERLLIB:../DateTime-TimeZone-%{DTTimeZone_version}/blib/lib
export PERLLIB
%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="%{optflags}"
make %{?_smp_mflags}
cd -

%install
rm -rf %{buildroot}

cd DateTime-Locale-%{DTLocale_version}
./Build install destdir=%{buildroot}
cd -

cd DateTime-TimeZone-%{DTTimeZone_version}
./Build install destdir=%{buildroot}
cd -

cd DateTime-%{version}
make pure_install PERL_INSTALL_ROOT=%{buildroot}
cd -

find %{buildroot} -type f -name .packlist -exec rm -f {} \;
find %{buildroot} -type f -name '*.bs' -size 0 -exec rm -f {} \;
find %{buildroot} -type d -depth -exec rmdir {} 2>/dev/null \;

chmod -R u+rwX,go+rX,go-w %{buildroot}/*

# Move documentation into bundle area
mkdir DT::Locale DT::TimeZone
mv DateTime-%{version}/{CREDITS,Changes,LICENSE,README,TODO} .
mv DateTime-Locale-%{DTLocale_version}/{Changes,LICENSE.icu} DT::Locale
mv DateTime-TimeZone-%{DTTimeZone_version}/{Changes,README} DT::TimeZone

%check
# Have to use PERL5LIB rather than PERLLIB here because the test scripts
# clobber PERLLIB
PERL5LIB=$(pwd)/DateTime-%{version}/blib/arch:$(pwd)/DateTime-%{version}/blib/lib
PERL5LIB=$PERL5LIB:$(pwd)/DateTime-Locale-%{DTLocale_version}/blib/lib
PERL5LIB=$PERL5LIB:$(pwd)/DateTime-TimeZone-%{DTTimeZone_version}/blib/lib
export PERL5LIB

cd DateTime-Locale-%{DTLocale_version}
./Build test
cd -

cd DateTime-TimeZone-%{DTTimeZone_version}
./Build test
cd -

make -C DateTime-%{version} test

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,0755)
%doc CREDITS Changes LICENSE README TODO DT::Locale DT::TimeZone
%{_mandir}/man3/*
# DateTime::TimeZone and DateTime::Locale modules are arch-independent
%{perl_vendorlib}/DateTime/
# DateTime module is arch-specific
%{perl_vendorarch}/auto/*
%{perl_vendorarch}/DateTime/
%{perl_vendorarch}/DateTime*.pm

%changelog
* Fri Sep 16 2005 Paul Howarth  0.2901-2
- Unpack each tarball only once
- Use Module::Build's build script where available
- Help each module find the others when needed
- Clean up files list
- Include additional documentation from DT::Locale & DT::TimeZone
- Add BR: perl(File::Find::Rule) & perl(Test::Pod) to improve test coverage
- Remove unversioned provides of perl(DateTime) & perl(DateTime::TimeZone)

* Wed Aug 31 2005 Steven Pritchard  0.2901-1
- Specfile autogenerated.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-DateTime/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	16 Sep 2005 20:14:17 -0000	1.1
+++ .cvsignore	16 Sep 2005 20:15:06 -0000	1.2
@@ -0,0 +1,3 @@
+DateTime-0.2901.tar.gz
+DateTime-Locale-0.22.tar.gz
+DateTime-TimeZone-0.37.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-DateTime/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	16 Sep 2005 20:14:17 -0000	1.1
+++ sources	16 Sep 2005 20:15:06 -0000	1.2
@@ -0,0 +1,3 @@
+f96816e634700ae3c8bd849f97856861  DateTime-0.2901.tar.gz
+bcf9fa78efa8d00fad1293b9d860ce75  DateTime-Locale-0.22.tar.gz
+1adf3f14eda8faccaf5564437eadcfd5  DateTime-TimeZone-0.37.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep 16 20:15:03 2005
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Fri, 16 Sep 2005 16:15:03 -0400
Subject: rpms/perl-DateTime import.log,1.1,1.2
Message-ID: <200509162015.j8GKFXV9013220@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-DateTime
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13177

Modified Files:
	import.log 
Log Message:
auto-import perl-DateTime-0.2901-2 on branch devel from perl-DateTime-0.2901-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-DateTime/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	16 Sep 2005 20:14:16 -0000	1.1
+++ import.log	16 Sep 2005 20:15:01 -0000	1.2
@@ -0,0 +1 @@
+perl-DateTime-0_2901-2:HEAD:perl-DateTime-0.2901-2.src.rpm:1126901693



From fedora-extras-commits at redhat.com  Fri Sep 16 20:17:50 2005
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Fri, 16 Sep 2005 16:17:50 -0400
Subject: rpms/perl-HTML-Mason/FC-3 perl-HTML-Mason.spec,1.1,1.2
Message-ID: <200509162017.j8GKHoLL013307@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-HTML-Mason/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13259/FC-3

Modified Files:
	perl-HTML-Mason.spec 
Log Message:
Improve Summary (Ville Skytt??).


Index: perl-HTML-Mason.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-HTML-Mason/FC-3/perl-HTML-Mason.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-HTML-Mason.spec	16 Sep 2005 02:09:55 -0000	1.1
+++ perl-HTML-Mason.spec	16 Sep 2005 20:17:48 -0000	1.2
@@ -1,7 +1,7 @@
 Name:           perl-HTML-Mason
 Version:        1.3101
 Release:        3%{?dist}
-Summary:        HTML::Mason Perl module
+Summary:        Powerful Perl-based web site development and delivery engine
 License:        GPL or Artistic
 Group:          Development/Libraries
 URL:            http://www.masonhq.com/



From fedora-extras-commits at redhat.com  Fri Sep 16 20:17:51 2005
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Fri, 16 Sep 2005 16:17:51 -0400
Subject: rpms/perl-HTML-Mason/FC-4 perl-HTML-Mason.spec,1.1,1.2
Message-ID: <200509162017.j8GKHpHU013313@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-HTML-Mason/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13259/FC-4

Modified Files:
	perl-HTML-Mason.spec 
Log Message:
Improve Summary (Ville Skytt??).


Index: perl-HTML-Mason.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-HTML-Mason/FC-4/perl-HTML-Mason.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-HTML-Mason.spec	16 Sep 2005 02:09:55 -0000	1.1
+++ perl-HTML-Mason.spec	16 Sep 2005 20:17:49 -0000	1.2
@@ -1,7 +1,7 @@
 Name:           perl-HTML-Mason
 Version:        1.3101
 Release:        3%{?dist}
-Summary:        HTML::Mason Perl module
+Summary:        Powerful Perl-based web site development and delivery engine
 License:        GPL or Artistic
 Group:          Development/Libraries
 URL:            http://www.masonhq.com/



From fedora-extras-commits at redhat.com  Fri Sep 16 20:17:51 2005
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Fri, 16 Sep 2005 16:17:51 -0400
Subject: rpms/perl-HTML-Mason/devel perl-HTML-Mason.spec,1.1,1.2
Message-ID: <200509162017.j8GKHp4M013319@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-HTML-Mason/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13259/devel

Modified Files:
	perl-HTML-Mason.spec 
Log Message:
Improve Summary (Ville Skytt??).


Index: perl-HTML-Mason.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-HTML-Mason/devel/perl-HTML-Mason.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-HTML-Mason.spec	16 Sep 2005 02:09:55 -0000	1.1
+++ perl-HTML-Mason.spec	16 Sep 2005 20:17:49 -0000	1.2
@@ -1,7 +1,7 @@
 Name:           perl-HTML-Mason
 Version:        1.3101
 Release:        3%{?dist}
-Summary:        HTML::Mason Perl module
+Summary:        Powerful Perl-based web site development and delivery engine
 License:        GPL or Artistic
 Group:          Development/Libraries
 URL:            http://www.masonhq.com/



From fedora-extras-commits at redhat.com  Fri Sep 16 20:23:03 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri, 16 Sep 2005 16:23:03 -0400
Subject: rpms/maxima/devel maxima-5.9.2-htmlview.patch, NONE, 1.1 .cvsignore,
	1.2, 1.3 maxima.spec, 1.5, 1.6 sources, 1.2,
	1.3 maxima-5.9.0-htmlview.patch, 1.1, NONE
Message-ID: <200509162023.j8GKN3S9013367@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/maxima/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13341

Modified Files:
	.cvsignore maxima.spec sources 
Added Files:
	maxima-5.9.2-htmlview.patch 
Removed Files:
	maxima-5.9.0-htmlview.patch 
Log Message:
* Fri Sep 16 2005 Rex Dieter  5.9.1.9rc1-2
- -runtime-sbcl: with sbcl_ver macro
- use versioned maxima-exec Obsoletes.

* Mon Sep 12 2005 Rex Dieter  5.9.1.9rc1-1
- 5.9.1.9rc1


maxima-5.9.2-htmlview.patch:

--- NEW FILE maxima-5.9.2-htmlview.patch ---
--- maxima/interfaces/xmaxima/Tkmaxima/Menu.tcl.htmlview	2004-10-16 10:37:53.000000000 -0500
+++ maxima/interfaces/xmaxima/Tkmaxima/Menu.tcl	2005-08-22 07:27:23.000000000 -0500
@@ -215,9 +215,9 @@
 	}
     } else {
 	
-	set selectedbrowser mozilla
+	set selectedbrowser htmlview 
 
-	foreach b { mozilla konqueror epiphany firefox netscape } {
+	foreach b { htmlview firefox konqueror mozilla epiphany netscape } {
 	    if { ! [catch {exec which $b} ] } {
 		set selectedbrowser $b
 		break } }


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/maxima/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	6 Sep 2005 17:56:03 -0000	1.2
+++ .cvsignore	16 Sep 2005 20:23:00 -0000	1.3
@@ -1,3 +1,3 @@
-macref.pdf
-maxima-5.9.1.tar.gz
+maxima-5.9.1.9rc1.tar.gz
 maximabook-19-Sept-2004.pdf
+macref.pdf


Index: maxima.spec
===================================================================
RCS file: /cvs/extras/rpms/maxima/devel/maxima.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- maxima.spec	12 Sep 2005 12:29:32 -0000	1.5
+++ maxima.spec	16 Sep 2005 20:23:00 -0000	1.6
@@ -6,19 +6,21 @@
 %define _without_sbcl 1
 
 #define cvs .20050908
-#define beta cvs
+%define beta rc1 
 
 Summary: Symbolic Computation Program
 Name: 	 maxima
-Version: 5.9.1%{?beta}
+Version: 5.9.1.9rc1
 
-Release: 5%{?dist} 
+Release: 2%{?dist} 
 License: GPL
 Group:	 Applications/Engineering 
 URL: 	 http://maxima.sourceforge.net/
-Source:  http://dl.sourceforge.net/sourceforge/maxima/maxima-%{version}%{?cvs}.tar.gz
+#Source:  http://dl.sourceforge.net/sourceforge/maxima/maxima-%{version}%{?cvs}.tar.gz
+Source:	 http://maxima.sf.net/tmp-release/maxima-5.9.1.9rc1.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-ExcludeArch: ppc ppc64
+# add ppc (and maybe ppc64)  when clisp builds again on ppc (http://bugzilla.redhat.com/bugzilla/166347) 
+ExclusiveArch: %{ix86} x86_64 
 
 Source1: maxima.png
 Source2: xmaxima.desktop
@@ -28,14 +30,14 @@
 Source10: http://starship.python.net/crew/mike/TixMaxima/macref.pdf
 Source11: http://maxima.sourceforge.net/docs/maximabook/maximabook-19-Sept-2004.pdf
 
-Patch1: maxima-5.9.0-htmlview.patch
+Patch1: maxima-5.9.2-htmlview.patch
 # (mysterious?) xemacs patch
 Patch2: maxima.el-xemacs.patch
 
 # Inhibit automatic compressing of info files. Compressed info
 # files break maxima's internal help.
 %define __spec_install_post %{nil} 
-# debuginfo is empty/blank, disable
+# debuginfo is empty/blank (when using gcl?), disable
 %define debug_package   %{nil}
 
 BuildRequires: texinfo
@@ -43,8 +45,7 @@
 BuildRequires: desktop-file-utils
 # /usr/bin/wish
 BuildRequires: tk
-# cvs
-%{?cvs:BuildRequires: autoconf automake}
+%{?beta:BuildRequires: autoconf automake}
 
 Requires: %{name}-runtime = %{version}
 Requires: gnuplot
@@ -79,11 +80,11 @@
 %package runtime-clisp
 Summary: Maxima compiled with clisp
 Group:	 Applications/Engineering
-BuildRequires: clisp
+BuildRequires: clisp-devel
 %define clisp_ver %{expand:%%(rpm -q --qf '%%{VERSION}' clisp )}
 Requires: clisp >= %{clisp_ver}
 Requires: %{name} = %{version}
-Obsoletes: maxima-exec-lisp
+Obsoletes: maxima-exec-clisp < %{version}-%{release}
 Provides: %{name}-runtime = %{version}
 %description runtime-clisp
 Maxima compiled with Common Lisp (clisp) 
@@ -94,10 +95,8 @@
 Summary: Maxima compiled with CMUCL
 Group:	 Applications/Engineering 
 BuildRequires: cmucl 
-#define cmucl_ver %{expand:%%(rpm -q --qf '%%{VERSION}' cmucl )}
-#Requires: cmucl >= %{cmucl_ver}
 Requires:  %{name} = %{version}
-Obsoletes: maxima-exec-cmucl 
+Obsoletes: maxima-exec-cmucl < %{version}-%{release}
 Provides:  %{name}-runtime = %{version}
 %description runtime-cmucl
 Maxima compiled with CMU Common Lisp (cmucl) 
@@ -107,9 +106,9 @@
 %package runtime-gcl
 Summary: Maxima compiled with GCL
 Group:   Applications/Engineering
-BuildRequires: gcl
+BuildRequires: gcl-devel
 Requires:  %{name} = %{version}
-Obsoletes: maxima-exec-gcl 
+Obsoletes: maxima-exec-gcl < %{version}-%{release}
 Provides:  %{name}-runtime = %{version}
 %description runtime-gcl
 Maxima compiled with Gnu Common Lisp (gcl)
@@ -120,10 +119,10 @@
 Summary: Maxima compiled with SBCL 
 Group:   Applications/Engineering
 BuildRequires: sbcl 
-%define sbcl_ver %{expand:%%(rpm -q --qf '%%{version}' sbcl )}
+%define sbcl_ver %{expand:%%(rpm -q --qf '%%{VERSION}' sbcl )}
 Requires: sbcl >= %{sbcl_ver}
 Requires: %{name} = %{version}
-#Obsoletes: maxima-exec-sbcl
+Obsoletes: maxima-exec-sbcl < %{version}-%{release}
 Provides: %{name}-runtime = %{version}
 %description runtime-sbcl
 Maxima compiled with Steel Bank Common Lisp (sbcl).
@@ -145,16 +144,16 @@
   's/(defcustom\s+maxima-info-index-file\s+)(\S+)/$1\"maxima.info-16\"/' \
   interfaces/emacs/emaxima/maxima.el
 
-#if "%{?cvs:1}" == "1"
-if [ ! -f configure ]; then
+# remove CVS crud
+find -name CVS -type d | xargs rm -r
+
+%if "%{?beta:1}" == "1"
+#if [ ! -f configure ]; then
 aclocal
 automake --add-missing --copy
 autoconf
-fi
-
-# remove CVS crud
-find -name CVS -type d | xargs rm -r
-#endif
+#fi
+%endif
 
 
 %build
@@ -167,7 +166,7 @@
 # docs
 pushd doc
 
- install -p -m644 %{SOURCE11} maximabook/maxima.pdf
+ install -D -p -m644 %{SOURCE11} maximabook/maxima.pdf
 
  pushd info
   texi2dvi -p maxima.texi
@@ -310,6 +309,13 @@
 
 
 %changelog
+* Fri Sep 16 2005 Rex Dieter  5.9.1.9rc1-2
+- -runtime-sbcl: with sbcl_ver macro
+- use versioned maxima-exec Obsoletes.
+
+* Mon Sep 12 2005 Rex Dieter  5.9.1.9rc1-1
+- 5.9.1.9rc1
+
 * Fri Sep 09 2005 Rex Dieter  5.9.1-5
 - add more Obsoletes: maxima-exec- for cleaner upgrade from customized,
   rebuilt upstream rpms.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/maxima/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	6 Sep 2005 17:56:03 -0000	1.2
+++ sources	16 Sep 2005 20:23:00 -0000	1.3
@@ -1,3 +1,3 @@
-c101a1ce604d31b02bbc2f37cced280d  macref.pdf
-659acfad1f61444cf5b38f6c28279d40  maxima-5.9.1.tar.gz
+60e188d2c10515e7dadbc176bd138694  maxima-5.9.1.9rc1.tar.gz
 9faa5a513de43b5e7384216a8783f620  maximabook-19-Sept-2004.pdf
+c101a1ce604d31b02bbc2f37cced280d  macref.pdf


--- maxima-5.9.0-htmlview.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Sep 16 20:36:45 2005
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Fri, 16 Sep 2005 16:36:45 -0400
Subject: owners owners.list,1.224,1.225
Message-ID: <200509162036.j8GKajIB013419@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13400

Modified Files:
	owners.list 
Log Message:
Add perl-DateTime.


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.224
retrieving revision 1.225
diff -u -r1.224 -r1.225
--- owners.list	16 Sep 2005 18:55:50 -0000	1.224
+++ owners.list	16 Sep 2005 20:36:43 -0000	1.225
@@ -622,6 +622,7 @@
 Fedora Extras|perl-Crypt-CBC|Encrypt Data with Cipher Block Chaining Mode|andreas at bawue.net|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Data-Page|Help when paging through sets of results|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Date-Simple|Simple date object for perl|paul at city-fan.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-DateTime|DateTime Perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-DBD-SQLite|Self Contained RDBMS in a DBI Driver|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-DBD-SQLite2|Self Contained RDBMS in a DBI Driver (sqlite 2.x)|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-DBIx-ContextualFetch|Add contextual fetches to DBI|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Fri Sep 16 23:09:32 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri, 16 Sep 2005 19:09:32 -0400
Subject: rpms/netgo - New directory
Message-ID: <200509162309.j8GN9W2C017919@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/netgo
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17899/netgo

Log Message:
Directory /cvs/extras/rpms/netgo added to the repository




From fedora-extras-commits at redhat.com  Fri Sep 16 23:09:33 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri, 16 Sep 2005 19:09:33 -0400
Subject: rpms/netgo/devel - New directory
Message-ID: <200509162309.j8GN9XKj017924@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/netgo/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17899/netgo/devel

Log Message:
Directory /cvs/extras/rpms/netgo/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Sep 16 23:09:53 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri, 16 Sep 2005 19:09:53 -0400
Subject: rpms/netgo Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200509162309.j8GN9rJG017979@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/netgo
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17944

Added Files:
	Makefile import.log 
Log Message:
Setup of module netgo


--- NEW FILE Makefile ---
# Top level Makefile for module netgo
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Fri Sep 16 23:09:54 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri, 16 Sep 2005 19:09:54 -0400
Subject: rpms/netgo/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200509162309.j8GN9sN4017984@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/netgo/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17944/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module netgo


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Fri Sep 16 23:10:26 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri, 16 Sep 2005 19:10:26 -0400
Subject: rpms/netgo/devel netgo.console_apps, NONE, 1.1 netgo.desktop, NONE,
	1.1 netgo.pamd, NONE, 1.1 netgo.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200509162310.j8GNAQ1I018062@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/netgo/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18027/devel

Modified Files:
	.cvsignore sources 
Added Files:
	netgo.console_apps netgo.desktop netgo.pamd netgo.spec 
Log Message:
auto-import netgo-0.5-3 on branch devel from netgo-0.5-3.src.rpm


--- NEW FILE netgo.console_apps ---
USER=root
PROGRAM=/usr/sbin/netgo
SESSION=true


--- NEW FILE netgo.desktop ---
[Desktop Entry]
Name=Netgo
Comment=Network Profile Tool
Icon=/usr/share/pixmaps/netgo.png
Exec=/usr/bin/netgo
StartupNotify=true
Terminal=false
Type=Application
Encoding=UTF-8
Categories=Application;SystemSetup;System;X-Fedora



--- NEW FILE netgo.pamd ---
#%PAM-1.0
auth       sufficient   pam_rootok.so
auth       sufficient   pam_timestamp.so
auth       required     pam_stack.so service=system-auth
session    required     pam_permit.so
session    optional     pam_xauth.so
session    optional     pam_timestamp.so
account    required     pam_permit.so


--- NEW FILE netgo.spec ---
Name:		netgo
Version:	0.5
Release:	3%{?dist}
License:	GPL
Group:		Applications/System
Summary:	Networking profile manager
URL:		http://netgo.hjolug.org/
Source0:	http://netgo.hjolug.org/files/v0.5/netgo-%{version}.tar.gz
Source1:	netgo.console_apps
Source2:	netgo.pamd
Source3:	netgo.desktop
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:	qt-devel, desktop-file-utils
Requires(post): desktop-file-utils
Requires(postun): desktop-file-utils
Requires:	usermode


%description
netGo is a distribution-independent networking tool (written in Qt) for 
changing network settings quickly and easily. It is intended for laptop 
owners, who often need to change network settings when relocating.
It allows you to create profiles that contain the network settings such as the 
IP, netmask, gateway, name servers and wireless options. After creating a 
profile it can be executed with a single click.

%prep
%setup -q

%build
%configure
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make INSTALL_ROOT=$RPM_BUILD_ROOT install
mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/security/console.apps
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/pam.d
cp -a $RPM_BUILD_ROOT%{_datadir}/netgo/icons/globe_32x32.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/netgo.png
install -m0644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/security/console.apps/netgo
install -m0644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/netgo

# We're going to use consolehelper, since this is a GUI app.
rm -rf $RPM_BUILD_ROOT%{_bindir}/netgo
cd $RPM_BUILD_ROOT%{_bindir}/
ln -s consolehelper netgo

mkdir -p $RPM_BUILD_ROOT%{_sbindir}
mv $RPM_BUILD_ROOT%{_datadir}/netgo/netgo-bin $RPM_BUILD_ROOT%{_sbindir}/netgo

desktop-file-install --vendor fedora                            \
        --dir $RPM_BUILD_ROOT%{_datadir}/applications           \
        %{SOURCE3}

%post
update-desktop-database %{_datadir}/applications &> /dev/null

%postun
if [ "$1" = "0" ]; then
  update-desktop-database %{_datadir}/applications &> /dev/null
fi

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc COPYING README
%{_bindir}/netgo
%config(noreplace) %{_sysconfdir}/pam.d/netgo
%config(noreplace) %{_sysconfdir}/security/console.apps/netgo
%{_datadir}/applications/fedora-netgo.desktop
%{_datadir}/pixmaps/netgo.png
%{_datadir}/netgo/
%{_sbindir}/netgo

%changelog
* Sat Sep 17 2005 Christian Iseli  0.5-3
- fix unowned dir

* Fri Sep 16 2005 Tom "spot" Callaway  0.5-2
- move netgo-bin to %%{_sbindir}/netgo

* Sun Sep  4 2005 Tom "spot" Callaway  0.5-1
- initial package for Fedora Extras


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/netgo/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	16 Sep 2005 23:09:51 -0000	1.1
+++ .cvsignore	16 Sep 2005 23:10:24 -0000	1.2
@@ -0,0 +1 @@
+netgo-0.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/netgo/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	16 Sep 2005 23:09:51 -0000	1.1
+++ sources	16 Sep 2005 23:10:24 -0000	1.2
@@ -0,0 +1 @@
+fe62a4035e6449db9761f8724d26d458  netgo-0.5.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep 16 23:10:26 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri, 16 Sep 2005 19:10:26 -0400
Subject: rpms/netgo import.log,1.1,1.2
Message-ID: <200509162310.j8GNAuYl018071@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/netgo
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18027

Modified Files:
	import.log 
Log Message:
auto-import netgo-0.5-3 on branch devel from netgo-0.5-3.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/netgo/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	16 Sep 2005 23:09:51 -0000	1.1
+++ import.log	16 Sep 2005 23:10:24 -0000	1.2
@@ -0,0 +1 @@
+netgo-0_5-3:HEAD:netgo-0.5-3.src.rpm:1126912218



From fedora-extras-commits at redhat.com  Fri Sep 16 23:12:17 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri, 16 Sep 2005 19:12:17 -0400
Subject: owners owners.list,1.225,1.226
Message-ID: <200509162312.j8GNCHdm018328@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18309

Modified Files:
	owners.list 
Log Message:

netgo



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.225
retrieving revision 1.226
diff -u -r1.225 -r1.226
--- owners.list	16 Sep 2005 20:36:43 -0000	1.225
+++ owners.list	16 Sep 2005 23:12:15 -0000	1.226
@@ -519,6 +519,7 @@
 Fedora Extras|nedit|A GUI text editor for systems with X and Motif|jnovy at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|netcdf|Libraries for the Unidata network Common Data Form (NetCDF v3)|ed at eh3.com|extras-qa at fedoraproject.org|
 Fedora Extras|netdiag|Diagnostic program for Ethernet adapters under Linux|anvil at livna.org|extras-qa at fedoraproject.org|
+Fedora Extras|netgo|Networking profile manager|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|nethack|A rogue-like single player dungeon exploration game|lmacken at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|nethack-falconseye|NetHack - Falcon's Eye|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|netmask|Utility for determining network masks|ville.skytta at iki.fi|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Fri Sep 16 23:27:29 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri, 16 Sep 2005 19:27:29 -0400
Subject: rpms/xsupplicant/devel xsupplicant-1.2.1-bz167467.patch, NONE,
	1.1 xsupplicant.spec, 1.6, 1.7
Message-ID: <200509162327.j8GNRTUA018545@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/xsupplicant/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18483/devel

Modified Files:
	xsupplicant.spec 
Added Files:
	xsupplicant-1.2.1-bz167467.patch 
Log Message:

patch to try to resolve bz 167467


xsupplicant-1.2.1-bz167467.patch:

--- NEW FILE xsupplicant-1.2.1-bz167467.patch ---
--- xsupplicant-1.2.1/src/cardif/linux/cardif_linux_rtnetlink.c.BAD	2005-09-16 18:22:29.000000000 -0500
+++ xsupplicant-1.2.1/src/cardif/linux/cardif_linux_rtnetlink.c	2005-09-16 18:22:44.000000000 -0500
@@ -135,7 +135,7 @@
   struct iw_event *iwe=NULL;
   unsigned char flags=0;
   u_char *wpa_ie=NULL, *rsn_ie=NULL, wpa_ie_len=0, rsn_ie_len=0;
-  unsigned int freq;
+  uint16_t freq;
   u_char temp_rsn_len = 0, temp_wpa_len = 0;
 
   tptr = bptr;
--- xsupplicant-1.2.1/doc/xml-userguide/userguide.xml.BAD	2005-09-04 10:28:44.000000000 -0500
+++ xsupplicant-1.2.1/doc/xml-userguide/userguide.xml	2005-09-04 10:28:53.000000000 -0500
@@ -1,6 +1,6 @@
 
 
       


Index: xsupplicant.spec
===================================================================
RCS file: /cvs/extras/rpms/xsupplicant/devel/xsupplicant.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- xsupplicant.spec	4 Sep 2005 21:57:58 -0000	1.6
+++ xsupplicant.spec	16 Sep 2005 23:27:27 -0000	1.7
@@ -1,7 +1,7 @@
 Name:		xsupplicant
 Summary:	Open Source Implementation of IEEE 802.1x
 Version:	1.2.1
-Release:	4%{?dist}
+Release:	5%{?dist}
 License:	GPL
 Group:		System Environment/Base
 URL:		http://www.open1x.org/
@@ -11,6 +11,7 @@
 BuildRequires:	docbook-dtds, docbook-style-dsssl
 Patch0:		xsupplicant-1.2.1-docsfix.patch
 Patch1:		xsupplicant-1.2.1-gcc4-cleanups.patch
+Patch2:		xsupplicant-1.2.1-bz167467.patch
 
 %description
 This software allows a GNU/Linux or BSD workstation to authenticate with
@@ -22,6 +23,7 @@
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 perl -pi.orig -e 's|/lib\b|/%{_lib}|g' configure*
 
@@ -52,6 +54,9 @@
 %{_sbindir}/xsupplicant
 
 %changelog
+* Fri Sep 16 2005 Tom "spot" Callaway  1.2.1-5
+- patch to try to resolve bz 167467
+
 * Sun Sep  4 2005 Tom "spot" Callaway  1.2.1-4
 - use lynx instead of elinks
 



From fedora-extras-commits at redhat.com  Fri Sep 16 23:27:23 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri, 16 Sep 2005 19:27:23 -0400
Subject: rpms/xsupplicant/FC-3 xsupplicant-1.2.1-bz167467.patch, NONE,
	1.1 xsupplicant.spec, 1.6, 1.7
Message-ID: <200509162327.j8GNRrrm018548@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/xsupplicant/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18483/FC-3

Modified Files:
	xsupplicant.spec 
Added Files:
	xsupplicant-1.2.1-bz167467.patch 
Log Message:

patch to try to resolve bz 167467


xsupplicant-1.2.1-bz167467.patch:

--- NEW FILE xsupplicant-1.2.1-bz167467.patch ---
--- xsupplicant-1.2.1/src/cardif/linux/cardif_linux_rtnetlink.c.BAD	2005-09-16 18:22:29.000000000 -0500
+++ xsupplicant-1.2.1/src/cardif/linux/cardif_linux_rtnetlink.c	2005-09-16 18:22:44.000000000 -0500
@@ -135,7 +135,7 @@
   struct iw_event *iwe=NULL;
   unsigned char flags=0;
   u_char *wpa_ie=NULL, *rsn_ie=NULL, wpa_ie_len=0, rsn_ie_len=0;
-  unsigned int freq;
+  uint16_t freq;
   u_char temp_rsn_len = 0, temp_wpa_len = 0;
 
   tptr = bptr;
--- xsupplicant-1.2.1/doc/xml-userguide/userguide.xml.BAD	2005-09-04 10:28:44.000000000 -0500
+++ xsupplicant-1.2.1/doc/xml-userguide/userguide.xml	2005-09-04 10:28:53.000000000 -0500
@@ -1,6 +1,6 @@
 
 
       


Index: xsupplicant.spec
===================================================================
RCS file: /cvs/extras/rpms/xsupplicant/FC-3/xsupplicant.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- xsupplicant.spec	4 Sep 2005 21:57:52 -0000	1.6
+++ xsupplicant.spec	16 Sep 2005 23:27:21 -0000	1.7
@@ -1,7 +1,7 @@
 Name:		xsupplicant
 Summary:	Open Source Implementation of IEEE 802.1x
 Version:	1.2.1
-Release:	4%{?dist}
+Release:	5%{?dist}
 License:	GPL
 Group:		System Environment/Base
 URL:		http://www.open1x.org/
@@ -11,6 +11,7 @@
 BuildRequires:	docbook-dtds, docbook-style-dsssl
 Patch0:		xsupplicant-1.2.1-docsfix.patch
 Patch1:		xsupplicant-1.2.1-gcc4-cleanups.patch
+Patch2:		xsupplicant-1.2.1-bz167467.patch
 
 %description
 This software allows a GNU/Linux or BSD workstation to authenticate with
@@ -22,6 +23,7 @@
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 perl -pi.orig -e 's|/lib\b|/%{_lib}|g' configure*
 
@@ -52,6 +54,9 @@
 %{_sbindir}/xsupplicant
 
 %changelog
+* Fri Sep 16 2005 Tom "spot" Callaway  1.2.1-5
+- patch to try to resolve bz 167467
+
 * Sun Sep  4 2005 Tom "spot" Callaway  1.2.1-4
 - use lynx instead of elinks
 



From fedora-extras-commits at redhat.com  Fri Sep 16 23:27:23 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri, 16 Sep 2005 19:27:23 -0400
Subject: rpms/xsupplicant/FC-4 xsupplicant-1.2.1-bz167467.patch, NONE,
	1.1 xsupplicant.spec, 1.6, 1.7
Message-ID: <200509162327.j8GNRsoR018551@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/xsupplicant/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18483/FC-4

Modified Files:
	xsupplicant.spec 
Added Files:
	xsupplicant-1.2.1-bz167467.patch 
Log Message:

patch to try to resolve bz 167467


xsupplicant-1.2.1-bz167467.patch:

--- NEW FILE xsupplicant-1.2.1-bz167467.patch ---
--- xsupplicant-1.2.1/src/cardif/linux/cardif_linux_rtnetlink.c.BAD	2005-09-16 18:22:29.000000000 -0500
+++ xsupplicant-1.2.1/src/cardif/linux/cardif_linux_rtnetlink.c	2005-09-16 18:22:44.000000000 -0500
@@ -135,7 +135,7 @@
   struct iw_event *iwe=NULL;
   unsigned char flags=0;
   u_char *wpa_ie=NULL, *rsn_ie=NULL, wpa_ie_len=0, rsn_ie_len=0;
-  unsigned int freq;
+  uint16_t freq;
   u_char temp_rsn_len = 0, temp_wpa_len = 0;
 
   tptr = bptr;
--- xsupplicant-1.2.1/doc/xml-userguide/userguide.xml.BAD	2005-09-04 10:28:44.000000000 -0500
+++ xsupplicant-1.2.1/doc/xml-userguide/userguide.xml	2005-09-04 10:28:53.000000000 -0500
@@ -1,6 +1,6 @@
 
 
       


Index: xsupplicant.spec
===================================================================
RCS file: /cvs/extras/rpms/xsupplicant/FC-4/xsupplicant.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- xsupplicant.spec	4 Sep 2005 21:57:53 -0000	1.6
+++ xsupplicant.spec	16 Sep 2005 23:27:21 -0000	1.7
@@ -1,7 +1,7 @@
 Name:		xsupplicant
 Summary:	Open Source Implementation of IEEE 802.1x
 Version:	1.2.1
-Release:	4%{?dist}
+Release:	5%{?dist}
 License:	GPL
 Group:		System Environment/Base
 URL:		http://www.open1x.org/
@@ -11,6 +11,7 @@
 BuildRequires:	docbook-dtds, docbook-style-dsssl
 Patch0:		xsupplicant-1.2.1-docsfix.patch
 Patch1:		xsupplicant-1.2.1-gcc4-cleanups.patch
+Patch2:		xsupplicant-1.2.1-bz167467.patch
 
 %description
 This software allows a GNU/Linux or BSD workstation to authenticate with
@@ -22,6 +23,7 @@
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 perl -pi.orig -e 's|/lib\b|/%{_lib}|g' configure*
 
@@ -52,6 +54,9 @@
 %{_sbindir}/xsupplicant
 
 %changelog
+* Fri Sep 16 2005 Tom "spot" Callaway  1.2.1-5
+- patch to try to resolve bz 167467
+
 * Sun Sep  4 2005 Tom "spot" Callaway  1.2.1-4
 - use lynx instead of elinks
 



From fedora-extras-commits at redhat.com  Fri Sep 16 23:30:09 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri, 16 Sep 2005 19:30:09 -0400
Subject: rpms/xsupplicant/FC-3 xsupplicant-1.2.1-bz167467.patch,1.1,1.2
Message-ID: <200509162330.j8GNU9GP018607@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/xsupplicant/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18557/FC-3

Modified Files:
	xsupplicant-1.2.1-bz167467.patch 
Log Message:

fix bad patch


xsupplicant-1.2.1-bz167467.patch:

Index: xsupplicant-1.2.1-bz167467.patch
===================================================================
RCS file: /cvs/extras/rpms/xsupplicant/FC-3/xsupplicant-1.2.1-bz167467.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xsupplicant-1.2.1-bz167467.patch	16 Sep 2005 23:27:21 -0000	1.1
+++ xsupplicant-1.2.1-bz167467.patch	16 Sep 2005 23:30:07 -0000	1.2
@@ -9,13 +9,3 @@
    u_char temp_rsn_len = 0, temp_wpa_len = 0;
  
    tptr = bptr;
---- xsupplicant-1.2.1/doc/xml-userguide/userguide.xml.BAD	2005-09-04 10:28:44.000000000 -0500
-+++ xsupplicant-1.2.1/doc/xml-userguide/userguide.xml	2005-09-04 10:28:53.000000000 -0500
-@@ -1,6 +1,6 @@
- 
- 
-       



From fedora-extras-commits at redhat.com  Fri Sep 16 23:30:10 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri, 16 Sep 2005 19:30:10 -0400
Subject: rpms/xsupplicant/devel xsupplicant-1.2.1-bz167467.patch,1.1,1.2
Message-ID: <200509162330.j8GNUA9b018625@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/xsupplicant/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18557/devel

Modified Files:
	xsupplicant-1.2.1-bz167467.patch 
Log Message:

fix bad patch


xsupplicant-1.2.1-bz167467.patch:

Index: xsupplicant-1.2.1-bz167467.patch
===================================================================
RCS file: /cvs/extras/rpms/xsupplicant/devel/xsupplicant-1.2.1-bz167467.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xsupplicant-1.2.1-bz167467.patch	16 Sep 2005 23:27:27 -0000	1.1
+++ xsupplicant-1.2.1-bz167467.patch	16 Sep 2005 23:30:08 -0000	1.2
@@ -9,13 +9,3 @@
    u_char temp_rsn_len = 0, temp_wpa_len = 0;
  
    tptr = bptr;
---- xsupplicant-1.2.1/doc/xml-userguide/userguide.xml.BAD	2005-09-04 10:28:44.000000000 -0500
-+++ xsupplicant-1.2.1/doc/xml-userguide/userguide.xml	2005-09-04 10:28:53.000000000 -0500
-@@ -1,6 +1,6 @@
- 
- 
-       



From fedora-extras-commits at redhat.com  Fri Sep 16 23:30:09 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri, 16 Sep 2005 19:30:09 -0400
Subject: rpms/xsupplicant/FC-4 xsupplicant-1.2.1-bz167467.patch,1.1,1.2
Message-ID: <200509162330.j8GNUAK5018616@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/xsupplicant/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18557/FC-4

Modified Files:
	xsupplicant-1.2.1-bz167467.patch 
Log Message:

fix bad patch


xsupplicant-1.2.1-bz167467.patch:

Index: xsupplicant-1.2.1-bz167467.patch
===================================================================
RCS file: /cvs/extras/rpms/xsupplicant/FC-4/xsupplicant-1.2.1-bz167467.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xsupplicant-1.2.1-bz167467.patch	16 Sep 2005 23:27:21 -0000	1.1
+++ xsupplicant-1.2.1-bz167467.patch	16 Sep 2005 23:30:07 -0000	1.2
@@ -9,13 +9,3 @@
    u_char temp_rsn_len = 0, temp_wpa_len = 0;
  
    tptr = bptr;
---- xsupplicant-1.2.1/doc/xml-userguide/userguide.xml.BAD	2005-09-04 10:28:44.000000000 -0500
-+++ xsupplicant-1.2.1/doc/xml-userguide/userguide.xml	2005-09-04 10:28:53.000000000 -0500
-@@ -1,6 +1,6 @@
- 
- 
-       



From fedora-extras-commits at redhat.com  Fri Sep 16 23:59:52 2005
From: fedora-extras-commits at redhat.com (Chris Wright (chrisw))
Date: Fri, 16 Sep 2005 19:59:52 -0400
Subject: rpms/cogito/devel cogito.spec,1.1,1.2
Message-ID: <200509162359.j8GNxqSU018667@cvs-int.fedora.redhat.com>

Author: chrisw

Update of /cvs/extras/rpms/cogito/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18648

Modified Files:
	cogito.spec 
Log Message:
Update spec file to use %{?dist} and fix _libdir breakage



Index: cogito.spec
===================================================================
RCS file: /cvs/extras/rpms/cogito/devel/cogito.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cogito.spec	16 Sep 2005 06:53:08 -0000	1.1
+++ cogito.spec	16 Sep 2005 23:59:49 -0000	1.2
@@ -1,6 +1,6 @@
 Name: 		cogito
 Version: 	0.14.1
-Release: 	1
+Release: 	2%{?dist}
 Summary:  	The Cogito Version Control System
 License: 	GPL
 Group: 		Development/Tools
@@ -25,7 +25,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make DESTDIR=$RPM_BUILD_ROOT prefix=%{_prefix} install
+make DESTDIR=$RPM_BUILD_ROOT prefix=%{_prefix} libdir=%{_libdir}/cogito install
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -38,6 +38,9 @@
 %doc README COPYING Documentation/*
 
 %changelog
+* Fri Sep 16 2005 Chris Wright  0.14.1-2
+- fix _libdir breakage on 64-bit, the irony...
+
 * Thu Sep 15 2005 Chris Wright  0.14.1-1
 - Update to 0.14.1
 



From fedora-extras-commits at redhat.com  Sat Sep 17 00:01:09 2005
From: fedora-extras-commits at redhat.com (Chris Wright (chrisw))
Date: Fri, 16 Sep 2005 20:01:09 -0400
Subject: rpms/cogito/FC-4 cogito.spec,1.1,1.2
Message-ID: <200509170001.j8H01unA020047@cvs-int.fedora.redhat.com>

Author: chrisw

Update of /cvs/extras/rpms/cogito/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19958

Modified Files:
	cogito.spec 
Log Message:
Update spec file to use %{?dist} and fix _libdir breakage



Index: cogito.spec
===================================================================
RCS file: /cvs/extras/rpms/cogito/FC-4/cogito.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cogito.spec	16 Sep 2005 06:53:08 -0000	1.1
+++ cogito.spec	17 Sep 2005 00:01:07 -0000	1.2
@@ -1,6 +1,6 @@
 Name: 		cogito
 Version: 	0.14.1
-Release: 	1
+Release: 	2%{?dist}
 Summary:  	The Cogito Version Control System
 License: 	GPL
 Group: 		Development/Tools
@@ -25,7 +25,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make DESTDIR=$RPM_BUILD_ROOT prefix=%{_prefix} install
+make DESTDIR=$RPM_BUILD_ROOT prefix=%{_prefix} libdir=%{_libdir}/cogito install
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -38,6 +38,9 @@
 %doc README COPYING Documentation/*
 
 %changelog
+* Fri Sep 16 2005 Chris Wright  0.14.1-2
+- fix _libdir breakage on 64-bit, the irony...
+
 * Thu Sep 15 2005 Chris Wright  0.14.1-1
 - Update to 0.14.1
 



From fedora-extras-commits at redhat.com  Sat Sep 17 00:04:19 2005
From: fedora-extras-commits at redhat.com (Chris Wright (chrisw))
Date: Fri, 16 Sep 2005 20:04:19 -0400
Subject: rpms/cogito/FC-3 cogito.spec,1.1,1.2
Message-ID: <200509170004.j8H04jDB020125@cvs-int.fedora.redhat.com>

Author: chrisw

Update of /cvs/extras/rpms/cogito/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20111

Modified Files:
	cogito.spec 
Log Message:
Update spec file to use %{?dist} and fix _libdir breakage



Index: cogito.spec
===================================================================
RCS file: /cvs/extras/rpms/cogito/FC-3/cogito.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cogito.spec	16 Sep 2005 06:53:08 -0000	1.1
+++ cogito.spec	17 Sep 2005 00:04:17 -0000	1.2
@@ -1,6 +1,6 @@
 Name: 		cogito
 Version: 	0.14.1
-Release: 	1
+Release: 	2%{?dist}
 Summary:  	The Cogito Version Control System
 License: 	GPL
 Group: 		Development/Tools
@@ -25,7 +25,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make DESTDIR=$RPM_BUILD_ROOT prefix=%{_prefix} install
+make DESTDIR=$RPM_BUILD_ROOT prefix=%{_prefix} libdir=%{_libdir}/cogito install
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -38,6 +38,9 @@
 %doc README COPYING Documentation/*
 
 %changelog
+* Fri Sep 16 2005 Chris Wright  0.14.1-2
+- fix _libdir breakage on 64-bit, the irony...
+
 * Thu Sep 15 2005 Chris Wright  0.14.1-1
 - Update to 0.14.1
 



From fedora-extras-commits at redhat.com  Sat Sep 17 04:20:23 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Sat, 17 Sep 2005 00:20:23 -0400
Subject: rpms/perl-Algorithm-Dependency - New directory
Message-ID: <200509170420.j8H4KNOQ025912@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Algorithm-Dependency
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25888/perl-Algorithm-Dependency

Log Message:
Directory /cvs/extras/rpms/perl-Algorithm-Dependency added to the repository




From fedora-extras-commits at redhat.com  Sat Sep 17 04:20:23 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Sat, 17 Sep 2005 00:20:23 -0400
Subject: rpms/perl-Algorithm-Dependency/devel - New directory
Message-ID: <200509170420.j8H4KNjP025917@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Algorithm-Dependency/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25888/perl-Algorithm-Dependency/devel

Log Message:
Directory /cvs/extras/rpms/perl-Algorithm-Dependency/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Sep 17 04:20:45 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Sat, 17 Sep 2005 00:20:45 -0400
Subject: rpms/perl-Algorithm-Dependency Makefile, NONE, 1.1 import.log, NONE,
	1.1
Message-ID: <200509170420.j8H4Kjs6025968@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Algorithm-Dependency
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25933

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-Algorithm-Dependency


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Algorithm-Dependency
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Sat Sep 17 04:20:45 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Sat, 17 Sep 2005 00:20:45 -0400
Subject: rpms/perl-Algorithm-Dependency/devel .cvsignore, NONE, 1.1 Makefile,
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <200509170420.j8H4Kj6x025973@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Algorithm-Dependency/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25933/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Algorithm-Dependency


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Sat Sep 17 04:21:52 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Sat, 17 Sep 2005 00:21:52 -0400
Subject: rpms/perl-Algorithm-Dependency import.log,1.1,1.2
Message-ID: <200509170421.j8H4Lqva026036@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Algorithm-Dependency
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26001

Modified Files:
	import.log 
Log Message:
auto-import perl-Algorithm-Dependency-1.04-2 on branch devel from perl-Algorithm-Dependency-1.04-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Algorithm-Dependency/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	17 Sep 2005 04:20:43 -0000	1.1
+++ import.log	17 Sep 2005 04:21:50 -0000	1.2
@@ -0,0 +1 @@
+perl-Algorithm-Dependency-1_04-2:HEAD:perl-Algorithm-Dependency-1.04-2.src.rpm:1126930895



From fedora-extras-commits at redhat.com  Sat Sep 17 04:21:52 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Sat, 17 Sep 2005 00:21:52 -0400
Subject: rpms/perl-Algorithm-Dependency/devel perl-Algorithm-Dependency.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200509170421.j8H4LqRq026043@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Algorithm-Dependency/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26001/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Algorithm-Dependency.spec 
Log Message:
auto-import perl-Algorithm-Dependency-1.04-2 on branch devel from perl-Algorithm-Dependency-1.04-2.src.rpm


--- NEW FILE perl-Algorithm-Dependency.spec ---
Name: 		perl-Algorithm-Dependency
Version: 	1.04
Release: 	2%{?dist}
Summary: 	Algorithmic framework for implementing dependency trees
License: 	GPL or Artistic
Group: 		Development/Libraries
URL: 		http://search.cpan.org/dist/Algorithm-Dependency/
Source0:	http://search.cpan.org/CPAN/authors/id/A/AD/ADAMK/Algorithm-Dependency-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
BuildArch: noarch

BuildRequires: perl(File::Spec)		>= 0.82
BuildRequires: perl(Test::ClassAPI)	>= 0.6
BuildRequires: perl(Test::More)		>= 0.47
BuildRequires: perl(Params::Util)	>= 0.05
BuildRequires: perl(Test::Pod)		>= 1.00

%description
Algorithm::Dependency is a framework for creating simple read-only
dependency hierarchies, where you have a set of items that rely on other
items in the set, and require actions on them as well.

%prep
%setup -q -n Algorithm-Dependency-%{version}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'
find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';'
chmod -R u+w $RPM_BUILD_ROOT/*

%clean
rm -rf $RPM_BUILD_ROOT

%check
make test

%files
%defattr(-,root,root,-)
%doc Changes LICENSE
%{perl_vendorlib}/Algorithm
%{_mandir}/man3/*

%changelog
* Thu Sep 15 2005 Paul Howarth  - 1.04-2
- Fix Source0 URL
- Fix perl(Params::Util) BuildReq version
- Add BR: perl(Test::Pod) for improved test coverage

* Thu Sep 15 2005 Ralf Corsepius  - 1.04-1
- Upstream update.
- Drop shipping README.

* Tue Sep 13 2005 Ralf Corsepius  - 1.03-1
- Spec file cleanup.
- FE submission.

* Wed Jun 29 2005 Ralf Corsepius  - 1.03-0.pm.1
- Initial packman version.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Algorithm-Dependency/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	17 Sep 2005 04:20:43 -0000	1.1
+++ .cvsignore	17 Sep 2005 04:21:50 -0000	1.2
@@ -0,0 +1 @@
+Algorithm-Dependency-1.04.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Algorithm-Dependency/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	17 Sep 2005 04:20:43 -0000	1.1
+++ sources	17 Sep 2005 04:21:50 -0000	1.2
@@ -0,0 +1 @@
+de94e564ce296804400f04a79b00a715  Algorithm-Dependency-1.04.tar.gz



From fedora-extras-commits at redhat.com  Sat Sep 17 04:24:10 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Sat, 17 Sep 2005 00:24:10 -0400
Subject: rpms/perl-Algorithm-Dependency/devel perl-Algorithm-Dependency.spec,
	1.1, 1.2
Message-ID: <200509170424.j8H4OAJM026099@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Algorithm-Dependency/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26080

Modified Files:
	perl-Algorithm-Dependency.spec 
Log Message:
Spec cleanup.


Index: perl-Algorithm-Dependency.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Algorithm-Dependency/devel/perl-Algorithm-Dependency.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Algorithm-Dependency.spec	17 Sep 2005 04:21:50 -0000	1.1
+++ perl-Algorithm-Dependency.spec	17 Sep 2005 04:24:08 -0000	1.2
@@ -1,6 +1,6 @@
 Name: 		perl-Algorithm-Dependency
 Version: 	1.04
-Release: 	2%{?dist}
+Release: 	3%{?dist}
 Summary: 	Algorithmic framework for implementing dependency trees
 License: 	GPL or Artistic
 Group: 		Development/Libraries
@@ -49,6 +49,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Sat Sep 17 2005 Ralf Corsepius  - 1.04-3
+- Spec cleanup.
+
 * Thu Sep 15 2005 Paul Howarth  - 1.04-2
 - Fix Source0 URL
 - Fix perl(Params::Util) BuildReq version
@@ -61,6 +64,3 @@
 * Tue Sep 13 2005 Ralf Corsepius  - 1.03-1
 - Spec file cleanup.
 - FE submission.
-
-* Wed Jun 29 2005 Ralf Corsepius  - 1.03-0.pm.1
-- Initial packman version.



From fedora-extras-commits at redhat.com  Sat Sep 17 04:37:15 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Sat, 17 Sep 2005 00:37:15 -0400
Subject: rpms/perl-Locale-Maketext-Lexicon - New directory
Message-ID: <200509170437.j8H4bFrS026216@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Locale-Maketext-Lexicon
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26196/perl-Locale-Maketext-Lexicon

Log Message:
Directory /cvs/extras/rpms/perl-Locale-Maketext-Lexicon added to the repository




From fedora-extras-commits at redhat.com  Sat Sep 17 04:37:15 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Sat, 17 Sep 2005 00:37:15 -0400
Subject: rpms/perl-Locale-Maketext-Lexicon/devel - New directory
Message-ID: <200509170437.j8H4bFGK026221@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Locale-Maketext-Lexicon/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26196/perl-Locale-Maketext-Lexicon/devel

Log Message:
Directory /cvs/extras/rpms/perl-Locale-Maketext-Lexicon/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Sep 17 04:37:44 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Sat, 17 Sep 2005 00:37:44 -0400
Subject: rpms/perl-Locale-Maketext-Lexicon Makefile, NONE, 1.1 import.log,
	NONE, 1.1
Message-ID: <200509170437.j8H4bioP026276@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Locale-Maketext-Lexicon
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26241

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-Locale-Maketext-Lexicon


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Locale-Maketext-Lexicon
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Sat Sep 17 04:37:45 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Sat, 17 Sep 2005 00:37:45 -0400
Subject: rpms/perl-Locale-Maketext-Lexicon/devel .cvsignore, NONE,
	1.1 Makefile, NONE, 1.1 sources, NONE, 1.1
Message-ID: <200509170437.j8H4bjZ7026281@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Locale-Maketext-Lexicon/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26241/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Locale-Maketext-Lexicon


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Sat Sep 17 04:38:43 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Sat, 17 Sep 2005 00:38:43 -0400
Subject: rpms/perl-Locale-Maketext-Lexicon import.log,1.1,1.2
Message-ID: <200509170439.j8H4dEdp026354@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Locale-Maketext-Lexicon
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26315

Modified Files:
	import.log 
Log Message:
auto-import perl-Locale-Maketext-Lexicon-0.49-1 on branch devel from perl-Locale-Maketext-Lexicon-0.49-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Locale-Maketext-Lexicon/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	17 Sep 2005 04:37:42 -0000	1.1
+++ import.log	17 Sep 2005 04:38:41 -0000	1.2
@@ -0,0 +1 @@
+perl-Locale-Maketext-Lexicon-0_49-1:HEAD:perl-Locale-Maketext-Lexicon-0.49-1.src.rpm:1126931909



From fedora-extras-commits at redhat.com  Sat Sep 17 04:38:44 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Sat, 17 Sep 2005 00:38:44 -0400
Subject: rpms/perl-Locale-Maketext-Lexicon/devel
	perl-Locale-Maketext-Lexicon-filter-provides.sh, NONE,
	1.1 perl-Locale-Maketext-Lexicon.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200509170439.j8H4dEtY026358@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Locale-Maketext-Lexicon/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26315/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Locale-Maketext-Lexicon-filter-provides.sh 
	perl-Locale-Maketext-Lexicon.spec 
Log Message:
auto-import perl-Locale-Maketext-Lexicon-0.49-1 on branch devel from perl-Locale-Maketext-Lexicon-0.49-1.src.rpm


--- NEW FILE perl-Locale-Maketext-Lexicon-filter-provides.sh ---
#!/bin/sh

/usr/lib/rpm/perl.prov $* |\
    sed -e '/perl(MyParser/d'


--- NEW FILE perl-Locale-Maketext-Lexicon.spec ---
Name: 		perl-Locale-Maketext-Lexicon
Version: 	0.49
Release: 	1%{?dist}
Summary: 	Locale::Maketext::Lexicon Perl module
License:	GPL or Artistic
Group: 		Development/Libraries
URL: 		http://search.cpan.org/dist/Locale-Maketext-Lexicon/
Source0: 	http://www.cpan.org/CPAN/authors/id/A/AU/AUTRIJUS/Locale-Maketext-Lexicon-0.49.tar.gz
Source1: 	%{name}-filter-provides.sh
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%define __perl_provides %{SOURCE1}

Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
BuildArch: noarch

%description
Locale::Maketext::Lexicon provides lexicon-handling backends for
Locale::Maketext to read from other localization formats, such as PO files,
MO files, or from databases via the "Tie" interface.

%prep
%setup -q -n Locale-Maketext-Lexicon-%{version}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'
find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';'
chmod -R u+w $RPM_BUILD_ROOT/*

%clean
rm -rf $RPM_BUILD_ROOT

%check
make test

%files
%defattr(-,root,root,-)
%doc AUTHORS Changes README
%{_bindir}/*
%{_mandir}/man1/*
%{perl_vendorlib}/Locale
%{_mandir}/man3/*

%changelog
* Tue Sep 13 2005 Ralf Corsepius  - 0.49-1
- FE submission.

* Sun Sep 04 2005 Ralf Corsepius  - 0.49-0.pm.1
- Cosmetics.

* Sat May 07 2005 Ralf Corsepius  - 0.49-0.pm.0
- Update to 0.49

* Tue Mar 22 2005 Ralf Corsepius  - 0.48-0.pm.2
- Initial packman version.
- Update to FE standards.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Locale-Maketext-Lexicon/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	17 Sep 2005 04:37:42 -0000	1.1
+++ .cvsignore	17 Sep 2005 04:38:42 -0000	1.2
@@ -0,0 +1 @@
+Locale-Maketext-Lexicon-0.49.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Locale-Maketext-Lexicon/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	17 Sep 2005 04:37:42 -0000	1.1
+++ sources	17 Sep 2005 04:38:42 -0000	1.2
@@ -0,0 +1 @@
+c9a37ce122e02163a4589db84ee6f08b  Locale-Maketext-Lexicon-0.49.tar.gz



From fedora-extras-commits at redhat.com  Sat Sep 17 04:43:13 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Sat, 17 Sep 2005 00:43:13 -0400
Subject: rpms/perl-Locale-Maketext-Lexicon/devel
	perl-Locale-Maketext-Lexicon.spec, 1.1, 1.2
Message-ID: <200509170443.j8H4hDor026415@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Locale-Maketext-Lexicon/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26396

Modified Files:
	perl-Locale-Maketext-Lexicon.spec 
Log Message:
Spec file cleanup.


Index: perl-Locale-Maketext-Lexicon.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Locale-Maketext-Lexicon/devel/perl-Locale-Maketext-Lexicon.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Locale-Maketext-Lexicon.spec	17 Sep 2005 04:38:42 -0000	1.1
+++ perl-Locale-Maketext-Lexicon.spec	17 Sep 2005 04:43:11 -0000	1.2
@@ -1,11 +1,11 @@
 Name: 		perl-Locale-Maketext-Lexicon
 Version: 	0.49
-Release: 	1%{?dist}
-Summary: 	Locale::Maketext::Lexicon Perl module
+Release: 	2%{?dist}
+Summary: 	Extract translatable strings from source
 License:	GPL or Artistic
 Group: 		Development/Libraries
 URL: 		http://search.cpan.org/dist/Locale-Maketext-Lexicon/
-Source0: 	http://www.cpan.org/CPAN/authors/id/A/AU/AUTRIJUS/Locale-Maketext-Lexicon-0.49.tar.gz
+Source0: 	http://search.cpan.org/CPAN/authors/id/A/AU/AUTRIJUS/Locale-Maketext-Lexicon-0.49.tar.gz
 Source1: 	%{name}-filter-provides.sh
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -48,16 +48,8 @@
 %{_mandir}/man3/*
 
 %changelog
+* Sat Sep 17 2005 Ralf Corsepius  - 0.49-2
+- Spec file cleanup.
+
 * Tue Sep 13 2005 Ralf Corsepius  - 0.49-1
 - FE submission.
-
-* Sun Sep 04 2005 Ralf Corsepius  - 0.49-0.pm.1
-- Cosmetics.
-
-* Sat May 07 2005 Ralf Corsepius  - 0.49-0.pm.0
-- Update to 0.49
-
-* Tue Mar 22 2005 Ralf Corsepius  - 0.48-0.pm.2
-- Initial packman version.
-- Update to FE standards.
-



From fedora-extras-commits at redhat.com  Sat Sep 17 06:05:24 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Sat, 17 Sep 2005 02:05:24 -0400
Subject: rpms/rxvt-unicode/devel rxvt-unicode.spec,1.3,1.4
Message-ID: <200509170605.j8H65OKE029219@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/rxvt-unicode/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29166/devel

Modified Files:
	rxvt-unicode.spec 
Log Message:
- enable iso14755 (#168548)



Index: rxvt-unicode.spec
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/devel/rxvt-unicode.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- rxvt-unicode.spec	23 Aug 2005 14:37:47 -0000	1.3
+++ rxvt-unicode.spec	17 Sep 2005 06:05:22 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           rxvt-unicode
 Version:        5.7
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Rxvt-unicode is an unicode version of rxvt
 
 Group:          User Interface/X
@@ -37,7 +37,7 @@
   --enable-mousewheel --enable-slipwheeling --enable-smart-resize \
   --enable-pointer-blank --enable-xpm-background --enable-next-scroll \
   --enable-xim --enable-linespace --with-save-lines=2000 --enable-resources \
-  --with-codesets=all
+  --with-codesets=all --enable-combining --enable-iso14755
 
 make CFLAGS="${RPM_OPT_FLAGS}" %{?_smp_mflags}
 
@@ -65,6 +65,10 @@
 %{_datadir}/applications/*
 
 %changelog
+* Sat Sep 17 2005 Andreas Bierfert 
+5.7-2
+- enable iso14755 (#168548)
+
 * Tue Aug 23 2005 Andreas Bierfert 
 5.7-1
 - version upgrade



From fedora-extras-commits at redhat.com  Sat Sep 17 06:05:05 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Sat, 17 Sep 2005 02:05:05 -0400
Subject: rpms/rxvt-unicode/FC-4 rxvt-unicode.spec,1.3,1.4
Message-ID: <200509170605.j8H65tWG029223@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/rxvt-unicode/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29166/FC-4

Modified Files:
	rxvt-unicode.spec 
Log Message:
- enable iso14755 (#168548)



Index: rxvt-unicode.spec
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/FC-4/rxvt-unicode.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- rxvt-unicode.spec	23 Aug 2005 14:37:41 -0000	1.3
+++ rxvt-unicode.spec	17 Sep 2005 06:05:03 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           rxvt-unicode
 Version:        5.7
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Rxvt-unicode is an unicode version of rxvt
 
 Group:          User Interface/X
@@ -37,7 +37,7 @@
   --enable-mousewheel --enable-slipwheeling --enable-smart-resize \
   --enable-pointer-blank --enable-xpm-background --enable-next-scroll \
   --enable-xim --enable-linespace --with-save-lines=2000 --enable-resources \
-  --with-codesets=all
+  --with-codesets=all --enable-combining --enable-iso14755
 
 make CFLAGS="${RPM_OPT_FLAGS}" %{?_smp_mflags}
 
@@ -65,6 +65,10 @@
 %{_datadir}/applications/*
 
 %changelog
+* Sat Sep 17 2005 Andreas Bierfert 
+5.7-2
+- enable iso14755 (#168548)
+
 * Tue Aug 23 2005 Andreas Bierfert 
 5.7-1
 - version upgrade



From fedora-extras-commits at redhat.com  Sat Sep 17 06:05:01 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Sat, 17 Sep 2005 02:05:01 -0400
Subject: rpms/rxvt-unicode/FC-3 rxvt-unicode.spec,1.3,1.4
Message-ID: <200509170605.j8H65tUS029222@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/rxvt-unicode/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29166/FC-3

Modified Files:
	rxvt-unicode.spec 
Log Message:
- enable iso14755 (#168548)



Index: rxvt-unicode.spec
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/FC-3/rxvt-unicode.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- rxvt-unicode.spec	23 Aug 2005 14:37:41 -0000	1.3
+++ rxvt-unicode.spec	17 Sep 2005 06:04:59 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           rxvt-unicode
 Version:        5.7
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Rxvt-unicode is an unicode version of rxvt
 
 Group:          User Interface/X
@@ -37,7 +37,7 @@
   --enable-mousewheel --enable-slipwheeling --enable-smart-resize \
   --enable-pointer-blank --enable-xpm-background --enable-next-scroll \
   --enable-xim --enable-linespace --with-save-lines=2000 --enable-resources \
-  --with-codesets=all
+  --with-codesets=all --enable-combining --enable-iso14755
 
 make CFLAGS="${RPM_OPT_FLAGS}" %{?_smp_mflags}
 
@@ -65,6 +65,10 @@
 %{_datadir}/applications/*
 
 %changelog
+* Sat Sep 17 2005 Andreas Bierfert 
+5.7-2
+- enable iso14755 (#168548)
+
 * Tue Aug 23 2005 Andreas Bierfert 
 5.7-1
 - version upgrade



From fedora-extras-commits at redhat.com  Sat Sep 17 06:38:05 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Sat, 17 Sep 2005 02:38:05 -0400
Subject: owners owners.list,1.226,1.227
Message-ID: <200509170638.j8H6c5D8029449@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29430

Modified Files:
	owners.list 
Log Message:
- add wmapmload
- add wmweather+



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.226
retrieving revision 1.227
diff -u -r1.226 -r1.227
--- owners.list	16 Sep 2005 23:12:15 -0000	1.226
+++ owners.list	17 Sep 2005 06:38:03 -0000	1.227
@@ -1022,6 +1022,8 @@
 Fedora Extras|whowatch|Displays informations about the users currently logged in|nos at utelsystems.com|extras-qa at fedoraproject.org|
 Fedora Extras|WindowMaker|A fast, feature rich Window manager|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|wine|A Windows 16/32 bit emulator|pmatilai at laiskiainen.org|extras-qa at fedoraproject.org|
+Fedora Extras|wmapmload|Wmapmload monitors your apm status in an lcd display fashion|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
+Fedora Extras|wmweather+|Weather status dockapp|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|wv2|A library which allows access to Microsoft?? Word files|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|wv|MSWord 6/7/8/9 binary file format to HTML converter|gauret at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|wxGTK|GTK+ port of the wxWidgets GUI library|anvil at livna.org|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sat Sep 17 07:39:01 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Sat, 17 Sep 2005 03:39:01 -0400
Subject: rpms/fluxbox/FC-3 .cvsignore, 1.4, 1.5 fluxbox.spec, 1.10,
	1.11 sources, 1.4, 1.5
Message-ID: <200509170739.j8H7d1UV030876@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/fluxbox/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30821/FC-3

Modified Files:
	.cvsignore fluxbox.spec sources 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fluxbox/FC-3/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	31 May 2005 21:42:26 -0000	1.4
+++ .cvsignore	17 Sep 2005 07:38:59 -0000	1.5
@@ -1,2 +1,2 @@
-fluxbox-0.9.13.tar.bz2
+fluxbox-0.9.14.tar.bz2
 artwiz-aleczapka.tar.bz2


Index: fluxbox.spec
===================================================================
RCS file: /cvs/extras/rpms/fluxbox/FC-3/fluxbox.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- fluxbox.spec	9 Sep 2005 08:07:38 -0000	1.10
+++ fluxbox.spec	17 Sep 2005 07:38:59 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           fluxbox
-Version:        0.9.13
-Release:        4%{?dist}
+Version:        0.9.14
+Release:        1%{?dist}
 
 Summary:	Window Manager based on Blackbox
 
@@ -8,7 +8,7 @@
 License:        MIT
 URL:            http://fluxbox.sourceforge.net
 
-Source0:        http://download.sourceforge.net/fluxbox/fluxbox-0.9.13.tar.bz2
+Source0:        http://download.sourceforge.net/fluxbox/fluxbox-0.9.14.tar.bz2
 Source1:        Xclients.%{name}
 Source2:        FluxBox
 Source3:        fluxbox.desktop
@@ -38,15 +38,14 @@
 %configure      --enable-xft \
                 --enable-gnome \
                 --enable-kde \
-                --enable-xinerama \
-		#-enable-debug \
+                --enable-xinerama
 
 make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%makeinstall
+make install DESTDIR=$RPM_BUILD_ROOT
 
 # make gdm users happy
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/apps/switchdesk/
@@ -69,7 +68,7 @@
 	-kg -in -ds\
 	-p %{_usr} \
 	-o %{_datadir}/fluxbox/menu \
-	-m Fluxbox-0.9.13 2>&1 > /dev/null
+	-m Fluxbox-0.9.14 2>&1 > /dev/null
 
 
 #artwiz fontz
@@ -106,6 +105,10 @@
 %{_libdir}/X11/fonts/artwiz-aleczapka
 
 %changelog
+* Thu Sep 15 2005 Andreas Bierfert 
+0.9.14-1
+- version upgrade
+
 * Tue Sep 06 2005 Andreas Bierfert 
 0.9.13-4
 - remove X11R6 path stuff #167601


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fluxbox/FC-3/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	31 May 2005 21:42:26 -0000	1.4
+++ sources	17 Sep 2005 07:38:59 -0000	1.5
@@ -1,2 +1,2 @@
-f9b7b3c3b8e1e9ce3449601b238d4fba  fluxbox-0.9.13.tar.bz2
+7641aaea532841e103e9705bb5b98f62  fluxbox-0.9.14.tar.bz2
 3c7da9a10a84d517e6846b2031950380  artwiz-aleczapka.tar.bz2



From fedora-extras-commits at redhat.com  Sat Sep 17 07:39:02 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Sat, 17 Sep 2005 03:39:02 -0400
Subject: rpms/fluxbox/devel .cvsignore, 1.4, 1.5 fluxbox.spec, 1.12,
	1.13 sources, 1.4, 1.5
Message-ID: <200509170739.j8H7d2Sj030892@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/fluxbox/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30821/devel

Modified Files:
	.cvsignore fluxbox.spec sources 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fluxbox/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	8 Jun 2005 21:29:07 -0000	1.4
+++ .cvsignore	17 Sep 2005 07:38:59 -0000	1.5
@@ -1,2 +1,2 @@
-fluxbox-0.9.13.tar.bz2
+fluxbox-0.9.14.tar.bz2
 artwiz-aleczapka.tar.bz2


Index: fluxbox.spec
===================================================================
RCS file: /cvs/extras/rpms/fluxbox/devel/fluxbox.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- fluxbox.spec	9 Sep 2005 08:07:56 -0000	1.12
+++ fluxbox.spec	17 Sep 2005 07:38:59 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           fluxbox
-Version:        0.9.13
-Release:        4%{?dist}
+Version:        0.9.14
+Release:        1%{?dist}
 
 Summary:	Window Manager based on Blackbox
 
@@ -8,7 +8,7 @@
 License:        MIT
 URL:            http://fluxbox.sourceforge.net
 
-Source0:        http://download.sourceforge.net/fluxbox/fluxbox-0.9.13.tar.bz2
+Source0:        http://download.sourceforge.net/fluxbox/fluxbox-0.9.14.tar.bz2
 Source1:        Xclients.%{name}
 Source2:        FluxBox
 Source3:        fluxbox.desktop
@@ -38,15 +38,14 @@
 %configure      --enable-xft \
                 --enable-gnome \
                 --enable-kde \
-                --enable-xinerama \
-		#-enable-debug \
+                --enable-xinerama
 
 make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%makeinstall
+make install DESTDIR=$RPM_BUILD_ROOT
 
 # make gdm users happy
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/apps/switchdesk/
@@ -69,7 +68,7 @@
 	-kg -in -ds\
 	-p %{_usr} \
 	-o %{_datadir}/fluxbox/menu \
-	-m Fluxbox-0.9.13 2>&1 > /dev/null
+	-m Fluxbox-0.9.14 2>&1 > /dev/null
 
 
 #artwiz fontz
@@ -106,6 +105,10 @@
 %{_libdir}/X11/fonts/artwiz-aleczapka
 
 %changelog
+* Thu Sep 15 2005 Andreas Bierfert 
+0.9.14-1
+- version upgrade
+
 * Tue Sep 06 2005 Andreas Bierfert 
 0.9.13-4
 - remove X11R6 path stuff #167601


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fluxbox/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	8 Jun 2005 21:29:07 -0000	1.4
+++ sources	17 Sep 2005 07:38:59 -0000	1.5
@@ -1,2 +1,2 @@
-f9b7b3c3b8e1e9ce3449601b238d4fba  fluxbox-0.9.13.tar.bz2
+7641aaea532841e103e9705bb5b98f62  fluxbox-0.9.14.tar.bz2
 3c7da9a10a84d517e6846b2031950380  artwiz-aleczapka.tar.bz2



From fedora-extras-commits at redhat.com  Sat Sep 17 07:39:01 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Sat, 17 Sep 2005 03:39:01 -0400
Subject: rpms/fluxbox/FC-4 .cvsignore, 1.4, 1.5 fluxbox.spec, 1.14,
	1.15 sources, 1.4, 1.5
Message-ID: <200509170739.j8H7d1pl030884@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/fluxbox/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30821/FC-4

Modified Files:
	.cvsignore fluxbox.spec sources 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fluxbox/FC-4/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	31 May 2005 21:55:25 -0000	1.4
+++ .cvsignore	17 Sep 2005 07:38:59 -0000	1.5
@@ -1,2 +1,2 @@
-fluxbox-0.9.13.tar.bz2
+fluxbox-0.9.14.tar.bz2
 artwiz-aleczapka.tar.bz2


Index: fluxbox.spec
===================================================================
RCS file: /cvs/extras/rpms/fluxbox/FC-4/fluxbox.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- fluxbox.spec	9 Sep 2005 08:07:40 -0000	1.14
+++ fluxbox.spec	17 Sep 2005 07:38:59 -0000	1.15
@@ -1,6 +1,6 @@
 Name:           fluxbox
-Version:        0.9.13
-Release:        4%{?dist}
+Version:        0.9.14
+Release:        1%{?dist}
 
 Summary:	Window Manager based on Blackbox
 
@@ -8,7 +8,7 @@
 License:        MIT
 URL:            http://fluxbox.sourceforge.net
 
-Source0:        http://download.sourceforge.net/fluxbox/fluxbox-0.9.13.tar.bz2
+Source0:        http://download.sourceforge.net/fluxbox/fluxbox-0.9.14.tar.bz2
 Source1:        Xclients.%{name}
 Source2:        FluxBox
 Source3:        fluxbox.desktop
@@ -38,15 +38,14 @@
 %configure      --enable-xft \
                 --enable-gnome \
                 --enable-kde \
-                --enable-xinerama \
-		#-enable-debug \
+                --enable-xinerama
 
 make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%makeinstall
+make install DESTDIR=$RPM_BUILD_ROOT
 
 # make gdm users happy
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/apps/switchdesk/
@@ -69,7 +68,7 @@
 	-kg -in -ds\
 	-p %{_usr} \
 	-o %{_datadir}/fluxbox/menu \
-	-m Fluxbox-0.9.13 2>&1 > /dev/null
+	-m Fluxbox-0.9.14 2>&1 > /dev/null
 
 
 #artwiz fontz
@@ -106,6 +105,10 @@
 %{_libdir}/X11/fonts/artwiz-aleczapka
 
 %changelog
+* Thu Sep 15 2005 Andreas Bierfert 
+0.9.14-1
+- version upgrade
+
 * Tue Sep 06 2005 Andreas Bierfert 
 0.9.13-4
 - remove X11R6 path stuff #167601


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fluxbox/FC-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	31 May 2005 21:55:25 -0000	1.4
+++ sources	17 Sep 2005 07:38:59 -0000	1.5
@@ -1,2 +1,2 @@
-f9b7b3c3b8e1e9ce3449601b238d4fba  fluxbox-0.9.13.tar.bz2
+7641aaea532841e103e9705bb5b98f62  fluxbox-0.9.14.tar.bz2
 3c7da9a10a84d517e6846b2031950380  artwiz-aleczapka.tar.bz2



From fedora-extras-commits at redhat.com  Sat Sep 17 08:39:16 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sat, 17 Sep 2005 04:39:16 -0400
Subject: rpms/libsidplay/devel libsidplay.spec,1.10,1.11
Message-ID: <200509170839.j8H8dGqw000540@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/libsidplay/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv521

Modified Files:
	libsidplay.spec 
Log Message:
* Sat Sep 17 2005 Michael Schwendt  1.36.57-9
- don't build/include static library



Index: libsidplay.spec
===================================================================
RCS file: /cvs/extras/rpms/libsidplay/devel/libsidplay.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- libsidplay.spec	27 Jun 2005 18:19:36 -0000	1.10
+++ libsidplay.spec	17 Sep 2005 08:39:14 -0000	1.11
@@ -1,7 +1,7 @@
 Name: libsidplay
 Summary: Commodore 64 music player and SID chip emulator library
 Version: 1.36.57
-Release: 8%{?dist}
+Release: 9%{?dist}
 Source: http://www.geocities.com/SiliconValley/Lakes/5147/sidplay/packages/%{name}-%{version}.tgz
 Patch: libsidplay-post57fixes.patch
 Group: System Environment/Libraries
@@ -29,11 +29,11 @@
 %patch -p1 -b .post57fixes
 
 %build
+CXXFLAGS="$RPM_OPT_FLAGS" %configure \
 %ifarch %{ix86}
-CXXFLAGS="$RPM_OPT_FLAGS" %configure --enable-optfixpoint --enable-optendian
-%else
-CXXFLAGS="$RPM_OPT_FLAGS" %configure
+  --enable-optfixpoint --enable-optendian \
 %endif
+  --disable-static
 make
 
 %install
@@ -58,10 +58,13 @@
 %files devel
 %defattr(-,root,root)
 %{_libdir}/libsidplay.so
-%{_libdir}/libsidplay.a
+#%{_libdir}/libsidplay.a
 %{_includedir}/sidplay
 
 %changelog
+* Sat Sep 17 2005 Michael Schwendt  1.36.57-9
+- don't build/include static library
+
 * Thu May 12 2005 Michael Schwendt  1.36.57-8
 - rebuilt
 



From fedora-extras-commits at redhat.com  Sat Sep 17 08:58:54 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sat, 17 Sep 2005 04:58:54 -0400
Subject: rpms/clamav/FC-3 clamav-0.86.2-timeout.patch,1.1,NONE
Message-ID: <200509170858.j8H8wseF000671@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/clamav/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv628/FC-3

Removed Files:
	clamav-0.86.2-timeout.patch 
Log Message:
not needed for 0.87 anymore



--- clamav-0.86.2-timeout.patch DELETED ---



From fedora-extras-commits at redhat.com  Sat Sep 17 08:58:55 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sat, 17 Sep 2005 04:58:55 -0400
Subject: rpms/clamav/devel clamav-0.86.2-timeout.patch,1.1,NONE
Message-ID: <200509170858.j8H8wtxd000681@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/clamav/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv628/devel

Removed Files:
	clamav-0.86.2-timeout.patch 
Log Message:
not needed for 0.87 anymore



--- clamav-0.86.2-timeout.patch DELETED ---



From fedora-extras-commits at redhat.com  Sat Sep 17 08:58:54 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sat, 17 Sep 2005 04:58:54 -0400
Subject: rpms/clamav/FC-4 clamav-0.86.2-timeout.patch,1.1,NONE
Message-ID: <200509170858.j8H8wsF7000676@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/clamav/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv628/FC-4

Removed Files:
	clamav-0.86.2-timeout.patch 
Log Message:
not needed for 0.87 anymore



--- clamav-0.86.2-timeout.patch DELETED ---



From fedora-extras-commits at redhat.com  Sat Sep 17 08:59:17 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sat, 17 Sep 2005 04:59:17 -0400
Subject: rpms/clamav/FC-3 freshclam.sysconfig,1.1,1.2
Message-ID: <200509170859.j8H8xlJb000740@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/clamav/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv687/FC-3

Modified Files:
	freshclam.sysconfig 
Log Message:
fixed typo



Index: freshclam.sysconfig
===================================================================
RCS file: /cvs/extras/rpms/clamav/FC-3/freshclam.sysconfig,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- freshclam.sysconfig	25 Jul 2005 17:47:53 -0000	1.1
+++ freshclam.sysconfig	17 Sep 2005 08:59:15 -0000	1.2
@@ -11,7 +11,7 @@
 ## calculated by the 'hostid' program. This predefined value guarantees
 ## constant timespans of 3 hours between two subsequent freshclam runs.
 ##
-## This options accepts two special values:
+## This option accepts two special values:
 ## 'disabled-warn'  ...  disables the automatic freshclam update and
 ##                         gives out a warning
 ## 'disabled'       ...  disables the automatic freshclam silently



From fedora-extras-commits at redhat.com  Sat Sep 17 08:59:18 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sat, 17 Sep 2005 04:59:18 -0400
Subject: rpms/clamav/devel freshclam.sysconfig,1.1,1.2
Message-ID: <200509170859.j8H8xmbO000746@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/clamav/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv687/devel

Modified Files:
	freshclam.sysconfig 
Log Message:
fixed typo



Index: freshclam.sysconfig
===================================================================
RCS file: /cvs/extras/rpms/clamav/devel/freshclam.sysconfig,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- freshclam.sysconfig	25 Jul 2005 17:17:06 -0000	1.1
+++ freshclam.sysconfig	17 Sep 2005 08:59:16 -0000	1.2
@@ -11,7 +11,7 @@
 ## calculated by the 'hostid' program. This predefined value guarantees
 ## constant timespans of 3 hours between two subsequent freshclam runs.
 ##
-## This options accepts two special values:
+## This option accepts two special values:
 ## 'disabled-warn'  ...  disables the automatic freshclam update and
 ##                         gives out a warning
 ## 'disabled'       ...  disables the automatic freshclam silently



From fedora-extras-commits at redhat.com  Sat Sep 17 08:59:18 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sat, 17 Sep 2005 04:59:18 -0400
Subject: rpms/clamav/FC-4 freshclam.sysconfig,1.1,1.2
Message-ID: <200509170859.j8H8xmdB000743@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/clamav/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv687/FC-4

Modified Files:
	freshclam.sysconfig 
Log Message:
fixed typo



Index: freshclam.sysconfig
===================================================================
RCS file: /cvs/extras/rpms/clamav/FC-4/freshclam.sysconfig,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- freshclam.sysconfig	25 Jul 2005 17:47:54 -0000	1.1
+++ freshclam.sysconfig	17 Sep 2005 08:59:15 -0000	1.2
@@ -11,7 +11,7 @@
 ## calculated by the 'hostid' program. This predefined value guarantees
 ## constant timespans of 3 hours between two subsequent freshclam runs.
 ##
-## This options accepts two special values:
+## This option accepts two special values:
 ## 'disabled-warn'  ...  disables the automatic freshclam update and
 ##                         gives out a warning
 ## 'disabled'       ...  disables the automatic freshclam silently



From fedora-extras-commits at redhat.com  Sat Sep 17 09:00:18 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sat, 17 Sep 2005 05:00:18 -0400
Subject: rpms/clamav/devel sources,1.11,1.12
Message-ID: <200509170900.j8H90IDR000806@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/clamav/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv753/devel

Modified Files:
	sources 
Log Message:
version 0.87



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/clamav/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	25 Jul 2005 17:19:38 -0000	1.11
+++ sources	17 Sep 2005 09:00:16 -0000	1.12
@@ -1,2 +1,2 @@
-870de14ba123d6e9cba9850498c49f5d  clamav-0.86.2.tar.gz
-7d9ffe964a67ee6db157e112203a2678  clamav-0.86.2.tar.gz.sig
+dd0a12deb4f48f760fa1fcd378ae7c24  clamav-0.87.tar.gz
+db9c17eec9e05085795b48ba199af895  clamav-0.87.tar.gz.sig



From fedora-extras-commits at redhat.com  Sat Sep 17 09:00:13 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sat, 17 Sep 2005 05:00:13 -0400
Subject: rpms/clamav/FC-3 sources,1.9,1.10
Message-ID: <200509170900.j8H90hOw000809@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/clamav/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv753/FC-3

Modified Files:
	sources 
Log Message:
version 0.87



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/clamav/FC-3/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	25 Jul 2005 17:47:53 -0000	1.9
+++ sources	17 Sep 2005 09:00:10 -0000	1.10
@@ -1,2 +1,2 @@
-870de14ba123d6e9cba9850498c49f5d  clamav-0.86.2.tar.gz
-7d9ffe964a67ee6db157e112203a2678  clamav-0.86.2.tar.gz.sig
+dd0a12deb4f48f760fa1fcd378ae7c24  clamav-0.87.tar.gz
+db9c17eec9e05085795b48ba199af895  clamav-0.87.tar.gz.sig



From fedora-extras-commits at redhat.com  Sat Sep 17 09:00:13 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sat, 17 Sep 2005 05:00:13 -0400
Subject: rpms/clamav/FC-4 sources,1.11,1.12
Message-ID: <200509170900.j8H90hMo000812@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/clamav/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv753/FC-4

Modified Files:
	sources 
Log Message:
version 0.87



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/clamav/FC-4/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	25 Jul 2005 17:47:54 -0000	1.11
+++ sources	17 Sep 2005 09:00:11 -0000	1.12
@@ -1,2 +1,2 @@
-870de14ba123d6e9cba9850498c49f5d  clamav-0.86.2.tar.gz
-7d9ffe964a67ee6db157e112203a2678  clamav-0.86.2.tar.gz.sig
+dd0a12deb4f48f760fa1fcd378ae7c24  clamav-0.87.tar.gz
+db9c17eec9e05085795b48ba199af895  clamav-0.87.tar.gz.sig



From fedora-extras-commits at redhat.com  Sat Sep 17 09:01:30 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sat, 17 Sep 2005 05:01:30 -0400
Subject: rpms/clamav/devel clamav.spec,1.28,1.29
Message-ID: <200509170901.j8H91UNe002157@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/clamav/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2121/devel

Modified Files:
	clamav.spec 
Log Message:
- 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



Index: clamav.spec
===================================================================
RCS file: /cvs/extras/rpms/clamav/devel/clamav.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- clamav.spec	10 Sep 2005 11:20:26 -0000	1.28
+++ clamav.spec	17 Sep 2005 09:01:24 -0000	1.29
@@ -14,9 +14,6 @@
 %global milterlog	%_var/log/clamd.milter
 %global milteruser	clamilt
 %global milterstatedir	%_var/run/clamav-milter
-%global clameximlog	%_var/log/clamd.exim
-%global clameximuser	clamexim
-%global clameximstatedir %_var/run/clamd.exim
 %global pkgdatadir	%_datadir/%name
 
 
@@ -24,14 +21,14 @@
 
 Summary:	End-user tools for the Clam Antivirus scanner
 Name:		clamav
-Version:	0.86.2
-Release:	%release_func 5
+Version:	0.87
+Release:	%release_func 1
 
 License:	GPL
 Group:		Applications/File
 URL:		http://www.clamav.net
 Source0:	http://download.sourceforge.net/sourceforge/clamav/%{name}-%{version}.tar.gz
-#Source999:	http://download.sourceforge.net/sourceforge/clamav/%{name}-%{version}.tar.gz.sig
+Source999:	http://download.sourceforge.net/sourceforge/clamav/%{name}-%{version}.tar.gz.sig
 Source1:	clamd-wrapper
 Source2:	clamd.sysconfig
 Source3:	clamd.logrotate
@@ -42,7 +39,6 @@
 Patch20:	clamav-0.70-user.patch
 Patch21:	clamav-0.70-path.patch
 Patch22:	clamav-0.80-initoff.patch
-Patch23:	clamav-0.86.2-timeout.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root
 Requires:	clamav-lib = %{version}-%{release}
 Requires:	data(clamav)
@@ -110,21 +106,6 @@
 Requires(pre):		fedora-usermgmt >= 0.7
 Requires(postun):	fedora-usermgmt >= 0.7
 
-%package exim
-Summary:	Exim d??mon configuration for the Clam Antivirus scanner
-Group:		System Environment/Daemons
-## For now, use this as a placeholder. Later, generate separate -sysv
-## and -minit subpackages
-Requires:	init(clamav-exim)
-Provides:	init(clamav-exim)
-Requires(pre):		exim
-Requires(pre):		%_initrddir
-Requires(postun):	%_initrddir initscripts
-Requires(post):		chkconfig coreutils
-Requires(preun):	chkconfig initscripts
-Requires(pre):		fedora-usermgmt >= 0.7
-Requires(postun):	fedora-usermgmt >= 0.7
-
 
 %description
 Clam AntiVirus is an anti-virus toolkit for UNIX. The main purpose of this
@@ -177,22 +158,6 @@
 
 THIS PACKAGE IS TO BE CONSIDERED AS EXPERIMENTAL!
 
-%description exim
-This package contains files which are needed to run the clamav d??mon for use
-by the Exim MTA. It can be activated by adding
-
-   av_scanner = clamd:%clameximstatedir/clamd.sock 
-
-to your exim.conf, and using the 'malware' condition in the data ACL, 
-as follows:
-
-   deny message = This message contains malware ($malware_name)
-      demime = *
-      malware = *
-
-For further details of Exim content scanning, see chapter 40 of the Exim 
-specification: http://www.exim.org/exim-html-4.50/doc/html/spec_40.html
-
 ## ------------------------------------------------------------
 
 %prep
@@ -200,7 +165,6 @@
 %patch20 -p1 -b .user
 %patch21 -p1 -b .path
 %patch22 -p1 -b .initoff
-%patch23 -p1 -b .timeout
 
 perl -pi -e 's!^(#?LogFile ).*!\1/var/log/clamd.!g;
 	     s!^#?(LocalSocket ).*!\1/var/run/clamd./clamd.sock!g;
@@ -260,7 +224,6 @@
 	${RPM_BUILD_ROOT}%{_sysconfdir}/{clamd.d,cron.d,logrotate.d,sysconfig} \
 	${RPM_BUILD_ROOT}%{_var}/log \
 	${RPM_BUILD_ROOT}%milterstatedir \
-	${RPM_BUILD_ROOT}%clameximstatedir \
 	${RPM_BUILD_ROOT}%pkgdatadir/template \
 	${RPM_BUILD_ROOT}%{_initrddir}
 
@@ -303,34 +266,15 @@
    $RPM_BUILD_ROOT%pkgdatadir/freshclam-sleep
 
 
-#### The Exim stuff
+%if 0%{!?_without_milter:1}
+#### The milter stuff
 
 function subst() {
-	sed -e "s!!$3!g;s!!$4!g;""$5" "$1" >"$RPM_BUILD_ROOT$2"
+	sed -e 's!!milter!g;s!!%milteruser!g;'"$3" "$1" >"$RPM_BUILD_ROOT$2"
 }
 
-subst etc/clamd.conf %_sysconfdir/clamd.d/exim.conf exim %clameximuser \
-	's!^##*\(\(LogFile\|LocalSocket\|PidFile\|User\)\s\|\(StreamSaveToDisk\|ScanMail\|LogTime\|ScanArchive\)$\)!\1!;s!^Example!#Example!;'
 
-
-subst %{SOURCE7} %_initrddir/clamd.exim exim %clameximuser ''
-chmod 0755 $RPM_BUILD_ROOT%_initrddir/clamd.exim
-subst %{SOURCE3} %_sysconfdir/logrotate.d/clamd.exim exim %clameximuser ''
-
-cat <$RPM_BUILD_ROOT%_sysconfdir/sysconfig/clamd.exim
-CLAMD_CONFIG='%_sysconfdir/clamd.d/exim.conf'
-CLAMD_SOCKET=%clameximstatedir/clamd.sock
-EOF
-
-mkdir -p $RPM_BUILD_ROOT/%clameximstatedir
-ln -sf clamd $RPM_BUILD_ROOT%_sbindir/clamd.exim
-
-touch $RPM_BUILD_ROOT%clameximstatedir/clamd.sock $RPM_BUILD_ROOT%clameximlog
-
-%if 0%{!?_without_milter:1}
-#### The milter stuff
-
-subst etc/clamd.conf /etc/clamd.d/milter.conf milter %milteruser \
+subst etc/clamd.conf /etc/clamd.d/milter.conf \
 	's!^##*\(\(LogFile\|LocalSocket\|PidFile\|User\)\s\|\(StreamSaveToDisk\|ScanMail\)$\)!\1!;'
 
 
@@ -391,26 +335,6 @@
 test "$1" != 0 || /usr/sbin/fedora-groupdel %{milteruser} &>/dev/null || :
 test "$1"  = 0 || %{_initrddir}/clamav-milter condrestart >/dev/null || :
 
-%pre exim
-/usr/sbin/fedora-useradd  5 -r -s /sbin/nologin -d %clameximstatedir -M \
-                            -c 'Clamav Exim User' -g exim %clameximuser &>/dev/null || :
-
-%post exim
-/sbin/chkconfig --add clamd.exim
-test -e %clameximlog || {
-	touch %clameximlog
-	chmod 0620             %clameximlog
-	chown root:exim %clameximlog
-}
-
-%preun exim
-test "$1" != 0 || %{_initrddir}/clamd.exim stop &>/dev/null || :
-test "$1" != 0 || /sbin/chkconfig --del clamd.exim
-
-%postun exim
-test "$1" != 0 || /usr/sbin/fedora-userdel  %{clameximuser} &>/dev/null || :
-test "$1"  = 0 || %{_initrddir}/clamd.exim condrestart >/dev/null || :
-
 
 %post   lib -p /sbin/ldconfig
 %postun lib -p /sbin/ldconfig
@@ -488,19 +412,6 @@
 
 ## -----------------------
 
-%files exim
-%defattr(-,root,root,-)
-%_sbindir/clamd.exim
-%config %{_initrddir}/clamd.exim
-%config(noreplace) %verify(not mtime) %{_sysconfdir}/clamd.d/exim.conf
-%config(noreplace) %verify(not mtime) %{_sysconfdir}/sysconfig/clamd.exim
-%config(noreplace) %verify(not mtime) %{_sysconfdir}/logrotate.d/clamd.exim
-%attr(0750,%clameximuser,exim) %dir %clameximstatedir
-%ghost %clameximstatedir/*
-%ghost %attr(0620,root,exim) %verify(not size md5 mtime) %clameximlog
-
-## -----------------------
-
 %files milter
 %defattr(-,root,root,-)
 %doc clamav-milter/INSTALL
@@ -515,6 +426,12 @@
 %endif	# _without_milter
 
 %changelog
+* 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
 



From fedora-extras-commits at redhat.com  Sat Sep 17 09:01:24 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sat, 17 Sep 2005 05:01:24 -0400
Subject: rpms/clamav/FC-4 clamav.spec,1.27,1.28
Message-ID: <200509170901.j8H91sBj002169@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/clamav/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2121/FC-4

Modified Files:
	clamav.spec 
Log Message:
- 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



Index: clamav.spec
===================================================================
RCS file: /cvs/extras/rpms/clamav/FC-4/clamav.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- clamav.spec	10 Sep 2005 11:20:32 -0000	1.27
+++ clamav.spec	17 Sep 2005 09:01:17 -0000	1.28
@@ -14,9 +14,6 @@
 %global milterlog	%_var/log/clamd.milter
 %global milteruser	clamilt
 %global milterstatedir	%_var/run/clamav-milter
-%global clameximlog	%_var/log/clamd.exim
-%global clameximuser	clamexim
-%global clameximstatedir %_var/run/clamd.exim
 %global pkgdatadir	%_datadir/%name
 
 
@@ -24,14 +21,14 @@
 
 Summary:	End-user tools for the Clam Antivirus scanner
 Name:		clamav
-Version:	0.86.2
-Release:	%release_func 5
+Version:	0.87
+Release:	%release_func 1
 
 License:	GPL
 Group:		Applications/File
 URL:		http://www.clamav.net
 Source0:	http://download.sourceforge.net/sourceforge/clamav/%{name}-%{version}.tar.gz
-#Source999:	http://download.sourceforge.net/sourceforge/clamav/%{name}-%{version}.tar.gz.sig
+Source999:	http://download.sourceforge.net/sourceforge/clamav/%{name}-%{version}.tar.gz.sig
 Source1:	clamd-wrapper
 Source2:	clamd.sysconfig
 Source3:	clamd.logrotate
@@ -42,7 +39,6 @@
 Patch20:	clamav-0.70-user.patch
 Patch21:	clamav-0.70-path.patch
 Patch22:	clamav-0.80-initoff.patch
-Patch23:	clamav-0.86.2-timeout.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root
 Requires:	clamav-lib = %{version}-%{release}
 Requires:	data(clamav)
@@ -110,21 +106,6 @@
 Requires(pre):		fedora-usermgmt >= 0.7
 Requires(postun):	fedora-usermgmt >= 0.7
 
-%package exim
-Summary:	Exim d??mon configuration for the Clam Antivirus scanner
-Group:		System Environment/Daemons
-## For now, use this as a placeholder. Later, generate separate -sysv
-## and -minit subpackages
-Requires:	init(clamav-exim)
-Provides:	init(clamav-exim)
-Requires(pre):		exim
-Requires(pre):		%_initrddir
-Requires(postun):	%_initrddir initscripts
-Requires(post):		chkconfig coreutils
-Requires(preun):	chkconfig initscripts
-Requires(pre):		fedora-usermgmt >= 0.7
-Requires(postun):	fedora-usermgmt >= 0.7
-
 
 %description
 Clam AntiVirus is an anti-virus toolkit for UNIX. The main purpose of this
@@ -177,22 +158,6 @@
 
 THIS PACKAGE IS TO BE CONSIDERED AS EXPERIMENTAL!
 
-%description exim
-This package contains files which are needed to run the clamav d??mon for use
-by the Exim MTA. It can be activated by adding
-
-   av_scanner = clamd:%clameximstatedir/clamd.sock 
-
-to your exim.conf, and using the 'malware' condition in the data ACL, 
-as follows:
-
-   deny message = This message contains malware ($malware_name)
-      demime = *
-      malware = *
-
-For further details of Exim content scanning, see chapter 40 of the Exim 
-specification: http://www.exim.org/exim-html-4.50/doc/html/spec_40.html
-
 ## ------------------------------------------------------------
 
 %prep
@@ -200,7 +165,6 @@
 %patch20 -p1 -b .user
 %patch21 -p1 -b .path
 %patch22 -p1 -b .initoff
-%patch23 -p1 -b .timeout
 
 perl -pi -e 's!^(#?LogFile ).*!\1/var/log/clamd.!g;
 	     s!^#?(LocalSocket ).*!\1/var/run/clamd./clamd.sock!g;
@@ -260,7 +224,6 @@
 	${RPM_BUILD_ROOT}%{_sysconfdir}/{clamd.d,cron.d,logrotate.d,sysconfig} \
 	${RPM_BUILD_ROOT}%{_var}/log \
 	${RPM_BUILD_ROOT}%milterstatedir \
-	${RPM_BUILD_ROOT}%clameximstatedir \
 	${RPM_BUILD_ROOT}%pkgdatadir/template \
 	${RPM_BUILD_ROOT}%{_initrddir}
 
@@ -303,34 +266,15 @@
    $RPM_BUILD_ROOT%pkgdatadir/freshclam-sleep
 
 
-#### The Exim stuff
+%if 0%{!?_without_milter:1}
+#### The milter stuff
 
 function subst() {
-	sed -e "s!!$3!g;s!!$4!g;""$5" "$1" >"$RPM_BUILD_ROOT$2"
+	sed -e 's!!milter!g;s!!%milteruser!g;'"$3" "$1" >"$RPM_BUILD_ROOT$2"
 }
 
-subst etc/clamd.conf %_sysconfdir/clamd.d/exim.conf exim %clameximuser \
-	's!^##*\(\(LogFile\|LocalSocket\|PidFile\|User\)\s\|\(StreamSaveToDisk\|ScanMail\|LogTime\|ScanArchive\)$\)!\1!;s!^Example!#Example!;'
 
-
-subst %{SOURCE7} %_initrddir/clamd.exim exim %clameximuser ''
-chmod 0755 $RPM_BUILD_ROOT%_initrddir/clamd.exim
-subst %{SOURCE3} %_sysconfdir/logrotate.d/clamd.exim exim %clameximuser ''
-
-cat <$RPM_BUILD_ROOT%_sysconfdir/sysconfig/clamd.exim
-CLAMD_CONFIG='%_sysconfdir/clamd.d/exim.conf'
-CLAMD_SOCKET=%clameximstatedir/clamd.sock
-EOF
-
-mkdir -p $RPM_BUILD_ROOT/%clameximstatedir
-ln -sf clamd $RPM_BUILD_ROOT%_sbindir/clamd.exim
-
-touch $RPM_BUILD_ROOT%clameximstatedir/clamd.sock $RPM_BUILD_ROOT%clameximlog
-
-%if 0%{!?_without_milter:1}
-#### The milter stuff
-
-subst etc/clamd.conf /etc/clamd.d/milter.conf milter %milteruser \
+subst etc/clamd.conf /etc/clamd.d/milter.conf \
 	's!^##*\(\(LogFile\|LocalSocket\|PidFile\|User\)\s\|\(StreamSaveToDisk\|ScanMail\)$\)!\1!;'
 
 
@@ -391,26 +335,6 @@
 test "$1" != 0 || /usr/sbin/fedora-groupdel %{milteruser} &>/dev/null || :
 test "$1"  = 0 || %{_initrddir}/clamav-milter condrestart >/dev/null || :
 
-%pre exim
-/usr/sbin/fedora-useradd  5 -r -s /sbin/nologin -d %clameximstatedir -M \
-                            -c 'Clamav Exim User' -g exim %clameximuser &>/dev/null || :
-
-%post exim
-/sbin/chkconfig --add clamd.exim
-test -e %clameximlog || {
-	touch %clameximlog
-	chmod 0620             %clameximlog
-	chown root:exim %clameximlog
-}
-
-%preun exim
-test "$1" != 0 || %{_initrddir}/clamd.exim stop &>/dev/null || :
-test "$1" != 0 || /sbin/chkconfig --del clamd.exim
-
-%postun exim
-test "$1" != 0 || /usr/sbin/fedora-userdel  %{clameximuser} &>/dev/null || :
-test "$1"  = 0 || %{_initrddir}/clamd.exim condrestart >/dev/null || :
-
 
 %post   lib -p /sbin/ldconfig
 %postun lib -p /sbin/ldconfig
@@ -488,19 +412,6 @@
 
 ## -----------------------
 
-%files exim
-%defattr(-,root,root,-)
-%_sbindir/clamd.exim
-%config %{_initrddir}/clamd.exim
-%config(noreplace) %verify(not mtime) %{_sysconfdir}/clamd.d/exim.conf
-%config(noreplace) %verify(not mtime) %{_sysconfdir}/sysconfig/clamd.exim
-%config(noreplace) %verify(not mtime) %{_sysconfdir}/logrotate.d/clamd.exim
-%attr(0750,%clameximuser,exim) %dir %clameximstatedir
-%ghost %clameximstatedir/*
-%ghost %attr(0620,root,exim) %verify(not size md5 mtime) %clameximlog
-
-## -----------------------
-
 %files milter
 %defattr(-,root,root,-)
 %doc clamav-milter/INSTALL
@@ -515,6 +426,12 @@
 %endif	# _without_milter
 
 %changelog
+* 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
 



From fedora-extras-commits at redhat.com  Sat Sep 17 09:03:00 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sat, 17 Sep 2005 05:03:00 -0400
Subject: rpms/clamav/FC-3 clamav.spec,1.17,1.18
Message-ID: <200509170903.j8H93Vsi002195@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/clamav/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2175/FC-3

Modified Files:
	clamav.spec 
Log Message:
- updated to 0.87 (SECURITY)
- removed -timeout patch; it is solved upstream



Index: clamav.spec
===================================================================
RCS file: /cvs/extras/rpms/clamav/FC-3/clamav.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- clamav.spec	29 Jul 2005 16:37:45 -0000	1.17
+++ clamav.spec	17 Sep 2005 09:02:55 -0000	1.18
@@ -21,14 +21,14 @@
 
 Summary:	End-user tools for the Clam Antivirus scanner
 Name:		clamav
-Version:	0.86.2
-Release:	%release_func 4
+Version:	0.87
+Release:	%release_func 1
 
 License:	GPL
 Group:		Applications/File
 URL:		http://www.clamav.net
 Source0:	http://download.sourceforge.net/sourceforge/clamav/%{name}-%{version}.tar.gz
-#Source999:	http://download.sourceforge.net/sourceforge/clamav/%{name}-%{version}.tar.gz.sig
+Source999:	http://download.sourceforge.net/sourceforge/clamav/%{name}-%{version}.tar.gz.sig
 Source1:	clamd-wrapper
 Source2:	clamd.sysconfig
 Source3:	clamd.logrotate
@@ -39,7 +39,6 @@
 Patch20:	clamav-0.70-user.patch
 Patch21:	clamav-0.70-path.patch
 Patch22:	clamav-0.80-initoff.patch
-Patch23:	clamav-0.86.2-timeout.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root
 Requires:	clamav-lib = %{version}-%{release}
 Requires:	data(clamav)
@@ -166,7 +165,6 @@
 %patch20 -p1 -b .user
 %patch21 -p1 -b .path
 %patch22 -p1 -b .initoff
-%patch23 -p1 -b .timeout
 
 perl -pi -e 's!^(#?LogFile ).*!\1/var/log/clamd.!g;
 	     s!^#?(LocalSocket ).*!\1/var/run/clamd./clamd.sock!g;
@@ -428,6 +426,10 @@
 %endif	# _without_milter
 
 %changelog
+* Sat Sep 17 2005 Enrico Scholz  - 0.87-1
+- updated to 0.87 (SECURITY)
+- removed -timeout patch; it is solved upstream
+
 * 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



From fedora-extras-commits at redhat.com  Sat Sep 17 09:08:06 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sat, 17 Sep 2005 05:08:06 -0400
Subject: common tobuild,1.2214,1.2215
Message-ID: <200509170908.j8H986th002335@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2316

Modified Files:
	tobuild 
Log Message:
request build of rpms/clamav/devel clamav-0_87-1_fc5 for devel


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.2214
retrieving revision 1.2215
diff -u -r1.2214 -r1.2215
--- tobuild	10 Sep 2005 11:20:51 -0000	1.2214
+++ tobuild	17 Sep 2005 09:08:04 -0000	1.2215
@@ -38,3 +38,4 @@
 gemi	rpms/clisp/FC-3	clisp-2_34-5_fc3	fc3
 katzj	rpms/perl-Class-Trigger/devel	perl-Class-Trigger-0_09-3_fc5	devel
 dwmw2	rpms/clamav/FC-4	clamav-0_86_2-5_fc4	fc4
+ensc	rpms/clamav/devel	clamav-0_87-1_fc5	devel



From fedora-extras-commits at redhat.com  Sat Sep 17 09:11:01 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sat, 17 Sep 2005 05:11:01 -0400
Subject: common tobuild,1.2215,1.2216
Message-ID: <200509170911.j8H9B1xc002451@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2429

Modified Files:
	tobuild 
Log Message:
request build of rpms/clamav/FC-4 clamav-0_87-1_fc4 for fc4


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.2215
retrieving revision 1.2216
diff -u -r1.2215 -r1.2216
--- tobuild	17 Sep 2005 09:08:04 -0000	1.2215
+++ tobuild	17 Sep 2005 09:10:59 -0000	1.2216
@@ -39,3 +39,4 @@
 katzj	rpms/perl-Class-Trigger/devel	perl-Class-Trigger-0_09-3_fc5	devel
 dwmw2	rpms/clamav/FC-4	clamav-0_86_2-5_fc4	fc4
 ensc	rpms/clamav/devel	clamav-0_87-1_fc5	devel
+ensc	rpms/clamav/FC-4	clamav-0_87-1_fc4	fc4



From fedora-extras-commits at redhat.com  Sat Sep 17 09:12:53 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sat, 17 Sep 2005 05:12:53 -0400
Subject: common tobuild,1.2216,1.2217
Message-ID: <200509170912.j8H9CrJs002532@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2513

Modified Files:
	tobuild 
Log Message:
request build of rpms/clamav/FC-3 clamav-0_87-1_fc3 for fc3


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.2216
retrieving revision 1.2217
diff -u -r1.2216 -r1.2217
--- tobuild	17 Sep 2005 09:10:59 -0000	1.2216
+++ tobuild	17 Sep 2005 09:12:51 -0000	1.2217
@@ -40,3 +40,4 @@
 dwmw2	rpms/clamav/FC-4	clamav-0_86_2-5_fc4	fc4
 ensc	rpms/clamav/devel	clamav-0_87-1_fc5	devel
 ensc	rpms/clamav/FC-4	clamav-0_87-1_fc4	fc4
+ensc	rpms/clamav/FC-3	clamav-0_87-1_fc3	fc3



From fedora-extras-commits at redhat.com  Sat Sep 17 09:52:36 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sat, 17 Sep 2005 05:52:36 -0400
Subject: common tobuild,1.2217,1.2218
Message-ID: <200509170952.j8H9qax5002656@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2637

Modified Files:
	tobuild 
Log Message:
clamav submitted through 'make plague' per Enrico's request.


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.2217
retrieving revision 1.2218
diff -u -r1.2217 -r1.2218
--- tobuild	17 Sep 2005 09:12:51 -0000	1.2217
+++ tobuild	17 Sep 2005 09:52:33 -0000	1.2218
@@ -37,7 +37,3 @@
 joost	rpms/fpc/FC-3	fpc-2_0_0-1	fc3
 gemi	rpms/clisp/FC-3	clisp-2_34-5_fc3	fc3
 katzj	rpms/perl-Class-Trigger/devel	perl-Class-Trigger-0_09-3_fc5	devel
-dwmw2	rpms/clamav/FC-4	clamav-0_86_2-5_fc4	fc4
-ensc	rpms/clamav/devel	clamav-0_87-1_fc5	devel
-ensc	rpms/clamav/FC-4	clamav-0_87-1_fc4	fc4
-ensc	rpms/clamav/FC-3	clamav-0_87-1_fc3	fc3



From fedora-extras-commits at redhat.com  Sat Sep 17 13:17:15 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Sat, 17 Sep 2005 09:17:15 -0400
Subject: rpms/check/devel check.spec,1.1,1.2
Message-ID: <200509171317.j8HDHFkd008340@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/check/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8287/devel

Modified Files:
	check.spec 
Log Message:

Trim down check package, get rid of so files (and only build -devel).



Index: check.spec
===================================================================
RCS file: /cvs/extras/rpms/check/devel/check.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- check.spec	12 Sep 2005 14:23:07 -0000	1.1
+++ check.spec	17 Sep 2005 13:17:13 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		check
 Version:	0.9.3
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	A unit test framework for C
 Source0:	http://download.sourceforge.net/check/%{name}-%{version}.tar.gz
 Group:		Development/Tools
@@ -8,8 +8,6 @@
 URL:		http://check.sourceforge.net/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	docbook-utils
-Patch0:		check-0.9.2-shared.patch
-Patch1:		check-0.9.2-fPIC.patch
 
 %description
 Check is a unit test framework for C. It features a simple interface for 
@@ -21,15 +19,17 @@
 %package devel
 Summary:	Libraries and headers for developing programs with check
 Group:		Development/Libraries
-Requires:	%{name} = %{version}-%{release}
+Provides:	%{name} = %{version}-%{release}
 
 %description devel
-%{summary}.
+Check is a unit test framework for C. It features a simple interface for
+defining unit tests, putting little in the way of the developer. Tests
+are run in a separate address space, so Check can catch both assertion
+failures and code errors that cause segmentation faults or other signals.
+The output from unit tests can be used within source code editors and IDEs.
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
 
 %build
 %configure
@@ -38,30 +38,21 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT install
-cd $RPM_BUILD_ROOT/%{_libdir}
-chmod +x libcheck.so.0.0.0
-ln -s libcheck.so.0.0.0 libcheck.so.0
-ln -s libcheck.so.0.0.0 libcheck.so
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post -p /sbin/ldconfig
-
-%postun -p /sbin/ldconfig
-
-%files
-%defattr(-,root,root,-)
-%{_libdir}/libcheck.so.*
-%{_datadir}/doc/%{name}-%{version}
-%{_datadir}/aclocal/check.m4
-
 %files devel
 %defattr(-,root,root,-)
 %{_includedir}/check.h
 %{_libdir}/libcheck.a
-%{_libdir}/libcheck.so
+%{_datadir}/doc/%{name}-%{version}
+%{_datadir}/aclocal/check.m4
 
 %changelog
+* Sat Sep 17 2005 Tom "spot" Callaway  0.9.2-2
+- get rid of the so file (not needed)
+- only make devel package
+
 * Sun Aug 14 2005 Tom "spot" Callaway  0.9.2-1
 - initial package for Fedora Extras



From fedora-extras-commits at redhat.com  Sat Sep 17 13:17:09 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Sat, 17 Sep 2005 09:17:09 -0400
Subject: rpms/check/FC-3 check.spec,1.1,1.2
Message-ID: <200509171317.j8HDHd7v008343@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/check/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8287/FC-3

Modified Files:
	check.spec 
Log Message:

Trim down check package, get rid of so files (and only build -devel).



Index: check.spec
===================================================================
RCS file: /cvs/extras/rpms/check/FC-3/check.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- check.spec	12 Sep 2005 14:23:07 -0000	1.1
+++ check.spec	17 Sep 2005 13:17:06 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		check
 Version:	0.9.3
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	A unit test framework for C
 Source0:	http://download.sourceforge.net/check/%{name}-%{version}.tar.gz
 Group:		Development/Tools
@@ -8,8 +8,6 @@
 URL:		http://check.sourceforge.net/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	docbook-utils
-Patch0:		check-0.9.2-shared.patch
-Patch1:		check-0.9.2-fPIC.patch
 
 %description
 Check is a unit test framework for C. It features a simple interface for 
@@ -21,15 +19,17 @@
 %package devel
 Summary:	Libraries and headers for developing programs with check
 Group:		Development/Libraries
-Requires:	%{name} = %{version}-%{release}
+Provides:	%{name} = %{version}-%{release}
 
 %description devel
-%{summary}.
+Check is a unit test framework for C. It features a simple interface for
+defining unit tests, putting little in the way of the developer. Tests
+are run in a separate address space, so Check can catch both assertion
+failures and code errors that cause segmentation faults or other signals.
+The output from unit tests can be used within source code editors and IDEs.
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
 
 %build
 %configure
@@ -38,30 +38,21 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT install
-cd $RPM_BUILD_ROOT/%{_libdir}
-chmod +x libcheck.so.0.0.0
-ln -s libcheck.so.0.0.0 libcheck.so.0
-ln -s libcheck.so.0.0.0 libcheck.so
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post -p /sbin/ldconfig
-
-%postun -p /sbin/ldconfig
-
-%files
-%defattr(-,root,root,-)
-%{_libdir}/libcheck.so.*
-%{_datadir}/doc/%{name}-%{version}
-%{_datadir}/aclocal/check.m4
-
 %files devel
 %defattr(-,root,root,-)
 %{_includedir}/check.h
 %{_libdir}/libcheck.a
-%{_libdir}/libcheck.so
+%{_datadir}/doc/%{name}-%{version}
+%{_datadir}/aclocal/check.m4
 
 %changelog
+* Sat Sep 17 2005 Tom "spot" Callaway  0.9.2-2
+- get rid of the so file (not needed)
+- only make devel package
+
 * Sun Aug 14 2005 Tom "spot" Callaway  0.9.2-1
 - initial package for Fedora Extras



From fedora-extras-commits at redhat.com  Sat Sep 17 13:17:09 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Sat, 17 Sep 2005 09:17:09 -0400
Subject: rpms/check/FC-4 check.spec,1.1,1.2
Message-ID: <200509171317.j8HDHeB7008346@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/check/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8287/FC-4

Modified Files:
	check.spec 
Log Message:

Trim down check package, get rid of so files (and only build -devel).



Index: check.spec
===================================================================
RCS file: /cvs/extras/rpms/check/FC-4/check.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- check.spec	12 Sep 2005 14:23:07 -0000	1.1
+++ check.spec	17 Sep 2005 13:17:07 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		check
 Version:	0.9.3
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	A unit test framework for C
 Source0:	http://download.sourceforge.net/check/%{name}-%{version}.tar.gz
 Group:		Development/Tools
@@ -8,8 +8,6 @@
 URL:		http://check.sourceforge.net/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	docbook-utils
-Patch0:		check-0.9.2-shared.patch
-Patch1:		check-0.9.2-fPIC.patch
 
 %description
 Check is a unit test framework for C. It features a simple interface for 
@@ -21,15 +19,17 @@
 %package devel
 Summary:	Libraries and headers for developing programs with check
 Group:		Development/Libraries
-Requires:	%{name} = %{version}-%{release}
+Provides:	%{name} = %{version}-%{release}
 
 %description devel
-%{summary}.
+Check is a unit test framework for C. It features a simple interface for
+defining unit tests, putting little in the way of the developer. Tests
+are run in a separate address space, so Check can catch both assertion
+failures and code errors that cause segmentation faults or other signals.
+The output from unit tests can be used within source code editors and IDEs.
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
 
 %build
 %configure
@@ -38,30 +38,21 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT install
-cd $RPM_BUILD_ROOT/%{_libdir}
-chmod +x libcheck.so.0.0.0
-ln -s libcheck.so.0.0.0 libcheck.so.0
-ln -s libcheck.so.0.0.0 libcheck.so
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post -p /sbin/ldconfig
-
-%postun -p /sbin/ldconfig
-
-%files
-%defattr(-,root,root,-)
-%{_libdir}/libcheck.so.*
-%{_datadir}/doc/%{name}-%{version}
-%{_datadir}/aclocal/check.m4
-
 %files devel
 %defattr(-,root,root,-)
 %{_includedir}/check.h
 %{_libdir}/libcheck.a
-%{_libdir}/libcheck.so
+%{_datadir}/doc/%{name}-%{version}
+%{_datadir}/aclocal/check.m4
 
 %changelog
+* Sat Sep 17 2005 Tom "spot" Callaway  0.9.2-2
+- get rid of the so file (not needed)
+- only make devel package
+
 * Sun Aug 14 2005 Tom "spot" Callaway  0.9.2-1
 - initial package for Fedora Extras



From fedora-extras-commits at redhat.com  Sat Sep 17 14:07:15 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Sat, 17 Sep 2005 10:07:15 -0400
Subject: rpms/tinyerp/devel tinyerp-2.1.3-client-syspath.patch, 1.1,
	1.2 tinyerp.spec, 1.1, 1.2
Message-ID: <200509171407.j8HE7FT2009997@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/tinyerp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9929/devel

Modified Files:
	tinyerp-2.1.3-client-syspath.patch tinyerp.spec 
Log Message:

fix missing plugin (Dan Hor??k)


tinyerp-2.1.3-client-syspath.patch:

Index: tinyerp-2.1.3-client-syspath.patch
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/devel/tinyerp-2.1.3-client-syspath.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tinyerp-2.1.3-client-syspath.patch	18 Aug 2005 19:31:23 -0000	1.1
+++ tinyerp-2.1.3-client-syspath.patch	17 Sep 2005 14:07:13 -0000	1.2
@@ -1,5 +1,14 @@
---- tinyerp-2.1.3/tinyerp-client-2.1.3/setup.py.BAD	2005-08-01 19:29:30.000000000 -0500
-+++ tinyerp-2.1.3/tinyerp-client-2.1.3/setup.py	2005-08-01 19:29:39.000000000 -0500
+--- tinyerp-2.1.3/tinyerp-client-2.1.3/setup.py.BAD	2005-09-17 11:17:54.000000000 +0200
++++ tinyerp-2.1.3/tinyerp-client-2.1.3/setup.py	2005-09-17 11:35:29.000000000 +0200
+@@ -46,7 +46,7 @@
+               ['bin/terp.glade'])]
+     return files
+ 
+-included_plugins = ['auction_lots_html', 'slideshow', 'workflow_print']
++included_plugins = ['auction_lots_html', 'huissier', 'slideshow', 'workflow_print']
+ 
+ def find_plugins():
+     for plugin in included_plugins:
 @@ -54,7 +54,7 @@
          for dirpath, dirnames, filenames in os.walk(path):
              if '__init__.py' in filenames:
@@ -9,7 +18,7 @@
  
  def translations():
      trans = []
-@@ -96,19 +96,19 @@
+@@ -96,19 +96,20 @@
        translations     = translations(),
        pot_file         = 'bin/po/terp-msg.pot',
        scripts          = ['bin/tinyerp-client'],
@@ -37,7 +46,8 @@
 +                          'tinyerp_client.widget',
 +                          'tinyerp_client.widget.form',
 +                          'tinyerp_client.widget.search',
-+                          'tinyerp_client.widget.tree'] + list(find_plugins()),
++                          'tinyerp_client.widget.tree',
++                          'tinyerp_client.plugins'] + list(find_plugins()),
 +      package_dir      = {'tinyerp_client': 'bin'},
        )
  


Index: tinyerp.spec
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/devel/tinyerp.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tinyerp.spec	18 Aug 2005 19:31:23 -0000	1.1
+++ tinyerp.spec	17 Sep 2005 14:07:13 -0000	1.2
@@ -1,9 +1,9 @@
-%{?!pyver: %define pyver %(python -c 'import sys;print(sys.version[0:3])')}
+%{?!pyver: %define pyver %(%{__python} -c 'import sys;print(sys.version[0:3])')}
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:		tinyerp
 Version:	2.1.3
-Release:	6%{?dist}
+Release:	7%{?dist}
 License:	GPL
 Group:		Applications/Productivity
 Summary:	Open Source ERP Client
@@ -102,6 +102,9 @@
 %{_mandir}/man1/tinyerp-server.*
 
 %changelog
+* Sat Sep 17 2005 Tom "spot" Callaway  2.1.3-7
+- fix missing plugin (Dan Hor??k)
+
 * Thu Aug 18 2005 Tom "spot" Callaway  2.1.3-6
 - use Xvfb to fake DISPLAY
 



From fedora-extras-commits at redhat.com  Sat Sep 17 14:07:14 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Sat, 17 Sep 2005 10:07:14 -0400
Subject: rpms/tinyerp/FC-4 tinyerp-2.1.3-client-syspath.patch, 1.1,
	1.2 tinyerp.spec, 1.1, 1.2
Message-ID: <200509171407.j8HE7E4U009983@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/tinyerp/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9929/FC-4

Modified Files:
	tinyerp-2.1.3-client-syspath.patch tinyerp.spec 
Log Message:

fix missing plugin (Dan Hor??k)


tinyerp-2.1.3-client-syspath.patch:

Index: tinyerp-2.1.3-client-syspath.patch
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/FC-4/tinyerp-2.1.3-client-syspath.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tinyerp-2.1.3-client-syspath.patch	18 Aug 2005 19:31:23 -0000	1.1
+++ tinyerp-2.1.3-client-syspath.patch	17 Sep 2005 14:07:11 -0000	1.2
@@ -1,5 +1,14 @@
---- tinyerp-2.1.3/tinyerp-client-2.1.3/setup.py.BAD	2005-08-01 19:29:30.000000000 -0500
-+++ tinyerp-2.1.3/tinyerp-client-2.1.3/setup.py	2005-08-01 19:29:39.000000000 -0500
+--- tinyerp-2.1.3/tinyerp-client-2.1.3/setup.py.BAD	2005-09-17 11:17:54.000000000 +0200
++++ tinyerp-2.1.3/tinyerp-client-2.1.3/setup.py	2005-09-17 11:35:29.000000000 +0200
+@@ -46,7 +46,7 @@
+               ['bin/terp.glade'])]
+     return files
+ 
+-included_plugins = ['auction_lots_html', 'slideshow', 'workflow_print']
++included_plugins = ['auction_lots_html', 'huissier', 'slideshow', 'workflow_print']
+ 
+ def find_plugins():
+     for plugin in included_plugins:
 @@ -54,7 +54,7 @@
          for dirpath, dirnames, filenames in os.walk(path):
              if '__init__.py' in filenames:
@@ -9,7 +18,7 @@
  
  def translations():
      trans = []
-@@ -96,19 +96,19 @@
+@@ -96,19 +96,20 @@
        translations     = translations(),
        pot_file         = 'bin/po/terp-msg.pot',
        scripts          = ['bin/tinyerp-client'],
@@ -37,7 +46,8 @@
 +                          'tinyerp_client.widget',
 +                          'tinyerp_client.widget.form',
 +                          'tinyerp_client.widget.search',
-+                          'tinyerp_client.widget.tree'] + list(find_plugins()),
++                          'tinyerp_client.widget.tree',
++                          'tinyerp_client.plugins'] + list(find_plugins()),
 +      package_dir      = {'tinyerp_client': 'bin'},
        )
  


Index: tinyerp.spec
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/FC-4/tinyerp.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tinyerp.spec	18 Aug 2005 19:31:23 -0000	1.1
+++ tinyerp.spec	17 Sep 2005 14:07:11 -0000	1.2
@@ -1,9 +1,9 @@
-%{?!pyver: %define pyver %(python -c 'import sys;print(sys.version[0:3])')}
+%{?!pyver: %define pyver %(%{__python} -c 'import sys;print(sys.version[0:3])')}
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:		tinyerp
 Version:	2.1.3
-Release:	6%{?dist}
+Release:	7%{?dist}
 License:	GPL
 Group:		Applications/Productivity
 Summary:	Open Source ERP Client
@@ -102,6 +102,9 @@
 %{_mandir}/man1/tinyerp-server.*
 
 %changelog
+* Sat Sep 17 2005 Tom "spot" Callaway  2.1.3-7
+- fix missing plugin (Dan Hor??k)
+
 * Thu Aug 18 2005 Tom "spot" Callaway  2.1.3-6
 - use Xvfb to fake DISPLAY
 



From fedora-extras-commits at redhat.com  Sat Sep 17 14:07:07 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Sat, 17 Sep 2005 10:07:07 -0400
Subject: rpms/tinyerp/FC-3 tinyerp-2.1.3-client-syspath.patch, 1.1,
	1.2 tinyerp.spec, 1.1, 1.2
Message-ID: <200509171407.j8HE7iXD010006@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/tinyerp/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9929/FC-3

Modified Files:
	tinyerp-2.1.3-client-syspath.patch tinyerp.spec 
Log Message:

fix missing plugin (Dan Hor??k)


tinyerp-2.1.3-client-syspath.patch:

Index: tinyerp-2.1.3-client-syspath.patch
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/FC-3/tinyerp-2.1.3-client-syspath.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tinyerp-2.1.3-client-syspath.patch	18 Aug 2005 19:31:23 -0000	1.1
+++ tinyerp-2.1.3-client-syspath.patch	17 Sep 2005 14:06:59 -0000	1.2
@@ -1,5 +1,14 @@
---- tinyerp-2.1.3/tinyerp-client-2.1.3/setup.py.BAD	2005-08-01 19:29:30.000000000 -0500
-+++ tinyerp-2.1.3/tinyerp-client-2.1.3/setup.py	2005-08-01 19:29:39.000000000 -0500
+--- tinyerp-2.1.3/tinyerp-client-2.1.3/setup.py.BAD	2005-09-17 11:17:54.000000000 +0200
++++ tinyerp-2.1.3/tinyerp-client-2.1.3/setup.py	2005-09-17 11:35:29.000000000 +0200
+@@ -46,7 +46,7 @@
+               ['bin/terp.glade'])]
+     return files
+ 
+-included_plugins = ['auction_lots_html', 'slideshow', 'workflow_print']
++included_plugins = ['auction_lots_html', 'huissier', 'slideshow', 'workflow_print']
+ 
+ def find_plugins():
+     for plugin in included_plugins:
 @@ -54,7 +54,7 @@
          for dirpath, dirnames, filenames in os.walk(path):
              if '__init__.py' in filenames:
@@ -9,7 +18,7 @@
  
  def translations():
      trans = []
-@@ -96,19 +96,19 @@
+@@ -96,19 +96,20 @@
        translations     = translations(),
        pot_file         = 'bin/po/terp-msg.pot',
        scripts          = ['bin/tinyerp-client'],
@@ -37,7 +46,8 @@
 +                          'tinyerp_client.widget',
 +                          'tinyerp_client.widget.form',
 +                          'tinyerp_client.widget.search',
-+                          'tinyerp_client.widget.tree'] + list(find_plugins()),
++                          'tinyerp_client.widget.tree',
++                          'tinyerp_client.plugins'] + list(find_plugins()),
 +      package_dir      = {'tinyerp_client': 'bin'},
        )
  


Index: tinyerp.spec
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/FC-3/tinyerp.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tinyerp.spec	18 Aug 2005 19:31:23 -0000	1.1
+++ tinyerp.spec	17 Sep 2005 14:06:59 -0000	1.2
@@ -1,9 +1,9 @@
-%{?!pyver: %define pyver %(python -c 'import sys;print(sys.version[0:3])')}
+%{?!pyver: %define pyver %(%{__python} -c 'import sys;print(sys.version[0:3])')}
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:		tinyerp
 Version:	2.1.3
-Release:	6%{?dist}
+Release:	7%{?dist}
 License:	GPL
 Group:		Applications/Productivity
 Summary:	Open Source ERP Client
@@ -102,6 +102,9 @@
 %{_mandir}/man1/tinyerp-server.*
 
 %changelog
+* Sat Sep 17 2005 Tom "spot" Callaway  2.1.3-7
+- fix missing plugin (Dan Hor??k)
+
 * Thu Aug 18 2005 Tom "spot" Callaway  2.1.3-6
 - use Xvfb to fake DISPLAY
 



From fedora-extras-commits at redhat.com  Sat Sep 17 14:16:32 2005
From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc))
Date: Sat, 17 Sep 2005 10:16:32 -0400
Subject: owners owners.list,1.227,1.228
Message-ID: <200509171416.j8HEGW20010080@cvs-int.fedora.redhat.com>

Author: buc

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10060

Modified Files:
	owners.list 
Log Message:



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.227
retrieving revision 1.228
diff -u -r1.227 -r1.228
--- owners.list	17 Sep 2005 06:38:03 -0000	1.227
+++ owners.list	17 Sep 2005 14:16:30 -0000	1.228
@@ -149,6 +149,7 @@
 Fedora Extras|eet|A library designed to write an arbitary set of chunks of data to a file|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
 Fedora Extras|elmo|Terminal-based mail client|gauret at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|emacs-auctex|Enhanced TeX modes for Emacsen|ed at eh3.com|extras-qa at fedoraproject.org|
+Fedora Extras|enca|Character set analyzer and detector|dmitry at butskoy.name|extras-qa at fedoraproject.org|
 Fedora Extras|enchant|An Enchanting Spell Checking Library|uwog at uwog.net|extras-qa at fedoraproject.org|
 Fedora Extras|enemies-of-carlotta|A simple mailing list manager|redhat-bugzilla at camperquake.de|extras-qa at fedoraproject.org|
 Fedora Extras|enigma|Clone of the ATARI game Oxyd|fedora at leemhuis.info|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sat Sep 17 14:21:21 2005
From: fedora-extras-commits at redhat.com (Marcin Garski (mgarski))
Date: Sat, 17 Sep 2005 10:21:21 -0400
Subject: rpms/digikam/devel digikam.spec,1.1,1.2
Message-ID: <200509171421.j8HELrhc010151@cvs-int.fedora.redhat.com>

Author: mgarski

Update of /cvs/extras/rpms/digikam/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10130

Modified Files:
	digikam.spec 
Log Message:
- Change confusing warning about Big Endian Platform



Index: digikam.spec
===================================================================
RCS file: /cvs/extras/rpms/digikam/devel/digikam.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- digikam.spec	15 Sep 2005 10:23:34 -0000	1.1
+++ digikam.spec	17 Sep 2005 14:21:18 -0000	1.2
@@ -1,12 +1,13 @@
 Name:		digikam
 Version:	0.7.4
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	A digital camera accessing & photo management application
 
 Group:		Applications/Multimedia
 License:	GPL
 URL:		http://www.digikam.org/
 Source0:	http://dl.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
+Patch0:		digikam-0.7.4-64bit-typo.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	gphoto2-devel >= 2.0.0 imlib2-devel gdbm-devel >= 1.8.0
@@ -36,6 +37,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b 64bit-typo.patch
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
@@ -48,7 +50,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT 
+make install DESTDIR=$RPM_BUILD_ROOT
 
 desktop-file-install --vendor fedora --delete-original \
 	--dir $RPM_BUILD_ROOT%{_datadir}/applications \
@@ -113,6 +115,9 @@
 %{_libdir}/libdigikam.so
 
 %changelog
+* Sat Sep 17 2005 Marcin Garski  0.7.4-3
+- Change confusing warning about Big Endian Platform
+
 * Tue Sep 13 2005 Marcin Garski  0.7.4-2
 - Spec improvements
 



From fedora-extras-commits at redhat.com  Sat Sep 17 14:27:38 2005
From: fedora-extras-commits at redhat.com (Marcin Garski (mgarski))
Date: Sat, 17 Sep 2005 10:27:38 -0400
Subject: rpms/digikam/devel digikam-0.7.4-64bit-typo.patch,NONE,1.1
Message-ID: <200509171427.j8HERcej010206@cvs-int.fedora.redhat.com>

Author: mgarski

Update of /cvs/extras/rpms/digikam/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10186

Added Files:
	digikam-0.7.4-64bit-typo.patch 
Log Message:
- Change confusing warning about Big Endian Platform


digikam-0.7.4-64bit-typo.patch:

--- NEW FILE digikam-0.7.4-64bit-typo.patch ---
--- digikam-0.7.4/digikam/sqlite/sqliteInt.h-orig	2005-08-21 05:20:42.000000000 +0200
+++ digikam-0.7.4/digikam/sqlite/sqliteInt.h	2005-09-17 15:44:54.000000000 +0200
@@ -115,7 +115,7 @@
 #   define INTPTR_TYPE int
 # else
 #   define INTPTR_TYPE long long
-#warning "WARNING: Compiling sqlite for a Big Endian Platform."
+#warning "WARNING: Compiling sqlite for a 64 bit Platform."
 #warning "WARNING: If you know this isn't true, please file a bugreport."
 # endif
 #endif



From fedora-extras-commits at redhat.com  Sat Sep 17 15:00:41 2005
From: fedora-extras-commits at redhat.com (Marcin Garski (mgarski))
Date: Sat, 17 Sep 2005 11:00:41 -0400
Subject: rpms/digikam/FC-3 digikam-0.7.4-64bit-typo.patch, NONE,
	1.1 digikam.spec, 1.1, 1.2
Message-ID: <200509171500.j8HF0f3Y010478@cvs-int.fedora.redhat.com>

Author: mgarski

Update of /cvs/extras/rpms/digikam/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10454

Modified Files:
	digikam.spec 
Added Files:
	digikam-0.7.4-64bit-typo.patch 
Log Message:
- Change confusing warning about Big Endian Platform


digikam-0.7.4-64bit-typo.patch:

--- NEW FILE digikam-0.7.4-64bit-typo.patch ---
--- digikam-0.7.4/digikam/sqlite/sqliteInt.h-orig	2005-08-21 05:20:42.000000000 +0200
+++ digikam-0.7.4/digikam/sqlite/sqliteInt.h	2005-09-17 15:44:54.000000000 +0200
@@ -115,7 +115,7 @@
 #   define INTPTR_TYPE int
 # else
 #   define INTPTR_TYPE long long
-#warning "WARNING: Compiling sqlite for a Big Endian Platform."
+#warning "WARNING: Compiling sqlite for a 64 bit Platform."
 #warning "WARNING: If you know this isn't true, please file a bugreport."
 # endif
 #endif


Index: digikam.spec
===================================================================
RCS file: /cvs/extras/rpms/digikam/FC-3/digikam.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- digikam.spec	15 Sep 2005 10:23:34 -0000	1.1
+++ digikam.spec	17 Sep 2005 15:00:39 -0000	1.2
@@ -1,12 +1,13 @@
 Name:		digikam
 Version:	0.7.4
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	A digital camera accessing & photo management application
 
 Group:		Applications/Multimedia
 License:	GPL
 URL:		http://www.digikam.org/
 Source0:	http://dl.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
+Patch0:		digikam-0.7.4-64bit-typo.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	gphoto2-devel >= 2.0.0 imlib2-devel gdbm-devel >= 1.8.0
@@ -36,6 +37,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b 64bit-typo.patch
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
@@ -48,7 +50,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT 
+make install DESTDIR=$RPM_BUILD_ROOT
 
 desktop-file-install --vendor fedora --delete-original \
 	--dir $RPM_BUILD_ROOT%{_datadir}/applications \
@@ -113,6 +115,9 @@
 %{_libdir}/libdigikam.so
 
 %changelog
+* Sat Sep 17 2005 Marcin Garski  0.7.4-3
+- Change confusing warning about Big Endian Platform
+
 * Tue Sep 13 2005 Marcin Garski  0.7.4-2
 - Spec improvements
 



From fedora-extras-commits at redhat.com  Sat Sep 17 15:02:27 2005
From: fedora-extras-commits at redhat.com (Marcin Garski (mgarski))
Date: Sat, 17 Sep 2005 11:02:27 -0400
Subject: rpms/digikam/FC-4 digikam-0.7.4-64bit-typo.patch, NONE,
	1.1 digikam.spec, 1.1, 1.2
Message-ID: <200509171503.j8HF2wBV011864@cvs-int.fedora.redhat.com>

Author: mgarski

Update of /cvs/extras/rpms/digikam/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11842

Modified Files:
	digikam.spec 
Added Files:
	digikam-0.7.4-64bit-typo.patch 
Log Message:
- Change confusing warning about Big Endian Platform


digikam-0.7.4-64bit-typo.patch:

--- NEW FILE digikam-0.7.4-64bit-typo.patch ---
--- digikam-0.7.4/digikam/sqlite/sqliteInt.h-orig	2005-08-21 05:20:42.000000000 +0200
+++ digikam-0.7.4/digikam/sqlite/sqliteInt.h	2005-09-17 15:44:54.000000000 +0200
@@ -115,7 +115,7 @@
 #   define INTPTR_TYPE int
 # else
 #   define INTPTR_TYPE long long
-#warning "WARNING: Compiling sqlite for a Big Endian Platform."
+#warning "WARNING: Compiling sqlite for a 64 bit Platform."
 #warning "WARNING: If you know this isn't true, please file a bugreport."
 # endif
 #endif


Index: digikam.spec
===================================================================
RCS file: /cvs/extras/rpms/digikam/FC-4/digikam.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- digikam.spec	15 Sep 2005 10:23:34 -0000	1.1
+++ digikam.spec	17 Sep 2005 15:02:25 -0000	1.2
@@ -1,12 +1,13 @@
 Name:		digikam
 Version:	0.7.4
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	A digital camera accessing & photo management application
 
 Group:		Applications/Multimedia
 License:	GPL
 URL:		http://www.digikam.org/
 Source0:	http://dl.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
+Patch0:		digikam-0.7.4-64bit-typo.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	gphoto2-devel >= 2.0.0 imlib2-devel gdbm-devel >= 1.8.0
@@ -36,6 +37,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b 64bit-typo.patch
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
@@ -48,7 +50,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT 
+make install DESTDIR=$RPM_BUILD_ROOT
 
 desktop-file-install --vendor fedora --delete-original \
 	--dir $RPM_BUILD_ROOT%{_datadir}/applications \
@@ -113,6 +115,9 @@
 %{_libdir}/libdigikam.so
 
 %changelog
+* Sat Sep 17 2005 Marcin Garski  0.7.4-3
+- Change confusing warning about Big Endian Platform
+
 * Tue Sep 13 2005 Marcin Garski  0.7.4-2
 - Spec improvements
 



From fedora-extras-commits at redhat.com  Sat Sep 17 20:51:56 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Sat, 17 Sep 2005 16:51:56 -0400
Subject: rpms/wlassistant/devel - New directory
Message-ID: <200509172051.j8HKpua3019406@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/wlassistant/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19381/wlassistant/devel

Log Message:
Directory /cvs/extras/rpms/wlassistant/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Sep 17 20:51:56 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Sat, 17 Sep 2005 16:51:56 -0400
Subject: rpms/wlassistant - New directory
Message-ID: <200509172051.j8HKpugM019401@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/wlassistant
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19381/wlassistant

Log Message:
Directory /cvs/extras/rpms/wlassistant added to the repository




From fedora-extras-commits at redhat.com  Sat Sep 17 20:52:10 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Sat, 17 Sep 2005 16:52:10 -0400
Subject: rpms/wlassistant Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200509172052.j8HKqAe2019461@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/wlassistant
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19426

Added Files:
	Makefile import.log 
Log Message:
Setup of module wlassistant


--- NEW FILE Makefile ---
# Top level Makefile for module wlassistant
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Sat Sep 17 20:52:10 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Sat, 17 Sep 2005 16:52:10 -0400
Subject: rpms/wlassistant/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200509172052.j8HKqAU5019466@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/wlassistant/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19426/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module wlassistant


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Sat Sep 17 20:52:56 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Sat, 17 Sep 2005 16:52:56 -0400
Subject: rpms/wlassistant import.log,1.1,1.2
Message-ID: <200509172052.j8HKqucS019553@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/wlassistant
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19514

Modified Files:
	import.log 
Log Message:
auto-import wlassistant-0.5.4a-2 on branch devel from wlassistant-0.5.4a-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/wlassistant/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	17 Sep 2005 20:52:08 -0000	1.1
+++ import.log	17 Sep 2005 20:52:54 -0000	1.2
@@ -0,0 +1 @@
+wlassistant-0_5_4a-2:HEAD:wlassistant-0.5.4a-2.src.rpm:1126990368



From fedora-extras-commits at redhat.com  Sat Sep 17 20:52:56 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Sat, 17 Sep 2005 16:52:56 -0400
Subject: rpms/wlassistant/devel wlassistant-0.5.4a-desktopfix.patch, NONE,
	1.1 wlassistant-0.5.4a-rpath.patch, NONE,
	1.1 wlassistant.console_apps, NONE, 1.1 wlassistant.pamd, NONE,
	1.1 wlassistant.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <200509172052.j8HKqu2q019563@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/wlassistant/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19514/devel

Modified Files:
	.cvsignore sources 
Added Files:
	wlassistant-0.5.4a-desktopfix.patch 
	wlassistant-0.5.4a-rpath.patch wlassistant.console_apps 
	wlassistant.pamd wlassistant.spec 
Log Message:
auto-import wlassistant-0.5.4a-2 on branch devel from wlassistant-0.5.4a-2.src.rpm

wlassistant-0.5.4a-desktopfix.patch:

--- NEW FILE wlassistant-0.5.4a-desktopfix.patch ---
--- wlassistant-0.5.4a/src/wlassistant.desktop.orig	2005-09-01 23:23:44.000000000 -0500
+++ wlassistant-0.5.4a/src/wlassistant.desktop	2005-09-04 20:00:41.000000000 -0500
@@ -3,7 +3,10 @@
 Name=Wireless Assistant
 Comment[pl]=Program do obs??ugi sieci bezprzewodowych
 Comment[es]=Aplicaci??n para buscar redes inal??mbricas
-Exec=sudo wlassistant
-Icon=wlassistant
+Comment=Application to look for wireless networks
+Exec=/usr/sbin/wlassistant
+Icon=/usr/share/icons/hicolor/32x32/apps/wlassistant.png
 Type=Application
+Categories=Application;SystemSetup;System;
+StartupNotify=true
 

wlassistant-0.5.4a-rpath.patch:

--- NEW FILE wlassistant-0.5.4a-rpath.patch ---
--- wlassistant-0.5.4a/configure.BAD	2005-09-04 19:32:40.000000000 -0500
+++ wlassistant-0.5.4a/configure	2005-09-04 19:33:10.000000000 -0500
@@ -29220,17 +29220,8 @@
 
 if test -z "$KDE_RPATH" && test "$USE_RPATH" = "yes"; then
 
-  KDE_RPATH="-R \$(kde_libraries)"
-
   if test -n "$qt_libraries"; then
-    KDE_RPATH="$KDE_RPATH -R \$(qt_libraries)"
-  fi
-    if test -n "$X_LDFLAGS"; then
-    X_RPATH="-R \$(x_libraries)"
-    KDE_RPATH="$KDE_RPATH $X_RPATH"
-  fi
-  if test -n "$KDE_EXTRA_RPATH"; then
-    KDE_RPATH="$KDE_RPATH \$(KDE_EXTRA_RPATH)"
+    KDE_RPATH="-R \$(qt_libraries)"
   fi
 fi
 


--- NEW FILE wlassistant.console_apps ---
USER=root
PROGRAM=/usr/bin/wlassistant
SESSION=true


--- NEW FILE wlassistant.pamd ---
#%PAM-1.0
auth       sufficient   pam_rootok.so
auth       sufficient   pam_timestamp.so
auth       required     pam_stack.so service=system-auth
session    required     pam_permit.so
session    optional     pam_xauth.so
session    optional     pam_timestamp.so
account    required     pam_permit.so


--- NEW FILE wlassistant.spec ---
Name:		wlassistant
Version:	0.5.4a
Release:	2%{?dist}
License:	GPL
Group:		Applications/System
Summary:	Wireless network management tool
URL:		http://wlassistant.sourceforge.net
Source0:	http://download.sourceforge.net/wlassistant/wlassistant-%{version}.tar.bz2
Source1:	wlassistant.console_apps
Source2:	wlassistant.pamd
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:	kdebase-devel, desktop-file-utils, dos2unix, wireless-tools
Requires(post): desktop-file-utils
Requires(postun): desktop-file-utils
Requires:       usermode, wireless-tools, net-tools, dhclient
Patch0:		wlassistant-0.5.4a-rpath.patch
Patch1:		wlassistant-0.5.4a-desktopfix.patch

%description
Wireless Assistant (wlassistant) is a small application that allows you to 
connect to wireless networks.

MAIN FEATURES:
- Managed Networks Support
- WEP Encryption Support
- Not Broadcasted ("hidden") ESSIDs Support
- Per Network (AP) Configuration Profiles
- Automatic (DHCP, both dhcpcd and dhclient) and manual configuration options.

%prep
%setup -q
%patch0 -p1
%patch1 -p1

%build
%configure
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make DESTDIR=$RPM_BUILD_ROOT install
mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/security/console.apps
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/pam.d
mkdir -p $RPM_BUILD_ROOT%{_sbindir}
install -m0644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/security/console.apps/wlassistant
install -m0644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/wlassistant

dos2unix $RPM_BUILD_ROOT%{_datadir}/applnk/Utilities/wlassistant.desktop

desktop-file-install --vendor fedora \
	--dir $RPM_BUILD_ROOT%{_datadir}/applications \
	--add-category X-Fedora \
	--delete-original \
	$RPM_BUILD_ROOT%{_datadir}/applnk/Utilities/wlassistant.desktop

%find_lang %{name}

# We're going to use consolehelper, since this is a GUI app.
cd $RPM_BUILD_ROOT%{_sbindir}/
ln -s /usr/bin/consolehelper wlassistant

%post
update-desktop-database %{_datadir}/applications &> /dev/null

%postun
if [ "$1" = "0" ]; then
  update-desktop-database %{_datadir}/applications &> /dev/null
fi

%clean
rm -rf $RPM_BUILD_ROOT

%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING README NEWS ChangeLog
%config(noreplace) %{_sysconfdir}/pam.d/wlassistant
%config(noreplace) %{_sysconfdir}/security/console.apps/wlassistant
%{_bindir}/wlassistant
%{_sbindir}/wlassistant
%{_datadir}/applications/*.desktop
%{_datadir}/icons/hicolor/16x16/apps/wlassistant.png
%{_datadir}/icons/hicolor/32x32/apps/wlassistant.png

%changelog
* Sat Sep 17 2005 Tom "spot" Callaway  0.5.4a-2
- add BR: wireless-tools

* Sun Sep  4 2005 Tom "spot" Callaway  0.5.4a-1
- initial package for Fedora Extras


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wlassistant/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	17 Sep 2005 20:52:08 -0000	1.1
+++ .cvsignore	17 Sep 2005 20:52:54 -0000	1.2
@@ -0,0 +1 @@
+wlassistant-0.5.4a.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wlassistant/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	17 Sep 2005 20:52:08 -0000	1.1
+++ sources	17 Sep 2005 20:52:54 -0000	1.2
@@ -0,0 +1 @@
+4836d595a27f34c24784cdf9c2a9d5a8  wlassistant-0.5.4a.tar.bz2



From fedora-extras-commits at redhat.com  Sat Sep 17 21:00:00 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Sat, 17 Sep 2005 17:00:00 -0400
Subject: owners owners.list,1.228,1.229
Message-ID: <200509172100.j8HL00fe019620@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19601

Modified Files:
	owners.list 
Log Message:

wlassistant



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.228
retrieving revision 1.229
diff -u -r1.228 -r1.229
--- owners.list	17 Sep 2005 14:16:30 -0000	1.228
+++ owners.list	17 Sep 2005 20:59:58 -0000	1.229
@@ -1023,6 +1023,7 @@
 Fedora Extras|whowatch|Displays informations about the users currently logged in|nos at utelsystems.com|extras-qa at fedoraproject.org|
 Fedora Extras|WindowMaker|A fast, feature rich Window manager|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|wine|A Windows 16/32 bit emulator|pmatilai at laiskiainen.org|extras-qa at fedoraproject.org|
+Fedora Extras|wlassistant|Wireless network management tool|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|wmapmload|Wmapmload monitors your apm status in an lcd display fashion|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|wmweather+|Weather status dockapp|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|wv2|A library which allows access to Microsoft?? Word files|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sat Sep 17 21:31:57 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Sat, 17 Sep 2005 17:31:57 -0400
Subject: rpms/wlassistant/FC-3 wlassistant.desktop, NONE,
	1.1 wlassistant.spec, 1.1, 1.2
Message-ID: <200509172131.j8HLVvI8022020@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/wlassistant/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21967/FC-3

Modified Files:
	wlassistant.spec 
Added Files:
	wlassistant.desktop 
Log Message:

Don't bother messing with the existing desktop file, use a known good copy.



--- NEW FILE wlassistant.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=Wireless Assistant
Comment[pl]=Program do obs??ugi sieci bezprzewodowych
Comment[es]=Aplicaci??n para buscar redes inal??mbricas
Comment=Application to look for wireless networks
Exec=/usr/sbin/wlassistant
Icon=/usr/share/icons/hicolor/32x32/apps/wlassistant.png
Type=Application
Categories=Application;SystemSetup;System;
StartupNotify=true



Index: wlassistant.spec
===================================================================
RCS file: /cvs/extras/rpms/wlassistant/FC-3/wlassistant.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wlassistant.spec	17 Sep 2005 20:52:54 -0000	1.1
+++ wlassistant.spec	17 Sep 2005 21:31:55 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		wlassistant
 Version:	0.5.4a
-Release:	2%{?dist}
+Release:	3%{?dist}
 License:	GPL
 Group:		Applications/System
 Summary:	Wireless network management tool
@@ -8,13 +8,13 @@
 Source0:	http://download.sourceforge.net/wlassistant/wlassistant-%{version}.tar.bz2
 Source1:	wlassistant.console_apps
 Source2:	wlassistant.pamd
+Source3:	wlassistant.desktop
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:	kdebase-devel, desktop-file-utils, dos2unix, wireless-tools
+BuildRequires:	kdebase-devel, desktop-file-utils, wireless-tools
 Requires(post): desktop-file-utils
 Requires(postun): desktop-file-utils
 Requires:       usermode, wireless-tools, net-tools, dhclient
 Patch0:		wlassistant-0.5.4a-rpath.patch
-Patch1:		wlassistant-0.5.4a-desktopfix.patch
 
 %description
 Wireless Assistant (wlassistant) is a small application that allows you to 
@@ -30,7 +30,6 @@
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 
 %build
 %configure
@@ -46,13 +45,12 @@
 install -m0644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/security/console.apps/wlassistant
 install -m0644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/wlassistant
 
-dos2unix $RPM_BUILD_ROOT%{_datadir}/applnk/Utilities/wlassistant.desktop
+rm -rf $RPM_BUILD_ROOT%{_datadir}/applnk/Utilities/wlassistant.desktop
 
 desktop-file-install --vendor fedora \
 	--dir $RPM_BUILD_ROOT%{_datadir}/applications \
 	--add-category X-Fedora \
-	--delete-original \
-	$RPM_BUILD_ROOT%{_datadir}/applnk/Utilities/wlassistant.desktop
+	%{SOURCE3}
 
 %find_lang %{name}
 
@@ -83,6 +81,9 @@
 %{_datadir}/icons/hicolor/32x32/apps/wlassistant.png
 
 %changelog
+* Sat Sep 17 2005 Tom "spot" Callaway  0.5.4a-3
+- use .desktop file as SOURCE3 rather than screwing around with dos2unix
+
 * Sat Sep 17 2005 Tom "spot" Callaway  0.5.4a-2
 - add BR: wireless-tools
 



From fedora-extras-commits at redhat.com  Sat Sep 17 21:31:58 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Sat, 17 Sep 2005 17:31:58 -0400
Subject: rpms/wlassistant/devel wlassistant.desktop, NONE,
	1.1 wlassistant.spec, 1.1, 1.2
Message-ID: <200509172131.j8HLVwnX022030@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/wlassistant/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21967/devel

Modified Files:
	wlassistant.spec 
Added Files:
	wlassistant.desktop 
Log Message:

Don't bother messing with the existing desktop file, use a known good copy.



--- NEW FILE wlassistant.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=Wireless Assistant
Comment[pl]=Program do obs??ugi sieci bezprzewodowych
Comment[es]=Aplicaci??n para buscar redes inal??mbricas
Comment=Application to look for wireless networks
Exec=/usr/sbin/wlassistant
Icon=/usr/share/icons/hicolor/32x32/apps/wlassistant.png
Type=Application
Categories=Application;SystemSetup;System;
StartupNotify=true



Index: wlassistant.spec
===================================================================
RCS file: /cvs/extras/rpms/wlassistant/devel/wlassistant.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wlassistant.spec	17 Sep 2005 20:52:54 -0000	1.1
+++ wlassistant.spec	17 Sep 2005 21:31:56 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		wlassistant
 Version:	0.5.4a
-Release:	2%{?dist}
+Release:	3%{?dist}
 License:	GPL
 Group:		Applications/System
 Summary:	Wireless network management tool
@@ -8,13 +8,13 @@
 Source0:	http://download.sourceforge.net/wlassistant/wlassistant-%{version}.tar.bz2
 Source1:	wlassistant.console_apps
 Source2:	wlassistant.pamd
+Source3:	wlassistant.desktop
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:	kdebase-devel, desktop-file-utils, dos2unix, wireless-tools
+BuildRequires:	kdebase-devel, desktop-file-utils, wireless-tools
 Requires(post): desktop-file-utils
 Requires(postun): desktop-file-utils
 Requires:       usermode, wireless-tools, net-tools, dhclient
 Patch0:		wlassistant-0.5.4a-rpath.patch
-Patch1:		wlassistant-0.5.4a-desktopfix.patch
 
 %description
 Wireless Assistant (wlassistant) is a small application that allows you to 
@@ -30,7 +30,6 @@
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 
 %build
 %configure
@@ -46,13 +45,12 @@
 install -m0644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/security/console.apps/wlassistant
 install -m0644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/wlassistant
 
-dos2unix $RPM_BUILD_ROOT%{_datadir}/applnk/Utilities/wlassistant.desktop
+rm -rf $RPM_BUILD_ROOT%{_datadir}/applnk/Utilities/wlassistant.desktop
 
 desktop-file-install --vendor fedora \
 	--dir $RPM_BUILD_ROOT%{_datadir}/applications \
 	--add-category X-Fedora \
-	--delete-original \
-	$RPM_BUILD_ROOT%{_datadir}/applnk/Utilities/wlassistant.desktop
+	%{SOURCE3}
 
 %find_lang %{name}
 
@@ -83,6 +81,9 @@
 %{_datadir}/icons/hicolor/32x32/apps/wlassistant.png
 
 %changelog
+* Sat Sep 17 2005 Tom "spot" Callaway  0.5.4a-3
+- use .desktop file as SOURCE3 rather than screwing around with dos2unix
+
 * Sat Sep 17 2005 Tom "spot" Callaway  0.5.4a-2
 - add BR: wireless-tools
 



From fedora-extras-commits at redhat.com  Sat Sep 17 21:31:57 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Sat, 17 Sep 2005 17:31:57 -0400
Subject: rpms/wlassistant/FC-4 wlassistant.desktop, NONE,
	1.1 wlassistant.spec, 1.1, 1.2
Message-ID: <200509172132.j8HLVwYX022026@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/wlassistant/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21967/FC-4

Modified Files:
	wlassistant.spec 
Added Files:
	wlassistant.desktop 
Log Message:

Don't bother messing with the existing desktop file, use a known good copy.



--- NEW FILE wlassistant.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=Wireless Assistant
Comment[pl]=Program do obs??ugi sieci bezprzewodowych
Comment[es]=Aplicaci??n para buscar redes inal??mbricas
Comment=Application to look for wireless networks
Exec=/usr/sbin/wlassistant
Icon=/usr/share/icons/hicolor/32x32/apps/wlassistant.png
Type=Application
Categories=Application;SystemSetup;System;
StartupNotify=true



Index: wlassistant.spec
===================================================================
RCS file: /cvs/extras/rpms/wlassistant/FC-4/wlassistant.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wlassistant.spec	17 Sep 2005 20:52:54 -0000	1.1
+++ wlassistant.spec	17 Sep 2005 21:31:55 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		wlassistant
 Version:	0.5.4a
-Release:	2%{?dist}
+Release:	3%{?dist}
 License:	GPL
 Group:		Applications/System
 Summary:	Wireless network management tool
@@ -8,13 +8,13 @@
 Source0:	http://download.sourceforge.net/wlassistant/wlassistant-%{version}.tar.bz2
 Source1:	wlassistant.console_apps
 Source2:	wlassistant.pamd
+Source3:	wlassistant.desktop
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:	kdebase-devel, desktop-file-utils, dos2unix, wireless-tools
+BuildRequires:	kdebase-devel, desktop-file-utils, wireless-tools
 Requires(post): desktop-file-utils
 Requires(postun): desktop-file-utils
 Requires:       usermode, wireless-tools, net-tools, dhclient
 Patch0:		wlassistant-0.5.4a-rpath.patch
-Patch1:		wlassistant-0.5.4a-desktopfix.patch
 
 %description
 Wireless Assistant (wlassistant) is a small application that allows you to 
@@ -30,7 +30,6 @@
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 
 %build
 %configure
@@ -46,13 +45,12 @@
 install -m0644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/security/console.apps/wlassistant
 install -m0644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/wlassistant
 
-dos2unix $RPM_BUILD_ROOT%{_datadir}/applnk/Utilities/wlassistant.desktop
+rm -rf $RPM_BUILD_ROOT%{_datadir}/applnk/Utilities/wlassistant.desktop
 
 desktop-file-install --vendor fedora \
 	--dir $RPM_BUILD_ROOT%{_datadir}/applications \
 	--add-category X-Fedora \
-	--delete-original \
-	$RPM_BUILD_ROOT%{_datadir}/applnk/Utilities/wlassistant.desktop
+	%{SOURCE3}
 
 %find_lang %{name}
 
@@ -83,6 +81,9 @@
 %{_datadir}/icons/hicolor/32x32/apps/wlassistant.png
 
 %changelog
+* Sat Sep 17 2005 Tom "spot" Callaway  0.5.4a-3
+- use .desktop file as SOURCE3 rather than screwing around with dos2unix
+
 * Sat Sep 17 2005 Tom "spot" Callaway  0.5.4a-2
 - add BR: wireless-tools
 



From fedora-extras-commits at redhat.com  Sat Sep 17 23:20:34 2005
From: fedora-extras-commits at redhat.com (W. Michael Petullo (mikep))
Date: Sat, 17 Sep 2005 19:20:34 -0400
Subject: rpms/roundup - New directory
Message-ID: <200509172320.j8HNKYne025100@cvs-int.fedora.redhat.com>

Author: mikep

Update of /cvs/extras/rpms/roundup
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25080/roundup

Log Message:
Directory /cvs/extras/rpms/roundup added to the repository




From fedora-extras-commits at redhat.com  Sat Sep 17 23:20:35 2005
From: fedora-extras-commits at redhat.com (W. Michael Petullo (mikep))
Date: Sat, 17 Sep 2005 19:20:35 -0400
Subject: rpms/roundup/devel - New directory
Message-ID: <200509172320.j8HNKZ5J025105@cvs-int.fedora.redhat.com>

Author: mikep

Update of /cvs/extras/rpms/roundup/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25080/roundup/devel

Log Message:
Directory /cvs/extras/rpms/roundup/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Sep 17 23:20:48 2005
From: fedora-extras-commits at redhat.com (W. Michael Petullo (mikep))
Date: Sat, 17 Sep 2005 19:20:48 -0400
Subject: rpms/roundup Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200509172320.j8HNKmL1025160@cvs-int.fedora.redhat.com>

Author: mikep

Update of /cvs/extras/rpms/roundup
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25125

Added Files:
	Makefile import.log 
Log Message:
Setup of module roundup


--- NEW FILE Makefile ---
# Top level Makefile for module roundup
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Sat Sep 17 23:20:49 2005
From: fedora-extras-commits at redhat.com (W. Michael Petullo (mikep))
Date: Sat, 17 Sep 2005 19:20:49 -0400
Subject: rpms/roundup/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200509172320.j8HNKnVl025165@cvs-int.fedora.redhat.com>

Author: mikep

Update of /cvs/extras/rpms/roundup/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25125/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module roundup


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Sat Sep 17 23:21:34 2005
From: fedora-extras-commits at redhat.com (W. Michael Petullo (mikep))
Date: Sat, 17 Sep 2005 19:21:34 -0400
Subject: rpms/roundup import.log,1.1,1.2
Message-ID: <200509172321.j8HNLYMT025252@cvs-int.fedora.redhat.com>

Author: mikep

Update of /cvs/extras/rpms/roundup
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25213

Modified Files:
	import.log 
Log Message:
auto-import roundup-0.8.4-5 on branch devel from roundup-0.8.4-5.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/roundup/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	17 Sep 2005 23:20:46 -0000	1.1
+++ import.log	17 Sep 2005 23:21:32 -0000	1.2
@@ -0,0 +1 @@
+roundup-0_8_4-5:HEAD:roundup-0.8.4-5.src.rpm:1126999290



From fedora-extras-commits at redhat.com  Sat Sep 17 23:21:34 2005
From: fedora-extras-commits at redhat.com (W. Michael Petullo (mikep))
Date: Sat, 17 Sep 2005 19:21:34 -0400
Subject: rpms/roundup/devel README.Fedora, NONE, 1.1 roundup, NONE,
	1.1 roundup-setup.patch, NONE, 1.1 roundup.conf, NONE,
	1.1 roundup.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200509172321.j8HNLY9O025260@cvs-int.fedora.redhat.com>

Author: mikep

Update of /cvs/extras/rpms/roundup/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25213/devel

Modified Files:
	.cvsignore sources 
Added Files:
	README.Fedora roundup roundup-setup.patch roundup.conf 
	roundup.spec 
Log Message:
auto-import roundup-0.8.4-5 on branch devel from roundup-0.8.4-5.src.rpm


--- NEW FILE README.Fedora ---
Some steps in the installation of Roundup are difficult to automate.
Because of this, the roundup installation must be completed manually
after installing the Roundup package.  The following steps will complete
the installation of Roundup:

1.  Set the following items in
/var/lib/roundup/trackers/default/config.ini as appropriate for your
network:

	[mail]
	domain
	host
	username
	password

	[tracker]
	web
	email

	[rdbms]
	password

2.  Create a mysql database:
	
	mysql -e "CREATE DATABASE roundup;"
	mysql -e "GRANT ALL PRIVILEGES ON roundup.* TO roundup at localhost
		IDENTIFIED BY 'PASSWORD';"

3.  Initialize the system.

	roundup-admin -i /var/lib/roundup/trackers/default initialise
		PASSWORD

To fully uninstall Roundup (and DESTROY any Roundup data), perform the
following steps:

1.  mysql -e "DROP DATABASE roundup;"
2.  rm -rf /var/lib/roundup


--- NEW FILE roundup ---
#!/bin/bash
#
#	/etc/rc.d/init.d/roundup
#
# Starts the roundup daemon
#
# chkconfig: - 95 5
# description: Bug tracking system.
# processname: roundup

# Source function library.
. /etc/init.d/functions

test -x /usr/bin/roundup-server || exit 0

RETVAL=0

#
#	See how we were called.
#

prog="roundup-server"

start() {
	# Check if roundup is already running
	if [ ! -f /var/lock/subsys/roundup ]; then
	    echo -n $"Starting $prog: "
	    daemon /usr/bin/roundup-server -d /var/run/roundup-server.pid -u roundup -g roundup -p 8080 issues=/var/lib/roundup/trackers/default
	    RETVAL=$?
	    [ $RETVAL -eq 0 ] && touch /var/lock/subsys/roundup
	    echo
	fi
	return $RETVAL
}

stop() {
	echo -n $"Stopping $prog: "
	killproc /usr/bin/roundup-server
	RETVAL=$?
	[ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/roundup
	echo
        return $RETVAL
}


restart() {
	stop
	start
}	

reload() {
	restart
}	

status_roundup() {
 	status /usr/bin/roundup-server
}

case "$1" in
start)
	start
	;;
stop)
	stop
	;;
reload|restart)
	restart
	;;
condrestart)
	if [ -f /var/lock/subsys/roundup ]; then
	    restart
	fi
	;;
status)
	status_roundup
	;;
*)
	echo $"Usage: $0 {start|stop|restart|condrestart|status}"
	exit 1
esac

exit $?
exit $RETVAL

roundup-setup.patch:

--- NEW FILE roundup-setup.patch ---
diff -u --recursive roundup-0.8.4-vanilla/setup.py roundup-0.8.4/setup.py
--- roundup-0.8.4-vanilla/setup.py	2005-07-17 23:09:47.000000000 -0400
+++ roundup-0.8.4/setup.py	2005-09-04 14:11:18.000000000 -0400
@@ -306,7 +306,7 @@
 
     # install man pages on POSIX platforms
     if os.name == 'posix':
-        installdatafiles.append(('man/man1', ['doc/roundup-admin.1',
+        installdatafiles.append(('share/man/man1', ['doc/roundup-admin.1',
             'doc/roundup-mailgw.1', 'doc/roundup-server.1',
             'doc/roundup-demo.1']))
 


--- NEW FILE roundup.conf ---
#
# Roundup is an issue-tracking system.
#

ProxyPass /roundup/ http://localhost:8080/


--- NEW FILE roundup.spec ---
%define pythonver 2.4
%define pythonsitedir %{_libdir}/python%{pythonver}/site-packages

Summary: Simple and flexible issue-tracking system
Name: roundup
Version: 0.8.4
Release: 5
License: MIT
Group: Applications/Engineering
Source: http://dl.sourceforge.net/roundup/roundup-%{version}.tar.gz
Source1: roundup.conf
Source2: roundup
Source3: README.Fedora
Patch0: roundup-setup.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
URL: http://roundup.sourceforge.net/
Requires: python >= %{pythonver} httpd mysql-server MySQL-python sharutils
Requires(post): /sbin/chkconfig
Requires(post): /sbin/service
Requires(preun): /sbin/chkconfig
Requires(preun): /sbin/service

%description
Roundup is a simple and flexible issue-tracking system with command line,
web and email interfaces.  It is based on the winning design from Ka-Ping
Yee in the Software Carpentry "Track" design competition.

%prep
%setup
%patch0 -p1
cp -p %{SOURCE3} .

%build
CFLAGS="$RPM_OPT_FLAGS" python setup.py build

%install
python setup.py install --root=$RPM_BUILD_ROOT
install -p -D -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/roundup.conf
install -p -D -m 755 %{SOURCE2} $RPM_BUILD_ROOT%{_initrddir}/roundup
%find_lang %{name}

%post
useradd -M -r -d /var/lib/roundup -s /sbin/nologin -c "Roundup Issue Tracker" roundup > /dev/null 2>&1 || :
if [ ! -d /var/lib/roundup ]; then
	install -d /var/lib/roundup/trackers/default/db > /dev/null 2>&1
	install -d /var/lib/roundup/trackers/default/db/files -m 2770 -o root -g roundup > /dev/null 2>&1

	# Create Roundup configuration.
	roundup-admin -i /var/lib/roundup/trackers/default install classic mysql > /dev/null 2>&1
fi
/sbin/chkconfig --add roundup >/dev/null 2>&1
if [ "$1" -ge "1" ]; then
	/sbin/service roundup condrestart >/dev/null 2>&1
fi

%preun
if [ $1 = 0 ]; then
	/sbin/service roundup stop > /dev/null 2>&1
	/sbin/chkconfig --del roundup >/dev/null 2>&1
fi

%clean
rm -rf $RPM_BUILD_ROOT

%files -f %{name}.lang
%{_bindir}/*
%{pythonsitedir}/*
%{_datadir}/roundup/*
%{_mandir}/man1/*
%defattr(-,root,root)
%config(noreplace) %{_initrddir}/roundup
%config(noreplace) %{_sysconfdir}/httpd/conf.d/*.conf

%doc README.Fedora COPYING.txt

%changelog
* Sun Sep 05 2005 W. Michael Petullo  - 0.8.4-5
   - No longer use setup.py's --record feature.
   - Really fix init script.
   - %{_mandir}/man1/* instead of %{_mandir}/*.

* Sun Sep 05 2005 W. Michael Petullo  - 0.8.4-4
   - Put man pages in /usr/share/man.
   - Use a shorter summary.
   - Do not enable service by default.
   - Include license in installed files.
   - Restart service if needed after upgrade.
   - Use %{find_lang}.
   - Tag %{_initrddir}/roundup as %config(noreplace).

* Sun Aug 14 2005 W. Michael Petullo  - 0.8.4-3
   - Do not use useradd's -o option.

* Thu Aug 11 2005 W. Michael Petullo  - 0.8.4-2
   - Set GID roundup will use from startup script.
   - Set proper permissions on db/files.
   - Change Source URL.
   - Use %{SOURCE1}, %{SOURCE2}, ...
   - Use install's -p switch.
   - Don't hardcode useradd UID.
   - Scriptlets no longer output anything.
   - Don't delete user in postun.
   - Use %{_initrddir}.
   - Only stop service if uninstalling.

* Sun Aug 07 2005 W. Michael Petullo  - 0.8.4-1
   - Stop roundup service after uninstalling.
   - New upstream version.

* Tue Jul 26 2005 W. Michael Petullo  - 0.8.3-2
   - Use proxy feature to increase performance.
   - Print better instructions after installing.

* Tue Jun 28 2005 W. Michael Petullo  - 0.8.3-1
   - Initial package for Fedora Extras.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/roundup/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	17 Sep 2005 23:20:46 -0000	1.1
+++ .cvsignore	17 Sep 2005 23:21:32 -0000	1.2
@@ -0,0 +1 @@
+roundup-0.8.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/roundup/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	17 Sep 2005 23:20:46 -0000	1.1
+++ sources	17 Sep 2005 23:21:32 -0000	1.2
@@ -0,0 +1 @@
+6b995d7d6c5b49666e5297929e70bbc7  roundup-0.8.4.tar.gz



From fedora-extras-commits at redhat.com  Sat Sep 17 23:24:55 2005
From: fedora-extras-commits at redhat.com (W. Michael Petullo (mikep))
Date: Sat, 17 Sep 2005 19:24:55 -0400
Subject: owners owners.list,1.229,1.230
Message-ID: <200509172324.j8HNOtsJ025326@cvs-int.fedora.redhat.com>

Author: mikep

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25307

Modified Files:
	owners.list 
Log Message:
Added entry for new roundup package.



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.229
retrieving revision 1.230
diff -u -r1.229 -r1.230
--- owners.list	17 Sep 2005 20:59:58 -0000	1.229
+++ owners.list	17 Sep 2005 23:24:53 -0000	1.230
@@ -877,6 +877,7 @@
 Fedora Extras|R-hdf5|R Interface to the NCSA HDF5 library|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|rinetd|TCP redirection server|kaboom at oobleck.net|extras-qa at fedoraproject.org|
 Fedora Extras|rkhunter|Rootkit Hunter scans for rootkits, backdoors and local exploits|tamaster at pobox.com|extras-qa at fedoraproject.org|
+Fedora Extras|roundup|Simple and flexible issue-tracking system|redhat at flyn.org|extras-qa at fedoraproject.org|
 Fedora Extras|rpmDirectoryCheck|Tool to detect some RPM packaging errors|enrico.scholz at informatik.tu-chemnitz.de|extras-qa at fedoraproject.org|
 Fedora Extras|rpmlint|RPM correctness checker|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|rpmproc|Perl script to help manage and build RPM packages|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sun Sep 18 00:28:11 2005
From: fedora-extras-commits at redhat.com (W. Michael Petullo (mikep))
Date: Sat, 17 Sep 2005 20:28:11 -0400
Subject: rpms/roundup import.log,1.2,1.3
Message-ID: <200509180028.j8I0SfdR026828@cvs-int.fedora.redhat.com>

Author: mikep

Update of /cvs/extras/rpms/roundup
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26792

Modified Files:
	import.log 
Log Message:
auto-import roundup-0.8.4-6 on branch devel from roundup-0.8.4-6.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/roundup/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	17 Sep 2005 23:21:32 -0000	1.2
+++ import.log	18 Sep 2005 00:28:09 -0000	1.3
@@ -1 +1,2 @@
 roundup-0_8_4-5:HEAD:roundup-0.8.4-5.src.rpm:1126999290
+roundup-0_8_4-6:HEAD:roundup-0.8.4-6.src.rpm:1127003286



From fedora-extras-commits at redhat.com  Sun Sep 18 00:28:11 2005
From: fedora-extras-commits at redhat.com (W. Michael Petullo (mikep))
Date: Sat, 17 Sep 2005 20:28:11 -0400
Subject: rpms/roundup/devel roundup.spec,1.1,1.2
Message-ID: <200509180028.j8I0Sg0X026831@cvs-int.fedora.redhat.com>

Author: mikep

Update of /cvs/extras/rpms/roundup/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26792/devel

Modified Files:
	roundup.spec 
Log Message:
auto-import roundup-0.8.4-6 on branch devel from roundup-0.8.4-6.src.rpm


Index: roundup.spec
===================================================================
RCS file: /cvs/extras/rpms/roundup/devel/roundup.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- roundup.spec	17 Sep 2005 23:21:32 -0000	1.1
+++ roundup.spec	18 Sep 2005 00:28:09 -0000	1.2
@@ -1,10 +1,10 @@
 %define pythonver 2.4
-%define pythonsitedir %{_libdir}/python%{pythonver}/site-packages
+%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Summary: Simple and flexible issue-tracking system
 Name: roundup
 Version: 0.8.4
-Release: 5
+Release: 6
 License: MIT
 Group: Applications/Engineering
 Source: http://dl.sourceforge.net/roundup/roundup-%{version}.tar.gz
@@ -64,7 +64,7 @@
 
 %files -f %{name}.lang
 %{_bindir}/*
-%{pythonsitedir}/*
+%{python_sitelib}/*
 %{_datadir}/roundup/*
 %{_mandir}/man1/*
 %defattr(-,root,root)
@@ -74,6 +74,9 @@
 %doc README.Fedora COPYING.txt
 
 %changelog
+* Sat Sep 17 2005 W. Michael Petullo  - 0.8.4-6
+   - Fix installation of Python modules on x86_64.
+
 * Sun Sep 05 2005 W. Michael Petullo  - 0.8.4-5
    - No longer use setup.py's --record feature.
    - Really fix init script.



From fedora-extras-commits at redhat.com  Sun Sep 18 08:47:13 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Sun, 18 Sep 2005 04:47:13 -0400
Subject: owners owners.list,1.230,1.231
Message-ID: <200509180847.j8I8lDoA009828@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9809

Modified Files:
	owners.list 
Log Message:
Add perl-Locale-Maketext-Lexicon


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.230
retrieving revision 1.231
diff -u -r1.230 -r1.231
--- owners.list	17 Sep 2005 23:24:53 -0000	1.230
+++ owners.list	18 Sep 2005 08:47:11 -0000	1.231
@@ -686,6 +686,7 @@
 Fedora Extras|perl-Lingua-EN-Inflect|Convert singular to plural, select "a" or "an"|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Lingua-EN-Inflect-Number|Force number of words to singular or plural|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Locale-Maketext-Fuzzy|Maketext from already interpolated strings|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Locale-Maketext-Lexicon|Extract translatable strings from source|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Locale-gettext|Interface to gettext family of functions|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Log-Dispatch|Dispatches messages to one or more outputs|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Mail-Alias|For bugs related to the perl-Mail-Alias component|oliver at linux-kernel.at|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Sun Sep 18 08:50:16 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Sun, 18 Sep 2005 04:50:16 -0400
Subject: owners owners.list,1.231,1.232
Message-ID: <200509180850.j8I8oGQ4009858@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9839

Modified Files:
	owners.list 
Log Message:
Add perl-Algorithm-Dependency


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.231
retrieving revision 1.232
diff -u -r1.231 -r1.232
--- owners.list	18 Sep 2005 08:47:11 -0000	1.231
+++ owners.list	18 Sep 2005 08:50:14 -0000	1.232
@@ -571,6 +571,7 @@
 Fedora Extras|pdfjam|Utilities for join, rotate and align PDFs|jpo at di.uminho.pt|extras-qa at fedoraproject.org|
 Fedora Extras|pdftk|The PDF Tool Kit|Jochen at herr-schmitt.de|extras-qa at fedoraproject.org|
 Fedora Extras|pdftohtml|A PDF to HTML converter|gauret at free.fr|extras-qa at fedoraproject.org|
+Fedora Extras|perl-Algorithm-Dependency|Algorithmic framework for implementing dependency trees|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Algorithm-Diff|Algorithm::Diff Perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Apache-LogRegex|Perl module for parsing a line from an Apache logfile into a hash|ghenry at suretecsystems.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Apache-Session|Apache::Session Perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Sun Sep 18 09:59:15 2005
From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo))
Date: Sun, 18 Sep 2005 05:59:15 -0400
Subject: rpms/scim-skk/FC-3 scim-skk.spec,1.2,1.3
Message-ID: <200509180959.j8I9xFVO011273@cvs-int.fedora.redhat.com>

Author: ryo

Update of /cvs/extras/rpms/scim-skk/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11254

Modified Files:
	scim-skk.spec 
Log Message:
fix requires tag



Index: scim-skk.spec
===================================================================
RCS file: /cvs/extras/rpms/scim-skk/FC-3/scim-skk.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- scim-skk.spec	16 Sep 2005 15:42:05 -0000	1.2
+++ scim-skk.spec	18 Sep 2005 09:59:13 -0000	1.3
@@ -10,7 +10,7 @@
 Patch0:		no-dictionary.diff
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Requires		skkdic
+Requires:		skkdic
 BuildRequires:	scim-devel
 
 %description



From fedora-extras-commits at redhat.com  Sun Sep 18 10:00:09 2005
From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo))
Date: Sun, 18 Sep 2005 06:00:09 -0400
Subject: rpms/scim-skk/FC-4 scim-skk.spec,1.2,1.3
Message-ID: <200509181000.j8IA092J011331@cvs-int.fedora.redhat.com>

Author: ryo

Update of /cvs/extras/rpms/scim-skk/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11312

Modified Files:
	scim-skk.spec 
Log Message:



Index: scim-skk.spec
===================================================================
RCS file: /cvs/extras/rpms/scim-skk/FC-4/scim-skk.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- scim-skk.spec	16 Sep 2005 15:42:27 -0000	1.2
+++ scim-skk.spec	18 Sep 2005 10:00:07 -0000	1.3
@@ -10,7 +10,7 @@
 Patch0:		no-dictionary.diff
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Requires		skkdic
+Requires:		skkdic
 BuildRequires:	scim-devel
 
 %description



From fedora-extras-commits at redhat.com  Sun Sep 18 10:00:49 2005
From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo))
Date: Sun, 18 Sep 2005 06:00:49 -0400
Subject: rpms/scim-skk/devel scim-skk.spec,1.2,1.3
Message-ID: <200509181000.j8IA0nJw011389@cvs-int.fedora.redhat.com>

Author: ryo

Update of /cvs/extras/rpms/scim-skk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11370

Modified Files:
	scim-skk.spec 
Log Message:



Index: scim-skk.spec
===================================================================
RCS file: /cvs/extras/rpms/scim-skk/devel/scim-skk.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- scim-skk.spec	16 Sep 2005 15:40:25 -0000	1.2
+++ scim-skk.spec	18 Sep 2005 10:00:47 -0000	1.3
@@ -10,7 +10,7 @@
 Patch0:		no-dictionary.diff
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Requires		skkdic
+Requires:		skkdic
 BuildRequires:	scim-devel
 
 %description



From fedora-extras-commits at redhat.com  Sun Sep 18 23:19:01 2005
From: fedora-extras-commits at redhat.com (Byron Young (bkyoung))
Date: Sun, 18 Sep 2005 19:19:01 -0400
Subject: rpms/swish-e - New directory
Message-ID: <200509182319.j8INJ15e031663@cvs-int.fedora.redhat.com>

Author: bkyoung

Update of /cvs/extras/rpms/swish-e
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31643/swish-e

Log Message:
Directory /cvs/extras/rpms/swish-e added to the repository




From fedora-extras-commits at redhat.com  Sun Sep 18 23:19:02 2005
From: fedora-extras-commits at redhat.com (Byron Young (bkyoung))
Date: Sun, 18 Sep 2005 19:19:02 -0400
Subject: rpms/swish-e/devel - New directory
Message-ID: <200509182319.j8INJ2N6031668@cvs-int.fedora.redhat.com>

Author: bkyoung

Update of /cvs/extras/rpms/swish-e/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31643/swish-e/devel

Log Message:
Directory /cvs/extras/rpms/swish-e/devel added to the repository




From fedora-extras-commits at redhat.com  Sun Sep 18 23:19:26 2005
From: fedora-extras-commits at redhat.com (Byron Young (bkyoung))
Date: Sun, 18 Sep 2005 19:19:26 -0400
Subject: rpms/swish-e Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200509182319.j8INJQBh031723@cvs-int.fedora.redhat.com>

Author: bkyoung

Update of /cvs/extras/rpms/swish-e
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31688

Added Files:
	Makefile import.log 
Log Message:
Setup of module swish-e


--- NEW FILE Makefile ---
# Top level Makefile for module swish-e
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Sun Sep 18 23:19:27 2005
From: fedora-extras-commits at redhat.com (Byron Young (bkyoung))
Date: Sun, 18 Sep 2005 19:19:27 -0400
Subject: rpms/swish-e/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200509182319.j8INJRci031728@cvs-int.fedora.redhat.com>

Author: bkyoung

Update of /cvs/extras/rpms/swish-e/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31688/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module swish-e


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Sun Sep 18 23:30:47 2005
From: fedora-extras-commits at redhat.com (Byron Young (bkyoung))
Date: Sun, 18 Sep 2005 19:30:47 -0400
Subject: rpms/swish-e import.log,1.1,1.2
Message-ID: <200509182330.j8INUlme031815@cvs-int.fedora.redhat.com>

Author: bkyoung

Update of /cvs/extras/rpms/swish-e
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31776

Modified Files:
	import.log 
Log Message:
auto-import swish-e-2.4.2-2_FC4 on branch devel from swish-e-2.4.2-2_FC4.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/swish-e/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	18 Sep 2005 23:19:24 -0000	1.1
+++ import.log	18 Sep 2005 23:30:45 -0000	1.2
@@ -0,0 +1 @@
+swish-e-2_4_2-2_FC4:HEAD:swish-e-2.4.2-2_FC4.src.rpm:1127089736



From fedora-extras-commits at redhat.com  Sun Sep 18 23:30:47 2005
From: fedora-extras-commits at redhat.com (Byron Young (bkyoung))
Date: Sun, 18 Sep 2005 19:30:47 -0400
Subject: rpms/swish-e/devel swish-e-2.4.2-httpd.conf, NONE,
	1.1 swish-e-2.4.2-src_compress.c.patch, NONE,
	1.1 swish-e-2.4.2-src_parser.c.patch, NONE,
	1.1 swish-e-2.4.2.FC4.spec, NONE, 1.1 swish-e.xpm, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200509182330.j8INUlPd031825@cvs-int.fedora.redhat.com>

Author: bkyoung

Update of /cvs/extras/rpms/swish-e/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31776/devel

Modified Files:
	.cvsignore sources 
Added Files:
	swish-e-2.4.2-httpd.conf swish-e-2.4.2-src_compress.c.patch 
	swish-e-2.4.2-src_parser.c.patch swish-e-2.4.2.FC4.spec 
	swish-e.xpm 
Log Message:
auto-import swish-e-2.4.2-2_FC4 on branch devel from swish-e-2.4.2-2_FC4.src.rpm


--- NEW FILE swish-e-2.4.2-httpd.conf ---
Alias /swish-e "/usr/share/doc/swish-e-2.4.2/html"


    Options Indexes
    AllowOverride None
    Order allow,deny
    Allow from all


swish-e-2.4.2-src_compress.c.patch:

--- NEW FILE swish-e-2.4.2-src_compress.c.patch ---
*** src/compress.c.orig	2005-04-26 19:24:25.000000000 -0700
--- src/compress.c	2005-04-26 19:32:05.000000000 -0700
***************
*** 689,695 ****
      if(! saved_bytes)     /* nothing to do */
          return;   
      new_buf= (unsigned char *) emalloc(*buf_size + saved_bytes);
!     zlib_status = uncompress(new_buf, &new_buf_size, *buf, (uLongf)buf_size );
      if ( zlib_status != Z_OK )
      {
          // $$$ make sure this works ok if returning null $$$
--- 689,695 ----
      if(! saved_bytes)     /* nothing to do */
          return;   
      new_buf= (unsigned char *) emalloc(*buf_size + saved_bytes);
!     zlib_status = uncompress(new_buf, &new_buf_size, *buf, (uLongf) *buf_size );
      if ( zlib_status != Z_OK )
      {
          // $$$ make sure this works ok if returning null $$$

swish-e-2.4.2-src_parser.c.patch:

--- NEW FILE swish-e-2.4.2-src_parser.c.patch ---
*** src/parser.c.orig	2005-09-14 10:34:21.000000000 -0700
--- src/parser.c	2005-09-14 11:13:40.000000000 -0700
***************
*** 870,876 ****
          if ( used > 0 )         // tally up total bytes consumed
              buf->cur += used;
  
!         if ( ret == 0 )         // all done
              return;
  
          if ( ret == -2 )        // encoding failed
--- 870,876 ----
          if ( used > 0 )         // tally up total bytes consumed
              buf->cur += used;
  
!         if ( ret >= 0 )         // all done
              return;
  
          if ( ret == -2 )        // encoding failed


--- NEW FILE swish-e-2.4.2.FC4.spec ---
%define	name	swish-e
%define	version	2.4.2
%define release 2_FC4
%define httpd_conf_d_dir /etc/httpd/conf.d

# Conditionals
# --with debug: Replaces -O2 with -O0 in CFLAGS, AND builds debuginfo package.
# --without debug OR missing: Disables debuginfo package AND Removes -g.

%{!?_with_debug:%define debug_package %{nil}}

Summary:        SWISH-E - Simple Web Indexing System for Humans - Enhanced
Name:           %{name}
Version:        %{version}
Release:        %{release}
License:        GPL
Group:          Networking/Other
Source:         http://swish-e.org/Download/%{name}-%{version}.tar.gz
Source1:	%{name}-%{version}-httpd.conf
URL:            http://swish-e.org/
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Icon:           swish-e.xpm
Provides:       %{name}
Obsoletes:	swish
Requires:       libxml2 >= 2.6.19, pcre >= 5.0, zlib >= 1.2.2.2
BuildRequires:	libxml2-devel >= 2.6.19, pcre-devel >= 5.0, zlib-devel >= 1.2.2.2
Prefix:         /usr
Patch0:         %{name}-%{version}-src_parser.c.patch
Patch1:         %{name}-%{version}-src_compress.c.patch
BuildArch:      i386 x86_64

%description
Swish-e is Simple Web Indexing System for Humans - Enhanced

Swish-e can quickly and easily index directories of files or remote 
web sites and search the generated indexes.

Swish-e is extremely fast in both indexing and searching, highly
configurable, and can be seamlessly integrated with existing web sites
to maintain a consistent design. Swish-e can index web pages, but can
just as easily index text files, mailing list archives, or data stored
in a relational database.

%package        perl
Summary:        SWISH-E - PERL Scripts and Modules
Group:          Networking/Other
Provides:       %{name}-perl
Requires:       %{name} = %{version}, perl >= 5.8.0

%description    perl
PERL SWISH-E language bindings and scripts.

%package doc
Summary:     doc
Group:          Networking/Other
Provides:      %{name}-doc
Requires:     %{name} = %{version}  

%description doc
SWISH-E documentation and examples

%package	devel
Summary:	SWISH-E - Static libraries and header files.
Group:		Networking/Other
Obsoletes:	swish-devel
Provides:       %{name}-devel
Requires:	%{name} = %{version}, libxml2-devel, pcre-devel, zlib-devel

%description	devel
Libraries and header files required for compiling applications based on the SWISH-E API.

%prep
%setup -q
A=`find ./ -name "Makefile.in"`
for i in $A; do
	%{__sed} -i 's/\$(datadir)\/doc\/swish-e/\/usr\/share\/doc/g' $i
	done

%{__sed} -i 's/\$(datadir)\/doc\/\$(PACKAGE)/\/usr\/share\/doc/g' Makefile.in
%patch0
%patch1

%build
CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS
%{?_with_debug:CFLAGS="${CFLAGS//-O2/-O0}"}
%{!?_with_debug:CFLAGS="${CFLAGS//-g/}"}
CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS
FFLAGS="${FFLAGS:-%optflags}" ; export FFLAGS
for i in $(find . -name config.guess -o -name config.sub) ; do
	if [ -f /usr/lib/rpm/redhat/$(basename $i) ]; then
	%{__rm} -f $i
	%{__cp} -fv /usr/lib/rpm/redhat/$(basename $i) $i
	fi
done
./configure \
	--host=%{_host} \
	--build=%{_build} \
	--target=%{_target_platform} \
	--with-pcre \
	--with-libxml2 \
	--with-zlib \
	--prefix=%{_prefix} \
	--exec-prefix=%{_exec_prefix} \
	--bindir=%{_bindir} \
	--sbindir=%{_sbindir} \
	--sysconfdir=%{_sysconfdir} \
	--datadir=%{_datadir} \
	--includedir=%{_includedir} \
	--libdir=%{_libdir} \
	--libexecdir=%{_libexecdir} \
	--localstatedir=%{_localstatedir} \
	--sharedstatedir=%{_sharedstatedir} \
	--mandir=%{_mandir} \
	--infodir=%{_infodir} \

make

%install
[ "${RPM_BUILD_ROOT}" != "/" ] && [ -d ${RPM_BUILD_ROOT} ] && rm -rf ${RPM_BUILD_ROOT};
make DESTDIR=$RPM_BUILD_ROOT prefix=%{_prefix} sysconfdir=%{_sysconfdir} install

# If httpd is installed, this aliases the docs into webspace.
# if httpd is not installed, this just creates some directories.
%{__install} -D -p -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{httpd_conf_d_dir}/swish-e.conf

for i in $RPM_BUILD_ROOT%{_mandir}/man1/*.gz; do
	%{__rm} -f $i
	done

%{__install} -d -p -m 755 $RPM_BUILD_ROOT%{_defaultdocdir}/swish-e-%{version}
%{__mv} $RPM_BUILD_ROOT%{_defaultdocdir}/swish-e/* $RPM_BUILD_ROOT%{_defaultdocdir}/swish-e-%{version}
rmdir $RPM_BUILD_ROOT%{_defaultdocdir}/swish-e
%{__mv} $RPM_BUILD_ROOT%{_defaultdocdir}/INSTALL $RPM_BUILD_ROOT%{_defaultdocdir}/swish-e-%{version}
%{__mv} $RPM_BUILD_ROOT%{_defaultdocdir}/README $RPM_BUILD_ROOT%{_defaultdocdir}/swish-e-%{version}
%{__mv} $RPM_BUILD_ROOT%{_defaultdocdir}/README.cvs $RPM_BUILD_ROOT%{_defaultdocdir}/swish-e-%{version}


%clean
[ "${RPM_BUILD_ROOT}" != "/" ] && [ -d ${RPM_BUILD_ROOT} ] && %{__rm} -rf ${RPM_BUILD_ROOT};

%files
%defattr(-, root, root)
%{_bindir}/swish-e
%{_libdir}/swish-e/swishspider
%{_libdir}/libswish-e.so.2.0.0
%{_libdir}/libswish-e.so.2
%{_mandir}/man1/swish-e.1.gz
%{_mandir}/man1/SWISH-CONFIG.1.gz
%{_mandir}/man1/SWISH-FAQ.1.gz
%{_mandir}/man1/SWISH-LIBRARY.1.gz
%{_mandir}/man1/SWISH-RUN.1.gz

%files perl
%defattr(-, root, root)
%{_libdir}/swish-e/perl/SWISH/Filters/Doc2txt.pm
%{_libdir}/swish-e/perl/SWISH/Filters/Pdf2HTML.pm
%{_libdir}/swish-e/perl/SWISH/Filters/ID3toHTML.pm
%{_libdir}/swish-e/perl/SWISH/Filters/XLtoHTML.pm
%{_libdir}/swish-e/perl/SWISH/Filter.pm
%{_libdir}/swish-e/perl/SWISH/DateRanges.pm
%{_libdir}/swish-e/perl/SWISH/DefaultHighlight.pm
%{_libdir}/swish-e/perl/SWISH/PhraseHighlight.pm
%{_libdir}/swish-e/perl/SWISH/SimpleHighlight.pm
%{_libdir}/swish-e/perl/SWISH/TemplateDefault.pm
%{_libdir}/swish-e/perl/SWISH/TemplateDumper.pm
%{_libdir}/swish-e/perl/SWISH/TemplateFrame.pm
%{_libdir}/swish-e/perl/SWISH/TemplateHTMLTemplate.pm
%{_libdir}/swish-e/perl/SWISH/TemplateToolkit.pm
%{_libdir}/swish-e/perl/SWISH/ParseQuery.pm
%{_libdir}/swish-e/perl/doc2txt.pm
%{_libdir}/swish-e/perl/pdf2html.pm
%{_libdir}/swish-e/perl/pdf2xml.pm
%{_libdir}/swish-e/spider.pl
%{_libdir}/swish-e/DirTree.pl
%{_libdir}/swish-e/search.cgi
%{_libdir}/swish-e/swish.cgi
%{_bindir}/swish-filter-test
%{_datadir}/swish-e/search.tt
%{_datadir}/swish-e/swish.tmpl

%files doc
%defattr(-, root, root)
%docdir %{_defaultdocdir}/swish-e-%{version}
%doc %{_defaultdocdir}/swish-e-%{version}
#%doc %{_defaultdocdir}/swish-e/examples
#%doc %{_defaultdocdir}/swish-e-%{version}/html
#%doc %{_defaultdocdir}/swish-e-%{version}/examples
#%doc %{_defaultdocdir}/swish-e-%{version}/INSTALL
#%doc %{_defaultdocdir}/swish-e-%{version}/README
#%doc %{_defaultdocdir}/swish-e-%{version}/README.cvs
%config %{httpd_conf_d_dir}/swish-e.conf

%files devel
%defattr(-, root, root)
%{_includedir}/swish-e.h
%{_libdir}/libswish-e.la
%{_libdir}/libswish-e.a
%{_libdir}/libswish-e.so

%changelog
* Wed Sep 14 2005 Byron Young  2.4.2
- Packaged for FC4
- Added --with debug conditional rpmbuild option.
- Fixed error on x86_64 systems.
- Fixed harmless UTF8 to latin1 error message.
* Fri Oct 24 2003 David L Norris  2.4.0-pr4-0
- Added new files and moved extra documentation and examples to a separate package.
* Mon Jun 30 2003 David L Norris  2.4.0-pr1-1cefha
- Modified spec file to minimize dependences on CEFHA.org server.
* Thu Jun 19 2003 David L Norris  2.4.0-pr1
- Updated RPM spec to provide recently added files
* Sun Apr 20 2003 David L Norris  2.3.5
- Updated RPM to provide the SWISH-E helper scripts.
* Fri Mar 28 2003 David L Norris  2.3.5
- Updated RPM for the new libtool-based 2.3.5 build system.
* Wed Dec 04 2002 David L Norris  2.3-dev04
- Created RPM spec file


--- NEW FILE swish-e.xpm ---
/* XPM */
static char *swish-e[] = {
/* columns rows colors chars-per-pixel */
"20 20 16 1",
"  c #5a3025",
". c #743f33",
"X c #7c4d44",
"o c #855c50",
"O c #957065",
"+ c #997d70",
"@ c #a68c7f",
"# c #af9a8e",
"$ c #b0a396",
"% c #bbb0a6",
"& c #c5c1b8",
"* c #cecec1",
"= c #d7d7c8",
"- c #e2e2d5",
"; c #f0f0e5",
": c #fcfcf7",
/* pixels */
"::::;&&%&%&%&&&&&#%:",
":::&%%%%%%%%%%%%%X$;",
"::&&%;;;;;;;;;;;; #;",
":;%%:;;;;;;-;;;-- @-",
":%%=;-+XXX....    +=",
":%$;;# +@@@@@@@+++$&",
":%$;-Oo===****=**&&&",
":$$--$+@@@@@@@%*&&&&",
":$%&--#@@@@@+@@O&&&&",
":;@@*==**&&*&&@@O&**",
":;*+O%=********%X+==",
":;;&oXoO+OOO@%**#.*-",
":;;--#Oooooo.+&*&.#=",
":;;--======*$%@=* @-",
":&%$$##@@@@@+$%=* +=",
":%&$#@@@@@@@@@**@ &*",
":%%---**&&&*&***XX**",
":$$;-===*****=%X %*&",
":$+@#@@@@@@@@o  %**&",
";O           o+&&*&*"
};


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/swish-e/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	18 Sep 2005 23:19:24 -0000	1.1
+++ .cvsignore	18 Sep 2005 23:30:45 -0000	1.2
@@ -0,0 +1 @@
+swish-e-2.4.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/swish-e/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	18 Sep 2005 23:19:24 -0000	1.1
+++ sources	18 Sep 2005 23:30:45 -0000	1.2
@@ -0,0 +1 @@
+1606e2f55034540f88c1748eeaae5274  swish-e-2.4.2.tar.gz



From fedora-extras-commits at redhat.com  Sun Sep 18 23:38:44 2005
From: fedora-extras-commits at redhat.com (Byron Young (bkyoung))
Date: Sun, 18 Sep 2005 19:38:44 -0400
Subject: owners owners.list,1.232,1.233
Message-ID: <200509182338.j8INciQ8031882@cvs-int.fedora.redhat.com>

Author: bkyoung

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31863

Modified Files:
	owners.list 
Log Message:
Added swish-e to Fedora Extras.



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.232
retrieving revision 1.233
diff -u -r1.232 -r1.233
--- owners.list	18 Sep 2005 08:50:14 -0000	1.232
+++ owners.list	18 Sep 2005 23:38:42 -0000	1.233
@@ -947,6 +947,7 @@
 Fedora Extras|supertux|SuperTux is a jump'n run like game similar to Mario Bros|steve at silug.org|extras-qa at fedoraproject.org|
 Fedora Extras|svgalib|Low-level fullscreen SVGA graphics library|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|swatch|A tool for actively monitoring log files|jpo at di.uminho.pt|extras-qa at fedoraproject.org|
+Fedora Extras|swish-e|Simple Web Indexing System for Humans - Enhanced|bkyoung at users.sourceforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|sword|Free Bible Software Project|mpeters at mac.com|extras-qa at fedoraproject.org|
 Fedora Extras|sylpheed-claws|The bleeding edge branch of Sylpheed|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|sylpheed-claws-plugins|Additional plugins for sylpheed-claws|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Mon Sep 19 14:22:07 2005
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Mon, 19 Sep 2005 10:22:07 -0400
Subject: rpms/nexuiz-data/devel .cvsignore, 1.3, 1.4 nexuiz-data.spec, 1.3,
	1.4 sources, 1.3, 1.4
Message-ID: <200509191422.j8JEM702021928@cvs-int.fedora.redhat.com>

Author: adrian

Update of /cvs/extras/rpms/nexuiz-data/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21905

Modified Files:
	.cvsignore nexuiz-data.spec sources 
Log Message:
* Mon Sep 19 2005 Adrian Reber  - 1.2.1-1
- updated to 1.2.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nexuiz-data/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	3 Sep 2005 14:13:03 -0000	1.3
+++ .cvsignore	19 Sep 2005 14:22:04 -0000	1.4
@@ -1,2 +1 @@
-nexuiz-data-1.2.tar
-serverfix12.zip
+nexuiz-data-1.2.1.tar


Index: nexuiz-data.spec
===================================================================
RCS file: /cvs/extras/rpms/nexuiz-data/devel/nexuiz-data.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- nexuiz-data.spec	3 Sep 2005 14:41:04 -0000	1.3
+++ nexuiz-data.spec	19 Sep 2005 14:22:04 -0000	1.4
@@ -1,21 +1,21 @@
-%define datadate 20050818
+%define datadate 20050905
 
 Summary: Game data for the Nexuiz first person shooter
 Name: nexuiz-data
-Version: 1.2
-Release: 2
+Version: 1.2.1
+Release: 1
 License: GPL
 Group: Amusements/Games
 URL: http://www.nexuiz.com/
 # Source is custom, obtained with :
-# wget http://dl.sf.net/sourceforge/nexuiz/nexuiz11.zip
-# unzip nexuiz12.zip
-# mkdir nexuiz-data-1.2/
+# wget http://dl.sf.net/sourceforge/nexuiz/nexuiz121.zip
+# unzip nexuiz121.zip
+# mkdir nexuiz-data-1.2.1/
 # mv Nexuiz/data/ Nexuiz/Readme.htm Nexuiz/gpl.txt \
-#    nexuiz-data-1.2/
-# tar cvf nexuiz-data-1.2.tar nexuiz-data-1.2/
+#    Nexuiz/betacredits.txt  Nexuiz/gamemodes.txt \
+#    nexuiz-data-1.2.1/
+# tar cvf nexuiz-data-1.2.1.tar nexuiz-data-1.2.1/
 Source0: nexuiz-data-%{version}.tar
-Source1: http://dl.sf.net/sourceforge/nexuiz/serverfix12.zip
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 
@@ -27,8 +27,7 @@
 
 %prep
 %setup -q
-%{__sed} -i 's/\r//' Readme.htm
-%{__unzip} %{SOURCE1} data/data20050830.pk3
+%{__sed} -i 's/\r//' Readme.htm *.txt data/*.txt
 
 %build
 
@@ -36,7 +35,6 @@
 %{__rm} -rf %{buildroot}
 %{__mkdir_p} %{buildroot}%{_datadir}/nexuiz/data/
 %{__install} -p data/data%{datadate}-full.pk3 \
-	data/data20050830.pk3 \
         %{buildroot}%{_datadir}/nexuiz/data/
 
 %clean
@@ -44,10 +42,14 @@
 
 %files
 %defattr(0644, root, root, 0755)
-%doc Readme.htm gpl.txt data/cvars.txt data/mapping.txt
+%doc Readme.htm gpl.txt data/cvars.txt data/mapping.txt betacredits.txt
+%doc gamemodes.txt
 %{_datadir}/nexuiz/
 
 %changelog
+* Mon Sep 19 2005 Adrian Reber  - 1.2.1-1
+- updated to 1.2.1
+
 * Sat Sep 03 2005 Adrian Reber  - 1.2-2
 - I should really test my changes before check-in
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nexuiz-data/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	3 Sep 2005 14:13:03 -0000	1.3
+++ sources	19 Sep 2005 14:22:04 -0000	1.4
@@ -1,2 +1 @@
-d6cc369900e6356a21daf4b95297c7f3  nexuiz-data-1.2.tar
-6e5f8fe6b9933f628779121eb31c9550  serverfix12.zip
+64d371d2008b096c67980e7a65a412bc  nexuiz-data-1.2.1.tar



From fedora-extras-commits at redhat.com  Mon Sep 19 14:25:50 2005
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Mon, 19 Sep 2005 10:25:50 -0400
Subject: rpms/nexuiz/devel .cvsignore, 1.3, 1.4 nexuiz.spec, 1.5, 1.6 sources,
	1.3, 1.4
Message-ID: <200509191425.j8JEPoMi022017@cvs-int.fedora.redhat.com>

Author: adrian

Update of /cvs/extras/rpms/nexuiz/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21994

Modified Files:
	.cvsignore nexuiz.spec sources 
Log Message:
* Mon Sep 19 2005 Adrian Reber  - 1.2.1-1
- updated to 1.2.1
- icons and binaries are now being renamed from darkplaces* to nexuiz*



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nexuiz/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	3 Sep 2005 14:14:02 -0000	1.3
+++ .cvsignore	19 Sep 2005 14:25:48 -0000	1.4
@@ -1 +1 @@
-nexuizenginesource20050814beta1.zip
+nexuizenginesource20050911.zip


Index: nexuiz.spec
===================================================================
RCS file: /cvs/extras/rpms/nexuiz/devel/nexuiz.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- nexuiz.spec	3 Sep 2005 14:35:48 -0000	1.5
+++ nexuiz.spec	19 Sep 2005 14:25:48 -0000	1.6
@@ -1,14 +1,14 @@
 Summary: Multiplayer, deathmatch oriented first person shooter
 Name: nexuiz
-Version: 1.2
-Release: 2%{?dist}
+Version: 1.2.1
+Release: 1%{?dist}
 License: GPL
 Group: Amusements/Games
 URL: http://www.nexuiz.com/
 # Source is custom, obtained with :
-# wget http://dl.sf.net/sourceforge/nexuiz/nexuiz12.zip
-# unzip nexuiz12.zip  Nexuiz/nexuizenginesource20050814beta1.zip
-Source: nexuizenginesource20050814beta1.zip
+# wget http://dl.sf.net/sourceforge/nexuiz/nexuiz121.zip
+# unzip nexuiz121.zip Nexuiz/nexuizenginesource20050911.zip
+Source: nexuizenginesource20050911.zip
 Patch0: nexuiz-1.0-basedir.patch
 Patch1: nexuiz-1.1-nostrip.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -52,7 +52,7 @@
 
 %build
 %{__make} cl-release sv-release OPTIM_RELEASE="$RPM_OPT_FLAGS"
-convert nexuiz.ico nexuiz.png
+convert darkplaces.ico nexuiz.png
 
 
 %install
@@ -60,8 +60,10 @@
 
 # Install the main programs
 %{__mkdir_p} %{buildroot}%{_bindir}
-%{__install} -m 0755 nexuiz-{glx,dedicated} \
-        %{buildroot}%{_bindir}/
+%{__install} -m 0755 darkplaces-glx \
+        %{buildroot}%{_bindir}/nexuiz-glx
+%{__install} -m 0755 darkplaces-dedicated \
+        %{buildroot}%{_bindir}/nexuiz-dedicated
 
 # Create the desktop file
 %{__cat} > %{name}.desktop << EOF
@@ -108,18 +110,22 @@
 
 %files
 %defattr(-,root,root,-)
-%doc COPYING ChangeLog darkplaces.txt
+%doc COPYING darkplaces.txt
 %{_bindir}/nexuiz-glx
 %{_datadir}/icons/hicolor/*/apps/nexuiz.png
 %{_datadir}/applications/*%{name}.desktop
 
 %files server
 %defattr(-,root,root,-)
-%doc COPYING ChangeLog darkplaces.txt
+%doc COPYING darkplaces.txt
 %{_bindir}/nexuiz-dedicated
 
 
 %changelog
+* Mon Sep 19 2005 Adrian Reber  - 1.2.1-1
+- updated to 1.2.1
+- icons and binaries are now being renamed from darkplaces* to nexuiz*
+
 * Fri Sep 02 2005 Adrian Reber  - 1.2-2
 - another try without smp_mflags
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nexuiz/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	3 Sep 2005 14:14:02 -0000	1.3
+++ sources	19 Sep 2005 14:25:48 -0000	1.4
@@ -1 +1 @@
-f46eab779e2d5d08bd21dad648a1e62f  nexuizenginesource20050814beta1.zip
+ea845ee2842ad6a2304da1f0b2c95bdd  nexuizenginesource20050911.zip



From fedora-extras-commits at redhat.com  Mon Sep 19 14:43:45 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Mon, 19 Sep 2005 10:43:45 -0400
Subject: rpms/perl-File-NCopy - New directory
Message-ID: <200509191443.j8JEhjXr022174@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-File-NCopy
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22154/perl-File-NCopy

Log Message:
Directory /cvs/extras/rpms/perl-File-NCopy added to the repository




From fedora-extras-commits at redhat.com  Mon Sep 19 14:43:45 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Mon, 19 Sep 2005 10:43:45 -0400
Subject: rpms/perl-File-NCopy/devel - New directory
Message-ID: <200509191443.j8JEhjD7022179@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-File-NCopy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22154/perl-File-NCopy/devel

Log Message:
Directory /cvs/extras/rpms/perl-File-NCopy/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Sep 19 14:44:13 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Mon, 19 Sep 2005 10:44:13 -0400
Subject: rpms/perl-File-NCopy Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200509191444.j8JEiDtM022228@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-File-NCopy
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22199

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-File-NCopy


--- NEW FILE Makefile ---
# Top level Makefile for module perl-File-NCopy
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Mon Sep 19 14:44:13 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Mon, 19 Sep 2005 10:44:13 -0400
Subject: rpms/perl-File-NCopy/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200509191444.j8JEiDwf022233@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-File-NCopy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22199/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-File-NCopy


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Mon Sep 19 14:45:10 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Mon, 19 Sep 2005 10:45:10 -0400
Subject: rpms/perl-File-NCopy import.log,1.1,1.2
Message-ID: <200509191445.j8JEjei3022313@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-File-NCopy
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22272

Modified Files:
	import.log 
Log Message:
auto-import perl-File-NCopy-0.34-2 on branch devel from perl-File-NCopy-0.34-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-File-NCopy/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	19 Sep 2005 14:44:11 -0000	1.1
+++ import.log	19 Sep 2005 14:45:08 -0000	1.2
@@ -0,0 +1 @@
+perl-File-NCopy-0_34-2:HEAD:perl-File-NCopy-0.34-2.src.rpm:1127141089



From fedora-extras-commits at redhat.com  Mon Sep 19 14:45:10 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Mon, 19 Sep 2005 10:45:10 -0400
Subject: rpms/perl-File-NCopy/devel perl-File-NCopy.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200509191445.j8JEjfoT022317@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-File-NCopy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22272/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-File-NCopy.spec 
Log Message:
auto-import perl-File-NCopy-0.34-2 on branch devel from perl-File-NCopy-0.34-2.src.rpm


--- NEW FILE perl-File-NCopy.spec ---
Name: 		perl-File-NCopy
Version: 	0.34
Release: 	2%{?dist}
Summary:	Copy files to directories, or a single file to another file
License: 	GPL or Artistic
Group: 		Development/Libraries
URL: 		http://search.cpan.org/dist/File-NCopy/
Source0:        http://www.cpan.org/authors/id/M/MZ/MZSANFORD/File-NCopy-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
BuildArch: noarch

%description
File::NCopy copies files to directories, or a single file to another
file. The functionality is very similar to cp.

%prep
%setup -q -n File-NCopy-%{version}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'
find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';'
chmod -R u+w $RPM_BUILD_ROOT/*

%clean
rm -rf $RPM_BUILD_ROOT

%check
make test

%files
%defattr(-,root,root,-)
%doc Changes
%{perl_vendorlib}/File
%{_mandir}/man3/*

%changelog
* Thu Sep 01 2005 Ralf Corsepius  - 0.34-1
- FE submission.

* Tue Jun 28 2005 Ralf Corsepius  - 0.34-0.pm.1
- Initial packman version.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-File-NCopy/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	19 Sep 2005 14:44:11 -0000	1.1
+++ .cvsignore	19 Sep 2005 14:45:08 -0000	1.2
@@ -0,0 +1 @@
+File-NCopy-0.34.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-File-NCopy/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	19 Sep 2005 14:44:11 -0000	1.1
+++ sources	19 Sep 2005 14:45:08 -0000	1.2
@@ -0,0 +1 @@
+a2633eb0f3f8a6906303e709a35af26f  File-NCopy-0.34.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 19 14:54:33 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Mon, 19 Sep 2005 10:54:33 -0400
Subject: rpms/perl-File-NCopy/devel perl-File-NCopy.spec,1.1,1.2
Message-ID: <200509191454.j8JEsXOH022385@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-File-NCopy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22366

Modified Files:
	perl-File-NCopy.spec 
Log Message:
Spec cleanup.


Index: perl-File-NCopy.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-File-NCopy/devel/perl-File-NCopy.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-File-NCopy.spec	19 Sep 2005 14:45:08 -0000	1.1
+++ perl-File-NCopy.spec	19 Sep 2005 14:54:31 -0000	1.2
@@ -1,11 +1,11 @@
 Name: 		perl-File-NCopy
 Version: 	0.34
-Release: 	2%{?dist}
+Release: 	3%{?dist}
 Summary:	Copy files to directories, or a single file to another file
 License: 	GPL or Artistic
 Group: 		Development/Libraries
 URL: 		http://search.cpan.org/dist/File-NCopy/
-Source0:        http://www.cpan.org/authors/id/M/MZ/MZSANFORD/File-NCopy-%{version}.tar.gz
+Source0:        http://search.cpan.org/CPAN/authors/id/M/MZ/MZSANFORD/File-NCopy-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
@@ -42,8 +42,8 @@
 %{_mandir}/man3/*
 
 %changelog
+* Mon Sep 19 2005 Ralf Corsepius  - 0.34-3
+- Spec cleanup.
+
 * Thu Sep 01 2005 Ralf Corsepius  - 0.34-1
 - FE submission.
-
-* Tue Jun 28 2005 Ralf Corsepius  - 0.34-0.pm.1
-- Initial packman version.



From fedora-extras-commits at redhat.com  Mon Sep 19 15:29:22 2005
From: fedora-extras-commits at redhat.com (Jason Tibbitts (tibbs))
Date: Mon, 19 Sep 2005 11:29:22 -0400
Subject: rpms/denyhosts/devel .cvsignore, 1.9, 1.10 denyhosts.spec, 1.13,
	1.14 sources, 1.9, 1.10
Message-ID: <200509191529.j8JFTMDT023865@cvs-int.fedora.redhat.com>

Author: tibbs

Update of /cvs/extras/rpms/denyhosts/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23840

Modified Files:
	.cvsignore denyhosts.spec sources 
Log Message:
* Mon Sep 19 2005 Jason L Tibbitts III  - 1.0.3-1
- Update to 1.0.3



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/denyhosts/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	23 Aug 2005 22:14:22 -0000	1.9
+++ .cvsignore	19 Sep 2005 15:29:20 -0000	1.10
@@ -1 +1 @@
-DenyHosts-1.0.2.tar.gz
+DenyHosts-1.0.3.tar.gz


Index: denyhosts.spec
===================================================================
RCS file: /cvs/extras/rpms/denyhosts/devel/denyhosts.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- denyhosts.spec	23 Aug 2005 22:14:22 -0000	1.13
+++ denyhosts.spec	19 Sep 2005 15:29:20 -0000	1.14
@@ -1,5 +1,5 @@
 Name:           denyhosts
-Version:        1.0.2
+Version:        1.0.3
 release:	1%{?dist}
 Summary:        A script to help thwart ssh server attacks
 
@@ -125,6 +125,9 @@
 %{_bindir}/denyhosts-control
 
 %changelog
+* Mon Sep 19 2005 Jason L Tibbitts III  - 1.0.3-1
+- Update to 1.0.3
+
 * Tue Aug 23 2005 Jason L Tibbitts III  - 1.0.2-1
 - Update to 1.0.2
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/denyhosts/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	23 Aug 2005 22:14:22 -0000	1.9
+++ sources	19 Sep 2005 15:29:20 -0000	1.10
@@ -1 +1 @@
-171da60b51c39c56056af6a3e8de49d9  DenyHosts-1.0.2.tar.gz
+1c610e0354408ee7c29b7ac86764b844  DenyHosts-1.0.3.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 19 15:47:13 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 19 Sep 2005 11:47:13 -0400
Subject: rpms/rekall - New directory
Message-ID: <200509191547.j8JFlDrl024007@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/rekall
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23983/rekall

Log Message:
Directory /cvs/extras/rpms/rekall added to the repository




From fedora-extras-commits at redhat.com  Mon Sep 19 15:47:13 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 19 Sep 2005 11:47:13 -0400
Subject: rpms/rekall/devel - New directory
Message-ID: <200509191547.j8JFlDCM024012@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/rekall/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23983/rekall/devel

Log Message:
Directory /cvs/extras/rpms/rekall/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Sep 19 15:47:23 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 19 Sep 2005 11:47:23 -0400
Subject: rpms/rekall Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200509191547.j8JFlNG6024057@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/rekall
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24028

Added Files:
	Makefile import.log 
Log Message:
Setup of module rekall


--- NEW FILE Makefile ---
# Top level Makefile for module rekall
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Mon Sep 19 15:47:24 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 19 Sep 2005 11:47:24 -0400
Subject: rpms/rekall/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200509191547.j8JFlOHh024062@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/rekall/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24028/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module rekall


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Mon Sep 19 15:49:53 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 19 Sep 2005 11:49:53 -0400
Subject: rpms/rekall import.log,1.1,1.2
Message-ID: <200509191550.j8JFoNEh024180@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/rekall
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24132

Modified Files:
	import.log 
Log Message:
auto-import rekall-2.2.3-5 on branch devel from rekall-2.2.3-5.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/rekall/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	19 Sep 2005 15:47:21 -0000	1.1
+++ import.log	19 Sep 2005 15:49:51 -0000	1.2
@@ -0,0 +1 @@
+rekall-2_2_3-5:HEAD:rekall-2.2.3-5.src.rpm:1127144984



From fedora-extras-commits at redhat.com  Mon Sep 19 15:49:53 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 19 Sep 2005 11:49:53 -0400
Subject: rpms/rekall/devel rekall-2.2.3-64bitfix.patch, NONE,
	1.1 rekall-2.2.3-norpath3.patch, NONE,
	1.1 rekall-2.2.3-py24.patch, NONE, 1.1 rekall.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200509191549.j8JFnrF9024172@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/rekall/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24132/devel

Modified Files:
	.cvsignore sources 
Added Files:
	rekall-2.2.3-64bitfix.patch rekall-2.2.3-norpath3.patch 
	rekall-2.2.3-py24.patch rekall.spec 
Log Message:
auto-import rekall-2.2.3-5 on branch devel from rekall-2.2.3-5.src.rpm

rekall-2.2.3-64bitfix.patch:

--- NEW FILE rekall-2.2.3-64bitfix.patch ---
--- rekall-2.2.3/configure.BAD	2005-06-18 18:54:56.478497376 -0500
+++ rekall-2.2.3/configure	2005-06-18 18:58:49.389089584 -0500
@@ -28918,7 +28918,7 @@
 if test "${with_qt_dir+set}" = set; then
   withval="$with_qt_dir"
     ac_qt_includes="$withval"/include
-       ac_qt_libraries="$withval"/lib${kdelibsuff}
+       ac_qt_libraries="$withval"/lib
        ac_qt_bindir="$withval"/bin
 
 fi;
@@ -28982,7 +28982,7 @@
 
 qt_libdirs=""
 for dir in $kde_qt_dirs; do
-   qt_libdirs="$qt_libdirs $dir/lib${kdelibsuff} $dir"
+   qt_libdirs="$qt_libdirs $dir/lib $dir"
 done
 qt_libdirs="$QTLIB $qt_libdirs /usr/X11R6/lib /usr/lib /usr/local/qt/lib $x_libraries"
 if test ! "$ac_qt_libraries" = "NO"; then
@@ -32627,7 +32627,7 @@
   MYSQL_INCDIR=$mysql_incdir
 fi
 
-mysql_libdirs="$ac_mysql_libdir /usr/lib /usr/lib/mysql /usr/local/lib/mysql /usr/local/lib"
+mysql_libdirs="$ac_mysql_libdir /usr/lib /usr/lib/mysql /usr/local/lib/mysql /usr/local/lib /usr/lib${kdelibsuff}/mysql"
 
 mysql_libdir=NO
 for i in $mysql_libdirs;

rekall-2.2.3-norpath3.patch:

--- NEW FILE rekall-2.2.3-norpath3.patch ---
--- rekall-2.2.3/configure.BAD	2005-06-18 10:36:14.000000000 -0500
+++ rekall-2.2.3/configure	2005-06-18 10:37:04.000000000 -0500
@@ -29730,17 +29730,8 @@
 
 if test -z "$KDE_RPATH" && test "$USE_RPATH" = "yes"; then
 
-  KDE_RPATH="-R \$(kde_libraries)"
-
   if test -n "$qt_libraries"; then
-    KDE_RPATH="$KDE_RPATH -R \$(qt_libraries)"
-  fi
-    if test -n "$X_LDFLAGS"; then
-    X_RPATH="-R \$(x_libraries)"
-    KDE_RPATH="$KDE_RPATH $X_RPATH"
-  fi
-  if test -n "$KDE_EXTRA_RPATH"; then
-    KDE_RPATH="$KDE_RPATH \$(KDE_EXTRA_RPATH)"
+    KDE_RPATH="-R \$(qt_libraries)"
   fi
 fi
 

rekall-2.2.3-py24.patch:

--- NEW FILE rekall-2.2.3-py24.patch ---
--- rekall-2.2.3/configure.BAD	2005-06-17 10:57:53.000000000 -0500
+++ rekall-2.2.3/configure	2005-06-17 10:58:20.000000000 -0500
@@ -32488,6 +32488,9 @@
 			2.3) SYSPYVER="2.3"
 			     USESYSPY=1
 			     ;;
+			2.4) SYSPYVER="2.4"
+			     USESYSPY=1
+			     ;;
 
 			*)   { { echo "$as_me:$LINENO: error: Unrecognised python version: $pyver" >&5
 echo "$as_me: error: Unrecognised python version: $pyver" >&2;}


--- NEW FILE rekall.spec ---
Name:		rekall
Summary:	A KDE database front-end application
Version:	2.2.3
Release:	5%{?dist}
Group:		Development/Tools
License:	GPL
URL:		http://www.rekallrevealed.org/
Source0: 	http://www.rekallrevealed.org/packages/%{name}-%{version}-2.tar.gz
Patch0:		rekall-2.2.3-py24.patch
Patch1:		rekall-2.2.3-norpath3.patch
Patch2:		rekall-2.2.3-64bitfix.patch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:	xbsql-devel, python-devel, mysql-devel, postgresql-devel
BuildRequires:	kdelibs-devel, desktop-file-utils
Requires(post): desktop-file-utils
Requires(postun): desktop-file-utils
Requires:	rekall-common = %{version}-%{release}

%description
Rekall is a database front-end, however, Rekall is not itself a 
database, and does not include a database. By this we mean that data 
is stored somewhere else in an SQL server, and Rekall is fundementally 
just a tool to extract, display and update that data (of course, it does 
lots more than that, it does forms and reports and scripting...). It is 
database agnostic, and does not have any preferred database (plugins are 
available for MySQL and PostgreSQL).

%package common
Summary: Rekall common libraries
Group: System Environment/Libraries

%description common
This package contains a set of common libraries that both rekall and 
rekall-runtime require to function.

%package devel
Summary: Rekall development libraries and headers
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}

%description devel
Headers and libraries for compiling programs that use Rekall.

%package docs
Summary: Rekall documentation
Group: Documentation
Requires: %{name} = %{version}-%{release}

%description docs
Documentation for Rekall

%package extra
Summary: Rekall Extra Stuff Plugin
Group: System Environment/Libraries
Requires: %{name} = %{version}-%{release}

%description extra
Rekall Extra Stuff Plugin.

%package mysql
Summary: Rekall MySQL driver
Group: System Environment/Libraries
Requires: %{name} = %{version}-%{release}

%description mysql
Driver to add MySQL support to Rekall.

%package postgresql
Summary: Rekall PostgreSQL driver
Group: System Environment/Libraries
Requires: %{name} = %{version}-%{release}

%description postgresql
Driver to add PostgreSQL support to Rekall.

%package python
Summary: Rekall Python support
Group: System Environment/Libraries
Requires: %{name} = %{version}-%{release}

%description python
Python components and scripts for Rekall.

%package runtime
Summary: Rekall runtime environment
Group: Development/Tools
Provides: %{name}-runtime-devel = %{version}-%{release}
Requires(post): desktop-file-utils
Requires(postun): desktop-file-utils
Requires: rekall-common = %{version}-%{release}

%description runtime
RekallRT is the runtime version of Rekall. It contains all the functionality 
of Rekall except that all design functions are removed, and direct access to 
tables and queries is restricted.

Typically, you can develop a Rekall application with the full version, then 
allow users to run it under the runtime version. Such a user is restricted 
to accessing the database only via the forms and reports that you have 
designed, and via any associated scripts.

%prep
%setup -q
%patch0 -p1
%patch1 -p1
%patch2 -p1

%build
export KDEDIR=%{_prefix}

%configure				\
	--with-qlib-loader		\
	--with-gui=kde			\
	--disable-rpath			\
	--enable-docs=yes		\
	--enable-odbc=yes		\
	--enable-iodbc=yes		\
	--enable-runtime=yes		\
	--enable-debug=yes		\
	--with-qt-dir=%{_libdir}/qt-3.3	\
%ifarch x86_64 ia64 sparc64 ppc64 
	--enable-libsuffix=64		\
%endif
	--with-sgml-prefix=%{_prefix}

make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make DESTDIR=$RPM_BUILD_ROOT install
# Normally, we'd nuke the .la files, but rekall actually seems to want them...
# rm -rf $RPM_BUILD_ROOT%{_libdir}/*.la
mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
mv $RPM_BUILD_ROOT%{_datadir}/doc/HTML $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}

mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
desktop-file-install --vendor fedora --delete-original \
  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
  --add-category X-Fedora \
  --add-category Application \
  --add-category Office \
  --add-mime-type Application/x-rlk \
  $RPM_BUILD_ROOT%{_datadir}/%{name}.desktop

sed -i -e 's|Rekall|Rekall RT|' $RPM_BUILD_ROOT%{_datadir}/%{name}rt.desktop
sed -i -e 's|rekall.png|rekallrt.png|' $RPM_BUILD_ROOT%{_datadir}/%{name}rt.desktop

desktop-file-install --vendor fedora --delete-original \
  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
  --add-category X-Fedora \
  --add-category Application \
  --add-category Office \
  --add-mime-type Application/x-rlk \
  $RPM_BUILD_ROOT%{_datadir}/%{name}rt.desktop

# No need to have this file twice.
rm -rf $RPM_BUILD_ROOT%{_datadir}/apps/rekall/LICENSE

%find_lang %{name}

cd $RPM_BUILD_ROOT%{_datadir}
ln -s %{_datadir}/apps/rekall/icons/hicolor/32x32/apps/rekall.png pixmaps/rekall.png
cp apps/rekall/icons/hicolor/32x32/apps/rekall.png pixmaps/rekallrt.png

%clean
rm -rf $RPM_BUILD_ROOT

%post
/sbin/ldconfig
update-desktop-database %{_datadir}/applications &> /dev/null

%postun
/sbin/ldconfig
if [ "$1" = "0" ]; then
  update-desktop-database %{_datadir}/applications &> /dev/null
fi

%post common -p /sbin/ldconfig

%postun common -p /sbin/ldconfig

%post extra -p /sbin/ldconfig

%postun extra -p /sbin/ldconfig

%post mysql -p /sbin/ldconfig

%postun mysql -p /sbin/ldconfig

%post postgresql -p /sbin/ldconfig

%postun postgresql -p /sbin/ldconfig

%post python -p /sbin/ldconfig

%postun python -p /sbin/ldconfig

%post runtime
/sbin/ldconfig
update-desktop-database %{_datadir}/applications &> /dev/null

%postun runtime
/sbin/ldconfig
if [ "$1" = "0" ]; then
  update-desktop-database %{_datadir}/applications &> /dev/null
fi

%files -f %{name}.lang
%defattr(-, root, root, 0755)
%doc LICENSE
%{_libdir}/libel_*.so.*
%{_libdir}/libel_*.la
%{_libdir}/libkbase.so.*
%{_libdir}/libkbase.la
%{_libdir}/libkbase_*.so.*
%exclude %{_libdir}/libkbase_common.so.*
%exclude %{_libdir}/libkbase_kde.so.*
%exclude %{_libdir}/libkbase_tkwidgets.so.*
%{_libdir}/libkbase_*.la
%{_libdir}/librekall.so.*
%{_libdir}/librekall.la
%{_bindir}/rekall
%{_datadir}/pixmaps/rekall.png
%dir %{_datadir}/apps/rekall
%{_datadir}/apps/rekall/dict/*
%{_datadir}/apps/rekall/help/*
%{_datadir}/apps/rekall/highlight/*
%{_datadir}/apps/rekall/icons/*
%{_datadir}/apps/rekall/keymap
%{_datadir}/apps/rekall/pics/*
%{_datadir}/apps/rekall/rekall.png
%{_datadir}/apps/rekall/rekallui.*
%{_datadir}/apps/rekall/services/kdeparts.lst
%{_datadir}/apps/rekall/services/rekall_component.desktop
%{_datadir}/apps/rekall/services/rekall_copier.desktop
%{_datadir}/apps/rekall/services/rekall_driver_xbase.desktop
%{_datadir}/apps/rekall/services/rekall_dummy.desktop
%{_datadir}/apps/rekall/services/rekall_editor.desktop
%{_datadir}/apps/rekall/services/rekall_form.desktop
%{_datadir}/apps/rekall/services/rekall_macro.desktop
%{_datadir}/apps/rekall/services/rekall_plugin_kde.desktop
%{_datadir}/apps/rekall/services/rekall_query.desktop
%{_datadir}/apps/rekall/services/rekall_report.desktop
%{_datadir}/apps/rekall/services/rekall_table.desktop
%{_datadir}/apps/rekall/wizards/*
%{_datadir}/applications/fedora-rekall.desktop
%{_libdir}/libkbase_componentview.so
%{_libdir}/libkbase_copierview.so
%{_libdir}/libkbase_editor.so
%{_libdir}/libkbase_formview.so
%{_libdir}/libkbase_macroview.so
%{_libdir}/libkbase_queryview.so
%{_libdir}/libkbase_reportview.so
%{_libdir}/libkbase_tableview.so

%files common
%defattr(-, root, root, 0755)
%{_libdir}/libkbase_common.so.*
%{_libdir}/libkbase_kde.so.*
%{_libdir}/libkbase_tkwidgets.so.*

%files devel
%defattr(-, root, root, 0755)
%{_includedir}/*
%{_libdir}/libel_compile.so
%{_libdir}/libel_interp.so
%{_libdir}/libkbase.so
%{_libdir}/libkbase_app.so
%{_libdir}/libkbase_common.so
%{_libdir}/libkbase_driver_xbase.so
%{_libdir}/libkbase_driver_xbase.la
%{_libdir}/libkbase_kde.so
%{_libdir}/libkbase_plugin_kde.so
%{_libdir}/libkbase_tkwidgets.so
%{_libdir}/libkbase_wizard.so
%{_libdir}/librekall.so

%files docs
%defattr(-, root, root, 0755)
%doc AUTHORS INSTALL.KDE README.FIRST Release.Notes
%{_docdir}/%{name}-%{version}/*

%files extra
%defattr(-, root, root, 0755)
%{_datadir}/apps/rekall/services/rekall_plugin_extra.desktop
%{_libdir}/libkbase_plugin_extra.so
%{_libdir}/libkbase_plugin_extra.la

%files mysql
%defattr(-, root, root, 0755)
%{_datadir}/apps/rekall/services/rekall_driver_mysql.desktop
%{_libdir}/libkbase_driver_mysql.so
%{_libdir}/libkbase_driver_mysql.la

%files postgresql
%defattr(-, root, root, 0755)
%{_datadir}/apps/rekall/services/rekall_driver_pgsql.desktop
%{_libdir}/libkbase_driver_pgsql.so
%{_libdir}/libkbase_driver_pgsql.la

%files python
%defattr(-, root, root, 0755)
%dir %{_datadir}/apps/rekall/stock/component/py
%{_datadir}/apps/rekall/stock/component/py/*
%dir %{_datadir}/apps/rekall/script/py
%{_datadir}/apps/rekall/script/py/*
%{_datadir}/apps/rekall/services/rekall_script_py.desktop
%{_libdir}/libkbase_script_py.so
%{_libdir}/libkbase_script_pysys.so

%files runtime
%defattr(-, root, root, 0755)
%{_bindir}/rekallrt
%{_datadir}/apps/rekall/services/rekallrt_copier.desktop
%{_datadir}/apps/rekall/services/rekallrt_form.desktop
%{_datadir}/apps/rekall/services/rekallrt_query.desktop
%{_datadir}/apps/rekall/services/rekallrt_report.desktop
%{_datadir}/apps/rekall/services/rekallrt_table.desktop
%{_datadir}/apps/rekall/services/rekallrt_plugin_extra.desktop
%{_datadir}/apps/rekall/services/rekallrt_script_py.desktop
%{_datadir}/apps/rekallrt
%{_datadir}/applications/fedora-rekallrt.desktop
%{_datadir}/pixmaps/rekallrt.png
%{_libdir}/libkbasert_plugin_extra.so
%{_libdir}/libkbasert_script_py.so
%{_libdir}/libkbasert_script_pysys.so
%{_libdir}/libkbasert.so*
%{_libdir}/libkbasert_app.so*
%{_libdir}/libkbasert_formview.so
%{_libdir}/libkbasert_queryview.so
%{_libdir}/libkbasert_reportview.so
%{_libdir}/libkbasert_tableview.so
%{_libdir}/libkbasert*.la
%{_libdir}/librekallrt.so*
%{_libdir}/librekallrt.la

%changelog
* Mon Sep 19 2005 Tom "spot" Callaway  2.2.3-5
- get rid of unnecessary BR: xbase-devel and qt-devel

* Sat Sep 17 2005 Tom "spot" Callaway  2.2.3-4
- fix runtime package to actually be standalone
- create common package that both rekall and rekall-runtime need

* Thu Sep  8 2005 Tom "spot" Callaway  2.2.3-3
- runtime: R: desktop-file-utils
- use %%{_datadir} everywhere

* Sun Sep  4 2005 Tom "spot" Callaway  2.2.3-2
- BR: desktop-file-utils
- R: desktop-file-utils
- fix typo in runtime desc
- set vendor to fedora not kde
- add Office, Application to category
- add rlk mimetype
- make symlink for icon
- provide runtime-devel in runtime package
- include .la files
- lots of missing post/postun added
- icon for the runtime bits

* Fri Jun 17 2005 Tom "spot" Callaway  2.2.3-1
- initial package for Fedora Extras


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rekall/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	19 Sep 2005 15:47:22 -0000	1.1
+++ .cvsignore	19 Sep 2005 15:49:51 -0000	1.2
@@ -0,0 +1 @@
+rekall-2.2.3-2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rekall/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	19 Sep 2005 15:47:22 -0000	1.1
+++ sources	19 Sep 2005 15:49:51 -0000	1.2
@@ -0,0 +1 @@
+0c27445eb9d58877067d60c94ef0dca9  rekall-2.2.3-2.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 19 15:50:50 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Mon, 19 Sep 2005 11:50:50 -0400
Subject: rpms/perl-File-Flat - New directory
Message-ID: <200509191550.j8JFoonE024261@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-File-Flat
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24241/perl-File-Flat

Log Message:
Directory /cvs/extras/rpms/perl-File-Flat added to the repository




From fedora-extras-commits at redhat.com  Mon Sep 19 15:50:50 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Mon, 19 Sep 2005 11:50:50 -0400
Subject: rpms/perl-File-Flat/devel - New directory
Message-ID: <200509191550.j8JFooj0024266@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-File-Flat/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24241/perl-File-Flat/devel

Log Message:
Directory /cvs/extras/rpms/perl-File-Flat/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Sep 19 15:51:17 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Mon, 19 Sep 2005 11:51:17 -0400
Subject: rpms/perl-File-Flat Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200509191551.j8JFpHeV024315@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-File-Flat
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24286

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-File-Flat


--- NEW FILE Makefile ---
# Top level Makefile for module perl-File-Flat
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Mon Sep 19 15:51:17 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Mon, 19 Sep 2005 11:51:17 -0400
Subject: rpms/perl-File-Flat/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200509191551.j8JFpHIB024320@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-File-Flat/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24286/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-File-Flat


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Mon Sep 19 15:52:14 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Mon, 19 Sep 2005 11:52:14 -0400
Subject: rpms/perl-File-Flat import.log,1.1,1.2
Message-ID: <200509191552.j8JFqEpl024389@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-File-Flat
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24354

Modified Files:
	import.log 
Log Message:
auto-import perl-File-Flat-0.95-1 on branch devel from perl-File-Flat-0.95-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-File-Flat/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	19 Sep 2005 15:51:14 -0000	1.1
+++ import.log	19 Sep 2005 15:52:12 -0000	1.2
@@ -0,0 +1 @@
+perl-File-Flat-0_95-1:HEAD:perl-File-Flat-0.95-1.src.rpm:1127145114



From fedora-extras-commits at redhat.com  Mon Sep 19 15:52:15 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Mon, 19 Sep 2005 11:52:15 -0400
Subject: rpms/perl-File-Flat/devel perl-File-Flat.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200509191552.j8JFqFIW024396@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-File-Flat/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24354/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-File-Flat.spec 
Log Message:
auto-import perl-File-Flat-0.95-1 on branch devel from perl-File-Flat-0.95-1.src.rpm


--- NEW FILE perl-File-Flat.spec ---
Name: 		perl-File-Flat
Version: 	0.95
Release: 	1%{?dist}
Summary: 	Implements a flat filesystem
License: 	GPL or Artistic
Group: 		Development/Libraries
URL: 		http://search.cpan.org/dist/File-Flat/
Source0: 	http://search.cpan.org/CPAN/authors/id/A/AD/ADAMK/File-Flat-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:  	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
BuildArch: 	noarch

BuildRequires: perl(ExtUtils::AutoInstall) >= 0.49
BuildRequires: perl(Test::More) >= 0.47
BuildRequires: perl(Test::ClassAPI) >= 1.02
BuildRequires: perl(File::Find) >= 1.07
BuildRequires: perl(prefork) >= 0.02
BuildRequires: perl(File::Spec) >= 0.85
BuildRequires: perl(File::Copy) >= 2.08
BuildRequires: perl(File::NCopy) >= 0.32
BuildRequires: perl(File::Slurp) >= 9999.04
BuildRequires: perl(File::Remove) >= 0.21
BuildRequires: perl(File::Temp) >= 0.14
BuildRequires: perl(IO::File) >= 1.10

%description
File::Flat implements a flat filesystem. A flat filesystem is a filesystem
in which directories do not exist. It provides an abstraction over any 
normal filesystem which makes it appear as if directories do not exist.

%prep
%setup -q -n File-Flat-%{version}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'
find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';'
chmod -R u+w $RPM_BUILD_ROOT/*

%clean
rm -rf $RPM_BUILD_ROOT

%check
make test

%files
%defattr(-,root,root,-)
%doc Changes README LICENSE
%{perl_vendorlib}/File
%{_mandir}/man3/*

%changelog
* Tue Sep 13 2005 Ralf Corsepius  - 0.95-1
- Spec file cleanup.
- FE submission.

* Tue Jun 28 2005 Ralf Corsepius  - 0.95-0.pm.1
- Initial packman version.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-File-Flat/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	19 Sep 2005 15:51:15 -0000	1.1
+++ .cvsignore	19 Sep 2005 15:52:12 -0000	1.2
@@ -0,0 +1 @@
+File-Flat-0.95.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-File-Flat/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	19 Sep 2005 15:51:15 -0000	1.1
+++ sources	19 Sep 2005 15:52:12 -0000	1.2
@@ -0,0 +1 @@
+4b018c9d2a366cfd15c920f3544e9cf1  File-Flat-0.95.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 19 16:02:39 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Mon, 19 Sep 2005 12:02:39 -0400
Subject: rpms/perl-File-Flat/devel perl-File-Flat.spec,1.1,1.2
Message-ID: <200509191603.j8JG39KU025778@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-File-Flat/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25762

Modified Files:
	perl-File-Flat.spec 
Log Message:
Spec cleanup.


Index: perl-File-Flat.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-File-Flat/devel/perl-File-Flat.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-File-Flat.spec	19 Sep 2005 15:52:12 -0000	1.1
+++ perl-File-Flat.spec	19 Sep 2005 16:02:37 -0000	1.2
@@ -1,6 +1,6 @@
 Name: 		perl-File-Flat
 Version: 	0.95
-Release: 	1%{?dist}
+Release: 	2%{?dist}
 Summary: 	Implements a flat filesystem
 License: 	GPL or Artistic
 Group: 		Development/Libraries
@@ -14,15 +14,15 @@
 BuildRequires: perl(ExtUtils::AutoInstall) >= 0.49
 BuildRequires: perl(Test::More) >= 0.47
 BuildRequires: perl(Test::ClassAPI) >= 1.02
-BuildRequires: perl(File::Find) >= 1.07
+BuildRequires: perl(File::Find)
 BuildRequires: perl(prefork) >= 0.02
 BuildRequires: perl(File::Spec) >= 0.85
-BuildRequires: perl(File::Copy) >= 2.08
+BuildRequires: perl(File::Copy)
 BuildRequires: perl(File::NCopy) >= 0.32
 BuildRequires: perl(File::Slurp) >= 9999.04
 BuildRequires: perl(File::Remove) >= 0.21
 BuildRequires: perl(File::Temp) >= 0.14
-BuildRequires: perl(IO::File) >= 1.10
+BuildRequires: perl(IO::File)
 
 %description
 File::Flat implements a flat filesystem. A flat filesystem is a filesystem
@@ -56,6 +56,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Mon Sep 19 2005 Ralf Corsepius  - 0.95-2
+- Spec file cleanup.
+
 * Tue Sep 13 2005 Ralf Corsepius  - 0.95-1
 - Spec file cleanup.
 - FE submission.



From fedora-extras-commits at redhat.com  Mon Sep 19 16:36:04 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 19 Sep 2005 12:36:04 -0400
Subject: owners owners.list,1.233,1.234
Message-ID: <200509191636.j8JGa4nZ026328@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26309

Modified Files:
	owners.list 
Log Message:

rekall



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.233
retrieving revision 1.234
diff -u -r1.233 -r1.234
--- owners.list	18 Sep 2005 23:38:42 -0000	1.233
+++ owners.list	19 Sep 2005 16:36:02 -0000	1.234
@@ -872,6 +872,7 @@
 Fedora Extras|rbldnsd|Small, fast daemon to serve DNSBLs|paul at city-fan.org|extras-qa at fedoraproject.org|
 Fedora Extras|rdiff-backup|Convenient and transparent local/remote incremental mirror/backup|ghenry at suretecsystems.com|extras-qa at fedoraproject.org|
 Fedora Extras|recode|Conversion between character sets and surfaces|z.kota at gmx.net|extras-qa at fedoraproject.org|
+Fedora Extras|rekall|A KDE database front-end application|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|repoml|Tools and data for working with RepoML files|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
 Fedora Extras|repoview|Creates a set of static HTML pages in a yum repository|icon at linux.duke.edu|extras-qa at fedoraproject.org|
 Fedora Extras|revelation|Password manager for GNOME 2|fedora at leemhuis.info|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Mon Sep 19 18:03:32 2005
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Mon, 19 Sep 2005 14:03:32 -0400
Subject: rpms/nexuiz-data/FC-4 .cvsignore, 1.2, 1.3 nexuiz-data.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <200509191804.j8JI4jAT029245@cvs-int.fedora.redhat.com>

Author: adrian

Update of /cvs/extras/rpms/nexuiz-data/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29222

Modified Files:
	.cvsignore nexuiz-data.spec sources 
Log Message:
* Mon Sep 19 2005 Adrian Reber  - 1.2.1-1
- updated to 1.2.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nexuiz-data/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Jul 2005 21:57:05 -0000	1.2
+++ .cvsignore	19 Sep 2005 18:03:30 -0000	1.3
@@ -1 +1 @@
-nexuiz-data-1.1.tar
+nexuiz-data-1.2.1.tar


Index: nexuiz-data.spec
===================================================================
RCS file: /cvs/extras/rpms/nexuiz-data/FC-4/nexuiz-data.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nexuiz-data.spec	8 Jul 2005 21:57:05 -0000	1.1
+++ nexuiz-data.spec	19 Sep 2005 18:03:30 -0000	1.2
@@ -1,20 +1,21 @@
-%define datadate 20050703
+%define datadate 20050905
 
 Summary: Game data for the Nexuiz first person shooter
 Name: nexuiz-data
-Version: 1.1
+Version: 1.2.1
 Release: 1
 License: GPL
 Group: Amusements/Games
 URL: http://www.nexuiz.com/
 # Source is custom, obtained with :
-# wget http://dl.sf.net/sourceforge/nexuiz/nexuiz11.zip
-# unzip nexuiz11.zip
-# mkdir nexuiz-data-1.1/
-# mv Nexuiz/data/ Nexuiz/Readme.htm Nexuiz/sources/darkplaces/COPYING \
-#    nexuiz-data-1.1/
-# tar cvf nexuiz-data-1.1.tar nexuiz-data-1.1/
-Source: nexuiz-data-%{version}.tar
+# wget http://dl.sf.net/sourceforge/nexuiz/nexuiz121.zip
+# unzip nexuiz121.zip
+# mkdir nexuiz-data-1.2.1/
+# mv Nexuiz/data/ Nexuiz/Readme.htm Nexuiz/gpl.txt \
+#    Nexuiz/betacredits.txt  Nexuiz/gamemodes.txt \
+#    nexuiz-data-1.2.1/
+# tar cvf nexuiz-data-1.2.1.tar nexuiz-data-1.2.1/
+Source0: nexuiz-data-%{version}.tar
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 
@@ -23,28 +24,39 @@
 focused on providing basic, old style deathmatches.
 
 Data (textures, maps, sounds and models) required to play nexuiz.
-This includes 17 maps, 28 playable characters and 10 music tracks.
 
 %prep
 %setup -q
-%{__sed} -i 's/\r//' Readme.htm
+%{__sed} -i 's/\r//' Readme.htm *.txt data/*.txt
 
 %build
 
 %install
 %{__rm} -rf %{buildroot}
-%{__install} -D -p data/data%{datadate}.pk3 \
-        %{buildroot}%{_datadir}/nexuiz/data/data%{datadate}.pk3
+%{__mkdir_p} %{buildroot}%{_datadir}/nexuiz/data/
+%{__install} -p data/data%{datadate}-full.pk3 \
+        %{buildroot}%{_datadir}/nexuiz/data/
 
 %clean
 %{__rm} -rf %{buildroot}
 
 %files
 %defattr(0644, root, root, 0755)
-%doc Readme.htm COPYING
+%doc Readme.htm gpl.txt data/cvars.txt data/mapping.txt betacredits.txt
+%doc gamemodes.txt
 %{_datadir}/nexuiz/
 
 %changelog
+* Mon Sep 19 2005 Adrian Reber  - 1.2.1-1
+- updated to 1.2.1
+
+* Sat Sep 03 2005 Adrian Reber  - 1.2-2
+- I should really test my changes before check-in
+
+* Fri Sep 02 2005 Adrian Reber  - 1.2-1
+- updated to 1.2
+- included serverfix12.zip
+
 * Fri Jul  8 2005 Matthias Saou  1.1-0
 - Split off data from the main package, will make fixing the binaries much
   easier and allow sharing this noarch package between archs. It also avoids


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nexuiz-data/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Jul 2005 21:57:05 -0000	1.2
+++ sources	19 Sep 2005 18:03:30 -0000	1.3
@@ -1 +1 @@
-c177cce8cf6ac9134d1d9b8a08dc3272  nexuiz-data-1.1.tar
+64d371d2008b096c67980e7a65a412bc  nexuiz-data-1.2.1.tar



From fedora-extras-commits at redhat.com  Mon Sep 19 18:40:11 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Mon, 19 Sep 2005 14:40:11 -0400
Subject: rpms/SDL_ttf/devel .cvsignore, 1.2, 1.3 SDL_ttf.spec, 1.6,
	1.7 sources, 1.2, 1.3 SDL_ttf-2.0.6-ft2-build.patch, 1.1,
	NONE SDL_ttf-2.0.6-openstream.patch, 1.1, NONE
Message-ID: <200509191840.j8JIeBiq029527@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/SDL_ttf/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29504

Modified Files:
	.cvsignore SDL_ttf.spec sources 
Removed Files:
	SDL_ttf-2.0.6-ft2-build.patch SDL_ttf-2.0.6-openstream.patch 
Log Message:
* Sun Sep 18 2005 Ville Skytt??  - 2.0.7-1
- 2.0.7, patches applied upstream.
- Require SDL-devel in -devel.
- Build with dependency tracking disabled.
- Don't ship static libs.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/SDL_ttf/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 03:59:03 -0000	1.2
+++ .cvsignore	19 Sep 2005 18:40:09 -0000	1.3
@@ -1 +1 @@
-SDL_ttf-2.0.6.tar.gz
+SDL_ttf-2.0.7.tar.gz


Index: SDL_ttf.spec
===================================================================
RCS file: /cvs/extras/rpms/SDL_ttf/devel/SDL_ttf.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- SDL_ttf.spec	6 Apr 2005 22:10:46 -0000	1.6
+++ SDL_ttf.spec	19 Sep 2005 18:40:09 -0000	1.7
@@ -1,12 +1,9 @@
 Summary: Simple DirectMedia Layer TrueType Font library
 Name: SDL_ttf
-Version: 2.0.6
-Release: 5
-
+Version: 2.0.7
+Release: 1%{?dist}
 URL: http://www.libsdl.org/projects/SDL_ttf/
-Source0: http://www.libsdl.org/projects/SDL_ttf/release/SDL_ttf-2.0.6.tar.gz
-Patch0: %{name}-%{version}-openstream.patch
-Patch1: %{name}-%{version}-ft2-build.patch
+Source0: http://www.libsdl.org/projects/SDL_ttf/release/%{name}-%{version}.tar.gz
 License: LGPL
 Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -22,6 +19,7 @@
 Summary: Files to develop SDL applications which use TrueType fonts
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
+Requires: SDL-devel >= 1.2.4
 
 %description devel
 This library allows you to use TrueType fonts to render text in SDL
@@ -30,17 +28,14 @@
 
 %prep
 %setup -q
-%patch -p1
-%patch1 -p1 -b .ft2
 
 %build
-%configure
+%configure --disable-dependency-tracking --disable-static
 make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%makeinstall
-
+make install DESTDIR=$RPM_BUILD_ROOT
 rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la
 
 %clean
@@ -57,12 +52,17 @@
 
 %files devel
 %defattr(-,root,root)
-%{_libdir}/*.a
 %{_libdir}/*.so
-%{_includedir}/SDL/
+%{_includedir}/SDL/*.h
 
 %changelog
-* Fri Apr  7 2005 Michael Schwendt 
+* Sun Sep 18 2005 Ville Skytt??  - 2.0.7-1
+- 2.0.7, patches applied upstream.
+- Require SDL-devel in -devel.
+- Build with dependency tracking disabled.
+- Don't ship static libs.
+
+* Fri Apr  7 2005 Michael Schwendt  - 2.0.6-5
 - rebuilt
 
 * Wed Mar 21 2004 Panu Matilainen  0:2.0.6-0.fdr.4


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/SDL_ttf/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 03:59:03 -0000	1.2
+++ sources	19 Sep 2005 18:40:09 -0000	1.3
@@ -1 +1 @@
-880ca22ac3e8beb5cca2326cc8069733  SDL_ttf-2.0.6.tar.gz
+0f6ee1a502e6913a412aac353dc75bbc  SDL_ttf-2.0.7.tar.gz


--- SDL_ttf-2.0.6-ft2-build.patch DELETED ---


--- SDL_ttf-2.0.6-openstream.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Sep 19 18:50:51 2005
From: fedora-extras-commits at redhat.com (Karsten Wade (kwade))
Date: Mon, 19 Sep 2005 14:50:51 -0400
Subject: web/html/participate/documentation-guide acknowledgments.php, 1.3,
 1.4 ch-converting.php, 1.3, 1.4 ch-cvs.php, 1.3, 1.4 ch-emacs-nxml.php, 1.3,
 1.4 ch-emacs.php, 1.3, 1.4 ch-getting-files.php, 1.3, 1.4 ch-intro.php, 1.3,
 1.4 ch-rh-guidelines.php, 1.3, 1.4 ch-style.php, 1.2, 1.3 ch-tutorial.php,
 1.3, 1.4 ch-vim.php, 1.3, 1.4 ch-xml-tags.php, 1.3, 1.4 generated-index.php,
 1.3, 1.4 index.php, 1.3, 1.4 ln-legalnotice.php, 1.3,
 1.4 s1-diagrams-images.php, 1.3, 1.4 s1-emacs-additional-resources.php, 1.3,
 1.4 s1-emacs-basic-commands.php, 1.3, 1.4 s1-emacs-cedfile.php, 1.3,
 1.4 s1-emacs-colors.php, 1.3, 1.4 s1-emacs-examples.php, 1.3,
 1.4 s1-emacs-loadced.php, 1.3, 1.4 s1-emacs-nxml-additional-resources.php,
 1.3, 1.4 s1-emacs-nxml-readme.php, 1.3, 1.4 s1-nxml-examples.php, 1.3,
 1.4 s1-screenshots.php, 1.3, 1.4 s1-tutorial-license.php, 1.3,
 1.4 s1-vim-additional-resources.php, 1.3, 1.4 s1-vim-keymapping.php, 1.3,
 1.4 s1-xml-admon.php, 1.3, 1.4 s1-xml-guidelines-header.php, 1.3,
 1.4 s1-xml-tag-sulink.php, 1.3, 1.4 s1-xml-tags-application.!
 php, 1.3, 1.4 s1-xml-tags-chapter.php, 1.3, 1.4 s1-xml-tags-citetitle.php,
 1.3, 1.4 s1-xml-tags-command.php, 1.3, 1.4 s1-xml-tags-compoutput.php, 1.3,
 1.4 s1-xml-tags-emphasis.php, 1.3, 1.4 s1-xml-tags-example.php, 1.3,
 1.4 s1-xml-tags-figure.php, 1.3, 1.4 s1-xml-tags-filename.php, 1.3,
 1.4 s1-xml-tags-firstterm.php, 1.3, 1.4 s1-xml-tags-footnote.php, 1.3,
 1.4 s1-xml-tags-gui.php, 1.3, 1.4 s1-xml-tags-indexing.php, 1.3,
 1.4 s1-xml-tags-keycap.php, 1.3, 1.4 s1-xml-tags-lists.php, 1.3,
 1.4 s1-xml-tags-option.php, 1.3, 1.4 s1-xml-tags-para.php, 1.3,
 1.4 s1-xml-tags-part.php, 1.3, 1.4 s1-xml-tags-prompt.php, 1.3,
 1.4 s1-xml-tags-replaceable.php, 1.3, 1.4 s1-xml-tags-screen.php, 1.3,
 1.4 s1-xml-tags-sections.php, 1.3, 1.4 s1-xml-tags-table.php, 1.3,
 1.4 s1-xml-tags-trademark.php, 1.3, 1.4 s1-xml-tags-userinput.php, 1.3,
 1.4 s1-xml-tags-wordasword.php, 1.3, 1.4 s1-xml-tags-xref.php, 1.3,
 1.4 sn-composition-tips.php, 1.2, 1.3 sn-cvs-config.php, 1.1,
 1.2 sn-cvs-cvscommands.php, 1.1, 1.2 sn-cvs-preparation.php, 1.1,
 1.2 sn-grammar-and-usage.ph!
 p,1.2,1.3 sn-tech-docs-fundamentals.php,1.2,1.3 s1-cvs-configu!
 re.php
Message-ID: <200509191850.j8JIopU5029681@cvs-int.fedora.redhat.com>

Author: kwade

Update of /cvs/fedora/web/html/participate/documentation-guide
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29592

Modified Files:
	acknowledgments.php ch-converting.php ch-cvs.php 
	ch-emacs-nxml.php ch-emacs.php ch-getting-files.php 
	ch-intro.php ch-rh-guidelines.php ch-style.php ch-tutorial.php 
	ch-vim.php ch-xml-tags.php generated-index.php index.php 
	ln-legalnotice.php s1-diagrams-images.php 
	s1-emacs-additional-resources.php s1-emacs-basic-commands.php 
	s1-emacs-cedfile.php s1-emacs-colors.php s1-emacs-examples.php 
	s1-emacs-loadced.php s1-emacs-nxml-additional-resources.php 
	s1-emacs-nxml-readme.php s1-nxml-examples.php 
	s1-screenshots.php s1-tutorial-license.php 
	s1-vim-additional-resources.php s1-vim-keymapping.php 
	s1-xml-admon.php s1-xml-guidelines-header.php 
	s1-xml-tag-sulink.php s1-xml-tags-application.php 
	s1-xml-tags-chapter.php s1-xml-tags-citetitle.php 
	s1-xml-tags-command.php s1-xml-tags-compoutput.php 
	s1-xml-tags-emphasis.php s1-xml-tags-example.php 
	s1-xml-tags-figure.php s1-xml-tags-filename.php 
	s1-xml-tags-firstterm.php s1-xml-tags-footnote.php 
	s1-xml-tags-gui.php s1-xml-tags-indexing.php 
	s1-xml-tags-keycap.php s1-xml-tags-lists.php 
	s1-xml-tags-option.php s1-xml-tags-para.php 
	s1-xml-tags-part.php s1-xml-tags-prompt.php 
	s1-xml-tags-replaceable.php s1-xml-tags-screen.php 
	s1-xml-tags-sections.php s1-xml-tags-table.php 
	s1-xml-tags-trademark.php s1-xml-tags-userinput.php 
	s1-xml-tags-wordasword.php s1-xml-tags-xref.php 
	sn-composition-tips.php sn-cvs-config.php 
	sn-cvs-cvscommands.php sn-cvs-preparation.php 
	sn-grammar-and-usage.php sn-tech-docs-fundamentals.php 
Removed Files:
	s1-cvs-configure.php s1-cvs-cvscommands.php 
Log Message:
Updating Doc Guide to reflect latest CVS information.






Index: ch-cvs.php
===================================================================
RCS file: /cvs/fedora/web/html/participate/documentation-guide/ch-cvs.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ch-cvs.php	24 Aug 2005 17:49:48 -0000	1.3
+++ ch-cvs.php	19 Sep 2005 18:50:48 -0000	1.4
@@ -18,7 +18,7 @@
     conflicts arise, CVS lets you know.
     CVS is often used so that programmers can
     share code, but it also works well for documentation.
-  
      10.1. How CVS Works
      
+  
      10.1. How CVS Works
      
       In most cases, each set of files that make up a package or project
       is stored as a module on the CVS server.
     
      


Index: ch-emacs-nxml.php
===================================================================
RCS file: /cvs/fedora/web/html/participate/documentation-guide/ch-emacs-nxml.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ch-emacs-nxml.php	24 Aug 2005 17:49:48 -0000	1.3
+++ ch-emacs-nxml.php	19 Sep 2005 18:50:48 -0000	1.4
@@ -7,7 +7,7 @@
 
 ?>
 
-
      Chapter 4. Emacs and nXML Mode
      Prev   Next
      Chapter 4. Emacs and nXML Mode
      
+
      Chapter 4. Emacs and nXML Mode
      Prev   Next
      Chapter 4. Emacs and nXML Mode
      
       You can also use the nXML mode available for
       Emacs to make it even easier to write in
       DocBook XML format. nXML mode provides context-sensitive editing using
@@ -19,7 +19,7 @@
 	when using it with other documents types. If you keep an eye on the
 	mailing-list, you can keep up to date with these, as well as ask
 	questions. For more details, check out Section 4.4, “nXML README File”.
-

      17. 4.1. Getting the nXML RPM

      +

      4.1. Getting the nXML RPM

      To use nXML mode with emacs, you will need to install the nXML RPM available from Tim Waugh's website or the source from http://www.thaiopensource.com/download/. The Index: ch-emacs.php =================================================================== RCS file: /cvs/fedora/web/html/participate/documentation-guide/ch-emacs.php,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- ch-emacs.php 24 Aug 2005 17:49:48 -0000 1.3 +++ ch-emacs.php 19 Sep 2005 18:50:48 -0000 1.4 @@ -7,11 +7,11 @@ ?> -

      Chapter 3. Emacs and PSGML Mode
      Prev   Next

      Chapter 3. Emacs and PSGML Mode

      +

      Chapter 3. Emacs and PSGML Mode
      Prev   Next

      Chapter 3. Emacs and PSGML Mode

      You can use the PSGML mode available for Emacs to make it easier to write in XML format. PSGML mode provides syntax-highlighting, tag completion, and more. -

      3.1. Setting Up Your .emacs File

      +

      3.1. Setting Up Your .emacs File

      For Emacs to parse your DocBook documents correctly, you must have a .emacs file. Cut and paste the following into your existing .emacs file or create a new one that Index: ch-getting-files.php =================================================================== RCS file: /cvs/fedora/web/html/participate/documentation-guide/ch-getting-files.php,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- ch-getting-files.php 24 Aug 2005 17:49:48 -0000 1.3 +++ ch-getting-files.php 19 Sep 2005 18:50:48 -0000 1.4 @@ -26,7 +26,8 @@ cd my-fedora-docs export CVSROOT=:pserver:anonymous at cvs.fedora.redhat.com:/cvs/docs cvs login -cvs co docs-setup +cvs co docs-common +cvs co example-tutorial

      When you perform an anonymous CVS checkout, you can view the files and retreive the latest versions. You cannot add (commit) any updates or new @@ -35,7 +36,7 @@ about getting write access to CVS.

      To see a list of the available documents: - 

      $ cvs co -c

      + 

      cvs co -c

      Pick your document of interest and then download it to your working directory: 

      cvs co example-tutorial

      Except for the Installation Guide, all documentation in CVS must Index: ch-rh-guidelines.php =================================================================== RCS file: /cvs/fedora/web/html/participate/documentation-guide/ch-rh-guidelines.php,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- ch-rh-guidelines.php 24 Aug 2005 17:49:48 -0000 1.3 +++ ch-rh-guidelines.php 19 Sep 2005 18:50:48 -0000 1.4 @@ -7,9 +7,9 @@ ?> -

      Chapter 2. Red Hat Documentation Guidelines
      Prev   Next

      Chapter 2. Red Hat Documentation Guidelines

      Please read this chapter carefully. This chapter describes the +

      Chapter 2. Red Hat Documentation Guidelines
      Prev   Next

      Chapter 2. Red Hat Documentation Guidelines

      Please read this chapter carefully. This chapter describes the guidelines that must be followed such as naming conventions. -

      2.1. ID Naming Conventions

      You will see certain ID names referred to below and this will +

      2.1. ID Naming Conventions

      You will see certain ID names referred to below and this will help to explain how we come up with those names. For example: 

       
@@ -21,7 +21,7 @@

      IDs are unique identifiers, allowing DocBook XML to know where to cross-reference a section or chapter or the like. -

      The general rules for defining an ID are:

      • Keep it 32 characters or under (this is counted as +

        The general rules for defining an ID are:

        • Keep it 32 characters or under (this is counted as everything between the quotation marks)

        • Keep it as short and simple as possible

        • Make sure the name is relevant to the information (make it recognizable)

        Some examples are "ch-uniquename" (with 13 characters) and "s3-install-make-disks" (with 21 Index: ch-style.php =================================================================== RCS file: /cvs/fedora/web/html/participate/documentation-guide/ch-style.php,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ch-style.php 24 Aug 2005 17:49:48 -0000 1.2 +++ ch-style.php 19 Sep 2005 18:50:48 -0000 1.3 @@ -35,7 +35,7 @@ Writing well comes naturally to almost no one. It is a skill that professional writers, even famous ones, must practice constantly. Style - is the quality + is the quality that separates elegant writing from the merely functional.

        Elegance comes in many forms. In prose and poetry, elegant @@ -55,12 +55,12 @@ idioms, or jargon, a reader or translator may easily become confused. The following example compares two different written executions of the same idea: -

        +

        So you made the changes I showed you in the last section. What's the next thing you should do? Just pop your thumb drive onto your system and read the messages log. When you see "USB device found," then Bob's your uncle. -

        Example 8.1. Incorrect style

        +

        Example 8.1. Incorrect style

        After you complete the configuration changes above, attach the USB removable media to your system. Use the dmesg command to examine the kernel message Index: ch-vim.php =================================================================== RCS file: /cvs/fedora/web/html/participate/documentation-guide/ch-vim.php,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- ch-vim.php 24 Aug 2005 17:49:48 -0000 1.3 +++ ch-vim.php 19 Sep 2005 18:50:48 -0000 1.4 @@ -7,7 +7,7 @@ ?> -

        Chapter 5. VIM and DocBook
        Prev   Next

        Chapter 5. VIM and DocBook

        +

        Chapter 5. VIM and DocBook
        Prev   Next

        Chapter 5. VIM and DocBook

        VIM has many features to help you write XML content such as DocBook, including syntax highlighting and customizable key bindings. Additionally, one can easily use external programs from VIM for features @@ -15,7 +15,7 @@ This chapter assumes you already know generally how to use VIM; if you want to learn how, try the vimtutor or by typing :help tutor from inside VIM. -

        5.1. Setting Up Your .vimrc File

        +

        5.1. Setting Up Your .vimrc File

        Below is a short sample .vimrc file that turns on some VIM features useful for editing SGML or XML content such as DocBook: Index: ch-xml-tags.php =================================================================== RCS file: /cvs/fedora/web/html/participate/documentation-guide/ch-xml-tags.php,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- ch-xml-tags.php 24 Aug 2005 17:49:48 -0000 1.3 +++ ch-xml-tags.php 19 Sep 2005 18:50:48 -0000 1.4 @@ -7,7 +7,7 @@ ?> -

        Chapter 6. DocBook XML Tags
        Prev   Next

        Chapter 6. DocBook XML Tags

        Please read this chapter carefully. This chapter describes the tags +

        Chapter 6. DocBook XML Tags
        Prev   Next

        Chapter 6. DocBook XML Tags

        Please read this chapter carefully. This chapter describes the tags used by the Docs Project. Some of the rules described are specific to the project.

        If these tags are used appropriately, document searches will provide @@ -15,7 +15,7 @@ information relevant to the search request. Another benefit is that all Fedora Project documents will have a similar look and feel (however, they will have some differences depending upon the output format). -

        All tags in XML must have an opening and closing tag Additionally, +

        All tags in XML must have an opening and closing tag Additionally, proper XML conventions say that there must be a unique identifier for sections, chapters, figures, tables, and so on, so that they may be correctly identified, and cross referenced if needed.

        Although XML is capable of handling many document types, the format @@ -26,7 +26,7 @@ http://www.docbook.org/tdg/en/html/docbook.html -

        6.1. Tags and Entities Caveats

        +

        6.1. Tags and Entities Caveats

        It is very important that you remember the caveats in this section. Even though they are more strict than valid DocBook XML, these rules exist so that both the HTML and PDF outputs look proper. Index: index.php =================================================================== RCS file: /cvs/fedora/web/html/participate/documentation-guide/index.php,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- index.php 24 Aug 2005 17:49:48 -0000 1.3 +++ index.php 19 Sep 2005 18:50:48 -0000 1.4 @@ -7,7 +7,7 @@ ?> -

        Fedora Project Documentation Guide
           Next

        Fedora Project Documentation Guide

        Version 0.2.6.1

        Tammy Fox

        Johnray Fuller

        Sandra Moore

        ! Copyright © 2003,2004,2005 Red Hat, Inc., Tammy Fox, Johnray Fuller, Sandra Moore

        Table of Contents

        Introduction
        1. Getting the Files
        2. Red Hat Documentation Guidelines
        2.1. ID Naming Conventions
        2.2. File Header
        2.3. Admonitions
        2.3.1. Creating Notes, Tips, Cautions, Importants, and Warnings
        2.4. Screenshots!
        2.5. Diagrams and Images
        3. Emacs and PSGML Mode
        3.1. Setting Up Your .emacs File
        3.2. Customizing Emacs
        3.3. Create Recompiled DTD Subset
        3.4. Load the Parsed DTD
        3.5. Basic Emacs Commands
        3.6. Examples
        3.6.1. Tag Completion
        3.6.2. Tag Closure
        3.6.3. Other Emacs Tasks
        3.7. Additional Resources
        4. Emacs and nXML Mode
        4.1. Getting the nXML RPM
        4.2. Examples
        4.2.1. Commands
        4.3. Additional Resources
        4.4. nXML README File
        5. VIM and DocBook
        5.1. Setting Up Your .vimrc File
        5.2. Keymapping with VIM
        5.3. Additional VIM Resources
        6. DocBook XML Tags
        6.1. Tags and Entities Caveats
        6.2. application
        6.3. chapter
        6.4. citetitle
        6.5. command
        6.6. computeroutput
        6.7. emphasis
        6.8. example
        6.9. filename
        6.10. firstterm
        6.11. footnote
        6.12. figure
        6.13. GUI Tags
        6.13.1. guilabel
        6.13.2. guibutton
        6.13.3. guiicon
        6.13.4. guimenu and +
        Fedora Project Documentation Guide
           Next

        Fedora Project Documentation Guide

        Version 0.2.6.3

        Tammy Fox

        Johnray Fuller

        Sandra Moore

        ! Copyright © 2003,2004,2005 Red Hat, Inc., Tammy Fox, Johnray Fuller, Sandra Moore

        Table of Contents

        Introduction
        1. Getting the Files
        2. Red Hat Documentation Guidelines
        2.1. ID Naming Conventions
        2.2. File Header
        2.3. Admonitions
        2.3.1. Creating Notes, Tips, Cautions, Importants, and Warnings
        2.4. Screenshots!
        2.5. Diagrams and Images
        3. Emacs and PSGML Mode
        3.1. Setting Up Your .emacs File
        3.2. Customizing Emacs
        3.3. Create Recompiled DTD Subset
        3.4. Load the Parsed DTD
        3.5. Basic Emacs Commands
        3.6. Examples
        3.6.1. Tag Completion
        3.6.2. Tag Closure
        3.6.3. Other Emacs Tasks
        3.7. Additional Resources
        4. Emacs and nXML Mode
        4.1. Getting the nXML RPM
        4.2. Examples
        4.2.1. Commands
        4.3. Additional Resources
        4.4. nXML README File
        5. VIM and DocBook
        5.1. Setting Up Your .vimrc File
        5.2. Keymapping with VIM
        5.3. Additional VIM Resources
        6. DocBook XML Tags
        6.1. Tags and Entities Caveats
        6.2. application
        6.3. chapter
        6.4. citetitle
        6.5. command
        6.6. computeroutput
        6.7. emphasis
        6.8. example
        6.9. filename
        6.10. firstterm
        6.11. footnote
        6.12. figure
        6.13. GUI Tags
        6.13.1. guilabel
        6.13.2. guibutton
        6.13.3. guiicon
        6.13.4. guimenu and guimenuitem
        6.14. keycap
        6.14.1. menuchoice
        6.14.2. keycombo
        6.15. Lists
        6.15.1. itemizedlist
        6.15.2. OrderedList
        6.15.3. Variablelist
        6.15.4. Creating a List Within a Table Using Simplelist
        6.15.5. glosslist
        6.16. option
        6.17. Index Entries
        6.18. para
        6.19. part
        6.20. prompt
        6.21. replaceable
        6.22. screen
        6.22.1. Using Inline Tags with screen
        6.23. Sections
        6.24. table
        6.24.1. Creating a List Within a Table
        6.25. trademark
        6.26. userinput
        6.27. ulink
        6.28. wordasword
        6.29. xref
        7. The Layout of a Tutorial
        7.1. The Parent File
        7.2. Including the License Information
        8. Style
        8.1. Why Style Is Important
        8.2. Fundamental Concepts of Technical Documentation
        8.2.1. General Style Requirements
        8.2.2. Golden Rules
        8.2.3. Tone
        8.2.4. Reaching the Right Audience
        8.2.5. User Motivation
        8.2.6. New Users
        .7. Experienced Users
        8.2.8. Do Not Offend Your Audience
        8.3. Grammar and Usage Guidelines
        8.4. Composition Tips
        8.4.1. Active Voice
        8.4.2. Present Tense
        8.4.3. Narrative Voice
        8.4.4. Negative Words
        8.4.5. Uncertainty
        8.4.6. Redundant Coverage
        8.4.7. Self-referential Value Judgments
        8.4.8. Precision of Language
        8.4.9. DocBook Tips
        8.4.9.1. Admonitions
        8.4.9.2. The replaceable Tag
        8.4.9.3. XML Entities
        9. Converting to HTML and PDF
        10. CVS
        10.1. How CVS Works
        10.2. Preparing For CVS Use
        10.2.1. Is CVS Installed On Your System
        10.2.2. Generating SSH Keys
        10.3. Configuring For CVS Access
        10.3.1. Avoiding Repetitive Typing
        10.3.2. Configuring for Read-Only CVS Access
        10.3.3. Configuring Read/Write CVS Access
        10.4. Basic CVS Commands
        10.4.1. Checking Out Modules
        10.4.1.1. Checking Out Branches of Modules
        10.4.2. Updating Files
        10.4.3. Committing Files
        10.4.5. Managing Binary Files
        10.4.6. Removing Files
        10.4.7. Status of Files
        10.4.8. Resolving Conflicts
        10.4.9. Summary
        11. Acknowledgments
        Index
           Next
           Introduction
        Index: ln-legalnotice.php =================================================================== RCS file: /cvs/fedora/web/html/participate/documentation-guide/ln-legalnotice.php,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- ln-legalnotice.php 24 Aug 2005 17:49:48 -0000 1.3 +++ ln-legalnotice.php 19 Sep 2005 18:50:48 -0000 1.4 @@ -26,7 +26,7 @@ They all may be freely redistributed with documentation produced for the Fedora Project.

        - documentation-guide-0.2.6.1 (2005-08-24) + documentation-guide-0.2.6.3 (2005-09-18)

        Red Hat, Red Hat Network, the Red Hat "Shadow Man" logo, RPM, Maximum RPM, the RPM logo, Linux Library, PowerTools, Linux Undercover, RHmember, RHmember More, Rough Cuts, Index: s1-diagrams-images.php =================================================================== RCS file: /cvs/fedora/web/html/participate/documentation-guide/s1-diagrams-images.php,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- s1-diagrams-images.php 24 Aug 2005 17:49:48 -0000 1.3 +++ s1-diagrams-images.php 19 Sep 2005 18:50:48 -0000 1.4 @@ -7,7 +7,7 @@ ?> -

        2.5. Diagrams and Images
        Prev Chapter 2. Red Hat Documentation Guidelines Next

        2.5. Diagrams and Images

        +

        2.5. Diagrams and Images
        Prev Chapter 2. Red Hat Documentation Guidelines Next

        2.5. Diagrams and Images

        To be written

        Prev Up Next
        2.4. Screenshots Home Chapter 3. Emacs and PSGML Mode
        Index: s1-emacs-colors.php =================================================================== RCS file: /cvs/fedora/web/html/participate/documentation-guide/s1-emacs-colors.php,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- s1-emacs-colors.php 24 Aug 2005 17:49:48 -0000 1.3 +++ s1-emacs-colors.php 19 Sep 2005 18:50:48 -0000 1.4 @@ -7,7 +7,7 @@ ?> -
        3.2. Customizing Emacs
        Prev Chapter 3. Emacs and PSGML Mode Next

        3.2. Customizing Emacs

        +

        3.2. Customizing Emacs
        Prev Chapter 3. Emacs and PSGML Mode Next

        3.2. Customizing Emacs

        The colors, font, and geometry (default size of window) for Emacs in your ~/.Xresources file. The format for the settings is emacs.keyword:value Index: s1-screenshots.php =================================================================== RCS file: /cvs/fedora/web/html/participate/documentation-guide/s1-screenshots.php,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- s1-screenshots.php 24 Aug 2005 17:49:48 -0000 1.3 +++ s1-screenshots.php 19 Sep 2005 18:50:48 -0000 1.4 @@ -7,7 +7,7 @@ ?> -

        2.4. Screenshots
        Prev Chapter 2. Red Hat Documentation Guidelines Next

        2.4. Screenshots

        +

        2.4. Screenshots
        Prev Chapter 2. Red Hat Documentation Guidelines Next

        2.4. Screenshots

        There are two types of screenshots: graphical and textual. The philosophy on using these two types is rely on text over graphics. This means, if you can say it in text instead of Index: s1-tutorial-license.php =================================================================== RCS file: /cvs/fedora/web/html/participate/documentation-guide/s1-tutorial-license.php,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- s1-tutorial-license.php 24 Aug 2005 17:49:48 -0000 1.3 +++ s1-tutorial-license.php 19 Sep 2005 18:50:48 -0000 1.4 @@ -7,7 +7,7 @@ ?> -

        7.2. Including the License Information
        Prev Chapter 7. The Layout of a Tutorial Next

        7.2. Including the License Information

        +

        7.2. Including the License Information
        Prev Chapter 7. The Layout of a Tutorial Next

        7.2. Including the License Information

        All Fedora Project manuals must contain the file legalnotice.xml. This file makes the license for the file the GNU Free Documentation License (FDL). Index: s1-xml-admon.php =================================================================== RCS file: /cvs/fedora/web/html/participate/documentation-guide/s1-xml-admon.php,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- s1-xml-admon.php 24 Aug 2005 17:49:48 -0000 1.3 +++ s1-xml-admon.php 19 Sep 2005 18:50:48 -0000 1.4 @@ -7,12 +7,12 @@ ?> -

        2.3. Admonitions
        Prev Chapter 2. Red Hat Documentation Guidelines Next

        2.3. Admonitions

        There are five types of admonitions in DocBook: Caution, Important, +

        2.3. Admonitions
        Prev Chapter 2. Red Hat Documentation Guidelines Next

        2.3. Admonitions

        There are five types of admonitions in DocBook: Caution, Important, Note, Tip, and Warning.

        All of the admonitions have the same structure: an optional Title followed by paragraph-level elements. The DocBook DTD does not impose any specific semantics on the individual admonitions. For example, DocBook does not mandate that Warnings be reserved for cases where bodily harm can - result.

        2.3.1. Creating Notes, Tips, Cautions, Importants, and Warnings

        There are several ways to bring attention to text within a + result.

        2.3.1. Creating Notes, Tips, Cautions, Importants, and Warnings

        There are several ways to bring attention to text within a document. A Note is used to bring additional information to the users' attention. A Tip is used to show the user helpful information or another way to do Index: s1-xml-tag-sulink.php =================================================================== RCS file: /cvs/fedora/web/html/participate/documentation-guide/s1-xml-tag-sulink.php,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- s1-xml-tag-sulink.php 24 Aug 2005 17:49:48 -0000 1.3 +++ s1-xml-tag-sulink.php 19 Sep 2005 18:50:48 -0000 1.4 @@ -7,7 +7,7 @@ ?> -

        6.27. ulink
        Prev Chapter 6. DocBook XML Tags Next

        6.27. ulink

        +

        6.27. ulink
        Prev Chapter 6. DocBook XML Tags Next

        6.27. ulink

        To create a URL link within your text, use the following example: 

         


Index: s1-xml-tags-application.php
===================================================================
RCS file: /cvs/fedora/web/html/participate/documentation-guide/s1-xml-tags-application.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- s1-xml-tags-application.php	24 Aug 2005 17:49:48 -0000	1.3
+++ s1-xml-tags-application.php	19 Sep 2005 18:50:48 -0000	1.4
@@ -7,7 +7,7 @@
 
 ?>
 
-
        6.2. application
        Prev Chapter 6. DocBook XML Tags Next
        6.2. application
        An application is the name of a GUI software program. A command is
+
        6.2. application
        Prev Chapter 6. DocBook XML Tags Next
        6.2. application
        An application is the name of a GUI software program. A command is
 	the name of an executable (text) program or a software command.
        The <application> and
       </application> tags allow you to refer to an
       application or program. For example, the following XML:


Index: s1-xml-tags-chapter.php
===================================================================
RCS file: /cvs/fedora/web/html/participate/documentation-guide/s1-xml-tags-chapter.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- s1-xml-tags-chapter.php	24 Aug 2005 17:49:48 -0000	1.3
+++ s1-xml-tags-chapter.php	19 Sep 2005 18:50:48 -0000	1.4
@@ -7,7 +7,7 @@
 
 ?>
 
-
        6.3. chapter
        Prev Chapter 6. DocBook XML Tags Next
        6.3. chapter
        
+
        6.3. chapter
        Prev Chapter 6. DocBook XML Tags Next
        6.3. chapter
        
 	A DocBook book can be divided into chapters such as:
       
         


Index: s1-xml-tags-citetitle.php
===================================================================
RCS file: /cvs/fedora/web/html/participate/documentation-guide/s1-xml-tags-citetitle.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- s1-xml-tags-citetitle.php	24 Aug 2005 17:49:48 -0000	1.3
+++ s1-xml-tags-citetitle.php	19 Sep 2005 18:50:48 -0000	1.4
@@ -7,10 +7,10 @@
 
 ?>
 
-
        6.4. citetitle
        Prev Chapter 6. DocBook XML Tags Next
        6.4. citetitle
        
+
        6.4. citetitle
        Prev Chapter 6. DocBook XML Tags Next
        6.4. citetitle
        
 	The <citetitle> tag provides formatting for a
 	specific references (title can be manually typed out or if already
-	defined within your document set, given as an entity[1]
+	defined within your document set, given as an entity[1]
 	).
        
       For example:
     
        @@ -20,7 +20,7 @@
 
        
 	The output looks like Installation Guide because &IG; is an
 	entity.
-      

        [1] An
+      

        [1] An
 	entity is a short hand way of referring to another manual or guide. It
 	can be defined within the parent document or within a set of files that
 	your DTD references for your specific documentation set.
        Prev Up Next
        6.3. chapter Home 6.5. command
        


Index: s1-xml-tags-command.php
===================================================================
RCS file: /cvs/fedora/web/html/participate/documentation-guide/s1-xml-tags-command.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- s1-xml-tags-command.php	24 Aug 2005 17:49:48 -0000	1.3
+++ s1-xml-tags-command.php	19 Sep 2005 18:50:48 -0000	1.4
@@ -7,7 +7,7 @@
 
 ?>
 
-
        6.5. command
        Prev Chapter 6. DocBook XML Tags Next
        6.5. command
        An application is the name of a GUI software program. A command is
+
        6.5. command
        Prev Chapter 6. DocBook XML Tags Next
        6.5. command
        An application is the name of a GUI software program. A command is
 	the name of an executable (text) program or a software command. Any
 	program that is a command line or text-based only tool is marked with
 	command tags. 
        If you have text that is a command, use the


Index: s1-xml-tags-compoutput.php
===================================================================
RCS file: /cvs/fedora/web/html/participate/documentation-guide/s1-xml-tags-compoutput.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- s1-xml-tags-compoutput.php	24 Aug 2005 17:49:48 -0000	1.3
+++ s1-xml-tags-compoutput.php	19 Sep 2005 18:50:48 -0000	1.4
@@ -7,7 +7,7 @@
 
 ?>
 
-
        6.6. computeroutput
        Prev Chapter 6. DocBook XML Tags Next
        6.6. computeroutput
        
+
        6.6. computeroutput
        Prev Chapter 6. DocBook XML Tags Next
        6.6. computeroutput
        
 	To show computer output use the following tags:
       
         


Index: s1-xml-tags-emphasis.php
===================================================================
RCS file: /cvs/fedora/web/html/participate/documentation-guide/s1-xml-tags-emphasis.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- s1-xml-tags-emphasis.php	24 Aug 2005 17:49:48 -0000	1.3
+++ s1-xml-tags-emphasis.php	19 Sep 2005 18:50:48 -0000	1.4
@@ -7,7 +7,7 @@
 
 ?>
 
-
        6.7. emphasis
        Prev Chapter 6. DocBook XML Tags Next
        6.7. emphasis
        
+
        6.7. emphasis
        Prev Chapter 6. DocBook XML Tags Next
        6.7. emphasis
        
 	To emphasis content, use the <emphasis> and
 	</emphasis> tags. For example:
       
        

Index: s1-xml-tags-example.php
===================================================================
RCS file: /cvs/fedora/web/html/participate/documentation-guide/s1-xml-tags-example.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- s1-xml-tags-example.php	24 Aug 2005 17:49:48 -0000	1.3
+++ s1-xml-tags-example.php	19 Sep 2005 18:50:48 -0000	1.4
@@ -7,7 +7,7 @@
 
 ?>
 
-
        6.8. example
        Prev Chapter 6. DocBook XML Tags Next
        6.8. example
        The <example> and
+
        6.8. example
        Prev Chapter 6. DocBook XML Tags Next
        6.8. example
        The <example> and
       </example> tags are used to format text within a
       document and is great for adding emphasis to show examples of code,
       exercises, and more. 
        The <example> tag set should be given an ID


Index: s1-xml-tags-figure.php
===================================================================
RCS file: /cvs/fedora/web/html/participate/documentation-guide/s1-xml-tags-figure.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- s1-xml-tags-figure.php	24 Aug 2005 17:49:48 -0000	1.3
+++ s1-xml-tags-figure.php	19 Sep 2005 18:50:48 -0000	1.4
@@ -7,7 +7,7 @@
 
 ?>
 
-
        6.12. figure
        Prev Chapter 6. DocBook XML Tags Next
        6.12. figure
        [Important]Important
        
+
        6.12. figure
        Prev Chapter 6. DocBook XML Tags Next
        6.12. figure
        [Important]Important
        
 	  Order matters! The EPS file must be declared
 	  first.
 	
        


Index: s1-xml-tags-filename.php
===================================================================
RCS file: /cvs/fedora/web/html/participate/documentation-guide/s1-xml-tags-filename.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- s1-xml-tags-filename.php	24 Aug 2005 17:49:48 -0000	1.3
+++ s1-xml-tags-filename.php	19 Sep 2005 18:50:48 -0000	1.4
@@ -7,7 +7,7 @@
 
 ?>
 
-
        6.9. filename
        Prev Chapter 6. DocBook XML Tags Next
        6.9. filename
        
+
        6.9. filename
        Prev Chapter 6. DocBook XML Tags Next
        6.9. filename
        
 	The <filename> and
 	</filename> tags define a filename or path to a
 	file. Since directories are just special files, they are marked with the


Index: s1-xml-tags-firstterm.php
===================================================================
RCS file: /cvs/fedora/web/html/participate/documentation-guide/s1-xml-tags-firstterm.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- s1-xml-tags-firstterm.php	24 Aug 2005 17:49:48 -0000	1.3
+++ s1-xml-tags-firstterm.php	19 Sep 2005 18:50:48 -0000	1.4
@@ -7,7 +7,7 @@
 
 ?>
 
-
        6.10. firstterm
        Prev Chapter 6. DocBook XML Tags Next
        6.10. firstterm
        
+
        6.10. firstterm
        Prev Chapter 6. DocBook XML Tags Next
        6.10. firstterm
        
 	The <firstterm> and
 	</firstterm> tags helps to define a word that
 	may be unfamiliar to the user, but that will be seen commonly throughout


Index: s1-xml-tags-footnote.php
===================================================================
RCS file: /cvs/fedora/web/html/participate/documentation-guide/s1-xml-tags-footnote.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- s1-xml-tags-footnote.php	24 Aug 2005 17:49:48 -0000	1.3
+++ s1-xml-tags-footnote.php	19 Sep 2005 18:50:48 -0000	1.4
@@ -7,7 +7,7 @@
 
 ?>
 
-
        6.11. footnote
        Prev Chapter 6. DocBook XML Tags Next
        6.11. footnote
        
+
        6.11. footnote
        Prev Chapter 6. DocBook XML Tags Next
        6.11. footnote
        
 	If you need to make a footnote, use the following example:
       
         
@@ -23,9 +23,9 @@
 
        
 	The output:
       
        
-	For those of you who need to perform a server-class [2] installation, refer to the
+	For those of you who need to perform a server-class [2] installation, refer to the
 	Installation Guide.
-      

        [2] A
+      

        [2] A
 	    server-class installation sets up a typical server environment. Please note, no
 	    graphical environment is installed during a server-class installation.
        Prev Up Next
        6.10. firstterm Home 6.12. figure
        
 


Index: s1-xml-tags-gui.php
===================================================================
RCS file: /cvs/fedora/web/html/participate/documentation-guide/s1-xml-tags-gui.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- s1-xml-tags-gui.php	24 Aug 2005 17:49:48 -0000	1.3
+++ s1-xml-tags-gui.php	19 Sep 2005 18:50:48 -0000	1.4
@@ -7,7 +7,7 @@
 
 ?>
 
-
        6.13. GUI Tags
        Prev Chapter 6. DocBook XML Tags Next
        6.13. GUI Tags
        6.13.1. guilabel
        
+
        6.13. GUI Tags
        Prev Chapter 6. DocBook XML Tags Next
        6.13. GUI Tags
        6.13.1. guilabel
        
 	  Use the <guilabel> and
 	  </guilabel> tags as a default for GUI
 	  descriptions, like a screen name or screen title. For example:
@@ -21,7 +21,7 @@
 	
        
 	  The Authentication Configuration screen shows you how to
 	  make your system more secure.
-	
        6.13.2. guibutton
        
+	
        6.13.2. guibutton
        
 	  Use the <guibutton> and
 	  </guibutton> tags to denote a button on a screen or
 	  menu. For example:
@@ -35,7 +35,7 @@
 	
        
 	  Check the Activate on boot button to have the X
 	  Window System start automatically.
-	
        6.13.3. guiicon
        
+	
        6.13.3. guiicon
        
 	  The <guiicon> and </guiicon>
 	  tags are used to denote a panel or desktop icon. For example:
 	
        @@ -47,7 +47,7 @@
 	
        
 	  Double-click the Start Here icon on the desktop.
 	
        6.13.4. guimenu and
-	  guimenuitem
        
+	  guimenuitem
        
 	  To note a menu (like in the installation program or within the control panel),
 	  use the <guimenu> and
 	  </guimenu> tags. 


Index: s1-xml-tags-indexing.php
===================================================================
RCS file: /cvs/fedora/web/html/participate/documentation-guide/s1-xml-tags-indexing.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- s1-xml-tags-indexing.php	24 Aug 2005 17:49:48 -0000	1.3
+++ s1-xml-tags-indexing.php	19 Sep 2005 18:50:48 -0000	1.4
@@ -7,7 +7,7 @@
 
 ?>
 
-
        6.17. Index Entries
        Prev Chapter 6. DocBook XML Tags Next
        6.17. Index Entries
        The following command sequence shows you the code inserted into
+
        6.17. Index Entries
        Prev Chapter 6. DocBook XML Tags Next
        6.17. Index Entries
        The following command sequence shows you the code inserted into
 	the body of the text to add an index entry to your document:
 	
         
@@ -16,11 +16,11 @@
 <secondary>bar</secondary> <-- "bar" will be listed under "foo" 
 </indexterm> <-- closes this index entry
 
-
        The <seealso> tag allows you to
+
        The <seealso> tag allows you to
 	reference another index entry or refer to another manual. Make sure
 	the <seealso> reference you are pointing to
 	has its own entry. For example:
-      
        +      
         
 <indexterm> 
 <primary>SWAK</primary> 
@@ -32,10 +32,10 @@
 <primary>salutations</primary> 
 </indexterm>
 
-
        
+
        
 	The <see> tag allows you to reference to
 	another index entry entirely. For example:
-      
        +      
         
 <indexterm> 
 <primary>Guinness</primary> 
@@ -48,7 +48,7 @@
 <primary>beer</primary>
 </indexterm>
 
-
        To view the HTML output of the index entries shown here, refer
+
        To view the HTML output of the index entries shown here, refer
 	to the generated-index.php file at the end of
 	this document.
        How does the index get generated? If indexterms exist in the
 	document and the beginning and ending index tags exist before the end


Index: s1-xml-tags-keycap.php
===================================================================
RCS file: /cvs/fedora/web/html/participate/documentation-guide/s1-xml-tags-keycap.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- s1-xml-tags-keycap.php	24 Aug 2005 17:49:48 -0000	1.3
+++ s1-xml-tags-keycap.php	19 Sep 2005 18:50:48 -0000	1.4
@@ -7,7 +7,7 @@
 
 ?>
 
-
        6.14. keycap
        Prev Chapter 6. DocBook XML Tags Next
        6.14. keycap
        
+
        6.14. keycap
        Prev Chapter 6. DocBook XML Tags Next
        6.14. keycap
        
 	To denote a specific key, you will need to use the
 	<keycap> and </keycap>
 	tags. Brackets are automatically added around the keycap, so do not add
@@ -20,7 +20,7 @@
 	The output:
       
        
 	To make your selection, press the Enter key.
-      
        6.14.1. menuchoice
        
+      
        6.14.1. menuchoice
        
 	  Often using a mouse is tedious for common tasks. Therefore,
 	  programmers often build in keyboard-shortcuts to simplify their
 	  program. These should be described using the shortcut tag as a wrapper
@@ -42,7 +42,7 @@
       
        
 	  Go to the menu bar and choose: 
 	  File->Save (Ctrl-s).
-	
        6.14.2. keycombo
        
+	
        6.14.2. keycombo
        
 	  To illustrate a key combination, you need to use the
 	  <keycombo> and
 	  </keycombo>,


Index: s1-xml-tags-lists.php
===================================================================
RCS file: /cvs/fedora/web/html/participate/documentation-guide/s1-xml-tags-lists.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- s1-xml-tags-lists.php	24 Aug 2005 17:49:48 -0000	1.3
+++ s1-xml-tags-lists.php	19 Sep 2005 18:50:48 -0000	1.4
@@ -7,11 +7,11 @@
 
 ?>
 
-
        6.15. Lists
        Prev Chapter 6. DocBook XML Tags Next
        6.15. Lists
        There are several types of lists you can create using XML. You
+
        6.15. Lists
        Prev Chapter 6. DocBook XML Tags Next
        6.15. Lists
        There are several types of lists you can create using XML. You
 	can have a itemized (bulleted) list, a ordered (numbered) list, or a
 	variable list (presents a term and then a separate paragraph).
        There is also a list format for tables and for for creating a
 	list of glossary terms and their definitions.
        The sections below will discuss the proper uses for the various
-	list and how to create them.
        6.15.1. itemizedlist
        An ItemizedList is best used to present
+	list and how to create them.
        6.15.1. itemizedlist
        An ItemizedList is best used to present
 	  information that is important for the reader to know, but that does
 	  not need to be in a specific order. It is shorter than a
 	  VariableList and presents the information in a
@@ -38,7 +38,7 @@
   </listitem>
 </itemizedlist>
 
-
        The output looks like:
        • Getting familiar with the installation program's user interface
        • Starting the installation program
        • Selecting an installation method
        6.15.2. OrderedList
        An orderedlist is best used to present
+
        The output looks like:
        • Getting familiar with the installation program's user interface
        • Starting the installation program
        • Selecting an installation method
        6.15.2. OrderedList
        An orderedlist is best used to present
 	  information that is important for the reader to know in a specific
 	  order. orderedlists are a good way to convey
 	  step-by-step senarios to the audience you are writing for.
        
@@ -82,7 +82,7 @@
 	      errata. Using these URLs, you can download any necessary
 	      diskette images. Please note: use binary mode when transferring
 	      a diskette image.
-	    
        6.15.3. Variablelist
        A variablelist best represents a list of
+	    
        6.15.3. Variablelist
        A variablelist best represents a list of
 	  terms and definitions or descriptions for those terms.
        To create a variablelist, use the following
 	  command sequence:
 	
        [Note]Note
        Notice below that the text for the list
@@ -125,7 +125,7 @@
 	    Do not specify the
 	    frame attribute to the table. Doing
 	    so breaks PDF production.
-	  
        6.15.4. Creating a List Within a Table Using Simplelist
        A simplelist is an unadorned list of
+	  
        6.15.4. Creating a List Within a Table Using Simplelist
        A simplelist is an unadorned list of
 	  items. simplelists can be inline or arranged in
 	  columns.
        We use simplelist to add separate paragraphs
 	  of text within a table element. A regular list, such as
@@ -208,7 +208,7 @@
 	    used. The  <entry> and <simplelist> tags must be aligned
 	    beside one another, otherwise you will receive a parsing error.

      For each paragraph or list item to be added within a SimpleList, the <member> tag set must be - added around that particular text item.

      6.15.5. glosslist

      Use the glosslist command set to create a + added around that particular text item.

      6.15.5. glosslist

      Use the glosslist command set to create a list of glossary terms and their definitions.

      In XML, an example looks like the following:

       
 	  <glosslist>


Index: s1-xml-tags-option.php
===================================================================
RCS file: /cvs/fedora/web/html/participate/documentation-guide/s1-xml-tags-option.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- s1-xml-tags-option.php	24 Aug 2005 17:49:48 -0000	1.3
+++ s1-xml-tags-option.php	19 Sep 2005 18:50:48 -0000	1.4
@@ -7,7 +7,7 @@
 
 ?>
 
-
      6.16. option
      Prev Chapter 6. DocBook XML Tags Next
      6.16. option
      If you have a command that offers an option or a flag, use the
+
      6.16. option
      Prev Chapter 6. DocBook XML Tags Next
      6.16. option
      If you have a command that offers an option or a flag, use the
 	<option> and
 	</option> tags.
       
      [Note]Note
      The <option> tag set is only meant to be used for command


Index: s1-xml-tags-para.php
===================================================================
RCS file: /cvs/fedora/web/html/participate/documentation-guide/s1-xml-tags-para.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- s1-xml-tags-para.php	24 Aug 2005 17:49:48 -0000	1.3
+++ s1-xml-tags-para.php	19 Sep 2005 18:50:48 -0000	1.4
@@ -7,7 +7,7 @@
 
 ?>
 
-
      6.18. para
      Prev Chapter 6. DocBook XML Tags Next
      6.18. para
      For any paragraph, the <para> and
+
      6.18. para
      Prev Chapter 6. DocBook XML Tags Next
      6.18. para
      For any paragraph, the <para> and
 	</para> tags must open and close that
 	particular paragraph.
       
      Do not use para tags around anything other than a simple


Index: s1-xml-tags-part.php
===================================================================
RCS file: /cvs/fedora/web/html/participate/documentation-guide/s1-xml-tags-part.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- s1-xml-tags-part.php	24 Aug 2005 17:49:48 -0000	1.3
+++ s1-xml-tags-part.php	19 Sep 2005 18:50:48 -0000	1.4
@@ -7,7 +7,7 @@
 
 ?>
 
-
      6.19. part
      Prev Chapter 6. DocBook XML Tags Next
      6.19. part
      
+
      6.19. part
      Prev Chapter 6. DocBook XML Tags Next
      6.19. part
      
 	In the parent file, you can separate the chapters into parts to divide
 	them into logical groups. For example, in the parent file, the
 	part tags surround the chapter entities:


Index: s1-xml-tags-prompt.php
===================================================================
RCS file: /cvs/fedora/web/html/participate/documentation-guide/s1-xml-tags-prompt.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- s1-xml-tags-prompt.php	24 Aug 2005 17:49:48 -0000	1.3
+++ s1-xml-tags-prompt.php	19 Sep 2005 18:50:48 -0000	1.4
@@ -7,7 +7,7 @@
 
 ?>
 
-
      6.20. prompt
      Prev Chapter 6. DocBook XML Tags Next
      6.20. prompt
      
+
      6.20. prompt
      Prev Chapter 6. DocBook XML Tags Next
      6.20. prompt
      
 	To show a prompt, such as a root or DOS prompt, use the
 	<prompt> and </prompt>
 	commands. For example:


Index: s1-xml-tags-replaceable.php
===================================================================
RCS file: /cvs/fedora/web/html/participate/documentation-guide/s1-xml-tags-replaceable.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- s1-xml-tags-replaceable.php	24 Aug 2005 17:49:48 -0000	1.3
+++ s1-xml-tags-replaceable.php	19 Sep 2005 18:50:48 -0000	1.4
@@ -7,7 +7,7 @@
 
 ?>
 
-
      6.21. replaceable
      Prev Chapter 6. DocBook XML Tags Next
      6.21. replaceable
      
+
      6.21. replaceable
      Prev Chapter 6. DocBook XML Tags Next
      6.21. replaceable
      
 	To create replaceable text, use the tags
 	<replaceable> and
 	</replaceable> around the text you want to use as a


Index: s1-xml-tags-screen.php
===================================================================
RCS file: /cvs/fedora/web/html/participate/documentation-guide/s1-xml-tags-screen.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- s1-xml-tags-screen.php	24 Aug 2005 17:49:48 -0000	1.3
+++ s1-xml-tags-screen.php	19 Sep 2005 18:50:48 -0000	1.4
@@ -7,7 +7,7 @@
 
 ?>
 
-
      6.22. screen
      Prev Chapter 6. DocBook XML Tags Next
      6.22. screen
      
+
      6.22. screen
      Prev Chapter 6. DocBook XML Tags Next
      6.22. screen
      
       The <screen> command is used to format text
       within a document and is great for adding emphasis to show examples of
       code, computer output, and more. In HTML with the Fedora CSS file, this


Index: s1-xml-tags-sections.php
===================================================================
RCS file: /cvs/fedora/web/html/participate/documentation-guide/s1-xml-tags-sections.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- s1-xml-tags-sections.php	24 Aug 2005 17:49:48 -0000	1.3
+++ s1-xml-tags-sections.php	19 Sep 2005 18:50:48 -0000	1.4
@@ -7,7 +7,7 @@
 
 ?>
 
-
      6.23. Sections
      Prev Chapter 6. DocBook XML Tags Next
      6.23. Sections
      Within an article (or chapter if it is a DocBook XML book like the
+
      6.23. Sections
      Prev Chapter 6. DocBook XML Tags Next
      6.23. Sections
      Within an article (or chapter if it is a DocBook XML book like the
 	Installation Guide), you can have sections and
 	subsections. <sect1> is always the highest
 	section and you cannot have two sections of the same level within one


Index: s1-xml-tags-table.php
===================================================================
RCS file: /cvs/fedora/web/html/participate/documentation-guide/s1-xml-tags-table.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- s1-xml-tags-table.php	24 Aug 2005 17:49:48 -0000	1.3
+++ s1-xml-tags-table.php	19 Sep 2005 18:50:48 -0000	1.4
@@ -7,7 +7,7 @@
 
 ?>
 
-
      6.24. table
      Prev Chapter 6. DocBook XML Tags Next
      6.24. table
      
+
      6.24. table
      Prev Chapter 6. DocBook XML Tags Next
      6.24. table
      
 	The following is an example of creating a table. 
       
       <table id="tb-mockup-before-begin">
@@ -78,7 +78,7 @@
 </tbody> 
 </tgroup> 
 </table> 
-
      Features GNOMEKDE
      highly configurableyesyes
      multiple window managers yesyes
      Internet applicationsyes yes 
      Table 6.2. Available Features of GNOME and KDE
      6.24.1. Creating a List Within a Table
      Creating a list within a table can be a difficult task. It
+
      Features GNOMEKDE
      highly configurableyesyes
      multiple window managers yesyes
      Internet applicationsyes yes 
      Table 6.2. Available Features of GNOME and KDE
      6.24.1. Creating a List Within a Table
      Creating a list within a table can be a difficult task. It
 	  requires strict formatting and a set of commands that are not
 	  available for command completion in
 	  Emacs.
      The tags you will need to use are


Index: s1-xml-tags-trademark.php
===================================================================
RCS file: /cvs/fedora/web/html/participate/documentation-guide/s1-xml-tags-trademark.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- s1-xml-tags-trademark.php	24 Aug 2005 17:49:48 -0000	1.3
+++ s1-xml-tags-trademark.php	19 Sep 2005 18:50:48 -0000	1.4
@@ -7,7 +7,7 @@
 
 ?>
 
-
      6.25. trademark
      Prev Chapter 6. DocBook XML Tags Next
      6.25. trademark
      Do not use the trademark entities &trade;, &copy;, or
+
      6.25. trademark
      Prev Chapter 6. DocBook XML Tags Next
      6.25. trademark
      Do not use the trademark entities &trade;, &copy;, or
 	&reg; because the do not produce HTML output that works for all
 	charsets. The HTML output produces by these entities are declared in
 	the DTD and cannot be changed via the stylesheet.
      Instead, use the trademark tag and its


Index: s1-xml-tags-userinput.php
===================================================================
RCS file: /cvs/fedora/web/html/participate/documentation-guide/s1-xml-tags-userinput.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- s1-xml-tags-userinput.php	24 Aug 2005 17:49:48 -0000	1.3
+++ s1-xml-tags-userinput.php	19 Sep 2005 18:50:48 -0000	1.4
@@ -7,7 +7,7 @@
 
 ?>
 
-
      6.26. userinput
      Prev Chapter 6. DocBook XML Tags Next
      6.26. userinput
      
+
      6.26. userinput
      Prev Chapter 6. DocBook XML Tags Next
      6.26. userinput
      
 	To show what a user would type, use the userinput
 	tag. For example:
       
      

Index: s1-xml-tags-wordasword.php
===================================================================
RCS file: /cvs/fedora/web/html/participate/documentation-guide/s1-xml-tags-wordasword.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- s1-xml-tags-wordasword.php	24 Aug 2005 17:49:48 -0000	1.3
+++ s1-xml-tags-wordasword.php	19 Sep 2005 18:50:48 -0000	1.4
@@ -7,7 +7,7 @@
 
 ?>
 
-
      6.28. wordasword
      Prev Chapter 6. DocBook XML Tags Next
      6.28. wordasword
      The <wordasword> tag set is used to define a word meant
+
      6.28. wordasword
      Prev Chapter 6. DocBook XML Tags Next
      6.28. wordasword
      The <wordasword> tag set is used to define a word meant
 	specifically as a word and not representing anything else.
      A lot of technical documentation contains words that have overloaded
 	meanings. Sometimes it is useful to be able to use a word without invoking
 	its technical meaning. The <wordasword> element identifies a word or


Index: s1-xml-tags-xref.php
===================================================================
RCS file: /cvs/fedora/web/html/participate/documentation-guide/s1-xml-tags-xref.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- s1-xml-tags-xref.php	24 Aug 2005 17:49:48 -0000	1.3
+++ s1-xml-tags-xref.php	19 Sep 2005 18:50:48 -0000	1.4
@@ -7,7 +7,7 @@
 
 ?>
 
-
      6.29. xref
      Prev Chapter 6. DocBook XML Tags Next
      6.29. xref
      
+
      6.29. xref
      Prev Chapter 6. DocBook XML Tags Next
      6.29. xref
      
 	To refer to other sections or chapters within a manual, use the
 	<xref> tag.
       
      




Index: sn-cvs-config.php
===================================================================
RCS file: /cvs/fedora/web/html/participate/documentation-guide/sn-cvs-config.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sn-cvs-config.php	24 Aug 2005 17:56:10 -0000	1.1
+++ sn-cvs-config.php	19 Sep 2005 18:50:48 -0000	1.2
@@ -7,7 +7,7 @@
 
 ?>
 
-
      10.3. Configuring For CVS Access
      Prev Chapter 10. CVS Next
      10.3. Configuring For CVS Access
      10.3.1. Avoiding Repetitive Typing
      
+
      10.3. Configuring For CVS Access
      Prev Chapter 10. CVS Next
      10.3. Configuring For CVS Access
      10.3.1. Avoiding Repetitive Typing
      
         Many CVS commands need certain
         command line switches to operate consistently. Rather than
         typing them every time that command is used, you can save the
@@ -21,7 +21,7 @@
 diff -uNp
 rdiff -uNp
 update -dP
      
-      
      10.3.2. Configuring for Read-Only CVS Access
      
+      
      10.3.2. Configuring for Read-Only CVS Access
      
         If your goal is to download the various Fedora Core documents and to
         render them on your system, you only need read-only access to
         the CVS repository. Follow the
@@ -33,7 +33,7 @@
         following commands:
       
      $ export CVSROOT=:pserver:cvs.fedora.redhat.com:/cvs/docs
 $ cvs login
-$ cvs checkout docs-setup module-name
+$ cvs checkout docs-common module-name
 $ cvs checkout module-name
 $ cd module-name
      
         Once you have checked the module out, it doesn't matter what
@@ -45,7 +45,7 @@
         CVS/ directory, the
         CVS program will automatically locate
         the Fedora Core repository.
-      
      10.3.3. Configuring Read/Write CVS Access
      
+      
      10.3.3. Configuring Read/Write CVS Access
      
         To author a new document or to change an existing one, you must
         obtain full read/write access to the Fedora Core Docs
         CVS repository. For the full details


Index: sn-cvs-cvscommands.php
===================================================================
RCS file: /cvs/fedora/web/html/participate/documentation-guide/sn-cvs-cvscommands.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sn-cvs-cvscommands.php	24 Aug 2005 17:56:10 -0000	1.1
+++ sn-cvs-cvscommands.php	19 Sep 2005 18:50:48 -0000	1.2
@@ -7,7 +7,7 @@
 
 ?>
 
-
      10.4. Basic CVS Commands
      Prev Chapter 10. CVS Next
      10.4. Basic CVS Commands
      
+
      10.4. Basic CVS Commands
      Prev Chapter 10. CVS Next
      10.4. Basic CVS Commands
      
       After configuring your system to work with CVS, checkout the
       modules you will be working on.
     
      [Tip]Tip
      
@@ -22,7 +22,7 @@
         CVS ignores any
         $CVSROOT
         or -m command line switch.
-      
      10.4.1. Checking Out Modules
      
+      
      10.4.1. Checking Out Modules
      
         You only need to checkout a module once. After a local copy of
         the module is on your system, it is on your system.
       
      
@@ -38,7 +38,7 @@
         If a branch name is not specified when checking out a module, it
         is referred to as the HEAD of the
         CVS module.
-      
      10.4.1.1. Checking Out Branches of Modules
      
+      
      10.4.1.1. Checking Out Branches of Modules
      
           Think of a CVS branch as a version
           of the files for a particular version of a manual or package.
         
      
@@ -81,7 +81,7 @@
           Only tags marked as branches in the second column under the
           Existing Tags section can be
           checked out as a branch.
-        
      10.4.2. Updating Files
      
+        
      10.4.2. Updating Files
      
         To retrieve the latest versions of the files in a module, change
         to the directory that contains the files for the module and
         execute the command:
@@ -89,7 +89,7 @@
         The latest versions of all the files in the module are
         downloaded into your local copy. If you notice a file conflict,
         refer to Section 10.4.8, “Resolving Conflicts”.
-      
      10.4.3. Committing Files
      
+      
      10.4.3. Committing Files
      
         After modifying files in your local version of a module, commit
         them to save the changes on the CVS
         server:
@@ -123,13 +123,13 @@
       
      
         If you notice a file conflict, refer to
         Section 10.4.8, “Resolving Conflicts”.
-      
      10.4.4. Adding Files
      
+      
      10.4.4. Adding Files
      
         To add a file to a module, create the file in your local copy
         then execute the following command:
       
      $ cvs add  file-to-add
      
         After adding the file, you must commit the
         add to copy it to the server:
-      
      $ cvs commit -m "some log message" file-to-add
      10.4.5. Managing Binary Files
      
+      
      $ cvs commit -m "some log message" file-to-add
      10.4.5. Managing Binary Files
      
         The most commonly-archived files are simple text files but
         sometimes binary files are also archived. The
         cvs program recognizes most common
@@ -160,7 +160,7 @@
           it corrupted when it is checked out, do not panic. Simply use
           the admin command as described above, delete
           your local file copy, and check it out again.
-

      10.4.6. Removing Files

      +

      10.4.6. Removing Files

      If a file is no longer needed in the module, use the remove command to remove it from your local copy and then commit the removal to the @@ -182,7 +182,7 @@ email to cvsdocs-administrator at fedora.redhat.com asking to have the file renamed. -

      10.4.7. Status of Files

      +

      10.4.7. Status of Files

      Sometimes it is necessary to view the status of a file in a CVS module. To view the status of a @@ -233,7 +233,7 @@ generated-index.sgml or for files that you want to add to the repository but have not yet issued the cvs add command. -

      10.4.8. Resolving Conflicts

      +

      10.4.8. Resolving Conflicts

      If you modify a file and the same region is modified by someone else and committed first, you will probably see a message similar to the following when committing the file or updating @@ -274,7 +274,7 @@ the content from the server.

      Resolve the conflict by editing your copy, and commit the file. -

      10.4.9. Summary

      +

      10.4.9. Summary

      All commands assume you are in the proper directory for the CVS module.

      CommandDescription
      cvs checkout Index: sn-cvs-preparation.php =================================================================== RCS file: /cvs/fedora/web/html/participate/documentation-guide/sn-cvs-preparation.php,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sn-cvs-preparation.php 24 Aug 2005 17:56:10 -0000 1.1 +++ sn-cvs-preparation.php 19 Sep 2005 18:50:48 -0000 1.2 @@ -7,12 +7,12 @@ ?> -
      10.2. Preparing For CVS Use
      Prev Chapter 10. CVS Next

      10.2. Preparing For CVS Use

      +

      10.2. Preparing For CVS Use
      Prev Chapter 10. CVS Next

      10.2. Preparing For CVS Use

      Before using CVS, you need to establish an account with the CVS server. After getting an account, you do not need to perform these actions again. -

      10.2.1. Is CVS Installed On Your System

      +

      10.2.1. Is CVS Installed On Your System

      You must have the CVS RPM package installed. Verify its presence by typing the command: @@ -24,7 +24,7 @@ cvs package before continuing. If you do not know how to do this, consult your system administrator who can install it for you. -

      10.2.2. Generating SSH Keys

      +

      10.2.2. Generating SSH Keys

      The CVS server uses SSH Protocol 2 keys to authenticate users. Thus, you need to generate a pair of keys before applying @@ -44,7 +44,7 @@ required for an cvs.fedora.redhat.com CVS account. -

      1. +

        1. To generate a DSA key to work with version 2.0 protocol, at a shell prompt, --- s1-cvs-configure.php DELETED --- --- s1-cvs-cvscommands.php DELETED --- From fedora-extras-commits at redhat.com Mon Sep 19 18:58:10 2005 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Mon, 19 Sep 2005 14:58:10 -0400 Subject: rpms/nexuiz/FC-4 .cvsignore, 1.2, 1.3 nexuiz.spec, 1.3, 1.4 sources, 1.2, 1.3 Message-ID: <200509191858.j8JIwAAO029807@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/rpms/nexuiz/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29784 Modified Files: .cvsignore nexuiz.spec sources Log Message: * Mon Sep 19 2005 Adrian Reber - 1.2.1-1 - updated to 1.2.1 - icons and binaries are now being renamed from darkplaces* to nexuiz* Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/nexuiz/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 9 Jul 2005 11:59:33 -0000 1.2 +++ .cvsignore 19 Sep 2005 18:58:07 -0000 1.3 @@ -1 +1 @@ -nexuiz-1.1.tar.bz2 +nexuizenginesource20050911.zip Index: nexuiz.spec =================================================================== RCS file: /cvs/extras/rpms/nexuiz/FC-4/nexuiz.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- nexuiz.spec 16 Aug 2005 08:16:57 -0000 1.3 +++ nexuiz.spec 19 Sep 2005 18:58:07 -0000 1.4 @@ -1,17 +1,14 @@ Summary: Multiplayer, deathmatch oriented first person shooter Name: nexuiz -Version: 1.1 -Release: 2%{?dist} +Version: 1.2.1 +Release: 1%{?dist} License: GPL Group: Amusements/Games URL: http://www.nexuiz.com/ # Source is custom, obtained with : -# wget http://dl.sf.net/sourceforge/nexuiz/nexuiz11.zip -# unzip nexuiz11.zip -# mkdir nexuiz-1.1/ -# mv Nexuiz/sources/darkplaces/* Nexuiz/Readme.htm nexuiz-1.1/ -# tar cjvf nexuiz-1.1.tar.bz2 nexuiz-1.1/ -Source: nexuiz-%{version}.tar.bz2 +# wget http://dl.sf.net/sourceforge/nexuiz/nexuiz121.zip +# unzip nexuiz121.zip Nexuiz/nexuizenginesource20050911.zip +Source: nexuizenginesource20050911.zip Patch0: nexuiz-1.0-basedir.patch Patch1: nexuiz-1.1-nostrip.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -22,7 +19,7 @@ # and therefore it isn't picked up by RPM during build Requires: libz.so.1 libvorbis.so.0 libvorbisfile.so.3 libjpeg.so.62 Requires: desktop-file-utils >= 0.9 -Requires: nexuiz-data +Requires: nexuiz-data = %{version} Requires(post): desktop-file-utils Requires(postun): desktop-file-utils @@ -34,7 +31,7 @@ %package server Group: Amusements/Games Summary: Dedicated server for the Nexuiz first person shooter -Requires: nexuiz-data +Requires: nexuiz-data = %{version} # This is necessary as these libraries are loaded during runtime # and therefore it isn't picked up by RPM during build Requires: libz.so.1 @@ -47,15 +44,15 @@ %prep -%setup -q +%setup -q -n darkplaces %patch0 -p0 -b .basedir %patch1 -p0 -b .nostrip -%{__sed} -i 's/\r//' Readme.htm +%{__sed} -i 's/\r//' darkplaces.txt %build -%{__make} %{?_smp_mflags} cl-release sv-release OPTIM_RELEASE="$RPM_OPT_FLAGS" -convert nexuiz.ico nexuiz.png +%{__make} cl-release sv-release OPTIM_RELEASE="$RPM_OPT_FLAGS" +convert darkplaces.ico nexuiz.png %install @@ -63,8 +60,10 @@ # Install the main programs %{__mkdir_p} %{buildroot}%{_bindir} -%{__install} -m 0755 nexuiz-{glx,dedicated} \ - %{buildroot}%{_bindir}/ +%{__install} -m 0755 darkplaces-glx \ + %{buildroot}%{_bindir}/nexuiz-glx +%{__install} -m 0755 darkplaces-dedicated \ + %{buildroot}%{_bindir}/nexuiz-dedicated # Create the desktop file %{__cat} > %{name}.desktop << EOF @@ -111,18 +110,28 @@ %files %defattr(-,root,root,-) -%doc Readme.htm COPYING +%doc COPYING darkplaces.txt %{_bindir}/nexuiz-glx %{_datadir}/icons/hicolor/*/apps/nexuiz.png %{_datadir}/applications/*%{name}.desktop %files server %defattr(-,root,root,-) -%doc Readme.htm COPYING +%doc COPYING darkplaces.txt %{_bindir}/nexuiz-dedicated %changelog +* Mon Sep 19 2005 Adrian Reber - 1.2.1-1 +- updated to 1.2.1 +- icons and binaries are now being renamed from darkplaces* to nexuiz* + +* Fri Sep 02 2005 Adrian Reber - 1.2-2 +- another try without smp_mflags + +* Fri Sep 02 2005 Adrian Reber - 1.2-1 +- updated to 1.2 + * Tue Aug 16 2005 Adrian Reber - 1.1-2 - support building on RHEL4 (#165522) Index: sources =================================================================== RCS file: /cvs/extras/rpms/nexuiz/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 9 Jul 2005 11:59:33 -0000 1.2 +++ sources 19 Sep 2005 18:58:07 -0000 1.3 @@ -1 +1 @@ -a2177339360d4ad19816c66a7dfd0353 nexuiz-1.1.tar.bz2 +ea845ee2842ad6a2304da1f0b2c95bdd nexuizenginesource20050911.zip From fedora-extras-commits at redhat.com Mon Sep 19 20:47:00 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Mon, 19 Sep 2005 16:47:00 -0400 Subject: rpms/sbcl/FC-4 sbcl.spec, 1.11, 1.12 sbcl-0.9.4-ADDR_NO_RANDOMIZE-argv0.patch, 1.1, NONE sbcl-0.9.4-ADDR_NO_RANDOMIZE-proc.patch, 1.1, NONE Message-ID: <200509192047.j8JKl0Mo000335@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/sbcl/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv316 Modified Files: sbcl.spec Removed Files: sbcl-0.9.4-ADDR_NO_RANDOMIZE-argv0.patch sbcl-0.9.4-ADDR_NO_RANDOMIZE-proc.patch Log Message: * Mon Sep 19 2005 Rex Dieter 0.9.4-16 - rework personality/reexec patch (execve -> execvp) Index: sbcl.spec =================================================================== RCS file: /cvs/extras/rpms/sbcl/FC-4/sbcl.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- sbcl.spec 16 Sep 2005 19:54:35 -0000 1.11 +++ sbcl.spec 19 Sep 2005 20:46:58 -0000 1.12 @@ -24,12 +24,12 @@ Name: sbcl Summary: Steel Bank Common Lisp Version: 0.9.4 -Release: 15%{?dist} +Release: 16%{?dist} License: BSD/MIT Group: Development/Languages URL: http://sbcl.sourceforge.net/ -Source0: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-%{version}-source.tar.bz2 +Source0: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-%{version}-source.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) ExclusiveArch: %{ix86} x86_64 @@ -51,11 +51,7 @@ %endif Patch1: sbcl-0.8.18-default-sbcl-home.patch -# See http://sourceforge.net/mailarchive/message.php?msg_id=12787069 -# use /proc/self/exe -#Patch2: sbcl-0.9.4-ADDR_NO_RANDOMIZE-proc.patch -# use argv[0] -Patch2: sbcl-0.9.4-ADDR_NO_RANDOMIZE-argv0.patch +Patch2: sbcl-0.9.4-personality.patch Patch3: sbcl-0.9.4-optflags.patch Patch4: sbcl-0.9.4-LIB_DIR.patch @@ -79,7 +75,7 @@ #sed -i -e "s|/usr/local/lib/sbcl/|%{_libdir}/sbcl/|" src/runtime/runtime.c #or patch to use SBCL_HOME env var %patch1 -p0 -b .default-sbcl-home -%{?setarch:%patch2 -p1 -b .ADDR_NO_RANDOMIZE} +%patch2 -p1 -b .personality %patch3 -p1 -b .optflags %patch4 -p1 -b .LIB_DIR @@ -125,8 +121,6 @@ %check || : pushd tests -# still need setarch if using ADDR_NO_RANDOMIZE-proc patch, since /proc isn't available on buildsystem/mock. -#{?setarch} sh ./run-tests.sh sh ./run-tests.sh popd @@ -138,7 +132,6 @@ unset SBCL_HOME ||: export INSTALL_ROOT=$RPM_BUILD_ROOT%{_prefix} export LIB_DIR=$RPM_BUILD_ROOT%{_libdir} -# (may) still need setarch if using ADDR_NO_RANDOMIZE-proc patch sh ./install.sh ## Unpackaged files @@ -177,6 +170,9 @@ %changelog +* Mon Sep 19 2005 Rex Dieter 0.9.4-16 +- rework personality/reexec patch (execve -> execvp) + * Sat Sep 16 2005 Rex Dieter 0.9.4-15 - disable ppc (probably related to #166347) --- sbcl-0.9.4-ADDR_NO_RANDOMIZE-argv0.patch DELETED --- --- sbcl-0.9.4-ADDR_NO_RANDOMIZE-proc.patch DELETED --- From fedora-extras-commits at redhat.com Mon Sep 19 20:47:51 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Mon, 19 Sep 2005 16:47:51 -0400 Subject: rpms/sbcl/FC-4 sbcl-0.9.4-personality.patch, NONE, 1.1 sbcl.spec, 1.12, 1.13 Message-ID: <200509192047.j8JKlpcq000411@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/sbcl/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv389 Modified Files: sbcl.spec Added Files: sbcl-0.9.4-personality.patch Log Message: forgot new patch sbcl-0.9.4-personality.patch: --- NEW FILE sbcl-0.9.4-personality.patch --- --- sbcl-0.9.4/src/runtime/os.h.ADDR_NO_RANDOMIZE 2005-07-14 10:41:20.000000000 -0500 +++ sbcl-0.9.4/src/runtime/os.h 2005-09-13 11:23:31.319884384 -0500 @@ -50,7 +50,7 @@ /* Do anything we need to do when starting up the runtime environment * in this OS. */ -extern void os_init(void); +extern void os_init(char *argv[]); /* Install any OS-dependent low-level signal handlers which are needed * by the runtime environment. E.g. the signals raised by a violation --- sbcl-0.9.4/src/runtime/linux-os.c.ADDR_NO_RANDOMIZE 2005-08-12 14:08:19.000000000 -0500 +++ sbcl-0.9.4/src/runtime/linux-os.c 2005-09-13 11:26:47.110833967 -0500 @@ -44,6 +44,7 @@ #include #include #include +#include #include "validate.h" #include "thread.h" @@ -92,7 +93,7 @@ int linux_no_threads_p = 0; void -os_init(void) +os_init(char *argv[]) { /* Conduct various version checks: do we have enough mmap(), is * this a sparc running 2.2, can we do threads? */ @@ -117,7 +118,7 @@ FSHOW((stderr,"linux kernel %d.%d predates 2.4;\n enabling workarounds for SPARC kernel bugs in signal handling.\n", major_version,minor_version)); linux_sparc_siginfo_bug = 1; #endif - } + } #ifdef LISP_FEATURE_SB_THREAD futex_wait(futex,-1); if(errno==ENOSYS) linux_no_threads_p = 1; @@ -125,6 +126,28 @@ fprintf(stderr,"Linux with NPTL support (e.g. kernel 2.6 or newer) required for \nthread-enabled SBCL. Disabling thread support.\n\n"); #endif os_vm_page_size = getpagesize(); + + /* KLUDGE: Disable memory randomization on new Linux kernels + * by setting a personality flag and re-executing. (We need + * to re-execute, since the memory maps that can conflict with + * the SBCL spaces have already been done at this point). + */ +#if defined(LISP_FEATURE_X86) + if ((major_version == 2) && (minor_version >= 6) || (major_version >= 3)) { + long pers = personality(-1); + /* 0x40000 aka. ADDR_NO_RANDOMIZE */ + if (!(pers & 0x40000)) { + if (personality(pers | 0x40000) != -1) { + execvp(argv[0], argv); + } + /* Either changing the personality or (re)exec failed. Either + * way we might as well continue, and hope that the random + * memory maps are ok this time around. + */ + fprintf(stderr, "WARNING: Couldn't re-execute SBCL with the proper personality flags. Trying to continue anyway.\n"); + } + } +#endif } --- sbcl-0.9.4/src/runtime/runtime.c.ADDR_NO_RANDOMIZE 2005-09-13 11:23:31.315884548 -0500 +++ sbcl-0.9.4/src/runtime/runtime.c 2005-09-13 11:23:31.323884220 -0500 @@ -194,7 +194,7 @@ /* KLUDGE: os_vm_page_size is set by os_init(), and on some * systems (e.g. Alpha) arch_init() needs need os_vm_page_size, so * it must follow os_init(). -- WHN 2000-01-26 */ - os_init(); + os_init(argv); arch_init(); gc_init(); validate(); Index: sbcl.spec =================================================================== RCS file: /cvs/extras/rpms/sbcl/FC-4/sbcl.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- sbcl.spec 19 Sep 2005 20:46:58 -0000 1.12 +++ sbcl.spec 19 Sep 2005 20:47:49 -0000 1.13 @@ -24,7 +24,7 @@ Name: sbcl Summary: Steel Bank Common Lisp Version: 0.9.4 -Release: 16%{?dist} +Release: 17%{?dist} License: BSD/MIT Group: Development/Languages @@ -170,7 +170,7 @@ %changelog -* Mon Sep 19 2005 Rex Dieter 0.9.4-16 +* Mon Sep 19 2005 Rex Dieter 0.9.4-17 - rework personality/reexec patch (execve -> execvp) * Sat Sep 16 2005 Rex Dieter 0.9.4-15 From fedora-extras-commits at redhat.com Mon Sep 19 21:10:55 2005 From: fedora-extras-commits at redhat.com (Linus Walleij (snirkel)) Date: Mon, 19 Sep 2005 17:10:55 -0400 Subject: rpms/libnjb/devel .cvsignore, 1.3, 1.4 libnjb.spec, 1.2, 1.3 sources, 1.3, 1.4 Message-ID: <200509192110.j8JLAtdi001853@cvs-int.fedora.redhat.com> Author: snirkel Update of /cvs/extras/rpms/libnjb/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1828 Modified Files: .cvsignore libnjb.spec sources Log Message: New upstream release. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libnjb/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 6 Sep 2005 20:33:51 -0000 1.3 +++ .cvsignore 19 Sep 2005 21:10:53 -0000 1.4 @@ -1 +1 @@ -libnjb-2.2.2.tar.gz +libnjb-2.2.3.tar.gz Index: libnjb.spec =================================================================== RCS file: /cvs/extras/rpms/libnjb/devel/libnjb.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- libnjb.spec 6 Sep 2005 20:33:51 -0000 1.2 +++ libnjb.spec 19 Sep 2005 21:10:53 -0000 1.3 @@ -11,7 +11,7 @@ # Name: libnjb -Version: 2.2.2 +Version: 2.2.3 Release: 1%{?dist} Summary: A software library for talking to the Creative Nomad Jukeboxes and Dell DJs URL: http://libnjb.sourceforge.net/ @@ -100,6 +100,8 @@ %changelog +* Mon Sep 19 2005 Linus Walleij 2.2.3-1 +- New upstream release. * Tue Sep 6 2005 Linus Walleij 2.2.2-1 - New upstream release. * Wed Aug 11 2005 Linus Walleij 2.2.1-7 Index: sources =================================================================== RCS file: /cvs/extras/rpms/libnjb/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 6 Sep 2005 20:33:51 -0000 1.3 +++ sources 19 Sep 2005 21:10:53 -0000 1.4 @@ -1 +1 @@ -5d17da61ea6a43fd3831789d1d518bc7 libnjb-2.2.2.tar.gz +a11b7b010c09b2f6c387c45c29bf3b64 libnjb-2.2.3.tar.gz From fedora-extras-commits at redhat.com Mon Sep 19 21:12:41 2005 From: fedora-extras-commits at redhat.com (Linus Walleij (snirkel)) Date: Mon, 19 Sep 2005 17:12:41 -0400 Subject: rpms/libnjb/FC-4 .cvsignore, 1.3, 1.4 libnjb.spec, 1.2, 1.3 sources, 1.3, 1.4 Message-ID: <200509192112.j8JLCftJ001931@cvs-int.fedora.redhat.com> Author: snirkel Update of /cvs/extras/rpms/libnjb/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1908 Modified Files: .cvsignore libnjb.spec sources Log Message: New upstream release. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libnjb/FC-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 6 Sep 2005 20:36:25 -0000 1.3 +++ .cvsignore 19 Sep 2005 21:12:39 -0000 1.4 @@ -1 +1 @@ -libnjb-2.2.2.tar.gz +libnjb-2.2.3.tar.gz Index: libnjb.spec =================================================================== RCS file: /cvs/extras/rpms/libnjb/FC-4/libnjb.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- libnjb.spec 6 Sep 2005 20:36:25 -0000 1.2 +++ libnjb.spec 19 Sep 2005 21:12:39 -0000 1.3 @@ -11,7 +11,7 @@ # Name: libnjb -Version: 2.2.2 +Version: 2.2.3 Release: 1%{?dist} Summary: A software library for talking to the Creative Nomad Jukeboxes and Dell DJs URL: http://libnjb.sourceforge.net/ @@ -100,6 +100,8 @@ %changelog +* Mon Sep 19 2005 Linus Walleij 2.2.3-1 +- New upstream release. * Tue Sep 6 2005 Linus Walleij 2.2.2-1 - New upstream release. * Wed Aug 11 2005 Linus Walleij 2.2.1-7 Index: sources =================================================================== RCS file: /cvs/extras/rpms/libnjb/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 6 Sep 2005 20:36:25 -0000 1.3 +++ sources 19 Sep 2005 21:12:39 -0000 1.4 @@ -1 +1 @@ -5d17da61ea6a43fd3831789d1d518bc7 libnjb-2.2.2.tar.gz +a11b7b010c09b2f6c387c45c29bf3b64 libnjb-2.2.3.tar.gz From fedora-extras-commits at redhat.com Mon Sep 19 21:13:52 2005 From: fedora-extras-commits at redhat.com (Linus Walleij (snirkel)) Date: Mon, 19 Sep 2005 17:13:52 -0400 Subject: rpms/libnjb/FC-3 .cvsignore, 1.3, 1.4 libnjb.spec, 1.2, 1.3 sources, 1.3, 1.4 Message-ID: <200509192113.j8JLDq9f002009@cvs-int.fedora.redhat.com> Author: snirkel Update of /cvs/extras/rpms/libnjb/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1986 Modified Files: .cvsignore libnjb.spec sources Log Message: New upstream release. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libnjb/FC-3/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 6 Sep 2005 20:38:34 -0000 1.3 +++ .cvsignore 19 Sep 2005 21:13:50 -0000 1.4 @@ -1 +1 @@ -libnjb-2.2.2.tar.gz +libnjb-2.2.3.tar.gz Index: libnjb.spec =================================================================== RCS file: /cvs/extras/rpms/libnjb/FC-3/libnjb.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- libnjb.spec 6 Sep 2005 20:38:34 -0000 1.2 +++ libnjb.spec 19 Sep 2005 21:13:50 -0000 1.3 @@ -11,7 +11,7 @@ # Name: libnjb -Version: 2.2.2 +Version: 2.2.3 Release: 1%{?dist} Summary: A software library for talking to the Creative Nomad Jukeboxes and Dell DJs URL: http://libnjb.sourceforge.net/ @@ -100,6 +100,8 @@ %changelog +* Mon Sep 19 2005 Linus Walleij 2.2.3-1 +- New upstream release. * Tue Sep 6 2005 Linus Walleij 2.2.2-1 - New upstream release. * Wed Aug 11 2005 Linus Walleij 2.2.1-7 Index: sources =================================================================== RCS file: /cvs/extras/rpms/libnjb/FC-3/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 6 Sep 2005 20:38:34 -0000 1.3 +++ sources 19 Sep 2005 21:13:50 -0000 1.4 @@ -1 +1 @@ -5d17da61ea6a43fd3831789d1d518bc7 libnjb-2.2.2.tar.gz +a11b7b010c09b2f6c387c45c29bf3b64 libnjb-2.2.3.tar.gz From fedora-extras-commits at redhat.com Mon Sep 19 22:10:14 2005 From: fedora-extras-commits at redhat.com (Chris Wright (chrisw)) Date: Mon, 19 Sep 2005 18:10:14 -0400 Subject: rpms/cogito/devel .cvsignore, 1.2, 1.3 cogito.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200509192210.j8JMAERE003514@cvs-int.fedora.redhat.com> Author: chrisw Update of /cvs/extras/rpms/cogito/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3488 Modified Files: .cvsignore cogito.spec sources Log Message: Update cogito to 0.15 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/cogito/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 16 Sep 2005 06:53:08 -0000 1.2 +++ .cvsignore 19 Sep 2005 22:10:12 -0000 1.3 @@ -1 +1 @@ -cogito-0.14.1.tar.gz +cogito-0.15.tar.gz Index: cogito.spec =================================================================== RCS file: /cvs/extras/rpms/cogito/devel/cogito.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- cogito.spec 16 Sep 2005 23:59:49 -0000 1.2 +++ cogito.spec 19 Sep 2005 22:10:12 -0000 1.3 @@ -1,13 +1,13 @@ Name: cogito -Version: 0.14.1 -Release: 2%{?dist} +Version: 0.15 +Release: 1 Summary: The Cogito Version Control System License: GPL Group: Development/Tools URL: http://kernel.org/pub/software/scm/cogito/ Source: http://kernel.org/pub/software/scm/cogito/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires: git-core >= 0.99.3 +Requires: git-core >= 0.99.7 BuildArch: noarch %description Index: sources =================================================================== RCS file: /cvs/extras/rpms/cogito/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 16 Sep 2005 06:53:08 -0000 1.2 +++ sources 19 Sep 2005 22:10:12 -0000 1.3 @@ -1 +1 @@ -e998a8d8146bd0c2b86fbb4b278cc4fc cogito-0.14.1.tar.gz +66da34e90b53e4904d8c4acca40c7ff0 cogito-0.15.tar.gz From fedora-extras-commits at redhat.com Mon Sep 19 22:15:35 2005 From: fedora-extras-commits at redhat.com (Chris Wright (chrisw)) Date: Mon, 19 Sep 2005 18:15:35 -0400 Subject: rpms/cogito/devel cogito.spec,1.3,1.4 Message-ID: <200509192215.j8JMFZFe003607@cvs-int.fedora.redhat.com> Author: chrisw Update of /cvs/extras/rpms/cogito/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3550 Modified Files: cogito.spec Log Message: Add %{?dist} again Index: cogito.spec =================================================================== RCS file: /cvs/extras/rpms/cogito/devel/cogito.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- cogito.spec 19 Sep 2005 22:10:12 -0000 1.3 +++ cogito.spec 19 Sep 2005 22:15:33 -0000 1.4 @@ -1,6 +1,6 @@ Name: cogito Version: 0.15 -Release: 1 +Release: 1%{?dist} Summary: The Cogito Version Control System License: GPL Group: Development/Tools From fedora-extras-commits at redhat.com Mon Sep 19 22:19:15 2005 From: fedora-extras-commits at redhat.com (Chris Wright (chrisw)) Date: Mon, 19 Sep 2005 18:19:15 -0400 Subject: rpms/cogito/FC-4 .cvsignore, 1.2, 1.3 cogito.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200509192219.j8JMJF0w003703@cvs-int.fedora.redhat.com> Author: chrisw Update of /cvs/extras/rpms/cogito/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3680 Modified Files: .cvsignore cogito.spec sources Log Message: Update to cogito-0.15 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/cogito/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 16 Sep 2005 06:53:08 -0000 1.2 +++ .cvsignore 19 Sep 2005 22:19:13 -0000 1.3 @@ -1 +1 @@ -cogito-0.14.1.tar.gz +cogito-0.15.tar.gz Index: cogito.spec =================================================================== RCS file: /cvs/extras/rpms/cogito/FC-4/cogito.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- cogito.spec 17 Sep 2005 00:01:07 -0000 1.2 +++ cogito.spec 19 Sep 2005 22:19:13 -0000 1.3 @@ -1,13 +1,13 @@ Name: cogito -Version: 0.14.1 -Release: 2%{?dist} +Version: 0.15 +Release: 1%{?dist} Summary: The Cogito Version Control System License: GPL Group: Development/Tools URL: http://kernel.org/pub/software/scm/cogito/ Source: http://kernel.org/pub/software/scm/cogito/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires: git-core >= 0.99.3 +Requires: git-core >= 0.99.7 BuildArch: noarch %description Index: sources =================================================================== RCS file: /cvs/extras/rpms/cogito/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 16 Sep 2005 06:53:08 -0000 1.2 +++ sources 19 Sep 2005 22:19:13 -0000 1.3 @@ -1 +1 @@ -e998a8d8146bd0c2b86fbb4b278cc4fc cogito-0.14.1.tar.gz +66da34e90b53e4904d8c4acca40c7ff0 cogito-0.15.tar.gz From fedora-extras-commits at redhat.com Mon Sep 19 22:20:35 2005 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Mon, 19 Sep 2005 18:20:35 -0400 Subject: rpms/python-matplotlib/FC-4 .cvsignore, 1.4, 1.5 python-matplotlib.spec, 1.9, 1.10 sources, 1.4, 1.5 Message-ID: <200509192220.j8JMKZ4R003792@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/python-matplotlib/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3765 Modified Files: .cvsignore python-matplotlib.spec sources Log Message: New upstream version 0.84 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/python-matplotlib/FC-4/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 1 Aug 2005 21:06:05 -0000 1.4 +++ .cvsignore 19 Sep 2005 22:20:33 -0000 1.5 @@ -1 +1 @@ -matplotlib-0.83.2.tar.gz +matplotlib-0.84.tar.gz Index: python-matplotlib.spec =================================================================== RCS file: /cvs/extras/rpms/python-matplotlib/FC-4/python-matplotlib.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- python-matplotlib.spec 2 Aug 2005 21:46:51 -0000 1.9 +++ python-matplotlib.spec 19 Sep 2005 22:20:33 -0000 1.10 @@ -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-matplotlib -Version: 0.83.2 -Release: 3%{?dist} +Version: 0.84 +Release: 1%{?dist} Summary: Python plotting library Group: Development/Libraries @@ -48,6 +48,9 @@ %{_datadir}/matplotlib/ %changelog +* Mon Sep 19 2005 Orion Poplawski 0.84-1 +- New upstream version 0.84 + * Tue Aug 02 2005 Orion Poplawski 0.83.2-3 - Add Requires: python-numeric, pytz, python-dateutil Index: sources =================================================================== RCS file: /cvs/extras/rpms/python-matplotlib/FC-4/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 1 Aug 2005 21:06:05 -0000 1.4 +++ sources 19 Sep 2005 22:20:33 -0000 1.5 @@ -1 +1 @@ -c5d7c39eeeeafd88a419194fba93a6cb matplotlib-0.83.2.tar.gz +9d7a9831f64a7c376b98333604e38cc1 matplotlib-0.84.tar.gz From fedora-extras-commits at redhat.com Mon Sep 19 22:20:39 2005 From: fedora-extras-commits at redhat.com (Chris Wright (chrisw)) Date: Mon, 19 Sep 2005 18:20:39 -0400 Subject: rpms/cogito/FC-3 .cvsignore, 1.2, 1.3 cogito.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200509192220.j8JMKd5k003817@cvs-int.fedora.redhat.com> Author: chrisw Update of /cvs/extras/rpms/cogito/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3769 Modified Files: .cvsignore cogito.spec sources Log Message: Update to cogito-0.15 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/cogito/FC-3/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 16 Sep 2005 06:53:08 -0000 1.2 +++ .cvsignore 19 Sep 2005 22:20:37 -0000 1.3 @@ -1 +1 @@ -cogito-0.14.1.tar.gz +cogito-0.15.tar.gz Index: cogito.spec =================================================================== RCS file: /cvs/extras/rpms/cogito/FC-3/cogito.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- cogito.spec 17 Sep 2005 00:04:17 -0000 1.2 +++ cogito.spec 19 Sep 2005 22:20:37 -0000 1.3 @@ -1,13 +1,13 @@ Name: cogito -Version: 0.14.1 -Release: 2%{?dist} +Version: 0.15 +Release: 1%{?dist} Summary: The Cogito Version Control System License: GPL Group: Development/Tools URL: http://kernel.org/pub/software/scm/cogito/ Source: http://kernel.org/pub/software/scm/cogito/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires: git-core >= 0.99.3 +Requires: git-core >= 0.99.7 BuildArch: noarch %description Index: sources =================================================================== RCS file: /cvs/extras/rpms/cogito/FC-3/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 16 Sep 2005 06:53:08 -0000 1.2 +++ sources 19 Sep 2005 22:20:37 -0000 1.3 @@ -1 +1 @@ -e998a8d8146bd0c2b86fbb4b278cc4fc cogito-0.14.1.tar.gz +66da34e90b53e4904d8c4acca40c7ff0 cogito-0.15.tar.gz From fedora-extras-commits at redhat.com Mon Sep 19 22:21:27 2005 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Mon, 19 Sep 2005 18:21:27 -0400 Subject: common tobuild,1.2218,1.2219 Message-ID: <200509192221.j8JMLRBT003931@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3910 Modified Files: tobuild Log Message: request build of rpms/python-matplotlib/FC-4 python-matplotlib-0_84-1_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2218 retrieving revision 1.2219 diff -u -r1.2218 -r1.2219 --- tobuild 17 Sep 2005 09:52:33 -0000 1.2218 +++ tobuild 19 Sep 2005 22:21:25 -0000 1.2219 @@ -37,3 +37,4 @@ joost rpms/fpc/FC-3 fpc-2_0_0-1 fc3 gemi rpms/clisp/FC-3 clisp-2_34-5_fc3 fc3 katzj rpms/perl-Class-Trigger/devel perl-Class-Trigger-0_09-3_fc5 devel +orion rpms/python-matplotlib/FC-4 python-matplotlib-0_84-1_fc4 fc4 From fedora-extras-commits at redhat.com Mon Sep 19 22:23:27 2005 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Mon, 19 Sep 2005 18:23:27 -0400 Subject: rpms/python-matplotlib/devel .cvsignore, 1.4, 1.5 python-matplotlib.spec, 1.9, 1.10 sources, 1.4, 1.5 Message-ID: <200509192223.j8JMNRbg004002@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/python-matplotlib/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3979 Modified Files: .cvsignore python-matplotlib.spec sources Log Message: New upstream version 0.84 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/python-matplotlib/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 1 Aug 2005 20:49:18 -0000 1.4 +++ .cvsignore 19 Sep 2005 22:23:25 -0000 1.5 @@ -1 +1 @@ -matplotlib-0.83.2.tar.gz +matplotlib-0.84.tar.gz Index: python-matplotlib.spec =================================================================== RCS file: /cvs/extras/rpms/python-matplotlib/devel/python-matplotlib.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- python-matplotlib.spec 2 Aug 2005 21:47:45 -0000 1.9 +++ python-matplotlib.spec 19 Sep 2005 22:23:25 -0000 1.10 @@ -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-matplotlib -Version: 0.83.2 -Release: 3%{?dist} +Version: 0.84 +Release: 1%{?dist} Summary: Python plotting library Group: Development/Libraries @@ -48,6 +48,9 @@ %{_datadir}/matplotlib/ %changelog +* Mon Sep 19 2005 Orion Poplawski 0.84-1 +- New upstream version 0.84 + * Tue Aug 02 2005 Orion Poplawski 0.83.2-3 - bump release Index: sources =================================================================== RCS file: /cvs/extras/rpms/python-matplotlib/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 1 Aug 2005 20:49:18 -0000 1.4 +++ sources 19 Sep 2005 22:23:25 -0000 1.5 @@ -1 +1 @@ -c5d7c39eeeeafd88a419194fba93a6cb matplotlib-0.83.2.tar.gz +9d7a9831f64a7c376b98333604e38cc1 matplotlib-0.84.tar.gz From fedora-extras-commits at redhat.com Mon Sep 19 22:23:59 2005 From: fedora-extras-commits at redhat.com (Chris Wright (chrisw)) Date: Mon, 19 Sep 2005 18:23:59 -0400 Subject: rpms/git-core/devel .cvsignore, 1.3, 1.4 git-core.spec, 1.2, 1.3 sources, 1.3, 1.4 Message-ID: <200509192223.j8JMNxcX004069@cvs-int.fedora.redhat.com> Author: chrisw Update of /cvs/extras/rpms/git-core/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4042 Modified Files: .cvsignore git-core.spec sources Log Message: Update to git-core 0.99.7 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/git-core/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 16 Sep 2005 18:10:58 -0000 1.3 +++ .cvsignore 19 Sep 2005 22:23:57 -0000 1.4 @@ -1 +1 @@ -git-core-0.99.6.tar.gz +git-core-0.99.7.tar.gz Index: git-core.spec =================================================================== RCS file: /cvs/extras/rpms/git-core/devel/git-core.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- git-core.spec 16 Sep 2005 18:10:58 -0000 1.2 +++ git-core.spec 19 Sep 2005 22:23:57 -0000 1.3 @@ -1,6 +1,6 @@ # Pass --without docs to rpmbuild if you don't want the documetnation Name: git-core -Version: 0.99.6 +Version: 0.99.7 Release: 1%{?dist} Summary: Git core and tools License: GPL @@ -9,7 +9,7 @@ Source: http://kernel.org/pub/software/scm/git/%{name}-%{version}.tar.gz BuildRequires: zlib-devel, openssl-devel, curl-devel %{!?_without_docs:, xmlto, asciidoc > 6.0.3} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires: rsync, rcs, curl +Requires: rsync, rcs, curl, less, openssh-clients, python >= 2.4, tk %description This is a stupid (but extremely fast) directory content manager. It @@ -39,13 +39,20 @@ %{_datadir}/git-core/ %doc README COPYING Documentation/*.txt %{!?_without_docs: %doc Documentation/*.html } -%{!?_without_docs: %{_mandir}/man1/*.1.gz} -%{!?_without_docs: %{_mandir}/man7/*.7.gz} +%{!?_without_docs: %{_mandir}/man1/*.1*} +%{!?_without_docs: %{_mandir}/man7/*.7*} %changelog * Fri Sep 16 2005 Chris Wright 0.99.6-1 - update to 0.99.6 +* Fri Sep 16 2005 Horst H. von Brand +- Linus noticed that less is required, added to the dependencies + +* Sun Sep 11 2005 Horst H. von Brand +- Updated dependencies +- Don't assume manpages are gzipped + * Thu Aug 18 2005 Chris Wright 0.99.4-4 - drop sh_utils, sh-utils, diffutils, mktemp, and openssl Requires - use RPM_OPT_FLAGS in spec file, drop patch0 Index: sources =================================================================== RCS file: /cvs/extras/rpms/git-core/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 16 Sep 2005 18:10:58 -0000 1.3 +++ sources 19 Sep 2005 22:23:57 -0000 1.4 @@ -1 +1 @@ -ca2f17bc1550909a2675386e8be46f0f git-core-0.99.6.tar.gz +0035da109f1e0f9f4fdbd425f2f6723b git-core-0.99.7.tar.gz From fedora-extras-commits at redhat.com Mon Sep 19 22:32:11 2005 From: fedora-extras-commits at redhat.com (Chris Wright (chrisw)) Date: Mon, 19 Sep 2005 18:32:11 -0400 Subject: rpms/git-core/FC-3 .cvsignore, 1.3, 1.4 git-core.spec, 1.2, 1.3 sources, 1.3, 1.4 Message-ID: <200509192232.j8JMWB0t004159@cvs-int.fedora.redhat.com> Author: chrisw Update of /cvs/extras/rpms/git-core/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4131 Modified Files: .cvsignore git-core.spec sources Log Message: Update git-core to 0.99.7 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/git-core/FC-3/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 16 Sep 2005 18:13:23 -0000 1.3 +++ .cvsignore 19 Sep 2005 22:32:09 -0000 1.4 @@ -1 +1 @@ -git-core-0.99.6.tar.gz +git-core-0.99.7.tar.gz Index: git-core.spec =================================================================== RCS file: /cvs/extras/rpms/git-core/FC-3/git-core.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- git-core.spec 16 Sep 2005 18:13:23 -0000 1.2 +++ git-core.spec 19 Sep 2005 22:32:09 -0000 1.3 @@ -1,6 +1,6 @@ # Pass --without docs to rpmbuild if you don't want the documetnation Name: git-core -Version: 0.99.6 +Version: 0.99.7 Release: 1%{?dist} Summary: Git core and tools License: GPL @@ -9,7 +9,7 @@ Source: http://kernel.org/pub/software/scm/git/%{name}-%{version}.tar.gz BuildRequires: zlib-devel, openssl-devel, curl-devel %{!?_without_docs:, xmlto, asciidoc > 6.0.3} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires: rsync, rcs, curl +Requires: rsync, rcs, curl, less, openssh-clients, python >= 2.4, tk %description This is a stupid (but extremely fast) directory content manager. It @@ -39,13 +39,20 @@ %{_datadir}/git-core/ %doc README COPYING Documentation/*.txt %{!?_without_docs: %doc Documentation/*.html } -%{!?_without_docs: %{_mandir}/man1/*.1.gz} -%{!?_without_docs: %{_mandir}/man7/*.7.gz} +%{!?_without_docs: %{_mandir}/man1/*.1*} +%{!?_without_docs: %{_mandir}/man7/*.7*} %changelog * Fri Sep 16 2005 Chris Wright 0.99.6-1 - update to 0.99.6 +* Fri Sep 16 2005 Horst H. von Brand +- Linus noticed that less is required, added to the dependencies + +* Sun Sep 11 2005 Horst H. von Brand +- Updated dependencies +- Don't assume manpages are gzipped + * Thu Aug 18 2005 Chris Wright 0.99.4-4 - drop sh_utils, sh-utils, diffutils, mktemp, and openssl Requires - use RPM_OPT_FLAGS in spec file, drop patch0 Index: sources =================================================================== RCS file: /cvs/extras/rpms/git-core/FC-3/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 16 Sep 2005 18:13:23 -0000 1.3 +++ sources 19 Sep 2005 22:32:09 -0000 1.4 @@ -1 +1 @@ -ca2f17bc1550909a2675386e8be46f0f git-core-0.99.6.tar.gz +0035da109f1e0f9f4fdbd425f2f6723b git-core-0.99.7.tar.gz From fedora-extras-commits at redhat.com Mon Sep 19 22:34:59 2005 From: fedora-extras-commits at redhat.com (Chris Wright (chrisw)) Date: Mon, 19 Sep 2005 18:34:59 -0400 Subject: rpms/git-core/FC-4 .cvsignore, 1.3, 1.4 git-core.spec, 1.2, 1.3 sources, 1.3, 1.4 Message-ID: <200509192234.j8JMYxHH004202@cvs-int.fedora.redhat.com> Author: chrisw Update of /cvs/extras/rpms/git-core/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4179 Modified Files: .cvsignore git-core.spec sources Log Message: Update git-core to 0.99.7 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/git-core/FC-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 16 Sep 2005 18:44:11 -0000 1.3 +++ .cvsignore 19 Sep 2005 22:34:57 -0000 1.4 @@ -1 +1 @@ -git-core-0.99.6.tar.gz +git-core-0.99.7.tar.gz Index: git-core.spec =================================================================== RCS file: /cvs/extras/rpms/git-core/FC-4/git-core.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- git-core.spec 16 Sep 2005 18:44:11 -0000 1.2 +++ git-core.spec 19 Sep 2005 22:34:57 -0000 1.3 @@ -1,6 +1,6 @@ # Pass --without docs to rpmbuild if you don't want the documetnation Name: git-core -Version: 0.99.6 +Version: 0.99.7 Release: 1%{?dist} Summary: Git core and tools License: GPL @@ -9,7 +9,7 @@ Source: http://kernel.org/pub/software/scm/git/%{name}-%{version}.tar.gz BuildRequires: zlib-devel, openssl-devel, curl-devel %{!?_without_docs:, xmlto, asciidoc > 6.0.3} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires: rsync, rcs, curl +Requires: rsync, rcs, curl, less, openssh-clients, python >= 2.4, tk %description This is a stupid (but extremely fast) directory content manager. It @@ -39,13 +39,20 @@ %{_datadir}/git-core/ %doc README COPYING Documentation/*.txt %{!?_without_docs: %doc Documentation/*.html } -%{!?_without_docs: %{_mandir}/man1/*.1.gz} -%{!?_without_docs: %{_mandir}/man7/*.7.gz} +%{!?_without_docs: %{_mandir}/man1/*.1*} +%{!?_without_docs: %{_mandir}/man7/*.7*} %changelog * Fri Sep 16 2005 Chris Wright 0.99.6-1 - update to 0.99.6 +* Fri Sep 16 2005 Horst H. von Brand +- Linus noticed that less is required, added to the dependencies + +* Sun Sep 11 2005 Horst H. von Brand +- Updated dependencies +- Don't assume manpages are gzipped + * Thu Aug 18 2005 Chris Wright 0.99.4-4 - drop sh_utils, sh-utils, diffutils, mktemp, and openssl Requires - use RPM_OPT_FLAGS in spec file, drop patch0 Index: sources =================================================================== RCS file: /cvs/extras/rpms/git-core/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 16 Sep 2005 18:44:11 -0000 1.3 +++ sources 19 Sep 2005 22:34:57 -0000 1.4 @@ -1 +1 @@ -ca2f17bc1550909a2675386e8be46f0f git-core-0.99.6.tar.gz +0035da109f1e0f9f4fdbd425f2f6723b git-core-0.99.7.tar.gz From fedora-extras-commits at redhat.com Mon Sep 19 22:45:19 2005 From: fedora-extras-commits at redhat.com (Karsten Wade (kwade)) Date: Mon, 19 Sep 2005 18:45:19 -0400 Subject: CVSROOT avail,1.12,1.13 Message-ID: <200509192245.j8JMjJV3004411@cvs-int.fedora.redhat.com> Author: kwade Update of /cvs/fedora/CVSROOT In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4392 Modified Files: avail Log Message: Spreading the documentation update work into the community more. Index: avail =================================================================== RCS file: /cvs/fedora/CVSROOT/avail,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- avail 12 Sep 2005 20:16:57 -0000 1.12 +++ avail 19 Sep 2005 22:45:16 -0000 1.13 @@ -48,3 +48,8 @@ avail | mjc,bressers,jorton,notting,sopwith,katzj | fedora-security avail | pfrields | web/html/projects/docs +avail | pfrields | web/html/participate/documentation-faq/ +avail | pfrields | web/html/participate/documentation-guide/ +avail | pfrields,mjohnson | web/html/participate/documentation-quick-start/ + + From fedora-extras-commits at redhat.com Tue Sep 20 07:09:18 2005 From: fedora-extras-commits at redhat.com (Denis Leroy (denis)) Date: Tue, 20 Sep 2005 03:09:18 -0400 Subject: rpms/libsigc++20/devel .cvsignore, 1.3, 1.4 libsigc++.spec, 1.6, 1.7 sources, 1.4, 1.5 Message-ID: <200509200709.j8K79I2v017468@cvs-int.fedora.redhat.com> Author: denis Update of /cvs/extras/rpms/libsigc++20/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17435 Modified Files: .cvsignore libsigc++.spec sources Log Message: Update to version 2.0.16 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libsigc++20/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 28 Apr 2005 21:39:37 -0000 1.3 +++ .cvsignore 20 Sep 2005 07:09:15 -0000 1.4 @@ -1 +1 @@ -libsigc++-2.0.11.tar.bz2 +libsigc++-2.0.16.tar.bz2 Index: libsigc++.spec =================================================================== RCS file: /cvs/extras/rpms/libsigc++20/devel/libsigc++.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- libsigc++.spec 28 Apr 2005 21:39:37 -0000 1.6 +++ libsigc++.spec 20 Sep 2005 07:09:15 -0000 1.7 @@ -1,5 +1,5 @@ Name: libsigc++20 -Version: 2.0.11 +Version: 2.0.16 Release: 1 Summary: Typesafe signal framework for C++ @@ -81,6 +81,9 @@ %{_libdir}/*.a %changelog +* Sun Sep 18 2005 Denis Leroy - 2.0.16-1 +- Upgrade to version 2.0.16 + * Sat Apr 9 2005 Denis Leroy - 2.0.11-1 - Upgrade to version 2.0.11 Index: sources =================================================================== RCS file: /cvs/extras/rpms/libsigc++20/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 28 Apr 2005 21:39:37 -0000 1.4 +++ sources 20 Sep 2005 07:09:15 -0000 1.5 @@ -1 +1 @@ -9e28167ebe664593c9222092e2a51d06 libsigc++-2.0.11.tar.bz2 +bd997b35a420861259a68d5f27a7592e libsigc++-2.0.16.tar.bz2 From fedora-extras-commits at redhat.com Tue Sep 20 07:13:00 2005 From: fedora-extras-commits at redhat.com (Denis Leroy (denis)) Date: Tue, 20 Sep 2005 03:13:00 -0400 Subject: rpms/glibmm24/devel .cvsignore, 1.3, 1.4 glibmm.spec, 1.6, 1.7 sources, 1.4, 1.5 Message-ID: <200509200713.j8K7D0BD017516@cvs-int.fedora.redhat.com> Author: denis Update of /cvs/extras/rpms/glibmm24/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17493 Modified Files: .cvsignore glibmm.spec sources Log Message: Update to 2.8.0, updated glib2 dependency Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/glibmm24/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 28 Apr 2005 22:31:10 -0000 1.3 +++ .cvsignore 20 Sep 2005 07:12:58 -0000 1.4 @@ -1 +1 @@ -glibmm-2.6.1.tar.bz2 +glibmm-2.8.0.tar.bz2 Index: glibmm.spec =================================================================== RCS file: /cvs/extras/rpms/glibmm24/devel/glibmm.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- glibmm.spec 2 Sep 2005 11:15:33 -0000 1.6 +++ glibmm.spec 20 Sep 2005 07:12:58 -0000 1.7 @@ -1,18 +1,18 @@ Name: glibmm24 -Version: 2.6.1 -Release: 2 +Version: 2.8.0 +Release: 1 Summary: C++ interface for GTK2 (a GUI library for X) Group: System Environment/Libraries License: LGPL URL: http://gtkmm.sourceforge.net/ -Source0: http://ftp.gnome.org/pub/GNOME/sources/glibmm/2.6/glibmm-%{version}.tar.bz2 +Source0: http://ftp.gnome.org/pub/GNOME/sources/glibmm/2.8/glibmm-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires(post): /sbin/ldconfig Requires(postun): /sbin/ldconfig BuildRequires: libsigc++20-devel >= 2.0.0 -BuildRequires: glib2-devel >= 2.6.0 +BuildRequires: glib2-devel >= 2.8.0 %description gtkmm provides a C++ interface to the GTK+ GUI library. gtkmm2 wraps GTK+ 2. @@ -77,6 +77,10 @@ %{_datadir}/aclocal/*.m4 %changelog +* Mon Sep 19 2005 Denis Leroy - 2.8.0-1 +- Upgrade to 2.8.0 +- Updated glib2 version dependency + * Fri Sep 2 2005 Michael Schwendt - 2.6.1-2 - rebuild for gcc-c++-4.0.1-12 result for GLIBMM_CXX_ALLOWS_STATIC_INLINE_NPOS check changed Index: sources =================================================================== RCS file: /cvs/extras/rpms/glibmm24/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 28 Apr 2005 22:31:10 -0000 1.4 +++ sources 20 Sep 2005 07:12:58 -0000 1.5 @@ -1 +1 @@ -e37da352bf581503c5866f0231fd4a74 glibmm-2.6.1.tar.bz2 +e1823b926e01db09aacf3da69234e3c5 glibmm-2.8.0.tar.bz2 From fedora-extras-commits at redhat.com Tue Sep 20 07:17:16 2005 From: fedora-extras-commits at redhat.com (Denis Leroy (denis)) Date: Tue, 20 Sep 2005 03:17:16 -0400 Subject: rpms/gtkmm24/devel .cvsignore, 1.3, 1.4 gtkmm.spec, 1.8, 1.9 sources, 1.5, 1.6 Message-ID: <200509200717.j8K7HG2Q017578@cvs-int.fedora.redhat.com> Author: denis Update of /cvs/extras/rpms/gtkmm24/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17555 Modified Files: .cvsignore gtkmm.spec sources Log Message: Update to 2.8.0, updated gtk dependencies Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gtkmm24/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 28 Apr 2005 22:36:05 -0000 1.3 +++ .cvsignore 20 Sep 2005 07:17:14 -0000 1.4 @@ -1 +1 @@ -gtkmm-2.6.2.tar.bz2 +gtkmm-2.8.0.tar.bz2 Index: gtkmm.spec =================================================================== RCS file: /cvs/extras/rpms/gtkmm24/devel/gtkmm.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- gtkmm.spec 29 Apr 2005 11:16:25 -0000 1.8 +++ gtkmm.spec 20 Sep 2005 07:17:14 -0000 1.9 @@ -1,22 +1,22 @@ Name: gtkmm24 -Version: 2.6.2 -Release: 2 +Version: 2.8.0 +Release: 1 Summary: C++ interface for GTK2 (a GUI library for X) Group: System Environment/Libraries License: LGPL URL: http://gtkmm.sourceforge.net/ -Source0: http://ftp.gnome.org/pub/GNOME/sources/gtkmm/2.6/gtkmm-%{version}.tar.bz2 +Source0: http://ftp.gnome.org/pub/GNOME/sources/gtkmm/2.8/gtkmm-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires(post): /sbin/ldconfig Requires(postun): /sbin/ldconfig -BuildRequires: glibmm24-devel >= 2.6.0 +BuildRequires: glibmm24-devel >= 2.8.0 BuildRequires: atk-devel >= 1.9.0 -BuildRequires: pango-devel >= 1.5.2 -BuildRequires: gtk2-devel >= 2.6.0 -BuildRequires: glib2-devel >= 2.4.0 +BuildRequires: pango-devel >= 1.10.0 +BuildRequires: gtk2-devel >= 2.8.0 +BuildRequires: glib2-devel >= 2.8.0 %description gtkmm provides a C++ interface to the GTK+ GUI library. gtkmm2 wraps GTK+ 2. @@ -100,6 +100,10 @@ %changelog +* Mon Sep 19 2005 Denis Leroy - 2.8.0-1 +- Update to gtkmm 2.8.0 +- Incorporated dependency updates from Rick Vinyard + * Fri Apr 29 2005 Denis Leroy - 2.6.2-2 - Disabled building of demo and examples Index: sources =================================================================== RCS file: /cvs/extras/rpms/gtkmm24/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 28 Apr 2005 22:36:05 -0000 1.5 +++ sources 20 Sep 2005 07:17:14 -0000 1.6 @@ -1 +1 @@ -c1ffa447172b16d1ee787b1c69379c30 gtkmm-2.6.2.tar.bz2 +337027bb21635967fd232fcc6bcb9359 gtkmm-2.8.0.tar.bz2 From fedora-extras-commits at redhat.com Tue Sep 20 07:20:19 2005 From: fedora-extras-commits at redhat.com (Denis Leroy (denis)) Date: Tue, 20 Sep 2005 03:20:19 -0400 Subject: rpms/gconfmm26/devel .cvsignore, 1.4, 1.5 gconfmm.spec, 1.7, 1.8 sources, 1.4, 1.5 Message-ID: <200509200720.j8K7KJXl017655@cvs-int.fedora.redhat.com> Author: denis Update of /cvs/extras/rpms/gconfmm26/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17632 Modified Files: .cvsignore gconfmm.spec sources Log Message: Update to 2.12.0, patches no longer necessary Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gconfmm26/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 7 May 2005 22:00:53 -0000 1.4 +++ .cvsignore 20 Sep 2005 07:20:16 -0000 1.5 @@ -1,3 +1 @@ -gconfmm-2.10.0-gcc4.patch -gconfmm-2.10.0.tar.bz2 -gconfmm-2.10.0-x86_64.patch +gconfmm-2.12.0.tar.bz2 Index: gconfmm.spec =================================================================== RCS file: /cvs/extras/rpms/gconfmm26/devel/gconfmm.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- gconfmm.spec 7 May 2005 22:00:53 -0000 1.7 +++ gconfmm.spec 20 Sep 2005 07:20:16 -0000 1.8 @@ -1,15 +1,13 @@ Name: gconfmm26 -Version: 2.10.0 -Release: 2 +Version: 2.12.0 +Release: 1 Summary: C++ wrapper for GConf2 Group: System Environment/Libraries License: LGPL URL: http://gtkmm.sourceforge.net/ -Source0: http://ftp.gnome.org/pub/GNOME/sources/gconfmm/2.10/gconfmm-%{version}.tar.bz2 -Patch0: gconfmm-2.10.0-gcc4.patch -Patch1: gconfmm-2.10.0-x86_64.patch +Source0: http://ftp.gnome.org/pub/GNOME/sources/gconfmm/2.12/gconfmm-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires(post): /sbin/ldconfig @@ -40,8 +38,6 @@ %prep %setup -q -n gconfmm-%{version} -%patch0 -p1 -%patch1 -p1 %build %configure --enable-static --enable-shared @@ -80,6 +76,9 @@ %{_libdir}/pkgconfig/*.pc %changelog +* Mon Sep 19 2005 Denis Leroy - 2.12.0-1 +- Update to 2.12.0 + * Sat May 7 2005 Denis Leroy - 2.10.0-2 - Added patch to fix x86_64 compile Index: sources =================================================================== RCS file: /cvs/extras/rpms/gconfmm26/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 7 May 2005 22:00:53 -0000 1.4 +++ sources 20 Sep 2005 07:20:16 -0000 1.5 @@ -1,3 +1 @@ -9b9a1ff7456698bf73c7cfe1b5792415 gconfmm-2.10.0-gcc4.patch -0f3787ff3f7089698da49b694b5f9155 gconfmm-2.10.0.tar.bz2 -2f29fc7e491118bbf0b98812944d3120 gconfmm-2.10.0-x86_64.patch +dfd62a95e7675943933b793183649402 gconfmm-2.12.0.tar.bz2 From fedora-extras-commits at redhat.com Tue Sep 20 07:23:00 2005 From: fedora-extras-commits at redhat.com (Denis Leroy (denis)) Date: Tue, 20 Sep 2005 03:23:00 -0400 Subject: rpms/libglademm24/devel .cvsignore, 1.3, 1.4 libglademm.spec, 1.6, 1.7 sources, 1.3, 1.4 Message-ID: <200509200723.j8K7N07u017708@cvs-int.fedora.redhat.com> Author: denis Update of /cvs/extras/rpms/libglademm24/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17685 Modified Files: .cvsignore libglademm.spec sources Log Message: Update to 2.6.1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libglademm24/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 28 Apr 2005 22:42:43 -0000 1.3 +++ .cvsignore 20 Sep 2005 07:22:58 -0000 1.4 @@ -1 +1 @@ -libglademm-2.6.0.tar.bz2 +libglademm-2.6.1.tar.bz2 Index: libglademm.spec =================================================================== RCS file: /cvs/extras/rpms/libglademm24/devel/libglademm.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- libglademm.spec 28 Apr 2005 22:42:43 -0000 1.6 +++ libglademm.spec 20 Sep 2005 07:22:58 -0000 1.7 @@ -1,5 +1,5 @@ Name: libglademm24 -Version: 2.6.0 +Version: 2.6.1 Release: 1 Summary: C++ wrapper for libglade @@ -79,6 +79,9 @@ %{_libdir}/pkgconfig/*.pc %changelog +* Mon Sep 19 2005 Denis Leroy - 2.6.1-1 +- Update to 2.6.1 + * Thu Apr 28 2005 Denis Leroy - 2.6.0-1 - Upgrade to 2.6.0 Index: sources =================================================================== RCS file: /cvs/extras/rpms/libglademm24/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 28 Apr 2005 22:42:43 -0000 1.3 +++ sources 20 Sep 2005 07:22:58 -0000 1.4 @@ -1 +1 @@ -be10dcaca106d4381dc339a39e2fe776 libglademm-2.6.0.tar.bz2 +0e9dd1e7b0e3170b56c50e5c4630fe95 libglademm-2.6.1.tar.bz2 From fedora-extras-commits at redhat.com Tue Sep 20 07:24:22 2005 From: fedora-extras-commits at redhat.com (Denis Leroy (denis)) Date: Tue, 20 Sep 2005 03:24:22 -0400 Subject: rpms/gnome-vfsmm26/devel .cvsignore, 1.3, 1.4 gnome-vfsmm.spec, 1.6, 1.7 sources, 1.4, 1.5 Message-ID: <200509200724.j8K7OM3R017761@cvs-int.fedora.redhat.com> Author: denis Update of /cvs/extras/rpms/gnome-vfsmm26/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17738 Modified Files: .cvsignore gnome-vfsmm.spec sources Log Message: Update to 2.12.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gnome-vfsmm26/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 28 Apr 2005 22:40:45 -0000 1.3 +++ .cvsignore 20 Sep 2005 07:24:20 -0000 1.4 @@ -1 +1 @@ -gnome-vfsmm-2.10.0.tar.bz2 +gnome-vfsmm-2.12.0.tar.bz2 Index: gnome-vfsmm.spec =================================================================== RCS file: /cvs/extras/rpms/gnome-vfsmm26/devel/gnome-vfsmm.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- gnome-vfsmm.spec 28 Apr 2005 22:40:45 -0000 1.6 +++ gnome-vfsmm.spec 20 Sep 2005 07:24:20 -0000 1.7 @@ -1,5 +1,5 @@ Name: gnome-vfsmm26 -Version: 2.10.0 +Version: 2.12.0 Release: 1 Summary: C++ wrapper for gnome-vfs @@ -7,7 +7,7 @@ Group: System Environment/Libraries License: LGPL URL: http://gtkmm.sourceforge.net/ -Source0: http://ftp.gnome.org/pub/GNOME/sources/gnome-vfsmm/2.10/gnome-vfsmm-%{version}.tar.bz2 +Source0: http://ftp.gnome.org/pub/GNOME/sources/gnome-vfsmm/2.12/gnome-vfsmm-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires(post): /sbin/ldconfig @@ -72,6 +72,9 @@ %changelog +* Mon Sep 19 2005 Denis Leroy - 2.12.0-1 +- Update to 2.12.0 + * Thu Apr 28 2005 Denis Leroy - 2.10.0-1 - Upgrade to 2.10.0. x86_64 patch should no longer be necessary Index: sources =================================================================== RCS file: /cvs/extras/rpms/gnome-vfsmm26/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 28 Apr 2005 22:40:45 -0000 1.4 +++ sources 20 Sep 2005 07:24:20 -0000 1.5 @@ -1 +1 @@ -0d5751f1c0074289c3e6a858357f9c4d gnome-vfsmm-2.10.0.tar.bz2 +4a73741ab5232bf85cb631108c5b6430 gnome-vfsmm-2.12.0.tar.bz2 From fedora-extras-commits at redhat.com Tue Sep 20 07:25:30 2005 From: fedora-extras-commits at redhat.com (Aaron Kurtz (dragoon)) Date: Tue, 20 Sep 2005 03:25:30 -0400 Subject: rpms/gnome-applet-netspeed/devel .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 gnome-applet-netspeed.spec, 1.3, 1.4 Message-ID: <200509200726.j8K7Q0vc017821@cvs-int.fedora.redhat.com> Author: dragoon Update of /cvs/extras/rpms/gnome-applet-netspeed/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17774/devel Modified Files: .cvsignore sources gnome-applet-netspeed.spec Log Message: * Tue Sep 20 2005 Aaron Kurtz - 0.13-1 - Bump to 0.13 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gnome-applet-netspeed/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 23 Apr 2005 03:55:52 -0000 1.2 +++ .cvsignore 20 Sep 2005 07:25:28 -0000 1.3 @@ -1 +1 @@ -netspeed_applet-0.12.1.tar.gz +netspeed_applet-0.13.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/gnome-applet-netspeed/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 23 Apr 2005 03:55:52 -0000 1.2 +++ sources 20 Sep 2005 07:25:28 -0000 1.3 @@ -1 +1 @@ -7a651eab80c1a10654595fcfd4832463 netspeed_applet-0.12.1.tar.gz +b5c5332993ed779c3653433c6f3b6a9a netspeed_applet-0.13.tar.gz Index: gnome-applet-netspeed.spec =================================================================== RCS file: /cvs/extras/rpms/gnome-applet-netspeed/devel/gnome-applet-netspeed.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- gnome-applet-netspeed.spec 16 Jun 2005 09:40:02 -0000 1.3 +++ gnome-applet-netspeed.spec 20 Sep 2005 07:25:28 -0000 1.4 @@ -1,6 +1,6 @@ Name: gnome-applet-netspeed -Version: 0.12.1 -Release: 3%{?dist} +Version: 0.13 +Release: 1%{?dist} Summary: GNOME applet that shows traffic on a network device Group: Applications/Internet @@ -53,6 +53,9 @@ %{_datadir}/omf/netspeed_applet/ %changelog +* Tue Sep 20 2005 Aaron Kurtz - 0.13-1 +- Bump to 0.13 + * Thu Jun 16 2005 Aaron Kurtz - 0.12.1-3 - Removing spec-defined dist From fedora-extras-commits at redhat.com Tue Sep 20 07:25:31 2005 From: fedora-extras-commits at redhat.com (Aaron Kurtz (dragoon)) Date: Tue, 20 Sep 2005 03:25:31 -0400 Subject: rpms/gnome-applet-netspeed/FC-4 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 gnome-applet-netspeed.spec, 1.3, 1.4 Message-ID: <200509200726.j8K7Q1Y3017826@cvs-int.fedora.redhat.com> Author: dragoon Update of /cvs/extras/rpms/gnome-applet-netspeed/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17774/FC-4 Modified Files: .cvsignore sources gnome-applet-netspeed.spec Log Message: * Tue Sep 20 2005 Aaron Kurtz - 0.13-1 - Bump to 0.13 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gnome-applet-netspeed/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 23 Apr 2005 03:55:52 -0000 1.2 +++ .cvsignore 20 Sep 2005 07:25:29 -0000 1.3 @@ -1 +1 @@ -netspeed_applet-0.12.1.tar.gz +netspeed_applet-0.13.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/gnome-applet-netspeed/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 23 Apr 2005 03:55:52 -0000 1.2 +++ sources 20 Sep 2005 07:25:29 -0000 1.3 @@ -1 +1 @@ -7a651eab80c1a10654595fcfd4832463 netspeed_applet-0.12.1.tar.gz +b5c5332993ed779c3653433c6f3b6a9a netspeed_applet-0.13.tar.gz Index: gnome-applet-netspeed.spec =================================================================== RCS file: /cvs/extras/rpms/gnome-applet-netspeed/FC-4/gnome-applet-netspeed.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- gnome-applet-netspeed.spec 16 Jun 2005 09:40:01 -0000 1.3 +++ gnome-applet-netspeed.spec 20 Sep 2005 07:25:29 -0000 1.4 @@ -1,6 +1,6 @@ Name: gnome-applet-netspeed -Version: 0.12.1 -Release: 3%{?dist} +Version: 0.13 +Release: 1%{?dist} Summary: GNOME applet that shows traffic on a network device Group: Applications/Internet @@ -53,6 +53,9 @@ %{_datadir}/omf/netspeed_applet/ %changelog +* Tue Sep 20 2005 Aaron Kurtz - 0.13-1 +- Bump to 0.13 + * Thu Jun 16 2005 Aaron Kurtz - 0.12.1-3 - Removing spec-defined dist From fedora-extras-commits at redhat.com Tue Sep 20 07:26:37 2005 From: fedora-extras-commits at redhat.com (Aaron Kurtz (dragoon)) Date: Tue, 20 Sep 2005 03:26:37 -0400 Subject: rpms/gnome-applet-sensors/FC-4 sources, 1.3, 1.4 .cvsignore, 1.3, 1.4 gnome-applet-sensors.spec, 1.2, 1.3 Message-ID: <200509200726.j8K7QbVK017893@cvs-int.fedora.redhat.com> Author: dragoon Update of /cvs/extras/rpms/gnome-applet-sensors/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17832/FC-4 Modified Files: sources .cvsignore gnome-applet-sensors.spec Log Message: * Tue Sep 20 2005 Aaron Kurtz - 1.4-1 - bump to stable release 1.4 Index: sources =================================================================== RCS file: /cvs/extras/rpms/gnome-applet-sensors/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 2 Jul 2005 22:41:06 -0000 1.3 +++ sources 20 Sep 2005 07:26:35 -0000 1.4 @@ -1 +1 @@ -d624349d668c7d25f94a042f3da75983 sensors-applet-1.0.tar.gz +e71ea9fe79cbc281293fa90857a92b04 sensors-applet-1.4.tar.gz Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gnome-applet-sensors/FC-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 2 Jul 2005 22:41:06 -0000 1.3 +++ .cvsignore 20 Sep 2005 07:26:35 -0000 1.4 @@ -1 +1 @@ -sensors-applet-1.0.tar.gz +sensors-applet-1.4.tar.gz Index: gnome-applet-sensors.spec =================================================================== RCS file: /cvs/extras/rpms/gnome-applet-sensors/FC-4/gnome-applet-sensors.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- gnome-applet-sensors.spec 2 Jul 2005 22:41:06 -0000 1.2 +++ gnome-applet-sensors.spec 20 Sep 2005 07:26:35 -0000 1.3 @@ -1,5 +1,5 @@ Name: gnome-applet-sensors -Version: 1.0 +Version: 1.4 Release: 1%{?dist} Summary: Gnome panel applet for hardware sensors @@ -59,6 +59,9 @@ %changelog +* Tue Sep 20 2005 Aaron Kurtz - 1.4-1 +- bump to stable release 1.4 + * Sat Jul 02 2005 Aaron Kurtz - 1.0-1 - bump to stable release 1.0 From fedora-extras-commits at redhat.com Tue Sep 20 07:26:31 2005 From: fedora-extras-commits at redhat.com (Aaron Kurtz (dragoon)) Date: Tue, 20 Sep 2005 03:26:31 -0400 Subject: rpms/gnome-applet-sensors/FC-3 sources, 1.3, 1.4 .cvsignore, 1.3, 1.4 gnome-applet-sensors.spec, 1.2, 1.3 Message-ID: <200509200727.j8K7R2NO017944@cvs-int.fedora.redhat.com> Author: dragoon Update of /cvs/extras/rpms/gnome-applet-sensors/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17832/FC-3 Modified Files: sources .cvsignore gnome-applet-sensors.spec Log Message: * Tue Sep 20 2005 Aaron Kurtz - 1.4-1 - bump to stable release 1.4 Index: sources =================================================================== RCS file: /cvs/extras/rpms/gnome-applet-sensors/FC-3/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 2 Jul 2005 22:40:43 -0000 1.3 +++ sources 20 Sep 2005 07:26:29 -0000 1.4 @@ -1 +1 @@ -d624349d668c7d25f94a042f3da75983 sensors-applet-1.0.tar.gz +e71ea9fe79cbc281293fa90857a92b04 sensors-applet-1.4.tar.gz Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gnome-applet-sensors/FC-3/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 2 Jul 2005 22:40:43 -0000 1.3 +++ .cvsignore 20 Sep 2005 07:26:29 -0000 1.4 @@ -1 +1 @@ -sensors-applet-1.0.tar.gz +sensors-applet-1.4.tar.gz Index: gnome-applet-sensors.spec =================================================================== RCS file: /cvs/extras/rpms/gnome-applet-sensors/FC-3/gnome-applet-sensors.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- gnome-applet-sensors.spec 2 Jul 2005 22:40:43 -0000 1.2 +++ gnome-applet-sensors.spec 20 Sep 2005 07:26:29 -0000 1.3 @@ -1,5 +1,5 @@ Name: gnome-applet-sensors -Version: 1.0 +Version: 1.4 Release: 1%{?dist} Summary: Gnome panel applet for hardware sensors @@ -59,6 +59,9 @@ %changelog +* Tue Sep 20 2005 Aaron Kurtz - 1.4-1 +- bump to stable release 1.4 + * Sat Jul 02 2005 Aaron Kurtz - 1.0-1 - bump to stable release 1.0 From fedora-extras-commits at redhat.com Tue Sep 20 07:26:31 2005 From: fedora-extras-commits at redhat.com (Aaron Kurtz (dragoon)) Date: Tue, 20 Sep 2005 03:26:31 -0400 Subject: rpms/gnome-applet-sensors/devel sources, 1.3, 1.4 .cvsignore, 1.3, 1.4 gnome-applet-sensors.spec, 1.3, 1.4 Message-ID: <200509200727.j8K7R255017947@cvs-int.fedora.redhat.com> Author: dragoon Update of /cvs/extras/rpms/gnome-applet-sensors/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17832/devel Modified Files: sources .cvsignore gnome-applet-sensors.spec Log Message: * Tue Sep 20 2005 Aaron Kurtz - 1.4-1 - bump to stable release 1.4 Index: sources =================================================================== RCS file: /cvs/extras/rpms/gnome-applet-sensors/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 2 Jul 2005 22:37:00 -0000 1.3 +++ sources 20 Sep 2005 07:26:29 -0000 1.4 @@ -1 +1 @@ -d624349d668c7d25f94a042f3da75983 sensors-applet-1.0.tar.gz +e71ea9fe79cbc281293fa90857a92b04 sensors-applet-1.4.tar.gz Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gnome-applet-sensors/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 2 Jul 2005 22:37:00 -0000 1.3 +++ .cvsignore 20 Sep 2005 07:26:29 -0000 1.4 @@ -1 +1 @@ -sensors-applet-1.0.tar.gz +sensors-applet-1.4.tar.gz Index: gnome-applet-sensors.spec =================================================================== RCS file: /cvs/extras/rpms/gnome-applet-sensors/devel/gnome-applet-sensors.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- gnome-applet-sensors.spec 5 Jul 2005 23:04:27 -0000 1.3 +++ gnome-applet-sensors.spec 20 Sep 2005 07:26:29 -0000 1.4 @@ -1,6 +1,6 @@ Name: gnome-applet-sensors -Version: 1.0 -Release: 2%{?dist} +Version: 1.4 +Release: 1%{?dist} Summary: Gnome panel applet for hardware sensors Group: User Interface/Desktops @@ -12,8 +12,7 @@ BuildRequires: gettext BuildRequires: gnome-panel-devel >= 2.8 -#Cairo needs this, so why didn't gnome-panel-devel grab it -BuildRequires: libpng-devel + %description GNOME Sensors Applet is an applet for the GNOME Panel to display readings @@ -60,8 +59,8 @@ %changelog -* Tue Jul 05 2005 Aaron Kurtz - 1.0-2 -- rawhide Cairo dependencies +* Tue Sep 20 2005 Aaron Kurtz - 1.4-1 +- bump to stable release 1.4 * Sat Jul 02 2005 Aaron Kurtz - 1.0-1 - bump to stable release 1.0 From fedora-extras-commits at redhat.com Tue Sep 20 07:27:19 2005 From: fedora-extras-commits at redhat.com (Denis Leroy (denis)) Date: Tue, 20 Sep 2005 03:27:19 -0400 Subject: rpms/libgnomecanvasmm26/devel .cvsignore, 1.3, 1.4 libgnomecanvasmm.spec, 1.6, 1.7 sources, 1.3, 1.4 Message-ID: <200509200727.j8K7RJCB017983@cvs-int.fedora.redhat.com> Author: denis Update of /cvs/extras/rpms/libgnomecanvasmm26/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17960 Modified Files: .cvsignore libgnomecanvasmm.spec sources Log Message: Update to 2.12.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libgnomecanvasmm26/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 28 Apr 2005 22:50:55 -0000 1.3 +++ .cvsignore 20 Sep 2005 07:27:17 -0000 1.4 @@ -1 +1 @@ -libgnomecanvasmm-2.10.0.tar.bz2 +libgnomecanvasmm-2.12.0.tar.bz2 Index: libgnomecanvasmm.spec =================================================================== RCS file: /cvs/extras/rpms/libgnomecanvasmm26/devel/libgnomecanvasmm.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- libgnomecanvasmm.spec 28 Apr 2005 22:50:55 -0000 1.6 +++ libgnomecanvasmm.spec 20 Sep 2005 07:27:17 -0000 1.7 @@ -1,5 +1,5 @@ Name: libgnomecanvasmm26 -Version: 2.10.0 +Version: 2.12.0 Release: 1 Summary: C++ interface for Gnome libs (a GUI library for X) @@ -7,7 +7,7 @@ Group: System Environment/Libraries License: LGPL URL: http://gtkmm.sourceforge.net/ -Source0: http://ftp.gnome.org/pub/GNOME/sources/libgnomecanvasmm/2.10/libgnomecanvasmm-%{version}.tar.bz2 +Source0: http://ftp.gnome.org/pub/GNOME/sources/libgnomecanvasmm/2.12/libgnomecanvasmm-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires(post): /sbin/ldconfig @@ -75,6 +75,9 @@ %{_libdir}/pkgconfig/*.pc %changelog +* Mon Sep 19 2005 Denis Leroy - 2.12.0-1 +- Update to 2.12.0 + * Thu Apr 28 2005 Denis Leroy - 2.10.0-1 - Upgrade to 2.10.0 Index: sources =================================================================== RCS file: /cvs/extras/rpms/libgnomecanvasmm26/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 28 Apr 2005 22:50:55 -0000 1.3 +++ sources 20 Sep 2005 07:27:17 -0000 1.4 @@ -1 +1 @@ -09010717524f990915a6923d685ca5c1 libgnomecanvasmm-2.10.0.tar.bz2 +b05bba03433745043ef0c781020d4738 libgnomecanvasmm-2.12.0.tar.bz2 From fedora-extras-commits at redhat.com Tue Sep 20 07:28:49 2005 From: fedora-extras-commits at redhat.com (Denis Leroy (denis)) Date: Tue, 20 Sep 2005 03:28:49 -0400 Subject: rpms/libgnomemm26/devel .cvsignore, 1.3, 1.4 libgnomemm.spec, 1.7, 1.8 sources, 1.4, 1.5 Message-ID: <200509200728.j8K7SnaO018114@cvs-int.fedora.redhat.com> Author: denis Update of /cvs/extras/rpms/libgnomemm26/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18091 Modified Files: .cvsignore libgnomemm.spec sources Log Message: Update to 2.12.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libgnomemm26/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 28 Apr 2005 22:56:41 -0000 1.3 +++ .cvsignore 20 Sep 2005 07:28:47 -0000 1.4 @@ -1 +1 @@ -libgnomemm-2.10.0.tar.bz2 +libgnomemm-2.12.0.tar.bz2 Index: libgnomemm.spec =================================================================== RCS file: /cvs/extras/rpms/libgnomemm26/devel/libgnomemm.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- libgnomemm.spec 28 Apr 2005 22:56:41 -0000 1.7 +++ libgnomemm.spec 20 Sep 2005 07:28:47 -0000 1.8 @@ -1,5 +1,5 @@ Name: libgnomemm26 -Version: 2.10.0 +Version: 2.12.0 Release: 1 Summary: C++ interface for Gnome libs (a GUI library for X) @@ -7,7 +7,7 @@ Group: System Environment/Libraries License: LGPL URL: http://gtkmm.sourceforge.net/ -Source0: http://ftp.gnome.org/pub/GNOME/sources/libgnomemm/2.10/libgnomemm-%{version}.tar.bz2 +Source0: http://ftp.gnome.org/pub/GNOME/sources/libgnomemm/2.12/libgnomemm-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires(post): /sbin/ldconfig @@ -76,6 +76,9 @@ %{_libdir}/pkgconfig/*.pc %changelog +* Mon Sep 19 2005 Denis Leroy - 2.12.0-1 +- Update to 2.12.0 + * Thu Apr 28 2005 Denis Leroy - 2.10.0-1 - Upgrade to 2.10.0; x86_64 patch should no longer be necessary Index: sources =================================================================== RCS file: /cvs/extras/rpms/libgnomemm26/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 28 Apr 2005 22:56:41 -0000 1.4 +++ sources 20 Sep 2005 07:28:47 -0000 1.5 @@ -1 +1 @@ -095cbf2a023a82a009dc19ffc1a9d9c8 libgnomemm-2.10.0.tar.bz2 +2a618db87d023525391372a6268290b9 libgnomemm-2.12.0.tar.bz2 From fedora-extras-commits at redhat.com Tue Sep 20 07:31:08 2005 From: fedora-extras-commits at redhat.com (Denis Leroy (denis)) Date: Tue, 20 Sep 2005 03:31:08 -0400 Subject: rpms/libgnomeuimm26/devel .cvsignore, 1.3, 1.4 libgnomeuimm.spec, 1.7, 1.8 sources, 1.4, 1.5 Message-ID: <200509200731.j8K7V8QP018162@cvs-int.fedora.redhat.com> Author: denis Update of /cvs/extras/rpms/libgnomeuimm26/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18139 Modified Files: .cvsignore libgnomeuimm.spec sources Log Message: Update to 2.12.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libgnomeuimm26/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 28 Apr 2005 23:00:04 -0000 1.3 +++ .cvsignore 20 Sep 2005 07:31:06 -0000 1.4 @@ -1 +1 @@ -libgnomeuimm-2.10.0.tar.bz2 +libgnomeuimm-2.12.0.tar.bz2 Index: libgnomeuimm.spec =================================================================== RCS file: /cvs/extras/rpms/libgnomeuimm26/devel/libgnomeuimm.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- libgnomeuimm.spec 28 Apr 2005 23:00:04 -0000 1.7 +++ libgnomeuimm.spec 20 Sep 2005 07:31:06 -0000 1.8 @@ -1,5 +1,5 @@ Name: libgnomeuimm26 -Version: 2.10.0 +Version: 2.12.0 Release: 1 Summary: C++ interface for Gnome libs (a GUI library for X) @@ -7,7 +7,7 @@ Group: System Environment/Libraries License: LGPL URL: http://gtkmm.sourceforge.net/ -Source0: http://ftp.gnome.org/pub/GNOME/sources/libgnomeuimm/2.10/libgnomeuimm-%{version}.tar.bz2 +Source0: http://ftp.gnome.org/pub/GNOME/sources/libgnomeuimm/2.12/libgnomeuimm-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires(post): /sbin/ldconfig @@ -83,6 +83,9 @@ %{_libdir}/pkgconfig/*.pc %changelog +* Mon Sep 19 2005 Denis Leroy - 2.10.0-1 +- Update to 2.12.0 + * Wed Apr 20 2005 Denis Leroy - 2.10.0-1 - Upgrade to 2.10.0. Removed x86_64 patch. Index: sources =================================================================== RCS file: /cvs/extras/rpms/libgnomeuimm26/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 28 Apr 2005 23:00:04 -0000 1.4 +++ sources 20 Sep 2005 07:31:06 -0000 1.5 @@ -1 +1 @@ -3ec51ceca78fcccff3df940689f8538b libgnomeuimm-2.10.0.tar.bz2 +50ee34ec10c4527f1dc49bb12d0e0954 libgnomeuimm-2.12.0.tar.bz2 From fedora-extras-commits at redhat.com Tue Sep 20 07:48:08 2005 From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard)) Date: Tue, 20 Sep 2005 03:48:08 -0400 Subject: rpms/colorscheme - New directory Message-ID: <200509200748.j8K7m87I018390@cvs-int.fedora.redhat.com> Author: abompard Update of /cvs/extras/rpms/colorscheme In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18366/colorscheme Log Message: Directory /cvs/extras/rpms/colorscheme added to the repository From fedora-extras-commits at redhat.com Tue Sep 20 07:48:08 2005 From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard)) Date: Tue, 20 Sep 2005 03:48:08 -0400 Subject: rpms/colorscheme/devel - New directory Message-ID: <200509200748.j8K7m8Q6018395@cvs-int.fedora.redhat.com> Author: abompard Update of /cvs/extras/rpms/colorscheme/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18366/colorscheme/devel Log Message: Directory /cvs/extras/rpms/colorscheme/devel added to the repository From fedora-extras-commits at redhat.com Tue Sep 20 07:48:32 2005 From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard)) Date: Tue, 20 Sep 2005 03:48:32 -0400 Subject: rpms/colorscheme Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200509200748.j8K7mW8n018440@cvs-int.fedora.redhat.com> Author: abompard Update of /cvs/extras/rpms/colorscheme In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18411 Added Files: Makefile import.log Log Message: Setup of module colorscheme --- NEW FILE Makefile --- # Top level Makefile for module colorscheme all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Tue Sep 20 07:48:33 2005 From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard)) Date: Tue, 20 Sep 2005 03:48:33 -0400 Subject: rpms/colorscheme/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200509200748.j8K7mXNt018445@cvs-int.fedora.redhat.com> Author: abompard Update of /cvs/extras/rpms/colorscheme/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18411/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module colorscheme --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Tue Sep 20 07:49:29 2005 From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard)) Date: Tue, 20 Sep 2005 03:49:29 -0400 Subject: rpms/colorscheme import.log,1.1,1.2 Message-ID: <200509200749.j8K7nTBV018514@cvs-int.fedora.redhat.com> Author: abompard Update of /cvs/extras/rpms/colorscheme In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18479 Modified Files: import.log Log Message: auto-import colorscheme-0.2.1-1 on branch devel from colorscheme-0.2.1-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/colorscheme/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 20 Sep 2005 07:48:30 -0000 1.1 +++ import.log 20 Sep 2005 07:49:27 -0000 1.2 @@ -0,0 +1 @@ +colorscheme-0_2_1-1:HEAD:colorscheme-0.2.1-1.src.rpm:1127202546 From fedora-extras-commits at redhat.com Tue Sep 20 07:49:30 2005 From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard)) Date: Tue, 20 Sep 2005 03:49:30 -0400 Subject: rpms/colorscheme/devel colorscheme.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200509200749.j8K7nUbQ018521@cvs-int.fedora.redhat.com> Author: abompard Update of /cvs/extras/rpms/colorscheme/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18479/devel Modified Files: .cvsignore sources Added Files: colorscheme.spec Log Message: auto-import colorscheme-0.2.1-1 on branch devel from colorscheme-0.2.1-1.src.rpm --- NEW FILE colorscheme.spec --- Name: colorscheme Version: 0.2.1 Release: 1%{?dist} Summary: Generate a variety of colorschemes from a single starting color Group: Applications/Multimedia License: GPL URL: http://home.gna.org/colorscheme/ Source0: http://download.gna.org/colorscheme/0.2/colorscheme-0.2.1.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gtkmm24-devel >= 2.5, libgnomeui-devel >= 2.0, desktop-file-utils BuildRequires: cppunit-devel %description Have you ever been re-finishing a room in your home and found yourself asking "What color would go well with this" ? Or been working on a website and not able to find the perfect colorscheme to go with the company logo ? Try GNOME Colorscheme. GNOME Colorscheme is a very simple application for the GNOME desktop that allows you to generate a variety of colorschemes from a single starting color. %prep %setup -q %build %configure make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT desktop-file-install --vendor fedora \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ --delete-original \ --add-category X-Fedora \ --remove-category GNOME \ $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop %check make check || : %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc README COPYING NEWS AUTHORS ChangeLog TODO %{_bindir}/colorscheme %{_datadir}/applications/*.desktop %{_datadir}/%{name} %{_datadir}/pixmaps/* %changelog * Sun Sep 18 2005 Aurelien Bompard 0.2.1-1 - initial Fedora package (reviewed in bug 168635) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/colorscheme/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 20 Sep 2005 07:48:31 -0000 1.1 +++ .cvsignore 20 Sep 2005 07:49:28 -0000 1.2 @@ -0,0 +1 @@ +colorscheme-0.2.1.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/colorscheme/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 20 Sep 2005 07:48:31 -0000 1.1 +++ sources 20 Sep 2005 07:49:28 -0000 1.2 @@ -0,0 +1 @@ +e1465624d3373b5593b7c6ca25856aee colorscheme-0.2.1.tar.bz2 From fedora-extras-commits at redhat.com Tue Sep 20 08:14:42 2005 From: fedora-extras-commits at redhat.com (José Abílio Oliveira Matos (jamatos)) Date: Tue, 20 Sep 2005 04:14:42 -0400 Subject: owners owners.list,1.234,1.235 Message-ID: <200509200814.j8K8Ehwa020474@cvs-int.fedora.redhat.com> Author: jamatos Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20455 Modified Files: owners.list Log Message: add entry to rpy Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.234 retrieving revision 1.235 diff -u -r1.234 -r1.235 --- owners.list 19 Sep 2005 16:36:02 -0000 1.234 +++ owners.list 20 Sep 2005 08:14:40 -0000 1.235 @@ -884,6 +884,7 @@ Fedora Extras|rpmDirectoryCheck|Tool to detect some RPM packaging errors|enrico.scholz at informatik.tu-chemnitz.de|extras-qa at fedoraproject.org| Fedora Extras|rpmlint|RPM correctness checker|ville.skytta at iki.fi|extras-qa at fedoraproject.org| Fedora Extras|rpmproc|Perl script to help manage and build RPM packages|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| +Fedora Extras|rpy|Python interface to the R language|jamatos at fc.up.pt|extras-qa at fedoraproject.org| Fedora Extras|rrdtool|Round Robin Database Tool to store and display time-series data|matthias at rpmforge.net|extras-qa at fedoraproject.org| Fedora Extras|R-RScaLAPACK|An interface to perform parallel computation on linear algebra problems using ScaLAPACK|tcallawa at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|rsnapshot|Local and remote filesystem snapshot utility|ghenry at suretecsystems.com|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Tue Sep 20 08:21:26 2005 From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard)) Date: Tue, 20 Sep 2005 04:21:26 -0400 Subject: owners owners.list,1.235,1.236 Message-ID: <200509200821.j8K8LQZ0020598@cvs-int.fedora.redhat.com> Author: abompard Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20579 Modified Files: owners.list Log Message: - adding colorscheme Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.235 retrieving revision 1.236 diff -u -r1.235 -r1.236 --- owners.list 20 Sep 2005 08:14:40 -0000 1.235 +++ owners.list 20 Sep 2005 08:21:24 -0000 1.236 @@ -91,6 +91,7 @@ Fedora Extras|cogito|Cogito SCM based on git-core|chrisw at osdl.org|extras-qa at fedoraproject.org| Fedora Extras|Coin2|A high-level 3D visualization library|rc040203 at freenet.de|extras-qa at fedoraproject.org| Fedora Extras|colordiff|Color terminal highlighter for diff files|ville.skytta at iki.fi|extras-qa at fedoraproject.org| +Fedora Extras|colorscheme|Generate a variety of colorschemes from a single starting color|gauret at free.fr|extras-qa at fedoraproject.org| Fedora Extras|comical|GUI comic book viewer|tcallawa at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|compface|Library for handling X-Faces|ville.skytta at iki.fi|extras-qa at fedoraproject.org| Fedora Extras|comps|The list of groups and packages displayed by yum and repoview.|notting at redhat.com|katzj at redhat.com|skvidal at phy.duke.edu,sopwith at redhat.com From fedora-extras-commits at redhat.com Tue Sep 20 08:21:51 2005 From: fedora-extras-commits at redhat.com (Gavin Henry (ghenry)) Date: Tue, 20 Sep 2005 04:21:51 -0400 Subject: rpms/perl-Imager - New directory Message-ID: <200509200821.j8K8Lpmo020652@cvs-int.fedora.redhat.com> Author: ghenry Update of /cvs/extras/rpms/perl-Imager In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20632/perl-Imager Log Message: Directory /cvs/extras/rpms/perl-Imager added to the repository From fedora-extras-commits at redhat.com Tue Sep 20 08:21:51 2005 From: fedora-extras-commits at redhat.com (Gavin Henry (ghenry)) Date: Tue, 20 Sep 2005 04:21:51 -0400 Subject: rpms/perl-Imager/devel - New directory Message-ID: <200509200821.j8K8LpTl020657@cvs-int.fedora.redhat.com> Author: ghenry Update of /cvs/extras/rpms/perl-Imager/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20632/perl-Imager/devel Log Message: Directory /cvs/extras/rpms/perl-Imager/devel added to the repository From fedora-extras-commits at redhat.com Tue Sep 20 08:22:21 2005 From: fedora-extras-commits at redhat.com (Gavin Henry (ghenry)) Date: Tue, 20 Sep 2005 04:22:21 -0400 Subject: rpms/perl-Imager Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200509200822.j8K8MLMF020706@cvs-int.fedora.redhat.com> Author: ghenry Update of /cvs/extras/rpms/perl-Imager In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20677 Added Files: Makefile import.log Log Message: Setup of module perl-Imager --- NEW FILE Makefile --- # Top level Makefile for module perl-Imager all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Tue Sep 20 08:22:21 2005 From: fedora-extras-commits at redhat.com (Gavin Henry (ghenry)) Date: Tue, 20 Sep 2005 04:22:21 -0400 Subject: rpms/perl-Imager/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200509200822.j8K8ML5U020711@cvs-int.fedora.redhat.com> Author: ghenry Update of /cvs/extras/rpms/perl-Imager/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20677/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-Imager --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Tue Sep 20 08:23:28 2005 From: fedora-extras-commits at redhat.com (Gavin Henry (ghenry)) Date: Tue, 20 Sep 2005 04:23:28 -0400 Subject: rpms/perl-Imager import.log,1.1,1.2 Message-ID: <200509200823.j8K8Nwv6020783@cvs-int.fedora.redhat.com> Author: ghenry Update of /cvs/extras/rpms/perl-Imager In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20745 Modified Files: import.log Log Message: auto-import perl-Imager-0.45-2 on branch devel from perl-Imager-0.45-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-Imager/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 20 Sep 2005 08:22:19 -0000 1.1 +++ import.log 20 Sep 2005 08:23:26 -0000 1.2 @@ -0,0 +1 @@ +perl-Imager-0_45-2:HEAD:perl-Imager-0.45-2.src.rpm:1127204593 From fedora-extras-commits at redhat.com Tue Sep 20 08:23:28 2005 From: fedora-extras-commits at redhat.com (Gavin Henry (ghenry)) Date: Tue, 20 Sep 2005 04:23:28 -0400 Subject: rpms/perl-Imager/devel perl-Imager.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200509200824.j8K8NwhQ020787@cvs-int.fedora.redhat.com> Author: ghenry Update of /cvs/extras/rpms/perl-Imager/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20745/devel Modified Files: .cvsignore sources Added Files: perl-Imager.spec Log Message: auto-import perl-Imager-0.45-2 on branch devel from perl-Imager-0.45-2.src.rpm --- NEW FILE perl-Imager.spec --- Name: perl-Imager Version: 0.45 Release: 2%{?dist} Summary: Imager - Perl extension for Generating 24 bit Images Group: Development/Libraries License: GPL or Artistic URL: http://search.cpan.org/dist/Imager/ Source0: http://search.cpan.org/CPAN/authors/id/T/TO/TONYC/Imager-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: perl(ExtUtils::Depends), perl(Parse::RecDescent) BuildRequires: libungif-devel, libpng-devel, freetype-devel, libtiff-devel BuildRequires: libjpeg-devel, t1lib-devel Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description Imager is a module for creating and altering images. It can read and write various image formats, draw primitive shapes like lines,and polygons, blend multiple images together in various ways, scale, crop, render text and more. %prep %setup -q -n Imager-%{version} %{__perl} -pi -e 's/my \$resp = /my \$resp = "n"/g' Makefile.PL # Quiet rpmlint. find . -type f \( -perm +100 -o -name '*.pl' \) \ -exec perl -pi -e 's,^(\#\!)perl,$1%{__perl}, if ($.==1);' {} \; find . -type f -name '*.pm' \ -exec perl -pi -e '$_=undef if ($.==1 and /^\#\!.*perl/)' {} \; chmod a-x samples/* %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 d -depth -exec rmdir {} 2>/dev/null ';' find $RPM_BUILD_ROOT -type f -name '*.bs' -empty -exec rm -f {} ';' chmod -R u+w $RPM_BUILD_ROOT/* perldoc -t perlgpl > COPYING perldoc -t perlartistic > Artistic %check make test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc README COPYING Artistic %doc samples/ %{perl_vendorarch}/Imager* %{perl_vendorarch}/auto/* %{_mandir}/man3/*.3* %changelog * Wed Sep 14 2005 Gavin Henry - 0.45-2 - Applied Steven Pritchard's kind patch to cleanup - https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=166254 * Thu Aug 18 2005 Gavin Henry - 0.45-1 - First build. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Imager/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 20 Sep 2005 08:22:19 -0000 1.1 +++ .cvsignore 20 Sep 2005 08:23:26 -0000 1.2 @@ -0,0 +1 @@ +Imager-0.45.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Imager/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 20 Sep 2005 08:22:19 -0000 1.1 +++ sources 20 Sep 2005 08:23:26 -0000 1.2 @@ -0,0 +1 @@ +85dd3736426396341b54b632d239e5e5 Imager-0.45.tar.gz From fedora-extras-commits at redhat.com Tue Sep 20 09:16:51 2005 From: fedora-extras-commits at redhat.com (Gavin Henry (ghenry)) Date: Tue, 20 Sep 2005 05:16:51 -0400 Subject: rpms/perl-Gnome2-Canvas - New directory Message-ID: <200509200916.j8K9Gp2q022756@cvs-int.fedora.redhat.com> Author: ghenry Update of /cvs/extras/rpms/perl-Gnome2-Canvas In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22729/perl-Gnome2-Canvas Log Message: Directory /cvs/extras/rpms/perl-Gnome2-Canvas added to the repository From fedora-extras-commits at redhat.com Tue Sep 20 09:16:52 2005 From: fedora-extras-commits at redhat.com (Gavin Henry (ghenry)) Date: Tue, 20 Sep 2005 05:16:52 -0400 Subject: rpms/perl-Gnome2-Canvas/devel - New directory Message-ID: <200509200916.j8K9GqPk022761@cvs-int.fedora.redhat.com> Author: ghenry Update of /cvs/extras/rpms/perl-Gnome2-Canvas/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22729/perl-Gnome2-Canvas/devel Log Message: Directory /cvs/extras/rpms/perl-Gnome2-Canvas/devel added to the repository From fedora-extras-commits at redhat.com Tue Sep 20 09:17:32 2005 From: fedora-extras-commits at redhat.com (Gavin Henry (ghenry)) Date: Tue, 20 Sep 2005 05:17:32 -0400 Subject: rpms/perl-Gnome2-Canvas Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200509200917.j8K9HWEP022806@cvs-int.fedora.redhat.com> Author: ghenry Update of /cvs/extras/rpms/perl-Gnome2-Canvas In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22777 Added Files: Makefile import.log Log Message: Setup of module perl-Gnome2-Canvas --- NEW FILE Makefile --- # Top level Makefile for module perl-Gnome2-Canvas all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Tue Sep 20 09:17:32 2005 From: fedora-extras-commits at redhat.com (Gavin Henry (ghenry)) Date: Tue, 20 Sep 2005 05:17:32 -0400 Subject: rpms/perl-Gnome2-Canvas/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200509200917.j8K9HWIE022811@cvs-int.fedora.redhat.com> Author: ghenry Update of /cvs/extras/rpms/perl-Gnome2-Canvas/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22777/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-Gnome2-Canvas --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Tue Sep 20 09:18:22 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Tue, 20 Sep 2005 05:18:22 -0400 Subject: rpms/Coin2/devel Coin2.spec,1.12,1.13 Message-ID: <200509200918.j8K9IPhs022865@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/Coin2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22844 Modified Files: Coin2.spec Log Message: Check if x86_64 still requires simmacros Index: Coin2.spec =================================================================== RCS file: /cvs/extras/rpms/Coin2/devel/Coin2.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- Coin2.spec 7 Jul 2005 10:34:00 -0000 1.12 +++ Coin2.spec 20 Sep 2005 09:18:20 -0000 1.13 @@ -13,7 +13,7 @@ Summary: High-level 3D visualization library Name: Coin2 -Version: 2.4.3 +Version: 2.4.4 Release: 1%{?dist} License: GPL @@ -39,6 +39,9 @@ Requires(post): /sbin/ldconfig Requires(postun): /sbin/ldconfig +# TESTING +ExclusiveArch: x86_64 + %description Coin is a 3D graphics library with an Application Programming Interface based on the Open Inventor 2.1 API. @@ -57,8 +60,8 @@ %patch0 -p1 %patch1 -p1 %patch2 -p1 -%patch3 -p1 -%patch4 -p1 +# %patch3 -p1 +# %patch4 -p1 %patch5 -p1 sed -i -e 's, at LIBFREETYPE_SONAME@,"%{libfreetype_SONAME}",' \ @@ -86,6 +89,9 @@ rm -rf $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT install +# TESTING +exit 1 + %clean rm -rf $RPM_BUILD_ROOT @@ -114,6 +120,9 @@ %doc %{coin_htmldir} %changelog +* Tue Sep 20 2005 Ralf Corsepius - 2.4.4-1 +- Upstream update. + * Thu Jul 07 2005 Ralf Corsepius - 0:2.4.3-1 - Upstream update. From fedora-extras-commits at redhat.com Tue Sep 20 09:18:35 2005 From: fedora-extras-commits at redhat.com (Gavin Henry (ghenry)) Date: Tue, 20 Sep 2005 05:18:35 -0400 Subject: rpms/perl-Gnome2-Canvas import.log,1.1,1.2 Message-ID: <200509200919.j8K9J54U022939@cvs-int.fedora.redhat.com> Author: ghenry Update of /cvs/extras/rpms/perl-Gnome2-Canvas In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22870 Modified Files: import.log Log Message: auto-import perl-Gnome2-Canvas-1.002-4 on branch devel from perl-Gnome2-Canvas-1.002-4.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-Gnome2-Canvas/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 20 Sep 2005 09:17:30 -0000 1.1 +++ import.log 20 Sep 2005 09:18:33 -0000 1.2 @@ -0,0 +1 @@ +perl-Gnome2-Canvas-1_002-4:HEAD:perl-Gnome2-Canvas-1.002-4.src.rpm:1127207897 From fedora-extras-commits at redhat.com Tue Sep 20 09:18:35 2005 From: fedora-extras-commits at redhat.com (Gavin Henry (ghenry)) Date: Tue, 20 Sep 2005 05:18:35 -0400 Subject: rpms/perl-Gnome2-Canvas/devel perl-Gnome2-Canvas.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200509200919.j8K9J6To022943@cvs-int.fedora.redhat.com> Author: ghenry Update of /cvs/extras/rpms/perl-Gnome2-Canvas/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22870/devel Modified Files: .cvsignore sources Added Files: perl-Gnome2-Canvas.spec Log Message: auto-import perl-Gnome2-Canvas-1.002-4 on branch devel from perl-Gnome2-Canvas-1.002-4.src.rpm --- NEW FILE perl-Gnome2-Canvas.spec --- Name: perl-Gnome2-Canvas Version: 1.002 Release: 4%{?dist} Summary: An engine for structured graphics in Gnome2 Group: Development/Libraries License: GPL URL: http://search.cpan.org/dist/Gnome2-Canvas/ Source0: http://search.cpan.org/CPAN/authors/id/T/TS/TSCH/Gnome2-Canvas-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: perl(ExtUtils::Depends), perl(ExtUtils::PkgConfig) BuildRequires: perl(Glib), perl(Gtk2) BuildRequires: libgnomecanvas-devel >= 2.0.0 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description The Gnome Canvas is an engine for structured graphics that offers a rich imaging model, high-performance rendering, and a powerful, high level API. It offers a choice of two rendering back-ends, one based on GDK for extremely fast display, and another based on Libart, a sophisticated, antialiased, alpha-compositing engine. This widget can be used for flexible display of graphics and for creating interactive user interface elements. %prep %setup -q -n Gnome2-Canvas-%{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 d -depth -exec rmdir {} 2>/dev/null ';' find $RPM_BUILD_ROOT -type f -name '*.bs' -empty -exec rm -f {} ';' chmod -R u+w $RPM_BUILD_ROOT/* %check make test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc AUTHORS ChangeLog LICENSE NEWS README TODO %doc canvas_demo/ %{perl_vendorarch}/auto/Gnome2/ %{perl_vendorarch}/Gnome2* %{_mandir}/man3/*.3* %changelog * Wed Sep 14 2005 Gavin Henry - 1.002-4 - Added OPTIMIZE="$RPM_OPT_FLAGS" * Fri Aug 19 2005 Gavin Henry - 1.002-3 - Third build. * Thu Aug 18 2005 Gavin Henry - 1.002-2 - Second build. * Sun Jul 3 2005 Gavin Henry - 1.002-1 - First build. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Gnome2-Canvas/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 20 Sep 2005 09:17:30 -0000 1.1 +++ .cvsignore 20 Sep 2005 09:18:33 -0000 1.2 @@ -0,0 +1 @@ +Gnome2-Canvas-1.002.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Gnome2-Canvas/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 20 Sep 2005 09:17:30 -0000 1.1 +++ sources 20 Sep 2005 09:18:33 -0000 1.2 @@ -0,0 +1 @@ +93405a987ba4bbd03c2f91592b88f5cb Gnome2-Canvas-1.002.tar.gz From fedora-extras-commits at redhat.com Tue Sep 20 09:19:45 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Tue, 20 Sep 2005 05:19:45 -0400 Subject: rpms/Coin2/devel .cvsignore,1.6,1.7 sources,1.6,1.7 Message-ID: <200509200919.j8K9Jjxq023009@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/Coin2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22984 Modified Files: .cvsignore sources Log Message: Update preps Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/Coin2/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 7 Jul 2005 10:34:00 -0000 1.6 +++ .cvsignore 20 Sep 2005 09:19:43 -0000 1.7 @@ -1,3 +1,4 @@ Coin-2.4.3-libtool.diff.bz2 Coin-2.4.3-simacros.diff.bz2 Coin-2.4.3.tar.gz +Coin-2.4.4.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/Coin2/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 7 Jul 2005 10:34:00 -0000 1.6 +++ sources 20 Sep 2005 09:19:43 -0000 1.7 @@ -1,3 +1,4 @@ e2dcc9dde9d97577d211f3caba10c7e0 Coin-2.4.3-libtool.diff.bz2 4f4d4e4172db2107c578d0d99fde2888 Coin-2.4.3-simacros.diff.bz2 57c039a55133c5037ebef6759d26f603 Coin-2.4.3.tar.gz +7976fcf2d1154bc8574d75b99bab45ee Coin-2.4.4.tar.gz From fedora-extras-commits at redhat.com Tue Sep 20 09:20:33 2005 From: fedora-extras-commits at redhat.com (Gavin Henry (ghenry)) Date: Tue, 20 Sep 2005 05:20:33 -0400 Subject: rpms/perl-Gtk2-GladeXML/devel - New directory Message-ID: <200509200920.j8K9KXei023109@cvs-int.fedora.redhat.com> Author: ghenry Update of /cvs/extras/rpms/perl-Gtk2-GladeXML/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23080/perl-Gtk2-GladeXML/devel Log Message: Directory /cvs/extras/rpms/perl-Gtk2-GladeXML/devel added to the repository From fedora-extras-commits at redhat.com Tue Sep 20 09:20:32 2005 From: fedora-extras-commits at redhat.com (Gavin Henry (ghenry)) Date: Tue, 20 Sep 2005 05:20:32 -0400 Subject: rpms/perl-Gtk2-GladeXML - New directory Message-ID: <200509200920.j8K9KWJN023104@cvs-int.fedora.redhat.com> Author: ghenry Update of /cvs/extras/rpms/perl-Gtk2-GladeXML In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23080/perl-Gtk2-GladeXML Log Message: Directory /cvs/extras/rpms/perl-Gtk2-GladeXML added to the repository From fedora-extras-commits at redhat.com Tue Sep 20 09:21:06 2005 From: fedora-extras-commits at redhat.com (Gavin Henry (ghenry)) Date: Tue, 20 Sep 2005 05:21:06 -0400 Subject: rpms/perl-Gtk2-GladeXML Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200509200921.j8K9L6gE023165@cvs-int.fedora.redhat.com> Author: ghenry Update of /cvs/extras/rpms/perl-Gtk2-GladeXML In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23130 Added Files: Makefile import.log Log Message: Setup of module perl-Gtk2-GladeXML --- NEW FILE Makefile --- # Top level Makefile for module perl-Gtk2-GladeXML all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Tue Sep 20 09:21:06 2005 From: fedora-extras-commits at redhat.com (Gavin Henry (ghenry)) Date: Tue, 20 Sep 2005 05:21:06 -0400 Subject: rpms/perl-Gtk2-GladeXML/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200509200921.j8K9L6Xq023168@cvs-int.fedora.redhat.com> Author: ghenry Update of /cvs/extras/rpms/perl-Gtk2-GladeXML/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23130/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-Gtk2-GladeXML --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Tue Sep 20 09:22:17 2005 From: fedora-extras-commits at redhat.com (Gavin Henry (ghenry)) Date: Tue, 20 Sep 2005 05:22:17 -0400 Subject: rpms/perl-Gtk2-GladeXML import.log,1.1,1.2 Message-ID: <200509200922.j8K9Mlvl023271@cvs-int.fedora.redhat.com> Author: ghenry Update of /cvs/extras/rpms/perl-Gtk2-GladeXML In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23233 Modified Files: import.log Log Message: auto-import perl-Gtk2-GladeXML-1.005-4 on branch devel from perl-Gtk2-GladeXML-1.005-4.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-Gtk2-GladeXML/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 20 Sep 2005 09:21:04 -0000 1.1 +++ import.log 20 Sep 2005 09:22:15 -0000 1.2 @@ -0,0 +1 @@ +perl-Gtk2-GladeXML-1_005-4:HEAD:perl-Gtk2-GladeXML-1.005-4.src.rpm:1127208120 From fedora-extras-commits at redhat.com Tue Sep 20 09:22:18 2005 From: fedora-extras-commits at redhat.com (Gavin Henry (ghenry)) Date: Tue, 20 Sep 2005 05:22:18 -0400 Subject: rpms/perl-Gtk2-GladeXML/devel perl-Gtk2-GladeXML.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200509200922.j8K9Mmdu023275@cvs-int.fedora.redhat.com> Author: ghenry Update of /cvs/extras/rpms/perl-Gtk2-GladeXML/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23233/devel Modified Files: .cvsignore sources Added Files: perl-Gtk2-GladeXML.spec Log Message: auto-import perl-Gtk2-GladeXML-1.005-4 on branch devel from perl-Gtk2-GladeXML-1.005-4.src.rpm --- NEW FILE perl-Gtk2-GladeXML.spec --- Name: perl-Gtk2-GladeXML Version: 1.005 Release: 4%{?dist} Summary: Create user interfaces directly from Glade XML files Group: Development/Libraries License: GPL URL: http://search.cpan.org/dist/Gtk2-GladeXML/ Source0: http://search.cpan.org/CPAN/authors/id/T/TS/TSCH/Gtk2-GladeXML-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: perl(ExtUtils::Depends), perl(ExtUtils::PkgConfig) BuildRequires: perl(Glib), perl(Gtk2) BuildRequires: libglade2-devel >= 2.0.0 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description Glade is a free user interface builder for GTK+ and GNOME. After designing a user interface with glade-2 the layout and configuration are saved in an XML file. libglade is a library which knows how to build and hook up the user interface described in the Glade XML file at application run time. This extension module binds libglade to Perl so you can create and manipulate user interfaces in Perl code in conjunction with Gtk2 and even Gnome2. Better yet you can load a file's contents into a PERL scalar do a few magical regular expressions to customize things and the load up the app. It doesn't get any easier. %prep %setup -q -n Gtk2-GladeXML-%{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 d -depth -exec rmdir {} 2>/dev/null ';' find $RPM_BUILD_ROOT -type f -name '*.bs' -empty -exec rm -f {} ';' chmod -R u+w $RPM_BUILD_ROOT/* %check make test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc AUTHORS ChangeLog LICENSE NEWS README %doc examples/ %{perl_vendorarch}/auto/Gtk2/ %{perl_vendorarch}/Gtk2* %{_mandir}/man3/*.3* %changelog * Wed Sep 14 2005 Gavin Henry - 1.005-4 - Added OPTIMIZE="$RPM_OPT_FLAGS" and removed "find examples -type f -exec chmod -x {} ';'" * Thu Aug 18 2005 Gavin Henry - 1.005-3 - Third build. * Thu Aug 18 2005 Gavin Henry - 1.005-2 - Second build. * Sun Jul 3 2005 Gavin Henry - 1.002-1 - First build. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Gtk2-GladeXML/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 20 Sep 2005 09:21:04 -0000 1.1 +++ .cvsignore 20 Sep 2005 09:22:15 -0000 1.2 @@ -0,0 +1 @@ +Gtk2-GladeXML-1.005.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Gtk2-GladeXML/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 20 Sep 2005 09:21:04 -0000 1.1 +++ sources 20 Sep 2005 09:22:15 -0000 1.2 @@ -0,0 +1 @@ +097ab67c4f0025b74e721ae835a2d554 Gtk2-GladeXML-1.005.tar.gz From fedora-extras-commits at redhat.com Tue Sep 20 09:23:07 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Tue, 20 Sep 2005 05:23:07 -0400 Subject: rpms/Coin2/devel Coin2.spec,1.13,1.14 Message-ID: <200509200923.j8K9N710023326@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/Coin2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23307 Modified Files: Coin2.spec Log Message: tag inflation Index: Coin2.spec =================================================================== RCS file: /cvs/extras/rpms/Coin2/devel/Coin2.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- Coin2.spec 20 Sep 2005 09:18:20 -0000 1.13 +++ Coin2.spec 20 Sep 2005 09:23:05 -0000 1.14 @@ -14,7 +14,7 @@ Summary: High-level 3D visualization library Name: Coin2 Version: 2.4.4 -Release: 1%{?dist} +Release: 1.1%{?dist} License: GPL Group: System Environment/Libraries From fedora-extras-commits at redhat.com Tue Sep 20 12:26:03 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Tue, 20 Sep 2005 08:26:03 -0400 Subject: rpms/Coin2/devel Coin2.spec,1.14,1.15 Message-ID: <200509201226.j8KCQ35U027730@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/Coin2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27711 Modified Files: Coin2.spec Log Message: More testing Index: Coin2.spec =================================================================== RCS file: /cvs/extras/rpms/Coin2/devel/Coin2.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- Coin2.spec 20 Sep 2005 09:23:05 -0000 1.14 +++ Coin2.spec 20 Sep 2005 12:26:01 -0000 1.15 @@ -9,7 +9,7 @@ %define libopenal_SONAME libopenal.so.0 %define libsimage_SONAME libsimage.so.20 -%define libfreetype_SONAME libfreetype.so.6 +# %define libfreetype_SONAME libfreetype.so.6 Summary: High-level 3D visualization library Name: Coin2 @@ -32,7 +32,10 @@ BuildRequires: xorg-x11-Mesa-libGL BuildRequires: xorg-x11-Mesa-libGLU BuildRequires: xorg-x11-devel -BuildRequires: zlib-devel bzip2-devel +BuildRequires: zlib-devel +BuildRequires: bzip2-devel +# BuildRequires: fontconfig-devel +# BuildRequries: freetype-devel BuildRequires: doxygen BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -59,13 +62,13 @@ %setup -q -n Coin-%{version} %patch0 -p1 %patch1 -p1 -%patch2 -p1 +# %patch2 -p1 # %patch3 -p1 # %patch4 -p1 %patch5 -p1 -sed -i -e 's, at LIBFREETYPE_SONAME@,"%{libfreetype_SONAME}",' \ - src/glue/freetype.c +# sed -i -e 's, at LIBFREETYPE_SONAME@,"%{libfreetype_SONAME}",' \ +# src/glue/freetype.c sed -i -e 's, at LIBSIMAGE_SONAME@,"%{libsimage_SONAME}",' \ src/glue/simage_wrapper.c sed -i -e 's, at LIBOPENAL_SONAME@,"%{libopenal_SONAME}",' \ @@ -79,10 +82,14 @@ --disable-dl-libbzip2 \ --disable-dl-glu \ --disable-dl-zlib \ + --disable-dl-freetype \ + --disable-dl-fontconfig \ + --disable-spidermonkey \ --enable-man \ --enable-html \ --enable-3ds-import \ - htmldir=%{coin_htmldir}/Coin + htmldir=%{coin_htmldir}/Coin \ + CFLAGS="$RPM_OPT_FLAGS "$(pkg-config --cflags freetype2) make %{?_smp_mflags} %install From fedora-extras-commits at redhat.com Tue Sep 20 16:04:27 2005 From: fedora-extras-commits at redhat.com (Robert Theisen (trobert)) Date: Tue, 20 Sep 2005 12:04:27 -0400 Subject: web/html/download mirrors.php,1.28,1.29 Message-ID: <200509201604.j8KG4wmT001209@cvs-int.fedora.redhat.com> Author: trobert Update of /cvs/fedora/web/html/download In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1189 Modified Files: mirrors.php Log Message: Added new link for http://fedora.secs.oakland.edu/ Index: mirrors.php =================================================================== RCS file: /cvs/fedora/web/html/download/mirrors.php,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- mirrors.php 13 Sep 2005 20:46:32 -0000 1.28 +++ mirrors.php 20 Sep 2005 16:04:25 -0000 1.29 @@ -86,6 +86,7 @@

        2. ftp://fedora.omnispring.com/
        3. http://srl.cs.jhu.edu/YUM/fedora-core/
        4. rsync://srl.cs.jhu.edu/YUM/fedora-core/
          5. +
        5. http://fedora.secs.oakland.edu/
        6. USA West From fedora-extras-commits at redhat.com Tue Sep 20 18:22:51 2005 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Tue, 20 Sep 2005 14:22:51 -0400 Subject: rpms/TeXmacs/devel .cvsignore, 1.12, 1.13 TeXmacs.spec, 1.18, 1.19 sources, 1.13, 1.14 Message-ID: <200509201822.j8KIMpKG004359@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/TeXmacs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4336 Modified Files: .cvsignore TeXmacs.spec sources Log Message: new version 1.0.5.8 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/TeXmacs/devel/.cvsignore,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- .cvsignore 25 Jul 2005 17:42:58 -0000 1.12 +++ .cvsignore 20 Sep 2005 18:22:48 -0000 1.13 @@ -1 +1 @@ -TeXmacs-1.0.5.6-src.tar.gz +TeXmacs-1.0.5.8-src.tar.gz Index: TeXmacs.spec =================================================================== RCS file: /cvs/extras/rpms/TeXmacs/devel/TeXmacs.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- TeXmacs.spec 22 Aug 2005 13:59:45 -0000 1.18 +++ TeXmacs.spec 20 Sep 2005 18:22:48 -0000 1.19 @@ -1,12 +1,12 @@ Name: TeXmacs -Version: 1.0.5.7 +Version: 1.0.5.8 Release: 1%{?dist} Summary: Structured wysiwyg scientific text editor Group: Applications/Editors License: GPL URL: http://www.texmacs.org -Source: ftp://ftp.texmacs.org/pub/TeXmacs/targz/TeXmacs-1.0.5.7-src.tar.gz +Source: ftp://ftp.texmacs.org/pub/TeXmacs/targz/TeXmacs-1.0.5.8-src.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: tetex, tetex-fonts, ghostscript Buildrequires: guile-devel, desktop-file-utils, tetex, freetype-devel, XFree86-devel @@ -124,6 +124,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Sep 20 2005 Gerard Milmeister - 1.0.5.8 +- New Version 1.0.5.8 + * Mon Aug 22 2005 Gerard Milmeister - 1.0.5.7 - New Version 1.0.5.7 Index: sources =================================================================== RCS file: /cvs/extras/rpms/TeXmacs/devel/sources,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- sources 22 Aug 2005 13:59:45 -0000 1.13 +++ sources 20 Sep 2005 18:22:48 -0000 1.14 @@ -1 +1 @@ -c5dc2bd407f238041982291acada8b02 TeXmacs-1.0.5.7-src.tar.gz +3ebeed05713a410ce57fbddb3a540244 TeXmacs-1.0.5.8-src.tar.gz From fedora-extras-commits at redhat.com Tue Sep 20 18:27:45 2005 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Tue, 20 Sep 2005 14:27:45 -0400 Subject: rpms/TeXmacs/FC-4 TeXmacs.spec,1.19,1.20 sources,1.13,1.14 Message-ID: <200509201827.j8KIRjEV004426@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/TeXmacs/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4405 Modified Files: TeXmacs.spec sources Log Message: new version 1.0.5.8 Index: TeXmacs.spec =================================================================== RCS file: /cvs/extras/rpms/TeXmacs/FC-4/TeXmacs.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- TeXmacs.spec 22 Aug 2005 13:57:01 -0000 1.19 +++ TeXmacs.spec 20 Sep 2005 18:27:42 -0000 1.20 @@ -1,12 +1,12 @@ Name: TeXmacs -Version: 1.0.5.7 +Version: 1.0.5.8 Release: 1%{?dist} Summary: Structured wysiwyg scientific text editor Group: Applications/Editors License: GPL URL: http://www.texmacs.org -Source: ftp://ftp.texmacs.org/pub/TeXmacs/targz/TeXmacs-1.0.5.7-src.tar.gz +Source: ftp://ftp.texmacs.org/pub/TeXmacs/targz/TeXmacs-1.0.5.8-src.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: tetex, tetex-fonts, ghostscript Buildrequires: guile-devel, desktop-file-utils, tetex, freetype-devel, XFree86-devel @@ -124,6 +124,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Sep 20 2005 Gerard Milmeister - 1.0.5.8 +- New Version 1.0.5.8 + * Mon Aug 22 2005 Gerard Milmeister - 1.0.5.7 - New Version 1.0.5.7 Index: sources =================================================================== RCS file: /cvs/extras/rpms/TeXmacs/FC-4/sources,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- sources 22 Aug 2005 13:57:01 -0000 1.13 +++ sources 20 Sep 2005 18:27:43 -0000 1.14 @@ -1 +1 @@ -c5dc2bd407f238041982291acada8b02 TeXmacs-1.0.5.7-src.tar.gz +3ebeed05713a410ce57fbddb3a540244 TeXmacs-1.0.5.8-src.tar.gz From fedora-extras-commits at redhat.com Tue Sep 20 18:28:01 2005 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Tue, 20 Sep 2005 14:28:01 -0400 Subject: rpms/TeXmacs/FC-3 TeXmacs.spec,1.9,1.10 sources,1.9,1.10 Message-ID: <200509201828.j8KIS1Jl004457@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/TeXmacs/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4434 Modified Files: TeXmacs.spec sources Log Message: new version 1.0.5.8 Index: TeXmacs.spec =================================================================== RCS file: /cvs/extras/rpms/TeXmacs/FC-3/TeXmacs.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- TeXmacs.spec 22 Aug 2005 13:58:45 -0000 1.9 +++ TeXmacs.spec 20 Sep 2005 18:27:59 -0000 1.10 @@ -1,12 +1,12 @@ Name: TeXmacs -Version: 1.0.5.7 +Version: 1.0.5.8 Release: 1%{?dist} Summary: Structured wysiwyg scientific text editor Group: Applications/Editors License: GPL URL: http://www.texmacs.org -Source: ftp://ftp.texmacs.org/pub/TeXmacs/targz/TeXmacs-1.0.5.7-src.tar.gz +Source: ftp://ftp.texmacs.org/pub/TeXmacs/targz/TeXmacs-1.0.5.8-src.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: tetex, tetex-fonts, ghostscript Buildrequires: guile-devel, desktop-file-utils, tetex, freetype-devel, XFree86-devel @@ -124,6 +124,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Sep 20 2005 Gerard Milmeister - 1.0.5.8 +- New Version 1.0.5.8 + * Mon Aug 22 2005 Gerard Milmeister - 1.0.5.7 - New Version 1.0.5.7 Index: sources =================================================================== RCS file: /cvs/extras/rpms/TeXmacs/FC-3/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 22 Aug 2005 13:58:45 -0000 1.9 +++ sources 20 Sep 2005 18:27:59 -0000 1.10 @@ -1 +1 @@ -c5dc2bd407f238041982291acada8b02 TeXmacs-1.0.5.7-src.tar.gz +3ebeed05713a410ce57fbddb3a540244 TeXmacs-1.0.5.8-src.tar.gz From fedora-extras-commits at redhat.com Tue Sep 20 19:09:41 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Tue, 20 Sep 2005 15:09:41 -0400 Subject: rpms/imlib2/devel .cvsignore, 1.3, 1.4 imlib2.spec, 1.14, 1.15 sources, 1.4, 1.5 imlib2-1.2.0-configure-xlib64.patch, 1.1, NONE imlib2-1.2.0-xpmcescape.patch, 1.1, NONE Message-ID: <200509201909.j8KJ9fXE006395@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/imlib2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6372 Modified Files: .cvsignore imlib2.spec sources Removed Files: imlib2-1.2.0-configure-xlib64.patch imlib2-1.2.0-xpmcescape.patch Log Message: * Sun Aug 28 2005 Ville Skytt?? - 1.2.1-2 - 1.2.1, patches applied/obsoleted upstream. - Improve summary and description, fix URL. - Move HTML docs to -devel. - Build with dependency tracking disabled. - Drop x86_64 freetype rpath hack, require a fixed freetype-devel. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/imlib2/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 8 Nov 2004 04:35:58 -0000 1.3 +++ .cvsignore 20 Sep 2005 19:09:39 -0000 1.4 @@ -1 +1 @@ -imlib2-1.1.2.tar.gz +imlib2-1.2.1.tar.gz Index: imlib2.spec =================================================================== RCS file: /cvs/extras/rpms/imlib2/devel/imlib2.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- imlib2.spec 9 May 2005 19:28:56 -0000 1.14 +++ imlib2.spec 20 Sep 2005 19:09:39 -0000 1.15 @@ -1,87 +1,74 @@ -Summary: Graphic library for file loading, saving, rendering, and manipulation +Summary: Image loading, saving, rendering, and manipulation library Name: imlib2 -Version: 1.2.0 -Release: 8.fc4 +Version: 1.2.1 +Release: 2%{?dist} License: BSD Group: System Environment/Libraries -URL: http://www.enlightenment.org/pages/imlib2.html +URL: http://www.enlightenment.org/Libraries/Imlib2/ Source0: http://download.sf.net/enlightenment/%{name}-%{version}.tar.gz -Patch0: imlib2-1.2.0-configure-xlib64.patch -Patch1: imlib2-1.2.0-xpmcescape.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot BuildRequires: XFree86-devel libjpeg-devel libpng-devel libtiff-devel -BuildRequires: libungif-devel freetype-devel libtool bzip2-devel %{__perl} +BuildRequires: libungif-devel freetype-devel >= 2.1.9-4 libtool bzip2-devel %package devel Summary: Development package for %{name} Group: Development/Libraries Requires: %{name} = %{version}-%{release} -Requires: XFree86-devel freetype-devel pkgconfig +Requires: XFree86-devel freetype-devel >= 2.1.9-4 pkgconfig %description -Imlib 2 is the successor to Imlib. It is NOT a newer version -- it is -a completely new library. Imlib 2 can be installed alongside Imlib 1.x -without any problems since they are effectively different libraries -which have very similar functionality. Please see the homepage for the -long description of the differences. +Imlib 2 is a library that does image file loading and saving as well +as rendering, manipulation, arbitrary polygon support, etc. It does +ALL of these operations FAST. Imlib2 also tries to be highly +intelligent about doing them, so writing naive programs can be done +easily, without sacrificing speed. This is a complete rewrite over +the Imlib 1.x series. The architecture is more modular, simple, and +flexible. %description devel This package contains development files for %{name}. -Imlib 2 is the successor to Imlib. It is NOT a newer version -- it is -a completely new library. Imlib 2 can be installed alongside Imlib 1.x -without any problems since they are effectively different libraries -which have very similar functionality. Please see the homepage for the -long description of the differences. +Imlib 2 is a library that does image file loading and saving as well +as rendering, manipulation, arbitrary polygon support, etc. It does +ALL of these operations FAST. Imlib2 also tries to be highly +intelligent about doing them, so writing naive programs can be done +easily, without sacrificing speed. This is a complete rewrite over +the Imlib 1.x series. The architecture is more modular, simple, and +flexible. %prep %setup -q -%ifarch x86_64 -%patch0 -b .patch0 -%endif -%patch1 -p1 -b .xpmcescape -# loaders need to link with the main lib -%{__perl} -pi -e \ - 's|^(\w+_la_LDFLAGS .*)|$1 -L\$(top_builddir)/src/lib| ; - s|^(\w+_la_LIBADD .*)|$1 -lImlib2|' src/modules/loaders/Makefile.* %build -%configure \ - --x-libraries=%{_prefix}/X11R6/%{_lib} \ - --with-pic \ +asmopts="--disable-mmx --disable-amd64" %ifarch %{ix86} ia64 - --enable-mmx -%else - --disable-mmx +asmopts="--enable-mmx --disable-amd64" %endif %ifarch x86_64 -# fix hardcoded rpath im Makefiles on x86_64 due to freetype-config --libs -# returning "-L/usr/lib64 -Wl,--rpath -Wl,/usr/lib64 -lfreetype -lz": -%{__perl} -pi.orig -e 's|-Wl,--rpath -Wl,/usr/lib64||g;' \ - Makefile */Makefile */*/Makefile imlib2-config +asmopts="--disable-mmx --enable-amd64" %endif +# Note: --disable-static doesn't work as of 1.2.1. +%configure --disable-dependency-tracking \ + --x-libraries=%{_prefix}/X11R6/%{_lib} \ + --with-pic \ + $asmopts + make %{?_smp_mflags} LIBTOOL=/usr/bin/libtool %install -rm -rf $RPM_BUILD_ROOT __doc +rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT LIBTOOL=/usr/bin/libtool -cp -a doc __doc -rm -f __doc/Makefile* - -# remove unexpanded variable in pkgconfig file -sed -i -e 's!@requirements@!!g' ${RPM_BUILD_ROOT}%{_libdir}/pkgconfig/imlib2.pc - rm -f \ $RPM_BUILD_ROOT%{_libdir}/imlib2/{loaders,filters}/*.a \ - $RPM_BUILD_ROOT%{_bindir}/{color_spaces,imlib2,*test} + $RPM_BUILD_ROOT%{_bindir}/imlib2_test -# ship .la files due to a bug in kdelibs (see changelog): +# ship .la files due to a bug in kdelibs (bugzilla.fedora.us #2284): # $RPM_BUILD_ROOT%{_libdir}/libImlib2.la \ @@ -95,7 +82,7 @@ %files %defattr(-,root,root,-) -%doc COPYING AUTHORS README ChangeLog TODO __doc/* +%doc COPYING AUTHORS README ChangeLog TODO %{_bindir}/imlib2_view %{_bindir}/imlib2_bumpmap %{_bindir}/imlib2_colorspace @@ -115,6 +102,7 @@ %files devel %defattr(-,root,root,-) +%doc doc/*.gif doc/*.html %{_bindir}/imlib2-config %{_includedir}/Imlib2.h %{_libdir}/libImlib2.a @@ -124,6 +112,13 @@ %changelog +* Sun Aug 28 2005 Ville Skytt?? - 1.2.1-2 +- 1.2.1, patches applied/obsoleted upstream. +- Improve summary and description, fix URL. +- Move HTML docs to -devel. +- Build with dependency tracking disabled. +- Drop x86_64 freetype rpath hack, require a fixed freetype-devel. + * Mon May 9 2005 Michael Schwendt - 1.2.0-8.fc4 - Fix segfault in XPM loader (#156058). Index: sources =================================================================== RCS file: /cvs/extras/rpms/imlib2/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 17 Jan 2005 09:43:09 -0000 1.4 +++ sources 20 Sep 2005 19:09:39 -0000 1.5 @@ -1 +1 @@ -853fb77100ee3c3ca944f52c892ab49b imlib2-1.2.0.tar.gz +e32970d03d8aee2885782312d0a7f15f imlib2-1.2.1.tar.gz --- imlib2-1.2.0-configure-xlib64.patch DELETED --- --- imlib2-1.2.0-xpmcescape.patch DELETED --- From fedora-extras-commits at redhat.com Tue Sep 20 19:09:57 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Tue, 20 Sep 2005 15:09:57 -0400 Subject: rpms/imlib2/FC-4 .cvsignore, 1.3, 1.4 imlib2.spec, 1.14, 1.15 sources, 1.4, 1.5 imlib2-1.2.0-configure-xlib64.patch, 1.1, NONE imlib2-1.2.0-xpmcescape.patch, 1.1, NONE Message-ID: <200509201909.j8KJ9v1K006424@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/imlib2/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6401 Modified Files: .cvsignore imlib2.spec sources Removed Files: imlib2-1.2.0-configure-xlib64.patch imlib2-1.2.0-xpmcescape.patch Log Message: * Sun Aug 28 2005 Ville Skytt?? - 1.2.1-1 - 1.2.1, patches applied/obsoleted upstream. - Improve summary and description, fix URL. - Move HTML docs to -devel. - Build with dependency tracking disabled. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/imlib2/FC-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 8 Nov 2004 04:35:58 -0000 1.3 +++ .cvsignore 20 Sep 2005 19:09:55 -0000 1.4 @@ -1 +1 @@ -imlib2-1.1.2.tar.gz +imlib2-1.2.1.tar.gz Index: imlib2.spec =================================================================== RCS file: /cvs/extras/rpms/imlib2/FC-4/imlib2.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- imlib2.spec 9 May 2005 19:28:56 -0000 1.14 +++ imlib2.spec 20 Sep 2005 19:09:55 -0000 1.15 @@ -1,13 +1,11 @@ -Summary: Graphic library for file loading, saving, rendering, and manipulation +Summary: Image loading, saving, rendering, and manipulation library Name: imlib2 -Version: 1.2.0 -Release: 8.fc4 +Version: 1.2.1 +Release: 1%{?dist} License: BSD Group: System Environment/Libraries -URL: http://www.enlightenment.org/pages/imlib2.html +URL: http://www.enlightenment.org/Libraries/Imlib2/ Source0: http://download.sf.net/enlightenment/%{name}-%{version}.tar.gz -Patch0: imlib2-1.2.0-configure-xlib64.patch -Patch1: imlib2-1.2.0-xpmcescape.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot BuildRequires: XFree86-devel libjpeg-devel libpng-devel libtiff-devel BuildRequires: libungif-devel freetype-devel libtool bzip2-devel %{__perl} @@ -20,44 +18,45 @@ %description -Imlib 2 is the successor to Imlib. It is NOT a newer version -- it is -a completely new library. Imlib 2 can be installed alongside Imlib 1.x -without any problems since they are effectively different libraries -which have very similar functionality. Please see the homepage for the -long description of the differences. +Imlib 2 is a library that does image file loading and saving as well +as rendering, manipulation, arbitrary polygon support, etc. It does +ALL of these operations FAST. Imlib2 also tries to be highly +intelligent about doing them, so writing naive programs can be done +easily, without sacrificing speed. This is a complete rewrite over +the Imlib 1.x series. The architecture is more modular, simple, and +flexible. %description devel This package contains development files for %{name}. -Imlib 2 is the successor to Imlib. It is NOT a newer version -- it is -a completely new library. Imlib 2 can be installed alongside Imlib 1.x -without any problems since they are effectively different libraries -which have very similar functionality. Please see the homepage for the -long description of the differences. +Imlib 2 is a library that does image file loading and saving as well +as rendering, manipulation, arbitrary polygon support, etc. It does +ALL of these operations FAST. Imlib2 also tries to be highly +intelligent about doing them, so writing naive programs can be done +easily, without sacrificing speed. This is a complete rewrite over +the Imlib 1.x series. The architecture is more modular, simple, and +flexible. %prep %setup -q -%ifarch x86_64 -%patch0 -b .patch0 -%endif -%patch1 -p1 -b .xpmcescape -# loaders need to link with the main lib -%{__perl} -pi -e \ - 's|^(\w+_la_LDFLAGS .*)|$1 -L\$(top_builddir)/src/lib| ; - s|^(\w+_la_LIBADD .*)|$1 -lImlib2|' src/modules/loaders/Makefile.* %build -%configure \ - --x-libraries=%{_prefix}/X11R6/%{_lib} \ - --with-pic \ +asmopts="--disable-mmx --disable-amd64" %ifarch %{ix86} ia64 - --enable-mmx -%else - --disable-mmx +asmopts="--enable-mmx --disable-amd64" %endif %ifarch x86_64 +asmopts="--disable-mmx --enable-amd64" +%endif + +%configure --disable-dependency-tracking \ + --x-libraries=%{_prefix}/X11R6/%{_lib} \ + --with-pic \ + $asmopts + +%ifarch x86_64 # fix hardcoded rpath im Makefiles on x86_64 due to freetype-config --libs # returning "-L/usr/lib64 -Wl,--rpath -Wl,/usr/lib64 -lfreetype -lz": %{__perl} -pi.orig -e 's|-Wl,--rpath -Wl,/usr/lib64||g;' \ @@ -68,20 +67,14 @@ %install -rm -rf $RPM_BUILD_ROOT __doc +rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT LIBTOOL=/usr/bin/libtool -cp -a doc __doc -rm -f __doc/Makefile* - -# remove unexpanded variable in pkgconfig file -sed -i -e 's!@requirements@!!g' ${RPM_BUILD_ROOT}%{_libdir}/pkgconfig/imlib2.pc - rm -f \ $RPM_BUILD_ROOT%{_libdir}/imlib2/{loaders,filters}/*.a \ - $RPM_BUILD_ROOT%{_bindir}/{color_spaces,imlib2,*test} + $RPM_BUILD_ROOT%{_bindir}/imlib2_test -# ship .la files due to a bug in kdelibs (see changelog): +# ship .la files due to a bug in kdelibs (bugzilla.fedora.us #2284): # $RPM_BUILD_ROOT%{_libdir}/libImlib2.la \ @@ -95,7 +88,7 @@ %files %defattr(-,root,root,-) -%doc COPYING AUTHORS README ChangeLog TODO __doc/* +%doc COPYING AUTHORS README ChangeLog TODO %{_bindir}/imlib2_view %{_bindir}/imlib2_bumpmap %{_bindir}/imlib2_colorspace @@ -115,6 +108,7 @@ %files devel %defattr(-,root,root,-) +%doc doc/*.gif doc/*.html %{_bindir}/imlib2-config %{_includedir}/Imlib2.h %{_libdir}/libImlib2.a @@ -124,6 +118,12 @@ %changelog +* Sun Aug 28 2005 Ville Skytt?? - 1.2.1-1 +- 1.2.1, patches applied/obsoleted upstream. +- Improve summary and description, fix URL. +- Move HTML docs to -devel. +- Build with dependency tracking disabled. + * Mon May 9 2005 Michael Schwendt - 1.2.0-8.fc4 - Fix segfault in XPM loader (#156058). Index: sources =================================================================== RCS file: /cvs/extras/rpms/imlib2/FC-4/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 17 Jan 2005 09:43:09 -0000 1.4 +++ sources 20 Sep 2005 19:09:55 -0000 1.5 @@ -1 +1 @@ -853fb77100ee3c3ca944f52c892ab49b imlib2-1.2.0.tar.gz +e32970d03d8aee2885782312d0a7f15f imlib2-1.2.1.tar.gz --- imlib2-1.2.0-configure-xlib64.patch DELETED --- --- imlib2-1.2.0-xpmcescape.patch DELETED --- From fedora-extras-commits at redhat.com Tue Sep 20 20:15:40 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Tue, 20 Sep 2005 16:15:40 -0400 Subject: rpms/ks3switch - New directory Message-ID: <200509202015.j8KKFeRT007940@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/ks3switch In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7920/ks3switch Log Message: Directory /cvs/extras/rpms/ks3switch added to the repository From fedora-extras-commits at redhat.com Tue Sep 20 20:15:40 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Tue, 20 Sep 2005 16:15:40 -0400 Subject: rpms/ks3switch/devel - New directory Message-ID: <200509202015.j8KKFeTD007945@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/ks3switch/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7920/ks3switch/devel Log Message: Directory /cvs/extras/rpms/ks3switch/devel added to the repository From fedora-extras-commits at redhat.com Tue Sep 20 20:16:04 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Tue, 20 Sep 2005 16:16:04 -0400 Subject: rpms/ks3switch Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200509202016.j8KKG4U3008000@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/ks3switch In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7965 Added Files: Makefile import.log Log Message: Setup of module ks3switch --- NEW FILE Makefile --- # Top level Makefile for module ks3switch all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Tue Sep 20 20:16:04 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Tue, 20 Sep 2005 16:16:04 -0400 Subject: rpms/ks3switch/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200509202016.j8KKG4mQ008005@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/ks3switch/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7965/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module ks3switch --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Tue Sep 20 20:17:12 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Tue, 20 Sep 2005 16:17:12 -0400 Subject: rpms/ks3switch import.log,1.1,1.2 Message-ID: <200509202017.j8KKHgq2008089@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/ks3switch In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8044 Modified Files: import.log Log Message: auto-import ks3switch-0.1-0.3 on branch devel from ks3switch-0.1-0.3.src.rpm Initial import (#165464). Index: import.log =================================================================== RCS file: /cvs/extras/rpms/ks3switch/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 20 Sep 2005 20:16:01 -0000 1.1 +++ import.log 20 Sep 2005 20:17:10 -0000 1.2 @@ -0,0 +1 @@ +ks3switch-0_1-0_3:HEAD:ks3switch-0.1-0.3.src.rpm:1127247421 From fedora-extras-commits at redhat.com Tue Sep 20 20:17:12 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Tue, 20 Sep 2005 16:17:12 -0400 Subject: rpms/ks3switch/devel ks3switch-desktop.patch, NONE, 1.1 ks3switch-exec.patch, NONE, 1.1 ks3switch.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200509202017.j8KKHCUi008082@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/ks3switch/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8044/devel Modified Files: .cvsignore sources Added Files: ks3switch-desktop.patch ks3switch-exec.patch ks3switch.spec Log Message: auto-import ks3switch-0.1-0.3 on branch devel from ks3switch-0.1-0.3.src.rpm Initial import (#165464). ks3switch-desktop.patch: --- NEW FILE ks3switch-desktop.patch --- --- ks3switch/ks3switch.desktop~ 2002-07-11 22:59:31.000000000 +0300 +++ ks3switch/ks3switch.desktop 2004-07-22 14:50:51.000000000 +0300 @@ -4,9 +4,7 @@ Type=Application Exec=ks3switch -caption "%c" %i %m Icon=ks3switch.png -DocPath=ks3switch/index.html -Comment= -Comment[de]= -Terminal=0 +Comment=Manage output devices of S3 chips +Terminal=false Name=KS3Switch -Name[de]=KS3Switch +Categories=Settings;HardwareSettings;System;SystemSetup;KDE; ks3switch-exec.patch: --- NEW FILE ks3switch-exec.patch --- Prevent an empty "exec=" in the config file from causing "" to be launched. --- ks3switch/ks3switch.cpp~ 2002-07-12 10:45:13.000000000 +0300 +++ ks3switch/ks3switch.cpp 2004-07-22 16:44:54.000000000 +0300 @@ -160,6 +160,10 @@ /** Set the values */ config->setGroup("General options"); s3switch = config->readEntry("exec"); + if (s3switch.isEmpty()) + { + s3switch = "s3switch"; + } if (config->readBoolEntry("PAL")){ TV_mode = "PAL"; } --- NEW FILE ks3switch.spec --- Name: ks3switch Version: 0.1 Release: 0.3 Summary: KDE utility for managing the output device on S3 Savage chips Group: Applications/System License: GPL URL: http://francois.bochatay.net/apps/ks3switch/ Source0: http://francois.bochatay.net/apps/ks3switch/%{name}-%{version}.tar.gz Patch0: %{name}-desktop.patch Patch1: %{name}-exec.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: kdelibs-devel BuildRequires: qt-devel >= 1:3.0 BuildRequires: desktop-file-utils Requires: s3switch # ExclusiveArch due to s3switch availability ExclusiveArch: %{ix86} %description KS3switch is a KDE frontend to s3switch, the utility for managing the output device on S3 Savage chips. %prep %setup -q %patch0 -p0 %patch1 -p0 %build [ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/qt.sh %configure --disable-rpath --disable-dependency-tracking make clean # 0.1 ships unclean make # %{?_smp_mflags} # not parallel build clean %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT desktop-file-install \ --vendor fedora \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ --mode 644 \ --add-category X-Fedora \ $RPM_BUILD_ROOT%{_datadir}/applnk/Applications/%{name}.desktop rm -rf $RPM_BUILD_ROOT%{_datadir}/applnk rm -rf $RPM_BUILD_ROOT%{_docdir}/HTML # it's just the template in 0.1 %clean rm -rf $RPM_BUILD_ROOT %post gtk-update-icon-cache -qf %{_datadir}/icons/hicolor >/dev/null 2>&1 || : %postun gtk-update-icon-cache -qf %{_datadir}/icons/hicolor >/dev/null 2>&1 || : %files %defattr(-,root,root,-) %doc AUTHORS COPYING %{_bindir}/ks3switch %{_datadir}/applications/*%{name}.desktop %{_datadir}/icons/hicolor/*x*/apps/%{name}.png %changelog * Sun Aug 7 2005 Ville Skytt?? - 0.1-0.3 - ExclusiveArch ix86 due to s3switch availability. * Sun May 29 2005 Ville Skytt?? - 0.1-0.2 - Rebuild for FC4. * Sun Feb 6 2005 Ville Skytt?? - 0.1-0.1 - Fix Group tag. - Reduce dir ownership. * Sat Dec 4 2004 Ville Skytt?? - 0:0.1-0.fdr.2 - Add -fpermissive to C(XX)FLAGS for gcc 3.4. * Thu Jul 22 2004 Ville Skytt?? - 0:0.1-0.fdr.1 - First build. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/ks3switch/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 20 Sep 2005 20:16:02 -0000 1.1 +++ .cvsignore 20 Sep 2005 20:17:10 -0000 1.2 @@ -0,0 +1 @@ +ks3switch-0.1.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/ks3switch/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 20 Sep 2005 20:16:02 -0000 1.1 +++ sources 20 Sep 2005 20:17:10 -0000 1.2 @@ -0,0 +1 @@ +e560f7db57ae12a60a08dbc75734fb8b ks3switch-0.1.tar.gz From fedora-extras-commits at redhat.com Tue Sep 20 20:41:22 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Tue, 20 Sep 2005 16:41:22 -0400 Subject: rpms/ks3switch/devel ks3switch-desktop.patch, 1.1, 1.2 ks3switch.spec, 1.1, 1.2 Message-ID: <200509202041.j8KKfM7b008250@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/ks3switch/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8226 Modified Files: ks3switch-desktop.patch ks3switch.spec Log Message: * Tue Sep 20 2005 Ville Skytt?? - 0.1-1 - Fix desktop entry categories (#165464). - Tidy up build dependencies. ks3switch-desktop.patch: Index: ks3switch-desktop.patch =================================================================== RCS file: /cvs/extras/rpms/ks3switch/devel/ks3switch-desktop.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ks3switch-desktop.patch 20 Sep 2005 20:17:10 -0000 1.1 +++ ks3switch-desktop.patch 20 Sep 2005 20:41:20 -0000 1.2 @@ -1,6 +1,9 @@ --- ks3switch/ks3switch.desktop~ 2002-07-11 22:59:31.000000000 +0300 -+++ ks3switch/ks3switch.desktop 2004-07-22 14:50:51.000000000 +0300 -@@ -4,9 +4,7 @@ ++++ ks3switch/ks3switch.desktop 2005-09-20 23:22:32.000000000 +0300 +@@ -1,12 +1,9 @@ +-# KDE Config File + [Desktop Entry] + Encoding=UTF-8 Type=Application Exec=ks3switch -caption "%c" %i %m Icon=ks3switch.png @@ -12,4 +15,4 @@ +Terminal=false Name=KS3Switch -Name[de]=KS3Switch -+Categories=Settings;HardwareSettings;System;SystemSetup;KDE; ++Categories=Settings;HardwareSettings;System;TrayIcon;KDE; Index: ks3switch.spec =================================================================== RCS file: /cvs/extras/rpms/ks3switch/devel/ks3switch.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ks3switch.spec 20 Sep 2005 20:17:10 -0000 1.1 +++ ks3switch.spec 20 Sep 2005 20:41:20 -0000 1.2 @@ -1,6 +1,6 @@ Name: ks3switch Version: 0.1 -Release: 0.3 +Release: 1%{?dist} Summary: KDE utility for managing the output device on S3 Savage chips Group: Applications/System @@ -12,7 +12,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: kdelibs-devel -BuildRequires: qt-devel >= 1:3.0 BuildRequires: desktop-file-utils Requires: s3switch # ExclusiveArch due to s3switch availability @@ -69,6 +68,10 @@ %changelog +* Tue Sep 20 2005 Ville Skytt?? - 0.1-1 +- Fix desktop entry categories (#165464). +- Tidy up build dependencies. + * Sun Aug 7 2005 Ville Skytt?? - 0.1-0.3 - ExclusiveArch ix86 due to s3switch availability. From fedora-extras-commits at redhat.com Tue Sep 20 21:07:53 2005 From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj)) Date: Tue, 20 Sep 2005 17:07:53 -0400 Subject: rpms/mercurial/devel .cvsignore, 1.4, 1.5 mercurial.spec, 1.3, 1.4 sources, 1.4, 1.5 Message-ID: <200509202107.j8KL7r3h009677@cvs-int.fedora.redhat.com> Author: katzj Update of /cvs/extras/rpms/mercurial/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9653 Modified Files: .cvsignore mercurial.spec sources Log Message: * Tue Sep 20 2005 Jeremy Katz - 0.7 - update to 0.7 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/mercurial/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 22 Aug 2005 17:06:49 -0000 1.4 +++ .cvsignore 20 Sep 2005 21:07:51 -0000 1.5 @@ -1 +1 @@ -mercurial-0.6c.tar.gz +mercurial-0.7.tar.gz Index: mercurial.spec =================================================================== RCS file: /cvs/extras/rpms/mercurial/devel/mercurial.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- mercurial.spec 22 Aug 2005 17:06:49 -0000 1.3 +++ mercurial.spec 20 Sep 2005 21:07:51 -0000 1.4 @@ -1,6 +1,6 @@ Summary: A fast, lightweight distributed source control management system Name: mercurial -Version: 0.6c +Version: 0.7 Release: 1%{?dist} License: GPL Group: Development/Tools @@ -34,6 +34,9 @@ %changelog +* Tue Sep 20 2005 Jeremy Katz - 0.7 +- update to 0.7 + * Mon Aug 22 2005 Jeremy Katz - 0.6c - update to 0.6c Index: sources =================================================================== RCS file: /cvs/extras/rpms/mercurial/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 22 Aug 2005 17:06:49 -0000 1.4 +++ sources 20 Sep 2005 21:07:51 -0000 1.5 @@ -1 +1 @@ -52c8cef44e3367f6abdb7bc8c16894d3 mercurial-0.6c.tar.gz +c024ca9ed3ef35af8c5618316b6ab00a mercurial-0.7.tar.gz From fedora-extras-commits at redhat.com Tue Sep 20 21:31:25 2005 From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj)) Date: Tue, 20 Sep 2005 17:31:25 -0400 Subject: rpms/mercurial/FC-4 .cvsignore, 1.2, 1.3 mercurial.spec, 1.3, 1.4 sources, 1.4, 1.5 Message-ID: <200509202131.j8KLVP67009799@cvs-int.fedora.redhat.com> Author: katzj Update of /cvs/extras/rpms/mercurial/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9776 Modified Files: .cvsignore mercurial.spec sources Log Message: * Tue Sep 20 2005 Jeremy Katz - 0.7 - update to 0.7 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/mercurial/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 1 Jul 2005 19:53:16 -0000 1.2 +++ .cvsignore 20 Sep 2005 21:31:23 -0000 1.3 @@ -1 +1 @@ -mercurial-0.6.tar.gz +mercurial-0.7.tar.gz Index: mercurial.spec =================================================================== RCS file: /cvs/extras/rpms/mercurial/FC-4/mercurial.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- mercurial.spec 22 Aug 2005 17:12:27 -0000 1.3 +++ mercurial.spec 20 Sep 2005 21:31:23 -0000 1.4 @@ -1,6 +1,6 @@ Summary: A fast, lightweight distributed source control management system Name: mercurial -Version: 0.6c +Version: 0.7 Release: 1%{?dist} License: GPL Group: Development/Tools @@ -34,6 +34,9 @@ %changelog +* Tue Sep 20 2005 Jeremy Katz - 0.7 +- update to 0.7 + * Mon Aug 22 2005 Jeremy Katz - 0.6c - update to 0.6c Index: sources =================================================================== RCS file: /cvs/extras/rpms/mercurial/FC-4/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 22 Aug 2005 17:12:27 -0000 1.4 +++ sources 20 Sep 2005 21:31:23 -0000 1.5 @@ -1 +1 @@ -52c8cef44e3367f6abdb7bc8c16894d3 mercurial-0.6c.tar.gz +c024ca9ed3ef35af8c5618316b6ab00a mercurial-0.7.tar.gz From fedora-extras-commits at redhat.com Tue Sep 20 21:36:45 2005 From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj)) Date: Tue, 20 Sep 2005 17:36:45 -0400 Subject: rpms/mercurial/FC-3 .cvsignore, 1.2, 1.3 mercurial.spec, 1.2, 1.3 sources, 1.3, 1.4 Message-ID: <200509202136.j8KLajYm009873@cvs-int.fedora.redhat.com> Author: katzj Update of /cvs/extras/rpms/mercurial/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9850 Modified Files: .cvsignore mercurial.spec sources Log Message: * Tue Sep 20 2005 Jeremy Katz - 0.7 - update to 0.7 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/mercurial/FC-3/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 1 Jul 2005 19:53:16 -0000 1.2 +++ .cvsignore 20 Sep 2005 21:36:43 -0000 1.3 @@ -1 +1 @@ -mercurial-0.6.tar.gz +mercurial-0.7.tar.gz Index: mercurial.spec =================================================================== RCS file: /cvs/extras/rpms/mercurial/FC-3/mercurial.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- mercurial.spec 12 Jul 2005 21:52:38 -0000 1.2 +++ mercurial.spec 20 Sep 2005 21:36:43 -0000 1.3 @@ -1,6 +1,6 @@ Summary: A fast, lightweight distributed source control management system Name: mercurial -Version: 0.6b +Version: 0.7 Release: 1%{?dist} License: GPL Group: Development/Tools @@ -30,10 +30,16 @@ %files -f %{name}.files %defattr(-,root,root,-) -%doc doc/FAQ.txt README doc/hg.1.txt +%doc README doc/hg.1.txt doc/hgmerge.1.txt doc/hgrc.5.txt %changelog +* Tue Sep 20 2005 Jeremy Katz - 0.7 +- update to 0.7 + +* Mon Aug 22 2005 Jeremy Katz - 0.6c +- update to 0.6c + * Tue Jul 12 2005 Jeremy Katz - 0.6b - update to new upstream 0.6b Index: sources =================================================================== RCS file: /cvs/extras/rpms/mercurial/FC-3/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 12 Jul 2005 21:52:38 -0000 1.3 +++ sources 20 Sep 2005 21:36:43 -0000 1.4 @@ -1 +1 @@ -502b7de4244017cb0b16658acbbbddc2 mercurial-0.6b.tar.gz +c024ca9ed3ef35af8c5618316b6ab00a mercurial-0.7.tar.gz From fedora-extras-commits at redhat.com Tue Sep 20 22:01:07 2005 From: fedora-extras-commits at redhat.com (Josh Bressers (bressers)) Date: Tue, 20 Sep 2005 18:01:07 -0400 Subject: fedora-security/audit fc4,1.59,1.60 Message-ID: <200509202201.j8KM1bm0011285@cvs-int.fedora.redhat.com> Author: bressers Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9945 Modified Files: fc4 Log Message: Add new ncompress CVE id. Index: fc4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc4,v retrieving revision 1.59 retrieving revision 1.60 diff -u -r1.59 -r1.60 --- fc4 15 Sep 2005 08:35:02 -0000 1.59 +++ fc4 20 Sep 2005 22:01:04 -0000 1.60 @@ -3,6 +3,7 @@ ** are items that need attention +2005-2991 ignore (ncompress) don't ship zdiff or zcmp scripts 2005-2876 backport (util-linux) [since FEDORA-2005-887] 2005-2874 version (cups, fixed 1.1.23) 2005-2873 ** kernel From fedora-extras-commits at redhat.com Tue Sep 20 23:37:18 2005 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Tue, 20 Sep 2005 19:37:18 -0400 Subject: rpms/ghc/devel .cvsignore, 1.4, 1.5 ghc.spec, 1.6, 1.7 sources, 1.4, 1.5 ghc-6.4-dsforeign-x86_64-1097471.patch, 1.1, NONE ghc-6.4-powerpc.patch, 1.1, NONE ghc-6.4-rts-adjustor-x86_64-1097471.patch, 1.1, NONE rts-GCCompact.h-x86_64.patch, 1.1, NONE Message-ID: <200509202337.j8KNbI1L012803@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/ghc/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12780 Modified Files: .cvsignore ghc.spec sources Removed Files: ghc-6.4-dsforeign-x86_64-1097471.patch ghc-6.4-powerpc.patch ghc-6.4-rts-adjustor-x86_64-1097471.patch rts-GCCompact.h-x86_64.patch Log Message: - 6.4.1 release - the following patches are now upstream: ghc-6.4-powerpc.patch, rts-GCCompact.h-x86_64.patch, ghc-6.4-dsforeign-x86_64-1097471.patch, ghc-6.4-rts-adjustor-x86_64-1097471.patch - builds with gcc4 so drop %%_with_gcc32 - x86_64 build restrictions (no ghci and split objects) no longer apply Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/ghc/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 2 Jun 2005 01:55:58 -0000 1.4 +++ .cvsignore 20 Sep 2005 23:37:16 -0000 1.5 @@ -1 +1 @@ -ghc-6.4-src.tar.bz2 +ghc-6.4.1-src.tar.bz2 Index: ghc.spec =================================================================== RCS file: /cvs/extras/rpms/ghc/devel/ghc.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- ghc.spec 2 Jun 2005 01:55:58 -0000 1.6 +++ ghc.spec 20 Sep 2005 23:37:16 -0000 1.7 @@ -1,16 +1,13 @@ %define build_version 6.4 -%define ghcver ghc64 +%define ghcver ghc641 # speed up test builds by not building profiled libraries %define build_prof 1 %define build_doc 0 -# ghc-6.4 doesn't build with gcc-4.0 yet -%define _with_gcc32 %{nil} - Name: ghc -Version: 6.4 -Release: 8%{?dist} +Version: 6.4.1 +Release: 0.1%{?dist} Summary: Glasgow Haskell Compilation system License: BSD style Group: Development/Languages @@ -18,17 +15,13 @@ URL: http://haskell.org/ghc/ Requires: %{ghcver} = %{version}-%{release} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: sed, %{ghcver}, %{?_with_gcc32: compat-gcc-32} +BuildRequires: ghc, sed Buildrequires: gmp-devel, readline-devel, xorg-x11-devel, freeglut-devel, openal-devel %if %{build_doc} # haddock generates libraries/ docs Buildrequires: libxslt, docbook-style-xsl, haddock %endif Prefix: %{_prefix} -Patch1: ghc-6.4-powerpc.patch -Patch2: rts-GCCompact.h-x86_64.patch -Patch3: ghc-6.4-dsforeign-x86_64-1097471.patch -Patch4: ghc-6.4-rts-adjustor-x86_64-1097471.patch %description GHC is a state-of-the-art programming suite for Haskell, a purely @@ -85,22 +78,14 @@ %prep %setup -q -n ghc-%{version} -%patch1 -p1 -b .1-ppc -%patch2 -p1 -b .2-x86_64 -%patch3 -p1 -b .3-x86_64 -%patch4 -p1 -b .4-x86_64 %build -%ifarch x86_64 -echo "SplitObjs = NO" >> mk/build.mk -echo "GhcWithInterpreter = NO" >> mk/build.mk -%endif %if !%{build_prof} echo "GhcLibWays=" >> mk/build.mk echo "GhcRTSWays=thr debug" >> mk/build.mk %endif -./configure --prefix=%{_prefix} --libdir=%{_libdir} --with-ghc=ghc-%{build_version} %{?_with_gcc32: --with-gcc=%{_bindir}/gcc32} +./configure --prefix=%{_prefix} --libdir=%{_libdir} --with-ghc=ghc-%{build_version} make all %if %{build_doc} @@ -171,6 +156,14 @@ %endif %changelog +* Tue Sep 20 2005 Jens Petersen - 6.4.1-0 +- 6.4.1 release + - the following patches are now upstream: ghc-6.4-powerpc.patch, + rts-GCCompact.h-x86_64.patch, ghc-6.4-dsforeign-x86_64-1097471.patch, + ghc-6.4-rts-adjustor-x86_64-1097471.patch + - builds with gcc4 so drop %%_with_gcc32 + - x86_64 build restrictions (no ghci and split objects) no longer apply + * Tue May 31 2005 Jens Petersen - add %%dist to release Index: sources =================================================================== RCS file: /cvs/extras/rpms/ghc/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 2 Jun 2005 01:55:58 -0000 1.4 +++ sources 20 Sep 2005 23:37:16 -0000 1.5 @@ -1 +1 @@ -45ea4e15f135698feb88d12c5000aaf8 ghc-6.4-src.tar.bz2 +fd289bc7c3afa272ff831a71a50b5b00 ghc-6.4.1-src.tar.bz2 --- ghc-6.4-dsforeign-x86_64-1097471.patch DELETED --- --- ghc-6.4-powerpc.patch DELETED --- --- ghc-6.4-rts-adjustor-x86_64-1097471.patch DELETED --- --- rts-GCCompact.h-x86_64.patch DELETED --- From fedora-extras-commits at redhat.com Tue Sep 20 23:38:36 2005 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Tue, 20 Sep 2005 19:38:36 -0400 Subject: rpms/ghc/devel ghc.spec,1.7,1.8 Message-ID: <200509202338.j8KNcaFD012833@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/ghc/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12814 Modified Files: ghc.spec Log Message: bump release Index: ghc.spec =================================================================== RCS file: /cvs/extras/rpms/ghc/devel/ghc.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- ghc.spec 20 Sep 2005 23:37:16 -0000 1.7 +++ ghc.spec 20 Sep 2005 23:38:34 -0000 1.8 @@ -7,7 +7,7 @@ Name: ghc Version: 6.4.1 -Release: 0.1%{?dist} +Release: 1%{?dist} Summary: Glasgow Haskell Compilation system License: BSD style Group: Development/Languages @@ -156,7 +156,7 @@ %endif %changelog -* Tue Sep 20 2005 Jens Petersen - 6.4.1-0 +* Tue Sep 20 2005 Jens Petersen - 6.4.1-1 - 6.4.1 release - the following patches are now upstream: ghc-6.4-powerpc.patch, rts-GCCompact.h-x86_64.patch, ghc-6.4-dsforeign-x86_64-1097471.patch, From fedora-extras-commits at redhat.com Tue Sep 20 23:50:04 2005 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Tue, 20 Sep 2005 19:50:04 -0400 Subject: rpms/ghc/FC-4 .cvsignore, 1.4, 1.5 ghc.spec, 1.6, 1.7 sources, 1.4, 1.5 ghc-6.4-dsforeign-x86_64-1097471.patch, 1.1, NONE ghc-6.4-powerpc.patch, 1.1, NONE ghc-6.4-rts-adjustor-x86_64-1097471.patch, 1.1, NONE rts-GCCompact.h-x86_64.patch, 1.1, NONE Message-ID: <200509202350.j8KNo4jG012926@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/ghc/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12901 Modified Files: .cvsignore ghc.spec sources Removed Files: ghc-6.4-dsforeign-x86_64-1097471.patch ghc-6.4-powerpc.patch ghc-6.4-rts-adjustor-x86_64-1097471.patch rts-GCCompact.h-x86_64.patch Log Message: - sync with devel branch: - 6.4.1 release - the following patches are now upstream: ghc-6.4-powerpc.patch, rts-GCCompact.h-x86_64.patch, ghc-6.4-dsforeign-x86_64-1097471.patch, ghc-6.4-rts-adjustor-x86_64-1097471.patch - builds with gcc4 so drop %%_with_gcc32 - x86_64 build restrictions (no ghci and split objects) no longer apply Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/ghc/FC-4/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 2 Jun 2005 01:49:10 -0000 1.4 +++ .cvsignore 20 Sep 2005 23:50:02 -0000 1.5 @@ -1 +1 @@ -ghc-6.4-src.tar.bz2 +ghc-6.4.1-src.tar.bz2 Index: ghc.spec =================================================================== RCS file: /cvs/extras/rpms/ghc/FC-4/ghc.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- ghc.spec 2 Jun 2005 01:49:10 -0000 1.6 +++ ghc.spec 20 Sep 2005 23:50:02 -0000 1.7 @@ -1,16 +1,13 @@ %define build_version 6.4 -%define ghcver ghc64 +%define ghcver ghc641 # speed up test builds by not building profiled libraries %define build_prof 1 %define build_doc 0 -# ghc-6.4 doesn't build with gcc-4.0 yet -%define _with_gcc32 %{nil} - Name: ghc -Version: 6.4 -Release: 8%{?dist} +Version: 6.4.1 +Release: 1%{?dist} Summary: Glasgow Haskell Compilation system License: BSD style Group: Development/Languages @@ -18,17 +15,13 @@ URL: http://haskell.org/ghc/ Requires: %{ghcver} = %{version}-%{release} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: sed, %{ghcver}, %{?_with_gcc32: compat-gcc-32} +BuildRequires: ghc, sed Buildrequires: gmp-devel, readline-devel, xorg-x11-devel, freeglut-devel, openal-devel %if %{build_doc} # haddock generates libraries/ docs Buildrequires: libxslt, docbook-style-xsl, haddock %endif Prefix: %{_prefix} -Patch1: ghc-6.4-powerpc.patch -Patch2: rts-GCCompact.h-x86_64.patch -Patch3: ghc-6.4-dsforeign-x86_64-1097471.patch -Patch4: ghc-6.4-rts-adjustor-x86_64-1097471.patch %description GHC is a state-of-the-art programming suite for Haskell, a purely @@ -85,22 +78,14 @@ %prep %setup -q -n ghc-%{version} -%patch1 -p1 -b .1-ppc -%patch2 -p1 -b .2-x86_64 -%patch3 -p1 -b .3-x86_64 -%patch4 -p1 -b .4-x86_64 %build -%ifarch x86_64 -echo "SplitObjs = NO" >> mk/build.mk -echo "GhcWithInterpreter = NO" >> mk/build.mk -%endif %if !%{build_prof} echo "GhcLibWays=" >> mk/build.mk echo "GhcRTSWays=thr debug" >> mk/build.mk %endif -./configure --prefix=%{_prefix} --libdir=%{_libdir} --with-ghc=ghc-%{build_version} %{?_with_gcc32: --with-gcc=%{_bindir}/gcc32} +./configure --prefix=%{_prefix} --libdir=%{_libdir} --with-ghc=ghc-%{build_version} make all %if %{build_doc} @@ -171,6 +156,14 @@ %endif %changelog +* Tue Sep 20 2005 Jens Petersen - 6.4.1-1 +- 6.4.1 release + - the following patches are now upstream: ghc-6.4-powerpc.patch, + rts-GCCompact.h-x86_64.patch, ghc-6.4-dsforeign-x86_64-1097471.patch, + ghc-6.4-rts-adjustor-x86_64-1097471.patch + - builds with gcc4 so drop %%_with_gcc32 + - x86_64 build restrictions (no ghci and split objects) no longer apply + * Tue May 31 2005 Jens Petersen - add %%dist to release Index: sources =================================================================== RCS file: /cvs/extras/rpms/ghc/FC-4/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 2 Jun 2005 01:49:10 -0000 1.4 +++ sources 20 Sep 2005 23:50:02 -0000 1.5 @@ -1 +1 @@ -45ea4e15f135698feb88d12c5000aaf8 ghc-6.4-src.tar.bz2 +fd289bc7c3afa272ff831a71a50b5b00 ghc-6.4.1-src.tar.bz2 --- ghc-6.4-dsforeign-x86_64-1097471.patch DELETED --- --- ghc-6.4-powerpc.patch DELETED --- --- ghc-6.4-rts-adjustor-x86_64-1097471.patch DELETED --- --- rts-GCCompact.h-x86_64.patch DELETED --- From fedora-extras-commits at redhat.com Wed Sep 21 00:14:46 2005 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Tue, 20 Sep 2005 20:14:46 -0400 Subject: rpms/ghc/FC-3 .cvsignore, 1.4, 1.5 ghc.spec, 1.3, 1.4 sources, 1.4, 1.5 ghc-6.4-dsforeign-x86_64-1097471.patch, 1.1, NONE ghc-6.4-powerpc.patch, 1.1, NONE ghc-6.4-rts-adjustor-x86_64-1097471.patch, 1.1, NONE rts-GCCompact.h-x86_64.patch, 1.1, NONE Message-ID: <200509210014.j8L0EkVO014443@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/ghc/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14420 Modified Files: .cvsignore ghc.spec sources Removed Files: ghc-6.4-dsforeign-x86_64-1097471.patch ghc-6.4-powerpc.patch ghc-6.4-rts-adjustor-x86_64-1097471.patch rts-GCCompact.h-x86_64.patch Log Message: - 6.4.1 release - the following patches are now upstream: ghc-6.4-powerpc.patch, rts-GCCompact.h-x86_64.patch, ghc-6.4-dsforeign-x86_64-1097471.patch, ghc-6.4-rts-adjustor-x86_64-1097471.patch - x86_64 build restrictions (no ghci and split objects) no longer apply Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/ghc/FC-3/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 2 Jun 2005 01:46:01 -0000 1.4 +++ .cvsignore 21 Sep 2005 00:14:44 -0000 1.5 @@ -1 +1 @@ -ghc-6.4-src.tar.bz2 +ghc-6.4.1-src.tar.bz2 Index: ghc.spec =================================================================== RCS file: /cvs/extras/rpms/ghc/FC-3/ghc.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- ghc.spec 31 May 2005 08:50:25 -0000 1.3 +++ ghc.spec 21 Sep 2005 00:14:44 -0000 1.4 @@ -1,13 +1,13 @@ %define build_version 6.4 -%define ghcver ghc64 +%define ghcver ghc641 # speed up test builds by not building profiled libraries %define build_prof 1 %define build_doc 0 Name: ghc -Version: 6.4 -Release: 8%{?dist} +Version: 6.4.1 +Release: 1%{?dist} Summary: Glasgow Haskell Compilation system License: BSD style Group: Development/Languages @@ -15,17 +15,13 @@ URL: http://haskell.org/ghc/ Requires: %{ghcver} = %{version}-%{release} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: sed, %{ghcver} +BuildRequires: ghc, sed Buildrequires: gmp-devel, readline-devel, xorg-x11-devel, freeglut-devel, openal-devel %if %{build_doc} # haddock generates libraries/ docs Buildrequires: libxslt, docbook-style-xsl, haddock %endif Prefix: %{_prefix} -Patch1: ghc-6.4-powerpc.patch -Patch2: rts-GCCompact.h-x86_64.patch -Patch3: ghc-6.4-dsforeign-x86_64-1097471.patch -Patch4: ghc-6.4-rts-adjustor-x86_64-1097471.patch %description GHC is a state-of-the-art programming suite for Haskell, a purely @@ -82,16 +78,8 @@ %prep %setup -q -n ghc-%{version} -%patch1 -p1 -b .1-ppc -%patch2 -p1 -b .2-x86_64 -%patch3 -p1 -b .3-x86_64 -%patch4 -p1 -b .4-x86_64 %build -%ifarch x86_64 -echo "SplitObjs = NO" >> mk/build.mk -echo "GhcWithInterpreter = NO" >> mk/build.mk -%endif %if !%{build_prof} echo "GhcLibWays=" >> mk/build.mk echo "GhcRTSWays=thr debug" >> mk/build.mk @@ -168,6 +156,13 @@ %endif %changelog +* Tue Sep 20 2005 Jens Petersen - 6.4.1-1 +- 6.4.1 release + - the following patches are now upstream: ghc-6.4-powerpc.patch, + rts-GCCompact.h-x86_64.patch, ghc-6.4-dsforeign-x86_64-1097471.patch, + ghc-6.4-rts-adjustor-x86_64-1097471.patch + - x86_64 build restrictions (no ghci and split objects) no longer apply + * Tue May 31 2005 Jens Petersen - add %%dist to release Index: sources =================================================================== RCS file: /cvs/extras/rpms/ghc/FC-3/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 2 Jun 2005 01:46:02 -0000 1.4 +++ sources 21 Sep 2005 00:14:44 -0000 1.5 @@ -1 +1 @@ -45ea4e15f135698feb88d12c5000aaf8 ghc-6.4-src.tar.bz2 +fd289bc7c3afa272ff831a71a50b5b00 ghc-6.4.1-src.tar.bz2 --- ghc-6.4-dsforeign-x86_64-1097471.patch DELETED --- --- ghc-6.4-powerpc.patch DELETED --- --- ghc-6.4-rts-adjustor-x86_64-1097471.patch DELETED --- --- rts-GCCompact.h-x86_64.patch DELETED --- From fedora-extras-commits at redhat.com Wed Sep 21 01:14:58 2005 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Tue, 20 Sep 2005 21:14:58 -0400 Subject: rpms/fig2ps - New directory Message-ID: <200509210114.j8L1EwU0016003@cvs-int.fedora.redhat.com> Author: qspencer Update of /cvs/extras/rpms/fig2ps In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15983/fig2ps Log Message: Directory /cvs/extras/rpms/fig2ps added to the repository From fedora-extras-commits at redhat.com Wed Sep 21 01:14:58 2005 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Tue, 20 Sep 2005 21:14:58 -0400 Subject: rpms/fig2ps/devel - New directory Message-ID: <200509210115.j8L1EwDM016008@cvs-int.fedora.redhat.com> Author: qspencer Update of /cvs/extras/rpms/fig2ps/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15983/fig2ps/devel Log Message: Directory /cvs/extras/rpms/fig2ps/devel added to the repository From fedora-extras-commits at redhat.com Wed Sep 21 01:15:36 2005 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Tue, 20 Sep 2005 21:15:36 -0400 Subject: rpms/fig2ps Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200509210115.j8L1Fa0k016059@cvs-int.fedora.redhat.com> Author: qspencer Update of /cvs/extras/rpms/fig2ps In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16030 Added Files: Makefile import.log Log Message: Setup of module fig2ps --- NEW FILE Makefile --- # Top level Makefile for module fig2ps all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Wed Sep 21 01:15:37 2005 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Tue, 20 Sep 2005 21:15:37 -0400 Subject: rpms/fig2ps/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200509210115.j8L1Fbix016064@cvs-int.fedora.redhat.com> Author: qspencer Update of /cvs/extras/rpms/fig2ps/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16030/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module fig2ps --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Wed Sep 21 01:16:41 2005 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Tue, 20 Sep 2005 21:16:41 -0400 Subject: rpms/fig2ps import.log,1.1,1.2 Message-ID: <200509210116.j8L1GfKd016133@cvs-int.fedora.redhat.com> Author: qspencer Update of /cvs/extras/rpms/fig2ps In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16098 Modified Files: import.log Log Message: auto-import fig2ps-1.3.3-1 on branch devel from fig2ps-1.3.3-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/fig2ps/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 21 Sep 2005 01:15:34 -0000 1.1 +++ import.log 21 Sep 2005 01:16:39 -0000 1.2 @@ -0,0 +1 @@ +fig2ps-1_3_3-1:HEAD:fig2ps-1.3.3-1.src.rpm:1127265388 From fedora-extras-commits at redhat.com Wed Sep 21 01:16:41 2005 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Tue, 20 Sep 2005 21:16:41 -0400 Subject: rpms/fig2ps/devel fig2ps.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200509210116.j8L1GfgB016140@cvs-int.fedora.redhat.com> Author: qspencer Update of /cvs/extras/rpms/fig2ps/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16098/devel Modified Files: .cvsignore sources Added Files: fig2ps.spec Log Message: auto-import fig2ps-1.3.3-1 on branch devel from fig2ps-1.3.3-1.src.rpm --- NEW FILE fig2ps.spec --- Name: fig2ps Version: 1.3.3 Release: 1 Summary: Utility for converting xfig pictures to PS/PDF Group: Applications/Publishing License: GPL URL: http://fig2ps.sourceforge.net/ Source0: http://prdownloads.sourceforge.net/fig2ps/%{name}_%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch Requires: tetex-latex tetex-dvips ghostscript transfig %description fig2ps is a perl script which converts xfig files to postscript or PDF, using LaTeX for processing text (a capability not included in transfig). This provides the benefit of seamless integration of figures into documents (the font in the figures is the same as in the text), and allows for special typesetting commands (such as mathematical equations) to be included in figures. %prep %setup -q %build %install rm -rf $RPM_BUILD_ROOT %makeinstall DESTDIR=$RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT%{_datadir}/doc %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc README examples %{_bindir}/* %{_mandir}/*/* %config(noreplace) /etc/fig2ps %changelog * Tue Sep 20 2005 Quentin Spencer 1.3.3-1 - Initial version. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/fig2ps/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 21 Sep 2005 01:15:34 -0000 1.1 +++ .cvsignore 21 Sep 2005 01:16:39 -0000 1.2 @@ -0,0 +1 @@ +fig2ps_1.3.3.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/fig2ps/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 21 Sep 2005 01:15:34 -0000 1.1 +++ sources 21 Sep 2005 01:16:39 -0000 1.2 @@ -0,0 +1 @@ +24d2061f7491160e870beb6904672663 fig2ps_1.3.3.tar.gz From fedora-extras-commits at redhat.com Wed Sep 21 06:28:56 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Wed, 21 Sep 2005 02:28:56 -0400 Subject: rpms/wesnoth/devel .cvsignore, 1.9, 1.10 sources, 1.9, 1.10 wesnoth.spec, 1.19, 1.20 Message-ID: <200509210628.j8L6SuJ9023435@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/wesnoth/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23412 Modified Files: .cvsignore sources wesnoth.spec Log Message: * Wed Sep 21 2005 Michael Schwendt - 1.0-0.1.rc1 - update to 1.0rc1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/wesnoth/devel/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 14 Sep 2005 04:50:08 -0000 1.9 +++ .cvsignore 21 Sep 2005 06:28:54 -0000 1.10 @@ -1 +1 @@ -wesnoth-0.9.7.tar.gz +wesnoth-1.0rc1.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/wesnoth/devel/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 14 Sep 2005 04:50:08 -0000 1.9 +++ sources 21 Sep 2005 06:28:54 -0000 1.10 @@ -1 +1 @@ -c2c863c58a3eb7de5fce882d8a1944e1 wesnoth-0.9.7.tar.gz +9a12505fbbb81d91a2975f73b0788174 wesnoth-1.0rc1.tar.gz Index: wesnoth.spec =================================================================== RCS file: /cvs/extras/rpms/wesnoth/devel/wesnoth.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- wesnoth.spec 14 Sep 2005 04:50:08 -0000 1.19 +++ wesnoth.spec 21 Sep 2005 06:28:54 -0000 1.20 @@ -1,12 +1,12 @@ Name: wesnoth -Version: 0.9.7 -Release: 1%{?dist} +Version: 1.0 +Release: 0.1.rc1%{?dist} Summary: Turn-based strategy game with a fantasy theme Group: Amusements/Games License: GPL URL: http://www.wesnoth.org -Source0: http://www.wesnoth.org/files/wesnoth-%{version}.tar.gz +Source0: http://www.wesnoth.org/files/wesnoth-1.0rc1.tar.gz Source1: wesnothd.init Source2: wesnoth.sysconfig Source3: README.fedora @@ -59,7 +59,7 @@ %prep -%setup -q +%setup -q -n %{name}-1.0rc1 cp %{SOURCE3} . @@ -156,6 +156,9 @@ %ghost /var/run/wesnothd/socket %changelog +* Wed Sep 21 2005 Michael Schwendt - 1.0-0.1.rc1 +- update to 1.0rc1 + * Wed Sep 14 2005 Michael Schwendt - 0.9.7-1 - update to 0.9.7 From fedora-extras-commits at redhat.com Wed Sep 21 06:29:47 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Wed, 21 Sep 2005 02:29:47 -0400 Subject: common tobuild,1.2219,1.2220 Message-ID: <200509210629.j8L6TlwB023499@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23480 Modified Files: tobuild Log Message: request build of rpms/wesnoth/devel wesnoth-1_0-0_1_rc1_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2219 retrieving revision 1.2220 diff -u -r1.2219 -r1.2220 --- tobuild 19 Sep 2005 22:21:25 -0000 1.2219 +++ tobuild 21 Sep 2005 06:29:45 -0000 1.2220 @@ -38,3 +38,4 @@ gemi rpms/clisp/FC-3 clisp-2_34-5_fc3 fc3 katzj rpms/perl-Class-Trigger/devel perl-Class-Trigger-0_09-3_fc5 devel orion rpms/python-matplotlib/FC-4 python-matplotlib-0_84-1_fc4 fc4 +mschwendt rpms/wesnoth/devel wesnoth-1_0-0_1_rc1_fc5 devel From fedora-extras-commits at redhat.com Wed Sep 21 06:30:28 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Wed, 21 Sep 2005 02:30:28 -0400 Subject: common tobuild,1.2220,1.2221 Message-ID: <200509210630.j8L6USgd023524@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23505 Modified Files: tobuild Log Message: Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2220 retrieving revision 1.2221 diff -u -r1.2220 -r1.2221 --- tobuild 21 Sep 2005 06:29:45 -0000 1.2220 +++ tobuild 21 Sep 2005 06:30:26 -0000 1.2221 @@ -38,4 +38,3 @@ gemi rpms/clisp/FC-3 clisp-2_34-5_fc3 fc3 katzj rpms/perl-Class-Trigger/devel perl-Class-Trigger-0_09-3_fc5 devel orion rpms/python-matplotlib/FC-4 python-matplotlib-0_84-1_fc4 fc4 -mschwendt rpms/wesnoth/devel wesnoth-1_0-0_1_rc1_fc5 devel From fedora-extras-commits at redhat.com Wed Sep 21 06:47:45 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Wed, 21 Sep 2005 02:47:45 -0400 Subject: rpms/wesnoth/devel wesnoth.spec,1.20,1.21 Message-ID: <200509210647.j8L6ljWt023581@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/wesnoth/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23562 Modified Files: wesnoth.spec Log Message: remove exe bit from Turkish manual Index: wesnoth.spec =================================================================== RCS file: /cvs/extras/rpms/wesnoth/devel/wesnoth.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- wesnoth.spec 21 Sep 2005 06:28:54 -0000 1.20 +++ wesnoth.spec 21 Sep 2005 06:47:42 -0000 1.21 @@ -61,6 +61,7 @@ %prep %setup -q -n %{name}-1.0rc1 cp %{SOURCE3} . +chmod -x MANUAL* %build @@ -158,6 +159,7 @@ %changelog * Wed Sep 21 2005 Michael Schwendt - 1.0-0.1.rc1 - update to 1.0rc1 +- remove exe bit from Turkish manual * Wed Sep 14 2005 Michael Schwendt - 0.9.7-1 - update to 0.9.7 From fedora-extras-commits at redhat.com Wed Sep 21 07:02:30 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Wed, 21 Sep 2005 03:02:30 -0400 Subject: rpms/imlib2/devel imlib2-1.2.1-X11-path.patch, NONE, 1.1 imlib2.spec, 1.15, 1.16 Message-ID: <200509210702.j8L72Umm024960@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/imlib2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24943 Modified Files: imlib2.spec Added Files: imlib2-1.2.1-X11-path.patch Log Message: * Wed Sep 21 2005 Michael Schwendt - 1.2.1-3 - Make XPM loader use /usr/lib/X11/rgb.txt instead of /usr/X11R6/... imlib2-1.2.1-X11-path.patch: --- NEW FILE imlib2-1.2.1-X11-path.patch --- diff -Nur imlib2-1.2.1-orig/src/modules/loaders/loader_xpm.c imlib2-1.2.1/src/modules/loaders/loader_xpm.c --- imlib2-1.2.1-orig/src/modules/loaders/loader_xpm.c 2005-05-18 07:26:16.000000000 +0200 +++ imlib2-1.2.1/src/modules/loaders/loader_xpm.c 2005-09-21 08:55:11.000000000 +0200 @@ -66,7 +66,7 @@ /* look in rgb txt database */ if (!rgb_txt) #ifndef __EMX__ - rgb_txt = fopen("/usr/X11R6/lib/X11/rgb.txt", "r"); + rgb_txt = fopen("/usr/lib/X11/rgb.txt", "r"); #else rgb_txt = fopen(__XOS2RedirRoot("/XFree86/lib/X11/rgb.txt"), "rt"); #endif Index: imlib2.spec =================================================================== RCS file: /cvs/extras/rpms/imlib2/devel/imlib2.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- imlib2.spec 20 Sep 2005 19:09:39 -0000 1.15 +++ imlib2.spec 21 Sep 2005 07:02:28 -0000 1.16 @@ -1,11 +1,12 @@ Summary: Image loading, saving, rendering, and manipulation library Name: imlib2 Version: 1.2.1 -Release: 2%{?dist} +Release: 3%{?dist} License: BSD Group: System Environment/Libraries URL: http://www.enlightenment.org/Libraries/Imlib2/ Source0: http://download.sf.net/enlightenment/%{name}-%{version}.tar.gz +Patch0: imlib2-1.2.1-X11-path.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot BuildRequires: XFree86-devel libjpeg-devel libpng-devel libtiff-devel BuildRequires: libungif-devel freetype-devel >= 2.1.9-4 libtool bzip2-devel @@ -40,6 +41,7 @@ %prep %setup -q +%patch0 -p1 -b .x11-path %build @@ -112,6 +114,9 @@ %changelog +* Wed Sep 21 2005 Michael Schwendt - 1.2.1-3 +- Make XPM loader use /usr/lib/X11/rgb.txt instead of /usr/X11R6/... + * Sun Aug 28 2005 Ville Skytt?? - 1.2.1-2 - 1.2.1, patches applied/obsoleted upstream. - Improve summary and description, fix URL. From fedora-extras-commits at redhat.com Wed Sep 21 08:58:13 2005 From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard)) Date: Wed, 21 Sep 2005 04:58:13 -0400 Subject: rpms/amarok/FC-3 .cvsignore, 1.9, 1.10 amarok.spec, 1.12, 1.13 sources, 1.9, 1.10 Message-ID: <200509210858.j8L8wD4H027230@cvs-int.fedora.redhat.com> Author: abompard Update of /cvs/extras/rpms/amarok/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27192/FC-3 Modified Files: .cvsignore amarok.spec sources Log Message: - version 1.3.2 - remove patch 4 (applied upstream) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/amarok/FC-3/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 24 May 2005 10:56:28 -0000 1.9 +++ .cvsignore 21 Sep 2005 08:58:11 -0000 1.10 @@ -1 +1 @@ -amarok-1.2.4.tar.bz2 +amarok-1.3.2.tar.bz2 Index: amarok.spec =================================================================== RCS file: /cvs/extras/rpms/amarok/FC-3/amarok.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- amarok.spec 29 May 2005 13:51:39 -0000 1.12 +++ amarok.spec 21 Sep 2005 08:58:11 -0000 1.13 @@ -6,14 +6,16 @@ Name: amarok Summary: Media player for KDE -Version: 1.2.4 +Version: 1.3.2 Release: 1%{?dist} Group: Applications/Multimedia License: GPL Url: http://amarok.kde.org -Source0: http://dl.sf.net/amarok/amarok-1.2.4.tar.bz2 +Source0: http://dl.sf.net/amarok/amarok-1.3.2.tar.bz2 Patch0: amarok-1.2.4-gcc4bl.patch +Patch2: amarok-1.3-engines-cfg.patch +Patch3: amarok-1.3-endian.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: kdemultimedia-devel >= 6:3.2 @@ -23,10 +25,9 @@ BuildRequires: gstreamer-plugins-devel >= 0.8.4 BuildRequires: libmusicbrainz-devel, xmms-devel >= 1:1.2 BuildRequires: libvisual-devel >= 0.2.0, SDL-devel, gtk+-devel -%if "%fedora" >= "4" BuildRequires: libtool-ltdl-devel -%else -BuildRequires: libtool +%ifnarch ppc64 x86_64 s390 s390x ia64 +BuildRequires: HelixPlayer %endif %if 0%{?use_xine} @@ -36,14 +37,22 @@ Requires: kdemultimedia >= 6:3.2 +Obsoletes: amarok-arts < 1.3, amarok-akode < 1.3 + + %description Amarok is a KDE multimedia player with: - fresh playlist concept, very fast to use, with drag and drop - - plays all formats supported by aRts, gstreamer or xine + - plays all formats supported by the various engines - audio effects, like reverb and compressor - compatible with the .m3u and .pls formats for playlists - nice GUI, integrates into the KDE look, but with a unique touch +Amarok can use various engines to decode sound : gstreamer, arts, +helix and xine (disabled by default for patent reasons) +To use the helix engine, you'll have to install either HelixPlayer +or RealPlayer + %package visualisation Summary: Visualisation plugins for Amarok @@ -56,27 +65,6 @@ use any of xmms' visualisation plugins with Amarok. -%package arts -Summary: Arts engine for Amarok -Group: Applications/Multimedia -Requires: %{name} = %{version} - -%description arts -Amarok can also use the arts engine to decode sound. This package -enables it. - - -%if "%fedora" >= "4" -%package akode -Summary: AKode engine for Amarok -Group: Applications/Multimedia -Requires: %{name} = %{version} - -%description akode -Amarok can also use the akode engine to decode sound. This package -enables it. -%endif - %if 0%{?use_xine} %package xine Summary: Xine engine for Amarok @@ -93,10 +81,14 @@ %setup -q # remove test for GCC blacklisting %patch0 -p1 -b .gcc4bl +%patch2 -p1 -b .engines-cfg +%patch3 -p1 -b .endian %build -unset QTDIR || : ; . /etc/profile.d/qt.sh +unset QTDIR && . %{_sysconfdir}/profile.d/qt.sh +# work around an improper ${kdelibsuff} +export QTLIB=${QTDIR}/lib QTINC=${QTDIR}/include %configure \ --disable-debug \ %if %{?use_xine:0}%{!?use_xine:1} @@ -139,8 +131,22 @@ %find_lang %{name} -%post -p /sbin/ldconfig -%postun -p /sbin/ldconfig +%post +/sbin/ldconfig +# update icon themes if necessary +if [ -x %{_bindir}/gtk-update-icon-cache ]; then + %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg || : + # needed because amarok 1.2 puts icon in hicolor + # and the RPM did not update the cache on uninstall + %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : +fi + +%postun +/sbin/ldconfig +# update icon themes if necessary +if [ -x %{_bindir}/gtk-update-icon-cache ]; then + %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg || : +fi %clean @@ -163,33 +169,28 @@ %{_libdir}/kde3/konqsidebar_universalamarok.* %{_datadir}/apps/konqsidebartng/*/amarok.desktop %{_datadir}/apps/profiles/amarok.profile.xml - %{_libdir}/mcop/Amarok %{_libdir}/mcop/amarok* %{_datadir}/config/amarokrc %{_datadir}/config.kcfg/*.kcfg %{_datadir}/doc/HTML/*/amarok - - -%files visualisation -%defattr(-,root,root) -%{_bindir}/amarok_libvisual -%{_bindir}/amarok_xmmswrapper2 - - -%files arts -%defattr(-,root,root) +# Arts engine %{_libdir}/libamarokarts* %{_libdir}/kde3/libamarok_artsengine_plugin.* %{_datadir}/services/amarok_artsengine_plugin.desktop +# Helix engine +%ifnarch ppc64 x86_64 s390 s390x ia64 +%{_libdir}/kde3/libamarok_helixengine_plugin.* +%{_datadir}/services/amarok_helixengine_plugin.desktop +%endif +%exclude %{_datadir}/apps/zeroconf/_shoutcast._tcp -%if "%fedora" >= "4" -%files akode + +%files visualisation %defattr(-,root,root) -%{_libdir}/kde3/libamarok_aKode-engine.* -%{_datadir}/services/amarok_aKode-engine.desktop -%endif +%{_bindir}/amarok_libvisual +%{_bindir}/amarok_xmmswrapper2 %if 0%{?use_xine} @@ -202,6 +203,66 @@ %changelog +* Wed Sep 21 2005 Aurelien Bompard 1.3.2-1 +- version 1.3.2 +- remove patch 4 (applied upstream) + +* Sat Sep 10 2005 Aurelien Bompard 1.3.1-2 +- add patch from upstream to fix alsasink in gstreamer +- default to autoaudiosink for gstreamer + +* Mon Sep 05 2005 Aurelien Bompard 1.3.1-1 +- version 1.3.1 + +* Tue Aug 23 2005 Aurelien Bompard 1.3-6 +- add version to obsoletes + +* Tue Aug 23 2005 Aurelien Bompard 1.3-5 +- add missing Obsoletes. + +* Mon Aug 22 2005 Aurelien Bompard 1.3-4 +- fix endian declaration on ppc + +* Mon Aug 22 2005 Aurelien Bompard 1.3-3 +- dont build the Helix engine on arches where HelixPlayer is not built + +* Mon Aug 22 2005 Aurelien Bompard 1.3-2 +- disable the akode engine (disabled upstream, see Changelog) +- merge in the Helix engine, since it does not have special Requires. + HelixPlayer or RealPlayer need to be installed manually (either one) +- updated description + +* Mon Aug 22 2005 Aurelien Bompard 1.3-1 +- update to version 1.3 +- add Michel Salim's improvements: + - call gtk-update-icon-cache to (de-)register icons + - new output plugin subpackage: helix + - patched gst and helix plugins' default settings + +* Fri Jul 01 2005 Aurelien Bompard 1.2.4-6 +- remove -arts subpackage, it is useless + +* Thu Jun 2 2005 Michael Schwendt - 1.2.4-6.fc5 +- remove temporary work-around from 1.2.4-2.fc4 +- add patch to fix several missing forward declarations which let + compilation with gcc >= 4.0.0-9 fail +- re-enable SMP make flags + +* Thu Jun 2 2005 Michael Schwendt - 1.2.4-5.fc4 +- disable SMP make flags, since previous release failed miserably on + i386 while the one before it succeeded + +* Thu Jun 2 2005 Michael Schwendt - 1.2.4-4.fc4 +- set QTLIB and QTINC, so configure script does not search for Qt in + QTDIR/lib64 on 64-bit multilib platforms + +* Thu Jun 2 2005 Michael Schwendt - 1.2.4-3.fc4 +- try to fix build problems (#158654): always set QTDIR, always + buildrequire libtool-ltdl-devel, disable %%fedora conditional BR + +* Thu Jun 2 2005 Michael Schwendt - 1.2.4-2.fc4 +- temporarily add patch to work around Fedora Core bug 159090 + * Mon May 23 2005 Aurelien Bompard 1.2.4-1 - version 1.2.4 - use dist tag Index: sources =================================================================== RCS file: /cvs/extras/rpms/amarok/FC-3/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 24 May 2005 10:56:28 -0000 1.9 +++ sources 21 Sep 2005 08:58:11 -0000 1.10 @@ -1 +1 @@ -9a3bb2c043d1db169c6a370aff439e0f amarok-1.2.4.tar.bz2 +5988bf5a1e6ac8da41e1a8710d75b6a8 amarok-1.3.2.tar.bz2 From fedora-extras-commits at redhat.com Wed Sep 21 08:58:14 2005 From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard)) Date: Wed, 21 Sep 2005 04:58:14 -0400 Subject: rpms/amarok/devel .cvsignore, 1.11, 1.12 amarok.spec, 1.24, 1.25 sources, 1.11, 1.12 amarok-1.2.4-forward-decl.patch, 1.1, NONE amarok-1.3.1-alsa-gst.patch, 1.1, NONE Message-ID: <200509210858.j8L8wEpu027239@cvs-int.fedora.redhat.com> Author: abompard Update of /cvs/extras/rpms/amarok/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27192/devel Modified Files: .cvsignore amarok.spec sources Removed Files: amarok-1.2.4-forward-decl.patch amarok-1.3.1-alsa-gst.patch Log Message: - version 1.3.2 - remove patch 4 (applied upstream) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/amarok/devel/.cvsignore,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- .cvsignore 10 Sep 2005 08:22:35 -0000 1.11 +++ .cvsignore 21 Sep 2005 08:58:12 -0000 1.12 @@ -1 +1 @@ -amarok-1.3.1.tar.bz2 +amarok-1.3.2.tar.bz2 Index: amarok.spec =================================================================== RCS file: /cvs/extras/rpms/amarok/devel/amarok.spec,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- amarok.spec 10 Sep 2005 08:22:35 -0000 1.24 +++ amarok.spec 21 Sep 2005 08:58:12 -0000 1.25 @@ -6,18 +6,16 @@ Name: amarok Summary: Media player for KDE -Version: 1.3.1 -Release: 2%{?dist} +Version: 1.3.2 +Release: 1%{?dist} Group: Applications/Multimedia License: GPL Url: http://amarok.kde.org -Source0: http://dl.sf.net/amarok/amarok-1.3.1.tar.bz2 +Source0: http://dl.sf.net/amarok/amarok-1.3.2.tar.bz2 Patch0: amarok-1.2.4-gcc4bl.patch -#Patch1: amarok-1.2.4-forward-decl.patch Patch2: amarok-1.3-engines-cfg.patch Patch3: amarok-1.3-endian.patch -Patch4: amarok-1.3.1-alsa-gst.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: kdemultimedia-devel >= 6:3.2 @@ -27,11 +25,7 @@ BuildRequires: gstreamer-plugins-devel >= 0.8.4 BuildRequires: libmusicbrainz-devel, xmms-devel >= 1:1.2 BuildRequires: libvisual-devel >= 0.2.0, SDL-devel, gtk+-devel -#%if "%fedora" >= "4" BuildRequires: libtool-ltdl-devel -#%else -#BuildRequires: libtool -#%endif %ifnarch ppc64 x86_64 s390 s390x ia64 BuildRequires: HelixPlayer %endif @@ -71,18 +65,6 @@ use any of xmms' visualisation plugins with Amarok. -#%if "%fedora" >= "4" -#%package akode -#Summary: AKode engine for Amarok -#Group: Applications/Multimedia -#Requires: %{name} = %{version} -# -#%description akode -#Amarok can also use the akode engine to decode sound. This package -#enables it. -#%endif - - %if 0%{?use_xine} %package xine Summary: Xine engine for Amarok @@ -99,10 +81,8 @@ %setup -q # remove test for GCC blacklisting %patch0 -p1 -b .gcc4bl -#%patch1 -p1 -b .forward-decl %patch2 -p1 -b .engines-cfg %patch3 -p1 -b .endian -%patch4 -p1 -b .alsa-gst %build @@ -213,16 +193,6 @@ %{_bindir}/amarok_xmmswrapper2 -#%if "%fedora" >= "4" -#%files akode -#%defattr(-,root,root) -#%{_libdir}/kde3/libamarok_aKode-engine.* -#%{_datadir}/services/amarok_aKode-engine.desktop -#%endif - - - - %if 0%{?use_xine} %files xine %defattr(-,root,root) @@ -233,6 +203,10 @@ %changelog +* Wed Sep 21 2005 Aurelien Bompard 1.3.2-1 +- version 1.3.2 +- remove patch 4 (applied upstream) + * Sat Sep 10 2005 Aurelien Bompard 1.3.1-2 - add patch from upstream to fix alsasink in gstreamer - default to autoaudiosink for gstreamer Index: sources =================================================================== RCS file: /cvs/extras/rpms/amarok/devel/sources,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- sources 10 Sep 2005 08:22:35 -0000 1.11 +++ sources 21 Sep 2005 08:58:12 -0000 1.12 @@ -1 +1 @@ -31f504e5fe985bbdb3c99f0e72d08fa1 amarok-1.3.1.tar.bz2 +5988bf5a1e6ac8da41e1a8710d75b6a8 amarok-1.3.2.tar.bz2 --- amarok-1.2.4-forward-decl.patch DELETED --- --- amarok-1.3.1-alsa-gst.patch DELETED --- From fedora-extras-commits at redhat.com Wed Sep 21 08:59:21 2005 From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard)) Date: Wed, 21 Sep 2005 04:59:21 -0400 Subject: rpms/amarok/FC-4 .cvsignore, 1.11, 1.12 amarok.spec, 1.27, 1.28 sources, 1.11, 1.12 Message-ID: <200509210859.j8L8xLuJ027306@cvs-int.fedora.redhat.com> Author: abompard Update of /cvs/extras/rpms/amarok/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27283/FC-4 Modified Files: .cvsignore amarok.spec sources Log Message: - version 1.3.2 - remove patch 4 (applied upstream) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/amarok/FC-4/.cvsignore,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- .cvsignore 10 Sep 2005 08:22:34 -0000 1.11 +++ .cvsignore 21 Sep 2005 08:59:19 -0000 1.12 @@ -1 +1 @@ -amarok-1.3.1.tar.bz2 +amarok-1.3.2.tar.bz2 Index: amarok.spec =================================================================== RCS file: /cvs/extras/rpms/amarok/FC-4/amarok.spec,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- amarok.spec 10 Sep 2005 08:22:34 -0000 1.27 +++ amarok.spec 21 Sep 2005 08:59:19 -0000 1.28 @@ -6,18 +6,16 @@ Name: amarok Summary: Media player for KDE -Version: 1.3.1 -Release: 2%{?dist} +Version: 1.3.2 +Release: 1%{?dist} Group: Applications/Multimedia License: GPL Url: http://amarok.kde.org -Source0: http://dl.sf.net/amarok/amarok-1.3.1.tar.bz2 +Source0: http://dl.sf.net/amarok/amarok-1.3.2.tar.bz2 Patch0: amarok-1.2.4-gcc4bl.patch -#Patch1: amarok-1.2.4-forward-decl.patch Patch2: amarok-1.3-engines-cfg.patch Patch3: amarok-1.3-endian.patch -Patch4: amarok-1.3.1-alsa-gst.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: kdemultimedia-devel >= 6:3.2 @@ -27,11 +25,7 @@ BuildRequires: gstreamer-plugins-devel >= 0.8.4 BuildRequires: libmusicbrainz-devel, xmms-devel >= 1:1.2 BuildRequires: libvisual-devel >= 0.2.0, SDL-devel, gtk+-devel -#%if "%fedora" >= "4" BuildRequires: libtool-ltdl-devel -#%else -#BuildRequires: libtool -#%endif %ifnarch ppc64 x86_64 s390 s390x ia64 BuildRequires: HelixPlayer %endif @@ -71,18 +65,6 @@ use any of xmms' visualisation plugins with Amarok. -#%if "%fedora" >= "4" -#%package akode -#Summary: AKode engine for Amarok -#Group: Applications/Multimedia -#Requires: %{name} = %{version} -# -#%description akode -#Amarok can also use the akode engine to decode sound. This package -#enables it. -#%endif - - %if 0%{?use_xine} %package xine Summary: Xine engine for Amarok @@ -99,10 +81,8 @@ %setup -q # remove test for GCC blacklisting %patch0 -p1 -b .gcc4bl -#%patch1 -p1 -b .forward-decl %patch2 -p1 -b .engines-cfg %patch3 -p1 -b .endian -%patch4 -p1 -b .alsa-gst %build @@ -213,16 +193,6 @@ %{_bindir}/amarok_xmmswrapper2 -#%if "%fedora" >= "4" -#%files akode -#%defattr(-,root,root) -#%{_libdir}/kde3/libamarok_aKode-engine.* -#%{_datadir}/services/amarok_aKode-engine.desktop -#%endif - - - - %if 0%{?use_xine} %files xine %defattr(-,root,root) @@ -233,6 +203,10 @@ %changelog +* Wed Sep 21 2005 Aurelien Bompard 1.3.2-1 +- version 1.3.2 +- remove patch 4 (applied upstream) + * Sat Sep 10 2005 Aurelien Bompard 1.3.1-2 - add patch from upstream to fix alsasink in gstreamer - default to autoaudiosink for gstreamer Index: sources =================================================================== RCS file: /cvs/extras/rpms/amarok/FC-4/sources,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- sources 10 Sep 2005 08:22:34 -0000 1.11 +++ sources 21 Sep 2005 08:59:19 -0000 1.12 @@ -1 +1 @@ -31f504e5fe985bbdb3c99f0e72d08fa1 amarok-1.3.1.tar.bz2 +5988bf5a1e6ac8da41e1a8710d75b6a8 amarok-1.3.2.tar.bz2 From fedora-extras-commits at redhat.com Wed Sep 21 09:36:50 2005 From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard)) Date: Wed, 21 Sep 2005 05:36:50 -0400 Subject: rpms/amarok/FC-3 .cvsignore, 1.10, 1.11 amarok.spec, 1.13, 1.14 sources, 1.10, 1.11 Message-ID: <200509210936.j8L9aoOM028967@cvs-int.fedora.redhat.com> Author: abompard Update of /cvs/extras/rpms/amarok/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28944 Modified Files: .cvsignore amarok.spec sources Log Message: - revert commit in the wrong branch Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/amarok/FC-3/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 21 Sep 2005 08:58:11 -0000 1.10 +++ .cvsignore 21 Sep 2005 09:36:48 -0000 1.11 @@ -1 +1 @@ -amarok-1.3.2.tar.bz2 +amarok-1.2.4.tar.bz2 Index: amarok.spec =================================================================== RCS file: /cvs/extras/rpms/amarok/FC-3/amarok.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- amarok.spec 21 Sep 2005 08:58:11 -0000 1.13 +++ amarok.spec 21 Sep 2005 09:36:48 -0000 1.14 @@ -6,16 +6,14 @@ Name: amarok Summary: Media player for KDE -Version: 1.3.2 +Version: 1.2.4 Release: 1%{?dist} Group: Applications/Multimedia License: GPL Url: http://amarok.kde.org -Source0: http://dl.sf.net/amarok/amarok-1.3.2.tar.bz2 +Source0: http://dl.sf.net/amarok/amarok-1.2.4.tar.bz2 Patch0: amarok-1.2.4-gcc4bl.patch -Patch2: amarok-1.3-engines-cfg.patch -Patch3: amarok-1.3-endian.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: kdemultimedia-devel >= 6:3.2 @@ -25,9 +23,10 @@ BuildRequires: gstreamer-plugins-devel >= 0.8.4 BuildRequires: libmusicbrainz-devel, xmms-devel >= 1:1.2 BuildRequires: libvisual-devel >= 0.2.0, SDL-devel, gtk+-devel +%if "%fedora" >= "4" BuildRequires: libtool-ltdl-devel -%ifnarch ppc64 x86_64 s390 s390x ia64 -BuildRequires: HelixPlayer +%else +BuildRequires: libtool %endif %if 0%{?use_xine} @@ -37,22 +36,14 @@ Requires: kdemultimedia >= 6:3.2 -Obsoletes: amarok-arts < 1.3, amarok-akode < 1.3 - - %description Amarok is a KDE multimedia player with: - fresh playlist concept, very fast to use, with drag and drop - - plays all formats supported by the various engines + - plays all formats supported by aRts, gstreamer or xine - audio effects, like reverb and compressor - compatible with the .m3u and .pls formats for playlists - nice GUI, integrates into the KDE look, but with a unique touch -Amarok can use various engines to decode sound : gstreamer, arts, -helix and xine (disabled by default for patent reasons) -To use the helix engine, you'll have to install either HelixPlayer -or RealPlayer - %package visualisation Summary: Visualisation plugins for Amarok @@ -65,6 +56,27 @@ use any of xmms' visualisation plugins with Amarok. +%package arts +Summary: Arts engine for Amarok +Group: Applications/Multimedia +Requires: %{name} = %{version} + +%description arts +Amarok can also use the arts engine to decode sound. This package +enables it. + + +%if "%fedora" >= "4" +%package akode +Summary: AKode engine for Amarok +Group: Applications/Multimedia +Requires: %{name} = %{version} + +%description akode +Amarok can also use the akode engine to decode sound. This package +enables it. +%endif + %if 0%{?use_xine} %package xine Summary: Xine engine for Amarok @@ -81,14 +93,10 @@ %setup -q # remove test for GCC blacklisting %patch0 -p1 -b .gcc4bl -%patch2 -p1 -b .engines-cfg -%patch3 -p1 -b .endian %build -unset QTDIR && . %{_sysconfdir}/profile.d/qt.sh -# work around an improper ${kdelibsuff} -export QTLIB=${QTDIR}/lib QTINC=${QTDIR}/include +unset QTDIR || : ; . /etc/profile.d/qt.sh %configure \ --disable-debug \ %if %{?use_xine:0}%{!?use_xine:1} @@ -131,22 +139,8 @@ %find_lang %{name} -%post -/sbin/ldconfig -# update icon themes if necessary -if [ -x %{_bindir}/gtk-update-icon-cache ]; then - %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg || : - # needed because amarok 1.2 puts icon in hicolor - # and the RPM did not update the cache on uninstall - %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : -fi - -%postun -/sbin/ldconfig -# update icon themes if necessary -if [ -x %{_bindir}/gtk-update-icon-cache ]; then - %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg || : -fi +%post -p /sbin/ldconfig +%postun -p /sbin/ldconfig %clean @@ -169,22 +163,12 @@ %{_libdir}/kde3/konqsidebar_universalamarok.* %{_datadir}/apps/konqsidebartng/*/amarok.desktop %{_datadir}/apps/profiles/amarok.profile.xml + %{_libdir}/mcop/Amarok %{_libdir}/mcop/amarok* %{_datadir}/config/amarokrc %{_datadir}/config.kcfg/*.kcfg %{_datadir}/doc/HTML/*/amarok -# Arts engine -%{_libdir}/libamarokarts* -%{_libdir}/kde3/libamarok_artsengine_plugin.* -%{_datadir}/services/amarok_artsengine_plugin.desktop -# Helix engine -%ifnarch ppc64 x86_64 s390 s390x ia64 -%{_libdir}/kde3/libamarok_helixengine_plugin.* -%{_datadir}/services/amarok_helixengine_plugin.desktop -%endif - -%exclude %{_datadir}/apps/zeroconf/_shoutcast._tcp %files visualisation @@ -193,6 +177,21 @@ %{_bindir}/amarok_xmmswrapper2 +%files arts +%defattr(-,root,root) +%{_libdir}/libamarokarts* +%{_libdir}/kde3/libamarok_artsengine_plugin.* +%{_datadir}/services/amarok_artsengine_plugin.desktop + + +%if "%fedora" >= "4" +%files akode +%defattr(-,root,root) +%{_libdir}/kde3/libamarok_aKode-engine.* +%{_datadir}/services/amarok_aKode-engine.desktop +%endif + + %if 0%{?use_xine} %files xine %defattr(-,root,root) @@ -203,66 +202,6 @@ %changelog -* Wed Sep 21 2005 Aurelien Bompard 1.3.2-1 -- version 1.3.2 -- remove patch 4 (applied upstream) - -* Sat Sep 10 2005 Aurelien Bompard 1.3.1-2 -- add patch from upstream to fix alsasink in gstreamer -- default to autoaudiosink for gstreamer - -* Mon Sep 05 2005 Aurelien Bompard 1.3.1-1 -- version 1.3.1 - -* Tue Aug 23 2005 Aurelien Bompard 1.3-6 -- add version to obsoletes - -* Tue Aug 23 2005 Aurelien Bompard 1.3-5 -- add missing Obsoletes. - -* Mon Aug 22 2005 Aurelien Bompard 1.3-4 -- fix endian declaration on ppc - -* Mon Aug 22 2005 Aurelien Bompard 1.3-3 -- dont build the Helix engine on arches where HelixPlayer is not built - -* Mon Aug 22 2005 Aurelien Bompard 1.3-2 -- disable the akode engine (disabled upstream, see Changelog) -- merge in the Helix engine, since it does not have special Requires. - HelixPlayer or RealPlayer need to be installed manually (either one) -- updated description - -* Mon Aug 22 2005 Aurelien Bompard 1.3-1 -- update to version 1.3 -- add Michel Salim's improvements: - - call gtk-update-icon-cache to (de-)register icons - - new output plugin subpackage: helix - - patched gst and helix plugins' default settings - -* Fri Jul 01 2005 Aurelien Bompard 1.2.4-6 -- remove -arts subpackage, it is useless - -* Thu Jun 2 2005 Michael Schwendt - 1.2.4-6.fc5 -- remove temporary work-around from 1.2.4-2.fc4 -- add patch to fix several missing forward declarations which let - compilation with gcc >= 4.0.0-9 fail -- re-enable SMP make flags - -* Thu Jun 2 2005 Michael Schwendt - 1.2.4-5.fc4 -- disable SMP make flags, since previous release failed miserably on - i386 while the one before it succeeded - -* Thu Jun 2 2005 Michael Schwendt - 1.2.4-4.fc4 -- set QTLIB and QTINC, so configure script does not search for Qt in - QTDIR/lib64 on 64-bit multilib platforms - -* Thu Jun 2 2005 Michael Schwendt - 1.2.4-3.fc4 -- try to fix build problems (#158654): always set QTDIR, always - buildrequire libtool-ltdl-devel, disable %%fedora conditional BR - -* Thu Jun 2 2005 Michael Schwendt - 1.2.4-2.fc4 -- temporarily add patch to work around Fedora Core bug 159090 - * Mon May 23 2005 Aurelien Bompard 1.2.4-1 - version 1.2.4 - use dist tag Index: sources =================================================================== RCS file: /cvs/extras/rpms/amarok/FC-3/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 21 Sep 2005 08:58:11 -0000 1.10 +++ sources 21 Sep 2005 09:36:48 -0000 1.11 @@ -1 +1 @@ -5988bf5a1e6ac8da41e1a8710d75b6a8 amarok-1.3.2.tar.bz2 +9a3bb2c043d1db169c6a370aff439e0f amarok-1.2.4.tar.bz2 From fedora-extras-commits at redhat.com Wed Sep 21 11:10:52 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Wed, 21 Sep 2005 07:10:52 -0400 Subject: rpms/wesnoth/FC-3 .cvsignore, 1.8, 1.9 sources, 1.8, 1.9 wesnoth.spec, 1.9, 1.10 Message-ID: <200509211111.j8LBBMnc031939@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/wesnoth/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31894 Modified Files: .cvsignore sources wesnoth.spec Log Message: * Wed Sep 21 2005 Michael Schwendt - 1.0-0.1.rc1 - update to 1.0rc1 - remove exe bit from Turkish manual Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/wesnoth/FC-3/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 14 Sep 2005 04:52:44 -0000 1.8 +++ .cvsignore 21 Sep 2005 11:10:30 -0000 1.9 @@ -1 +1 @@ -wesnoth-0.9.7.tar.gz +wesnoth-1.0rc1.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/wesnoth/FC-3/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 14 Sep 2005 04:52:44 -0000 1.8 +++ sources 21 Sep 2005 11:10:30 -0000 1.9 @@ -1 +1 @@ -c2c863c58a3eb7de5fce882d8a1944e1 wesnoth-0.9.7.tar.gz +9a12505fbbb81d91a2975f73b0788174 wesnoth-1.0rc1.tar.gz Index: wesnoth.spec =================================================================== RCS file: /cvs/extras/rpms/wesnoth/FC-3/wesnoth.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- wesnoth.spec 14 Sep 2005 04:52:44 -0000 1.9 +++ wesnoth.spec 21 Sep 2005 11:10:30 -0000 1.10 @@ -1,12 +1,12 @@ Name: wesnoth -Version: 0.9.7 -Release: 1%{?dist} +Version: 1.0 +Release: 0.1.rc1%{?dist} Summary: Turn-based strategy game with a fantasy theme Group: Amusements/Games License: GPL URL: http://www.wesnoth.org -Source0: http://www.wesnoth.org/files/wesnoth-%{version}.tar.gz +Source0: http://www.wesnoth.org/files/wesnoth-1.0rc1.tar.gz Source1: wesnothd.init Source2: wesnoth.sysconfig Source3: README.fedora @@ -59,8 +59,9 @@ %prep -%setup -q +%setup -q -n %{name}-1.0rc1 cp %{SOURCE3} . +chmod -x MANUAL* %build @@ -156,6 +157,10 @@ %ghost /var/run/wesnothd/socket %changelog +* Wed Sep 21 2005 Michael Schwendt - 1.0-0.1.rc1 +- update to 1.0rc1 +- remove exe bit from Turkish manual + * Wed Sep 14 2005 Michael Schwendt - 0.9.7-1 - update to 0.9.7 From fedora-extras-commits at redhat.com Wed Sep 21 11:12:02 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Wed, 21 Sep 2005 07:12:02 -0400 Subject: rpms/wesnoth/FC-4 .cvsignore, 1.8, 1.9 sources, 1.8, 1.9 wesnoth.spec, 1.13, 1.14 Message-ID: <200509211112.j8LBC2se032006@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/wesnoth/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31983 Modified Files: .cvsignore sources wesnoth.spec Log Message: * Wed Sep 21 2005 Michael Schwendt - 1.0-0.1.rc1 - update to 1.0rc1 - remove exe bit from Turkish manual Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/wesnoth/FC-4/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 14 Sep 2005 04:52:45 -0000 1.8 +++ .cvsignore 21 Sep 2005 11:12:00 -0000 1.9 @@ -1 +1 @@ -wesnoth-0.9.7.tar.gz +wesnoth-1.0rc1.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/wesnoth/FC-4/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 14 Sep 2005 04:52:45 -0000 1.8 +++ sources 21 Sep 2005 11:12:00 -0000 1.9 @@ -1 +1 @@ -c2c863c58a3eb7de5fce882d8a1944e1 wesnoth-0.9.7.tar.gz +9a12505fbbb81d91a2975f73b0788174 wesnoth-1.0rc1.tar.gz Index: wesnoth.spec =================================================================== RCS file: /cvs/extras/rpms/wesnoth/FC-4/wesnoth.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- wesnoth.spec 14 Sep 2005 04:52:45 -0000 1.13 +++ wesnoth.spec 21 Sep 2005 11:12:00 -0000 1.14 @@ -1,12 +1,12 @@ Name: wesnoth -Version: 0.9.7 -Release: 1%{?dist} +Version: 1.0 +Release: 0.1.rc1%{?dist} Summary: Turn-based strategy game with a fantasy theme Group: Amusements/Games License: GPL URL: http://www.wesnoth.org -Source0: http://www.wesnoth.org/files/wesnoth-%{version}.tar.gz +Source0: http://www.wesnoth.org/files/wesnoth-1.0rc1.tar.gz Source1: wesnothd.init Source2: wesnoth.sysconfig Source3: README.fedora @@ -59,8 +59,9 @@ %prep -%setup -q +%setup -q -n %{name}-1.0rc1 cp %{SOURCE3} . +chmod -x MANUAL* %build @@ -156,6 +157,10 @@ %ghost /var/run/wesnothd/socket %changelog +* Wed Sep 21 2005 Michael Schwendt - 1.0-0.1.rc1 +- update to 1.0rc1 +- remove exe bit from Turkish manual + * Wed Sep 14 2005 Michael Schwendt - 0.9.7-1 - update to 0.9.7 From fedora-extras-commits at redhat.com Wed Sep 21 13:40:21 2005 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Wed, 21 Sep 2005 09:40:21 -0400 Subject: rpms/fig2ps/devel fig2ps.spec,1.1,1.2 Message-ID: <200509211340.j8LDeLch002670@cvs-int.fedora.redhat.com> Author: qspencer Update of /cvs/extras/rpms/fig2ps/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2651 Modified Files: fig2ps.spec Log Message: Fix make install command. Index: fig2ps.spec =================================================================== RCS file: /cvs/extras/rpms/fig2ps/devel/fig2ps.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- fig2ps.spec 21 Sep 2005 01:16:39 -0000 1.1 +++ fig2ps.spec 21 Sep 2005 13:40:19 -0000 1.2 @@ -1,6 +1,6 @@ Name: fig2ps Version: 1.3.3 -Release: 1 +Release: 2 Summary: Utility for converting xfig pictures to PS/PDF Group: Applications/Publishing @@ -28,7 +28,7 @@ %install rm -rf $RPM_BUILD_ROOT -%makeinstall DESTDIR=$RPM_BUILD_ROOT +make install DESTDIR=$RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT%{_datadir}/doc %clean @@ -43,5 +43,8 @@ %config(noreplace) /etc/fig2ps %changelog +* Wed Sep 21 2005 Quentin Spencer 1.3.3-2 +- fix make install command + * Tue Sep 20 2005 Quentin Spencer 1.3.3-1 - Initial version. From fedora-extras-commits at redhat.com Wed Sep 21 13:47:18 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 21 Sep 2005 09:47:18 -0400 Subject: rpms/sbcl/devel sbcl-0.9.4-personality.patch, NONE, 1.1 sbcl.spec, 1.12, 1.13 sbcl-0.9.4-ADDR_NO_RANDOMIZE-argv0.patch, 1.1, NONE sbcl-0.9.4-ADDR_NO_RANDOMIZE-proc.patch, 1.1, NONE Message-ID: <200509211347.j8LDlILM002802@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/sbcl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2780 Modified Files: sbcl.spec Added Files: sbcl-0.9.4-personality.patch Removed Files: sbcl-0.9.4-ADDR_NO_RANDOMIZE-argv0.patch sbcl-0.9.4-ADDR_NO_RANDOMIZE-proc.patch Log Message: * Mon Sep 19 2005 Rex Dieter 0.9.4-17 - rework personality/reexec patch (execve -> execvp) sbcl-0.9.4-personality.patch: --- NEW FILE sbcl-0.9.4-personality.patch --- --- sbcl-0.9.4/src/runtime/os.h.ADDR_NO_RANDOMIZE 2005-07-14 10:41:20.000000000 -0500 +++ sbcl-0.9.4/src/runtime/os.h 2005-09-13 11:23:31.319884384 -0500 @@ -50,7 +50,7 @@ /* Do anything we need to do when starting up the runtime environment * in this OS. */ -extern void os_init(void); +extern void os_init(char *argv[]); /* Install any OS-dependent low-level signal handlers which are needed * by the runtime environment. E.g. the signals raised by a violation --- sbcl-0.9.4/src/runtime/linux-os.c.ADDR_NO_RANDOMIZE 2005-08-12 14:08:19.000000000 -0500 +++ sbcl-0.9.4/src/runtime/linux-os.c 2005-09-13 11:26:47.110833967 -0500 @@ -44,6 +44,7 @@ #include #include #include +#include #include "validate.h" #include "thread.h" @@ -92,7 +93,7 @@ int linux_no_threads_p = 0; void -os_init(void) +os_init(char *argv[]) { /* Conduct various version checks: do we have enough mmap(), is * this a sparc running 2.2, can we do threads? */ @@ -117,7 +118,7 @@ FSHOW((stderr,"linux kernel %d.%d predates 2.4;\n enabling workarounds for SPARC kernel bugs in signal handling.\n", major_version,minor_version)); linux_sparc_siginfo_bug = 1; #endif - } + } #ifdef LISP_FEATURE_SB_THREAD futex_wait(futex,-1); if(errno==ENOSYS) linux_no_threads_p = 1; @@ -125,6 +126,28 @@ fprintf(stderr,"Linux with NPTL support (e.g. kernel 2.6 or newer) required for \nthread-enabled SBCL. Disabling thread support.\n\n"); #endif os_vm_page_size = getpagesize(); + + /* KLUDGE: Disable memory randomization on new Linux kernels + * by setting a personality flag and re-executing. (We need + * to re-execute, since the memory maps that can conflict with + * the SBCL spaces have already been done at this point). + */ +#if defined(LISP_FEATURE_X86) + if ((major_version == 2) && (minor_version >= 6) || (major_version >= 3)) { + long pers = personality(-1); + /* 0x40000 aka. ADDR_NO_RANDOMIZE */ + if (!(pers & 0x40000)) { + if (personality(pers | 0x40000) != -1) { + execvp(argv[0], argv); + } + /* Either changing the personality or (re)exec failed. Either + * way we might as well continue, and hope that the random + * memory maps are ok this time around. + */ + fprintf(stderr, "WARNING: Couldn't re-execute SBCL with the proper personality flags. Trying to continue anyway.\n"); + } + } +#endif } --- sbcl-0.9.4/src/runtime/runtime.c.ADDR_NO_RANDOMIZE 2005-09-13 11:23:31.315884548 -0500 +++ sbcl-0.9.4/src/runtime/runtime.c 2005-09-13 11:23:31.323884220 -0500 @@ -194,7 +194,7 @@ /* KLUDGE: os_vm_page_size is set by os_init(), and on some * systems (e.g. Alpha) arch_init() needs need os_vm_page_size, so * it must follow os_init(). -- WHN 2000-01-26 */ - os_init(); + os_init(argv); arch_init(); gc_init(); validate(); Index: sbcl.spec =================================================================== RCS file: /cvs/extras/rpms/sbcl/devel/sbcl.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- sbcl.spec 16 Sep 2005 19:54:36 -0000 1.12 +++ sbcl.spec 21 Sep 2005 13:47:15 -0000 1.13 @@ -7,6 +7,7 @@ #define sbcl_bootstrap cmucl #define sbcl_bootstrap clisp +%if "%{?bootstrap}" == "%{nil}" %if "%{?fedora}" >= "3" BuildRequires:setarch %define setarch setarch %{_target_cpu} @@ -20,16 +21,17 @@ BuildRequires:setarch %define setarch setarch %{_target_cpu} %endif +%endif Name: sbcl Summary: Steel Bank Common Lisp Version: 0.9.4 -Release: 15%{?dist} +Release: 17%{?dist} License: BSD/MIT Group: Development/Languages URL: http://sbcl.sourceforge.net/ -Source0: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-%{version}-source.tar.bz2 +Source0: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-%{version}-source.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) ExclusiveArch: %{ix86} x86_64 @@ -51,11 +53,7 @@ %endif Patch1: sbcl-0.8.18-default-sbcl-home.patch -# See http://sourceforge.net/mailarchive/message.php?msg_id=12787069 -# use /proc/self/exe -#Patch2: sbcl-0.9.4-ADDR_NO_RANDOMIZE-proc.patch -# use argv[0] -Patch2: sbcl-0.9.4-ADDR_NO_RANDOMIZE-argv0.patch +Patch2: sbcl-0.9.4-personality.patch Patch3: sbcl-0.9.4-optflags.patch Patch4: sbcl-0.9.4-LIB_DIR.patch @@ -79,7 +77,7 @@ #sed -i -e "s|/usr/local/lib/sbcl/|%{_libdir}/sbcl/|" src/runtime/runtime.c #or patch to use SBCL_HOME env var %patch1 -p0 -b .default-sbcl-home -%{?setarch:%patch2 -p1 -b .ADDR_NO_RANDOMIZE} +%patch2 -p1 -b .personality %patch3 -p1 -b .optflags %patch4 -p1 -b .LIB_DIR @@ -125,8 +123,6 @@ %check || : pushd tests -# still need setarch if using ADDR_NO_RANDOMIZE-proc patch, since /proc isn't available on buildsystem/mock. -#{?setarch} sh ./run-tests.sh sh ./run-tests.sh popd @@ -138,7 +134,6 @@ unset SBCL_HOME ||: export INSTALL_ROOT=$RPM_BUILD_ROOT%{_prefix} export LIB_DIR=$RPM_BUILD_ROOT%{_libdir} -# (may) still need setarch if using ADDR_NO_RANDOMIZE-proc patch sh ./install.sh ## Unpackaged files @@ -177,6 +172,9 @@ %changelog +* Mon Sep 19 2005 Rex Dieter 0.9.4-17 +- rework personality/reexec patch (execve -> execvp) + * Sat Sep 16 2005 Rex Dieter 0.9.4-15 - disable ppc (probably related to #166347) --- sbcl-0.9.4-ADDR_NO_RANDOMIZE-argv0.patch DELETED --- --- sbcl-0.9.4-ADDR_NO_RANDOMIZE-proc.patch DELETED --- From fedora-extras-commits at redhat.com Wed Sep 21 14:12:09 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Wed, 21 Sep 2005 10:12:09 -0400 Subject: rpms/Coin2/devel Coin2.spec,1.15,1.16 Message-ID: <200509211412.j8LEC9eA004374@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/Coin2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4355 Modified Files: Coin2.spec Log Message: Still testing Index: Coin2.spec =================================================================== RCS file: /cvs/extras/rpms/Coin2/devel/Coin2.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- Coin2.spec 20 Sep 2005 12:26:01 -0000 1.15 +++ Coin2.spec 21 Sep 2005 14:12:07 -0000 1.16 @@ -34,8 +34,8 @@ BuildRequires: xorg-x11-devel BuildRequires: zlib-devel BuildRequires: bzip2-devel -# BuildRequires: fontconfig-devel -# BuildRequries: freetype-devel +BuildRequires: fontconfig-devel +BuildRequries: freetype-devel BuildRequires: doxygen BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -89,7 +89,7 @@ --enable-html \ --enable-3ds-import \ htmldir=%{coin_htmldir}/Coin \ - CFLAGS="$RPM_OPT_FLAGS "$(pkg-config --cflags freetype2) + CPPFLAGS=$(pkg-config --cflags freetype2) make %{?_smp_mflags} %install From fedora-extras-commits at redhat.com Wed Sep 21 14:26:33 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Wed, 21 Sep 2005 10:26:33 -0400 Subject: rpms/Coin2/devel Coin2.spec,1.16,1.17 Message-ID: <200509211426.j8LEQXSw004562@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/Coin2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4539 Modified Files: Coin2.spec Log Message: Still testing Index: Coin2.spec =================================================================== RCS file: /cvs/extras/rpms/Coin2/devel/Coin2.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- Coin2.spec 21 Sep 2005 14:12:07 -0000 1.16 +++ Coin2.spec 21 Sep 2005 14:26:31 -0000 1.17 @@ -35,7 +35,7 @@ BuildRequires: zlib-devel BuildRequires: bzip2-devel BuildRequires: fontconfig-devel -BuildRequries: freetype-devel +BuildRequires: freetype-devel BuildRequires: doxygen BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) From fedora-extras-commits at redhat.com Wed Sep 21 16:01:47 2005 From: fedora-extras-commits at redhat.com (Elliot Lee (sopwith)) Date: Wed, 21 Sep 2005 12:01:47 -0400 Subject: web/html/css fedora.css,NONE,1.1 Message-ID: <200509211601.j8LG1lWT008402@cvs-int.fedora.redhat.com> Author: sopwith Update of /cvs/fedora/web/html/css In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8390 Added Files: fedora.css Log Message: Add fedora.css --- NEW FILE fedora.css --- /* CSS for Red Hat Linux Project docs from the Documentation Project Written by Tammy Fox and Garrett LeSage Copyright 2003 Tammy Fox, Garrett LeSage, and Red Hat, Inc. License: GPL */ li p { display: inline; } div.table table { width: 95%; background-color: #DCDCDC; color: #000000; border-spacing: 0; } div.table table th { border: 1px solid #A9A9A9; background-color: #A9A9A9; color: #000000; } div.table table td { border: 1px solid #A9A9A9; background-color: #DCDCDC; color: #000000; padding: 0.5em; margin-bottom: 0.5em; margin-top: 2px; } div.note table, div.tip table, div.important table, div.caution table, div.warning table { width: 95%; border: 2px solid #B0C4DE; background-color: #F0F8FF; color: #000000; /* padding inside table area */ padding: 0.5em; margin-bottom: 0.5em; margin-top: 0.5em; } .qandaset table { border-collapse: collapse; } .qandaset { } .qandaset tr.question { } .qandaset tr.question td { font-weight: bold; padding: 1em 1em 0; } .qandaset tr.answer td { padding: 0.25em 1em 1.5em; } .qandaset tr.question td, .qandaset tr.answer td { } hr { border: 0; border-bottom: 1px solid #ccc; } h1, h2, h3, h4 { font-family: luxi sans,sans-serif; color: #990000; font-weight: bold; } h1 { font-size: 1.75em; } h2 { font-size: 1.25em; } h3 { font-size: 1.1em; } code.screen, pre.screen { font-family: monospace; font-size: 1em; display: block; padding: 10px; border: 1px solid #bbb; background-color: #eee; color: #000; overflow: auto; border-radius: 2.5px; -moz-border-radius: 2.5px; margin: 0.5em 2em; } div.example { padding: 10px; border: 1px solid #bbb; margin: 0.5em 2em; } .procedure ol li { margin-bottom: 0.5em; } .procedure ol li li { /* prevent inheritance */ margin-bottom: 0em; } .itemizedlist ul li { margin-bottom: 0.5em; } .itemizedlist ul li li { /* prevent inheritance */ margin-bottom: 0em; } From fedora-extras-commits at redhat.com Wed Sep 21 17:35:53 2005 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Wed, 21 Sep 2005 13:35:53 -0400 Subject: owners owners.list,1.236,1.237 Message-ID: <200509211735.j8LHZrak010003@cvs-int.fedora.redhat.com> Author: qspencer Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9984 Modified Files: owners.list Log Message: Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.236 retrieving revision 1.237 diff -u -r1.236 -r1.237 --- owners.list 20 Sep 2005 08:21:24 -0000 1.236 +++ owners.list 21 Sep 2005 17:35:51 -0000 1.237 @@ -171,6 +171,7 @@ Fedora Extras|feh|Fast command line image viewer using Imlib2|a.kurtz at hardsun.net|extras-qa at fedoraproject.org| Fedora Extras|fftw3|Fast Fourier Transform library|qspencer at ieee.org|extras-qa at fedoraproject.org| Fedora Extras|fftw|Fast Fourier Transform library|compton at pcompton.com|extras-qa at fedoraproject.org| +Fedora Extras|fig2ps|Utility for converting xfig pictures to PS/PDF|qspencer at ieee.org|extras-qa at fedoraproject.org| Fedora Extras|fillets-ng-data-cs|Czech audio data files for Fish Fillets Next Generation|matthias at rpmforge.net|extras-qa at fedoraproject.org| Fedora Extras|fillets-ng-data|Game data files for Fish Fillets Next Generation|matthias at rpmforge.net|extras-qa at fedoraproject.org| Fedora Extras|fillets-ng|Fish Fillets Next Generation, a puzzle game with 70 levels|matthias at rpmforge.net|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Wed Sep 21 17:48:23 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Wed, 21 Sep 2005 13:48:23 -0400 Subject: owners owners.list,1.237,1.238 Message-ID: <200509211748.j8LHmNdn010146@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10127 Modified Files: owners.list Log Message: +ks3switch Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.237 retrieving revision 1.238 diff -u -r1.237 -r1.238 --- owners.list 21 Sep 2005 17:35:51 -0000 1.237 +++ owners.list 21 Sep 2005 17:48:21 -0000 1.238 @@ -377,6 +377,7 @@ Fedora Extras|kphone|A SIP (Session Initiation Protocol) user agent for Linux|dennis at dgilmore.net|extras-qa at fedoraproject.org| Fedora Extras|krecipes|Application to manage recipes and shopping-lists|dennis at ausil.us|extras-qa at fedoraproject.org| Fedora Extras|krusader|An advanced twin-panel (commander-style) file-manager for KDE|mgarski at post.pl|extras-qa at fedoraproject.org| +Fedora Extras|ks3switch|KDE utility for managing the output device on S3 Savage chips|ville.skytta at iki.fi|extras-qa at fedoraproject.org| Fedora Extras|ksensors|An lm_sensors frontend for KDE|ville.skytta at iki.fi|extras-qa at fedoraproject.org| Fedora Extras|ktrack|Satellite prediction software for KDE|dennis at dgilmore.net|extras-qa at fedoraproject.org| Fedora Extras|kyum|Graphical User Frontend (GUI) for yum|Jochen at herr-schmitt.de|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Wed Sep 21 18:09:14 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Wed, 21 Sep 2005 14:09:14 -0400 Subject: rpms/hddtemp/FC-4 .cvsignore, 1.5, 1.6 hddtemp.db, 1.7, 1.8 hddtemp.spec, 1.13, 1.14 sources, 1.6, 1.7 Message-ID: <200509211809.j8LI9E4t011586@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/hddtemp/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11528/FC-4 Modified Files: .cvsignore hddtemp.db hddtemp.spec sources Log Message: * Tue Sep 20 2005 Ville Skytt?? - 0.3-0.6.beta14 - 0.3-beta14, drive database 2005-09-20. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/hddtemp/FC-4/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 24 Mar 2005 16:57:47 -0000 1.5 +++ .cvsignore 21 Sep 2005 18:09:12 -0000 1.6 @@ -1 +1 @@ -hddtemp-0.3-beta13.tar.bz2 +hddtemp-0.3-beta14.tar.bz2 Index: hddtemp.db =================================================================== RCS file: /cvs/extras/rpms/hddtemp/FC-4/hddtemp.db,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- hddtemp.db 13 Sep 2005 15:34:24 -0000 1.7 +++ hddtemp.db 21 Sep 2005 18:09:12 -0000 1.8 @@ -6,7 +6,7 @@ # a temperature sensor (you can set the unit to C or F). # ############################################################################ -# The following list was found at (http://www.almico.com/sfhardware.php) +# The following list was found at (http://www.almico.com/forumharddisks.php) # If your drive is in the list send me a mail. # # Manufacturer Model Size Notes @@ -45,6 +45,7 @@ # "ExcelStor Technology CT215" ??? ? "ExcelStor CT215" "ExcelStor Technology J3.0" 194 C "ExcelStor Technology 3xy (xy GB)" "ExcelStor Technology J6.0" 194 C "ExcelStor Technology 6xy (xy GB)" +"ExcelStor Technology J860" 194 C "ExcelStor Technology J860 (60 GB)" ######################################## @@ -101,6 +102,8 @@ "HDT722525DLAT80" 194 C "Hitachi Deskstar T7K250 250GB, 7200RPM, 8MB, PATA" "HDT722516DLA380 V43O" 194 C "Hitachi T7K250 SATA" +"HDS722580VLSA80" 194 C "Hitachi Deskstar 7K250 80GB SATA" +"HDS728040PLAT20" 194 C "Hitachi Deskstar 7K80 40GB" "HTE726060M9AT00" 194 C "Hitachi Travelstar 60GB (7200RPM)" "HTS424030M9AT00" 194 C "Hitachi Travelstar 30GB (4200RPM)" @@ -165,7 +168,7 @@ "Maxtor 5A250J0" 194 C "Maxtor MaXline II 250GB 5400RPM" "Maxtor 5A300J0" 194 C "Maxtor 5A300J0" "Maxtor 5T0[24]0H[24]" 0 C "Maxtor DiamondMax Plus 60" -"Maxtor 6B(08|12|16|20|25|30)0[RSPM]0" 194 C "Maxtor DiamondMax Plus 10" +"Maxtor 6(B|L)(08|12|16|20|25|30)0[RSPM]0" 194 C "Maxtor DiamondMax Plus 10" "Maxtor 6E0[234]0L0" 194 C "Maxtor DiamondMax Plus 8" "MAXTOR 6L0[2468]0[LJ][1234]" 194 C "Maxtor DiamondMax Plus D740X family" "Maxtor 6L250R0" 194 C "Maxtor DiamondMax 10 250GB 16MB buffer 7200rpm" @@ -176,7 +179,6 @@ - ######################################## ############# Quantum drives ######################################## @@ -204,7 +206,7 @@ "SAMSUNG SP(0812|1213|1614)C" 194 C "Samsung Spinpoint 160G SATA" "SAMSUNG SV0432A" 0 C "Samsung SV0432A" "SAMSUNG SV3002H" 0 C "Samsung SpinPoint V30 serie" -"SAMSUNG SV(2001|4002|6003|8004)H" 194 C "Samsung SpinPoint V40 serie" +"SAMSUNG SV(2001|4002|4012|6003|8004)H" 194 C "Samsung SpinPoint V40 serie" #"SAMSUNG SV(0221|0602|0813|1204)H" 9 C "Samsung SpinPoint V60 serie" #"SAMSUNG SV1204H" 194 C "Samsung 120G" "SAMSUNG SV(0401|0802|1203|1604)N" 194 C "Samsung SpinPoint V80 serie" @@ -268,6 +270,7 @@ "ST3300831A" 194 C "Seagate 300GB ST3300831A" "ST3400832A" 194 C "Seagate Barracuda 7200.8 Plus 400GB" "ST9100823A" 194 C "Seagate Momentus 5400.2 100GB" +"ST94019A" 194 C "Seagate ST94019A" "ST94[08]11A" 194 C "Seagate ST94011A" "ST960821A" 194 C "Seagate ST960821A" "ST960822A" 194 C "Seagate Momentus 5400.2 60GB" @@ -285,6 +288,7 @@ #"TOSHIBA MK4019GAX" 222 C "Toshiba MK4019GAX" "TOSHIBA MK4021GAS" 194 C "Toshiba MK4021GAS" "TOSHIBA MK4025GAS" 194 C "Toshiba MK4025GAS 40 Go" +"TOSHIBA MK4026GAS" 194 C "Toshiba MK4026GAS 40 Go" "TOSHIBA MK6021GAS" 194 C "Toshiba MK6021GAS" "TOSHIBA MK6022GAX" 194 C "Toshiba MK6022GAX" "TOSHIBA MK6025GAS" 194 C "Toshiba MK6025GAS" @@ -301,6 +305,7 @@ "WDC AC22000L" 0 C "Western Digital Caviar AC22000" "WDC AC420400D" 231 C "Western Digital Caviar AC420400D" "WDC AC418000D" 231 C "Western Digital AC418000D" +"WDC WD135BA" 231 C "Western Digital WD135BA" "WDC WD100EB-00BHF0" 0 C "Western Digital 100EB-00BHF0" "WDC WD200BB-00AUA1" 0 C "Western Digital Caviar WD200BB" @@ -308,12 +313,14 @@ "WDC WD300BB-00CAA0" 0 C "Western Digital WD300BB" "WDC WD360GD-00FNA0" 194 C "Western Digital SATA Raptor 36.7GB" "WDC WD400BB-00J[KH]A0" 194 C "Western Digital Caviar WD400BB" +"WDC WD400BB-23JHC0" 194 C "Western Digital 23JHC0" #"WDC WD400BB-00GFA0" 0 C "" "WDC WD400BB-55HEA0" 194 C "Western Digital Caviar WD400BB" "WDC WD400BB-(18CA|00DE)A0" 0 C "Western Digital Caviar WD400BB" "WDC WD400BB-75FJA1" 194 C "Western Digital Caviar WD400BB" "WDC WD400EB-00CPF0" 0 C "Western Digital 400EB-00CPF0" -"WDC WD400JB-00(JJ|FM|FS)A0" 194 C "Western Digital Caviar 40GB Special Edition 8MB" +"WDC WD400JB-00(JJ|FM|FS)A0" 194 C "Western Digital Caviar 40GB Special Edition 8MB" +"WDC WD400JB-00ETA0" 194 C "Western Digital 400JB-00ETA0" "WDC WD400JB-00JJC0" 194 C "Western Digital 400JB-00JJC0 40GB" "WDC WD600BB-32BSA0" 0 C "Western Digital 600BB-32BSA0" "WDC WD600JB-00ETA0" 194 C "Western Digital 600JB-00ETA0" @@ -324,6 +331,7 @@ "WDC WD800BB-(00|22)DKA0" 194 C "Western Digital WD800BB 80 Go" "WDC WD800BB-32CCB0" 194 C "Western Digital 800BB-32CCB0" "WDC WD800BB-55HEA0" 194 C "Western Digital 800BB-55HEA0" +"WDC WD800BB-00JHA0" 194 C "Western Digital 800BB-00JHA0" "WDC WD800BB-00JKA0" 194 C "Western Digital 800BB-00JKA0" "WDC WD800BB-55JKA0" 194 C "Western Digital 800BB-55JKA0" "WDC WD800BB-75FRA0" 194 C "Western Digital Caviar WD800BB" @@ -339,13 +347,12 @@ "WDC WD1200LB-55EDA0" 194 C "Western Digital WD1220LB" "WDC WD1600BB-00DWA0" 194 C "Western Digital Caviar WD1600BB" "WDC WD1600JB-(00EV|00FU|00GV|75GV)A0" 194 C "Western Digital Caviar 160GB Special Edition 8MB" -"WDC WD2000JB-(00EV|34EV|00FU|00GV|55GV|98GV)A0" 194 C "Western Digital Caviar 200GB Special Edition 8MB" +"WDC WD2000JB-(00EV|32EV|34EV|00FU|00GV|55GV|98GV)A0" 194 C "Western Digital Caviar 200GB Special Edition 8MB" "WDC WD2500JB-(00FU|32FU|00GV|55GV)A0" 194 C "Western Digital Caviar 250GB Special Edition 8MB" "WDC WD2500JB-00GVC0" 194 C "Western Digital 250GB" "WDC WD2500JD-00GBB0" 194 C "Western Digital SATA Caviar 250GB Special Edition 8MB" "WDC WD2500PB-98FBA0" 194 C "Western Digital Caviar 250GB Special Edition 8MB" -"WDC WD135BA" 231 C "Western Digital WD135BA" - +"WDC WD3200JB-00KFA0" 194 C "Western Digital Caviar 320GB 8MB" # not sure for next # "WDC WD1200JB-00CRA1" 9 C "Western Digital 1200JB-00CRA1" Index: hddtemp.spec =================================================================== RCS file: /cvs/extras/rpms/hddtemp/FC-4/hddtemp.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- hddtemp.spec 13 Sep 2005 15:34:24 -0000 1.13 +++ hddtemp.spec 21 Sep 2005 18:09:12 -0000 1.14 @@ -1,4 +1,4 @@ -%define beta beta13 +%define beta beta14 Name: hddtemp Version: 0.3 @@ -96,6 +96,9 @@ %changelog +* Tue Sep 20 2005 Ville Skytt?? - 0.3-0.6.beta14 +- 0.3-beta14, drive database 2005-09-20. + * Sun Sep 11 2005 Ville Skytt?? - 0.3-0.6.beta13 - Update drive database to 2005-09-11. Index: sources =================================================================== RCS file: /cvs/extras/rpms/hddtemp/FC-4/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 24 Mar 2005 16:57:47 -0000 1.6 +++ sources 21 Sep 2005 18:09:12 -0000 1.7 @@ -1 +1 @@ -36d98101daeac1ae8c1589a75aaab00c hddtemp-0.3-beta13.tar.bz2 +bbf8be4539495e18bec54af77511a680 hddtemp-0.3-beta14.tar.bz2 From fedora-extras-commits at redhat.com Wed Sep 21 18:09:34 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Wed, 21 Sep 2005 14:09:34 -0400 Subject: rpms/hddtemp/devel .cvsignore, 1.5, 1.6 hddtemp.db, 1.7, 1.8 hddtemp.spec, 1.13, 1.14 sources, 1.6, 1.7 Message-ID: <200509211809.j8LI9YOr011600@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/hddtemp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11528/devel Modified Files: .cvsignore hddtemp.db hddtemp.spec sources Log Message: * Tue Sep 20 2005 Ville Skytt?? - 0.3-0.6.beta14 - 0.3-beta14, drive database 2005-09-20. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/hddtemp/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 24 Mar 2005 16:57:47 -0000 1.5 +++ .cvsignore 21 Sep 2005 18:09:14 -0000 1.6 @@ -1 +1 @@ -hddtemp-0.3-beta13.tar.bz2 +hddtemp-0.3-beta14.tar.bz2 Index: hddtemp.db =================================================================== RCS file: /cvs/extras/rpms/hddtemp/devel/hddtemp.db,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- hddtemp.db 13 Sep 2005 15:34:25 -0000 1.7 +++ hddtemp.db 21 Sep 2005 18:09:14 -0000 1.8 @@ -6,7 +6,7 @@ # a temperature sensor (you can set the unit to C or F). # ############################################################################ -# The following list was found at (http://www.almico.com/sfhardware.php) +# The following list was found at (http://www.almico.com/forumharddisks.php) # If your drive is in the list send me a mail. # # Manufacturer Model Size Notes @@ -45,6 +45,7 @@ # "ExcelStor Technology CT215" ??? ? "ExcelStor CT215" "ExcelStor Technology J3.0" 194 C "ExcelStor Technology 3xy (xy GB)" "ExcelStor Technology J6.0" 194 C "ExcelStor Technology 6xy (xy GB)" +"ExcelStor Technology J860" 194 C "ExcelStor Technology J860 (60 GB)" ######################################## @@ -101,6 +102,8 @@ "HDT722525DLAT80" 194 C "Hitachi Deskstar T7K250 250GB, 7200RPM, 8MB, PATA" "HDT722516DLA380 V43O" 194 C "Hitachi T7K250 SATA" +"HDS722580VLSA80" 194 C "Hitachi Deskstar 7K250 80GB SATA" +"HDS728040PLAT20" 194 C "Hitachi Deskstar 7K80 40GB" "HTE726060M9AT00" 194 C "Hitachi Travelstar 60GB (7200RPM)" "HTS424030M9AT00" 194 C "Hitachi Travelstar 30GB (4200RPM)" @@ -165,7 +168,7 @@ "Maxtor 5A250J0" 194 C "Maxtor MaXline II 250GB 5400RPM" "Maxtor 5A300J0" 194 C "Maxtor 5A300J0" "Maxtor 5T0[24]0H[24]" 0 C "Maxtor DiamondMax Plus 60" -"Maxtor 6B(08|12|16|20|25|30)0[RSPM]0" 194 C "Maxtor DiamondMax Plus 10" +"Maxtor 6(B|L)(08|12|16|20|25|30)0[RSPM]0" 194 C "Maxtor DiamondMax Plus 10" "Maxtor 6E0[234]0L0" 194 C "Maxtor DiamondMax Plus 8" "MAXTOR 6L0[2468]0[LJ][1234]" 194 C "Maxtor DiamondMax Plus D740X family" "Maxtor 6L250R0" 194 C "Maxtor DiamondMax 10 250GB 16MB buffer 7200rpm" @@ -176,7 +179,6 @@ - ######################################## ############# Quantum drives ######################################## @@ -204,7 +206,7 @@ "SAMSUNG SP(0812|1213|1614)C" 194 C "Samsung Spinpoint 160G SATA" "SAMSUNG SV0432A" 0 C "Samsung SV0432A" "SAMSUNG SV3002H" 0 C "Samsung SpinPoint V30 serie" -"SAMSUNG SV(2001|4002|6003|8004)H" 194 C "Samsung SpinPoint V40 serie" +"SAMSUNG SV(2001|4002|4012|6003|8004)H" 194 C "Samsung SpinPoint V40 serie" #"SAMSUNG SV(0221|0602|0813|1204)H" 9 C "Samsung SpinPoint V60 serie" #"SAMSUNG SV1204H" 194 C "Samsung 120G" "SAMSUNG SV(0401|0802|1203|1604)N" 194 C "Samsung SpinPoint V80 serie" @@ -268,6 +270,7 @@ "ST3300831A" 194 C "Seagate 300GB ST3300831A" "ST3400832A" 194 C "Seagate Barracuda 7200.8 Plus 400GB" "ST9100823A" 194 C "Seagate Momentus 5400.2 100GB" +"ST94019A" 194 C "Seagate ST94019A" "ST94[08]11A" 194 C "Seagate ST94011A" "ST960821A" 194 C "Seagate ST960821A" "ST960822A" 194 C "Seagate Momentus 5400.2 60GB" @@ -285,6 +288,7 @@ #"TOSHIBA MK4019GAX" 222 C "Toshiba MK4019GAX" "TOSHIBA MK4021GAS" 194 C "Toshiba MK4021GAS" "TOSHIBA MK4025GAS" 194 C "Toshiba MK4025GAS 40 Go" +"TOSHIBA MK4026GAS" 194 C "Toshiba MK4026GAS 40 Go" "TOSHIBA MK6021GAS" 194 C "Toshiba MK6021GAS" "TOSHIBA MK6022GAX" 194 C "Toshiba MK6022GAX" "TOSHIBA MK6025GAS" 194 C "Toshiba MK6025GAS" @@ -301,6 +305,7 @@ "WDC AC22000L" 0 C "Western Digital Caviar AC22000" "WDC AC420400D" 231 C "Western Digital Caviar AC420400D" "WDC AC418000D" 231 C "Western Digital AC418000D" +"WDC WD135BA" 231 C "Western Digital WD135BA" "WDC WD100EB-00BHF0" 0 C "Western Digital 100EB-00BHF0" "WDC WD200BB-00AUA1" 0 C "Western Digital Caviar WD200BB" @@ -308,12 +313,14 @@ "WDC WD300BB-00CAA0" 0 C "Western Digital WD300BB" "WDC WD360GD-00FNA0" 194 C "Western Digital SATA Raptor 36.7GB" "WDC WD400BB-00J[KH]A0" 194 C "Western Digital Caviar WD400BB" +"WDC WD400BB-23JHC0" 194 C "Western Digital 23JHC0" #"WDC WD400BB-00GFA0" 0 C "" "WDC WD400BB-55HEA0" 194 C "Western Digital Caviar WD400BB" "WDC WD400BB-(18CA|00DE)A0" 0 C "Western Digital Caviar WD400BB" "WDC WD400BB-75FJA1" 194 C "Western Digital Caviar WD400BB" "WDC WD400EB-00CPF0" 0 C "Western Digital 400EB-00CPF0" -"WDC WD400JB-00(JJ|FM|FS)A0" 194 C "Western Digital Caviar 40GB Special Edition 8MB" +"WDC WD400JB-00(JJ|FM|FS)A0" 194 C "Western Digital Caviar 40GB Special Edition 8MB" +"WDC WD400JB-00ETA0" 194 C "Western Digital 400JB-00ETA0" "WDC WD400JB-00JJC0" 194 C "Western Digital 400JB-00JJC0 40GB" "WDC WD600BB-32BSA0" 0 C "Western Digital 600BB-32BSA0" "WDC WD600JB-00ETA0" 194 C "Western Digital 600JB-00ETA0" @@ -324,6 +331,7 @@ "WDC WD800BB-(00|22)DKA0" 194 C "Western Digital WD800BB 80 Go" "WDC WD800BB-32CCB0" 194 C "Western Digital 800BB-32CCB0" "WDC WD800BB-55HEA0" 194 C "Western Digital 800BB-55HEA0" +"WDC WD800BB-00JHA0" 194 C "Western Digital 800BB-00JHA0" "WDC WD800BB-00JKA0" 194 C "Western Digital 800BB-00JKA0" "WDC WD800BB-55JKA0" 194 C "Western Digital 800BB-55JKA0" "WDC WD800BB-75FRA0" 194 C "Western Digital Caviar WD800BB" @@ -339,13 +347,12 @@ "WDC WD1200LB-55EDA0" 194 C "Western Digital WD1220LB" "WDC WD1600BB-00DWA0" 194 C "Western Digital Caviar WD1600BB" "WDC WD1600JB-(00EV|00FU|00GV|75GV)A0" 194 C "Western Digital Caviar 160GB Special Edition 8MB" -"WDC WD2000JB-(00EV|34EV|00FU|00GV|55GV|98GV)A0" 194 C "Western Digital Caviar 200GB Special Edition 8MB" +"WDC WD2000JB-(00EV|32EV|34EV|00FU|00GV|55GV|98GV)A0" 194 C "Western Digital Caviar 200GB Special Edition 8MB" "WDC WD2500JB-(00FU|32FU|00GV|55GV)A0" 194 C "Western Digital Caviar 250GB Special Edition 8MB" "WDC WD2500JB-00GVC0" 194 C "Western Digital 250GB" "WDC WD2500JD-00GBB0" 194 C "Western Digital SATA Caviar 250GB Special Edition 8MB" "WDC WD2500PB-98FBA0" 194 C "Western Digital Caviar 250GB Special Edition 8MB" -"WDC WD135BA" 231 C "Western Digital WD135BA" - +"WDC WD3200JB-00KFA0" 194 C "Western Digital Caviar 320GB 8MB" # not sure for next # "WDC WD1200JB-00CRA1" 9 C "Western Digital 1200JB-00CRA1" Index: hddtemp.spec =================================================================== RCS file: /cvs/extras/rpms/hddtemp/devel/hddtemp.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- hddtemp.spec 13 Sep 2005 15:34:25 -0000 1.13 +++ hddtemp.spec 21 Sep 2005 18:09:14 -0000 1.14 @@ -1,4 +1,4 @@ -%define beta beta13 +%define beta beta14 Name: hddtemp Version: 0.3 @@ -96,6 +96,9 @@ %changelog +* Tue Sep 20 2005 Ville Skytt?? - 0.3-0.6.beta14 +- 0.3-beta14, drive database 2005-09-20. + * Sun Sep 11 2005 Ville Skytt?? - 0.3-0.6.beta13 - Update drive database to 2005-09-11. Index: sources =================================================================== RCS file: /cvs/extras/rpms/hddtemp/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 24 Mar 2005 16:57:47 -0000 1.6 +++ sources 21 Sep 2005 18:09:14 -0000 1.7 @@ -1 +1 @@ -36d98101daeac1ae8c1589a75aaab00c hddtemp-0.3-beta13.tar.bz2 +bbf8be4539495e18bec54af77511a680 hddtemp-0.3-beta14.tar.bz2 From fedora-extras-commits at redhat.com Wed Sep 21 19:56:08 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Wed, 21 Sep 2005 15:56:08 -0400 Subject: rpms/pam_pkcs11/devel pam_pkcs11-0.5.3-examples.patch, NONE, 1.1 pam_pkcs11-0.5.3-genmapper-config.patch, NONE, 1.1 pam_pkcs11-0.5.3-pcsc120.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 pam_pkcs11.spec, 1.1, 1.2 sources, 1.2, 1.3 pam_pkcs11-0.5.2-pki.patch, 1.1, NONE Message-ID: <200509211956.j8LJu806013435@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/pam_pkcs11/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13406 Modified Files: .cvsignore pam_pkcs11.spec sources Added Files: pam_pkcs11-0.5.3-examples.patch pam_pkcs11-0.5.3-genmapper-config.patch pam_pkcs11-0.5.3-pcsc120.patch Removed Files: pam_pkcs11-0.5.2-pki.patch Log Message: WIP commit, not quite ready yet: * Wed Sep 21 2005 Ville Skytt?? - 0.5.3-1 - 0.5.3, patch to compile with pcsc-lite < 1.2.9. - Comment out example entries in default configuration files. - Sync installation layout in config files and on disk. - Specfile cleanups and maintainability improvements. pam_pkcs11-0.5.3-examples.patch: --- NEW FILE pam_pkcs11-0.5.3-examples.patch --- Index: etc/digest_mapping.example =================================================================== --- etc/digest_mapping.example (revision 182) +++ etc/digest_mapping.example (working copy) @@ -1,4 +1,5 @@ # Mapping for certificate sha1 digest # Format: Cert SHA1 digest (hexdot) -> login # -90:17:64:09:4C:42:D6:9C:91:52:7F:1C:86:00:23:DC:BB:5D:27:50 -> jantonio +# Example: +# 90:17:64:09:4C:42:D6:9C:91:52:7F:1C:86:00:23:DC:BB:5D:27:50 -> jantonio Index: etc/subject_mapping.example =================================================================== --- etc/subject_mapping.example (revision 182) +++ etc/subject_mapping.example (working copy) @@ -1,4 +1,5 @@ # Mapping file for Certificate Subject # format: Certificate Subject -> login # -/C=ES/O=FNMT/OU=FNMT Clase 2 CA/OU=500051483/CN=NOMBRE MARTINEZ CASTA\xF1O JUAN ANTONIO - NIF 50431138G -> jantonio +# Example: +# /C=ES/O=FNMT/OU=FNMT Clase 2 CA/OU=500051483/CN=NOMBRE MARTINEZ CASTA\xF1O JUAN ANTONIO - NIF 50431138G -> jantonio Index: etc/mail_mapping.example =================================================================== --- etc/mail_mapping.example (revision 182) +++ etc/mail_mapping.example (working copy) @@ -1,7 +1,8 @@ # mapping file for Certificate E-email # format: email -> login # -jantonio at dit.upm.es -> jantonio -juan_a_mtnez at yahoo.es -> jantonio -jonsito at terra.es -> jantonio -pjpg at dit.upm.es -> pjpg +# Examples: +# jantonio at dit.upm.es -> jantonio +# juan_a_mtnez at yahoo.es -> jantonio +# jonsito at terra.es -> jantonio +# pjpg at dit.upm.es -> pjpg pam_pkcs11-0.5.3-genmapper-config.patch: --- NEW FILE pam_pkcs11-0.5.3-genmapper-config.patch --- Index: src/mappers/Makefile.am =================================================================== --- src/mappers/Makefile.am (revision 182) +++ src/mappers/Makefile.am (working copy) @@ -10,6 +10,7 @@ # Statically linked mapperis list # Uncomment to get refered mapper statically linked # DON'T FORGET update libmappers_la_SOURCES and lib_LTLIBRARIES entries below +# nor the corresponding "module = ..." in etc/pam_pkcs11.conf.example # AM_CFLAGS += -DSUBJECT_MAPPER_STATIC #AM_CFLAGS += -DLDAP_MAPPER_STATIC Index: etc/pam_pkcs11.conf.example =================================================================== --- etc/pam_pkcs11.conf.example (revision 182) +++ etc/pam_pkcs11.conf.example (working copy) @@ -99,7 +99,8 @@ # Generic certificate contents mapper mapper generic { debug = true; - module = /usr/lib/pam_pkcs11/generic_mapper.so; + # module = /usr/lib/pam_pkcs11/generic_mapper.so; + module = internal; # ignore letter case on match/compare ignorecase = false; # Use one of "cn" , "subject" , "kpn" , "email" , "upn" or "uid" pam_pkcs11-0.5.3-pcsc120.patch: --- NEW FILE pam_pkcs11-0.5.3-pcsc120.patch --- --- src/tools/card_eventmgr.c~ 2005-09-21 00:19:50.000000000 +0300 +++ src/tools/card_eventmgr.c 2005-09-21 00:25:54.000000000 +0300 @@ -311,7 +311,7 @@ LONG rv; SCARD_READERSTATE_A *rgReaderStates_t = NULL; DWORD dwReaders, dwReadersOld; - LPTSTR mszReaders = NULL; + char *mszReaders = NULL; char *ptr, **readers = NULL; int nbReaders, i; int first_loop = TRUE; Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/pam_pkcs11/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 29 Aug 2005 03:15:27 -0000 1.2 +++ .cvsignore 21 Sep 2005 19:56:06 -0000 1.3 @@ -1 +1 @@ -pam_pkcs11-0.5.2.tar.gz +pam_pkcs11-0.5.3.tar.gz Index: pam_pkcs11.spec =================================================================== RCS file: /cvs/extras/rpms/pam_pkcs11/devel/pam_pkcs11.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- pam_pkcs11.spec 29 Aug 2005 03:15:27 -0000 1.1 +++ pam_pkcs11.spec 21 Sep 2005 19:56:06 -0000 1.2 @@ -1,19 +1,24 @@ Name: pam_pkcs11 -Version: 0.5.2 -Release: 2%{?dist} +Version: 0.5.3 +Release: 1%{?dist} Summary: PKCS #11 PAM login module Group: System Environment/Base License: LGPL URL: http://www.opensc.org/pam_pkcs11 -Source0: http://oasis.dit.upm.es/~jantonio/pam-pkcs11/downloads/%{name}-%{version}.tar.gz +Source0: http://www.opensc.org/files/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Patch0: pam_pkcs11-0.5.2-pki.patch -Patch1: pam_pkcs11-0.5.2-badstatic.patch +# http://www.opensc.org/pam_pkcs11/ticket/11 +Patch0: %{name}-0.5.3-pcsc120.patch +Patch1: %{name}-0.5.2-badstatic.patch +# http://www.opensc.org/pam_pkcs11/ticket/9 +Patch2: %{name}-0.5.3-examples.patch +# http://www.opensc.org/pam_pkcs11/ticket/10 +Patch3: %{name}-0.5.3-genmapper-config.patch BuildRequires: pam-devel, openssl-devel, openldap-devel %{?_with_curl:BuildRequires: curl-devel} -BuildRequires: libxslt docbook-style-xsl +BuildRequires: libxslt docbook-style-xsl Provides: pkcs11_login = %{version}-%{release} %description @@ -41,17 +46,25 @@ %prep %setup -q -%patch0 -p1 -%patch1 -p1 -# 64bit arches -%ifarch ia64 sparc64 alpha ppc64 x86_64 -for i in etc/pam_pkcs11.conf.example etc/pkcs11_eventmgr.conf.example etc/pam.d_login.example src/pam_pkcs11/pam_config.c src/tools/pkcs11_eventmgr.c; do - sed -i 's/usr\/lib/usr\/lib64/g' $i -done -%endif +if ! pkg-config --atleast-version 1.2.9 libpcsclite ; then +%patch0 +fi +#patch1 -p1 +%patch2 +%patch3 + +grep -rlF /etc/pam_pkcs11/pkcs11_module.so * \ +| xargs sed -i -e \ + 's|/etc/pam_pkcs11/pkcs11_module\.so|%{_libdir}/pam_pkcs11/pkcs11_module.so|g' + +grep -rlF /etc/pam_pkcs11 * \ +| xargs sed -i -e 's|/etc/pam_pkcs11|%{_sysconfdir}/pki/pam_pkcs11|g' + +grep -rl '/usr/lib\b' * | xargs sed -i -e 's|/usr/lib\b|%{_libdir}|g' %build +# --disable-static is broken as of 0.5.[23] %configure --disable-dependency-tracking %{?_with_curl} make %{?_smp_mflags} @@ -59,45 +72,41 @@ %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT +install -dm 755 $RPM_BUILD_ROOT/%{_lib} +mv $RPM_BUILD_ROOT%{_libdir}/security $RPM_BUILD_ROOT/%{_lib} + # Nuke the static and libtool bits rm -rf $RPM_BUILD_ROOT%{_libdir}/pam_pkcs11/*.*a -# 64 bit correction -%ifarch ia64 sparc64 alpha ppc64 x86_64 -mv $RPM_BUILD_ROOT/lib $RPM_BUILD_ROOT/lib64 -%endif - -# Nuke %{_datadir}/pam_pkcs11 +# Example configs are installed in-place and some as docs rm -rf $RPM_BUILD_ROOT%{_datadir}/pam_pkcs11 -# Hardcoded defaults... no sysconfdir -mkdir -p $RPM_BUILD_ROOT/etc/pki/pkcs11/mapdir -install -dm 755 $RPM_BUILD_ROOT/etc/pki/pkcs11/cacerts -install -dm 755 $RPM_BUILD_ROOT/etc/pki/pkcs11/crls -install -m 644 etc/pam_pkcs11.conf.example $RPM_BUILD_ROOT/etc/pki/pkcs11/pam_pkcs11.conf -install -m 644 etc/card_eventmgr.conf.example $RPM_BUILD_ROOT/etc/pki/pkcs11/card_eventmgr.conf -install -m 644 etc/pkcs11_eventmgr.conf.example $RPM_BUILD_ROOT/etc/pki/pkcs11/pkcs11_eventmgr.conf -install -m 644 etc/digest_mapping.example $RPM_BUILD_ROOT/etc/pki/pkcs11/digest_mapping -install -m 644 etc/mail_mapping.example $RPM_BUILD_ROOT/etc/pki/pkcs11/mail_mapping -install -m 644 etc/subject_mapping.example $RPM_BUILD_ROOT/etc/pki/pkcs11/subject_mapping +install -dm 755 \ + $RPM_BUILD_ROOT%{_sysconfdir}/pki/pam_pkcs11/{cacerts,crls,mapdir} +for file in card_eventmgr.conf pam_pkcs11.conf pkcs11_eventmgr.conf {digest,mail,subject}_mapping ; do + install -pm 644 etc/$file.example \ + $RPM_BUILD_ROOT%{_sysconfdir}/pki/pam_pkcs11/$file +done + %clean rm -rf $RPM_BUILD_ROOT + %files %defattr(-,root,root,-) %doc AUTHORS COPYING README TODO ChangeLog NEWS -%doc docs/pam_pkcs11.html -%doc docs/README.autologin -%doc docs/README.mappers +%doc doc/pam_pkcs11.html +%doc doc/README.autologin doc/README.ldap_mapper doc/README.mappers %doc etc/pam.d_login.example -%dir %{_sysconfdir}/pki/pkcs11 -%config(noreplace) %{_sysconfdir}/pki/pkcs11/cacerts -%config(noreplace) %{_sysconfdir}/pki/pkcs11/crls -%config(noreplace) %{_sysconfdir}/pki/pkcs11/pam_pkcs11.conf -%config(noreplace) %{_sysconfdir}/pki/pkcs11/digest_mapping -%config(noreplace) %{_sysconfdir}/pki/pkcs11/mail_mapping -%config(noreplace) %{_sysconfdir}/pki/pkcs11/subject_mapping +%dir %{_sysconfdir}/pki/pam_pkcs11 +%config(noreplace) %{_sysconfdir}/pki/pam_pkcs11/cacerts/ +%config(noreplace) %{_sysconfdir}/pki/pam_pkcs11/crls/ +%config(noreplace) %{_sysconfdir}/pki/pam_pkcs11/mapdir/ +%config(noreplace) %{_sysconfdir}/pki/pam_pkcs11/pam_pkcs11.conf +%config(noreplace) %{_sysconfdir}/pki/pam_pkcs11/digest_mapping +%config(noreplace) %{_sysconfdir}/pki/pam_pkcs11/mail_mapping +%config(noreplace) %{_sysconfdir}/pki/pam_pkcs11/subject_mapping %{_bindir}/make_hash_link.sh %{_libdir}/pam_pkcs11/ /%{_lib}/security/pam_pkcs11.so @@ -105,20 +114,23 @@ %files tools %defattr(-,root,root,-) -%dir %{_sysconfdir}/pki/pkcs11 -%config(noreplace) %{_sysconfdir}/pki/pkcs11/card_eventmgr.conf -%config(noreplace) %{_sysconfdir}/pki/pkcs11/pkcs11_eventmgr.conf +%doc doc/README.eventmgr +%config(noreplace) %{_sysconfdir}/pki/pam_pkcs11/card_eventmgr.conf +%config(noreplace) %{_sysconfdir}/pki/pam_pkcs11/pkcs11_eventmgr.conf %{_bindir}/card_eventmgr %{_bindir}/pkcs11_eventmgr %{_bindir}/pklogin_finder %{_bindir}/pkcs11_inspect -%{_mandir}/man1/card_eventmgr.1.gz -%{_mandir}/man1/pkcs11_eventmgr.1.gz -%{_mandir}/man1/pkcs11_inspect.1.gz -%{_mandir}/man1/pklogin_finder.1.gz -%doc docs/README.eventmgr +%{_mandir}/man1/* + %changelog +* Wed Sep 21 2005 Ville Skytt?? - 0.5.3-1 +- 0.5.3, patch to compile with pcsc-lite < 1.2.9. +- Comment out example entries in default configuration files. +- Sync installation layout in config files and on disk. +- Specfile cleanups and maintainability improvements. + * Sun Aug 28 2005 Tom "spot" Callaway 0.5.2-2 - don't need the datadir - 64bit fixups @@ -131,7 +143,6 @@ - remove BR:automake - own directories - use /etc/pki -- use --disable-static * Sat Aug 13 2005 Tom "spot" Callaway 0.5.1-1 - minor cleanups (and naming change) for Fedora Extras Index: sources =================================================================== RCS file: /cvs/extras/rpms/pam_pkcs11/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 29 Aug 2005 03:15:27 -0000 1.2 +++ sources 21 Sep 2005 19:56:06 -0000 1.3 @@ -1 +1 @@ -5b5c6ac1c718297fa250d8a5b6e7cb82 pam_pkcs11-0.5.2.tar.gz +607e3ba84b8938eff20c51c597e522c0 pam_pkcs11-0.5.3.tar.gz --- pam_pkcs11-0.5.2-pki.patch DELETED --- From fedora-extras-commits at redhat.com Wed Sep 21 20:07:26 2005 From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard)) Date: Wed, 21 Sep 2005 16:07:26 -0400 Subject: rpms/colorscheme/devel colorscheme-0.2.1-include64.patch, NONE, 1.1 colorscheme.spec, 1.1, 1.2 Message-ID: <200509212007.j8LK7QBQ014892@cvs-int.fedora.redhat.com> Author: abompard Update of /cvs/extras/rpms/colorscheme/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14846 Modified Files: colorscheme.spec Added Files: colorscheme-0.2.1-include64.patch Log Message: - add patch for missing include colorscheme-0.2.1-include64.patch: --- NEW FILE colorscheme-0.2.1-include64.patch --- --- ./src/main.cc.include64 2005-09-21 22:01:06.000000000 +0200 +++ ./src/main.cc 2005-09-21 22:01:40.000000000 +0200 @@ -33,6 +33,7 @@ #include #include "gcs-mainwindow.h" +#include "gcs-i18n.h" namespace gcs { Index: colorscheme.spec =================================================================== RCS file: /cvs/extras/rpms/colorscheme/devel/colorscheme.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- colorscheme.spec 20 Sep 2005 07:49:28 -0000 1.1 +++ colorscheme.spec 21 Sep 2005 20:07:24 -0000 1.2 @@ -1,12 +1,13 @@ Name: colorscheme Version: 0.2.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Generate a variety of colorschemes from a single starting color Group: Applications/Multimedia License: GPL URL: http://home.gna.org/colorscheme/ Source0: http://download.gna.org/colorscheme/0.2/colorscheme-0.2.1.tar.bz2 +Patch0: colorscheme-0.2.1-include64.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gtkmm24-devel >= 2.5, libgnomeui-devel >= 2.0, desktop-file-utils @@ -24,6 +25,7 @@ %prep %setup -q +%patch0 -p1 -b .include64 %build @@ -61,5 +63,8 @@ %changelog +* Wed Sep 21 2005 Aurelien Bompard 0.2.1-2 +- add patch for missing include + * Sun Sep 18 2005 Aurelien Bompard 0.2.1-1 - initial Fedora package (reviewed in bug 168635) From fedora-extras-commits at redhat.com Wed Sep 21 20:09:27 2005 From: fedora-extras-commits at redhat.com (Aaron Kurtz (dragoon)) Date: Wed, 21 Sep 2005 16:09:27 -0400 Subject: rpms/gnome-applet-netspeed/devel gnome-applet-netspeed.spec, 1.4, 1.5 Message-ID: <200509212009.j8LK9Rlk014980@cvs-int.fedora.redhat.com> Author: dragoon Update of /cvs/extras/rpms/gnome-applet-netspeed/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14952/devel Modified Files: gnome-applet-netspeed.spec Log Message: * Wed Sep 21 2005 Aaron Kurtz - 0.13-2 - Proper buildreps this time Index: gnome-applet-netspeed.spec =================================================================== RCS file: /cvs/extras/rpms/gnome-applet-netspeed/devel/gnome-applet-netspeed.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- gnome-applet-netspeed.spec 20 Sep 2005 07:25:28 -0000 1.4 +++ gnome-applet-netspeed.spec 21 Sep 2005 20:09:25 -0000 1.5 @@ -1,6 +1,6 @@ Name: gnome-applet-netspeed Version: 0.13 -Release: 1%{?dist} +Release: 2%{?dist} Summary: GNOME applet that shows traffic on a network device Group: Applications/Internet @@ -9,7 +9,7 @@ Source0: http://www.wh-hms.uni-ulm.de/~mfcn/netspeed/packages/netspeed_applet-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: pkgconfig, gettext, scrollkeeper -BuildRequires: libgnomeui-devel >= 2.8 +BuildRequires: libgnomeui-devel >= 2.8, libgtop2-devel BuildRequires: gnome-panel-devel >= 2.8 Requires(post): scrollkeeper Requires(postun): scrollkeeper @@ -53,6 +53,9 @@ %{_datadir}/omf/netspeed_applet/ %changelog +* Wed Sep 21 2005 Aaron Kurtz - 0.13-2 +- Proper buildreps this time + * Tue Sep 20 2005 Aaron Kurtz - 0.13-1 - Bump to 0.13 From fedora-extras-commits at redhat.com Wed Sep 21 20:09:28 2005 From: fedora-extras-commits at redhat.com (Aaron Kurtz (dragoon)) Date: Wed, 21 Sep 2005 16:09:28 -0400 Subject: rpms/gnome-applet-netspeed/FC-4 gnome-applet-netspeed.spec,1.4,1.5 Message-ID: <200509212009.j8LK9SlR014991@cvs-int.fedora.redhat.com> Author: dragoon Update of /cvs/extras/rpms/gnome-applet-netspeed/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14952/FC-4 Modified Files: gnome-applet-netspeed.spec Log Message: * Wed Sep 21 2005 Aaron Kurtz - 0.13-2 - Proper buildreps this time Index: gnome-applet-netspeed.spec =================================================================== RCS file: /cvs/extras/rpms/gnome-applet-netspeed/FC-4/gnome-applet-netspeed.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- gnome-applet-netspeed.spec 20 Sep 2005 07:25:29 -0000 1.4 +++ gnome-applet-netspeed.spec 21 Sep 2005 20:09:26 -0000 1.5 @@ -1,6 +1,6 @@ Name: gnome-applet-netspeed Version: 0.13 -Release: 1%{?dist} +Release: 2%{?dist} Summary: GNOME applet that shows traffic on a network device Group: Applications/Internet @@ -9,7 +9,7 @@ Source0: http://www.wh-hms.uni-ulm.de/~mfcn/netspeed/packages/netspeed_applet-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: pkgconfig, gettext, scrollkeeper -BuildRequires: libgnomeui-devel >= 2.8 +BuildRequires: libgnomeui-devel >= 2.8, libgtop2-devel BuildRequires: gnome-panel-devel >= 2.8 Requires(post): scrollkeeper Requires(postun): scrollkeeper @@ -53,6 +53,9 @@ %{_datadir}/omf/netspeed_applet/ %changelog +* Wed Sep 21 2005 Aaron Kurtz - 0.13-2 +- Proper buildreps this time + * Tue Sep 20 2005 Aaron Kurtz - 0.13-1 - Bump to 0.13 From fedora-extras-commits at redhat.com Thu Sep 22 02:33:52 2005 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Wed, 21 Sep 2005 22:33:52 -0400 Subject: rpms/scim/FC-4 scim.spec,1.21,1.22 Message-ID: <200509220233.j8M2Xqgr024259@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/scim/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24238 Modified Files: scim.spec Log Message: - move libs and the gtk immodule to scim-libs for multilib - make scim-devel require scim-libs - add xinput.d entries for Indic langs Index: scim.spec =================================================================== RCS file: /cvs/extras/rpms/scim/FC-4/scim.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- scim.spec 9 Sep 2005 05:47:23 -0000 1.21 +++ scim.spec 22 Sep 2005 02:33:50 -0000 1.22 @@ -1,7 +1,7 @@ Name: scim Version: 1.4.2 # must be less than the release number of scim in Core -Release: 1%{?dist} +Release: 3%{?dist} Summary: Smart Common Input Method platform License: LGPL @@ -26,7 +26,7 @@ %package devel Summary: Smart Common Input Method platform Group: Development/Libraries -Requires: %{name} = %{version}-%{release} +Requires: %{name}-libs = %{version}-%{release} Requires: gtk2-devel %description devel @@ -36,12 +36,20 @@ %package doc Summary: Smart Common Input Method platform documentation -Group: Development/Libraries +Group: Documentation %description doc SCIM development documentation files generated from the sourcecode. +%package libs +Summary: Smart Common Input Method libraries +Group: System Environment/Libraries + +%description libs +This package provides the libraries and GTK input method module for SCIM. + + %prep %setup -q %patch1 -p1 -b .1-restart @@ -86,11 +94,14 @@ %clean rm -rf ${RPM_BUILD_ROOT} +%define cjk_langs ja_JP ko_KR zh_CN zh_TW +%define indic_langs bn_IN gu_IN hi_IN kn_IN ml_IN pa_IN ta_IN te_IN +%define supported_langs %{cjk_langs} %{indic_langs} ne_NE th_TH %post /sbin/ldconfig -for llcc in ja_JP ko_KR zh_CN zh_TW; do +for llcc in %{supported_langs}; do %{_sbindir}/alternatives --install %{_sysconfdir}/X11/xinit/xinput.d/$llcc xinput-$llcc %{_sysconfdir}/X11/xinit/xinput.d/scim 81 done @@ -101,7 +112,7 @@ /sbin/ldconfig if [ "$1" = "0" ]; then - for llcc in ja_JP ko_KR zh_CN zh_TW; do + for llcc in %{supported_langs}; do %{_sbindir}/alternatives --remove xinput-$llcc %{_sysconfdir}/X11/xinit/xinput.d/scim # if alternative was set to manual scim, reset to auto [ "`readlink %{_sysconfdir}/alternatives/xinput-$llcc`" = "%{_sysconfdir}/X11/xinit/xinput.d/scim" ] && %{_sbindir}/alternatives --auto xinput-$llcc @@ -118,9 +129,7 @@ %config(noreplace) %{_sysconfdir}/scim/* %{_sysconfdir}/X11/xinit/xinput.d %{_bindir}/* -%{_libdir}/libscim*.so.* %{_libdir}/scim-1.0 -%{_libdir}/gtk-2.0/immodules %{_datadir}/scim %{_datadir}/pixmaps/* %{_datadir}/applications/fedora-scim-setup.desktop @@ -136,8 +145,20 @@ %defattr(-,root,root,-) %doc docs/html +%files libs +%defattr(-,root,root,-) +%{_libdir}/libscim-*.so.* +%{_libdir}/gtk-2.0/immodules + %changelog +* Thu Sep 22 2005 Jens Petersen - 1.4.2-3 +- make scim-devel require scim-libs +- add xinput.d entries for Indic langs + +* Thu Sep 15 2005 Jens Petersen +- move libs and the gtk immodule to scim-libs for multilib + * Fri Sep 9 2005 Jens Petersen - 1.4.2-1 - improve scim-restart script to take account of the config module in use (Liu Cougar) From fedora-extras-commits at redhat.com Thu Sep 22 02:58:43 2005 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Wed, 21 Sep 2005 22:58:43 -0400 Subject: rpms/scim/FC-3 scim.spec,1.15,1.16 Message-ID: <200509220258.j8M2whvF024340@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/scim/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24319 Modified Files: scim.spec Log Message: sync with FC-4: - move libs and the gtk immodule to scim-libs for multilib - make scim-devel require scim-libs - add xinput.d entries for Indic langs Index: scim.spec =================================================================== RCS file: /cvs/extras/rpms/scim/FC-3/scim.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- scim.spec 9 Sep 2005 06:39:54 -0000 1.15 +++ scim.spec 22 Sep 2005 02:58:41 -0000 1.16 @@ -1,7 +1,7 @@ Name: scim Version: 1.4.2 # must be less than the release number of scim in Core -Release: 1%{?dist} +Release: 3%{?dist} Summary: Smart Common Input Method platform License: LGPL @@ -26,7 +26,7 @@ %package devel Summary: Smart Common Input Method platform Group: Development/Libraries -Requires: %{name} = %{version}-%{release} +Requires: %{name}-libs = %{version}-%{release} Requires: gtk2-devel %description devel @@ -36,12 +36,20 @@ %package doc Summary: Smart Common Input Method platform documentation -Group: Development/Libraries +Group: Documentation %description doc SCIM development documentation files generated from the sourcecode. +%package libs +Summary: Smart Common Input Method libraries +Group: System Environment/Libraries + +%description libs +This package provides the libraries and GTK input method module for SCIM. + + %prep %setup -q %patch1 -p1 -b .1-restart @@ -51,6 +59,7 @@ %build +# symbol versioning enabled for FC3 and RHEL4 %configure --disable-static --enable-ld-version-script make %{?_smp_mflags} @@ -85,11 +94,14 @@ %clean rm -rf ${RPM_BUILD_ROOT} +%define cjk_langs ja_JP ko_KR zh_CN zh_TW +%define indic_langs bn_IN gu_IN hi_IN kn_IN ml_IN pa_IN ta_IN te_IN +%define supported_langs %{cjk_langs} %{indic_langs} ne_NE th_TH %post /sbin/ldconfig -for llcc in ja_JP ko_KR zh_CN zh_TW; do +for llcc in %{supported_langs}; do %{_sbindir}/alternatives --install %{_sysconfdir}/X11/xinit/xinput.d/$llcc xinput-$llcc %{_sysconfdir}/X11/xinit/xinput.d/scim 81 done @@ -100,7 +112,7 @@ /sbin/ldconfig if [ "$1" = "0" ]; then - for llcc in ja_JP ko_KR zh_CN zh_TW; do + for llcc in %{supported_langs}; do %{_sbindir}/alternatives --remove xinput-$llcc %{_sysconfdir}/X11/xinit/xinput.d/scim # if alternative was set to manual scim, reset to auto [ "`readlink %{_sysconfdir}/alternatives/xinput-$llcc`" = "%{_sysconfdir}/X11/xinit/xinput.d/scim" ] && %{_sbindir}/alternatives --auto xinput-$llcc @@ -117,9 +129,7 @@ %config(noreplace) %{_sysconfdir}/scim/* %{_sysconfdir}/X11/xinit/xinput.d %{_bindir}/* -%{_libdir}/libscim*.so.* %{_libdir}/scim-1.0 -%{_libdir}/gtk-2.0/immodules %{_datadir}/scim %{_datadir}/pixmaps/* %{_datadir}/applications/fedora-scim-setup.desktop @@ -135,8 +145,20 @@ %defattr(-,root,root,-) %doc docs/html +%files libs +%defattr(-,root,root,-) +%{_libdir}/libscim-*.so.* +%{_libdir}/gtk-2.0/immodules + %changelog +* Thu Sep 22 2005 Jens Petersen - 1.4.2-3 +- make scim-devel require scim-libs +- add xinput.d entries for Indic langs + +* Thu Sep 15 2005 Jens Petersen +- move libs and the gtk immodule to scim-libs for multilib + * Fri Sep 9 2005 Jens Petersen - 1.4.2-1 - improve scim-restart script to take account of the config module in use (Liu Cougar) @@ -148,7 +170,7 @@ for now so that rhgb doesn't load scim (Warren Togami, #167088) * Thu Aug 25 2005 Warren Togami -- --enable-ld-version-script +- configure with --enable-ld-version-script (#166041) * Mon Aug 22 2005 Jens Petersen - 1.4.2-0 - update to 1.4.2 release From fedora-extras-commits at redhat.com Thu Sep 22 03:06:16 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Wed, 21 Sep 2005 23:06:16 -0400 Subject: rpms/Coin2/devel Coin2.spec,1.17,1.18 Message-ID: <200509220306.j8M36qFD025735@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/Coin2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25716 Modified Files: Coin2.spec Log Message: - Remove simacros patch. - Remove libtool patch. - Link against freetype2. Index: Coin2.spec =================================================================== RCS file: /cvs/extras/rpms/Coin2/devel/Coin2.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- Coin2.spec 21 Sep 2005 14:26:31 -0000 1.17 +++ Coin2.spec 22 Sep 2005 03:06:09 -0000 1.18 @@ -9,12 +9,11 @@ %define libopenal_SONAME libopenal.so.0 %define libsimage_SONAME libsimage.so.20 -# %define libfreetype_SONAME libfreetype.so.6 Summary: High-level 3D visualization library Name: Coin2 Version: 2.4.4 -Release: 1.1%{?dist} +Release: 2%{?dist} License: GPL Group: System Environment/Libraries @@ -24,9 +23,6 @@ Patch0: coin-2.3.0-simage-soname.diff Patch1: coin-2.3.0-openal-soname.diff -Patch2: coin-2.3.0-freetype-soname.diff -Patch3: Coin-2.4.3-simacros.diff.bz2 -Patch4: Coin-2.4.3-libtool.diff.bz2 Patch5: coin-2.3.0-man3.diff BuildRequires: xorg-x11-Mesa-libGL @@ -42,9 +38,6 @@ Requires(post): /sbin/ldconfig Requires(postun): /sbin/ldconfig -# TESTING -ExclusiveArch: x86_64 - %description Coin is a 3D graphics library with an Application Programming Interface based on the Open Inventor 2.1 API. @@ -62,13 +55,8 @@ %setup -q -n Coin-%{version} %patch0 -p1 %patch1 -p1 -# %patch2 -p1 -# %patch3 -p1 -# %patch4 -p1 %patch5 -p1 -# sed -i -e 's, at LIBFREETYPE_SONAME@,"%{libfreetype_SONAME}",' \ -# src/glue/freetype.c sed -i -e 's, at LIBSIMAGE_SONAME@,"%{libsimage_SONAME}",' \ src/glue/simage_wrapper.c sed -i -e 's, at LIBOPENAL_SONAME@,"%{libopenal_SONAME}",' \ @@ -93,14 +81,11 @@ make %{?_smp_mflags} %install - rm -rf $RPM_BUILD_ROOT +rm -rf $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT install -# TESTING -exit 1 - %clean - rm -rf $RPM_BUILD_ROOT +rm -rf $RPM_BUILD_ROOT %post /sbin/ldconfig @@ -127,6 +112,11 @@ %doc %{coin_htmldir} %changelog +* Thu Sep 22 2005 Ralf Corsepius - 2.4.4-2 +- Remove simacros patch. +- Remove libtool patch. +- Link against freetype2. + * Tue Sep 20 2005 Ralf Corsepius - 2.4.4-1 - Upstream update. From fedora-extras-commits at redhat.com Thu Sep 22 03:10:23 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Wed, 21 Sep 2005 23:10:23 -0400 Subject: rpms/Coin2/devel sources,1.7,1.8 .cvsignore,1.7,1.8 Message-ID: <200509220310.j8M3ANsH025813@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/Coin2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25794 Modified Files: sources .cvsignore Log Message: - Remove simacros patch. - Remove libtool patch. - Link against freetype2. Index: sources =================================================================== RCS file: /cvs/extras/rpms/Coin2/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 20 Sep 2005 09:19:43 -0000 1.7 +++ sources 22 Sep 2005 03:10:21 -0000 1.8 @@ -1,4 +1 @@ -e2dcc9dde9d97577d211f3caba10c7e0 Coin-2.4.3-libtool.diff.bz2 -4f4d4e4172db2107c578d0d99fde2888 Coin-2.4.3-simacros.diff.bz2 -57c039a55133c5037ebef6759d26f603 Coin-2.4.3.tar.gz 7976fcf2d1154bc8574d75b99bab45ee Coin-2.4.4.tar.gz Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/Coin2/devel/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 20 Sep 2005 09:19:43 -0000 1.7 +++ .cvsignore 22 Sep 2005 03:10:21 -0000 1.8 @@ -1,4 +1 @@ -Coin-2.4.3-libtool.diff.bz2 -Coin-2.4.3-simacros.diff.bz2 -Coin-2.4.3.tar.gz Coin-2.4.4.tar.gz From fedora-extras-commits at redhat.com Thu Sep 22 03:13:55 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Wed, 21 Sep 2005 23:13:55 -0400 Subject: rpms/Coin2/devel coin-2.3.0-freetype-soname.diff,1.1,NONE Message-ID: <200509220313.j8M3Dtj4025911@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/Coin2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25894 Removed Files: coin-2.3.0-freetype-soname.diff Log Message: Remove --- coin-2.3.0-freetype-soname.diff DELETED --- From fedora-extras-commits at redhat.com Thu Sep 22 03:15:18 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Wed, 21 Sep 2005 23:15:18 -0400 Subject: rpms/Coin2/devel Coin2.spec,1.18,1.19 Message-ID: <200509220315.j8M3FILf025943@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/Coin2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25924 Modified Files: Coin2.spec Log Message: Version inflation. Index: Coin2.spec =================================================================== RCS file: /cvs/extras/rpms/Coin2/devel/Coin2.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- Coin2.spec 22 Sep 2005 03:06:09 -0000 1.18 +++ Coin2.spec 22 Sep 2005 03:15:16 -0000 1.19 @@ -13,7 +13,7 @@ Summary: High-level 3D visualization library Name: Coin2 Version: 2.4.4 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL Group: System Environment/Libraries @@ -112,7 +112,7 @@ %doc %{coin_htmldir} %changelog -* Thu Sep 22 2005 Ralf Corsepius - 2.4.4-2 +* Thu Sep 22 2005 Ralf Corsepius - 2.4.4-3 - Remove simacros patch. - Remove libtool patch. - Link against freetype2. From fedora-extras-commits at redhat.com Thu Sep 22 04:05:01 2005 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Thu, 22 Sep 2005 00:05:01 -0400 Subject: rpms/scim-tables/FC-4 Thai.png, NONE, 1.1 scim-tables-indic.patch, NONE, 1.1 thai-table.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 scim-tables.spec, 1.6, 1.7 sources, 1.2, 1.3 Message-ID: <200509220405.j8M451nM027414@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/scim-tables/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26053 Modified Files: .cvsignore scim-tables.spec sources Added Files: Thai.png scim-tables-indic.patch thai-table.patch Log Message: * Thu Sep 22 2005 Jens Petersen - 0.5.3-4 - add a Thai table derived from m17n-db with a Thai icon - separate the Indic tables and the additional language tables into separate language subpackages * Fri Sep 9 2005 Jens Petersen - add 14 new Indic tables for Bengali, Gujarati, Hindi, Kannada, Malayalam, Punjabi, Tamil and Telugu in updated scim-tables-indic.patch - inscript tables are derived from iiimf unitle tables - new icons for all Indic tables by Amanpreet Singh Brar - Indic tables are now in new scim-tables-indic subpackage - make {chinese,japanese,korean} subpackages obsolete {zh,ja,ko} - make subpackages own %{_datadir}/scim/tables * Wed Aug 17 2005 Jens Petersen - 0.5.3 release - update files lists for new tables (ipa, latex, nepali, wu) - rename {zh,ja,ko} subpackages to {chinese,japanese,korean} scim-tables-indic.patch: --- NEW FILE scim-tables-indic.patch --- diff -ruN --exclude='*~' scim-tables-0.5.3.orig/Makefile.am scim-tables-0.5.3/Makefile.am --- scim-tables-0.5.3.orig/Makefile.am 2005-08-04 22:29:46.000000000 +0900 +++ scim-tables-0.5.3/Makefile.am 2005-09-21 17:25:28.000000000 +0900 @@ -30,7 +30,7 @@ SKIM_SUBDIR=skim endif -SUBDIRS = intl m4 src zh ja ko ne additional icons po $(SKIM_SUBDIR) +SUBDIRS = intl m4 src zh ja ko bn gu hi kn ml ne pa ta te additional icons po $(SKIM_SUBDIR) MAINTAINERCLEANFILES = Makefile.in aclocal.m4 configure $(AUX_DIST) diff -ruN --exclude='*~' scim-tables-0.5.3.orig/bn/Bengali-inscript.txt.in scim-tables-0.5.3/bn/Bengali-inscript.txt.in --- scim-tables-0.5.3.orig/bn/Bengali-inscript.txt.in 1970-01-01 09:00:00.000000000 +0900 +++ scim-tables-0.5.3/bn/Bengali-inscript.txt.in 2005-09-21 17:25:28.000000000 +0900 @@ -0,0 +1,205 @@ +### File header must not be modified +### This file must be encoded into UTF-8. +### This file is derived from iiimf unitLE's Bengali inscript layout. +SCIM_Generic_Table_Phrase_Library_TEXT +VERSION_1_0 + +### Begin Table definition. +BEGIN_DEFINITION + +### An unique id to distinguish this table among others. +### Use uuidgen to generate this kind of id. +UUID = b01beb4c-c1ba-4cb5-afb7-d21a9372a231 + +### A unique number indicates the version of this file. +### For example the last modified date of this file. +### This number must be less than 2^32. +SERIAL_NUMBER = 20050808 + +ICON = @SCIM_ICONDIR@/Bengali-inscript.png + +### The default name of this table +NAME = Inscript + +### The local names of this table +NAME.bn_IN = ????????????????????????????????? + +### Supported languages of this table +LANGUAGES = bn + +### The author of this table +AUTHOR = Amanpreet Singh Brar + +### Prompt string to be displayed in the status area. +STATUS_PROMPT = Bn + +### If true then the first candidate phrase +### will be selected automatically during inputing. +AUTO_SELECT = TRUE + +### If true then a multi wildcard will be appended +### at the end of inputing string automatically. +AUTO_WILDCARD = FALSE + +### If true then the result string will be committed to client automatically. +### This should be used with AUTO_SELECT = TRUE. +AUTO_COMMIT = TRUE + +### If true then the inputed string will be automatically splitted during inputing. +AUTO_SPLIT = TRUE + +### If true then the phrases' frequencies will be adjusted dynamically. +DYNAMIC_ADJUST = FALSE + +### If true then the preedit area will be filled up by the current candidate phrase automatically. +AUTO_FILL = TRUE + +### Whether to discard invalid key automatically. +### This takes effact only when AUTO_FILL and AUTO_COMMIT is true. +DISCARD_INVALID_KEY = TRUE + +### If true then the lookup table will always be shown if there is any candidate phrase. +### Otherwise the lookup table won't be shown unless the user requires it by moving the preedit caret left. +ALWAYS_SHOW_LOOKUP = FALSE + +### Enable full width punctuation property +USE_FULL_WIDTH_PUNCT = FALSE + +### Use full width punctuation by default +DEF_FULL_WIDTH_PUNCT = FALSE + +### Enable full width letter property +USE_FULL_WIDTH_LETTER = FALSE + +### Use full width letter by default +DEF_FULL_WIDTH_LETTER = FALSE + +### The maxmium length of a key. +MAX_KEY_LENGTH = 1 + +### Valid input chars. +VALID_INPUT_CHARS = abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890!@#$%^&*()_-+=|\~`:;"'{[}]<,>.?/ + +### Single wildcard char, can have multiple chars. +###SINGLE_WILDCARD_CHAR = ? + +### Multi wildcard char. +###MULTI_WILDCARD_CHAR = * + +### The key strokes to split inputted string. +###SPLIT_KEYS = quoteright + +### The key strokes to commit the convert result to client. +COMMIT_KEYS = space + +### The key strokes to forward the inputed string to client. +FORWARD_KEYS = VoidSymbol + +### The key strokes to select candidiate phrases. +SELECT_KEYS = VoidSymbol + +### The key strokes to page up the lookup table. +PAGE_UP_KEYS = VoidSymbol + +### The key strokes to page down the lookup table. +PAGE_DOWN_KEYS = VoidSymbol + +END_DEFINITION + +### Begin Table data. +BEGIN_TABLE +! ! 0 +" ??? 0 +' ??? 0 +( ( 0 +) ) 0 ++ ??? 0 +, , 0 +- - 0 +. ??? 0 +/ ??? 0 +0 ??? 0 +1 ??? 0 +2 ??? 0 +3 ??? 0 +4 ??? 0 +5 ??? 0 +6 ??? 0 +7 ??? 0 +8 ??? 0 +9 ??? 0 +: ??? 0 +; ??? 0 +< ??? 0 += ??? 0 +> > 0 +? ??? 0 +@ @ 0 +# ?????? 0 +$ ?????? 0 +% ????????? 0 +& ????????? 0 +* ????????? 0 +^ ????????? 0 +A ??? 0 +B B 0 +C ??? 0 +D ??? 0 +E ??? 0 +F ??? 0 +G ??? 0 +H ??? 0 +I ??? 0 +J J 0 +K ??? 0 +L ??? 0 +M ??? 0 +N N 0 +O ??? 0 +P ??? 0 +Q ??? 0 +R ??? 0 +S ??? 0 +T ??? 0 +U ??? 0 +V V 0 +W ??? 0 +X ??? 0 +Y ??? 0 +Z Z 0 +[ ??? 0 +\ \ 0 +] ??? 0 +_ ??? 0 +` ` 0 +a ??? 0 +b b 0 +c ??? 0 +d ??? 0 +e ??? 0 +f ??? 0 +g ??? 0 +h ??? 0 +i ??? 0 [...3498 lines suppressed...] + +### Begin Table definition. +BEGIN_DEFINITION + +### An unique id to distinguish this table among others. +### Use uuidgen to generate this kind of id. +UUID = 0bd6518c-5aec-4b97-817c-6efa43be8c8d + +### A unique number indicates the version of this file. +### For example the last modified date of this file. +### This number must be less than 2^32. +SERIAL_NUMBER = 20050901 + +ICON = @SCIM_ICONDIR@/Telugu-inscript.png + +### The default name of this table +NAME = Inscript + +### The local names of this table +NAME.te_IN = ?????????????????????????????? + +### Supported languages of this table +LANGUAGES = te_IN + +### The author of this table +AUTHOR = Jens Petersen + +### Prompt string to be displayed in the status area. +STATUS_PROMPT = Te + +### If true then the first candidate phrase +### will be selected automatically during inputing. +AUTO_SELECT = TRUE + +### If true then a multi wildcard will be appended +### at the end of inputing string automatically. +AUTO_WILDCARD = FALSE + +### If true then the result string will be committed to client automatically. +### This should be used with AUTO_SELECT = TRUE. +AUTO_COMMIT = TRUE + +### If true then the inputed string will be automatically splitted during inputing. +AUTO_SPLIT = TRUE + +### If true then the phrases' frequencies will be adjusted dynamically. +DYNAMIC_ADJUST = FALSE + +### If true then the preedit area will be filled up by the current candidate phrase automatically. +AUTO_FILL = TRUE + +### Whether to discard invalid key automatically. +### This takes effact only when AUTO_FILL and AUTO_COMMIT is true. +DISCARD_INVALID_KEY = TRUE + +### If true then the lookup table will always be shown if there is any candidate phrase. +### Otherwise the lookup table won't be shown unless the user requires it by moving the preedit caret left. +ALWAYS_SHOW_LOOKUP = FALSE + +### Enable full width punctuation property +USE_FULL_WIDTH_PUNCT = FALSE + +### Use full width punctuation by default +DEF_FULL_WIDTH_PUNCT = FALSE + +### Enable full width letter property +USE_FULL_WIDTH_LETTER = FALSE + +### Use full width letter by default +DEF_FULL_WIDTH_LETTER = FALSE + +### The maxmium length of a key. +MAX_KEY_LENGTH = 1 + +### Valid input chars. +VALID_INPUT_CHARS = abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890!@#$%^&*()_-+=|\~`:;"'{[}]<,>.?/ + +### Single wildcard char, can have multiple chars. +###SINGLE_WILDCARD_CHAR = ? + +### Multi wildcard char. +###MULTI_WILDCARD_CHAR = * + +### The key strokes to split inputted string. +###SPLIT_KEYS = quoteright + +### The key strokes to commit the convert result to client. +COMMIT_KEYS = space + +### The key strokes to forward the inputed string to client. +FORWARD_KEYS = VoidSymbol + +### The key strokes to select candidiate phrases. +SELECT_KEYS = VoidSymbol + +### The key strokes to page up the lookup table. +PAGE_UP_KEYS = VoidSymbol + +### The key strokes to page down the lookup table. +PAGE_DOWN_KEYS = VoidSymbol + +END_DEFINITION + +### Begin Table data. +BEGIN_TABLE +! ! +1 ??? +@ @ +2 ??? +# # +3 ??? +$ $ +4 ??? +5 ??? +6 ??? +7 ??? +8 ??? +( ( +9 ??? +) ) +0 ??? +_ _ +- - ++ ??? += ??? +Q ??? +q ??? +W ??? +w ??? +E ??? +e ??? +R ??? +r ??? +T ??? +t ??? +Y ??? +y ??? +U ??? +u ??? +I ??? +i ??? +O ??? +o ??? +P ??? +p ??? +{ ??? +[ ??? +} ??? +] ] +A ??? +a ??? +S ??? +s ??? +D ??? +d ??? +F ??? +f ??? +G ??? +g ??? +H ??? +h ??? +J ??? +j ??? +K ??? +k ??? +L ??? +l ??? +: ??? +; ??? +" ??? +' ??? +| | +\ \ +~ ??? +` ??? +Z ??? +z ??? +X X +x ??? +C ??? +c ??? +V V +v ??? +B B +b ??? +N ??? +n ??? +M ??? +m ??? +< ??? +, , +> > +. . +? ? +/ ??? +% ????????? +^ ????????? +& ????????? +* ????????? +END_TABLE thai-table.patch: --- NEW FILE thai-table.patch --- --- scim-tables-0.5.3/configure.ac~ 2005-09-06 18:17:52.000000000 +0900 +++ scim-tables-0.5.3/configure.ac 2005-09-08 19:52:58.000000000 +0900 @@ -160,6 +160,7 @@ additional/Arabic.txt additional/Danish.txt additional/LaTeX.txt + additional/Thai.txt additional/Viqr.txt additional/Yawerty.txt additional/IPA-X-SAMPA.txt --- scim-tables-0.5.3/additional/Makefile.am~ 2005-09-06 18:17:52.000000000 +0900 +++ scim-tables-0.5.3/additional/Makefile.am 2005-09-08 20:05:30.000000000 +0900 @@ -21,6 +21,7 @@ Arabic.txt.in \ Danish.txt.in \ LaTeX.txt.in \ + Thai.txt.in \ Viqr.txt.in \ Yawerty.txt.in \ IPA-X-SAMPA.txt.in @@ -29,6 +30,7 @@ Arabic.txt \ Danish.txt \ LaTeX.txt \ + Thai.txt \ Viqr.txt \ Yawerty.txt \ IPA-X-SAMPA.txt @@ -38,6 +40,7 @@ Arabic.bin \ Danish.bin \ LaTeX.bin \ + Thai.bin \ Viqr.bin \ Yawerty.bin \ IPA-X-SAMPA.bin --- scim-tables-0.5.3/additional/Thai.txt.in~ 2005-09-09 09:36:42.000000000 +0900 +++ scim-tables-0.5.3/additional/Thai.txt.in 2005-09-09 09:37:28.000000000 +0900 @@ -0,0 +1,198 @@ +### File header must not be modified +### This file must be encoded into UTF-8. +### Derived from th-kesmanee.mim table in m17n-db. +SCIM_Generic_Table_Phrase_Library_TEXT +VERSION_1_0 + +### Begin Table definition. +BEGIN_DEFINITION + +### An unique id to distinguish this table among others. +### Use uuidgen to generate this kind of id. +UUID = d63402a2-2268-44fc-b415-99eb2276ff7b + +### A unique number indicates the version of this file. +### For example the last modified date of this file. +### This number must be less than 2^32. +SERIAL_NUMBER = 20050908 + +ICON = @SCIM_ICONDIR@/Thai.png + +### The default name of this table +NAME = Thai + +### Author of this table +AUTHOR = Jens Petersen + +### Supported locales of this table +LANGUAGES = th + +### Prompt string to be displayed in the status area. +STATUS_PROMPT = Th + +### If true then the first candidate phrase +### will be selected automatically during inputing. +AUTO_SELECT = TRUE + +### If true then a multi wildcard will be appended +### at the end of inputting string automatically. +AUTO_WILDCARD = FALSE + +### If true then the result string will be committed to client automatically. +### This should be used with AUTO_SELECT = TRUE. +AUTO_COMMIT = TRUE + +### If true then the inputted string will be automatically splitted during inputing. +AUTO_SPLIT = TRUE + +### If true then the phrases' frequencies will be adjusted dynamically. +DYNAMIC_ADJUST = FALSE + +### If true then the preedit area will be filled up by the current candidate phrase automatically. +AUTO_FILL = TRUE + +### If true then the lookup table will always be shown if there is any candidate phrase. +### Otherwise the lookup table won't be shown unless the user requires it by moving the preedit caret left. +ALWAYS_SHOW_LOOKUP = FALSE + +### Enable full width punctuation property +USE_FULL_WIDTH_PUNCT = FALSE + +### Use full width punctuation by default +DEF_FULL_WIDTH_PUNCT = FALSE + +### Enable full width letter property +USE_FULL_WIDTH_LETTER = FALSE + +### Use full width letter by default +DEF_FULL_WIDTH_LETTER = FALSE + +### The maxmium length of a key. +MAX_KEY_LENGTH = 1 + +### Valid input chars. +VALID_INPUT_CHARS = !"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}~ + +### Single wildcard char, can have multiple chars. +###SINGLE_WILDCARD_CHAR = ? + +### Multi wildcard char. +###MULTI_WILDCARD_CHAR = * + +### The key strokes to split inputted string. +### SPLIT_KEYS = quoteright + +### The key strokes to commit the convert result to client. +COMMIT_KEYS = VoidSymbol + +### The key strokes to forward the inputted string to client. +FORWARD_KEYS = VoidSymbol + +### The key strokes to select candidiate phrases. +SELECT_KEYS = VoidSymbol + +### The key strokes to page up the lookup table. +PAGE_UP_KEYS = VoidSymbol + +### The key strokes to page down the lookup table. +PAGE_DOWN_KEYS = VoidSymbol + +END_DEFINITION + +### Begin Table data. +BEGIN_TABLE +! # +" ??? +# ??? +$ ??? +% ??? +& ?????? +' ??? +( ??? +) ??? +* ??? ++ ??? +, ??? +- ??? +. ??? +/ ??? +0 ??? +1 ??? +2 / +3 _ +4 ??? +5 ??? +6 ??? +7 ??? +8 ??? +9 ??? +: ??? +; ??? +< ??? += ??? +> ??? +? ??? +@ ??? +A ??? +B ??? +C ??? +D ??? +E ??? +F ??? +G ??? +H ??? +I ??? +J ??? +K ??? +L ??? +M ??? +N ??? +O ??? +P ??? +Q ??? +R ??? +S ??? +T ??? +U ??? +V ??? +W " +X ) +Y ??? +Z ( +[ ??? +\ ??? +] ??? +^ ??? +_ ??? +` ??? +a ??? +b ??? +c ??? +d ??? +e ??? +f ??? +g ??? +h ??? +i ??? +j ??? +k ??? +l ??? +m ??? +n ??? +o ??? +p ??? +q ??? +r ??? +s ??? +t ??? +u ??? +v ??? +w ??? +x ??? +y ??? +z ??? +{ ??? +| ??? +} . +~ ??? +END_TABLE --- scim-tables-0.5.3/icons/Makefile.am~ 2005-09-15 16:33:35.000000000 +0900 +++ scim-tables-0.5.3/icons/Makefile.am 2005-09-15 16:33:35.000000000 +0900 @@ -57,6 +57,7 @@ Tamil-inscript.png \ Tamil-phonetic.png \ Telugu-inscript.png \ + Thai.png \ Viqr.png \ Wu.png \ Wubi.png \ Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/scim-tables/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 11 Jun 2005 01:15:47 -0000 1.2 +++ .cvsignore 22 Sep 2005 04:04:59 -0000 1.3 @@ -1 +1,2 @@ -scim-tables-0.5.1.tar.gz +scim-tables-0.5.3.tar.gz +indic-icons-1.tar.gz Index: scim-tables.spec =================================================================== RCS file: /cvs/extras/rpms/scim-tables/FC-4/scim-tables.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- scim-tables.spec 2 Aug 2005 09:13:28 -0000 1.6 +++ scim-tables.spec 22 Sep 2005 04:04:59 -0000 1.7 @@ -1,60 +1,192 @@ -Name: scim-tables -Version: 0.5.1 -Release: 3.2%{?dist} -Summary: SCIM Generic Table IMEngine - -License: GPL -Group: System Environment/Libraries -URL: http://sourceforge.net/projects/scim -Source0: http://download.sourceforge.net/scim/%{name}-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n) +Name: scim-tables +Version: 0.5.3 +Release: 4%{?dist} +Summary: SCIM Generic Table IMEngine -BuildRequires: scim-devel, gtk2-devel - +License: GPL +Group: System Environment/Libraries +URL: http://sourceforge.net/projects/scim +Source0: http://download.sourceforge.net/scim/%{name}-%{version}.tar.gz +Source1: indic-icons-1.tar.gz +Source2: Thai.png +BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n) + +BuildRequires: scim-devel, gtk2-devel +BuildRequires: gettext-devel +Patch1: scim-tables-indic.patch +Patch2: thai-table.patch %description This package contains the Generic Table IMEngine for SCIM. -%package zh +%package amharic +Summary: SCIM tables for Amharic +Group: System Environment/Libraries +Requires: scim-tables = %{version} + +%description amharic +This package contains scim-tables files for Amharic input. + +%package arabic +Summary: SCIM tables for Arabic +Group: System Environment/Libraries +Requires: scim-tables = %{version} + +%description arabic +This package contains scim-tables files for Chinese input. + +%package bengali +Summary: SCIM tables for Bengali +Group: System Environment/Libraries +Requires: scim-tables = %{version} + +%description bengali +This package contains scim-tables files for Bengali input. + +%package chinese Summary: SCIM tables for Chinese Group: System Environment/Libraries Requires: scim-tables = %{version} +Obsoletes: scim-tables-zh + +%description chinese +This package contains scim-tables files for Chinese input. -%description zh -This package includes table IM data files for Chinese. +%package danish +Summary: SCIM tables for Danish +Group: System Environment/Libraries +Requires: scim-tables = %{version} -%package ja +%description danish +This package contains scim-tables files for Danish input. + +%package gujarati +Summary: SCIM tables for Gujarati +Group: System Environment/Libraries +Requires: scim-tables = %{version} + +%description gujarati +This package contains scim-tables files for Gujarati input. + +%package hindi +Summary: SCIM tables for Hindi +Group: System Environment/Libraries +Requires: scim-tables = %{version} + +%description hindi +This package contains scim-tables files for Hindi input. + +%package japanese Summary: SCIM tables for Japanese Group: System Environment/Libraries Requires: scim-tables = %{version} +Obsoletes: scim-tables-ja + +%description japanese +This package contains scim-tables files for Japanese. -%description ja -This package includes table IM data files for Japanese. +%package kannada +Summary: SCIM tables for Kannada +Group: System Environment/Libraries +Requires: scim-tables = %{version} -%package ko +%description kannada +This package contains scim-tables files for Kannada input. + +%package korean Summary: SCIM tables for Korean Group: System Environment/Libraries Requires: scim-tables = %{version} +Obsoletes: scim-tables-ko + +%description korean +This package contains scim-tables files for Korean. + +%package malayalam +Summary: SCIM tables for Malayalam scripts +Group: System Environment/Libraries +Requires: scim-tables = %{version} + +%description malayalam +This package contains scim-tables files for Malayalam languages. + +%package nepali +Summary: SCIM tables for +Group: System Environment/Libraries +Requires: scim-tables = %{version} + +%description nepali +This package contains scim-tables files for input. + +%package punjabi +Summary: SCIM tables for Punjabi +Group: System Environment/Libraries +Requires: scim-tables = %{version} + +%description punjabi +This package contains scim-tables files for Punjabi input. + +%package russian +Summary: SCIM tables for Russian +Group: System Environment/Libraries +Requires: scim-tables = %{version} + +%description russian +This package contains scim-tables files for Russian input. + +%package tamil +Summary: SCIM tables for Tamil +Group: System Environment/Libraries +Requires: scim-tables = %{version} + +%description tamil +This package contains scim-tables files for Tamil input. + +%package thai +Summary: SCIM tables for Thai +Group: System Environment/Libraries +Requires: scim-tables = %{version} + +%description thai +This package contains scim-tables files for Thai input. + +%package telugu +Summary: SCIM tables for Telugu +Group: System Environment/Libraries +Requires: scim-tables = %{version} + +%description telugu +This package contains scim-tables files for Telugu input. + +%package vietnamese +Summary: SCIM tables for Vietnamese +Group: System Environment/Libraries +Requires: scim-tables = %{version} -%description ko -This package includes table IM data files for Korean. +%description vietnamese +This package contains scim-tables files for Vietnamese input. %package additional -Summary: SCIM tables for some additional languages +Summary: Other miscellaneous SCIM tables Group: System Environment/Libraries Requires: scim-tables = %{version} %description additional -This package includes table IM data files for additional languages, -such as Russian etc.. +This package contains some miscellaneous scim-tables. %prep -%setup -q +%setup -q -a1 +%patch1 -p1 -b .1 +%patch2 -p1 -b .2 +# patch1, patch2, and patch3 touch Makefile.am's and configure.ac +autoreconf + +cp %SOURCE2 %SOURCE3 icons %build -%configure +%configure --disable-static make %{?_smp_mflags} @@ -63,7 +195,7 @@ make DESTDIR=${RPM_BUILD_ROOT} install # kill *.a and *.la files -rm -f ${RPM_BUILD_ROOT}/%{_libdir}/scim-1.0/*/*.{a,la} +rm -f ${RPM_BUILD_ROOT}/%{_libdir}/scim-1.0/*/*.la %find_lang %{name} @@ -73,12 +205,10 @@ rm -rf $RPM_BUILD_ROOT -%post -/sbin/ldconfig +%post -p /sbin/ldconfig -%postun -/sbin/ldconfig +%postun -p /sbin/ldconfig %files -f %{name}.lang @@ -89,9 +219,33 @@ %{_datadir}/scim/icons/table.png -%files zh +%files amharic +%defattr(-, root, root, -) +%dir %{_datadir}/scim/tables +%{_datadir}/scim/tables/Amharic.bin +%{_datadir}/scim/icons/Amharic.png + + +%files arabic +%defattr(-, root, root, -) +%dir %{_datadir}/scim/tables +%{_datadir}/scim/tables/Arabic.bin +%{_datadir}/scim/icons/Arabic.png + + +%files bengali +%defattr(-, root, root, -) +%dir %{_datadir}/scim/tables +%{_datadir}/scim/tables/Bengali-inscript.bin +%{_datadir}/scim/tables/Bengali-probhat.bin +%{_datadir}/scim/icons/Bengali-inscript.png +%{_datadir}/scim/icons/Bengali-probhat.png + + +%files chinese %defattr(-, root, root, -) %doc zh/README-Erbi.txt zh/README-CangJie.txt +%dir %{_datadir}/scim/tables %{_datadir}/scim/tables/Array30.bin %{_datadir}/scim/tables/CangJie.bin %{_datadir}/scim/tables/CangJie3.bin @@ -105,6 +259,7 @@ %{_datadir}/scim/tables/Quick.bin %{_datadir}/scim/tables/Simplex.bin %{_datadir}/scim/tables/Stroke5.bin +%{_datadir}/scim/tables/Wu.bin %{_datadir}/scim/tables/Wubi.bin %{_datadir}/scim/tables/Ziranma.bin %{_datadir}/scim/tables/ZhuYin.bin @@ -121,14 +276,41 @@ %{_datadir}/scim/icons/Quick.png %{_datadir}/scim/icons/Simplex.png %{_datadir}/scim/icons/Stroke5.png +%{_datadir}/scim/icons/Wu.png %{_datadir}/scim/icons/Wubi.png %{_datadir}/scim/icons/Ziranma.png %{_datadir}/scim/icons/ZhuYin.png -%files ja +%files danish +%defattr(-, root, root, -) +%dir %{_datadir}/scim/tables +%{_datadir}/scim/tables/Danish.bin +%{_datadir}/scim/icons/Danish.png + + +%files gujarati +%defattr(-, root, root, -) +%dir %{_datadir}/scim/tables +%{_datadir}/scim/tables/Gujarati-inscript.bin +%{_datadir}/scim/tables/Gujarati-phonetic.bin +%{_datadir}/scim/icons/Gujarati-inscript.png +%{_datadir}/scim/icons/Gujarati-phonetic.png + + +%files hindi +%defattr(-, root, root, -) +%dir %{_datadir}/scim/tables +%{_datadir}/scim/tables/Hindi-inscript.bin +%{_datadir}/scim/tables/Hindi-phonetic.bin +%{_datadir}/scim/icons/Hindi-inscript.png +%{_datadir}/scim/icons/Hindi-phonetic.png + + +%files japanese %defattr(-, root, root, -) %doc ja/kanjidic_licence.html ja/kanjidic_doc.html +%dir %{_datadir}/scim/tables %{_datadir}/scim/tables/HIRAGANA.bin %{_datadir}/scim/tables/KATAKANA.bin %{_datadir}/scim/tables/Nippon.bin @@ -137,8 +319,18 @@ %{_datadir}/scim/icons/Nippon.png -%files ko +%files kannada %defattr(-, root, root, -) +%dir %{_datadir}/scim/tables +%{_datadir}/scim/tables/Kannada-inscript.bin +%{_datadir}/scim/tables/Kannada-kgp.bin +%{_datadir}/scim/icons/Kannada-inscript.png +%{_datadir}/scim/icons/Kannada-kgp.png + + +%files korean +%defattr(-, root, root, -) +%dir %{_datadir}/scim/tables %{_datadir}/scim/tables/Hangul.bin %{_datadir}/scim/tables/HangulRomaja.bin %{_datadir}/scim/tables/Hanja.bin @@ -146,26 +338,102 @@ %{_datadir}/scim/icons/Hanja.png -%files additional +%files malayalam %defattr(-, root, root, -) -%{_datadir}/scim/tables/Arabic.bin -%{_datadir}/scim/tables/Amharic.bin -%{_datadir}/scim/tables/Viqr.bin +%dir %{_datadir}/scim/tables +%{_datadir}/scim/tables/Malayalam-inscript.bin +%{_datadir}/scim/icons/Malayalam-inscript.png + + +%files nepali +%defattr(-, root, root, -) +%dir %{_datadir}/scim/tables +%{_datadir}/scim/tables/Nepali_*.bin +%{_datadir}/scim/icons/Nepali.png + + +%files punjabi +%defattr(-, root, root, -) +%dir %{_datadir}/scim/tables +%{_datadir}/scim/tables/Punjabi-inscript.bin +%{_datadir}/scim/tables/Punjabi-jhelum.bin +%{_datadir}/scim/tables/Punjabi-phonetic.bin +%{_datadir}/scim/icons/Punjabi-inscript.png +%{_datadir}/scim/icons/Punjabi-jhelum.png +%{_datadir}/scim/icons/Punjabi-phonetic.png + + +%files russian +%defattr(-, root, root, -) +%dir %{_datadir}/scim/tables %{_datadir}/scim/tables/Yawerty.bin -%{_datadir}/scim/icons/Arabic.png -%{_datadir}/scim/icons/Amharic.png -%{_datadir}/scim/icons/Viqr.png %{_datadir}/scim/icons/Yawerty.png +%files tamil +%defattr(-, root, root, -) +%dir %{_datadir}/scim/tables +%{_datadir}/scim/tables/Tamil-inscript.bin +%{_datadir}/scim/tables/Tamil-phonetic.bin +%{_datadir}/scim/icons/Tamil-inscript.png +%{_datadir}/scim/icons/Tamil-phonetic.png + + +%files thai +%defattr(-, root, root, -) +%dir %{_datadir}/scim/tables +%{_datadir}/scim/tables/Thai.bin +%{_datadir}/scim/icons/Thai.png + + +%files telugu +%defattr(-, root, root, -) +%dir %{_datadir}/scim/tables +%{_datadir}/scim/tables/Telugu-inscript.bin +%{_datadir}/scim/icons/Telugu-inscript.png + + +%files vietnamese +%defattr(-, root, root, -) +%dir %{_datadir}/scim/tables +%{_datadir}/scim/tables/Viqr.bin +%{_datadir}/scim/icons/Viqr.png + + +%files additional +%defattr(-, root, root, -) +%dir %{_datadir}/scim/tables +%{_datadir}/scim/tables/IPA-X-SAMPA.bin +%{_datadir}/scim/tables/LaTeX.bin +%{_datadir}/scim/icons/IPA-X-SAMPA.png +%{_datadir}/scim/icons/LaTeX.png + + %changelog -* Tue Aug 2 2005 Ryo Dairiki -0.5.1-3.2 -- Remove update-xinput-scim script +* Thu Sep 22 2005 Jens Petersen - 0.5.3-4 +- add a Thai table derived from m17n-db with a Thai icon +- separate the Indic tables and the additional language tables into separate + language subpackages + +* Fri Sep 9 2005 Jens Petersen +- add 14 new Indic tables for Bengali, Gujarati, Hindi, Kannada, Malayalam, + Punjabi, Tamil and Telugu in updated scim-tables-indic.patch + - inscript tables are derived from iiimf unitle tables + - new icons for all Indic tables by Amanpreet Singh Brar + - Indic tables are now in new scim-tables-indic subpackage +- make {chinese,japanese,korean} subpackages obsolete {zh,ja,ko} +- make subpackages own %{_datadir}/scim/tables + +* Wed Aug 17 2005 Jens Petersen +- 0.5.3 release + - replace scim-tables-0.5.1-add-hindi.patch with scim-tables-indic.patch + - update files lists for new tables (ipa, latex, nepali, wu) +- rename {zh,ja,ko} subpackages to {chinese,japanese,korean} -* Sun Jul 31 2005 Ryo Dairiki -0.5.1-3.1 -- Modify to use update-xinput-scim script +* Tue Aug 2 2005 Ryo Dairiki - 0.5.1-3.2 +- rebuild -* Wed Jul 27 2005 Ryo Dairiki -0.5.1-3 +* Wed Jul 27 2005 Ryo Dairiki - 0.5.1-3 - Rebuild for scim-1.4.0 * Sat Jun 25 2005 Colin Charles 0.5.1-2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/scim-tables/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 11 Jun 2005 01:15:47 -0000 1.2 +++ sources 22 Sep 2005 04:04:59 -0000 1.3 @@ -1 +1,2 @@ -3249d0fbdb731c2003bea093dc43f19c scim-tables-0.5.1.tar.gz +0e4c216af80e6a7d40d3d0224f84b22a scim-tables-0.5.3.tar.gz +e537986f66aaaad9a8e8e2fad7c2b8f1 indic-icons-1.tar.gz From fedora-extras-commits at redhat.com Thu Sep 22 05:13:42 2005 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Thu, 22 Sep 2005 01:13:42 -0400 Subject: common tobuild,1.2221,1.2222 Message-ID: <200509220513.j8M5Dgik028971@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28952 Modified Files: tobuild Log Message: request build of rpms/scim-tables/FC-4 scim-tables-0_5_3-4_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2221 retrieving revision 1.2222 diff -u -r1.2221 -r1.2222 --- tobuild 21 Sep 2005 06:30:26 -0000 1.2221 +++ tobuild 22 Sep 2005 05:13:39 -0000 1.2222 @@ -38,3 +38,4 @@ gemi rpms/clisp/FC-3 clisp-2_34-5_fc3 fc3 katzj rpms/perl-Class-Trigger/devel perl-Class-Trigger-0_09-3_fc5 devel orion rpms/python-matplotlib/FC-4 python-matplotlib-0_84-1_fc4 fc4 +petersen rpms/scim-tables/FC-4 scim-tables-0_5_3-4_fc4 fc4 From fedora-extras-commits at redhat.com Thu Sep 22 05:16:55 2005 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Thu, 22 Sep 2005 01:16:55 -0400 Subject: common tobuild,1.2222,1.2223 Message-ID: <200509220516.j8M5GtIP029003@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28984 Modified Files: tobuild Log Message: remove scim-tables fc4 build (iwbni "make build" ran cvs update ../common"...) Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2222 retrieving revision 1.2223 diff -u -r1.2222 -r1.2223 --- tobuild 22 Sep 2005 05:13:39 -0000 1.2222 +++ tobuild 22 Sep 2005 05:16:53 -0000 1.2223 @@ -38,4 +38,3 @@ gemi rpms/clisp/FC-3 clisp-2_34-5_fc3 fc3 katzj rpms/perl-Class-Trigger/devel perl-Class-Trigger-0_09-3_fc5 devel orion rpms/python-matplotlib/FC-4 python-matplotlib-0_84-1_fc4 fc4 -petersen rpms/scim-tables/FC-4 scim-tables-0_5_3-4_fc4 fc4 From fedora-extras-commits at redhat.com Thu Sep 22 05:25:41 2005 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Thu, 22 Sep 2005 01:25:41 -0400 Subject: rpms/scim-tables/FC-4 scim-tables.spec,1.7,1.8 Message-ID: <200509220526.j8M5QCm5029061@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/scim-tables/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29040 Modified Files: scim-tables.spec Log Message: no source3 here Index: scim-tables.spec =================================================================== RCS file: /cvs/extras/rpms/scim-tables/FC-4/scim-tables.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- scim-tables.spec 22 Sep 2005 04:04:59 -0000 1.7 +++ scim-tables.spec 22 Sep 2005 05:25:39 -0000 1.8 @@ -180,10 +180,10 @@ %patch1 -p1 -b .1 %patch2 -p1 -b .2 -# patch1, patch2, and patch3 touch Makefile.am's and configure.ac +# patch1 and patch2 touch Makefile.am's and configure.ac autoreconf -cp %SOURCE2 %SOURCE3 icons +cp %SOURCE2 icons %build %configure --disable-static From fedora-extras-commits at redhat.com Thu Sep 22 05:39:39 2005 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Thu, 22 Sep 2005 01:39:39 -0400 Subject: rpms/scim-tables/FC-4 scim-tables.spec,1.8,1.9 Message-ID: <200509220539.j8M5ddGd029184@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/scim-tables/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29165 Modified Files: scim-tables.spec Log Message: danish table not included Index: scim-tables.spec =================================================================== RCS file: /cvs/extras/rpms/scim-tables/FC-4/scim-tables.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- scim-tables.spec 22 Sep 2005 05:25:39 -0000 1.8 +++ scim-tables.spec 22 Sep 2005 05:39:37 -0000 1.9 @@ -52,14 +52,6 @@ %description chinese This package contains scim-tables files for Chinese input. -%package danish -Summary: SCIM tables for Danish -Group: System Environment/Libraries -Requires: scim-tables = %{version} - -%description danish -This package contains scim-tables files for Danish input. - %package gujarati Summary: SCIM tables for Gujarati Group: System Environment/Libraries @@ -282,13 +274,6 @@ %{_datadir}/scim/icons/ZhuYin.png -%files danish -%defattr(-, root, root, -) -%dir %{_datadir}/scim/tables -%{_datadir}/scim/tables/Danish.bin -%{_datadir}/scim/icons/Danish.png - - %files gujarati %defattr(-, root, root, -) %dir %{_datadir}/scim/tables From fedora-extras-commits at redhat.com Thu Sep 22 06:38:53 2005 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Thu, 22 Sep 2005 02:38:53 -0400 Subject: rpms/scim-tables/FC-3 Thai.png, NONE, 1.1 scim-tables-indic.patch, NONE, 1.1 thai-table.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 scim-tables.spec, 1.4, 1.5 sources, 1.2, 1.3 Message-ID: <200509220638.j8M6crp6030762@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/scim-tables/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30677 Modified Files: .cvsignore scim-tables.spec sources Added Files: Thai.png scim-tables-indic.patch thai-table.patch Log Message: sync with FC-4: * Thu Sep 22 2005 Jens Petersen - 0.5.3-4 - add a Thai table derived from m17n-db with a Thai icon - separate the Indic tables and the additional language tables into separate language subpackages * Fri Sep 9 2005 Jens Petersen - add 14 new Indic tables for Bengali, Gujarati, Hindi, Kannada, Malayalam, Punjabi, Tamil and Telugu in updated scim-tables-indic.patch - inscript tables are derived from iiimf unitle tables - new icons for all Indic tables by Amanpreet Singh Brar - Indic tables are now in new scim-tables-indic subpackage - make {chinese,japanese,korean} subpackages obsolete {zh,ja,ko} - make subpackages own %{_datadir}/scim/tables * Wed Aug 17 2005 Jens Petersen - 0.5.3 release - replace scim-tables-0.5.1-add-hindi.patch with scim-tables-indic.patch - update files lists for new tables (ipa, latex, nepali, wu) - rename {zh,ja,ko} subpackages to {chinese,japanese,korean} scim-tables-indic.patch: --- NEW FILE scim-tables-indic.patch --- diff -ruN --exclude='*~' scim-tables-0.5.3.orig/Makefile.am scim-tables-0.5.3/Makefile.am --- scim-tables-0.5.3.orig/Makefile.am 2005-08-04 22:29:46.000000000 +0900 +++ scim-tables-0.5.3/Makefile.am 2005-09-21 17:25:28.000000000 +0900 @@ -30,7 +30,7 @@ SKIM_SUBDIR=skim endif -SUBDIRS = intl m4 src zh ja ko ne additional icons po $(SKIM_SUBDIR) +SUBDIRS = intl m4 src zh ja ko bn gu hi kn ml ne pa ta te additional icons po $(SKIM_SUBDIR) MAINTAINERCLEANFILES = Makefile.in aclocal.m4 configure $(AUX_DIST) diff -ruN --exclude='*~' scim-tables-0.5.3.orig/bn/Bengali-inscript.txt.in scim-tables-0.5.3/bn/Bengali-inscript.txt.in --- scim-tables-0.5.3.orig/bn/Bengali-inscript.txt.in 1970-01-01 09:00:00.000000000 +0900 +++ scim-tables-0.5.3/bn/Bengali-inscript.txt.in 2005-09-21 17:25:28.000000000 +0900 @@ -0,0 +1,205 @@ +### File header must not be modified +### This file must be encoded into UTF-8. +### This file is derived from iiimf unitLE's Bengali inscript layout. +SCIM_Generic_Table_Phrase_Library_TEXT +VERSION_1_0 + +### Begin Table definition. +BEGIN_DEFINITION + +### An unique id to distinguish this table among others. +### Use uuidgen to generate this kind of id. +UUID = b01beb4c-c1ba-4cb5-afb7-d21a9372a231 + +### A unique number indicates the version of this file. +### For example the last modified date of this file. +### This number must be less than 2^32. +SERIAL_NUMBER = 20050808 + +ICON = @SCIM_ICONDIR@/Bengali-inscript.png + +### The default name of this table +NAME = Inscript + +### The local names of this table +NAME.bn_IN = ????????????????????????????????? + +### Supported languages of this table +LANGUAGES = bn + +### The author of this table +AUTHOR = Amanpreet Singh Brar + +### Prompt string to be displayed in the status area. +STATUS_PROMPT = Bn + +### If true then the first candidate phrase +### will be selected automatically during inputing. +AUTO_SELECT = TRUE + +### If true then a multi wildcard will be appended +### at the end of inputing string automatically. +AUTO_WILDCARD = FALSE + +### If true then the result string will be committed to client automatically. +### This should be used with AUTO_SELECT = TRUE. +AUTO_COMMIT = TRUE + +### If true then the inputed string will be automatically splitted during inputing. +AUTO_SPLIT = TRUE + +### If true then the phrases' frequencies will be adjusted dynamically. +DYNAMIC_ADJUST = FALSE + +### If true then the preedit area will be filled up by the current candidate phrase automatically. +AUTO_FILL = TRUE + +### Whether to discard invalid key automatically. +### This takes effact only when AUTO_FILL and AUTO_COMMIT is true. +DISCARD_INVALID_KEY = TRUE + +### If true then the lookup table will always be shown if there is any candidate phrase. +### Otherwise the lookup table won't be shown unless the user requires it by moving the preedit caret left. +ALWAYS_SHOW_LOOKUP = FALSE + +### Enable full width punctuation property +USE_FULL_WIDTH_PUNCT = FALSE + +### Use full width punctuation by default +DEF_FULL_WIDTH_PUNCT = FALSE + +### Enable full width letter property +USE_FULL_WIDTH_LETTER = FALSE + +### Use full width letter by default +DEF_FULL_WIDTH_LETTER = FALSE + +### The maxmium length of a key. +MAX_KEY_LENGTH = 1 + +### Valid input chars. +VALID_INPUT_CHARS = abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890!@#$%^&*()_-+=|\~`:;"'{[}]<,>.?/ + +### Single wildcard char, can have multiple chars. +###SINGLE_WILDCARD_CHAR = ? + +### Multi wildcard char. +###MULTI_WILDCARD_CHAR = * + +### The key strokes to split inputted string. +###SPLIT_KEYS = quoteright + +### The key strokes to commit the convert result to client. +COMMIT_KEYS = space + +### The key strokes to forward the inputed string to client. +FORWARD_KEYS = VoidSymbol + +### The key strokes to select candidiate phrases. +SELECT_KEYS = VoidSymbol + +### The key strokes to page up the lookup table. +PAGE_UP_KEYS = VoidSymbol + +### The key strokes to page down the lookup table. +PAGE_DOWN_KEYS = VoidSymbol + +END_DEFINITION + +### Begin Table data. +BEGIN_TABLE +! ! 0 +" ??? 0 +' ??? 0 +( ( 0 +) ) 0 ++ ??? 0 +, , 0 +- - 0 +. ??? 0 +/ ??? 0 +0 ??? 0 +1 ??? 0 +2 ??? 0 +3 ??? 0 +4 ??? 0 +5 ??? 0 +6 ??? 0 +7 ??? 0 +8 ??? 0 +9 ??? 0 +: ??? 0 +; ??? 0 +< ??? 0 += ??? 0 +> > 0 +? ??? 0 +@ @ 0 +# ?????? 0 +$ ?????? 0 +% ????????? 0 +& ????????? 0 +* ????????? 0 +^ ????????? 0 +A ??? 0 +B B 0 +C ??? 0 +D ??? 0 +E ??? 0 +F ??? 0 +G ??? 0 +H ??? 0 +I ??? 0 +J J 0 +K ??? 0 +L ??? 0 +M ??? 0 +N N 0 +O ??? 0 +P ??? 0 +Q ??? 0 +R ??? 0 +S ??? 0 +T ??? 0 +U ??? 0 +V V 0 +W ??? 0 +X ??? 0 +Y ??? 0 +Z Z 0 +[ ??? 0 +\ \ 0 +] ??? 0 +_ ??? 0 +` ` 0 +a ??? 0 +b b 0 +c ??? 0 +d ??? 0 +e ??? 0 +f ??? 0 +g ??? 0 +h ??? 0 +i ??? 0 [...3498 lines suppressed...] + +### Begin Table definition. +BEGIN_DEFINITION + +### An unique id to distinguish this table among others. +### Use uuidgen to generate this kind of id. +UUID = 0bd6518c-5aec-4b97-817c-6efa43be8c8d + +### A unique number indicates the version of this file. +### For example the last modified date of this file. +### This number must be less than 2^32. +SERIAL_NUMBER = 20050901 + +ICON = @SCIM_ICONDIR@/Telugu-inscript.png + +### The default name of this table +NAME = Inscript + +### The local names of this table +NAME.te_IN = ?????????????????????????????? + +### Supported languages of this table +LANGUAGES = te_IN + +### The author of this table +AUTHOR = Jens Petersen + +### Prompt string to be displayed in the status area. +STATUS_PROMPT = Te + +### If true then the first candidate phrase +### will be selected automatically during inputing. +AUTO_SELECT = TRUE + +### If true then a multi wildcard will be appended +### at the end of inputing string automatically. +AUTO_WILDCARD = FALSE + +### If true then the result string will be committed to client automatically. +### This should be used with AUTO_SELECT = TRUE. +AUTO_COMMIT = TRUE + +### If true then the inputed string will be automatically splitted during inputing. +AUTO_SPLIT = TRUE + +### If true then the phrases' frequencies will be adjusted dynamically. +DYNAMIC_ADJUST = FALSE + +### If true then the preedit area will be filled up by the current candidate phrase automatically. +AUTO_FILL = TRUE + +### Whether to discard invalid key automatically. +### This takes effact only when AUTO_FILL and AUTO_COMMIT is true. +DISCARD_INVALID_KEY = TRUE + +### If true then the lookup table will always be shown if there is any candidate phrase. +### Otherwise the lookup table won't be shown unless the user requires it by moving the preedit caret left. +ALWAYS_SHOW_LOOKUP = FALSE + +### Enable full width punctuation property +USE_FULL_WIDTH_PUNCT = FALSE + +### Use full width punctuation by default +DEF_FULL_WIDTH_PUNCT = FALSE + +### Enable full width letter property +USE_FULL_WIDTH_LETTER = FALSE + +### Use full width letter by default +DEF_FULL_WIDTH_LETTER = FALSE + +### The maxmium length of a key. +MAX_KEY_LENGTH = 1 + +### Valid input chars. +VALID_INPUT_CHARS = abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890!@#$%^&*()_-+=|\~`:;"'{[}]<,>.?/ + +### Single wildcard char, can have multiple chars. +###SINGLE_WILDCARD_CHAR = ? + +### Multi wildcard char. +###MULTI_WILDCARD_CHAR = * + +### The key strokes to split inputted string. +###SPLIT_KEYS = quoteright + +### The key strokes to commit the convert result to client. +COMMIT_KEYS = space + +### The key strokes to forward the inputed string to client. +FORWARD_KEYS = VoidSymbol + +### The key strokes to select candidiate phrases. +SELECT_KEYS = VoidSymbol + +### The key strokes to page up the lookup table. +PAGE_UP_KEYS = VoidSymbol + +### The key strokes to page down the lookup table. +PAGE_DOWN_KEYS = VoidSymbol + +END_DEFINITION + +### Begin Table data. +BEGIN_TABLE +! ! +1 ??? +@ @ +2 ??? +# # +3 ??? +$ $ +4 ??? +5 ??? +6 ??? +7 ??? +8 ??? +( ( +9 ??? +) ) +0 ??? +_ _ +- - ++ ??? += ??? +Q ??? +q ??? +W ??? +w ??? +E ??? +e ??? +R ??? +r ??? +T ??? +t ??? +Y ??? +y ??? +U ??? +u ??? +I ??? +i ??? +O ??? +o ??? +P ??? +p ??? +{ ??? +[ ??? +} ??? +] ] +A ??? +a ??? +S ??? +s ??? +D ??? +d ??? +F ??? +f ??? +G ??? +g ??? +H ??? +h ??? +J ??? +j ??? +K ??? +k ??? +L ??? +l ??? +: ??? +; ??? +" ??? +' ??? +| | +\ \ +~ ??? +` ??? +Z ??? +z ??? +X X +x ??? +C ??? +c ??? +V V +v ??? +B B +b ??? +N ??? +n ??? +M ??? +m ??? +< ??? +, , +> > +. . +? ? +/ ??? +% ????????? +^ ????????? +& ????????? +* ????????? +END_TABLE thai-table.patch: --- NEW FILE thai-table.patch --- --- scim-tables-0.5.3/configure.ac~ 2005-09-06 18:17:52.000000000 +0900 +++ scim-tables-0.5.3/configure.ac 2005-09-08 19:52:58.000000000 +0900 @@ -160,6 +160,7 @@ additional/Arabic.txt additional/Danish.txt additional/LaTeX.txt + additional/Thai.txt additional/Viqr.txt additional/Yawerty.txt additional/IPA-X-SAMPA.txt --- scim-tables-0.5.3/additional/Makefile.am~ 2005-09-06 18:17:52.000000000 +0900 +++ scim-tables-0.5.3/additional/Makefile.am 2005-09-08 20:05:30.000000000 +0900 @@ -21,6 +21,7 @@ Arabic.txt.in \ Danish.txt.in \ LaTeX.txt.in \ + Thai.txt.in \ Viqr.txt.in \ Yawerty.txt.in \ IPA-X-SAMPA.txt.in @@ -29,6 +30,7 @@ Arabic.txt \ Danish.txt \ LaTeX.txt \ + Thai.txt \ Viqr.txt \ Yawerty.txt \ IPA-X-SAMPA.txt @@ -38,6 +40,7 @@ Arabic.bin \ Danish.bin \ LaTeX.bin \ + Thai.bin \ Viqr.bin \ Yawerty.bin \ IPA-X-SAMPA.bin --- scim-tables-0.5.3/additional/Thai.txt.in~ 2005-09-09 09:36:42.000000000 +0900 +++ scim-tables-0.5.3/additional/Thai.txt.in 2005-09-09 09:37:28.000000000 +0900 @@ -0,0 +1,198 @@ +### File header must not be modified +### This file must be encoded into UTF-8. +### Derived from th-kesmanee.mim table in m17n-db. +SCIM_Generic_Table_Phrase_Library_TEXT +VERSION_1_0 + +### Begin Table definition. +BEGIN_DEFINITION + +### An unique id to distinguish this table among others. +### Use uuidgen to generate this kind of id. +UUID = d63402a2-2268-44fc-b415-99eb2276ff7b + +### A unique number indicates the version of this file. +### For example the last modified date of this file. +### This number must be less than 2^32. +SERIAL_NUMBER = 20050908 + +ICON = @SCIM_ICONDIR@/Thai.png + +### The default name of this table +NAME = Thai + +### Author of this table +AUTHOR = Jens Petersen + +### Supported locales of this table +LANGUAGES = th + +### Prompt string to be displayed in the status area. +STATUS_PROMPT = Th + +### If true then the first candidate phrase +### will be selected automatically during inputing. +AUTO_SELECT = TRUE + +### If true then a multi wildcard will be appended +### at the end of inputting string automatically. +AUTO_WILDCARD = FALSE + +### If true then the result string will be committed to client automatically. +### This should be used with AUTO_SELECT = TRUE. +AUTO_COMMIT = TRUE + +### If true then the inputted string will be automatically splitted during inputing. +AUTO_SPLIT = TRUE + +### If true then the phrases' frequencies will be adjusted dynamically. +DYNAMIC_ADJUST = FALSE + +### If true then the preedit area will be filled up by the current candidate phrase automatically. +AUTO_FILL = TRUE + +### If true then the lookup table will always be shown if there is any candidate phrase. +### Otherwise the lookup table won't be shown unless the user requires it by moving the preedit caret left. +ALWAYS_SHOW_LOOKUP = FALSE + +### Enable full width punctuation property +USE_FULL_WIDTH_PUNCT = FALSE + +### Use full width punctuation by default +DEF_FULL_WIDTH_PUNCT = FALSE + +### Enable full width letter property +USE_FULL_WIDTH_LETTER = FALSE + +### Use full width letter by default +DEF_FULL_WIDTH_LETTER = FALSE + +### The maxmium length of a key. +MAX_KEY_LENGTH = 1 + +### Valid input chars. +VALID_INPUT_CHARS = !"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}~ + +### Single wildcard char, can have multiple chars. +###SINGLE_WILDCARD_CHAR = ? + +### Multi wildcard char. +###MULTI_WILDCARD_CHAR = * + +### The key strokes to split inputted string. +### SPLIT_KEYS = quoteright + +### The key strokes to commit the convert result to client. +COMMIT_KEYS = VoidSymbol + +### The key strokes to forward the inputted string to client. +FORWARD_KEYS = VoidSymbol + +### The key strokes to select candidiate phrases. +SELECT_KEYS = VoidSymbol + +### The key strokes to page up the lookup table. +PAGE_UP_KEYS = VoidSymbol + +### The key strokes to page down the lookup table. +PAGE_DOWN_KEYS = VoidSymbol + +END_DEFINITION + +### Begin Table data. +BEGIN_TABLE +! # +" ??? +# ??? +$ ??? +% ??? +& ?????? +' ??? +( ??? +) ??? +* ??? ++ ??? +, ??? +- ??? +. ??? +/ ??? +0 ??? +1 ??? +2 / +3 _ +4 ??? +5 ??? +6 ??? +7 ??? +8 ??? +9 ??? +: ??? +; ??? +< ??? += ??? +> ??? +? ??? +@ ??? +A ??? +B ??? +C ??? +D ??? +E ??? +F ??? +G ??? +H ??? +I ??? +J ??? +K ??? +L ??? +M ??? +N ??? +O ??? +P ??? +Q ??? +R ??? +S ??? +T ??? +U ??? +V ??? +W " +X ) +Y ??? +Z ( +[ ??? +\ ??? +] ??? +^ ??? +_ ??? +` ??? +a ??? +b ??? +c ??? +d ??? +e ??? +f ??? +g ??? +h ??? +i ??? +j ??? +k ??? +l ??? +m ??? +n ??? +o ??? +p ??? +q ??? +r ??? +s ??? +t ??? +u ??? +v ??? +w ??? +x ??? +y ??? +z ??? +{ ??? +| ??? +} . +~ ??? +END_TABLE --- scim-tables-0.5.3/icons/Makefile.am~ 2005-09-15 16:33:35.000000000 +0900 +++ scim-tables-0.5.3/icons/Makefile.am 2005-09-15 16:33:35.000000000 +0900 @@ -57,6 +57,7 @@ Tamil-inscript.png \ Tamil-phonetic.png \ Telugu-inscript.png \ + Thai.png \ Viqr.png \ Wu.png \ Wubi.png \ Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/scim-tables/FC-3/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 11 Jun 2005 01:15:47 -0000 1.2 +++ .cvsignore 22 Sep 2005 06:38:51 -0000 1.3 @@ -1 +1,2 @@ -scim-tables-0.5.1.tar.gz +scim-tables-0.5.3.tar.gz +indic-icons-1.tar.gz Index: scim-tables.spec =================================================================== RCS file: /cvs/extras/rpms/scim-tables/FC-3/scim-tables.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- scim-tables.spec 2 Aug 2005 09:14:29 -0000 1.4 +++ scim-tables.spec 22 Sep 2005 06:38:51 -0000 1.5 @@ -1,60 +1,184 @@ -Name: scim-tables -Version: 0.5.1 -Release: 3.2%{?dist} -Summary: SCIM Generic Table IMEngine - -License: GPL -Group: System Environment/Libraries -URL: http://sourceforge.net/projects/scim -Source0: http://download.sourceforge.net/scim/%{name}-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n) +Name: scim-tables +Version: 0.5.3 +Release: 4%{?dist} +Summary: SCIM Generic Table IMEngine -BuildRequires: scim-devel, gtk2-devel - +License: GPL +Group: System Environment/Libraries +URL: http://sourceforge.net/projects/scim +Source0: http://download.sourceforge.net/scim/%{name}-%{version}.tar.gz +Source1: indic-icons-1.tar.gz +Source2: Thai.png +BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n) + +BuildRequires: scim-devel, gtk2-devel +BuildRequires: gettext-devel +Patch1: scim-tables-indic.patch +Patch2: thai-table.patch %description This package contains the Generic Table IMEngine for SCIM. -%package zh +%package amharic +Summary: SCIM tables for Amharic +Group: System Environment/Libraries +Requires: scim-tables = %{version} + +%description amharic +This package contains scim-tables files for Amharic input. + +%package arabic +Summary: SCIM tables for Arabic +Group: System Environment/Libraries +Requires: scim-tables = %{version} + +%description arabic +This package contains scim-tables files for Chinese input. + +%package bengali +Summary: SCIM tables for Bengali +Group: System Environment/Libraries +Requires: scim-tables = %{version} + +%description bengali +This package contains scim-tables files for Bengali input. + +%package chinese Summary: SCIM tables for Chinese Group: System Environment/Libraries Requires: scim-tables = %{version} +Obsoletes: scim-tables-zh -%description zh -This package includes table IM data files for Chinese. +%description chinese +This package contains scim-tables files for Chinese input. -%package ja +%package gujarati +Summary: SCIM tables for Gujarati +Group: System Environment/Libraries +Requires: scim-tables = %{version} + +%description gujarati +This package contains scim-tables files for Gujarati input. + +%package hindi +Summary: SCIM tables for Hindi +Group: System Environment/Libraries +Requires: scim-tables = %{version} + +%description hindi +This package contains scim-tables files for Hindi input. + +%package japanese Summary: SCIM tables for Japanese Group: System Environment/Libraries Requires: scim-tables = %{version} +Obsoletes: scim-tables-ja + +%description japanese +This package contains scim-tables files for Japanese. + +%package kannada +Summary: SCIM tables for Kannada +Group: System Environment/Libraries +Requires: scim-tables = %{version} -%description ja -This package includes table IM data files for Japanese. +%description kannada +This package contains scim-tables files for Kannada input. -%package ko +%package korean Summary: SCIM tables for Korean Group: System Environment/Libraries Requires: scim-tables = %{version} +Obsoletes: scim-tables-ko + +%description korean +This package contains scim-tables files for Korean. + +%package malayalam +Summary: SCIM tables for Malayalam scripts +Group: System Environment/Libraries +Requires: scim-tables = %{version} + +%description malayalam +This package contains scim-tables files for Malayalam languages. + +%package nepali +Summary: SCIM tables for +Group: System Environment/Libraries +Requires: scim-tables = %{version} + +%description nepali +This package contains scim-tables files for input. + +%package punjabi +Summary: SCIM tables for Punjabi +Group: System Environment/Libraries +Requires: scim-tables = %{version} + +%description punjabi +This package contains scim-tables files for Punjabi input. + +%package russian +Summary: SCIM tables for Russian +Group: System Environment/Libraries +Requires: scim-tables = %{version} + +%description russian +This package contains scim-tables files for Russian input. + +%package tamil +Summary: SCIM tables for Tamil +Group: System Environment/Libraries +Requires: scim-tables = %{version} + +%description tamil +This package contains scim-tables files for Tamil input. + +%package thai +Summary: SCIM tables for Thai +Group: System Environment/Libraries +Requires: scim-tables = %{version} + +%description thai +This package contains scim-tables files for Thai input. + +%package telugu +Summary: SCIM tables for Telugu +Group: System Environment/Libraries +Requires: scim-tables = %{version} + +%description telugu +This package contains scim-tables files for Telugu input. + +%package vietnamese +Summary: SCIM tables for Vietnamese +Group: System Environment/Libraries +Requires: scim-tables = %{version} -%description ko -This package includes table IM data files for Korean. +%description vietnamese +This package contains scim-tables files for Vietnamese input. %package additional -Summary: SCIM tables for some additional languages +Summary: Other miscellaneous SCIM tables Group: System Environment/Libraries Requires: scim-tables = %{version} %description additional -This package includes table IM data files for additional languages, -such as Russian etc.. +This package contains some miscellaneous scim-tables. %prep -%setup -q +%setup -q -a1 +%patch1 -p1 -b .1 +%patch2 -p1 -b .2 +# patch1 and patch2 touch Makefile.am's and configure.ac +autoreconf + +cp %SOURCE2 icons %build -%configure +%configure --disable-static make %{?_smp_mflags} @@ -63,7 +187,7 @@ make DESTDIR=${RPM_BUILD_ROOT} install # kill *.a and *.la files -rm -f ${RPM_BUILD_ROOT}/%{_libdir}/scim-1.0/*/*.{a,la} +rm -f ${RPM_BUILD_ROOT}/%{_libdir}/scim-1.0/*/*.la %find_lang %{name} @@ -73,12 +197,10 @@ rm -rf $RPM_BUILD_ROOT -%post -/sbin/ldconfig +%post -p /sbin/ldconfig -%postun -/sbin/ldconfig +%postun -p /sbin/ldconfig %files -f %{name}.lang @@ -89,9 +211,33 @@ %{_datadir}/scim/icons/table.png -%files zh +%files amharic +%defattr(-, root, root, -) +%dir %{_datadir}/scim/tables +%{_datadir}/scim/tables/Amharic.bin +%{_datadir}/scim/icons/Amharic.png + + +%files arabic +%defattr(-, root, root, -) +%dir %{_datadir}/scim/tables +%{_datadir}/scim/tables/Arabic.bin +%{_datadir}/scim/icons/Arabic.png + + +%files bengali +%defattr(-, root, root, -) +%dir %{_datadir}/scim/tables +%{_datadir}/scim/tables/Bengali-inscript.bin +%{_datadir}/scim/tables/Bengali-probhat.bin +%{_datadir}/scim/icons/Bengali-inscript.png +%{_datadir}/scim/icons/Bengali-probhat.png + + +%files chinese %defattr(-, root, root, -) %doc zh/README-Erbi.txt zh/README-CangJie.txt +%dir %{_datadir}/scim/tables %{_datadir}/scim/tables/Array30.bin %{_datadir}/scim/tables/CangJie.bin %{_datadir}/scim/tables/CangJie3.bin @@ -105,6 +251,7 @@ %{_datadir}/scim/tables/Quick.bin %{_datadir}/scim/tables/Simplex.bin %{_datadir}/scim/tables/Stroke5.bin +%{_datadir}/scim/tables/Wu.bin %{_datadir}/scim/tables/Wubi.bin %{_datadir}/scim/tables/Ziranma.bin %{_datadir}/scim/tables/ZhuYin.bin @@ -121,14 +268,34 @@ %{_datadir}/scim/icons/Quick.png %{_datadir}/scim/icons/Simplex.png %{_datadir}/scim/icons/Stroke5.png +%{_datadir}/scim/icons/Wu.png %{_datadir}/scim/icons/Wubi.png %{_datadir}/scim/icons/Ziranma.png %{_datadir}/scim/icons/ZhuYin.png -%files ja +%files gujarati +%defattr(-, root, root, -) +%dir %{_datadir}/scim/tables +%{_datadir}/scim/tables/Gujarati-inscript.bin +%{_datadir}/scim/tables/Gujarati-phonetic.bin +%{_datadir}/scim/icons/Gujarati-inscript.png +%{_datadir}/scim/icons/Gujarati-phonetic.png + + +%files hindi +%defattr(-, root, root, -) +%dir %{_datadir}/scim/tables +%{_datadir}/scim/tables/Hindi-inscript.bin +%{_datadir}/scim/tables/Hindi-phonetic.bin +%{_datadir}/scim/icons/Hindi-inscript.png +%{_datadir}/scim/icons/Hindi-phonetic.png + + +%files japanese %defattr(-, root, root, -) %doc ja/kanjidic_licence.html ja/kanjidic_doc.html +%dir %{_datadir}/scim/tables %{_datadir}/scim/tables/HIRAGANA.bin %{_datadir}/scim/tables/KATAKANA.bin %{_datadir}/scim/tables/Nippon.bin @@ -137,8 +304,18 @@ %{_datadir}/scim/icons/Nippon.png -%files ko +%files kannada +%defattr(-, root, root, -) +%dir %{_datadir}/scim/tables +%{_datadir}/scim/tables/Kannada-inscript.bin +%{_datadir}/scim/tables/Kannada-kgp.bin +%{_datadir}/scim/icons/Kannada-inscript.png +%{_datadir}/scim/icons/Kannada-kgp.png + + +%files korean %defattr(-, root, root, -) +%dir %{_datadir}/scim/tables %{_datadir}/scim/tables/Hangul.bin %{_datadir}/scim/tables/HangulRomaja.bin %{_datadir}/scim/tables/Hanja.bin @@ -146,26 +323,102 @@ %{_datadir}/scim/icons/Hanja.png -%files additional +%files malayalam %defattr(-, root, root, -) -%{_datadir}/scim/tables/Arabic.bin -%{_datadir}/scim/tables/Amharic.bin -%{_datadir}/scim/tables/Viqr.bin +%dir %{_datadir}/scim/tables +%{_datadir}/scim/tables/Malayalam-inscript.bin +%{_datadir}/scim/icons/Malayalam-inscript.png + + +%files nepali +%defattr(-, root, root, -) +%dir %{_datadir}/scim/tables +%{_datadir}/scim/tables/Nepali_*.bin +%{_datadir}/scim/icons/Nepali.png + + +%files punjabi +%defattr(-, root, root, -) +%dir %{_datadir}/scim/tables +%{_datadir}/scim/tables/Punjabi-inscript.bin +%{_datadir}/scim/tables/Punjabi-jhelum.bin +%{_datadir}/scim/tables/Punjabi-phonetic.bin +%{_datadir}/scim/icons/Punjabi-inscript.png +%{_datadir}/scim/icons/Punjabi-jhelum.png +%{_datadir}/scim/icons/Punjabi-phonetic.png + + +%files russian +%defattr(-, root, root, -) +%dir %{_datadir}/scim/tables %{_datadir}/scim/tables/Yawerty.bin -%{_datadir}/scim/icons/Arabic.png -%{_datadir}/scim/icons/Amharic.png -%{_datadir}/scim/icons/Viqr.png %{_datadir}/scim/icons/Yawerty.png +%files tamil +%defattr(-, root, root, -) +%dir %{_datadir}/scim/tables +%{_datadir}/scim/tables/Tamil-inscript.bin +%{_datadir}/scim/tables/Tamil-phonetic.bin +%{_datadir}/scim/icons/Tamil-inscript.png +%{_datadir}/scim/icons/Tamil-phonetic.png + + +%files thai +%defattr(-, root, root, -) +%dir %{_datadir}/scim/tables +%{_datadir}/scim/tables/Thai.bin +%{_datadir}/scim/icons/Thai.png + + +%files telugu +%defattr(-, root, root, -) +%dir %{_datadir}/scim/tables +%{_datadir}/scim/tables/Telugu-inscript.bin +%{_datadir}/scim/icons/Telugu-inscript.png + + +%files vietnamese +%defattr(-, root, root, -) +%dir %{_datadir}/scim/tables +%{_datadir}/scim/tables/Viqr.bin +%{_datadir}/scim/icons/Viqr.png + + +%files additional +%defattr(-, root, root, -) +%dir %{_datadir}/scim/tables +%{_datadir}/scim/tables/IPA-X-SAMPA.bin +%{_datadir}/scim/tables/LaTeX.bin +%{_datadir}/scim/icons/IPA-X-SAMPA.png +%{_datadir}/scim/icons/LaTeX.png + + %changelog -* Tue Aug 2 2005 Ryo Dairiki -0.5.1-3.2 -- Remove update-xinput-scim script +* Thu Sep 22 2005 Jens Petersen - 0.5.3-4 +- add a Thai table derived from m17n-db with a Thai icon +- separate the Indic tables and the additional language tables into separate + language subpackages + +* Fri Sep 9 2005 Jens Petersen +- add 14 new Indic tables for Bengali, Gujarati, Hindi, Kannada, Malayalam, + Punjabi, Tamil and Telugu in updated scim-tables-indic.patch + - inscript tables are derived from iiimf unitle tables + - new icons for all Indic tables by Amanpreet Singh Brar + - Indic tables are now in new scim-tables-indic subpackage +- make {chinese,japanese,korean} subpackages obsolete {zh,ja,ko} +- make subpackages own %{_datadir}/scim/tables + +* Wed Aug 17 2005 Jens Petersen +- 0.5.3 release + - replace scim-tables-0.5.1-add-hindi.patch with scim-tables-indic.patch + - update files lists for new tables (ipa, latex, nepali, wu) +- rename {zh,ja,ko} subpackages to {chinese,japanese,korean} -* Sun Jul 31 2005 Ryo Dairiki -0.5.1-3.1 -- Modify to use update-xinput-scim script +* Tue Aug 2 2005 Ryo Dairiki - 0.5.1-3.2 +- rebuild -* Wed Jul 27 2005 Ryo Dairiki -0.5.1-3 +* Wed Jul 27 2005 Ryo Dairiki - 0.5.1-3 - Rebuild for scim-1.4.0 * Sat Jun 25 2005 Colin Charles 0.5.1-2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/scim-tables/FC-3/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 11 Jun 2005 01:15:47 -0000 1.2 +++ sources 22 Sep 2005 06:38:51 -0000 1.3 @@ -1 +1,2 @@ -3249d0fbdb731c2003bea093dc43f19c scim-tables-0.5.1.tar.gz +0e4c216af80e6a7d40d3d0224f84b22a scim-tables-0.5.3.tar.gz +e537986f66aaaad9a8e8e2fad7c2b8f1 indic-icons-1.tar.gz From fedora-extras-commits at redhat.com Thu Sep 22 07:03:17 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Thu, 22 Sep 2005 03:03:17 -0400 Subject: rpms/Coin2/FC-4 sources,1.6,1.7 Coin2.spec,1.12,1.13 Message-ID: <200509220703.j8M73lbT032216@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/Coin2/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32195 Modified Files: sources Coin2.spec Log Message: Update to 2.4.4 Index: sources =================================================================== RCS file: /cvs/extras/rpms/Coin2/FC-4/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 13 Jul 2005 10:42:32 -0000 1.6 +++ sources 22 Sep 2005 07:03:14 -0000 1.7 @@ -1,3 +1,4 @@ e2dcc9dde9d97577d211f3caba10c7e0 Coin-2.4.3-libtool.diff.bz2 4f4d4e4172db2107c578d0d99fde2888 Coin-2.4.3-simacros.diff.bz2 57c039a55133c5037ebef6759d26f603 Coin-2.4.3.tar.gz +7976fcf2d1154bc8574d75b99bab45ee Coin-2.4.4.tar.gz Index: Coin2.spec =================================================================== RCS file: /cvs/extras/rpms/Coin2/FC-4/Coin2.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- Coin2.spec 13 Jul 2005 10:42:32 -0000 1.12 +++ Coin2.spec 22 Sep 2005 07:03:14 -0000 1.13 @@ -9,12 +9,11 @@ %define libopenal_SONAME libopenal.so.0 %define libsimage_SONAME libsimage.so.20 -%define libfreetype_SONAME libfreetype.so.6 Summary: High-level 3D visualization library Name: Coin2 -Version: 2.4.3 -Release: 1%{?dist} +Version: 2.4.4 +Release: 2%{?dist} License: GPL Group: System Environment/Libraries @@ -24,15 +23,15 @@ Patch0: coin-2.3.0-simage-soname.diff Patch1: coin-2.3.0-openal-soname.diff -Patch2: coin-2.3.0-freetype-soname.diff -Patch3: Coin-2.4.3-simacros.diff.bz2 -Patch4: Coin-2.4.3-libtool.diff.bz2 Patch5: coin-2.3.0-man3.diff BuildRequires: xorg-x11-Mesa-libGL BuildRequires: xorg-x11-Mesa-libGLU BuildRequires: xorg-x11-devel -BuildRequires: zlib-devel bzip2-devel +BuildRequires: zlib-devel +BuildRequires: bzip2-devel +BuildRequires: fontconfig-devel +BuildRequires: freetype-devel BuildRequires: doxygen BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -56,13 +55,8 @@ %setup -q -n Coin-%{version} %patch0 -p1 %patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 %patch5 -p1 -sed -i -e 's, at LIBFREETYPE_SONAME@,"%{libfreetype_SONAME}",' \ - src/glue/freetype.c sed -i -e 's, at LIBSIMAGE_SONAME@,"%{libsimage_SONAME}",' \ src/glue/simage_wrapper.c sed -i -e 's, at LIBOPENAL_SONAME@,"%{libopenal_SONAME}",' \ @@ -76,18 +70,24 @@ --disable-dl-libbzip2 \ --disable-dl-glu \ --disable-dl-zlib \ + --disable-dl-freetype \ + --disable-dl-fontconfig \ + --disable-spidermonkey \ --enable-man \ --enable-html \ --enable-3ds-import \ - htmldir=%{coin_htmldir}/Coin + htmldir=%{coin_htmldir}/Coin \ + CPPFLAGS=$(pkg-config --cflags freetype2) make %{?_smp_mflags} %install - rm -rf $RPM_BUILD_ROOT +rm -rf $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT install +# TESTING +exit 1 %clean - rm -rf $RPM_BUILD_ROOT +rm -rf $RPM_BUILD_ROOT %post /sbin/ldconfig @@ -114,6 +114,14 @@ %doc %{coin_htmldir} %changelog +* Thu Sep 22 2005 Ralf Corsepius - 2.4.4-3 +- Remove simacros patch. +- Remove libtool patch. +- Link against freetype2. + +* Tue Sep 20 2005 Ralf Corsepius - 2.4.4-1 +- Upstream update. + * Thu Jul 07 2005 Ralf Corsepius - 0:2.4.3-1 - Upstream update. From fedora-extras-commits at redhat.com Thu Sep 22 07:06:12 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Thu, 22 Sep 2005 03:06:12 -0400 Subject: rpms/Coin2/FC-4 .cvsignore,1.6,1.7 Message-ID: <200509220706.j8M76unh032275@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/Coin2/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32252 Modified Files: .cvsignore Log Message: Update to 2.4.4 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/Coin2/FC-4/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 13 Jul 2005 10:42:32 -0000 1.6 +++ .cvsignore 22 Sep 2005 07:06:10 -0000 1.7 @@ -1,3 +1 @@ -Coin-2.4.3-libtool.diff.bz2 -Coin-2.4.3-simacros.diff.bz2 -Coin-2.4.3.tar.gz +Coin-2.4.4.tar.gz From fedora-extras-commits at redhat.com Thu Sep 22 07:31:36 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Thu, 22 Sep 2005 03:31:36 -0400 Subject: rpms/Coin2/FC-4 Coin2.spec,1.13,1.14 sources,1.7,1.8 Message-ID: <200509220731.j8M7VaqB032540@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/Coin2/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32519 Modified Files: Coin2.spec sources Log Message: Sync with devel Index: Coin2.spec =================================================================== RCS file: /cvs/extras/rpms/Coin2/FC-4/Coin2.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- Coin2.spec 22 Sep 2005 07:03:14 -0000 1.13 +++ Coin2.spec 22 Sep 2005 07:31:34 -0000 1.14 @@ -13,7 +13,7 @@ Summary: High-level 3D visualization library Name: Coin2 Version: 2.4.4 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL Group: System Environment/Libraries @@ -83,8 +83,6 @@ %install rm -rf $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT install -# TESTING -exit 1 %clean rm -rf $RPM_BUILD_ROOT Index: sources =================================================================== RCS file: /cvs/extras/rpms/Coin2/FC-4/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 22 Sep 2005 07:03:14 -0000 1.7 +++ sources 22 Sep 2005 07:31:34 -0000 1.8 @@ -1,4 +1 @@ -e2dcc9dde9d97577d211f3caba10c7e0 Coin-2.4.3-libtool.diff.bz2 -4f4d4e4172db2107c578d0d99fde2888 Coin-2.4.3-simacros.diff.bz2 -57c039a55133c5037ebef6759d26f603 Coin-2.4.3.tar.gz 7976fcf2d1154bc8574d75b99bab45ee Coin-2.4.4.tar.gz From fedora-extras-commits at redhat.com Thu Sep 22 07:33:16 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Thu, 22 Sep 2005 03:33:16 -0400 Subject: rpms/Coin2/FC-4 coin-2.3.0-freetype-soname.diff,1.1,NONE Message-ID: <200509220733.j8M7XGYV032584@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/Coin2/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32567 Removed Files: coin-2.3.0-freetype-soname.diff Log Message: Sync with devel --- coin-2.3.0-freetype-soname.diff DELETED --- From fedora-extras-commits at redhat.com Thu Sep 22 10:00:41 2005 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Thu, 22 Sep 2005 06:00:41 -0400 Subject: rpms/bittorrent/FC-4 bittorrent.spec, 1.14, 1.15 bttrack.init, 1.1, 1.2 btseed.init, 1.1, 1.2 sources, 1.6, 1.7 .cvsignore, 1.6, 1.7 Message-ID: <200509221000.j8MA0fde003756@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/rpms/bittorrent/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3732 Modified Files: bittorrent.spec bttrack.init btseed.init sources .cvsignore Log Message: * Thu Sep 15 2005 Paul Howarth 4.0.4-1 - new upstream release 4.0.4 (#168323) - tidy up description text - improved initscripts (#158273) - for versions on Fedora Core >= 4 or RHEL, put server data under /srv rather than %{_localstatedir} - separate logs/logrotate scripts for tracker and seeder - have the gui subpackage obsolete the official BitTorrent RPM package, which is called BitTorrent, includes the GUI in the same package and is built using python's dist tools and hence doesn't include all dependencies, provide initscripts etc.; this provides a clean upgrade path to Extras - don't delete user/group torrent on uninstall (see https://www.redhat.com/archives/fedora-extras-commits/2005-June/msg00271.html) - move icon to %{_datadir}/icons/hicolor/48x48/apps instead of %{_datadir}/pixmaps and update icon cache on installation if necessary (#162465) - no need to set CFLAGS in %build for noarch package - don't generate redundant python-abi dependency for FC >= 4 - don't need to edit out "env python2"... stuff Index: bittorrent.spec =================================================================== RCS file: /cvs/extras/rpms/bittorrent/FC-4/bittorrent.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- bittorrent.spec 24 May 2005 11:18:05 -0000 1.14 +++ bittorrent.spec 22 Sep 2005 10:00:39 -0000 1.15 @@ -3,7 +3,7 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: bittorrent -Version: 4.0.2 +Version: 4.0.4 Release: 1%{?dist} Summary: BitTorrent swarming network file transfer tool @@ -19,24 +19,24 @@ BuildArch: noarch BuildRequires: python-devel desktop-file-utils -Requires: python +# FC4 and later auto-generate python version dependency +%if %{!?fedora:0}%{?fedora} < 4 || %{!?rhel:0}%{?rhel} Requires: python-abi = %(%{__python} -c "import sys ; print sys.version[:3]") +%endif Requires(pre): %{_sbindir}/useradd Requires(post): /sbin/chkconfig Requires(post): /sbin/service Requires(preun): /sbin/chkconfig Requires(preun): /sbin/service -Requires(postun): %{_sbindir}/userdel -Requires(postun): %{_sbindir}/groupdel Requires(postun): /sbin/service %description -BitTorrent is a tool for copying files from one machine to -another. FTP punishes sites for being popular: Since all uploading is -done from one place, a popular site needs big iron and big -bandwidth. With BitTorrent, clients automatically mirror files they -download, making the publisher's burden almost nothing. +BitTorrent is a tool for copying files from one machine to another. FTP +punishes sites for being popular: Since all uploading is done from one place, +a popular site needs big iron and big bandwidth. With BitTorrent, clients +automatically mirror files they download, making the publisher's burden almost +nothing. %package gui Summary: GUI versions of the BitTorrent file transfer tool @@ -45,29 +45,51 @@ Requires: %{name} = %{version}-%{release} Requires(post): desktop-file-utils Requires(postun): desktop-file-utils +Obsoletes: BitTorrent <= %{version} +Provides: BitTorrent = %{version}-%{release} %description gui This package contains the GUI versions of the BitTorrent file transfer tool. +# Fedora >= 4 has /srv, as does RHEL >= 4 +%if %{!?fedora:0}%{?fedora} >= 4 || %{!?rhel:0}%{?rhel} >= 4 +%define bt_dir /srv/bittorrent/data +%define bt_statedir /srv/bittorrent/state +%else +%define bt_dir %{_localstatedir}/spool/bittorrent +%define bt_statedir %{_localstatedir}/lib/bittorrent +%endif + %prep %setup -q -n BitTorrent-%{version} %{__sed} -i "s/appdir = .*/appdir = '%{name}-%{version}'/" BitTorrent/__init__.py %{__cat} <btseed.sysconfig -#DIR=%{_localstatedir}/spool/bittorrent -OPTIONS="--max_upload_rate 350" +DIR=%{bt_dir} +OPTIONS="--max_upload_rate 350 --display_interval 300" +SEEDLOG=%{_localstatedir}/log/bittorrent/btseed.log EOF %{__cat} <bttrack.sysconfig -#PORT=6969 -#DIR=%{_localstatedir}/spool/bittorrent -#STATEFILE=%{_localstatedir}/lib/bittorrent/bttrack -#LOGFILE=%{_localstatedir}/log/bittorrent/bttrack.log -OPTIONS="--show_names 1 --hupmonitor 1" +PORT=6969 +DIR=%{bt_dir} +STATEFILE=%{bt_statedir}/bttrack +LOGFILE=%{_localstatedir}/log/bittorrent/bttrack.log +OPTIONS="--min_time_between_log_flushes 4.0 --show_names 1 --hupmonitor 1" +EOF + +%{__cat} <btseed.logrotate +%{_localstatedir}/log/bittorrent/btseed.log { + notifempty + missingok + postrotate + /sbin/service btseed condrestart 2>/dev/null >/dev/null || true + endscript +} EOF -%{__cat} <torrent.logrotate +%{__cat} <bttrack.logrotate %{_localstatedir}/log/bittorrent/bttrack.log { notifempty missingok @@ -78,24 +100,26 @@ EOF %build -CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build +%{__python} setup.py build %install %{__rm} -rf $RPM_BUILD_ROOT %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT -%{__sed} -i -e 's/env python2/env python/' $RPM_BUILD_ROOT%{_bindir}/* %{_bindir}/desktop-file-install --vendor %{desktopvendor} \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ --add-category X-Fedora \ %{SOURCE1} -%{__install} -d $RPM_BUILD_ROOT%{_localstatedir}/{spool,lib,log}/bittorrent -%{__install} -m 0644 -D %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/pixmaps/bittorrent.png +%{__install} -d $RPM_BUILD_ROOT%{bt_dir} +%{__install} -d $RPM_BUILD_ROOT%{bt_statedir} +%{__install} -d $RPM_BUILD_ROOT%{_localstatedir}/log/bittorrent +%{__install} -m 0644 -D %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/bittorrent.png %{__install} -m 0755 -D %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/btseed %{__install} -m 0755 -D %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/bttrack %{__install} -m 0644 -D btseed.sysconfig $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/btseed %{__install} -m 0644 -D bttrack.sysconfig $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/bttrack -%{__install} -m 0644 -D torrent.logrotate $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/bittorrent +%{__install} -m 0644 -D btseed.logrotate $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/btseed +%{__install} -m 0644 -D bttrack.logrotate $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/bttrack %clean %{__rm} -rf $RPM_BUILD_ROOT @@ -117,19 +141,20 @@ fi %postun -if [ $1 -eq 0 ]; then - %{_sbindir}/userdel torrent &>/dev/null || : - %{_sbindir}/groupdel torrent &>/dev/null || : -else +if [ $1 -gt 0 ]; then /sbin/service btseed condrestart &>/dev/null || : /sbin/service bttrack condrestart &>/dev/null || : fi %post gui %{_bindir}/update-desktop-database %{_datadir}/applications &>/dev/null || : +/bin/touch --no-create %{_datadir}/icons/hicolor || : +[ -x %{_bindir}/gtk-update-icon-cache ] && %{_bindir}/gtk-update-icon-cache -q %{_datadir}/icons/hicolor || : %postun gui %{_bindir}/update-desktop-database %{_datadir}/applications &>/dev/null || : +/bin/touch --no-create %{_datadir}/icons/hicolor || : +[ -x %{_bindir}/gtk-update-icon-cache ] && %{_bindir}/gtk-update-icon-cache -q %{_datadir}/icons/hicolor || : %files %defattr(-,root,root,-) @@ -147,12 +172,13 @@ %{python_sitelib}/BitTorrent/*.py %{python_sitelib}/BitTorrent/*.pyc %ghost %{python_sitelib}/BitTorrent/*.pyo -%attr(-,torrent,torrent) %dir %{_localstatedir}/spool/bittorrent -%attr(-,torrent,torrent) %dir %{_localstatedir}/lib/bittorrent +%attr(-,torrent,torrent) %dir %{bt_dir} +%attr(-,torrent,torrent) %dir %{bt_statedir} %attr(-,torrent,torrent) %dir %{_localstatedir}/log/bittorrent %{_sysconfdir}/rc.d/init.d/btseed %{_sysconfdir}/rc.d/init.d/bttrack -%config(noreplace) %{_sysconfdir}/logrotate.d/bittorrent +%config(noreplace) %{_sysconfdir}/logrotate.d/btseed +%config(noreplace) %{_sysconfdir}/logrotate.d/bttrack %config(noreplace) %{_sysconfdir}/sysconfig/btseed %config(noreplace) %{_sysconfdir}/sysconfig/bttrack @@ -162,20 +188,40 @@ %{_bindir}/btmaketorrentgui.py %{_datadir}/applications/%{desktopvendor}-bittorrent.desktop %{_datadir}/pixmaps/%{name}-%{version} -%{_datadir}/pixmaps/bittorrent.png +%{_datadir}/icons/hicolor/48x48/apps/bittorrent.png %changelog -* Tue May 24 2005 Paul Howarth 4.0.2-1%{?dist} -- Update to 4.0.2 +* Thu Sep 15 2005 Paul Howarth 4.0.4-1 +- new upstream release 4.0.4 (#168323) +- tidy up description text +- improved initscripts (#158273) +- for versions on Fedora Core >= 4 or RHEL, put server data under /srv rather + than %{_localstatedir} +- separate logs/logrotate scripts for tracker and seeder +- have the gui subpackage obsolete the official BitTorrent RPM package, which + is called BitTorrent, includes the GUI in the same package and is built + using python's dist tools and hence doesn't include all dependencies, + provide initscripts etc.; this provides a clean upgrade path to Extras +- don't delete user/group torrent on uninstall + (see https://www.redhat.com/archives/fedora-extras-commits/2005-June/msg00271.html) +- move icon to %{_datadir}/icons/hicolor/48x48/apps instead of + %{_datadir}/pixmaps and update icon cache on installation if + necessary (#162465) +- no need to set CFLAGS in %%build for noarch package +- don't generate redundant python-abi dependency for FC >= 4 +- don't need to edit out "env python2"... stuff + +* Tue May 24 2005 Paul Howarth 4.0.2-1 +- update to 4.0.2 -* Mon May 23 2005 Paul Howarth 4.0.1-2%{?dist} +* Mon May 23 2005 Paul Howarth 4.0.1-2 - use macros consistently throughout - add initscripts so users can easily set up trackers and seeders on their own (#158273) - add user torrent for tracker/seeder - add logrotate script for tracker -* Wed May 18 2005 Paul Howarth 4.0.1-1%{?dist} +* Wed May 18 2005 Paul Howarth 4.0.1-1 - new upstream release 4.0.1 (#157632) - add dist tag - source now found on sourceforge.net Index: bttrack.init =================================================================== RCS file: /cvs/extras/rpms/bittorrent/FC-4/bttrack.init,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- bttrack.init 22 May 2005 22:55:32 -0000 1.1 +++ bttrack.init 22 Sep 2005 10:00:39 -0000 1.2 @@ -13,13 +13,13 @@ [ "${NETWORKING}" = "no" ] && exit 0 -#default +# defaults PORT=6969 -STATEFILE=/var/lib/bittorrent/bttrack +STATEFILE=/srv/bittorrent/state/bttrack OPTIONS= LOGFILE=/var/log/bittorrent/bttrack.log -# directly of torrents that the tracker is allowed to serve -DIR="/var/spool/bittorrent" +# directory of torrents that the tracker is allowed to serve +DIR="/srv/bittorrent/data" # source the config . /etc/sysconfig/bttrack @@ -32,10 +32,13 @@ case "$1" in start) echo -n $"Starting BitTorrent tracker: " - daemon --user $btuser $prog --port $PORT --dfile $STATEFILE \ - --logfile $LOGFILE $OPTIONS --allowed_dir $DIR & + runuser -s /bin/sh -c "$prog --port $PORT --dfile $STATEFILE --logfile $LOGFILE \ + $OPTIONS --allowed_dir $DIR" $btuser &> /dev/null & + disown -ar + usleep 500000 + status bttrack.py &> /dev/null && echo_success || echo_failure RETVAL=$? - [ $RETVAL -eq 0 ] && touch /var/lock/subsys/bttrack + [ $RETVAL -eq 0 ] && touch /var/lock/subsys/bttrack.py echo ;; stop) @@ -43,7 +46,7 @@ killproc $prog #killproc "/usr/bin/python $prog" RETVAL=$? - [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/bttrack + [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/bttrack.py echo ;; restart|reload) @@ -52,14 +55,14 @@ RETVAL=$? ;; condrestart) - if [ -f /var/lock/subsys/bttrack ]; then + if [ -f /var/lock/subsys/bttrack.py ]; then $0 stop $0 start fi RETVAL=$? ;; status) - status bttrack + status bttrack.py RETVAL=$? ;; *) Index: btseed.init =================================================================== RCS file: /cvs/extras/rpms/bittorrent/FC-4/btseed.init,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- btseed.init 22 May 2005 22:55:32 -0000 1.1 +++ btseed.init 22 Sep 2005 10:00:39 -0000 1.2 @@ -16,7 +16,10 @@ [ "${NETWORKING}" = "no" ] && exit 0 # default directory for torrents to seed -DIR=/var/spool/bittorrent +DIR=/srv/bittorrent/data + +# default log file +SEEDLOG=/var/log/btseed.log # source the config . /etc/sysconfig/btseed @@ -28,9 +31,12 @@ case "$1" in start) echo -n $"Starting BitTorrent seed client: " - daemon --user $btuser $prog $OPTIONS $DIR & + runuser -s /bin/sh -c "$prog $OPTIONS $DIR" $btuser &> $SEEDLOG & + disown -ar + usleep 500000 + status btlaunchmany.py &> /dev/null && echo_success || echo_failure RETVAL=$? - [ $RETVAL -eq 0 ] && touch /var/lock/subsys/btseed + [ $RETVAL -eq 0 ] && touch /var/lock/subsys/btlaunchmany.py echo ;; stop) @@ -38,7 +44,7 @@ killproc $prog #killproc "/usr/bin/python $prog" RETVAL=$? - [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/btseed + [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/btlaunchmany.py echo ;; restart|reload) @@ -47,14 +53,14 @@ RETVAL=$? ;; condrestart) - if [ -f /var/lock/subsys/btseed ]; then + if [ -f /var/lock/subsys/btlaunchmany.py ]; then $0 stop $0 start fi RETVAL=$? ;; status) - status btseed + status btlaunchmany.py RETVAL=$? ;; *) Index: sources =================================================================== RCS file: /cvs/extras/rpms/bittorrent/FC-4/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 24 May 2005 11:18:05 -0000 1.6 +++ sources 22 Sep 2005 10:00:39 -0000 1.7 @@ -1 +1 @@ -4640b7c1bac3146d628f54b20afb87b7 BitTorrent-4.0.2.tar.gz +7f03514dd4d684728a4e54c6ffce7d1f BitTorrent-4.0.4.tar.gz Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/bittorrent/FC-4/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 24 May 2005 11:18:05 -0000 1.6 +++ .cvsignore 22 Sep 2005 10:00:39 -0000 1.7 @@ -1 +1 @@ -BitTorrent-4.0.2.tar.gz +BitTorrent-4.0.4.tar.gz From fedora-extras-commits at redhat.com Thu Sep 22 10:04:25 2005 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Thu, 22 Sep 2005 06:04:25 -0400 Subject: rpms/bittorrent/FC-3 bittorrent.spec, 1.9, 1.10 bttrack.init, 1.1, 1.2 btseed.init, 1.1, 1.2 sources, 1.6, 1.7 .cvsignore, 1.6, 1.7 Message-ID: <200509221005.j8MA5CAI005153@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/rpms/bittorrent/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5133 Modified Files: bittorrent.spec bttrack.init btseed.init sources .cvsignore Log Message: resync with FC-4 Index: bittorrent.spec =================================================================== RCS file: /cvs/extras/rpms/bittorrent/FC-3/bittorrent.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- bittorrent.spec 26 May 2005 06:12:56 -0000 1.9 +++ bittorrent.spec 22 Sep 2005 10:04:22 -0000 1.10 @@ -3,7 +3,7 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: bittorrent -Version: 4.0.2 +Version: 4.0.4 Release: 1%{?dist} Summary: BitTorrent swarming network file transfer tool @@ -19,24 +19,24 @@ BuildArch: noarch BuildRequires: python-devel desktop-file-utils -Requires: python +# FC4 and later auto-generate python version dependency +%if %{!?fedora:0}%{?fedora} < 4 || %{!?rhel:0}%{?rhel} Requires: python-abi = %(%{__python} -c "import sys ; print sys.version[:3]") +%endif Requires(pre): %{_sbindir}/useradd Requires(post): /sbin/chkconfig Requires(post): /sbin/service Requires(preun): /sbin/chkconfig Requires(preun): /sbin/service -Requires(postun): %{_sbindir}/userdel -Requires(postun): %{_sbindir}/groupdel Requires(postun): /sbin/service %description -BitTorrent is a tool for copying files from one machine to -another. FTP punishes sites for being popular: Since all uploading is -done from one place, a popular site needs big iron and big -bandwidth. With BitTorrent, clients automatically mirror files they -download, making the publisher's burden almost nothing. +BitTorrent is a tool for copying files from one machine to another. FTP +punishes sites for being popular: Since all uploading is done from one place, +a popular site needs big iron and big bandwidth. With BitTorrent, clients +automatically mirror files they download, making the publisher's burden almost +nothing. %package gui Summary: GUI versions of the BitTorrent file transfer tool @@ -45,29 +45,51 @@ Requires: %{name} = %{version}-%{release} Requires(post): desktop-file-utils Requires(postun): desktop-file-utils +Obsoletes: BitTorrent <= %{version} +Provides: BitTorrent = %{version}-%{release} %description gui This package contains the GUI versions of the BitTorrent file transfer tool. +# Fedora >= 4 has /srv, as does RHEL >= 4 +%if %{!?fedora:0}%{?fedora} >= 4 || %{!?rhel:0}%{?rhel} >= 4 +%define bt_dir /srv/bittorrent/data +%define bt_statedir /srv/bittorrent/state +%else +%define bt_dir %{_localstatedir}/spool/bittorrent +%define bt_statedir %{_localstatedir}/lib/bittorrent +%endif + %prep %setup -q -n BitTorrent-%{version} %{__sed} -i "s/appdir = .*/appdir = '%{name}-%{version}'/" BitTorrent/__init__.py %{__cat} <btseed.sysconfig -#DIR=%{_localstatedir}/spool/bittorrent -OPTIONS="--max_upload_rate 350" +DIR=%{bt_dir} +OPTIONS="--max_upload_rate 350 --display_interval 300" +SEEDLOG=%{_localstatedir}/log/bittorrent/btseed.log EOF %{__cat} <bttrack.sysconfig -#PORT=6969 -#DIR=%{_localstatedir}/spool/bittorrent -#STATEFILE=%{_localstatedir}/lib/bittorrent/bttrack -#LOGFILE=%{_localstatedir}/log/bittorrent/bttrack.log -OPTIONS="--show_names 1 --hupmonitor 1" +PORT=6969 +DIR=%{bt_dir} +STATEFILE=%{bt_statedir}/bttrack +LOGFILE=%{_localstatedir}/log/bittorrent/bttrack.log +OPTIONS="--min_time_between_log_flushes 4.0 --show_names 1 --hupmonitor 1" +EOF + +%{__cat} <btseed.logrotate +%{_localstatedir}/log/bittorrent/btseed.log { + notifempty + missingok + postrotate + /sbin/service btseed condrestart 2>/dev/null >/dev/null || true + endscript +} EOF -%{__cat} <torrent.logrotate +%{__cat} <bttrack.logrotate %{_localstatedir}/log/bittorrent/bttrack.log { notifempty missingok @@ -78,24 +100,26 @@ EOF %build -CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build +%{__python} setup.py build %install %{__rm} -rf $RPM_BUILD_ROOT %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT -%{__sed} -i -e 's/env python2/env python/' $RPM_BUILD_ROOT%{_bindir}/* %{_bindir}/desktop-file-install --vendor %{desktopvendor} \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ --add-category X-Fedora \ %{SOURCE1} -%{__install} -d $RPM_BUILD_ROOT%{_localstatedir}/{spool,lib,log}/bittorrent -%{__install} -m 0644 -D %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/pixmaps/bittorrent.png +%{__install} -d $RPM_BUILD_ROOT%{bt_dir} +%{__install} -d $RPM_BUILD_ROOT%{bt_statedir} +%{__install} -d $RPM_BUILD_ROOT%{_localstatedir}/log/bittorrent +%{__install} -m 0644 -D %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/bittorrent.png %{__install} -m 0755 -D %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/btseed %{__install} -m 0755 -D %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/bttrack %{__install} -m 0644 -D btseed.sysconfig $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/btseed %{__install} -m 0644 -D bttrack.sysconfig $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/bttrack -%{__install} -m 0644 -D torrent.logrotate $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/bittorrent +%{__install} -m 0644 -D btseed.logrotate $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/btseed +%{__install} -m 0644 -D bttrack.logrotate $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/bttrack %clean %{__rm} -rf $RPM_BUILD_ROOT @@ -117,19 +141,20 @@ fi %postun -if [ $1 -eq 0 ]; then - %{_sbindir}/userdel torrent &>/dev/null || : - %{_sbindir}/groupdel torrent &>/dev/null || : -else +if [ $1 -gt 0 ]; then /sbin/service btseed condrestart &>/dev/null || : /sbin/service bttrack condrestart &>/dev/null || : fi %post gui %{_bindir}/update-desktop-database %{_datadir}/applications &>/dev/null || : +/bin/touch --no-create %{_datadir}/icons/hicolor || : +[ -x %{_bindir}/gtk-update-icon-cache ] && %{_bindir}/gtk-update-icon-cache -q %{_datadir}/icons/hicolor || : %postun gui %{_bindir}/update-desktop-database %{_datadir}/applications &>/dev/null || : +/bin/touch --no-create %{_datadir}/icons/hicolor || : +[ -x %{_bindir}/gtk-update-icon-cache ] && %{_bindir}/gtk-update-icon-cache -q %{_datadir}/icons/hicolor || : %files %defattr(-,root,root,-) @@ -147,12 +172,13 @@ %{python_sitelib}/BitTorrent/*.py %{python_sitelib}/BitTorrent/*.pyc %ghost %{python_sitelib}/BitTorrent/*.pyo -%attr(-,torrent,torrent) %dir %{_localstatedir}/spool/bittorrent -%attr(-,torrent,torrent) %dir %{_localstatedir}/lib/bittorrent +%attr(-,torrent,torrent) %dir %{bt_dir} +%attr(-,torrent,torrent) %dir %{bt_statedir} %attr(-,torrent,torrent) %dir %{_localstatedir}/log/bittorrent %{_sysconfdir}/rc.d/init.d/btseed %{_sysconfdir}/rc.d/init.d/bttrack -%config(noreplace) %{_sysconfdir}/logrotate.d/bittorrent +%config(noreplace) %{_sysconfdir}/logrotate.d/btseed +%config(noreplace) %{_sysconfdir}/logrotate.d/bttrack %config(noreplace) %{_sysconfdir}/sysconfig/btseed %config(noreplace) %{_sysconfdir}/sysconfig/bttrack @@ -162,20 +188,40 @@ %{_bindir}/btmaketorrentgui.py %{_datadir}/applications/%{desktopvendor}-bittorrent.desktop %{_datadir}/pixmaps/%{name}-%{version} -%{_datadir}/pixmaps/bittorrent.png +%{_datadir}/icons/hicolor/48x48/apps/bittorrent.png %changelog -* Tue May 24 2005 Paul Howarth 4.0.2-1%{?dist} -- Update to 4.0.2 +* Thu Sep 15 2005 Paul Howarth 4.0.4-1 +- new upstream release 4.0.4 (#168323) +- tidy up description text +- improved initscripts (#158273) +- for versions on Fedora Core >= 4 or RHEL, put server data under /srv rather + than %{_localstatedir} +- separate logs/logrotate scripts for tracker and seeder +- have the gui subpackage obsolete the official BitTorrent RPM package, which + is called BitTorrent, includes the GUI in the same package and is built + using python's dist tools and hence doesn't include all dependencies, + provide initscripts etc.; this provides a clean upgrade path to Extras +- don't delete user/group torrent on uninstall + (see https://www.redhat.com/archives/fedora-extras-commits/2005-June/msg00271.html) +- move icon to %{_datadir}/icons/hicolor/48x48/apps instead of + %{_datadir}/pixmaps and update icon cache on installation if + necessary (#162465) +- no need to set CFLAGS in %%build for noarch package +- don't generate redundant python-abi dependency for FC >= 4 +- don't need to edit out "env python2"... stuff + +* Tue May 24 2005 Paul Howarth 4.0.2-1 +- update to 4.0.2 -* Mon May 23 2005 Paul Howarth 4.0.1-2%{?dist} +* Mon May 23 2005 Paul Howarth 4.0.1-2 - use macros consistently throughout - add initscripts so users can easily set up trackers and seeders on their own (#158273) - add user torrent for tracker/seeder - add logrotate script for tracker -* Wed May 18 2005 Paul Howarth 4.0.1-1%{?dist} +* Wed May 18 2005 Paul Howarth 4.0.1-1 - new upstream release 4.0.1 (#157632) - add dist tag - source now found on sourceforge.net Index: bttrack.init =================================================================== RCS file: /cvs/extras/rpms/bittorrent/FC-3/bttrack.init,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- bttrack.init 26 May 2005 06:12:56 -0000 1.1 +++ bttrack.init 22 Sep 2005 10:04:22 -0000 1.2 @@ -13,13 +13,13 @@ [ "${NETWORKING}" = "no" ] && exit 0 -#default +# defaults PORT=6969 -STATEFILE=/var/lib/bittorrent/bttrack +STATEFILE=/srv/bittorrent/state/bttrack OPTIONS= LOGFILE=/var/log/bittorrent/bttrack.log -# directly of torrents that the tracker is allowed to serve -DIR="/var/spool/bittorrent" +# directory of torrents that the tracker is allowed to serve +DIR="/srv/bittorrent/data" # source the config . /etc/sysconfig/bttrack @@ -32,10 +32,13 @@ case "$1" in start) echo -n $"Starting BitTorrent tracker: " - daemon --user $btuser $prog --port $PORT --dfile $STATEFILE \ - --logfile $LOGFILE $OPTIONS --allowed_dir $DIR & + runuser -s /bin/sh -c "$prog --port $PORT --dfile $STATEFILE --logfile $LOGFILE \ + $OPTIONS --allowed_dir $DIR" $btuser &> /dev/null & + disown -ar + usleep 500000 + status bttrack.py &> /dev/null && echo_success || echo_failure RETVAL=$? - [ $RETVAL -eq 0 ] && touch /var/lock/subsys/bttrack + [ $RETVAL -eq 0 ] && touch /var/lock/subsys/bttrack.py echo ;; stop) @@ -43,7 +46,7 @@ killproc $prog #killproc "/usr/bin/python $prog" RETVAL=$? - [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/bttrack + [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/bttrack.py echo ;; restart|reload) @@ -52,14 +55,14 @@ RETVAL=$? ;; condrestart) - if [ -f /var/lock/subsys/bttrack ]; then + if [ -f /var/lock/subsys/bttrack.py ]; then $0 stop $0 start fi RETVAL=$? ;; status) - status bttrack + status bttrack.py RETVAL=$? ;; *) Index: btseed.init =================================================================== RCS file: /cvs/extras/rpms/bittorrent/FC-3/btseed.init,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- btseed.init 26 May 2005 06:12:56 -0000 1.1 +++ btseed.init 22 Sep 2005 10:04:22 -0000 1.2 @@ -16,7 +16,10 @@ [ "${NETWORKING}" = "no" ] && exit 0 # default directory for torrents to seed -DIR=/var/spool/bittorrent +DIR=/srv/bittorrent/data + +# default log file +SEEDLOG=/var/log/btseed.log # source the config . /etc/sysconfig/btseed @@ -28,9 +31,12 @@ case "$1" in start) echo -n $"Starting BitTorrent seed client: " - daemon --user $btuser $prog $OPTIONS $DIR & + runuser -s /bin/sh -c "$prog $OPTIONS $DIR" $btuser &> $SEEDLOG & + disown -ar + usleep 500000 + status btlaunchmany.py &> /dev/null && echo_success || echo_failure RETVAL=$? - [ $RETVAL -eq 0 ] && touch /var/lock/subsys/btseed + [ $RETVAL -eq 0 ] && touch /var/lock/subsys/btlaunchmany.py echo ;; stop) @@ -38,7 +44,7 @@ killproc $prog #killproc "/usr/bin/python $prog" RETVAL=$? - [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/btseed + [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/btlaunchmany.py echo ;; restart|reload) @@ -47,14 +53,14 @@ RETVAL=$? ;; condrestart) - if [ -f /var/lock/subsys/btseed ]; then + if [ -f /var/lock/subsys/btlaunchmany.py ]; then $0 stop $0 start fi RETVAL=$? ;; status) - status btseed + status btlaunchmany.py RETVAL=$? ;; *) Index: sources =================================================================== RCS file: /cvs/extras/rpms/bittorrent/FC-3/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 26 May 2005 06:12:56 -0000 1.6 +++ sources 22 Sep 2005 10:04:22 -0000 1.7 @@ -1 +1 @@ -4640b7c1bac3146d628f54b20afb87b7 BitTorrent-4.0.2.tar.gz +7f03514dd4d684728a4e54c6ffce7d1f BitTorrent-4.0.4.tar.gz Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/bittorrent/FC-3/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 26 May 2005 06:12:56 -0000 1.6 +++ .cvsignore 22 Sep 2005 10:04:22 -0000 1.7 @@ -1 +1 @@ -BitTorrent-4.0.2.tar.gz +BitTorrent-4.0.4.tar.gz From fedora-extras-commits at redhat.com Thu Sep 22 11:04:27 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Thu, 22 Sep 2005 07:04:27 -0400 Subject: rpms/tetex-font-tipa/FC-4 tetex-font-tipa.spec,1.4,1.5 Message-ID: <200509221104.j8MB4SSh006835@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/tetex-font-tipa/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6821 Modified Files: tetex-font-tipa.spec Log Message: * Thu Sep 22 2005 Michael Schwendt - 1.3-3 - Run udpmap-sys in scriptlets, not udpmap. - Update location of map files. - Own all relevant directories. Index: tetex-font-tipa.spec =================================================================== RCS file: /cvs/extras/rpms/tetex-font-tipa/FC-4/tetex-font-tipa.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- tetex-font-tipa.spec 6 Apr 2005 22:13:33 -0000 1.4 +++ tetex-font-tipa.spec 22 Sep 2005 11:04:25 -0000 1.5 @@ -1,11 +1,15 @@ +# This package is for Fedora Core >= 4. + %define texmf %{_datadir}/texmf %define tdsname tipa + %define fontpath fkr/tipa +# The directory prefix of fontpath we want to own. +%define fontpathtop fkr Name: tetex-font-tipa Version: 1.3 -Release: 2 - +Release: 3 Summary: TIPA fonts for LaTeX Group: Applications/Publishing @@ -14,13 +18,12 @@ # NOTE: This tarball cannot be verified directly as it is # automatically generated by the FTP site. Instead, the # files contained in the tarball have to be verified one by one ;( -Source0: ftp://ftp.dante.de/tex-archive/fonts/tipa/tipa-1.3.tar.gz +Source0: ftp://ftp.dante.de/tex-archive/fonts/tipa/tipa-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: tetex-latex Requires: tetex-latex Requires(post): tetex -Requires(preun): tetex Requires(postun): tetex BuildArch: noarch @@ -51,8 +54,8 @@ install -p -m 644 tfm/*.tfm $RPM_BUILD_ROOT%{texmf}/fonts/tfm/%{fontpath}/ install -p -m 644 mf/*.mf $RPM_BUILD_ROOT%{texmf}/fonts/source/%{fontpath}/ -mkdir -p $RPM_BUILD_ROOT%{texmf}/dvips/config -install -m 644 dvips/*.map $RPM_BUILD_ROOT%{texmf}/dvips/config/ +mkdir -p $RPM_BUILD_ROOT%{texmf}/fonts/map/dvips/%{tdsname} +install -m 644 dvips/*.map $RPM_BUILD_ROOT%{texmf}/fonts/map/dvips/%{tdsname}/ %clean @@ -61,14 +64,17 @@ %post /usr/bin/mktexlsr %{texmf} -/usr/bin/updmap --quiet --nohash --outputdir %{texmf}/dvips/config --enable Map tipa.map - -%preun -if [ "$1" = "0" ]; then - /usr/bin/updmap --quiet --nohash --outputdir %{texmf}/dvips/config --disable tipa.map +if [ "$1" = "2" ]; then + [ -f /usr/share/texmf/dvips/config/tipa.map ] && \ + rm -f /usr/share/texmf/dvips/config/tipa.map fi +/usr/bin/updmap-sys --quiet --nohash --outputdir %{texmf}/dvips/config --enable Map tipa.map + %postun +if [ "$1" = "0" ]; then + /usr/bin/updmap-sys --quiet --nohash --outputdir %{texmf}/dvips/config --disable tipa.map +fi /usr/bin/mktexlsr %{texmf} @@ -76,14 +82,19 @@ %defattr(-,root,root,-) %doc doc/tipaman.dvi %{texmf}/tex/latex/%{tdsname} -%{texmf}/fonts/tfm/%{fontpath} -%{texmf}/fonts/type1/%{fontpath} -%{texmf}/fonts/source/%{fontpath} -%{texmf}/dvips/config/tipa.map +%{texmf}/fonts/tfm/%{fontpathtop} +%{texmf}/fonts/type1/%{fontpathtop} +%{texmf}/fonts/source/%{fontpathtop} +%{texmf}/fonts/map/dvips/%{tdsname}/ %changelog -* Fri Apr 7 2005 Michael Schwendt +* Thu Sep 22 2005 Michael Schwendt - 1.3-3 +- Run udpmap-sys in scriptlets, not udpmap. +- Update location of map files. +- Own all relevant directories. + +* Thu Apr 7 2005 Michael Schwendt - 1.3-2 - rebuilt * Thu Apr 22 2004 Marius L. J??hndal - 0:1.3-0.fdr.1 From fedora-extras-commits at redhat.com Thu Sep 22 11:06:37 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Thu, 22 Sep 2005 07:06:37 -0400 Subject: rpms/tetex-font-tipa/devel tetex-font-tipa.spec,1.4,1.5 Message-ID: <200509221106.j8MB6b2e006907@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/tetex-font-tipa/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6888 Modified Files: tetex-font-tipa.spec Log Message: * Thu Sep 22 2005 Michael Schwendt - 1.3-4 - rebuilt * Thu Sep 22 2005 Michael Schwendt - 1.3-3 - Run udpmap-sys in scriptlets, not udpmap. - Update location of map files. - Own all relevant directories. Index: tetex-font-tipa.spec =================================================================== RCS file: /cvs/extras/rpms/tetex-font-tipa/devel/tetex-font-tipa.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- tetex-font-tipa.spec 6 Apr 2005 22:13:33 -0000 1.4 +++ tetex-font-tipa.spec 22 Sep 2005 11:06:35 -0000 1.5 @@ -1,11 +1,15 @@ +# This package is for Fedora Core >= 4. + %define texmf %{_datadir}/texmf %define tdsname tipa + %define fontpath fkr/tipa +# The directory prefix of fontpath we want to own. +%define fontpathtop fkr Name: tetex-font-tipa Version: 1.3 -Release: 2 - +Release: 4 Summary: TIPA fonts for LaTeX Group: Applications/Publishing @@ -14,13 +18,12 @@ # NOTE: This tarball cannot be verified directly as it is # automatically generated by the FTP site. Instead, the # files contained in the tarball have to be verified one by one ;( -Source0: ftp://ftp.dante.de/tex-archive/fonts/tipa/tipa-1.3.tar.gz +Source0: ftp://ftp.dante.de/tex-archive/fonts/tipa/tipa-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: tetex-latex Requires: tetex-latex Requires(post): tetex -Requires(preun): tetex Requires(postun): tetex BuildArch: noarch @@ -51,8 +54,8 @@ install -p -m 644 tfm/*.tfm $RPM_BUILD_ROOT%{texmf}/fonts/tfm/%{fontpath}/ install -p -m 644 mf/*.mf $RPM_BUILD_ROOT%{texmf}/fonts/source/%{fontpath}/ -mkdir -p $RPM_BUILD_ROOT%{texmf}/dvips/config -install -m 644 dvips/*.map $RPM_BUILD_ROOT%{texmf}/dvips/config/ +mkdir -p $RPM_BUILD_ROOT%{texmf}/fonts/map/dvips/%{tdsname} +install -m 644 dvips/*.map $RPM_BUILD_ROOT%{texmf}/fonts/map/dvips/%{tdsname}/ %clean @@ -61,14 +64,17 @@ %post /usr/bin/mktexlsr %{texmf} -/usr/bin/updmap --quiet --nohash --outputdir %{texmf}/dvips/config --enable Map tipa.map - -%preun -if [ "$1" = "0" ]; then - /usr/bin/updmap --quiet --nohash --outputdir %{texmf}/dvips/config --disable tipa.map +if [ "$1" = "2" ]; then + [ -f /usr/share/texmf/dvips/config/tipa.map ] && \ + rm -f /usr/share/texmf/dvips/config/tipa.map fi +/usr/bin/updmap-sys --quiet --nohash --outputdir %{texmf}/dvips/config --enable Map tipa.map + %postun +if [ "$1" = "0" ]; then + /usr/bin/updmap-sys --quiet --nohash --outputdir %{texmf}/dvips/config --disable tipa.map +fi /usr/bin/mktexlsr %{texmf} @@ -76,14 +82,22 @@ %defattr(-,root,root,-) %doc doc/tipaman.dvi %{texmf}/tex/latex/%{tdsname} -%{texmf}/fonts/tfm/%{fontpath} -%{texmf}/fonts/type1/%{fontpath} -%{texmf}/fonts/source/%{fontpath} -%{texmf}/dvips/config/tipa.map +%{texmf}/fonts/tfm/%{fontpathtop} +%{texmf}/fonts/type1/%{fontpathtop} +%{texmf}/fonts/source/%{fontpathtop} +%{texmf}/fonts/map/dvips/%{tdsname}/ %changelog -* Fri Apr 7 2005 Michael Schwendt +* Thu Sep 22 2005 Michael Schwendt - 1.3-4 +- rebuilt + +* Thu Sep 22 2005 Michael Schwendt - 1.3-3 +- Run udpmap-sys in scriptlets, not udpmap. +- Update location of map files. +- Own all relevant directories. + +* Thu Apr 7 2005 Michael Schwendt - 1.3-2 - rebuilt * Thu Apr 22 2004 Marius L. J??hndal - 0:1.3-0.fdr.1 From fedora-extras-commits at redhat.com Thu Sep 22 11:14:54 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Thu, 22 Sep 2005 07:14:54 -0400 Subject: owners owners.list,1.238,1.239 Message-ID: <200509221114.j8MBEs5C007016@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6997 Modified Files: owners.list Log Message: I believe Seth has taken over over seahorse many weeks ago Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.238 retrieving revision 1.239 diff -u -r1.238 -r1.239 --- owners.list 21 Sep 2005 17:48:21 -0000 1.238 +++ owners.list 22 Sep 2005 11:14:52 -0000 1.239 @@ -920,7 +920,7 @@ Fedora Extras|SDL_mixer|Simple DirectMedia Layer - Sample Mixer Library|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| Fedora Extras|SDL_net|SDL portable network library|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| Fedora Extras|SDL_ttf|Simple DirectMedia Layer - Sample TrueType Font Library|pmatilai at laiskiainen.org|extras-qa at fedoraproject.org| -Fedora Extras|seahorse|GNOME2 interface for gnupg|compton at pcompton.com|extras-qa at fedoraproject.org| +Fedora Extras|seahorse|GNOME2 interface for gnupg|skvidal at phy.duke.edu|extras-qa at fedoraproject.org| Fedora Extras|shapelib|API in "C" for Shapefile handling|mccann0011 at hotmail.com|extras-qa at fedoraproject.org| Fedora Extras|shorewall|Shoreline Firewall is an iptables-based firewall for Linux systems|kuko at maarmas.com|extras-qa at fedoraproject.org| Fedora Extras|showimg|Feature-rich image viewer for KDE|gauret at free.fr|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Thu Sep 22 12:19:08 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 22 Sep 2005 08:19:08 -0400 Subject: rpms/maxima/devel maxima.spec,1.6,1.7 Message-ID: <200509221219.j8MCJ8uI008557@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/maxima/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8538 Modified Files: maxima.spec Log Message: enable sbcl Index: maxima.spec =================================================================== RCS file: /cvs/extras/rpms/maxima/devel/maxima.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- maxima.spec 16 Sep 2005 20:23:00 -0000 1.6 +++ maxima.spec 22 Sep 2005 12:19:05 -0000 1.7 @@ -3,9 +3,8 @@ %define _with_clisp 1 %define _without_cmucl 1 %define _without_gcl 1 -%define _without_sbcl 1 +%define _with_sbcl 1 -#define cvs .20050908 %define beta rc1 Summary: Symbolic Computation Program @@ -16,10 +15,11 @@ License: GPL Group: Applications/Engineering URL: http://maxima.sourceforge.net/ -#Source: http://dl.sourceforge.net/sourceforge/maxima/maxima-%{version}%{?cvs}.tar.gz +#Source: http://dl.sourceforge.net/sourceforge/maxima/maxima-%{version}%{?cvs}.tar.gz Source: http://maxima.sf.net/tmp-release/maxima-5.9.1.9rc1.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -# add ppc (and maybe ppc64) when clisp builds again on ppc (http://bugzilla.redhat.com/bugzilla/166347) +# add ppc (and maybe ppc64) when lisps build again on ppc +# (clisp: http://bugzilla.redhat.com/bugzilla/166347) ExclusiveArch: %{ix86} x86_64 Source1: maxima.png @@ -106,7 +106,7 @@ %package runtime-gcl Summary: Maxima compiled with GCL Group: Applications/Engineering -BuildRequires: gcl-devel +BuildRequires: gcl Requires: %{name} = %{version} Obsoletes: maxima-exec-gcl < %{version}-%{release} Provides: %{name}-runtime = %{version} From fedora-extras-commits at redhat.com Thu Sep 22 12:34:52 2005 From: fedora-extras-commits at redhat.com (Mark Cox (mjc)) Date: Thu, 22 Sep 2005 08:34:52 -0400 Subject: fedora-security/audit fc4,1.60,1.61 Message-ID: <200509221234.j8MCYqJd008675@cvs-int.fedora.redhat.com> Author: mjc Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8656 Modified Files: fc4 Log Message: Last few days updates Index: fc4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc4,v retrieving revision 1.60 retrieving revision 1.61 diff -u -r1.60 -r1.61 --- fc4 20 Sep 2005 22:01:04 -0000 1.60 +++ fc4 22 Sep 2005 12:34:50 -0000 1.61 @@ -1,9 +1,13 @@ -Up to date CVE as of CVE email 20050914 -Up to date FC4 as of 20050914 +Up to date CVE as of CVE email 20050921 +Up to date FC4 as of 20050921 ** are items that need attention +2005-3011 ** texinfo 2005-2991 ignore (ncompress) don't ship zdiff or zcmp scripts +2005-2968 version (mozilla, not 1.7.10) +we include a different mozilla sh +2005-2968 VULNERABLE (firefox) +2005-2946 VULNERABLE (openssl, fixed 0.9.8) (as it uses md5 md) 2005-2876 backport (util-linux) [since FEDORA-2005-887] 2005-2874 version (cups, fixed 1.1.23) 2005-2873 ** kernel @@ -41,6 +45,7 @@ 2005-2499 backport (slocate) [since FEDORA-2005-770] 2005-2498 version (php xml_rpc, fixed 1.4.0) [since FEDORA-2005-810] 2005-2496 backport (ntp, fixed 4.2.0b) ...0a-20040617-ntpd_guid.patch +2005-2495 backport (xorg-x11) [since FEDORA-2005-894] 2005-2494 VULNERABLE (kdebase, fixed after 3.4.2) bz#166997 2005-2491 ignore (python, fc4 python does not contain pcre) 2005-2491 backport (pcre, fixed 6.2) [since FEDORA-2005-803] From fedora-extras-commits at redhat.com Thu Sep 22 12:37:24 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 22 Sep 2005 08:37:24 -0400 Subject: rpms/maxima/FC-4 .cvsignore, 1.2, 1.3 maxima.spec, 1.5, 1.6 sources, 1.2, 1.3 maxima-5.9.0-htmlview.patch, 1.1, NONE Message-ID: <200509221237.j8MCbOtE008720@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/maxima/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8693 Modified Files: .cvsignore maxima.spec sources Removed Files: maxima-5.9.0-htmlview.patch Log Message: 5.9.1.9rc1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/maxima/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 6 Sep 2005 17:56:03 -0000 1.2 +++ .cvsignore 22 Sep 2005 12:37:22 -0000 1.3 @@ -1,3 +1,3 @@ -macref.pdf -maxima-5.9.1.tar.gz +maxima-5.9.1.9rc1.tar.gz maximabook-19-Sept-2004.pdf +macref.pdf Index: maxima.spec =================================================================== RCS file: /cvs/extras/rpms/maxima/FC-4/maxima.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- maxima.spec 12 Sep 2005 12:29:32 -0000 1.5 +++ maxima.spec 22 Sep 2005 12:37:22 -0000 1.6 @@ -3,22 +3,24 @@ %define _with_clisp 1 %define _without_cmucl 1 %define _without_gcl 1 -%define _without_sbcl 1 +%define _with_sbcl 1 -#define cvs .20050908 -#define beta cvs +%define beta rc1 Summary: Symbolic Computation Program Name: maxima -Version: 5.9.1%{?beta} +Version: 5.9.1.9rc1 -Release: 5%{?dist} +Release: 2%{?dist} License: GPL Group: Applications/Engineering URL: http://maxima.sourceforge.net/ -Source: http://dl.sourceforge.net/sourceforge/maxima/maxima-%{version}%{?cvs}.tar.gz +#Source: http://dl.sourceforge.net/sourceforge/maxima/maxima-%{version}%{?cvs}.tar.gz +Source: http://maxima.sf.net/tmp-release/maxima-5.9.1.9rc1.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -ExcludeArch: ppc ppc64 +# add ppc (and maybe ppc64) when lisps build again on ppc +# (clisp: http://bugzilla.redhat.com/bugzilla/166347) +ExclusiveArch: %{ix86} x86_64 Source1: maxima.png Source2: xmaxima.desktop @@ -28,14 +30,14 @@ Source10: http://starship.python.net/crew/mike/TixMaxima/macref.pdf Source11: http://maxima.sourceforge.net/docs/maximabook/maximabook-19-Sept-2004.pdf -Patch1: maxima-5.9.0-htmlview.patch +Patch1: maxima-5.9.2-htmlview.patch # (mysterious?) xemacs patch Patch2: maxima.el-xemacs.patch # Inhibit automatic compressing of info files. Compressed info # files break maxima's internal help. %define __spec_install_post %{nil} -# debuginfo is empty/blank, disable +# debuginfo is empty/blank (when using gcl?), disable %define debug_package %{nil} BuildRequires: texinfo @@ -43,8 +45,7 @@ BuildRequires: desktop-file-utils # /usr/bin/wish BuildRequires: tk -# cvs -%{?cvs:BuildRequires: autoconf automake} +%{?beta:BuildRequires: autoconf automake} Requires: %{name}-runtime = %{version} Requires: gnuplot @@ -79,11 +80,11 @@ %package runtime-clisp Summary: Maxima compiled with clisp Group: Applications/Engineering -BuildRequires: clisp +BuildRequires: clisp-devel %define clisp_ver %{expand:%%(rpm -q --qf '%%{VERSION}' clisp )} Requires: clisp >= %{clisp_ver} Requires: %{name} = %{version} -Obsoletes: maxima-exec-lisp +Obsoletes: maxima-exec-clisp < %{version}-%{release} Provides: %{name}-runtime = %{version} %description runtime-clisp Maxima compiled with Common Lisp (clisp) @@ -94,10 +95,8 @@ Summary: Maxima compiled with CMUCL Group: Applications/Engineering BuildRequires: cmucl -#define cmucl_ver %{expand:%%(rpm -q --qf '%%{VERSION}' cmucl )} -#Requires: cmucl >= %{cmucl_ver} Requires: %{name} = %{version} -Obsoletes: maxima-exec-cmucl +Obsoletes: maxima-exec-cmucl < %{version}-%{release} Provides: %{name}-runtime = %{version} %description runtime-cmucl Maxima compiled with CMU Common Lisp (cmucl) @@ -109,7 +108,7 @@ Group: Applications/Engineering BuildRequires: gcl Requires: %{name} = %{version} -Obsoletes: maxima-exec-gcl +Obsoletes: maxima-exec-gcl < %{version}-%{release} Provides: %{name}-runtime = %{version} %description runtime-gcl Maxima compiled with Gnu Common Lisp (gcl) @@ -120,10 +119,10 @@ Summary: Maxima compiled with SBCL Group: Applications/Engineering BuildRequires: sbcl -%define sbcl_ver %{expand:%%(rpm -q --qf '%%{version}' sbcl )} +%define sbcl_ver %{expand:%%(rpm -q --qf '%%{VERSION}' sbcl )} Requires: sbcl >= %{sbcl_ver} Requires: %{name} = %{version} -#Obsoletes: maxima-exec-sbcl +Obsoletes: maxima-exec-sbcl < %{version}-%{release} Provides: %{name}-runtime = %{version} %description runtime-sbcl Maxima compiled with Steel Bank Common Lisp (sbcl). @@ -145,16 +144,16 @@ 's/(defcustom\s+maxima-info-index-file\s+)(\S+)/$1\"maxima.info-16\"/' \ interfaces/emacs/emaxima/maxima.el -#if "%{?cvs:1}" == "1" -if [ ! -f configure ]; then +# remove CVS crud +find -name CVS -type d | xargs rm -r + +%if "%{?beta:1}" == "1" +#if [ ! -f configure ]; then aclocal automake --add-missing --copy autoconf -fi - -# remove CVS crud -find -name CVS -type d | xargs rm -r -#endif +#fi +%endif %build @@ -167,7 +166,7 @@ # docs pushd doc - install -p -m644 %{SOURCE11} maximabook/maxima.pdf + install -D -p -m644 %{SOURCE11} maximabook/maxima.pdf pushd info texi2dvi -p maxima.texi @@ -310,6 +309,13 @@ %changelog +* Fri Sep 16 2005 Rex Dieter 5.9.1.9rc1-2 +- -runtime-sbcl: with sbcl_ver macro +- use versioned maxima-exec Obsoletes. + +* Mon Sep 12 2005 Rex Dieter 5.9.1.9rc1-1 +- 5.9.1.9rc1 + * Fri Sep 09 2005 Rex Dieter 5.9.1-5 - add more Obsoletes: maxima-exec- for cleaner upgrade from customized, rebuilt upstream rpms. Index: sources =================================================================== RCS file: /cvs/extras/rpms/maxima/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 6 Sep 2005 17:56:03 -0000 1.2 +++ sources 22 Sep 2005 12:37:22 -0000 1.3 @@ -1,3 +1,3 @@ -c101a1ce604d31b02bbc2f37cced280d macref.pdf -659acfad1f61444cf5b38f6c28279d40 maxima-5.9.1.tar.gz +60e188d2c10515e7dadbc176bd138694 maxima-5.9.1.9rc1.tar.gz 9faa5a513de43b5e7384216a8783f620 maximabook-19-Sept-2004.pdf +c101a1ce604d31b02bbc2f37cced280d macref.pdf --- maxima-5.9.0-htmlview.patch DELETED --- From fedora-extras-commits at redhat.com Thu Sep 22 12:39:07 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 22 Sep 2005 08:39:07 -0400 Subject: rpms/maxima/FC-4 maxima-5.9.2-htmlview.patch,NONE,1.1 Message-ID: <200509221239.j8MCd7lQ008759@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/maxima/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8739 Added Files: maxima-5.9.2-htmlview.patch Log Message: updated htmlview patch maxima-5.9.2-htmlview.patch: --- NEW FILE maxima-5.9.2-htmlview.patch --- --- maxima/interfaces/xmaxima/Tkmaxima/Menu.tcl.htmlview 2004-10-16 10:37:53.000000000 -0500 +++ maxima/interfaces/xmaxima/Tkmaxima/Menu.tcl 2005-08-22 07:27:23.000000000 -0500 @@ -215,9 +215,9 @@ } } else { - set selectedbrowser mozilla + set selectedbrowser htmlview - foreach b { mozilla konqueror epiphany firefox netscape } { + foreach b { htmlview firefox konqueror mozilla epiphany netscape } { if { ! [catch {exec which $b} ] } { set selectedbrowser $b break } } From fedora-extras-commits at redhat.com Thu Sep 22 13:21:45 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 22 Sep 2005 09:21:45 -0400 Subject: rpms/sbcl/FC-3 my_setarch.c, NONE, 1.1 sbcl.spec, 1.11, 1.12 sbcl-0.9.4-ADDR_NO_RANDOMIZE-argv0.patch, 1.1, NONE sbcl-0.9.4-ADDR_NO_RANDOMIZE-proc.patch, 1.1, NONE Message-ID: <200509221321.j8MDLj7n010411@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/sbcl/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10387 Modified Files: sbcl.spec Added Files: my_setarch.c Removed Files: sbcl-0.9.4-ADDR_NO_RANDOMIZE-argv0.patch sbcl-0.9.4-ADDR_NO_RANDOMIZE-proc.patch Log Message: * Thu Sep 22 2005 Rex Dieter 0.9.4-18 - drop use of setarch, use my_setarch.c * Mon Sep 19 2005 Rex Dieter 0.9.4-17 - rework personality/reexec patch (execve -> execvp) --- NEW FILE my_setarch.c --- #include #include #include #include int main(int argc, char **argv) { if ( argc >= 2 ) { long pers = personality(-1); /* 0x40000 aka. ADDR_NO_RANDOMIZE */ if (!(pers & 0x40000)) { if (personality(pers | 0x40000) == -1) { fprintf(stderr, "WARNING: Couldn't set the proper personality flags. Trying to continue anyway.\n"); } } /* fprintf (stdout, "DEBUG: execing %s with arg %s",argv[1],&argv[1]); */ execvp(argv[1], &argv[1]); } exit(0); } Index: sbcl.spec =================================================================== RCS file: /cvs/extras/rpms/sbcl/FC-3/sbcl.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- sbcl.spec 16 Sep 2005 19:54:35 -0000 1.11 +++ sbcl.spec 22 Sep 2005 13:21:42 -0000 1.12 @@ -7,29 +7,15 @@ #define sbcl_bootstrap cmucl #define sbcl_bootstrap clisp -%if "%{?fedora}" >= "3" -BuildRequires:setarch -%define setarch setarch %{_target_cpu} -%endif - -%if "%{?fedora}" >= "4" -%define setarch setarch %{_target_cpu} -R -%endif - -%if "%{?rhel}" >= "3" -BuildRequires:setarch -%define setarch setarch %{_target_cpu} -%endif - Name: sbcl Summary: Steel Bank Common Lisp Version: 0.9.4 -Release: 15%{?dist} +Release: 18%{?dist} License: BSD/MIT Group: Development/Languages URL: http://sbcl.sourceforge.net/ -Source0: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-%{version}-source.tar.bz2 +Source0: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-%{version}-source.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) ExclusiveArch: %{ix86} x86_64 @@ -50,12 +36,10 @@ %endif %endif +Source100: my_setarch.c + Patch1: sbcl-0.8.18-default-sbcl-home.patch -# See http://sourceforge.net/mailarchive/message.php?msg_id=12787069 -# use /proc/self/exe -#Patch2: sbcl-0.9.4-ADDR_NO_RANDOMIZE-proc.patch -# use argv[0] -Patch2: sbcl-0.9.4-ADDR_NO_RANDOMIZE-argv0.patch +Patch2: sbcl-0.9.4-personality.patch Patch3: sbcl-0.9.4-optflags.patch Patch4: sbcl-0.9.4-LIB_DIR.patch @@ -79,7 +63,7 @@ #sed -i -e "s|/usr/local/lib/sbcl/|%{_libdir}/sbcl/|" src/runtime/runtime.c #or patch to use SBCL_HOME env var %patch1 -p0 -b .default-sbcl-home -%{?setarch:%patch2 -p1 -b .ADDR_NO_RANDOMIZE} +%patch2 -p1 -b .personality %patch3 -p1 -b .optflags %patch4 -p1 -b .LIB_DIR @@ -115,6 +99,9 @@ %if "%{?sbcl_bootstrap}" == "%{nil}" export SBCL_HOME=`pwd`/sbcl-bootstrap/lib/sbcl export PATH=`pwd`/sbcl-bootstrap/bin:${PATH} + +%{__cc} %{SOURCE100} -o my_setarch +%define setarch ./my_setarch %endif %{?setarch} ./make.sh %{?bootstrap} @@ -125,8 +112,6 @@ %check || : pushd tests -# still need setarch if using ADDR_NO_RANDOMIZE-proc patch, since /proc isn't available on buildsystem/mock. -#{?setarch} sh ./run-tests.sh sh ./run-tests.sh popd @@ -138,7 +123,6 @@ unset SBCL_HOME ||: export INSTALL_ROOT=$RPM_BUILD_ROOT%{_prefix} export LIB_DIR=$RPM_BUILD_ROOT%{_libdir} -# (may) still need setarch if using ADDR_NO_RANDOMIZE-proc patch sh ./install.sh ## Unpackaged files @@ -177,6 +161,12 @@ %changelog +* Thu Sep 22 2005 Rex Dieter 0.9.4-18 +- drop use of setarch, use my_setarch.c + +* Mon Sep 19 2005 Rex Dieter 0.9.4-17 +- rework personality/reexec patch (execve -> execvp) + * Sat Sep 16 2005 Rex Dieter 0.9.4-15 - disable ppc (probably related to #166347) --- sbcl-0.9.4-ADDR_NO_RANDOMIZE-argv0.patch DELETED --- --- sbcl-0.9.4-ADDR_NO_RANDOMIZE-proc.patch DELETED --- From fedora-extras-commits at redhat.com Thu Sep 22 13:24:15 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 22 Sep 2005 09:24:15 -0400 Subject: rpms/sbcl/FC-3 sbcl-0.9.4-personality.patch, NONE, 1.1 sbcl.spec, 1.12, 1.13 Message-ID: <200509221324.j8MDOFUv010539@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/sbcl/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10516 Modified Files: sbcl.spec Added Files: sbcl-0.9.4-personality.patch Log Message: respin for missing patch sbcl-0.9.4-personality.patch: --- NEW FILE sbcl-0.9.4-personality.patch --- --- sbcl-0.9.4/src/runtime/os.h.ADDR_NO_RANDOMIZE 2005-07-14 10:41:20.000000000 -0500 +++ sbcl-0.9.4/src/runtime/os.h 2005-09-13 11:23:31.319884384 -0500 @@ -50,7 +50,7 @@ /* Do anything we need to do when starting up the runtime environment * in this OS. */ -extern void os_init(void); +extern void os_init(char *argv[]); /* Install any OS-dependent low-level signal handlers which are needed * by the runtime environment. E.g. the signals raised by a violation --- sbcl-0.9.4/src/runtime/linux-os.c.ADDR_NO_RANDOMIZE 2005-08-12 14:08:19.000000000 -0500 +++ sbcl-0.9.4/src/runtime/linux-os.c 2005-09-13 11:26:47.110833967 -0500 @@ -44,6 +44,7 @@ #include #include #include +#include #include "validate.h" #include "thread.h" @@ -92,7 +93,7 @@ int linux_no_threads_p = 0; void -os_init(void) +os_init(char *argv[]) { /* Conduct various version checks: do we have enough mmap(), is * this a sparc running 2.2, can we do threads? */ @@ -117,7 +118,7 @@ FSHOW((stderr,"linux kernel %d.%d predates 2.4;\n enabling workarounds for SPARC kernel bugs in signal handling.\n", major_version,minor_version)); linux_sparc_siginfo_bug = 1; #endif - } + } #ifdef LISP_FEATURE_SB_THREAD futex_wait(futex,-1); if(errno==ENOSYS) linux_no_threads_p = 1; @@ -125,6 +126,28 @@ fprintf(stderr,"Linux with NPTL support (e.g. kernel 2.6 or newer) required for \nthread-enabled SBCL. Disabling thread support.\n\n"); #endif os_vm_page_size = getpagesize(); + + /* KLUDGE: Disable memory randomization on new Linux kernels + * by setting a personality flag and re-executing. (We need + * to re-execute, since the memory maps that can conflict with + * the SBCL spaces have already been done at this point). + */ +#if defined(LISP_FEATURE_X86) + if ((major_version == 2) && (minor_version >= 6) || (major_version >= 3)) { + long pers = personality(-1); + /* 0x40000 aka. ADDR_NO_RANDOMIZE */ + if (!(pers & 0x40000)) { + if (personality(pers | 0x40000) != -1) { + execvp(argv[0], argv); + } + /* Either changing the personality or (re)exec failed. Either + * way we might as well continue, and hope that the random + * memory maps are ok this time around. + */ + fprintf(stderr, "WARNING: Couldn't re-execute SBCL with the proper personality flags. Trying to continue anyway.\n"); + } + } +#endif } --- sbcl-0.9.4/src/runtime/runtime.c.ADDR_NO_RANDOMIZE 2005-09-13 11:23:31.315884548 -0500 +++ sbcl-0.9.4/src/runtime/runtime.c 2005-09-13 11:23:31.323884220 -0500 @@ -194,7 +194,7 @@ /* KLUDGE: os_vm_page_size is set by os_init(), and on some * systems (e.g. Alpha) arch_init() needs need os_vm_page_size, so * it must follow os_init(). -- WHN 2000-01-26 */ - os_init(); + os_init(argv); arch_init(); gc_init(); validate(); Index: sbcl.spec =================================================================== RCS file: /cvs/extras/rpms/sbcl/FC-3/sbcl.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- sbcl.spec 22 Sep 2005 13:21:42 -0000 1.12 +++ sbcl.spec 22 Sep 2005 13:24:13 -0000 1.13 @@ -10,7 +10,7 @@ Name: sbcl Summary: Steel Bank Common Lisp Version: 0.9.4 -Release: 18%{?dist} +Release: 19%{?dist} License: BSD/MIT Group: Development/Languages @@ -161,7 +161,7 @@ %changelog -* Thu Sep 22 2005 Rex Dieter 0.9.4-18 +* Thu Sep 22 2005 Rex Dieter 0.9.4-19 - drop use of setarch, use my_setarch.c * Mon Sep 19 2005 Rex Dieter 0.9.4-17 From fedora-extras-commits at redhat.com Thu Sep 22 14:10:13 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 22 Sep 2005 10:10:13 -0400 Subject: rpms/sbcl/FC-4 my_setarch.c,NONE,1.1 sbcl.spec,1.13,1.14 Message-ID: <200509221410.j8MEADfm012153@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/sbcl/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12133 Modified Files: sbcl.spec Added Files: my_setarch.c Log Message: * Thu Sep 22 2005 Rex Dieter 0.9.4-19 - drop use of setarch, use my_setarch.c --- NEW FILE my_setarch.c --- #include #include #include #include int main(int argc, char **argv) { if ( argc >= 2 ) { long pers = personality(-1); /* 0x40000 aka. ADDR_NO_RANDOMIZE */ if (!(pers & 0x40000)) { if (personality(pers | 0x40000) == -1) { fprintf(stderr, "WARNING: Couldn't set the proper personality flags. Trying to continue anyway.\n"); } } /* fprintf (stdout, "DEBUG: execing %s with arg %s",argv[1],&argv[1]); */ execvp(argv[1], &argv[1]); } exit(0); } Index: sbcl.spec =================================================================== RCS file: /cvs/extras/rpms/sbcl/FC-4/sbcl.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- sbcl.spec 19 Sep 2005 20:47:49 -0000 1.13 +++ sbcl.spec 22 Sep 2005 14:10:11 -0000 1.14 @@ -7,24 +7,10 @@ #define sbcl_bootstrap cmucl #define sbcl_bootstrap clisp -%if "%{?fedora}" >= "3" -BuildRequires:setarch -%define setarch setarch %{_target_cpu} -%endif - -%if "%{?fedora}" >= "4" -%define setarch setarch %{_target_cpu} -R -%endif - -%if "%{?rhel}" >= "3" -BuildRequires:setarch -%define setarch setarch %{_target_cpu} -%endif - Name: sbcl Summary: Steel Bank Common Lisp Version: 0.9.4 -Release: 17%{?dist} +Release: 19%{?dist} License: BSD/MIT Group: Development/Languages @@ -50,6 +36,8 @@ %endif %endif +Source100: my_setarch.c + Patch1: sbcl-0.8.18-default-sbcl-home.patch Patch2: sbcl-0.9.4-personality.patch Patch3: sbcl-0.9.4-optflags.patch @@ -111,6 +99,9 @@ %if "%{?sbcl_bootstrap}" == "%{nil}" export SBCL_HOME=`pwd`/sbcl-bootstrap/lib/sbcl export PATH=`pwd`/sbcl-bootstrap/bin:${PATH} + +%{__cc} -o my_setarch %{optflags} %{SOURCE100} +%define setarch ./my_setarch %endif %{?setarch} ./make.sh %{?bootstrap} @@ -170,6 +161,9 @@ %changelog +* Thu Sep 22 2005 Rex Dieter 0.9.4-19 +- drop use of setarch, use my_setarch.c + * Mon Sep 19 2005 Rex Dieter 0.9.4-17 - rework personality/reexec patch (execve -> execvp) From fedora-extras-commits at redhat.com Thu Sep 22 14:10:31 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 22 Sep 2005 10:10:31 -0400 Subject: rpms/sbcl/devel my_setarch.c,NONE,1.1 sbcl.spec,1.13,1.14 Message-ID: <200509221410.j8MEAV0q012179@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/sbcl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12159 Modified Files: sbcl.spec Added Files: my_setarch.c Log Message: * Thu Sep 22 2005 Rex Dieter 0.9.4-19 - drop use of setarch, use my_setarch.c --- NEW FILE my_setarch.c --- #include #include #include #include int main(int argc, char **argv) { if ( argc >= 2 ) { long pers = personality(-1); /* 0x40000 aka. ADDR_NO_RANDOMIZE */ if (!(pers & 0x40000)) { if (personality(pers | 0x40000) == -1) { fprintf(stderr, "WARNING: Couldn't set the proper personality flags. Trying to continue anyway.\n"); } } /* fprintf (stdout, "DEBUG: execing %s with arg %s",argv[1],&argv[1]); */ execvp(argv[1], &argv[1]); } exit(0); } Index: sbcl.spec =================================================================== RCS file: /cvs/extras/rpms/sbcl/devel/sbcl.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- sbcl.spec 21 Sep 2005 13:47:15 -0000 1.13 +++ sbcl.spec 22 Sep 2005 14:10:29 -0000 1.14 @@ -7,26 +7,10 @@ #define sbcl_bootstrap cmucl #define sbcl_bootstrap clisp -%if "%{?bootstrap}" == "%{nil}" -%if "%{?fedora}" >= "3" -BuildRequires:setarch -%define setarch setarch %{_target_cpu} -%endif - -%if "%{?fedora}" >= "4" -%define setarch setarch %{_target_cpu} -R -%endif - -%if "%{?rhel}" >= "3" -BuildRequires:setarch -%define setarch setarch %{_target_cpu} -%endif -%endif - Name: sbcl Summary: Steel Bank Common Lisp Version: 0.9.4 -Release: 17%{?dist} +Release: 19%{?dist} License: BSD/MIT Group: Development/Languages @@ -52,6 +36,8 @@ %endif %endif +Source100: my_setarch.c + Patch1: sbcl-0.8.18-default-sbcl-home.patch Patch2: sbcl-0.9.4-personality.patch Patch3: sbcl-0.9.4-optflags.patch @@ -113,6 +99,9 @@ %if "%{?sbcl_bootstrap}" == "%{nil}" export SBCL_HOME=`pwd`/sbcl-bootstrap/lib/sbcl export PATH=`pwd`/sbcl-bootstrap/bin:${PATH} + +%{__cc} -o my_setarch %{optflags} %{SOURCE100} +%define setarch ./my_setarch %endif %{?setarch} ./make.sh %{?bootstrap} @@ -172,6 +161,9 @@ %changelog +* Thu Sep 22 2005 Rex Dieter 0.9.4-19 +- drop use of setarch, use my_setarch.c + * Mon Sep 19 2005 Rex Dieter 0.9.4-17 - rework personality/reexec patch (execve -> execvp) From fedora-extras-commits at redhat.com Thu Sep 22 14:10:54 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 22 Sep 2005 10:10:54 -0400 Subject: rpms/sbcl/FC-3 sbcl.spec,1.13,1.14 Message-ID: <200509221410.j8MEAsWI012211@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/sbcl/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12190 Modified Files: sbcl.spec Log Message: use %%optflags when building my_setarch Index: sbcl.spec =================================================================== RCS file: /cvs/extras/rpms/sbcl/FC-3/sbcl.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- sbcl.spec 22 Sep 2005 13:24:13 -0000 1.13 +++ sbcl.spec 22 Sep 2005 14:10:52 -0000 1.14 @@ -100,7 +100,7 @@ export SBCL_HOME=`pwd`/sbcl-bootstrap/lib/sbcl export PATH=`pwd`/sbcl-bootstrap/bin:${PATH} -%{__cc} %{SOURCE100} -o my_setarch +%{__cc} -o my_setarch %{optflags} %{SOURCE100} %define setarch ./my_setarch %endif From fedora-extras-commits at redhat.com Thu Sep 22 15:15:23 2005 From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj)) Date: Thu, 22 Sep 2005 11:15:23 -0400 Subject: rpms/gnome-applet-timer - New directory Message-ID: <200509221515.j8MFFNrI013913@cvs-int.fedora.redhat.com> Author: katzj Update of /cvs/extras/rpms/gnome-applet-timer In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13893/gnome-applet-timer Log Message: Directory /cvs/extras/rpms/gnome-applet-timer added to the repository From fedora-extras-commits at redhat.com Thu Sep 22 15:15:23 2005 From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj)) Date: Thu, 22 Sep 2005 11:15:23 -0400 Subject: rpms/gnome-applet-timer/devel - New directory Message-ID: <200509221515.j8MFFN5D013918@cvs-int.fedora.redhat.com> Author: katzj Update of /cvs/extras/rpms/gnome-applet-timer/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13893/gnome-applet-timer/devel Log Message: Directory /cvs/extras/rpms/gnome-applet-timer/devel added to the repository From fedora-extras-commits at redhat.com Thu Sep 22 15:15:47 2005 From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj)) Date: Thu, 22 Sep 2005 11:15:47 -0400 Subject: rpms/gnome-applet-timer Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200509221515.j8MFFlbA013973@cvs-int.fedora.redhat.com> Author: katzj Update of /cvs/extras/rpms/gnome-applet-timer In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13938 Added Files: Makefile import.log Log Message: Setup of module gnome-applet-timer --- NEW FILE Makefile --- # Top level Makefile for module gnome-applet-timer all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Thu Sep 22 15:15:47 2005 From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj)) Date: Thu, 22 Sep 2005 11:15:47 -0400 Subject: rpms/gnome-applet-timer/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200509221515.j8MFFl6l013978@cvs-int.fedora.redhat.com> Author: katzj Update of /cvs/extras/rpms/gnome-applet-timer/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13938/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module gnome-applet-timer --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Thu Sep 22 15:16:24 2005 From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj)) Date: Thu, 22 Sep 2005 11:16:24 -0400 Subject: rpms/gnome-applet-timer import.log,1.1,1.2 Message-ID: <200509221516.j8MFGORT014041@cvs-int.fedora.redhat.com> Author: katzj Update of /cvs/extras/rpms/gnome-applet-timer In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14006 Modified Files: import.log Log Message: auto-import gnome-applet-timer-1.1.1-8.fc4 on branch devel from gnome-applet-timer-1.1.1-8.fc4.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/gnome-applet-timer/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 22 Sep 2005 15:15:45 -0000 1.1 +++ import.log 22 Sep 2005 15:16:22 -0000 1.2 @@ -0,0 +1 @@ +gnome-applet-timer-1_1_1-8_fc4:HEAD:gnome-applet-timer-1.1.1-8.fc4.src.rpm:1127402148 From fedora-extras-commits at redhat.com Thu Sep 22 15:16:24 2005 From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj)) Date: Thu, 22 Sep 2005 11:16:24 -0400 Subject: rpms/gnome-applet-timer/devel gnome-applet-timer.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200509221516.j8MFGOJW014047@cvs-int.fedora.redhat.com> Author: katzj Update of /cvs/extras/rpms/gnome-applet-timer/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14006/devel Modified Files: .cvsignore sources Added Files: gnome-applet-timer.spec Log Message: auto-import gnome-applet-timer-1.1.1-8.fc4 on branch devel from gnome-applet-timer-1.1.1-8.fc4.src.rpm --- NEW FILE gnome-applet-timer.spec --- Name: gnome-applet-timer Version: 1.1.1 Release: 8%{?dist} Summary: A countdown timer applet for the GNOME panel Group: User Interface/Desktops License: GPL URL: http://timerapplet.sourceforge.net/ Source0: http://download.sourceforge.net/timerapplet/timer-applet-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gnome-panel-devel >= 2.6, gettext, scrollkeeper Provides: timer-applet = %{version} Requires(pre): GConf2 Requires(post): GConf2, scrollkeeper Requires(preun): GConf2 Requires(postun): scrollkeeper %description Timer Applet is a countdown timer applet for the GNOME panel. Highlights: * Run multiple Timer Applets simultaneously to have different timers * Quickly set a time and the applet will notify you when time's up * Create presets for quick access to frequently-used times * Small and unobtrusive. Choose to either view the remaining time right in the panel or hide it so you don't get distracted by the countdown. %prep %setup -q -n timer-applet-%{version} %build %configure make %{?_smp_mflags} # Part one of omf install hack sed -i 's!!!' help/C/timer-applet-C.omf sed -i 's!!!' help/fr/timer-applet-fr.omf # Part one of libexec install hack sed -i 's!!!' GNOME_TimerApplet.server %install rm -rf $RPM_BUILD_ROOT # For GConf apps: prevent schemas from being installed at this stage export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 make install DESTDIR=$RPM_BUILD_ROOT # Part two of omf install hack mkdir -p $RPM_BUILD_ROOT%{_datadir}/omf/timer-applet install -m 0644 -p help/C/timer-applet-C.omf $RPM_BUILD_ROOT%{_datadir}/omf/timer-applet install -m 0644 -p help/fr/timer-applet-fr.omf $RPM_BUILD_ROOT%{_datadir}/omf/timer-applet # Part two of libexec install hack mkdir -p $RPM_BUILD_ROOT%{_libexecdir} mv ${RPM_BUILD_ROOT}%{_bindir}/timer-applet ${RPM_BUILD_ROOT}%{_libexecdir}/timer-applet %find_lang timer-applet find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';' %check || : %clean rm -rf $RPM_BUILD_ROOT %pre if [ "$1" -gt 1 ]; then export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` gconftool-2 --makefile-uninstall-rule \ %{_sysconfdir}/gconf/schemas/timer-applet.schemas >/dev/null || : killall -HUP gconfd-2 || : fi %post export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` gconftool-2 --makefile-install-rule \ %{_sysconfdir}/gconf/schemas/timer-applet.schemas >/dev/null || : killall -HUP gconfd-2 || : scrollkeeper-update -q -o %{_datadir}/omf/timer-applet || : %preun if [ "$1" -eq 0 ]; then export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` gconftool-2 --makefile-uninstall-rule \ %{_sysconfdir}/gconf/schemas/timer-applet.schemas > /dev/null || : killall -HUP gconfd-2 || : fi %postun scrollkeeper-update -q || : %files -f timer-applet.lang %defattr(-,root,root,-) %doc AUTHORS COPYING ChangeLog NEWS README %{_libexecdir}/timer-applet %{_sysconfdir}/gconf/schemas/timer-applet.schemas %{_libdir}/bonobo/servers/GNOME_TimerApplet.server %{_datadir}/gnome/help/timer-applet %{_datadir}/gnome-2.0/ui/GNOME_TimerApplet.xml %{_datadir}/omf/timer-applet %{_datadir}/pixmaps/timer-applet %changelog * Mon Sep 19 2005 Christoph Wickert - 1.1.1-8 - Minor Specfile Changes. * Sun Sep 18 2005 Christoph Wickert - 1.1.1-7 - removed all patches and use Toshi's specfile hacks instead. (#168032) * Sun Sep 18 2005 Christoph Wickert - 1.1.1-6 - removed omf file install specfile hack. * Sun Sep 18 2005 Christoph Wickert - 1.1.1-5 - added timer-applet-libexec.patch by Toshio Kuratomi (#168032) - modified timer-applet-docinstall.patch: replaced *.old with *.docinstall - modified specfile to install omf file. * Sat Sep 17 2005 Christoph Wickert - 1.1.1-4 - added timer-applet-docinstall.patch by Toshio Kuratomi (#168032) * Fri Sep 16 2005 Christoph Wickert - 1.1.1-3 - Renamed package from gnome-timer-applet to gnome-applet-timer according to Fedora Extras package naming guidelines. - Minor Specfile Changes: Added scrollkeeper requirements and snipplets * Sat Sep 10 2005 Christoph Wickert - 1.1.1-2 - Renamed package from timer-applet to gnome-timer-applet according to Fedora Extras package naming guidelines. - Several fixes for FE (version etc). - Cleaned up Specfile. * Fri Aug 19 2005 Christoph Wickert - 1.1.1-1.fc4.cw - Updated to version 1.1.1. - Rebuild for Core 4. * Wed Apr 13 2005 Christoph Wickert - 1.0-2.fc3.cw - Rebuild to fit to repos naming conventions. * Sun Apr 03 2005 Christoph Wickert - 1.0-fc3_cw.1 - Updated to version 1.0. * Thu Mar 24 2005 Christoph Wickert - 0.9-fc3_cw.1 - Updated to version 0.9. * Mon Mar 21 2005 Christoph Wickert - 0.8-fc3_cw.1 - Initial RPM release. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gnome-applet-timer/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 22 Sep 2005 15:15:45 -0000 1.1 +++ .cvsignore 22 Sep 2005 15:16:22 -0000 1.2 @@ -0,0 +1 @@ +timer-applet-1.1.1.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/gnome-applet-timer/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 22 Sep 2005 15:15:45 -0000 1.1 +++ sources 22 Sep 2005 15:16:22 -0000 1.2 @@ -0,0 +1 @@ +db9dacfa6bd35904dc88740764b1750e timer-applet-1.1.1.tar.gz From fedora-extras-commits at redhat.com Thu Sep 22 15:21:26 2005 From: fedora-extras-commits at redhat.com (Marc Maurer (uwog)) Date: Thu, 22 Sep 2005 11:21:26 -0400 Subject: rpms/abiword/devel .cvsignore, 1.9, 1.10 abiword.spec, 1.18, 1.19 sources, 1.9, 1.10 Message-ID: <200509221521.j8MFLQqj014110@cvs-int.fedora.redhat.com> Author: uwog Update of /cvs/extras/rpms/abiword/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14087 Modified Files: .cvsignore abiword.spec sources Log Message: 2.3.99 release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/abiword/devel/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 10 Sep 2005 09:29:50 -0000 1.9 +++ .cvsignore 22 Sep 2005 15:21:24 -0000 1.10 @@ -1 +1 @@ -abiword-2.3.6.tar.bz2 +abiword-2.3.99.tar.bz2 Index: abiword.spec =================================================================== RCS file: /cvs/extras/rpms/abiword/devel/abiword.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- abiword.spec 10 Sep 2005 09:29:50 -0000 1.18 +++ abiword.spec 22 Sep 2005 15:21:24 -0000 1.19 @@ -2,7 +2,7 @@ Summary: The AbiWord word processor Name: abiword -Version: 2.3.6 +Version: 2.3.99 Release: 1 Epoch: 1 Group: Applications/Editors @@ -131,6 +131,9 @@ %{_datadir}/icons/*png %changelog +* Thu Sep 22 2005 Marc Maurer - 1:2.3.99-1 +- Update to 2.3.99 + * Sat Sep 10 2005 Marc Maurer - 1:2.3.6-1 - Update to 2.3.6 - Drop the pango patch Index: sources =================================================================== RCS file: /cvs/extras/rpms/abiword/devel/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 10 Sep 2005 09:29:50 -0000 1.9 +++ sources 22 Sep 2005 15:21:24 -0000 1.10 @@ -1 +1 @@ -8a1fc6a2a9cec61ed15231d2fa1b3110 abiword-2.3.6.tar.bz2 +9dada36fc81c2af204f85a5db0627935 abiword-2.3.99.tar.bz2 From fedora-extras-commits at redhat.com Thu Sep 22 15:34:05 2005 From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert)) Date: Thu, 22 Sep 2005 11:34:05 -0400 Subject: owners owners.list,1.239,1.240 Message-ID: <200509221534.j8MFY5of014224@cvs-int.fedora.redhat.com> Author: cwickert Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14205 Modified Files: owners.list Log Message: added gnome-applet-timer Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.239 retrieving revision 1.240 diff -u -r1.239 -r1.240 --- owners.list 22 Sep 2005 11:14:52 -0000 1.239 +++ owners.list 22 Sep 2005 15:34:03 -0000 1.240 @@ -255,6 +255,7 @@ Fedora Extras|gnome-applet-netspeed|GNOME applet that shows traffic on a network device|a.kurtz at hardsun.net|extras-qa at fedoraproject.org| Fedora Extras|gnome-applet-rhythmbox|A GNOME panel applet to control Rhythmbox's playback|ivazquez at ivazquez.net|extras-qa at fedoraproject.org| Fedora Extras|gnome-applet-sensors|Gnome panel applet for hardware sensors|a.kurtz at hardsun.net|extras-qa at fedoraproject.org| +Fedora Extras|gnome-applet-timer|A countdown timer applet for the GNOME panel|wickerpms at arcor.de|extras-qa at fedoraproject.org| Fedora Extras|gnome-blog|GNOME panel object for posting blog entries|bdpepple at ameritech.net|extras-qa at fedoraproject.org| Fedora Extras|gnome-common|Useful things common to building gnome packages from scratch|toshio at tiki-lounge.com|extras-qa at fedoraproject.org| Fedora Extras|gnome-cpufreq-applet|CPU frequency scaling monitor applet|adrian at lisas.de|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Thu Sep 22 15:35:09 2005 From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl)) Date: Thu, 22 Sep 2005 11:35:09 -0400 Subject: rpms/gwget/devel .cvsignore, 1.4, 1.5 gwget.spec, 1.6, 1.7 sources, 1.4, 1.5 Message-ID: <200509221535.j8MFZ9nc014260@cvs-int.fedora.redhat.com> Author: thl Update of /cvs/extras/rpms/gwget/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14236 Modified Files: .cvsignore gwget.spec sources Log Message: Update to 0.96; dropped x86_64 patch; make install DESTDIR= instead of makeinstall macro; Use epimajor macro to simplify spec for different dists; Remove the epiphanye build-option and build it always Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gwget/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 4 Mar 2005 16:56:22 -0000 1.4 +++ .cvsignore 22 Sep 2005 15:35:07 -0000 1.5 @@ -1,2 +1 @@ -gwget-0.93.tar.gz -gwget-autoreconf.patch.bz2 +gwget-0.96.tar.gz Index: gwget.spec =================================================================== RCS file: /cvs/extras/rpms/gwget/devel/gwget.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- gwget.spec 5 Mar 2005 21:10:21 -0000 1.6 +++ gwget.spec 22 Sep 2005 15:35:07 -0000 1.7 @@ -1,21 +1,21 @@ -# use "--without epiphanye" as rpmbuildparameter to disable epiphany-extension (requires FC3 Core package) +%define epimajor 1.8 Summary: Graphical download manager that uses wget Name: gwget -Version: 0.93 +Version: 0.96 Release: 2 License: GPL Group: Applications/Internet -Source0: http://dl.sf.net/gwget/gwget-0.93.tar.gz +Source0: http://ftp.gnome.org/pub/GNOME/sources/gwget/0.96/gwget-0.96.tar.gz Source1: gwget.desktop -Patch0: gwget-autoreconf.patch.bz2 -URL: http://gwget.sourceforge.net/ +URL: http://gnome.org/projects/gwget Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Buildrequires: libgnomeui-devel >= 2.0 Buildrequires: libglade2-devel >= 2.0 BuildRequires: perl-XML-Parser BuildRequires: gettext >= 0.14.1 BuildRequires: desktop-file-utils +BuildRequires: epiphany-devel >= %{epimajor} Requires: wget >= 1.9 Requires(post): GConf2 Requires(preun): GConf2 @@ -26,32 +26,27 @@ Currently, very basic wget options are available, supporting multiple downloads, drag&drop and display the errors from wget process. -%if 0%{!?_without_epiphanye:1} - %package epiphany-extension Summary: This Package contains extensions gwget2 extensions for epiphany. Group: Applications/Internet Requires: %{name} = %{version} -Requires: epiphany >= 1.4.4 -BuildRequires: epiphany-devel >= 1.4.4 +Requires: epiphany >= %{epimajor} %description epiphany-extension This Package contains extensions gwget2 extensions for epiphany. -%endif # _without_epiphanye %prep %setup -q -%patch0 -p1 %build -%configure %{?_without_epiphanye:--disable-epiphany-extension} +%configure --with-epiphany-version=%{epimajor} make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT # For GConf apps: prevent schemas from being installed at this stage export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 -%makeinstall +make install DESTDIR=$RPM_BUILD_ROOT rm ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop desktop-file-install --vendor fedora \ --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ @@ -89,16 +84,22 @@ %{_datadir}/idl/GNOME_Gwget.idl %{_datadir}/applications/fedora-%{name}.desktop -%if 0%{!?_without_epiphanye:1} %files epiphany-extension %defattr (-,root,root) -%dir %{_libdir}/epiphany/extensions/ -%{_libdir}/epiphany/extensions/* -%endif # _without_epiphanye - +%{_libdir}/epiphany-%{epimajor}/extensions/ %changelog +* Mon Sep 19 2005 Thorsten Leemhuis 0.96-2 +- Remove the epiphanye build-option and build it always +- Use epimajor macro to simplify spec for different dists +- make install DESTDIR= instead of makeinstall macro + +* Mon Sep 19 2005 Adel Gadllah 0.96-1 +- Update to 0.96 +- Fix urls in spec file (project has moved) +- dropped x86_64 patch (not needed anymore) + * Tue Mar 01 2005 Thorsten Leemhuis 0:0.93-2 - Add gwget-autoreconf.patch.bz2 ; fixes x86_64 Index: sources =================================================================== RCS file: /cvs/extras/rpms/gwget/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 4 Mar 2005 16:56:37 -0000 1.4 +++ sources 22 Sep 2005 15:35:07 -0000 1.5 @@ -1,2 +1 @@ -79a3625ef99a5a417164e0d97020fcc5 gwget-0.93.tar.gz -159d5d2c94c0bb88a82cdfdb2ecbe0d2 gwget-autoreconf.patch.bz2 +f4c78534574300ce7997e9fdc3c3b6be gwget-0.96.tar.gz From fedora-extras-commits at redhat.com Thu Sep 22 15:36:59 2005 From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl)) Date: Thu, 22 Sep 2005 11:36:59 -0400 Subject: rpms/gwget/devel gwget.spec,1.7,1.8 Message-ID: <200509221536.j8MFaxeU014297@cvs-int.fedora.redhat.com> Author: thl Update of /cvs/extras/rpms/gwget/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14278 Modified Files: gwget.spec Log Message: use dist Index: gwget.spec =================================================================== RCS file: /cvs/extras/rpms/gwget/devel/gwget.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- gwget.spec 22 Sep 2005 15:35:07 -0000 1.7 +++ gwget.spec 22 Sep 2005 15:36:57 -0000 1.8 @@ -3,7 +3,7 @@ Summary: Graphical download manager that uses wget Name: gwget Version: 0.96 -Release: 2 +Release: 3%{?dist} License: GPL Group: Applications/Internet Source0: http://ftp.gnome.org/pub/GNOME/sources/gwget/0.96/gwget-0.96.tar.gz @@ -90,6 +90,9 @@ %changelog +* Thu Sep 22 2005 Thorsten Leemhuis 0.96-3 +- use dist + * Mon Sep 19 2005 Thorsten Leemhuis 0.96-2 - Remove the epiphanye build-option and build it always - Use epimajor macro to simplify spec for different dists From fedora-extras-commits at redhat.com Thu Sep 22 16:27:16 2005 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Thu, 22 Sep 2005 12:27:16 -0400 Subject: rpms/perl-ExtUtils-CBuilder/devel .cvsignore, 1.9, 1.10 perl-ExtUtils-CBuilder.spec, 1.13, 1.14 sources, 1.9, 1.10 Message-ID: <200509221627.j8MGRGgO018031@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-ExtUtils-CBuilder/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17968/devel Modified Files: .cvsignore perl-ExtUtils-CBuilder.spec sources Log Message: Update to 0.14. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-ExtUtils-CBuilder/devel/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 25 Aug 2005 14:29:43 -0000 1.9 +++ .cvsignore 22 Sep 2005 16:27:14 -0000 1.10 @@ -1 +1 @@ -ExtUtils-CBuilder-0.13.tar.gz +ExtUtils-CBuilder-0.14.tar.gz Index: perl-ExtUtils-CBuilder.spec =================================================================== RCS file: /cvs/extras/rpms/perl-ExtUtils-CBuilder/devel/perl-ExtUtils-CBuilder.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- perl-ExtUtils-CBuilder.spec 25 Aug 2005 14:29:43 -0000 1.13 +++ perl-ExtUtils-CBuilder.spec 22 Sep 2005 16:27:14 -0000 1.14 @@ -1,5 +1,5 @@ Name: perl-ExtUtils-CBuilder -Version: 0.13 +Version: 0.14 Release: 1%{?dist} Summary: Compile and link C code for Perl modules @@ -37,7 +37,7 @@ chmod -R u+w $RPM_BUILD_ROOT/* -%check || : +%check make test @@ -48,11 +48,14 @@ %files %defattr(-,root,root,-) %doc Changes -%{perl_vendorlib}/ExtUtils +%{perl_vendorlib}/ExtUtils/ %{_mandir}/man3/*.3* %changelog +* Thu Sep 22 2005 Jose Pedro Oliveira - 0.14-1 +- Update 0.14. + * Thu Aug 25 2005 Jose Pedro Oliveira - 0.13-1 - Update 0.13. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-ExtUtils-CBuilder/devel/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 25 Aug 2005 14:29:43 -0000 1.9 +++ sources 22 Sep 2005 16:27:14 -0000 1.10 @@ -1 +1 @@ -c90c5e20d931eea02efa4d0f68483648 ExtUtils-CBuilder-0.13.tar.gz +f651ae9246952f56fe92583796fc1950 ExtUtils-CBuilder-0.14.tar.gz From fedora-extras-commits at redhat.com Thu Sep 22 16:27:10 2005 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Thu, 22 Sep 2005 12:27:10 -0400 Subject: rpms/perl-ExtUtils-CBuilder/FC-3 .cvsignore, 1.9, 1.10 perl-ExtUtils-CBuilder.spec, 1.11, 1.12 sources, 1.9, 1.10 Message-ID: <200509221627.j8MGRfmD018036@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-ExtUtils-CBuilder/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17968/FC-3 Modified Files: .cvsignore perl-ExtUtils-CBuilder.spec sources Log Message: Update to 0.14. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-ExtUtils-CBuilder/FC-3/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 25 Aug 2005 14:29:42 -0000 1.9 +++ .cvsignore 22 Sep 2005 16:27:08 -0000 1.10 @@ -1 +1 @@ -ExtUtils-CBuilder-0.13.tar.gz +ExtUtils-CBuilder-0.14.tar.gz Index: perl-ExtUtils-CBuilder.spec =================================================================== RCS file: /cvs/extras/rpms/perl-ExtUtils-CBuilder/FC-3/perl-ExtUtils-CBuilder.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- perl-ExtUtils-CBuilder.spec 25 Aug 2005 14:29:42 -0000 1.11 +++ perl-ExtUtils-CBuilder.spec 22 Sep 2005 16:27:08 -0000 1.12 @@ -1,5 +1,5 @@ Name: perl-ExtUtils-CBuilder -Version: 0.13 +Version: 0.14 Release: 1%{?dist} Summary: Compile and link C code for Perl modules @@ -37,7 +37,7 @@ chmod -R u+w $RPM_BUILD_ROOT/* -%check || : +%check make test @@ -48,11 +48,14 @@ %files %defattr(-,root,root,-) %doc Changes -%{perl_vendorlib}/ExtUtils +%{perl_vendorlib}/ExtUtils/ %{_mandir}/man3/*.3* %changelog +* Thu Sep 22 2005 Jose Pedro Oliveira - 0.14-1 +- Update 0.14. + * Thu Aug 25 2005 Jose Pedro Oliveira - 0.13-1 - Update 0.13. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-ExtUtils-CBuilder/FC-3/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 25 Aug 2005 14:29:42 -0000 1.9 +++ sources 22 Sep 2005 16:27:08 -0000 1.10 @@ -1 +1 @@ -c90c5e20d931eea02efa4d0f68483648 ExtUtils-CBuilder-0.13.tar.gz +f651ae9246952f56fe92583796fc1950 ExtUtils-CBuilder-0.14.tar.gz From fedora-extras-commits at redhat.com Thu Sep 22 16:27:11 2005 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Thu, 22 Sep 2005 12:27:11 -0400 Subject: rpms/perl-ExtUtils-CBuilder/FC-4 .cvsignore, 1.9, 1.10 perl-ExtUtils-CBuilder.spec, 1.13, 1.14 sources, 1.9, 1.10 Message-ID: <200509221627.j8MGRfxh018041@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-ExtUtils-CBuilder/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17968/FC-4 Modified Files: .cvsignore perl-ExtUtils-CBuilder.spec sources Log Message: Update to 0.14. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-ExtUtils-CBuilder/FC-4/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 25 Aug 2005 14:29:42 -0000 1.9 +++ .cvsignore 22 Sep 2005 16:27:09 -0000 1.10 @@ -1 +1 @@ -ExtUtils-CBuilder-0.13.tar.gz +ExtUtils-CBuilder-0.14.tar.gz Index: perl-ExtUtils-CBuilder.spec =================================================================== RCS file: /cvs/extras/rpms/perl-ExtUtils-CBuilder/FC-4/perl-ExtUtils-CBuilder.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- perl-ExtUtils-CBuilder.spec 25 Aug 2005 14:29:42 -0000 1.13 +++ perl-ExtUtils-CBuilder.spec 22 Sep 2005 16:27:09 -0000 1.14 @@ -1,5 +1,5 @@ Name: perl-ExtUtils-CBuilder -Version: 0.13 +Version: 0.14 Release: 1%{?dist} Summary: Compile and link C code for Perl modules @@ -37,7 +37,7 @@ chmod -R u+w $RPM_BUILD_ROOT/* -%check || : +%check make test @@ -48,11 +48,14 @@ %files %defattr(-,root,root,-) %doc Changes -%{perl_vendorlib}/ExtUtils +%{perl_vendorlib}/ExtUtils/ %{_mandir}/man3/*.3* %changelog +* Thu Sep 22 2005 Jose Pedro Oliveira - 0.14-1 +- Update 0.14. + * Thu Aug 25 2005 Jose Pedro Oliveira - 0.13-1 - Update 0.13. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-ExtUtils-CBuilder/FC-4/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 25 Aug 2005 14:29:42 -0000 1.9 +++ sources 22 Sep 2005 16:27:09 -0000 1.10 @@ -1 +1 @@ -c90c5e20d931eea02efa4d0f68483648 ExtUtils-CBuilder-0.13.tar.gz +f651ae9246952f56fe92583796fc1950 ExtUtils-CBuilder-0.14.tar.gz From fedora-extras-commits at redhat.com Thu Sep 22 16:31:25 2005 From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert)) Date: Thu, 22 Sep 2005 12:31:25 -0400 Subject: rpms/gnome-applet-timer/devel gnome-applet-timer.spec,1.1,1.2 Message-ID: <200509221631.j8MGVPWN018115@cvs-int.fedora.redhat.com> Author: cwickert Update of /cvs/extras/rpms/gnome-applet-timer/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18095 Modified Files: gnome-applet-timer.spec Log Message: increase revision due to tag collision Index: gnome-applet-timer.spec =================================================================== RCS file: /cvs/extras/rpms/gnome-applet-timer/devel/gnome-applet-timer.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gnome-applet-timer.spec 22 Sep 2005 15:16:22 -0000 1.1 +++ gnome-applet-timer.spec 22 Sep 2005 16:31:23 -0000 1.2 @@ -1,6 +1,6 @@ Name: gnome-applet-timer Version: 1.1.1 -Release: 8%{?dist} +Release: 9%{?dist} Summary: A countdown timer applet for the GNOME panel Group: User Interface/Desktops @@ -105,6 +105,9 @@ %{_datadir}/pixmaps/timer-applet %changelog +* Thu Sep 22 2005 Christoph Wickert - 1.1.1-9 +- Increase release due to tag collision. + * Mon Sep 19 2005 Christoph Wickert - 1.1.1-8 - Minor Specfile Changes. From fedora-extras-commits at redhat.com Thu Sep 22 16:33:06 2005 From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl)) Date: Thu, 22 Sep 2005 12:33:06 -0400 Subject: rpms/gwget/devel gwget.spec,1.8,1.9 Message-ID: <200509221633.j8MGX6eY018187@cvs-int.fedora.redhat.com> Author: thl Update of /cvs/extras/rpms/gwget/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18170 Modified Files: gwget.spec Log Message: extension-dir is different on epiphany 1.8; Own _libdir/epiphany Index: gwget.spec =================================================================== RCS file: /cvs/extras/rpms/gwget/devel/gwget.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- gwget.spec 22 Sep 2005 15:36:57 -0000 1.8 +++ gwget.spec 22 Sep 2005 16:32:44 -0000 1.9 @@ -3,7 +3,7 @@ Summary: Graphical download manager that uses wget Name: gwget Version: 0.96 -Release: 3%{?dist} +Release: 4%{?dist} License: GPL Group: Applications/Internet Source0: http://ftp.gnome.org/pub/GNOME/sources/gwget/0.96/gwget-0.96.tar.gz @@ -86,10 +86,14 @@ %files epiphany-extension %defattr (-,root,root) -%{_libdir}/epiphany-%{epimajor}/extensions/ +%{_libdir}/epiphany*/ %changelog +* Thu Sep 22 2005 Thorsten Leemhuis 0.96-4 +- extension-dir is different on epiphany 1.8 +- Own _libdir/epiphany + * Thu Sep 22 2005 Thorsten Leemhuis 0.96-3 - use dist From fedora-extras-commits at redhat.com Thu Sep 22 16:41:10 2005 From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl)) Date: Thu, 22 Sep 2005 12:41:10 -0400 Subject: rpms/gwget/FC-4 .cvsignore, 1.4, 1.5 gwget.spec, 1.6, 1.7 sources, 1.4, 1.5 Message-ID: <200509221641.j8MGfATQ018812@cvs-int.fedora.redhat.com> Author: thl Update of /cvs/extras/rpms/gwget/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18785 Modified Files: .cvsignore gwget.spec sources Log Message: sync with devel -- update to 0.96, always build epiphany extension and more Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gwget/FC-4/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 4 Mar 2005 16:56:22 -0000 1.4 +++ .cvsignore 22 Sep 2005 16:41:08 -0000 1.5 @@ -1,2 +1 @@ -gwget-0.93.tar.gz -gwget-autoreconf.patch.bz2 +gwget-0.96.tar.gz Index: gwget.spec =================================================================== RCS file: /cvs/extras/rpms/gwget/FC-4/gwget.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- gwget.spec 5 Mar 2005 21:10:21 -0000 1.6 +++ gwget.spec 22 Sep 2005 16:41:08 -0000 1.7 @@ -1,21 +1,21 @@ -# use "--without epiphanye" as rpmbuildparameter to disable epiphany-extension (requires FC3 Core package) +%define epimajor 1.6 Summary: Graphical download manager that uses wget Name: gwget -Version: 0.93 -Release: 2 +Version: 0.96 +Release: 4%{?dist} License: GPL Group: Applications/Internet -Source0: http://dl.sf.net/gwget/gwget-0.93.tar.gz +Source0: http://ftp.gnome.org/pub/GNOME/sources/gwget/0.96/gwget-0.96.tar.gz Source1: gwget.desktop -Patch0: gwget-autoreconf.patch.bz2 -URL: http://gwget.sourceforge.net/ +URL: http://gnome.org/projects/gwget Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Buildrequires: libgnomeui-devel >= 2.0 Buildrequires: libglade2-devel >= 2.0 BuildRequires: perl-XML-Parser BuildRequires: gettext >= 0.14.1 BuildRequires: desktop-file-utils +BuildRequires: epiphany-devel >= %{epimajor} Requires: wget >= 1.9 Requires(post): GConf2 Requires(preun): GConf2 @@ -26,32 +26,27 @@ Currently, very basic wget options are available, supporting multiple downloads, drag&drop and display the errors from wget process. -%if 0%{!?_without_epiphanye:1} - %package epiphany-extension Summary: This Package contains extensions gwget2 extensions for epiphany. Group: Applications/Internet Requires: %{name} = %{version} -Requires: epiphany >= 1.4.4 -BuildRequires: epiphany-devel >= 1.4.4 +Requires: epiphany >= %{epimajor} %description epiphany-extension This Package contains extensions gwget2 extensions for epiphany. -%endif # _without_epiphanye %prep %setup -q -%patch0 -p1 %build -%configure %{?_without_epiphanye:--disable-epiphany-extension} +%configure --with-epiphany-version=%{epimajor} make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT # For GConf apps: prevent schemas from being installed at this stage export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 -%makeinstall +make install DESTDIR=$RPM_BUILD_ROOT rm ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop desktop-file-install --vendor fedora \ --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ @@ -89,16 +84,29 @@ %{_datadir}/idl/GNOME_Gwget.idl %{_datadir}/applications/fedora-%{name}.desktop -%if 0%{!?_without_epiphanye:1} %files epiphany-extension %defattr (-,root,root) -%dir %{_libdir}/epiphany/extensions/ -%{_libdir}/epiphany/extensions/* -%endif # _without_epiphanye - +%{_libdir}/epiphany*/ %changelog +* Thu Sep 22 2005 Thorsten Leemhuis 0.96-4 +- extension-dir is different on epiphany 1.8 +- Own _libdir/epiphany + +* Thu Sep 22 2005 Thorsten Leemhuis 0.96-3 +- use dist + +* Mon Sep 19 2005 Thorsten Leemhuis 0.96-2 +- Remove the epiphanye build-option and build it always +- Use epimajor macro to simplify spec for different dists +- make install DESTDIR= instead of makeinstall macro + +* Mon Sep 19 2005 Adel Gadllah 0.96-1 +- Update to 0.96 +- Fix urls in spec file (project has moved) +- dropped x86_64 patch (not needed anymore) + * Tue Mar 01 2005 Thorsten Leemhuis 0:0.93-2 - Add gwget-autoreconf.patch.bz2 ; fixes x86_64 Index: sources =================================================================== RCS file: /cvs/extras/rpms/gwget/FC-4/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 4 Mar 2005 16:56:37 -0000 1.4 +++ sources 22 Sep 2005 16:41:08 -0000 1.5 @@ -1,2 +1 @@ -79a3625ef99a5a417164e0d97020fcc5 gwget-0.93.tar.gz -159d5d2c94c0bb88a82cdfdb2ecbe0d2 gwget-autoreconf.patch.bz2 +f4c78534574300ce7997e9fdc3c3b6be gwget-0.96.tar.gz From fedora-extras-commits at redhat.com Thu Sep 22 16:48:27 2005 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Thu, 22 Sep 2005 12:48:27 -0400 Subject: rpms/gdl - New directory Message-ID: <200509221648.j8MGmRe4019111@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/gdl In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19087/gdl Log Message: Directory /cvs/extras/rpms/gdl added to the repository From fedora-extras-commits at redhat.com Thu Sep 22 16:48:28 2005 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Thu, 22 Sep 2005 12:48:28 -0400 Subject: rpms/gdl/devel - New directory Message-ID: <200509221648.j8MGmSVc019116@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/gdl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19087/gdl/devel Log Message: Directory /cvs/extras/rpms/gdl/devel added to the repository From fedora-extras-commits at redhat.com Thu Sep 22 16:48:43 2005 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Thu, 22 Sep 2005 12:48:43 -0400 Subject: rpms/gdl Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200509221648.j8MGmhCA019161@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/gdl In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19132 Added Files: Makefile import.log Log Message: Setup of module gdl --- NEW FILE Makefile --- # Top level Makefile for module gdl all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Thu Sep 22 16:48:43 2005 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Thu, 22 Sep 2005 12:48:43 -0400 Subject: rpms/gdl/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200509221648.j8MGmhad019167@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/gdl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19132/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module gdl --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Thu Sep 22 16:49:37 2005 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Thu, 22 Sep 2005 12:49:37 -0400 Subject: rpms/gdl import.log,1.1,1.2 Message-ID: <200509221650.j8MGo8as019287@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/gdl In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19243 Modified Files: import.log Log Message: auto-import gdl-0.8.10-1 on branch devel from gdl-0.8.10-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/gdl/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 22 Sep 2005 16:48:41 -0000 1.1 +++ import.log 22 Sep 2005 16:49:35 -0000 1.2 @@ -0,0 +1 @@ +gdl-0_8_10-1:HEAD:gdl-0.8.10-1.src.rpm:1127407770 From fedora-extras-commits at redhat.com Thu Sep 22 16:49:37 2005 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Thu, 22 Sep 2005 12:49:37 -0400 Subject: rpms/gdl/devel gdl-0.8.10-hdf5.patch, NONE, 1.1 gdl.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200509221650.j8MGo8Vi019288@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/gdl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19243/devel Modified Files: .cvsignore sources Added Files: gdl-0.8.10-hdf5.patch gdl.spec Log Message: auto-import gdl-0.8.10-1 on branch devel from gdl-0.8.10-1.src.rpm gdl-0.8.10-hdf5.patch: --- NEW FILE gdl-0.8.10-hdf5.patch --- --- gdl-0.8.10/src/hdf5_fun.cpp.orig 2005-08-05 16:50:37.000000000 -0600 +++ gdl-0.8.10/src/hdf5_fun.cpp 2005-08-05 16:50:56.000000000 -0600 @@ -128,7 +128,7 @@ // define hyperslab in dataset - hssize_t offset[MAXRANK]; + hsize_t offset[MAXRANK]; hsize_t count[MAXRANK]; for(int i=0; i - 0.8.10-1 - Initial Fedora Extras version Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gdl/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 22 Sep 2005 16:48:41 -0000 1.1 +++ .cvsignore 22 Sep 2005 16:49:35 -0000 1.2 @@ -0,0 +1 @@ +gdl-0.8.10.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/gdl/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 22 Sep 2005 16:48:41 -0000 1.1 +++ sources 22 Sep 2005 16:49:35 -0000 1.2 @@ -0,0 +1 @@ +5dc3efbe49b6aa98de5033e6746b865a gdl-0.8.10.tar.gz From fedora-extras-commits at redhat.com Thu Sep 22 17:02:11 2005 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Thu, 22 Sep 2005 13:02:11 -0400 Subject: rpms/octave/devel octave.spec,1.18,1.19 Message-ID: <200509221702.j8MH2gQi020814@cvs-int.fedora.redhat.com> Author: qspencer Update of /cvs/extras/rpms/octave/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20791 Modified Files: octave.spec Log Message: Add -devel to lapack and blas dependencies (due to recent changes in lapack). Index: octave.spec =================================================================== RCS file: /cvs/extras/rpms/octave/devel/octave.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- octave.spec 9 Aug 2005 15:23:22 -0000 1.18 +++ octave.spec 22 Sep 2005 17:02:09 -0000 1.19 @@ -1,6 +1,6 @@ Name: octave Version: 2.9.3 -Release: 4%{?dist} +Release: 5%{?dist} Summary: A high-level language for numerical computations Epoch: 6 @@ -10,10 +10,10 @@ URL: http://www.octave.org Requires: gnuplot less info texinfo Requires: /sbin/install-info -BuildPrereq: gnuplot bison flex less tetex gcc-gfortran lapack blas +BuildPrereq: bison flex less tetex gcc-gfortran lapack-devel blas-devel BuildPrereq: ncurses-devel zlib-devel libtermcap-devel hdf5-devel BuildPrereq: readline-devel glibc-devel fftw3-devel autoconf gperf -BuildPrereq: umfpack-devel glpk-devel +BuildPrereq: umfpack-devel glpk-devel gnuplot Prereq: /sbin/ldconfig BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: /etc/ld.so.conf.d @@ -123,6 +123,9 @@ %changelog +* Thu Sep 22 2005 Quentin Spencer 2.9.3-5 +- Change lapack and blas dependencies to lapack-devel and blas-devel + * Mon Aug 08 2005 Quentin Spencer 2.9.3-4 - Cleanup: remove redefinition of __libtoolize, ExcludeArch of two platforms, old s390 workarounds, and LC_ALL setting. None of these appear to be From fedora-extras-commits at redhat.com Thu Sep 22 17:03:15 2005 From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert)) Date: Thu, 22 Sep 2005 13:03:15 -0400 Subject: rpms/gnome-applet-timer/FC-4 gnome-applet-timer.spec,1.1,1.2 Message-ID: <200509221703.j8MH3F41020841@cvs-int.fedora.redhat.com> Author: cwickert Update of /cvs/extras/rpms/gnome-applet-timer/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20822 Modified Files: gnome-applet-timer.spec Log Message: increase revision due to tag collision Index: gnome-applet-timer.spec =================================================================== RCS file: /cvs/extras/rpms/gnome-applet-timer/FC-4/gnome-applet-timer.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gnome-applet-timer.spec 22 Sep 2005 15:16:22 -0000 1.1 +++ gnome-applet-timer.spec 22 Sep 2005 17:03:13 -0000 1.2 @@ -1,6 +1,6 @@ Name: gnome-applet-timer Version: 1.1.1 -Release: 8%{?dist} +Release: 9%{?dist} Summary: A countdown timer applet for the GNOME panel Group: User Interface/Desktops @@ -105,6 +105,9 @@ %{_datadir}/pixmaps/timer-applet %changelog +* Thu Sep 22 2005 Christoph Wickert - 1.1.1-9 +- Increase release due to tag collision. + * Mon Sep 19 2005 Christoph Wickert - 1.1.1-8 - Minor Specfile Changes. From fedora-extras-commits at redhat.com Thu Sep 22 17:06:27 2005 From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert)) Date: Thu, 22 Sep 2005 13:06:27 -0400 Subject: rpms/gnome-applet-timer/FC-3 gnome-applet-timer.spec,1.1,1.2 Message-ID: <200509221707.j8MH6w2R020935@cvs-int.fedora.redhat.com> Author: cwickert Update of /cvs/extras/rpms/gnome-applet-timer/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20913 Modified Files: gnome-applet-timer.spec Log Message: increase revision due to tag collision Index: gnome-applet-timer.spec =================================================================== RCS file: /cvs/extras/rpms/gnome-applet-timer/FC-3/gnome-applet-timer.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gnome-applet-timer.spec 22 Sep 2005 15:16:22 -0000 1.1 +++ gnome-applet-timer.spec 22 Sep 2005 17:06:25 -0000 1.2 @@ -1,6 +1,6 @@ Name: gnome-applet-timer Version: 1.1.1 -Release: 8%{?dist} +Release: 9%{?dist} Summary: A countdown timer applet for the GNOME panel Group: User Interface/Desktops @@ -105,6 +105,9 @@ %{_datadir}/pixmaps/timer-applet %changelog +* Thu Sep 22 2005 Christoph Wickert - 1.1.1-9 +- Increase release due to tag collision. + * Mon Sep 19 2005 Christoph Wickert - 1.1.1-8 - Minor Specfile Changes. From fedora-extras-commits at redhat.com Thu Sep 22 17:08:05 2005 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Thu, 22 Sep 2005 13:08:05 -0400 Subject: rpms/octave/FC-4 octave.spec,1.18,1.19 Message-ID: <200509221708.j8MH8aSn020963@cvs-int.fedora.redhat.com> Author: qspencer Update of /cvs/extras/rpms/octave/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20944 Modified Files: octave.spec Log Message: Change lapack and blas dependencies to lapack-devel and blas-devel. Index: octave.spec =================================================================== RCS file: /cvs/extras/rpms/octave/FC-4/octave.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- octave.spec 8 Aug 2005 13:49:03 -0000 1.18 +++ octave.spec 22 Sep 2005 17:08:02 -0000 1.19 @@ -11,7 +11,8 @@ URL: http://www.octave.org Requires: gnuplot less info texinfo Requires: /sbin/install-info -BuildPrereq: gnuplot bison flex less tetex gcc-gfortran lapack blas +BuildPrereq: gnuplot bison flex less tetex gcc-gfortran +BuildPrereq: lapack-devel blas-devel BuildPrereq: ncurses-devel zlib-devel libtermcap-devel hdf5-devel BuildPrereq: readline-devel glibc-devel fftw3-devel autoconf gperf Prereq: /sbin/ldconfig @@ -118,6 +119,9 @@ %changelog +* Thu Sep 22 2005 Quentin Spencer 2.1.71-15 +- Change lapack and blas dependencies to lapack-devel and blas-devel + * Mon Aug 08 2005 Quentin Spencer 2.1.71-15 - Cleanup: remove redefinition of __libtoolize, ExcludeArch of two platforms, old s390 workarounds, and LC_ALL setting. None of these appear to be From fedora-extras-commits at redhat.com Thu Sep 22 17:21:55 2005 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Thu, 22 Sep 2005 13:21:55 -0400 Subject: rpms/gdl/devel gdl.spec,1.1,1.2 Message-ID: <200509221721.j8MHLtI4021084@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/gdl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21063 Modified Files: gdl.spec Log Message: Don't include hdf support on ppc Index: gdl.spec =================================================================== RCS file: /cvs/extras/rpms/gdl/devel/gdl.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gdl.spec 22 Sep 2005 16:49:35 -0000 1.1 +++ gdl.spec 22 Sep 2005 17:21:53 -0000 1.2 @@ -1,6 +1,6 @@ Name: gdl Version: 0.8.10 -Release: 1%{?dist} +Release: 2%{?dist} Summary: GNU Data Language Group: Applications/Engineering @@ -12,9 +12,17 @@ BuildRequires: readline-devel, ncurses-devel BuildRequires: gsl-devel, plplot-devel, ImageMagick-c++-devel -BuildRequires: netcdf-devel, hdf5-devel, hdf-devel, libjpeg-devel +BuildRequires: netcdf-devel, hdf5-devel, libjpeg-devel BuildRequires: python-devel, python-numarray, python-matplotlib -#Requires: +%ifnarch ppc ppc64 +BuildRequires: hdf-devel +%define hdfinclude "-I/usr/include/hdf" +%define hdflib "-L%{_libdir}/hdf" +%else +%define hdfinclude %{nil} +%define hdflib %{nil} +%endif + %description A free IDL (Interactive Data Language) compatible incremental compiler @@ -29,8 +37,8 @@ %build %configure --disable-static \ - INCLUDES="-I/usr/include/netcdf-3 -I/usr/include/hdf" \ - LIBS="-L%{_libdir}/netcdf-3 -L%{_libdir}/hdf -L/usr/X11R6/%{_lib}" + INCLUDES="-I/usr/include/netcdf-3 %{hdfinclude}" \ + LIBS="-L%{_libdir}/netcdf-3 %{hdflib} -L/usr/X11R6/%{_lib}" make %{?_smp_mflags} @@ -50,5 +58,8 @@ %changelog +* Thu Sep 22 2005 - Orion Poplawski - 0.8.10-2 +- Don't include hdf support on ppc + * Fri Aug 19 2005 - Orion Poplawski - 0.8.10-1 - Initial Fedora Extras version From fedora-extras-commits at redhat.com Thu Sep 22 17:27:35 2005 From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl)) Date: Thu, 22 Sep 2005 13:27:35 -0400 Subject: rpms/mail-notification/devel mail-notification-evolution.patch, NONE, 1.1 mail-notification.spec, 1.10, 1.11 Message-ID: <200509221727.j8MHRZng021158@cvs-int.fedora.redhat.com> Author: thl Update of /cvs/extras/rpms/mail-notification/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21136 Modified Files: mail-notification.spec Added Files: mail-notification-evolution.patch Log Message: add mail-notification-evolution.patch and enable evo-support (from Radek Vokal) mail-notification-evolution.patch: --- NEW FILE mail-notification-evolution.patch --- --- mail-notification-2.0/src/mn-evolution-folder-tree-control.c.evolution 2005-09-14 16:17:50.000000000 +0200 +++ mail-notification-2.0/src/mn-evolution-folder-tree-control.c 2005-09-14 16:17:37.000000000 +0200 @@ -22,7 +22,7 @@ #include /* headers from the Evolution source tree */ -#include "mail/mail-component.h" +/*#include "mail/mail-component.h"*/ #include "mail/em-folder-tree.h" #include "mn-evolution.h" --- mail-notification-2.0/configure.evolution 2005-08-09 22:01:09.000000000 +0200 +++ mail-notification-2.0/configure 2005-09-14 16:15:51.000000000 +0200 @@ -24784,12 +24784,12 @@ if test "x$ac_cv_env_EVOLUTION_PLUGIN_CFLAGS_set" = "xset"; then pkg_cv_EVOLUTION_PLUGIN_CFLAGS=$ac_cv_env_EVOLUTION_PLUGIN_CFLAGS_value elif test -n "$PKG_CONFIG"; then - if { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists \"evolution-plugin-2.2 \$evolution_plugin_min_version\" >/dev/null 2>&1") >&5 - ($PKG_CONFIG --exists "evolution-plugin-2.2 $evolution_plugin_min_version" >/dev/null 2>&1) 2>&5 + if { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists \"evolution-plugin-2.4 \$evolution_plugin_min_version\" >/dev/null 2>&1") >&5 + ($PKG_CONFIG --exists "evolution-plugin-2.4 $evolution_plugin_min_version" >/dev/null 2>&1) 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then - pkg_cv_EVOLUTION_PLUGIN_CFLAGS=`$PKG_CONFIG --cflags "evolution-plugin-2.2 $evolution_plugin_min_version" 2>/dev/null` + pkg_cv_EVOLUTION_PLUGIN_CFLAGS=`$PKG_CONFIG --cflags "evolution-plugin-2.4 $evolution_plugin_min_version" 2>/dev/null` else pkg_failed=yes fi @@ -24807,12 +24807,12 @@ if test "x$ac_cv_env_EVOLUTION_PLUGIN_LIBS_set" = "xset"; then pkg_cv_EVOLUTION_PLUGIN_LIBS=$ac_cv_env_EVOLUTION_PLUGIN_LIBS_value elif test -n "$PKG_CONFIG"; then - if { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists \"evolution-plugin-2.2 \$evolution_plugin_min_version\" >/dev/null 2>&1") >&5 - ($PKG_CONFIG --exists "evolution-plugin-2.2 $evolution_plugin_min_version" >/dev/null 2>&1) 2>&5 + if { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists \"evolution-plugin-2.4 \$evolution_plugin_min_version\" >/dev/null 2>&1") >&5 + ($PKG_CONFIG --exists "evolution-plugin-2.4 $evolution_plugin_min_version" >/dev/null 2>&1) 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then - pkg_cv_EVOLUTION_PLUGIN_LIBS=`$PKG_CONFIG --libs "evolution-plugin-2.2 $evolution_plugin_min_version" 2>/dev/null` + pkg_cv_EVOLUTION_PLUGIN_LIBS=`$PKG_CONFIG --libs "evolution-plugin-2.4 $evolution_plugin_min_version" 2>/dev/null` else pkg_failed=yes fi @@ -24824,7 +24824,7 @@ echo "${ECHO_T}$pkg_cv_EVOLUTION_PLUGIN_LIBS" >&6 if test $pkg_failed = yes; then - EVOLUTION_PLUGIN_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "evolution-plugin-2.2 $evolution_plugin_min_version"` + EVOLUTION_PLUGIN_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "evolution-plugin-2.4 $evolution_plugin_min_version"` # Put the nasty error message in config.log where it belongs echo "$EVOLUTION_PLUGIN_PKG_ERRORS" 1>&5 @@ -24841,7 +24841,7 @@ if test $found = yes; then echo "$as_me:$LINENO: checking for the Evolution plugin directory" >&5 echo $ECHO_N "checking for the Evolution plugin directory... $ECHO_C" >&6 - evolution_plugindir=`$PKG_CONFIG --variable=plugindir evolution-plugin-2.2 2>/dev/null` + evolution_plugindir=`$PKG_CONFIG --variable=plugindir evolution-plugin-2.4 2>/dev/null` if test -n "$evolution_plugindir"; then echo "$as_me:$LINENO: result: $evolution_plugindir" >&5 echo "${ECHO_T}$evolution_plugindir" >&6 Index: mail-notification.spec =================================================================== RCS file: /cvs/extras/rpms/mail-notification/devel/mail-notification.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- mail-notification.spec 3 Sep 2005 17:00:53 -0000 1.10 +++ mail-notification.spec 22 Sep 2005 17:27:33 -0000 1.11 @@ -1,6 +1,6 @@ Name: mail-notification Version: 2.0 -Release: 3%{?dist} +Release: 5%{?dist} Summary: Status icon that informs you if you have new mail Group: Applications/Internet @@ -10,6 +10,7 @@ Source1: mail-notification-README.FEDORA Patch0: http://savannah.nongnu.org/download/mailnotify/mail-notification-2.0-buildfix.diff Patch1: http://savannah.nongnu.org/download/mailnotify/mail-notification-2.0-gmail-properties-fix.diff +Patch2: mail-notification-evolution.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gettext >= 0.14.1 @@ -24,6 +25,7 @@ BuildRequires: libgcrypt-devel >= 1.2.0 BuildRequires: libicu-devel >= 2.6 BuildRequires: gob2 +BuildRequires: evolution-devel Requires(post): GConf2 @@ -43,10 +45,10 @@ cp %{SOURCE1} ./README.FEDORA %patch0 -b .patch0 %patch1 -b .patch1 - +%patch2 -p1 -b .evolution %build -%configure --disable-evolution +%configure --enable-evolution --with-evolution-source-dir=/usr/include/evolution-2.4 make %{?_smp_mflags} @@ -102,10 +104,12 @@ %{_sysconfdir}/sound/events/mail-notification.soundlist %{_bindir}/* %{_libdir}/bonobo/servers/GNOME_MailNotification.server +%{_libdir}/bonobo/servers/GNOME_MailNotification_Evolution.server %{_datadir}/%{name} %{_datadir}/applications/fedora-mail-notification.desktop %{_datadir}/applications/fedora-mail-notification-properties.desktop %{_datadir}/gnome/help/mail-notification/ +%{_libdir}/evolution/2.4/plugins/* %dir %{_datadir}/omf/mail-notification/ %{_datadir}/omf/mail-notification/mail-notification-C.omf %{_datadir}/pixmaps/mail-notification.png @@ -113,6 +117,12 @@ %changelog +* Thu Sep 22 2005 Thorsten Leemhuis 2.0-5 +- BR evo-devel + +* Tue Sep 20 2005 Radek Vokal 2.0-4 +- add mail-notification-evolution.patch and enable evo-support + * Sat Sep 03 2005 Thorsten Leemhuis - 2.0-3 - rebuild for new icu From fedora-extras-commits at redhat.com Thu Sep 22 17:34:18 2005 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Thu, 22 Sep 2005 13:34:18 -0400 Subject: owners owners.list,1.240,1.241 Message-ID: <200509221734.j8MHYISE021228@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21209 Modified Files: owners.list Log Message: Add gdl Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.240 retrieving revision 1.241 diff -u -r1.240 -r1.241 --- owners.list 22 Sep 2005 15:34:03 -0000 1.240 +++ owners.list 22 Sep 2005 17:34:16 -0000 1.241 @@ -218,6 +218,7 @@ Fedora Extras|gconfmm20|A C++ interface for GTK2 (a GUI library for X)|denisleroy at yahoo.com|extras-qa at fedoraproject.org| Fedora Extras|gconfmm26|A C++ wrapper for GConf2|denisleroy at yahoo.com|extras-qa at fedoraproject.org| Fedora Extras|gdeskcal|Eye-candy calendar for your desktop.|compton at pcompton.com|extras-qa at fedoraproject.org| +Fedora Extras|gdl|GNU Data Language|orion at cora.nwra.com|extras-qa at fedoraproject.org| Fedora Extras|gdome2|DOM level 2 library for accessing XML files|ville.skytta at iki.fi|extras-qa at fedoraproject.org| Fedora Extras|general|For bugs not specific to any single component.|dkl at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|gentoo|Graphical file management program in GTK+ for Linux|matthias at rpmforge.net|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Thu Sep 22 17:36:42 2005 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Thu, 22 Sep 2005 13:36:42 -0400 Subject: rpms/gdl/devel gdl.spec,1.2,1.3 Message-ID: <200509221736.j8MHag4K021309@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/gdl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21290 Modified Files: gdl.spec Log Message: Disable hdf with configure on ppc Index: gdl.spec =================================================================== RCS file: /cvs/extras/rpms/gdl/devel/gdl.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- gdl.spec 22 Sep 2005 17:21:53 -0000 1.2 +++ gdl.spec 22 Sep 2005 17:36:40 -0000 1.3 @@ -1,6 +1,6 @@ Name: gdl Version: 0.8.10 -Release: 2%{?dist} +Release: 3%{?dist} Summary: GNU Data Language Group: Applications/Engineering @@ -16,9 +16,11 @@ BuildRequires: python-devel, python-numarray, python-matplotlib %ifnarch ppc ppc64 BuildRequires: hdf-devel +%define hdfconfig %{nil} %define hdfinclude "-I/usr/include/hdf" %define hdflib "-L%{_libdir}/hdf" %else +%define hdfconfig "--with-hdf=no" %define hdfinclude %{nil} %define hdflib %{nil} %endif @@ -58,6 +60,9 @@ %changelog +* Thu Sep 22 2005 - Orion Poplawski - 0.8.10-3 +- Disable hdf with configure on ppc + * Thu Sep 22 2005 - Orion Poplawski - 0.8.10-2 - Don't include hdf support on ppc From fedora-extras-commits at redhat.com Thu Sep 22 17:48:33 2005 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Thu, 22 Sep 2005 13:48:33 -0400 Subject: rpms/perl-Log-Dispatch/devel perl-Log-Dispatch.spec,1.2,1.3 Message-ID: <200509221748.j8MHmXV9021423@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Log-Dispatch/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21370/devel Modified Files: perl-Log-Dispatch.spec Log Message: - Exclude mod_perl from the requirements list (overkill for most applications using Log::Dispatch). Index: perl-Log-Dispatch.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Log-Dispatch/devel/perl-Log-Dispatch.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-Log-Dispatch.spec 12 Sep 2005 18:49:17 -0000 1.2 +++ perl-Log-Dispatch.spec 22 Sep 2005 17:48:31 -0000 1.3 @@ -8,7 +8,7 @@ Name: perl-Log-Dispatch Version: 2.11 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Dispatches messages to one or more outputs Group: Development/Libraries @@ -46,6 +46,15 @@ %patch1 -p1 %endif +# Requirements list: exclude mod_perl +cat <<__EOF__ > %{name}-perlreq +#!/bin/sh +/usr/lib/rpm/perl.req \$* | grep -v 'perl(Apache' +__EOF__ +%define __perl_requires %{_builddir}/Log-Dispatch-%{version}/%{name}-perlreq +chmod +x %{__perl_requires} + + %build %{__perl} Build.PL installdirs=vendor @@ -74,6 +83,10 @@ %changelog +* Thu Sep 22 2005 Jose Pedro Oliveira - 2.11-3 +- Exclude mod_perl from the requirements list + (overkill for most applications using Log::Dispatch). + * Mon Sep 12 2005 Jose Pedro Oliveira - 2.11-2 - Better mod_perl handling. From fedora-extras-commits at redhat.com Thu Sep 22 17:48:27 2005 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Thu, 22 Sep 2005 13:48:27 -0400 Subject: rpms/perl-Log-Dispatch/FC-3 perl-Log-Dispatch.spec,1.3,1.4 Message-ID: <200509221748.j8MHmvoo021428@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Log-Dispatch/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21370/FC-3 Modified Files: perl-Log-Dispatch.spec Log Message: - Exclude mod_perl from the requirements list (overkill for most applications using Log::Dispatch). Index: perl-Log-Dispatch.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Log-Dispatch/FC-3/perl-Log-Dispatch.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- perl-Log-Dispatch.spec 12 Sep 2005 18:58:23 -0000 1.3 +++ perl-Log-Dispatch.spec 22 Sep 2005 17:48:25 -0000 1.4 @@ -8,7 +8,7 @@ Name: perl-Log-Dispatch Version: 2.11 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Dispatches messages to one or more outputs Group: Development/Libraries @@ -46,6 +46,15 @@ %patch1 -p1 %endif +# Requirements list: exclude mod_perl +cat <<__EOF__ > %{name}-perlreq +#!/bin/sh +/usr/lib/rpm/perl.req \$* | grep -v 'perl(Apache' +__EOF__ +%define __perl_requires %{_builddir}/Log-Dispatch-%{version}/%{name}-perlreq +chmod +x %{__perl_requires} + + %build %{__perl} Build.PL installdirs=vendor @@ -74,6 +83,10 @@ %changelog +* Thu Sep 22 2005 Jose Pedro Oliveira - 2.11-3 +- Exclude mod_perl from the requirements list + (overkill for most applications using Log::Dispatch). + * Mon Sep 12 2005 Jose Pedro Oliveira - 2.11-2 - Better mod_perl handling. From fedora-extras-commits at redhat.com Thu Sep 22 17:48:27 2005 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Thu, 22 Sep 2005 13:48:27 -0400 Subject: rpms/perl-Log-Dispatch/FC-4 perl-Log-Dispatch.spec,1.2,1.3 Message-ID: <200509221748.j8MHmwmp021431@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Log-Dispatch/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21370/FC-4 Modified Files: perl-Log-Dispatch.spec Log Message: - Exclude mod_perl from the requirements list (overkill for most applications using Log::Dispatch). Index: perl-Log-Dispatch.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Log-Dispatch/FC-4/perl-Log-Dispatch.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-Log-Dispatch.spec 12 Sep 2005 18:58:23 -0000 1.2 +++ perl-Log-Dispatch.spec 22 Sep 2005 17:48:25 -0000 1.3 @@ -8,7 +8,7 @@ Name: perl-Log-Dispatch Version: 2.11 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Dispatches messages to one or more outputs Group: Development/Libraries @@ -46,6 +46,15 @@ %patch1 -p1 %endif +# Requirements list: exclude mod_perl +cat <<__EOF__ > %{name}-perlreq +#!/bin/sh +/usr/lib/rpm/perl.req \$* | grep -v 'perl(Apache' +__EOF__ +%define __perl_requires %{_builddir}/Log-Dispatch-%{version}/%{name}-perlreq +chmod +x %{__perl_requires} + + %build %{__perl} Build.PL installdirs=vendor @@ -74,6 +83,10 @@ %changelog +* Thu Sep 22 2005 Jose Pedro Oliveira - 2.11-3 +- Exclude mod_perl from the requirements list + (overkill for most applications using Log::Dispatch). + * Mon Sep 12 2005 Jose Pedro Oliveira - 2.11-2 - Better mod_perl handling. From fedora-extras-commits at redhat.com Thu Sep 22 17:50:16 2005 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Thu, 22 Sep 2005 13:50:16 -0400 Subject: rpms/gdl/devel gdl.spec,1.3,1.4 Message-ID: <200509221750.j8MHoGRg021495@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/gdl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21475 Modified Files: gdl.spec Log Message: Really pass the hdfconfig arg to configure Index: gdl.spec =================================================================== RCS file: /cvs/extras/rpms/gdl/devel/gdl.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- gdl.spec 22 Sep 2005 17:36:40 -0000 1.3 +++ gdl.spec 22 Sep 2005 17:50:14 -0000 1.4 @@ -38,7 +38,7 @@ %build -%configure --disable-static \ +%configure --disable-static %{hdfconfig} \ INCLUDES="-I/usr/include/netcdf-3 %{hdfinclude}" \ LIBS="-L%{_libdir}/netcdf-3 %{hdflib} -L/usr/X11R6/%{_lib}" make %{?_smp_mflags} From fedora-extras-commits at redhat.com Thu Sep 22 18:14:49 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 22 Sep 2005 14:14:49 -0400 Subject: rpms/pychart - New directory Message-ID: <200509221814.j8MIEnMw023279@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/pychart In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23257/pychart Log Message: Directory /cvs/extras/rpms/pychart added to the repository From fedora-extras-commits at redhat.com Thu Sep 22 18:14:49 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 22 Sep 2005 14:14:49 -0400 Subject: rpms/pychart/devel - New directory Message-ID: <200509221814.j8MIEnQk023285@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/pychart/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23257/pychart/devel Log Message: Directory /cvs/extras/rpms/pychart/devel added to the repository From fedora-extras-commits at redhat.com Thu Sep 22 18:15:07 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 22 Sep 2005 14:15:07 -0400 Subject: rpms/pychart Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200509221815.j8MIF7Cd023336@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/pychart In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23307 Added Files: Makefile import.log Log Message: Setup of module pychart --- NEW FILE Makefile --- # Top level Makefile for module pychart all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Thu Sep 22 18:15:07 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 22 Sep 2005 14:15:07 -0400 Subject: rpms/pychart/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200509221815.j8MIF7ax023341@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/pychart/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23307/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module pychart --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Thu Sep 22 18:15:43 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 22 Sep 2005 14:15:43 -0400 Subject: rpms/pychart import.log,1.1,1.2 Message-ID: <200509221816.j8MIGDUU023427@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/pychart In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23382 Modified Files: import.log Log Message: auto-import pychart-1.38-2 on branch devel from pychart-1.38-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/pychart/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 22 Sep 2005 18:15:05 -0000 1.1 +++ import.log 22 Sep 2005 18:15:40 -0000 1.2 @@ -0,0 +1 @@ +pychart-1_38-2:HEAD:pychart-1.38-2.src.rpm:1127412920 From fedora-extras-commits at redhat.com Thu Sep 22 18:15:43 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 22 Sep 2005 14:15:43 -0400 Subject: rpms/pychart/devel pychart.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200509221816.j8MIGD7o023432@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/pychart/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23382/devel Modified Files: .cvsignore sources Added Files: pychart.spec Log Message: auto-import pychart-1.38-2 on branch devel from pychart-1.38-2.src.rpm --- NEW FILE pychart.spec --- %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: pychart Version: 1.38 Release: 2%{?dist} License: GPL Group: System Environment/Libraries Summary: Python library for generating chart images URL: http://home.gna.org/pychart/ Source0: http://download.gna.org/pychart/PyChart-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ghostscript-devel BuildArch: noarch %description PyChart is a Python library for creating high quality Encapsulated Postscript, PDF, PNG, or SVG charts. It currently supports line plots, bar plots, range-fill plots, and pie charts. Because it is based on Python, you can make full use of Python's scripting power. %package doc Summary: Documentation for using pychart in python programs Group: Documentation Requires: %{name} = %{version}-%{release} %description doc PyChart is a Python library for creating high quality Encapsulated Postscript, PDF, PNG, or SVG charts. It currently supports line plots, bar plots, range-fill plots, and pie charts. Because it is based on Python, you can make full use of Python's scripting power. Install this package if you want the developers' documentation and examples that tell you how to program with the pychart library. %prep %setup -q -n PyChart-%{version} %build %{__python} setup.py build cd doc/ make %install rm -rf $RPM_BUILD_ROOT %{__python} setup.py install --skip-build --root=$RPM_BUILD_ROOT %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc COPYING %{python_sitelib}/pychart/ %files doc %defattr(-,root,root,-) %doc doc/examples doc/pychart %changelog * Mon Sep 19 2005 Toshio Kuratomi 1.38-2 - Create a doc subpackage with the developers documentation * Sat Sep 17 2005 Tom "spot" Callaway 1.38-1 - initial package for Fedora Extras Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/pychart/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 22 Sep 2005 18:15:05 -0000 1.1 +++ .cvsignore 22 Sep 2005 18:15:41 -0000 1.2 @@ -0,0 +1 @@ +PyChart-1.38.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/pychart/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 22 Sep 2005 18:15:05 -0000 1.1 +++ sources 22 Sep 2005 18:15:41 -0000 1.2 @@ -0,0 +1 @@ +30b41cb4e0cd4957a8e54b0a58ee48a2 PyChart-1.38.tar.gz From fedora-extras-commits at redhat.com Thu Sep 22 18:19:12 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 22 Sep 2005 14:19:12 -0400 Subject: owners owners.list,1.241,1.242 Message-ID: <200509221819.j8MIJCTL023681@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23662 Modified Files: owners.list Log Message: pychart Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.241 retrieving revision 1.242 diff -u -r1.241 -r1.242 --- owners.list 22 Sep 2005 17:34:16 -0000 1.241 +++ owners.list 22 Sep 2005 18:19:10 -0000 1.242 @@ -820,6 +820,7 @@ Fedora Extras|pure-ftpd|Lightweight, fast and secure FTP server|gauret at free.fr|extras-qa at fedoraproject.org| Fedora Extras|putty|Putty - a SSH, Telnet & Rlogin client|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| Fedora Extras|pybliographer|A framework for working with bibliographic databases|z.kota at gmx.net|extras-qa at fedoraproject.org| +Fedora Extras|pychart|Python library for generating chart images|tcallawa at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|pylint|Analyzes Python code looking for bugs and signs of poor quality|icon at linux.duke.edu|extras-qa at fedoraproject.org| Fedora Extras|pyparsing|An object-oriented approach to text processing|ivazquez at ivazquez.net|extras-qa at fedoraproject.org| Fedora Extras|PyRTF|Rich Text Format (RTF) Document Generation in Python|mpeters at mac.com|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Thu Sep 22 18:28:55 2005 From: fedora-extras-commits at redhat.com (José Abílio Oliveira Matos (jamatos)) Date: Thu, 22 Sep 2005 14:28:55 -0400 Subject: owners owners.list,1.242,1.243 Message-ID: <200509221828.j8MIStKh023847@cvs-int.fedora.redhat.com> Author: jamatos Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23828 Modified Files: owners.list Log Message: fix ownership of pygsl Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.242 retrieving revision 1.243 diff -u -r1.242 -r1.243 --- owners.list 22 Sep 2005 18:19:10 -0000 1.242 +++ owners.list 22 Sep 2005 18:28:53 -0000 1.243 @@ -854,7 +854,7 @@ Fedora Extras|python-sqlite|Python bindings for SQLite|thomas at apestaart.org|extras-qa at fedoraproject.org| Fedora Extras|python-tpg|Toy Parser Generator|shahms at shahms.com|extras-qa at fedoraproject.org| Fedora Extras|python-twisted|Event-driven networking framework written in Python|thomas at apestaart.org|extras-qa at fedoraproject.org| -Fedora Extras|pygsl|GNU Scientific Library Interface for python|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| +Fedora Extras|pygsl|GNU Scientific Library Interface for python|jamatos at fc.up.pt|extras-qa at fedoraproject.org| Fedora Extras|pytz|World Timezone Definitions for Python|orion at cora.nwra.com|extras-qa at fedoraproject.org| Fedora Extras|pyxdg|PyXDG is a python library to access freedesktop.org standards|jpmahowald at gmail.com|extras-qa at fedoraproject.org|foolish at guezz.net Fedora Extras|pyzor|Pyzor collaborative spam filtering system|wtogami at redhat.com|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Thu Sep 22 18:45:46 2005 From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj)) Date: Thu, 22 Sep 2005 14:45:46 -0400 Subject: rpms/mercurial/devel mercurial.spec,1.4,1.5 Message-ID: <200509221845.j8MIjk3I023910@cvs-int.fedora.redhat.com> Author: katzj Update of /cvs/extras/rpms/mercurial/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23891 Modified Files: mercurial.spec Log Message: * Thu Sep 22 2005 Jeremy Katz - add contributors to %doc Index: mercurial.spec =================================================================== RCS file: /cvs/extras/rpms/mercurial/devel/mercurial.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- mercurial.spec 20 Sep 2005 21:07:51 -0000 1.4 +++ mercurial.spec 22 Sep 2005 18:45:44 -0000 1.5 @@ -30,10 +30,13 @@ %files -f %{name}.files %defattr(-,root,root,-) -%doc README doc/hg.1.txt doc/hgmerge.1.txt doc/hgrc.5.txt +%doc CONTRIBUTORS README doc/hg.1.txt doc/hgmerge.1.txt doc/hgrc.5.txt %changelog +* Thu Sep 22 2005 Jeremy Katz +- add contributors to %%doc + * Tue Sep 20 2005 Jeremy Katz - 0.7 - update to 0.7 From fedora-extras-commits at redhat.com Thu Sep 22 18:46:22 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 22 Sep 2005 14:46:22 -0400 Subject: rpms/rekall/devel .cvsignore, 1.2, 1.3 rekall-2.2.3-64bitfix.patch, 1.1, 1.2 rekall.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200509221846.j8MIkMi2023988@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/rekall/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23916/devel Modified Files: .cvsignore rekall-2.2.3-64bitfix.patch rekall.spec sources Log Message: fix 64bit long issue, go to new version of rekall Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/rekall/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 19 Sep 2005 15:49:51 -0000 1.2 +++ .cvsignore 22 Sep 2005 18:46:20 -0000 1.3 @@ -1 +1,2 @@ rekall-2.2.3-2.tar.gz +rekall-2.2.4-2.tar.gz rekall-2.2.3-64bitfix.patch: Index: rekall-2.2.3-64bitfix.patch =================================================================== RCS file: /cvs/extras/rpms/rekall/devel/rekall-2.2.3-64bitfix.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- rekall-2.2.3-64bitfix.patch 19 Sep 2005 15:49:51 -0000 1.1 +++ rekall-2.2.3-64bitfix.patch 22 Sep 2005 18:46:20 -0000 1.2 @@ -27,3 +27,14 @@ mysql_libdir=NO for i in $mysql_libdirs; +--- rekall-2.2.3/libs/el32/hash.cpp.BAD 2005-09-22 13:34:45.000000000 -0500 ++++ rekall-2.2.3/libs/el32/hash.cpp 2005-09-22 13:34:53.000000000 -0500 +@@ -141,7 +141,7 @@ + /* otherwise use just the tag (pretty useless */ + /* but so what, not a common case). */ + if ((key.tag->flags & TF_SHARED) == 0) +- hval = (int)key.val.shared ; ++ hval = (long)key.val.shared ; + else hval = key.tag->tag ; + break ; + } Index: rekall.spec =================================================================== RCS file: /cvs/extras/rpms/rekall/devel/rekall.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- rekall.spec 19 Sep 2005 15:49:51 -0000 1.1 +++ rekall.spec 22 Sep 2005 18:46:20 -0000 1.2 @@ -1,7 +1,7 @@ Name: rekall Summary: A KDE database front-end application -Version: 2.2.3 -Release: 5%{?dist} +Version: 2.2.4 +Release: 1%{?dist} Group: Development/Tools License: GPL URL: http://www.rekallrevealed.org/ @@ -336,6 +336,10 @@ %{_libdir}/librekallrt.la %changelog +* Thu Sep 22 2005 Tom "spot" Callaway 2.2.4-1 +- go to 2.2.4 +- fix 64 bit long issue + * Mon Sep 19 2005 Tom "spot" Callaway 2.2.3-5 - get rid of unnecessary BR: xbase-devel and qt-devel Index: sources =================================================================== RCS file: /cvs/extras/rpms/rekall/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 19 Sep 2005 15:49:51 -0000 1.2 +++ sources 22 Sep 2005 18:46:20 -0000 1.3 @@ -1 +1 @@ -0c27445eb9d58877067d60c94ef0dca9 rekall-2.2.3-2.tar.gz +437b45a98884cd9e192ff8c0a5a7e286 rekall-2.2.4-2.tar.gz From fedora-extras-commits at redhat.com Thu Sep 22 18:46:17 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 22 Sep 2005 14:46:17 -0400 Subject: rpms/rekall/FC-4 rekall-2.2.3-64bitfix.patch, 1.1, 1.2 rekall.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200509221846.j8MIkluO023998@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/rekall/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23916/FC-4 Modified Files: rekall-2.2.3-64bitfix.patch rekall.spec sources Log Message: fix 64bit long issue, go to new version of rekall rekall-2.2.3-64bitfix.patch: Index: rekall-2.2.3-64bitfix.patch =================================================================== RCS file: /cvs/extras/rpms/rekall/FC-4/rekall-2.2.3-64bitfix.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- rekall-2.2.3-64bitfix.patch 19 Sep 2005 15:49:51 -0000 1.1 +++ rekall-2.2.3-64bitfix.patch 22 Sep 2005 18:46:15 -0000 1.2 @@ -27,3 +27,14 @@ mysql_libdir=NO for i in $mysql_libdirs; +--- rekall-2.2.3/libs/el32/hash.cpp.BAD 2005-09-22 13:34:45.000000000 -0500 ++++ rekall-2.2.3/libs/el32/hash.cpp 2005-09-22 13:34:53.000000000 -0500 +@@ -141,7 +141,7 @@ + /* otherwise use just the tag (pretty useless */ + /* but so what, not a common case). */ + if ((key.tag->flags & TF_SHARED) == 0) +- hval = (int)key.val.shared ; ++ hval = (long)key.val.shared ; + else hval = key.tag->tag ; + break ; + } Index: rekall.spec =================================================================== RCS file: /cvs/extras/rpms/rekall/FC-4/rekall.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- rekall.spec 19 Sep 2005 15:49:51 -0000 1.1 +++ rekall.spec 22 Sep 2005 18:46:15 -0000 1.2 @@ -1,7 +1,7 @@ Name: rekall Summary: A KDE database front-end application -Version: 2.2.3 -Release: 5%{?dist} +Version: 2.2.4 +Release: 1%{?dist} Group: Development/Tools License: GPL URL: http://www.rekallrevealed.org/ @@ -336,6 +336,10 @@ %{_libdir}/librekallrt.la %changelog +* Thu Sep 22 2005 Tom "spot" Callaway 2.2.4-1 +- go to 2.2.4 +- fix 64 bit long issue + * Mon Sep 19 2005 Tom "spot" Callaway 2.2.3-5 - get rid of unnecessary BR: xbase-devel and qt-devel Index: sources =================================================================== RCS file: /cvs/extras/rpms/rekall/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 19 Sep 2005 15:49:51 -0000 1.2 +++ sources 22 Sep 2005 18:46:15 -0000 1.3 @@ -1 +1 @@ -0c27445eb9d58877067d60c94ef0dca9 rekall-2.2.3-2.tar.gz +437b45a98884cd9e192ff8c0a5a7e286 rekall-2.2.4-2.tar.gz From fedora-extras-commits at redhat.com Thu Sep 22 18:46:16 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 22 Sep 2005 14:46:16 -0400 Subject: rpms/rekall/FC-3 rekall-2.2.3-64bitfix.patch, 1.1, 1.2 rekall.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200509221846.j8MIklwr023993@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/rekall/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23916/FC-3 Modified Files: rekall-2.2.3-64bitfix.patch rekall.spec sources Log Message: fix 64bit long issue, go to new version of rekall rekall-2.2.3-64bitfix.patch: Index: rekall-2.2.3-64bitfix.patch =================================================================== RCS file: /cvs/extras/rpms/rekall/FC-3/rekall-2.2.3-64bitfix.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- rekall-2.2.3-64bitfix.patch 19 Sep 2005 15:49:51 -0000 1.1 +++ rekall-2.2.3-64bitfix.patch 22 Sep 2005 18:46:14 -0000 1.2 @@ -27,3 +27,14 @@ mysql_libdir=NO for i in $mysql_libdirs; +--- rekall-2.2.3/libs/el32/hash.cpp.BAD 2005-09-22 13:34:45.000000000 -0500 ++++ rekall-2.2.3/libs/el32/hash.cpp 2005-09-22 13:34:53.000000000 -0500 +@@ -141,7 +141,7 @@ + /* otherwise use just the tag (pretty useless */ + /* but so what, not a common case). */ + if ((key.tag->flags & TF_SHARED) == 0) +- hval = (int)key.val.shared ; ++ hval = (long)key.val.shared ; + else hval = key.tag->tag ; + break ; + } Index: rekall.spec =================================================================== RCS file: /cvs/extras/rpms/rekall/FC-3/rekall.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- rekall.spec 19 Sep 2005 15:49:51 -0000 1.1 +++ rekall.spec 22 Sep 2005 18:46:14 -0000 1.2 @@ -1,7 +1,7 @@ Name: rekall Summary: A KDE database front-end application -Version: 2.2.3 -Release: 5%{?dist} +Version: 2.2.4 +Release: 1%{?dist} Group: Development/Tools License: GPL URL: http://www.rekallrevealed.org/ @@ -336,6 +336,10 @@ %{_libdir}/librekallrt.la %changelog +* Thu Sep 22 2005 Tom "spot" Callaway 2.2.4-1 +- go to 2.2.4 +- fix 64 bit long issue + * Mon Sep 19 2005 Tom "spot" Callaway 2.2.3-5 - get rid of unnecessary BR: xbase-devel and qt-devel Index: sources =================================================================== RCS file: /cvs/extras/rpms/rekall/FC-3/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 19 Sep 2005 15:49:51 -0000 1.2 +++ sources 22 Sep 2005 18:46:14 -0000 1.3 @@ -1 +1 @@ -0c27445eb9d58877067d60c94ef0dca9 rekall-2.2.3-2.tar.gz +437b45a98884cd9e192ff8c0a5a7e286 rekall-2.2.4-2.tar.gz From fedora-extras-commits at redhat.com Thu Sep 22 19:32:01 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 22 Sep 2005 15:32:01 -0400 Subject: rpms/rekall/devel rekall-2.2.3-64bitfix.patch, 1.2, 1.3 rekall.spec, 1.2, 1.3 Message-ID: <200509221932.j8MJW1W5025655@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/rekall/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25589/devel Modified Files: rekall-2.2.3-64bitfix.patch rekall.spec Log Message: more 64 bit precision issues rekall-2.2.3-64bitfix.patch: Index: rekall-2.2.3-64bitfix.patch =================================================================== RCS file: /cvs/extras/rpms/rekall/devel/rekall-2.2.3-64bitfix.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- rekall-2.2.3-64bitfix.patch 22 Sep 2005 18:46:20 -0000 1.2 +++ rekall-2.2.3-64bitfix.patch 22 Sep 2005 19:31:59 -0000 1.3 @@ -38,3 +38,32 @@ else hval = key.tag->tag ; break ; } +--- rekall-2.2.4/libs/kbase/kb_parse.cpp.BAD 2005-09-22 14:29:36.000000000 -0500 ++++ rekall-2.2.4/libs/kbase/kb_parse.cpp 2005-09-22 14:29:52.000000000 -0500 +@@ -971,7 +971,7 @@ + receiver, + SLOT (newNode(int)), + 0, +- (int)nsItem ++ (long)nsItem + ) ; + + sep = true ; +@@ -1025,7 +1025,7 @@ + receiver, + SLOT (newNode(int)), + 0, +- (int)nsItem ++ (long)nsItem + ) ; + } + +@@ -1043,7 +1043,7 @@ + receiver, + SLOT (newNode(int)), + 0, +- (int)exItem ++ (long)exItem + ) ; + ) + Index: rekall.spec =================================================================== RCS file: /cvs/extras/rpms/rekall/devel/rekall.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- rekall.spec 22 Sep 2005 18:46:20 -0000 1.2 +++ rekall.spec 22 Sep 2005 19:31:59 -0000 1.3 @@ -1,7 +1,7 @@ Name: rekall Summary: A KDE database front-end application Version: 2.2.4 -Release: 1%{?dist} +Release: 2%{?dist} Group: Development/Tools License: GPL URL: http://www.rekallrevealed.org/ @@ -336,6 +336,9 @@ %{_libdir}/librekallrt.la %changelog +* Thu Sep 22 2005 Tom "spot" Callaway 2.2.4-2 +- another 64 bit long issue + * Thu Sep 22 2005 Tom "spot" Callaway 2.2.4-1 - go to 2.2.4 - fix 64 bit long issue From fedora-extras-commits at redhat.com Thu Sep 22 19:31:55 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 22 Sep 2005 15:31:55 -0400 Subject: rpms/rekall/FC-3 rekall-2.2.3-64bitfix.patch, 1.2, 1.3 rekall.spec, 1.2, 1.3 Message-ID: <200509221932.j8MJWQx1025661@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/rekall/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25589/FC-3 Modified Files: rekall-2.2.3-64bitfix.patch rekall.spec Log Message: more 64 bit precision issues rekall-2.2.3-64bitfix.patch: Index: rekall-2.2.3-64bitfix.patch =================================================================== RCS file: /cvs/extras/rpms/rekall/FC-3/rekall-2.2.3-64bitfix.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- rekall-2.2.3-64bitfix.patch 22 Sep 2005 18:46:14 -0000 1.2 +++ rekall-2.2.3-64bitfix.patch 22 Sep 2005 19:31:53 -0000 1.3 @@ -38,3 +38,32 @@ else hval = key.tag->tag ; break ; } +--- rekall-2.2.4/libs/kbase/kb_parse.cpp.BAD 2005-09-22 14:29:36.000000000 -0500 ++++ rekall-2.2.4/libs/kbase/kb_parse.cpp 2005-09-22 14:29:52.000000000 -0500 +@@ -971,7 +971,7 @@ + receiver, + SLOT (newNode(int)), + 0, +- (int)nsItem ++ (long)nsItem + ) ; + + sep = true ; +@@ -1025,7 +1025,7 @@ + receiver, + SLOT (newNode(int)), + 0, +- (int)nsItem ++ (long)nsItem + ) ; + } + +@@ -1043,7 +1043,7 @@ + receiver, + SLOT (newNode(int)), + 0, +- (int)exItem ++ (long)exItem + ) ; + ) + Index: rekall.spec =================================================================== RCS file: /cvs/extras/rpms/rekall/FC-3/rekall.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- rekall.spec 22 Sep 2005 18:46:14 -0000 1.2 +++ rekall.spec 22 Sep 2005 19:31:53 -0000 1.3 @@ -1,7 +1,7 @@ Name: rekall Summary: A KDE database front-end application Version: 2.2.4 -Release: 1%{?dist} +Release: 2%{?dist} Group: Development/Tools License: GPL URL: http://www.rekallrevealed.org/ @@ -336,6 +336,9 @@ %{_libdir}/librekallrt.la %changelog +* Thu Sep 22 2005 Tom "spot" Callaway 2.2.4-2 +- another 64 bit long issue + * Thu Sep 22 2005 Tom "spot" Callaway 2.2.4-1 - go to 2.2.4 - fix 64 bit long issue From fedora-extras-commits at redhat.com Thu Sep 22 19:31:56 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 22 Sep 2005 15:31:56 -0400 Subject: rpms/rekall/FC-4 rekall-2.2.3-64bitfix.patch, 1.2, 1.3 rekall.spec, 1.2, 1.3 Message-ID: <200509221932.j8MJWQZV025665@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/rekall/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25589/FC-4 Modified Files: rekall-2.2.3-64bitfix.patch rekall.spec Log Message: more 64 bit precision issues rekall-2.2.3-64bitfix.patch: Index: rekall-2.2.3-64bitfix.patch =================================================================== RCS file: /cvs/extras/rpms/rekall/FC-4/rekall-2.2.3-64bitfix.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- rekall-2.2.3-64bitfix.patch 22 Sep 2005 18:46:15 -0000 1.2 +++ rekall-2.2.3-64bitfix.patch 22 Sep 2005 19:31:54 -0000 1.3 @@ -38,3 +38,32 @@ else hval = key.tag->tag ; break ; } +--- rekall-2.2.4/libs/kbase/kb_parse.cpp.BAD 2005-09-22 14:29:36.000000000 -0500 ++++ rekall-2.2.4/libs/kbase/kb_parse.cpp 2005-09-22 14:29:52.000000000 -0500 +@@ -971,7 +971,7 @@ + receiver, + SLOT (newNode(int)), + 0, +- (int)nsItem ++ (long)nsItem + ) ; + + sep = true ; +@@ -1025,7 +1025,7 @@ + receiver, + SLOT (newNode(int)), + 0, +- (int)nsItem ++ (long)nsItem + ) ; + } + +@@ -1043,7 +1043,7 @@ + receiver, + SLOT (newNode(int)), + 0, +- (int)exItem ++ (long)exItem + ) ; + ) + Index: rekall.spec =================================================================== RCS file: /cvs/extras/rpms/rekall/FC-4/rekall.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- rekall.spec 22 Sep 2005 18:46:15 -0000 1.2 +++ rekall.spec 22 Sep 2005 19:31:54 -0000 1.3 @@ -1,7 +1,7 @@ Name: rekall Summary: A KDE database front-end application Version: 2.2.4 -Release: 1%{?dist} +Release: 2%{?dist} Group: Development/Tools License: GPL URL: http://www.rekallrevealed.org/ @@ -336,6 +336,9 @@ %{_libdir}/librekallrt.la %changelog +* Thu Sep 22 2005 Tom "spot" Callaway 2.2.4-2 +- another 64 bit long issue + * Thu Sep 22 2005 Tom "spot" Callaway 2.2.4-1 - go to 2.2.4 - fix 64 bit long issue From fedora-extras-commits at redhat.com Thu Sep 22 19:33:16 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 22 Sep 2005 15:33:16 -0400 Subject: rpms/maxima/FC-4 maxima.spec,1.6,1.7 Message-ID: <200509221933.j8MJXG0N025703@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/maxima/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25684 Modified Files: maxima.spec Log Message: * Thu Sep 22 2005 Rex Dieter 5.9.1.9rc1-3 - runtime-clisp: workaround "cpio: MD5 sum mismatch" error - --with-gcl - make %_libdir/maxima owned by runtime pkgs Index: maxima.spec =================================================================== RCS file: /cvs/extras/rpms/maxima/FC-4/maxima.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- maxima.spec 22 Sep 2005 12:37:22 -0000 1.6 +++ maxima.spec 22 Sep 2005 19:33:14 -0000 1.7 @@ -2,7 +2,7 @@ ## Which runtimes to build/enable? %define _with_clisp 1 %define _without_cmucl 1 -%define _without_gcl 1 +%define _with_gcl 1 %define _with_sbcl 1 %define beta rc1 @@ -11,7 +11,7 @@ Name: maxima Version: 5.9.1.9rc1 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL Group: Applications/Engineering URL: http://maxima.sourceforge.net/ @@ -37,7 +37,7 @@ # Inhibit automatic compressing of info files. Compressed info # files break maxima's internal help. %define __spec_install_post %{nil} -# debuginfo is empty/blank (when using gcl?), disable +# debuginfo.list ends up empty/blank anyway. disable %define debug_package %{nil} BuildRequires: texinfo @@ -77,6 +77,8 @@ %{name} lisp source code. %if "%{?_with_clisp:1}" == "1" +# to workaround mysterious(?) "cpio: MD5 sum mismatch" errors on this subpkg +%define __prelink_undo_cmd %{nil} %package runtime-clisp Summary: Maxima compiled with clisp Group: Applications/Engineering @@ -261,8 +263,6 @@ %{_datadir}/maxima/%{version}/[a-c,f-r,t-w,y-z,A-Z]* %{_datadir}/maxima/%{version}/demo/ %{_datadir}/maxima/%{version}/share/ -%dir %{_libdir}/maxima -%dir %{_libdir}/maxima/%{version} %{_libexecdir}/maxima %{_infodir}/*.info* %{_mandir}/man1/maxima.* @@ -286,29 +286,42 @@ %if "%{?_with_clisp:1}" == "1" %files runtime-clisp %defattr(-,root,root) +%dir %{_libdir}/maxima/ +%dir %{_libdir}/maxima/%{version}/ %{_libdir}/maxima/%{version}/binary-clisp %endif %if "%{?_with_cmucl:1}" == "1" %files runtime-cmucl %defattr(-,root,root) +%dir %{_libdir}/maxima/ +%dir %{_libdir}/maxima/%{version}/ %{_libdir}/maxima/%{version}/binary-cmucl %endif %if "%{?_with_gcl:1}" == "1" %files runtime-gcl %defattr(-,root,root) +%dir %{_libdir}/maxima/ +%dir %{_libdir}/maxima/%{version}/ %{_libdir}/maxima/%{version}/binary-gcl %endif %if "%{?_with_sbcl:1}" == "1" %files runtime-sbcl %defattr(-,root,root) +%dir %{_libdir}/maxima/ +%dir %{_libdir}/maxima/%{version}/ %{_libdir}/maxima/%{version}/binary-sbcl %endif %changelog +* Thu Sep 22 2005 Rex Dieter 5.9.1.9rc1-3 +- runtime-clisp: workaround "cpio: MD5 sum mismatch" error +- --with-gcl +- make %%_libdir/maxima owned by runtime pkgs + * Fri Sep 16 2005 Rex Dieter 5.9.1.9rc1-2 - -runtime-sbcl: with sbcl_ver macro - use versioned maxima-exec Obsoletes. From fedora-extras-commits at redhat.com Thu Sep 22 19:34:32 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 22 Sep 2005 15:34:32 -0400 Subject: rpms/maxima/FC-4 maxima.spec,1.7,1.8 Message-ID: <200509221934.j8MJYW8x025852@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/maxima/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25833 Modified Files: maxima.spec Log Message: move doc generation to end of %%build Index: maxima.spec =================================================================== RCS file: /cvs/extras/rpms/maxima/FC-4/maxima.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- maxima.spec 22 Sep 2005 19:33:14 -0000 1.7 +++ maxima.spec 22 Sep 2005 19:34:30 -0000 1.8 @@ -165,6 +165,8 @@ %{?_with_gcl: --enable-gcl }%{?_without_gcl: --disable-gcl } \ %{?_with_sbcl: --enable-sbcl }%{?_without_sbcl: --disable-sbcl } +make %{?_smp_mflags} + # docs pushd doc @@ -180,9 +182,6 @@ popd -# everything else -make %{?_smp_mflags} - %check || : make check From fedora-extras-commits at redhat.com Thu Sep 22 19:44:13 2005 From: fedora-extras-commits at redhat.com (Chris Wright (chrisw)) Date: Thu, 22 Sep 2005 15:44:13 -0400 Subject: rpms/git-core/devel .cvsignore, 1.4, 1.5 git-core.spec, 1.3, 1.4 sources, 1.4, 1.5 Message-ID: <200509221944.j8MJiDJU025989@cvs-int.fedora.redhat.com> Author: chrisw Update of /cvs/extras/rpms/git-core/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25966 Modified Files: .cvsignore git-core.spec sources Log Message: Update git-core to 0.99.7a (bugfix release) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/git-core/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 19 Sep 2005 22:23:57 -0000 1.4 +++ .cvsignore 22 Sep 2005 19:44:11 -0000 1.5 @@ -1 +1 @@ -git-core-0.99.7.tar.gz +git-core-0.99.7a.tar.gz Index: git-core.spec =================================================================== RCS file: /cvs/extras/rpms/git-core/devel/git-core.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- git-core.spec 19 Sep 2005 22:23:57 -0000 1.3 +++ git-core.spec 22 Sep 2005 19:44:11 -0000 1.4 @@ -1,6 +1,6 @@ # Pass --without docs to rpmbuild if you don't want the documetnation Name: git-core -Version: 0.99.7 +Version: 0.99.7a Release: 1%{?dist} Summary: Git core and tools License: GPL @@ -9,7 +9,7 @@ Source: http://kernel.org/pub/software/scm/git/%{name}-%{version}.tar.gz BuildRequires: zlib-devel, openssl-devel, curl-devel %{!?_without_docs:, xmlto, asciidoc > 6.0.3} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires: rsync, rcs, curl, less, openssh-clients, python >= 2.4, tk +Requires: rsync, rcs, curl, less, openssh-clients, python >= 2.3, tk %description This is a stupid (but extremely fast) directory content manager. It @@ -23,11 +23,13 @@ %setup -q %build -make COPTS="$RPM_OPT_FLAGS" prefix=%{_prefix} all %{!?_without_docs: doc} +make COPTS="$RPM_OPT_FLAGS" WITH_OWN_SUBPROCESS_PY=YesPlease \ + prefix=%{_prefix} all %{!?_without_docs: doc} %install rm -rf $RPM_BUILD_ROOT -make DESTDIR=$RPM_BUILD_ROOT prefix=%{_prefix} mandir=%{_mandir} \ +make DESTDIR=$RPM_BUILD_ROOT WITH_OWN_SUBPROCESS_PY=YesPlease \ + prefix=%{_prefix} mandir=%{_mandir} \ install %{!?_without_docs: install-doc} %clean Index: sources =================================================================== RCS file: /cvs/extras/rpms/git-core/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 19 Sep 2005 22:23:57 -0000 1.4 +++ sources 22 Sep 2005 19:44:11 -0000 1.5 @@ -1 +1 @@ -0035da109f1e0f9f4fdbd425f2f6723b git-core-0.99.7.tar.gz +9c1f316a34f00e1b595cc0063010a213 git-core-0.99.7a.tar.gz From fedora-extras-commits at redhat.com Thu Sep 22 19:46:02 2005 From: fedora-extras-commits at redhat.com (Chris Wright (chrisw)) Date: Thu, 22 Sep 2005 15:46:02 -0400 Subject: rpms/git-core/FC-4 .cvsignore, 1.4, 1.5 git-core.spec, 1.3, 1.4 sources, 1.4, 1.5 Message-ID: <200509221946.j8MJk2pv026074@cvs-int.fedora.redhat.com> Author: chrisw Update of /cvs/extras/rpms/git-core/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26051 Modified Files: .cvsignore git-core.spec sources Log Message: Update git-core to 0.99.7a (bugfix release) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/git-core/FC-4/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 19 Sep 2005 22:34:57 -0000 1.4 +++ .cvsignore 22 Sep 2005 19:46:00 -0000 1.5 @@ -1 +1 @@ -git-core-0.99.7.tar.gz +git-core-0.99.7a.tar.gz Index: git-core.spec =================================================================== RCS file: /cvs/extras/rpms/git-core/FC-4/git-core.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- git-core.spec 19 Sep 2005 22:34:57 -0000 1.3 +++ git-core.spec 22 Sep 2005 19:46:00 -0000 1.4 @@ -1,6 +1,6 @@ # Pass --without docs to rpmbuild if you don't want the documetnation Name: git-core -Version: 0.99.7 +Version: 0.99.7a Release: 1%{?dist} Summary: Git core and tools License: GPL @@ -9,7 +9,7 @@ Source: http://kernel.org/pub/software/scm/git/%{name}-%{version}.tar.gz BuildRequires: zlib-devel, openssl-devel, curl-devel %{!?_without_docs:, xmlto, asciidoc > 6.0.3} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires: rsync, rcs, curl, less, openssh-clients, python >= 2.4, tk +Requires: rsync, rcs, curl, less, openssh-clients, python >= 2.3, tk %description This is a stupid (but extremely fast) directory content manager. It @@ -23,11 +23,13 @@ %setup -q %build -make COPTS="$RPM_OPT_FLAGS" prefix=%{_prefix} all %{!?_without_docs: doc} +make COPTS="$RPM_OPT_FLAGS" WITH_OWN_SUBPROCESS_PY=YesPlease \ + prefix=%{_prefix} all %{!?_without_docs: doc} %install rm -rf $RPM_BUILD_ROOT -make DESTDIR=$RPM_BUILD_ROOT prefix=%{_prefix} mandir=%{_mandir} \ +make DESTDIR=$RPM_BUILD_ROOT WITH_OWN_SUBPROCESS_PY=YesPlease \ + prefix=%{_prefix} mandir=%{_mandir} \ install %{!?_without_docs: install-doc} %clean Index: sources =================================================================== RCS file: /cvs/extras/rpms/git-core/FC-4/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 19 Sep 2005 22:34:57 -0000 1.4 +++ sources 22 Sep 2005 19:46:00 -0000 1.5 @@ -1 +1 @@ -0035da109f1e0f9f4fdbd425f2f6723b git-core-0.99.7.tar.gz +9c1f316a34f00e1b595cc0063010a213 git-core-0.99.7a.tar.gz From fedora-extras-commits at redhat.com Thu Sep 22 19:47:54 2005 From: fedora-extras-commits at redhat.com (Chris Wright (chrisw)) Date: Thu, 22 Sep 2005 15:47:54 -0400 Subject: rpms/git-core/FC-3 .cvsignore, 1.4, 1.5 git-core.spec, 1.3, 1.4 sources, 1.4, 1.5 Message-ID: <200509221947.j8MJlshR026182@cvs-int.fedora.redhat.com> Author: chrisw Update of /cvs/extras/rpms/git-core/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26159 Modified Files: .cvsignore git-core.spec sources Log Message: Update git-core to 0.99.7a (bugfix release) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/git-core/FC-3/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 19 Sep 2005 22:32:09 -0000 1.4 +++ .cvsignore 22 Sep 2005 19:47:52 -0000 1.5 @@ -1 +1 @@ -git-core-0.99.7.tar.gz +git-core-0.99.7a.tar.gz Index: git-core.spec =================================================================== RCS file: /cvs/extras/rpms/git-core/FC-3/git-core.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- git-core.spec 19 Sep 2005 22:32:09 -0000 1.3 +++ git-core.spec 22 Sep 2005 19:47:52 -0000 1.4 @@ -1,6 +1,6 @@ # Pass --without docs to rpmbuild if you don't want the documetnation Name: git-core -Version: 0.99.7 +Version: 0.99.7a Release: 1%{?dist} Summary: Git core and tools License: GPL @@ -9,7 +9,7 @@ Source: http://kernel.org/pub/software/scm/git/%{name}-%{version}.tar.gz BuildRequires: zlib-devel, openssl-devel, curl-devel %{!?_without_docs:, xmlto, asciidoc > 6.0.3} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires: rsync, rcs, curl, less, openssh-clients, python >= 2.4, tk +Requires: rsync, rcs, curl, less, openssh-clients, python >= 2.3, tk %description This is a stupid (but extremely fast) directory content manager. It @@ -23,11 +23,13 @@ %setup -q %build -make COPTS="$RPM_OPT_FLAGS" prefix=%{_prefix} all %{!?_without_docs: doc} +make COPTS="$RPM_OPT_FLAGS" WITH_OWN_SUBPROCESS_PY=YesPlease \ + prefix=%{_prefix} all %{!?_without_docs: doc} %install rm -rf $RPM_BUILD_ROOT -make DESTDIR=$RPM_BUILD_ROOT prefix=%{_prefix} mandir=%{_mandir} \ +make DESTDIR=$RPM_BUILD_ROOT WITH_OWN_SUBPROCESS_PY=YesPlease \ + prefix=%{_prefix} mandir=%{_mandir} \ install %{!?_without_docs: install-doc} %clean Index: sources =================================================================== RCS file: /cvs/extras/rpms/git-core/FC-3/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 19 Sep 2005 22:32:09 -0000 1.4 +++ sources 22 Sep 2005 19:47:52 -0000 1.5 @@ -1 +1 @@ -0035da109f1e0f9f4fdbd425f2f6723b git-core-0.99.7.tar.gz +9c1f316a34f00e1b595cc0063010a213 git-core-0.99.7a.tar.gz From fedora-extras-commits at redhat.com Thu Sep 22 20:58:03 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 22 Sep 2005 16:58:03 -0400 Subject: rpms/rekall/FC-3 rekall-2.2.3-64bitfix.patch, 1.3, 1.4 rekall.spec, 1.3, 1.4 Message-ID: <200509222058.j8MKw3LP027874@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/rekall/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27820/FC-3 Modified Files: rekall-2.2.3-64bitfix.patch rekall.spec Log Message: yet another 64bit fix rekall-2.2.3-64bitfix.patch: Index: rekall-2.2.3-64bitfix.patch =================================================================== RCS file: /cvs/extras/rpms/rekall/FC-3/rekall-2.2.3-64bitfix.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- rekall-2.2.3-64bitfix.patch 22 Sep 2005 19:31:53 -0000 1.3 +++ rekall-2.2.3-64bitfix.patch 22 Sep 2005 20:58:01 -0000 1.4 @@ -67,3 +67,30 @@ ) ; ) +--- rekall-2.2.4/libs/kbase/kb_link.cpp.BAD 2005-09-22 15:53:11.000000000 -0500 ++++ rekall-2.2.4/libs/kbase/kb_link.cpp 2005-09-22 15:53:53.000000000 -0500 +@@ -849,21 +849,21 @@ + receiver, + SLOT(newNode(int)), + 0, +- (int)&nodeSpecTable ++ (long)&nodeSpecTable + ) ; + lp->insertItem + ( TR("Query link"), + receiver, + SLOT(newNode(int)), + 0, +- (int)&nodeSpecQuery ++ (long)&nodeSpecQuery + ) ; + lp->insertItem + ( TR("SQL link" ), + receiver, + SLOT(newNode(int)), + 0, +- (int)&nodeSpecSQL ++ (long)&nodeSpecSQL + ) ; + + popup->insertItem (TR("New &Link"), lp) ; Index: rekall.spec =================================================================== RCS file: /cvs/extras/rpms/rekall/FC-3/rekall.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- rekall.spec 22 Sep 2005 19:31:53 -0000 1.3 +++ rekall.spec 22 Sep 2005 20:58:01 -0000 1.4 @@ -1,7 +1,7 @@ Name: rekall Summary: A KDE database front-end application Version: 2.2.4 -Release: 2%{?dist} +Release: 3%{?dist} Group: Development/Tools License: GPL URL: http://www.rekallrevealed.org/ @@ -336,6 +336,9 @@ %{_libdir}/librekallrt.la %changelog +* Thu Sep 22 2005 Tom "spot" Callaway 2.2.4-3 +- yet another 64 bit long issue + * Thu Sep 22 2005 Tom "spot" Callaway 2.2.4-2 - another 64 bit long issue From fedora-extras-commits at redhat.com Thu Sep 22 20:58:04 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 22 Sep 2005 16:58:04 -0400 Subject: rpms/rekall/FC-4 rekall-2.2.3-64bitfix.patch, 1.3, 1.4 rekall.spec, 1.3, 1.4 Message-ID: <200509222058.j8MKw4sj027884@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/rekall/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27820/FC-4 Modified Files: rekall-2.2.3-64bitfix.patch rekall.spec Log Message: yet another 64bit fix rekall-2.2.3-64bitfix.patch: Index: rekall-2.2.3-64bitfix.patch =================================================================== RCS file: /cvs/extras/rpms/rekall/FC-4/rekall-2.2.3-64bitfix.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- rekall-2.2.3-64bitfix.patch 22 Sep 2005 19:31:54 -0000 1.3 +++ rekall-2.2.3-64bitfix.patch 22 Sep 2005 20:58:02 -0000 1.4 @@ -67,3 +67,30 @@ ) ; ) +--- rekall-2.2.4/libs/kbase/kb_link.cpp.BAD 2005-09-22 15:53:11.000000000 -0500 ++++ rekall-2.2.4/libs/kbase/kb_link.cpp 2005-09-22 15:53:53.000000000 -0500 +@@ -849,21 +849,21 @@ + receiver, + SLOT(newNode(int)), + 0, +- (int)&nodeSpecTable ++ (long)&nodeSpecTable + ) ; + lp->insertItem + ( TR("Query link"), + receiver, + SLOT(newNode(int)), + 0, +- (int)&nodeSpecQuery ++ (long)&nodeSpecQuery + ) ; + lp->insertItem + ( TR("SQL link" ), + receiver, + SLOT(newNode(int)), + 0, +- (int)&nodeSpecSQL ++ (long)&nodeSpecSQL + ) ; + + popup->insertItem (TR("New &Link"), lp) ; Index: rekall.spec =================================================================== RCS file: /cvs/extras/rpms/rekall/FC-4/rekall.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- rekall.spec 22 Sep 2005 19:31:54 -0000 1.3 +++ rekall.spec 22 Sep 2005 20:58:02 -0000 1.4 @@ -1,7 +1,7 @@ Name: rekall Summary: A KDE database front-end application Version: 2.2.4 -Release: 2%{?dist} +Release: 3%{?dist} Group: Development/Tools License: GPL URL: http://www.rekallrevealed.org/ @@ -336,6 +336,9 @@ %{_libdir}/librekallrt.la %changelog +* Thu Sep 22 2005 Tom "spot" Callaway 2.2.4-3 +- yet another 64 bit long issue + * Thu Sep 22 2005 Tom "spot" Callaway 2.2.4-2 - another 64 bit long issue From fedora-extras-commits at redhat.com Thu Sep 22 20:58:04 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 22 Sep 2005 16:58:04 -0400 Subject: rpms/rekall/devel rekall-2.2.3-64bitfix.patch, 1.3, 1.4 rekall.spec, 1.3, 1.4 Message-ID: <200509222058.j8MKw4e6027894@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/rekall/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27820/devel Modified Files: rekall-2.2.3-64bitfix.patch rekall.spec Log Message: yet another 64bit fix rekall-2.2.3-64bitfix.patch: Index: rekall-2.2.3-64bitfix.patch =================================================================== RCS file: /cvs/extras/rpms/rekall/devel/rekall-2.2.3-64bitfix.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- rekall-2.2.3-64bitfix.patch 22 Sep 2005 19:31:59 -0000 1.3 +++ rekall-2.2.3-64bitfix.patch 22 Sep 2005 20:58:02 -0000 1.4 @@ -67,3 +67,30 @@ ) ; ) +--- rekall-2.2.4/libs/kbase/kb_link.cpp.BAD 2005-09-22 15:53:11.000000000 -0500 ++++ rekall-2.2.4/libs/kbase/kb_link.cpp 2005-09-22 15:53:53.000000000 -0500 +@@ -849,21 +849,21 @@ + receiver, + SLOT(newNode(int)), + 0, +- (int)&nodeSpecTable ++ (long)&nodeSpecTable + ) ; + lp->insertItem + ( TR("Query link"), + receiver, + SLOT(newNode(int)), + 0, +- (int)&nodeSpecQuery ++ (long)&nodeSpecQuery + ) ; + lp->insertItem + ( TR("SQL link" ), + receiver, + SLOT(newNode(int)), + 0, +- (int)&nodeSpecSQL ++ (long)&nodeSpecSQL + ) ; + + popup->insertItem (TR("New &Link"), lp) ; Index: rekall.spec =================================================================== RCS file: /cvs/extras/rpms/rekall/devel/rekall.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- rekall.spec 22 Sep 2005 19:31:59 -0000 1.3 +++ rekall.spec 22 Sep 2005 20:58:02 -0000 1.4 @@ -1,7 +1,7 @@ Name: rekall Summary: A KDE database front-end application Version: 2.2.4 -Release: 2%{?dist} +Release: 3%{?dist} Group: Development/Tools License: GPL URL: http://www.rekallrevealed.org/ @@ -336,6 +336,9 @@ %{_libdir}/librekallrt.la %changelog +* Thu Sep 22 2005 Tom "spot" Callaway 2.2.4-3 +- yet another 64 bit long issue + * Thu Sep 22 2005 Tom "spot" Callaway 2.2.4-2 - another 64 bit long issue From fedora-extras-commits at redhat.com Thu Sep 22 21:17:15 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Thu, 22 Sep 2005 17:17:15 -0400 Subject: rpms/freedroidrpg/devel .cvsignore, 1.4, 1.5 freedroidrpg.spec, 1.10, 1.11 sources, 1.4, 1.5 freedroidrpg-lvalue.patch, 1.1, NONE Message-ID: <200509222117.j8MLHFsT029439@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/freedroidrpg/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29416 Modified Files: .cvsignore freedroidrpg.spec sources Removed Files: freedroidrpg-lvalue.patch Log Message: * Sat Sep 10 2005 Ville Skytt?? - 0.9.13-1 - 0.9.13. - Drop some outdated docs. * Thu Aug 4 2005 Ville Skytt?? - 0.9.13-0.2.rc3 - 0.9.13rc3, build with gcc4, lvalue cast fix applied upstream. - Move icon to %%{datadir}/icons/hicolor. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/freedroidrpg/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 31 Jul 2005 17:08:29 -0000 1.4 +++ .cvsignore 22 Sep 2005 21:17:13 -0000 1.5 @@ -1 +1 @@ -freedroidrpg-0.9.13-rc2.tar.bz2 +freedroidrpg-0.9.13.tar.bz2 Index: freedroidrpg.spec =================================================================== RCS file: /cvs/extras/rpms/freedroidrpg/devel/freedroidrpg.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- freedroidrpg.spec 31 Jul 2005 17:08:29 -0000 1.10 +++ freedroidrpg.spec 22 Sep 2005 21:17:13 -0000 1.11 @@ -1,14 +1,13 @@ Name: freedroidrpg Version: 0.9.13 -Release: 0.2.rc2 +Release: 1%{?dist} Summary: Role playing game with Freedroid theme and Tux as the hero Group: Amusements/Games License: GPL URL: http://freedroid.sourceforge.net/ -Source0: http://download.sf.net/freedroid/%{name}-%{version}-rc2.tar.bz2 +Source0: http://download.sf.net/freedroid/%{name}-%{version}.tar.bz2 Source1: %{name}.desktop -Patch0: %{name}-lvalue.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: SDL_image-devel @@ -20,7 +19,6 @@ BuildRequires: ImageMagick BuildRequires: libvorbis-devel BuildRequires: desktop-file-utils -BuildRequires: compat-gcc-32 %description The Freedroid RPG is an extension/modification of the classical @@ -28,13 +26,10 @@ %prep -%setup -q -n %{name}-%{version}-rc2 -%patch0 -p2 +%setup -q %build -export CC=gcc32 -%{expand: %%define optflags %(echo %optflags | sed -e s/mtune/mcpu/)} %configure --datadir=%{_datadir}/games --disable-dependency-tracking make %{?_smp_mflags} @@ -47,9 +42,9 @@ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ --add-category X-Fedora \ %{SOURCE1} -mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps -convert -resize 48x48 graphics/droids/001.png \ - $RPM_BUILD_ROOT%{_datadir}/pixmaps/freedroidrpg.png +mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps +convert -transparent "#077300" graphics/paraicon.bmp \ + $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/freedroidrpg.png # Fix permissions, remove extra junk. find $RPM_BUILD_ROOT%{_datadir}/games/freedroidrpg -name "*.sh" | xargs rm rm -r $RPM_BUILD_ROOT%{_datadir}/games/freedroidrpg/graphics/blender_sources @@ -60,17 +55,32 @@ rm -rf $RPM_BUILD_ROOT +%post +gtk-update-icon-cache -qf %{_datadir}/icons/hicolor >/dev/null 2>&1 || : + +%postun +gtk-update-icon-cache -qf %{_datadir}/icons/hicolor >/dev/null 2>&1 || : + + %files %defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING NEWS README TODO +%doc AUTHORS COPYING README TODO %{_bindir}/* -%{_datadir}/games/freedroidrpg +%{_datadir}/games/freedroidrpg/ %{_mandir}/man6/freedroidRPG.6* %{_datadir}/applications/*freedroidrpg.desktop -%{_datadir}/pixmaps/freedroidrpg.png +%{_datadir}/icons/hicolor/32x32/apps/freedroidrpg.png %changelog +* Sat Sep 10 2005 Ville Skytt?? - 0.9.13-1 +- 0.9.13. +- Drop some outdated docs. + +* Thu Aug 4 2005 Ville Skytt?? - 0.9.13-0.2.rc3 +- 0.9.13rc3, build with gcc4, lvalue cast fix applied upstream. +- Move icon to %%{datadir}/icons/hicolor. + * Sun Jul 31 2005 Ville Skytt?? - 0.9.13-0.2.rc2 - 0.9.13rc2. - Apply upstream lvalue cast fix. Index: sources =================================================================== RCS file: /cvs/extras/rpms/freedroidrpg/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 31 Jul 2005 17:08:29 -0000 1.4 +++ sources 22 Sep 2005 21:17:13 -0000 1.5 @@ -1 +1 @@ -eda34581d784cbd1db59ebc46208880e freedroidrpg-0.9.13-rc2.tar.bz2 +d57e366a69e8999f5f0e30e960f72d15 freedroidrpg-0.9.13.tar.bz2 --- freedroidrpg-lvalue.patch DELETED --- From fedora-extras-commits at redhat.com Thu Sep 22 22:43:58 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Thu, 22 Sep 2005 18:43:58 -0400 Subject: rpms/libetpan/devel .cvsignore, 1.2, 1.3 libetpan.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200509222243.j8MMhwU8031088@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/libetpan/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31026/devel Modified Files: .cvsignore libetpan.spec sources Log Message: - version upgrade Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libetpan/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 12 Aug 2005 22:43:46 -0000 1.2 +++ .cvsignore 22 Sep 2005 22:43:55 -0000 1.3 @@ -1 +1 @@ -libetpan-0.38.tar.gz +libetpan-0.39.1.tar.gz Index: libetpan.spec =================================================================== RCS file: /cvs/extras/rpms/libetpan/devel/libetpan.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- libetpan.spec 12 Aug 2005 22:51:46 -0000 1.2 +++ libetpan.spec 22 Sep 2005 22:43:55 -0000 1.3 @@ -1,6 +1,6 @@ Name: libetpan -Version: 0.38 -Release: 4%{?dist} +Version: 0.39.1 +Release: 1%{?dist} Summary: Portable, efficient middleware for different kinds of mail access Group: System Environment/Libraries @@ -31,7 +31,7 @@ with %{name}. %prep -%setup -q +%setup -q -n %{name}-0.39 %build %configure --disable-static --with-gnutls=no @@ -43,7 +43,7 @@ make install DESTDIR=$RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT%{_libdir}/libetpan.la -chmod 755 $RPM_BUILD_ROOT%{_libdir}/libetpan.so.3.0.0 +chmod 755 $RPM_BUILD_ROOT%{_libdir}/libetpan.so.3.1.0 %clean rm -rf $RPM_BUILD_ROOT @@ -65,6 +65,10 @@ %{_libdir}/*.so %changelog +* Fri Sep 23 2005 Andreas Bierfert +0.39.1-1 +- version upgrade + * Sat Aug 13 2005 Andreas Bierfert 0.38-4 - add dist tag Index: sources =================================================================== RCS file: /cvs/extras/rpms/libetpan/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 12 Aug 2005 22:43:46 -0000 1.2 +++ sources 22 Sep 2005 22:43:55 -0000 1.3 @@ -1 +1 @@ -4d31145dee857beca7e283aa03fe9450 libetpan-0.38.tar.gz +d737fa265944ef76dd1d0b0455c9ff97 libetpan-0.39.1.tar.gz From fedora-extras-commits at redhat.com Thu Sep 22 22:43:52 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Thu, 22 Sep 2005 18:43:52 -0400 Subject: rpms/libetpan/FC-3 .cvsignore, 1.2, 1.3 libetpan.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200509222244.j8MMiMmU031093@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/libetpan/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31026/FC-3 Modified Files: .cvsignore libetpan.spec sources Log Message: - version upgrade Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libetpan/FC-3/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 12 Aug 2005 22:43:46 -0000 1.2 +++ .cvsignore 22 Sep 2005 22:43:50 -0000 1.3 @@ -1 +1 @@ -libetpan-0.38.tar.gz +libetpan-0.39.1.tar.gz Index: libetpan.spec =================================================================== RCS file: /cvs/extras/rpms/libetpan/FC-3/libetpan.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- libetpan.spec 12 Aug 2005 22:51:46 -0000 1.2 +++ libetpan.spec 22 Sep 2005 22:43:50 -0000 1.3 @@ -1,6 +1,6 @@ Name: libetpan -Version: 0.38 -Release: 4%{?dist} +Version: 0.39.1 +Release: 1%{?dist} Summary: Portable, efficient middleware for different kinds of mail access Group: System Environment/Libraries @@ -31,7 +31,7 @@ with %{name}. %prep -%setup -q +%setup -q -n %{name}-0.39 %build %configure --disable-static --with-gnutls=no @@ -43,7 +43,7 @@ make install DESTDIR=$RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT%{_libdir}/libetpan.la -chmod 755 $RPM_BUILD_ROOT%{_libdir}/libetpan.so.3.0.0 +chmod 755 $RPM_BUILD_ROOT%{_libdir}/libetpan.so.3.1.0 %clean rm -rf $RPM_BUILD_ROOT @@ -65,6 +65,10 @@ %{_libdir}/*.so %changelog +* Fri Sep 23 2005 Andreas Bierfert +0.39.1-1 +- version upgrade + * Sat Aug 13 2005 Andreas Bierfert 0.38-4 - add dist tag Index: sources =================================================================== RCS file: /cvs/extras/rpms/libetpan/FC-3/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 12 Aug 2005 22:43:46 -0000 1.2 +++ sources 22 Sep 2005 22:43:50 -0000 1.3 @@ -1 +1 @@ -4d31145dee857beca7e283aa03fe9450 libetpan-0.38.tar.gz +d737fa265944ef76dd1d0b0455c9ff97 libetpan-0.39.1.tar.gz From fedora-extras-commits at redhat.com Thu Sep 22 22:43:52 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Thu, 22 Sep 2005 18:43:52 -0400 Subject: rpms/libetpan/FC-4 .cvsignore, 1.2, 1.3 libetpan.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200509222244.j8MMiM0k031098@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/libetpan/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31026/FC-4 Modified Files: .cvsignore libetpan.spec sources Log Message: - version upgrade Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libetpan/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 12 Aug 2005 22:43:46 -0000 1.2 +++ .cvsignore 22 Sep 2005 22:43:50 -0000 1.3 @@ -1 +1 @@ -libetpan-0.38.tar.gz +libetpan-0.39.1.tar.gz Index: libetpan.spec =================================================================== RCS file: /cvs/extras/rpms/libetpan/FC-4/libetpan.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- libetpan.spec 12 Aug 2005 22:51:46 -0000 1.2 +++ libetpan.spec 22 Sep 2005 22:43:50 -0000 1.3 @@ -1,6 +1,6 @@ Name: libetpan -Version: 0.38 -Release: 4%{?dist} +Version: 0.39.1 +Release: 1%{?dist} Summary: Portable, efficient middleware for different kinds of mail access Group: System Environment/Libraries @@ -31,7 +31,7 @@ with %{name}. %prep -%setup -q +%setup -q -n %{name}-0.39 %build %configure --disable-static --with-gnutls=no @@ -43,7 +43,7 @@ make install DESTDIR=$RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT%{_libdir}/libetpan.la -chmod 755 $RPM_BUILD_ROOT%{_libdir}/libetpan.so.3.0.0 +chmod 755 $RPM_BUILD_ROOT%{_libdir}/libetpan.so.3.1.0 %clean rm -rf $RPM_BUILD_ROOT @@ -65,6 +65,10 @@ %{_libdir}/*.so %changelog +* Fri Sep 23 2005 Andreas Bierfert +0.39.1-1 +- version upgrade + * Sat Aug 13 2005 Andreas Bierfert 0.38-4 - add dist tag Index: sources =================================================================== RCS file: /cvs/extras/rpms/libetpan/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 12 Aug 2005 22:43:46 -0000 1.2 +++ sources 22 Sep 2005 22:43:50 -0000 1.3 @@ -1 +1 @@ -4d31145dee857beca7e283aa03fe9450 libetpan-0.38.tar.gz +d737fa265944ef76dd1d0b0455c9ff97 libetpan-0.39.1.tar.gz From fedora-extras-commits at redhat.com Thu Sep 22 23:25:21 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 22 Sep 2005 19:25:21 -0400 Subject: rpms/lapack/FC-4 lapack.spec,1.3,1.4 Message-ID: <200509222325.j8MNPqrm032625@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/lapack/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32589/FC-4 Modified Files: lapack.spec Log Message: Actually install liblapack_pic.a Index: lapack.spec =================================================================== RCS file: /cvs/extras/rpms/lapack/FC-4/lapack.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- lapack.spec 14 Sep 2005 19:32:23 -0000 1.3 +++ lapack.spec 22 Sep 2005 23:25:19 -0000 1.4 @@ -1,7 +1,7 @@ Summary: The LAPACK libraries for numerical linear algebra. Name: lapack Version: 3.0 -Release: 30%{?dist} +Release: 31%{?dist} License: Freely distributable Group: Development/Libraries URL: http://www.netlib.org/lapack/ @@ -105,7 +105,7 @@ mkdir -p ${RPM_BUILD_ROOT}%{_libdir} mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/manl -for f in liblapack.so.3.0.3 libblas.so.3.0.3 libblas.a liblapack.a; do +for f in liblapack.so.3.0.3 libblas.so.3.0.3 libblas.a liblapack.a liblapack_pic.a; do cp -f $f ${RPM_BUILD_ROOT}%{_libdir}/$f done @@ -159,6 +159,9 @@ %{_libdir}/libblas*.a %changelog +* Thu Sep 22 2005 Tom "spot" Callaway 3.0-31 +- actually install liblapack_pic.a + * Wed Sep 14 2005 Tom "spot" Callaway 3.0-30 - make -devel packages - make liblapack_pic.a package From fedora-extras-commits at redhat.com Thu Sep 22 23:25:22 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 22 Sep 2005 19:25:22 -0400 Subject: rpms/lapack/devel lapack.spec,1.3,1.4 Message-ID: <200509222325.j8MNPqkw032628@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/lapack/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32589/devel Modified Files: lapack.spec Log Message: Actually install liblapack_pic.a Index: lapack.spec =================================================================== RCS file: /cvs/extras/rpms/lapack/devel/lapack.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- lapack.spec 14 Sep 2005 19:32:24 -0000 1.3 +++ lapack.spec 22 Sep 2005 23:25:20 -0000 1.4 @@ -1,7 +1,7 @@ Summary: The LAPACK libraries for numerical linear algebra. Name: lapack Version: 3.0 -Release: 30%{?dist} +Release: 31%{?dist} License: Freely distributable Group: Development/Libraries URL: http://www.netlib.org/lapack/ @@ -105,7 +105,7 @@ mkdir -p ${RPM_BUILD_ROOT}%{_libdir} mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/manl -for f in liblapack.so.3.0.3 libblas.so.3.0.3 libblas.a liblapack.a; do +for f in liblapack.so.3.0.3 libblas.so.3.0.3 libblas.a liblapack.a liblapack_pic.a; do cp -f $f ${RPM_BUILD_ROOT}%{_libdir}/$f done @@ -159,6 +159,9 @@ %{_libdir}/libblas*.a %changelog +* Thu Sep 22 2005 Tom "spot" Callaway 3.0-31 +- actually install liblapack_pic.a + * Wed Sep 14 2005 Tom "spot" Callaway 3.0-30 - make -devel packages - make liblapack_pic.a package From fedora-extras-commits at redhat.com Fri Sep 23 02:57:26 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Thu, 22 Sep 2005 22:57:26 -0400 Subject: rpms/SoQt/devel .cvsignore, 1.3, 1.4 SoQt.spec, 1.10, 1.11 sources, 1.3, 1.4 Message-ID: <200509230257.j8N2vQev004750@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/SoQt/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4727 Modified Files: .cvsignore SoQt.spec sources Log Message: - Update to 1.3.0 - Build w/o simacros. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/SoQt/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 21 Apr 2005 15:32:46 -0000 1.3 +++ .cvsignore 23 Sep 2005 02:57:24 -0000 1.4 @@ -1,3 +1,4 @@ SoQt-1.2.0.tar.gz SoQt-1.2.0-config.diff.bz2 SoQt-1.2.0-simacros.diff.bz2 +SoQt-1.3.0.tar.gz Index: SoQt.spec =================================================================== RCS file: /cvs/extras/rpms/SoQt/devel/SoQt.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- SoQt.spec 13 Jul 2005 10:35:55 -0000 1.10 +++ SoQt.spec 23 Sep 2005 02:57:24 -0000 1.11 @@ -3,8 +3,8 @@ Summary: High-level 3D visualization library Name: SoQt -Version: 1.2.0 -Release: 7%{?dist} +Version: 1.3.0 +Release: 1%{?dist} License: GPL Group: System Environment/Libraries @@ -50,8 +50,8 @@ %prep %setup -%patch0 -p1 -%patch1 -p1 +# %patch0 -p1 +# %patch1 -p1 %patch2 -p1 %build @@ -66,11 +66,14 @@ make %install - rm -rf $RPM_BUILD_ROOT +rm -rf $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT install +# TESTING +exit 1; + %clean - rm -rf $RPM_BUILD_ROOT +rm -rf $RPM_BUILD_ROOT %post /sbin/ldconfig @@ -96,6 +99,10 @@ %{_mandir}/man?/*.?.gz %changelog +* Fri Sep 23 2005 Ralf Corsepius - 0:1.3.0-1 +- Update to 1.3.0 +- Build w/o simacros. + * Wed Jul 13 2005 Ralf Corsepius - 0:1.2.0-7 - Rebuild against Coin-2.4.3. - Let devel provide Coin2-SoQt-devel. Index: sources =================================================================== RCS file: /cvs/extras/rpms/SoQt/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 21 Apr 2005 15:32:46 -0000 1.3 +++ sources 23 Sep 2005 02:57:24 -0000 1.4 @@ -1,3 +1,4 @@ 4a20e834ace358f3e81fd43b38a69efb SoQt-1.2.0.tar.gz 22454ea02257dbff7304da6e9e12dc63 SoQt-1.2.0-config.diff.bz2 99db70be7488e3b15a164ece03492db6 SoQt-1.2.0-simacros.diff.bz2 +85d6b2b1a78eacd38f1c7219f4a745e3 SoQt-1.3.0.tar.gz From fedora-extras-commits at redhat.com Fri Sep 23 03:08:49 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 22 Sep 2005 23:08:49 -0400 Subject: rpms/rekall/FC-4 rekall-2.2.3-64bitfix.patch, 1.4, 1.5 rekall.spec, 1.4, 1.5 Message-ID: <200509230308.j8N38n40006154@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/rekall/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6094/FC-4 Modified Files: rekall-2.2.3-64bitfix.patch rekall.spec Log Message: 64bit hell. rekall-2.2.3-64bitfix.patch: Index: rekall-2.2.3-64bitfix.patch =================================================================== RCS file: /cvs/extras/rpms/rekall/FC-4/rekall-2.2.3-64bitfix.patch,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- rekall-2.2.3-64bitfix.patch 22 Sep 2005 20:58:02 -0000 1.4 +++ rekall-2.2.3-64bitfix.patch 23 Sep 2005 03:08:47 -0000 1.5 @@ -94,3 +94,25 @@ ) ; popup->insertItem (TR("New &Link"), lp) ; +--- rekall-2.2.4/libs/kbase/kb_framer.cpp.BAD 2005-09-22 22:04:21.000000000 -0500 ++++ rekall-2.2.4/libs/kbase/kb_framer.cpp 2005-09-22 22:04:30.000000000 -0500 +@@ -321,7 +321,7 @@ + return false ; + } + +- newNode ((int)nSpec) ; ++ newNode ((long)nSpec) ; + return true ; + } + +--- rekall-2.2.4/libs/kbase/kb_formblock.cpp.BAD 2005-09-22 22:03:30.000000000 -0500 ++++ rekall-2.2.4/libs/kbase/kb_formblock.cpp 2005-09-22 22:03:46.000000000 -0500 +@@ -1510,7 +1510,7 @@ + return false ; + } + +- newNode ((int)nSpec) ; ++ newNode ((long)nSpec) ; + return true ; + } + Index: rekall.spec =================================================================== RCS file: /cvs/extras/rpms/rekall/FC-4/rekall.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- rekall.spec 22 Sep 2005 20:58:02 -0000 1.4 +++ rekall.spec 23 Sep 2005 03:08:47 -0000 1.5 @@ -1,7 +1,7 @@ Name: rekall Summary: A KDE database front-end application Version: 2.2.4 -Release: 3%{?dist} +Release: 4%{?dist} Group: Development/Tools License: GPL URL: http://www.rekallrevealed.org/ @@ -336,6 +336,9 @@ %{_libdir}/librekallrt.la %changelog +* Thu Sep 22 2005 Tom "spot" Callaway 2.2.4-4 +- yes. another one. + * Thu Sep 22 2005 Tom "spot" Callaway 2.2.4-3 - yet another 64 bit long issue From fedora-extras-commits at redhat.com Fri Sep 23 03:08:50 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 22 Sep 2005 23:08:50 -0400 Subject: rpms/rekall/devel rekall-2.2.3-64bitfix.patch, 1.4, 1.5 rekall.spec, 1.4, 1.5 Message-ID: <200509230308.j8N38okB006164@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/rekall/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6094/devel Modified Files: rekall-2.2.3-64bitfix.patch rekall.spec Log Message: 64bit hell. rekall-2.2.3-64bitfix.patch: Index: rekall-2.2.3-64bitfix.patch =================================================================== RCS file: /cvs/extras/rpms/rekall/devel/rekall-2.2.3-64bitfix.patch,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- rekall-2.2.3-64bitfix.patch 22 Sep 2005 20:58:02 -0000 1.4 +++ rekall-2.2.3-64bitfix.patch 23 Sep 2005 03:08:47 -0000 1.5 @@ -94,3 +94,25 @@ ) ; popup->insertItem (TR("New &Link"), lp) ; +--- rekall-2.2.4/libs/kbase/kb_framer.cpp.BAD 2005-09-22 22:04:21.000000000 -0500 ++++ rekall-2.2.4/libs/kbase/kb_framer.cpp 2005-09-22 22:04:30.000000000 -0500 +@@ -321,7 +321,7 @@ + return false ; + } + +- newNode ((int)nSpec) ; ++ newNode ((long)nSpec) ; + return true ; + } + +--- rekall-2.2.4/libs/kbase/kb_formblock.cpp.BAD 2005-09-22 22:03:30.000000000 -0500 ++++ rekall-2.2.4/libs/kbase/kb_formblock.cpp 2005-09-22 22:03:46.000000000 -0500 +@@ -1510,7 +1510,7 @@ + return false ; + } + +- newNode ((int)nSpec) ; ++ newNode ((long)nSpec) ; + return true ; + } + Index: rekall.spec =================================================================== RCS file: /cvs/extras/rpms/rekall/devel/rekall.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- rekall.spec 22 Sep 2005 20:58:02 -0000 1.4 +++ rekall.spec 23 Sep 2005 03:08:47 -0000 1.5 @@ -1,7 +1,7 @@ Name: rekall Summary: A KDE database front-end application Version: 2.2.4 -Release: 3%{?dist} +Release: 4%{?dist} Group: Development/Tools License: GPL URL: http://www.rekallrevealed.org/ @@ -336,6 +336,9 @@ %{_libdir}/librekallrt.la %changelog +* Thu Sep 22 2005 Tom "spot" Callaway 2.2.4-4 +- yes. another one. + * Thu Sep 22 2005 Tom "spot" Callaway 2.2.4-3 - yet another 64 bit long issue From fedora-extras-commits at redhat.com Fri Sep 23 03:08:46 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 22 Sep 2005 23:08:46 -0400 Subject: rpms/rekall/FC-3 rekall-2.2.3-64bitfix.patch, 1.4, 1.5 rekall.spec, 1.4, 1.5 Message-ID: <200509230309.j8N39H4p006168@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/rekall/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6094/FC-3 Modified Files: rekall-2.2.3-64bitfix.patch rekall.spec Log Message: 64bit hell. rekall-2.2.3-64bitfix.patch: Index: rekall-2.2.3-64bitfix.patch =================================================================== RCS file: /cvs/extras/rpms/rekall/FC-3/rekall-2.2.3-64bitfix.patch,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- rekall-2.2.3-64bitfix.patch 22 Sep 2005 20:58:01 -0000 1.4 +++ rekall-2.2.3-64bitfix.patch 23 Sep 2005 03:08:34 -0000 1.5 @@ -94,3 +94,25 @@ ) ; popup->insertItem (TR("New &Link"), lp) ; +--- rekall-2.2.4/libs/kbase/kb_framer.cpp.BAD 2005-09-22 22:04:21.000000000 -0500 ++++ rekall-2.2.4/libs/kbase/kb_framer.cpp 2005-09-22 22:04:30.000000000 -0500 +@@ -321,7 +321,7 @@ + return false ; + } + +- newNode ((int)nSpec) ; ++ newNode ((long)nSpec) ; + return true ; + } + +--- rekall-2.2.4/libs/kbase/kb_formblock.cpp.BAD 2005-09-22 22:03:30.000000000 -0500 ++++ rekall-2.2.4/libs/kbase/kb_formblock.cpp 2005-09-22 22:03:46.000000000 -0500 +@@ -1510,7 +1510,7 @@ + return false ; + } + +- newNode ((int)nSpec) ; ++ newNode ((long)nSpec) ; + return true ; + } + Index: rekall.spec =================================================================== RCS file: /cvs/extras/rpms/rekall/FC-3/rekall.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- rekall.spec 22 Sep 2005 20:58:01 -0000 1.4 +++ rekall.spec 23 Sep 2005 03:08:34 -0000 1.5 @@ -1,7 +1,7 @@ Name: rekall Summary: A KDE database front-end application Version: 2.2.4 -Release: 3%{?dist} +Release: 4%{?dist} Group: Development/Tools License: GPL URL: http://www.rekallrevealed.org/ @@ -336,6 +336,9 @@ %{_libdir}/librekallrt.la %changelog +* Thu Sep 22 2005 Tom "spot" Callaway 2.2.4-4 +- yes. another one. + * Thu Sep 22 2005 Tom "spot" Callaway 2.2.4-3 - yet another 64 bit long issue From fedora-extras-commits at redhat.com Fri Sep 23 04:37:09 2005 From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters)) Date: Fri, 23 Sep 2005 00:37:09 -0400 Subject: rpms/gourmet import.log,1.2,1.3 Message-ID: <200509230437.j8N4b9ZD007862@cvs-int.fedora.redhat.com> Author: mpeters Update of /cvs/extras/rpms/gourmet In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7827 Modified Files: import.log Log Message: auto-import gourmet-0.8.5.12-1.fc3 on branch FC-3 from gourmet-0.8.5.12-1.fc3.src.rpm new improved upstream version Index: import.log =================================================================== RCS file: /cvs/extras/rpms/gourmet/import.log,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- import.log 14 Jun 2005 01:44:05 -0000 1.2 +++ import.log 23 Sep 2005 04:37:07 -0000 1.3 @@ -1 +1,2 @@ gourmet-0_8_5_2-1:HEAD:gourmet-0.8.5.2-1.src.rpm:1118713419 +gourmet-0_8_5_12-1_fc3:FC-3:gourmet-0.8.5.12-1.fc3.src.rpm:1127450140 From fedora-extras-commits at redhat.com Fri Sep 23 04:37:10 2005 From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters)) Date: Fri, 23 Sep 2005 00:37:10 -0400 Subject: rpms/gourmet/FC-3 .cvsignore, 1.2, 1.3 gourmet.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200509230437.j8N4bA1u007870@cvs-int.fedora.redhat.com> Author: mpeters Update of /cvs/extras/rpms/gourmet/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7827/FC-3 Modified Files: .cvsignore gourmet.spec sources Log Message: auto-import gourmet-0.8.5.12-1.fc3 on branch FC-3 from gourmet-0.8.5.12-1.fc3.src.rpm new improved upstream version Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gourmet/FC-3/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 14 Jun 2005 01:44:06 -0000 1.2 +++ .cvsignore 23 Sep 2005 04:37:07 -0000 1.3 @@ -1 +1 @@ -gourmet-0.8.5.2.tar.gz +gourmet-0.8.5.12.tar.gz Index: gourmet.spec =================================================================== RCS file: /cvs/extras/rpms/gourmet/FC-3/gourmet.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gourmet.spec 14 Jun 2005 01:44:06 -0000 1.1 +++ gourmet.spec 23 Sep 2005 04:37:07 -0000 1.2 @@ -1,7 +1,7 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: gourmet -Version: 0.8.5.2 +Version: 0.8.5.12 Release: 1%{?dist} Summary: PyGTK Recipe Manager @@ -33,8 +33,8 @@ %prep %setup -q %{__sed} -i 's?\.$??g' gourmet.desktop -%{__sed} -i 's?\r??' src/lib/defaults_pt.py -%{__sed} -i 's?\r??' src/lib/defaults_sk.py +#%{__sed} -i 's?\r??' src/lib/defaults_pt.py +#%{__sed} -i 's?\r??' src/lib/defaults_sk.py # remove *.mo files - we'll regenerate them pushd i18n find -name \*.mo |xargs rm -f @@ -90,11 +90,18 @@ %{python_sitelib}/gourmet/importers/*.py %{python_sitelib}/gourmet/importers/*.pyc %ghost %{python_sitelib}/gourmet/importers/*.pyo +%dir %{python_sitelib}/gourmet/importers/html_plugins +%{python_sitelib}/gourmet/importers/html_plugins/*.py +%{python_sitelib}/gourmet/importers/html_plugins/*.pyc +%ghost %{python_sitelib}/gourmet/importers/html_plugins/*.pyo # datadir stuff %{_datadir}/applications/fedora-gourmet.desktop %{_datadir}/pixmaps/recbox.png %{_datadir}/gourmet %changelog +* Thu Sep 22 2005 Michael A. Peters - 0.8.5.12-1 +- New upstream version + * Mon Jun 13 2005 Michael A. Peters - 0.8.5.2-1 - Initial checkin to cvs Index: sources =================================================================== RCS file: /cvs/extras/rpms/gourmet/FC-3/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 14 Jun 2005 01:44:06 -0000 1.2 +++ sources 23 Sep 2005 04:37:07 -0000 1.3 @@ -1 +1 @@ -9a1014582aacc58ff2ea86ad66fdc2cb gourmet-0.8.5.2.tar.gz +77b615493759a5a37a55589e7a24b9a9 gourmet-0.8.5.12.tar.gz From fedora-extras-commits at redhat.com Fri Sep 23 04:38:53 2005 From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters)) Date: Fri, 23 Sep 2005 00:38:53 -0400 Subject: rpms/gourmet import.log,1.3,1.4 Message-ID: <200509230439.j8N4dNZ6007969@cvs-int.fedora.redhat.com> Author: mpeters Update of /cvs/extras/rpms/gourmet In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7931 Modified Files: import.log Log Message: auto-import gourmet-0.8.5.12-1.fc4 on branch FC-4 from gourmet-0.8.5.12-1.fc4.src.rpm new improved upstream version Index: import.log =================================================================== RCS file: /cvs/extras/rpms/gourmet/import.log,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- import.log 23 Sep 2005 04:37:07 -0000 1.3 +++ import.log 23 Sep 2005 04:38:50 -0000 1.4 @@ -1,2 +1,3 @@ gourmet-0_8_5_2-1:HEAD:gourmet-0.8.5.2-1.src.rpm:1118713419 gourmet-0_8_5_12-1_fc3:FC-3:gourmet-0.8.5.12-1.fc3.src.rpm:1127450140 +gourmet-0_8_5_12-1_fc4:FC-4:gourmet-0.8.5.12-1.fc4.src.rpm:1127450247 From fedora-extras-commits at redhat.com Fri Sep 23 04:38:53 2005 From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters)) Date: Fri, 23 Sep 2005 00:38:53 -0400 Subject: rpms/gourmet/FC-4 .cvsignore, 1.2, 1.3 gourmet.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200509230439.j8N4dNee007974@cvs-int.fedora.redhat.com> Author: mpeters Update of /cvs/extras/rpms/gourmet/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7931/FC-4 Modified Files: .cvsignore gourmet.spec sources Log Message: auto-import gourmet-0.8.5.12-1.fc4 on branch FC-4 from gourmet-0.8.5.12-1.fc4.src.rpm new improved upstream version Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gourmet/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 14 Jun 2005 01:44:06 -0000 1.2 +++ .cvsignore 23 Sep 2005 04:38:51 -0000 1.3 @@ -1 +1 @@ -gourmet-0.8.5.2.tar.gz +gourmet-0.8.5.12.tar.gz Index: gourmet.spec =================================================================== RCS file: /cvs/extras/rpms/gourmet/FC-4/gourmet.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gourmet.spec 14 Jun 2005 01:44:06 -0000 1.1 +++ gourmet.spec 23 Sep 2005 04:38:51 -0000 1.2 @@ -1,7 +1,7 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: gourmet -Version: 0.8.5.2 +Version: 0.8.5.12 Release: 1%{?dist} Summary: PyGTK Recipe Manager @@ -33,8 +33,8 @@ %prep %setup -q %{__sed} -i 's?\.$??g' gourmet.desktop -%{__sed} -i 's?\r??' src/lib/defaults_pt.py -%{__sed} -i 's?\r??' src/lib/defaults_sk.py +#%{__sed} -i 's?\r??' src/lib/defaults_pt.py +#%{__sed} -i 's?\r??' src/lib/defaults_sk.py # remove *.mo files - we'll regenerate them pushd i18n find -name \*.mo |xargs rm -f @@ -90,11 +90,18 @@ %{python_sitelib}/gourmet/importers/*.py %{python_sitelib}/gourmet/importers/*.pyc %ghost %{python_sitelib}/gourmet/importers/*.pyo +%dir %{python_sitelib}/gourmet/importers/html_plugins +%{python_sitelib}/gourmet/importers/html_plugins/*.py +%{python_sitelib}/gourmet/importers/html_plugins/*.pyc +%ghost %{python_sitelib}/gourmet/importers/html_plugins/*.pyo # datadir stuff %{_datadir}/applications/fedora-gourmet.desktop %{_datadir}/pixmaps/recbox.png %{_datadir}/gourmet %changelog +* Thu Sep 22 2005 Michael A. Peters - 0.8.5.12-1 +- New upstream version + * Mon Jun 13 2005 Michael A. Peters - 0.8.5.2-1 - Initial checkin to cvs Index: sources =================================================================== RCS file: /cvs/extras/rpms/gourmet/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 14 Jun 2005 01:44:06 -0000 1.2 +++ sources 23 Sep 2005 04:38:51 -0000 1.3 @@ -1 +1 @@ -9a1014582aacc58ff2ea86ad66fdc2cb gourmet-0.8.5.2.tar.gz +77b615493759a5a37a55589e7a24b9a9 gourmet-0.8.5.12.tar.gz From fedora-extras-commits at redhat.com Fri Sep 23 04:41:10 2005 From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters)) Date: Fri, 23 Sep 2005 00:41:10 -0400 Subject: rpms/gourmet import.log,1.4,1.5 Message-ID: <200509230441.j8N4fAwh008071@cvs-int.fedora.redhat.com> Author: mpeters Update of /cvs/extras/rpms/gourmet In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8036 Modified Files: import.log Log Message: auto-import gourmet-0.8.5.12-1.fc5 on branch devel from gourmet-0.8.5.12-1.fc5.src.rpm new improved upstream version Index: import.log =================================================================== RCS file: /cvs/extras/rpms/gourmet/import.log,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- import.log 23 Sep 2005 04:38:50 -0000 1.4 +++ import.log 23 Sep 2005 04:41:08 -0000 1.5 @@ -1,3 +1,4 @@ gourmet-0_8_5_2-1:HEAD:gourmet-0.8.5.2-1.src.rpm:1118713419 gourmet-0_8_5_12-1_fc3:FC-3:gourmet-0.8.5.12-1.fc3.src.rpm:1127450140 gourmet-0_8_5_12-1_fc4:FC-4:gourmet-0.8.5.12-1.fc4.src.rpm:1127450247 +gourmet-0_8_5_12-1_fc5:HEAD:gourmet-0.8.5.12-1.fc5.src.rpm:1127450383 From fedora-extras-commits at redhat.com Fri Sep 23 04:41:11 2005 From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters)) Date: Fri, 23 Sep 2005 00:41:11 -0400 Subject: rpms/gourmet/devel .cvsignore, 1.2, 1.3 gourmet.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200509230441.j8N4fBs4008079@cvs-int.fedora.redhat.com> Author: mpeters Update of /cvs/extras/rpms/gourmet/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8036/devel Modified Files: .cvsignore gourmet.spec sources Log Message: auto-import gourmet-0.8.5.12-1.fc5 on branch devel from gourmet-0.8.5.12-1.fc5.src.rpm new improved upstream version Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gourmet/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 14 Jun 2005 01:44:06 -0000 1.2 +++ .cvsignore 23 Sep 2005 04:41:09 -0000 1.3 @@ -1 +1 @@ -gourmet-0.8.5.2.tar.gz +gourmet-0.8.5.12.tar.gz Index: gourmet.spec =================================================================== RCS file: /cvs/extras/rpms/gourmet/devel/gourmet.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gourmet.spec 14 Jun 2005 01:44:06 -0000 1.1 +++ gourmet.spec 23 Sep 2005 04:41:09 -0000 1.2 @@ -1,7 +1,7 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: gourmet -Version: 0.8.5.2 +Version: 0.8.5.12 Release: 1%{?dist} Summary: PyGTK Recipe Manager @@ -33,8 +33,8 @@ %prep %setup -q %{__sed} -i 's?\.$??g' gourmet.desktop -%{__sed} -i 's?\r??' src/lib/defaults_pt.py -%{__sed} -i 's?\r??' src/lib/defaults_sk.py +#%{__sed} -i 's?\r??' src/lib/defaults_pt.py +#%{__sed} -i 's?\r??' src/lib/defaults_sk.py # remove *.mo files - we'll regenerate them pushd i18n find -name \*.mo |xargs rm -f @@ -90,11 +90,18 @@ %{python_sitelib}/gourmet/importers/*.py %{python_sitelib}/gourmet/importers/*.pyc %ghost %{python_sitelib}/gourmet/importers/*.pyo +%dir %{python_sitelib}/gourmet/importers/html_plugins +%{python_sitelib}/gourmet/importers/html_plugins/*.py +%{python_sitelib}/gourmet/importers/html_plugins/*.pyc +%ghost %{python_sitelib}/gourmet/importers/html_plugins/*.pyo # datadir stuff %{_datadir}/applications/fedora-gourmet.desktop %{_datadir}/pixmaps/recbox.png %{_datadir}/gourmet %changelog +* Thu Sep 22 2005 Michael A. Peters - 0.8.5.12-1 +- New upstream version + * Mon Jun 13 2005 Michael A. Peters - 0.8.5.2-1 - Initial checkin to cvs Index: sources =================================================================== RCS file: /cvs/extras/rpms/gourmet/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 14 Jun 2005 01:44:06 -0000 1.2 +++ sources 23 Sep 2005 04:41:09 -0000 1.3 @@ -1 +1 @@ -9a1014582aacc58ff2ea86ad66fdc2cb gourmet-0.8.5.2.tar.gz +77b615493759a5a37a55589e7a24b9a9 gourmet-0.8.5.12.tar.gz From fedora-extras-commits at redhat.com Fri Sep 23 04:54:03 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Fri, 23 Sep 2005 00:54:03 -0400 Subject: rpms/SoQt/devel SoQt.spec,1.11,1.12 Message-ID: <200509230454.j8N4s3gx008208@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/SoQt/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8188 Modified Files: SoQt.spec Log Message: More testing Index: SoQt.spec =================================================================== RCS file: /cvs/extras/rpms/SoQt/devel/SoQt.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- SoQt.spec 23 Sep 2005 02:57:24 -0000 1.11 +++ SoQt.spec 23 Sep 2005 04:54:00 -0000 1.12 @@ -10,6 +10,8 @@ Group: System Environment/Libraries URL: http://www.coin3d.org +ExclusiveArch: x86_64 + Source: ftp://ftp.coin3d.org/pub/coin/src/SoQt-%{version}.tar.gz # Needed to rebuild patch1 @@ -69,12 +71,12 @@ rm -rf $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT install -# TESTING -exit 1; - %clean rm -rf $RPM_BUILD_ROOT +# TESTING +exit 1; + %post /sbin/ldconfig From fedora-extras-commits at redhat.com Fri Sep 23 05:33:42 2005 From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters)) Date: Fri, 23 Sep 2005 01:33:42 -0400 Subject: rpms/pan/devel pan-0.14.2.91-linewrap.patch, NONE, 1.1 pan.spec, 1.4, 1.5 Message-ID: <200509230533.j8N5Xggi009673@cvs-int.fedora.redhat.com> Author: mpeters Update of /cvs/extras/rpms/pan/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9651 Modified Files: pan.spec Added Files: pan-0.14.2.91-linewrap.patch Log Message: Adding patch to cvs pan-0.14.2.91-linewrap.patch: --- NEW FILE pan-0.14.2.91-linewrap.patch --- --- patch-text-massager.c::wrap begins here --- --- pan/base/text-massager.c.orig Mon Jan 26 00:51:26 2004 +++ pan/base/text-massager.c Mon Jan 26 00:55:48 2004 @@ -250,23 +250,29 @@ char * pch; char * line_start; char * end; + int pos; /* walk through the entire string */ linefeed_here = NULL; - for (line_start=pch=str->str, end=line_start+str->len; pch!=end; ) + for (pos = 0, line_start=pch=str->str, end=line_start+str->len; pch=column && linefeed_here!=NULL) + if (pos>=column && linefeed_here!=NULL) { *linefeed_here = '\n'; pch = line_start = linefeed_here + 1; linefeed_here = NULL; + pos = 0; + } + else + { + pch = g_utf8_next_char (pch); + ++ pos; } - else ++pch; } } --- patch-text-massager.c::wrap ends here --- Index: pan.spec =================================================================== RCS file: /cvs/extras/rpms/pan/devel/pan.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- pan.spec 11 Sep 2005 11:38:16 -0000 1.4 +++ pan.spec 23 Sep 2005 05:33:40 -0000 1.5 @@ -1,7 +1,7 @@ Summary: A GNOME/GTK+ news reader for X Name: pan Version: 0.14.2.91 -Release: 3.1%{?dist} +Release: 3.2%{?dist} Epoch: 1 License: GPL Group: Applications/Internet @@ -83,6 +83,9 @@ %{_datadir}/applications/fedora-pan.desktop %changelog +* Thu Sep 22 2005 Michael A. Peters - 1:0.14.2.91-3.2 +- forgot to commit patch to cvs in devel branch. + * Sun Sep 11 2005 Michael A. Peters - 1:0.14.2.91-3.1 - added patch12 to fix bug 165626 From fedora-extras-commits at redhat.com Fri Sep 23 06:29:38 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Fri, 23 Sep 2005 02:29:38 -0400 Subject: owners owners.list,1.243,1.244 Message-ID: <200509230629.j8N6Tc7U011220@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11201 Modified Files: owners.list Log Message: Add perl-File-Flat Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.243 retrieving revision 1.244 diff -u -r1.243 -r1.244 --- owners.list 22 Sep 2005 18:28:53 -0000 1.243 +++ owners.list 23 Sep 2005 06:29:36 -0000 1.244 @@ -648,6 +648,7 @@ Fedora Extras|perl-ExtUtils-XSBuilder| Modules that parse C header files and create XS glue code|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-File-BOM|Utilities for reading Byte Order Marks|mpeters at mac.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-File-Find-Rule|Perl module implementing an alternative interface to File::Find|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-File-Flat|Implements a flat filesystem|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-File-Remove|Convenience module for removing files and directories|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-File-Slurp|Efficient Reading/Writing of Complete Files|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-File-Tail|Perl extension for reading from continously updated files|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com From fedora-extras-commits at redhat.com Fri Sep 23 06:32:00 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Fri, 23 Sep 2005 02:32:00 -0400 Subject: owners owners.list,1.244,1.245 Message-ID: <200509230632.j8N6W0dX011251@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11237 Modified Files: owners.list Log Message: Add perl-File-NCopy Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.244 retrieving revision 1.245 diff -u -r1.244 -r1.245 --- owners.list 23 Sep 2005 06:29:36 -0000 1.244 +++ owners.list 23 Sep 2005 06:31:58 -0000 1.245 @@ -649,6 +649,7 @@ Fedora Extras|perl-File-BOM|Utilities for reading Byte Order Marks|mpeters at mac.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-File-Find-Rule|Perl module implementing an alternative interface to File::Find|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-File-Flat|Implements a flat filesystem|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-File-NCopy|Copy files to directories, or a single file to another file|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-File-Remove|Convenience module for removing files and directories|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-File-Slurp|Efficient Reading/Writing of Complete Files|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-File-Tail|Perl extension for reading from continously updated files|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com From fedora-extras-commits at redhat.com Fri Sep 23 07:45:42 2005 From: fedora-extras-commits at redhat.com (Mark Cox (mjc)) Date: Fri, 23 Sep 2005 03:45:42 -0400 Subject: fedora-security/audit fc4,1.61,1.62 Message-ID: <200509230745.j8N7jgqH012737@cvs-int.fedora.redhat.com> Author: mjc Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12718 Modified Files: fc4 Log Message: Deal with kernel issues fixed in fc4 released kernel Index: fc4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc4,v retrieving revision 1.61 retrieving revision 1.62 diff -u -r1.61 -r1.62 --- fc4 22 Sep 2005 12:34:50 -0000 1.61 +++ fc4 23 Sep 2005 07:45:40 -0000 1.62 @@ -1,8 +1,9 @@ -Up to date CVE as of CVE email 20050921 -Up to date FC4 as of 20050921 +Up to date CVE as of CVE email 20050922 +Up to date FC4 as of 20050922 ** are items that need attention +2005-3044 VULNERABLE (kernel, fixed 2.6.13.2) 2005-3011 ** texinfo 2005-2991 ignore (ncompress) don't ship zdiff or zcmp scripts 2005-2968 version (mozilla, not 1.7.10) +we include a different mozilla sh @@ -17,7 +18,7 @@ 2005-2871 VULNERABLE (thunderbird) (moderate only) 2005-2811 version (net-snmp, not upstream gentoo only) 2005-2801 version (kernel, fixed 2.6.11) -2005-2800 VULNERABLE (kernel) +2005-2800 backport (kernel, fixed 2.6.12.6) [since FEDORA-2005-906] 2005-2798 version (openssh, fixed 4.2) [since FEDORA-2005-860] 2005-2797 version (openssh, fixed 4.2) [since FEDORA-2005-860] 2005-2796 backport (squid, fixed after 2.5.STABLE10) [since FEDORA-2005-851] @@ -51,8 +52,8 @@ 2005-2491 backport (pcre, fixed 6.2) [since FEDORA-2005-803] 2005-2491 ignore (httpd, pcre uses system pcre) 2005-2491 ignore (php, pcre uses system pcre) -2005-2492 VULNERABLE (kernel, fixed 2.6.13.1) -2005-2490 VULNERABLE (kernel, fixed 2.6.13.1) bz#166249 +2005-2492 backport (kernel, fixed 2.6.13.1) [since FEDORA-2005-906] +2005-2490 backport (kernel, fixed 2.6.13.1) [since FEDORA-2005-906] 2005-2475 VULNERABLE (unzip) bz#164928 2005-2471 backport (netpbm) [since FEDORA-2005-728] 2005-2459 ignore (kernel, fixed 2.6.12.5) dropped as code path not possible From rc040203 at freenet.de Fri Sep 23 07:52:02 2005 From: rc040203 at freenet.de (Ralf Corsepius) Date: Fri, 23 Sep 2005 09:52:02 +0200 Subject: rpms/perl-Log-Dispatch/devel perl-Log-Dispatch.spec,1.2,1.3 In-Reply-To: <200509221748.j8MHmXV9021423@cvs-int.fedora.redhat.com> References: <200509221748.j8MHmXV9021423@cvs-int.fedora.redhat.com> Message-ID: <1127461922.7815.103.camel@mccallum.corsepiu.local> On Thu, 2005-09-22 at 13:48 -0400, Jose Pedro Oliveira wrote: > Author: jpo > > Update of /cvs/extras/rpms/perl-Log-Dispatch/devel > In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21370/devel > > Modified Files: > perl-Log-Dispatch.spec > Log Message: > - Exclude mod_perl from the requirements list > (overkill for most applications using Log::Dispatch). VETO IMO, this decision is a fault and should be reverted. You are breaking package dependencies. If you find this dependency to be too annoying, you probably better should consider to package %perl_vendordir/Log/Dispatch/ApacheLog.pm into a separate subpackage. Ralf From fedora-extras-commits at redhat.com Fri Sep 23 08:56:15 2005 From: fedora-extras-commits at redhat.com (Gavin Henry (ghenry)) Date: Fri, 23 Sep 2005 04:56:15 -0400 Subject: rpms/perl-Apache-LogRegex/FC-4 Makefile,1.1,1.2 Message-ID: <200509230856.j8N8uFp3014937@cvs-int.fedora.redhat.com> Author: ghenry Update of /cvs/extras/rpms/perl-Apache-LogRegex/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14918 Modified Files: Makefile Log Message: perl-Apache-Regex was no the name in Makefile, cheanged from meld. Index: Makefile =================================================================== RCS file: /cvs/extras/rpms/perl-Apache-LogRegex/FC-4/Makefile,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- Makefile 21 Aug 2005 00:09:41 -0000 1.1 +++ Makefile 23 Sep 2005 08:56:12 -0000 1.2 @@ -1,6 +1,6 @@ # Makefile for source rpm: perl-Apache-LogRegex # $Id$ -NAME := meld +NAME := perl-Apache-LogRegex SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common From fedora-extras-commits at redhat.com Fri Sep 23 12:09:52 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Fri, 23 Sep 2005 08:09:52 -0400 Subject: rpms/maxima/FC-4 maxima.spec,1.8,1.9 Message-ID: <200509231209.j8NC9qhD020752@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/maxima/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20733 Modified Files: maxima.spec Log Message: * Fri Sep 23 2005 Rex Dieter 5.9.1.9rc1-4 - --with-clisp only (for now) Index: maxima.spec =================================================================== RCS file: /cvs/extras/rpms/maxima/FC-4/maxima.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- maxima.spec 22 Sep 2005 19:34:30 -0000 1.8 +++ maxima.spec 23 Sep 2005 12:09:50 -0000 1.9 @@ -2,8 +2,8 @@ ## Which runtimes to build/enable? %define _with_clisp 1 %define _without_cmucl 1 -%define _with_gcl 1 -%define _with_sbcl 1 +%define _without_gcl 1 +%define _without_sbcl 1 %define beta rc1 @@ -11,7 +11,7 @@ Name: maxima Version: 5.9.1.9rc1 -Release: 3%{?dist} +Release: 4%{?dist} License: GPL Group: Applications/Engineering URL: http://maxima.sourceforge.net/ @@ -316,6 +316,9 @@ %changelog +* Fri Sep 23 2005 Rex Dieter 5.9.1.9rc1-4 +- --with-clisp only (for now) + * Thu Sep 22 2005 Rex Dieter 5.9.1.9rc1-3 - runtime-clisp: workaround "cpio: MD5 sum mismatch" error - --with-gcl From fedora-extras-commits at redhat.com Fri Sep 23 12:25:49 2005 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Fri, 23 Sep 2005 08:25:49 -0400 Subject: rpms/srecord/devel .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 srecord.spec, 1.1, 1.2 Message-ID: <200509231225.j8NCPnGK020932@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/srecord/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20870/devel Modified Files: .cvsignore sources srecord.spec Log Message: Update to 1.23. (It should now pass all tests in x86_64). Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/srecord/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 15 Sep 2005 02:36:25 -0000 1.2 +++ .cvsignore 23 Sep 2005 12:25:47 -0000 1.3 @@ -1 +1 @@ -srecord-1.22.tar.gz +srecord-1.23.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/srecord/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 15 Sep 2005 02:36:25 -0000 1.2 +++ sources 23 Sep 2005 12:25:47 -0000 1.3 @@ -1 +1 @@ -d67c70be352486db6a9c0929a4d8f08e srecord-1.22.tar.gz +fcca798d3cc3f186410b8ed0e1c2e793 srecord-1.23.tar.gz Index: srecord.spec =================================================================== RCS file: /cvs/extras/rpms/srecord/devel/srecord.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- srecord.spec 15 Sep 2005 02:36:25 -0000 1.1 +++ srecord.spec 23 Sep 2005 12:25:47 -0000 1.2 @@ -1,12 +1,12 @@ Name: srecord -Version: 1.22 -Release: 2%{?dist} +Version: 1.23 +Release: 1%{?dist} Summary: Manipulate EPROM load files Group: Development/Tools License: GPL URL: http://srecord.sourceforge.net/ -Source: http://srecord.sourceforge.net/%{name}-%{version}.tar.gz +Source: http://srecord.sourceforge.net/srecord-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: diffutils, sharutils, groff @@ -40,7 +40,8 @@ %build %configure -make %{?_smp_mflags} +# Fails to build in SMP machines using "make %{?_smp_mflags}" +make %install rm -rf $RPM_BUILD_ROOT @@ -63,6 +64,9 @@ %changelog +* Fri Sep 23 2005 Jose Pedro Oliveira - 1.23-1 +- Update to 1.23. + * Thu Sep 15 2005 Jose Pedro Oliveira - 1.22-2 - Updated the source tarball (PATCHLEVEL "1.22.D002"). The author repackages updates without changing the tarball version (ARGH!). From fedora-extras-commits at redhat.com Fri Sep 23 12:25:43 2005 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Fri, 23 Sep 2005 08:25:43 -0400 Subject: rpms/srecord/FC-3 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 srecord.spec, 1.1, 1.2 Message-ID: <200509231226.j8NCQDqH020937@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/srecord/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20870/FC-3 Modified Files: .cvsignore sources srecord.spec Log Message: Update to 1.23. (It should now pass all tests in x86_64). Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/srecord/FC-3/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 15 Sep 2005 02:36:25 -0000 1.2 +++ .cvsignore 23 Sep 2005 12:25:41 -0000 1.3 @@ -1 +1 @@ -srecord-1.22.tar.gz +srecord-1.23.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/srecord/FC-3/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 15 Sep 2005 02:36:25 -0000 1.2 +++ sources 23 Sep 2005 12:25:41 -0000 1.3 @@ -1 +1 @@ -d67c70be352486db6a9c0929a4d8f08e srecord-1.22.tar.gz +fcca798d3cc3f186410b8ed0e1c2e793 srecord-1.23.tar.gz Index: srecord.spec =================================================================== RCS file: /cvs/extras/rpms/srecord/FC-3/srecord.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- srecord.spec 15 Sep 2005 02:36:25 -0000 1.1 +++ srecord.spec 23 Sep 2005 12:25:41 -0000 1.2 @@ -1,12 +1,12 @@ Name: srecord -Version: 1.22 -Release: 2%{?dist} +Version: 1.23 +Release: 1%{?dist} Summary: Manipulate EPROM load files Group: Development/Tools License: GPL URL: http://srecord.sourceforge.net/ -Source: http://srecord.sourceforge.net/%{name}-%{version}.tar.gz +Source: http://srecord.sourceforge.net/srecord-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: diffutils, sharutils, groff @@ -40,7 +40,8 @@ %build %configure -make %{?_smp_mflags} +# Fails to build in SMP machines using "make %{?_smp_mflags}" +make %install rm -rf $RPM_BUILD_ROOT @@ -63,6 +64,9 @@ %changelog +* Fri Sep 23 2005 Jose Pedro Oliveira - 1.23-1 +- Update to 1.23. + * Thu Sep 15 2005 Jose Pedro Oliveira - 1.22-2 - Updated the source tarball (PATCHLEVEL "1.22.D002"). The author repackages updates without changing the tarball version (ARGH!). From fedora-extras-commits at redhat.com Fri Sep 23 12:25:43 2005 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Fri, 23 Sep 2005 08:25:43 -0400 Subject: rpms/srecord/FC-4 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 srecord.spec, 1.1, 1.2 Message-ID: <200509231226.j8NCQE44020942@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/srecord/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20870/FC-4 Modified Files: .cvsignore sources srecord.spec Log Message: Update to 1.23. (It should now pass all tests in x86_64). Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/srecord/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 15 Sep 2005 02:36:25 -0000 1.2 +++ .cvsignore 23 Sep 2005 12:25:41 -0000 1.3 @@ -1 +1 @@ -srecord-1.22.tar.gz +srecord-1.23.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/srecord/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 15 Sep 2005 02:36:25 -0000 1.2 +++ sources 23 Sep 2005 12:25:41 -0000 1.3 @@ -1 +1 @@ -d67c70be352486db6a9c0929a4d8f08e srecord-1.22.tar.gz +fcca798d3cc3f186410b8ed0e1c2e793 srecord-1.23.tar.gz Index: srecord.spec =================================================================== RCS file: /cvs/extras/rpms/srecord/FC-4/srecord.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- srecord.spec 15 Sep 2005 02:36:25 -0000 1.1 +++ srecord.spec 23 Sep 2005 12:25:41 -0000 1.2 @@ -1,12 +1,12 @@ Name: srecord -Version: 1.22 -Release: 2%{?dist} +Version: 1.23 +Release: 1%{?dist} Summary: Manipulate EPROM load files Group: Development/Tools License: GPL URL: http://srecord.sourceforge.net/ -Source: http://srecord.sourceforge.net/%{name}-%{version}.tar.gz +Source: http://srecord.sourceforge.net/srecord-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: diffutils, sharutils, groff @@ -40,7 +40,8 @@ %build %configure -make %{?_smp_mflags} +# Fails to build in SMP machines using "make %{?_smp_mflags}" +make %install rm -rf $RPM_BUILD_ROOT @@ -63,6 +64,9 @@ %changelog +* Fri Sep 23 2005 Jose Pedro Oliveira - 1.23-1 +- Update to 1.23. + * Thu Sep 15 2005 Jose Pedro Oliveira - 1.22-2 - Updated the source tarball (PATCHLEVEL "1.22.D002"). The author repackages updates without changing the tarball version (ARGH!). From fedora-extras-commits at redhat.com Fri Sep 23 12:52:23 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Fri, 23 Sep 2005 08:52:23 -0400 Subject: rpms/SoQt/devel .cvsignore, 1.4, 1.5 SoQt.spec, 1.12, 1.13 sources, 1.4, 1.5 Message-ID: <200509231252.j8NCqNWu021206@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/SoQt/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21183 Modified Files: .cvsignore SoQt.spec sources Log Message: Remove remnants of 1.2.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/SoQt/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 23 Sep 2005 02:57:24 -0000 1.4 +++ .cvsignore 23 Sep 2005 12:52:21 -0000 1.5 @@ -1,4 +1 @@ -SoQt-1.2.0.tar.gz -SoQt-1.2.0-config.diff.bz2 -SoQt-1.2.0-simacros.diff.bz2 SoQt-1.3.0.tar.gz Index: SoQt.spec =================================================================== RCS file: /cvs/extras/rpms/SoQt/devel/SoQt.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- SoQt.spec 23 Sep 2005 04:54:00 -0000 1.12 +++ SoQt.spec 23 Sep 2005 12:52:21 -0000 1.13 @@ -14,14 +14,6 @@ Source: ftp://ftp.coin3d.org/pub/coin/src/SoQt-%{version}.tar.gz -# Needed to rebuild patch1 -Patch0: SoQt-1.2.0-simacros.diff.bz2 - -# Work-around to issues with RH's libtool on ix86_64 -# libtoolize -f -c -# aclocal-1.7 -I cfg/m4 -# autoconf -Patch1: SoQt-1.2.0-config.diff.bz2 Patch2: SoQt-1.2.0-man3.diff BuildRequires: doxygen @@ -42,7 +34,7 @@ %package devel Summary: Development files for SoQt Requires: %{name} = %{version}-%{release} -Requires: autoconf +Requires: %{_datadir}/aclocal Requires: Coin2-devel qt-devel Provides: Coin2-SoQt-devel = %{version}-%{release} Group: Development/Libraries @@ -52,8 +44,6 @@ %prep %setup -# %patch0 -p1 -# %patch1 -p1 %patch2 -p1 %build @@ -74,9 +64,6 @@ %clean rm -rf $RPM_BUILD_ROOT -# TESTING -exit 1; - %post /sbin/ldconfig Index: sources =================================================================== RCS file: /cvs/extras/rpms/SoQt/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 23 Sep 2005 02:57:24 -0000 1.4 +++ sources 23 Sep 2005 12:52:21 -0000 1.5 @@ -1,4 +1 @@ -4a20e834ace358f3e81fd43b38a69efb SoQt-1.2.0.tar.gz -22454ea02257dbff7304da6e9e12dc63 SoQt-1.2.0-config.diff.bz2 -99db70be7488e3b15a164ece03492db6 SoQt-1.2.0-simacros.diff.bz2 85d6b2b1a78eacd38f1c7219f4a745e3 SoQt-1.3.0.tar.gz From fedora-extras-commits at redhat.com Fri Sep 23 12:53:31 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Fri, 23 Sep 2005 08:53:31 -0400 Subject: rpms/SoQt/devel SoQt.spec,1.13,1.14 Message-ID: <200509231254.j8NCs1Fe021245@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/SoQt/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21222 Modified Files: SoQt.spec Log Message: Remove testing stuff Index: SoQt.spec =================================================================== RCS file: /cvs/extras/rpms/SoQt/devel/SoQt.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- SoQt.spec 23 Sep 2005 12:52:21 -0000 1.13 +++ SoQt.spec 23 Sep 2005 12:53:21 -0000 1.14 @@ -10,8 +10,6 @@ Group: System Environment/Libraries URL: http://www.coin3d.org -ExclusiveArch: x86_64 - Source: ftp://ftp.coin3d.org/pub/coin/src/SoQt-%{version}.tar.gz Patch2: SoQt-1.2.0-man3.diff From fedora-extras-commits at redhat.com Fri Sep 23 13:20:58 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Fri, 23 Sep 2005 09:20:58 -0400 Subject: rpms/SoQt/FC-4 .cvsignore, 1.3, 1.4 SoQt.spec, 1.9, 1.10 sources, 1.3, 1.4 Message-ID: <200509231320.j8NDKw92022755@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/SoQt/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22732 Modified Files: .cvsignore SoQt.spec sources Log Message: Upgrade to 1.3.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/SoQt/FC-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 21 Apr 2005 15:32:46 -0000 1.3 +++ .cvsignore 23 Sep 2005 13:20:55 -0000 1.4 @@ -1,3 +1 @@ -SoQt-1.2.0.tar.gz -SoQt-1.2.0-config.diff.bz2 -SoQt-1.2.0-simacros.diff.bz2 +SoQt-1.3.0.tar.gz Index: SoQt.spec =================================================================== RCS file: /cvs/extras/rpms/SoQt/FC-4/SoQt.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- SoQt.spec 20 May 2005 14:09:48 -0000 1.9 +++ SoQt.spec 23 Sep 2005 13:20:55 -0000 1.10 @@ -3,8 +3,8 @@ Summary: High-level 3D visualization library Name: SoQt -Version: 1.2.0 -Release: 6%{?dist} +Version: 1.3.0 +Release: 1%{?dist} License: GPL Group: System Environment/Libraries @@ -12,14 +12,6 @@ Source: ftp://ftp.coin3d.org/pub/coin/src/SoQt-%{version}.tar.gz -# Needed to rebuild patch1 -Patch0: SoQt-1.2.0-simacros.diff.bz2 - -# Work-around to issues with RH's libtool on ix86_64 -# libtoolize -f -c -# aclocal-1.7 -I cfg/m4 -# autoconf -Patch1: SoQt-1.2.0-config.diff.bz2 Patch2: SoQt-1.2.0-man3.diff BuildRequires: doxygen @@ -40,9 +32,9 @@ %package devel Summary: Development files for SoQt Requires: %{name} = %{version}-%{release} -Requires: autoconf +Requires: %{_datadir}/aclocal Requires: Coin2-devel qt-devel -Provides: Coin2-SoQt = %{version}-%{release} +Provides: Coin2-SoQt-devel = %{version}-%{release} Group: Development/Libraries %description devel @@ -50,8 +42,6 @@ %prep %setup -%patch0 -p1 -%patch1 -p1 %patch2 -p1 %build @@ -66,11 +56,11 @@ make %install - rm -rf $RPM_BUILD_ROOT +rm -rf $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT install %clean - rm -rf $RPM_BUILD_ROOT +rm -rf $RPM_BUILD_ROOT %post /sbin/ldconfig @@ -96,6 +86,14 @@ %{_mandir}/man?/*.?.gz %changelog +* Fri Sep 23 2005 Ralf Corsepius - 0:1.3.0-1 +- Update to 1.3.0 +- Build w/o simacros. + +* Wed Jul 13 2005 Ralf Corsepius - 0:1.2.0-7 +- Rebuild against Coin-2.4.3. +- Let devel provide Coin2-SoQt-devel. + * Mon May 10 2005 Ralf Corsepius - 0:1.2.0-6 - Rebuild against Coin-2.4.1. Index: sources =================================================================== RCS file: /cvs/extras/rpms/SoQt/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 21 Apr 2005 15:32:46 -0000 1.3 +++ sources 23 Sep 2005 13:20:55 -0000 1.4 @@ -1,3 +1 @@ -4a20e834ace358f3e81fd43b38a69efb SoQt-1.2.0.tar.gz -22454ea02257dbff7304da6e9e12dc63 SoQt-1.2.0-config.diff.bz2 -99db70be7488e3b15a164ece03492db6 SoQt-1.2.0-simacros.diff.bz2 +85d6b2b1a78eacd38f1c7219f4a745e3 SoQt-1.3.0.tar.gz From fedora-extras-commits at redhat.com Fri Sep 23 14:43:56 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 23 Sep 2005 10:43:56 -0400 Subject: rpms/rocksndiamonds - New directory Message-ID: <200509231443.j8NEhu4E024426@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/rocksndiamonds In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24406/rocksndiamonds Log Message: Directory /cvs/extras/rpms/rocksndiamonds added to the repository From fedora-extras-commits at redhat.com Fri Sep 23 14:43:56 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 23 Sep 2005 10:43:56 -0400 Subject: rpms/rocksndiamonds/devel - New directory Message-ID: <200509231444.j8NEhue8024431@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/rocksndiamonds/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24406/rocksndiamonds/devel Log Message: Directory /cvs/extras/rpms/rocksndiamonds/devel added to the repository From fedora-extras-commits at redhat.com Fri Sep 23 14:44:18 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 23 Sep 2005 10:44:18 -0400 Subject: rpms/rocksndiamonds Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200509231444.j8NEiI5l024498@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/rocksndiamonds In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24460 Added Files: Makefile import.log Log Message: Setup of module rocksndiamonds --- NEW FILE Makefile --- # Top level Makefile for module rocksndiamonds all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Fri Sep 23 14:44:19 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 23 Sep 2005 10:44:19 -0400 Subject: rpms/rocksndiamonds/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200509231444.j8NEiJbn024503@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/rocksndiamonds/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24460/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module rocksndiamonds --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Fri Sep 23 14:46:18 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 23 Sep 2005 10:46:18 -0400 Subject: rpms/rocksndiamonds import.log,1.1,1.2 Message-ID: <200509231446.j8NEkIN6024624@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/rocksndiamonds In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24584 Modified Files: import.log Log Message: auto-import rocksndiamonds-3.1.1-2 on branch devel from rocksndiamonds-3.1.1-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/rocksndiamonds/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 23 Sep 2005 14:44:16 -0000 1.1 +++ import.log 23 Sep 2005 14:46:16 -0000 1.2 @@ -0,0 +1 @@ +rocksndiamonds-3_1_1-2:HEAD:rocksndiamonds-3.1.1-2.src.rpm:1127486754 From fedora-extras-commits at redhat.com Fri Sep 23 14:46:19 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 23 Sep 2005 10:46:19 -0400 Subject: rpms/rocksndiamonds/devel rocksndiamonds-3.1.1-nosmpeg.patch, NONE, 1.1 rocksndiamonds.desktop, NONE, 1.1 rocksndiamonds.png, NONE, 1.1 rocksndiamonds.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200509231446.j8NEkJ9X024633@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/rocksndiamonds/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24584/devel Modified Files: .cvsignore sources Added Files: rocksndiamonds-3.1.1-nosmpeg.patch rocksndiamonds.desktop rocksndiamonds.png rocksndiamonds.spec Log Message: auto-import rocksndiamonds-3.1.1-2 on branch devel from rocksndiamonds-3.1.1-2.src.rpm rocksndiamonds-3.1.1-nosmpeg.patch: --- NEW FILE rocksndiamonds-3.1.1-nosmpeg.patch --- --- rocksndiamonds-3.1.1/src/Makefile.BAD 2005-09-22 16:20:14.000000000 -0500 +++ rocksndiamonds-3.1.1/src/Makefile 2005-09-22 16:20:23.000000000 -0500 @@ -91,13 +91,13 @@ ifeq ($(TARGET),sdl) SYS_CFLAGS = -DTARGET_SDL $(shell sdl-config --cflags) -SDL_LIBS = -lSDL_image -lSDL_mixer -lSDL_net -lsmpeg +SDL_LIBS = -lSDL_image -lSDL_mixer -lSDL_net SYS_LDFLAGS = $(SDL_LIBS) $(shell sdl-config --libs) endif ifeq ($(TARGET),sdl-static) SYS_CFLAGS = -DTARGET_SDL $(shell sdl-config --cflags) -SDL_LIBS = -lSDL_image -lSDL_mixer -lSDL_net -lsmpeg +SDL_LIBS = -lSDL_image -lSDL_mixer -lSDL_net SYS_LDFLAGS = $(SDL_LIBS) $(shell sdl-config --static-libs) endif --- NEW FILE rocksndiamonds.desktop --- [Desktop Entry] Type=Application Version=1.0 Encoding=UTF-8 Name=Rocks'N'Diamonds GenericName=Underground digging game Comment=Dig for treasure and solve puzzles underground Icon=rocksndiamonds.png Exec=rocksndiamonds Terminal=false StartupNotify=false Categories=Application;Game; --- NEW FILE rocksndiamonds.spec --- Name: rocksndiamonds Version: 3.1.1 Release: 2%{?dist} License: GPL Group: Amusements/Games Summary: Underground digging game URL: http://www.artsoft.org/rocksndiamonds/ Source0: http://www.artsoft.org/RELEASES/unix/rocksndiamonds/rocksndiamonds-%{version}.tar.gz Source1: rocksndiamonds.desktop Source2: rocksndiamonds.png Patch0: rocksndiamonds-3.1.1-nosmpeg.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: SDL-devel, xorg-x11-devel, desktop-file-utils BuildRequires: SDL_image-devel, SDL_mixer-devel, SDL_net-devel %description Dig for treasure and solve puzzles underground, but watch out for falling rocks and strange creatures! %prep %setup -q %patch0 -p1 %build make %{?_smp_mflags} RO_GAME_DIR=%{_datadir}/%{name}/ RW_GAME_DIR=%{_localstatedir}/games/%{name}/ EXTRA_CFLAGS="$RPM_OPT_FLAGS" %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name} mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/games/%{name} mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1 mkdir -p $RPM_BUILD_ROOT%{_bindir} install -m0755 rocksndiamonds $RPM_BUILD_ROOT%{_bindir} for i in graphics levels music scores sounds; do cp -a $i $RPM_BUILD_ROOT%{_datadir}/%{name}/ done install -m0644 rocksndiamonds.1 $RPM_BUILD_ROOT%{_mandir}/man1 cp %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/pixmaps desktop-file-install \ --vendor fedora \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ --mode 0644 \ --add-category X-Fedora \ %{SOURCE1} %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc ChangeLog CHANGES COPYING CREDITS HARDWARE INSTALL README TODO %doc docs/elements/ %{_bindir}/* %{_datadir}/%{name}/ %{_datadir}/pixmaps/* %{_datadir}/applications/*.desktop %{_localstatedir}/games/%{name}/ %{_mandir}/man1/* %changelog * Thu Sep 22 2005 Tom "spot" Callaway 3.1.1-2 - add missing BR: SDL_net-devel * Thu Sep 22 2005 Tom "spot" Callaway 3.1.1-1 - initial package for Fedora Extras Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/rocksndiamonds/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 23 Sep 2005 14:44:16 -0000 1.1 +++ .cvsignore 23 Sep 2005 14:46:17 -0000 1.2 @@ -0,0 +1 @@ +rocksndiamonds-3.1.1.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/rocksndiamonds/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 23 Sep 2005 14:44:16 -0000 1.1 +++ sources 23 Sep 2005 14:46:17 -0000 1.2 @@ -0,0 +1 @@ +6a6e0397f043314e3df8ee85c03590b5 rocksndiamonds-3.1.1.tar.gz From fedora-extras-commits at redhat.com Fri Sep 23 15:51:14 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 23 Sep 2005 11:51:14 -0400 Subject: owners owners.list,1.245,1.246 Message-ID: <200509231551.j8NFpEHu026463@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26444 Modified Files: owners.list Log Message: rocksndiamonds Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.245 retrieving revision 1.246 diff -u -r1.245 -r1.246 --- owners.list 23 Sep 2005 06:31:58 -0000 1.245 +++ owners.list 23 Sep 2005 15:51:12 -0000 1.246 @@ -888,6 +888,7 @@ Fedora Extras|R-hdf5|R Interface to the NCSA HDF5 library|tcallawa at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|rinetd|TCP redirection server|kaboom at oobleck.net|extras-qa at fedoraproject.org| Fedora Extras|rkhunter|Rootkit Hunter scans for rootkits, backdoors and local exploits|tamaster at pobox.com|extras-qa at fedoraproject.org| +Fedora Extras|rocksndiamonds|Underground digging game|tcallawa at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|roundup|Simple and flexible issue-tracking system|redhat at flyn.org|extras-qa at fedoraproject.org| Fedora Extras|rpmDirectoryCheck|Tool to detect some RPM packaging errors|enrico.scholz at informatik.tu-chemnitz.de|extras-qa at fedoraproject.org| Fedora Extras|rpmlint|RPM correctness checker|ville.skytta at iki.fi|extras-qa at fedoraproject.org| From tcallawa at redhat.com Fri Sep 23 16:12:25 2005 From: tcallawa at redhat.com (Tom 'spot' Callaway) Date: Fri, 23 Sep 2005 11:12:25 -0500 Subject: rpms/perl-Log-Dispatch/devel perl-Log-Dispatch.spec,1.2,1.3 In-Reply-To: <1127461922.7815.103.camel@mccallum.corsepiu.local> References: <200509221748.j8MHmXV9021423@cvs-int.fedora.redhat.com> <1127461922.7815.103.camel@mccallum.corsepiu.local> Message-ID: <1127491945.2481.125.camel@localhost.localdomain> On Fri, 2005-09-23 at 09:52 +0200, Ralf Corsepius wrote: > On Thu, 2005-09-22 at 13:48 -0400, Jose Pedro Oliveira wrote: > > Author: jpo > > > > Update of /cvs/extras/rpms/perl-Log-Dispatch/devel > > In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21370/devel > > > > Modified Files: > > perl-Log-Dispatch.spec > > Log Message: > > - Exclude mod_perl from the requirements list > > (overkill for most applications using Log::Dispatch). > > VETO > > IMO, this decision is a fault and should be reverted. You are breaking > package dependencies. > > If you find this dependency to be too annoying, you probably better > should consider to package > %perl_vendordir/Log/Dispatch/ApacheLog.pm > into a separate subpackage. I agree. If a file in a package needs mod_perl (or any other dependency) to fully function, then you should NOT be excluding that dependency from the list. The only time excluding dependencies is ok is if it is a false positive (rpm says it needs perl, but nothing actually does). ~spot -- Tom "spot" Callaway: Red Hat Senior Sales Engineer || GPG ID: 93054260 Fedora Extras Steering Committee Member (RPM Standards and Practices) Aurora Linux Project Leader: http://auroralinux.org Lemurs, llamas, and sparcs, oh my! From fedora-extras-commits at redhat.com Fri Sep 23 18:44:03 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 23 Sep 2005 14:44:03 -0400 Subject: rpms/physfs - New directory Message-ID: <200509231844.j8NIi3Xu031072@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/physfs In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31048/physfs Log Message: Directory /cvs/extras/rpms/physfs added to the repository From fedora-extras-commits at redhat.com Fri Sep 23 18:44:03 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 23 Sep 2005 14:44:03 -0400 Subject: rpms/physfs/devel - New directory Message-ID: <200509231844.j8NIi3jk031077@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/physfs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31048/physfs/devel Log Message: Directory /cvs/extras/rpms/physfs/devel added to the repository From fedora-extras-commits at redhat.com Fri Sep 23 18:44:17 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 23 Sep 2005 14:44:17 -0400 Subject: rpms/physfs Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200509231844.j8NIiH4W031122@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/physfs In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31093 Added Files: Makefile import.log Log Message: Setup of module physfs --- NEW FILE Makefile --- # Top level Makefile for module physfs all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Fri Sep 23 18:44:17 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 23 Sep 2005 14:44:17 -0400 Subject: rpms/physfs/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200509231844.j8NIiHu8031127@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/physfs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31093/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module physfs --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Fri Sep 23 18:44:59 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 23 Sep 2005 14:44:59 -0400 Subject: rpms/physfs import.log,1.1,1.2 Message-ID: <200509231844.j8NIix2v031201@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/physfs In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31166 Modified Files: import.log Log Message: auto-import physfs-1.0.1-2 on branch devel from physfs-1.0.1-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/physfs/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 23 Sep 2005 18:44:15 -0000 1.1 +++ import.log 23 Sep 2005 18:44:57 -0000 1.2 @@ -0,0 +1 @@ +physfs-1_0_1-2:HEAD:physfs-1.0.1-2.src.rpm:1127501076 From fedora-extras-commits at redhat.com Fri Sep 23 18:45:00 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 23 Sep 2005 14:45:00 -0400 Subject: rpms/physfs/devel physfs.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200509231845.j8NIj05L031208@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/physfs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31166/devel Modified Files: .cvsignore sources Added Files: physfs.spec Log Message: auto-import physfs-1.0.1-2 on branch devel from physfs-1.0.1-2.src.rpm --- NEW FILE physfs.spec --- Name: physfs Version: 1.0.1 Release: 2%{?dist} License: BSD Group: System Environment/Libraries Summary: Library to provide abstract access to various archives URL: http://www.icculus.org/physfs/ Source0: http://www.icculus.org/physfs/downloads/physfs-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: doxygen, zlib-devel, readline-devel %description PhysicsFS is a library to provide abstract access to various archives. It is intended for use in video games, and the design was somewhat inspired by Quake 3's file subsystem. The programmer defines a "write directory" on the physical filesystem. No file writing done through the PhysicsFS API can leave that write directory, for security. For example, an embedded scripting language cannot write outside of this path if it uses PhysFS for all of its I/O, which means that untrusted scripts can run more safely. Symbolic links can be disabled as well, for added safety. For file reading, the programmer lists directories and archives that form a "search path". Once the search path is defined, it becomes a single, transparent hierarchical filesystem. This makes for easy access to ZIP files in the same way as you access a file directly on the disk, and it makes it easy to ship a new archive that will override a previous archive on a per-file basis. Finally, PhysicsFS gives you platform-abstracted means to determine if CD-ROMs are available, the user's home directory, where in the real filesystem your program is running, etc. %package devel Summary: Development libraries and headers for physfs Group: Development/Libraries Requires: %{name} = %{version}-%{release} %description devel This package contains the libraries and headers necessary for developing packages with physfs functionality. %prep %setup -q %build %configure make %{?_smp_mflags} doxygen %install rm -rf $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT install rm -rf $RPM_BUILD_ROOT%{_libdir}/*.la mkdir -p $RPM_BUILD_ROOT%{_mandir}/man3 install -m0644 docs/man/man3/* $RPM_BUILD_ROOT%{_mandir}/man3 %clean rm -rf $RPM_BUILD_ROOT %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files %defattr(-,root,root,-) %doc CHANGELOG CREDITS LICENSE TODO %{_libdir}/*.so.* %{_bindir}/test_physfs %files devel %defattr(-,root,root,-) %doc docs/html/ docs/latex/ %{_includedir}/physfs.h %{_libdir}/*.a %{_libdir}/*.so %{_mandir}/man3/* %changelog * Fri Sep 23 2005 Tom "spot" Callaway 1.0.1-2 - add docs for devel * Fri Aug 19 2005 Tom "spot" Callaway 1.0.1-1 - initial package for Fedora Extras Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/physfs/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 23 Sep 2005 18:44:15 -0000 1.1 +++ .cvsignore 23 Sep 2005 18:44:58 -0000 1.2 @@ -0,0 +1 @@ +physfs-1.0.1.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/physfs/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 23 Sep 2005 18:44:15 -0000 1.1 +++ sources 23 Sep 2005 18:44:58 -0000 1.2 @@ -0,0 +1 @@ +d0bd118c6b55fb1e020fe982d6ec6957 physfs-1.0.1.tar.gz From fedora-extras-commits at redhat.com Fri Sep 23 18:45:21 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 23 Sep 2005 14:45:21 -0400 Subject: owners owners.list,1.246,1.247 Message-ID: <200509231845.j8NIjLEs031261@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31242 Modified Files: owners.list Log Message: physfs Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.246 retrieving revision 1.247 diff -u -r1.246 -r1.247 --- owners.list 23 Sep 2005 15:51:12 -0000 1.246 +++ owners.list 23 Sep 2005 18:45:19 -0000 1.247 @@ -801,6 +801,7 @@ Fedora Extras|php-pecl-pdo|PECL package for PHP Data Objects Interface|matthias at rpmforge.net|extras-qa at fedoraproject.org| Fedora Extras|php-pecl-pdo-sqlite|PECL package for PHP Data Objects Interface to SQLite v3|matthias at rpmforge.net|extras-qa at fedoraproject.org| Fedora Extras|php-pecl-sqlite|PECL package for accessing SQLite databases|matthias at rpmforge.net|extras-qa at fedoraproject.org| +Fedora Extras|physfs|Library to provide abstract access to various archives|tcallawa at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|pinentry|Collection of simple PIN or passphrase entry dialogs|ville.skytta at iki.fi|extras-qa at fedoraproject.org| Fedora Extras|plague|Distributed build system for RPMs|dcbw at redhat.com|extras-qa at fedoraproject.org Fedora Extras|plib16|Set of portable libraries especially useful for games|matthias at rpmforge.net|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Fri Sep 23 20:33:48 2005 From: fedora-extras-commits at redhat.com (Elliot Lee (sopwith)) Date: Fri, 23 Sep 2005 16:33:48 -0400 Subject: web/include navigation.inc,1.11,1.12 Message-ID: <200509232034.j8NKYIxY002051@cvs-int.fedora.redhat.com> Author: sopwith Update of /cvs/fedora/web/include In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2032 Modified Files: navigation.inc Log Message: remove leadership.html Index: navigation.inc =================================================================== RCS file: /cvs/fedora/web/include/navigation.inc,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- navigation.inc 22 Aug 2005 17:07:40 -0000 1.11 +++ navigation.inc 23 Sep 2005 20:33:44 -0000 1.12 @@ -50,7 +50,6 @@ "About"=>array("uri"=>"/about/","sub"=>array( "FAQs"=>array("uri"=>"/about/faq/"), "History"=>array("uri"=>"/about/history/"), - "Leadership"=>array("uri"=>"/about/leadership.php"), "Objectives"=>array("uri"=>"/about/objectives.php"), "Product Relationship"=>array("uri"=>"/about/rhel.php"), "Fedora Name"=>array("uri"=>"/about/name.php"), From jpo at di.uminho.pt Sat Sep 24 00:28:44 2005 From: jpo at di.uminho.pt (=?ISO-8859-1?Q?Jos=E9_Pedro_Oliveira?=) Date: Sat, 24 Sep 2005 01:28:44 +0100 Subject: rpms/perl-Log-Dispatch/devel perl-Log-Dispatch.spec,1.2,1.3 In-Reply-To: <1127461922.7815.103.camel@mccallum.corsepiu.local> References: <200509221748.j8MHmXV9021423@cvs-int.fedora.redhat.com> <1127461922.7815.103.camel@mccallum.corsepiu.local> Message-ID: <43349DBC.7030906@di.uminho.pt> Ralf Corsepius wrote: > On Thu, 2005-09-22 at 13:48 -0400, Jose Pedro Oliveira wrote: > >>Author: jpo >> >>Update of /cvs/extras/rpms/perl-Log-Dispatch/devel >>In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21370/devel >> >>Modified Files: >> perl-Log-Dispatch.spec >>Log Message: >>- Exclude mod_perl from the requirements list >> (overkill for most applications using Log::Dispatch). > > > VETO > > IMO, this decision is a fault and should be reverted. You are breaking > package dependencies. I disagree with your opinion and I believe my decision is correct. Reasoning: 1) to create an ApacheLog dispatcher you need to supply an Apache object (see http://search.cpan.org/dist/Log-Dispatch/lib/Log/Dispatch/ApacheLog.pm) 2) you can only obtain an Apache* object if your app is running under mod_perl So, your app should be the one requiring mod_perl and not perl-Log-Dispatch. Also, when installing this perl package using CPAN you are not required to install mod_perl (see Build.PL). This kind of requirements nightmare can even get worst if we start to talk about Log::Log4perl which uses Log::Dispatch. > If you find this dependency to be too annoying, you probably better > should consider to package > %perl_vendordir/Log/Dispatch/ApacheLog.pm > into a separate subpackage. This could be a solution if there are packages that need perl-Log-Dispatch to install mod_perl and apache (I never came across one). jpo -- Jos? Pedro Oliveira * mailto: jpo at di.uminho.pt * http://gsd.di.uminho.pt/jpo * * gpg fingerprint = F9B6 8D87 859D 1C94 48F0 84C0 9749 9EB5 91BD 851B * http://conferences.yapceurope.org/2005/ * http://braga.yapceurope.org/ -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 251 bytes Desc: OpenPGP digital signature URL: From fedora-extras-commits at redhat.com Sat Sep 24 03:16:23 2005 From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon)) Date: Fri, 23 Sep 2005 23:16:23 -0400 Subject: rpms/repoview/FC-4 .cvsignore, 1.2, 1.3 repoview.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200509240316.j8O3GNHC013039@cvs-int.fedora.redhat.com> Author: icon Update of /cvs/extras/rpms/repoview/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13016 Modified Files: .cvsignore repoview.spec sources Log Message: Version 0.4 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/repoview/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 30 Mar 2005 15:18:00 -0000 1.2 +++ .cvsignore 24 Sep 2005 03:16:21 -0000 1.3 @@ -1 +1 @@ -repoview-0.3.tar.gz +repoview-0.4.tar.gz Index: repoview.spec =================================================================== RCS file: /cvs/extras/rpms/repoview/FC-4/repoview.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- repoview.spec 4 Apr 2005 21:09:47 -0000 1.2 +++ repoview.spec 24 Sep 2005 03:16:21 -0000 1.3 @@ -1,16 +1,16 @@ Name: repoview -Version: 0.3 -Release: 3 +Version: 0.4 +Release: 1%{?dist} Summary: Creates a set of static HTML pages in a yum repository Group: Applications/System License: GPL URL: http://linux.duke.edu/projects/mini/repoview -Source0: http://linux.duke.edu/projects/mini/repoview/download/repoview-0.3.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-root +Source0: http://linux.duke.edu/projects/mini/repoview/download/%{name}-%{version}.tar.gz +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -Requires: python-kid >= 0.6.3, python-elementtree +Requires: python-kid >= 0.6.3, yum >= 2.3 %description RepoView creates a set of static HTML pages in a yum repository for easy @@ -52,6 +52,12 @@ %changelog +* Fri Sep 23 2005 Konstantin Ryabitsev - 0.4-1 +- Version 0.4 +- Require yum >= 2.3 +- Drop requirement for python-elementtree, since it's required by yum +- Disttagging. + * Mon Apr 04 2005 Konstantin Ryabitsev 0.3-3 - Do not BuildRequire sed -- basic enough dependency, even for version 4. Index: sources =================================================================== RCS file: /cvs/extras/rpms/repoview/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 30 Mar 2005 15:18:00 -0000 1.2 +++ sources 24 Sep 2005 03:16:21 -0000 1.3 @@ -1 +1 @@ -03a14fccdb7cae46d3a6da9f1069ca14 repoview-0.3.tar.gz +d0d10417310ea5e4e03c84ec33ec1129 repoview-0.4.tar.gz From fedora-extras-commits at redhat.com Sat Sep 24 03:20:47 2005 From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon)) Date: Fri, 23 Sep 2005 23:20:47 -0400 Subject: rpms/repoview/devel .cvsignore, 1.2, 1.3 repoview.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200509240320.j8O3KlSx013080@cvs-int.fedora.redhat.com> Author: icon Update of /cvs/extras/rpms/repoview/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13057 Modified Files: .cvsignore repoview.spec sources Log Message: Version 0.4 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/repoview/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 30 Mar 2005 15:18:00 -0000 1.2 +++ .cvsignore 24 Sep 2005 03:20:45 -0000 1.3 @@ -1 +1 @@ -repoview-0.3.tar.gz +repoview-0.4.tar.gz Index: repoview.spec =================================================================== RCS file: /cvs/extras/rpms/repoview/devel/repoview.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- repoview.spec 4 Apr 2005 21:09:47 -0000 1.2 +++ repoview.spec 24 Sep 2005 03:20:45 -0000 1.3 @@ -1,16 +1,16 @@ Name: repoview -Version: 0.3 -Release: 3 +Version: 0.4 +Release: 1%{?dist} Summary: Creates a set of static HTML pages in a yum repository Group: Applications/System License: GPL URL: http://linux.duke.edu/projects/mini/repoview -Source0: http://linux.duke.edu/projects/mini/repoview/download/repoview-0.3.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-root +Source0: http://linux.duke.edu/projects/mini/repoview/download/%{name}-%{version}.tar.gz +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -Requires: python-kid >= 0.6.3, python-elementtree +Requires: python-kid >= 0.6.3, yum >= 2.3 %description RepoView creates a set of static HTML pages in a yum repository for easy @@ -52,6 +52,12 @@ %changelog +* Fri Sep 23 2005 Konstantin Ryabitsev - 0.4-1 +- Version 0.4 +- Require yum >= 2.3 +- Drop requirement for python-elementtree, since it's required by yum +- Disttagging. + * Mon Apr 04 2005 Konstantin Ryabitsev 0.3-3 - Do not BuildRequire sed -- basic enough dependency, even for version 4. Index: sources =================================================================== RCS file: /cvs/extras/rpms/repoview/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 30 Mar 2005 15:18:00 -0000 1.2 +++ sources 24 Sep 2005 03:20:45 -0000 1.3 @@ -1 +1 @@ -03a14fccdb7cae46d3a6da9f1069ca14 repoview-0.3.tar.gz +d0d10417310ea5e4e03c84ec33ec1129 repoview-0.4.tar.gz From rc040203 at freenet.de Sat Sep 24 03:47:55 2005 From: rc040203 at freenet.de (Ralf Corsepius) Date: Sat, 24 Sep 2005 05:47:55 +0200 Subject: rpms/perl-Log-Dispatch/devel perl-Log-Dispatch.spec,1.2,1.3 In-Reply-To: <43349DBC.7030906@di.uminho.pt> References: <200509221748.j8MHmXV9021423@cvs-int.fedora.redhat.com> <1127461922.7815.103.camel@mccallum.corsepiu.local> <43349DBC.7030906@di.uminho.pt> Message-ID: <1127533675.7815.152.camel@mccallum.corsepiu.local> On Sat, 2005-09-24 at 01:28 +0100, Jos? Pedro Oliveira wrote: > Ralf Corsepius wrote: > > On Thu, 2005-09-22 at 13:48 -0400, Jose Pedro Oliveira wrote: > > > >>Author: jpo > >> > >>Update of /cvs/extras/rpms/perl-Log-Dispatch/devel > >>In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21370/devel > >> > >>Modified Files: > >> perl-Log-Dispatch.spec > >>Log Message: > >>- Exclude mod_perl from the requirements list > >> (overkill for most applications using Log::Dispatch). > > > > > > VETO > > > > IMO, this decision is a fault and should be reverted. You are breaking > > package dependencies. > > I disagree with your opinion and I believe my decision is correct. > > Reasoning: > > 1) to create an ApacheLog dispatcher you need to supply an Apache > object (see > http://search.cpan.org/dist/Log-Dispatch/lib/Log/Dispatch/ApacheLog.pm) > > 2) you can only obtain an Apache* object if your app is running > under mod_perl ApacheLog.pm does not depend on mod_perl. It depends on perl(Apache2::Log), which currently just happens to be provided by mod_perl. So, if you split out ApacheLog.pm into a separate sub package, the whole problem is gone. I.e. a new perl-Log-Dispatch-ApacheLog subpackage would Require: perl(Apache2::Log) which would cause installation to implicitly/indirectly pull-in mod_perl. > So, your app should be the one requiring mod_perl and not > perl-Log-Dispatch. > > Also, when installing this perl package using CPAN you are not > required to install mod_perl (see Build.PL). > > This kind of requirements nightmare can even get worst if we > start to talk about Log::Log4perl which uses Log::Dispatch. I am not familiar with Log::Log4perl, but I don't see where the problem is. AFAIS, the only part inside of the current perl-Log-Dispatch package which indirectly depends on something inside of mod_perl is ApacheLog.pm. I.e. this all is ordinary perl module dependencies. > > If you find this dependency to be too annoying, you probably better > > should consider to package > > %perl_vendordir/Log/Dispatch/ApacheLog.pm > > into a separate subpackage. > > This could be a solution if there are packages that need > perl-Log-Dispatch to install mod_perl and apache (I never > came across one). Ralf From fedora-extras-commits at redhat.com Sat Sep 24 04:17:16 2005 From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon)) Date: Sat, 24 Sep 2005 00:17:16 -0400 Subject: rpms/verbiste/FC-4 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 verbiste.spec, 1.5, 1.6 Message-ID: <200509240417.j8O4HGP7014645@cvs-int.fedora.redhat.com> Author: icon Update of /cvs/extras/rpms/verbiste/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14621 Modified Files: .cvsignore sources verbiste.spec Log Message: Version 0.1.12 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/verbiste/FC-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 6 May 2005 19:53:18 -0000 1.3 +++ .cvsignore 24 Sep 2005 04:17:14 -0000 1.4 @@ -1 +1 @@ -verbiste-0.1.11.tar.gz +verbiste-0.1.12.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/verbiste/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 6 May 2005 19:53:18 -0000 1.3 +++ sources 24 Sep 2005 04:17:14 -0000 1.4 @@ -1 +1 @@ -8cce96efa9764ca57ba444524b4aeb19 verbiste-0.1.11.tar.gz +291f28dbb1fa4b160d2193ea7c141041 verbiste-0.1.12.tar.gz Index: verbiste.spec =================================================================== RCS file: /cvs/extras/rpms/verbiste/FC-4/verbiste.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- verbiste.spec 9 May 2005 21:12:28 -0000 1.5 +++ verbiste.spec 24 Sep 2005 04:17:14 -0000 1.6 @@ -1,6 +1,6 @@ Name: verbiste -Version: 0.1.11 -Release: 2 +Version: 0.1.12 +Release: 1 Summary: French conjugation system Group: Applications/Text @@ -101,6 +101,9 @@ %changelog +* Fri Sep 23 2005 Konstantin Ryabitsev - 0.1.12-1 +- Version 0.1.12. + * Mon May 09 2005 Konstantin Ryabitsev - 0.1.11-2 - Remove /usr/share/locale/locale.alias created on x86_64 on the buildsystem. From fedora-extras-commits at redhat.com Sat Sep 24 04:18:15 2005 From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon)) Date: Sat, 24 Sep 2005 00:18:15 -0400 Subject: rpms/verbiste/FC-4 verbiste.spec,1.6,1.7 Message-ID: <200509240418.j8O4Ijiu014671@cvs-int.fedora.redhat.com> Author: icon Update of /cvs/extras/rpms/verbiste/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14652 Modified Files: verbiste.spec Log Message: Add disttag. Index: verbiste.spec =================================================================== RCS file: /cvs/extras/rpms/verbiste/FC-4/verbiste.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- verbiste.spec 24 Sep 2005 04:17:14 -0000 1.6 +++ verbiste.spec 24 Sep 2005 04:18:13 -0000 1.7 @@ -1,6 +1,6 @@ Name: verbiste Version: 0.1.12 -Release: 1 +Release: 1%{?dist} Summary: French conjugation system Group: Applications/Text @@ -103,6 +103,7 @@ %changelog * Fri Sep 23 2005 Konstantin Ryabitsev - 0.1.12-1 - Version 0.1.12. +- Disttagging. * Mon May 09 2005 Konstantin Ryabitsev - 0.1.11-2 - Remove /usr/share/locale/locale.alias created on x86_64 on the From fedora-extras-commits at redhat.com Sat Sep 24 04:20:05 2005 From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon)) Date: Sat, 24 Sep 2005 00:20:05 -0400 Subject: rpms/verbiste/devel .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 verbiste.spec, 1.5, 1.6 Message-ID: <200509240420.j8O4K5oH014706@cvs-int.fedora.redhat.com> Author: icon Update of /cvs/extras/rpms/verbiste/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14683 Modified Files: .cvsignore sources verbiste.spec Log Message: Version 0.1.12 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/verbiste/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 6 May 2005 19:53:18 -0000 1.3 +++ .cvsignore 24 Sep 2005 04:20:03 -0000 1.4 @@ -1 +1 @@ -verbiste-0.1.11.tar.gz +verbiste-0.1.12.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/verbiste/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 6 May 2005 19:53:18 -0000 1.3 +++ sources 24 Sep 2005 04:20:03 -0000 1.4 @@ -1 +1 @@ -8cce96efa9764ca57ba444524b4aeb19 verbiste-0.1.11.tar.gz +291f28dbb1fa4b160d2193ea7c141041 verbiste-0.1.12.tar.gz Index: verbiste.spec =================================================================== RCS file: /cvs/extras/rpms/verbiste/devel/verbiste.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- verbiste.spec 9 May 2005 21:12:28 -0000 1.5 +++ verbiste.spec 24 Sep 2005 04:20:03 -0000 1.6 @@ -1,6 +1,6 @@ Name: verbiste -Version: 0.1.11 -Release: 2 +Version: 0.1.12 +Release: 1%{?dist} Summary: French conjugation system Group: Applications/Text @@ -101,6 +101,10 @@ %changelog +* Fri Sep 23 2005 Konstantin Ryabitsev - 0.1.12-1 +- Version 0.1.12. +- Disttagging. + * Mon May 09 2005 Konstantin Ryabitsev - 0.1.11-2 - Remove /usr/share/locale/locale.alias created on x86_64 on the buildsystem. From fedora-extras-commits at redhat.com Sat Sep 24 12:08:47 2005 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Sat, 24 Sep 2005 08:08:47 -0400 Subject: rpms/tagtool - New directory Message-ID: <200509241208.j8OC8lUU026853@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/tagtool In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26838/tagtool Log Message: Directory /cvs/extras/rpms/tagtool added to the repository From fedora-extras-commits at redhat.com Sat Sep 24 12:08:49 2005 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Sat, 24 Sep 2005 08:08:49 -0400 Subject: rpms/tagtool/devel - New directory Message-ID: <200509241208.j8OC8nU4026876@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/tagtool/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26838/tagtool/devel Log Message: Directory /cvs/extras/rpms/tagtool/devel added to the repository From fedora-extras-commits at redhat.com Sat Sep 24 12:09:13 2005 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Sat, 24 Sep 2005 08:09:13 -0400 Subject: rpms/tagtool/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200509241209.j8OC9Djd026937@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/tagtool/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26895/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module tagtool --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Sat Sep 24 12:09:11 2005 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Sat, 24 Sep 2005 08:09:11 -0400 Subject: rpms/tagtool Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200509241209.j8OC9Br5026922@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/tagtool In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26895 Added Files: Makefile import.log Log Message: Setup of module tagtool --- NEW FILE Makefile --- # Top level Makefile for module tagtool all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Sat Sep 24 12:09:46 2005 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Sat, 24 Sep 2005 08:09:46 -0400 Subject: rpms/tagtool import.log,1.1,1.2 Message-ID: <200509241209.j8OC9knR027023@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/tagtool In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26987 Modified Files: import.log Log Message: auto-import tagtool-0.12.2-2 on branch devel from tagtool-0.12.2-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/tagtool/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 24 Sep 2005 12:09:09 -0000 1.1 +++ import.log 24 Sep 2005 12:09:44 -0000 1.2 @@ -0,0 +1 @@ +tagtool-0_12_2-2:HEAD:tagtool-0.12.2-2.src.rpm:1127563780 From fedora-extras-commits at redhat.com Sat Sep 24 12:09:46 2005 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Sat, 24 Sep 2005 08:09:46 -0400 Subject: rpms/tagtool/devel tagtool-contents.patch, NONE, 1.1 tagtool.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200509241209.j8OC9kHg027031@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/tagtool/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26987/devel Modified Files: .cvsignore sources Added Files: tagtool-contents.patch tagtool.spec Log Message: auto-import tagtool-0.12.2-2 on branch devel from tagtool-0.12.2-2.src.rpm tagtool-contents.patch: --- NEW FILE tagtool-contents.patch --- diff -ur tagtool-0.12.2.OLD/src/main_win.c tagtool-0.12.2/src/main_win.c --- tagtool-0.12.2.OLD/src/main_win.c 2005-05-26 05:44:21.000000000 -0400 +++ tagtool-0.12.2/src/main_win.c 2005-09-16 15:08:45.000000000 -0400 @@ -61,15 +61,6 @@ prefs_display(); } -void cb_help_contents(GtkWidget *widget, GdkEvent *event) -{ - GError *err = NULL; - - // XXX - should check with g_find_program_in_path() - - g_spawn_command_line_async ("yelp "HELPDIR"tagtool.xml", &err); -} - void cb_help_about(GtkWidget *widget, GdkEvent *event) { about_display(); diff -ur tagtool-0.12.2.OLD/src/tagtool.glade tagtool-0.12.2/src/tagtool.glade --- tagtool-0.12.2.OLD/src/tagtool.glade 2005-05-26 11:12:54.000000000 -0400 +++ tagtool-0.12.2/src/tagtool.glade 2005-09-16 16:08:50.000000000 -0400 @@ -274,27 +274,6 @@ - - True - Contents... - True - - - - - True - gtk-help - 1 - 0.5 - 0.5 - 0 - 0 - - - - - - True About... --- NEW FILE tagtool.spec --- Name: tagtool Version: 0.12.2 Release: 2 Summary: Ogg Vorbis and MP3 tag manager Group: Applications/Multimedia License: GPL URL: http://pwp.netcabo.pt/paol/tagtool/ Source0: http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.gz Patch1: %{name}-contents.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libglade2-devel BuildRequires: libvorbis-devel BuildRequires: id3lib-devel BuildRequires: desktop-file-utils BuildRequires: gettext Requires(post): desktop-file-utils Requires(postun):desktop-file-utils %description Audio Tag Tool is a program to manage the information fields in MP3 and Ogg Vorbis files. It can be used to edit tags one by one, but the most useful features are mass tag and mass rename. These are designed to tag or rename hundreds of files at once, in any desired format. %prep %setup -q %patch1 -p1 -b .contents %build %configure make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT %find_lang %{name} desktop-file-install --vendor fedora --delete-original \ --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ --add-category X-Fedora \ --add-category AudioVideoEditing \ --add-category AudioVideo \ --add-category Application \ $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop %clean rm -rf $RPM_BUILD_ROOT %post update-desktop-database &> /dev/null ||: %postun update-desktop-database &> /dev/null ||: %files -f %{name}.lang %defattr(-,root,root,-) %doc AUTHORS BUGS COPYING ChangeLog NEWS README %{_bindir}/%{name} %{_datadir}/applications/fedora-%{name}.desktop %{_datadir}/%{name}/ %{_datadir}/pixmaps/TagTool.png %changelog * Fri Sep 23 2005 Brian Pepple - 0.12.2-2 - Drop redundant BR's: gtk2-devel, libxml2-devel. - Add missing scriplets for desktop-database. - Merge directories. * Fri Sep 16 2005 Brian Pepple - 0.12.2-1 - Initial Fedora Extras spec. - Add patch to remove content from menu, since no help file is provided. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/tagtool/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 24 Sep 2005 12:09:11 -0000 1.1 +++ .cvsignore 24 Sep 2005 12:09:44 -0000 1.2 @@ -0,0 +1 @@ +tagtool-0.12.2.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/tagtool/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 24 Sep 2005 12:09:11 -0000 1.1 +++ sources 24 Sep 2005 12:09:44 -0000 1.2 @@ -0,0 +1 @@ +4d688dbbe7cd8a08a9f9faef4d1c5b27 tagtool-0.12.2.tar.gz From fedora-extras-commits at redhat.com Sat Sep 24 12:12:59 2005 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Sat, 24 Sep 2005 08:12:59 -0400 Subject: owners owners.list,1.247,1.248 Message-ID: <200509241212.j8OCCxSf027095@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27076 Modified Files: owners.list Log Message: Add tagtool Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.247 retrieving revision 1.248 diff -u -r1.247 -r1.248 --- owners.list 23 Sep 2005 18:45:19 -0000 1.247 +++ owners.list 24 Sep 2005 12:12:57 -0000 1.248 @@ -973,6 +973,7 @@ Fedora Extras|t1lib|PostScript Type 1 font rasterizer|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| Fedora Extras|t1utils|Collection of Type 1 and 2 font manipulation utilities|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| Fedora Extras|taglib|Audio Meta-Data Library|gauret at free.fr|extras-qa at fedoraproject.org| +Fedora Extras|tagtool|Ogg Vorbis and MP3 tag manager|bdpepple at ameritech.net|extras-qa at fedoraproject.org| Fedora Extras|tdl|To-do list manager|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| Fedora Extras|Terminal|Xfce Terminal Emulator|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org| Fedora Extras|tetex-arabtex|The ArabTeX package for TeX/LaTeX|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| From chris at chrisgrau.com Sat Sep 24 16:11:17 2005 From: chris at chrisgrau.com (Chris Grau) Date: Sat, 24 Sep 2005 09:11:17 -0700 Subject: rpms/perl-Log-Dispatch/devel perl-Log-Dispatch.spec,1.2,1.3 In-Reply-To: <1127533675.7815.152.camel@mccallum.corsepiu.local> References: <200509221748.j8MHmXV9021423@cvs-int.fedora.redhat.com> <1127461922.7815.103.camel@mccallum.corsepiu.local> <43349DBC.7030906@di.uminho.pt> <1127533675.7815.152.camel@mccallum.corsepiu.local> Message-ID: <20050924161116.GA14207@chrisgrau.com> On Sat, Sep 24, 2005 at 05:47:55AM +0200, Ralf Corsepius wrote: > On Sat, 2005-09-24 at 01:28 +0100, Jos? Pedro Oliveira wrote: > > Ralf Corsepius wrote: > > > On Thu, 2005-09-22 at 13:48 -0400, Jose Pedro Oliveira wrote: > > > > > >>Author: jpo > > >> > > >>Update of /cvs/extras/rpms/perl-Log-Dispatch/devel > > >>In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21370/devel > > >> > > >>Modified Files: > > >> perl-Log-Dispatch.spec > > >>Log Message: > > >>- Exclude mod_perl from the requirements list > > >> (overkill for most applications using Log::Dispatch). > > > > > > > > > VETO > > > > > > IMO, this decision is a fault and should be reverted. You are breaking > > > package dependencies. > > > > I disagree with your opinion and I believe my decision is correct. > > > > Reasoning: > > > > 1) to create an ApacheLog dispatcher you need to supply an Apache > > object (see > > http://search.cpan.org/dist/Log-Dispatch/lib/Log/Dispatch/ApacheLog.pm) > > > > 2) you can only obtain an Apache* object if your app is running > > under mod_perl > > ApacheLog.pm does not depend on mod_perl. It depends on > perl(Apache2::Log), which currently just happens to be provided by > mod_perl. And probably always will be. It's an integral part of mod_perl. As Jos? wrote, Log::Dispatch::ApacheLog will always require an Apache2::RequestRec object and thus mod_perl. I don't know what percentage of the Log::Dispatch user space uses it in conjunction with mod_perl, but it's a certainty that those users will have mod_perl installed anyway. Thus the dependencies don't need to be forced by RPM. > So, if you split out ApacheLog.pm into a separate sub package, the whole > problem is gone. > > I.e. a new perl-Log-Dispatch-ApacheLog subpackage would > Require: perl(Apache2::Log) > which would cause installation to implicitly/indirectly pull-in > mod_perl. Since the filtering method appears to be unpopular, this is the solution I'd prefer to see. I use Log::Dispatch both with and without mod_perl, and I'd hate to see it pull in mod_perl (and thus httpd) on those systems that don't need it. > > So, your app should be the one requiring mod_perl and not > > perl-Log-Dispatch. > > > > Also, when installing this perl package using CPAN you are not > > required to install mod_perl (see Build.PL). > > > > This kind of requirements nightmare can even get worst if we > > start to talk about Log::Log4perl which uses Log::Dispatch. > I am not familiar with Log::Log4perl, but I don't see where the problem > is. > > AFAIS, the only part inside of the current perl-Log-Dispatch package > which indirectly depends on something inside of mod_perl is > ApacheLog.pm. > > I.e. this all is ordinary perl module dependencies. > > > > If you find this dependency to be too annoying, you probably better > > > should consider to package > > > %perl_vendordir/Log/Dispatch/ApacheLog.pm > > > into a separate subpackage. > > > > This could be a solution if there are packages that need > > perl-Log-Dispatch to install mod_perl and apache (I never > > came across one). > > Ralf -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 189 bytes Desc: not available URL: From fedora-extras-commits at redhat.com Sat Sep 24 16:34:55 2005 From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard)) Date: Sat, 24 Sep 2005 12:34:55 -0400 Subject: rpms/colorscheme/FC-4 .cvsignore, 1.2, 1.3 colorscheme.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200509241635.j8OGZPmO000585@cvs-int.fedora.redhat.com> Author: abompard Update of /cvs/extras/rpms/colorscheme/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv543/FC-4 Modified Files: .cvsignore colorscheme.spec sources Log Message: - version 0.2.2 - drop patch (applied upstream) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/colorscheme/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 20 Sep 2005 07:49:28 -0000 1.2 +++ .cvsignore 24 Sep 2005 16:34:52 -0000 1.3 @@ -1 +1 @@ -colorscheme-0.2.1.tar.bz2 +colorscheme-0.2.2.tar.bz2 Index: colorscheme.spec =================================================================== RCS file: /cvs/extras/rpms/colorscheme/FC-4/colorscheme.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- colorscheme.spec 20 Sep 2005 07:49:28 -0000 1.1 +++ colorscheme.spec 24 Sep 2005 16:34:52 -0000 1.2 @@ -1,12 +1,12 @@ Name: colorscheme -Version: 0.2.1 +Version: 0.2.2 Release: 1%{?dist} Summary: Generate a variety of colorschemes from a single starting color Group: Applications/Multimedia License: GPL URL: http://home.gna.org/colorscheme/ -Source0: http://download.gna.org/colorscheme/0.2/colorscheme-0.2.1.tar.bz2 +Source0: http://download.gna.org/colorscheme/0.2/colorscheme-0.2.2.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gtkmm24-devel >= 2.5, libgnomeui-devel >= 2.0, desktop-file-utils @@ -61,5 +61,12 @@ %changelog +* Sat Sep 24 2005 Aurelien Bompard 0.2.2-1 +- version 0.2.2 +- drop patch (applied upstream) + +* Wed Sep 21 2005 Aurelien Bompard 0.2.1-2 +- add patch for missing include + * Sun Sep 18 2005 Aurelien Bompard 0.2.1-1 - initial Fedora package (reviewed in bug 168635) Index: sources =================================================================== RCS file: /cvs/extras/rpms/colorscheme/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 20 Sep 2005 07:49:28 -0000 1.2 +++ sources 24 Sep 2005 16:34:53 -0000 1.3 @@ -1 +1 @@ -e1465624d3373b5593b7c6ca25856aee colorscheme-0.2.1.tar.bz2 +0106bd04856d89181984ea8fa1c4647c colorscheme-0.2.2.tar.bz2 From fedora-extras-commits at redhat.com Sat Sep 24 16:34:56 2005 From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard)) Date: Sat, 24 Sep 2005 12:34:56 -0400 Subject: rpms/colorscheme/devel .cvsignore, 1.2, 1.3 colorscheme.spec, 1.2, 1.3 sources, 1.2, 1.3 colorscheme-0.2.1-include64.patch, 1.1, NONE Message-ID: <200509241635.j8OGZQnl000590@cvs-int.fedora.redhat.com> Author: abompard Update of /cvs/extras/rpms/colorscheme/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv543/devel Modified Files: .cvsignore colorscheme.spec sources Removed Files: colorscheme-0.2.1-include64.patch Log Message: - version 0.2.2 - drop patch (applied upstream) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/colorscheme/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 20 Sep 2005 07:49:28 -0000 1.2 +++ .cvsignore 24 Sep 2005 16:34:54 -0000 1.3 @@ -1 +1 @@ -colorscheme-0.2.1.tar.bz2 +colorscheme-0.2.2.tar.bz2 Index: colorscheme.spec =================================================================== RCS file: /cvs/extras/rpms/colorscheme/devel/colorscheme.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- colorscheme.spec 21 Sep 2005 20:07:24 -0000 1.2 +++ colorscheme.spec 24 Sep 2005 16:34:54 -0000 1.3 @@ -1,13 +1,12 @@ Name: colorscheme -Version: 0.2.1 -Release: 2%{?dist} +Version: 0.2.2 +Release: 1%{?dist} Summary: Generate a variety of colorschemes from a single starting color Group: Applications/Multimedia License: GPL URL: http://home.gna.org/colorscheme/ -Source0: http://download.gna.org/colorscheme/0.2/colorscheme-0.2.1.tar.bz2 -Patch0: colorscheme-0.2.1-include64.patch +Source0: http://download.gna.org/colorscheme/0.2/colorscheme-0.2.2.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gtkmm24-devel >= 2.5, libgnomeui-devel >= 2.0, desktop-file-utils @@ -25,7 +24,6 @@ %prep %setup -q -%patch0 -p1 -b .include64 %build @@ -63,6 +61,10 @@ %changelog +* Sat Sep 24 2005 Aurelien Bompard 0.2.2-1 +- version 0.2.2 +- drop patch (applied upstream) + * Wed Sep 21 2005 Aurelien Bompard 0.2.1-2 - add patch for missing include Index: sources =================================================================== RCS file: /cvs/extras/rpms/colorscheme/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 20 Sep 2005 07:49:28 -0000 1.2 +++ sources 24 Sep 2005 16:34:54 -0000 1.3 @@ -1 +1 @@ -e1465624d3373b5593b7c6ca25856aee colorscheme-0.2.1.tar.bz2 +0106bd04856d89181984ea8fa1c4647c colorscheme-0.2.2.tar.bz2 --- colorscheme-0.2.1-include64.patch DELETED --- From fedora-extras-commits at redhat.com Sat Sep 24 19:21:50 2005 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Sat, 24 Sep 2005 15:21:50 -0400 Subject: rpms/perl-BerkeleyDB/devel perl-BerkeleyDB.spec,1.3,1.4 Message-ID: <200509241921.j8OJLoep005019@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-BerkeleyDB/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5000 Modified Files: perl-BerkeleyDB.spec Log Message: bump Index: perl-BerkeleyDB.spec =================================================================== RCS file: /cvs/extras/rpms/perl-BerkeleyDB/devel/perl-BerkeleyDB.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- perl-BerkeleyDB.spec 6 Sep 2005 00:14:34 -0000 1.3 +++ perl-BerkeleyDB.spec 24 Sep 2005 19:21:47 -0000 1.4 @@ -1,6 +1,6 @@ Name: perl-BerkeleyDB Version: 0.26 -Release: 4%{?dist} +Release: 5%{?dist} Summary: BerkeleyDB Perl module License: GPL or Artistic Group: Development/Libraries @@ -60,6 +60,9 @@ %{_bindir}/* %changelog +* Sat Sep 24 2005 Steven Pritchard 0.26-5 +- Rebuild for new db4 in rawhide + * Mon Sep 05 2005 Steven Pritchard 0.26-4 - Spec cleanup - Include COPYING and Artistic From fedora-extras-commits at redhat.com Sun Sep 25 12:46:01 2005 From: fedora-extras-commits at redhat.com (Marc Maurer (uwog)) Date: Sun, 25 Sep 2005 08:46:01 -0400 Subject: rpms/gtkmathview/devel .cvsignore, 1.3, 1.4 gtkmathview.spec, 1.2, 1.3 sources, 1.3, 1.4 Message-ID: <200509251246.j8PCk1sc002586@cvs-int.fedora.redhat.com> Author: uwog Update of /cvs/extras/rpms/gtkmathview/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2563 Modified Files: .cvsignore gtkmathview.spec sources Log Message: Update to 0.7.5 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gtkmathview/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 12 Sep 2005 09:27:37 -0000 1.3 +++ .cvsignore 25 Sep 2005 12:45:58 -0000 1.4 @@ -1 +1 @@ -gtkmathview-0.7.4.tar.gz +gtkmathview-0.7.5.tar.gz Index: gtkmathview.spec =================================================================== RCS file: /cvs/extras/rpms/gtkmathview/devel/gtkmathview.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- gtkmathview.spec 12 Sep 2005 09:26:42 -0000 1.2 +++ gtkmathview.spec 25 Sep 2005 12:45:58 -0000 1.3 @@ -1,6 +1,6 @@ Summary: A MathML rendering library Name: gtkmathview -Version: 0.7.4 +Version: 0.7.5 Release: 1 Group: System Environment/Libraries License: GPL @@ -75,6 +75,9 @@ rm -r $RPM_BUILD_ROOT %changelog +* Sun Sep 25 2005 Marc Maurer - 0.7.5-1 +- Update to 0.7.5 + * Mon Sep 12 2005 Marc Maurer - 0.7.4-1 - Update to 0.7.4 Index: sources =================================================================== RCS file: /cvs/extras/rpms/gtkmathview/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 12 Sep 2005 09:27:37 -0000 1.3 +++ sources 25 Sep 2005 12:45:58 -0000 1.4 @@ -1 +1 @@ -3309357cfc4d09854da046773f14d919 gtkmathview-0.7.4.tar.gz +94a4415a8226874075037a88972baa11 gtkmathview-0.7.5.tar.gz From fedora-extras-commits at redhat.com Sun Sep 25 16:07:32 2005 From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl)) Date: Sun, 25 Sep 2005 12:07:32 -0400 Subject: rpms/baobab/devel .cvsignore, 1.2, 1.3 baobab.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200509251607.j8PG7WAZ008348@cvs-int.fedora.redhat.com> Author: thl Update of /cvs/extras/rpms/baobab/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8327 Modified Files: .cvsignore baobab.spec sources Log Message: update to 1.2.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/baobab/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 13 Sep 2005 07:33:23 -0000 1.2 +++ .cvsignore 25 Sep 2005 16:07:29 -0000 1.3 @@ -1 +1 @@ -baobab-1.1.0.tar.gz +baobab-1.2.0.tar.gz Index: baobab.spec =================================================================== RCS file: /cvs/extras/rpms/baobab/devel/baobab.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- baobab.spec 13 Sep 2005 13:56:41 -0000 1.2 +++ baobab.spec 25 Sep 2005 16:07:29 -0000 1.3 @@ -1,12 +1,12 @@ Name: baobab -Version: 1.1.0 -Release: 3%{?dist} +Version: 1.2.0 +Release: 1%{?dist} Summary: Graphical tool to analyse directory trees Group: Applications/System License: GPL URL: http://www.marzocca.net/linux/baobab.html -Source0: http://www.marzocca.net/linux/downloads/baobab-1.1.0.tar.gz +Source0: http://www.marzocca.net/linux/downloads/baobab-1.2.0.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gtk2-devel >= 2.6 @@ -57,6 +57,9 @@ %changelog +* Sun Sep 25 2005 Thorsten Leemhuis - 1.2.0-1 +- Update to 1.2.0 + * Sat Sep 10 2005 Thorsten Leemhuis - 1.1.0-3 - Don't ship INSTALL in doc as suggested by adrianr in #167940 Index: sources =================================================================== RCS file: /cvs/extras/rpms/baobab/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 13 Sep 2005 07:33:23 -0000 1.2 +++ sources 25 Sep 2005 16:07:29 -0000 1.3 @@ -1 +1 @@ -7387ab6621beaba07daaa02c85cbe1a0 baobab-1.1.0.tar.gz +a2917d5c6b5f867d71e77832ea2f0801 baobab-1.2.0.tar.gz From fedora-extras-commits at redhat.com Sun Sep 25 16:21:17 2005 From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl)) Date: Sun, 25 Sep 2005 12:21:17 -0400 Subject: rpms/baobab/FC-4 .cvsignore, 1.2, 1.3 baobab.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200509251621.j8PGLHOm008476@cvs-int.fedora.redhat.com> Author: thl Update of /cvs/extras/rpms/baobab/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8453 Modified Files: .cvsignore baobab.spec sources Log Message: update to 1.2.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/baobab/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 13 Sep 2005 07:33:23 -0000 1.2 +++ .cvsignore 25 Sep 2005 16:21:15 -0000 1.3 @@ -1 +1 @@ -baobab-1.1.0.tar.gz +baobab-1.2.0.tar.gz Index: baobab.spec =================================================================== RCS file: /cvs/extras/rpms/baobab/FC-4/baobab.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- baobab.spec 13 Sep 2005 13:56:40 -0000 1.2 +++ baobab.spec 25 Sep 2005 16:21:15 -0000 1.3 @@ -1,12 +1,12 @@ Name: baobab -Version: 1.1.0 -Release: 3%{?dist} +Version: 1.2.0 +Release: 1%{?dist} Summary: Graphical tool to analyse directory trees Group: Applications/System License: GPL URL: http://www.marzocca.net/linux/baobab.html -Source0: http://www.marzocca.net/linux/downloads/baobab-1.1.0.tar.gz +Source0: http://www.marzocca.net/linux/downloads/baobab-1.2.0.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gtk2-devel >= 2.6 @@ -57,6 +57,9 @@ %changelog +* Sun Sep 25 2005 Thorsten Leemhuis - 1.2.0-1 +- Update to 1.2.0 + * Sat Sep 10 2005 Thorsten Leemhuis - 1.1.0-3 - Don't ship INSTALL in doc as suggested by adrianr in #167940 Index: sources =================================================================== RCS file: /cvs/extras/rpms/baobab/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 13 Sep 2005 07:33:23 -0000 1.2 +++ sources 25 Sep 2005 16:21:15 -0000 1.3 @@ -1 +1 @@ -7387ab6621beaba07daaa02c85cbe1a0 baobab-1.1.0.tar.gz +a2917d5c6b5f867d71e77832ea2f0801 baobab-1.2.0.tar.gz From fedora-extras-commits at redhat.com Sun Sep 25 18:15:23 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Sun, 25 Sep 2005 14:15:23 -0400 Subject: rpms/sylpheed/FC-4 sylpheed-1.0.5-summaryview.patch, NONE, 1.1 sylpheed.spec, 1.11, 1.12 Message-ID: <200509251815.j8PIFNAR011645@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/sylpheed/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11623 Modified Files: sylpheed.spec Added Files: sylpheed-1.0.5-summaryview.patch Log Message: * Sun Sep 25 2005 Michael Schwendt - 1.0.5-2.fc4 - Fix summary view "Delete" skipping first unselected message when deleting multiple messages. sylpheed-1.0.5-summaryview.patch: --- NEW FILE sylpheed-1.0.5-summaryview.patch --- diff -Nur sylpheed-1.0.5-orig/src/summaryview.c sylpheed-1.0.5/src/summaryview.c --- sylpheed-1.0.5-orig/src/summaryview.c 2005-05-26 10:00:43.000000000 +0200 +++ sylpheed-1.0.5/src/summaryview.c 2005-09-25 20:08:32.000000000 +0200 @@ -2402,7 +2402,7 @@ summary_delete_row(summaryview, sel_last); } - node = summary_find_next_msg(summaryview, sel_last); + node = sel_last; if (!node) node = summary_find_prev_msg(summaryview, sel_last); Index: sylpheed.spec =================================================================== RCS file: /cvs/extras/rpms/sylpheed/FC-4/sylpheed.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- sylpheed.spec 17 Jun 2005 17:53:03 -0000 1.11 +++ sylpheed.spec 25 Sep 2005 18:15:21 -0000 1.12 @@ -5,7 +5,7 @@ Summary: GTK+ based, lightweight, and fast email client Name: sylpheed Version: 1.0.5 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL URL: http://sylpheed.good-day.net/ Group: Applications/Internet @@ -21,6 +21,7 @@ Patch1: %{name}-0.8.9-ssl.patch Patch2: sylpheed-default-browser.patch Patch3: sylpheed-1.0.3-desktop.patch +Patch4: sylpheed-1.0.5-summaryview.patch %description This program is an X based fast email client which has features @@ -43,6 +44,7 @@ %patch1 -p1 -b .ssl %patch2 -p1 -b .default-browser %patch3 -p1 -b .desktop +%patch4 -p1 -b .summaryview %build autoconf @@ -81,6 +83,10 @@ %{_mandir}/man1 %changelog +* Sun Sep 25 2005 Michael Schwendt - 1.0.5-2.fc4 +- Fix summary view "Delete" skipping first unselected message + when deleting multiple messages. + * Fri Jun 17 2005 Michael Schwendt - 1.0.5-1.fc4 - Update to 1.0.5 (minor bug fixes). From fedora-extras-commits at redhat.com Sun Sep 25 18:34:46 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Sun, 25 Sep 2005 14:34:46 -0400 Subject: rpms/sylpheed/FC-4 sylpheed-1.0.5-summaryview.patch, 1.1, 1.2 sylpheed.spec, 1.12, 1.13 Message-ID: <200509251834.j8PIYkDI011742@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/sylpheed/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11718 Modified Files: sylpheed-1.0.5-summaryview.patch sylpheed.spec Log Message: * Sun Sep 25 2005 Michael Schwendt - 1.0.5-2.fc4 - Fix summary view Delete/Move skipping first unselected message when deleting/moving multiple messages. sylpheed-1.0.5-summaryview.patch: Index: sylpheed-1.0.5-summaryview.patch =================================================================== RCS file: /cvs/extras/rpms/sylpheed/FC-4/sylpheed-1.0.5-summaryview.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sylpheed-1.0.5-summaryview.patch 25 Sep 2005 18:15:21 -0000 1.1 +++ sylpheed-1.0.5-summaryview.patch 25 Sep 2005 18:34:44 -0000 1.2 @@ -1,6 +1,6 @@ diff -Nur sylpheed-1.0.5-orig/src/summaryview.c sylpheed-1.0.5/src/summaryview.c --- sylpheed-1.0.5-orig/src/summaryview.c 2005-05-26 10:00:43.000000000 +0200 -+++ sylpheed-1.0.5/src/summaryview.c 2005-09-25 20:08:32.000000000 +0200 ++++ sylpheed-1.0.5/src/summaryview.c 2005-09-25 20:32:29.000000000 +0200 @@ -2402,7 +2402,7 @@ summary_delete_row(summaryview, sel_last); } @@ -10,3 +10,12 @@ if (!node) node = summary_find_prev_msg(summaryview, sel_last); +@@ -2548,8 +2548,6 @@ + summary_move_row_to + (summaryview, GTK_CTREE_NODE(cur->data), to_folder); + +- summary_step(summaryview, GTK_SCROLL_STEP_FORWARD); +- + if (prefs_common.immediate_exec) + summary_execute(summaryview); + else Index: sylpheed.spec =================================================================== RCS file: /cvs/extras/rpms/sylpheed/FC-4/sylpheed.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- sylpheed.spec 25 Sep 2005 18:15:21 -0000 1.12 +++ sylpheed.spec 25 Sep 2005 18:34:44 -0000 1.13 @@ -84,8 +84,8 @@ %changelog * Sun Sep 25 2005 Michael Schwendt - 1.0.5-2.fc4 -- Fix summary view "Delete" skipping first unselected message - when deleting multiple messages. +- Fix summary view Delete/Move skipping first unselected message + when deleting/moving multiple messages. * Fri Jun 17 2005 Michael Schwendt - 1.0.5-1.fc4 - Update to 1.0.5 (minor bug fixes). From fedora-extras-commits at redhat.com Sun Sep 25 19:34:10 2005 From: fedora-extras-commits at redhat.com (Marc Maurer (uwog)) Date: Sun, 25 Sep 2005 15:34:10 -0400 Subject: rpms/abiword/FC-4 .cvsignore, 1.6, 1.7 abiword.spec, 1.11, 1.12 sources, 1.6, 1.7 Message-ID: <200509251934.j8PJYAGr013210@cvs-int.fedora.redhat.com> Author: uwog Update of /cvs/extras/rpms/abiword/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13187 Modified Files: .cvsignore abiword.spec sources Log Message: 2.2.10 release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/abiword/FC-4/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 29 Jul 2005 11:33:26 -0000 1.6 +++ .cvsignore 25 Sep 2005 19:34:08 -0000 1.7 @@ -1 +1 @@ -abiword-2.2.9.tar.bz2 +abiword-2.2.10.tar.bz2 Index: abiword.spec =================================================================== RCS file: /cvs/extras/rpms/abiword/FC-4/abiword.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- abiword.spec 29 Jul 2005 11:33:26 -0000 1.11 +++ abiword.spec 25 Sep 2005 19:34:08 -0000 1.12 @@ -2,8 +2,8 @@ Summary: The AbiWord word processor Name: abiword -Version: 2.2.9 -Release: 2%{?dist} +Version: 2.2.10 +Release: 1%{?dist} Epoch: 1 Group: Applications/Editors License: GPL @@ -127,6 +127,9 @@ %{_datadir}/icons/*png %changelog +* Sun Sep 25 2005 Marc Maurer - 1:2.2.10-1.fc4 +- Update to 2.2.10, fixing security issue + * Fri Jul 2 2005 Marc Maurer - 1:2.2.9-2.fc4 - Bump release number Index: sources =================================================================== RCS file: /cvs/extras/rpms/abiword/FC-4/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 29 Jul 2005 11:33:26 -0000 1.6 +++ sources 25 Sep 2005 19:34:08 -0000 1.7 @@ -1 +1 @@ -17fe5169f03643dd59c83af7cf1c448a abiword-2.2.9.tar.bz2 +4aa8838d211129b8fc9c1231bc9df18a abiword-2.2.10.tar.bz2 From fedora-extras-commits at redhat.com Sun Sep 25 19:44:48 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Sun, 25 Sep 2005 15:44:48 -0400 Subject: rpms/sylpheed/FC-4 sylpheed.spec, 1.13, 1.14 sylpheed-1.0.5-summaryview.patch, 1.2, NONE Message-ID: <200509251944.j8PJimjY013291@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/sylpheed/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13272 Modified Files: sylpheed.spec Removed Files: sylpheed-1.0.5-summaryview.patch Log Message: revert for now since there are other problems left Index: sylpheed.spec =================================================================== RCS file: /cvs/extras/rpms/sylpheed/FC-4/sylpheed.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- sylpheed.spec 25 Sep 2005 18:34:44 -0000 1.13 +++ sylpheed.spec 25 Sep 2005 19:44:46 -0000 1.14 @@ -5,7 +5,7 @@ Summary: GTK+ based, lightweight, and fast email client Name: sylpheed Version: 1.0.5 -Release: 2%{?dist} +Release: 1%{?dist} License: GPL URL: http://sylpheed.good-day.net/ Group: Applications/Internet @@ -21,7 +21,6 @@ Patch1: %{name}-0.8.9-ssl.patch Patch2: sylpheed-default-browser.patch Patch3: sylpheed-1.0.3-desktop.patch -Patch4: sylpheed-1.0.5-summaryview.patch %description This program is an X based fast email client which has features @@ -44,7 +43,6 @@ %patch1 -p1 -b .ssl %patch2 -p1 -b .default-browser %patch3 -p1 -b .desktop -%patch4 -p1 -b .summaryview %build autoconf @@ -83,10 +81,6 @@ %{_mandir}/man1 %changelog -* Sun Sep 25 2005 Michael Schwendt - 1.0.5-2.fc4 -- Fix summary view Delete/Move skipping first unselected message - when deleting/moving multiple messages. - * Fri Jun 17 2005 Michael Schwendt - 1.0.5-1.fc4 - Update to 1.0.5 (minor bug fixes). --- sylpheed-1.0.5-summaryview.patch DELETED --- From fedora-extras-commits at redhat.com Sun Sep 25 21:02:27 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sun, 25 Sep 2005 17:02:27 -0400 Subject: rpms/cvsweb/devel .cvsignore, 1.4, 1.5 cvsweb.spec, 1.6, 1.7 sources, 1.4, 1.5 Message-ID: <200509252103.j8PL34Ki016252@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/cvsweb/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16207/devel Modified Files: .cvsignore cvsweb.spec sources Log Message: * Sun Sep 25 2005 Ville Skytt?? - 3.0.6-1 - 3.0.6. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/cvsweb/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 29 May 2005 09:08:45 -0000 1.4 +++ .cvsignore 25 Sep 2005 21:02:24 -0000 1.5 @@ -1 +1 @@ -cvsweb-3.0.5.tar.gz +cvsweb-3.0.6.tar.gz Index: cvsweb.spec =================================================================== RCS file: /cvs/extras/rpms/cvsweb/devel/cvsweb.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- cvsweb.spec 29 May 2005 09:15:27 -0000 1.6 +++ cvsweb.spec 25 Sep 2005 21:02:24 -0000 1.7 @@ -1,6 +1,6 @@ Name: cvsweb -Version: 3.0.5 -Release: 2 +Version: 3.0.6 +Release: 1%{?dist} Summary: Web interface for CVS repositories License: BSD @@ -11,8 +11,9 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -# Perl deps autodetected by rpm. -Requires: rcs, cvs, httpd +Requires: rcs +Requires: cvs +Requires: httpd %description CVSweb is a WWW interface for CVS repositories with which you can @@ -58,6 +59,9 @@ %changelog +* Sun Sep 25 2005 Ville Skytt?? - 3.0.6-1 +- 3.0.6. + * Sun May 29 2005 Ville Skytt?? - 3.0.5-2 - 3.0.5. - Install the sample httpd.conf as doc instead of into place; running Index: sources =================================================================== RCS file: /cvs/extras/rpms/cvsweb/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 29 May 2005 09:08:45 -0000 1.4 +++ sources 25 Sep 2005 21:02:24 -0000 1.5 @@ -1 +1 @@ -572dbb2d66ad6487c0a3536f93023086 cvsweb-3.0.5.tar.gz +0e1eec962b1db00e01b295fff84b6e89 cvsweb-3.0.6.tar.gz From fedora-extras-commits at redhat.com Sun Sep 25 21:02:16 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sun, 25 Sep 2005 17:02:16 -0400 Subject: rpms/cvsweb/FC-4 .cvsignore, 1.4, 1.5 cvsweb.spec, 1.6, 1.7 sources, 1.4, 1.5 Message-ID: <200509252103.j8PL34VD016251@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/cvsweb/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16207/FC-4 Modified Files: .cvsignore cvsweb.spec sources Log Message: * Sun Sep 25 2005 Ville Skytt?? - 3.0.6-1 - 3.0.6. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/cvsweb/FC-4/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 29 May 2005 09:08:45 -0000 1.4 +++ .cvsignore 25 Sep 2005 21:02:14 -0000 1.5 @@ -1 +1 @@ -cvsweb-3.0.5.tar.gz +cvsweb-3.0.6.tar.gz Index: cvsweb.spec =================================================================== RCS file: /cvs/extras/rpms/cvsweb/FC-4/cvsweb.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- cvsweb.spec 29 May 2005 09:15:27 -0000 1.6 +++ cvsweb.spec 25 Sep 2005 21:02:14 -0000 1.7 @@ -1,6 +1,6 @@ Name: cvsweb -Version: 3.0.5 -Release: 2 +Version: 3.0.6 +Release: 1%{?dist} Summary: Web interface for CVS repositories License: BSD @@ -11,8 +11,9 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -# Perl deps autodetected by rpm. -Requires: rcs, cvs, httpd +Requires: rcs +Requires: cvs +Requires: httpd %description CVSweb is a WWW interface for CVS repositories with which you can @@ -58,6 +59,9 @@ %changelog +* Sun Sep 25 2005 Ville Skytt?? - 3.0.6-1 +- 3.0.6. + * Sun May 29 2005 Ville Skytt?? - 3.0.5-2 - 3.0.5. - Install the sample httpd.conf as doc instead of into place; running Index: sources =================================================================== RCS file: /cvs/extras/rpms/cvsweb/FC-4/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 29 May 2005 09:08:45 -0000 1.4 +++ sources 25 Sep 2005 21:02:14 -0000 1.5 @@ -1 +1 @@ -572dbb2d66ad6487c0a3536f93023086 cvsweb-3.0.5.tar.gz +0e1eec962b1db00e01b295fff84b6e89 cvsweb-3.0.6.tar.gz From fedora-extras-commits at redhat.com Sun Sep 25 21:43:31 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sun, 25 Sep 2005 17:43:31 -0400 Subject: rpms/lincity-ng/devel - New directory Message-ID: <200509252143.j8PLhVnI017026@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/lincity-ng/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17001/lincity-ng/devel Log Message: Directory /cvs/extras/rpms/lincity-ng/devel added to the repository From fedora-extras-commits at redhat.com Sun Sep 25 21:43:30 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sun, 25 Sep 2005 17:43:30 -0400 Subject: rpms/lincity-ng - New directory Message-ID: <200509252143.j8PLhUXb017021@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/lincity-ng In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17001/lincity-ng Log Message: Directory /cvs/extras/rpms/lincity-ng added to the repository From fedora-extras-commits at redhat.com Sun Sep 25 21:43:45 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sun, 25 Sep 2005 17:43:45 -0400 Subject: rpms/lincity-ng Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200509252143.j8PLhjpC017075@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/lincity-ng In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17046 Added Files: Makefile import.log Log Message: Setup of module lincity-ng --- NEW FILE Makefile --- # Top level Makefile for module lincity-ng all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Sun Sep 25 21:43:45 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sun, 25 Sep 2005 17:43:45 -0400 Subject: rpms/lincity-ng/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200509252143.j8PLhjS3017080@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/lincity-ng/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17046/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module lincity-ng --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Sun Sep 25 21:45:08 2005 From: fedora-extras-commits at redhat.com (Marc Maurer (uwog)) Date: Sun, 25 Sep 2005 17:45:08 -0400 Subject: rpms/gtkmathview/FC-4 gtkmathview.spec,1.3,1.4 Message-ID: <200509252145.j8PLj8xH017125@cvs-int.fedora.redhat.com> Author: uwog Update of /cvs/extras/rpms/gtkmathview/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17104 Modified Files: gtkmathview.spec Log Message: Initial release on FC-4 Index: gtkmathview.spec =================================================================== RCS file: /cvs/extras/rpms/gtkmathview/FC-4/gtkmathview.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- gtkmathview.spec 25 Sep 2005 12:45:58 -0000 1.3 +++ gtkmathview.spec 25 Sep 2005 21:45:05 -0000 1.4 @@ -1,6 +1,6 @@ Summary: A MathML rendering library Name: gtkmathview -Version: 0.7.5 +Version: 0.7.5%{?dist} Release: 1 Group: System Environment/Libraries License: GPL @@ -75,30 +75,5 @@ rm -r $RPM_BUILD_ROOT %changelog -* Sun Sep 25 2005 Marc Maurer - 0.7.5-1 -- Update to 0.7.5 - -* Mon Sep 12 2005 Marc Maurer - 0.7.4-1 -- Update to 0.7.4 - -* Tue Aug 30 2005 Marc Maurer - 0.7.3-5 -- Drop more unneeded Requires - -* Tue Aug 30 2005 Marc Maurer - 0.7.3-4 -- Drop the explicit Requires - -* Mon Aug 29 2005 Marc Maurer - 0.7.3-3 -- Use smaller lines in the Description field -- Remove the --disable-gmetadom and --without-t1lib flags -- Add a '/' to directories in the files section -- Remove the mathmlviewer man page - -* Tue Aug 23 2005 Marc Maurer - 0.7.3-2 -- Add the proper Requires and Buildrequires -- Make the description field more descriptive -- Add CONTRIBUTORS BUGS LICENSE to the doc section -- Disable gmetadom and t1lib -- Remove the mathml2ps man page - -* Sun Aug 14 2005 Marc Maurer - 0.7.3-1 -- Initial version +* Sun Sep 25 2005 Marc Maurer - 0.7.5-1.fc4 +- Initial release into FC-4 From fedora-extras-commits at redhat.com Sun Sep 25 21:49:26 2005 From: fedora-extras-commits at redhat.com (Marc Maurer (uwog)) Date: Sun, 25 Sep 2005 17:49:26 -0400 Subject: rpms/link-grammar/FC-4 link-grammar.spec,1.1,1.2 Message-ID: <200509252149.j8PLnQIC017197@cvs-int.fedora.redhat.com> Author: uwog Update of /cvs/extras/rpms/link-grammar/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17178 Modified Files: link-grammar.spec Log Message: Initial link-grammar package for fc4 Index: link-grammar.spec =================================================================== RCS file: /cvs/extras/rpms/link-grammar/FC-4/link-grammar.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- link-grammar.spec 11 Aug 2005 13:45:41 -0000 1.1 +++ link-grammar.spec 25 Sep 2005 21:49:24 -0000 1.2 @@ -1,7 +1,7 @@ Summary: A Grammar Checking library Name: link-grammar -Version: 4.1.3 -Release: 3 +Version: 4.1.3%{?dist} +Release: 1 Group: System Environment/Libraries License: BSD-style Source: http://www.abisource.com/downloads/link-grammar/%{version}/link-grammar-%{version}.tar.gz @@ -55,14 +55,5 @@ rm -r $RPM_BUILD_ROOT %changelog -* Wed Aug 10 2005 Marc Maurer - 4.1.3-3 -- Set the buildroot to the standard Fedora buildroot -- Make the package own the %{_datadir}/link-grammar - directory (thanks go to Aurelien Bompard for both issues) - -* Wed Aug 10 2005 Marc Maurer - 4.1.3-2 -- Remove epoch -- Make rpmlint happy - -* Sun Aug 7 2005 Marc Maurer - 1:4.1.3-1 -- Initial version +* Sun Sep 25 2005 Marc Maurer - 4.1.3-1.fc4 +- Initial release for FC4 \ No newline at end of file From fedora-extras-commits at redhat.com Sun Sep 25 21:49:59 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sun, 25 Sep 2005 17:49:59 -0400 Subject: owners owners.list,1.248,1.249 Message-ID: <200509252149.j8PLnxVw017251@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17207 Modified Files: owners.list Log Message: lincity-ng Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.248 retrieving revision 1.249 diff -u -r1.248 -r1.249 --- owners.list 24 Sep 2005 12:12:57 -0000 1.248 +++ owners.list 25 Sep 2005 21:49:57 -0000 1.249 @@ -465,6 +465,7 @@ Fedora Extras|libzvt|ZVT - Zed's Virtual Terminal|compton at pcompton.com|extras-qa at fedoraproject.org| Fedora Extras|liferea|An RSS/RDF feed reader|bdpepple at ameritech.net|extras-qa at fedoraproject.org| Fedora Extras|lighttpd|Lightning fast webserver with light system requirements|matthias at rpmforge.net|extras-qa at fedoraproject.org| +Fedora Extras|lincity-ng|City Simulation Game|tcallawa at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|lincvs|Graphical CVS Client|compton at pcompton.com|extras-qa at fedoraproject.org| Fedora Extras|link-grammar|Library that can perform grammar checking|uwog at uwog.net|extras-qa at fedoraproject.org| Fedora Extras|linphone|Phone anywhere in the whole world by using the Internet|ivazquez at ivazquez.net|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Sun Sep 25 21:54:50 2005 From: fedora-extras-commits at redhat.com (Marc Maurer (uwog)) Date: Sun, 25 Sep 2005 17:54:50 -0400 Subject: rpms/link-grammar/FC-4 link-grammar.spec,1.2,1.3 Message-ID: <200509252154.j8PLsoEW017288@cvs-int.fedora.redhat.com> Author: uwog Update of /cvs/extras/rpms/link-grammar/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17265 Modified Files: link-grammar.spec Log Message: Fix build Index: link-grammar.spec =================================================================== RCS file: /cvs/extras/rpms/link-grammar/FC-4/link-grammar.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- link-grammar.spec 25 Sep 2005 21:49:24 -0000 1.2 +++ link-grammar.spec 25 Sep 2005 21:54:48 -0000 1.3 @@ -1,7 +1,7 @@ Summary: A Grammar Checking library Name: link-grammar -Version: 4.1.3%{?dist} -Release: 1 +Version: 4.1.3 +Release: 2%{?dist} Group: System Environment/Libraries License: BSD-style Source: http://www.abisource.com/downloads/link-grammar/%{version}/link-grammar-%{version}.tar.gz @@ -55,5 +55,8 @@ rm -r $RPM_BUILD_ROOT %changelog +* Sun Sep 25 2005 Marc Maurer - 4.1.3-2.fc4 +- Add %{?dist} to the release field, not the version field + * Sun Sep 25 2005 Marc Maurer - 4.1.3-1.fc4 - Initial release for FC4 \ No newline at end of file From fedora-extras-commits at redhat.com Sun Sep 25 21:56:56 2005 From: fedora-extras-commits at redhat.com (Marc Maurer (uwog)) Date: Sun, 25 Sep 2005 17:56:56 -0400 Subject: rpms/gtkmathview/FC-4 gtkmathview.spec,1.4,1.5 Message-ID: <200509252156.j8PLuurq017351@cvs-int.fedora.redhat.com> Author: uwog Update of /cvs/extras/rpms/gtkmathview/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17332 Modified Files: gtkmathview.spec Log Message: Fix build Index: gtkmathview.spec =================================================================== RCS file: /cvs/extras/rpms/gtkmathview/FC-4/gtkmathview.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- gtkmathview.spec 25 Sep 2005 21:45:05 -0000 1.4 +++ gtkmathview.spec 25 Sep 2005 21:56:53 -0000 1.5 @@ -1,7 +1,7 @@ Summary: A MathML rendering library Name: gtkmathview -Version: 0.7.5%{?dist} -Release: 1 +Version: 0.7.5 +Release: 2%{?dist} Group: System Environment/Libraries License: GPL Source: http://helm.cs.unibo.it/mml-widget/sources/gtkmathview-%{version}.tar.gz @@ -75,5 +75,8 @@ rm -r $RPM_BUILD_ROOT %changelog +* Sun Sep 25 2005 Marc Maurer - 0.7.5-2.fc4 +- Add %{?dist} to the release field, not the version field + * Sun Sep 25 2005 Marc Maurer - 0.7.5-1.fc4 - Initial release into FC-4 From fedora-extras-commits at redhat.com Sun Sep 25 21:59:15 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sun, 25 Sep 2005 17:59:15 -0400 Subject: rpms/lincity-ng import.log,1.1,1.2 Message-ID: <200509252159.j8PLxjKi017438@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/lincity-ng In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17400 Modified Files: import.log Log Message: auto-import lincity-ng-1.0.1-2 on branch devel from lincity-ng-1.0.1-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/lincity-ng/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 25 Sep 2005 21:43:43 -0000 1.1 +++ import.log 25 Sep 2005 21:59:13 -0000 1.2 @@ -0,0 +1 @@ +lincity-ng-1_0_1-2:HEAD:lincity-ng-1.0.1-2.src.rpm:1127685531 From fedora-extras-commits at redhat.com Sun Sep 25 21:59:15 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sun, 25 Sep 2005 17:59:15 -0400 Subject: rpms/lincity-ng/devel lincity-ng.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200509252159.j8PLxkuM017442@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/lincity-ng/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17400/devel Modified Files: .cvsignore sources Added Files: lincity-ng.spec Log Message: auto-import lincity-ng-1.0.1-2 on branch devel from lincity-ng-1.0.1-2.src.rpm --- NEW FILE lincity-ng.spec --- Name: lincity-ng Version: 1.0.1 Release: 2%{?dist} License: GPL Group: Amusements/Games Summary: City Simulation Game URL: http://lincity-ng.berlios.de/ Source0: http://download.berlios.de/lincity-ng/lincity-ng-1.0.1.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: jam, physfs-devel, zlib-devel, libxml2-devel BuildRequires: SDL-devel, SDL_mixer-devel, SDL_image-devel, SDL_gfx-devel BuildRequires: SDL_ttf-devel, xorg-x11-devel, desktop-file-utils Requires: %{name}-data = %{version}-%{release} %description LinCity-NG is a City Simulation Game. It is a polished and improved version of the classic LinCity (http://www.floot.demon.co.uk/lincity.html) game with a new iso-3D graphics engine and a completely redone and modern GUI. %package data Summary: Data files needed to run lincity-ng Group: Amusements/Games Requires: %{name} = %{version}-%{release} %description data This package contains the data files (graphics, models, audio) necessary to play Lincity-NG. %prep %setup -q %build %configure jam %install rm -rf $RPM_BUILD_ROOT DESTDIR=$RPM_BUILD_ROOT jam install desktop-file-install --delete-original \ --vendor fedora \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ --mode 0644 \ --add-category X-Fedora \ $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc %{_datadir}/doc/%{name}-%{version} %{_bindir}/lincity-ng %{_datadir}/pixmaps/* %{_datadir}/applications/fedora-lincity-ng.desktop %files data %defattr(-,root,root,-) %{_datadir}/lincity-ng/ %changelog * Sun Sep 25 2005 Tom "spot" Callaway 1.0.1-2 - split datadir/lincity-ng into its own package - shorten main description * Fri Aug 19 2005 Tom "spot" Callaway 1.0.1-1 - initial package for Fedora Extras Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/lincity-ng/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 25 Sep 2005 21:43:43 -0000 1.1 +++ .cvsignore 25 Sep 2005 21:59:13 -0000 1.2 @@ -0,0 +1 @@ +lincity-ng-1.0.1.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/lincity-ng/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 25 Sep 2005 21:43:43 -0000 1.1 +++ sources 25 Sep 2005 21:59:13 -0000 1.2 @@ -0,0 +1 @@ +1576a0765eb29a668f7af3084de00739 lincity-ng-1.0.1.tar.bz2 From fedora-extras-commits at redhat.com Sun Sep 25 22:07:25 2005 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Sun, 25 Sep 2005 18:07:25 -0400 Subject: rpms/tagtool/FC-4 tagtool.spec,1.1,1.2 Message-ID: <200509252207.j8PM7uTx018841@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/tagtool/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18819 Modified Files: tagtool.spec Log Message: * Sun Sep 25 2005 Brian Pepple - 0.12.2-3 - Add dist tag. Index: tagtool.spec =================================================================== RCS file: /cvs/extras/rpms/tagtool/FC-4/tagtool.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- tagtool.spec 24 Sep 2005 12:09:44 -0000 1.1 +++ tagtool.spec 25 Sep 2005 22:07:21 -0000 1.2 @@ -1,6 +1,6 @@ Name: tagtool Version: 0.12.2 -Release: 2 +Release: 3%{?dist} Summary: Ogg Vorbis and MP3 tag manager Group: Applications/Multimedia @@ -75,6 +75,9 @@ %changelog +* Sun Sep 25 2005 Brian Pepple - 0.12.2-3 +- Add dist tag. + * Fri Sep 23 2005 Brian Pepple - 0.12.2-2 - Drop redundant BR's: gtk2-devel, libxml2-devel. - Add missing scriplets for desktop-database. From fedora-extras-commits at redhat.com Sun Sep 25 22:09:06 2005 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Sun, 25 Sep 2005 18:09:06 -0400 Subject: rpms/tagtool/devel tagtool.spec,1.1,1.2 Message-ID: <200509252209.j8PM9aF5018909@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/tagtool/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18890 Modified Files: tagtool.spec Log Message: * Sun Sep 25 2005 Brian Pepple - 0.12.2-4 - Add dist tag. Index: tagtool.spec =================================================================== RCS file: /cvs/extras/rpms/tagtool/devel/tagtool.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- tagtool.spec 24 Sep 2005 12:09:44 -0000 1.1 +++ tagtool.spec 25 Sep 2005 22:09:03 -0000 1.2 @@ -1,6 +1,6 @@ Name: tagtool Version: 0.12.2 -Release: 2 +Release: 4%{?dist} Summary: Ogg Vorbis and MP3 tag manager Group: Applications/Multimedia @@ -75,6 +75,9 @@ %changelog +* Sun Sep 25 2005 Brian Pepple - 0.12.2-4 +- Add dist tag. + * Fri Sep 23 2005 Brian Pepple - 0.12.2-2 - Drop redundant BR's: gtk2-devel, libxml2-devel. - Add missing scriplets for desktop-database. From fedora-extras-commits at redhat.com Mon Sep 26 08:19:44 2005 From: fedora-extras-commits at redhat.com (Mark Cox (mjc)) Date: Mon, 26 Sep 2005 04:19:44 -0400 Subject: fedora-security/audit fc4,1.62,1.63 Message-ID: <200509260819.j8Q8JipJ001706@cvs-int.fedora.redhat.com> Author: mjc Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1687 Modified Files: fc4 Log Message: Updates for pending Mozilla/Fedora updates, also squid got moved to new upstream version so ensured that all the previously backported issues got addressed in stable11 and note each issue. Fix a 2005->2004 typo Index: fc4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc4,v retrieving revision 1.62 retrieving revision 1.63 diff -u -r1.62 -r1.63 --- fc4 23 Sep 2005 07:45:40 -0000 1.62 +++ fc4 26 Sep 2005 08:19:41 -0000 1.63 @@ -1,5 +1,5 @@ -Up to date CVE as of CVE email 20050922 -Up to date FC4 as of 20050922 +Up to date CVE as of CVE email 20050925 +Up to date FC4 as of 20050925 ** are items that need attention @@ -21,9 +21,29 @@ 2005-2800 backport (kernel, fixed 2.6.12.6) [since FEDORA-2005-906] 2005-2798 version (openssh, fixed 4.2) [since FEDORA-2005-860] 2005-2797 version (openssh, fixed 4.2) [since FEDORA-2005-860] -2005-2796 backport (squid, fixed after 2.5.STABLE10) [since FEDORA-2005-851] -2005-2794 backport (squid, fixed after 2.5.STABLE10) [since FEDORA-2005-851] +2005-2796 version (squid, fixed 2.5.STABLE11) [since FEDORA-2005-913] was backport since FEDORA-2005-851 +2005-2794 version (squid, fixed 2.5.STABLE11) [since FEDORA-2005-913] was backport since FEDORA-2005-851 2005-2728 backport (httpd, fixed 2.0.55-dev) [since FEDORA-2005-849] +2005-2707 VULNERABLE (thunderbird) +2005-2707 VULNERABLE (firefox, fixed 1.0.7) +2005-2707 VULNERABLE (mozilla, fixed 1.7.12) +2005-2706 VULNERABLE (thunderbird) +2005-2706 VULNERABLE (firefox, fixed 1.0.7) +2005-2706 VULNERABLE (mozilla, fixed 1.7.12) +2005-2705 VULNERABLE (thunderbird) +2005-2705 VULNERABLE (firefox, fixed 1.0.7) +2005-2705 VULNERABLE (mozilla, fixed 1.7.12) +2005-2704 VULNERABLE (thunderbird) +2005-2704 VULNERABLE (firefox, fixed 1.0.7) +2005-2704 VULNERABLE (mozilla, fixed 1.7.12) +2005-2703 VULNERABLE (thunderbird) +2005-2703 VULNERABLE (firefox, fixed 1.0.7) +2005-2703 VULNERABLE (mozilla, fixed 1.7.12) +2005-2702 VULNERABLE (thunderbird) +2005-2702 VULNERABLE (firefox, fixed 1.0.7) +2005-2702 VULNERABLE (mozilla, fixed 1.7.12) +2005-2701 VULNERABLE (firefox, fixed 1.0.7) +2005-2701 VULNERABLE (mozilla, fixed 1.7.12) 2005-2700 backport (httpd, fixed 2.0.55-dev) [since FEDORA-2005-849] 2005-2693 backport (cvs) [since FEDORA-2005-790] 2005-2672 VULNERABLE (lm_sensors) bz#166673 @@ -163,7 +183,7 @@ 2005-1532 version (mozilla, fixed 1.7.8) [since re0522.0] 2005-1531 version (firefox, fixed 1.0.4) [since re0522.0] 2005-1531 version (mozilla, fixed 1.7.8) [since re0522.0] -2005-1519 backport (squid, after 2.5.STABLE9) ..ry-5.patch [since re0522.0] +2005-1519 version (squid, fixed 2.5.STABLE10) [since FEDORA-2005-913] was backport since GA (re0522.0) 2005-1470 version (ethereal, fixed 0.10.11) 2005-1469 version (ethereal, fixed 0.10.11) 2005-1468 version (ethereal, fixed 0.10.11) @@ -186,7 +206,7 @@ 2005-1409 version (postgresql, fixed 8.0.1) 2005-1369 version (kernel, fixed 2.6.12) [since FEDORA-2005-510] was backport in patch-2.6.12-rc3 2005-1368 version (kernel, fixed 2.6.12) [since FEDORA-2005-510] was backport in patch-2.6.12-rc3 -2005-1345 backport (squid, affects 2.5.STABLE9) ...-extaclauth.patch +2005-1345 version (squid, fixed 2.5.STABLE10) [since FEDORA-2005-913] was backport since GA 2005-1344 ignore (httpd) not a vulnerability 2005-1281 version (ethereal, fixed 0.10.11) 2005-1280 backport (tcpdump, not fixed in 3.8.3) in srpm @@ -280,7 +300,7 @@ 2005-0664 version (libexif, fixed 0.6.12) 2005-0654 ignore (gimp, not fixed 2.2) upstream considers harmless 2005-0627 version (qt, fixed 3.3.4) -2005-0626 backport (squid, affects 2.5.STABLE9) ..-setcookie.patch +2005-0626 version (squid, fixed 2.5.STABLE10) [since FEDORA-2005-913] was backport since GA 2005-0605 backport (xorg-x11) ...-fix-CAN-2005-0605.patch 2005-0602 VULNERABLE (unzip, fixed 5.52) not in srpm 2005-0596 version (php, fixed 5.0) @@ -429,8 +449,8 @@ 2005-0004 version (mysql, fixed 4.1.10) 2005-0003 version (kernel, fixed 2.6.10) 2005-0001 version (kernel, fixed 2.6.10) -2005-2480 ignore (squid) bz#166523, not reproducable -2005-2479 version (squid, fixed 2.5.STABLE8) +2004-2480 ignore (squid) bz#166523, not reproducable +2004-2479 version (squid, fixed 2.5.STABLE8) 2004-2396 version (passwd, fixed 0.69) verified in source 2004-2395 version (passwd, fixed 0.69) verified in source 2004-2394 version (passwd, fixed 0.69) verified in source From fedora-extras-commits at redhat.com Mon Sep 26 08:21:51 2005 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Mon, 26 Sep 2005 04:21:51 -0400 Subject: rpms/libcdio/devel .cvsignore, 1.6, 1.7 libcdio.spec, 1.14, 1.15 sources, 1.6, 1.7 Message-ID: <200509260821.j8Q8LpGD001745@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/rpms/libcdio/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1722 Modified Files: .cvsignore libcdio.spec sources Log Message: * Mon Sep 26 2005 Adrian Reber - 0.76-1 - Updated to 0.76. - Included doxygen generated documentation into -devel - Included examples into -devel Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libcdio/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 15 Jul 2005 06:30:22 -0000 1.6 +++ .cvsignore 26 Sep 2005 08:21:49 -0000 1.7 @@ -1,2 +1,2 @@ -libcdio-0.75.tar.gz -libcdio-0.75.tar.gz.sig +libcdio-0.76.tar.gz +libcdio-0.76.tar.gz.sig Index: libcdio.spec =================================================================== RCS file: /cvs/extras/rpms/libcdio/devel/libcdio.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- libcdio.spec 23 Aug 2005 15:13:08 -0000 1.14 +++ libcdio.spec 26 Sep 2005 08:21:49 -0000 1.15 @@ -1,17 +1,17 @@ Name: libcdio -Version: 0.75 -Release: 4%{?dist} +Version: 0.76 +Release: 1%{?dist} Summary: CD-ROM input and control library Group: Applications/Multimedia License: GPL URL: http://www.gnu.org/software/libcdio/ -Source0: http://ftp.gnu.org/gnu/libcdio/libcdio-0.75.tar.gz -Source1: http://ftp.gnu.org/gnu/libcdio/libcdio-0.75.tar.gz.sig +Source0: http://ftp.gnu.org/gnu/libcdio/libcdio-0.76.tar.gz +Source1: http://ftp.gnu.org/gnu/libcdio/libcdio-0.76.tar.gz.sig BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) #BuildRequires: libcddb-devel >= 0.9.4 -BuildRequires: pkgconfig +BuildRequires: pkgconfig doxygen BuildRequires: ncurses-devel Requires(post): /sbin/ldconfig Requires(post): /sbin/install-info @@ -45,6 +45,8 @@ --disable-cddb \ --disable-rpath make %{?_smp_mflags} +cd doc/doxygen +./run_doxygen %install @@ -56,8 +58,14 @@ mv $RPM_BUILD_ROOT%{_mandir}/{jp,ja} +rm -rf examples +mkdir -p examples/C++ +cp -a example/{*.c,README} examples +cp -a example/C++/{*.cpp,README} examples/C++ + %check || : +# disable test using local CDROM %{__sed} -i -e "s/am__EXEEXT_1 =.*$/am__EXEEXT_1 =/g" test/Makefile make check @@ -91,6 +99,7 @@ %files devel %defattr(-,root,root,-) +%doc doc/doxygen/html examples %{_includedir}/cdio %{_libdir}/*.a %{_libdir}/*.so @@ -98,6 +107,11 @@ %changelog +* Mon Sep 26 2005 Adrian Reber - 0.76-1 +- Updated to 0.76. +- Included doxygen generated documentation into -devel +- Included examples into -devel + * Mon Aug 01 2005 Adrian Reber - 0.75-4 - disable test accessing local CDROM drive (#164266) Index: sources =================================================================== RCS file: /cvs/extras/rpms/libcdio/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 15 Jul 2005 06:30:22 -0000 1.6 +++ sources 26 Sep 2005 08:21:49 -0000 1.7 @@ -1,2 +1,2 @@ -628bd9e6d62747ff6a2b14f976673ea0 libcdio-0.75.tar.gz -3a861ce2e430451107d923127c64cf77 libcdio-0.75.tar.gz.sig +6d5f97847c8be003f4018dd2b5afe23d libcdio-0.76.tar.gz +99dec4b805556a5a6cccaa3539707422 libcdio-0.76.tar.gz.sig From fedora-extras-commits at redhat.com Mon Sep 26 09:20:29 2005 From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh)) Date: Mon, 26 Sep 2005 05:20:29 -0400 Subject: rpms/Canna - New directory Message-ID: <200509260920.j8Q9KTD8003430@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/extras/rpms/Canna In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3405/Canna Log Message: Directory /cvs/extras/rpms/Canna added to the repository From fedora-extras-commits at redhat.com Mon Sep 26 09:20:29 2005 From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh)) Date: Mon, 26 Sep 2005 05:20:29 -0400 Subject: rpms/Canna/devel - New directory Message-ID: <200509260920.j8Q9KT55003435@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/extras/rpms/Canna/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3405/Canna/devel Log Message: Directory /cvs/extras/rpms/Canna/devel added to the repository From fedora-extras-commits at redhat.com Mon Sep 26 09:21:12 2005 From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh)) Date: Mon, 26 Sep 2005 05:21:12 -0400 Subject: rpms/Canna Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200509260921.j8Q9LCPM003487@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/extras/rpms/Canna In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3455 Added Files: Makefile import.log Log Message: Setup of module Canna --- NEW FILE Makefile --- # Top level Makefile for module Canna all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Mon Sep 26 09:21:13 2005 From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh)) Date: Mon, 26 Sep 2005 05:21:13 -0400 Subject: rpms/Canna/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200509260921.j8Q9LDYh003493@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/extras/rpms/Canna/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3455/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module Canna --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Mon Sep 26 09:29:16 2005 From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh)) Date: Mon, 26 Sep 2005 05:29:16 -0400 Subject: rpms/Canna import.log,1.1,1.2 Message-ID: <200509260929.j8Q9TGWb003739@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/extras/rpms/Canna In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3685 Modified Files: import.log Log Message: auto-import Canna-3.7p3-13 on branch devel from Canna-3.7p3-13.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/Canna/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 26 Sep 2005 09:21:10 -0000 1.1 +++ import.log 26 Sep 2005 09:29:14 -0000 1.2 @@ -0,0 +1 @@ +Canna-3_7p3-13:HEAD:Canna-3.7p3-13.src.rpm:1127726812 From fedora-extras-commits at redhat.com Mon Sep 26 09:29:17 2005 From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh)) Date: Mon, 26 Sep 2005 05:29:17 -0400 Subject: rpms/Canna/devel Canna-3.6-bonobo.patch, NONE, 1.1 Canna-3.6-cannadic.patch, NONE, 1.1 Canna-3.6-dont-grab-ctrl-o.patch, NONE, 1.1 Canna-3.6-fix-warnings.patch, NONE, 1.1 Canna-3.6-sharedir.patch, NONE, 1.1 Canna-3.6-shion.patch, NONE, 1.1 Canna-3.6-wconv.patch, NONE, 1.1 Canna-3.7p1-fix-duplicated-strings.patch, NONE, 1.1 Canna-3.7p1-notimeout.patch, NONE, 1.1 Canna-3.7p3-fix-gcc4-warning.patch, NONE, 1.1 Canna-3.7p3-redecl.patch, NONE, 1.1 Canna-3.7p3-yenbs.patch, NONE, 1.1 Canna-conf.patch, NONE, 1.1 Canna-oldsock.patch, NONE, 1.1 Canna-x86_64.patch, NONE, 1.1 Canna.spec, NONE, 1.1 canna.init, NONE, 1.1 cannaping.c, NONE, 1.1 dot-canna, NONE, 1.1 skk-dictionaries.patch, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200509260929.j8Q9THc2003755@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/extras/rpms/Canna/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3685/devel Modified Files: .cvsignore sources Added Files: Canna-3.6-bonobo.patch Canna-3.6-cannadic.patch Canna-3.6-dont-grab-ctrl-o.patch Canna-3.6-fix-warnings.patch Canna-3.6-sharedir.patch Canna-3.6-shion.patch Canna-3.6-wconv.patch Canna-3.7p1-fix-duplicated-strings.patch Canna-3.7p1-notimeout.patch Canna-3.7p3-fix-gcc4-warning.patch Canna-3.7p3-redecl.patch Canna-3.7p3-yenbs.patch Canna-conf.patch Canna-oldsock.patch Canna-x86_64.patch Canna.spec canna.init cannaping.c dot-canna skk-dictionaries.patch Log Message: auto-import Canna-3.7p3-13 on branch devel from Canna-3.7p3-13.src.rpm Canna-3.6-bonobo.patch: --- NEW FILE Canna-3.6-bonobo.patch --- --- Canna36/dic/ideo/words/dics.dir.orig Tue Apr 2 18:08:49 2002 +++ Canna36/dic/ideo/words/dics.dir Tue Apr 2 18:09:06 2002 @@ -54,3 +54,6 @@ pub.cld(pub.mwd) -pub--- scien.cld(scien.mwd) -scien--- sup.cld(sup.mwd) -sup--- + +bonobo.cbd(bonobo.mwd) -bonobo--- +bonobo.cld(bonobo.mwd) -bonobo--- Canna-3.6-cannadic.patch: --- NEW FILE Canna-3.6-cannadic.patch --- --- Canna36/dic/ideo/words/dics.dir.orig Sat Jan 5 23:03:06 2002 +++ Canna36/dic/ideo/words/dics.dir Sat Jan 5 23:04:54 2002 @@ -40,3 +40,7 @@ software.ctd(.mwd) -software--- zipcode.ctd(.mwd) -zipcode--- geo.ctd(.mwd) -geo--- +gcanna.cbd(gcanna.mwd) -gcanna--- +gcanna.cld(gcanna.mwd) -gcanna--- +gcannaf.cbd(gcannaf.swd) -gcannaf--- +gcannaf.cld(gcannaf.swd) -gcannaf--- Canna-3.6-dont-grab-ctrl-o.patch: --- NEW FILE Canna-3.6-dont-grab-ctrl-o.patch --- diff -ruN Canna36p3.orig/lib/canna/alphamap.h Canna36p3/lib/canna/alphamap.h --- Canna36p3.orig/lib/canna/alphamap.h 2003-04-21 18:44:26.000000000 +0900 +++ Canna36p3/lib/canna/alphamap.h 2003-04-21 18:46:01.000000000 +0900 @@ -65,7 +65,7 @@ /* C-l */ CANNA_FN_SelfInsert, /* C-m */ CANNA_FN_SelfInsert, /* C-n */ CANNA_FN_SelfInsert, -/* C-o */ CANNA_FN_JapaneseMode, +/* C-o */ CANNA_FN_SelfInsert, /* C-p */ CANNA_FN_SelfInsert, /* C-q */ CANNA_FN_SelfInsert, /* C-r */ CANNA_FN_SelfInsert, Canna-3.6-fix-warnings.patch: --- NEW FILE Canna-3.6-fix-warnings.patch --- diff -ruN Canna36p3.orig/lib/canna/kctrl.c Canna36p3/lib/canna/kctrl.c --- Canna36p3.orig/lib/canna/kctrl.c 2003-04-21 18:44:26.000000000 +0900 +++ Canna36p3/lib/canna/kctrl.c 2003-04-21 19:03:24.000000000 +0900 @@ -27,6 +27,7 @@ #include "canna.h" #include +#include #include #include Canna-3.6-sharedir.patch: --- NEW FILE Canna-3.6-sharedir.patch --- diff -ruN Canna36p3.orig/lib/canna/romaji.c Canna36p3/lib/canna/romaji.c --- Canna36p3.orig/lib/canna/romaji.c 2003-03-25 18:41:14.000000000 +0900 +++ Canna36p3/lib/canna/romaji.c 2003-03-26 17:11:58.000000000 +0900 @@ -438,7 +438,6 @@ } } -#if 0 /* currently CANNASHAREDDIR is not defined */ if (retval == (struct RkRxDic *)NULL) { /* added for Debian by ISHIKAWA Mutsumi */ extern jrUserInfoStruct *uinfo; @@ -463,7 +462,6 @@ } } } -#endif if (retval == (struct RkRxDic *)NULL) { /* ???????????????????? */ sprintf(rdic, Canna-3.6-shion.patch: --- NEW FILE Canna-3.6-shion.patch --- --- Canna36/dic/ideo/words/dics.dir.shion Wed Jan 9 18:00:33 2002 +++ Canna36/dic/ideo/words/dics.dir Wed Jan 9 18:02:04 2002 @@ -44,4 +44,15 @@ gcanna.cbd(gcanna.mwd) -gcanna--- gcanna.cld(gcanna.mwd) -gcanna--- gcannaf.cbd(gcannaf.swd) -gcannaf--- gcannaf.cld(gcannaf.swd) -gcannaf--- + +basho.cbd(basho.mwd) -basho--- +keisan.cbd(keisan.mwd) -keisan--- +pub.cbd(pub.mwd) -pub--- +scien.cbd(scien.mwd) -scien--- +sup.cbd(sup.mwd) -sup--- +basho.cld(basho.mwd) -basho--- +keisan.cld(keisan.mwd) -keisan--- +pub.cld(pub.mwd) -pub--- +scien.cld(scien.mwd) -scien--- +sup.cld(sup.mwd) -sup--- Canna-3.6-wconv.patch: --- NEW FILE Canna-3.6-wconv.patch --- --- Canna36/server/wconvert.c.orig 2002-11-01 17:21:49.000000000 +0900 +++ Canna36/server/wconvert.c 2002-11-01 17:23:25.000000000 +0900 @@ -2096,12 +2096,12 @@ char *buf = (char *)0; if (validcontext(cxnum, client, wThrough)) { - buf = malloc((int)Request.type20.bufsize); + content_size = Request.type20.datalen - (SIZEOFINT * 2 + SIZEOFSHORT); + buf = malloc(content_size); if (buf) { - content_size = Request.type20.datalen - (SIZEOFINT * 2 + SIZEOFSHORT); bcopy(Request.type20.buf, buf, content_size); stat = size = RkThrough(cxnum, Request.type20.command, - buf, content_size, (int)Request.type20.bufsize); + buf, content_size, content_size); } } retval = SendType6Reply(client, wThrough, EXTPROTO, stat, buf, size); Canna-3.7p1-fix-duplicated-strings.patch: --- NEW FILE Canna-3.7p1-fix-duplicated-strings.patch --- diff -ruN Canna37p1.orig/lib/canna/romaji.c Canna37p1/lib/canna/romaji.c --- Canna37p1.orig/lib/canna/romaji.c 2004-03-17 17:56:42.651277000 +0900 +++ Canna37p1/lib/canna/romaji.c 2004-03-17 17:57:23.207908504 +0900 @@ -21,7 +21,7 @@ */ #if !defined(lint) && !defined(__CODECENTER__) -static char rcs_id[] = "@(#) 102.1 $Id: romaji.c,v 1.10 2003/09/17 08:50:53 aida_s Exp $"; +static char rcs_id[] = "@(#) 102.1 $Id: romaji.c,v 1.11 2004/03/15 04:33:23 aida_s Exp $"; #endif /* lint */ #include "canna.h" @@ -2626,6 +2626,7 @@ yc->englishtype = CANNA_ENG_KANA; yc->cStartp = yc->cRStartp = 0; yc->jishu_kEndp = 0; + yc->n_susp_chars = 0; } static int @@ -2782,8 +2783,13 @@ } yc->last_rule = 0; howManyDelete = howFarToGoBackward(yc); - if (howManyDelete > 0 && (yc->generalFlags & CANNA_YOMI_BREAK_ROMAN)) { - yc->generalFlags &= ~CANNA_YOMI_BREAK_ROMAN; + if (howManyDelete > 0 && (yc->generalFlags & CANNA_YOMI_BREAK_ROMAN) + && (yc->kAttr[yc->kCurs] & SENTOU)) { + /* + * ????????1???????????????????????????????????????????????? + * SENTOU????????1???????? + * ????????????????SENTOU???????????????????????? + */ yc->rStartp = yc->rCurs - 1; while ( yc->rStartp > 0 && !(yc->rAttr[yc->rStartp] & SENTOU) ) { yc->rStartp--; @@ -2792,16 +2798,23 @@ yc->kRStartp = yc->kCurs - 1; while ( yc->kRStartp > 0 && !(yc->kAttr[yc->kRStartp] & SENTOU) ) yc->kRStartp--; + /* ??????????????? */ prevflag = (yc->kAttr[yc->kRStartp] & SENTOU); kanaReplace(yc->kRStartp - yc->kCurs, yc->romaji_buffer + yc->rStartp, yc->rCurs - yc->rStartp, 0); + /* ????????1????????????????????????????????????????SENTOU?????? */ yc->kAttr[yc->kRStartp] |= prevflag; yc->n_susp_chars = 0; /* ???????????????????????? */ makePhonoOnBuffer(d, yc, (unsigned char)0, 0, 0); + /* ???????????????????????????????????????????????????????????????? + * ?????????????????????????? */ + if (yc->kRStartp == yc->kCurs) + yc->generalFlags &= ~CANNA_YOMI_BREAK_ROMAN; } else { + yc->generalFlags &= ~CANNA_YOMI_BREAK_ROMAN; if ( yc->kAttr[yc->kCurs - howManyDelete] & HENKANSUMI ) { if (yc->kAttr[yc->kCurs - howManyDelete] & SENTOU) { /* ?????????????????????????????? */ @@ -2821,6 +2834,12 @@ yc->rEndp -= n; } else { + /* ????????????????????????????????????????????????????????????*/ + while ( yc->rCurs > 0 && !(yc->rAttr[--yc->rCurs] & SENTOU) ) + ; + if (yc->rCurs < yc->rStartp) { + yc->rStartp = yc->rCurs; + } yc->kAttr[yc->kCurs] |= SENTOU; } } @@ -2829,6 +2848,12 @@ romajiReplace(-howManyDelete, (wchar_t *)NULL, 0, 0); } kanaReplace(-howManyDelete, (wchar_t *)NULL, 0, 0); + if ((yc->rAttr[yc->rCurs] & SENTOU) && yc->kRStartp == yc->kCurs) { + /* ???????????????????????????????????????????????????????????? + * SENTOU???????????????????? + */ + yc->rStartp = yc->rCurs; + } } debug_yomi(yc); return(0); @@ -2944,6 +2969,7 @@ currentModeInfo(d); } makeYomiReturnStruct(d); + debug_yomi(yc); return 0; } Canna-3.7p1-notimeout.patch: --- NEW FILE Canna-3.7p1-notimeout.patch --- ??????????????????????????????Canna37p1.orig/lib/RKC/.wconvert.c.swp???Canna37p1/lib/RKC/.wconvert.c.swp??????????????? diff -ruN Canna37p1.orig/lib/RKC/conf.c Canna37p1/lib/RKC/conf.c --- Canna37p1.orig/lib/RKC/conf.c 2003-12-28 02:15:24.000000000 +0900 +++ Canna37p1/lib/RKC/conf.c 2004-02-19 22:24:48.882713989 +0900 @@ -1496,7 +1496,7 @@ }; const NumberDefaultRec host_num_defaults[] = { - { CONF_SERVER_TIMEOUT, 1500u }, + { CONF_SERVER_TIMEOUT, 0u }, }; const char * Canna-3.7p3-fix-gcc4-warning.patch: --- NEW FILE Canna-3.7p3-fix-gcc4-warning.patch --- diff -ruN Canna37p3.orig/cmd/crxgram/crxgram.c Canna37p3/cmd/crxgram/crxgram.c --- Canna37p3.orig/cmd/crxgram/crxgram.c 2003-03-24 13:04:25.000000000 +0900 +++ Canna37p3/cmd/crxgram/crxgram.c 2005-03-02 17:15:28.000000000 +0900 @@ -485,7 +485,7 @@ int j; nextS = scanToken(nextS, namevec, sizeof(namevec)); - name = strtok(namevec, SEP); + name = strtok((char *)namevec, SEP); for (j = 0; name && j < 255;) { if (r = probeIdent(Row, name)) rdata[i][j++] = r->rownum; diff -ruN Canna37p3.orig/cmd/cshost/cshost.c Canna37p3/cmd/cshost/cshost.c --- Canna37p3.orig/cmd/cshost/cshost.c 2003-12-28 02:15:22.000000000 +0900 +++ Canna37p3/cmd/cshost/cshost.c 2005-03-02 17:15:28.000000000 +0900 @@ -152,12 +152,12 @@ goto protoerr; assert(wp + 2 <= endp); printf("HOST NAME:%s\n", wp ) ; - wp += strlen( wp ) + 1 ; + wp += strlen((char *) wp ) + 1 ; if( *wp ) { printf("USER NAME:" ) ; while( *wp ) { printf("%s ", wp ) ; - wp += strlen( wp ) + 1 ; + wp += strlen((char *) wp ) + 1 ; } } else printf("ALL USER" ) ; diff -ruN Canna37p3.orig/cmd/wtoc/wtoc.c Canna37p3/cmd/wtoc/wtoc.c --- Canna37p3.orig/cmd/wtoc/wtoc.c 2003-12-28 02:15:23.000000000 +0900 +++ Canna37p3/cmd/wtoc/wtoc.c 2005-03-02 17:15:28.000000000 +0900 @@ -144,8 +144,8 @@ int hindo; { if( !strcmp((char *)hinshi,"#kxuru") || !strcmp((char *)hinshi,"#sxuru")){ - strcat(yomi,"??"); - strcat(kouho,"??"); + strcat((char *)yomi,"??"); + strcat((char *)kouho,"??"); } if( hindo == 0 ) fprintf( fp, "%s %s %s \n", yomi, hinshi, kouho ); diff -ruN Canna37p3.orig/lib/canna/ebind.c Canna37p3/lib/canna/ebind.c --- Canna37p3.orig/lib/canna/ebind.c 2003-09-17 17:50:53.000000000 +0900 +++ Canna37p3/lib/canna/ebind.c 2005-03-02 17:15:28.000000000 +0900 @@ -364,7 +364,7 @@ /* list_cb??KC_setListCallback??d->elistcb?????????? */ list_cb.client_data = (char *)arg; list_cb.callback_func = &EUCListCallback; - ret = XwcKanjiControl2(display, window, request, (char *)&list_cb); + ret = XwcKanjiControl2(display, window, request, (BYTE *)&list_cb); goto return_ret; /* FALLTHROUGH */ default: /* ??????????EUC?????????????????? */ diff -ruN Canna37p3.orig/lib/canna/obind.c Canna37p3/lib/canna/obind.c --- Canna37p3.orig/lib/canna/obind.c 2004-04-27 07:49:21.000000000 +0900 +++ Canna37p3/lib/canna/obind.c 2005-03-02 17:15:28.000000000 +0900 @@ -500,7 +500,7 @@ /* list_cb??KC_setListCallback??d->elistcb?????????? */ list_cb.client_data = (char *)arg; list_cb.callback_func = &owcListCallback; - ret = XwcKanjiControl2(display, window, request, (char *)&list_cb); + ret = XwcKanjiControl2(display, window, request, (BYTE *)&list_cb); goto return_ret; default: /* ???????????????????????? */ ret = XwcKanjiControl2(display, window, request, arg); diff -ruN Canna37p3.orig/server/convert.c Canna37p3/server/convert.c --- Canna37p3.orig/server/convert.c 2003-12-28 02:15:24.000000000 +0900 +++ Canna37p3/server/convert.c 2005-03-02 17:15:28.000000000 +0900 @@ -1506,7 +1506,7 @@ const char *username; const char *hostname; { - int (*ReqCallFunc) pro((char *, int)) ; + int (*ReqCallFunc) pro((BYTE *, int)) ; register Req0 *req0 = &Request.Request0 ; const char *username0 = username ? username : ""; const char *hostname0 = hostname ? hostname : ""; diff -ruN Canna37p3.orig/server/wconvert.c Canna37p3/server/wconvert.c --- Canna37p3.orig/server/wconvert.c 2005-03-02 17:15:05.000000000 +0900 +++ Canna37p3/server/wconvert.c 2005-03-02 17:15:28.000000000 +0900 @@ -189,7 +189,7 @@ size_t size; { ir_debug( Dmsg(10, "WriteClient:") ); - ir_debug( DebugDump( 10, buf, size ) ); + ir_debug( DebugDump( 10, (const char *)buf, size ) ); return ClientBuf_store_reply(client->client_buf, buf, size); } #else @@ -1372,8 +1372,8 @@ /* ?????????????????????????????? */ stat = ACCES; if (checkPermissionToRead(client, dirname, (char *)0) >= 0) { - stat = RkwListDic(cxnum, (unsigned char *)dirname, - (unsigned char *)dicnames, requestsize); + stat = RkwListDic(cxnum, (char *)dirname, + (char *)dicnames, requestsize); } listdicdone: @@ -1403,7 +1403,7 @@ ir_debug( Dmsg(5, "dicname = %s\n", (req->dicname)?req->dicname:null) ); - stat = (char)RkwCreateDic(cxnum, (unsigned char *)req->dicname, + stat = (char)RkwCreateDic(cxnum, (char *)req->dicname, req->mode); } @@ -1438,7 +1438,7 @@ ir_debug( Dmsg(5, "dicname = %s\n", (req->dicname)?req->dicname:null) ); - stat = (char)RkwRemoveDic(cxnum, (unsigned char *)req->dicname, + stat = (char)RkwRemoveDic(cxnum, (char *)req->dicname, req->mode); } @@ -1456,8 +1456,8 @@ if (validcontext(cxnum, client, wRenameDictionary)) { diclen = strlen(req->dicname) + 1 ; - stat = RkwRenameDic(cxnum, (unsigned char *)req->dicname, - (unsigned char *)&(req->dicname)[diclen], + stat = RkwRenameDic(cxnum, (char *)req->dicname, + (char *)&(req->dicname)[diclen], req->mode); } return SendType2Reply(client, wRenameDictionary, EXTPROTO, stat); @@ -1950,8 +1950,8 @@ ir_debug( Dmsg(5, "dicname = %s\n", Request.type15.dicname) ); ir_debug( Dmsg(5, "username = %s\n", username) ); - stat = (RkwQueryDic(cxnum, (unsigned char *)username, - (unsigned char *)Request.type15.dicname, + stat = (RkwQueryDic(cxnum, (char *)username, + (char *)Request.type15.dicname, dicinfo) < 0) ? -1 : 0; if (stat < 0) { Canna-3.7p3-redecl.patch: --- NEW FILE Canna-3.7p3-redecl.patch --- --- Canna37p3/lib/canna/lisp.c.redecl 2004-11-24 00:08:05.429789120 +0100 +++ Canna37p3/lib/canna/lisp.c 2004-11-24 00:08:30.246016480 +0100 @@ -1355,8 +1355,6 @@ static int tyi() { - char *gets(), *fgets(); - if (untyibuf) { int ret = untyibuf[--untyip]; if (untyip == 0) { Canna-3.7p3-yenbs.patch: --- NEW FILE Canna-3.7p3-yenbs.patch --- --- Canna37p3/lib/RK/RkGetDic.man.yenbs 2004-11-23 23:01:21.908416880 +0100 +++ Canna37p3/lib/RK/RkGetDic.man 2004-11-23 23:02:00.867494200 +0100 @@ -41,7 +41,7 @@ Dictionary names are got in the area \f2dics\f1 in the following format: .P .RS 0.2c -dictionary-name-1 ??0 dictionary-name-2 ??0 ... dictionary-name-n ??0 ??0 +dictionary-name-1 \\0 dictionary-name-2 \\0 ... dictionary-name-n \\0 \\0 .RE .P The size of the area \f2dics\f1 is given in bytes by \f2maxdics\f1. The dictionary list is truncated in character strings when it exceeds this size. Canna-conf.patch: --- NEW FILE Canna-conf.patch --- diff -ruN Canna37p1.orig/Canna.conf Canna37p1/Canna.conf --- Canna37p1.orig/Canna.conf 2004-01-02 21:26:27.000000000 +0900 +++ Canna37p1/Canna.conf 2004-04-30 17:45:30.268087408 +0900 @@ -109,12 +109,12 @@ # define DefErrDir $(cannaPrefix)/log # define DefLibCannaDir $(cannaExecPrefix)/lib #else -# define DefCannaPrefix /usr/local/canna +# define DefCannaPrefix /usr # ifdef ObsoleteInstallDir # define DefErrDir /usr/spool/canna # define DefLibCannaDir /usr/lib # else -# define DefErrDir /var/log +# define DefErrDir /var/log/canna # define DefLibCannaDir $(cannaExecPrefix)/lib # endif #endif @@ -123,7 +123,7 @@ # define DefCannaLibDir $(cannaPrefix)/lib #else # define DefCannaSrvDir $(cannaExecPrefix)/sbin -# define DefCannaLibDir $(cannaPrefix)/share/canna +# define DefCannaLibDir $(cannaPrefix)/lib #endif #if defined(LinuxArchitecture) || defined(FreeBSDArchitecture) \ @@ -146,9 +146,11 @@ cannaSrvDir = DefCannaSrvDir XCOMM cannaLibDir = /var/lib/canna XCOMM cannaLibDir = /var/db/canna -cannaLibDir = DefCannaLibDir +cannaLibDir = /etc/canna +cannaEtcDir = /etc/canna +cannaShareDir = $(cannaPrefix)/share/canna XCOMM cannaManDir = $(cannaPrefix)/share/man -cannaManDir = $(cannaPrefix)/man +cannaManDir = $(cannaPrefix)/share/man cannaIncDir = $(cannaPrefix)/include/canna libCannaDir = DefLibCannaDir @@ -158,7 +160,7 @@ #define SupportOldWchar 1 /* IPv6??????????????1?????????????????? */ -#define UseInet6 0 /* requires newer IPv6 implementation */ +#define UseInet6 1 /* requires newer IPv6 implementation */ /* 3.2??????3.6???????????????????????????????????????????????????? */ /* #define DIC_3_6_COMPAT */ @@ -175,10 +177,10 @@ #ifdef InstallAsUser cannaOwnerGroup = #else -cannaOwnerGroup = -o $(cannaOwner) -g $(cannaGroup) +cannaOwnerGroup = #endif -cannaDsoRev = 1.2 +cannaDsoRev = 1.2.0 #if defined(cygwinArchitecture) /* import library????????????????????DLL??????/usr/X11R6/bin???????? */ @@ -199,8 +201,8 @@ CHGRP = : CHMOD = : #else -CHOWN = chown -CHGRP = chgrp +CHOWN = echo +CHGRP = echo CHMOD = chmod #endif @@ -237,7 +239,7 @@ /* #define UseInstalledLibCanna YES */ #define UseInstalledLibCanna NO -DicDir = $(cannaLibDir)/dic +DicDir = /var/lib/canna/dic /* ???????????????????????? */ @@ -339,10 +341,10 @@ #endif #ifdef InstallAsUser -UnixSockDir = $(cannaPrefix)/tmp/.iroha_unix +UnixSockDir = $(cannaPrefix)/var/run/.iroha_unix AccessFile = $(cannaPrefix)/etc/hosts.canna #else -UnixSockDir = /tmp/.iroha_unix +UnixSockDir = /var/run/.iroha_unix AccessFile = /etc/hosts.canna #endif UnixSockName = IROHA diff -ruN Canna37p1.orig/Imakefile Canna37p1/Imakefile --- Canna37p1.orig/Imakefile 2003-12-28 02:15:20.000000000 +0900 +++ Canna37p1/Imakefile 2004-04-30 17:45:01.586886913 +0900 @@ -58,6 +58,7 @@ @echo "#define CANNAHOSTFILE '$(cannaLibDir)/cannahost'" >> junkjunk @echo "/* for lib/canna */" >> junkjunk @echo "#define CANNALIBDIR '$(cannaLibDir)'" >> junkjunk + @echo "#define CANNASHAREDIR '$(cannaShareDir)'" >> junkjunk @echo "#define SUPPORT_OLD_WCHAR '$(supportOldWchar)'" >> junkjunk @echo "/* for scripts */" >> junkjunk @echo "#define CANNABINDIR $(cannaBinDir)" >> junkjunk @@ -89,6 +90,7 @@ echo "#define CANNAHOSTFILE \"$(cannaLibDir)/cannahost\"";\ echo "/* for lib/canna */";\ echo "#define CANNALIBDIR \"$(cannaLibDir)\""; \ + echo "#define CANNASHAREDIR \"$(cannaShareDir)\""; \ echo "#define SUPPORT_OLD_WCHAR $(supportOldWchar)"; \ echo "/* for scripts */";\ echo "#define CANNABINDIR $(cannaBinDir)"; \ diff -ruN Canna37p1.orig/dic/phono/Imakefile Canna37p1/dic/phono/Imakefile --- Canna37p1.orig/dic/phono/Imakefile 2002-10-19 17:27:40.000000000 +0900 +++ Canna37p1/dic/phono/Imakefile 2004-04-30 17:45:01.587886780 +0900 @@ -28,6 +28,7 @@ ROMAJI_DIC_DEF = -DSHIFT DICDIR = $(cannaLibDir)/dic + CANNASHAREDIR = $(cannaShareDir) SAMPLEDIR = $(cannaLibDir)/sample SAMPLESRCDIR = $(cannaLibDir)/sample/src @@ -69,7 +70,7 @@ MakeDirectories(install,$(DICDIR)) MakeDirectories(install,$(SAMPLESRCDIR)) -InstallMultiple($(ROMKANA_TABLES),$(DICDIR)) +InstallMultiple($(ROMKANA_TABLES),$(CANNASHAREDIR)) #ifdef USE_OBSOLETE_STYLE_FILENAME InstallNonExec(default.kpdef,$(SAMPLESRCDIR)) diff -ruN Canna37p1.orig/misc/initfiles/Imakefile Canna37p1/misc/initfiles/Imakefile --- Canna37p1.orig/misc/initfiles/Imakefile 2003-02-04 05:13:01.000000000 +0900 +++ Canna37p1/misc/initfiles/Imakefile 2004-04-30 17:45:01.587886780 +0900 @@ -6,7 +6,7 @@ #endif CANNAROOT = ../.. - SAMPLEDIR = $(cannaLibDir)/sample + SAMPLEDIR = $(cannaShareDir) all:: Canna-oldsock.patch: --- NEW FILE Canna-oldsock.patch --- diff -ruN Canna37p1.orig/lib/RKC/wconvert.c Canna37p1/lib/RKC/wconvert.c --- Canna37p1.orig/lib/RKC/wconvert.c 2003-09-24 23:50:40.000000000 +0900 +++ Canna37p1/lib/RKC/wconvert.c 2004-04-30 19:10:18.762882047 +0900 @@ -150,8 +150,25 @@ if ((ServerFD = socket((int) addr->sa_family, SOCK_STREAM, 0)) >= 0){ if( try_connect( ServerFD, addr, sizeof unaddr ) < 0 ) { close( ServerFD ) ; - return( -1 ) ; + ServerFD = -1; + } + } + if (ServerFD < 0) { + /* for the backward compatibility */ +#define OLD_IR_UNIX_PATH "/tmp/.iroha_unix/IROHA" + + if (number) + sprintf (unaddr.sun_path, "%s:%d", OLD_IR_UNIX_PATH, number); + else + strcpy (unaddr.sun_path, OLD_IR_UNIX_PATH); + + if ((ServerFD = socket ((int) addr->sa_family, SOCK_STREAM, 0)) >= 0) { + if (try_connect (ServerFD, addr, sizeof (unaddr)) < 0) { + close (ServerFD); + return -1; + } } +#undef OLD_IR_UNIX_PATH } return( ServerFD ) ; } Canna-x86_64.patch: --- NEW FILE Canna-x86_64.patch --- diff -ruN Canna37.orig/Canna.conf Canna37/Canna.conf --- Canna37.orig/Canna.conf 2003-12-24 13:20:19.000000000 +0900 +++ Canna37/Canna.conf 2003-12-24 13:20:48.000000000 +0900 @@ -112,7 +112,7 @@ # define DefCannaPrefix /usr # ifdef ObsoleteInstallDir # define DefErrDir /usr/spool/canna -# define DefLibCannaDir /usr/lib +# define DefLibCannaDir /usr/lib64 # else # define DefErrDir /var/log/canna # define DefLibCannaDir $(cannaExecPrefix)/lib --- NEW FILE Canna.spec --- %define pubdicrhver 20021028 %define zipcodever 20030204 %define cannadicver 0.95c %define cannadir Canna37p3 Summary: A Japanese character set input system. Name: Canna Version: 3.7p3 Release: 13 License: Distributable Group: System Environment/Libraries URL: http://www.nec.co.jp/japanese/product/computer/soft/canna/ Source0: http://prdownloads.sourceforge.jp/canna/7240/%{cannadir}.tar.bz2 Source1: http://cannadic.oucrc.org/cannadic-%{cannadicver}.tar.gz Source2: pubdic-bonobo-%{pubdicrhver}.tar.bz2 Source3: http://www.coolbrain.net/dl/shion/shion.tar.gz Source4: http://bonobo.gnome.gr.jp/~nakai/canna/zipcode-%{zipcodever}.tar.bz2 Source20: canna.init Source21: dot-canna Source22: cannaping.c Patch0: Canna-conf.patch Patch2: Canna-3.6-sharedir.patch Patch4: Canna-3.6-dont-grab-ctrl-o.patch Patch5: Canna-3.6-fix-warnings.patch ## some dictionaries were ported from SKK-JISYO.* Patch17: skk-dictionaries.patch Patch18: Canna-3.6-cannadic.patch Patch19: Canna-3.6-shion.patch Patch21: Canna-3.6-bonobo.patch # Fix for buffer overrun Patch23: Canna-3.6-wconv.patch Patch25: Canna-x86_64.patch Patch27: Canna-3.7p1-notimeout.patch Patch28: Canna-oldsock.patch # Patch from the upstream Patch40: Canna-3.7p1-fix-duplicated-strings.patch Patch41: Canna-3.7p3-yenbs.patch Patch42: Canna-3.7p3-redecl.patch Patch43: Canna-3.7p3-fix-gcc4-warning.patch BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot Prereq: /sbin/chkconfig, /etc/services, /bin/grep, /bin/cp BuildPrereq: XFree86-devel,cpp,gawk Obsoletes: tamago %description Canna provides a user interface for inputting Japanese characters. Canna supports Nemacs (Mule), kinput2, and canuum. All of these tools can then use a single customization file, Romaji-to-Kana conversion rules and dictionaries, and input Japanese in the same way. Canna automatically supports Kana-to-Kanji conversions; the conversions are based on a client-server model. %package devel Summary: Header file and library for developing programs which use Canna. Group: Development/Libraries Requires: Canna-libs >= %{version}-%{release} %package libs Summary: The runtime library for Canna. Group: System Environment/Libraries %description devel The Canna-devel package contains the development files needed to build programs that will use the Canna Japanese character input system. %description libs The Canna-libs package contains the runtime library for running programs with the Canna Japanese input system. %prep %setup -q -c -a 1 -a 2 -a 3 -a 4 cd %{cannadir} %patch0 -p1 -b .conffix %patch2 -p1 -b .share %patch4 -p1 -b .ctrl-o %patch5 -p1 -b .warnings %patch17 -p1 -b .skk %patch18 -p1 -b .cannadic %patch19 -p1 -b .shion %patch21 -p1 -b .bonobo %patch23 -p1 -b .wconv %ifarch x86_64 %patch25 -p1 -b .x86_64 %endif %patch27 -p1 -b .notimeout %patch28 -p1 -b .oldsock %patch40 -p1 -b .duplicate %patch41 -p1 -b .yenbs %patch42 -p1 -b .redecl %patch43 -p1 -b .gcc4 cd .. for file in %{cannadir}/{cmd/mkromdic/mkromdic.man,lib/RK/RkIntro.man}; do iconv -f euc-jp -t utf-8 < "$file" > "${file}_" mv "${file}_" "$file" done cat $RPM_BUILD_DIR/Canna-%{version}/zipcode-%{zipcodever}/zipcode.t \ $RPM_BUILD_DIR/Canna-%{version}/zipcode-%{zipcodever}/jigyosyo.t | sort \ > $RPM_BUILD_DIR/Canna-%{version}/%{cannadir}/dic/ideo/words/zipcode.t cat $RPM_BUILD_DIR/Canna-%{version}/pubdic-bonobo/*.p | sort >> \ $RPM_BUILD_DIR/Canna-%{version}/%{cannadir}/dic/ideo/pubdic/y.p # find CVS files and remove it. find $RPM_BUILD_DIR/%{name}-%{version} -name .cvsignore -exec rm -f {} \; %build function builddic() { dic=$1 dicname=`echo $dic | sed -e 's/\(.*\)\..*\$/\1/'` case $2 in mwd) mode="mwd"; flag="-m"; ;; swd) mode="swd"; flag="-s"; ;; *) echo "unknown dictionary type: $2"; exit 1; ;; esac export buildcannadir=$RPM_BUILD_DIR/%{name}-%{version}/%{cannadir} if [ "x$3" = "xsort" ]; then $buildcannadir/cmd/splitwd/splitword $dic | $buildcannadir/cmd/forsort/forsort -7 | sort | $buildcannadir/cmd/forsort/forsort -8 | $buildcannadir/cmd/mergewd/mergeword > $dicname.$mode else cat $dic > $dicname.$mode fi $buildcannadir/cmd/crxdic/crxdic -D $buildcannadir/dic/ideo/grammar/cnj.bits $flag -o $dicname.cbd -n $dicname $dicname.$mode $buildcannadir/cmd/crfreq/crfreq -div 512 -o $dicname.cld $dicname.cbd $dicname.$mode rm $dicname.$mode } cd %{cannadir} xmkmf make Makefile pushd lib/canna xmkmf make sglobal.h popd %ifarch ia64 sed 's/-O2//' Makefile > Makefile.tmp mv Makefile.tmp Makefile %endif # ugly hack to avoid X.Org: no such file or directory issue TMP_MAKEFILE=`mktemp /tmp/Canna-build-makefile.XXXXXX` sed -e 's/$(VENDOR_DEFINES)//' Makefile > $TMP_MAKEFILE && cp $TMP_MAKEFILE Makefile rm $TMP_MAKEFILE make canna gcc -o ./misc/cannaping %{SOURCE22} -I./include -L./lib/canna -lcanna cd .. cd cannadic-%{cannadicver} for i in $RPM_BUILD_DIR/Canna-%{version}/%{cannadir}/cmd/*; do \ if [ -d $i ]; then \ export PATH=$PATH:$i; \ fi \ done; export RPM_CANNAIDEO_DIR=$RPM_BUILD_DIR/Canna-%{version}/%{cannadir}/dic/ideo export RPM_CANNACMD_DIR=$RPM_BUILD_DIR/Canna-%{version}/%{cannadir}/cmd export RPM_CANNA_POD=$RPM_BUILD_DIR/Canna-%{version}/%{cannadir}/dic/ideo/pubdic/pod builddic gcanna.ctd mwd none builddic gcannaf.ctd swd none cd .. cd pubdic-bonobo cat *.p | $RPM_CANNA_POD - -p -i -2 > bonobo.spl $RPM_CANNACMD_DIR/mergewd/mergeword< bonobo.spl > bonobo.t rm -rf bonobo.spl builddic bonobo.t mwd sort cd .. cd shion builddic basho.ctd mwd sort builddic keisan.ctd mwd sort builddic pub.ctd mwd sort builddic scien.ctd mwd none builddic sup.ctd mwd sort cd .. %install [ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT cd %{cannadir} make libCannaDir=%{_libdir} DESTDIR=$RPM_BUILD_ROOT install make DESTDIR=$RPM_BUILD_ROOT MANDIR=%{_mandir} MANSUFFIX=1 LIBMANSUFFIX=3 install.man for i in `find $RPM_BUILD_ROOT%{_mandir}/ja -type f`; do iconv -f euc-jp -t utf-8 $i > $i.new && mv -f $i.new $i && chmod 444 $i done %{__install} -c -s -m755 ./misc/cannaping $RPM_BUILD_ROOT%{_bindir}/cannaping cd .. cd %{cannadir} %{__mv} misc/manual.sed . %{__rm} -fr misc %{__mkdir} misc %{__mv} manual.sed misc cd .. cd cannadic-%{cannadicver} %{__mkdir_p} $RPM_BUILD_ROOT%{_localstatedir}/lib/canna/dic/canna %{__install} -m 644 gcanna*.c[bl]d \ $RPM_BUILD_ROOT%{_localstatedir}/lib/canna/dic/canna cd .. cd pubdic-bonobo %{__install} -m 644 bonobo*.c[bl]d \ $RPM_BUILD_ROOT%{_localstatedir}/lib/canna/dic/canna cd .. cd shion %{__install} -m 644 basho.cld basho.cbd kaom.ctd keisan.cld keisan.cbd \ pub.cld pub.cbd scien.cld scien.cbd sup.cld sup.cbd \ $RPM_BUILD_ROOT%{_localstatedir}/lib/canna/dic/canna cd .. %{__mkdir_p} $RPM_BUILD_ROOT/etc/rc.d/init.d %{__mkdir_p} $RPM_BUILD_ROOT/etc/skel %{__install} -m 755 %SOURCE20 $RPM_BUILD_ROOT/etc/rc.d/init.d/canna %{__cp} %SOURCE21 $RPM_BUILD_ROOT/etc/skel/.canna %{__cp} -f %SOURCE21 $RPM_BUILD_ROOT/etc/canna/default.canna ## chmod 755 $RPM_BUILD_ROOT/etc/rc.d/init.d/canna cat > $RPM_BUILD_ROOT%{_sysconfdir}/hosts.canna << EOF unix EOF cat > $RPM_BUILD_ROOT%{_sysconfdir}/canna/cannahost << EOF unix EOF for bin in addwords cpdic delwords lsdic mkdic mvdic rmdic syncdic ; do ln -sf catdic $RPM_BUILD_ROOT%{_bindir}/${bin} done ln -sf ../bin/catdic $RPM_BUILD_ROOT%{_sbindir}/cannakill mv $RPM_BUILD_ROOT%{_sysconfdir}/canna/sample $RPM_BUILD_DIR/%{name}-%{version} %{__mkdir_p} $RPM_BUILD_ROOT%{_localstatedir}/run/.iroha_unix %clean [ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -fr $RPM_BUILD_ROOT %pre if %{__grep} -q '^canna:' /etc/passwd then %{_sbindir}/userdel canna fi %{_sbindir}/useradd -c "Canna Service User" -r \ -s /sbin/nologin -u 39 -d %{_localstatedir}/lib/canna canna 2>/dev/null || : %post if ! grep -q canna /etc/services then echo "canna 5680/tcp" >>/etc/services fi /sbin/chkconfig --add canna chown -R canna:canna /var/lib/canna %preun if [ "$1" = "0" ]; then /sbin/service canna stop > /dev/null 2>&1 || : /sbin/chkconfig --del canna fi %postun if [ "$1" -ge "1" ]; then /sbin/service canna condrestart >/dev/null 2>&1 || : fi %post libs -p /sbin/ldconfig %postun libs -p /sbin/ldconfig %files %defattr (-,root,root) %doc %{cannadir}/CHANGES.jp %{cannadir}/ChangeLog %doc %{cannadir}/OCHANGES.jp %{cannadir}/RKCCONF.jp %doc %{cannadir}/README %{cannadir}/README.jp %{cannadir}/WHATIS %doc %{cannadir}/WHATIS.jp %{cannadir}/Canna.conf %doc $RPM_BUILD_DIR/%{name}-%{version}/sample %config %{_sysconfdir}/rc.d/init.d/canna %config %{_sysconfdir}/skel/.canna %config(noreplace) %{_sysconfdir}/hosts.canna %config(noreplace) %{_sysconfdir}/canna/cannahost %config %{_sysconfdir}/canna/default.canna %{_bindir}/* %{_datadir}/canna/* %{_mandir}/man1/* %{_mandir}/ja/man1/* %defattr (0755,root,root) %{_sbindir}/cannaserver %{_sbindir}/cannakill %defattr (-,canna,canna) %dir %{_localstatedir}/run/.iroha_unix %{_localstatedir}/lib/canna %{_localstatedir}/log/canna %files devel %defattr (-,root,root) %{_includedir}/canna/ %{_mandir}/man3/* %{_mandir}/ja/man3/* %{_libdir}/libRKC.a %{_libdir}/libRKC.so %{_libdir}/libRKC16.a %{_libdir}/libRKC16.so %{_libdir}/libcanna.a %{_libdir}/libcanna.so %{_libdir}/libcanna16.a %{_libdir}/libcanna16.so %files libs %defattr (-,root,root) %{_libdir}/libRKC.so.* %{_libdir}/libRKC16.so.* %{_libdir}/libcanna.so.* %{_libdir}/libcanna16.so.* %changelog * Mon Mar 7 2005 Akira TAGOH - 3.7p3-13 - stop to sort the words on some dictionaries during making the binary dictionaries. * Wed Mar 2 2005 Akira TAGOH - 3.7p3-12 - rebuild for gcc4. - Canna-3.7p3-fix-gcc4-warning.patch: applied to fix more compiler warnings. * Tue Feb 22 2005 Akira TAGOH - 3.7p3-11 - updates to cannadic-0.95c * Mon Jan 3 2005 Bill Nottingham - 3.7p3-10 - don't use initlog * Tue Nov 23 2004 Miloslav Trmac - 3.7p3-9 - Convert man pages to UTF-8 - Don't use Yen symbol instead of backspace in RkGetDicList man page - Fix build failure when redeclaring glibc functions * Thu Nov 4 2004 Akira TAGOH - 3.7p3-8 - rebuilt * Thu Oct 21 2004 Akira TAGOH - 3.7p3-7 - dot.canna: assigned quit to Escape key to escape with Escape key from the mode. (#135039) * Tue Sep 21 2004 Warren Togami - 3.7p3-6 - remove unnecessary docs * Wed Sep 08 2004 Akira TAGOH 3.7p3-5 - fixed default.canna to get usability and improve the default behavior without proper .canna file. NOTE: you must always have proper .canna file however, since your .canna file is prior than the default behavior and it probably overrides the default thing. * Thu Jun 24 2004 Akira TAGOH 3.7p3-4 - Canna-conf.patch: updated to change the socket file directory under /var/run. - Canna-oldsock.patch: applied to ensure that restarting the daemon works during upgrading. - made /var/run/.iroha_unix at the build time. * Tue Jun 15 2004 Elliot Lee - rebuilt * Sun Jun 06 2004 Florian La Roche - use /var/lib/canna in filelist to also include that dir in the rpm listing and set proper ownership from rpm and not only via the post script * Mon May 24 2004 Akira TAGOH 3.7p3-1 - New upstream release. - Canna-3.7p1-pod-fix-wrongparam.patch: removed. * Wed Apr 14 2004 Akira TAGOH 3.7p1-7 - updates cannadic-0.95b * Sun Mar 21 2004 Florian La Roche 3.7p1-6 - apps owned by root instead of bin * Wed Mar 17 2004 Akira TAGOH 3.7p1-5 - Canna-3.7p1-fix-duplicated-strings.patch: applied a backport patch from CVS. when the characters like 'bbb...' is deleted, the preedit strings is duplicated. (#117140) * Tue Mar 02 2004 Elliot Lee 3.7p1-4.1 - rebuilt * Thu Feb 19 2004 Akira TAGOH 3.7p1-4 - Canna-3.7p1-notimeout.patch: applied to avoid cant-mount-the-dictionaries issue. (#114886) * Fri Feb 13 2004 Elliot Lee - rebuilt * Wed Jan 14 2004 Akira TAGOH 3.7p1-2 - fix broken dictionaries on ia64. - Canna-3.7p1-pod-fix-wrongparam.patch: applied to fix the wrong function parameter. (#113662) * Fri Jan 09 2004 Akira TAGOH 3.7p1-1 - New upstream release. * Mon Dec 24 2003 Akira TAGOH 3.7-1 - New upstream release. - Canna-3.6-cannadic.patch: updated to fix the warning. - Canna-3.6-fix-warnings.patch: updated. - Canna-3.6-sleep.patch: removed because it's unnecessary anymore. - Canna-3.6-fix-ia64-unaligned-access.patch: removed. should be unnecessary. - canna.init: correct path for cannakill. - dot-canna: re-enabled fuzokugo entry. * Wed Dec 10 2003 Akira TAGOH 3.6-25 - updated to cannadic-0.95a * Fri Oct 10 2003 Akira TAGOH 3.6-24 - Canna-3.6-fix-ia64-unaligned-access.patch: fixed unaligned access on ia64. (#101762) * Tue Sep 30 2003 Akira TAGOH 3.6-22 - converted Japanese manpages to UTF-8. * Wed Sep 24 2003 Akira TAGOH 3.6-21 - updates to Canna-3.6p4 - Canna-3.6-fix-segv-amd64.patch: removed. - dot-canna: comment "fuzokugo" dictionary out. it isn't contained anymore. * Wed Sep 17 2003 Akira TAGOH 3.6-20.1 - rebuilt * Wed Sep 17 2003 Akira TAGOH 3.6-20 - Canna-3.6-fix-segv-amd64.patch: applied to fix segfault on x86-64. (#104539) * Wed Jul 09 2003 Akira TAGOH 3.6-19 - updates to cannadic-0.95 * Wed Jun 04 2003 Elliot Lee - rebuilt * Wed Apr 23 2003 Akira TAGOH 3.6-17 - updates to cannadic-0.94g * Mon Apr 21 2003 Akira TAGOH 3.6-16 - rebuild. * Mon Apr 21 2003 Akira TAGOH 3.6-15 - Canna-3.6-dont-grab-ctrl-o.patch: applied to not grab ctrl-o. (#75865) - Canna-3.6-fix-warnings.patch: applied to fix some compiler warnings. (#80639) * Tue Apr 01 2003 Akira TAGOH 3.6-14 - don't ship .cvsignore files. * Tue Mar 25 2003 Akira TAGOH 3.6-13 - updates to 3.6p3 - clean up - Canna-3.6-Imakefile.patch: removed an unnecessary patch. - Canna-3.6-sharedir.patch: find the dictionary files from /usr/share/canna - Canna-3.6-sleep.patch: to fix very strange problem. when the child process tries to kill the parent process, the parent process isn't terminated, and it seems that the parent process doesn't still return from fork() and waiting on SYS_futex. - moved cannahost and default.canna to /etc/canna so that config files should be moved on /etc. - moved sample files to /usr/share/doc/Canna-/ * Tue Feb 4 2003 Yukihiro Nakai 3.6-9 - Add cannaping command for init script (#82163) - Update canna init script (#82163) * Thu Jan 23 2003 Tim Powers 3.6-8 - rebuild * Sat Dec 21 2002 Yukihiro Nakai 3.6-7 - Change shell to /sbin/nologin (#80175) * Thu Dec 12 2002 Yukihiro Nakai 3.6-5 - Update to 3.6p1 * Thu Nov 28 2002 Yukihiro Nakai 3.6-4 - Disable -O2 on ia64 * Wed Nov 27 2002 Yukihiro Nakai 3.6-3 - Update bonobo - Update zipcode - Update cannadic * Tue Nov 19 2002 Yukihiro Nakai 3.6-1 - Update to 3.6 * Tue Nov 12 2002 Elliot Lee 3.5b2-71 - Remove/fix ldconfig usage in scripts - _smp_mflags - Rebuild * Mon Nov 11 2002 Yukihiro Nakai 3.5b2-70.8.0.1 - Add CANNA-2002-01 patch * Fri Nov 01 2002 Yukihiro Nakai 3.5b2-70.8.0 - Add wconvert.c buffer overrun fix patch * Tue Aug 06 2002 Yukihiro Nakai 3.5b2-70 - Delete -inet option from canna.init script (#67217) - Obsolete tamago with this version (#67217) - Delete localhost from /etc/hosts.canna * Fri Aug 02 2002 Yukihiro Nakai 3.5b2-69 - Update zipcode - Update pubdic-bonobo * Thu Jul 18 2002 Akira TAGOH 3.5b2-68 - Canna-3.5b2-nonstrip.patch: applied to fix the stripped binary. * Tue Jul 09 2002 Yukihiro Nakai - Update zipcode - Update pubdic-bonobo - Update Cannadic * Thu Jun 27 2002 Yukihiro Nakai - Make users at install(%%pre) (#66306) * Wed Jun 26 2002 Yukihiro Nakai - Update pubdic-bonobo * Thu Jun 06 2002 Yukihiro Nakai - Update pubdic-bonobo - Update zipcode * Thu May 23 2002 Tim Powers - automated rebuild * Tue Mar 28 2002 Yukihiro Nakai 3.5b2-62 - Update cannadic to 0.94b to fix pubdic wrong entry - Update pubdic-bonobo - Remove refer to pubdic - celebrate pubdic-bonobo indepence day * Tue Feb 26 2002 Yukihiro Nakai 3.5b2-61 - Update cannadic to 0.94 * Wed Jan 30 2002 Yukihiro Nakai 3.5b2-58 - Update zipcode dic - Update pubdic-bonobo * Mon Jan 21 2002 Yukihiro Nakai 3.5b2-56 - Update pubdic-bonobo(renamed from pubdic-redhat) * Sat Jan 12 2002 Yukihiro Nakai 3.5b2-55 - Minor fix for shion - Update cannadic to 0.93 * Wed Jan 9 2002 Yukihiro Nakai 3.5b2-52 - %%doc fix - Add pubdic-redhat - Add dictionary 'shion' * Sun Jan 6 2002 Yukihiro Nakai 3.5b2-51 - Add cannadic, GPL dictionary * Thu Aug 30 2001 Yukihiro Nakai - Set -inet option by default in canna init script and add localhost to hosts.canna. It affects to tamago/emacs problem(#52886) * Wed Aug 29 2001 Yukihiro Nakai - Apply patch3 in all case * Thu Aug 23 2001 Jens Petersen - 3.5b2-48 - Add defattr before /var/lib/canna, so that files therein not made executable. * Wed Aug 22 2001 SATO Satoru - 3.5b2-47 - cleaned up SPEC (remove meaningless 'Prefix:' tag, use macros, etc.) - added BuildPrereq: XFree86-devel (xmkmf) - added some dictionaries ported from skk (#52248) - added %%config(noreplace) /var/lib/canna/cannahost * Tue Aug 21 2001 Yukihiro Nakai - 3.5b2-46 - Build fix with (#52088) * Wed Aug 15 2001 Jens Petersen - 3.5b2-45 - Added patch by Ishikawa to make cannaserver listen only on a unix domain socket by default (#33420) and create "/var/lib/canna/cannahost" to help kinput2 find it. - Added fix from Ishikawa for "typo" in malloc call in lib/RK/dd.c. * Tue Aug 9 2001 Yukihiro Nakai - 3.5b2-44 - Off the S bit (#13135) * Sun Jun 24 2001 Elliot Lee - Bump release + rebuild. * Mon Apr 23 2001 Yukihiro Nakai - Add complete ia64 patch * Tue Apr 17 2001 Bill Nottingham - build on ia64 so that dependencies work * Tue Feb 6 2001 Matt Wilson - changed requires on Canna-devel to require Canna-libs, not Canna * Tue Feb 6 2001 Trond Eivind Glomsrd - Display OK or FAILED from initscript (#26111) * Fri Jan 26 2001 Yukihiro Nakai - More fix to reduce warning * Fri Jan 26 2001 Yukihiro Nakai - Capitalize summary - Add Requires to Canna-devel - Minor fix for %%files * Wed Jan 24 2001 Adrian Havill - changed dangerous suid bin/bin uid/gid of server to canna/canna * Tue Jan 23 2001 Yukihiro Nakai - Update canna.init (teg at redhat.com> * Tue Jan 23 2001 Yukihiro Nakai - Add defattr - Add post and postun for -libs to ldconfig * Mon Jan 22 2001 Yukihiro Nakai - Split the runtime library - bzip2 * Fri Jan 19 2001 Yukihiro Nakai - Disable IA64 patch. It seems to cause serious problem. (Such IA64 fix is not needed with the newer compiler?) * Fri Jan 19 2001 Matt Wilson - use -DCANNA_WCHAR (revert the the part of the ia64 patch that disables -DCANNA_WCHAR * Tue Dec 19 2000 Yukihiro Nakai - Add IA64 patch (Not complete) * Wed Sep 13 2000 ISHIKAWA Mutsumi - spcfile typo fix (doc-canna -> dot-canna) * Wed Sep 13 2000 ISHIKAWA Mutsumi - add /etc/skel/.canna * Thu Sep 12 2000 ISHIKAWA Mutsumi - fix initscript * Mon Sep 11 2000 ISHIKAWA Mutsumi - chown bin.bin /usr/sbin/{cannaserver,cannakill},/var/lib/canna and /var/log/canna * Mon Sep 11 2000 ISHIKAWA Mutsumi - hosts.canna read bug fix. * Thu Sep 7 2000 ISHIKAWA Mutsumi - move back /etc/init.d -> /etc/rc.d/init.d * Thu Aug 24 2000 ISHIKAWA Mutsumi - chmod +x /etc/init.d/canna * Fri Aug 4 2000 ISHIKAWA Mutsumi - move /etc/rc.d/init.d -> /etc/init.d * Thu Aug 3 2000 ISHIKAWA Mutsumi - rebuilt for RedHat 7.0. - man directory ja_JP.UJIS -> ja - Canna-3.5b2.conf.patch modified to install manpages to /usr/share/man - remove Canna-3.5b2-fhs.patch to install manpages to /usr/share/man * Tue Jul 18 2000 Nalin Dahyabhai - fix syntax error in postun - no need to remove the services entry in postun - make all symlinks to catdic relative instead of absolute * Fri Jul 14 2000 Bill Nottingham - move initscript back * Wed Jul 12 2000 Prospector - automatic rebuild * Tue Jul 11 2000 Bill Nottingham - don't run by default - add buffer overflow patch - add configuration that should in theory only accept connections from localhost or unix socket * Mon Jun 26 2000 Preston Brown - initscript to /etc/init.d, and updated for new initscript stds. * Mon Jun 19 2000 Preston Brown - FHS paths * Mon Jun 12 2000 Matt Wilson - don't redefine bcopy - add defattr * Sun Mar 26 2000 Chris Ding - ja -> ja_JP.eucJP * Tue Mar 21 2000 Chris Ding - ja_JP.eucJP -> ja * Thu Mar 9 2000 Matt Wilson - build for 6.2, gzip manpages * Sat Mar 4 2000 Chris Ding - ja -> ja_JP.eucJP - changed group * Thu Oct 21 1999 Matt Wilson - added prereq for grep and cp * Wed Oct 20 1999 Matt Wilson - added prereq for /sbin/chkconfig and /etc/services * Tue Oct 12 1999 Matt Wilson - fixed redirection path for 4 man pages * Thu Oct 7 1999 Matt Wilson - rebuilt against 6.1 * Thu Jun 24 1999 Japanese LinuxPPC Users' Group - build against Linuxppc R5 - add Oe's stdin patch in Canna-3.5b2-3rh.src.rpm - change canna.init and spec file for safty shutdown cannaserver. Thanks to Shoichiro Nagata. * Sun May 30 1999 FURUSAWA,Kazuhisa - 4th Release for i386 (glibc2.1). - Original Packager: Atsushi Yamagata * Fri Jan 22 1999 Atsushi Yamagata - 4th release - changed installed directories (See Canna.conf and INSTALL.jp) - added post-{un}install scripts for Canna and Canna-devel packages - added URL, Distribution, Vendor, and Prefix tags * Tue Nov 04 1997 Atsushi Yamagata - 3rd release - patched for glibc. Thanks Mr. Daisuke Sato - divided the Canna packege into Canna and Canna-devel * Sun Jul 27 1997 Atsushi Yamagata - 2nd release * Fri Jul 11 1997 Atsushi Yamagata - 1st release --- NEW FILE canna.init --- #!/bin/bash # # chkconfig: 2345 90 12 # description: Canna Japanese Conversion Engine # # canna Canna server # # Author Manabe Takashi # Modifier Atsushi Yamagata # Modifier 22 Jan 1999 Atsushi Yamagata # Modifier 23 Jun 1999 Shoichiro Nagata # Modifier 04 Feb 2003 Yukihiro Nakai # Source function library. . /etc/init.d/functions PATH=$PATH:/usr/sbin SERVER=/usr/sbin/cannaserver KILLER=/usr/sbin/cannakill prog="Canna server" [ -f $SERVER ] || exit 0 start() { rm -f /tmp/.iroha_unix/IROHA rm -f /var/run/.iroha_unix/IROHA echo -n $"Starting $prog: " $SERVER -syslog -u canna cannaping && success || failure RETVAL=$? [ "$RETVAL" = 0 ] && touch /var/lock/subsys/canna echo } stop() { action "Stopping $prog:" $KILLER 2> /dev/null rm -f /tmp/.iroha_unix/IROHA rm -f /var/run/.iroha_unix/IROHA rm -f /var/lock/subsys/canna } case "$1" in start) start ;; stop) stop ;; status) status cannaserver ;; restart|reload) stop start ;; condrestart) if [ -f /var/lock/subsys/canna ]; then stop start fi ;; *) echo $"Usage: $0 {start|stop|restart|condrestart|status}" exit 1 esac exit 0 --- NEW FILE cannaping.c --- /* * cannaping - the minimal cannaserver check program * * Copyright (C) 2003 Red Hat, Inc. * * 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. */ /* * Bugs & suggestions about this program are welcome: * http://bugzilla.redhat.com/ * * 2003/02/04 * Yukihiro Nakai */ #include #include #include int main() { char** warning = NULL; int res = jrKanjiControl(0, KC_INITIALIZE, (char*)&warning); if( res != 0 ) { exit(-1); } else if( warning ) { exit(-1); } jrKanjiControl(0, KC_FINALIZE, 0); return 0; } --- NEW FILE dot-canna --- ;; Copyright 1992 NEC Corporation, Tokyo, Japan. ;; ;; Permission to use, copy, modify, distribute and sell this software ;; and its documentation for any purpose is hereby granted without ;; fee, provided that the above copyright notice appear in all copies ;; and that both that copyright notice and this permission notice ;; appear in supporting documentation, and that the name of NEC ;; Corporation not be used in advertising or publicity pertaining to ;; distribution of the software without specific, written prior ;; permission. NEC Corporation makes no representations about the ;; suitability of this software for any purpose. It is provided "as ;; is" without express or implied warranty. ;; ;; NEC CORPORATION DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, ;; INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN ;; NO EVENT SHALL NEC CORPORATION BE LIABLE FOR ANY SPECIAL, INDIRECT OR ;; CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF ;; USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR ;; OTHER TORTUOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR ;; PERFORMANCE OF THIS SOFTWARE. ;; $Id: unix.canna,v 1.4 1996/10/25 05:23:02 kon Exp $ ;; ?????????????????????????????? (setq use-symbolic-definition t) ;;; ?????????????????????? ; ; ???????????????????????????????????????????????????????????????? ; (1) ???????????????????? ; (2) ?????????????????? ; (3) /usr/lib/canna/dic ; ?????????????????????? ; ;(setq romkana-table "unix.cbp") (setq romkana-table "default.cbp") ;; ?????????? ;(setq english-table "canna/english.cbp") ;;; ???????????? ; ; ???????????????????????????????????????????????????????????????????? ; ?????????????????? ; ; ?????????????????? :bushu ???????????????????????? ; ; ?????????????????????????????? :user ?????????????????????????????? ; ???????????????????????????????????????????????????????????????????? ; ?????? mkdic user ?????????????????????????????????????????????????? ; ???????? ; (use-dictionary "gcanna" "gcannaf" "chimei" ; "iroha" "fuzokugo" "hojomwd" "hojoswd" "software" "keishiki" "zipcode" "geo" ; "zip99" "basho" "keisan" "pub" "scien" "sup" "bonobo" :bushu "bushu" :user "user" ) ;;; ???????????????????????? ; ; ?????????????????????????????????????????? t ?????????????? nil ???? ; ?????????? ; ???????????????????????????????????????????????? (setq cursor-wrap t) ; default t ; ????????????????????????????????????????????????(nil)?????????????? ; ????????(t) (setq select-direct t) ; default t ; ??????????????????????????(t)??nil?????????????????????????? (setq numerical-key-select t) ; default t ; ???????????????????????????????????????? (setq bunsetsu-kugiri nil) ; default nil ; ????????????????????????(t)?? nil?????????????????????????????????? ; ?????????????????????? (setq character-based-move t) ; default t ; ???????????????????????????????? (setq reverse-widely nil) ; default nil ; ???????????????? (setq gakushu t) ; default t ; ???????????????????????????????????????????? (setq quit-if-end-of-ichiran nil); default nil ; ???????????????????????????????????????????????? (setq kakutei-if-end-of-bunsetsu nil) ; default nil ; ??????????????????????????????(t)??nil?????????????????????????????? ; ???????????????????? (setq stay-after-validate t) ; default t ; ???????????????????????????????????????????????????????????????? (setq break-into-roman t) ; default nil ; ?????????????????????????????????????????????????????????????? ; ???????????????????????????????????? C-w ?????????????????????? ; ???????? (setq n-henkan-for-ichiran 2) ; default 2 ; ??????????????????????????????????(t)??nil?????????????????????????? ; ?????????? (setq gramatical-question t) ; default t ; ???????????????????????????????? (setq kouho-count t) ; default t ; ???????????????? (setq auto nil) ; default nil ; ???????????????????????????????????????????????????? (setq n-kouho-bunsetsu 16) ; default 16 ; ???????????????????????????????????????????????? (setq abandon-illegal-phonogram nil) ; default nil ; ???????????????????????????? (setq allow-next-input t) ; default t ; ???????????????????????????????????????????? (if use-symbolic-definition (progn (defsymbol ?- "??" "-" "??" "??") (defsymbol ?/ "/" "??" "??") (defsymbol ?\\ "\\" "??" "??") (defsymbol ?( "(" "??" "??" ?) ")" "??" "??" ) (defsymbol ?[ "??" "??" "??" "??" "[" ?] "??" "??" "??" "??" "]") (defsymbol ?. "??" "??" "." ?, "??" "??" "," ) (defsymbol ?0 "0" "??" "??" "??" ?1 "1" "??" "??" "??" ?2 "2" "??" "??" "??" ?3 "3" "??" "??" "??" ?4 "4" "??" "??" "??" ?5 "5" "??" "??" "??" ?6 "6" "??" "??" "??" ?7 "7" "??" "??" "??" ?8 "8" "??" "??" "??" ?9 "9" "??" "??" "??" ) (defsymbol ?? "?" "??" ?! "!" "??") (defsymbol ?# "#" "??") (defsymbol ?$ "$" "??") (defsymbol ?% "%" "??") (defsymbol ?& "&" "??") (defsymbol ?+ "+" "??") (defsymbol ?* "*" "??" "??") (defsymbol ?_ "_" "??") (defsymbol ?' "'" "??") (defsymbol ?` "`" "??") (defsymbol ?\" "\"" "??") )) ;; delete ?????????????????????????????????????? (global-set-key "\Delete" 'delete-previous) ; necessary in using Emacs ;; Help ?????????????????? F1 ?????????????????????? (global-set-key "\F1" 'extend-mode) ;; Escape key should escape from the mode. (global-set-key "\Escape" 'quit) ;; Ctrl-o ?????? (global-unbind-key-function 'japanese-mode) skk-dictionaries.patch: --- NEW FILE skk-dictionaries.patch --- diff -uNr Canna35b2/dic/ideo/words/Imakefile Canna35b2.new/dic/ideo/words/Imakefile --- Canna35b2/dic/ideo/words/Imakefile Wed Aug 22 08:44:52 2001 +++ Canna35b2.new/dic/ideo/words/Imakefile Wed Aug 22 08:44:30 2001 @@ -82,6 +82,8 @@ InstallNamedNonExec(kanasmpl.t,kanasmpl.ctd,$(CANNADICDIR)) InstallNamedNonExec(software.t,software.ctd,$(CANNADICDIR)) InstallNamedNonExec(chimei.t,chimei.ctd,$(CANNADICDIR)) +InstallNamedNonExec(zipcode.t,zipcode.ctd,$(CANNADICDIR)) +InstallNamedNonExec(geo.t,geo.ctd,$(CANNADICDIR)) InstallNamedNonExec(hojomwd.t,hojomwd.ctd,$(CANNADICDIR)) InstallNamedNonExec(hojoswd.t,hojoswd.ctd,$(CANNADICDIR)) InstallNamedNonExec(suffix.t,suffix.ctd,$(CANNADICDIR)) @@ -90,6 +92,7 @@ InstallNamedNonExec(keishiki.t,keishiki.ctd,$(CANNADICDIR)) #else TEXTDICS = necgaiji.t kanasmpl.t software.t chimei.t \ + zipcode.t geo.t \ hojomwd.t hojoswd.t suffix.t number.t katakana.t keishiki.t InstallMultipleFlags($(TEXTDICS),$(CANNADICDIR),-m 0664) #endif diff -uNr Canna35b2/dic/ideo/words/dics.dir Canna35b2.new/dic/ideo/words/dics.dir --- Canna35b2/dic/ideo/words/dics.dir Sat Nov 9 11:14:13 1996 +++ Canna35b2.new/dic/ideo/words/dics.dir Wed Aug 22 08:44:30 2001 @@ -38,3 +38,5 @@ kanasmpl.ctd(.mwd) -kanasample--- necgaiji.ctd(.mwd) -necgaiji--- software.ctd(.mwd) -software--- +zipcode.ctd(.mwd) -zipcode--- +geo.ctd(.mwd) -geo--- diff -uNr Canna35b2/dic/ideo/words/geo.t Canna35b2.new/dic/ideo/words/geo.t --- Canna35b2/dic/ideo/words/geo.t Thu Jan 1 09:00:00 1970 +++ Canna35b2.new/dic/ideo/words/geo.t Wed Aug 22 08:44:30 2001 @@ -0,0 +1,68607 @@ +# +# This dictionary was generated from /usr/share/skk/SKK-JISYO.geo by ./Geo.rb +# Date: Wed Aug 22 07:57:49 JST 2001 +# +?????????????? #CN ???????????? +???? #CN ???? ???? +???????? #CN ???? +???????? #CN ???? +???????? #CN ???? +???????? #CN ???? +???????? #CN ???? +?????????? #CNS ?????? +?????????????? #CNS ?????? ?????? +?????????????? #CN ?????? +???????????? #CNS ?????? +???????? #CN ???? +?????????????? #CN ???????? +???????? #CN ???? +???????? #CN ???? +???????????? #CNS ?????? +?????????? #CN ???? +???????? #CN ???? +???????? #CN ???? ???? ???? +???????????? #CN ?????? +?????????????? #CNS ?????? ?????? +???????????? #CNS ?????? ?????? +?????????????????? #CNS ?????????? +???????????? #CNS ?????? +???????????????????? #CN ?????????? +?????????????????? #CN ?????????? +???????????????????? #CN ?????????? +???????????????????????? #CN ???????????? +?????????????????????? #CN ???????????? +?????????????????????? #CN ???????????? +???????????? #CNS ?????? +???????????? #CN ???????? +???????????? #CNS ?????? +???????? #CN ???? +?????????????? #CNS ?????? +???????????????????????? #CNS ???????????? +???????????????????????? #CNS ???????????? +?????????????? #CNS ?????? +?????????????? #CNS ?????? +???????????? #CN ?????? +?????????????? #CN ?????? +?????????? #CN ?????? +???????? #CN ???? +???????? #CN ???? +???????? #CN ???? +?????????????? #CNS ?????? +???????? #CN ???? +???????? #CN ???? +???????? #CN ???? +???????? #CN ???? +???????? #CN ???? +?????????????? #CNS ?????? +???????? #CN ???? +?????????????????? #CNS ???????? +???????? #CN ?????? ???? +???????????????? #CN ???????? +?????? #CN ???? +???????? #CN ???? +?????????????? #CNS ?????? +?????? #CN ???? +???????????????? #CNS ???????? +???????? #CN ???? +???????????????????? #CN ?????????? +?????????????? #CNS ?????? +?????? #CN ???? ???? +???????? #CN ???? +?????????????? #CNS ?????? +???????? #CN ???? +?????? #CN ???? ???? ???? +???????? #CN ???? +?????????????????????? #CNS ???????????? +???????????????????????? #CNS ???????????? +???????????????????????? #CNS ???????????? +?????????????????????????? #CNS ?????????????? +???????????????????????????? #CNS ?????????????? +???????????????????????? #CNS ???????????? +???????????? #CNS ?????? +???????? #CN ???? +?????? #CN ???? +???????????????????????? #CNS ???????????? +???????????????????????? #CNS ?????????????? +???????????? #CNS ?????? +?????? #CN ???? +???????? #CN ???? +???????? #CN ???? +?????????????? #CN ???????? +?????????? #CNS ?????? +?????????????? #CNS ?????? +???????????? #CNS ?????? +?????? #CN ???? ???? +?????????? #CN ???? +???????????? #CNS ?????? +?????? #CN ???? ???? +???????? #CN ???? ???? +?????????????? #CN ?????????? +???????? #CN ???? +?????? #CN ???? +???????? #CN ???? +?????????? #CN ?????? +???????????????? #CNS ?????? +?????????? #CN ?????? +???????? #CN ?????? ???? +???????????? #CN ?????? +???????????????? #CNS ?????????? +???????????? #CNS ?????? +?????????? #CN ???? +?????????? #CN ???? +?????????????? #CN ???????? +?????????????? #CN ???????? +?????????? #CN ?????? +??????????1?????? #CN ???????????? +??????????2?????? #CN ???????????? +??????????3?????? #CN ???????????? +??????????4?????? #CN ???????????? +??????????5?????? #CN ???????????? +?????????? #CN ?????? ?????? +?????????? #CN ???? ?????? ???? +???????? #CN ?????? +?????????? #CN ?????? ???? +???????????? #CNS ?????? +???????????????? #CNS ?????? +???????? #CN ?????? +?????????? #CN ?????? ?????? +?????????? #CNS ?????? +????????????????2???????????? #CN ???????????????? +???????????????????????????????? #CN ?????????????????? +?????????? #CN ?????? +?????????? #CN ???? +???????? #CN ?????? ?????? ?????? +?????????? #CN ?????? +?????????? #CN ?????? +???????????? #CNS ???????? +???????? #CN ???? +???????? #CN ???? +???????? #CN ???? +?????????????? #CN ???????? +?????????????????????? #CN ???????????? +???????????? #CN ?????? +?????????????? #CN ???????? +???????????????? #CN ?????????? +???????????? #CN ?????? +???????????????? #CN ???????? +???????????????? #CN ???????? +?????????????? #CN ???????? +???????????????? #CN ???????? +???????????? #CN ?????? +???????????? #CNS ?????? +?????????????????? #CN ???????? +???????????????? #CN ?????????? +?????????????? #CN ???????? +?????? #CN ???? ???? +?????????? #CN ???? +???????????? #CNS ?????? ?????? +???????????? #CN ?????? +???????? #CN ???? +???????? #CN ???? ???? +???????? #CN ???? +???????????? #CN ?????? +???????????????????????????????????? #CN ?????????????????? +?????????????? #CNS ???????? +???????????? #CNS ???????? +?????? #CN ???? [...185178 lines suppressed...] +9997312 #CN ?????????????????????????? +9997313 #CN ?????????????????????????? +9997314 #CN ???????????????????????? +9997315 #CN ???????????????????????? +9997316 #CN ???????????????????????? +9997461 #CN ?????????????????? +9997462 #CN ?????????????????? +9997463 #CN ???????????????? +9997464 #CN ???????????????? +9997541 #CN ???????????????? +9997542 #CN ???????????????? +9997543 #CN ???????????????? +9997544 #CN ???????????????? +9997545 #CN ???????????????? +9997546 #CN ???????????????? +9997547 #CN ???????????????? +9997600 #CN ???????????????????? +9997601 #CN ???????????????????????? +9997602 #CN ?????????????????????????? +9997604 #CN ???????????????????????? +9997611 #CN ?????????????????????????? +9997621 #CN ???????????????????????? +9997622 #CN ???????????????????????? +9997631 #CN ?????????????????????????? +9997632 #CN ?????????????????????????? +9997633 #CN ???????????????????????? +9997634 #CN ???????????????????????? +9997635 #CN ???????????????????????????? +9997636 #CN ?????????????????????????? +9997637 #CN ???????????????????????????? +9997638 #CN ???????????????????????? +9997641 #CN ?????????????????????? +9997642 #CN ???????????????????????? +9997643 #CN ???????????????????????? +9997644 #CN ???????????????????????? +9997645 #CN ???????????????????????? +9997646 #CN ???????????????????????? +9997651 #CN ???????????????????????? +9997652 #CN ???????????????????????? +9997653 #CN ?????????????????????????? +9997661 #CN ?????????????????????????? +9997662 #CN ???????????????????????????? +9997663 #CN ???????????????????????????? +9997664 #CN ???????????????????????????? +9997671 #CN ???????????????????????? +9997672 #CN ?????????????????????????? +9997673 #CN ???????????????????????? +9997674 #CN ???????????????????????????? +9997675 #CN ???????????????????????? +9997676 #CN ?????????????????????????? +9997677 #CN ?????????????????????????? +9997681 #CN ???????????????????????? +9997682 #CN ?????????????????????????? +9997683 #CN ???????????????????????? +9997684 #CN ?????????????????????????? +9997685 #CN ???????????????????????? +9997700 #CN ???????????????????? +9997701 #CN ?????????????????????? +9997702 #CN ???????????????????????? +9997703 #CN ???????????????????????? +9997704 #CN ?????????????????????????? +9997705 #CN ???????????????????????? +9997706 #CN ?????????????????????????? +9997707 #CN ?????????????????????????? +9997711 #CN ???????????????????????? +9997712 #CN ???????????????????????? +9997713 #CN ???????????????????????? +9997714 #CN ???????????????????????????? +9997715 #CN ???????????????????????? +9997721 #CN ?????????????????????????? +9997722 #CN ???????????????????????????? +9997723 #CN ???????????????????????? +9997724 #CN ???????????????????????????? +9997725 #CN ?????????????????????????? +9997726 #CN ???????????????????????? +9997727 #CN ???????????????????????? +9997731 #CN ???????????????????????????? +9997732 #CN ???????????????????????????? +9997733 #CN ?????????????????????????? +9997734 #CN ???????????????????????? +9997735 #CN ???????????????????????????? +9997736 #CN ???????????????????????? +9997737 #CN ?????????????????????????? +9997741 #CN ???????????????????????? +9997742 #CN ???????????????????????? +9997743 #CN ?????????????????????????? +9997744 #CN ???????????????????????????? +9997745 #CN ?????????????????????????? +9997746 #CN ???????????????????????? +9997747 #CN ???????????????????????? +9997748 #CN ???????????????????????? +9997749 #CN ???????????????????????? +9997751 #CN ???????????????????????????? +9997752 #CN ???????????????????????????? +9997753 #CN ???????????????????????? +9997754 #CN ???????????????????????? +9997755 #CN ???????????????????????? +9997756 #CN ?????????????????????????? +9997757 #CN ???????????????????????? +9997761 #CN ?????????????????????????? +9997762 #CN ?????????????????????????? +9997763 #CN ???????????????????????? +9997764 #CN ?????????????????????????? +9997765 #CN ???????????????????????? +9997766 #CN ???????????????????????? +9997767 #CN ???????????????????????? +9997768 #CN ???????????????????????? +9997771 #CN ?????????????? +9997772 #CN ???????????????? +9997773 #CN ???????????????? +9997774 #CN ???????????????? +9997775 #CN ?????????????????? +9997776 #CN ???????????????? +9997777 #CN ???????????????? +9997781 #CN ???????????????????????? +9998131 #CN ???????????????? ???????????????????? +9998132 #CN ???????????????? +9998133 #CN ?????????????????? +9998134 #CN ???????????????? +9998141 #CN ???????????????? +9998142 #CN ???????????????? +9998143 #CN ???????????????? +9998144 #CN ???????????????? +9998145 #CN ???????????????? +9998151 #CN ???????????????? +9998152 #CN ?????????????????? +9998153 #CN ?????????????????? +9998154 #CN ?????????????????? +9998155 #CN ?????????????????? +9998156 #CN ?????????????????? +9998157 #CN ?????????????????? +9998158 #CN ???????????????? +9998161 #CN ???????????????? +9998162 #CN ???????????????????? +9998163 #CN ?????????????????? +9998164 #CN ?????????????????? +9998165 #CN ???????????????????? +9998166 #CN ?????????????????? +9998167 #CN ???????????????????? +9998168 #CN ???????????????? +9998200 #CN ?????????????????? +9998201 #CN ?????????????????????? +9998202 #CN ?????????????????????? +9998203 #CN ?????????????????????? +9998204 #CN ?????????????????????? +9998205 #CN ???????????????????????? +9998206 #CN ???????????????????????? +9998207 #CN ?????????????????????? +9998211 #CN ???????????????????????? +9998212 #CN ???????????????????????? +9998213 #CN ???????????????????????? +9998214 #CN ???????????????????????? +9998215 #CN ?????????????????????? +9998221 #CN ?????????????????????? +9998222 #CN ???????????????????????? +9998223 #CN ???????????????????????? +9998224 #CN ?????????????????????? +9998225 #CN ???????????????????????? +9998226 #CN ?????????????????????? +9998227 #CN ???????????????????????? +9998231 #CN ???????????????????? +9998232 #CN ?????????????????????? +9998233 #CN ???????????????????????? +9998234 #CN ?????????????????????? +9998235 #CN ???????????????????????? +9998241 #CN ?????????????????????? +9998242 #CN ?????????????????????? +9998243 #CN ???????????????????????? +9998244 #CN ???????????????????????? +9998245 #CN ?????????????????????? +9998246 #CN ?????????????????????? +9998300 #CN ?????????????????? +9998301 #CN ???????????????????????? +9998302 #CN ?????????????????????? +9998303 #CN ?????????????????????? +9998304 #CN ?????????????????????????? +9998311 #CN ???????????????????????? +9998312 #CN ???????????????????????? +9998313 #CN ?????????????????????? +9998314 #CN ???????????????????????? +9998315 #CN ???????????????????????? +9998316 #CN ?????????????????????? +9998317 #CN ?????????????????????? +9998421 #CN ???????????????? +9998422 #CN ?????????????????? +9998423 #CN ???????????????? +9998431 #CN ?????????????????????? ???????????????????????????? +9998432 #CN ?????????????????????? +9998433 #CN ?????????????????????? +9998434 #CN ?????????????????????? +9998435 #CN ?????????????????????? +9998436 #CN ?????????????????????? +9998437 #CN ?????????????????????? +9998438 #CN ?????????????????????? +9998521 #CN ?????????????????????? +9998522 #CN ?????????????????????? +9998523 #CN ?????????????????????? +9998524 #CN ?????????????????????? +9998525 #CN ?????????????????????? +9998531 #CN ?????????????????????? Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/Canna/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 26 Sep 2005 09:21:11 -0000 1.1 +++ .cvsignore 26 Sep 2005 09:29:14 -0000 1.2 @@ -0,0 +1,5 @@ +Canna37p3.tar.bz2 +cannadic-0.95c.tar.gz +pubdic-bonobo-20021028.tar.bz2 +shion.tar.gz +zipcode-20030204.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/Canna/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 26 Sep 2005 09:21:11 -0000 1.1 +++ sources 26 Sep 2005 09:29:14 -0000 1.2 @@ -0,0 +1,5 @@ +0b8c241f63ab4cd3c0b9be569456dc33 Canna37p3.tar.bz2 +2a7fc1be5a50e0ca5dd6e5721be4371a cannadic-0.95c.tar.gz +1c89701cc7a274068c3b265e2aa36ac2 pubdic-bonobo-20021028.tar.bz2 +9df0656abbcfdcc2001071805d23229b shion.tar.gz +d6287eb37f8b9151fa38cc2684952177 zipcode-20030204.tar.bz2 From fedora-extras-commits at redhat.com Mon Sep 26 09:39:54 2005 From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh)) Date: Mon, 26 Sep 2005 05:39:54 -0400 Subject: rpms/Canna/devel Canna.spec,1.1,1.2 Message-ID: <200509260939.j8Q9dsFv003851@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/extras/rpms/Canna/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3832 Modified Files: Canna.spec Log Message: * Mon Sep 26 2005 Akira TAGOH - 3.7p3-14 - Imported into Extras. Index: Canna.spec =================================================================== RCS file: /cvs/extras/rpms/Canna/devel/Canna.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- Canna.spec 26 Sep 2005 09:29:14 -0000 1.1 +++ Canna.spec 26 Sep 2005 09:39:52 -0000 1.2 @@ -6,7 +6,7 @@ Summary: A Japanese character set input system. Name: Canna Version: 3.7p3 -Release: 13 +Release: 14%{?dist} License: Distributable Group: System Environment/Libraries URL: http://www.nec.co.jp/japanese/product/computer/soft/canna/ @@ -324,6 +324,9 @@ %{_libdir}/libcanna16.so.* %changelog +* Mon Sep 26 2005 Akira TAGOH - 3.7p3-14 +- Imported into Extras. + * Mon Mar 7 2005 Akira TAGOH - 3.7p3-13 - stop to sort the words on some dictionaries during making the binary dictionaries. From fedora-extras-commits at redhat.com Mon Sep 26 09:42:35 2005 From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh)) Date: Mon, 26 Sep 2005 05:42:35 -0400 Subject: owners owners.list,1.249,1.250 Message-ID: <200509260942.j8Q9gZvu003910@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3891 Modified Files: owners.list Log Message: added Canna owner Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.249 retrieving revision 1.250 diff -u -r1.249 -r1.250 --- owners.list 25 Sep 2005 21:49:57 -0000 1.249 +++ owners.list 26 Sep 2005 09:42:33 -0000 1.250 @@ -70,6 +70,7 @@ Fedora Extras|cabextract|A Microsoft Cabinet file extractor|ville.skytta at iki.fi|extras-qa at fedoraproject.org| Fedora Extras|camE|Rewrite of the xawtv webcam app, which adds imlib2 support|matthias at rpmforge.net|extras-qa at fedoraproject.org| Fedora Extras|camstream|CamStream - a set of programs to make use of your webcam|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| +Fedora Extras|Canna|A Japanese character set input system|tagoh at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|c-ares|A library that performs asynchronous DNS operations|tcallawa at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|ccache|Compiler cache|wtogami at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|ccid|Generic USB CCID smart card reader driver|ville.skytta at iki.fi|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Mon Sep 26 10:07:24 2005 From: fedora-extras-commits at redhat.com (Marc Maurer (uwog)) Date: Mon, 26 Sep 2005 06:07:24 -0400 Subject: rpms/link-grammar/FC-4 link-grammar.spec,1.3,1.4 Message-ID: <200509261007.j8QA7uQ1005334@cvs-int.fedora.redhat.com> Author: uwog Update of /cvs/extras/rpms/link-grammar/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5311 Modified Files: link-grammar.spec Log Message: Escape the dist macro in the changelog Index: link-grammar.spec =================================================================== RCS file: /cvs/extras/rpms/link-grammar/FC-4/link-grammar.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- link-grammar.spec 25 Sep 2005 21:54:48 -0000 1.3 +++ link-grammar.spec 26 Sep 2005 10:07:17 -0000 1.4 @@ -1,7 +1,7 @@ Summary: A Grammar Checking library Name: link-grammar Version: 4.1.3 -Release: 2%{?dist} +Release: 3%{?dist} Group: System Environment/Libraries License: BSD-style Source: http://www.abisource.com/downloads/link-grammar/%{version}/link-grammar-%{version}.tar.gz @@ -55,8 +55,11 @@ rm -r $RPM_BUILD_ROOT %changelog +* Mon Sep 25 2005 Marc Maurer - 4.1.3-3.fc4 +- Escape the dist macro in the changelog + * Sun Sep 25 2005 Marc Maurer - 4.1.3-2.fc4 -- Add %{?dist} to the release field, not the version field +- Add %%{?dist} to the release field, not the version field * Sun Sep 25 2005 Marc Maurer - 4.1.3-1.fc4 -- Initial release for FC4 \ No newline at end of file +- Initial release for FC4 From fedora-extras-commits at redhat.com Mon Sep 26 10:27:19 2005 From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc)) Date: Mon, 26 Sep 2005 06:27:19 -0400 Subject: rpms/nail - New directory Message-ID: <200509261027.j8QARJP8005516@cvs-int.fedora.redhat.com> Author: buc Update of /cvs/extras/rpms/nail In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5492/nail Log Message: Directory /cvs/extras/rpms/nail added to the repository From fedora-extras-commits at redhat.com Mon Sep 26 10:27:19 2005 From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc)) Date: Mon, 26 Sep 2005 06:27:19 -0400 Subject: rpms/nail/devel - New directory Message-ID: <200509261027.j8QARJ1j005521@cvs-int.fedora.redhat.com> Author: buc Update of /cvs/extras/rpms/nail/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5492/nail/devel Log Message: Directory /cvs/extras/rpms/nail/devel added to the repository From fedora-extras-commits at redhat.com Mon Sep 26 10:27:42 2005 From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc)) Date: Mon, 26 Sep 2005 06:27:42 -0400 Subject: rpms/nail Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200509261027.j8QARg1t005572@cvs-int.fedora.redhat.com> Author: buc Update of /cvs/extras/rpms/nail In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5537 Added Files: Makefile import.log Log Message: Setup of module nail --- NEW FILE Makefile --- # Top level Makefile for module nail all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Mon Sep 26 10:27:42 2005 From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc)) Date: Mon, 26 Sep 2005 06:27:42 -0400 Subject: rpms/nail/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200509261027.j8QARg8L005577@cvs-int.fedora.redhat.com> Author: buc Update of /cvs/extras/rpms/nail/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5537/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module nail --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Mon Sep 26 10:28:38 2005 From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc)) Date: Mon, 26 Sep 2005 06:28:38 -0400 Subject: rpms/nail import.log,1.1,1.2 Message-ID: <200509261028.j8QAScWw005660@cvs-int.fedora.redhat.com> Author: buc Update of /cvs/extras/rpms/nail In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5623 Modified Files: import.log Log Message: auto-import nail-11.25-3 on branch devel from nail-11.25-3.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/nail/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 26 Sep 2005 10:27:40 -0000 1.1 +++ import.log 26 Sep 2005 10:28:35 -0000 1.2 @@ -0,0 +1 @@ +nail-11_25-3:HEAD:nail-11.25-3.src.rpm:1127730503 From fedora-extras-commits at redhat.com Mon Sep 26 10:28:38 2005 From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc)) Date: Mon, 26 Sep 2005 06:28:38 -0400 Subject: rpms/nail/devel nail-11.25-config.patch, NONE, 1.1 nail.html, NONE, 1.1 nail.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200509261028.j8QAScrA005667@cvs-int.fedora.redhat.com> Author: buc Update of /cvs/extras/rpms/nail/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5623/devel Modified Files: .cvsignore sources Added Files: nail-11.25-config.patch nail.html nail.spec Log Message: auto-import nail-11.25-3 on branch devel from nail-11.25-3.src.rpm nail-11.25-config.patch: --- NEW FILE nail-11.25-config.patch --- diff -Nrbu nail-11.25/nail.rc nail-11.25-OK/nail.rc --- nail-11.25/nail.rc 2005-01-15 17:33:16.000000000 +0300 +++ nail-11.25-OK/nail.rc 2005-08-19 16:55:09.000000000 +0400 @@ -60,3 +60,7 @@ # Only include selected header fields when forwarding messages. fwdretain subject date from to + +# For Linux and BSD, this should be set. +set bsdcompat + --- NEW FILE nail.html --- nail, an enhanced mailx command

          nail, an enhanced mailx command

          Nail is a mail user agent for Unix systems. Highlights are:

          • Derived from Berkeley Mail 8.1. An interface like the original Berkeley one is still optionally available.
          • Is a free implementation of the System V mailx command and features an interface like that by default.
          • Is intended to comply to the mailx command specifications of IEEE Std 1003.2-1992 (POSIX.2) and IEEE Std 1003.1-2004 with XSI extensions (SUSv3).
          • Supports the MIME specifications. Nail can send and receive attachments and code and decode international character strings. If the system libraries provide appropriate support, conversion between different character encodings is performed. In combination with a UTF-8 terminal, nearly all international languages are supported. External converter programs can be automatically invoked e. g. to view messages in HTML format.
          • Supports IMAP. In combination with either OpenSSL or Mozilla NSS, IMAPS can also be used. With IMAP, folder hierarchies can be stored and managed on remote servers. This is particularly useful for people who use more than one computer to access their mail. Of course, it is also possible to use IMAP just for fetching mails and storing them locally.
          • Supports caching and disconnected operation of IMAP folders. This speeds up operation while in online mode. It also makes it possible to transparently view and edit IMAP mailboxes without an active connection to the server.
          • Supports POP3 to read messages on a remove server. In combination with OpenSSL or NSS, POP3S can also be used. Nail can read and delete individual messages, thus POP3 accounts can almost be accessed like local mail folders.
          • Supports SMTP to send messages directly to a remote server. A local sendmail interface setup is thus not necessary. In combination with OpenSSL or NSS, both the STARTTLS method and SMTPS can be used. SMTP AUTH is also supported.
          • Supports S/MIME for signed and encrypted email (in combination with OpenSSL or NSS).
          • In combination with NSS, certificates for S/MIME and SSL/TLS can be shared with Mozilla applications, and can be managed using them.
          • Can display message threads and supports operations on them. This is especially useful for handling mailing lists. It is also possible to sort messages by various other criteria.
          • Provides a Bayesian junk mail filter mostly according to Paul Graham's article “Better Bayesian Filtering”. Chained tokens according to Jonathan A. Zdziarski's “Advanced Language Classification using Chained Tokens” can optionally be used.
          • Features a lot of detail improvements over Mail/mailx, such as IMAP-style search methods and flags for any types of folders, killing and scoring of messages, maildir folder support, an option to set the From: address directly, and the generation of References: header fields to avoid annoyances on mailing lists.
          • Can be used as a mail batch language in nearly the same way as it is used interactively. So it is possible to use nail as a mailbox filter, for fetching mails, or for sending files as attachments.
          • Is extensively described in its manual page nail(1), which provides both introductory material and complete reference documentation.

          For installation instructions, see the README.

          The ChangeLog keeps track of modifications.

          New releases of this project are announced on freshmeat.net. You can use their subscription service to get an email when a new version is available.

          Nail development is discussed on the nail-devel mailing list. All people interested in discussing or coding features for future releases are invited to participate. Bug reports should also be sent to the list. To subscribe to the list or look at the archives, visit <https://lists.sourceforge.net/lists/listinfo/nail-devel>. If you do not want to subscribe, you can directly mail to the list using the address <nail-devel at lists.sourceforge.net>.

          Download the source code

          Release 11.25 (current)

          All releases

          Browse the CVS repository

          The most recent results of development are sometimes made available in the public CVS repository. Use 

          $ cvs -d:pserver:anonymous at cvs.sourceforge.net:/cvsroot/nail login
CVS password:<just type return>
$ cvs -d:pserver:anonymous at cvs.sourceforge.net:/cvsroot/nail co nail
          to retrieve a copy. Follow these instructions for more information. If you want to report a problem, please look at the ChangeLog in CVS to see if it has already been resolved, and if so, try if the fix works for you. Do not use the code from CVS unless you have a special reason to do so. It may be incorrect, not well tested, and might not even compile.

          mail, Mail, mailx, nail - history notes

          There has since long been confusion about the names of mail commands on Unix systems. Here is some clarification:

          The most ancient command is mail, which was included in Unix 1st Edition in 1971 according to the manuals. At this time, Unix had no remote communication facility at all, so mail would simply write to other users' files on a single machine.

          mail has since been updated a bit in following Unix versions; it could invoke uux and later sendmail for sending remote messages and got at least some interactive commands for navigating in a mailbox. A mail command like this was standardized with the System V Interface Definition (SVID) and the Single Unix Specification (up to the 1998 edition).

          With later versions of System V, mail still got some more features, e. g. a facility to print header summaries. An Open Source version of such a mail command is available from the Heirloom Project; see its manual page for an overview of its features. Yet all derivatives of the original mail remained somewhat primitive; since they neither invoke a pager for viewing messages longer than a CRT screen, nor offer a method to set Subject lines, they are not well suited for use with Internet mail. They are still appropriate to send short messages, though.

          What one should learn from this is, however, that any use of a mail command with the -s option to set a subject line in a shell script is unportable and will not work on some Unix implementations.

          In 1978, Kurt Shoens wrote another mail user agent for Unix: Berkeley Mail. It was not a derivative of the original mail command. At the time it was included in the 2BSD release (which still was just an add-on for Unix 6th or 7th Edition systems), its user interface was already complete (so if the bsdcompat option is set in nail, it practically looks and feels the same). After installation, Berkeley Mail was found as /usr/ucb/Mail, but Unix mail was still available as /bin/mail.

          Confusion really began with the 3BSD release (a complete system, not an add-on), as it also provided a /usr/ucb/mail command which was just a link to Mail. So, depending on the PATH setting, typing mail could either invoke Unix mail or Berkeley Mail. This remained the same with all Berkeley releases up to 4.3BSD-Tahoe and derivatives; in the end, Unix mail was removed entirely, but the name remained as a link to Mail in all places.

          For System V Release 3, a derivative of Berkeley Mail was created: mailx. It remained mostly compatible with Mail, but there were some add-ons and the user interface was slightly changed (nail uses a similar interface if none of the bsd... compatibility variables is set).

          This System V mailx command was then also standardized with POSIX.2 in 1992, including many of the extensions.

          Linux distributions made the situation even more confusing. They could only use the original Berkeley Mail (System V mailx was closed source until the OpenSolaris release in 2005). Yet because Mail and mailx were sufficiently similar for most applications, it seemed appropriate for many to also feature a mailx command which was just Mail, thus not sufficient for formal POSIX.2 conformance. Most distributions also made mail invoke Mail, since Unix mail was also closed source until January 2002.

          To complete the confusion, some commercial Unix vendors dropped support for the original mail over the time and made it invoke mailx.

          nail is derived from Berkeley Mail. It got its name because the m and n keys are located next to one another on the keyboard, and the resulting word was easy to remember. Since version 10, nail also features independent implementations of the System V and POSIX mailx additions.

          Thus it is appropriate to call nail as mailx. If it is called as Mail, a short shell script should be created which sets the bsdcompat variable before invoking nail. mail however is an entirely different command and should be taken from the Heirloom Toolchest if an Open Source version is desired.

          Portable scripts should either invoke mail without any options or should use the standardized mailx interface. In any case, they should set the MAILRC variable to /dev/null to bypass the user's configuration. As this variable is present in mailx, but not in Mail, using Mail for scripts does not work reliably anyway and should be avoided. (In effect, this means that there is no reliable way to send mail from a script on many BSD derivatives and Linux distributions. But that is a fact one has to live with.)

          Gunnar Ritter <gunnarr at acm.org> 2005-07-29

          More software by Gunnar Ritter

          SourceForge.net Logo --- NEW FILE nail.spec --- %define use_nss 0 Summary: Enhanced implementation of the mailx command Name: nail Version: 11.25 Release: 3%{?dist} Group: Applications/Internet License: BSD URL: http://nail.sourceforge.net Source0: http://surfnet.dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.bz2 # Note: it is just "lynx -source http://nail.sourceforge.net > nail.html" Source1: nail.html BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Patch0: nail-11.25-config.patch %if %{use_nss} BuildRequires: mozilla-nss-devel, mozilla-nspr-devel, pkgconfig %else BuildRequires: krb5-devel, openssl-devel %endif %description Nail is an enhanced mail command, which provides the functionality of the POSIX mailx command. It is derived from Berkeley Mail. Additionally to the POSIX features, nail can work with Maildir/ e-mail storage format (as well as mailboxes), supports IMAP, POP3 and SMTP procotols (including over SSL) to operate with remote hosts, handles mime types and different charsets. There are a lot of other useful features, see %{name}.html in the documentation. And as its ancient analogues, nail can be used as a mail script language, both for sending and receiving mail. %prep %setup -q %patch0 -p1 cp %{SOURCE1} %{name}.html %build rm -rf $RPM_BUILD_ROOT %if %{use_nss} INCLUDES="$INCLUDES `pkg-config --cflags-only-I mozilla-nspr`" INCLUDES="$INCLUDES `pkg-config --cflags-only-I mozilla-nss`" export INCLUDES %endif echo PREFIX=%{_prefix} \ BINDIR=%{_bindir} \ MANDIR=%{_mandir} \ SYSCONFDIR=%{_sysconfdir} \ MAILRC=%{_sysconfdir}/nail.rc \ MAILSPOOL=%{_localstatedir}/mail \ SENDMAIL=%{_sbindir}/sendmail \ UCBINSTALL=install \ > makeflags make %{?_smp_mflags} `cat makeflags` CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE" %install make DESTDIR=$RPM_BUILD_ROOT `cat makeflags` install %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) %doc COPYING AUTHORS README %{name}.html %config(noreplace) %{_sysconfdir}/nail.rc %{_bindir}/nail %{_mandir}/man1/nail* %changelog * Mon Sep 26 2005 Dmitry Butskoy - 11.25-3 - more spec file cleanups - accepted for Fedora Extra (review by Aurelien Bompard ) * Mon Aug 22 2005 Dmitry Butskoy - 11.25-2 - spec file cleanups (#166343) * Fri Aug 19 2005 Dmitry Butskoy - 11.25-1 - initial release - add "set bsdcompat" to nail.rc as default - copy nail web page to doc Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/nail/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 26 Sep 2005 10:27:40 -0000 1.1 +++ .cvsignore 26 Sep 2005 10:28:36 -0000 1.2 @@ -0,0 +1 @@ +nail-11.25.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/nail/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 26 Sep 2005 10:27:40 -0000 1.1 +++ sources 26 Sep 2005 10:28:36 -0000 1.2 @@ -0,0 +1 @@ +54f42db31911d734fcf37a89b72d4df7 nail-11.25.tar.bz2 From fedora-extras-commits at redhat.com Mon Sep 26 10:34:55 2005 From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc)) Date: Mon, 26 Sep 2005 06:34:55 -0400 Subject: owners owners.list,1.250,1.251 Message-ID: <200509261034.j8QAYtQs005773@cvs-int.fedora.redhat.com> Author: buc Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5754 Modified Files: owners.list Log Message: Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.250 retrieving revision 1.251 diff -u -r1.250 -r1.251 --- owners.list 26 Sep 2005 09:42:33 -0000 1.250 +++ owners.list 26 Sep 2005 10:34:53 -0000 1.251 @@ -516,6 +516,7 @@ Fedora Extras|most|more, less, most|adrian at lisas.de|extras-qa at fedoraproject.org| Fedora Extras|mpc|Command-line client for MPD|gauret at free.fr|extras-qa at fedoraproject.org| Fedora Extras|nabi|Simple Hangul X Input Method|djoo at redhat.com|extras-qa at fedoraproject.org|wtogami at redhat.com +Fedora Extras|nail|Enhanced implementation of the mailx command|dmitry at butskoy.name|extras-qa at fedoraproject.org| Fedora Extras|naim|An ncurses-based console AIM, ICQ, IRC, and Lily client|lmacken at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|namazu|A full-text search engine|tagoh at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|nautilus-open-terminal|Nautilus extension for an open terminal shortcut|stickster at gmail.com|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Mon Sep 26 10:45:36 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Mon, 26 Sep 2005 06:45:36 -0400 Subject: rpms/wmCalClock - New directory Message-ID: <200509261045.j8QAjaYY005914@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/wmCalClock In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5890/wmCalClock Log Message: Directory /cvs/extras/rpms/wmCalClock added to the repository From fedora-extras-commits at redhat.com Mon Sep 26 10:45:37 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Mon, 26 Sep 2005 06:45:37 -0400 Subject: rpms/wmCalClock/devel - New directory Message-ID: <200509261045.j8QAjbA3005919@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/wmCalClock/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5890/wmCalClock/devel Log Message: Directory /cvs/extras/rpms/wmCalClock/devel added to the repository From fedora-extras-commits at redhat.com Mon Sep 26 10:45:53 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Mon, 26 Sep 2005 06:45:53 -0400 Subject: rpms/wmCalClock Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200509261045.j8QAjrKT005964@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/wmCalClock In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5935 Added Files: Makefile import.log Log Message: Setup of module wmCalClock --- NEW FILE Makefile --- # Top level Makefile for module wmCalClock all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Mon Sep 26 10:45:53 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Mon, 26 Sep 2005 06:45:53 -0400 Subject: rpms/wmCalClock/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200509261045.j8QAjrT3005967@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/wmCalClock/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5935/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module wmCalClock --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Mon Sep 26 10:46:33 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Mon, 26 Sep 2005 06:46:33 -0400 Subject: rpms/wmCalClock import.log,1.1,1.2 Message-ID: <200509261046.j8QAkXhd006038@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/wmCalClock In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6003 Modified Files: import.log Log Message: auto-import wmCalClock-1.25-2 on branch devel from wmCalClock-1.25-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/wmCalClock/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 26 Sep 2005 10:45:51 -0000 1.1 +++ import.log 26 Sep 2005 10:46:31 -0000 1.2 @@ -0,0 +1 @@ +wmCalClock-1_25-2:HEAD:wmCalClock-1.25-2.src.rpm:1127731583 From fedora-extras-commits at redhat.com Mon Sep 26 10:46:34 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Mon, 26 Sep 2005 06:46:34 -0400 Subject: rpms/wmCalClock/devel wmCalClock.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200509261046.j8QAkY5g006045@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/wmCalClock/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6003/devel Modified Files: .cvsignore sources Added Files: wmCalClock.spec Log Message: auto-import wmCalClock-1.25-2 on branch devel from wmCalClock-1.25-2.src.rpm --- NEW FILE wmCalClock.spec --- Name: wmCalClock Version: 1.25 Release: 2 Summary: A Calendar clock with antialiased text Group: User Interface/X License: GPL URL: http://www.dockapps.org/file.php/id/9 Source0: http://www.dockapps.org/download.php/id/16/wmCalClock-1.25.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: xorg-x11-devel %description %{summary} %prep %setup -q %build cd Src make CFLAGS="${RPM_OPT_FLAGS}" %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT %{__mkdir_p} ${RPM_BUILD_ROOT}%{_bindir} %{__mkdir_p} ${RPM_BUILD_ROOT}%{_mandir} %{__install} -p %{_builddir}/%{name}-%{version}/Src/wmCalClock \ ${RPM_BUILD_ROOT}%{_bindir} %{__install} -p -m644 %{_builddir}/%{name}-%{version}/Src/wmCalClock.1 \ ${RPM_BUILD_ROOT}%{_mandir} %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc BUGS CHANGES COPYING HINTS README TODO %{_bindir}/wmCalClock %{_mandir}/wmCalClock.1 %changelog * Mon Sep 26 2005 Andreas Bierfert 1.25-2 - add -p and to install - man page should be 644 * Fri Jun 03 2005 Andreas Bierfert 1.25-1 - Initial Release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/wmCalClock/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 26 Sep 2005 10:45:51 -0000 1.1 +++ .cvsignore 26 Sep 2005 10:46:32 -0000 1.2 @@ -0,0 +1 @@ +wmCalClock-1.25.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/wmCalClock/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 26 Sep 2005 10:45:51 -0000 1.1 +++ sources 26 Sep 2005 10:46:32 -0000 1.2 @@ -0,0 +1 @@ +70c47ec1d8f8ec7e3ed7eb2d3105d371 wmCalClock-1.25.tar.gz From fedora-extras-commits at redhat.com Mon Sep 26 10:53:31 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Mon, 26 Sep 2005 06:53:31 -0400 Subject: rpms/wmCalClock/devel wmCalClock.spec,1.1,1.2 Message-ID: <200509261053.j8QArVpx006103@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/wmCalClock/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6084 Modified Files: wmCalClock.spec Log Message: - add dist Index: wmCalClock.spec =================================================================== RCS file: /cvs/extras/rpms/wmCalClock/devel/wmCalClock.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- wmCalClock.spec 26 Sep 2005 10:46:32 -0000 1.1 +++ wmCalClock.spec 26 Sep 2005 10:53:29 -0000 1.2 @@ -1,6 +1,6 @@ Name: wmCalClock Version: 1.25 -Release: 2 +Release: 3%{?dist} Summary: A Calendar clock with antialiased text Group: User Interface/X @@ -45,6 +45,10 @@ %changelog * Mon Sep 26 2005 Andreas Bierfert +1.25-3 +- add dist + +* Mon Sep 26 2005 Andreas Bierfert 1.25-2 - add -p and to install - man page should be 644 From fedora-extras-commits at redhat.com Mon Sep 26 11:11:55 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Mon, 26 Sep 2005 07:11:55 -0400 Subject: rpms/wmCalClock/devel wmCalClock.spec,1.2,1.3 Message-ID: <200509261111.j8QBBtAn007546@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/wmCalClock/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7527 Modified Files: wmCalClock.spec Log Message: - try to fix x86_64 build (libdir) Index: wmCalClock.spec =================================================================== RCS file: /cvs/extras/rpms/wmCalClock/devel/wmCalClock.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- wmCalClock.spec 26 Sep 2005 10:53:29 -0000 1.2 +++ wmCalClock.spec 26 Sep 2005 11:11:53 -0000 1.3 @@ -1,6 +1,6 @@ Name: wmCalClock Version: 1.25 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A Calendar clock with antialiased text Group: User Interface/X @@ -20,9 +20,8 @@ %build cd Src -make CFLAGS="${RPM_OPT_FLAGS}" %{?_smp_mflags} - - +make CFLAGS="${RPM_OPT_FLAGS}" LIBDIR="-L%{_usr}/X11R6/%{_lib}" %{?_smp_mflags} + %install rm -rf $RPM_BUILD_ROOT @@ -45,6 +44,10 @@ %changelog * Mon Sep 26 2005 Andreas Bierfert +1.25-4 +- try to fix x86_64 build (libdir) + +* Mon Sep 26 2005 Andreas Bierfert 1.25-3 - add dist From fedora-extras-commits at redhat.com Mon Sep 26 11:40:18 2005 From: fedora-extras-commits at redhat.com (Marc Maurer (uwog)) Date: Mon, 26 Sep 2005 07:40:18 -0400 Subject: rpms/gtkmathview/FC-4 gtkmathview.spec,1.5,1.6 Message-ID: <200509261140.j8QBeI6X007629@cvs-int.fedora.redhat.com> Author: uwog Update of /cvs/extras/rpms/gtkmathview/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7610 Modified Files: gtkmathview.spec Log Message: Escape the dist macro in the changelog Index: gtkmathview.spec =================================================================== RCS file: /cvs/extras/rpms/gtkmathview/FC-4/gtkmathview.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- gtkmathview.spec 25 Sep 2005 21:56:53 -0000 1.5 +++ gtkmathview.spec 26 Sep 2005 11:40:16 -0000 1.6 @@ -1,7 +1,7 @@ Summary: A MathML rendering library Name: gtkmathview Version: 0.7.5 -Release: 2%{?dist} +Release: 3%{?dist} Group: System Environment/Libraries License: GPL Source: http://helm.cs.unibo.it/mml-widget/sources/gtkmathview-%{version}.tar.gz @@ -75,8 +75,11 @@ rm -r $RPM_BUILD_ROOT %changelog +* Mon Sep 25 2005 Marc Maurer - 0.7.5-3.fc4 +- Escape the dist macro in the changelog + * Sun Sep 25 2005 Marc Maurer - 0.7.5-2.fc4 -- Add %{?dist} to the release field, not the version field +- Add %%{?dist} to the release field, not the version field * Sun Sep 25 2005 Marc Maurer - 0.7.5-1.fc4 - Initial release into FC-4 From fedora-extras-commits at redhat.com Mon Sep 26 11:43:09 2005 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Mon, 26 Sep 2005 07:43:09 -0400 Subject: rpms/libcdio/FC-4 libcdio.spec,1.12,1.13 sources,1.6,1.7 Message-ID: <200509261143.j8QBh9KJ007696@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/rpms/libcdio/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7675 Modified Files: libcdio.spec sources Log Message: * Mon Sep 26 2005 Adrian Reber - 0.76-1 - Updated to 0.76. - Included doxygen generated documentation into -devel - Included examples into -devel Index: libcdio.spec =================================================================== RCS file: /cvs/extras/rpms/libcdio/FC-4/libcdio.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- libcdio.spec 23 Aug 2005 15:13:08 -0000 1.12 +++ libcdio.spec 26 Sep 2005 11:43:07 -0000 1.13 @@ -1,17 +1,17 @@ Name: libcdio -Version: 0.75 -Release: 3%{?dist} +Version: 0.76 +Release: 1%{?dist} Summary: CD-ROM input and control library Group: Applications/Multimedia License: GPL URL: http://www.gnu.org/software/libcdio/ -Source0: http://ftp.gnu.org/gnu/libcdio/libcdio-0.75.tar.gz -Source1: http://ftp.gnu.org/gnu/libcdio/libcdio-0.75.tar.gz.sig +Source0: http://ftp.gnu.org/gnu/libcdio/libcdio-0.76.tar.gz +Source1: http://ftp.gnu.org/gnu/libcdio/libcdio-0.76.tar.gz.sig BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) #BuildRequires: libcddb-devel >= 0.9.4 -BuildRequires: pkgconfig +BuildRequires: pkgconfig doxygen BuildRequires: ncurses-devel Requires(post): /sbin/ldconfig Requires(post): /sbin/install-info @@ -39,8 +39,14 @@ %build -%configure --disable-vcd-info --disable-dependency-tracking +%configure \ + --disable-vcd-info \ + --disable-dependency-tracking \ + --disable-cddb \ + --disable-rpath make %{?_smp_mflags} +cd doc/doxygen +./run_doxygen %install @@ -52,8 +58,15 @@ mv $RPM_BUILD_ROOT%{_mandir}/{jp,ja} +rm -rf examples +mkdir -p examples/C++ +cp -a example/{*.c,README} examples +cp -a example/C++/{*.cpp,README} examples/C++ + %check || : +# disable test using local CDROM +%{__sed} -i -e "s/am__EXEEXT_1 =.*$/am__EXEEXT_1 =/g" test/Makefile make check @@ -67,8 +80,8 @@ %preun if [ $1 = 0 ]; then - /sbin/install-info --delete %{_infodir}/%{name}.info \ - %{_infodir}/dir 2>/dev/null || : + /sbin/install-info --delete %{_infodir}/%{name}.info \ + %{_infodir}/dir 2>/dev/null || : fi %postun -p /sbin/ldconfig @@ -86,6 +99,7 @@ %files devel %defattr(-,root,root,-) +%doc doc/doxygen/html examples %{_includedir}/cdio %{_libdir}/*.a %{_libdir}/*.so @@ -93,6 +107,14 @@ %changelog +* Mon Sep 26 2005 Adrian Reber - 0.76-1 +- Updated to 0.76. +- Included doxygen generated documentation into -devel +- Included examples into -devel + +* Mon Aug 01 2005 Adrian Reber - 0.75-4 +- disable test accessing local CDROM drive (#164266) + * Wed Jul 27 2005 Adrian Reber - 0.75-3 - Rebuilt without libcddb dependency (#164270) Index: sources =================================================================== RCS file: /cvs/extras/rpms/libcdio/FC-4/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 26 Jul 2005 11:58:19 -0000 1.6 +++ sources 26 Sep 2005 11:43:07 -0000 1.7 @@ -1,2 +1,2 @@ -628bd9e6d62747ff6a2b14f976673ea0 libcdio-0.75.tar.gz -3a861ce2e430451107d923127c64cf77 libcdio-0.75.tar.gz.sig +6d5f97847c8be003f4018dd2b5afe23d libcdio-0.76.tar.gz +99dec4b805556a5a6cccaa3539707422 libcdio-0.76.tar.gz.sig From fedora-extras-commits at redhat.com Mon Sep 26 12:09:38 2005 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Mon, 26 Sep 2005 08:09:38 -0400 Subject: rpms/libcdio/FC-3 .cvsignore, 1.5, 1.6 libcdio.spec, 1.7, 1.8 sources, 1.5, 1.6 Message-ID: <200509261209.j8QC9dhQ009159@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/rpms/libcdio/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9120 Modified Files: .cvsignore libcdio.spec sources Log Message: * Mon Sep 26 2005 Adrian Reber - 0.76-1 - Updated to 0.76. - Included doxygen generated documentation into -devel - Included examples into -devel Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libcdio/FC-3/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 28 Jul 2005 07:39:13 -0000 1.5 +++ .cvsignore 26 Sep 2005 12:09:15 -0000 1.6 @@ -1,2 +1,2 @@ -libcdio-0.75.tar.gz -libcdio-0.75.tar.gz.sig +libcdio-0.76.tar.gz +libcdio-0.76.tar.gz.sig Index: libcdio.spec =================================================================== RCS file: /cvs/extras/rpms/libcdio/FC-3/libcdio.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- libcdio.spec 23 Aug 2005 15:13:09 -0000 1.7 +++ libcdio.spec 26 Sep 2005 12:09:15 -0000 1.8 @@ -1,17 +1,17 @@ Name: libcdio -Version: 0.75 -Release: 3%{?dist} +Version: 0.76 +Release: 1%{?dist} Summary: CD-ROM input and control library Group: Applications/Multimedia License: GPL URL: http://www.gnu.org/software/libcdio/ -Source0: http://ftp.gnu.org/gnu/libcdio/libcdio-0.75.tar.gz -Source1: http://ftp.gnu.org/gnu/libcdio/libcdio-0.75.tar.gz.sig +Source0: http://ftp.gnu.org/gnu/libcdio/libcdio-0.76.tar.gz +Source1: http://ftp.gnu.org/gnu/libcdio/libcdio-0.76.tar.gz.sig BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) #BuildRequires: libcddb-devel >= 0.9.4 -BuildRequires: pkgconfig +BuildRequires: pkgconfig doxygen BuildRequires: ncurses-devel Requires(post): /sbin/ldconfig Requires(post): /sbin/install-info @@ -39,8 +39,14 @@ %build -%configure --disable-vcd-info --disable-dependency-tracking +%configure \ + --disable-vcd-info \ + --disable-dependency-tracking \ + --disable-cddb \ + --disable-rpath make %{?_smp_mflags} +cd doc/doxygen +./run_doxygen %install @@ -52,8 +58,15 @@ mv $RPM_BUILD_ROOT%{_mandir}/{jp,ja} +rm -rf examples +mkdir -p examples/C++ +cp -a example/{*.c,README} examples +cp -a example/C++/{*.cpp,README} examples/C++ + %check || : +# disable test using local CDROM +%{__sed} -i -e "s/am__EXEEXT_1 =.*$/am__EXEEXT_1 =/g" test/Makefile make check @@ -67,8 +80,8 @@ %preun if [ $1 = 0 ]; then - /sbin/install-info --delete %{_infodir}/%{name}.info \ - %{_infodir}/dir 2>/dev/null || : + /sbin/install-info --delete %{_infodir}/%{name}.info \ + %{_infodir}/dir 2>/dev/null || : fi %postun -p /sbin/ldconfig @@ -86,6 +99,7 @@ %files devel %defattr(-,root,root,-) +%doc doc/doxygen/html examples %{_includedir}/cdio %{_libdir}/*.a %{_libdir}/*.so @@ -93,6 +107,14 @@ %changelog +* Mon Sep 26 2005 Adrian Reber - 0.76-1 +- Updated to 0.76. +- Included doxygen generated documentation into -devel +- Included examples into -devel + +* Mon Aug 01 2005 Adrian Reber - 0.75-4 +- disable test accessing local CDROM drive (#164266) + * Wed Jul 27 2005 Adrian Reber - 0.75-3 - Rebuilt without libcddb dependency (#164270) Index: sources =================================================================== RCS file: /cvs/extras/rpms/libcdio/FC-3/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 28 Jul 2005 07:39:13 -0000 1.5 +++ sources 26 Sep 2005 12:09:15 -0000 1.6 @@ -1,2 +1,2 @@ -628bd9e6d62747ff6a2b14f976673ea0 libcdio-0.75.tar.gz -3a861ce2e430451107d923127c64cf77 libcdio-0.75.tar.gz.sig +6d5f97847c8be003f4018dd2b5afe23d libcdio-0.76.tar.gz +99dec4b805556a5a6cccaa3539707422 libcdio-0.76.tar.gz.sig From fedora-extras-commits at redhat.com Mon Sep 26 12:20:59 2005 From: fedora-extras-commits at redhat.com (Gijs Hollestelle (gijs)) Date: Mon, 26 Sep 2005 08:20:59 -0400 Subject: rpms/yum-utils/devel .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 yum-utils.spec, 1.2, 1.3 Message-ID: <200509261220.j8QCKx3q009270@cvs-int.fedora.redhat.com> Author: gijs Update of /cvs/extras/rpms/yum-utils/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9238 Modified Files: .cvsignore sources yum-utils.spec Log Message: * Mon Sep 26 2005 Gijs Hollestelle - 0.3.1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/yum-utils/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 11 Jun 2005 19:28:20 -0000 1.2 +++ .cvsignore 26 Sep 2005 12:20:57 -0000 1.3 @@ -1 +1 @@ -yum-utils-0.2.tar.gz +yum-utils-0.3.1.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/yum-utils/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 11 Jun 2005 19:28:20 -0000 1.2 +++ sources 26 Sep 2005 12:20:57 -0000 1.3 @@ -1 +1 @@ -4e7a416d040c194c1cb9e77651f0c86f yum-utils-0.2.tar.gz +e4dfc68f3a8fa9c6f107d865763eea81 yum-utils-0.3.1.tar.gz Index: yum-utils.spec =================================================================== RCS file: /cvs/extras/rpms/yum-utils/devel/yum-utils.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- yum-utils.spec 11 Jun 2005 19:40:27 -0000 1.2 +++ yum-utils.spec 26 Sep 2005 12:20:57 -0000 1.3 @@ -1,7 +1,7 @@ Summary: Utilities based around the yum package manager Name: yum-utils -Version: 0.2 -Release: 2%{?dist} +Version: 0.3.1 +Release: 1%{?dist} License: GPL Group: Development/Tools Source: http://linux.duke.edu/yum/download/yum-utils/%{name}-%{version}.tar.gz @@ -65,6 +65,9 @@ %{_initrddir}/yum-updateonboot %changelog +* Mon Sep 26 2005 Gijs Hollestelle +- 0.3.1 + * Wed Jun 1 2005 Seth Vidal - 0.2 From fedora-extras-commits at redhat.com Mon Sep 26 12:26:03 2005 From: fedora-extras-commits at redhat.com (Gijs Hollestelle (gijs)) Date: Mon, 26 Sep 2005 08:26:03 -0400 Subject: rpms/yum-utils/FC-4 sources,1.2,1.3 yum-utils.spec,1.2,1.3 Message-ID: <200509261226.j8QCQ31L009308@cvs-int.fedora.redhat.com> Author: gijs Update of /cvs/extras/rpms/yum-utils/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9287 Modified Files: sources yum-utils.spec Log Message: * Mon Sep 26 2005 Gijs Hollestelle - 0.3.1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/yum-utils/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 11 Jun 2005 19:28:20 -0000 1.2 +++ sources 26 Sep 2005 12:26:00 -0000 1.3 @@ -1 +1 @@ -4e7a416d040c194c1cb9e77651f0c86f yum-utils-0.2.tar.gz +e4dfc68f3a8fa9c6f107d865763eea81 yum-utils-0.3.1.tar.gz Index: yum-utils.spec =================================================================== RCS file: /cvs/extras/rpms/yum-utils/FC-4/yum-utils.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- yum-utils.spec 11 Jun 2005 19:40:27 -0000 1.2 +++ yum-utils.spec 26 Sep 2005 12:26:00 -0000 1.3 @@ -1,7 +1,7 @@ Summary: Utilities based around the yum package manager Name: yum-utils -Version: 0.2 -Release: 2%{?dist} +Version: 0.3.1 +Release: 1%{?dist} License: GPL Group: Development/Tools Source: http://linux.duke.edu/yum/download/yum-utils/%{name}-%{version}.tar.gz @@ -65,6 +65,9 @@ %{_initrddir}/yum-updateonboot %changelog +* Mon Sep 26 2005 Gijs Hollestelle +- 0.3.1 + * Wed Jun 1 2005 Seth Vidal - 0.2 From fedora-extras-commits at redhat.com Mon Sep 26 16:27:01 2005 From: fedora-extras-commits at redhat.com (Marc Maurer (uwog)) Date: Mon, 26 Sep 2005 12:27:01 -0400 Subject: rpms/abiword/devel abiword.spec,1.19,1.20 Message-ID: <200509261627.j8QGR10q015847@cvs-int.fedora.redhat.com> Author: uwog Update of /cvs/extras/rpms/abiword/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15828 Modified Files: abiword.spec Log Message: Fix gtkmathview BuildRequires Index: abiword.spec =================================================================== RCS file: /cvs/extras/rpms/abiword/devel/abiword.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- abiword.spec 22 Sep 2005 15:21:24 -0000 1.19 +++ abiword.spec 26 Sep 2005 16:26:58 -0000 1.20 @@ -3,7 +3,7 @@ Summary: The AbiWord word processor Name: abiword Version: 2.3.99 -Release: 1 +Release: 2 Epoch: 1 Group: Applications/Editors License: GPL @@ -32,7 +32,7 @@ BuildRequires: libwmf-devel BuildRequires: aiksaurus-gtk-devel >= 1.2.1 BuildRequires: link-grammar-devel >= 4.1.3 -BuildRequires: gtkmathview >= 0.7.3 +BuildRequires: gtkmathview-devel >= 0.7.3 # gnome build deps BuildRequires: libbonobo-devel @@ -131,6 +131,9 @@ %{_datadir}/icons/*png %changelog +* Mon Sep 26 2005 Marc Maurer - 1:2.3.99-2 +- Fix gtkmathview BuildRequires + * Thu Sep 22 2005 Marc Maurer - 1:2.3.99-1 - Update to 2.3.99 From fedora-extras-commits at redhat.com Mon Sep 26 17:17:11 2005 From: fedora-extras-commits at redhat.com (Dan Kenigsberg (danken)) Date: Mon, 26 Sep 2005 13:17:11 -0400 Subject: rpms/hspell - New directory Message-ID: <200509261717.j8QHHBwZ017384@cvs-int.fedora.redhat.com> Author: danken Update of /cvs/extras/rpms/hspell In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17360/hspell Log Message: Directory /cvs/extras/rpms/hspell added to the repository From fedora-extras-commits at redhat.com Mon Sep 26 17:17:11 2005 From: fedora-extras-commits at redhat.com (Dan Kenigsberg (danken)) Date: Mon, 26 Sep 2005 13:17:11 -0400 Subject: rpms/hspell/devel - New directory Message-ID: <200509261717.j8QHHBPc017389@cvs-int.fedora.redhat.com> Author: danken Update of /cvs/extras/rpms/hspell/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17360/hspell/devel Log Message: Directory /cvs/extras/rpms/hspell/devel added to the repository From fedora-extras-commits at redhat.com Mon Sep 26 17:17:41 2005 From: fedora-extras-commits at redhat.com (Dan Kenigsberg (danken)) Date: Mon, 26 Sep 2005 13:17:41 -0400 Subject: rpms/hspell Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200509261717.j8QHHfmC017440@cvs-int.fedora.redhat.com> Author: danken Update of /cvs/extras/rpms/hspell In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17405 Added Files: Makefile import.log Log Message: Setup of module hspell --- NEW FILE Makefile --- # Top level Makefile for module hspell all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Mon Sep 26 17:17:41 2005 From: fedora-extras-commits at redhat.com (Dan Kenigsberg (danken)) Date: Mon, 26 Sep 2005 13:17:41 -0400 Subject: rpms/hspell/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200509261717.j8QHHfXa017445@cvs-int.fedora.redhat.com> Author: danken Update of /cvs/extras/rpms/hspell/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17405/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module hspell --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Mon Sep 26 17:18:55 2005 From: fedora-extras-commits at redhat.com (Dan Kenigsberg (danken)) Date: Mon, 26 Sep 2005 13:18:55 -0400 Subject: rpms/hspell import.log,1.1,1.2 Message-ID: <200509261718.j8QHItdI017508@cvs-int.fedora.redhat.com> Author: danken Update of /cvs/extras/rpms/hspell In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17473 Modified Files: import.log Log Message: auto-import hspell-0.9-6 on branch devel from hspell-0.9-6.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/hspell/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 26 Sep 2005 17:17:39 -0000 1.1 +++ import.log 26 Sep 2005 17:18:53 -0000 1.2 @@ -0,0 +1 @@ +hspell-0_9-6:HEAD:hspell-0.9-6.src.rpm:1127755119 From fedora-extras-commits at redhat.com Mon Sep 26 17:18:56 2005 From: fedora-extras-commits at redhat.com (Dan Kenigsberg (danken)) Date: Mon, 26 Sep 2005 13:18:56 -0400 Subject: rpms/hspell/devel hspell.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200509261719.j8QHIuXO017514@cvs-int.fedora.redhat.com> Author: danken Update of /cvs/extras/rpms/hspell/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17473/devel Modified Files: .cvsignore sources Added Files: hspell.spec Log Message: auto-import hspell-0.9-6 on branch devel from hspell-0.9-6.src.rpm --- NEW FILE hspell.spec --- Summary: A Hebrew spell checker Name: hspell Version: 0.9 Release: 6 URL: http://ivrix.org.il/projects/spell-checker/ Source: http://ivrix.org.il/projects/spell-checker/hspell-%{version}.tar.gz License: GPL Group: Applications/Text BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: zlib-devel Obsoletes: hspell-fat Provides: hspell-fat = %{version}-%{release} %description Hspell is a Hebrew SPELLer . It currently provides a mostly spell-like interface (gives the list of wrong words in the input text), but can also suggest corrections (-c). It also provides a true (yet incomplete) morphological analizer (-l), that prints all known meanings of a Hebrew string. Note: it is a fully working Hebrew spellchecker, not a toy release. On typical documents it should recognize the majority of correct words. However, users of this release must take into account that it still will not recognize *all* the correct words; The dictionary is still admittedly not complete, and this situation will continue to improve in the next releases. On the other hand, barring bugs Hspell should not recognize incorrect words - extreme attention has been given to the correctness and consistency of the dictionary. %description -l he Hspell ??? ????? ????, ????? (???????) ???? ????-spell - ???? ????? ?? ?????? ??????? ???????? ????. ?? ???? ?????, ???? ??? ????? ???? ????? - ????? ?????? ???? ???? ?????? ??? ??????? ???????. ?????? ???? ??-??? ?????? ???? *??* ????? ?????? ????? ??-?? ???? ??????? ?????? ????? ??? ????? )"???? ???"(. ??? ??, Hspell ???? (-l) ???? ????????? ???? (??-?? ?? ???) ??? ????? ?? ?? ????????? ???????? ?? ?????? ?????? ?????. %package devel Summary: Library and include files for Hspell, the hebrew spell checker Group: Applications/Text Requires: %{name} = %{version}-%{release} %description devel Library and include files for applications that want to use Hspell. %description -l he devel ?????? ?????? ????? ???? ??????? ?????? ?????? ?-Hspell. %prep %setup -q %build %configure --enable-fatverb --enable-linginfo make CFLAGS="$RPM_OPT_FLAGS" %install rm -rf %{buildroot} make DESTDIR=%{buildroot} install %clean rm -rf %{buildroot} %files %defattr(-,root,root) %doc LICENSE README WHATSNEW COPYING %{_bindir}/hspell %{_bindir}/hspell-i %{_bindir}/multispell %{_mandir}/man1/hspell.1* %{_datadir}/hspell/ %files devel %defattr(-,root,root) %{_includedir}/*.h %{_libdir}/libhspell.a %{_mandir}/man3/hspell.3* %changelog * Mon Sep 26 2005 Dan Kenigsberg 0.9-6 - Add the text of the GPL to the binary package. It seems that I'll do anything to make my sponsor Tom happy. * Thu Sep 23 2005 Dan Kenigsberg 0.9-5 - According to Tom's request, distribute the fat version. - Add short Hebrew description to the devel package. * Thu Sep 20 2005 Dan Kenigsberg 0.9-4 - Distribute the "slim" flavor, as I suspect it is better suited for the casual user (even though I personally enjoy the chubby morphological analizer). * Mon Sep 19 2005 Tom "spot" Callaway 0.9-3 - minor spec file cleanups, eliminate "fat" variant * Thu Sep 15 2005 Dan Kenigsberg 0.9-2 - version 0.9, some magic to silence rpmlint * Fri Jun 4 2004 Dan Kenigsberg 0.8-1 - Some cleanups, and a devel package * Fri Dec 20 2003 Dan Kenigsberg 0.7-1 - Changes for version 0.7 * Tue Jul 29 2003 Dan Kenigsberg 0.6-1 - Tiny changes for the C frontend * Fri May 2 2003 Dan Kenigsberg 0.5-1 - create the "fat" variant * Mon Feb 17 2003 Dan Kenigsberg 0.3-2 - The release includes only the compressed database. - Added signature, and some other minor changes. * Sun Jan 5 2003 Tzafrir Cohen 0.2-1 - Initial build. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/hspell/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 26 Sep 2005 17:17:39 -0000 1.1 +++ .cvsignore 26 Sep 2005 17:18:54 -0000 1.2 @@ -0,0 +1 @@ +hspell-0.9.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/hspell/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 26 Sep 2005 17:17:39 -0000 1.1 +++ sources 26 Sep 2005 17:18:54 -0000 1.2 @@ -0,0 +1 @@ +6ebae9cfe721c6563075095fa73f69ac hspell-0.9.tar.gz From fedora-extras-commits at redhat.com Mon Sep 26 17:33:19 2005 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Mon, 26 Sep 2005 13:33:19 -0400 Subject: rpms/gl-117/devel .cvsignore, 1.3, 1.4 gl-117.spec, 1.5, 1.6 sources, 1.3, 1.4 Message-ID: <200509261733.j8QHXJA2017695@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/gl-117/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17628/devel Modified Files: .cvsignore gl-117.spec sources Log Message: Update to 1.3.2. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gl-117/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 13 Jan 2005 11:14:36 -0000 1.3 +++ .cvsignore 26 Sep 2005 17:33:17 -0000 1.4 @@ -1 +1 @@ -gl-117-1.3.1-src.tar.bz2 +gl-117-1.3.2-src.tar.bz2 Index: gl-117.spec =================================================================== RCS file: /cvs/extras/rpms/gl-117/devel/gl-117.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- gl-117.spec 6 Apr 2005 22:11:38 -0000 1.5 +++ gl-117.spec 26 Sep 2005 17:33:17 -0000 1.6 @@ -1,19 +1,19 @@ Name: gl-117 -Version: 1.3.1 -Release: 2 +Version: 1.3.2 +Release: 1%{?dist} Summary: Action flight simulator Group: Amusements/Games License: GPL -URL: http://www.heptargon.de/ +URL: http://www.heptargon.de/gl-117/gl-117.htm Source0: http://dl.sf.net/sourceforge/gl-117/gl-117-%{version}-src.tar.bz2 Source1: gl-117.desktop Source2: gl-117.png BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: SDL-devel, SDL_mixer-devel -BuildRequires: XFree86-devel, freeglut-devel +BuildRequires: xorg-x11-devel, freeglut-devel BuildRequires: desktop-file-utils %description @@ -55,7 +55,12 @@ %{_mandir}/man6/* %changelog -* Fri Apr 7 2005 Michael Schwendt +* Mon Sep 26 2005 Steven Pritchard 1.3.2-1 +- Update to 1.3.2 (#169275) +- BR xorg-x11-devel instead of XFree86-devel +- Change URL to the gl-117 home page + +* Fri Apr 7 2005 Michael Schwendt 1.3.1-2 - rebuilt * Tue Dec 21 2004 Panu Matilainen 0:1.3.1-1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/gl-117/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 13 Jan 2005 11:14:36 -0000 1.3 +++ sources 26 Sep 2005 17:33:17 -0000 1.4 @@ -1 +1 @@ -c9bf8573ebb60fd77dc18de7eda006ec gl-117-1.3.1-src.tar.bz2 +aad53c5531943529fd769fae4efeae02 gl-117-1.3.2-src.tar.bz2 From fedora-extras-commits at redhat.com Mon Sep 26 17:33:13 2005 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Mon, 26 Sep 2005 13:33:13 -0400 Subject: rpms/gl-117/FC-3 .cvsignore, 1.3, 1.4 gl-117.spec, 1.3, 1.4 sources, 1.3, 1.4 Message-ID: <200509261733.j8QHXher017717@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/gl-117/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17628/FC-3 Modified Files: .cvsignore gl-117.spec sources Log Message: Update to 1.3.2. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gl-117/FC-3/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 13 Jan 2005 11:14:36 -0000 1.3 +++ .cvsignore 26 Sep 2005 17:33:11 -0000 1.4 @@ -1 +1 @@ -gl-117-1.3.1-src.tar.bz2 +gl-117-1.3.2-src.tar.bz2 Index: gl-117.spec =================================================================== RCS file: /cvs/extras/rpms/gl-117/FC-3/gl-117.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- gl-117.spec 13 Jan 2005 11:14:36 -0000 1.3 +++ gl-117.spec 26 Sep 2005 17:33:11 -0000 1.4 @@ -1,26 +1,26 @@ Name: gl-117 -Version: 1.3.1 -Release: 1 -Epoch: 0 -Summary: An action flight simulator +Version: 1.3.2 +Release: 1%{?dist} + +Summary: Action flight simulator Group: Amusements/Games License: GPL -URL: http://www.heptargon.de/ +URL: http://www.heptargon.de/gl-117/gl-117.htm Source0: http://dl.sf.net/sourceforge/gl-117/gl-117-%{version}-src.tar.bz2 -Source1: gl-117.desktop -Source2: gl-117.png +Source1: gl-117.desktop +Source2: gl-117.png BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: SDL-devel, SDL_mixer-devel -BuildRequires: XFree86-devel, freeglut-devel -BuildRequires: desktop-file-utils +BuildRequires: xorg-x11-devel, freeglut-devel +BuildRequires: desktop-file-utils %description -GL-117 is an action flight simulator for Linux/Unix and MSWindows. Enter the -Eagle Squadron and succeed in several challanging missions leading though -different landscapes. Five predefined levels of video quality and an amount of -viewing ranges let you perfectly adjust the game to the performance of your +GL-117 is an action flight simulator for Linux/Unix and MSWindows. Enter the +Eagle Squadron and succeed in several challanging missions leading though +different landscapes. Five predefined levels of video quality and an amount of +viewing ranges let you perfectly adjust the game to the performance of your system. Joystick, mouse, sound effects, music... %prep @@ -39,8 +39,8 @@ install -m 644 doc/%{name}.6 $RPM_BUILD_ROOT/%{_mandir}/man6/ install -m 644 %{SOURCE2} $RPM_BUILD_ROOT/%{_datadir}/pixmaps/ desktop-file-install --dir $RPM_BUILD_ROOT/%{_datadir}/applications \ - --add-category X-Fedora \ - --vendor fedora %{SOURCE1} + --add-category X-Fedora \ + --vendor fedora %{SOURCE1} %clean rm -rf $RPM_BUILD_ROOT @@ -55,6 +55,14 @@ %{_mandir}/man6/* %changelog +* Mon Sep 26 2005 Steven Pritchard 1.3.2-1 +- Update to 1.3.2 (#169275) +- BR xorg-x11-devel instead of XFree86-devel +- Change URL to the gl-117 home page + +* Fri Apr 7 2005 Michael Schwendt 1.3.1-2 +- rebuilt + * Tue Dec 21 2004 Panu Matilainen 0:1.3.1-1 - update to 1.3.1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/gl-117/FC-3/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 13 Jan 2005 11:14:36 -0000 1.3 +++ sources 26 Sep 2005 17:33:11 -0000 1.4 @@ -1 +1 @@ -c9bf8573ebb60fd77dc18de7eda006ec gl-117-1.3.1-src.tar.bz2 +aad53c5531943529fd769fae4efeae02 gl-117-1.3.2-src.tar.bz2 From fedora-extras-commits at redhat.com Mon Sep 26 17:33:14 2005 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Mon, 26 Sep 2005 13:33:14 -0400 Subject: rpms/gl-117/FC-4 .cvsignore, 1.3, 1.4 gl-117.spec, 1.5, 1.6 sources, 1.3, 1.4 Message-ID: <200509261733.j8QHXiE8017722@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/gl-117/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17628/FC-4 Modified Files: .cvsignore gl-117.spec sources Log Message: Update to 1.3.2. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gl-117/FC-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 13 Jan 2005 11:14:36 -0000 1.3 +++ .cvsignore 26 Sep 2005 17:33:11 -0000 1.4 @@ -1 +1 @@ -gl-117-1.3.1-src.tar.bz2 +gl-117-1.3.2-src.tar.bz2 Index: gl-117.spec =================================================================== RCS file: /cvs/extras/rpms/gl-117/FC-4/gl-117.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- gl-117.spec 6 Apr 2005 22:11:38 -0000 1.5 +++ gl-117.spec 26 Sep 2005 17:33:11 -0000 1.6 @@ -1,19 +1,19 @@ Name: gl-117 -Version: 1.3.1 -Release: 2 +Version: 1.3.2 +Release: 1%{?dist} Summary: Action flight simulator Group: Amusements/Games License: GPL -URL: http://www.heptargon.de/ +URL: http://www.heptargon.de/gl-117/gl-117.htm Source0: http://dl.sf.net/sourceforge/gl-117/gl-117-%{version}-src.tar.bz2 Source1: gl-117.desktop Source2: gl-117.png BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: SDL-devel, SDL_mixer-devel -BuildRequires: XFree86-devel, freeglut-devel +BuildRequires: xorg-x11-devel, freeglut-devel BuildRequires: desktop-file-utils %description @@ -55,7 +55,12 @@ %{_mandir}/man6/* %changelog -* Fri Apr 7 2005 Michael Schwendt +* Mon Sep 26 2005 Steven Pritchard 1.3.2-1 +- Update to 1.3.2 (#169275) +- BR xorg-x11-devel instead of XFree86-devel +- Change URL to the gl-117 home page + +* Fri Apr 7 2005 Michael Schwendt 1.3.1-2 - rebuilt * Tue Dec 21 2004 Panu Matilainen 0:1.3.1-1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/gl-117/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 13 Jan 2005 11:14:36 -0000 1.3 +++ sources 26 Sep 2005 17:33:11 -0000 1.4 @@ -1 +1 @@ -c9bf8573ebb60fd77dc18de7eda006ec gl-117-1.3.1-src.tar.bz2 +aad53c5531943529fd769fae4efeae02 gl-117-1.3.2-src.tar.bz2 From fedora-extras-commits at redhat.com Mon Sep 26 17:34:05 2005 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Mon, 26 Sep 2005 13:34:05 -0400 Subject: rpms/abcm2ps - New directory Message-ID: <200509261734.j8QHY5PO017808@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/abcm2ps In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17785/abcm2ps Log Message: Directory /cvs/extras/rpms/abcm2ps added to the repository From fedora-extras-commits at redhat.com Mon Sep 26 17:34:05 2005 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Mon, 26 Sep 2005 13:34:05 -0400 Subject: rpms/abcm2ps/devel - New directory Message-ID: <200509261734.j8QHY5Vo017813@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/abcm2ps/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17785/abcm2ps/devel Log Message: Directory /cvs/extras/rpms/abcm2ps/devel added to the repository From fedora-extras-commits at redhat.com Mon Sep 26 17:34:27 2005 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Mon, 26 Sep 2005 13:34:27 -0400 Subject: rpms/abcm2ps Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200509261734.j8QHYRV8017917@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/abcm2ps In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17886 Added Files: Makefile import.log Log Message: Setup of module abcm2ps --- NEW FILE Makefile --- # Top level Makefile for module abcm2ps all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Mon Sep 26 17:34:28 2005 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Mon, 26 Sep 2005 13:34:28 -0400 Subject: rpms/abcm2ps/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200509261734.j8QHYSAe017922@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/abcm2ps/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17886/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module abcm2ps --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Mon Sep 26 17:36:05 2005 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Mon, 26 Sep 2005 13:36:05 -0400 Subject: rpms/abcm2ps import.log,1.1,1.2 Message-ID: <200509261736.j8QHaacw018076@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/abcm2ps In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18004 Modified Files: import.log Log Message: auto-import abcm2ps-4.11.4-2 on branch devel from abcm2ps-4.11.4-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/abcm2ps/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 26 Sep 2005 17:34:25 -0000 1.1 +++ import.log 26 Sep 2005 17:36:03 -0000 1.2 @@ -0,0 +1 @@ +abcm2ps-4_11_4-2:HEAD:abcm2ps-4.11.4-2.src.rpm:1127756153 From fedora-extras-commits at redhat.com Mon Sep 26 17:36:43 2005 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Mon, 26 Sep 2005 13:36:43 -0400 Subject: rpms/fwrestart - New directory Message-ID: <200509261736.j8QHahRG018118@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/fwrestart In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18095/fwrestart Log Message: Directory /cvs/extras/rpms/fwrestart added to the repository From fedora-extras-commits at redhat.com Mon Sep 26 17:36:06 2005 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Mon, 26 Sep 2005 13:36:06 -0400 Subject: rpms/abcm2ps/devel abcm2ps.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200509261736.j8QHaa9T018080@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/abcm2ps/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18004/devel Modified Files: .cvsignore sources Added Files: abcm2ps.spec Log Message: auto-import abcm2ps-4.11.4-2 on branch devel from abcm2ps-4.11.4-2.src.rpm --- NEW FILE abcm2ps.spec --- Name: abcm2ps Version: 4.11.4 Release: 2 Summary: A program to typeset ABC tunes into Postscript Group: Applications/Multimedia License: GPL URL: http://moinejf.free.fr Source0: http://moinejf.free.fr/abcm2ps-4.11.4.tar.gz Source1: http://abcplus.sourceforge.net/abcplus_en-1.0.3.zip BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description Abcm2ps is a package which converts music tunes from ABC format to Postscript. Based on abc2ps version 1.2.5, it was developed mainly to print Baroque organ scores which have independent voices played on one or many keyboards and a pedal-board. Abcm2ps introduces many extensions to the ABC language that make it suitable for classical music. %prep %setup -q unzip %{SOURCE1} %build %configure --enable-a4 make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install \ prefix=$RPM_BUILD_ROOT%{_prefix} \ bindir=$RPM_BUILD_ROOT%{_bindir} \ libdir=$RPM_BUILD_ROOT%{_libdir} \ datadir=$RPM_BUILD_ROOT%{_datadir} \ docdir=$RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc abcplus*/abcplus_en.pdf %doc *.abc License README features.txt format.txt options.txt Changes %{_bindir}/abcm2ps %{_datadir}/abcm2ps %changelog * Thu Sep 8 2005 Gerard Milmeister - 4.11.4-2 - Updated description * Wed Sep 7 2005 Gerard Milmeister - 4.11.4-1 - New Version 4.11.4 * Sun Aug 21 2005 Gerard Milmeister - 4.11.3-1 - New Version 4.11.3 * Fri Jun 24 2005 Gerard Milmeister - 4.11.0-1 - New Version 4.11.0 * Sun May 29 2005 Gerard Milmeister - 4.10.0-1 - New Version 4.10.0 * Mon May 9 2005 Gerard Milmeister - 4.9.7-1 - New Version 4.9.7 * Thu Apr 14 2005 Gerard Milmeister - 4.9.5-1 - New Version 4.9.5 * Thu Mar 24 2005 Gerard Milmeister - 4.9.2-1 - New Version 4.9.2 * Thu Mar 17 2005 Gerard Milmeister - 4.9.1-1 - New Version 4.9.1 * Tue Feb 22 2005 Gerard Milmeister - 4.8.11-1 - First Fedora release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/abcm2ps/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 26 Sep 2005 17:34:26 -0000 1.1 +++ .cvsignore 26 Sep 2005 17:36:04 -0000 1.2 @@ -0,0 +1,2 @@ +abcm2ps-4.11.4.tar.gz +abcplus_en-1.0.3.zip Index: sources =================================================================== RCS file: /cvs/extras/rpms/abcm2ps/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 26 Sep 2005 17:34:26 -0000 1.1 +++ sources 26 Sep 2005 17:36:04 -0000 1.2 @@ -0,0 +1,2 @@ +296c0ff7527234a1b9bbf44b70731fb4 abcm2ps-4.11.4.tar.gz +221c256a7102244d1509be209601586e abcplus_en-1.0.3.zip From fedora-extras-commits at redhat.com Mon Sep 26 17:36:43 2005 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Mon, 26 Sep 2005 13:36:43 -0400 Subject: rpms/fwrestart/devel - New directory Message-ID: <200509261736.j8QHahSU018124@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/fwrestart/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18095/fwrestart/devel Log Message: Directory /cvs/extras/rpms/fwrestart/devel added to the repository From fedora-extras-commits at redhat.com Mon Sep 26 17:37:00 2005 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Mon, 26 Sep 2005 13:37:00 -0400 Subject: rpms/fwrestart Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200509261737.j8QHb0su018197@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/fwrestart In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18168 Added Files: Makefile import.log Log Message: Setup of module fwrestart --- NEW FILE Makefile --- # Top level Makefile for module fwrestart all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Mon Sep 26 17:37:00 2005 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Mon, 26 Sep 2005 13:37:00 -0400 Subject: rpms/fwrestart/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200509261737.j8QHb0f9018202@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/fwrestart/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18168/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module fwrestart --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Mon Sep 26 17:37:21 2005 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Mon, 26 Sep 2005 13:37:21 -0400 Subject: rpms/fwrestart import.log,1.1,1.2 Message-ID: <200509261737.j8QHbLf7018276@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/fwrestart In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18241 Modified Files: import.log Log Message: auto-import fwrestart-1.01-3 on branch devel from fwrestart-1.01-3.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/fwrestart/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 26 Sep 2005 17:36:57 -0000 1.1 +++ import.log 26 Sep 2005 17:37:19 -0000 1.2 @@ -0,0 +1 @@ +fwrestart-1_01-3:HEAD:fwrestart-1.01-3.src.rpm:1127756235 From fedora-extras-commits at redhat.com Mon Sep 26 17:37:22 2005 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Mon, 26 Sep 2005 13:37:22 -0400 Subject: rpms/fwrestart/devel fwrestart.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200509261737.j8QHbMEE018283@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/fwrestart/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18241/devel Modified Files: .cvsignore sources Added Files: fwrestart.spec Log Message: auto-import fwrestart-1.01-3 on branch devel from fwrestart-1.01-3.src.rpm --- NEW FILE fwrestart.spec --- Summary: A way to more safely re-load firewall rules remotely Name: fwrestart Version: 1.01 Release: 3 License: GPL Group: Applications/System URL: http://www.tummy.com/Community/software/ Source: ftp://ftp.tummy.com/pub/tummy/fwrestart/fwrestart-1.01.tar.gz BuildRequires: python BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch %description This program can automatically detect when changes to the firewall block the administrative shell session, and to take corrective action fwrestart uses terminal auto-response codes to safely re-start firewall rules over a remote shell session. It sends a request to your terminal (xterm, for example), which responds back automatically. When that response is received, ensuring that fwrestart can communicate with the terminal, fwrestart then issues a command to restart the firewall. It then tries another request to the terminal, and if that is not received within 5 seconds, a command is run to clear the firewall and an appropriate error is generated. %prep %setup %build %install rm -rf "$RPM_BUILD_ROOT" mkdir -p "$RPM_BUILD_ROOT"/usr/sbin mkdir -p "$RPM_BUILD_ROOT"/usr/share/man/man8 # copy over files cp fwrestart "$RPM_BUILD_ROOT"/usr/sbin cp fwrestart.man "$RPM_BUILD_ROOT"/usr/share/man/man8/fwrestart.8 %clean rm -rf "$RPM_BUILD_ROOT" %files %doc README LICENSE %{_mandir}/man8/fwrestart.8.gz %defattr(755,root,root) %{_sbindir}/fwrestart %changelog * Thu Sep 22 2005 Kevin Fenzi - 1.01-3 - A few more tweaks to clean up issues and re-submit to extras * Thu May 26 2005 Kevin Fenzi - 1.01-2 - Changed a number of items to match Fedora extras guidelines Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/fwrestart/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 26 Sep 2005 17:36:58 -0000 1.1 +++ .cvsignore 26 Sep 2005 17:37:20 -0000 1.2 @@ -0,0 +1 @@ +fwrestart-1.01.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/fwrestart/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 26 Sep 2005 17:36:58 -0000 1.1 +++ sources 26 Sep 2005 17:37:20 -0000 1.2 @@ -0,0 +1 @@ +c0997c048c1c01a43b169ecc1e0dc479 fwrestart-1.01.tar.gz From fedora-extras-commits at redhat.com Mon Sep 26 17:40:25 2005 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Mon, 26 Sep 2005 13:40:25 -0400 Subject: owners owners.list,1.251,1.252 Message-ID: <200509261740.j8QHePVE018356@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18337 Modified Files: owners.list Log Message: add fwrestart Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.251 retrieving revision 1.252 diff -u -r1.251 -r1.252 --- owners.list 26 Sep 2005 10:34:53 -0000 1.251 +++ owners.list 26 Sep 2005 17:40:22 -0000 1.252 @@ -200,6 +200,7 @@ Fedora Extras|frotz|Interpreter for Infocom and other Z-machine games|chris at chrisgrau.com|extras-qa at fedoraproject.org| Fedora Extras|fslint|FSlint - a utility to find and clean "lint" on a filesystem|P at draigBrady.com|extras-qa at fedoraproject.org| Fedora Extras|fwbuilder|Firewall Builder|sgrubb at redhat.com|extras-qa at fedoraproject.org| +Fedora Extras|fwrestart|A way to more safely re-load firewall rules remotely|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org| Fedora Extras|fyre|A tool for creating artwork from chaotic functions|ivazquez at ivazquez.net|extras-qa at fedoraproject.org| Fedora Extras|gai|Generic Applet Interface|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|bugs.michael at gmx.net Fedora Extras|gaim-guifications|Guifications plugin for GAIM|colin at fedoraproject.org|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Mon Sep 26 18:00:40 2005 From: fedora-extras-commits at redhat.com (Dan Kenigsberg (danken)) Date: Mon, 26 Sep 2005 14:00:40 -0400 Subject: owners owners.list,1.252,1.253 Message-ID: <200509261800.j8QI0eFE018465@cvs-int.fedora.redhat.com> Author: danken Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18438 Modified Files: owners.list Log Message: add an entry for Hspell, a Hebrew spell checker Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.252 retrieving revision 1.253 diff -u -r1.252 -r1.253 --- owners.list 26 Sep 2005 17:40:22 -0000 1.252 +++ owners.list 26 Sep 2005 18:00:38 -0000 1.253 @@ -325,6 +325,7 @@ Fedora Extras|highlight|Universal source code to formatted text converter|Jochen at herr-schmitt.de|extras-qa at fedoraproject.org| Fedora Extras|hmmer|Profile HMM software for protein sequence analysis|Christian.Iseli at licr.org|extras-qa at fedoraproject.org| Fedora Extras|hping2|A software to do TCP/IP stack auditing and much more|kuko at maarmas.com|extras-qa at fedoraproject.org| +Fedora Extras|hspell|A Hebrew spell checker|danken at cs.technion.ac.il|extras-qa at fedoraproject.org| Fedora Extras|htb-util|Another tool to make your life easier with HTB|mihai at xcyb.org|extras-qa at fedoraproject.org| Fedora Extras|htmltmpl|Templating engine for separation of code and HTML|ville.skytta at iki.fi|extras-qa at fedoraproject.org| Fedora Extras|http_ping|HTTP latency measuring utility|ville.skytta at iki.fi|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Mon Sep 26 19:24:51 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Mon, 26 Sep 2005 15:24:51 -0400 Subject: owners owners.list,1.253,1.254 Message-ID: <200509261924.j8QJOpkc021826@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21801 Modified Files: owners.list Log Message: - add wmCalClock Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.253 retrieving revision 1.254 diff -u -r1.253 -r1.254 --- owners.list 26 Sep 2005 18:00:38 -0000 1.253 +++ owners.list 26 Sep 2005 19:24:49 -0000 1.254 @@ -1046,6 +1046,7 @@ Fedora Extras|WindowMaker|A fast, feature rich Window manager|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org| Fedora Extras|wine|A Windows 16/32 bit emulator|pmatilai at laiskiainen.org|extras-qa at fedoraproject.org| Fedora Extras|wlassistant|Wireless network management tool|tcallawa at redhat.com|extras-qa at fedoraproject.org| +Fedora Extras|wmCalClock|A Calendar clock with antialiased text|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org| Fedora Extras|wmapmload|Wmapmload monitors your apm status in an lcd display fashion|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org| Fedora Extras|wmweather+|Weather status dockapp|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org| Fedora Extras|wv2|A library which allows access to Microsoft?? Word files|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Mon Sep 26 20:22:16 2005 From: fedora-extras-commits at redhat.com (Denis Leroy (denis)) Date: Mon, 26 Sep 2005 16:22:16 -0400 Subject: devel/inkscape inkscape.spec,1.22,1.23 Message-ID: <200509262022.j8QKMGVM024313@cvs-int.fedora.redhat.com> Author: denis Update of /cvs/extras/devel/inkscape In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24294 Modified Files: inkscape.spec Log Message: Rebuilt with newer glibmm Index: inkscape.spec =================================================================== RCS file: /cvs/extras/devel/inkscape/inkscape.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- inkscape.spec 2 Sep 2005 10:46:13 -0000 1.22 +++ inkscape.spec 26 Sep 2005 20:22:14 -0000 1.23 @@ -1,6 +1,6 @@ Name: inkscape Version: 0.42.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Vector-based drawing program using SVG Group: Applications/Productivity @@ -104,6 +104,9 @@ %changelog +* Mon Sep 26 2005 Denis Leroy - 0.42.2-2 +- rebuilt with newer glibmm + * Thu Sep 1 2005 Michael Schwendt - 0.42.2-1 - update to 0.42.2 From fedora-extras-commits at redhat.com Mon Sep 26 20:24:05 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Mon, 26 Sep 2005 16:24:05 -0400 Subject: rpms/uw-imap - New directory Message-ID: <200509262024.j8QKO50G024447@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/uw-imap In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24425/uw-imap Log Message: Directory /cvs/extras/rpms/uw-imap added to the repository From fedora-extras-commits at redhat.com Mon Sep 26 20:24:06 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Mon, 26 Sep 2005 16:24:06 -0400 Subject: rpms/uw-imap/devel - New directory Message-ID: <200509262024.j8QKO6TD024452@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/uw-imap/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24425/uw-imap/devel Log Message: Directory /cvs/extras/rpms/uw-imap/devel added to the repository From fedora-extras-commits at redhat.com Mon Sep 26 20:24:19 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Mon, 26 Sep 2005 16:24:19 -0400 Subject: rpms/uw-imap Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200509262024.j8QKOJ5H024502@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/uw-imap In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24473 Added Files: Makefile import.log Log Message: Setup of module uw-imap --- NEW FILE Makefile --- # Top level Makefile for module uw-imap all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Mon Sep 26 20:24:19 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Mon, 26 Sep 2005 16:24:19 -0400 Subject: rpms/uw-imap/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200509262024.j8QKOJY9024507@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/uw-imap/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24473/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module uw-imap --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Mon Sep 26 20:26:25 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Mon, 26 Sep 2005 16:26:25 -0400 Subject: rpms/uw-imap import.log,1.1,1.2 Message-ID: <200509262026.j8QKQPiw024660@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/uw-imap In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24611 Modified Files: import.log Log Message: auto-import uw-imap-2004g-1 on branch devel from uw-imap-2004g-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/uw-imap/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 26 Sep 2005 20:24:17 -0000 1.1 +++ import.log 26 Sep 2005 20:26:22 -0000 1.2 @@ -0,0 +1 @@ +uw-imap-2004g-1:HEAD:uw-imap-2004g-1.src.rpm:1127766317 From fedora-extras-commits at redhat.com Mon Sep 26 20:26:25 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Mon, 26 Sep 2005 16:26:25 -0400 Subject: rpms/uw-imap/devel README.IMAPS, NONE, 1.1 imap-2001a-overflow.patch, NONE, 1.1 imap-2002d-ssltype.patch, NONE, 1.1 imap-2002e-authmd5.patch, NONE, 1.1 imap-2002e-shared.patch, NONE, 1.1 imap-2004-paths.patch, NONE, 1.1 imap-2004c1-mbxproto.patch, NONE, 1.1 imap-2004d-optflags.patch, NONE, 1.1 imap-xinetd, NONE, 1.1 imap.pamd, NONE, 1.1 imaps-xinetd, NONE, 1.1 ipop2-xinetd, NONE, 1.1 ipop3-xinetd, NONE, 1.1 pop3s-xinetd, NONE, 1.1 uw-imap.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200509262026.j8QKQPCG024672@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/uw-imap/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24611/devel Modified Files: .cvsignore sources Added Files: README.IMAPS imap-2001a-overflow.patch imap-2002d-ssltype.patch imap-2002e-authmd5.patch imap-2002e-shared.patch imap-2004-paths.patch imap-2004c1-mbxproto.patch imap-2004d-optflags.patch imap-xinetd imap.pamd imaps-xinetd ipop2-xinetd ipop3-xinetd pop3s-xinetd uw-imap.spec Log Message: auto-import uw-imap-2004g-1 on branch devel from uw-imap-2004g-1.src.rpm --- NEW FILE README.IMAPS --- The IMAP server is now configured by default to use its built-in SSL support instead of using stunnel. Accordingly, the name of the certificate file in @@SSLCERTS@@ has changed from stunnel.pem to imapd.pem. Users upgrading from previous releases will need to rename, copy, or create a symbolic link to their existing certificate. imap-2001a-overflow.patch: --- NEW FILE imap-2001a-overflow.patch --- --- imap-2001a/src/c-client/rfc822.c.overflow Wed Apr 17 22:39:13 2002 +++ imap-2001a/src/c-client/rfc822.c Wed Apr 17 22:40:25 2002 @@ -610,6 +610,9 @@ if (CHR (bs) == '\012'){/* following LF? */ c = SNX (bs); i--; /* yes, slurp it */ } + if (!i) /* Make sure we don't get an overflow for */ + break; /* messages ending on \015 (or the following */ + /* i-- will cause i to be MAXINT. Not good.) */ case '\012': /* at start of a line, start with -- ? */ if (i-- && ((c = SNX (bs)) == '-') && i-- && ((c = SNX (bs)) == '-')) { /* see if cookie matches */ imap-2002d-ssltype.patch: --- NEW FILE imap-2002d-ssltype.patch --- *** imap-2002d.orig/Makefile 2003-04-16 20:32:42.000000000 -0400 --- imap-2002d/Makefile 2003-07-11 15:47:30.000000000 -0400 *************** *** 419,427 **** @echo + In order to rectify this problem, you MUST build with: @echo ++ SSLTYPE=$(SSLTYPE).nopwd @echo +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - @echo - @echo Do you want to continue this build anyway? Type y or n please: - @$(SH) -c 'read x; case "$$x" in y) exit 0;; *) exit 1;; esac' sslnone: @echo +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ --- 419,424 ---- *************** *** 434,442 **** @echo ++ SSLTYPE=nopwd @echo + You must also have OpenSSL or equivalent installed. @echo +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - @echo - @echo Do you want to continue this build anyway? Type y or n please: - @$(SH) -c 'read x; case "$$x" in y) exit 0;; *) exit 1;; esac' # C compiler types --- 431,436 ---- imap-2002e-authmd5.patch: --- NEW FILE imap-2002e-authmd5.patch --- Make some more functions static to prevent such horrible namespace pollution. --- imap-2002e/src/c-client/auth_md5.c.authmd5 2004-03-02 17:25:43.000000000 +0000 +++ imap-2002e/src/c-client/auth_md5.c 2004-03-02 17:25:51.000000000 +0000 @@ -34,17 +34,17 @@ /* Prototypes */ -long auth_md5_valid (void); -long auth_md5_client (authchallenge_t challenger,authrespond_t responder, +static long auth_md5_valid (void); +static long auth_md5_client (authchallenge_t challenger,authrespond_t responder, char *service,NETMBX *mb,void *stream, unsigned long *trial,char *user); -char *auth_md5_server (authresponse_t responder,int argc,char *argv[]); -char *auth_md5_pwd (char *user); +static char *auth_md5_server (authresponse_t responder,int argc,char *argv[]); +static char *auth_md5_pwd (char *user); char *apop_login (char *chal,char *user,char *md5,int argc,char *argv[]); -char *hmac_md5 (char *text,unsigned long tl,char *key,unsigned long kl); -void md5_init (MD5CONTEXT *ctx); -void md5_update (MD5CONTEXT *ctx,unsigned char *data,unsigned long len); -void md5_final (unsigned char *digest,MD5CONTEXT *ctx); +static char *hmac_md5 (char *text,unsigned long tl,char *key,unsigned long kl); +static void md5_init (MD5CONTEXT *ctx); +static void md5_update (MD5CONTEXT *ctx,unsigned char *data,unsigned long len); +static void md5_final (unsigned char *digest,MD5CONTEXT *ctx); static void md5_transform (unsigned long *state,unsigned char *block); static void md5_encode (unsigned char *dst,unsigned long *src,int len); static void md5_decode (unsigned long *dst,unsigned char *src,int len); imap-2002e-shared.patch: --- NEW FILE imap-2002e-shared.patch --- --- imap-2002e/src/osdep/unix/Makefile.shared 2004-04-07 00:16:48.370334040 +0300 +++ imap-2002e/src/osdep/unix/Makefile 2004-04-07 00:18:31.458379840 +0300 @@ -131,6 +131,10 @@ EXTRADRIVERS='$(EXTRADRIVERS)' EXTRAAUTHENTICATORS='$(EXTRAAUTHENTICATORS)'\ PASSWDTYPE=$(PASSWDTYPE) SSLTYPE=$(SSLTYPE) +# Need this for the shared library rule to work correctly +.SUFFIXES: .o .so +SOFILES=${BINARIES:.o=.so} + # Here if no make argument established @@ -762,18 +766,24 @@ # Build it! -build: clean once $(ARCHIVE) +build: clean once $(ARCHIVE) $(SHLIBNAME) -all: $(ARCHIVE) +all: $(ARCHIVE) $(SHLIBNAME) $(ARCHIVE): $(BINARIES) sh -c '$(RM) $(ARCHIVE) || true' @$(CAT) ARCHIVE @$(SH) ARCHIVE -.c.o: - `$(CAT) CCTYPE` -c `$(CAT) CFLAGS` $*.c +$(SHLIBNAME): $(SOFILES) + gcc -shared -Wl,-soname,$(SHLIBNAME) -o $(SHLIBNAME) $(SOFILES) `cat LDFLAGS` + ln -s $(SHLIBNAME) lib$(SHLIBBASE).so + +.c.so: osdep.h + $(CC) -fPIC -DPIC -D_REENTRANT -c `$(CAT) CFLAGS` ${@:.so=.c} -o $@ +.c.o: + $(CC) -c `$(CAT) CFLAGS` $*.c # Cleanup @@ -812,7 +822,7 @@ # OS-dependent -osdep.o:mail.h misc.h env.h fs.h ftl.h nl.h tcp.h \ +OSDEPS= mail.h misc.h env.h fs.h ftl.h nl.h tcp.h \ osdep.h env_unix.h tcp_unix.h \ osdep.c env_unix.c fs_unix.c ftl_unix.c nl_unix.c tcp_unix.c \ auths.c crexcl.c flocksim.c nfstest.c flcksafe.c fsync.c gethstid.c \ @@ -825,12 +835,19 @@ write.c sslstdio.c \ strerror.c strpbrk.c strstr.c strtok.c strtoul.c \ OSCFLAGS + +osdep.o: $(OSDEPS) + $(CC) $(CFLAGS) `$(CAT) OSCFLAGS` -c osdep.c + @echo ======================================================================== @echo Building OS-dependent module @echo If you get No such file error messages for files x509.h, ssl.h, @echo pem.h, buffer.h, bio.h, and crypto.h, that means that OpenSSL @echo is not installed on your system. Either install OpenSSL first @echo or build with command: make `$(CAT) OSTYPE` SSLTYPE=none - `$(CAT) CCTYPE` -c `$(CAT) CFLAGS` `$(CAT) OSCFLAGS` -c osdep.c + @echo ======================================================================== + +osdep.so: $(OSDEPS) + $(CC) -fPIC -DPIC -D_REENTRANT -c $(CFLAGS) `cat OSCFLAGS` osdep.c -o $@ osdep.c: osdepbas.c osdepckp.c osdeplog.c osdepssl.c $(CAT) osdepbas.c osdepckp.c osdeplog.c osdepssl.c > osdep.c imap-2004-paths.patch: --- NEW FILE imap-2004-paths.patch --- --- imap-2004/src/osdep/unix/Makefile.linux-patch 2004-07-07 09:33:00.000000000 -0500 +++ imap-2004/src/osdep/unix/Makefile 2004-07-07 09:33:00.000000000 -0500 @@ -71,14 +71,13 @@ LOGINPW=std SIGTYPE=bsd CRXTYPE=std -ACTIVEFILE=/usr/lib/news/active -SPOOLDIR=/usr/spool +ACTIVEFILE=/var/lib/news/active +SPOOLDIR=/var/spool MAILSPOOL=$(SPOOLDIR)/mail NEWSSPOOL=$(SPOOLDIR)/news -RSHPATH=/usr/ucb/rsh +RSHPATH=/usr/bin/rsh LOCKPGM=/etc/mlock - # Default formats for creating new mailboxes and for empty mailboxes in the # default namespace; must be set to the associated driver's prototype. # imap-2004c1-mbxproto.patch: --- NEW FILE imap-2004c1-mbxproto.patch --- --- imap-2004c1/src/osdep/unix/Makefile.mbxproto 2005-04-28 12:44:53.000000000 -0500 +++ imap-2004c1/src/osdep/unix/Makefile 2005-04-28 12:59:29.000000000 -0500 @@ -91,7 +91,7 @@ # set certain other formats (e.g. mbx and mx) as the EMPTYPROTO since these # formats can never be empty files. -CREATEPROTO=unixproto +CREATEPROTO=mbxproto EMPTYPROTO=unixproto imap-2004d-optflags.patch: --- NEW FILE imap-2004d-optflags.patch --- --- imap-2004d/src/osdep/unix/Makefile.optflags 2005-04-29 12:53:09.000000000 -0500 +++ imap-2004d/src/osdep/unix/Makefile 2005-04-29 12:55:16.000000000 -0500 @@ -36,7 +36,7 @@ # -O3 seems to be safe, but empirical observation from our local expert # indicates that in some (many?) cases -O3 code runs slower than -O2. -GCCOPTLEVEL= -O2 +GCCOPTLEVEL= -O2 $(RPM_OPT_FLAGS) # Extended flags needed for SSL. You may need to modify. @@ -454,7 +454,7 @@ SPOOLDIR=/var/spool \ ACTIVEFILE=/var/lib/news/active \ RSHPATH=/usr/bin/rsh \ - BASECFLAGS="-g -fno-omit-frame-pointer $(GCCOPTLEVEL)" \ + BASECFLAGS="$(GCCOPTLEVEL)" \ BASELDFLAGS="$(PAMLDFLAGS)" lnx: # Linux non-shadow passwords --- NEW FILE imap-xinetd --- # default: off # description: The IMAP service allows remote users to access their mail using \ # an IMAP client such as Mutt, Pine, fetchmail, or Netscape \ # Communicator. service imap { socket_type = stream wait = no user = root server = /usr/sbin/imapd log_on_success += HOST DURATION log_on_failure += HOST disable = yes } --- NEW FILE imap.pamd --- #%PAM-1.0 auth required pam_stack.so service=system-auth account required pam_stack.so service=system-auth --- NEW FILE imaps-xinetd --- # default: off # description: The IMAPS service allows remote users to access their mail \ # using an IMAP client with SSL support such as Netscape \ # Communicator or fetchmail. service imaps { socket_type = stream wait = no user = root server = /usr/sbin/imapd log_on_success += HOST DURATION log_on_failure += HOST disable = yes } --- NEW FILE ipop2-xinetd --- # default: off # description: The POP2 service allows remote users to access their mail \ # using an POP2 client such as fetchmail. In most cases, clients \ # support POP3 instead of POP2, so enabling this service is rarely \ # necessary. service pop2 { socket_type = stream wait = no user = root server = /usr/sbin/ipop2d log_on_success += HOST DURATION log_on_failure += HOST disable = yes } --- NEW FILE ipop3-xinetd --- # default: off # description: The POP3 service allows remote users to access their mail \ # using an POP3 client such as Netscape Communicator, mutt, \ # or fetchmail. service pop3 { socket_type = stream wait = no user = root server = /usr/sbin/ipop3d log_on_success += HOST DURATION log_on_failure += HOST disable = yes } --- NEW FILE pop3s-xinetd --- # default: off # description: The POP3S service allows remote users to access their mail \ # using an POP3 client with SSL support such as fetchmail. service pop3s { socket_type = stream wait = no user = root server = /usr/sbin/ipop3d log_on_success += HOST DURATION log_on_failure += HOST disable = yes } --- NEW FILE uw-imap.spec --- # $Id: imap.spec,v 1.4 2004/07/23 14:41:13 rexdieter Exp $ # Change the default connected directory from the user's home directory # to the named subdirectory of the user's home directory %define mail_subdirectory Mail Summary: UW Server daemons for IMAP and POP network mail protocols Name: uw-imap #Epoch: 1 Version: 2004g Release: 1%{?dist} License: University of Washington Free-Fork License Group: System Environment/Daemons URL: http://www.washington.edu/imap/ # Old (non-latest) releases live at ftp://ftp.cac.washington.edu/imap/old/ Source: ftp://ftp.cac.washington.edu/imap/imap-2004g.tar.Z BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %define soname c-client %define somajver %{version} %define shlibname lib%{soname}.so.%{somajver} %define imap_libs lib%{soname}%{somajver} #Old naming #define imap_libs imap-libs # FC4 uses %%_sysconfdir/pki/tls/certs, previous releases used %%_datadir/ssl/certs %define sslcerts %{expand:%(if [ -d %{_sysconfdir}/pki/tls/certs ]; then echo "%{_sysconfdir}/pki/tls/certs"; else echo "%{_datadir}/ssl/certs"; fi)} # imap -> uw-imap rename Obsoletes: imap < 1:%{version} Source1: imap.pamd Source3: imap-xinetd Source4: ipop2-xinetd Source5: ipop3-xinetd Source6: imaps-xinetd Source7: pop3s-xinetd Source9: README.IMAPS Patch1: imap-2004-paths.patch Patch2: imap-2004d-optflags.patch Patch5: imap-2001a-overflow.patch Patch7: imap-2002d-ssltype.patch Patch9: imap-2002e-shared.patch Patch10: imap-2002e-authmd5.patch Patch11: imap-2004c1-mbxproto.patch # for legacy machines BuildRequires: krb5-devel BuildRequires: openssl-devel BuildRequires: pam-devel # Prereq is shorter than separate Requires, Requires(post), Requires(postun) Prereq: xinetd Requires(post): openssl Requires(triggerpostun): sed >= 4.0 %description The %{name} package provides UW server daemons for both the IMAP (Internet Message Access Protocol) and POP (Post Office Protocol) mail access protocols. The POP protocol uses a "post office" machine to collect mail for users and allows users to download their mail to their local machine for reading. The IMAP protocol allows a user to read mail on a remote machine without downloading it to their local machine. %package -n %{imap_libs} Summary: UW C-client mail library Group: System Environment/Libraries %description -n %{imap_libs} Provides a common API for accessing mailboxes. %package devel Summary: Development tools for programs which will use the UW IMAP library Group: Development/Libraries Requires: %{imap_libs} = %{version}-%{release} # imap -> uw-imap rename Obsoletes: imap-devel < 1:%{version} Conflicts: libc-client-devel %description devel Contains the header files and static libraries for developing programs which will use the UW C-client common API. %package utils Summary: UW IMAP Utilities to make managing your email simpler Group: Applications/System # imap -> uw-imap rename Obsoletes: imap-utils < 1:%{version} %description utils This package contains some utilities for managing UW IMAP email. %prep %setup -q -n imap-%{version} %patch1 -p1 -b .paths %patch2 -p1 -b .optflags %patch5 -p1 -b .overflow %patch7 -p1 -b .ssltype %patch9 -p1 -b .shared %patch10 -p1 -b .authmd5 # use mbx (instead of unix/mbox) folder format by default %patch11 -p1 -b .mbxproto install -m644 %{SOURCE9} README.IMAPS sed -i -e "s|@@SSLCERTS@@|%{sslcerts}|" README.IMAPS %build # Not sure why this is included, omitting for now -- Rex #EXTRACFLAGS="$EXTRACFLAGS -DDISABLE_POP_PROXY=1" # Kerberos setup (proabably legacy-only -- Rex) if [ -x %{_sysconfdir}/profile.d/krb5.sh ]; then . %{_sysconfdir}/profile.d/krb5.sh elif ! echo ${PATH} | grep -q %{_prefix}kerberos/bin ; then export PATH=%{_prefix}/kerberos/bin:${PATH} fi GSSDIR=$(krb5-config --prefix) # SSL setup (probably legacy-only -- Rex) export EXTRACFLAGS="$EXTRACFLAGS $(pkg-config --cflags openssl 2>/dev/null)" make %{?_smp_mflags} lnp \ EXTRACFLAGS="$EXTRACFLAGS" \ EXTRALDFLAGS="$EXTRALDFLAGS" \ EXTRAAUTHENTICATORS=gss \ SPECIALS="GSSDIR=${GSSDIR} LOCKPGM=%{_sbindir}/mlock SSLCERTS=%{sslcerts} SSLDIR=%{_datadir}/ssl SSLINCLUDE=%{_includedir}/openssl SSLLIB=%{_libdir}" \ SSLTYPE=unix \ CCLIENTLIB=$(pwd)/c-client/%{shlibname} \ SHLIBBASE=%{soname} \ SHLIBNAME=%{shlibname} # Blank line %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT%{_libdir} install -p -m644 ./c-client/c-client.a $RPM_BUILD_ROOT%{_libdir}/ ln -s c-client.a $RPM_BUILD_ROOT%{_libdir}/libc-client.a install -p -m755 ./c-client/%{shlibname} $RPM_BUILD_ROOT%{_libdir}/ ln -s %{shlibname} $RPM_BUILD_ROOT%{_libdir}/lib%{soname}.so mkdir -p $RPM_BUILD_ROOT%{_includedir}/imap install -m644 ./c-client/*.h $RPM_BUILD_ROOT%{_includedir}/imap # Added linkage.c to fix (#34658) install -m644 ./c-client/linkage.c $RPM_BUILD_ROOT%{_includedir}/imap install -m644 ./src/osdep/tops-20/shortsym.h $RPM_BUILD_ROOT%{_includedir}/imap mkdir -p $RPM_BUILD_ROOT%{_mandir}/man8 install -p -m644 src/{ipopd/ipopd,imapd/imapd}.8 $RPM_BUILD_ROOT%{_mandir}/man8/ mkdir -p $RPM_BUILD_ROOT%{_sbindir} install -p -m755 ipopd/ipop{2d,3d} $RPM_BUILD_ROOT%{_sbindir}/ install -p -m755 imapd/imapd $RPM_BUILD_ROOT%{_sbindir}/ install -p -m755 mlock/mlock $RPM_BUILD_ROOT%{_sbindir}/ mkdir -p $RPM_BUILD_ROOT%{_bindir} install -p -m755 dmail/dmail mailutil/mailutil mtest/mtest tmail/tmail $RPM_BUILD_ROOT%{_bindir}/ mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1 install -p -m644 src/{dmail/dmail,mailutil/mailutil,tmail/tmail}.1 $RPM_BUILD_ROOT%{_mandir}/man1/ mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/pam.d install -p -m644 -D ${RPM_SOURCE_DIR}/imap.pamd $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/imap install -p -m644 -D ${RPM_SOURCE_DIR}/imap.pamd $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/pop mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d/ install -p -m644 -D %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d/imap install -p -m644 -D %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d/imaps install -p -m644 -D %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d/ipop2 install -p -m644 -D %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d/ipop3 install -p -m644 -D %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d/pop3s # Generate ghost *.pem files mkdir -p $RPM_BUILD_ROOT%{sslcerts} touch $RPM_BUILD_ROOT%{sslcerts}/{imapd,ipop3d}.pem # c-client.cf: mail_subdirectory cat > c-client.cf < /dev/null || : for CERT in imapd.pem ipop3d.pem ;do if [ ! -e $CERT ];then if [ -e stunnel.pem ];then cp stunnel.pem $CERT &> /dev/null || : elif [ -e Makefile ];then make $CERT << EOF &> /dev/null || : -- SomeState SomeCity SomeOrganization SomeOrganizationalUnit localhost.localdomain root at localhost.localdomain EOF fi fi done } || : /sbin/service xinetd reload > /dev/null 2>&1 || : %postun /sbin/service xinetd reload > /dev/null 2>&1 || : %post -n %{imap_libs} -p /sbin/ldconfig %postun -n %{imap_libs} -p /sbin/ldconfig %triggerpostun -- imap < 1:2004 #if upgrading from old version, don't change/set (default) MailDir if [ -r %{_sysconfdir}/c-client.cf ]; then if grep -q "^set mail-subdirectory %{mail_subdirectory}" %{_sysconfdir}/c-client.cf; then sed -i -e 's/^set mail-subdirectory/\#set mail-subdirectory/g' \ %{_sysconfdir}/c-client.cf fi fi %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) %doc README.IMAPS docs/CONFIG %config %{_sysconfdir}/pam.d/imap %config %{_sysconfdir}/pam.d/pop %config(noreplace) %{_sysconfdir}/xinetd.d/imap %config(noreplace) %{_sysconfdir}/xinetd.d/ipop2 %config(noreplace) %{_sysconfdir}/xinetd.d/ipop3 # These need to be replaced (ie, can't use %%noreplace), or imaps/pop3s will fail after an upgrade %config %{_sysconfdir}/xinetd.d/imaps %config %{_sysconfdir}/xinetd.d/pop3s %attr(0600,root,root) %ghost %config(missingok,noreplace) %verify(not md5 size mtime) %{sslcerts}/imapd.pem %attr(0600,root,root) %ghost %config(missingok,noreplace) %verify(not md5 size mtime) %{sslcerts}/ipop3d.pem %config(noreplace) %{_sysconfdir}/c-client.cf %{_mandir}/man8/* %{_sbindir}/ipop2d %{_sbindir}/ipop3d %{_sbindir}/imapd %files utils %defattr(-,root,root) %{_bindir}/* %attr(2755, root, mail) %{_sbindir}/mlock %{_mandir}/man1/* %files -n lib%{soname}%{version} %defattr(-,root,root) %doc docs/RELNOTES docs/*.txt %doc docs/CONFIG %{_libdir}/lib%{soname}.so.* %files devel %defattr(-,root,root) %doc docs/SSLBUILD %{_includedir}/imap %{_libdir}/c-client.a %{_libdir}/libc-client.a %{_libdir}/lib%{soname}.so %changelog * Mon Sep 26 2005 Rex Dieter 2004g-1 - imap-2004g - /etc -> %%_sysconfdir - use %%{?_smp_mflags} * Mon Aug 15 2005 Rex Dieter 2004e-1 - imap-2004e - rename: imap -> uw-imap (yay, we get to drop the Epoch) - sslcerts=%{_sysconfdir}/pki/tls/certs if exists, else /usr/share/ssl/certs * Fri Apr 29 2005 Rex Dieter 1:2004d-1 - 2004d - imap-libs -> lib%%{soname}%%{version} (ie, libc-client2004d), so we can have multiple versions (shared-lib only) installed - move mlock to -utils. - revert RFC2301, locks out too many folks where SSL is unavailable * Thu Apr 28 2005 Rex Dieter 1:2004-0.fdr.11.c1 - change default driver from mbox to mbx - comply with RFC 3501 security: Unencrypted plaintext passwords are prohibited * Fri Jan 28 2005 Rex Dieter 1:2004-0.fdr.10.c1 - imap-2004c1 security release: http://www.kb.cert.org/vuls/id/702777 * Thu Jan 20 2005 Rex Dieter 1:2004-0.fdr.9.c - imap2004c - -utils: dmail,mailutil,tmail - -libs: include mlock (so it's available for other imap clients, like pine) - remove extraneous patches - %%_sysconfigdir/c-client.cf: use to set MailDir (but don't if upgrading from an older version (ie, if folks don't want/expect a change in behavior) * Mon Sep 13 2004 Rex Dieter 1:2004-0.fdr.7.a - mailsubdir patch (default to ~/Mail instead of ~) * Fri Jul 23 2004 Rex Dieter 1:2004-0.fdr.6.a - remove Obsoletes/Provides: libc-client (they can, in fact, co-xist) - -devel: remove O/P: libc-client-devel -> Conflicts: libc-client-devel * Thu Jul 16 2004 Rex Dieter 1:2004-0.fdr.5.a - imap2004a * Tue Jul 13 2004 Rex Dieter 1:2004-0.fdr.4 - -devel: Req: %%{name}-libs * Tue Jul 13 2004 Rex Dieter 1:2004-0.fdr.3 - previous imap pkgs had Epoch: 1, we need it too. * Wed Jul 07 2004 Rex Dieter 2004-0.fdr.2 - use %%version as %%somajver (like how openssl does it) * Wed Jul 07 2004 Rex Dieter 2004-0.fdr.1 - imap-2004 - use mlock, if available. - Since libc-client is an attrocious name choice, we'll trump it, and provide imap, imap-libs, imap-devel instead (redhat bug #120873) * Wed Apr 07 2004 Kaj J. Niemi 2002e-4 - Use CFLAGS (and RPM_OPT_FLAGS) during the compilation - Build the .so through gcc instead of directly calling ld * Fri Mar 5 2004 Joe Orton 2002e-3 - install .so with permissions 0755 - make auth_md5.c functions static to avoid symbol conflicts - remove Epoch: 0 * Tue Mar 02 2004 Kaj J. Niemi 0:2002e-2 - "lnp" already uses RPM_OPT_FLAGS - have us conflict with imap, imap-devel * Tue Mar 2 2004 Joe Orton 0:2002e-1 - add post/postun, always use -fPIC * Tue Feb 24 2004 Kaj J. Niemi - Name change from c-client to libc-client * Sat Feb 14 2004 Kaj J. Niemi 0:2002e-0.1 - c-client 2002e is based on imap-2002d - Build shared version, build logic is copied from FreeBSD net/cclient Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/uw-imap/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 26 Sep 2005 20:24:17 -0000 1.1 +++ .cvsignore 26 Sep 2005 20:26:23 -0000 1.2 @@ -0,0 +1 @@ +imap-2004g.tar.Z Index: sources =================================================================== RCS file: /cvs/extras/rpms/uw-imap/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 26 Sep 2005 20:24:17 -0000 1.1 +++ sources 26 Sep 2005 20:26:23 -0000 1.2 @@ -0,0 +1 @@ +9a80f58d8d6a0979c13714ae69050020 imap-2004g.tar.Z From fedora-extras-commits at redhat.com Mon Sep 26 20:28:45 2005 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Mon, 26 Sep 2005 16:28:45 -0400 Subject: rpms/freeciv/devel .cvsignore, 1.8, 1.9 freeciv.spec, 1.15, 1.16 sources, 1.8, 1.9 Message-ID: <200509262028.j8QKSjrB024754@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/freeciv/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24731 Modified Files: .cvsignore freeciv.spec sources Log Message: * Mon Sep 26 2005 Brian Pepple - 2.0.6-3 - Update to 2.0.6. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/freeciv/devel/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 2 Sep 2005 14:35:12 -0000 1.8 +++ .cvsignore 26 Sep 2005 20:28:43 -0000 1.9 @@ -1,2 +1,2 @@ -freeciv-2.0.5.tar.bz2 +freeciv-2.0.6.tar.bz2 stdsounds3.tar.gz Index: freeciv.spec =================================================================== RCS file: /cvs/extras/rpms/freeciv/devel/freeciv.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- freeciv.spec 2 Sep 2005 14:35:12 -0000 1.15 +++ freeciv.spec 26 Sep 2005 20:28:43 -0000 1.16 @@ -1,5 +1,5 @@ Name: freeciv -Version: 2.0.5 +Version: 2.0.6 Release: 3%{?dist} Summary: The Freeciv multi-player strategy game @@ -90,6 +90,9 @@ %{_mandir}/man6/civclient.6.gz %changelog +* Mon Sep 26 2005 Brian Pepple - 2.0.6-3 +- Update to 2.0.6. + * Fri Sep 2 2005 Brian Pepple - 2.0.5-3 - Update to 2.0.5. - Enable debug info. Index: sources =================================================================== RCS file: /cvs/extras/rpms/freeciv/devel/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 2 Sep 2005 14:35:12 -0000 1.8 +++ sources 26 Sep 2005 20:28:43 -0000 1.9 @@ -1,2 +1,2 @@ -cc224a166f914b3404291c6fe997f90a freeciv-2.0.5.tar.bz2 +ba694b804beee7b9c09b5be1f303f7aa freeciv-2.0.6.tar.bz2 77215914712f2f351092918f5e41e39e stdsounds3.tar.gz From fedora-extras-commits at redhat.com Mon Sep 26 20:30:53 2005 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Mon, 26 Sep 2005 16:30:53 -0400 Subject: rpms/freeciv/FC-4 .cvsignore, 1.8, 1.9 freeciv.spec, 1.13, 1.14 sources, 1.8, 1.9 Message-ID: <200509262030.j8QKUrb0024839@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/freeciv/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24816 Modified Files: .cvsignore freeciv.spec sources Log Message: * Mon Sep 26 2005 Brian Pepple - 2.0.6-2 - Update to 2.0.6. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/freeciv/FC-4/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 2 Sep 2005 14:36:47 -0000 1.8 +++ .cvsignore 26 Sep 2005 20:30:51 -0000 1.9 @@ -1,2 +1,2 @@ -freeciv-2.0.5.tar.bz2 +freeciv-2.0.6.tar.bz2 stdsounds3.tar.gz Index: freeciv.spec =================================================================== RCS file: /cvs/extras/rpms/freeciv/FC-4/freeciv.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- freeciv.spec 2 Sep 2005 14:36:47 -0000 1.13 +++ freeciv.spec 26 Sep 2005 20:30:51 -0000 1.14 @@ -1,5 +1,5 @@ Name: freeciv -Version: 2.0.5 +Version: 2.0.6 Release: 2%{?dist} Summary: The Freeciv multi-player strategy game @@ -90,6 +90,9 @@ %{_mandir}/man6/civclient.6.gz %changelog +* Mon Sep 26 2005 Brian Pepple - 2.0.6-2 +- Update to 2.0.6. + * Fri Sep 2 2005 Brian Pepple - 2.0.5-2 - Updateto 2.0.5. - Enable debug info. Index: sources =================================================================== RCS file: /cvs/extras/rpms/freeciv/FC-4/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 2 Sep 2005 14:36:48 -0000 1.8 +++ sources 26 Sep 2005 20:30:51 -0000 1.9 @@ -1,2 +1,2 @@ -cc224a166f914b3404291c6fe997f90a freeciv-2.0.5.tar.bz2 +ba694b804beee7b9c09b5be1f303f7aa freeciv-2.0.6.tar.bz2 77215914712f2f351092918f5e41e39e stdsounds3.tar.gz From fedora-extras-commits at redhat.com Mon Sep 26 21:49:40 2005 From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc)) Date: Mon, 26 Sep 2005 17:49:40 -0400 Subject: rpms/phpldapadmin - New directory Message-ID: <200509262149.j8QLneLd028183@cvs-int.fedora.redhat.com> Author: buc Update of /cvs/extras/rpms/phpldapadmin In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28163/phpldapadmin Log Message: Directory /cvs/extras/rpms/phpldapadmin added to the repository From fedora-extras-commits at redhat.com Mon Sep 26 21:49:40 2005 From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc)) Date: Mon, 26 Sep 2005 17:49:40 -0400 Subject: rpms/phpldapadmin/devel - New directory Message-ID: <200509262149.j8QLne75028188@cvs-int.fedora.redhat.com> Author: buc Update of /cvs/extras/rpms/phpldapadmin/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28163/phpldapadmin/devel Log Message: Directory /cvs/extras/rpms/phpldapadmin/devel added to the repository From fedora-extras-commits at redhat.com Mon Sep 26 21:50:16 2005 From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc)) Date: Mon, 26 Sep 2005 17:50:16 -0400 Subject: rpms/phpldapadmin Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200509262150.j8QLoG0f028244@cvs-int.fedora.redhat.com> Author: buc Update of /cvs/extras/rpms/phpldapadmin In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28213 Added Files: Makefile import.log Log Message: Setup of module phpldapadmin --- NEW FILE Makefile --- # Top level Makefile for module phpldapadmin all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Mon Sep 26 21:50:16 2005 From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc)) Date: Mon, 26 Sep 2005 17:50:16 -0400 Subject: rpms/phpldapadmin/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200509262150.j8QLoGFn028245@cvs-int.fedora.redhat.com> Author: buc Update of /cvs/extras/rpms/phpldapadmin/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28213/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module phpldapadmin --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Mon Sep 26 21:52:09 2005 From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc)) Date: Mon, 26 Sep 2005 17:52:09 -0400 Subject: rpms/phpldapadmin import.log,1.1,1.2 Message-ID: <200509262152.j8QLq9Du028346@cvs-int.fedora.redhat.com> Author: buc Update of /cvs/extras/rpms/phpldapadmin In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28306 Modified Files: import.log Log Message: auto-import phpldapadmin-0.9.7-1 on branch devel from phpldapadmin-0.9.7-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/phpldapadmin/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 26 Sep 2005 21:50:13 -0000 1.1 +++ import.log 26 Sep 2005 21:52:07 -0000 1.2 @@ -0,0 +1 @@ +phpldapadmin-0_9_7-1:HEAD:phpldapadmin-0.9.7-1.src.rpm:1127771506 From fedora-extras-commits at redhat.com Mon Sep 26 21:52:09 2005 From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc)) Date: Mon, 26 Sep 2005 17:52:09 -0400 Subject: rpms/phpldapadmin/devel phpldapadmin-0.9.7-config.patch, NONE, 1.1 phpldapadmin-0.9.7-namingcontexts.patch, NONE, 1.1 phpldapadmin-0.9.7-obfuscate.patch, NONE, 1.1 phpldapadmin-0.9.7-session_opt_secret.patch, NONE, 1.1 phpldapadmin-strip-debug.sh, NONE, 1.1 phpldapadmin.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200509262152.j8QLq9Ms028356@cvs-int.fedora.redhat.com> Author: buc Update of /cvs/extras/rpms/phpldapadmin/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28306/devel Modified Files: .cvsignore sources Added Files: phpldapadmin-0.9.7-config.patch phpldapadmin-0.9.7-namingcontexts.patch phpldapadmin-0.9.7-obfuscate.patch phpldapadmin-0.9.7-session_opt_secret.patch phpldapadmin-strip-debug.sh phpldapadmin.spec Log Message: auto-import phpldapadmin-0.9.7-1 on branch devel from phpldapadmin-0.9.7-1.src.rpm phpldapadmin-0.9.7-config.patch: --- NEW FILE phpldapadmin-0.9.7-config.patch --- diff -Nrbu phpldapadmin-20050912/config.php phpldapadmin.NEW/config.php --- phpldapadmin-20050912/config.php 2005-09-13 17:23:18.000000000 +0400 +++ phpldapadmin.NEW/config.php 2005-09-12 20:14:38.000000000 +0400 @@ -21,6 +21,8 @@ * as many as you like. You can also specify your language, and * many other options. */ +// $config->custom->appearance['language'] = 'en'; +// $config->custom->appearance['show_clear_password'] = true; /** **/ /** Miscellaneous Configuration overrides **/ @@ -55,16 +57,16 @@ /* A convenient name that will appear in the tree viewer and throughout phpLDAPadmin to identify this LDAP server to users. */ -$ldapservers->SetValue($i,'server','name','My LDAP Server'); +$ldapservers->SetValue($i,'server','name','Local LDAP Server'); /* Examples: 'ldap.example.com', 'ldaps://ldap.example.com/', 'ldapi://%2fusr%local%2fvar%2frun%2fldapi' (Unix socket at /usr/local/var/run/ldap) */ -// $ldapservers->SetValue($i,'server','host','127.0.0.1'); +$ldapservers->SetValue($i,'server','host','localhost'); /* The port your LDAP server listens on (no quotes). 389 is standard. */ -// $ldapservers->SetValue($i,'server','port','389'); +$ldapservers->SetValue($i,'server','port','389'); /* Array of base DNs of your LDAP server. Leave this blank to have phpLDAPadmin auto-detect it for you. */ // $ldapservers->SetValue($i,'server','base',array('')); @@ -80,7 +82,7 @@ Choose wisely to protect your authentication information appropriately for your situation. If you choose 'cookie', your cookie contents will be encrypted using blowfish and the secret your specify above as session['blowfish']. */ -// $ldapservers->SetValue($i,'server','auth_type','cookie'); +$ldapservers->SetValue($i,'server','auth_type','session'); /* The DN of the user for phpLDAPadmin to bind with. For anonymous binds or 'cookie' or 'session' auth_types, leave the login_dn and login_pass blank. If you specify a login_attr in conjunction with a cookie or @@ -100,7 +102,7 @@ /* Default password hashing algorithm. One of md5, ssha, sha, md5crpyt, smd5, blowfish, crypt or leave blank for now default algorithm. */ -// $ldapservers->SetValue($i,'appearance','password_hash','md5'); +$ldapservers->SetValue($i,'appearance','password_hash',''); /* If you specified 'cookie' or 'session' as the auth_type above, you can optionally specify here an attribute to use when logging in. If you enter 'uid' and login as 'dsmith', phpLDAPadmin will search for (uid=dsmith) @@ -108,7 +110,7 @@ LDAP server requires you to login to perform searches, you can enter the DN to use when searching in 'login_dn' and 'login_pass' above. You may also specify 'string', in which case you can provide a string to use for logging users in. See 'login_string' directly below. */ -// $ldapservers->SetValue($i,'login','attr','uid'); +$ldapservers->SetValue($i,'login','attr','uid'); /* If you specified 'cookie' or 'session' as the auth_type above, and you specified 'string' for 'login_attr' above, you must provide a string here for logging users in. If, for example, I have a lot of user entries with @@ -192,7 +194,7 @@ $i++; $ldapservers->SetValue($i,'server','name','LDAP Server'); -$ldapservers->SetValue($i,'server','host','127.0.0.1'); +$ldapservers->SetValue($i,'server','host',''); $ldapservers->SetValue($i,'server','port','389'); $ldapservers->SetValue($i,'server','base',array('')); $ldapservers->SetValue($i,'server','auth_type','cookie'); phpldapadmin-0.9.7-namingcontexts.patch: --- NEW FILE phpldapadmin-0.9.7-namingcontexts.patch --- diff -Nrbu phpldapadmin-20050912/server_functions.php phpldapadmin.NEW/server_functions.php --- phpldapadmin-20050912/server_functions.php 2005-09-11 09:23:19.000000000 +0400 +++ phpldapadmin.NEW/server_functions.php 2005-09-12 19:57:28.000000000 +0400 @@ -339,6 +339,16 @@ return $this->_baseDN; + } + /* May be there is a bug in php-ldap module -- it cannot handle + empty `dn' value (as returned here at least by OpenLdap servers), + and fill it by the next attribute value (i.e., `namingcontexts'), + and the next attribute disappears... + Therefore ugly hacking here. + */ + else if( isset( $r[0]['dn'] ) ) { + $this->_baseDN = array ($r[0]['dn']); + return $this->_baseDN; } else { return array(''); } phpldapadmin-0.9.7-obfuscate.patch: --- NEW FILE phpldapadmin-0.9.7-obfuscate.patch --- diff -Nru phpldapadmin.OLD/compare.php phpldapadmin.NEW/compare.php --- phpldapadmin.OLD/compare.php 2005-09-04 22:41:54.000000000 +0400 +++ phpldapadmin.NEW/compare.php 2005-09-23 20:18:48.000000000 +0400 @@ -348,7 +348,7 @@ GetValue('appearance','obfuscate_password_display') || is_null( $enc_type ) ) { + if( obfuscate_password_display( $enc_type ) ) { echo htmlspecialchars( preg_replace( "/./", "*", $user_password ) ); } else { echo htmlspecialchars( $user_password ); diff -Nru phpldapadmin.OLD/template_engine.php phpldapadmin.NEW/template_engine.php --- phpldapadmin.OLD/template_engine.php 2005-09-18 00:43:17.000000000 +0400 +++ phpldapadmin.NEW/template_engine.php 2005-09-23 21:00:50.000000000 +0400 @@ -793,7 +793,12 @@ } ?>
          - + " name="new_values[userpassword]" value="" /> diff -Nru phpldapadmin.OLD/templates/modification/default.php phpldapadmin.NEW/templates/modification/default.php --- phpldapadmin.OLD/templates/modification/default.php 2005-04-26 13:48:56.000000000 +0400 +++ phpldapadmin.NEW/templates/modification/default.php 2005-09-23 20:55:43.000000000 +0400 @@ -472,7 +472,7 @@ name="old_enc_type" value="" /> -
          diff -Nru phpldapadmin.OLD/update_confirm.php phpldapadmin.NEW/update_confirm.php --- phpldapadmin.OLD/update_confirm.php 2005-08-27 20:18:52.000000000 +0400 +++ phpldapadmin.NEW/update_confirm.php 2005-09-23 20:45:37.000000000 +0400 @@ -143,7 +143,7 @@ echo nl2br( htmlspecialchars( $v ) ) . "
          "; else if( 0 == strcasecmp( $attr, 'userPassword' ) - && ( $config->GetValue('appearance','obfuscate_password_display') || is_null( get_enc_type( $old_values[ $attr ] ) ) ) ) + && obfuscate_password_display( get_enc_type( $old_values[ $attr ] ) ) ) echo preg_replace( '/./', '*', $old_values[ $attr ] ) . "
          "; @@ -174,9 +174,9 @@ } } - elseif( $new_val != '' ) + elseif( $new_val != '' ) if( 0 == strcasecmp( $attr, 'userPassword' ) && - ( $config->GetValue('appearance','obfuscate_password_display') || is_null( get_enc_type( $new_values[ $attr ] ) ) ) ) + obfuscate_password_display( get_enc_type( $new_values[ $attr ] ) ) ) echo preg_replace( '/./', '*', $new_val ) . "
          "; phpldapadmin-0.9.7-session_opt_secret.patch: --- NEW FILE phpldapadmin-0.9.7-session_opt_secret.patch --- diff -Nrbu phpldapadmin-0.9.7/functions.php phpldapadmin-0.9.7-OK/functions.php --- phpldapadmin-0.9.7/functions.php 2005-09-25 20:11:44.000000000 +0400 +++ phpldapadmin-0.9.7-OK/functions.php 2005-09-26 17:50:07.000000000 +0400 @@ -386,8 +386,13 @@ $password = '0'; } + if( no_blowfish_secret() ) { + $_SESSION[ $sess_var_dn_name ] = $dn; + $_SESSION[ $sess_var_pass_name ] = $password; + } else { $_SESSION[ $sess_var_dn_name ] = pla_blowfish_encrypt( $dn ); $_SESSION[ $sess_var_pass_name ] = pla_blowfish_encrypt ( $password ); + } return true; break; default: @@ -1385,6 +1390,8 @@ if( $pass == '0' ) return null; + else if( no_blowfish_secret() ) + return $pass; else return pla_blowfish_decrypt ( $pass ); break; @@ -1434,9 +1441,12 @@ case 'session': $session_var_name = sprintf('pla_login_dn_%s',$ldapserver->server_id); - if (isset($_SESSION[$session_var_name])) - $return = pla_blowfish_decrypt($_SESSION[$session_var_name]); + if (isset($_SESSION[$session_var_name])) { + if (no_blowfish_secret() ) + $return = $_SESSION[$session_var_name]; else + $return = pla_blowfish_decrypt($_SESSION[$session_var_name]); + } else $return = false; break; @@ -3629,6 +3639,17 @@ return $return; } +function no_blowfish_secret() { + global $config; + + $return = $config->GetValue('session','blowfish'); + + if (! trim($return)) + return true; + + return false; +} + /** * Encryption using blowfish algorithm * --- NEW FILE phpldapadmin-strip-debug.sh --- #!/bin/sh [ $# -lt 1 ] && exit 1 awk '{ if (cont) { if ($0 ~ ";") { sub ("^[^;]*;", "") cont = 0 if ($0 ~ "^[ ]*$") next } else next } if ($0 ~ "debug_log[ ]*\\(.*;") { sub ("debug_log[^;]*;", "") if ($0 ~ "^[ ]*$") next } if ($0 ~ "debug_log[ ]*\\(.*") { if ($0 ~ "function[ ]*debug_log") { print $0 next } sub ("debug_log.*$", "") cont = 1 if ($0 ~ "^[ ]*$") next } print $0 }' $1 >$1.tmp && mv -f $1.tmp $1 --- NEW FILE phpldapadmin.spec --- Name: phpldapadmin Summary: Web-based tool for managing LDAP servers Version: 0.9.7 Release: 1 Group: Applications/Internet License: GPL URL: http://phpldapadmin.sourceforge.net Source: http://dl.sourceforge.net/sourceforge/phpldapadmin/phpldapadmin-%{version}.tar.gz Source1: phpldapadmin-strip-debug.sh # cvs -d:pserver:anonymous at cvs.sourceforge.net:/cvsroot/phpldapadmin login ##Just type Enter as password # cvs -z3 -d:pserver:anonymous at cvs.sourceforge.net:/cvsroot/phpldapadmin co -P phpldapadmin # mv phpldapadmin phpldapadmin-YYYYMMDD # tar -cvf - phpldapadmiin-YYYYMMDD | gzip -c -9 >phpldapadmin-YYYYMMDD.tar.gz # #Source: %{name}-%{cvs}.tar.gz Patch1: phpldapadmin-0.9.7-namingcontexts.patch Patch2: phpldapadmin-0.9.7-config.patch Patch3: phpldapadmin-0.9.7-session_opt_secret.patch Patch4: phpldapadmin-0.9.7-obfuscate.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch Requires: httpd, php >= 4.1.0, php-ldap %description PhpLDAPadmin is a web-based LDAP client. It provides easy, anywhere-accessible, multi-language administration for your LDAP server. Its hierarchical tree-viewer and advanced search functionality make it intuitive to browse and administer your LDAP directory. Since it is a web application, this LDAP browser works on many platforms, making your LDAP server easily manageable from any location. PhpLDAPadmin is the perfect LDAP browser for the LDAP professional and novice alike. Its user base consists mostly of LDAP administration professionals. Edit %{_sysconfdir}/%{name}/config.php to change default (localhost) LDAP server location and other things. Edit %{_sysconfdir}/httpd/conf.d/%{name}.conf to allow access by remote web-clients. %prep %setup -q -n %{name}-%{version} cp config.php.example config.php %patch1 -p1 %patch2 -p1 %patch3 -p1 %patch4 -p1 %build # remove all "debug_log()" calls find . -name "*.php" -exec sh %{SOURCE1} {} \; -print find . \( -name "*.orig" -o -name "*~" \) -print0 | xargs -0 rm -f %install rm -rf $RPM_BUILD_ROOT install -d -m755 $RPM_BUILD_ROOT/%{_datadir}/%{name} cp -a * $RPM_BUILD_ROOT/%{_datadir}/%{name} pushd $RPM_BUILD_ROOT/%{_datadir}/%{name} rm -rf doc/ INSTALL LICENSE VERSION .cvsignore popd install -d -m755 $RPM_BUILD_ROOT/%{_sysconfdir}/%{name} mv $RPM_BUILD_ROOT/%{_datadir}/%{name}/config.php \ $RPM_BUILD_ROOT/%{_sysconfdir}/%{name} ln -s ../../../..%{_sysconfdir}/%{name}/config.php \ $RPM_BUILD_ROOT/%{_datadir}/%{name}/config.php mv $RPM_BUILD_ROOT/%{_datadir}/%{name}/config.php.example \ $RPM_BUILD_ROOT/%{_sysconfdir}/%{name} mv $RPM_BUILD_ROOT/%{_datadir}/%{name}/templates/template_config.php \ $RPM_BUILD_ROOT/%{_sysconfdir}/%{name} ln -s ../../../..%{_sysconfdir}/%{name}/template_config.php \ $RPM_BUILD_ROOT/%{_datadir}/%{name}/templates/template_config.php cat <%{name}.conf # # %{summary} # Alias /%{name} %{_datadir}/%{name} Alias /ldapadmin %{_datadir}/%{name} Order Deny,Allow Deny from all Allow from 127.0.0.1 EOF install -d $RPM_BUILD_ROOT/%{_sysconfdir}/httpd/conf.d install -m644 %{name}.conf $RPM_BUILD_ROOT/%{_sysconfdir}/httpd/conf.d %clean rm -rf $RPM_BUILD_ROOT %post if [ $1 -eq 1 ]; then set @@@ `dd bs=128 count=1 /dev/null | md5sum` sed -i -e "/session\['blowfish'\] = '';/ s/'';/'$2'; # Autogenerated for `uname -n`/" %{_sysconfdir}/%{name}/config.php fi %files %defattr(-,root,root) %config %dir %{_sysconfdir}/%{name} %attr(640,root,apache) %config(noreplace) %{_sysconfdir}/%{name}/*.php %attr(640,root,apache) %{_sysconfdir}/%{name}/*.example %config(noreplace) %{_sysconfdir}/httpd/conf.d/*.conf %{_datadir}/%{name} %doc INSTALL LICENSE doc/CREDITS doc/ChangeLog %changelog * Tue Sep 27 2005 Dmitry Butskoy - accepted for Fedora Extras devel (review by Aurelien Bompard ) * Mon Sep 26 2005 Dmitry Butskoy - 0.9.7-1 - upgrade to final 0.9.7 - strip debug stuff completely. It gives essential speedup of work. - Blowfish encryption is considered optional for "session" auth type. Add patch to allow user to disable it for performance reason (just specifying the empty key). It was a default behaviour in previous versions of phpldapadmin. - add "obfuscate" patch to better handle show_clear_password feature. - initial install allow connects from localhost only (security reasons). * Tue Sep 20 2005 Dmitry Butskoy - 0.9.7-0.3.rc3 - upgrade to 0.9.7-rc3 - add post script to generate blowfish secret on initial installations. * Thu Sep 15 2005 Dmitry Butskoy - 0.9.7-0.2.rc2 - upgrade to 0.9.7-rc2, cvs snapshot no more needed. * Tue Sep 13 2005 Dmitry Butskoy - 0.9.7-0.1.20050912 - initial release. CVS snapshot is one week later than 0.9.7-rc1 release. - add namingcontexts patch and config patch Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/phpldapadmin/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 26 Sep 2005 21:50:14 -0000 1.1 +++ .cvsignore 26 Sep 2005 21:52:07 -0000 1.2 @@ -0,0 +1 @@ +phpldapadmin-0.9.7.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/phpldapadmin/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 26 Sep 2005 21:50:14 -0000 1.1 +++ sources 26 Sep 2005 21:52:07 -0000 1.2 @@ -0,0 +1 @@ +a9a6f8dd289210a3d732552d38eb2d25 phpldapadmin-0.9.7.tar.gz From fedora-extras-commits at redhat.com Mon Sep 26 22:01:02 2005 From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc)) Date: Mon, 26 Sep 2005 18:01:02 -0400 Subject: owners owners.list,1.254,1.255 Message-ID: <200509262201.j8QM12ri029650@cvs-int.fedora.redhat.com> Author: buc Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28461 Modified Files: owners.list Log Message: Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.254 retrieving revision 1.255 diff -u -r1.254 -r1.255 --- owners.list 26 Sep 2005 19:24:49 -0000 1.254 +++ owners.list 26 Sep 2005 22:01:00 -0000 1.255 @@ -806,6 +806,7 @@ Fedora Extras|php-pecl-pdo|PECL package for PHP Data Objects Interface|matthias at rpmforge.net|extras-qa at fedoraproject.org| Fedora Extras|php-pecl-pdo-sqlite|PECL package for PHP Data Objects Interface to SQLite v3|matthias at rpmforge.net|extras-qa at fedoraproject.org| Fedora Extras|php-pecl-sqlite|PECL package for accessing SQLite databases|matthias at rpmforge.net|extras-qa at fedoraproject.org| +Fedora Extras|phpldapadmin|Web-based tool for managing LDAP servers|dmitry at butskoy.name|extras-qa at fedoraproject.org| Fedora Extras|physfs|Library to provide abstract access to various archives|tcallawa at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|pinentry|Collection of simple PIN or passphrase entry dialogs|ville.skytta at iki.fi|extras-qa at fedoraproject.org| Fedora Extras|plague|Distributed build system for RPMs|dcbw at redhat.com|extras-qa at fedoraproject.org From fedora-extras-commits at redhat.com Mon Sep 26 22:04:07 2005 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Mon, 26 Sep 2005 18:04:07 -0400 Subject: owners owners.list,1.255,1.256 Message-ID: <200509262204.j8QM4ctM029850@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29836 Modified Files: owners.list Log Message: Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.255 retrieving revision 1.256 diff -u -r1.255 -r1.256 --- owners.list 26 Sep 2005 22:01:00 -0000 1.255 +++ owners.list 26 Sep 2005 22:04:05 -0000 1.256 @@ -10,6 +10,7 @@ Fedora Extras|aalib|An ASCII art library|anvil at livna.org|extras-qa at fedoraproject.org| Fedora Extras|abcde|A Better CD Encoder|ville.skytta at iki.fi|extras-qa at fedoraproject.org| +Fedora Extras|abcm2ps|A program to typeset ABC tunes into Postscript|gemi at bluewin.ch|extras-qa at fedoraproject.org| Fedora Extras|abe|A scrolling, platform-jumping, ancient pyramid exploring game|pmatilai at laiskiainen.org|extras-qa at fedoraproject.org| Fedora Extras|abicheck|ABI checking tool|bugs.michael at gmx.net|extras-qa at fedoraproject.org| Fedora Extras|abiword|The AbiWord word processor|uwog at uwog.net|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Tue Sep 27 09:36:53 2005 From: fedora-extras-commits at redhat.com (Mark Cox (mjc)) Date: Tue, 27 Sep 2005 05:36:53 -0400 Subject: fedora-security/audit fc4,1.63,1.64 Message-ID: <200509270936.j8R9arm4014175@cvs-int.fedora.redhat.com> Author: mjc Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14156 Modified Files: fc4 Log Message: Deal with the release of firefox, mozilla, and others Index: fc4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc4,v retrieving revision 1.63 retrieving revision 1.64 diff -u -r1.63 -r1.64 --- fc4 26 Sep 2005 08:19:41 -0000 1.63 +++ fc4 27 Sep 2005 09:36:51 -0000 1.64 @@ -1,22 +1,25 @@ -Up to date CVE as of CVE email 20050925 -Up to date FC4 as of 20050925 +Up to date CVE as of CVE email 20050926 +Up to date FC4 as of 20050926 ** are items that need attention +2005-3055 VULNERABLE (kernel) +2005-3054 ** php +2005-3053 backport (kernel) [since FEDORA-2005-820] patch-2.6.12.5 2005-3044 VULNERABLE (kernel, fixed 2.6.13.2) 2005-3011 ** texinfo 2005-2991 ignore (ncompress) don't ship zdiff or zcmp scripts 2005-2968 version (mozilla, not 1.7.10) +we include a different mozilla sh -2005-2968 VULNERABLE (firefox) +2005-2968 version (firefox) [since FEDORA-2005-926] 2005-2946 VULNERABLE (openssl, fixed 0.9.8) (as it uses md5 md) 2005-2876 backport (util-linux) [since FEDORA-2005-887] 2005-2874 version (cups, fixed 1.1.23) -2005-2873 ** kernel +2005-2873 VULNERABLE (kernel) not upstream fixed 2005-2872 version (kernel, fixed 2.6.12) [since FEDORA-2005-510] -2005-2871 backport (firefox) [since FEDORA-2005-871] -2005-2871 backport (mozilla) [since FEDORA-2005-873] +2005-2871 ** backport (firefox) [since FEDORA-2005-871] +2005-2871 ** backport (mozilla) [since FEDORA-2005-873] 2005-2871 VULNERABLE (thunderbird) (moderate only) -2005-2811 version (net-snmp, not upstream gentoo only) +2005-2811 version (net-snmp, not upstream) gentoo only 2005-2801 version (kernel, fixed 2.6.11) 2005-2800 backport (kernel, fixed 2.6.12.6) [since FEDORA-2005-906] 2005-2798 version (openssh, fixed 4.2) [since FEDORA-2005-860] @@ -25,25 +28,25 @@ 2005-2794 version (squid, fixed 2.5.STABLE11) [since FEDORA-2005-913] was backport since FEDORA-2005-851 2005-2728 backport (httpd, fixed 2.0.55-dev) [since FEDORA-2005-849] 2005-2707 VULNERABLE (thunderbird) -2005-2707 VULNERABLE (firefox, fixed 1.0.7) -2005-2707 VULNERABLE (mozilla, fixed 1.7.12) +2005-2707 version (firefox, fixed 1.0.7) [since FEDORA-2005-926] +2005-2707 version (mozilla, fixed 1.7.12) [since FEDORA-2005-927] 2005-2706 VULNERABLE (thunderbird) -2005-2706 VULNERABLE (firefox, fixed 1.0.7) -2005-2706 VULNERABLE (mozilla, fixed 1.7.12) +2005-2706 version (firefox, fixed 1.0.7) [since FEDORA-2005-926] +2005-2706 version (mozilla, fixed 1.7.12) [since FEDORA-2005-927] 2005-2705 VULNERABLE (thunderbird) -2005-2705 VULNERABLE (firefox, fixed 1.0.7) -2005-2705 VULNERABLE (mozilla, fixed 1.7.12) +2005-2705 version (firefox, fixed 1.0.7) [since FEDORA-2005-926] +2005-2705 version (mozilla, fixed 1.7.12) [since FEDORA-2005-927] 2005-2704 VULNERABLE (thunderbird) -2005-2704 VULNERABLE (firefox, fixed 1.0.7) -2005-2704 VULNERABLE (mozilla, fixed 1.7.12) +2005-2704 version (firefox, fixed 1.0.7) [since FEDORA-2005-926] +2005-2704 version (mozilla, fixed 1.7.12) [since FEDORA-2005-927] 2005-2703 VULNERABLE (thunderbird) -2005-2703 VULNERABLE (firefox, fixed 1.0.7) -2005-2703 VULNERABLE (mozilla, fixed 1.7.12) +2005-2703 version (firefox, fixed 1.0.7) [since FEDORA-2005-926] +2005-2703 version (mozilla, fixed 1.7.12) [since FEDORA-2005-927] 2005-2702 VULNERABLE (thunderbird) -2005-2702 VULNERABLE (firefox, fixed 1.0.7) -2005-2702 VULNERABLE (mozilla, fixed 1.7.12) -2005-2701 VULNERABLE (firefox, fixed 1.0.7) -2005-2701 VULNERABLE (mozilla, fixed 1.7.12) +2005-2702 version (firefox, fixed 1.0.7) [since FEDORA-2005-926] +2005-2702 version (mozilla, fixed 1.7.12) [since FEDORA-2005-927] +2005-2701 version (firefox, fixed 1.0.7) [since FEDORA-2005-926] +2005-2701 version (mozilla, fixed 1.7.12) [since FEDORA-2005-927] 2005-2700 backport (httpd, fixed 2.0.55-dev) [since FEDORA-2005-849] 2005-2693 backport (cvs) [since FEDORA-2005-790] 2005-2672 VULNERABLE (lm_sensors) bz#166673 @@ -51,8 +54,8 @@ 2005-2642 version (mutt, openbsd only) 2005-2641 VULNERABLE (pam_ldap) bz#166164 2005-2617 version (kernel, fixed 2.6.12.5) [since FEDORA-2005-820] -2005-2602 VULNERABLE (firefox) probably -2005-2602 VULNERABLE (thunderbird) probably +2005-2602 ** VULNERABLE (firefox) probably +2005-2602 ** VULNERABLE (thunderbird) probably 2005-2558 ignore (mysql) not an issue 2005-2558 VULNERABLE (mysql, fixed 4.1.13) probably 2005-2555 backport (kernel, fixed 2.6.12.6pre) [since FEDORA-2005-820] patch-2.6.12.6pre.patch @@ -141,7 +144,7 @@ 2005-2069 VULNERABLE (nss_ldap) http://bugzilla.padl.com/attachment.cgi?id=10&action=view 2005-2023 version (gnupg, fixed 1.9.15) 2005-1993 backport (sudo, fixed 1.6.8p9) [since FEDORA-2005-472] -2005-1992 backport (ruby) [since FEDORA-2005-475] +2005-1992 version (ruby, fixed 1.8.3 at least) [since FEDORA-2005-936] was backport since FEDORA-2005-475 2005-1937 version (firefox, fixed 1.0.5) [since FEDORA-2005-605] 2005-1937 version (mozilla, fixed 1.7.9) [since FEDORA-2005-619] 2005-1934 version (gaim, fixed 1.3.1) [since FEDORA-2005-411] @@ -872,6 +875,7 @@ 2004-0005 version (gaim, fixed 0.76) 2004-0003 version (kernel, not 2.6) 2004-0001 version (kernel, not 2.6) +2003-1232 version (emacs, fixed 21.3) 2003-1201 version (openldap, not 2.2) 2003-1161 version (kernel, not released version) 2003-1138 backport (httpd, Red Hat only) contains /+ now From fedora-extras-commits at redhat.com Tue Sep 27 10:16:27 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Tue, 27 Sep 2005 06:16:27 -0400 Subject: rpms/shorewall/FC-3 shorewall.spec,1.5,1.6 Message-ID: <200509271016.j8RAGvjJ015661@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/shorewall/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15624/FC-3 Modified Files: shorewall.spec Log Message: shorewall is orphaned Index: shorewall.spec =================================================================== RCS file: /cvs/extras/rpms/shorewall/FC-3/shorewall.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- shorewall.spec 10 Dec 2004 22:03:11 -0000 1.5 +++ shorewall.spec 27 Sep 2005 10:16:24 -0000 1.6 @@ -31,6 +31,12 @@ http://www.shorewall.net/ %prep +echo " +-------------------------------------------------------------- +Build disabled. Binary packages removed from the repository. +Package is without maintainer and has been declared orphaned. +--------------------------------------------------------------" > /dev/null +exit 1 %setup -q From fedora-extras-commits at redhat.com Tue Sep 27 10:16:27 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Tue, 27 Sep 2005 06:16:27 -0400 Subject: rpms/shorewall/FC-4 shorewall.spec,1.7,1.8 Message-ID: <200509271017.j8RAGvBT015662@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/shorewall/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15624/FC-4 Modified Files: shorewall.spec Log Message: shorewall is orphaned Index: shorewall.spec =================================================================== RCS file: /cvs/extras/rpms/shorewall/FC-4/shorewall.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- shorewall.spec 6 Apr 2005 22:13:31 -0000 1.7 +++ shorewall.spec 27 Sep 2005 10:16:25 -0000 1.8 @@ -31,6 +31,13 @@ http://www.shorewall.net/ %prep +echo " +-------------------------------------------------------------- +Build disabled. Binary packages removed from the repository. +Package is without maintainer and has been declared orphaned. +--------------------------------------------------------------" > /dev/null +exit 1 + %setup -q From fedora-extras-commits at redhat.com Tue Sep 27 11:38:18 2005 From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc)) Date: Tue, 27 Sep 2005 07:38:18 -0400 Subject: rpms/phpldapadmin/devel phpldapadmin.spec,1.1,1.2 Message-ID: <200509271138.j8RBcI4R017221@cvs-int.fedora.redhat.com> Author: buc Update of /cvs/extras/rpms/phpldapadmin/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17202 Modified Files: phpldapadmin.spec Log Message: Index: phpldapadmin.spec =================================================================== RCS file: /cvs/extras/rpms/phpldapadmin/devel/phpldapadmin.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- phpldapadmin.spec 26 Sep 2005 21:52:07 -0000 1.1 +++ phpldapadmin.spec 27 Sep 2005 11:38:16 -0000 1.2 @@ -52,8 +52,8 @@ %patch1 -p1 %patch2 -p1 -%patch3 -p1 -%patch4 -p1 +#%patch3 -p1 +#%patch4 -p1 %build @@ -132,6 +132,7 @@ %changelog * Tue Sep 27 2005 Dmitry Butskoy +- comment out patch3 and patch4 -- better to wait for upstream decision... - accepted for Fedora Extras devel (review by Aurelien Bompard ) From fedora-extras-commits at redhat.com Tue Sep 27 12:24:03 2005 From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc)) Date: Tue, 27 Sep 2005 08:24:03 -0400 Subject: rpms/phpldapadmin/devel phpldapadmin.spec, 1.2, 1.3 phpldapadmin-0.9.7-obfuscate.patch, 1.1, NONE phpldapadmin-0.9.7-session_opt_secret.patch, 1.1, NONE Message-ID: <200509271224.j8RCO3ve018683@cvs-int.fedora.redhat.com> Author: buc Update of /cvs/extras/rpms/phpldapadmin/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18664 Modified Files: phpldapadmin.spec Removed Files: phpldapadmin-0.9.7-obfuscate.patch phpldapadmin-0.9.7-session_opt_secret.patch Log Message: Index: phpldapadmin.spec =================================================================== RCS file: /cvs/extras/rpms/phpldapadmin/devel/phpldapadmin.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- phpldapadmin.spec 27 Sep 2005 11:38:16 -0000 1.2 +++ phpldapadmin.spec 27 Sep 2005 12:23:44 -0000 1.3 @@ -2,7 +2,7 @@ Name: phpldapadmin Summary: Web-based tool for managing LDAP servers Version: 0.9.7 -Release: 1 +Release: 2 Group: Applications/Internet License: GPL URL: http://phpldapadmin.sourceforge.net @@ -19,8 +19,6 @@ Patch1: phpldapadmin-0.9.7-namingcontexts.patch Patch2: phpldapadmin-0.9.7-config.patch -Patch3: phpldapadmin-0.9.7-session_opt_secret.patch -Patch4: phpldapadmin-0.9.7-obfuscate.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -131,19 +129,14 @@ %changelog -* Tue Sep 27 2005 Dmitry Butskoy -- comment out patch3 and patch4 -- better to wait for upstream decision... +* Tue Sep 27 2005 Dmitry Butskoy - 0.9.7-2 +- patch cleanups. - accepted for Fedora Extras devel (review by Aurelien Bompard ) * Mon Sep 26 2005 Dmitry Butskoy - 0.9.7-1 - upgrade to final 0.9.7 - strip debug stuff completely. It gives essential speedup of work. -- Blowfish encryption is considered optional for "session" auth type. - Add patch to allow user to disable it for performance reason - (just specifying the empty key). It was a default behaviour in - previous versions of phpldapadmin. -- add "obfuscate" patch to better handle show_clear_password feature. - initial install allow connects from localhost only (security reasons). * Tue Sep 20 2005 Dmitry Butskoy - 0.9.7-0.3.rc3 --- phpldapadmin-0.9.7-obfuscate.patch DELETED --- --- phpldapadmin-0.9.7-session_opt_secret.patch DELETED --- From fedora-extras-commits at redhat.com Tue Sep 27 12:26:29 2005 From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc)) Date: Tue, 27 Sep 2005 08:26:29 -0400 Subject: rpms/phpldapadmin/devel phpldapadmin.spec,1.3,1.4 Message-ID: <200509271226.j8RCQTxM018737@cvs-int.fedora.redhat.com> Author: buc Update of /cvs/extras/rpms/phpldapadmin/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18718 Modified Files: phpldapadmin.spec Log Message: Index: phpldapadmin.spec =================================================================== RCS file: /cvs/extras/rpms/phpldapadmin/devel/phpldapadmin.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- phpldapadmin.spec 27 Sep 2005 12:23:44 -0000 1.3 +++ phpldapadmin.spec 27 Sep 2005 12:26:27 -0000 1.4 @@ -50,8 +50,6 @@ %patch1 -p1 %patch2 -p1 -#%patch3 -p1 -#%patch4 -p1 %build From fedora-extras-commits at redhat.com Tue Sep 27 13:43:45 2005 From: fedora-extras-commits at redhat.com (Alain Portal (Dionysos)) Date: Tue, 27 Sep 2005 09:43:45 -0400 Subject: rpms/utrac - New directory Message-ID: <200509271343.j8RDhjZo020331@cvs-int.fedora.redhat.com> Author: Dionysos Update of /cvs/extras/rpms/utrac In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20307/utrac Log Message: Directory /cvs/extras/rpms/utrac added to the repository From fedora-extras-commits at redhat.com Tue Sep 27 13:43:46 2005 From: fedora-extras-commits at redhat.com (Alain Portal (Dionysos)) Date: Tue, 27 Sep 2005 09:43:46 -0400 Subject: rpms/utrac/devel - New directory Message-ID: <200509271343.j8RDhksh020336@cvs-int.fedora.redhat.com> Author: Dionysos Update of /cvs/extras/rpms/utrac/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20307/utrac/devel Log Message: Directory /cvs/extras/rpms/utrac/devel added to the repository From fedora-extras-commits at redhat.com Tue Sep 27 13:43:59 2005 From: fedora-extras-commits at redhat.com (Alain Portal (Dionysos)) Date: Tue, 27 Sep 2005 09:43:59 -0400 Subject: rpms/utrac Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200509271343.j8RDhxjJ020387@cvs-int.fedora.redhat.com> Author: Dionysos Update of /cvs/extras/rpms/utrac In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20352 Added Files: Makefile import.log Log Message: Setup of module utrac --- NEW FILE Makefile --- # Top level Makefile for module utrac all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Tue Sep 27 13:43:59 2005 From: fedora-extras-commits at redhat.com (Alain Portal (Dionysos)) Date: Tue, 27 Sep 2005 09:43:59 -0400 Subject: rpms/utrac/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200509271344.j8RDhxkN020392@cvs-int.fedora.redhat.com> Author: Dionysos Update of /cvs/extras/rpms/utrac/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20352/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module utrac --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Tue Sep 27 13:44:36 2005 From: fedora-extras-commits at redhat.com (Alain Portal (Dionysos)) Date: Tue, 27 Sep 2005 09:44:36 -0400 Subject: rpms/utrac import.log,1.1,1.2 Message-ID: <200509271344.j8RDiaZa020467@cvs-int.fedora.redhat.com> Author: Dionysos Update of /cvs/extras/rpms/utrac In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20430 Modified Files: import.log Log Message: auto-import utrac-0.3.0-4 on branch devel from utrac-0.3.0-4.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/utrac/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 27 Sep 2005 13:43:57 -0000 1.1 +++ import.log 27 Sep 2005 13:44:34 -0000 1.2 @@ -0,0 +1 @@ +utrac-0_3_0-4:HEAD:utrac-0.3.0-4.src.rpm:1127828662 From fedora-extras-commits at redhat.com Tue Sep 27 13:44:37 2005 From: fedora-extras-commits at redhat.com (Alain Portal (Dionysos)) Date: Tue, 27 Sep 2005 09:44:37 -0400 Subject: rpms/utrac/devel utrac-destdir.patch, NONE, 1.1 utrac.h.utf8, NONE, 1.1 utrac.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200509271344.j8RDib6E020476@cvs-int.fedora.redhat.com> Author: Dionysos Update of /cvs/extras/rpms/utrac/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20430/devel Modified Files: .cvsignore sources Added Files: utrac-destdir.patch utrac.h.utf8 utrac.spec Log Message: auto-import utrac-0.3.0-4 on branch devel from utrac-0.3.0-4.src.rpm utrac-destdir.patch: --- NEW FILE utrac-destdir.patch --- --- Makefile 2005-02-25 18:07:49.000000000 +0100 +++ Makefile.Fedora 2005-09-27 10:35:42.000000000 +0200 @@ -49,23 +49,26 @@ #### INSTALL / UNINSTALL ###### install: utrac strip ./utrac - mkdir -p ${BIN_PATH} - cp ./utrac ${BIN_PATH} - mkdir -p ${SHARE_PATH} - cp -f ${CHARMAPS_FILE} ${SHARE_PATH} - cp -f utrac.1 ${MAN_PATH} + mkdir -p $(DESTDIR)${BIN_PATH} + cp ./utrac $(DESTDIR)${BIN_PATH} + mkdir -p $(DESTDIR)${SHARE_PATH} + cp -f ${CHARMAPS_FILE} $(DESTDIR)${SHARE_PATH} + mkdir -p $(DESTDIR)${MAN_PATH} + cp -f utrac.1 $(DESTDIR)${MAN_PATH} install-lib: lib - mkdir -p ${LIB_PATH} - cp libutrac.a ${LIB_PATH} - mkdir -p ${LIB_PATH} - cp libutrac.a ${LIB_PATH} - + mkdir -p $(DESTDIR)${LIB_PATH} + cp libutrac.a $(DESTDIR)${LIB_PATH} + mkdir -p $(DESTDIR)${LIB_PATH} + cp libutrac.a $(DESTDIR)${LIB_PATH} + mkdir -p $(DESTDIR)${INC_PATH} + cp -f utrac.h $(DESTDIR)${INC_PATH} + uninstall: - rm -f ${BIN_PATH}/utrac - rm -f ${LIB_PATH}/libutrac.a - rm -f ${SHARE_PATH}/${CHARMAPS_FILE} - rmdir ${SHARE_PATH} + rm -f $(DESTDIR)${BIN_PATH}/utrac + rm -f $(DESTDIR)${LIB_PATH}/libutrac.a + rm -f $(DESTDIR)${SHARE_PATH}/${CHARMAPS_FILE} + rmdir $(DESTDIR)${SHARE_PATH} ###### OBJECT FILES ######### utrac_cmd.o: utrac_cmd.c utrac.h ut_charset.h ut_error.h ut_text.h @@ -85,7 +88,7 @@ #option -Wno-multichar has no effect! (gcc 3.3.4) so we use -w... ut_charset.o: ut_charset.c utrac.h ut_charset.h ut_error.h - $(CC) -w -Wno-multichar -c $(CFLAGS) -DUT_CHARMAPS_FILENAME='"${SHARE_PATH}/${CHARMAPS_FILE}"' $< -o $@ + $(CC) -w -Wno-multichar -c $(CFLAGS) -DUT_CHARMAPS_FILENAME='"$(DESTDIR)${SHARE_PATH}/${CHARMAPS_FILE}"' $< -o $@ ut_utils.o: ut_utils.c ut_error.h utrac.h $(CC) -c $(CFLAGS) $< -o $@ --- NEW FILE utrac.h.utf8 --- --- utrac-0.2/utrac.h.old 2004-12-02 17:56:01.000000000 +0100 +++ utrac-0.2/utrac.h 2004-12-15 15:45:40.415374016 +0100 @@ -71,7 +71,7 @@ //const char * UT_CHARMAPS_FILENAME2 = "/home/antoine/dev/utrac/charsets.dat"; //UT_CHARMAPS_FILENAME should be set with "gcc -D ..." const char * UT_CHARMAPS_FILENAME2 = "charsets.dat"; -const char * UT_DEFAULT_ENCODING_UNIX = "ISO-8859-1"; +const char * UT_DEFAULT_ENCODING_UNIX = "UTF-8"; #else //! Language and system coeficients applied to charset rating, depending on language or system selected. extern const float UT_LANG_SYS_COEF []; --- NEW FILE utrac.spec --- Name: utrac Version: 0.3.0 Release: 4%{?dist} Summary: Universal Text Recognizer and Converter Summary(fr): Reconnaisseur et convertisseur universel de texte Group: Applications/File License: GPL Url: http://utrac.sourceforge.net Source: http://utrac.sourceforge.net/download/utrac-0.3.0.tar.gz Patch0: utrac-destdir.patch Patch1: utrac.h.utf8 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description Utrac is a command line tool and a library that recognize the encoding of an input file (ex: UTF-8, ISO-8859-1, CP437...) and its end-of-line type (CR, LF, CRLF). It has three main features: - Automatic recognition (depending on the file and on the system's locale), reliable in most cases; - Assistance for verification or manual recognition; - Conversion to an other charset and/or end-of-line type. %description -l fr Utrac est un outil en ligne de commande et une biblioth??que qui reconnait l'encodage d'un fichier d'entr??e (par ex: UTF-8, ISO-8859-1, CP437...) et son type de fin de ligne (CR, LF, CRLF). Ses trois fonctionnalit??s principales sont : - reconnaissance automatique (suivant le fichier et la localisation du syst??me) fiable dans la plupart des cas ; - assistance ?? la v??rification ou ?? la reconnaissance manuelle ; - conversion dans un autre jeu de caract??res et/ou type de fin de ligne. %package devel Summary: Library and file header for utrac Summary(fr): Biblioth??que et fichier d'en-t??tes pour utrac Group: Development/Libraries Requires: %{name} = %{version}-%{release} %description devel The %{name}-devel package includes the static library and the header files for compiling programs that use the utrac library. %description -l fr devel Le paquetage %{name}-devel contient la biblioth??que statique et le fichier d'en-t??tes n??cessaires ?? la compilation des programmes qui utilisent la biblioth??que utrac. %prep %setup -q %patch0 %patch1 -p1 %build make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT \ PREFIX_PATH=%{_prefix} \ BIN_PATH=%{_bindir} \ LIB_PATH=%{_libdir} \ INC_PATH=%{_includedir} \ MAN_PATH=%{_mandir}/man1 \ SHARE_PATH=%{_datadir}/%{name} make install-lib DESTDIR=$RPM_BUILD_ROOT \ PREFIX_PATH=%{_prefix} \ BIN_PATH=%{_bindir} \ LIB_PATH=%{_libdir} \ INC_PATH=%{_includedir} \ MAN_PATH=%{_mandir}/man1 \ SHARE_PATH=%{_datadir}/%{name} %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) %doc CHANGES COPYING README TODO %{_bindir}/* %dir %{_datadir}/%{name} %{_datadir}/%{name}/* %{_mandir}/man1/* %files devel %defattr(-,root,root,-) %{_libdir}/*.a %{_includedir}/* %changelog * Tue Sep 27 2005 Alain Portal 0.3.0-4 - Change Source tag to allow direct download * Tue Sep 27 2005 Alain Portal 0.3.0-3 - Change Source tag to allow direct download - Update and rename Makefile patch - Override utrac variables in install section - Add "-l fr" forgotten option in french description - Remove "rm -rf $RPM_BUILD_DIR/%{name}-%{version}" statement in %clean section - Remove useless INSTALL file - Package don't own /usr/share/man/man1 - Contribution of Aur??lien Bompard Thanks to him * Tue Sep 13 2005 Alain Portal 0.3.0-2 - Add french summary and description * Mon Sep 12 2005 Alain Portal 0.3.0-1 - New version - Patch0 to easy installation - Patch1 to set default encoding recognition as utf8 * Thu Jan 20 2005 Alain Portal 0:0.2-0.fdr.1 - Initial Fedora RPM Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/utrac/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 27 Sep 2005 13:43:57 -0000 1.1 +++ .cvsignore 27 Sep 2005 13:44:34 -0000 1.2 @@ -0,0 +1 @@ +utrac-0.3.0.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/utrac/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 27 Sep 2005 13:43:57 -0000 1.1 +++ sources 27 Sep 2005 13:44:34 -0000 1.2 @@ -0,0 +1 @@ +0b70a94e450d428bc49d499110052ae6 utrac-0.3.0.tar.gz From fedora-extras-commits at redhat.com Tue Sep 27 13:48:26 2005 From: fedora-extras-commits at redhat.com (Alain Portal (Dionysos)) Date: Tue, 27 Sep 2005 09:48:26 -0400 Subject: owners owners.list,1.256,1.257 Message-ID: <200509271348.j8RDmQiv020534@cvs-int.fedora.redhat.com> Author: Dionysos Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20515/owners Modified Files: owners.list Log Message: Add utrac entry. Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.256 retrieving revision 1.257 diff -u -r1.256 -r1.257 --- owners.list 26 Sep 2005 22:04:05 -0000 1.256 +++ owners.list 27 Sep 2005 13:48:24 -0000 1.257 @@ -1033,6 +1033,7 @@ Fedora Extras|uqm-content|Base content files for The Ur-Quan Masters|ville.skytta at iki.fi|extras-qa at fedoraproject.org| Fedora Extras|uqm|The Ur-Quan Masters|ville.skytta at iki.fi|extras-qa at fedoraproject.org| Fedora Extras|util-vserver|Linux virtual server utilities|enrico.scholz at informatik.tu-chemnitz.de|extras-qa at fedoraproject.org|wtogami at redhat.com +Fedora Extras|utrac|Universal Text Recognizer and Converter|aportal at univ-montp2.fr|extras-qa at fedoraproject.org| Fedora Extras|uudeview|Applications for uuencoding, uudecoding, ..|adrian at lisas.de|extras-qa at fedoraproject.org| Fedora Extras|verbiste|French conjugation system|icon at linux.duke.edu|extras-qa at fedoraproject.org| Fedora Extras|vice|Versatile Commodore Emulator|pmatilai at laiskiainen.org|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Tue Sep 27 14:52:59 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Tue, 27 Sep 2005 10:52:59 -0400 Subject: rpms/lft/devel .cvsignore, 1.4, 1.5 lft-install.patch, 1.1, 1.2 lft.spec, 1.16, 1.17 sources, 1.4, 1.5 Message-ID: <200509271452.j8REqxET022852@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/lft/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22824 Modified Files: .cvsignore lft-install.patch lft.spec sources Log Message: * Thu Aug 25 2005 Ville Skytt?? - 1:2.5-1 - 2.5. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/lft/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 19 May 2005 18:38:28 -0000 1.4 +++ .cvsignore 27 Sep 2005 14:52:57 -0000 1.5 @@ -1 +1 @@ -lft-2.31.tar.gz +lft-2.5.tar.gz lft-install.patch: Index: lft-install.patch =================================================================== RCS file: /cvs/extras/rpms/lft/devel/lft-install.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- lft-install.patch 8 Nov 2004 04:40:48 -0000 1.1 +++ lft-install.patch 27 Sep 2005 14:52:57 -0000 1.2 @@ -1,10 +1,16 @@ ---- Makefile.in~ 2003-05-07 21:57:58.000000000 +0300 -+++ Makefile.in 2003-07-12 13:34:15.000000000 +0300 -@@ -60,7 +60,6 @@ - install: lft lft.8 +--- Makefile.in~ ++++ Makefile.in +@@ -51,11 +51,10 @@ test -d $(bindir)/. || $(MKDIR) $(bindir) $(INSTALL) lft $(bindir)/lft + $(INSTALL) whob $(bindir)/whob - @ ( echo chown root $(bindir)/lft && chown root $(bindir)/lft && echo chmod u+s $(bindir)/lft && chmod u+s $(bindir)/lft ) || echo "***" WARNING: could not set $(bindir) suid to root test -d $(mandir)/man8/. || $(MKDIR) $(mandir)/man8 - $(INSTALL) lft.8 $(mandir)/man8/lft.8 + @echo "Installing LFT and WhoB manual pages" +- $(INSTALL) lft.8 $(mandir)/man8/lft.8 +- $(INSTALL) whob.8 $(mandir)/man8/whob.8 ++ $(INSTALL) -pm 644 lft.8 $(mandir)/man8/lft.8 ++ $(INSTALL) -pm 644 whob.8 $(mandir)/man8/whob.8 + clean: + $(RM) *.o core* lft whob *~ Index: lft.spec =================================================================== RCS file: /cvs/extras/rpms/lft/devel/lft.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- lft.spec 21 Jul 2005 19:02:08 -0000 1.16 +++ lft.spec 27 Sep 2005 14:52:57 -0000 1.17 @@ -1,12 +1,13 @@ Name: lft -Version: 2.31 -Release: 3 +Version: 2.5 +Release: 1%{?dist} +Epoch: 1 Summary: Alternate traceroute tool Group: Applications/Internet License: VOSTROM Public License -URL: http://oppleman.com/lft/ -# http://oppleman.com/dl/?file=lft-2.31.tar.gz +URL: http://pwhois.org/lft/ +# http://pwhois.org/dl/?file=lft-2.5.tar.gz Source0: %{name}-%{version}.tar.gz Patch0: %{name}-install.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -43,13 +44,18 @@ %files -%defattr(0644,root,root,0755) -%doc CHANGELOG COPYING README TODO lft-manpage.html +%defattr(-,root,root,-) +%doc CHANGELOG COPYING README TODO %attr(4755,root,root) %{_bindir}/lft +%{_bindir}/whob %{_mandir}/man8/lft.8* +%{_mandir}/man8/whob.8* %changelog +* Thu Aug 25 2005 Ville Skytt?? - 1:2.5-1 +- 2.5. + * Thu Jul 21 2005 Ville Skytt?? - 2.31-3 - Rebuild against new libpcap. Index: sources =================================================================== RCS file: /cvs/extras/rpms/lft/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 19 May 2005 18:38:28 -0000 1.4 +++ sources 27 Sep 2005 14:52:57 -0000 1.5 @@ -1 +1 @@ -5b8b16c061528c1ace9550a47255906d lft-2.31.tar.gz +5b0f45addbb371cc076fe6d9d9694546 lft-2.5.tar.gz From fedora-extras-commits at redhat.com Tue Sep 27 15:14:33 2005 From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert)) Date: Tue, 27 Sep 2005 11:14:33 -0400 Subject: rpms/emelfm2 - New directory Message-ID: <200509271514.j8RFEXj7024426@cvs-int.fedora.redhat.com> Author: cwickert Update of /cvs/extras/rpms/emelfm2 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24402/emelfm2 Log Message: Directory /cvs/extras/rpms/emelfm2 added to the repository From fedora-extras-commits at redhat.com Tue Sep 27 15:14:34 2005 From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert)) Date: Tue, 27 Sep 2005 11:14:34 -0400 Subject: rpms/emelfm2/devel - New directory Message-ID: <200509271514.j8RFEYxj024431@cvs-int.fedora.redhat.com> Author: cwickert Update of /cvs/extras/rpms/emelfm2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24402/emelfm2/devel Log Message: Directory /cvs/extras/rpms/emelfm2/devel added to the repository From fedora-extras-commits at redhat.com Tue Sep 27 15:14:51 2005 From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert)) Date: Tue, 27 Sep 2005 11:14:51 -0400 Subject: rpms/emelfm2 Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200509271514.j8RFEp7Z024482@cvs-int.fedora.redhat.com> Author: cwickert Update of /cvs/extras/rpms/emelfm2 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24447 Added Files: Makefile import.log Log Message: Setup of module emelfm2 --- NEW FILE Makefile --- # Top level Makefile for module emelfm2 all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Tue Sep 27 15:14:51 2005 From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert)) Date: Tue, 27 Sep 2005 11:14:51 -0400 Subject: rpms/emelfm2/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200509271514.j8RFEpQp024487@cvs-int.fedora.redhat.com> Author: cwickert Update of /cvs/extras/rpms/emelfm2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24447/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module emelfm2 --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Tue Sep 27 15:16:18 2005 From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert)) Date: Tue, 27 Sep 2005 11:16:18 -0400 Subject: rpms/emelfm2 import.log,1.1,1.2 Message-ID: <200509271516.j8RFGIJp024593@cvs-int.fedora.redhat.com> Author: cwickert Update of /cvs/extras/rpms/emelfm2 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24557 Modified Files: import.log Log Message: auto-import emelfm2-0.1.2-2.fc4 on branch devel from emelfm2-0.1.2-2.fc4.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/emelfm2/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 27 Sep 2005 15:14:49 -0000 1.1 +++ import.log 27 Sep 2005 15:16:16 -0000 1.2 @@ -0,0 +1 @@ +emelfm2-0_1_2-2_fc4:HEAD:emelfm2-0.1.2-2.fc4.src.rpm:1127834166 From fedora-extras-commits at redhat.com Tue Sep 27 15:16:18 2005 From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert)) Date: Tue, 27 Sep 2005 11:16:18 -0400 Subject: rpms/emelfm2/devel emelfm2-0.1.2-makefile.config.patch, NONE, 1.1 emelfm2.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200509271516.j8RFGIv3024601@cvs-int.fedora.redhat.com> Author: cwickert Update of /cvs/extras/rpms/emelfm2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24557/devel Modified Files: .cvsignore sources Added Files: emelfm2-0.1.2-makefile.config.patch emelfm2.spec Log Message: auto-import emelfm2-0.1.2-2.fc4 on branch devel from emelfm2-0.1.2-2.fc4.src.rpm emelfm2-0.1.2-makefile.config.patch: --- NEW FILE emelfm2-0.1.2-makefile.config.patch --- --- Makefile.config.orig 2005-09-13 02:06:53.000000000 +0200 +++ Makefile.config 2005-09-22 04:01:53.000000000 +0200 @@ -2,7 +2,7 @@ ### installation (where) ### ############################ -PREFIX ?= /usr/local +PREFIX ?= %PREFIX% #on debian systems, install to X11R6/bin by default ifeq ($(shell ls /etc/debian_version 2>/dev/null), /etc/debian_version) @@ -12,7 +12,7 @@ endif # setting this to 1 makes the default docs dir include the current version no. -DOCS_VERSION ?= 0 +DOCS_VERSION ?= 1 #defaults for PLUGINS_DIR, DOC_DIR, ICON_DIR, LOCALE_DIR are set in Makefile @@ -82,7 +82,7 @@ # setting this to 1 includes code (not much) that is applicable # only to Gtk versions > 2.4 -USE_LATEST ?= 0 +USE_LATEST ?= 1 ######################### ### documentation ### --- NEW FILE emelfm2.spec --- Name: emelfm2 Version: 0.1.2 Release: 2%{?dist} Summary: A file manager that implements the popular two-pane design Group: Applications/File License: GPL URL: http://emelfm2.org/ Source0: http://emelfm2.org/rel/emelfm2-%{version}.tar.gz Patch0: %{name}-0.1.2-makefile.config.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gtk2-devel >= 2.4.0, gettext, desktop-file-utils %description emelFM2 is the GTK+2 port of emelFM. emelFM2 is a file manager that implements the popular two-pane design. It features a simple GTK+2 interface, a flexible file typing scheme, and a built-in command line for executing commands without opening an xterm. %prep %setup -q %patch0 -p0 -b .orig sed -i 's!%PREFIX%'!'%{_prefix}!' Makefile.config # fix broken icon in emelfm2.desktop sed -i 's!emelfm2/icon_emelfm2_48.png!%{_datadir}/pixmaps/emelfm2/emelfm2_48.png!' docs/desktop_environment/%{name}.desktop %build make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install PREFIX=$RPM_BUILD_ROOT%{_prefix} make install_i18n PREFIX=$RPM_BUILD_ROOT%{_prefix} %find_lang %{name} desktop-file-install --vendor fedora \ --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ --add-category X-Fedora \ --add-category Application \ --add-category Utility \ --delete-original \ ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop %clean rm -rf $RPM_BUILD_ROOT %files -f %{name}.lang %defattr(-,root,root,-) %doc docs/ACTIONS docs/CHANGELOG docs/CONFIGURATION docs/CREDITS docs/HACKING %doc docs/PLUGINS docs/README docs/ROADMAP docs/TODO docs/USAGE docs/WARNING %doc docs/help.txt docs/GPL docs/LGPL %{_bindir}/%{name} %{_libdir}/%{name} %{_datadir}/applications/fedora-%{name}.desktop %{_datadir}/application-registry/%{name}.applications %{_datadir}/pixmaps/%{name} %changelog * Mon Sep 26 2005 Christoph Wickert - 0.1.2-2 - removed broken-icon.patch (using sed instead). - removed hardcoded /usr from makefile.config-patch. - Minor specfile changes (#168608). * Sun Sep 18 2005 Christoph Wickert - 0.1.2-1 - Update to 0.1.2. * Sun Sep 11 2005 Christoph Wickert - 0.1.1-2 - Using destop-file-install. - Several fixes for FE. * Sun Aug 21 2005 Christoph Wickert - 0.1.1-1.fc4.cw - Initial RPM release. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/emelfm2/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 27 Sep 2005 15:14:49 -0000 1.1 +++ .cvsignore 27 Sep 2005 15:16:16 -0000 1.2 @@ -0,0 +1 @@ +emelfm2-0.1.2.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/emelfm2/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 27 Sep 2005 15:14:49 -0000 1.1 +++ sources 27 Sep 2005 15:16:16 -0000 1.2 @@ -0,0 +1 @@ +33b0f1bd8f0119c9a6122f39d6073710 emelfm2-0.1.2.tar.gz From fedora-extras-commits at redhat.com Tue Sep 27 15:33:27 2005 From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert)) Date: Tue, 27 Sep 2005 11:33:27 -0400 Subject: owners owners.list,1.257,1.258 Message-ID: <200509271533.j8RFXRSt024801@cvs-int.fedora.redhat.com> Author: cwickert Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24770 Modified Files: owners.list Log Message: added emelfm2 Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.257 retrieving revision 1.258 diff -u -r1.257 -r1.258 --- owners.list 27 Sep 2005 13:48:24 -0000 1.257 +++ owners.list 27 Sep 2005 15:33:25 -0000 1.258 @@ -152,6 +152,7 @@ Fedora Extras|eet|A library designed to write an arbitary set of chunks of data to a file|ivazquez at ivazquez.net|extras-qa at fedoraproject.org| Fedora Extras|elmo|Terminal-based mail client|gauret at free.fr|extras-qa at fedoraproject.org| Fedora Extras|emacs-auctex|Enhanced TeX modes for Emacsen|ed at eh3.com|extras-qa at fedoraproject.org| +Fedora Extras|emelfm2|A file manager that implements the popular two-pane design|wickerpms at arcor.de|extras-qa at fedoraproject.org| Fedora Extras|enca|Character set analyzer and detector|dmitry at butskoy.name|extras-qa at fedoraproject.org| Fedora Extras|enchant|An Enchanting Spell Checking Library|uwog at uwog.net|extras-qa at fedoraproject.org| Fedora Extras|enemies-of-carlotta|A simple mailing list manager|redhat-bugzilla at camperquake.de|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Tue Sep 27 15:39:52 2005 From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters)) Date: Tue, 27 Sep 2005 11:39:52 -0400 Subject: rpms/lcdf-typetools/devel - New directory Message-ID: <200509271539.j8RFdqqV025274@cvs-int.fedora.redhat.com> Author: mpeters Update of /cvs/extras/rpms/lcdf-typetools/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25247/lcdf-typetools/devel Log Message: Directory /cvs/extras/rpms/lcdf-typetools/devel added to the repository From fedora-extras-commits at redhat.com Tue Sep 27 15:39:52 2005 From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters)) Date: Tue, 27 Sep 2005 11:39:52 -0400 Subject: rpms/lcdf-typetools - New directory Message-ID: <200509271539.j8RFdqC5025269@cvs-int.fedora.redhat.com> Author: mpeters Update of /cvs/extras/rpms/lcdf-typetools In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25247/lcdf-typetools Log Message: Directory /cvs/extras/rpms/lcdf-typetools added to the repository From fedora-extras-commits at redhat.com Tue Sep 27 15:40:29 2005 From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters)) Date: Tue, 27 Sep 2005 11:40:29 -0400 Subject: rpms/lcdf-typetools Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200509271540.j8RFeTWA025372@cvs-int.fedora.redhat.com> Author: mpeters Update of /cvs/extras/rpms/lcdf-typetools In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25341 Added Files: Makefile import.log Log Message: Setup of module lcdf-typetools --- NEW FILE Makefile --- # Top level Makefile for module lcdf-typetools all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Tue Sep 27 15:40:30 2005 From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters)) Date: Tue, 27 Sep 2005 11:40:30 -0400 Subject: rpms/lcdf-typetools/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200509271540.j8RFeUX1025377@cvs-int.fedora.redhat.com> Author: mpeters Update of /cvs/extras/rpms/lcdf-typetools/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25341/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module lcdf-typetools --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Tue Sep 27 15:41:50 2005 From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters)) Date: Tue, 27 Sep 2005 11:41:50 -0400 Subject: rpms/lcdf-typetools import.log,1.1,1.2 Message-ID: <200509271542.j8RFgK1j025553@cvs-int.fedora.redhat.com> Author: mpeters Update of /cvs/extras/rpms/lcdf-typetools In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25485 Modified Files: import.log Log Message: auto-import lcdf-typetools-2.34-1.fc5 on branch devel from lcdf-typetools-2.34-1.fc5.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/lcdf-typetools/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 27 Sep 2005 15:40:27 -0000 1.1 +++ import.log 27 Sep 2005 15:41:48 -0000 1.2 @@ -0,0 +1 @@ +lcdf-typetools-2_34-1_fc5:HEAD:lcdf-typetools-2.34-1.fc5.src.rpm:1127835611 From fedora-extras-commits at redhat.com Tue Sep 27 15:41:50 2005 From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters)) Date: Tue, 27 Sep 2005 11:41:50 -0400 Subject: rpms/lcdf-typetools/devel lcdf-typetools.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200509271542.j8RFgKbf025557@cvs-int.fedora.redhat.com> Author: mpeters Update of /cvs/extras/rpms/lcdf-typetools/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25485/devel Modified Files: .cvsignore sources Added Files: lcdf-typetools.spec Log Message: auto-import lcdf-typetools-2.34-1.fc5 on branch devel from lcdf-typetools-2.34-1.fc5.src.rpm --- NEW FILE lcdf-typetools.spec --- Name: lcdf-typetools Version: 2.34 Release: 1%{?dist} Summary: Tools for manipulating Postscript fonts Group: Applications/Publishing License: GPL URL: http://www.lcdf.org/~eddietwo/type/index.html Source0: http://www.lcdf.org/~eddietwo/type/lcdf-typetools-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: tetex-fonts %description The LCDF Typetools package contains several programs for manipulating PostScript Type 1, Type 1 multiple master, and PostScript-flavored OpenType fonts. LCDF Typetools includes the mmafm and mmpfb programs, which were formerly distributed as part of a different package (mminstance). %prep %setup -q %build %configure make %{?_smp_mflags} %install rm -rf %buildroot make install DESTDIR=%buildroot %clean rm -rf %buildroot %files %defattr(-,root,root,-) %doc README COPYING NEWS ONEWS %_bindir/* %_datadir/%{name} %_mandir/man1/* %changelog * Sun Sep 25 2005 Michael A. Peters - 2.34-1 Initial Packaging for Fedora Extras Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/lcdf-typetools/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 27 Sep 2005 15:40:28 -0000 1.1 +++ .cvsignore 27 Sep 2005 15:41:48 -0000 1.2 @@ -0,0 +1 @@ +lcdf-typetools-2.34.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/lcdf-typetools/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 27 Sep 2005 15:40:28 -0000 1.1 +++ sources 27 Sep 2005 15:41:48 -0000 1.2 @@ -0,0 +1 @@ +027019eff3de4cd322f727f29cc8cdda lcdf-typetools-2.34.tar.gz From fedora-extras-commits at redhat.com Tue Sep 27 15:50:44 2005 From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters)) Date: Tue, 27 Sep 2005 11:50:44 -0400 Subject: owners owners.list,1.258,1.259 Message-ID: <200509271550.j8RFoiVS026312@cvs-int.fedora.redhat.com> Author: mpeters Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26232 Modified Files: owners.list Log Message: added lcdf-typetools, approved by Aurelien Bompard (gauret at free.fr) Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.258 retrieving revision 1.259 diff -u -r1.258 -r1.259 --- owners.list 27 Sep 2005 15:33:25 -0000 1.258 +++ owners.list 27 Sep 2005 15:50:42 -0000 1.259 @@ -392,6 +392,7 @@ Fedora Extras|lablgtk|An Objective Caml interface to gtk+|gemi at bluewin.ch|extras-qa at fedoraproject.org| Fedora Extras|ladspa|LADSPA SDK, example plug-ins and tools|thomas at apestaart.org|extras-qa at fedoraproject.org| Fedora Extras|lapack|The LAPACK libraries for numerical linear algebra.|tcallawa at redhat.com|extras-qa at fedoraproject.org| +Fedora Extras|lcdf-typetools|Tools for manipulating Postscript fonts|mpeters at mac.com|extras-qa at fedoraproject.org| Fedora Extras|lcms|Color Management System|compton at pcompton.com|extras-qa at fedoraproject.org| Fedora Extras|leafnode|A leafsite NNTP server|davidhart at tqmcube.com|extras-qa at fedoraproject.org| Fedora Extras|leafpad|GTK+ based simple text editor|ivazquez at ivazquez.net|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Tue Sep 27 15:55:00 2005 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Tue, 27 Sep 2005 11:55:00 -0400 Subject: rpms/nautilus-image-converter - New directory Message-ID: <200509271555.j8RFt0Xf026621@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/nautilus-image-converter In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26597/nautilus-image-converter Log Message: Directory /cvs/extras/rpms/nautilus-image-converter added to the repository From fedora-extras-commits at redhat.com Tue Sep 27 15:55:00 2005 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Tue, 27 Sep 2005 11:55:00 -0400 Subject: rpms/nautilus-image-converter/devel - New directory Message-ID: <200509271555.j8RFt0NY026626@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/nautilus-image-converter/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26597/nautilus-image-converter/devel Log Message: Directory /cvs/extras/rpms/nautilus-image-converter/devel added to the repository From fedora-extras-commits at redhat.com Tue Sep 27 15:55:09 2005 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Tue, 27 Sep 2005 11:55:09 -0400 Subject: rpms/nautilus-image-converter Makefile, NONE, 1.1 import.log, NONE, 1.1 Message-ID: <200509271555.j8RFt94u026671@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/nautilus-image-converter In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26642 Added Files: Makefile import.log Log Message: Setup of module nautilus-image-converter --- NEW FILE Makefile --- # Top level Makefile for module nautilus-image-converter all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Tue Sep 27 15:55:09 2005 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Tue, 27 Sep 2005 11:55:09 -0400 Subject: rpms/nautilus-image-converter/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200509271555.j8RFt93x026676@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/nautilus-image-converter/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26642/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module nautilus-image-converter --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Tue Sep 27 15:55:36 2005 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Tue, 27 Sep 2005 11:55:36 -0400 Subject: rpms/nautilus-image-converter import.log,1.1,1.2 Message-ID: <200509271555.j8RFtavH026745@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/nautilus-image-converter In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26710 Modified Files: import.log Log Message: auto-import nautilus-image-converter-0.0.3-2 on branch devel from nautilus-image-converter-0.0.3-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/nautilus-image-converter/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 27 Sep 2005 15:55:07 -0000 1.1 +++ import.log 27 Sep 2005 15:55:34 -0000 1.2 @@ -0,0 +1 @@ +nautilus-image-converter-0_0_3-2:HEAD:nautilus-image-converter-0.0.3-2.src.rpm:1127836530 From fedora-extras-commits at redhat.com Tue Sep 27 15:55:36 2005 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Tue, 27 Sep 2005 11:55:36 -0400 Subject: rpms/nautilus-image-converter/devel nautilus-image-converter.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200509271555.j8RFtaqw026752@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/nautilus-image-converter/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26710/devel Modified Files: .cvsignore sources Added Files: nautilus-image-converter.spec Log Message: auto-import nautilus-image-converter-0.0.3-2 on branch devel from nautilus-image-converter-0.0.3-2.src.rpm --- NEW FILE nautilus-image-converter.spec --- Name: nautilus-image-converter Version: 0.0.3 Release: 2%{?dist} Summary: Nautilus extension to mass resize images Group: System Environment/Shells License: GPL URL: http://www.bitron.ch/software/nautilus-image-converter.php Source0: http://www.bitron.ch/downloads/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libglade2-devel >= 2.4.0 BuildRequires: gnome-vfs2-devel >= 2.6.0 BuildRequires: nautilus >= 2.6.0 Requires: ImageMagick %description Adds a "Resize Images..." menu item to the context menu of all images. This opens a dialog where you set the desired image size and file name. A click on "Resize" finally resizes the image(s) using ImageMagick's convert tool. %prep %setup -q %build %configure --disable-static make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -name \*.la -exec rm {} \; %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc AUTHORS COPYING %{_datadir}/%{name}/ %{_libdir}/nautilus/extensions-1.0/*.so %changelog * Tue Sep 27 2005 Brian Pepple - 0.0.3-2 - Fix ownership of data directory. - Add dist tag. * Tue Sep 27 2005 Brian Pepple - 0.0.3-1 - Initial Fedora Extras release. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/nautilus-image-converter/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 27 Sep 2005 15:55:07 -0000 1.1 +++ .cvsignore 27 Sep 2005 15:55:34 -0000 1.2 @@ -0,0 +1 @@ +nautilus-image-converter-0.0.3.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/nautilus-image-converter/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 27 Sep 2005 15:55:07 -0000 1.1 +++ sources 27 Sep 2005 15:55:34 -0000 1.2 @@ -0,0 +1 @@ +4f6d178acecdbbf7671066845f3c704e nautilus-image-converter-0.0.3.tar.bz2 From fedora-extras-commits at redhat.com Tue Sep 27 15:58:07 2005 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Tue, 27 Sep 2005 11:58:07 -0400 Subject: owners owners.list,1.259,1.260 Message-ID: <200509271558.j8RFw7Ud026813@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26794 Modified Files: owners.list Log Message: Add nautilus-image-converter Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.259 retrieving revision 1.260 diff -u -r1.259 -r1.260 --- owners.list 27 Sep 2005 15:50:42 -0000 1.259 +++ owners.list 27 Sep 2005 15:58:04 -0000 1.260 @@ -524,6 +524,7 @@ Fedora Extras|nail|Enhanced implementation of the mailx command|dmitry at butskoy.name|extras-qa at fedoraproject.org| Fedora Extras|naim|An ncurses-based console AIM, ICQ, IRC, and Lily client|lmacken at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|namazu|A full-text search engine|tagoh at redhat.com|extras-qa at fedoraproject.org| +Fedora Extras|nautilus-image-converter|Nautilus extension to mass resize images|bdpepple at ameritech.net|extras-qa at fedoraproject.org| Fedora Extras|nautilus-open-terminal|Nautilus extension for an open terminal shortcut|stickster at gmail.com|extras-qa at fedoraproject.org| Fedora Extras|nautilus-search-tool|A Nautilus extension to put "Search for Files" on the context menu of folders|ivazquez at ivazquez.net|extras-qa at fedoraproject.org| Fedora Extras|ncftp|Improved console FTP client|matthias at rpmforge.net|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Tue Sep 27 16:20:02 2005 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Tue, 27 Sep 2005 12:20:02 -0400 Subject: rpms/abcm2ps/devel abcm2ps.spec,1.1,1.2 Message-ID: <200509271620.j8RGK234028364@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/abcm2ps/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28311/devel Modified Files: abcm2ps.spec Log Message: Index: abcm2ps.spec =================================================================== RCS file: /cvs/extras/rpms/abcm2ps/devel/abcm2ps.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- abcm2ps.spec 26 Sep 2005 17:36:04 -0000 1.1 +++ abcm2ps.spec 27 Sep 2005 16:20:00 -0000 1.2 @@ -1,6 +1,6 @@ Name: abcm2ps Version: 4.11.4 -Release: 2 +Release: 2%{?dist} Summary: A program to typeset ABC tunes into Postscript Group: Applications/Multimedia From fedora-extras-commits at redhat.com Tue Sep 27 16:19:56 2005 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Tue, 27 Sep 2005 12:19:56 -0400 Subject: rpms/abcm2ps/FC-3 abcm2ps.spec,1.1,1.2 Message-ID: <200509271620.j8RGKQdH028367@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/abcm2ps/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28311/FC-3 Modified Files: abcm2ps.spec Log Message: Index: abcm2ps.spec =================================================================== RCS file: /cvs/extras/rpms/abcm2ps/FC-3/abcm2ps.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- abcm2ps.spec 26 Sep 2005 17:36:04 -0000 1.1 +++ abcm2ps.spec 27 Sep 2005 16:19:54 -0000 1.2 @@ -1,6 +1,6 @@ Name: abcm2ps Version: 4.11.4 -Release: 2 +Release: 2%{?dist} Summary: A program to typeset ABC tunes into Postscript Group: Applications/Multimedia From fedora-extras-commits at redhat.com Tue Sep 27 16:19:56 2005 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Tue, 27 Sep 2005 12:19:56 -0400 Subject: rpms/abcm2ps/FC-4 abcm2ps.spec,1.1,1.2 Message-ID: <200509271620.j8RGKRRo028370@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/abcm2ps/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28311/FC-4 Modified Files: abcm2ps.spec Log Message: Index: abcm2ps.spec =================================================================== RCS file: /cvs/extras/rpms/abcm2ps/FC-4/abcm2ps.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- abcm2ps.spec 26 Sep 2005 17:36:04 -0000 1.1 +++ abcm2ps.spec 27 Sep 2005 16:19:54 -0000 1.2 @@ -1,6 +1,6 @@ Name: abcm2ps Version: 4.11.4 -Release: 2 +Release: 2%{?dist} Summary: A program to typeset ABC tunes into Postscript Group: Applications/Multimedia From fedora-extras-commits at redhat.com Tue Sep 27 16:34:41 2005 From: fedora-extras-commits at redhat.com (Dan Kenigsberg (danken)) Date: Tue, 27 Sep 2005 12:34:41 -0400 Subject: rpms/hspell/FC-4 hspell.spec,1.1,1.2 Message-ID: <200509271634.j8RGYfe9028558@cvs-int.fedora.redhat.com> Author: danken Update of /cvs/extras/rpms/hspell/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28537 Modified Files: hspell.spec Log Message: change release version to merit a rebuild in the FC4 branch. Is it really required? Index: hspell.spec =================================================================== RCS file: /cvs/extras/rpms/hspell/FC-4/hspell.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- hspell.spec 26 Sep 2005 17:18:54 -0000 1.1 +++ hspell.spec 27 Sep 2005 16:34:38 -0000 1.2 @@ -1,7 +1,7 @@ Summary: A Hebrew spell checker Name: hspell Version: 0.9 -Release: 6 +Release: 6.fc4 URL: http://ivrix.org.il/projects/spell-checker/ Source: http://ivrix.org.il/projects/spell-checker/hspell-%{version}.tar.gz License: GPL @@ -75,7 +75,7 @@ %{_mandir}/man3/hspell.3* %changelog -* Mon Sep 26 2005 Dan Kenigsberg 0.9-6 +* Mon Sep 26 2005 Dan Kenigsberg 0.9-6.fc4 - Add the text of the GPL to the binary package. It seems that I'll do anything to make my sponsor Tom happy. * Thu Sep 23 2005 Dan Kenigsberg 0.9-5 From fedora-extras-commits at redhat.com Tue Sep 27 16:52:32 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Tue, 27 Sep 2005 12:52:32 -0400 Subject: rpms/sbcl/devel sbcl-0.9.5-personality.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 sbcl.spec, 1.14, 1.15 sources, 1.2, 1.3 sbcl-0.9.4-personality.patch, 1.1, NONE Message-ID: <200509271652.j8RGqWaH028951@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/sbcl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28925 Modified Files: .cvsignore sbcl.spec sources Added Files: sbcl-0.9.5-personality.patch Removed Files: sbcl-0.9.4-personality.patch Log Message: * Tue Sep 27 2005 Rex Dieter 0.9.5-1 - 0.9.5 - use native sbcl bootstraps, when available (ie, %{ix86},x86_64) - try ppc again sbcl-0.9.5-personality.patch: --- NEW FILE sbcl-0.9.5-personality.patch --- --- sbcl-0.9.5/src/runtime/linux-os.c.pers 2005-09-24 09:29:54.000000000 -0500 +++ sbcl-0.9.5/src/runtime/linux-os.c 2005-09-27 09:37:33.463478519 -0500 @@ -177,6 +177,10 @@ if (i != -1) { runtime[i] = '\0'; execve(runtime, argv, envp); + } else { + /* if /proc isn't available (like in chroot builds, like mock), + * try using execvp with argv[0] instead */ + execvp(argv[0], argv); } } /* Either changing the personality or execve() failed. Either Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/sbcl/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 12 Sep 2005 12:36:44 -0000 1.2 +++ .cvsignore 27 Sep 2005 16:52:30 -0000 1.3 @@ -1,4 +1,2 @@ +sbcl-0.9.5-source.tar.bz2 sbcl-0.8.15-powerpc-linux-binary.tar.bz2 -sbcl-0.9.4-source.tar.bz2 -sbcl-0.9.4-x86-64-linux-binary.tar.bz2 -sbcl-0.9.4-x86-linux-binary.tar.bz2 Index: sbcl.spec =================================================================== RCS file: /cvs/extras/rpms/sbcl/devel/sbcl.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- sbcl.spec 22 Sep 2005 14:10:29 -0000 1.14 +++ sbcl.spec 27 Sep 2005 16:52:30 -0000 1.15 @@ -9,29 +9,33 @@ Name: sbcl Summary: Steel Bank Common Lisp -Version: 0.9.4 -Release: 19%{?dist} +Version: 0.9.5 +Release: 1%{?dist} License: BSD/MIT Group: Development/Languages URL: http://sbcl.sourceforge.net/ Source0: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-%{version}-source.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -ExclusiveArch: %{ix86} x86_64 +ExclusiveArch: %{ix86} x86_64 ppc %if "%{?sbcl_bootstrap}" == "%{nil}" # local Bootstrap binaries -Source10: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-%{version}-x86-linux-binary.tar.bz2 +Source10: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.4-x86-linux-binary.tar.bz2 %ifarch %{ix86} -%define sbcl_bootstrap_src -a 10 +%define sbcl_bootstrap sbcl +#define sbcl_bootstrap_src -a 10 %endif -Source11: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-%{version}-x86-64-linux-binary.tar.bz2 +Source11: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.4-x86-64-linux-binary.tar.bz2 %ifarch x86_64 -%define sbcl_bootstrap_src -a 11 +%define sbcl_bootstrap sbcl +#define sbcl_bootstrap_src -a 11 %endif -# Latest powerpc-linux bootstrap (untested) +# Latest powerpc-linux bootstrap, busted: +# buildsys.fedoraproject.org/logs/development/1131-sbcl-0.9.4-14.fc5/ppc/build.log Source12: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.8.15-powerpc-linux-binary.tar.bz2 %ifarch ppc +%undefine sbcl_bootstrap %define sbcl_bootstrap_src -a 12 %endif %endif @@ -39,7 +43,7 @@ Source100: my_setarch.c Patch1: sbcl-0.8.18-default-sbcl-home.patch -Patch2: sbcl-0.9.4-personality.patch +Patch2: sbcl-0.9.5-personality.patch Patch3: sbcl-0.9.4-optflags.patch Patch4: sbcl-0.9.4-LIB_DIR.patch @@ -161,6 +165,11 @@ %changelog +* Tue Sep 27 2005 Rex Dieter 0.9.5-1 +- 0.9.5 +- use native sbcl bootstraps, when available (ie, %%{ix86},x86_64) +- try ppc again + * Thu Sep 22 2005 Rex Dieter 0.9.4-19 - drop use of setarch, use my_setarch.c Index: sources =================================================================== RCS file: /cvs/extras/rpms/sbcl/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 12 Sep 2005 12:36:44 -0000 1.2 +++ sources 27 Sep 2005 16:52:30 -0000 1.3 @@ -1,4 +1,2 @@ +f594f18813c08f262a6df9a36288adcb sbcl-0.9.5-source.tar.bz2 3a72d0785ce0a8e02f9af632c2a4f217 sbcl-0.8.15-powerpc-linux-binary.tar.bz2 -a0420dc6236efece72c1c80ee15873c9 sbcl-0.9.4-source.tar.bz2 -67ec41e624a3f2ad7f6f3cde1bd001d3 sbcl-0.9.4-x86-64-linux-binary.tar.bz2 -947d1cde2c1c80416b5f9fb4e4c81383 sbcl-0.9.4-x86-linux-binary.tar.bz2 --- sbcl-0.9.4-personality.patch DELETED --- From fedora-extras-commits at redhat.com Tue Sep 27 17:44:28 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 27 Sep 2005 13:44:28 -0400 Subject: owners owners.list,1.260,1.261 Message-ID: <200509271744.j8RHiSxG030489@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30470 Modified Files: owners.list Log Message: transfer ownership of tinyerp to Dan Hor??k Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.260 retrieving revision 1.261 diff -u -r1.260 -r1.261 --- owners.list 27 Sep 2005 15:58:04 -0000 1.260 +++ owners.list 27 Sep 2005 17:44:26 -0000 1.261 @@ -1006,7 +1006,7 @@ Fedora Extras|thunderbird|thunderbird mail|wtogami at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|tidy|Utility to clean up and pretty print HTML/XHTML/XML|rdieter at math.unl.edu|extras-qa at fedoraproject.org| Fedora Extras|tin|A basic Internet news reader|adrian at lisas.de|extras-qa at fedoraproject.org| -Fedora Extras|tinyerp|Open Source ERP Client|tcallawa at redhat.com|extras-qa at fedoraproject.org| +Fedora Extras|tinyerp|Open Source ERP Client|dan at danny.cz|extras-qa at fedoraproject.org|tcallawa at redhat.com Fedora Extras|tkcvs|TkCVS and TkDiff|gemi at bluewin.ch|extras-qa at fedoraproject.org| Fedora Extras|tktable|Table/matrix widget extension to Tcl/Tk|jfontain at free.fr|extras-qa at fedoraproject.org| Fedora Extras|tla|The Low-Budget arch Revision Control System|shahms at shahms.com|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Tue Sep 27 17:57:59 2005 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Tue, 27 Sep 2005 13:57:59 -0400 Subject: owners owners.list,1.261,1.262 Message-ID: <200509271757.j8RHvxgP030534@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30513 Modified Files: owners.list Log Message: Taking over celestia. Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.261 retrieving revision 1.262 diff -u -r1.261 -r1.262 --- owners.list 27 Sep 2005 17:44:26 -0000 1.261 +++ owners.list 27 Sep 2005 17:57:57 -0000 1.262 @@ -79,7 +79,7 @@ Fedora Extras|cdiff|Diff readability enhancer for color terminals|ville.skytta at iki.fi|extras-qa at fedoraproject.org| Fedora Extras|cdlabelgen|Generates frontcards and traycards for inserting in CD jewelcases.|harald at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|cdo|A program for manipulating GRIB/NetCDF/SERVICE/EXTRA files|ed at eh3.com|extras-qa at fedoraproject.org| -Fedora Extras|celestia|An OpenGL real-time visual space simulation|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| +Fedora Extras|celestia|An OpenGL real-time visual space simulation|steve at silug.org|extras-qa at fedoraproject.org| Fedora Extras|centericq|Text mode menu- and window-driven IM|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org| Fedora Extras|cfengine|GNU cfengine - a systems administration tool for networks|sheltren at cs.ucsb.edu|extras-qa at fedoraproject.org| Fedora Extras|cfs|An userspace crypto-filesystem|enrico.scholz at informatik.tu-chemnitz.de|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Tue Sep 27 18:02:28 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Tue, 27 Sep 2005 14:02:28 -0400 Subject: rpms/sbcl/devel .cvsignore,1.3,1.4 sources,1.3,1.4 Message-ID: <200509271803.j8RI34RK032050@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/sbcl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32029 Modified Files: .cvsignore sources Log Message: Add sources (even though they're not used?) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/sbcl/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 27 Sep 2005 16:52:30 -0000 1.3 +++ .cvsignore 27 Sep 2005 18:02:25 -0000 1.4 @@ -1,2 +1,4 @@ sbcl-0.9.5-source.tar.bz2 sbcl-0.8.15-powerpc-linux-binary.tar.bz2 +sbcl-0.9.4-x86-64-linux-binary.tar.bz2 +sbcl-0.9.4-x86-linux-binary.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/sbcl/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 27 Sep 2005 16:52:30 -0000 1.3 +++ sources 27 Sep 2005 18:02:25 -0000 1.4 @@ -1,2 +1,4 @@ f594f18813c08f262a6df9a36288adcb sbcl-0.9.5-source.tar.bz2 3a72d0785ce0a8e02f9af632c2a4f217 sbcl-0.8.15-powerpc-linux-binary.tar.bz2 +67ec41e624a3f2ad7f6f3cde1bd001d3 sbcl-0.9.4-x86-64-linux-binary.tar.bz2 +947d1cde2c1c80416b5f9fb4e4c81383 sbcl-0.9.4-x86-linux-binary.tar.bz2 From fedora-extras-commits at redhat.com Tue Sep 27 18:05:03 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Tue, 27 Sep 2005 14:05:03 -0400 Subject: rpms/sbcl/devel sbcl.spec,1.15,1.16 Message-ID: <200509271805.j8RI5X4R032087@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/sbcl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32068 Modified Files: sbcl.spec Log Message: remove unused Source's, Release++ Index: sbcl.spec =================================================================== RCS file: /cvs/extras/rpms/sbcl/devel/sbcl.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- sbcl.spec 27 Sep 2005 16:52:30 -0000 1.15 +++ sbcl.spec 27 Sep 2005 18:04:55 -0000 1.16 @@ -10,7 +10,7 @@ Name: sbcl Summary: Steel Bank Common Lisp Version: 0.9.5 -Release: 1%{?dist} +Release: 2%{?dist} License: BSD/MIT Group: Development/Languages @@ -21,12 +21,12 @@ %if "%{?sbcl_bootstrap}" == "%{nil}" # local Bootstrap binaries -Source10: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.4-x86-linux-binary.tar.bz2 +#Source10: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.4-x86-linux-binary.tar.bz2 %ifarch %{ix86} %define sbcl_bootstrap sbcl #define sbcl_bootstrap_src -a 10 %endif -Source11: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.4-x86-64-linux-binary.tar.bz2 +#Source11: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.4-x86-64-linux-binary.tar.bz2 %ifarch x86_64 %define sbcl_bootstrap sbcl #define sbcl_bootstrap_src -a 11 @@ -165,7 +165,7 @@ %changelog -* Tue Sep 27 2005 Rex Dieter 0.9.5-1 +* Tue Sep 27 2005 Rex Dieter 0.9.5-2 - 0.9.5 - use native sbcl bootstraps, when available (ie, %%{ix86},x86_64) - try ppc again From fedora-extras-commits at redhat.com Tue Sep 27 18:15:46 2005 From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert)) Date: Tue, 27 Sep 2005 14:15:46 -0400 Subject: rpms/emelfm2/devel emelfm2.spec,1.1,1.2 Message-ID: <200509271815.j8RIFkSw032337@cvs-int.fedora.redhat.com> Author: cwickert Update of /cvs/extras/rpms/emelfm2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32318 Modified Files: emelfm2.spec Log Message: release 0.3, fix for x86_64 Index: emelfm2.spec =================================================================== RCS file: /cvs/extras/rpms/emelfm2/devel/emelfm2.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- emelfm2.spec 27 Sep 2005 15:16:16 -0000 1.1 +++ emelfm2.spec 27 Sep 2005 18:15:44 -0000 1.2 @@ -1,6 +1,6 @@ Name: emelfm2 Version: 0.1.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A file manager that implements the popular two-pane design Group: Applications/File @@ -22,6 +22,8 @@ %setup -q %patch0 -p0 -b .orig sed -i 's!%PREFIX%'!'%{_prefix}!' Makefile.config +# 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!emelfm2/icon_emelfm2_48.png!%{_datadir}/pixmaps/emelfm2/emelfm2_48.png!' docs/desktop_environment/%{name}.desktop @@ -61,9 +63,12 @@ %changelog +* Tue Sep 27 2005 Christoph Wickert - 0.1.2-3 +- Fix for x86_64. + * Mon Sep 26 2005 Christoph Wickert - 0.1.2-2 -- removed broken-icon.patch (using sed instead). -- removed hardcoded /usr from makefile.config-patch. +- Removed broken-icon.patch (using sed instead). +- Removed hardcoded /usr from makefile.config-patch. - Minor specfile changes (#168608). * Sun Sep 18 2005 Christoph Wickert - 0.1.2-1 From fedora-extras-commits at redhat.com Tue Sep 27 18:43:16 2005 From: fedora-extras-commits at redhat.com (Dan Kenigsberg (danken)) Date: Tue, 27 Sep 2005 14:43:16 -0400 Subject: rpms/hspell/FC-3 hspell.spec,1.1,1.2 Message-ID: <200509271843.j8RIhG8G032524@cvs-int.fedora.redhat.com> Author: danken Update of /cvs/extras/rpms/hspell/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32505 Modified Files: hspell.spec Log Message: add %?dist to release version Index: hspell.spec =================================================================== RCS file: /cvs/extras/rpms/hspell/FC-3/hspell.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- hspell.spec 26 Sep 2005 17:18:54 -0000 1.1 +++ hspell.spec 27 Sep 2005 18:43:13 -0000 1.2 @@ -1,7 +1,7 @@ Summary: A Hebrew spell checker Name: hspell Version: 0.9 -Release: 6 +Release: 6%{?dist} URL: http://ivrix.org.il/projects/spell-checker/ Source: http://ivrix.org.il/projects/spell-checker/hspell-%{version}.tar.gz License: GPL From fedora-extras-commits at redhat.com Tue Sep 27 18:43:43 2005 From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert)) Date: Tue, 27 Sep 2005 14:43:43 -0400 Subject: rpms/emelfm2/FC-4 emelfm2.spec,1.1,1.2 Message-ID: <200509271843.j8RIhhDW032578@cvs-int.fedora.redhat.com> Author: cwickert Update of /cvs/extras/rpms/emelfm2/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32559 Modified Files: emelfm2.spec Log Message: release 0.3, fix for x86_64 Index: emelfm2.spec =================================================================== RCS file: /cvs/extras/rpms/emelfm2/FC-4/emelfm2.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- emelfm2.spec 27 Sep 2005 15:16:16 -0000 1.1 +++ emelfm2.spec 27 Sep 2005 18:43:40 -0000 1.2 @@ -1,6 +1,6 @@ Name: emelfm2 Version: 0.1.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A file manager that implements the popular two-pane design Group: Applications/File @@ -22,6 +22,8 @@ %setup -q %patch0 -p0 -b .orig sed -i 's!%PREFIX%'!'%{_prefix}!' Makefile.config +# 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!emelfm2/icon_emelfm2_48.png!%{_datadir}/pixmaps/emelfm2/emelfm2_48.png!' docs/desktop_environment/%{name}.desktop @@ -61,9 +63,12 @@ %changelog +* Tue Sep 27 2005 Christoph Wickert - 0.1.2-3 +- Fix for x86_64. + * Mon Sep 26 2005 Christoph Wickert - 0.1.2-2 -- removed broken-icon.patch (using sed instead). -- removed hardcoded /usr from makefile.config-patch. +- Removed broken-icon.patch (using sed instead). +- Removed hardcoded /usr from makefile.config-patch. - Minor specfile changes (#168608). * Sun Sep 18 2005 Christoph Wickert - 0.1.2-1 From fedora-extras-commits at redhat.com Tue Sep 27 18:44:26 2005 From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert)) Date: Tue, 27 Sep 2005 14:44:26 -0400 Subject: rpms/emelfm2/FC-3 emelfm2.spec,1.1,1.2 Message-ID: <200509271844.j8RIiQmd032613@cvs-int.fedora.redhat.com> Author: cwickert Update of /cvs/extras/rpms/emelfm2/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32592 Modified Files: emelfm2.spec Log Message: release 0.3, fix for x86_64 Index: emelfm2.spec =================================================================== RCS file: /cvs/extras/rpms/emelfm2/FC-3/emelfm2.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- emelfm2.spec 27 Sep 2005 15:16:16 -0000 1.1 +++ emelfm2.spec 27 Sep 2005 18:44:24 -0000 1.2 @@ -1,6 +1,6 @@ Name: emelfm2 Version: 0.1.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A file manager that implements the popular two-pane design Group: Applications/File @@ -22,6 +22,8 @@ %setup -q %patch0 -p0 -b .orig sed -i 's!%PREFIX%'!'%{_prefix}!' Makefile.config +# 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!emelfm2/icon_emelfm2_48.png!%{_datadir}/pixmaps/emelfm2/emelfm2_48.png!' docs/desktop_environment/%{name}.desktop @@ -61,9 +63,12 @@ %changelog +* Tue Sep 27 2005 Christoph Wickert - 0.1.2-3 +- Fix for x86_64. + * Mon Sep 26 2005 Christoph Wickert - 0.1.2-2 -- removed broken-icon.patch (using sed instead). -- removed hardcoded /usr from makefile.config-patch. +- Removed broken-icon.patch (using sed instead). +- Removed hardcoded /usr from makefile.config-patch. - Minor specfile changes (#168608). * Sun Sep 18 2005 Christoph Wickert - 0.1.2-1 From fedora-extras-commits at redhat.com Tue Sep 27 18:54:22 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Tue, 27 Sep 2005 14:54:22 -0400 Subject: rpms/sbcl/devel sbcl.spec,1.16,1.17 Message-ID: <200509271854.j8RIsMFR032735@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/sbcl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32716 Modified Files: sbcl.spec Log Message: * Tue Sep 27 2005 Rex Dieter 0.9.5-3 - ppc needs SBCL_ARCH and(or?) setarch Index: sbcl.spec =================================================================== RCS file: /cvs/extras/rpms/sbcl/devel/sbcl.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- sbcl.spec 27 Sep 2005 18:04:55 -0000 1.16 +++ sbcl.spec 27 Sep 2005 18:54:20 -0000 1.17 @@ -10,7 +10,7 @@ Name: sbcl Summary: Steel Bank Common Lisp Version: 0.9.5 -Release: 2%{?dist} +Release: 3%{?dist} License: BSD/MIT Group: Development/Languages @@ -26,17 +26,21 @@ %define sbcl_bootstrap sbcl #define sbcl_bootstrap_src -a 10 %endif -#Source11: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.4-x86-64-linux-binary.tar.bz2 +#Source20: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.4-x86-64-linux-binary.tar.bz2 %ifarch x86_64 %define sbcl_bootstrap sbcl -#define sbcl_bootstrap_src -a 11 +#define sbcl_bootstrap_src -a 20 %endif # Latest powerpc-linux bootstrap, busted: # buildsys.fedoraproject.org/logs/development/1131-sbcl-0.9.4-14.fc5/ppc/build.log -Source12: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.8.15-powerpc-linux-binary.tar.bz2 +Source30: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.8.15-powerpc-linux-binary.tar.bz2 +# another possible ppc bootstrap to try +#Source31: http://clozure.com/openmcl/ftp/openmcl-linuxppc-all-0.14.3.tar.gz %ifarch ppc +BuildRequires: setarch +%define setarch setarch %{_target_cpu} %undefine sbcl_bootstrap -%define sbcl_bootstrap_src -a 12 +%define sbcl_bootstrap_src -a 30 %endif %endif @@ -47,6 +51,7 @@ Patch3: sbcl-0.9.4-optflags.patch Patch4: sbcl-0.9.4-LIB_DIR.patch +BuildRequires: setarch %{?sbcl_bootstrap:BuildRequires: %{?sbcl_bootstrap}} Requires(post): /sbin/install-info @@ -105,10 +110,12 @@ export PATH=`pwd`/sbcl-bootstrap/bin:${PATH} %{__cc} -o my_setarch %{optflags} %{SOURCE100} -%define setarch ./my_setarch +%define my_setarch ./my_setarch %endif -%{?setarch} ./make.sh %{?bootstrap} +# setting SBCL_ARCH couldn't hurt, esp for ppc, might avoid the need for the setarch call +export SBCL_ARCH=%{_target_cpu} +%{?setarch} %{?my_setarch} ./make.sh %{?bootstrap} # docs make -C doc/manual html info @@ -165,6 +172,9 @@ %changelog +* Tue Sep 27 2005 Rex Dieter 0.9.5-3 +- ppc needs SBCL_ARCH and(or?) setarch + * Tue Sep 27 2005 Rex Dieter 0.9.5-2 - 0.9.5 - use native sbcl bootstraps, when available (ie, %%{ix86},x86_64) From fedora-extras-commits at redhat.com Tue Sep 27 19:09:07 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Tue, 27 Sep 2005 15:09:07 -0400 Subject: rpms/sbcl/devel sbcl.spec,1.17,1.18 Message-ID: <200509271909.j8RJ9cAk001726@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/sbcl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1676 Modified Files: sbcl.spec Log Message: SBCL_ARCH only on ppc, since it breaks on others (ie x86_86 != x86-64) Index: sbcl.spec =================================================================== RCS file: /cvs/extras/rpms/sbcl/devel/sbcl.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- sbcl.spec 27 Sep 2005 18:54:20 -0000 1.17 +++ sbcl.spec 27 Sep 2005 19:09:05 -0000 1.18 @@ -10,7 +10,7 @@ Name: sbcl Summary: Steel Bank Common Lisp Version: 0.9.5 -Release: 3%{?dist} +Release: 4%{?dist} License: BSD/MIT Group: Development/Languages @@ -113,8 +113,9 @@ %define my_setarch ./my_setarch %endif -# setting SBCL_ARCH couldn't hurt, esp for ppc, might avoid the need for the setarch call +%ifarch ppc export SBCL_ARCH=%{_target_cpu} +%endif %{?setarch} %{?my_setarch} ./make.sh %{?bootstrap} # docs @@ -172,7 +173,7 @@ %changelog -* Tue Sep 27 2005 Rex Dieter 0.9.5-3 +* Tue Sep 27 2005 Rex Dieter 0.9.5-4 - ppc needs SBCL_ARCH and(or?) setarch * Tue Sep 27 2005 Rex Dieter 0.9.5-2 From fedora-extras-commits at redhat.com Tue Sep 27 19:12:23 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Tue, 27 Sep 2005 15:12:23 -0400 Subject: rpms/sbcl/devel sbcl.spec,1.18,1.19 Message-ID: <200509271912.j8RJCNJ7001763@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/sbcl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1744 Modified Files: sbcl.spec Log Message: cleanup sbcl_arch handling, with x86_64 exception Index: sbcl.spec =================================================================== RCS file: /cvs/extras/rpms/sbcl/devel/sbcl.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- sbcl.spec 27 Sep 2005 19:09:05 -0000 1.18 +++ sbcl.spec 27 Sep 2005 19:12:21 -0000 1.19 @@ -19,6 +19,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) ExclusiveArch: %{ix86} x86_64 ppc +%define sbcl_arch %{_target_cpu} + %if "%{?sbcl_bootstrap}" == "%{nil}" # local Bootstrap binaries #Source10: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.4-x86-linux-binary.tar.bz2 @@ -28,6 +30,7 @@ %endif #Source20: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.4-x86-64-linux-binary.tar.bz2 %ifarch x86_64 +%define sbcl_arch x86-64 %define sbcl_bootstrap sbcl #define sbcl_bootstrap_src -a 20 %endif @@ -113,9 +116,7 @@ %define my_setarch ./my_setarch %endif -%ifarch ppc -export SBCL_ARCH=%{_target_cpu} -%endif +%{?sbcl_arch:export SBCL_ARCH=%{sbcl_arch}} %{?setarch} %{?my_setarch} ./make.sh %{?bootstrap} # docs From fedora-extras-commits at redhat.com Tue Sep 27 19:31:53 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Tue, 27 Sep 2005 15:31:53 -0400 Subject: rpms/sbcl/devel sbcl.spec,1.19,1.20 Message-ID: <200509271932.j8RJWNgJ001864@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/sbcl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1843 Modified Files: sbcl.spec Log Message: cleanup/allow-for arch-specific build options Index: sbcl.spec =================================================================== RCS file: /cvs/extras/rpms/sbcl/devel/sbcl.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- sbcl.spec 27 Sep 2005 19:12:21 -0000 1.19 +++ sbcl.spec 27 Sep 2005 19:31:50 -0000 1.20 @@ -1,16 +1,9 @@ # $Id$ -## Default to using a local bootstrap, -## define one of the following to override -## (non sbcl bootstraps untested) -#define sbcl_bootstrap sbcl -#define sbcl_bootstrap cmucl -#define sbcl_bootstrap clisp - Name: sbcl Summary: Steel Bank Common Lisp Version: 0.9.5 -Release: 4%{?dist} +Release: 5%{?dist} License: BSD/MIT Group: Development/Languages @@ -19,32 +12,33 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) ExclusiveArch: %{ix86} x86_64 ppc -%define sbcl_arch %{_target_cpu} - -%if "%{?sbcl_bootstrap}" == "%{nil}" -# local Bootstrap binaries +## x86 section #Source10: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.4-x86-linux-binary.tar.bz2 %ifarch %{ix86} -%define sbcl_bootstrap sbcl +%define sbcl_arch x86 +BuildRequires: sbcl #define sbcl_bootstrap_src -a 10 %endif + +## x86_64 section #Source20: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.4-x86-64-linux-binary.tar.bz2 %ifarch x86_64 %define sbcl_arch x86-64 -%define sbcl_bootstrap sbcl +BuildRequires: sbcl #define sbcl_bootstrap_src -a 20 %endif + +## ppc section # Latest powerpc-linux bootstrap, busted: # buildsys.fedoraproject.org/logs/development/1131-sbcl-0.9.4-14.fc5/ppc/build.log Source30: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.8.15-powerpc-linux-binary.tar.bz2 # another possible ppc bootstrap to try #Source31: http://clozure.com/openmcl/ftp/openmcl-linuxppc-all-0.14.3.tar.gz %ifarch ppc +%define sbcl_arch ppc +%define sbcl_bootstrap_src -a 30 BuildRequires: setarch %define setarch setarch %{_target_cpu} -%undefine sbcl_bootstrap -%define sbcl_bootstrap_src -a 30 -%endif %endif Source100: my_setarch.c @@ -54,9 +48,6 @@ Patch3: sbcl-0.9.4-optflags.patch Patch4: sbcl-0.9.4-LIB_DIR.patch -BuildRequires: setarch -%{?sbcl_bootstrap:BuildRequires: %{?sbcl_bootstrap}} - Requires(post): /sbin/install-info Requires(preun): /sbin/install-info # doc generation @@ -90,7 +81,7 @@ %endif #endif -%if "%{?sbcl_bootstrap}" == "%{nil}" +%if "%{?sbcl_bootstrap_src}" != "%{nil}" mkdir sbcl-bootstrap pushd sbcl-*-linux chmod +x install.sh @@ -108,7 +99,7 @@ %build export DEFAULT_SBCL_HOME=%{_libdir}/sbcl -%if "%{?sbcl_bootstrap}" == "%{nil}" +%if "%{?sbcl_bootstrap_src}" != "%{nil}" export SBCL_HOME=`pwd`/sbcl-bootstrap/lib/sbcl export PATH=`pwd`/sbcl-bootstrap/bin:${PATH} @@ -174,8 +165,9 @@ %changelog -* Tue Sep 27 2005 Rex Dieter 0.9.5-4 -- ppc needs SBCL_ARCH and(or?) setarch +* Tue Sep 27 2005 Rex Dieter 0.9.5-5 +- set/use SBCL_ARCH/setarch (esp on ppc) +- allow arch-specific build-options * Tue Sep 27 2005 Rex Dieter 0.9.5-2 - 0.9.5 From fedora-extras-commits at redhat.com Tue Sep 27 20:07:30 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Tue, 27 Sep 2005 16:07:30 -0400 Subject: rpms/sbcl/devel sbcl-0.9.5-optflags.patch, NONE, 1.1 sbcl.spec, 1.20, 1.21 sbcl-0.9.4-optflags.patch, 1.1, NONE Message-ID: <200509272008.j8RK83ZB003392@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/sbcl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3367 Modified Files: sbcl.spec Added Files: sbcl-0.9.5-optflags.patch Removed Files: sbcl-0.9.4-optflags.patch Log Message: * Tue Sep 27 2005 Rex Dieter 0.9.5-6 - drop ppc - cleaner optflags patch sbcl-0.9.5-optflags.patch: --- NEW FILE sbcl-0.9.5-optflags.patch --- --- sbcl-0.9.5/src/runtime/Config.ppc-linux.optflags 2005-09-21 10:01:15.000000000 -0500 +++ sbcl-0.9.5/src/runtime/Config.ppc-linux 2005-09-27 15:03:06.295658344 -0500 @@ -9,7 +9,7 @@ # provided with absolutely no warranty. See the COPYING and CREDITS # files for more information. -CFLAGS = -g +CFLAGS += $(RPM_OPT_FLAGS) LINKFLAGS += -v -rdynamic NM = ./linux-nm --- sbcl-0.9.5/src/runtime/Config.x86_64-linux.optflags 2005-09-21 10:01:15.000000000 -0500 +++ sbcl-0.9.5/src/runtime/Config.x86_64-linux 2005-09-27 15:04:31.690676328 -0500 @@ -34,7 +34,7 @@ > /dev/null 2>&1; \ then echo "-lpthread"; fi) -CFLAGS += -fno-omit-frame-pointer +CFLAGS += -fno-omit-frame-pointer $(RPM_OPT_FLAGS) GC_SRC = gencgc.c --- sbcl-0.9.5/src/runtime/Config.x86-linux.optflags 2005-09-21 10:01:15.000000000 -0500 +++ sbcl-0.9.5/src/runtime/Config.x86-linux 2005-09-27 15:05:03.562831024 -0500 @@ -34,6 +34,8 @@ > /dev/null 2>&1; \ then echo "-lpthread"; fi) +CFLAGS += $(RPM_OPT_FLAGS) + GC_SRC = gencgc.c # Nothing to do for after-grovel-headers. Index: sbcl.spec =================================================================== RCS file: /cvs/extras/rpms/sbcl/devel/sbcl.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- sbcl.spec 27 Sep 2005 19:31:50 -0000 1.20 +++ sbcl.spec 27 Sep 2005 20:07:27 -0000 1.21 @@ -3,14 +3,14 @@ Name: sbcl Summary: Steel Bank Common Lisp Version: 0.9.5 -Release: 5%{?dist} +Release: 6%{?dist} License: BSD/MIT Group: Development/Languages URL: http://sbcl.sourceforge.net/ Source0: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-%{version}-source.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -ExclusiveArch: %{ix86} x86_64 ppc +ExclusiveArch: %{ix86} x86_64 ## x86 section #Source10: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.4-x86-linux-binary.tar.bz2 @@ -45,7 +45,7 @@ Patch1: sbcl-0.8.18-default-sbcl-home.patch Patch2: sbcl-0.9.5-personality.patch -Patch3: sbcl-0.9.4-optflags.patch +Patch3: sbcl-0.9.5-optflags.patch Patch4: sbcl-0.9.4-LIB_DIR.patch Requires(post): /sbin/install-info @@ -116,7 +116,7 @@ %check || : pushd tests -sh ./run-tests.sh +%{?setarch} sh ./run-tests.sh popd @@ -165,6 +165,10 @@ %changelog +* Tue Sep 27 2005 Rex Dieter 0.9.5-6 +- drop ppc +- cleaner optflags patch + * Tue Sep 27 2005 Rex Dieter 0.9.5-5 - set/use SBCL_ARCH/setarch (esp on ppc) - allow arch-specific build-options --- sbcl-0.9.4-optflags.patch DELETED --- From fedora-extras-commits at redhat.com Tue Sep 27 20:10:06 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Tue, 27 Sep 2005 16:10:06 -0400 Subject: rpms/sbcl/devel sbcl.spec,1.21,1.22 Message-ID: <200509272010.j8RKA6PE003465@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/sbcl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3445 Modified Files: sbcl.spec Log Message: Since we're omitting ppc, omit the ppc bootstrap source too (for now) Index: sbcl.spec =================================================================== RCS file: /cvs/extras/rpms/sbcl/devel/sbcl.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- sbcl.spec 27 Sep 2005 20:07:27 -0000 1.21 +++ sbcl.spec 27 Sep 2005 20:10:04 -0000 1.22 @@ -3,7 +3,7 @@ Name: sbcl Summary: Steel Bank Common Lisp Version: 0.9.5 -Release: 6%{?dist} +Release: 7%{?dist} License: BSD/MIT Group: Development/Languages @@ -31,7 +31,7 @@ ## ppc section # Latest powerpc-linux bootstrap, busted: # buildsys.fedoraproject.org/logs/development/1131-sbcl-0.9.4-14.fc5/ppc/build.log -Source30: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.8.15-powerpc-linux-binary.tar.bz2 +#Source30: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.8.15-powerpc-linux-binary.tar.bz2 # another possible ppc bootstrap to try #Source31: http://clozure.com/openmcl/ftp/openmcl-linuxppc-all-0.14.3.tar.gz %ifarch ppc @@ -165,7 +165,7 @@ %changelog -* Tue Sep 27 2005 Rex Dieter 0.9.5-6 +* Tue Sep 27 2005 Rex Dieter 0.9.5-7 - drop ppc - cleaner optflags patch From fedora-extras-commits at redhat.com Tue Sep 27 20:19:34 2005 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Tue, 27 Sep 2005 16:19:34 -0400 Subject: owners owners.list,1.262,1.263 Message-ID: <200509272019.j8RKJYWk003585@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3566 Modified Files: owners.list Log Message: Take ownership of SDL_* orphaned packages Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.262 retrieving revision 1.263 diff -u -r1.262 -r1.263 --- owners.list 27 Sep 2005 17:57:57 -0000 1.262 +++ owners.list 27 Sep 2005 20:19:32 -0000 1.263 @@ -933,9 +933,9 @@ Fedora Extras|scribus-templates|This package includes additional templates for Scribus|compton at pcompton.com|extras-qa at fedoraproject.org| Fedora Extras|scrub|Disk scrubbing program|tcallawa at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|SDL_gfx|Graphic primitives, rotozoomer, framerate control and image filters|matthias at rpmforge.net|extras-qa at fedoraproject.org| -Fedora Extras|SDL_image|A sample image loading library for SDL.|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| -Fedora Extras|SDL_mixer|Simple DirectMedia Layer - Sample Mixer Library|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| -Fedora Extras|SDL_net|SDL portable network library|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| +Fedora Extras|SDL_image|A sample image loading library for SDL.|bdpepple at ameritech.net|extras-qa at fedoraproject.org| +Fedora Extras|SDL_mixer|Simple DirectMedia Layer - Sample Mixer Library|bdpepple at ameritech.net|extras-qa at fedoraproject.org| +Fedora Extras|SDL_net|SDL portable network library|bdpepple at ameritech.net|extras-qa at fedoraproject.org| Fedora Extras|SDL_ttf|Simple DirectMedia Layer - Sample TrueType Font Library|pmatilai at laiskiainen.org|extras-qa at fedoraproject.org| Fedora Extras|seahorse|GNOME2 interface for gnupg|skvidal at phy.duke.edu|extras-qa at fedoraproject.org| Fedora Extras|shapelib|API in "C" for Shapefile handling|mccann0011 at hotmail.com|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Tue Sep 27 20:44:51 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Tue, 27 Sep 2005 16:44:51 -0400 Subject: rpms/sbcl/FC-3 sbcl-0.9.5-optflags.patch, NONE, 1.1 sbcl-0.9.5-personality.patch, NONE, 1.1 sbcl.spec, 1.14, 1.15 sbcl-0.9.4-optflags.patch, 1.1, NONE sbcl-0.9.4-personality.patch, 1.1, NONE Message-ID: <200509272045.j8RKjM16003728@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/sbcl/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3678/FC-3 Modified Files: sbcl.spec Added Files: sbcl-0.9.5-optflags.patch sbcl-0.9.5-personality.patch Removed Files: sbcl-0.9.4-optflags.patch sbcl-0.9.4-personality.patch Log Message: * Tue Sep 27 2005 Rex Dieter 0.9.5-7 - drop ppc - cleaner optflags patch * Tue Sep 27 2005 Rex Dieter 0.9.5-5 - set/use SBCL_ARCH/setarch (esp on ppc) - allow arch-specific build-options * Tue Sep 27 2005 Rex Dieter 0.9.5-2 - 0.9.5 - use native sbcl bootstraps, when available (ie, %%{ix86},x86_64) - try ppc again sbcl-0.9.5-optflags.patch: --- NEW FILE sbcl-0.9.5-optflags.patch --- --- sbcl-0.9.5/src/runtime/Config.ppc-linux.optflags 2005-09-21 10:01:15.000000000 -0500 +++ sbcl-0.9.5/src/runtime/Config.ppc-linux 2005-09-27 15:03:06.295658344 -0500 @@ -9,7 +9,7 @@ # provided with absolutely no warranty. See the COPYING and CREDITS # files for more information. -CFLAGS = -g +CFLAGS += $(RPM_OPT_FLAGS) LINKFLAGS += -v -rdynamic NM = ./linux-nm --- sbcl-0.9.5/src/runtime/Config.x86_64-linux.optflags 2005-09-21 10:01:15.000000000 -0500 +++ sbcl-0.9.5/src/runtime/Config.x86_64-linux 2005-09-27 15:04:31.690676328 -0500 @@ -34,7 +34,7 @@ > /dev/null 2>&1; \ then echo "-lpthread"; fi) -CFLAGS += -fno-omit-frame-pointer +CFLAGS += -fno-omit-frame-pointer $(RPM_OPT_FLAGS) GC_SRC = gencgc.c --- sbcl-0.9.5/src/runtime/Config.x86-linux.optflags 2005-09-21 10:01:15.000000000 -0500 +++ sbcl-0.9.5/src/runtime/Config.x86-linux 2005-09-27 15:05:03.562831024 -0500 @@ -34,6 +34,8 @@ > /dev/null 2>&1; \ then echo "-lpthread"; fi) +CFLAGS += $(RPM_OPT_FLAGS) + GC_SRC = gencgc.c # Nothing to do for after-grovel-headers. sbcl-0.9.5-personality.patch: --- NEW FILE sbcl-0.9.5-personality.patch --- --- sbcl-0.9.5/src/runtime/linux-os.c.pers 2005-09-24 09:29:54.000000000 -0500 +++ sbcl-0.9.5/src/runtime/linux-os.c 2005-09-27 09:37:33.463478519 -0500 @@ -177,6 +177,10 @@ if (i != -1) { runtime[i] = '\0'; execve(runtime, argv, envp); + } else { + /* if /proc isn't available (like in chroot builds, like mock), + * try using execvp with argv[0] instead */ + execvp(argv[0], argv); } } /* Either changing the personality or execve() failed. Either Index: sbcl.spec =================================================================== RCS file: /cvs/extras/rpms/sbcl/FC-3/sbcl.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- sbcl.spec 22 Sep 2005 14:10:52 -0000 1.14 +++ sbcl.spec 27 Sep 2005 20:44:49 -0000 1.15 @@ -1,16 +1,9 @@ # $Id$ -## Default to using a local bootstrap, -## define one of the following to override -## (non sbcl bootstraps untested) -#define sbcl_bootstrap sbcl -#define sbcl_bootstrap cmucl -#define sbcl_bootstrap clisp - Name: sbcl Summary: Steel Bank Common Lisp -Version: 0.9.4 -Release: 19%{?dist} +Version: 0.9.5 +Release: 7%{?dist} License: BSD/MIT Group: Development/Languages @@ -19,32 +12,42 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) ExclusiveArch: %{ix86} x86_64 -%if "%{?sbcl_bootstrap}" == "%{nil}" -# local Bootstrap binaries -Source10: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-%{version}-x86-linux-binary.tar.bz2 +## x86 section +#Source10: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.4-x86-linux-binary.tar.bz2 %ifarch %{ix86} -%define sbcl_bootstrap_src -a 10 +%define sbcl_arch x86 +BuildRequires: sbcl +#define sbcl_bootstrap_src -a 10 %endif -Source11: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-%{version}-x86-64-linux-binary.tar.bz2 + +## x86_64 section +#Source20: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.4-x86-64-linux-binary.tar.bz2 %ifarch x86_64 -%define sbcl_bootstrap_src -a 11 +%define sbcl_arch x86-64 +BuildRequires: sbcl +#define sbcl_bootstrap_src -a 20 %endif -# Latest powerpc-linux bootstrap (untested) -Source12: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.8.15-powerpc-linux-binary.tar.bz2 + +## ppc section +# Latest powerpc-linux bootstrap, busted: +# buildsys.fedoraproject.org/logs/development/1131-sbcl-0.9.4-14.fc5/ppc/build.log +#Source30: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.8.15-powerpc-linux-binary.tar.bz2 +# another possible ppc bootstrap to try +#Source31: http://clozure.com/openmcl/ftp/openmcl-linuxppc-all-0.14.3.tar.gz %ifarch ppc -%define sbcl_bootstrap_src -a 12 -%endif +%define sbcl_arch ppc +%define sbcl_bootstrap_src -a 30 +BuildRequires: setarch +%define setarch setarch %{_target_cpu} %endif Source100: my_setarch.c Patch1: sbcl-0.8.18-default-sbcl-home.patch -Patch2: sbcl-0.9.4-personality.patch -Patch3: sbcl-0.9.4-optflags.patch +Patch2: sbcl-0.9.5-personality.patch +Patch3: sbcl-0.9.5-optflags.patch Patch4: sbcl-0.9.4-LIB_DIR.patch -%{?sbcl_bootstrap:BuildRequires: %{?sbcl_bootstrap}} - Requires(post): /sbin/install-info Requires(preun): /sbin/install-info # doc generation @@ -78,7 +81,7 @@ %endif #endif -%if "%{?sbcl_bootstrap}" == "%{nil}" +%if "%{?sbcl_bootstrap_src}" != "%{nil}" mkdir sbcl-bootstrap pushd sbcl-*-linux chmod +x install.sh @@ -96,15 +99,16 @@ %build export DEFAULT_SBCL_HOME=%{_libdir}/sbcl -%if "%{?sbcl_bootstrap}" == "%{nil}" +%if "%{?sbcl_bootstrap_src}" != "%{nil}" export SBCL_HOME=`pwd`/sbcl-bootstrap/lib/sbcl export PATH=`pwd`/sbcl-bootstrap/bin:${PATH} %{__cc} -o my_setarch %{optflags} %{SOURCE100} -%define setarch ./my_setarch +%define my_setarch ./my_setarch %endif -%{?setarch} ./make.sh %{?bootstrap} +%{?sbcl_arch:export SBCL_ARCH=%{sbcl_arch}} +%{?setarch} %{?my_setarch} ./make.sh %{?bootstrap} # docs make -C doc/manual html info @@ -112,7 +116,7 @@ %check || : pushd tests -sh ./run-tests.sh +%{?setarch} sh ./run-tests.sh popd @@ -161,6 +165,19 @@ %changelog +* Tue Sep 27 2005 Rex Dieter 0.9.5-7 +- drop ppc +- cleaner optflags patch + +* Tue Sep 27 2005 Rex Dieter 0.9.5-5 +- set/use SBCL_ARCH/setarch (esp on ppc) +- allow arch-specific build-options + +* Tue Sep 27 2005 Rex Dieter 0.9.5-2 +- 0.9.5 +- use native sbcl bootstraps, when available (ie, %%{ix86},x86_64) +- try ppc again + * Thu Sep 22 2005 Rex Dieter 0.9.4-19 - drop use of setarch, use my_setarch.c --- sbcl-0.9.4-optflags.patch DELETED --- --- sbcl-0.9.4-personality.patch DELETED --- From fedora-extras-commits at redhat.com Tue Sep 27 20:44:52 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Tue, 27 Sep 2005 16:44:52 -0400 Subject: rpms/sbcl/FC-4 sbcl-0.9.5-optflags.patch, NONE, 1.1 sbcl-0.9.5-personality.patch, NONE, 1.1 sbcl.spec, 1.14, 1.15 sbcl-0.9.4-optflags.patch, 1.1, NONE sbcl-0.9.4-personality.patch, 1.1, NONE Message-ID: <200509272045.j8RKjNT8003731@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/sbcl/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3678/FC-4 Modified Files: sbcl.spec Added Files: sbcl-0.9.5-optflags.patch sbcl-0.9.5-personality.patch Removed Files: sbcl-0.9.4-optflags.patch sbcl-0.9.4-personality.patch Log Message: * Tue Sep 27 2005 Rex Dieter 0.9.5-7 - drop ppc - cleaner optflags patch * Tue Sep 27 2005 Rex Dieter 0.9.5-5 - set/use SBCL_ARCH/setarch (esp on ppc) - allow arch-specific build-options * Tue Sep 27 2005 Rex Dieter 0.9.5-2 - 0.9.5 - use native sbcl bootstraps, when available (ie, %%{ix86},x86_64) - try ppc again sbcl-0.9.5-optflags.patch: --- NEW FILE sbcl-0.9.5-optflags.patch --- --- sbcl-0.9.5/src/runtime/Config.ppc-linux.optflags 2005-09-21 10:01:15.000000000 -0500 +++ sbcl-0.9.5/src/runtime/Config.ppc-linux 2005-09-27 15:03:06.295658344 -0500 @@ -9,7 +9,7 @@ # provided with absolutely no warranty. See the COPYING and CREDITS # files for more information. -CFLAGS = -g +CFLAGS += $(RPM_OPT_FLAGS) LINKFLAGS += -v -rdynamic NM = ./linux-nm --- sbcl-0.9.5/src/runtime/Config.x86_64-linux.optflags 2005-09-21 10:01:15.000000000 -0500 +++ sbcl-0.9.5/src/runtime/Config.x86_64-linux 2005-09-27 15:04:31.690676328 -0500 @@ -34,7 +34,7 @@ > /dev/null 2>&1; \ then echo "-lpthread"; fi) -CFLAGS += -fno-omit-frame-pointer +CFLAGS += -fno-omit-frame-pointer $(RPM_OPT_FLAGS) GC_SRC = gencgc.c --- sbcl-0.9.5/src/runtime/Config.x86-linux.optflags 2005-09-21 10:01:15.000000000 -0500 +++ sbcl-0.9.5/src/runtime/Config.x86-linux 2005-09-27 15:05:03.562831024 -0500 @@ -34,6 +34,8 @@ > /dev/null 2>&1; \ then echo "-lpthread"; fi) +CFLAGS += $(RPM_OPT_FLAGS) + GC_SRC = gencgc.c # Nothing to do for after-grovel-headers. sbcl-0.9.5-personality.patch: --- NEW FILE sbcl-0.9.5-personality.patch --- --- sbcl-0.9.5/src/runtime/linux-os.c.pers 2005-09-24 09:29:54.000000000 -0500 +++ sbcl-0.9.5/src/runtime/linux-os.c 2005-09-27 09:37:33.463478519 -0500 @@ -177,6 +177,10 @@ if (i != -1) { runtime[i] = '\0'; execve(runtime, argv, envp); + } else { + /* if /proc isn't available (like in chroot builds, like mock), + * try using execvp with argv[0] instead */ + execvp(argv[0], argv); } } /* Either changing the personality or execve() failed. Either Index: sbcl.spec =================================================================== RCS file: /cvs/extras/rpms/sbcl/FC-4/sbcl.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- sbcl.spec 22 Sep 2005 14:10:11 -0000 1.14 +++ sbcl.spec 27 Sep 2005 20:44:50 -0000 1.15 @@ -1,16 +1,9 @@ # $Id$ -## Default to using a local bootstrap, -## define one of the following to override -## (non sbcl bootstraps untested) -#define sbcl_bootstrap sbcl -#define sbcl_bootstrap cmucl -#define sbcl_bootstrap clisp - Name: sbcl Summary: Steel Bank Common Lisp -Version: 0.9.4 -Release: 19%{?dist} +Version: 0.9.5 +Release: 7%{?dist} License: BSD/MIT Group: Development/Languages @@ -19,32 +12,42 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) ExclusiveArch: %{ix86} x86_64 -%if "%{?sbcl_bootstrap}" == "%{nil}" -# local Bootstrap binaries -Source10: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-%{version}-x86-linux-binary.tar.bz2 +## x86 section +#Source10: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.4-x86-linux-binary.tar.bz2 %ifarch %{ix86} -%define sbcl_bootstrap_src -a 10 +%define sbcl_arch x86 +BuildRequires: sbcl +#define sbcl_bootstrap_src -a 10 %endif -Source11: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-%{version}-x86-64-linux-binary.tar.bz2 + +## x86_64 section +#Source20: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.4-x86-64-linux-binary.tar.bz2 %ifarch x86_64 -%define sbcl_bootstrap_src -a 11 +%define sbcl_arch x86-64 +BuildRequires: sbcl +#define sbcl_bootstrap_src -a 20 %endif -# Latest powerpc-linux bootstrap (untested) -Source12: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.8.15-powerpc-linux-binary.tar.bz2 + +## ppc section +# Latest powerpc-linux bootstrap, busted: +# buildsys.fedoraproject.org/logs/development/1131-sbcl-0.9.4-14.fc5/ppc/build.log +#Source30: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.8.15-powerpc-linux-binary.tar.bz2 +# another possible ppc bootstrap to try +#Source31: http://clozure.com/openmcl/ftp/openmcl-linuxppc-all-0.14.3.tar.gz %ifarch ppc -%define sbcl_bootstrap_src -a 12 -%endif +%define sbcl_arch ppc +%define sbcl_bootstrap_src -a 30 +BuildRequires: setarch +%define setarch setarch %{_target_cpu} %endif Source100: my_setarch.c Patch1: sbcl-0.8.18-default-sbcl-home.patch -Patch2: sbcl-0.9.4-personality.patch -Patch3: sbcl-0.9.4-optflags.patch +Patch2: sbcl-0.9.5-personality.patch +Patch3: sbcl-0.9.5-optflags.patch Patch4: sbcl-0.9.4-LIB_DIR.patch -%{?sbcl_bootstrap:BuildRequires: %{?sbcl_bootstrap}} - Requires(post): /sbin/install-info Requires(preun): /sbin/install-info # doc generation @@ -78,7 +81,7 @@ %endif #endif -%if "%{?sbcl_bootstrap}" == "%{nil}" +%if "%{?sbcl_bootstrap_src}" != "%{nil}" mkdir sbcl-bootstrap pushd sbcl-*-linux chmod +x install.sh @@ -96,15 +99,16 @@ %build export DEFAULT_SBCL_HOME=%{_libdir}/sbcl -%if "%{?sbcl_bootstrap}" == "%{nil}" +%if "%{?sbcl_bootstrap_src}" != "%{nil}" export SBCL_HOME=`pwd`/sbcl-bootstrap/lib/sbcl export PATH=`pwd`/sbcl-bootstrap/bin:${PATH} %{__cc} -o my_setarch %{optflags} %{SOURCE100} -%define setarch ./my_setarch +%define my_setarch ./my_setarch %endif -%{?setarch} ./make.sh %{?bootstrap} +%{?sbcl_arch:export SBCL_ARCH=%{sbcl_arch}} +%{?setarch} %{?my_setarch} ./make.sh %{?bootstrap} # docs make -C doc/manual html info @@ -112,7 +116,7 @@ %check || : pushd tests -sh ./run-tests.sh +%{?setarch} sh ./run-tests.sh popd @@ -161,6 +165,19 @@ %changelog +* Tue Sep 27 2005 Rex Dieter 0.9.5-7 +- drop ppc +- cleaner optflags patch + +* Tue Sep 27 2005 Rex Dieter 0.9.5-5 +- set/use SBCL_ARCH/setarch (esp on ppc) +- allow arch-specific build-options + +* Tue Sep 27 2005 Rex Dieter 0.9.5-2 +- 0.9.5 +- use native sbcl bootstraps, when available (ie, %%{ix86},x86_64) +- try ppc again + * Thu Sep 22 2005 Rex Dieter 0.9.4-19 - drop use of setarch, use my_setarch.c --- sbcl-0.9.4-optflags.patch DELETED --- --- sbcl-0.9.4-personality.patch DELETED --- From fedora-extras-commits at redhat.com Tue Sep 27 20:47:30 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Tue, 27 Sep 2005 16:47:30 -0400 Subject: rpms/centericq/FC-4 .cvsignore, 1.3, 1.4 centericq.spec, 1.17, 1.18 sources, 1.3, 1.4 Message-ID: <200509272048.j8RKm07J003856@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/centericq/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3814/FC-4 Modified Files: .cvsignore centericq.spec sources Log Message: - version upgrade Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/centericq/FC-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 13 Feb 2005 11:43:46 -0000 1.3 +++ .cvsignore 27 Sep 2005 20:47:28 -0000 1.4 @@ -1 +1 @@ -centericq-4.20.0.tar.bz2 +centericq-4.21.0.tar.bz2 Index: centericq.spec =================================================================== RCS file: /cvs/extras/rpms/centericq/FC-4/centericq.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- centericq.spec 30 May 2005 08:24:38 -0000 1.17 +++ centericq.spec 27 Sep 2005 20:47:28 -0000 1.18 @@ -1,13 +1,13 @@ Name: centericq -Version: 4.20.0 -Release: 10 +Version: 4.21.0 +Release: 1%{?dist} Summary: Text mode menu- and window-driven IM Group: Applications/Internet License: GPL URL: http://konst.org.ua/centericq/ -Source0: http://konst.org.ua/download/centericq-4.20.0.tar.bz2 +Source0: http://konst.org.ua/download/centericq-4.21.0.tar.bz2 Patch0: centericq-libyahoo.patch Patch1: centericq-kkconsui.patch Patch2: centericq-kkstrtext.patch @@ -33,8 +33,8 @@ %patch3 %build -CFLAGS="-I/usr/include/openssl -I/usr/kerberos/include -I/usr/include ${RPM_OPT_FLAGS}" \ -%configure --with-ssl +CFLAGS="$RPM_OPT_FLAGS" \ +./configure --with-ssl %{__make} %{?_smp_flags} @@ -60,6 +60,10 @@ %{_mandir}/man1/* %changelog +* Tue Sep 27 2005 Andreas Bierfert +4.21.0-1 +- version upgrade (#168425) + * Mon May 30 2005 Andreas Bierfert 4.20.0-10 - cleanup the x86_64 build fixes... Index: sources =================================================================== RCS file: /cvs/extras/rpms/centericq/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 13 Feb 2005 11:43:46 -0000 1.3 +++ sources 27 Sep 2005 20:47:28 -0000 1.4 @@ -1 +1 @@ -bbb81f87b4ecb703dec31a8092303914 centericq-4.20.0.tar.bz2 +82e426f2b4f6f2ab799c28807f36ade6 centericq-4.21.0.tar.bz2 From fedora-extras-commits at redhat.com Tue Sep 27 20:47:31 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Tue, 27 Sep 2005 16:47:31 -0400 Subject: rpms/centericq/devel .cvsignore, 1.3, 1.4 centericq.spec, 1.17, 1.18 sources, 1.3, 1.4 Message-ID: <200509272048.j8RKm17i003861@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/centericq/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3814/devel Modified Files: .cvsignore centericq.spec sources Log Message: - version upgrade Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/centericq/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 13 Feb 2005 11:43:46 -0000 1.3 +++ .cvsignore 27 Sep 2005 20:47:29 -0000 1.4 @@ -1 +1 @@ -centericq-4.20.0.tar.bz2 +centericq-4.21.0.tar.bz2 Index: centericq.spec =================================================================== RCS file: /cvs/extras/rpms/centericq/devel/centericq.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- centericq.spec 30 May 2005 08:24:38 -0000 1.17 +++ centericq.spec 27 Sep 2005 20:47:29 -0000 1.18 @@ -1,13 +1,13 @@ Name: centericq -Version: 4.20.0 -Release: 10 +Version: 4.21.0 +Release: 1%{?dist} Summary: Text mode menu- and window-driven IM Group: Applications/Internet License: GPL URL: http://konst.org.ua/centericq/ -Source0: http://konst.org.ua/download/centericq-4.20.0.tar.bz2 +Source0: http://konst.org.ua/download/centericq-4.21.0.tar.bz2 Patch0: centericq-libyahoo.patch Patch1: centericq-kkconsui.patch Patch2: centericq-kkstrtext.patch @@ -33,8 +33,8 @@ %patch3 %build -CFLAGS="-I/usr/include/openssl -I/usr/kerberos/include -I/usr/include ${RPM_OPT_FLAGS}" \ -%configure --with-ssl +CFLAGS="$RPM_OPT_FLAGS" \ +./configure --with-ssl %{__make} %{?_smp_flags} @@ -60,6 +60,10 @@ %{_mandir}/man1/* %changelog +* Tue Sep 27 2005 Andreas Bierfert +4.21.0-1 +- version upgrade (#168425) + * Mon May 30 2005 Andreas Bierfert 4.20.0-10 - cleanup the x86_64 build fixes... Index: sources =================================================================== RCS file: /cvs/extras/rpms/centericq/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 13 Feb 2005 11:43:46 -0000 1.3 +++ sources 27 Sep 2005 20:47:29 -0000 1.4 @@ -1 +1 @@ -bbb81f87b4ecb703dec31a8092303914 centericq-4.20.0.tar.bz2 +82e426f2b4f6f2ab799c28807f36ade6 centericq-4.21.0.tar.bz2 From fedora-extras-commits at redhat.com Tue Sep 27 20:52:20 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Tue, 27 Sep 2005 16:52:20 -0400 Subject: rpms/centericq/FC-3 .cvsignore, 1.3, 1.4 centericq.spec, 1.7, 1.8 sources, 1.3, 1.4 Message-ID: <200509272052.j8RKqKQ6003973@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/centericq/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3950 Modified Files: .cvsignore centericq.spec sources Log Message: - version upgrade Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/centericq/FC-3/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 13 Feb 2005 11:43:46 -0000 1.3 +++ .cvsignore 27 Sep 2005 20:52:18 -0000 1.4 @@ -1 +1 @@ -centericq-4.20.0.tar.bz2 +centericq-4.21.0.tar.bz2 Index: centericq.spec =================================================================== RCS file: /cvs/extras/rpms/centericq/FC-3/centericq.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- centericq.spec 25 Feb 2005 19:40:27 -0000 1.7 +++ centericq.spec 27 Sep 2005 20:52:18 -0000 1.8 @@ -1,12 +1,17 @@ Name: centericq -Version: 4.20.0 -Release: 1 +Version: 4.21.0 +Release: 1%{?dist} + Summary: Text mode menu- and window-driven IM -Group: Applications/Internet +Group: Applications/Internet License: GPL URL: http://konst.org.ua/centericq/ -Source0: http://konst.org.ua/download/centericq-4.20.0.tar.bz2 +Source0: http://konst.org.ua/download/centericq-4.21.0.tar.bz2 +Patch0: centericq-libyahoo.patch +Patch1: centericq-kkconsui.patch +Patch2: centericq-kkstrtext.patch +Patch3: centericq-src.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: krb5-devel @@ -14,6 +19,7 @@ BuildRequires: curl-devel BuildRequires: ncurses-devel BuildRequires: gettext +BuildRequires: gpgme-devel %description Centericq is a text mode menu- and window-driven IM interface that supports the @@ -21,10 +27,14 @@ %prep %setup -q -n %{name}-%{version} +%patch0 +%patch1 +%patch2 +%patch3 %build -CFLAGS="-I/usr/include/openssl -I/usr/kerberos/include -I/usr/include ${RPM_OPT_FLAGS}" \ -%configure --with-ssl +CFLAGS="$RPM_OPT_FLAGS" \ +./configure --with-ssl %{__make} %{?_smp_flags} @@ -50,6 +60,46 @@ %{_mandir}/man1/* %changelog +* Tue Sep 27 2005 Andreas Bierfert +4.21.0-1 +- version upgrade (#168425) + +* Mon May 30 2005 Andreas Bierfert +4.20.0-10 +- cleanup the x86_64 build fixes... + +* Sun May 29 2005 Andreas Bierfert +4.20.0-9 +- hopefully the last x86_64 build fixes... + +* Sun May 29 2005 Andreas Bierfert +4.20.0-8 +- and again more size_t fixes in src + +* Sun May 29 2005 Andreas Bierfert +4.20.0-7 +- even more size_t build fixes in kkstrtext + +* Thu May 26 2005 Andreas Bierfert +4.20.0-6 +- renew -5 buildfix and drop ifarch +- add another x86_64 buildfix + +* Thu May 26 2005 Andreas Bierfert +4.20.0-5 +- x86_64 buildfix + +* Mon May 23 2005 Andreas Bierfert +4.20.0-4 +- enable jabber encryption support via gpgme +- fix build (#156202) + +* Sun May 22 2005 Jeremy Katz - 4.20.0-3 +- rebuild on all arches + +* Fri Apr 7 2005 Michael Schwendt +- rebuilt + * Tue Feb 08 2005 Andreas Bierfert 4.20.0-1 - version upgrade Index: sources =================================================================== RCS file: /cvs/extras/rpms/centericq/FC-3/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 13 Feb 2005 11:43:46 -0000 1.3 +++ sources 27 Sep 2005 20:52:18 -0000 1.4 @@ -1 +1 @@ -bbb81f87b4ecb703dec31a8092303914 centericq-4.20.0.tar.bz2 +82e426f2b4f6f2ab799c28807f36ade6 centericq-4.21.0.tar.bz2 From fedora-extras-commits at redhat.com Tue Sep 27 20:54:45 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Tue, 27 Sep 2005 16:54:45 -0400 Subject: rpms/libpqxx/FC-4 .cvsignore, 1.2, 1.3 libpqxx.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200509272055.j8RKtFJf004064@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/libpqxx/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4020/FC-4 Modified Files: .cvsignore libpqxx.spec sources Log Message: - version upgrade Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libpqxx/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 1 Jul 2005 22:34:14 -0000 1.2 +++ .cvsignore 27 Sep 2005 20:54:43 -0000 1.3 @@ -1 +1 @@ -libpqxx-2.5.4.tar.gz +libpqxx-2.5.5.tar.gz Index: libpqxx.spec =================================================================== RCS file: /cvs/extras/rpms/libpqxx/FC-4/libpqxx.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- libpqxx.spec 5 Jul 2005 10:49:32 -0000 1.2 +++ libpqxx.spec 27 Sep 2005 20:54:43 -0000 1.3 @@ -1,12 +1,12 @@ Name: libpqxx -Version: 2.5.4 +Version: 2.5.5 Release: 4%{?dist} Summary: C++ client API for PostgreSQL Group: System Environment/Libraries License: BSD URL: http://gborg.postgresql.org/project/libpqxx/projdisplay.php -Source0: ftp://gborg.postgresql.org/pub/libpqxx/stable/libpqxx-2.5.4.tar.gz +Source0: ftp://gborg.postgresql.org/pub/libpqxx/stable/libpqxx-2.5.5.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: postgresql-devel @@ -55,7 +55,7 @@ %files %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING NEWS README TODO VERSION -%{_libdir}/libpqxx-2.5.4.so +%{_libdir}/libpqxx-2.5.5.so %files devel %doc README-UPGRADE @@ -66,6 +66,9 @@ %{_libdir}/pkgconfig/libpqxx.pc %changelog +* Tue Sep 27 2005 Andreas Bierfert 2.5.5-1 +- version upgrade + * Tue Jul 05 2005 Andreas Bierfert 2.5.4-4 - add dist tag Index: sources =================================================================== RCS file: /cvs/extras/rpms/libpqxx/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 1 Jul 2005 22:34:14 -0000 1.2 +++ sources 27 Sep 2005 20:54:43 -0000 1.3 @@ -1 +1 @@ -b0951e530dc9b35171f8ff015ab43920 libpqxx-2.5.4.tar.gz +db71975570ee31ecd0a11380dbaa8634 libpqxx-2.5.5.tar.gz From fedora-extras-commits at redhat.com Tue Sep 27 20:54:45 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Tue, 27 Sep 2005 16:54:45 -0400 Subject: rpms/libpqxx/devel .cvsignore, 1.2, 1.3 libpqxx.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200509272055.j8RKtGR6004069@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/libpqxx/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4020/devel Modified Files: .cvsignore libpqxx.spec sources Log Message: - version upgrade Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libpqxx/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 1 Jul 2005 22:34:14 -0000 1.2 +++ .cvsignore 27 Sep 2005 20:54:43 -0000 1.3 @@ -1 +1 @@ -libpqxx-2.5.4.tar.gz +libpqxx-2.5.5.tar.gz Index: libpqxx.spec =================================================================== RCS file: /cvs/extras/rpms/libpqxx/devel/libpqxx.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- libpqxx.spec 5 Jul 2005 10:50:26 -0000 1.2 +++ libpqxx.spec 27 Sep 2005 20:54:43 -0000 1.3 @@ -1,12 +1,12 @@ Name: libpqxx -Version: 2.5.4 +Version: 2.5.5 Release: 4%{?dist} Summary: C++ client API for PostgreSQL Group: System Environment/Libraries License: BSD URL: http://gborg.postgresql.org/project/libpqxx/projdisplay.php -Source0: ftp://gborg.postgresql.org/pub/libpqxx/stable/libpqxx-2.5.4.tar.gz +Source0: ftp://gborg.postgresql.org/pub/libpqxx/stable/libpqxx-2.5.5.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: postgresql-devel @@ -55,7 +55,7 @@ %files %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING NEWS README TODO VERSION -%{_libdir}/libpqxx-2.5.4.so +%{_libdir}/libpqxx-2.5.5.so %files devel %doc README-UPGRADE @@ -66,6 +66,9 @@ %{_libdir}/pkgconfig/libpqxx.pc %changelog +* Tue Sep 27 2005 Andreas Bierfert 2.5.5-1 +- version upgrade + * Tue Jul 05 2005 Andreas Bierfert 2.5.4-4 - add dist tag Index: sources =================================================================== RCS file: /cvs/extras/rpms/libpqxx/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 1 Jul 2005 22:34:14 -0000 1.2 +++ sources 27 Sep 2005 20:54:43 -0000 1.3 @@ -1 +1 @@ -b0951e530dc9b35171f8ff015ab43920 libpqxx-2.5.4.tar.gz +db71975570ee31ecd0a11380dbaa8634 libpqxx-2.5.5.tar.gz From fedora-extras-commits at redhat.com Tue Sep 27 20:59:44 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Tue, 27 Sep 2005 16:59:44 -0400 Subject: rpms/centericq/FC-3 centericq-kkconsui.patch, NONE, 1.1 centericq-kkstrtext.patch, NONE, 1.1 centericq-libyahoo.patch, NONE, 1.1 centericq-src.patch, NONE, 1.1 Message-ID: <200509272059.j8RKxiPZ004143@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/centericq/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4114 Added Files: centericq-kkconsui.patch centericq-kkstrtext.patch centericq-libyahoo.patch centericq-src.patch Log Message: - forgot about patches centericq-kkconsui.patch: --- NEW FILE centericq-kkconsui.patch --- --- kkconsui-0.1/src/texteditor.cc.orig 2005-05-30 10:07:58.000000000 +0200 +++ kkconsui-0.1/src/texteditor.cc 2005-05-30 10:09:38.000000000 +0200 @@ -1940,11 +1940,11 @@ } int texteditor::findint(void *p1, void *p2) { - return *(int *) p1 != (int) p2; + return *(intptr_t *) p1 != (intptr_t) p2; } int texteditor::findhighline(void *p1, void *p2) { - return *(int *) p1 != ((highline *) p2)->line; + return *(intptr_t *) p1 != ((highline *) p2)->line; } void texteditor::shiftmarkedblock(int delta) { centericq-kkstrtext.patch: --- NEW FILE centericq-kkstrtext.patch --- --- kkstrtext-0.1/kkstrtext.cc.orig 2005-05-29 09:23:07.000000000 +0200 +++ kkstrtext-0.1/kkstrtext.cc 2005-05-29 09:27:51.000000000 +0200 @@ -431,7 +431,7 @@ } int intcompare(void *s1, void *s2) { - return (int) s1 != (int) s2; + return (size_t) s1 != (size_t) s2; } string i2str(int i) { @@ -885,7 +885,7 @@ #ifdef HAVE_ICONV iconv_t cd = iconv_open(tocs.c_str(), fromcs.c_str()); - if(((int) cd) != -1) { + if(((size_t) cd) != -1) { string r, text(atext); size_t inleft, outleft, soutleft; char *inbuf, *outbuf, *sinbuf, *soutbuf; centericq-libyahoo.patch: --- NEW FILE centericq-libyahoo.patch --- --- libyahoo2-0.1/yahoo_util.h.orig 2005-05-23 21:07:43.000000000 +0200 +++ libyahoo2-0.1/yahoo_util.h 2005-05-23 21:30:10.000000000 +0200 @@ -68,10 +68,6 @@ int strcasecmp(const char * s1, const char * s2); //char * strdup(const char *s); - -int snprintf(char *str, size_t size, const char *format, ...); -int vsnprintf(char *str, size_t size, const char *format, va_list ap); - #endif #ifndef TRUE centericq-src.patch: --- NEW FILE centericq-src.patch --- --- src/icqdialogs.cc.orig 2005-05-30 10:16:12.000000000 +0200 +++ src/icqdialogs.cc 2005-05-30 10:18:08.000000000 +0200 @@ -894,7 +894,7 @@ i = m.open(); m.close(); - if(i) f = (unsigned short) ((int) m.getref(i-1)); + if(i) f = (unsigned short) ((intptr_t) m.getref(i-1)); } void icqface::selectlanguage(unsigned short &f) { @@ -946,7 +946,7 @@ int i = m.open(); m.close(); - if(i) f = (imgender) ((int) m.getref(i-1)); + if(i) f = (imgender) ((intptr_t) m.getref(i-1)); } void icqface::selectagerange(ICQ2000::AgeRange &r) { @@ -967,7 +967,7 @@ int i = m.open(); m.close(); - if(i) r = (ICQ2000::AgeRange) ((int) m.getref(i-1)); + if(i) r = (ICQ2000::AgeRange) ((intptr_t) m.getref(i-1)); } bool icqface::edit(string &txt, const string &header) { @@ -1254,7 +1254,7 @@ void *p; finished = !db.open(n, b, &p); - i = (int) p; + i = (intptr_t) p; if(!finished) switch(b) { @@ -1745,7 +1745,7 @@ it = transfers.end(); if(!db.gettree()->isnode(db.gettree()->getid(np-1))) - it = transfers.begin() + (int) db.getmenu()->getref(n-1); + it = transfers.begin() + (intptr_t) db.getmenu()->getref(n-1); switch(b) { case 0: --- src/icqface.cc.orig 2005-05-30 10:18:23.000000000 +0200 +++ src/icqface.cc 2005-05-30 10:22:18.000000000 +0200 @@ -392,7 +392,7 @@ m.scale(); m.idle = &menuidle; - i = (int) m.getref(m.open()-1); + i = (intptr_t) m.getref(m.open()-1); m.close(); if(i) lastr = i; @@ -441,7 +441,7 @@ if(i) { lastitem = i-1; - r = (int) m.getref(lastitem); + r = (intptr_t) m.getref(lastitem); } return r; @@ -467,7 +467,7 @@ g = 0; } - if((unsigned int) c < 100) c = 0; + if((uintptr_t)c < 100) c = 0; if(i) { switch(action = extk) { @@ -1430,7 +1430,7 @@ m.scale(); i = m.open(); - choice = (int) m.getref(i-1); + choice = (intptr_t) m.getref(i-1); m.close(); } @@ -1485,7 +1485,7 @@ m.close(); if(r = i) { - st = (imstatus) ((int) m.getref(i-1)); + st = (imstatus) ((intptr_t) m.getref(i-1)); } } @@ -2078,7 +2078,7 @@ c = (icqcontact *) cm->getref(i); } - if((unsigned int) c > 100) { + if((uintptr_t)c > 100) { string current = c->getdispnick(); len = current.size(); if(len > nick.size()) len = nick.size(); From fedora-extras-commits at redhat.com Tue Sep 27 21:21:20 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Tue, 27 Sep 2005 17:21:20 -0400 Subject: rpms/libpqxx/devel libpqxx.spec,1.3,1.4 Message-ID: <200509272121.j8RLLKfb005718@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/libpqxx/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5699 Modified Files: libpqxx.spec Log Message: - try fc5 build Index: libpqxx.spec =================================================================== RCS file: /cvs/extras/rpms/libpqxx/devel/libpqxx.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- libpqxx.spec 27 Sep 2005 20:54:43 -0000 1.3 +++ libpqxx.spec 27 Sep 2005 21:21:18 -0000 1.4 @@ -1,6 +1,6 @@ Name: libpqxx Version: 2.5.5 -Release: 4%{?dist} +Release: 5%{?dist} Summary: C++ client API for PostgreSQL Group: System Environment/Libraries @@ -32,7 +32,7 @@ %setup -q %build -%configure --enable-shared +%configure --enable-shared --disable-thread-safety # I hate rpath... ;) %{__perl} -pi -e 's/hardcode_into_libs=yes/hardcode_into_libs=no/;' \ libtool @@ -66,7 +66,10 @@ %{_libdir}/pkgconfig/libpqxx.pc %changelog -* Tue Sep 27 2005 Andreas Bierfert 2.5.5-1 +* Tue Sep 27 2005 Andreas Bierfert 2.5.5-5 +- try fc5 build + +* Tue Sep 27 2005 Andreas Bierfert 2.5.5-4 - version upgrade * Tue Jul 05 2005 Andreas Bierfert 2.5.4-4 From fedora-extras-commits at redhat.com Tue Sep 27 21:25:14 2005 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Tue, 27 Sep 2005 17:25:14 -0400 Subject: rpms/SDL_image/devel SDL_image.spec,1.5,1.6 Message-ID: <200509272125.j8RLPEu5005796@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/SDL_image/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5777 Modified Files: SDL_image.spec Log Message: * Tue Sep 27 2005 Brian Pepple - 1.2.4-4 - Bump release so it upgrades from FC4. - General spec formatting cleanup. Index: SDL_image.spec =================================================================== RCS file: /cvs/extras/rpms/SDL_image/devel/SDL_image.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- SDL_image.spec 25 Jun 2005 17:55:03 -0000 1.5 +++ SDL_image.spec 27 Sep 2005 21:25:12 -0000 1.6 @@ -1,13 +1,19 @@ -Summary: Image loading library for SDL -Name: SDL_image -Version: 1.2.4 -Release: 2%{?dist} -Source: http://www.libsdl.org/projects/SDL_image/release/%{name}-%{version}.tar.gz -URL: http://www.libsdl.org/projects/SDL_image/ -License: LGPL -Group: System Environment/Libraries -BuildRoot: %{_tmppath}/%{name}-buildroot -BuildRequires: SDL-devel >= 1.2.4-1, libjpeg-devel, libpng-devel, libtiff-devel +Name: SDL_image +Version: 1.2.4 +Release: 4%{?dist} +Summary: Image loading library for SDL + +Group: System Environment/Libraries +License: LGPL +URL: http://www.libsdl.org/projects/SDL_image/ +Source0: http://www.libsdl.org/projects/%{name}/release/%{name}-%{version}.tar.gz +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +BuildRequires: SDL-devel >= 1.2.4-1 +BuildRequires: libjpeg-devel +BuildRequires: libpng-devel +BuildRequires: libtiff-devel + %description Simple DirectMedia Layer (SDL) is a cross-platform multimedia library @@ -15,11 +21,13 @@ device. This package contains a simple library for loading images of various formats (BMP, PPM, PCX, GIF, JPEG, PNG) as SDL surfaces. + %package devel -Summary: Development files for the SDL image loading library -Group: Development/Libraries -Requires: %{name} = %{version}-%{release} -Requires: SDL-devel >= 1.2.4-1 +Summary: Development files for the SDL image loading library +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} +Requires: SDL-devel >= 1.2.4-1 + %description devel Simple DirectMedia Layer (SDL) is a cross-platform multimedia library @@ -27,44 +35,55 @@ device. This package contains the files needed for development using the SDL image loading library contained in the SDL_image package. -%prep +%prep %setup -q + %build # XCF support is crashy in 1.2.4 %configure --disable-dependency-tracking --enable-tif make %{?_smp_mflags} + %install rm -rf $RPM_BUILD_ROOT - %makeinstall mkdir -p $RPM_BUILD_ROOT%{_bindir} ./libtool --mode=install /usr/bin/install showimage $RPM_BUILD_ROOT%{_bindir} rm -f $RPM_BUILD_ROOT%{_libdir}/*.la + %clean rm -rf $RPM_BUILD_ROOT + %post -p /sbin/ldconfig + %postun -p /sbin/ldconfig + %files %defattr(-,root,root) %doc README CHANGES COPYING %{_bindir}/showimage %{_libdir}/lib*.so.* + %files devel %defattr(-,root,root) %{_libdir}/*.a %{_libdir}/lib*.so %{_includedir}/SDL/* + %changelog +* Tue Sep 27 2005 Brian Pepple - 1.2.4-4 +- Bump release so it upgrades from FC4. +- General spec formatting cleanup. + * Sat Jun 25 2005 Ville Skytt?? - 1.2.4-2 - Rebuild. From fedora-extras-commits at redhat.com Tue Sep 27 21:33:32 2005 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Tue, 27 Sep 2005 17:33:32 -0400 Subject: rpms/SDL_image/FC-4 .cvsignore, 1.2, 1.3 SDL_image.spec, 1.3, 1.4 sources, 1.2, 1.3 SDL_image-1.2.3-autofoo.patch, 1.1, NONE SDL_image-ppc64.patch, 1.1, NONE Message-ID: <200509272133.j8RLXWY5005882@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/SDL_image/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5859 Modified Files: .cvsignore SDL_image.spec sources Removed Files: SDL_image-1.2.3-autofoo.patch SDL_image-ppc64.patch Log Message: * Tue Sep 27 2005 Brian Pepple - 1.2.4-1 - Bump release so it upgrades from FC4. - General spec formatting cleanup. - 1.2.4, patches obsolete. - Bring back TIFF support (BuildRequire libtiff-devel). - Build with dependency tracking disabled. - Require exact EVR of main package in -devel. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/SDL_image/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 26 May 2005 18:02:32 -0000 1.2 +++ .cvsignore 27 Sep 2005 21:33:30 -0000 1.3 @@ -1 +1 @@ -SDL_image-1.2.3.tar.gz +SDL_image-1.2.4.tar.gz Index: SDL_image.spec =================================================================== RCS file: /cvs/extras/rpms/SDL_image/FC-4/SDL_image.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- SDL_image.spec 27 May 2005 20:04:38 -0000 1.3 +++ SDL_image.spec 27 Sep 2005 21:33:30 -0000 1.4 @@ -1,15 +1,19 @@ -Summary: A sample image loading library for SDL. -Name: SDL_image -Version: 1.2.3 -Release: 9 -Source: http://www.libsdl.org/projects/SDL_image/src/%{name}-%{version}.tar.gz -Patch: SDL_image-ppc64.patch -Patch2: SDL_image-1.2.3-autofoo.patch -URL: http://www.libsdl.org/projects/SDL_image/index.html -License: LGPL -Group: System Environment/Libraries -BuildRoot: %{_tmppath}/%{name}-buildroot -BuildRequires: SDL-devel >= 1.2.4-1, libjpeg-devel, libpng-devel +Name: SDL_image +Version: 1.2.4 +Release: 1%{?dist} +Summary: Image loading library for SDL + +Group: System Environment/Libraries +License: LGPL +URL: http://www.libsdl.org/projects/SDL_image/ +Source0: http://www.libsdl.org/projects/%{name}/release/%{name}-%{version}.tar.gz +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +BuildRequires: SDL-devel >= 1.2.4-1 +BuildRequires: libjpeg-devel +BuildRequires: libpng-devel +BuildRequires: libtiff-devel + %description Simple DirectMedia Layer (SDL) is a cross-platform multimedia library @@ -17,11 +21,13 @@ device. This package contains a simple library for loading images of various formats (BMP, PPM, PCX, GIF, JPEG, PNG) as SDL surfaces. + %package devel -Summary: Development files for the SDL image loading library. -Group: Development/Libraries -Requires: %{name} = %{version} -Requires: SDL-devel >= 1.2.3-5 +Summary: Development files for the SDL image loading library +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} +Requires: SDL-devel >= 1.2.4-1 + %description devel Simple DirectMedia Layer (SDL) is a cross-platform multimedia library @@ -29,50 +35,59 @@ device. This package contains the files needed for development using the SDL image loading library contained in the SDL_image package. -%prep +%prep %setup -q -%patch -p1 -b .ppc64 -%patch2 -p1 -b .autofoo + %build -# replaced by patch -#libtoolize --copy --force -#aclocal -#autoconf -#automake --foreign --include-deps --add-missing --force-missing --copy -a -%configure --enable-tif +# XCF support is crashy in 1.2.4 +%configure --disable-dependency-tracking --enable-tif make %{?_smp_mflags} + %install rm -rf $RPM_BUILD_ROOT - %makeinstall mkdir -p $RPM_BUILD_ROOT%{_bindir} ./libtool --mode=install /usr/bin/install showimage $RPM_BUILD_ROOT%{_bindir} rm -f $RPM_BUILD_ROOT%{_libdir}/*.la + %clean rm -rf $RPM_BUILD_ROOT + %post -p /sbin/ldconfig + %postun -p /sbin/ldconfig + %files %defattr(-,root,root) %doc README CHANGES COPYING %{_bindir}/showimage %{_libdir}/lib*.so.* + %files devel %defattr(-,root,root) %{_libdir}/*.a %{_libdir}/lib*.so %{_includedir}/SDL/* + %changelog +* Tue Sep 27 2005 Brian Pepple - 1.2.4-1 +- Bump release so it upgrades from FC4. +- General spec formatting cleanup. +- 1.2.4, patches obsolete. +- Bring back TIFF support (BuildRequire libtiff-devel). +- Build with dependency tracking disabled. +- Require exact EVR of main package in -devel. + * Thu May 26 2005 Bill Nottingham 1.2.3-9 - rebuild Index: sources =================================================================== RCS file: /cvs/extras/rpms/SDL_image/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 26 May 2005 18:02:32 -0000 1.2 +++ sources 27 Sep 2005 21:33:30 -0000 1.3 @@ -1 +1 @@ -d55826ffbd2bdc48b09cc64a9ed9e59e SDL_image-1.2.3.tar.gz +70bf617f99e51a2c94550fc79d542f0b SDL_image-1.2.4.tar.gz --- SDL_image-1.2.3-autofoo.patch DELETED --- --- SDL_image-ppc64.patch DELETED --- From fedora-extras-commits at redhat.com Tue Sep 27 21:40:59 2005 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Tue, 27 Sep 2005 17:40:59 -0400 Subject: rpms/SDL_mixer/devel SDL_mixer.spec,1.8,1.9 Message-ID: <200509272140.j8RLexL3005957@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/SDL_mixer/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5938 Modified Files: SDL_mixer.spec Log Message: * Tue Sep 27 2005 Brian Pepple - 1.2.6-3 - Cleanup up spec formatting. Index: SDL_mixer.spec =================================================================== RCS file: /cvs/extras/rpms/SDL_mixer/devel/SDL_mixer.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- SDL_mixer.spec 25 Jun 2005 16:26:32 -0000 1.8 +++ SDL_mixer.spec 27 Sep 2005 21:40:57 -0000 1.9 @@ -1,19 +1,22 @@ -Summary: Simple DirectMedia Layer - Sample Mixer Library -Name: SDL_mixer -Version: 1.2.6 -Release: 2%{?dist} -Source: http://www.libsdl.org/projects/SDL_mixer/release/%{name}-%{version}.tar.gz -Patch1: SDL_mixer-1.0.6-redhat.patch -Patch4: SDL_mixer-1.2.5-bad_code.patch -License: LGPL -Group: System Environment/Libraries -BuildRoot: %{_tmppath}/%{name}-buildroot -URL: http://www.libsdl.org/projects/SDL_mixer/ -Prefix: %{_prefix} -BuildRequires: SDL-devel >= 1.2.4-1 -BuildRequires: libvorbis-devel -BuildRequires: mikmod-devel >= 3.1.6-26 -Requires: SDL >= 1.2.4-1 +Name: SDL_mixer +Version: 1.2.6 +Release: 3%{?dist} +Summary: Simple DirectMedia Layer - Sample Mixer Library + +Group: System Environment/Libraries +License: LGPL +URL: http://www.libsdl.org/projects/SDL_mixer/ +Source0: http://www.libsdl.org/projects/%{name}/release/%{name}-%{version}.tar.gz +Patch1: SDL_mixer-1.0.6-redhat.patch +Patch4: SDL_mixer-1.2.5-bad_code.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Prefix: %{_prefix} +BuildRequires: SDL-devel >= 1.2.4-1 +BuildRequires: libvorbis-devel +BuildRequires: mikmod-devel >= 3.1.6-26 +Requires: SDL >= 1.2.4-1 + %description A simple multi-channel audio mixer for SDL. @@ -21,11 +24,13 @@ of music, mixed by the popular MikMod MOD, Timidity MIDI and Ogg Vorbis libraries. + %package devel -Summary: Libraries, includes and more to develop SDL applications using the SDL mixer -Group: Development/Libraries -Requires: %{name} = %{version}-%{release} -Requires: SDL-devel >= 1.2.4-1 +Summary: Libraries, includes and more to develop SDL applications using the SDL mixer +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} +Requires: SDL-devel >= 1.2.4-1 + %description devel Development files for SDL_mixer, a simple multi-channel audio mixer for SDL. @@ -35,15 +40,18 @@ You need SDL_mixer-devel if you want to compile an application using SDL_mixer. + %prep %setup -q %patch1 -p1 -b .redhat %patch4 -p1 -b .bad_code + %build %configure --disable-dependency-tracking make %{?_smp_mflags} + %install rm -rf $RPM_BUILD_ROOT %makeinstall @@ -52,13 +60,17 @@ ./libtool --mode=install /usr/bin/install -c playwave $RPM_BUILD_ROOT/usr/bin rm -f $RPM_BUILD_ROOT%{_libdir}/*.la + %clean rm -rf $RPM_BUILD_ROOT + %post -p /sbin/ldconfig + %postun -p /sbin/ldconfig + %files %defattr(-,root,root) %doc README CHANGES COPYING @@ -66,13 +78,18 @@ %{_bindir}/playwave %{_libdir}/lib*.so.* + %files devel %defattr(-,root,root) %{_libdir}/lib*.a %{_libdir}/lib*.so %{_includedir}/SDL + %changelog +* Tue Sep 27 2005 Brian Pepple - 1.2.6-3 +- Cleanup up spec formatting. + * Sat Jun 25 2005 Ville Skytt?? - 1.2.6-2 - Rebuild. From fedora-extras-commits at redhat.com Tue Sep 27 21:46:56 2005 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Tue, 27 Sep 2005 17:46:56 -0400 Subject: rpms/SDL_mixer/FC-4 .cvsignore, 1.2, 1.3 SDL_mixer.spec, 1.4, 1.5 sources, 1.2, 1.3 SDL_mixer-1.2.4-64bit.patch, 1.1, NONE SDL_mixer-1.2.5-autofoo.patch, 1.1, NONE SDL_mixer-ppc64.patch, 1.1, NONE Message-ID: <200509272146.j8RLkuPP006031@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/SDL_mixer/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6008 Modified Files: .cvsignore SDL_mixer.spec sources Removed Files: SDL_mixer-1.2.4-64bit.patch SDL_mixer-1.2.5-autofoo.patch SDL_mixer-ppc64.patch Log Message: * Tue Sep 27 2005 Brian Pepple - 1.2.6-1 - Cleanup up spec formatting. - 1.2.6, use system libmikmod. - Drop obsolete patches, *.la and over-eager cleanup from %clean. - Build with dependency tracking disabled. - Make -devel package require exact release of main package (this is particularly important for API changes such as in 1.2.5-9). Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/SDL_mixer/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 26 May 2005 18:04:16 -0000 1.2 +++ .cvsignore 27 Sep 2005 21:46:53 -0000 1.3 @@ -1 +1 @@ -SDL_mixer-1.2.5.tar.gz +SDL_mixer-1.2.6.tar.gz Index: SDL_mixer.spec =================================================================== RCS file: /cvs/extras/rpms/SDL_mixer/FC-4/SDL_mixer.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- SDL_mixer.spec 9 Jun 2005 21:00:54 -0000 1.4 +++ SDL_mixer.spec 27 Sep 2005 21:46:54 -0000 1.5 @@ -1,21 +1,22 @@ -Summary: Simple DirectMedia Layer - Sample Mixer Library -Name: SDL_mixer -Version: 1.2.5 -Release: 8 -Source: %{name}-%{version}.tar.gz -Patch1: SDL_mixer-1.0.6-redhat.patch -Patch2: SDL_mixer-1.2.4-64bit.patch -Patch3: SDL_mixer-ppc64.patch -Patch4: SDL_mixer-1.2.5-bad_code.patch -Patch5: SDL_mixer-1.2.5-autofoo.patch -License: LGPL -Group: System Environment/Libraries -BuildRoot: %{_tmppath}/%{name}-buildroot -URL: http://www.libsdl.org/projects/SDL_mixer/ -Prefix: %{_prefix} -BuildRequires: SDL-devel >= 1.2.4-1 -BuildRequires: libvorbis-devel -Requires: SDL >= 1.2.4-1 +Name: SDL_mixer +Version: 1.2.6 +Release: 1%{?dist} +Summary: Simple DirectMedia Layer - Sample Mixer Library + +Group: System Environment/Libraries +License: LGPL +URL: http://www.libsdl.org/projects/SDL_mixer/ +Source0: http://www.libsdl.org/projects/%{name}/release/%{name}-%{version}.tar.gz +Patch1: SDL_mixer-1.0.6-redhat.patch +Patch4: SDL_mixer-1.2.5-bad_code.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Prefix: %{_prefix} +BuildRequires: SDL-devel >= 1.2.4-1 +BuildRequires: libvorbis-devel +BuildRequires: mikmod-devel >= 3.1.6-26 +Requires: SDL >= 1.2.4-1 + %description A simple multi-channel audio mixer for SDL. @@ -23,11 +24,13 @@ of music, mixed by the popular MikMod MOD, Timidity MIDI and Ogg Vorbis libraries. + %package devel -Summary: Libraries, includes and more to develop SDL applications using the SDL mixer. -Group: Development/Libraries -Requires: %{name} = %{version} -Requires: SDL-devel >= 1.2.4-1 +Summary: Libraries, includes and more to develop SDL applications using the SDL mixer +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} +Requires: SDL-devel >= 1.2.4-1 + %description devel Development files for SDL_mixer, a simple multi-channel audio mixer for SDL. @@ -37,37 +40,37 @@ You need SDL_mixer-devel if you want to compile an application using SDL_mixer. + %prep %setup -q %patch1 -p1 -b .redhat -%patch2 -p1 -b .64bit -%patch3 -p1 -b .ppc64 %patch4 -p1 -b .bad_code -%patch5 -p1 -b .autofoo + %build -# replaced by patch -#libtoolize --copy --force -#aclocal -#autoconf -#automake --foreign --include-deps --add-missing --force-missing --copy -a -%configure +%configure --disable-dependency-tracking make %{?_smp_mflags} + %install rm -rf $RPM_BUILD_ROOT %makeinstall /usr/bin/install -d $RPM_BUILD_ROOT/usr/bin ./libtool --mode=install /usr/bin/install -c playmus $RPM_BUILD_ROOT/usr/bin ./libtool --mode=install /usr/bin/install -c playwave $RPM_BUILD_ROOT/usr/bin +rm -f $RPM_BUILD_ROOT%{_libdir}/*.la + %clean -rm -rf $RPM_BUILD_ROOT $RPM_BUILD_DIR/%{name}-%{version} +rm -rf $RPM_BUILD_ROOT + %post -p /sbin/ldconfig + %postun -p /sbin/ldconfig + %files %defattr(-,root,root) %doc README CHANGES COPYING @@ -75,14 +78,24 @@ %{_bindir}/playwave %{_libdir}/lib*.so.* + %files devel %defattr(-,root,root) -%{_libdir}/*a +%{_libdir}/lib*.a %{_libdir}/lib*.so %{_includedir}/SDL + %changelog -* Thu Jun 9 2005 Ville Skytt?? - 1.2.5-8 +* Tue Sep 27 2005 Brian Pepple - 1.2.6-1 +- Cleanup up spec formatting. +- 1.2.6, use system libmikmod. +- Drop obsolete patches, *.la and over-eager cleanup from %%clean. +- Build with dependency tracking disabled. +- Make -devel package require exact release of main package (this + is particularly important for API changes such as in 1.2.5-9). + +* Thu Jun 9 2005 Ville Skytt?? - 1.2.5-9 - Bring back Ogg support (BuildRequire libvorbis-devel). - Add SDL-devel dependency to -devel. - Improve description. Index: sources =================================================================== RCS file: /cvs/extras/rpms/SDL_mixer/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 26 May 2005 18:04:16 -0000 1.2 +++ sources 27 Sep 2005 21:46:54 -0000 1.3 @@ -1 +1 @@ -f26d4e4625f00517203e32bd06fbc5d8 SDL_mixer-1.2.5.tar.gz +2b8beffad9179d80e598c22c80efb135 SDL_mixer-1.2.6.tar.gz --- SDL_mixer-1.2.4-64bit.patch DELETED --- --- SDL_mixer-1.2.5-autofoo.patch DELETED --- --- SDL_mixer-ppc64.patch DELETED --- From fedora-extras-commits at redhat.com Tue Sep 27 21:47:02 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Tue, 27 Sep 2005 17:47:02 -0400 Subject: rpms/synce/devel synce-rra-devel.patch,NONE,1.1 synce.spec,1.7,1.8 Message-ID: <200509272147.j8RLl2Ia006055@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/synce/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6004 Modified Files: synce.spec Added Files: synce-rra-devel.patch Log Message: - workaround libmimedir problem on devel synce-rra-devel.patch: --- NEW FILE synce-rra-devel.patch --- --- synce-rra-0.9.1/configure.ac.in.orig 2005-09-27 23:40:16.000000000 +0200 +++ synce-rra-0.9.1/configure.ac.in 2005-09-27 23:40:34.000000000 +0200 @@ -48,13 +48,6 @@ ) - AC_CHECK_LIB(mimedir,mdir_parse,,[ - AC_MSG_ERROR([Can't find libmimedir (http://sourceforge.net/projects/libmimedir/)]) - ]) - AC_CHECK_HEADERS(libmimedir.h,,[ - AC_MSG_ERROR([Can't find libmimedir.h (http://sourceforge.net/projects/libmimedir/)]) - ]) - enable_recurrence=1 AC_ARG_ENABLE(recurrence, AC_HELP_STRING( --- synce-rra-0.9.1/src/Makefile.am.orig 2005-09-27 23:40:45.000000000 +0200 +++ synce-rra-0.9.1/src/Makefile.am 2005-09-27 23:41:46.000000000 +0200 @@ -1,6 +1,6 @@ ## useful flags AM_CFLAGS = -ansi @CFLAGS@ -I../lib -LDADD = -L../lib ../lib/librra.la +LDADD = -L../lib ../lib/librra.la -L../../libmimedir-0.4 -lmimedir bin_PROGRAMS = synce-matchmaker Index: synce.spec =================================================================== RCS file: /cvs/extras/rpms/synce/devel/synce.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- synce.spec 21 Aug 2005 00:39:14 -0000 1.7 +++ synce.spec 27 Sep 2005 21:47:00 -0000 1.8 @@ -1,6 +1,6 @@ Name: synce Version: 0.9.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Serial connection support for Pocket PC devices Group: Applications/Communications @@ -13,6 +13,7 @@ Source4: http://dl.sf.net/synce/synce-librapi2-%{version}.tar.gz Source5: http://dl.sf.net/synce/libmimedir-0.4.tar.gz Patch0: synce-rra-Makefile.patch +Patch1: synce-rra-devel.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: ppp @@ -39,6 +40,7 @@ %prep %setup -q -c -a 1 -a 2 -a 3 -a 4 -a 5 %patch0 +%patch1 %build # build libsynce @@ -78,6 +80,7 @@ cd .. # build rra cd synce-rra-%{version} +./bootstrap %configure \ --with-libsynce-include="${SYNCEINC}" \ --with-libsynce-lib="${SYNCELIB}" \ @@ -170,6 +173,10 @@ %{_datadir}/aclocal/*.m4 %changelog +* Tue Sep 27 2005 Andreas Bierfert +0.9.1-4 +- workaround for libmimedir problem an devel + * Sun Aug 21 2005 Andreas Bierfert 0.9.1-3 - fix dep problem From fedora-extras-commits at redhat.com Tue Sep 27 21:55:26 2005 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Tue, 27 Sep 2005 17:55:26 -0400 Subject: rpms/SDL_net/devel SDL_net.spec,1.3,1.4 Message-ID: <200509272155.j8RLtQk6006176@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/SDL_net/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6157 Modified Files: SDL_net.spec Log Message: * Tue Sep 27 2005 Brian Pepple - 1.2.5-7 - General spec formatting cleanup. - Add dist tag. Index: SDL_net.spec =================================================================== RCS file: /cvs/extras/rpms/SDL_net/devel/SDL_net.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- SDL_net.spec 9 Jun 2005 20:49:08 -0000 1.3 +++ SDL_net.spec 27 Sep 2005 21:55:24 -0000 1.4 @@ -1,26 +1,31 @@ -Summary: SDL portable network library -Name: SDL_net -Version: 1.2.5 -Release: 6 -Source0: %{name}-%{version}.tar.gz -URL: http://www.libsdl.org/projects/SDL_net/ -License: LGPL -Group: System Environment/Libraries -BuildRoot: /var/tmp/%{name}-buildroot -Requires: SDL >= 1.2.4-1 -BuildRequires: SDL-devel >= 1.2.4-1 -BuildRequires: automake autoconf libtool -Patch: SDL_net-ppc64.patch -Patch1: SDL_net-137525.patch +Name: SDL_net +Version: 1.2.5 +Release: 7%{?dist} +Summary: SDL portable network library + +Group: System Environment/Libraries +License: LGPL +URL: http://www.libsdl.org/projects/SDL_net/ +Source0: http://www.libsdl.org/projects/%{name}/release/%{name}-%{version}.tar.gz +Patch0: %{name}-ppc64.patch +Patch1: %{name}-137525.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +BuildRequires: SDL-devel >= 1.2.4-1 +BuildRequires: automake autoconf libtool +Requires: SDL >= 1.2.4-1 + %description This is a portable network library for use with SDL. + %package devel -Summary: Libraries and includes to develop SDL networked applications. -Group: Development/Libraries -Requires: %{name} = %{version}-%{release} -Requires: SDL-devel >= 1.2.4-1 +Summary: Libraries and includes to develop SDL networked applications. +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} +Requires: SDL-devel >= 1.2.4-1 + %description devel This is a portable network library for use with SDL. @@ -28,9 +33,10 @@ This is the libraries and include files you can use to develop SDL networked applications. + %prep %setup -q -%patch -p1 +%patch0 -p1 %patch1 touch NEWS AUTHORS ChangeLog # Quiet automake @@ -40,35 +46,47 @@ automake --add-missing autoconf + %build %configure --prefix=%{_prefix} make %{?_smp_mflags} + %install rm -rf $RPM_BUILD_ROOT %makeinstall rm -f $RPM_BUILD_ROOT%{_libdir}/*.la + %clean rm -rf $RPM_BUILD_ROOT + %post -p /sbin/ldconfig + %postun -p /sbin/ldconfig + %files %defattr(-,root,root) %doc README CHANGES COPYING %{_libdir}/lib*.so.* + %files devel %defattr(-,root,root) %{_libdir}/lib*.a %{_libdir}/lib*.so %{_includedir}/SDL/ + %changelog +* Tue Sep 27 2005 Brian Pepple - 1.2.5-7 +- General spec formatting cleanup. +- Add dist tag. + * Thu Jun 9 2005 Ville Skytt?? - 1.2.5-6 - Add SDL-devel dependency to -devel, remove duplicate docs. - Remove trailing semicolon from "extern C" block in SDL_net.h (#137525, Kees). From fedora-extras-commits at redhat.com Tue Sep 27 21:56:14 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Tue, 27 Sep 2005 17:56:14 -0400 Subject: rpms/koffice/devel koffice.spec,1.6,1.7 Message-ID: <200509272156.j8RLuEA4006202@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/koffice/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6150 Modified Files: koffice.spec Log Message: - try to fix devel Index: koffice.spec =================================================================== RCS file: /cvs/extras/rpms/koffice/devel/koffice.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- koffice.spec 16 Aug 2005 08:51:03 -0000 1.6 +++ koffice.spec 27 Sep 2005 21:56:12 -0000 1.7 @@ -206,7 +206,7 @@ --with-pgsqllibdir=%{_libdir} --with-pgsqlincdir=%{_includedir} \ --with-pqxxlibdir=%{_libdir} --with-pqxxincdir=%{_includedir} -make %{?_smp_mflags} +make %install rm -rf $RPM_BUILD_ROOT @@ -738,6 +738,10 @@ %{_datadir}/servicetypes/kofilter*.desktop %changelog +* Tue Sep 27 2005 Andreas Bierfert +1.4.1-5 +- try to fix devel build + * Tue Aug 16 2005 Andreas Bierfert 1.4.1-4 - fix libpqxx detection on x86_64 From fedora-extras-commits at redhat.com Tue Sep 27 21:57:05 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Tue, 27 Sep 2005 17:57:05 -0400 Subject: rpms/koffice/devel koffice.spec,1.7,1.8 Message-ID: <200509272157.j8RLv5Tj006259@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/koffice/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6240 Modified Files: koffice.spec Log Message: - bump release Index: koffice.spec =================================================================== RCS file: /cvs/extras/rpms/koffice/devel/koffice.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- koffice.spec 27 Sep 2005 21:56:12 -0000 1.7 +++ koffice.spec 27 Sep 2005 21:57:03 -0000 1.8 @@ -1,6 +1,6 @@ Name: koffice Version: 1.4.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: A free, integrated office suite for KDE Group: Applications/Productivity From fedora-extras-commits at redhat.com Tue Sep 27 21:57:41 2005 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Tue, 27 Sep 2005 17:57:41 -0400 Subject: rpms/SDL_net/FC-4 SDL_net.spec,1.3,1.4 Message-ID: <200509272157.j8RLvfDR006327@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/SDL_net/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6308 Modified Files: SDL_net.spec Log Message: * Tue Sep 27 2005 Brian Pepple - 1.2.5-6 - General spec formatting cleanup. - Add dist tag. Index: SDL_net.spec =================================================================== RCS file: /cvs/extras/rpms/SDL_net/FC-4/SDL_net.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- SDL_net.spec 9 Jun 2005 20:49:08 -0000 1.3 +++ SDL_net.spec 27 Sep 2005 21:57:39 -0000 1.4 @@ -1,26 +1,31 @@ -Summary: SDL portable network library -Name: SDL_net -Version: 1.2.5 -Release: 5 -Source0: %{name}-%{version}.tar.gz -URL: http://www.libsdl.org/projects/SDL_net/ -License: LGPL -Group: System Environment/Libraries -BuildRoot: /var/tmp/%{name}-buildroot -Requires: SDL >= 1.2.4-1 -BuildRequires: SDL-devel >= 1.2.4-1 -BuildRequires: automake autoconf libtool -Patch: SDL_net-ppc64.patch -Patch1: SDL_net-137525.patch +Name: SDL_net +Version: 1.2.5 +Release: 6%{?dist} +Summary: SDL portable network library + +Group: System Environment/Libraries +License: LGPL +URL: http://www.libsdl.org/projects/SDL_net/ +Source0: http://www.libsdl.org/projects/%{name}/release/%{name}-%{version}.tar.gz +Patch0: %{name}-ppc64.patch +Patch1: %{name}-137525.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +BuildRequires: SDL-devel >= 1.2.4-1 +BuildRequires: automake autoconf libtool +Requires: SDL >= 1.2.4-1 + %description This is a portable network library for use with SDL. + %package devel -Summary: Libraries and includes to develop SDL networked applications. -Group: Development/Libraries -Requires: %{name} = %{version}-%{release} -Requires: SDL-devel >= 1.2.4-1 +Summary: Libraries and includes to develop SDL networked applications. +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} +Requires: SDL-devel >= 1.2.4-1 + %description devel This is a portable network library for use with SDL. @@ -28,9 +33,10 @@ This is the libraries and include files you can use to develop SDL networked applications. + %prep %setup -q -%patch -p1 +%patch0 -p1 %patch1 touch NEWS AUTHORS ChangeLog # Quiet automake @@ -40,35 +46,47 @@ automake --add-missing autoconf + %build %configure --prefix=%{_prefix} make %{?_smp_mflags} + %install rm -rf $RPM_BUILD_ROOT %makeinstall rm -f $RPM_BUILD_ROOT%{_libdir}/*.la + %clean rm -rf $RPM_BUILD_ROOT + %post -p /sbin/ldconfig + %postun -p /sbin/ldconfig + %files %defattr(-,root,root) %doc README CHANGES COPYING %{_libdir}/lib*.so.* + %files devel %defattr(-,root,root) %{_libdir}/lib*.a %{_libdir}/lib*.so %{_includedir}/SDL/ + %changelog +* Tue Sep 27 2005 Brian Pepple - 1.2.5-6 +- General spec formatting cleanup. +- Add dist tag. + * Thu Jun 9 2005 Ville Skytt?? - 1.2.5-5 - Add SDL-devel dependency to -devel, remove duplicate docs. - Remove trailing semicolon from "extern C" block in SDL_net.h (#137525, Kees). From fedora-extras-commits at redhat.com Tue Sep 27 22:07:55 2005 From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez)) Date: Tue, 27 Sep 2005 18:07:55 -0400 Subject: rpms/mod_auth_pam - New directory Message-ID: <200509272207.j8RM7t5F007758@cvs-int.fedora.redhat.com> Author: ivazquez Update of /cvs/extras/rpms/mod_auth_pam In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7748/mod_auth_pam Log Message: Directory /cvs/extras/rpms/mod_auth_pam added to the repository From fedora-extras-commits at redhat.com Tue Sep 27 22:08:00 2005 From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez)) Date: Tue, 27 Sep 2005 18:08:00 -0400 Subject: rpms/mod_auth_pam/devel - New directory Message-ID: <200509272208.j8RM80Wd007773@cvs-int.fedora.redhat.com> Author: ivazquez Update of /cvs/extras/rpms/mod_auth_pam/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7748/mod_auth_pam/devel Log Message: Directory /cvs/extras/rpms/mod_auth_pam/devel added to the repository From fedora-extras-commits at redhat.com Tue Sep 27 22:08:33 2005 From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez)) Date: Tue, 27 Sep 2005 18:08:33 -0400 Subject: rpms/mod_auth_pam Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200509272208.j8RM8XIw007807@cvs-int.fedora.redhat.com> Author: ivazquez Update of /cvs/extras/rpms/mod_auth_pam In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7793 Added Files: Makefile import.log Log Message: Setup of module mod_auth_pam --- NEW FILE Makefile --- # Top level Makefile for module mod_auth_pam all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Tue Sep 27 22:08:35 2005 From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez)) Date: Tue, 27 Sep 2005 18:08:35 -0400 Subject: rpms/mod_auth_pam/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200509272208.j8RM8ZNb007827@cvs-int.fedora.redhat.com> Author: ivazquez Update of /cvs/extras/rpms/mod_auth_pam/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7793/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module mod_auth_pam --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Tue Sep 27 22:10:18 2005 From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez)) Date: Tue, 27 Sep 2005 18:10:18 -0400 Subject: rpms/mod_auth_pam import.log,1.1,1.2 Message-ID: <200509272210.j8RMAvQs007919@cvs-int.fedora.redhat.com> Author: ivazquez Update of /cvs/extras/rpms/mod_auth_pam In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7876 Modified Files: import.log Log Message: auto-import mod_auth_pam-1.1.1-1 on branch devel from mod_auth_pam-1.1.1-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/mod_auth_pam/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 27 Sep 2005 22:08:25 -0000 1.1 +++ import.log 27 Sep 2005 22:10:15 -0000 1.2 @@ -0,0 +1 @@ +mod_auth_pam-1_1_1-1:HEAD:mod_auth_pam-1.1.1-1.src.rpm:1127858992 From fedora-extras-commits at redhat.com Tue Sep 27 22:10:36 2005 From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez)) Date: Tue, 27 Sep 2005 18:10:36 -0400 Subject: rpms/mod_auth_pam/devel COPYING-mod_auth_pam, NONE, 1.1 mod_auth_pam-auth_pam.conf, NONE, 1.1 mod_auth_pam-httpd.pam, NONE, 1.1 mod_auth_pam.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200509272210.j8RMAaL7007906@cvs-int.fedora.redhat.com> Author: ivazquez Update of /cvs/extras/rpms/mod_auth_pam/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7876/devel Modified Files: .cvsignore sources Added Files: COPYING-mod_auth_pam mod_auth_pam-auth_pam.conf mod_auth_pam-httpd.pam mod_auth_pam.spec Log Message: auto-import mod_auth_pam-1.1.1-1 on branch devel from mod_auth_pam-1.1.1-1.src.rpm --- NEW FILE COPYING-mod_auth_pam --- /* Copyright (c) 2000 Ingo Luetkebohle, 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 ``AS IS'' AND ANY EXPRESSED OR IMPLIED * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE * DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR OTHER CODE 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. */ --- NEW FILE mod_auth_pam-auth_pam.conf --- LoadModule auth_pam_module modules/mod_auth_pam.so LoadModule auth_sys_group_module modules/mod_auth_sys_group.so --- NEW FILE mod_auth_pam-httpd.pam --- #%PAM-1.0 auth required pam_stack.so service=system-auth account required pam_stack.so service=system-auth # Comment out the previous account line and uncomment the following line if # you wish to allow logins that don't have a system account #account required pam_permit.so --- NEW FILE mod_auth_pam.spec --- Name: mod_auth_pam Version: 1.1.1 Release: 1 Summary: PAM authentication module for Apache Group: System Environment/Daemons License: Distributable URL: http://pam.sourceforge.net/mod_auth_pam/ Source0: http://pam.sourceforge.net/mod_auth_pam/dist/%{name}-2.0-%{version}.tar.gz Source1: mod_auth_pam-auth_pam.conf Source2: COPYING-mod_auth_pam Source3: mod_auth_pam-httpd.pam BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: httpd-devel pam-devel Requires: httpd-mmn = %(cat %{_includedir}/httpd/.mmn || echo missing-httpd-devel) %description The PAM authentication module implements Basic authentication on top of the Pluggable Authentication Module library. Thereby it supports standard unix passwd, shadow, NIS, SMB auth and radius authentication transparently and easily interchangeable, wherever the HTTP protocol allows it. %prep %setup -q -n %{name} find -name CVS -type d | xargs rm -r install -p -m 644 %{SOURCE2} COPYING %build make %{?_smp_mflags} APXS=%{_sbindir}/apxs %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT%{_libdir}/httpd/modules install -m 755 .libs/%{name}.so $RPM_BUILD_ROOT%{_libdir}/httpd/modules install -m 755 .libs/mod_auth_sys_group.so $RPM_BUILD_ROOT%{_libdir}/httpd/modules mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d install -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/auth_pam.conf mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/pam.d install -p -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/httpd %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) %doc COPYING README doc samples %{_libdir}/httpd/modules/*.so %config(noreplace) %{_sysconfdir}/pam.d/* %config(noreplace) %{_sysconfdir}/httpd/conf.d/*.conf %changelog * Sat Sep 27 2005 Ignacio Vazquez-Abrams 1.1.1-1 - Initial RPM release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/mod_auth_pam/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 27 Sep 2005 22:08:33 -0000 1.1 +++ .cvsignore 27 Sep 2005 22:10:17 -0000 1.2 @@ -0,0 +1 @@ +mod_auth_pam-2.0-1.1.1.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/mod_auth_pam/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 27 Sep 2005 22:08:33 -0000 1.1 +++ sources 27 Sep 2005 22:10:18 -0000 1.2 @@ -0,0 +1 @@ +ab873520ddd2fee7d480dfd53e464e0a mod_auth_pam-2.0-1.1.1.tar.gz From fedora-extras-commits at redhat.com Tue Sep 27 22:47:37 2005 From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields)) Date: Tue, 27 Sep 2005 18:47:37 -0400 Subject: rpms/blogtk - New directory Message-ID: <200509272247.j8RMlbEa008133@cvs-int.fedora.redhat.com> Author: pfrields Update of /cvs/extras/rpms/blogtk In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8109/blogtk Log Message: Directory /cvs/extras/rpms/blogtk added to the repository From fedora-extras-commits at redhat.com Tue Sep 27 22:47:37 2005 From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields)) Date: Tue, 27 Sep 2005 18:47:37 -0400 Subject: rpms/blogtk/devel - New directory Message-ID: <200509272247.j8RMlbPF008138@cvs-int.fedora.redhat.com> Author: pfrields Update of /cvs/extras/rpms/blogtk/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8109/blogtk/devel Log Message: Directory /cvs/extras/rpms/blogtk/devel added to the repository From fedora-extras-commits at redhat.com Tue Sep 27 22:47:48 2005 From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields)) Date: Tue, 27 Sep 2005 18:47:48 -0400 Subject: rpms/blogtk Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200509272247.j8RMlmiF008183@cvs-int.fedora.redhat.com> Author: pfrields Update of /cvs/extras/rpms/blogtk In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8154 Added Files: Makefile import.log Log Message: Setup of module blogtk --- NEW FILE Makefile --- # Top level Makefile for module blogtk all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Tue Sep 27 22:47:49 2005 From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields)) Date: Tue, 27 Sep 2005 18:47:49 -0400 Subject: rpms/blogtk/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200509272247.j8RMlnu4008188@cvs-int.fedora.redhat.com> Author: pfrields Update of /cvs/extras/rpms/blogtk/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8154/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module blogtk --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Tue Sep 27 22:48:17 2005 From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields)) Date: Tue, 27 Sep 2005 18:48:17 -0400 Subject: rpms/blogtk import.log,1.1,1.2 Message-ID: <200509272248.j8RMmlsN008267@cvs-int.fedora.redhat.com> Author: pfrields Update of /cvs/extras/rpms/blogtk In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8227 Modified Files: import.log Log Message: auto-import blogtk-1.1-4 on branch devel from blogtk-1.1-4.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/blogtk/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 27 Sep 2005 22:47:46 -0000 1.1 +++ import.log 27 Sep 2005 22:48:15 -0000 1.2 @@ -0,0 +1 @@ +blogtk-1_1-4:HEAD:blogtk-1.1-4.src.rpm:1127861303 From fedora-extras-commits at redhat.com Tue Sep 27 22:48:17 2005 From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields)) Date: Tue, 27 Sep 2005 18:48:17 -0400 Subject: rpms/blogtk/devel BSD, NONE, 1.1 blogtk.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200509272248.j8RMmHdN008260@cvs-int.fedora.redhat.com> Author: pfrields Update of /cvs/extras/rpms/blogtk/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8227/devel Modified Files: .cvsignore sources Added Files: BSD blogtk.spec Log Message: auto-import blogtk-1.1-4 on branch devel from blogtk-1.1-4.src.rpm --- NEW FILE BSD --- Copyright (c) 2005, Jay Reding. 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 the author nor the names of 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 HOLDER 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. --- NEW FILE blogtk.spec --- # Note to Fedora Extras reviewers: The developer is very inconsistent # about the capitalization of the program name. I have erred on the # conservative side. Name: blogtk Version: 1.1 Release: 4%{?dist} Summary: Gnome application for editing/maintaining blogs Group: Applications/Internet License: BSD URL: http://blogtk.sourceforge.net Source0: http://dl.sf.net/blogtk/blogtk_%{version}.tar.bz2 Source1: BSD BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch Requires: gnome-python2 >= 2.00 Requires: pygtk2 >= 2.00 Requires: aspell BuildRequires: pygtk2-devel >= 2.00 BuildRequires: glib2-devel BuildRequires: desktop-file-utils # To make sure this doesn't inflict pain on CapNames users Provides: BloGTK = %{version}-%{release} %description BloGTK is a weblog posting client written in Python for any platform that supports Python and the GTK widget set. BloGTK allows you to connect to your weblog with XML-RPC and create new posts. %prep %setup -q -n BloGTK-%{version} cp %{SOURCE1} $RPM_BUILD_DIR/BloGTK-%{version} %build %install rm -rf $RPM_BUILD_ROOT # Cope with developer's Makefile and Fedora standards %define pyver %(python -c "import sys; x = sys.version_info; print '%%s.%%s' %% (x[0], x[1])") install -m 755 -d $RPM_BUILD_ROOT/%{_bindir} install -m 755 -d $RPM_BUILD_ROOT/%{_libdir}/python%{pyver}/site-packages/%{name} install -m 755 -d $RPM_BUILD_ROOT/%{_datadir}/{%{name},pixmaps/%{name}} install -m 755 src/* \ $RPM_BUILD_ROOT/%{_libdir}/python%{pyver}/site-packages/%{name} install -m 644 pixmaps/blogtk.glade \ $RPM_BUILD_ROOT/%{_datadir}/%{name} install -m 644 pixmaps/*.png $RPM_BUILD_ROOT/%{_datadir}/%{name} install -m 644 -D data/blogtk-icon.png \ $RPM_BUILD_ROOT/%{_datadir}/pixmaps/blogtk-icon.png %{__sed} -i 's/Exec=BloGTK/Exec=blogtk/' data/blogtk.desktop install -m 644 -D data/blogtk.desktop \ $RPM_BUILD_ROOT/%{_datadir}/applications/blogtk.desktop cat << EOF > $RPM_BUILD_ROOT/%{_bindir}/blogtk #!/bin/sh exec %{_libdir}/python%{pyver}/site-packages/%{name}/BloGTK.py EOF chmod 755 $RPM_BUILD_ROOT/%{_bindir}/blogtk desktop-file-install --vendor=fedora \ --dir=$RPM_BUILD_ROOT%{_datadir}/applications \ --add-category=X-Fedora \ --delete-original \ --add-category=Network \ $RPM_BUILD_ROOT/%{_datadir}/applications/blogtk.desktop %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc AUTHORS ChangeLog README BSD %{_bindir}/* %dir %{_libdir}/python%{pyver}/site-packages/%{name} %{_libdir}/python%{pyver}/site-packages/%{name}/* %dir %{_datadir}/%{name} %{_datadir}/%{name}/* %{_datadir}/applications/fedora-blogtk.desktop %{_datadir}/pixmaps/blogtk-icon.png %changelog * Mon Aug 29 2005 Paul W. Frields - 1.1-4 - Add BSD license file * Sat Aug 20 2005 Paul W. Frields - 1.1-3 - Revised packaging to match current Fedora Extras guidelines * Mon Mar 21 2005 Seth Vidal 1.1-2 - fixes for fedora extras compliance * Thu Mar 17 2005 Seth Vidal 1.1-1 - initial package Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/blogtk/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 27 Sep 2005 22:47:47 -0000 1.1 +++ .cvsignore 27 Sep 2005 22:48:15 -0000 1.2 @@ -0,0 +1 @@ +blogtk_1.1.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/blogtk/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 27 Sep 2005 22:47:47 -0000 1.1 +++ sources 27 Sep 2005 22:48:15 -0000 1.2 @@ -0,0 +1 @@ +cd2d2521a261867cd9c830a81d3d4408 blogtk_1.1.tar.bz2 From fedora-extras-commits at redhat.com Tue Sep 27 23:30:29 2005 From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez)) Date: Tue, 27 Sep 2005 19:30:29 -0400 Subject: owners owners.list,1.263,1.264 Message-ID: <200509272330.j8RNUTkN009791@cvs-int.fedora.redhat.com> Author: ivazquez Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9772 Modified Files: owners.list Log Message: mod_auth_pam Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.263 retrieving revision 1.264 diff -u -r1.263 -r1.264 --- owners.list 27 Sep 2005 20:19:32 -0000 1.263 +++ owners.list 27 Sep 2005 23:30:27 -0000 1.264 @@ -511,6 +511,7 @@ Fedora Extras|mlmmj|Mailserver-independent ezmlm-like mailing list manager|mfleming+rpm at enlartenment.com|extras-qa at fedoraproject.org| Fedora Extras|mock|Builds packages inside chroots|skvidal at phy.duke.edu|extras-qa at fedoraproject.org| Fedora Extras|mod_annodex|Apache module for server-side support of annodex media|thomas at apestaart.org|extras-qa at fedoraproject.org| +Fedora Extras|mod_auth_pam|PAM authentication module for Apache|ivazquez at ivazquez.net|extras-qa at fedoraproject.org| Fedora Extras|mod_security|Security module for the Apache HTTP Server|mfleming+rpm at enlartenment.com|extras-qa at fedoraproject.org| Fedora Extras|mod_suphp|An apache2 module for executing PHP scripts with the permissions of their owners|andreas at bawue.net|extras-qa at fedoraproject.org| Fedora Extras|moin|MoinMoin is a Python clone of WikiWiki|matthias at rpmforge.net|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Tue Sep 27 23:31:15 2005 From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez)) Date: Tue, 27 Sep 2005 19:31:15 -0400 Subject: rpms/mod_auth_pam/devel mod_auth_pam.spec,1.1,1.2 Message-ID: <200509272331.j8RNVFkq009821@cvs-int.fedora.redhat.com> Author: ivazquez Update of /cvs/extras/rpms/mod_auth_pam/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9802 Modified Files: mod_auth_pam.spec Log Message: Add disttag Index: mod_auth_pam.spec =================================================================== RCS file: /cvs/extras/rpms/mod_auth_pam/devel/mod_auth_pam.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- mod_auth_pam.spec 27 Sep 2005 22:10:18 -0000 1.1 +++ mod_auth_pam.spec 27 Sep 2005 23:31:13 -0000 1.2 @@ -1,6 +1,6 @@ Name: mod_auth_pam Version: 1.1.1 -Release: 1 +Release: 1%{?dist} Summary: PAM authentication module for Apache Group: System Environment/Daemons From fedora-extras-commits at redhat.com Tue Sep 27 23:34:08 2005 From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields)) Date: Tue, 27 Sep 2005 19:34:08 -0400 Subject: owners owners.list,1.264,1.265 Message-ID: <200509272334.j8RNY8ZH009856@cvs-int.fedora.redhat.com> Author: pfrields Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9837 Modified Files: owners.list Log Message: Add blogtk Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.264 retrieving revision 1.265 diff -u -r1.264 -r1.265 --- owners.list 27 Sep 2005 23:30:27 -0000 1.264 +++ owners.list 27 Sep 2005 23:34:06 -0000 1.265 @@ -56,6 +56,7 @@ Fedora Extras|blackbox|Very small and fast Window Manager|matthias at rpmforge.net|extras-qa at fedoraproject.org| Fedora Extras|blacs|Basic Linear Algebra Communication Subprograms|tcallawa at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|blender|3D modeling, animation, rendering and post-production|compton at pcompton.com|extras-qa at fedoraproject.org| +Fedora Extras|blogtk|Gnome application for editing/maintaining blogs|stickster at gmail.com|extras-qa at fedoraproject.org| Fedora Extras|blt|BLT widget extension to Tcl/Tk scripting language development|jfontain at free.fr|extras-qa at fedoraproject.org| Fedora Extras|bluefish|A GTK2 web development application for experienced users|compton at pcompton.com|extras-qa at fedoraproject.org| Fedora Extras|bmp|GTK2 based fork of the XMMS media player|redhat-bugzilla at camperquake.de|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Wed Sep 28 00:17:29 2005 From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert)) Date: Tue, 27 Sep 2005 20:17:29 -0400 Subject: rpms/regexxer - New directory Message-ID: <200509280017.j8S0HTLo011466@cvs-int.fedora.redhat.com> Author: cwickert Update of /cvs/extras/rpms/regexxer In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11442/regexxer Log Message: Directory /cvs/extras/rpms/regexxer added to the repository From fedora-extras-commits at redhat.com Wed Sep 28 00:17:29 2005 From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert)) Date: Tue, 27 Sep 2005 20:17:29 -0400 Subject: rpms/regexxer/devel - New directory Message-ID: <200509280017.j8S0HTuA011471@cvs-int.fedora.redhat.com> Author: cwickert Update of /cvs/extras/rpms/regexxer/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11442/regexxer/devel Log Message: Directory /cvs/extras/rpms/regexxer/devel added to the repository From fedora-extras-commits at redhat.com Wed Sep 28 00:17:46 2005 From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert)) Date: Tue, 27 Sep 2005 20:17:46 -0400 Subject: rpms/regexxer Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200509280017.j8S0Hk1H011516@cvs-int.fedora.redhat.com> Author: cwickert Update of /cvs/extras/rpms/regexxer In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11487 Added Files: Makefile import.log Log Message: Setup of module regexxer --- NEW FILE Makefile --- # Top level Makefile for module regexxer all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Wed Sep 28 00:17:46 2005 From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert)) Date: Tue, 27 Sep 2005 20:17:46 -0400 Subject: rpms/regexxer/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200509280017.j8S0HkYs011521@cvs-int.fedora.redhat.com> Author: cwickert Update of /cvs/extras/rpms/regexxer/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11487/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module regexxer --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Wed Sep 28 00:18:37 2005 From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert)) Date: Tue, 27 Sep 2005 20:18:37 -0400 Subject: rpms/regexxer import.log,1.1,1.2 Message-ID: <200509280019.j8S0J7U0011594@cvs-int.fedora.redhat.com> Author: cwickert Update of /cvs/extras/rpms/regexxer In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11556 Modified Files: import.log Log Message: auto-import regexxer-0.8-1.fc4 on branch devel from regexxer-0.8-1.fc4.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/regexxer/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 28 Sep 2005 00:17:43 -0000 1.1 +++ import.log 28 Sep 2005 00:18:35 -0000 1.2 @@ -0,0 +1 @@ +regexxer-0_8-1_fc4:HEAD:regexxer-0.8-1.fc4.src.rpm:1127866707 From fedora-extras-commits at redhat.com Wed Sep 28 00:18:37 2005 From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert)) Date: Tue, 27 Sep 2005 20:18:37 -0400 Subject: rpms/regexxer/devel regexxer.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200509280019.j8S0J820011596@cvs-int.fedora.redhat.com> Author: cwickert Update of /cvs/extras/rpms/regexxer/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11556/devel Modified Files: .cvsignore sources Added Files: regexxer.spec Log Message: auto-import regexxer-0.8-1.fc4 on branch devel from regexxer-0.8-1.fc4.src.rpm --- NEW FILE regexxer.spec --- Name: regexxer Version: 0.8 Release: 1%{?dist} Summary: A nifty GUI search/replace tool Group: Applications/Text License: GPL URL: http://regexxer.sourceforge.net/ Source0: http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libsigc++20-devel, libglademm24-devel BuildRequires: gconfmm26-devel >= 2.6.1, pcre-devel >= 4.0.0 BuildRequires: desktop-file-utils, gettext Requires(pre): GConf2 Requires(post): GConf2 Requires(preun): GConf2 %description Regexxer is a nifty GUI search/replace tool featuring Perl-style regular expressions. If you need project-wide substitution and you???re tired of hacking sed command lines together, then you should definitely give it a try. %prep %setup -q %build %configure make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 make install DESTDIR=$RPM_BUILD_ROOT desktop-file-install --vendor fedora \ --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ --add-category X-Fedora \ --delete-original \ ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop %find_lang %{name} %clean rm -rf $RPM_BUILD_ROOT %pre if [ "$1" -gt 1 ]; then export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` gconftool-2 --makefile-uninstall-rule \ %{_sysconfdir}/gconf/schemas/%{name}.schemas >/dev/null || : killall -HUP gconfd-2 || : fi %post export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` gconftool-2 --makefile-install-rule \ %{_sysconfdir}/gconf/schemas/%{name}.schemas >/dev/null || : killall -HUP gconfd-2 || : %preun if [ "$1" -eq 0 ]; then export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` gconftool-2 --makefile-uninstall-rule \ %{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null || : killall -HUP gconfd-2 || : fi %files -f %{name}.lang %defattr(-,root,root,-) %doc AUTHORS COPYING ChangeLog NEWS README %{_bindir}/%{name} %{_sysconfdir}/gconf/schemas/%{name}.schemas %{_datadir}/applications/fedora-%{name}.desktop %{_datadir}/%{name} %{_datadir}/pixmaps/%{name}.png %changelog * Thu Sep 22 2005 Christoph Wickert - 0.8-1 - Initial RPM release. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/regexxer/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 28 Sep 2005 00:17:44 -0000 1.1 +++ .cvsignore 28 Sep 2005 00:18:35 -0000 1.2 @@ -0,0 +1 @@ +regexxer-0.8.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/regexxer/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 28 Sep 2005 00:17:44 -0000 1.1 +++ sources 28 Sep 2005 00:18:35 -0000 1.2 @@ -0,0 +1 @@ +acaa19b119cc7159c42b7f93e02f9fbd regexxer-0.8.tar.gz From fedora-extras-commits at redhat.com Wed Sep 28 00:28:56 2005 From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert)) Date: Tue, 27 Sep 2005 20:28:56 -0400 Subject: owners owners.list,1.265,1.266 Message-ID: <200509280028.j8S0Sue0011663@cvs-int.fedora.redhat.com> Author: cwickert Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11644 Modified Files: owners.list Log Message: added regexxer Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.265 retrieving revision 1.266 diff -u -r1.265 -r1.266 --- owners.list 27 Sep 2005 23:34:06 -0000 1.265 +++ owners.list 28 Sep 2005 00:28:54 -0000 1.266 @@ -893,6 +893,7 @@ Fedora Extras|rbldnsd|Small, fast daemon to serve DNSBLs|paul at city-fan.org|extras-qa at fedoraproject.org| Fedora Extras|rdiff-backup|Convenient and transparent local/remote incremental mirror/backup|ghenry at suretecsystems.com|extras-qa at fedoraproject.org| Fedora Extras|recode|Conversion between character sets and surfaces|z.kota at gmx.net|extras-qa at fedoraproject.org| +Fedora Extras|regexxer|A nifty GUI search/replace tool|wickerpms at arcor.de|extras-qa at fedoraproject.org| Fedora Extras|rekall|A KDE database front-end application|tcallawa at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|repoml|Tools and data for working with RepoML files|ivazquez at ivazquez.net|extras-qa at fedoraproject.org| Fedora Extras|repoview|Creates a set of static HTML pages in a yum repository|icon at linux.duke.edu|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Wed Sep 28 01:23:46 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Tue, 27 Sep 2005 21:23:46 -0400 Subject: rpms/sbcl/FC-3 .cvsignore, 1.2, 1.3 sbcl.spec, 1.15, 1.16 sources, 1.2, 1.3 Message-ID: <200509280123.j8S1NlIq013230@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/sbcl/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13177/FC-3 Modified Files: .cvsignore sbcl.spec sources Log Message: * Tue Sep 27 2005 Rex Dieter 0.9.5-8 - respin (fc3/fc4) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/sbcl/FC-3/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 12 Sep 2005 12:36:44 -0000 1.2 +++ .cvsignore 28 Sep 2005 01:23:44 -0000 1.3 @@ -1,4 +1,4 @@ +sbcl-0.9.5-source.tar.bz2 sbcl-0.8.15-powerpc-linux-binary.tar.bz2 -sbcl-0.9.4-source.tar.bz2 sbcl-0.9.4-x86-64-linux-binary.tar.bz2 sbcl-0.9.4-x86-linux-binary.tar.bz2 Index: sbcl.spec =================================================================== RCS file: /cvs/extras/rpms/sbcl/FC-3/sbcl.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- sbcl.spec 27 Sep 2005 20:44:49 -0000 1.15 +++ sbcl.spec 28 Sep 2005 01:23:44 -0000 1.16 @@ -3,7 +3,7 @@ Name: sbcl Summary: Steel Bank Common Lisp Version: 0.9.5 -Release: 7%{?dist} +Release: 8%{?dist} License: BSD/MIT Group: Development/Languages @@ -165,6 +165,9 @@ %changelog +* Tue Sep 27 2005 Rex Dieter 0.9.5-8 +- respin (fc3/fc4) + * Tue Sep 27 2005 Rex Dieter 0.9.5-7 - drop ppc - cleaner optflags patch Index: sources =================================================================== RCS file: /cvs/extras/rpms/sbcl/FC-3/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 12 Sep 2005 12:36:44 -0000 1.2 +++ sources 28 Sep 2005 01:23:44 -0000 1.3 @@ -1,4 +1,4 @@ +f594f18813c08f262a6df9a36288adcb sbcl-0.9.5-source.tar.bz2 3a72d0785ce0a8e02f9af632c2a4f217 sbcl-0.8.15-powerpc-linux-binary.tar.bz2 -a0420dc6236efece72c1c80ee15873c9 sbcl-0.9.4-source.tar.bz2 67ec41e624a3f2ad7f6f3cde1bd001d3 sbcl-0.9.4-x86-64-linux-binary.tar.bz2 947d1cde2c1c80416b5f9fb4e4c81383 sbcl-0.9.4-x86-linux-binary.tar.bz2 From fedora-extras-commits at redhat.com Wed Sep 28 01:23:47 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Tue, 27 Sep 2005 21:23:47 -0400 Subject: rpms/sbcl/devel sbcl.spec,1.22,1.23 Message-ID: <200509280123.j8S1NlFH013244@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/sbcl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13177/devel Modified Files: sbcl.spec Log Message: * Tue Sep 27 2005 Rex Dieter 0.9.5-8 - respin (fc3/fc4) Index: sbcl.spec =================================================================== RCS file: /cvs/extras/rpms/sbcl/devel/sbcl.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- sbcl.spec 27 Sep 2005 20:10:04 -0000 1.22 +++ sbcl.spec 28 Sep 2005 01:23:45 -0000 1.23 @@ -3,7 +3,7 @@ Name: sbcl Summary: Steel Bank Common Lisp Version: 0.9.5 -Release: 7%{?dist} +Release: 8%{?dist} License: BSD/MIT Group: Development/Languages @@ -165,6 +165,9 @@ %changelog +* Tue Sep 27 2005 Rex Dieter 0.9.5-8 +- respin (fc3/fc4) + * Tue Sep 27 2005 Rex Dieter 0.9.5-7 - drop ppc - cleaner optflags patch From fedora-extras-commits at redhat.com Wed Sep 28 01:23:47 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Tue, 27 Sep 2005 21:23:47 -0400 Subject: rpms/sbcl/FC-4 .cvsignore, 1.2, 1.3 sbcl.spec, 1.15, 1.16 sources, 1.2, 1.3 Message-ID: <200509280123.j8S1NlTh013238@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/sbcl/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13177/FC-4 Modified Files: .cvsignore sbcl.spec sources Log Message: * Tue Sep 27 2005 Rex Dieter 0.9.5-8 - respin (fc3/fc4) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/sbcl/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 12 Sep 2005 12:36:44 -0000 1.2 +++ .cvsignore 28 Sep 2005 01:23:45 -0000 1.3 @@ -1,4 +1,4 @@ +sbcl-0.9.5-source.tar.bz2 sbcl-0.8.15-powerpc-linux-binary.tar.bz2 -sbcl-0.9.4-source.tar.bz2 sbcl-0.9.4-x86-64-linux-binary.tar.bz2 sbcl-0.9.4-x86-linux-binary.tar.bz2 Index: sbcl.spec =================================================================== RCS file: /cvs/extras/rpms/sbcl/FC-4/sbcl.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- sbcl.spec 27 Sep 2005 20:44:50 -0000 1.15 +++ sbcl.spec 28 Sep 2005 01:23:45 -0000 1.16 @@ -3,7 +3,7 @@ Name: sbcl Summary: Steel Bank Common Lisp Version: 0.9.5 -Release: 7%{?dist} +Release: 8%{?dist} License: BSD/MIT Group: Development/Languages @@ -165,6 +165,9 @@ %changelog +* Tue Sep 27 2005 Rex Dieter 0.9.5-8 +- respin (fc3/fc4) + * Tue Sep 27 2005 Rex Dieter 0.9.5-7 - drop ppc - cleaner optflags patch Index: sources =================================================================== RCS file: /cvs/extras/rpms/sbcl/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 12 Sep 2005 12:36:44 -0000 1.2 +++ sources 28 Sep 2005 01:23:45 -0000 1.3 @@ -1,4 +1,4 @@ +f594f18813c08f262a6df9a36288adcb sbcl-0.9.5-source.tar.bz2 3a72d0785ce0a8e02f9af632c2a4f217 sbcl-0.8.15-powerpc-linux-binary.tar.bz2 -a0420dc6236efece72c1c80ee15873c9 sbcl-0.9.4-source.tar.bz2 67ec41e624a3f2ad7f6f3cde1bd001d3 sbcl-0.9.4-x86-64-linux-binary.tar.bz2 947d1cde2c1c80416b5f9fb4e4c81383 sbcl-0.9.4-x86-linux-binary.tar.bz2 From fedora-extras-commits at redhat.com Wed Sep 28 02:59:15 2005 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Tue, 27 Sep 2005 22:59:15 -0400 Subject: rpms/haddock - New directory Message-ID: <200509280259.j8S2xF5f014943@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/haddock In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14921/haddock Log Message: Directory /cvs/extras/rpms/haddock added to the repository From fedora-extras-commits at redhat.com Wed Sep 28 02:59:15 2005 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Tue, 27 Sep 2005 22:59:15 -0400 Subject: rpms/haddock/devel - New directory Message-ID: <200509280259.j8S2xFK6014948@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/haddock/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14921/haddock/devel Log Message: Directory /cvs/extras/rpms/haddock/devel added to the repository From fedora-extras-commits at redhat.com Wed Sep 28 02:59:36 2005 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Tue, 27 Sep 2005 22:59:36 -0400 Subject: rpms/haddock Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200509280259.j8S2xagB014999@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/haddock In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14970 Added Files: Makefile import.log Log Message: Setup of module haddock --- NEW FILE Makefile --- # Top level Makefile for module haddock all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Wed Sep 28 02:59:36 2005 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Tue, 27 Sep 2005 22:59:36 -0400 Subject: rpms/haddock/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200509280259.j8S2xaxV015004@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/haddock/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14970/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module haddock --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Wed Sep 28 03:00:16 2005 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Tue, 27 Sep 2005 23:00:16 -0400 Subject: rpms/haddock import.log,1.1,1.2 Message-ID: <200509280300.j8S30Gop015081@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/haddock In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15046 Modified Files: import.log Log Message: auto-import haddock-0.7-1 on branch devel from haddock-0.7-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/haddock/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 28 Sep 2005 02:59:34 -0000 1.1 +++ import.log 28 Sep 2005 03:00:14 -0000 1.2 @@ -0,0 +1 @@ +haddock-0_7-1:HEAD:haddock-0.7-1.src.rpm:1127876405 From fedora-extras-commits at redhat.com Wed Sep 28 03:00:17 2005 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Tue, 27 Sep 2005 23:00:17 -0400 Subject: rpms/haddock/devel haddock.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200509280300.j8S30HS0015088@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/haddock/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15046/devel Modified Files: .cvsignore sources Added Files: haddock.spec Log Message: auto-import haddock-0.7-1 on branch devel from haddock-0.7-1.src.rpm --- NEW FILE haddock.spec --- Name: haddock Version: 0.7 Release: 1%{?dist} Summary: Haddock documentation tool for annotated Haskell source code Group: Development/Tools License: BSD-like URL: http://www.haskell.org/haddock/ Source0: http://www.haskell.org/haddock/%{name}-%{version}-src.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ghc libxslt docbook-style-xsl %description Haddock is a tool for automatically generating hyperlinked documentation from annotated Haskell source code. It is primary intended for documenting libraries, but it is useful for any kind of Haskell code. Haddock lets you write documentation annotations next to the definitions of functions and types in the source code in a lightweight syntax. # don't generate an empty debuginfo subpackage %define debug_package %{nil} %define __spec_install_post /usr/lib/rpm/brp-compress %prep %setup -q %build ./configure --prefix=%{_prefix} --libdir=%{_libdir} make %{?_smp_mflags} (cd haddock/doc ; make html ) %install rm -rf ${RPM_BUILD_ROOT} %makeinstall # move datafiles into their expected location mkdir ${RPM_BUILD_ROOT}%{_datadir}/%{name}-%{version} find ${RPM_BUILD_ROOT}%{_datadir} -type f | xargs mv --target-directory=${RPM_BUILD_ROOT}%{_datadir}/%{name}-%{version} sed -i -e "s!%{_libdir}/%{name}-%{version}!%{_libexecdir}!" ${RPM_BUILD_ROOT}%{_bindir}/%{name}-%{version} # drop versioned binary wrapper rm ${RPM_BUILD_ROOT}%{_bindir}/%{name} mv ${RPM_BUILD_ROOT}%{_bindir}/%{name}{-%{version},} %clean rm -rf ${RPM_BUILD_ROOT} %files %defattr(-,root,root) %doc haddock/README %doc haddock/doc/haddock %{_bindir}/haddock %{_libexecdir}/haddock.bin %{_datadir}/haddock-%{version} %changelog * Tue Sep 27 2005 Jens Petersen - 0.7-1 - cleanup for Fedora Extras (G??rard Milmeister) - drop versioned binary - set standard buildroot - do not create debuginfo - improve the description * Mon Aug 22 2005 Jens Petersen - 0.7 release * Tue Jul 5 2005 Jens Petersen - 0.7-0.20050705 - update to cvs snapshot - update filelist - install data files in a subdir * Wed Dec 15 2004 Jens Petersen - spec file cleanup - only generate docs in html * Sat Oct 11 2003 Sven Panne - Include architecture-independent files in file list * Tue Aug 26 2003 Sven Panne - Use autoreconf instead of autoconf * Mon Jul 28 2003 Sven Panne - Updated to version 0.5 - Automagically generate configure if it is not there * Tue Jul 23 2002 Simon Marlow - Updated to version 0.4 * Sun Jun 23 2002 Sven Panne - Cleaned up build root handling and added more docs * Wed May 01 2002 Tom Moertel - Created spec file Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/haddock/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 28 Sep 2005 02:59:34 -0000 1.1 +++ .cvsignore 28 Sep 2005 03:00:15 -0000 1.2 @@ -0,0 +1 @@ +haddock-0.7-src.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/haddock/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 28 Sep 2005 02:59:34 -0000 1.1 +++ sources 28 Sep 2005 03:00:15 -0000 1.2 @@ -0,0 +1 @@ +759419e78416d5f093190968a4dc18f5 haddock-0.7-src.tar.gz From fedora-extras-commits at redhat.com Wed Sep 28 03:18:47 2005 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Tue, 27 Sep 2005 23:18:47 -0400 Subject: owners owners.list,1.266,1.267 Message-ID: <200509280318.j8S3IlIX016597@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16578 Modified Files: owners.list Log Message: add haddock Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.266 retrieving revision 1.267 diff -u -r1.266 -r1.267 --- owners.list 28 Sep 2005 00:28:54 -0000 1.266 +++ owners.list 28 Sep 2005 03:18:45 -0000 1.267 @@ -317,6 +317,7 @@ Fedora Extras|gwget|GUI Download manager using wget|fedora at leemhuis.info|extras-qa at fedoraproject.org| Fedora Extras|gxemul|Instruction-level machine emulator|tcallawa at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|hackedbox|The bastard son of Blackbox, a small and fast Window Manager|matthias at rpmforge.net|extras-qa at fedoraproject.org| +Fedora Extras|haddock|Documentation tool for annotated Haskell source code|petersen at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|hamlib|Run-time library to control radio transceivers and receivers|ivazquez at ivazquez.net|extras-qa at fedoraproject.org| Fedora Extras|hddtemp|Hard disk temperature tool|ville.skytta at iki.fi|extras-qa at fedoraproject.org| Fedora Extras|hdf|A general purpose library and file format for storing scientific data|orion at cora.nwra.com|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Wed Sep 28 03:28:17 2005 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Tue, 27 Sep 2005 23:28:17 -0400 Subject: owners owners.list,1.267,1.268 Message-ID: <200509280328.j8S3SHMI016645@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16612 Modified Files: owners.list Log Message: reassign scim-pinyin Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.267 retrieving revision 1.268 diff -u -r1.267 -r1.268 --- owners.list 28 Sep 2005 03:18:45 -0000 1.267 +++ owners.list 28 Sep 2005 03:28:15 -0000 1.268 @@ -924,7 +924,7 @@ Fedora Extras|scim-anthy|SCIM IMEngine for Japanese input with anthy|tagoh at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|scim-chewing|SCIM IMEngine for Traditional Chinese|petersen at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|scim-hangul|SCIM IMEngine for Korean Hangul|tagoh at redhat.com|extras-qa at fedoraproject.org| -Fedora Extras|scim-pinyin|Chinese input method for SCIM|ryo-dairiki at users.sourceforge.net|extras-qa at fedoraproject.org|petersen at redhat.com +Fedora Extras|scim-pinyin|Chinese input method for SCIM|petersen at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|scim-qtimm|SCIM Qt Input Method module|petersen at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|scim-skk|Scim-skk is a SCIM IMEngine module for skk to support Japanese input|ryo-dairiki at users.sourceforge.net|extras-qa at fedoraproject.org| Fedora Extras|scim-tables|SCIM Generic Table IMEngine and its data files|ryo-dairiki at users.sourceforge.net|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Wed Sep 28 03:41:21 2005 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Tue, 27 Sep 2005 23:41:21 -0400 Subject: rpms/fwrestart/devel fwrestart.spec,1.1,1.2 Message-ID: <200509280341.j8S3fLq1016692@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/fwrestart/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16673 Modified Files: fwrestart.spec Log Message: add dist tag Index: fwrestart.spec =================================================================== RCS file: /cvs/extras/rpms/fwrestart/devel/fwrestart.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- fwrestart.spec 26 Sep 2005 17:37:20 -0000 1.1 +++ fwrestart.spec 28 Sep 2005 03:41:19 -0000 1.2 @@ -1,7 +1,7 @@ Summary: A way to more safely re-load firewall rules remotely Name: fwrestart Version: 1.01 -Release: 3 +Release: 4%{?dist} License: GPL Group: Applications/System URL: http://www.tummy.com/Community/software/ @@ -45,6 +45,9 @@ %{_sbindir}/fwrestart %changelog +* Tue Sep 27 2005 Kevin Fenzi - 1.01-4.fc5 +- add dist to release + * Thu Sep 22 2005 Kevin Fenzi - 1.01-3 - A few more tweaks to clean up issues and re-submit to extras From fedora-extras-commits at redhat.com Wed Sep 28 03:42:38 2005 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Tue, 27 Sep 2005 23:42:38 -0400 Subject: rpms/fwrestart/FC-4 fwrestart.spec,1.1,1.2 Message-ID: <200509280342.j8S3gcv3016760@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/fwrestart/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16741 Modified Files: fwrestart.spec Log Message: add dist tag Index: fwrestart.spec =================================================================== RCS file: /cvs/extras/rpms/fwrestart/FC-4/fwrestart.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- fwrestart.spec 26 Sep 2005 17:37:20 -0000 1.1 +++ fwrestart.spec 28 Sep 2005 03:42:36 -0000 1.2 @@ -1,7 +1,7 @@ Summary: A way to more safely re-load firewall rules remotely Name: fwrestart Version: 1.01 -Release: 3 +Release: 4%{?dist} License: GPL Group: Applications/System URL: http://www.tummy.com/Community/software/ @@ -45,6 +45,9 @@ %{_sbindir}/fwrestart %changelog +* Tue Sep 27 2005 Kevin Fenzi - 1.01-4.fc4 +- add dist to release + * Thu Sep 22 2005 Kevin Fenzi - 1.01-3 - A few more tweaks to clean up issues and re-submit to extras From fedora-extras-commits at redhat.com Wed Sep 28 03:44:01 2005 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Tue, 27 Sep 2005 23:44:01 -0400 Subject: rpms/fwrestart/FC-3 fwrestart.spec,1.1,1.2 Message-ID: <200509280344.j8S3i1nl016828@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/fwrestart/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16809 Modified Files: fwrestart.spec Log Message: add dist tag Index: fwrestart.spec =================================================================== RCS file: /cvs/extras/rpms/fwrestart/FC-3/fwrestart.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- fwrestart.spec 26 Sep 2005 17:37:20 -0000 1.1 +++ fwrestart.spec 28 Sep 2005 03:43:59 -0000 1.2 @@ -1,7 +1,7 @@ Summary: A way to more safely re-load firewall rules remotely Name: fwrestart Version: 1.01 -Release: 3 +Release: 4%{?dist} License: GPL Group: Applications/System URL: http://www.tummy.com/Community/software/ @@ -45,6 +45,9 @@ %{_sbindir}/fwrestart %changelog +* Tue Sep 27 2005 Kevin Fenzi - 1.01-4.fc3 +- add dist to release + * Thu Sep 22 2005 Kevin Fenzi - 1.01-3 - A few more tweaks to clean up issues and re-submit to extras From fedora-extras-commits at redhat.com Wed Sep 28 06:30:06 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Wed, 28 Sep 2005 02:30:06 -0400 Subject: rpms/synce/devel synce.spec,1.8,1.9 Message-ID: <200509280630.j8S6U6tS021244@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/synce/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21225 Modified Files: synce.spec Log Message: - disable stack protector Index: synce.spec =================================================================== RCS file: /cvs/extras/rpms/synce/devel/synce.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- synce.spec 27 Sep 2005 21:47:00 -0000 1.8 +++ synce.spec 28 Sep 2005 06:30:04 -0000 1.9 @@ -89,6 +89,10 @@ --with-libmimedir-include="${MIMEDIRINC}" \ --with-libmimedir-lib="${MIMEDIRLIB}" \ --disable-static +# don't want stack protector on this one +%{__perl} -pi -e 's/-fstack-protector/-fno-stack-protector/;' \ +Makefile src/Makefile lib/Makefile man/Makefile + make LDFLAGS="-L${SYNCEINC} -L${RAPI2INC} -L${MIMEDIRLIB}" cd .. # build the serial support From fedora-extras-commits at redhat.com Wed Sep 28 06:37:06 2005 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Wed, 28 Sep 2005 02:37:06 -0400 Subject: owners owners.list,1.268,1.269 Message-ID: <200509280637.j8S6b6pM021351@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21330 Modified Files: owners.list Log Message: Add cppunit Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.268 retrieving revision 1.269 diff -u -r1.268 -r1.269 --- owners.list 28 Sep 2005 03:28:15 -0000 1.268 +++ owners.list 28 Sep 2005 06:37:04 -0000 1.269 @@ -105,6 +105,7 @@ Fedora Extras|convmv|Convert filename encodings.|nphilipp at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|cook|A file construction tool|gemi at bluewin.ch|extras-qa at fedoraproject.org| Fedora Extras|cpan2rpm|Perl module packager|ghenry at suretecsystems.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|cppunit|C++ unit testing framework|pertusus at free.fr|extras-qa at fedoraproject.org| Fedora Extras|cproto|Generates function prototypes and variable declarations from C code|jnovy at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|crack|Password cracker|Christian.Iseli at licr.org|extras-qa at fedoraproject.org| Fedora Extras|cryptplug|Cryptography plugin for mutt & kmail|dennis at dgilmore.net|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Wed Sep 28 09:20:03 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Wed, 28 Sep 2005 05:20:03 -0400 Subject: rpms/koffice/FC-4 koffice.spec,1.6,1.7 Message-ID: <200509280920.j8S9K3Hu026370@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/koffice/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26351 Modified Files: koffice.spec Log Message: - rebuild Index: koffice.spec =================================================================== RCS file: /cvs/extras/rpms/koffice/FC-4/koffice.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- koffice.spec 16 Aug 2005 07:34:20 -0000 1.6 +++ koffice.spec 28 Sep 2005 09:20:00 -0000 1.7 @@ -1,6 +1,6 @@ Name: koffice Version: 1.4.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: A free, integrated office suite for KDE Group: Applications/Productivity @@ -738,6 +738,10 @@ %{_datadir}/servicetypes/kofilter*.desktop %changelog +* Wed Sep 28 2005 Andreas Bierfert +1.4.1-5 +- rebuild + * Tue Aug 16 2005 Andreas Bierfert 1.4.1-4 - fix libpqxx detection on x86_64 From fedora-extras-commits at redhat.com Wed Sep 28 09:37:58 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Wed, 28 Sep 2005 05:37:58 -0400 Subject: rpms/koffice/devel koffice-qt3.3.5.patch, NONE, 1.1 koffice.spec, 1.8, 1.9 Message-ID: <200509280937.j8S9bwlS026514@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/koffice/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26492 Modified Files: koffice.spec Added Files: koffice-qt3.3.5.patch Log Message: - add patch for qt-3.3.5 problem koffice-qt3.3.5.patch: --- NEW FILE koffice-qt3.3.5.patch --- --- kpresenter/imageEffectBase.ui.orig 2005-09-28 11:33:34.000000000 +0200 +++ kpresenter/imageEffectBase.ui 2005-09-28 11:34:08.000000000 +0200 @@ -1461,20 +1461,5 @@ kcolorbutton.h - kdoublenuminput.h - kcolorbutton.h - kcolorbutton.h - kdoublenuminput.h - kdoublenuminput.h - kdoublenuminput.h - kdoublenuminput.h - kdoublenuminput.h - kdoublenuminput.h - kdoublenuminput.h - kdoublenuminput.h - kdoublenuminput.h - kdoublenuminput.h - kdoublenuminput.h - kdoublenuminput.h Index: koffice.spec =================================================================== RCS file: /cvs/extras/rpms/koffice/devel/koffice.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- koffice.spec 27 Sep 2005 21:57:03 -0000 1.8 +++ koffice.spec 28 Sep 2005 09:37:56 -0000 1.9 @@ -1,6 +1,6 @@ Name: koffice Version: 1.4.1 -Release: 5%{?dist} +Release: 6%{?dist} Summary: A free, integrated office suite for KDE Group: Applications/Productivity @@ -12,6 +12,7 @@ # stuff for the build configuration Patch0: koffice-admin-gcc4isok.patch Patch1: koffice-admin-disable-fvisibility.patch +Patch2: koffice-qt3.3.5.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -193,6 +194,7 @@ %setup -q %patch0 -p1 %patch1 -p1 +%patch2 # this will make sure that patch0 and patch1 are considered make -f admin/Makefile.common @@ -738,6 +740,10 @@ %{_datadir}/servicetypes/kofilter*.desktop %changelog +* Wed Sep 28 2005 Andreas Bierfert +1.4.1-6 +- add patch for qt-3.3.5 problem + * Tue Sep 27 2005 Andreas Bierfert 1.4.1-5 - try to fix devel build From fedora-extras-commits at redhat.com Wed Sep 28 09:43:35 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Wed, 28 Sep 2005 05:43:35 -0400 Subject: rpms/synce/devel synce.spec,1.9,1.10 Message-ID: <200509280943.j8S9hZ1K026600@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/synce/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26581 Modified Files: synce.spec Log Message: - add nother fix Index: synce.spec =================================================================== RCS file: /cvs/extras/rpms/synce/devel/synce.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- synce.spec 28 Sep 2005 06:30:04 -0000 1.9 +++ synce.spec 28 Sep 2005 09:43:33 -0000 1.10 @@ -90,7 +90,7 @@ --with-libmimedir-lib="${MIMEDIRLIB}" \ --disable-static # don't want stack protector on this one -%{__perl} -pi -e 's/-fstack-protector/-fno-stack-protector/;' \ +%{__perl} -pi -e 's/-fstack-protector/-fno-stack-protector -lgcc/;' \ Makefile src/Makefile lib/Makefile man/Makefile make LDFLAGS="-L${SYNCEINC} -L${RAPI2INC} -L${MIMEDIRLIB}" From fedora-extras-commits at redhat.com Wed Sep 28 09:50:10 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Wed, 28 Sep 2005 05:50:10 -0400 Subject: rpms/synce/devel synce.spec,1.10,1.11 Message-ID: <200509280950.j8S9oAJr026691@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/synce/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26672 Modified Files: synce.spec Log Message: - see if this works Index: synce.spec =================================================================== RCS file: /cvs/extras/rpms/synce/devel/synce.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- synce.spec 28 Sep 2005 09:43:33 -0000 1.10 +++ synce.spec 28 Sep 2005 09:50:07 -0000 1.11 @@ -90,10 +90,10 @@ --with-libmimedir-lib="${MIMEDIRLIB}" \ --disable-static # don't want stack protector on this one -%{__perl} -pi -e 's/-fstack-protector/-fno-stack-protector -lgcc/;' \ +%{__perl} -pi -e 's/-fstack-protector/-fno-stack-protector/;' \ Makefile src/Makefile lib/Makefile man/Makefile -make LDFLAGS="-L${SYNCEINC} -L${RAPI2INC} -L${MIMEDIRLIB}" +make LDFLAGS="-L${SYNCEINC} -L${RAPI2INC} -L${MIMEDIRLIB} -lgcc" cd .. # build the serial support cd synce-serial-%{version} From fedora-extras-commits at redhat.com Wed Sep 28 10:09:29 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Wed, 28 Sep 2005 06:09:29 -0400 Subject: rpms/koffice/devel koffice-qt3.3.5.patch,1.1,1.2 Message-ID: <200509281009.j8SA9ggB028186@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/koffice/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28133 Modified Files: koffice-qt3.3.5.patch Log Message: - more qt fixes koffice-qt3.3.5.patch: Index: koffice-qt3.3.5.patch =================================================================== RCS file: /cvs/extras/rpms/koffice/devel/koffice-qt3.3.5.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- koffice-qt3.3.5.patch 28 Sep 2005 09:37:56 -0000 1.1 +++ koffice-qt3.3.5.patch 28 Sep 2005 10:09:27 -0000 1.2 @@ -21,3 +21,13 @@ - kdoublenuminput.h +--- krita/ui/widgets/kis_wdg_autogradient.ui.orig 2005-09-28 12:07:25.000000000 +0200 ++++ krita/ui/widgets/kis_wdg_autogradient.ui 2005-09-28 12:07:44.000000000 +0200 +@@ -406,7 +406,6 @@ + + + +- kisgradientsliderwidget.h + kcolorbutton.h + kcolorbutton.h + From fedora-extras-commits at redhat.com Wed Sep 28 10:22:27 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Wed, 28 Sep 2005 06:22:27 -0400 Subject: rpms/synce/devel synce.spec,1.11,1.12 Message-ID: <200509281022.j8SAMRK4028312@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/synce/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28293 Modified Files: synce.spec Log Message: - try to fix hidden symbol error Index: synce.spec =================================================================== RCS file: /cvs/extras/rpms/synce/devel/synce.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- synce.spec 28 Sep 2005 09:50:07 -0000 1.11 +++ synce.spec 28 Sep 2005 10:22:24 -0000 1.12 @@ -46,7 +46,7 @@ # build libsynce cd synce-libsynce-%{version} %configure --disable-static -make +make LDFLAGS="-lgcc" SYNCEINC="$(pwd)/lib" SYNCELIB="$(pwd)/lib/.libs" cd .. @@ -56,7 +56,7 @@ --with-libsynce-include="${SYNCEINC}" \ --with-libsynce-lib="${SYNCELIB}" \ --disable-static -make LDFLAGS="-L${SYNCEINC}" +make LDFLAGS="-L${SYNCEINC} -lgcc" cd .. # build librapi2 cd synce-librapi2-%{version} @@ -64,7 +64,7 @@ --with-libsynce-include="${SYNCEINC}" \ --with-libsynce-lib="${SYNCELIB}" \ --disable-static -make LDFLAGS="-L${SYNCEINC}" +make LDFLAGS="-L${SYNCEINC} -lgcc" RAPI2INC="$(pwd)/src" RAPI2LIB="$(pwd)/src/.libs" cd .. From rc040203 at freenet.de Wed Sep 28 11:16:01 2005 From: rc040203 at freenet.de (Ralf Corsepius) Date: Wed, 28 Sep 2005 13:16:01 +0200 Subject: rpms/synce/devel synce.spec,1.11,1.12 In-Reply-To: <200509281022.j8SAMRK4028312@cvs-int.fedora.redhat.com> References: <200509281022.j8SAMRK4028312@cvs-int.fedora.redhat.com> Message-ID: <1127906161.25763.196.camel@mccallum.corsepiu.local> On Wed, 2005-09-28 at 06:22 -0400, Andreas Bierfert wrote: > Author: awjb > > Update of /cvs/extras/rpms/synce/devel > In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28293 > > Modified Files: > synce.spec > Log Message: > - try to fix hidden symbol error > > > > Index: synce.spec > =================================================================== > RCS file: /cvs/extras/rpms/synce/devel/synce.spec,v > retrieving revision 1.11 > retrieving revision 1.12 > diff -u -r1.11 -r1.12 > --- synce.spec 28 Sep 2005 09:50:07 -0000 1.11 > +++ synce.spec 28 Sep 2005 10:22:24 -0000 1.12 > @@ -46,7 +46,7 @@ > # build libsynce > cd synce-libsynce-%{version} > %configure --disable-static > -make > +make LDFLAGS="-lgcc" Urgh - Are you serious about this? I don't know why this package needs this, but in general -lgcc is _never_ correct and indicates very serious problems inside of the package. Ralf From fedora-extras-commits at redhat.com Wed Sep 28 11:24:44 2005 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Wed, 28 Sep 2005 07:24:44 -0400 Subject: rpms/fish/devel .cvsignore, 1.3, 1.4 fish.spec, 1.4, 1.5 sources, 1.3, 1.4 Message-ID: <200509281124.j8SBOi2x029933@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/rpms/fish/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29910 Modified Files: .cvsignore fish.spec sources Log Message: * Import new fish release. Axel wanted me to do so... Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/fish/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 16 Jul 2005 05:08:26 -0000 1.3 +++ .cvsignore 28 Sep 2005 11:24:42 -0000 1.4 @@ -1 +1 @@ -fish-1.12.0.tar.bz2 +fish-1.14.0.tar.bz2 Index: fish.spec =================================================================== RCS file: /cvs/extras/rpms/fish/devel/fish.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- fish.spec 16 Jul 2005 05:08:26 -0000 1.4 +++ fish.spec 28 Sep 2005 11:24:42 -0000 1.5 @@ -1,7 +1,7 @@ Summary: A friendly interactive shell Name: fish -Version: 1.12.0 +Version: 1.14.0 Release: 1%{?dist} License: GPL @@ -54,6 +54,8 @@ %_mandir/man1/tokenize.1* %_mandir/man1/count.1* %attr(0755,root,root) %_bindir/fish +%attr(0755,root,root) %_bindir/fishd +%attr(0755,root,root) %_bindir/fish_pager %attr(0755,root,root) %_bindir/xsel %attr(0755,root,root) %_bindir/set_color %attr(0755,root,root) %_bindir/tokenize @@ -63,8 +65,34 @@ %config %_sysconfdir/fish_inputrc %dir %_sysconfdir/fish.d %config %_sysconfdir/fish.d/fish_*.fish +%dir %_sysconfdir/fish.d/completions +%config %_sysconfdir/fish.d/completions/*.fish %changelog +* Sat Sep 24 2005 Axel Liljencrantz 1.14.0-0 +- 1.14.0 + +* Mon Sep 12 2005 Axel Liljencrantz 1.13.4-0 +- 1.13.4 + +* Wed Sep 07 2005 Axel Liljencrantz 1.13.3-0 +- 1.13.3 + +* Tue Sep 06 2005 Axel Liljencrantz 1.13.2-0 +- 1.13.2 + +* Fri Aug 30 2005 Axel Liljencrantz 1.13.1-0 +- 1.13.1 + +* Sun Aug 28 2005 Axel Liljencrantz 1.13.0-0 +- 1.13.0 + +* Sat Aug 13 2005 Axel Liljencrantz 1.13.0-0 +- Add completions subdirectory + +* Thu Jul 28 2005 Axel Liljencrantz 1.12.1-0 +- 1.12.1 + * Fri Jul 15 2005 Axel Liljencrantz 1.12.0-1 - 1.12.0 Index: sources =================================================================== RCS file: /cvs/extras/rpms/fish/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 16 Jul 2005 05:08:26 -0000 1.3 +++ sources 28 Sep 2005 11:24:42 -0000 1.4 @@ -1 +1 @@ -8980e6dd1a41d699a44c2579c9b1e36c fish-1.12.0.tar.bz2 +c1a1fd6b6a31e9ff93aa916f910d1692 fish-1.14.0.tar.bz2 From fedora-extras-commits at redhat.com Wed Sep 28 11:26:38 2005 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Wed, 28 Sep 2005 07:26:38 -0400 Subject: rpms/fish/FC-4 .cvsignore, 1.3, 1.4 fish.spec, 1.4, 1.5 sources, 1.3, 1.4 Message-ID: <200509281126.j8SBQcqk030015@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/rpms/fish/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29992 Modified Files: .cvsignore fish.spec sources Log Message: * Import new fish release. Axel wanted me to do so... Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/fish/FC-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 26 Jul 2005 17:23:45 -0000 1.3 +++ .cvsignore 28 Sep 2005 11:26:36 -0000 1.4 @@ -1 +1 @@ -fish-1.12.0.tar.bz2 +fish-1.14.0.tar.bz2 Index: fish.spec =================================================================== RCS file: /cvs/extras/rpms/fish/FC-4/fish.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- fish.spec 26 Jul 2005 17:23:45 -0000 1.4 +++ fish.spec 28 Sep 2005 11:26:36 -0000 1.5 @@ -1,7 +1,7 @@ Summary: A friendly interactive shell Name: fish -Version: 1.12.0 +Version: 1.14.0 Release: 1%{?dist} License: GPL @@ -54,6 +54,8 @@ %_mandir/man1/tokenize.1* %_mandir/man1/count.1* %attr(0755,root,root) %_bindir/fish +%attr(0755,root,root) %_bindir/fishd +%attr(0755,root,root) %_bindir/fish_pager %attr(0755,root,root) %_bindir/xsel %attr(0755,root,root) %_bindir/set_color %attr(0755,root,root) %_bindir/tokenize @@ -63,11 +65,41 @@ %config %_sysconfdir/fish_inputrc %dir %_sysconfdir/fish.d %config %_sysconfdir/fish.d/fish_*.fish +%dir %_sysconfdir/fish.d/completions +%config %_sysconfdir/fish.d/completions/*.fish %changelog +* Sat Sep 24 2005 Axel Liljencrantz 1.14.0-0 +- 1.14.0 + +* Mon Sep 12 2005 Axel Liljencrantz 1.13.4-0 +- 1.13.4 + +* Wed Sep 07 2005 Axel Liljencrantz 1.13.3-0 +- 1.13.3 + +* Tue Sep 06 2005 Axel Liljencrantz 1.13.2-0 +- 1.13.2 + +* Fri Aug 30 2005 Axel Liljencrantz 1.13.1-0 +- 1.13.1 + +* Sun Aug 28 2005 Axel Liljencrantz 1.13.0-0 +- 1.13.0 + +* Sat Aug 13 2005 Axel Liljencrantz 1.13.0-0 +- Add completions subdirectory + +* Thu Jul 28 2005 Axel Liljencrantz 1.12.1-0 +- 1.12.1 + * Fri Jul 15 2005 Axel Liljencrantz 1.12.0-1 - 1.12.0 +* Fri Jul 01 2005 Oliver Falk - 1.11.1-10 +- Added dist macro to the release +- Small spec beautifying + * Thu Jun 30 2005 Michael Schwendt 1.11.1-9 - Set CFLAGS the proper way Index: sources =================================================================== RCS file: /cvs/extras/rpms/fish/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 26 Jul 2005 17:23:45 -0000 1.3 +++ sources 28 Sep 2005 11:26:36 -0000 1.4 @@ -1 +1 @@ -8980e6dd1a41d699a44c2579c9b1e36c fish-1.12.0.tar.bz2 +c1a1fd6b6a31e9ff93aa916f910d1692 fish-1.14.0.tar.bz2 From fedora-extras-commits at redhat.com Wed Sep 28 11:27:24 2005 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Wed, 28 Sep 2005 07:27:24 -0400 Subject: rpms/fish/FC-3 .cvsignore, 1.3, 1.4 fish.spec, 1.4, 1.5 sources, 1.3, 1.4 Message-ID: <200509281127.j8SBROmE030087@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/rpms/fish/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30064 Modified Files: .cvsignore fish.spec sources Log Message: * Import new fish release. Axel wanted me to do so... Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/fish/FC-3/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 26 Jul 2005 17:22:46 -0000 1.3 +++ .cvsignore 28 Sep 2005 11:27:22 -0000 1.4 @@ -1 +1 @@ -fish-1.12.0.tar.bz2 +fish-1.14.0.tar.bz2 Index: fish.spec =================================================================== RCS file: /cvs/extras/rpms/fish/FC-3/fish.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- fish.spec 26 Jul 2005 17:22:46 -0000 1.4 +++ fish.spec 28 Sep 2005 11:27:22 -0000 1.5 @@ -1,7 +1,7 @@ Summary: A friendly interactive shell Name: fish -Version: 1.12.0 +Version: 1.14.0 Release: 1%{?dist} License: GPL @@ -54,6 +54,8 @@ %_mandir/man1/tokenize.1* %_mandir/man1/count.1* %attr(0755,root,root) %_bindir/fish +%attr(0755,root,root) %_bindir/fishd +%attr(0755,root,root) %_bindir/fish_pager %attr(0755,root,root) %_bindir/xsel %attr(0755,root,root) %_bindir/set_color %attr(0755,root,root) %_bindir/tokenize @@ -63,11 +65,41 @@ %config %_sysconfdir/fish_inputrc %dir %_sysconfdir/fish.d %config %_sysconfdir/fish.d/fish_*.fish +%dir %_sysconfdir/fish.d/completions +%config %_sysconfdir/fish.d/completions/*.fish %changelog +* Sat Sep 24 2005 Axel Liljencrantz 1.14.0-0 +- 1.14.0 + +* Mon Sep 12 2005 Axel Liljencrantz 1.13.4-0 +- 1.13.4 + +* Wed Sep 07 2005 Axel Liljencrantz 1.13.3-0 +- 1.13.3 + +* Tue Sep 06 2005 Axel Liljencrantz 1.13.2-0 +- 1.13.2 + +* Fri Aug 30 2005 Axel Liljencrantz 1.13.1-0 +- 1.13.1 + +* Sun Aug 28 2005 Axel Liljencrantz 1.13.0-0 +- 1.13.0 + +* Sat Aug 13 2005 Axel Liljencrantz 1.13.0-0 +- Add completions subdirectory + +* Thu Jul 28 2005 Axel Liljencrantz 1.12.1-0 +- 1.12.1 + * Fri Jul 15 2005 Axel Liljencrantz 1.12.0-1 - 1.12.0 +* Fri Jul 01 2005 Oliver Falk - 1.11.1-10 +- Added dist macro to the release +- Small spec beautifying + * Thu Jun 30 2005 Michael Schwendt 1.11.1-9 - Set CFLAGS the proper way Index: sources =================================================================== RCS file: /cvs/extras/rpms/fish/FC-3/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 26 Jul 2005 17:22:46 -0000 1.3 +++ sources 28 Sep 2005 11:27:22 -0000 1.4 @@ -1 +1 @@ -8980e6dd1a41d699a44c2579c9b1e36c fish-1.12.0.tar.bz2 +c1a1fd6b6a31e9ff93aa916f910d1692 fish-1.14.0.tar.bz2 From fedora-extras-commits at redhat.com Wed Sep 28 11:34:17 2005 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Wed, 28 Sep 2005 07:34:17 -0400 Subject: rpms/bigloo - New directory Message-ID: <200509281134.j8SBYHVT030227@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/bigloo In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30203/bigloo Log Message: Directory /cvs/extras/rpms/bigloo added to the repository From fedora-extras-commits at redhat.com Wed Sep 28 11:34:17 2005 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Wed, 28 Sep 2005 07:34:17 -0400 Subject: rpms/bigloo/devel - New directory Message-ID: <200509281134.j8SBYHGZ030232@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/bigloo/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30203/bigloo/devel Log Message: Directory /cvs/extras/rpms/bigloo/devel added to the repository From fedora-extras-commits at redhat.com Wed Sep 28 11:34:49 2005 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Wed, 28 Sep 2005 07:34:49 -0400 Subject: rpms/bigloo Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200509281134.j8SBYn2A030277@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/bigloo In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30248 Added Files: Makefile import.log Log Message: Setup of module bigloo --- NEW FILE Makefile --- # Top level Makefile for module bigloo all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Wed Sep 28 11:34:49 2005 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Wed, 28 Sep 2005 07:34:49 -0400 Subject: rpms/bigloo/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200509281134.j8SBYnHT030282@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/bigloo/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30248/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module bigloo --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Wed Sep 28 11:52:57 2005 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Wed, 28 Sep 2005 07:52:57 -0400 Subject: rpms/bigloo import.log,1.1,1.2 Message-ID: <200509281153.j8SBrRsm030488@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/bigloo In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30449 Modified Files: import.log Log Message: auto-import bigloo-2.6f-1 on branch devel from bigloo-2.6f-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/bigloo/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 28 Sep 2005 11:34:46 -0000 1.1 +++ import.log 28 Sep 2005 11:52:55 -0000 1.2 @@ -0,0 +1 @@ +bigloo-2_6f-1:HEAD:bigloo-2.6f-1.src.rpm:1127908365 From fedora-extras-commits at redhat.com Wed Sep 28 11:52:57 2005 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Wed, 28 Sep 2005 07:52:57 -0400 Subject: rpms/bigloo/devel bigloo.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200509281152.j8SBqv9b030481@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/bigloo/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30449/devel Modified Files: .cvsignore sources Added Files: bigloo.spec Log Message: auto-import bigloo-2.6f-1 on branch devel from bigloo-2.6f-1.src.rpm --- NEW FILE bigloo.spec --- Name: bigloo Version: 2.6f Release: 1%{?dist} Summary: Bigloo is compiler for the Scheme programming language Group: Development/Languages License: GPL URL: http://www-sop.inria.fr/mimosa/fp/Bigloo Source: ftp://ftp-sop.inria.fr/mimosa/fp/Bigloo/bigloo2.6f.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: emacs, emacs-el, xemacs, xemacs-el, /sbin/install-info Requires: bigloo-libs = %{version}-%{release} Requires(post): /sbin/install-info Requires(postun): /sbin/install-info %description Bigloo is a Scheme implementation devoted to one goal: enabling Scheme based programming style where C(++) is usually required. Bigloo attempts to make Scheme practical by offering features usually presented by traditional programming languages but ot offered by Scheme and functional programming. Bigloo compiles Scheme modules. It delivers small and fast stand alone binary executables. Bigloo enables full connections between Scheme and C programs. %package libs Summary: Bigloo runtime libraries Group: System Environment/Libraries %description libs Runtime libraries for Bigloo compiled programs. %package doc Summary: Bigloo documentation Group: Development/Languages %description doc Documentation for the Bigloo compiler and integrated development environment. %package emacs Summary: Bigloo Emacs environment Group: Development/Languages Requires: emacs-common %description emacs Emacs development environment for Bigloo %package xemacs Summary: Bigloo XEmacs environment Group: Development/Languages Requires: xemacs-common %description xemacs XEmacs development environment for Bigloo %prep %setup -q -n %{name}%{version} perl -pi -e 's|bmask=755|bmask=644|' configure %build %define emacslisppath %{_datadir}/emacs/site-lisp %define xemacslisppath %{_datadir}/xemacs/site-packages/lisp %define inplace `pwd`/inplace ./configure \ --prefix=%{_prefix} \ --bindir=%{_bindir} \ --libdir=%{_libdir} \ --mandir=%{_mandir}/man1 \ --infodir=%{_infodir} \ --docdir=%{_docdir} \ --lispdir=%{emacslisppath}/bigloo \ --bee=full \ --native-default-backend \ --emacs=emacs \ %{?_with_java: --jvm=yes} %{!?_with_java: --jvm=no} \ %{?_with_mono: --dotnet=yes --mono} \ %{?_with_pnet: --dotnet=yes --pnet} \ --sharedbde=yes \ --sharedcompiler=yes \ --coflags="$RPM_OPT_FLAGS" perl -pi -e 's|EMACSBRAND=.*|EMACSBRAND=emacs21|' Makefile.config # _smp_mflags breaks the build make env LD_LIBRARY_PATH=`pwd`/lib/%{version} \ make DESTDIR=%{inplace} install env LD_LIBRARY_PATH=%{inplace}%{_libdir} \ BIGLOOLIB=%{inplace}%{_libdir}/bigloo/%{version} \ make compile-bee %install rm -rf $RPM_BUILD_ROOT env LD_LIBRARY_PATH=`pwd`/lib/%{version} \ make DESTDIR=$RPM_BUILD_ROOT install env LD_LIBRARY_PATH=`pwd`/lib/%{version} \ make DESTDIR=$RPM_BUILD_ROOT EMACSDIR=$RPM_BUILD_ROOT%{emacslisppath}/bigloo install-bee make -C manuals DESTDIR=$RPM_BUILD_ROOT install-bee chmod 755 $RPM_BUILD_ROOT%{_bindir}/* ( cd $RPM_BUILD_ROOT%{_libdir} chmod 755 bigloo/%{version}/*.so rm -f *.so mv bigloo/%{version}/*.so . (cd bigloo/%{version}; ln -sf ../../*.so .) ) rm -fr $RPM_BUILD_ROOT%{_infodir}/dir rm -fr $RPM_BUILD_ROOT%{_datadir}/doc perl -pi -e 's|^BOOTBINDIR=.*|BOOTBINDIR=%{_bindir}|' Makefile.config mkdir -p $RPM_BUILD_ROOT%{emacslisppath}/site-start.d cat > $RPM_BUILD_ROOT%{emacslisppath}/site-start.d/bigloo.el < $RPM_BUILD_ROOT%{xemacslisppath}/site-start.d/bigloo.el </dev/null || : %postun if [ $1 = 0 ]; then /sbin/install-info --delete %{_infodir}/bigloo.info %{_infodir}/dir 2>/dev/null || : fi %post libs -p /sbin/ldconfig %postun libs -p /sbin/ldconfig %files %defattr(-,root,root,-) %{_bindir}/* %{_libdir}/bigloo %{_infodir}/* %{_mandir}/man*/* %doc Makefile.config examples LICENSE COPYING %doc README* %doc tutorial %files emacs %defattr(-,root,root,-) %{emacslisppath}/bigloo %{emacslisppath}/site-start.d/bigloo.el %files xemacs %defattr(-,root,root,-) %{xemacslisppath}/bigloo %{xemacslisppath}/site-start.d/bigloo.el %files libs %defattr(-,root,root,-) %{_libdir}/lib*.so %files doc %defattr(-,root,root,-) %doc manuals/*.html %changelog * Tue Sep 27 2005 Gerard Milmeister - 2.6f-3 - Removed --arch * Fri Feb 18 2005 Gerard Milmeister - 0:2.6f-1 - New Version 2.6f * Sun Feb 13 2005 Gerard Milmeister - 0:2.6e-1 - New Version 2.6e * Tue Mar 16 2004 Gerard Milmeister - 0:2.6-0.fdr.1.c - New Version 2.6c - Separated Emacs and XEmacs packages * Tue Dec 16 2003 Gerard Milmeister - 0:2.6-0.fdr.1.b - New Version 2.6b * Thu Nov 27 2003 Gerard Milmeister - 0:2.6-0.fdr.1.a - First Fedora release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/bigloo/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 28 Sep 2005 11:34:47 -0000 1.1 +++ .cvsignore 28 Sep 2005 11:52:55 -0000 1.2 @@ -0,0 +1 @@ +bigloo2.6f.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/bigloo/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 28 Sep 2005 11:34:47 -0000 1.1 +++ sources 28 Sep 2005 11:52:55 -0000 1.2 @@ -0,0 +1 @@ +bc99b1919adee864dd371aeebc36862c bigloo2.6f.tar.gz From fedora-extras-commits at redhat.com Wed Sep 28 12:29:42 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Wed, 28 Sep 2005 08:29:42 -0400 Subject: rpms/perl-Class-Autouse/devel .cvsignore, 1.2, 1.3 perl-Class-Autouse.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200509281229.j8SCTg9H032089@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-Class-Autouse/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32066 Modified Files: .cvsignore perl-Class-Autouse.spec sources Log Message: Update Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Class-Autouse/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 15 Sep 2005 03:49:33 -0000 1.2 +++ .cvsignore 28 Sep 2005 12:29:40 -0000 1.3 @@ -1 +1 @@ -Class-Autouse-1.20.tar.gz +Class-Autouse-1.21.tar.gz Index: perl-Class-Autouse.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Class-Autouse/devel/perl-Class-Autouse.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-Class-Autouse.spec 15 Sep 2005 03:54:30 -0000 1.2 +++ perl-Class-Autouse.spec 28 Sep 2005 12:29:40 -0000 1.3 @@ -1,6 +1,6 @@ Name: perl-Class-Autouse -Version: 1.20 -Release: 2%{?dist} +Version: 1.21 +Release: 1%{?dist} Summary: Run-time class loading on first method call License: GPL or Artistic Group: Development/Libraries @@ -12,7 +12,7 @@ BuildArch: noarch BuildRequires: perl(Test::More) >= 0.47 -BuildRequires: perl(Carp) >= 1.03 +BuildRequires: perl(Carp) BuildRequires: perl(File::Spec) >= 0.82 BuildRequires: perl(List::Util) >= 1.11 @@ -53,6 +53,10 @@ %{_mandir}/man3/* %changelog +* Wed Sep 28 2005 Ralf Corsepius - 1.21-1 +- Upstream update. +- Fix bogus dep on perl(Carp). + * Thu Sep 15 2005 Ralf Corsepius - 1.20-2 - Spec cleanup. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Class-Autouse/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 15 Sep 2005 03:49:33 -0000 1.2 +++ sources 28 Sep 2005 12:29:40 -0000 1.3 @@ -1 +1 @@ -746a4f415dd8c7267bcec07841022275 Class-Autouse-1.20.tar.gz +3bf4fadd8349e57d6af0961b6565c74f Class-Autouse-1.21.tar.gz From fedora-extras-commits at redhat.com Wed Sep 28 13:02:00 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 28 Sep 2005 09:02:00 -0400 Subject: rpms/sbcl/FC-4 sbcl.spec,1.16,1.17 Message-ID: <200509281302.j8SD20YW001115@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/sbcl/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1096 Modified Files: sbcl.spec Log Message: * Wed Sep 28 2005 Rex Dieter 0.9.5-9 - more ppc work Index: sbcl.spec =================================================================== RCS file: /cvs/extras/rpms/sbcl/FC-4/sbcl.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- sbcl.spec 28 Sep 2005 01:23:45 -0000 1.16 +++ sbcl.spec 28 Sep 2005 13:01:58 -0000 1.17 @@ -3,14 +3,15 @@ Name: sbcl Summary: Steel Bank Common Lisp Version: 0.9.5 -Release: 8%{?dist} +Release: 9%{?dist} License: BSD/MIT Group: Development/Languages URL: http://sbcl.sourceforge.net/ Source0: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-%{version}-source.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -ExclusiveArch: %{ix86} x86_64 +#ExclusiveArch: %{ix86} x86_64 +ExclusiveArch: ppc ## x86 section #Source10: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.4-x86-linux-binary.tar.bz2 @@ -31,7 +32,7 @@ ## ppc section # Latest powerpc-linux bootstrap, busted: # buildsys.fedoraproject.org/logs/development/1131-sbcl-0.9.4-14.fc5/ppc/build.log -#Source30: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.8.15-powerpc-linux-binary.tar.bz2 +Source30: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.8.15-powerpc-linux-binary.tar.bz2 # another possible ppc bootstrap to try #Source31: http://clozure.com/openmcl/ftp/openmcl-linuxppc-all-0.14.3.tar.gz %ifarch ppc @@ -165,6 +166,9 @@ %changelog +* Wed Sep 28 2005 Rex Dieter 0.9.5-9 +- more ppc work + * Tue Sep 27 2005 Rex Dieter 0.9.5-8 - respin (fc3/fc4) From fedora-extras-commits at redhat.com Wed Sep 28 14:16:50 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 28 Sep 2005 10:16:50 -0400 Subject: rpms/sbcl/FC-4 customize-target-features.lisp, NONE, 1.1 sbcl-0.9.5-make-config-fix.patch, NONE, 1.1 sbcl.spec, 1.17, 1.18 Message-ID: <200509281416.j8SEGoGd002776@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/sbcl/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2753 Modified Files: sbcl.spec Added Files: customize-target-features.lisp sbcl-0.9.5-make-config-fix.patch Log Message: customize-target-features.lisp (for :sb-thread) make-config.sh patch to properly find Config --- NEW FILE customize-target-features.lisp --- (lambda (features) (flet ((enable (x) (pushnew x features)) (disable (x) (setf features (remove x features)))) ;; Threading support, available on x86/x86-64 Linux only. (enable :sb-thread))) sbcl-0.9.5-make-config-fix.patch: --- NEW FILE sbcl-0.9.5-make-config-fix.patch --- --- sbcl-0.9.5/make-config.sh.fix 2005-09-21 10:00:33.000000000 -0500 +++ sbcl-0.9.5/make-config.sh 2005-09-28 09:00:48.000000000 -0500 @@ -208,7 +208,7 @@ # cross-compilers! # # FIXME: integrate to grovel-features, mayhaps - $GNUMAKE -C tools-for-build determine-endianness -I src/runtime + $GNUMAKE -C tools-for-build determine-endianness -I ../src/runtime tools-for-build/determine-endianness >> $ltf elif [ "$sbcl_arch" = "ppc" -a "$sbcl_os" = "linux" ]; then # Use a C program to detect which kind of glibc we're building on, @@ -217,7 +217,7 @@ # # FIXME: integrate to grovel-features., maypahps printf ' :stack-allocatable-closures' >> $ltf - $GNUMAKE -C tools-for-build where-is-mcontext -I src/runtime + $GNUMAKE -C tools-for-build where-is-mcontext -I ../src/runtime tools-for-build/where-is-mcontext > src/runtime/ppc-linux-mcontext.h elif [ "$sbcl_arch" = "ppc" -a "$sbcl_os" = "darwin" ]; then printf ' :stack-allocatable-closures' >> $ltf Index: sbcl.spec =================================================================== RCS file: /cvs/extras/rpms/sbcl/FC-4/sbcl.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- sbcl.spec 28 Sep 2005 13:01:58 -0000 1.17 +++ sbcl.spec 28 Sep 2005 14:16:48 -0000 1.18 @@ -3,7 +3,7 @@ Name: sbcl Summary: Steel Bank Common Lisp Version: 0.9.5 -Release: 9%{?dist} +Release: 10%{?dist} License: BSD/MIT Group: Development/Languages @@ -13,6 +13,8 @@ #ExclusiveArch: %{ix86} x86_64 ExclusiveArch: ppc +Source1: customize-target-features.lisp + ## x86 section #Source10: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.4-x86-linux-binary.tar.bz2 %ifarch %{ix86} @@ -48,6 +50,7 @@ Patch2: sbcl-0.9.5-personality.patch Patch3: sbcl-0.9.5-optflags.patch Patch4: sbcl-0.9.4-LIB_DIR.patch +Patch5: sbcl-0.9.5-make-config-fix.patch Requires(post): /sbin/install-info Requires(preun): /sbin/install-info @@ -70,17 +73,12 @@ %patch2 -p1 -b .personality %patch3 -p1 -b .optflags %patch4 -p1 -b .LIB_DIR +%patch5 -p1 -b .make-config-fix -# http://article.gmane.org/gmane.lisp.steel-bank.general/340 -# enable threads (was only for >= 2.6, but code has checks to disable for <= 2.4) -## FIXME(?): per section 2.2 of INSTALL, should create/use customize-target-features.lisp -## to customize features -- Rex -#define kernel_ver %(uname -r | cut -d- -f1 | cut -d. -f-2 ) -#if "%{?kernel_ver}" >= "2.6" %ifarch %{ix86} x86_64 #sed -i -e "s|; :sb-thread|:sb-thread|" base-target-features.lisp-expr +#cp %{SOURCE1} ./customize-target-features.lisp %endif -#endif %if "%{?sbcl_bootstrap_src}" != "%{nil}" mkdir sbcl-bootstrap @@ -166,7 +164,7 @@ %changelog -* Wed Sep 28 2005 Rex Dieter 0.9.5-9 +* Wed Sep 28 2005 Rex Dieter 0.9.5-10 - more ppc work * Tue Sep 27 2005 Rex Dieter 0.9.5-8 From fedora-extras-commits at redhat.com Wed Sep 28 14:21:56 2005 From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert)) Date: Wed, 28 Sep 2005 10:21:56 -0400 Subject: rpms/regexxer/devel regexxer.spec,1.1,1.2 Message-ID: <200509281421.j8SELuQZ002858@cvs-int.fedora.redhat.com> Author: cwickert Update of /cvs/extras/rpms/regexxer/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2839 Modified Files: regexxer.spec Log Message: rel 0.2 with additional changelog info Index: regexxer.spec =================================================================== RCS file: /cvs/extras/rpms/regexxer/devel/regexxer.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- regexxer.spec 28 Sep 2005 00:18:35 -0000 1.1 +++ regexxer.spec 28 Sep 2005 14:21:54 -0000 1.2 @@ -1,6 +1,6 @@ Name: regexxer Version: 0.8 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A nifty GUI search/replace tool Group: Applications/Text @@ -84,5 +84,9 @@ %changelog +* Wed Sep 23 2005 Christoph Wickert - 0.8-2 +- Removed hardcoded dependency on gconfmm26. +- Remoded duplicate BuildRequires gtkmm24-devel. + * Thu Sep 22 2005 Christoph Wickert - 0.8-1 - Initial RPM release. From fedora-extras-commits at redhat.com Wed Sep 28 14:47:50 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Wed, 28 Sep 2005 10:47:50 -0400 Subject: rpms/koffice/devel koffice-qt3.3.5.patch,1.2,1.3 Message-ID: <200509281447.j8SEloo8002981@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/koffice/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2958 Modified Files: koffice-qt3.3.5.patch Log Message: - more fixes koffice-qt3.3.5.patch: Index: koffice-qt3.3.5.patch =================================================================== RCS file: /cvs/extras/rpms/koffice/devel/koffice-qt3.3.5.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- koffice-qt3.3.5.patch 28 Sep 2005 10:09:27 -0000 1.2 +++ koffice-qt3.3.5.patch 28 Sep 2005 14:47:48 -0000 1.3 @@ -31,3 +31,14 @@ kcolorbutton.h kcolorbutton.h +--- krita/ui/kis_previewwidgetbase.ui.orig 2005-09-28 16:46:19.000000000 +0200 ++++ krita/ui/kis_previewwidgetbase.ui 2005-09-28 16:46:38.000000000 +0200 +@@ -201,8 +201,4 @@ + + + +- +- kispreviewview.h +- kispreviewview.h +- + From fedora-extras-commits at redhat.com Wed Sep 28 14:51:27 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Wed, 28 Sep 2005 10:51:27 -0400 Subject: rpms/libpqxx/FC-4 libpqxx.spec,1.3,1.4 Message-ID: <200509281451.j8SEpRLb003070@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/libpqxx/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3051 Modified Files: libpqxx.spec Log Message: - fix #169441 Index: libpqxx.spec =================================================================== RCS file: /cvs/extras/rpms/libpqxx/FC-4/libpqxx.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- libpqxx.spec 27 Sep 2005 20:54:43 -0000 1.3 +++ libpqxx.spec 28 Sep 2005 14:51:25 -0000 1.4 @@ -1,6 +1,6 @@ Name: libpqxx Version: 2.5.5 -Release: 4%{?dist} +Release: 5%{?dist} Summary: C++ client API for PostgreSQL Group: System Environment/Libraries @@ -30,9 +30,11 @@ %prep %setup -q +# Don't pull in extra crud when clients link +perl -pi.no-pqlibs -e 's|@POSTGRES_LIB@||' pqxx-config.in %build -%configure --enable-shared +%configure --enable-shared --disable-static # I hate rpath... ;) %{__perl} -pi -e 's/hardcode_into_libs=yes/hardcode_into_libs=no/;' \ libtool @@ -60,13 +62,15 @@ %files devel %doc README-UPGRADE %{_bindir}/pqxx-config -%{_libdir}/libpqxx.a %{_libdir}/libpqxx.so %{_includedir}/pqxx %{_libdir}/pkgconfig/libpqxx.pc %changelog -* Tue Sep 27 2005 Andreas Bierfert 2.5.5-1 +* Wed Sep 28 2005 Andreas Bierfert 2.5.5-5 +- fix #169441 + +* Tue Sep 27 2005 Andreas Bierfert 2.5.5-4 - version upgrade * Tue Jul 05 2005 Andreas Bierfert 2.5.4-4 From fedora-extras-commits at redhat.com Wed Sep 28 14:55:07 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Wed, 28 Sep 2005 10:55:07 -0400 Subject: rpms/libpqxx/devel libpqxx.spec,1.4,1.5 Message-ID: <200509281455.j8SEt7hD003137@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/libpqxx/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3118 Modified Files: libpqxx.spec Log Message: - fix #169441 Index: libpqxx.spec =================================================================== RCS file: /cvs/extras/rpms/libpqxx/devel/libpqxx.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- libpqxx.spec 27 Sep 2005 21:21:18 -0000 1.4 +++ libpqxx.spec 28 Sep 2005 14:55:05 -0000 1.5 @@ -1,6 +1,6 @@ Name: libpqxx Version: 2.5.5 -Release: 5%{?dist} +Release: 6%{?dist} Summary: C++ client API for PostgreSQL Group: System Environment/Libraries @@ -30,9 +30,11 @@ %prep %setup -q +# Don't pull in extra crud when clients link +perl -pi.no-pqlibs -e 's|@POSTGRES_LIB@||' pqxx-config.in %build -%configure --enable-shared --disable-thread-safety +%configure --enable-shared --disable-thread-safety --disable-static # I hate rpath... ;) %{__perl} -pi -e 's/hardcode_into_libs=yes/hardcode_into_libs=no/;' \ libtool @@ -60,12 +62,14 @@ %files devel %doc README-UPGRADE %{_bindir}/pqxx-config -%{_libdir}/libpqxx.a %{_libdir}/libpqxx.so %{_includedir}/pqxx %{_libdir}/pkgconfig/libpqxx.pc %changelog +* Wed Sep 28 2005 Andreas Bierfert 2.5.5-6 +- fix #169441 + * Tue Sep 27 2005 Andreas Bierfert 2.5.5-5 - try fc5 build From fedora-extras-commits at redhat.com Wed Sep 28 15:10:56 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 28 Sep 2005 11:10:56 -0400 Subject: rpms/sbcl/FC-4 sbcl-0.9.5-verbose-build.patch, NONE, 1.1 sbcl-0.9.4-LIB_DIR.patch, 1.2, 1.3 sbcl.spec, 1.18, 1.19 Message-ID: <200509281510.j8SFAujN004647@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/sbcl/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4618 Modified Files: sbcl-0.9.4-LIB_DIR.patch sbcl.spec Added Files: sbcl-0.9.5-verbose-build.patch Log Message: make build verbose, try to determine where failure(s) occur touchup LIB_DIR patch sbcl-0.9.5-verbose-build.patch: --- NEW FILE sbcl-0.9.5-verbose-build.patch --- --- sbcl-0.9.5/make.sh.verbose 2005-09-21 10:00:33.000000000 -0500 +++ sbcl-0.9.5/make.sh 2005-09-28 10:08:15.560262424 -0500 @@ -70,7 +70,7 @@ # If you're cross-compiling, you should probably just walk through the # make-config.sh script by hand doing the right thing on both the host # and target machines. -sh make-config.sh +sh -x make-config.sh # Enforce the source policy for no bogus whitespace tools-for-build/canonicalize-whitespace @@ -102,11 +102,11 @@ # Or, if you can set up the files somewhere shared (with NFS, AFS, or # whatever) between the host machine and the target machine, the basic # procedure above should still work, but you can skip the "copy" steps. -time sh make-host-1.sh -time sh make-target-1.sh -time sh make-host-2.sh -time sh make-target-2.sh -time sh make-target-contrib.sh +time sh -x make-host-1.sh +time sh -x make-target-1.sh +time sh -x make-host-2.sh +time sh -x make-target-2.sh +time sh -x make-target-contrib.sh NCONTRIBS=`find contrib -name Makefile -print | wc -l` NPASSED=`find contrib -name test-passed -print | wc -l` sbcl-0.9.4-LIB_DIR.patch: Index: sbcl-0.9.4-LIB_DIR.patch =================================================================== RCS file: /cvs/extras/rpms/sbcl/FC-4/sbcl-0.9.4-LIB_DIR.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sbcl-0.9.4-LIB_DIR.patch 13 Sep 2005 16:50:44 -0000 1.2 +++ sbcl-0.9.4-LIB_DIR.patch 28 Sep 2005 15:10:54 -0000 1.3 @@ -31,7 +31,7 @@ echo "SBCL has been installed:" echo " binary $BUILD_ROOT$INSTALL_ROOT/bin/sbcl" -echo " core and contribs in $BUILD_ROOT$INSTALL_ROOT/lib/sbcl/" -+echo " core and contribs in $BUILD_ROOT$LIB_DIR" ++echo " core and contribs in $BUILD_ROOT$LIB_DIR/sbcl" # Installing manual & misc bits of documentation # Index: sbcl.spec =================================================================== RCS file: /cvs/extras/rpms/sbcl/FC-4/sbcl.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- sbcl.spec 28 Sep 2005 14:16:48 -0000 1.18 +++ sbcl.spec 28 Sep 2005 15:10:54 -0000 1.19 @@ -3,7 +3,7 @@ Name: sbcl Summary: Steel Bank Common Lisp Version: 0.9.5 -Release: 10%{?dist} +Release: 11%{?dist} License: BSD/MIT Group: Development/Languages @@ -51,6 +51,7 @@ Patch3: sbcl-0.9.5-optflags.patch Patch4: sbcl-0.9.4-LIB_DIR.patch Patch5: sbcl-0.9.5-make-config-fix.patch +Patch6: sbcl-0.9.5-verbose-build.patch Requires(post): /sbin/install-info Requires(preun): /sbin/install-info @@ -74,6 +75,7 @@ %patch3 -p1 -b .optflags %patch4 -p1 -b .LIB_DIR %patch5 -p1 -b .make-config-fix +%patch6 -p1 -b .verbose-build %ifarch %{ix86} x86_64 #sed -i -e "s|; :sb-thread|:sb-thread|" base-target-features.lisp-expr @@ -164,7 +166,7 @@ %changelog -* Wed Sep 28 2005 Rex Dieter 0.9.5-10 +* Wed Sep 28 2005 Rex Dieter 0.9.5-11 - more ppc work * Tue Sep 27 2005 Rex Dieter 0.9.5-8 From fedora-extras-commits at redhat.com Wed Sep 28 15:59:02 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 28 Sep 2005 11:59:02 -0400 Subject: rpms/sbcl/FC-4 sbcl-0.9.5-stdlib_h.patch, NONE, 1.1 sbcl.spec, 1.19, 1.20 Message-ID: <200509281559.j8SFx246004791@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/sbcl/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4769 Modified Files: sbcl.spec Added Files: sbcl-0.9.5-stdlib_h.patch Log Message: try setarch -R, quiet gcc warnings. Last try for ppc sbcl-0.9.5-stdlib_h.patch: --- NEW FILE sbcl-0.9.5-stdlib_h.patch --- --- sbcl-0.9.5/tools-for-build/where-is-mcontext.c.stdlib_h 2005-07-14 15:24:19.000000000 -0500 +++ sbcl-0.9.5/tools-for-build/where-is-mcontext.c 2005-09-28 10:36:32.090350648 -0500 @@ -20,6 +20,7 @@ #include #include +#include #include int main (int argc, char *argv[]) { Index: sbcl.spec =================================================================== RCS file: /cvs/extras/rpms/sbcl/FC-4/sbcl.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- sbcl.spec 28 Sep 2005 15:10:54 -0000 1.19 +++ sbcl.spec 28 Sep 2005 15:59:00 -0000 1.20 @@ -3,7 +3,7 @@ Name: sbcl Summary: Steel Bank Common Lisp Version: 0.9.5 -Release: 11%{?dist} +Release: 12%{?dist} License: BSD/MIT Group: Development/Languages @@ -41,7 +41,7 @@ %define sbcl_arch ppc %define sbcl_bootstrap_src -a 30 BuildRequires: setarch -%define setarch setarch %{_target_cpu} +%define setarch setarch %{_target_cpu} -R %endif Source100: my_setarch.c @@ -52,12 +52,14 @@ Patch4: sbcl-0.9.4-LIB_DIR.patch Patch5: sbcl-0.9.5-make-config-fix.patch Patch6: sbcl-0.9.5-verbose-build.patch +Patch7: sbcl-0.9.5-stdlib_h.patch Requires(post): /sbin/install-info Requires(preun): /sbin/install-info # doc generation BuildRequires: ghostscript BuildRequires: texinfo +BuildRequires: time %description Steel Bank Common Lisp (SBCL) is a Open Source development environment @@ -76,6 +78,7 @@ %patch4 -p1 -b .LIB_DIR %patch5 -p1 -b .make-config-fix %patch6 -p1 -b .verbose-build +%patch7 -p1 -b .stdlib_h %ifarch %{ix86} x86_64 #sed -i -e "s|; :sb-thread|:sb-thread|" base-target-features.lisp-expr @@ -117,7 +120,12 @@ %check || : pushd tests +# Only x86 builds are expected to pass all +%ifarch %{ix86} x86_64 %{?setarch} sh ./run-tests.sh +%else +%{?setarch} sh ./run-tests.sh ||: +%endif popd @@ -166,7 +174,7 @@ %changelog -* Wed Sep 28 2005 Rex Dieter 0.9.5-11 +* Wed Sep 28 2005 Rex Dieter 0.9.5-12 - more ppc work * Tue Sep 27 2005 Rex Dieter 0.9.5-8 From fedora-extras-commits at redhat.com Wed Sep 28 16:23:19 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 28 Sep 2005 12:23:19 -0400 Subject: rpms/sbcl/FC-4 sbcl-0.9.5-verbose-build.patch, 1.1, 1.2 sbcl.spec, 1.20, 1.21 Message-ID: <200509281623.j8SGNJxZ006360@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/sbcl/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6336 Modified Files: sbcl-0.9.5-verbose-build.patch sbcl.spec Log Message: increase verbosity, try again sbcl-0.9.5-verbose-build.patch: Index: sbcl-0.9.5-verbose-build.patch =================================================================== RCS file: /cvs/extras/rpms/sbcl/FC-4/sbcl-0.9.5-verbose-build.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sbcl-0.9.5-verbose-build.patch 28 Sep 2005 15:10:54 -0000 1.1 +++ sbcl-0.9.5-verbose-build.patch 28 Sep 2005 16:23:17 -0000 1.2 @@ -1,11 +1,22 @@ +--- sbcl-0.9.5/make-config.sh.verbose 2005-09-21 10:00:33.000000000 -0500 ++++ sbcl-0.9.5/make-config.sh 2005-09-28 10:39:30.540222144 -0500 +@@ -218,7 +218,7 @@ + # FIXME: integrate to grovel-features., maypahps + printf ' :stack-allocatable-closures' >> $ltf + $GNUMAKE -C tools-for-build where-is-mcontext -I src/runtime +- tools-for-build/where-is-mcontext > src/runtime/ppc-linux-mcontext.h ++ tools-for-build/where-is-mcontext > src/runtime/ppc-linux-mcontext.h || echo "error running where-is-mcontext" + elif [ "$sbcl_arch" = "ppc" -a "$sbcl_os" = "darwin" ]; then + printf ' :stack-allocatable-closures' >> $ltf + # We provide a dlopen shim, so a little lie won't hurt --- sbcl-0.9.5/make.sh.verbose 2005-09-21 10:00:33.000000000 -0500 -+++ sbcl-0.9.5/make.sh 2005-09-28 10:08:15.560262424 -0500 ++++ sbcl-0.9.5/make.sh 2005-09-28 11:21:54.305511040 -0500 @@ -70,7 +70,7 @@ # If you're cross-compiling, you should probably just walk through the # make-config.sh script by hand doing the right thing on both the host # and target machines. -sh make-config.sh -+sh -x make-config.sh ++sh -x make-config.sh ||: # Enforce the source policy for no bogus whitespace tools-for-build/canonicalize-whitespace Index: sbcl.spec =================================================================== RCS file: /cvs/extras/rpms/sbcl/FC-4/sbcl.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- sbcl.spec 28 Sep 2005 15:59:00 -0000 1.20 +++ sbcl.spec 28 Sep 2005 16:23:17 -0000 1.21 @@ -3,7 +3,7 @@ Name: sbcl Summary: Steel Bank Common Lisp Version: 0.9.5 -Release: 12%{?dist} +Release: 13%{?dist} License: BSD/MIT Group: Development/Languages @@ -174,7 +174,7 @@ %changelog -* Wed Sep 28 2005 Rex Dieter 0.9.5-12 +* Wed Sep 28 2005 Rex Dieter 0.9.5-13 - more ppc work * Tue Sep 27 2005 Rex Dieter 0.9.5-8 From fedora-extras-commits at redhat.com Wed Sep 28 16:27:36 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 28 Sep 2005 12:27:36 -0400 Subject: rpms/libmcrypt - New directory Message-ID: <200509281627.j8SGRaUo006470@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/libmcrypt In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6450/libmcrypt Log Message: Directory /cvs/extras/rpms/libmcrypt added to the repository From fedora-extras-commits at redhat.com Wed Sep 28 16:27:36 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 28 Sep 2005 12:27:36 -0400 Subject: rpms/libmcrypt/devel - New directory Message-ID: <200509281627.j8SGRa0B006475@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/libmcrypt/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6450/libmcrypt/devel Log Message: Directory /cvs/extras/rpms/libmcrypt/devel added to the repository From fedora-extras-commits at redhat.com Wed Sep 28 16:27:56 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 28 Sep 2005 12:27:56 -0400 Subject: rpms/libmcrypt Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200509281627.j8SGRuoN006531@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/libmcrypt In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6496 Added Files: Makefile import.log Log Message: Setup of module libmcrypt --- NEW FILE Makefile --- # Top level Makefile for module libmcrypt all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Wed Sep 28 16:27:56 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 28 Sep 2005 12:27:56 -0400 Subject: rpms/libmcrypt/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200509281627.j8SGRuT7006536@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/libmcrypt/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6496/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module libmcrypt --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Wed Sep 28 16:28:33 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 28 Sep 2005 12:28:33 -0400 Subject: rpms/libmcrypt import.log,1.1,1.2 Message-ID: <200509281629.j8SGT37d006615@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/libmcrypt In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6569 Modified Files: import.log Log Message: auto-import libmcrypt-2.5.7-1 on branch devel from libmcrypt-2.5.7-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/libmcrypt/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 28 Sep 2005 16:27:54 -0000 1.1 +++ import.log 28 Sep 2005 16:28:31 -0000 1.2 @@ -0,0 +1 @@ +libmcrypt-2_5_7-1:HEAD:libmcrypt-2.5.7-1.src.rpm:1127924885 From fedora-extras-commits at redhat.com Wed Sep 28 16:28:33 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 28 Sep 2005 12:28:33 -0400 Subject: rpms/libmcrypt/devel libmcrypt-2.5.7-nolibltdl.patch, NONE, 1.1 libmcrypt.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200509281629.j8SGT3a4006619@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/libmcrypt/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6569/devel Modified Files: .cvsignore sources Added Files: libmcrypt-2.5.7-nolibltdl.patch libmcrypt.spec Log Message: auto-import libmcrypt-2.5.7-1 on branch devel from libmcrypt-2.5.7-1.src.rpm libmcrypt-2.5.7-nolibltdl.patch: --- NEW FILE libmcrypt-2.5.7-nolibltdl.patch --- --- libmcrypt-2.5.7/configure.BAD 2005-09-22 17:04:51.000000000 -0500 +++ libmcrypt-2.5.7/configure 2005-09-22 17:05:19.000000000 -0500 @@ -430,7 +430,7 @@ PACKAGE_BUGREPORT= ac_unique_file="lib/mcrypt.c" -ac_subdirs_all="$ac_subdirs_all libltdl" +ac_subdirs_all="$ac_subdirs_all" # Factoring default headers for most tests. ac_includes_default="\ #include @@ -3356,7 +3356,7 @@ -subdirs="$subdirs libltdl" +subdirs="$subdirs" # Check whether --enable-static or --disable-static was given. if test "${enable_static+set}" = set; then --- libmcrypt-2.5.7/Makefile.in.BAD 2005-09-22 17:06:35.000000000 -0500 +++ libmcrypt-2.5.7/Makefile.in 2005-09-22 17:06:47.000000000 -0500 @@ -148,8 +148,8 @@ INCLUDES = $(INCLTDL) EXTRA_DIST = KNOWN-BUGS THANKS NEWS libmcrypt.spec.in libmcrypt.spec COPYING.LIB -DIST_SUBDIRS = libltdl modules lib src doc -SUBDIRS = $(LIBLTDL_DIR) modules lib src doc +DIST_SUBDIRS = modules lib src doc +SUBDIRS = modules lib src doc subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --- NEW FILE libmcrypt.spec --- Name: libmcrypt Version: 2.5.7 Release: 1%{?dist} License: LGPL Group: System Environment/Libraries Summary: Encryption algorithms library URL: http://mcrypt.sourceforge.net/ Source0: http://download.sourceforge.net/mcrypt/libmcrypt-%{version}.tar.gz Patch0: libmcrypt-2.5.7-nolibltdl.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libtool-ltdl-devel %description Libmcrypt is a thread-safe library providing a uniform interface to access several block and stream encryption algorithms. %package devel Group: Development/Libraries Summary: Development libraries and headers for libmcrypt Requires: %{name} = %{version}-%{release} %description devel Development libraries and headers for use in building applications that use libmcrypt. %prep %setup -q %patch0 -p1 %build %configure --enable-static=yes make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT install find $RPM_BUILD_ROOT -type f -name '*.la' -exec rm -f {} \; %clean rm -rf $RPM_BUILD_ROOT %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files %defattr(-,root,root,-) %doc AUTHORS COPYING.LIB ChangeLog KNOWN-BUGS README NEWS THANKS TODO %{_libdir}/*.so.* %{_datadir}/aclocal/libmcrypt.m4 %{_mandir}/man3/* %files devel %defattr(-,root,root,-) %doc doc/README.key doc/README.xtea doc/example.c %{_bindir}/libmcrypt-config %{_includedir}/mcrypt.h %{_libdir}/*.a %{_libdir}/*.so %changelog * Thu Sep 22 2005 Tom "spot" Callaway 2.5.7-1 - initial package for Fedora Extras Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libmcrypt/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 28 Sep 2005 16:27:54 -0000 1.1 +++ .cvsignore 28 Sep 2005 16:28:31 -0000 1.2 @@ -0,0 +1 @@ +libmcrypt-2.5.7.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/libmcrypt/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 28 Sep 2005 16:27:54 -0000 1.1 +++ sources 28 Sep 2005 16:28:31 -0000 1.2 @@ -0,0 +1 @@ +b1be163143f8e8ed0474beeb642b3bad libmcrypt-2.5.7.tar.gz From fedora-extras-commits at redhat.com Wed Sep 28 16:30:52 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 28 Sep 2005 12:30:52 -0400 Subject: owners owners.list,1.269,1.270 Message-ID: <200509281630.j8SGUqdM006670@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6651 Modified Files: owners.list Log Message: libmcrypt, mcrypt Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.269 retrieving revision 1.270 diff -u -r1.269 -r1.270 --- owners.list 28 Sep 2005 06:37:04 -0000 1.269 +++ owners.list 28 Sep 2005 16:30:50 -0000 1.270 @@ -437,6 +437,7 @@ Fedora Extras|libksba|X.509 library|rdieter at math.unl.edu|extras-qa at fedoraproject.org| Fedora Extras|libmatchbox|All font and image operations are provided to other Matchbox packages via libmatchbox|toniw at iki.fi|extras-qa at fedoraproject.org| Fedora Extras|libmatroska|An open Audio/Video container format|anvil at livna.org|extras-qa at fedoraproject.org| +Fedora Extras|libmcrypt|Encryption algorithms library|tcallawa at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|libmodplug|Modplug mod music file format library|ville.skytta at iki.fi|extras-qa at fedoraproject.org| Fedora Extras|libnet10|High-level API (toolkit) allowing the application programmer to construct and inject network packets|compton at pcompton.com|extras-qa at fedoraproject.org| Fedora Extras|libnet|C library for portable packet creation and injection|pertusus at free.fr|extras-qa at fedoraproject.org| @@ -500,6 +501,7 @@ Fedora Extras|mantis|A web-based bugtracking system|enrico.scholz at informatik.tu-chemnitz.de|extras-qa at fedoraproject.org| Fedora Extras|mathml-fonts|Mathematical symbol fonts|rdieter at math.unl.edu|extras-qa at fedoraproject.org| Fedora Extras|maxima|Symbolic Computation Program|rdieter at math.unl.edu|extras-qa at fedoraproject.org| +Fedora Extras|mcrypt|Replacement for crypt()|tcallawa at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|meanwhile| Lotus Sametime Community Client library|jwboyer at jdub.homelinux.org|extras-qa at fedoraproject.org| Fedora Extras|meld|Visual diff and merge tool|compton at pcompton.com|extras-qa at fedoraproject.org| Fedora Extras|mercurial|A fast, lightweight distributed source control management system|katzj at redhat.com|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Wed Sep 28 16:31:36 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 28 Sep 2005 12:31:36 -0400 Subject: rpms/mcrypt - New directory Message-ID: <200509281631.j8SGVa4m006801@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/mcrypt In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6781/mcrypt Log Message: Directory /cvs/extras/rpms/mcrypt added to the repository From fedora-extras-commits at redhat.com Wed Sep 28 16:31:36 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 28 Sep 2005 12:31:36 -0400 Subject: rpms/mcrypt/devel - New directory Message-ID: <200509281631.j8SGVaA4006806@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/mcrypt/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6781/mcrypt/devel Log Message: Directory /cvs/extras/rpms/mcrypt/devel added to the repository From fedora-extras-commits at redhat.com Wed Sep 28 16:32:02 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 28 Sep 2005 12:32:02 -0400 Subject: rpms/mcrypt Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200509281632.j8SGW2Xi007016@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/mcrypt In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6983 Added Files: Makefile import.log Log Message: Setup of module mcrypt --- NEW FILE Makefile --- # Top level Makefile for module mcrypt all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Wed Sep 28 16:32:02 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 28 Sep 2005 12:32:02 -0400 Subject: rpms/mcrypt/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200509281632.j8SGW22Y007021@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/mcrypt/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6983/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module mcrypt --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Wed Sep 28 16:33:21 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 28 Sep 2005 12:33:21 -0400 Subject: rpms/mcrypt import.log,1.1,1.2 Message-ID: <200509281633.j8SGXqhe007149@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/mcrypt In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7108 Modified Files: import.log Log Message: auto-import mcrypt-2.6.4-1 on branch devel from mcrypt-2.6.4-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/mcrypt/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 28 Sep 2005 16:32:00 -0000 1.1 +++ import.log 28 Sep 2005 16:33:19 -0000 1.2 @@ -0,0 +1 @@ +mcrypt-2_6_4-1:HEAD:mcrypt-2.6.4-1.src.rpm:1127925135 From fedora-extras-commits at redhat.com Wed Sep 28 16:33:22 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 28 Sep 2005 12:33:22 -0400 Subject: rpms/mcrypt/devel mcrypt-2.6.4-destdirfix.patch, NONE, 1.1 mcrypt.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200509281633.j8SGXqQx007151@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/mcrypt/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7108/devel Modified Files: .cvsignore sources Added Files: mcrypt-2.6.4-destdirfix.patch mcrypt.spec Log Message: auto-import mcrypt-2.6.4-1 on branch devel from mcrypt-2.6.4-1.src.rpm mcrypt-2.6.4-destdirfix.patch: --- NEW FILE mcrypt-2.6.4-destdirfix.patch --- --- mcrypt-2.6.4/Makefile.in.BAD 2005-09-22 17:58:15.000000000 -0500 +++ mcrypt-2.6.4/Makefile.in 2005-09-22 17:58:25.000000000 -0500 @@ -552,7 +552,7 @@ install-exec-hook: -$(RM) -f $(bindir)/mdecrypt - $(LN_S) mcrypt $(bindir)/mdecrypt + $(LN_S) mcrypt $(DESTDIR)$(bindir)/mdecrypt uninstall-local: -$(RM) -f $(bindir)/mdecrypt --- NEW FILE mcrypt.spec --- Name: mcrypt Version: 2.6.4 Release: 1%{?dist} License: GPL Group: Applications/System Summary: Replacement for crypt() URL: http://mcrypt.sourceforge.net/ Source0: http://download.sourceforge.net/mcrypt/mcrypt-%{version}.tar.gz Patch0: mcrypt-2.6.4-destdirfix.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libmcrypt-devel, mhash-devel, gettext, zlib-devel %description MCrypt is a replacement for the old crypt() package and crypt(1) command, with extensions. It allows developers to use a wide range of encryption functions, without making drastic changes to their code. It allows users to encrypt files or data streams without having to be cryptographers. %prep %setup -q %patch0 -p1 %build %configure make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT install %find_lang %{name} %clean rm -rf $RPM_BUILD_ROOT %files -f %{name}.lang %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING NEWS README THANKS TODO %{_bindir}/* %{_mandir}/man1/* %changelog * Thu Sep 22 2005 Tom "spot" Callaway 2.6.4-1 - initial package for Fedora Extras Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/mcrypt/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 28 Sep 2005 16:32:00 -0000 1.1 +++ .cvsignore 28 Sep 2005 16:33:20 -0000 1.2 @@ -0,0 +1 @@ +mcrypt-2.6.4.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/mcrypt/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 28 Sep 2005 16:32:00 -0000 1.1 +++ sources 28 Sep 2005 16:33:20 -0000 1.2 @@ -0,0 +1 @@ +5a011846fd0f166428c8d97359aaa6b3 mcrypt-2.6.4.tar.gz From fedora-extras-commits at redhat.com Wed Sep 28 16:43:31 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 28 Sep 2005 12:43:31 -0400 Subject: rpms/sbcl/FC-4 sbcl-0.9.5-make-config-fix.patch, 1.1, 1.2 sbcl-0.9.5-verbose-build.patch, 1.2, 1.3 sbcl.spec, 1.21, 1.22 Message-ID: <200509281643.j8SGhVeH007510@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/sbcl/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7481 Modified Files: sbcl-0.9.5-make-config-fix.patch sbcl-0.9.5-verbose-build.patch sbcl.spec Log Message: fix patches so they actually apply sbcl-0.9.5-make-config-fix.patch: Index: sbcl-0.9.5-make-config-fix.patch =================================================================== RCS file: /cvs/extras/rpms/sbcl/FC-4/sbcl-0.9.5-make-config-fix.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sbcl-0.9.5-make-config-fix.patch 28 Sep 2005 14:16:48 -0000 1.1 +++ sbcl-0.9.5-make-config-fix.patch 28 Sep 2005 16:43:29 -0000 1.2 @@ -1,5 +1,5 @@ ---- sbcl-0.9.5/make-config.sh.fix 2005-09-21 10:00:33.000000000 -0500 -+++ sbcl-0.9.5/make-config.sh 2005-09-28 09:00:48.000000000 -0500 +--- sbcl-0.9.5/make-config.sh.make-config-fix 2005-09-21 10:00:33.000000000 -0500 ++++ sbcl-0.9.5/make-config.sh 2005-09-28 11:42:29.135788304 -0500 @@ -208,7 +208,7 @@ # cross-compilers! # @@ -9,12 +9,14 @@ tools-for-build/determine-endianness >> $ltf elif [ "$sbcl_arch" = "ppc" -a "$sbcl_os" = "linux" ]; then # Use a C program to detect which kind of glibc we're building on, -@@ -217,7 +217,7 @@ +@@ -217,8 +217,8 @@ # # FIXME: integrate to grovel-features., maypahps printf ' :stack-allocatable-closures' >> $ltf - $GNUMAKE -C tools-for-build where-is-mcontext -I src/runtime +- tools-for-build/where-is-mcontext > src/runtime/ppc-linux-mcontext.h + $GNUMAKE -C tools-for-build where-is-mcontext -I ../src/runtime - tools-for-build/where-is-mcontext > src/runtime/ppc-linux-mcontext.h ++ tools-for-build/where-is-mcontext > src/runtime/ppc-linux-mcontext.h || echo "error running where-is-mcontext" elif [ "$sbcl_arch" = "ppc" -a "$sbcl_os" = "darwin" ]; then printf ' :stack-allocatable-closures' >> $ltf + # We provide a dlopen shim, so a little lie won't hurt sbcl-0.9.5-verbose-build.patch: Index: sbcl-0.9.5-verbose-build.patch =================================================================== RCS file: /cvs/extras/rpms/sbcl/FC-4/sbcl-0.9.5-verbose-build.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sbcl-0.9.5-verbose-build.patch 28 Sep 2005 16:23:17 -0000 1.2 +++ sbcl-0.9.5-verbose-build.patch 28 Sep 2005 16:43:29 -0000 1.3 @@ -1,16 +1,5 @@ ---- sbcl-0.9.5/make-config.sh.verbose 2005-09-21 10:00:33.000000000 -0500 -+++ sbcl-0.9.5/make-config.sh 2005-09-28 10:39:30.540222144 -0500 -@@ -218,7 +218,7 @@ - # FIXME: integrate to grovel-features., maypahps - printf ' :stack-allocatable-closures' >> $ltf - $GNUMAKE -C tools-for-build where-is-mcontext -I src/runtime -- tools-for-build/where-is-mcontext > src/runtime/ppc-linux-mcontext.h -+ tools-for-build/where-is-mcontext > src/runtime/ppc-linux-mcontext.h || echo "error running where-is-mcontext" - elif [ "$sbcl_arch" = "ppc" -a "$sbcl_os" = "darwin" ]; then - printf ' :stack-allocatable-closures' >> $ltf - # We provide a dlopen shim, so a little lie won't hurt ---- sbcl-0.9.5/make.sh.verbose 2005-09-21 10:00:33.000000000 -0500 -+++ sbcl-0.9.5/make.sh 2005-09-28 11:21:54.305511040 -0500 +--- sbcl-0.9.5/make.sh.verbose-build 2005-09-21 10:00:33.000000000 -0500 ++++ sbcl-0.9.5/make.sh 2005-09-28 11:42:06.353251776 -0500 @@ -70,7 +70,7 @@ # If you're cross-compiling, you should probably just walk through the # make-config.sh script by hand doing the right thing on both the host Index: sbcl.spec =================================================================== RCS file: /cvs/extras/rpms/sbcl/FC-4/sbcl.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- sbcl.spec 28 Sep 2005 16:23:17 -0000 1.21 +++ sbcl.spec 28 Sep 2005 16:43:29 -0000 1.22 @@ -3,7 +3,7 @@ Name: sbcl Summary: Steel Bank Common Lisp Version: 0.9.5 -Release: 13%{?dist} +Release: 14%{?dist} License: BSD/MIT Group: Development/Languages @@ -174,7 +174,7 @@ %changelog -* Wed Sep 28 2005 Rex Dieter 0.9.5-13 +* Wed Sep 28 2005 Rex Dieter 0.9.5-14 - more ppc work * Tue Sep 27 2005 Rex Dieter 0.9.5-8 From fedora-extras-commits at redhat.com Wed Sep 28 16:44:19 2005 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Wed, 28 Sep 2005 12:44:19 -0400 Subject: rpms/graphviz/devel graphviz.spec,1.17,1.18 Message-ID: <200509281644.j8SGiJ7u007641@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/rpms/graphviz/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7554/devel Modified Files: graphviz.spec Log Message: * Requires urw-fonts. Index: graphviz.spec =================================================================== RCS file: /cvs/extras/rpms/graphviz/devel/graphviz.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- graphviz.spec 29 Aug 2005 12:53:11 -0000 1.17 +++ graphviz.spec 28 Sep 2005 16:44:17 -0000 1.18 @@ -21,6 +21,7 @@ BuildRequires: fontconfig-devel xorg-x11-devel libtool-ltdl-devel Requires(post): %{_bindir}/dot Requires(postun): %{_bindir}/dot +Requires: urw-fonts %package tcl Summary: Tcl extension tools for %{name} From fedora-extras-commits at redhat.com Wed Sep 28 16:44:07 2005 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Wed, 28 Sep 2005 12:44:07 -0400 Subject: rpms/graphviz/FC-1 graphviz.spec,1.3,1.4 Message-ID: <200509281644.j8SGibhM007644@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/rpms/graphviz/FC-1 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7554/FC-1 Modified Files: graphviz.spec Log Message: * Requires urw-fonts. Index: graphviz.spec =================================================================== RCS file: /cvs/extras/rpms/graphviz/FC-1/graphviz.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- graphviz.spec 8 Nov 2004 04:31:13 -0000 1.3 +++ graphviz.spec 28 Sep 2005 16:44:05 -0000 1.4 @@ -13,6 +13,7 @@ BuildRequires: zlib-devel libpng-devel libjpeg-devel XFree86-devel expat-devel BuildRequires: bison m4 flex tk tcl >= 0:8.3 BuildRequires: /usr/include/tcl.h /usr/include/tk.h +Requires: urw-fonts %package devel Summary: Development package for %{name} From fedora-extras-commits at redhat.com Wed Sep 28 16:44:08 2005 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Wed, 28 Sep 2005 12:44:08 -0400 Subject: rpms/graphviz/FC-2 graphviz.spec,1.4,1.5 Message-ID: <200509281644.j8SGicm0007647@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/rpms/graphviz/FC-2 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7554/FC-2 Modified Files: graphviz.spec Log Message: * Requires urw-fonts. Index: graphviz.spec =================================================================== RCS file: /cvs/extras/rpms/graphviz/FC-2/graphviz.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- graphviz.spec 8 Nov 2004 04:32:07 -0000 1.4 +++ graphviz.spec 28 Sep 2005 16:44:05 -0000 1.5 @@ -13,6 +13,7 @@ BuildRequires: zlib-devel libpng-devel libjpeg-devel XFree86-devel expat-devel BuildRequires: bison m4 flex tk tcl >= 0:8.3 BuildRequires: /usr/include/tcl.h /usr/include/tk.h +Requires: urw-fonts %package devel Summary: Development package for %{name} From fedora-extras-commits at redhat.com Wed Sep 28 16:44:13 2005 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Wed, 28 Sep 2005 12:44:13 -0400 Subject: rpms/graphviz/FC-3 graphviz.spec,1.6,1.7 Message-ID: <200509281644.j8SGihnf007650@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/rpms/graphviz/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7554/FC-3 Modified Files: graphviz.spec Log Message: * Requires urw-fonts. Index: graphviz.spec =================================================================== RCS file: /cvs/extras/rpms/graphviz/FC-3/graphviz.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- graphviz.spec 23 Jan 2005 16:27:43 -0000 1.6 +++ graphviz.spec 28 Sep 2005 16:44:11 -0000 1.7 @@ -14,6 +14,7 @@ BuildRequires: zlib-devel libpng-devel libjpeg-devel XFree86-devel expat-devel BuildRequires: /bin/ksh bison m4 flex tk tcl >= 0:8.3 BuildRequires: /usr/include/tcl.h /usr/include/tk.h +Requires: urw-fonts %package tcl Group: Applications/Multimedia From fedora-extras-commits at redhat.com Wed Sep 28 16:44:13 2005 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Wed, 28 Sep 2005 12:44:13 -0400 Subject: rpms/graphviz/FC-4 graphviz.spec,1.10,1.11 Message-ID: <200509281644.j8SGii5a007653@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/rpms/graphviz/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7554/FC-4 Modified Files: graphviz.spec Log Message: * Requires urw-fonts. Index: graphviz.spec =================================================================== RCS file: /cvs/extras/rpms/graphviz/FC-4/graphviz.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- graphviz.spec 22 May 2005 22:59:38 -0000 1.10 +++ graphviz.spec 28 Sep 2005 16:44:11 -0000 1.11 @@ -14,6 +14,7 @@ BuildRequires: zlib-devel libpng-devel libjpeg-devel XFree86-devel expat-devel BuildRequires: /bin/ksh bison m4 flex tk tcl >= 8.3 BuildRequires: /usr/include/tcl.h /usr/include/tk.h +Requires: urw-fonts %package tcl Group: Applications/Multimedia From fedora-extras-commits at redhat.com Wed Sep 28 16:45:59 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 28 Sep 2005 12:45:59 -0400 Subject: rpms/libmcrypt/FC-3 libmcrypt.spec,1.1,1.2 Message-ID: <200509281645.j8SGjxJM007708@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/libmcrypt/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7661/FC-3 Modified Files: libmcrypt.spec Log Message: Fix FC-3 Index: libmcrypt.spec =================================================================== RCS file: /cvs/extras/rpms/libmcrypt/FC-3/libmcrypt.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- libmcrypt.spec 28 Sep 2005 16:28:31 -0000 1.1 +++ libmcrypt.spec 28 Sep 2005 16:45:57 -0000 1.2 @@ -1,6 +1,6 @@ Name: libmcrypt Version: 2.5.7 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPL Group: System Environment/Libraries Summary: Encryption algorithms library @@ -8,7 +8,8 @@ Source0: http://download.sourceforge.net/mcrypt/libmcrypt-%{version}.tar.gz Patch0: libmcrypt-2.5.7-nolibltdl.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: libtool-ltdl-devel +# FC-3 +BuildRequires: libtool %description Libmcrypt is a thread-safe library providing a uniform interface @@ -58,5 +59,8 @@ %{_libdir}/*.so %changelog +* Wed Sep 28 2005 Tom "spot" Callaway 2.5.7-2 +- fix for FC-3 + * Thu Sep 22 2005 Tom "spot" Callaway 2.5.7-1 - initial package for Fedora Extras From fedora-extras-commits at redhat.com Wed Sep 28 16:46:00 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 28 Sep 2005 12:46:00 -0400 Subject: rpms/libmcrypt/devel libmcrypt.spec,1.1,1.2 Message-ID: <200509281646.j8SGk0jN007718@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/libmcrypt/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7661/devel Modified Files: libmcrypt.spec Log Message: Fix FC-3 Index: libmcrypt.spec =================================================================== RCS file: /cvs/extras/rpms/libmcrypt/devel/libmcrypt.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- libmcrypt.spec 28 Sep 2005 16:28:31 -0000 1.1 +++ libmcrypt.spec 28 Sep 2005 16:45:58 -0000 1.2 @@ -1,6 +1,6 @@ Name: libmcrypt Version: 2.5.7 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPL Group: System Environment/Libraries Summary: Encryption algorithms library @@ -58,5 +58,8 @@ %{_libdir}/*.so %changelog +* Wed Sep 28 2005 Tom "spot" Callaway 2.5.7-2 +- fix for FC-3 + * Thu Sep 22 2005 Tom "spot" Callaway 2.5.7-1 - initial package for Fedora Extras From fedora-extras-commits at redhat.com Wed Sep 28 16:45:59 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 28 Sep 2005 12:45:59 -0400 Subject: rpms/libmcrypt/FC-4 libmcrypt.spec,1.1,1.2 Message-ID: <200509281646.j8SGjx0b007714@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/libmcrypt/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7661/FC-4 Modified Files: libmcrypt.spec Log Message: Fix FC-3 Index: libmcrypt.spec =================================================================== RCS file: /cvs/extras/rpms/libmcrypt/FC-4/libmcrypt.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- libmcrypt.spec 28 Sep 2005 16:28:31 -0000 1.1 +++ libmcrypt.spec 28 Sep 2005 16:45:57 -0000 1.2 @@ -1,6 +1,6 @@ Name: libmcrypt Version: 2.5.7 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPL Group: System Environment/Libraries Summary: Encryption algorithms library @@ -58,5 +58,8 @@ %{_libdir}/*.so %changelog +* Wed Sep 28 2005 Tom "spot" Callaway 2.5.7-2 +- fix for FC-3 + * Thu Sep 22 2005 Tom "spot" Callaway 2.5.7-1 - initial package for Fedora Extras From fedora-extras-commits at redhat.com Wed Sep 28 18:49:49 2005 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Wed, 28 Sep 2005 14:49:49 -0400 Subject: rpms/TeXmacs/devel .cvsignore, 1.13, 1.14 TeXmacs.spec, 1.19, 1.20 sources, 1.14, 1.15 Message-ID: <200509281849.j8SInnig011996@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/TeXmacs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11973 Modified Files: .cvsignore TeXmacs.spec sources Log Message: new version 1.0.5.9 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/TeXmacs/devel/.cvsignore,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- .cvsignore 20 Sep 2005 18:22:48 -0000 1.13 +++ .cvsignore 28 Sep 2005 18:49:46 -0000 1.14 @@ -1 +1 @@ -TeXmacs-1.0.5.8-src.tar.gz +TeXmacs-1.0.5.9-src.tar.gz Index: TeXmacs.spec =================================================================== RCS file: /cvs/extras/rpms/TeXmacs/devel/TeXmacs.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- TeXmacs.spec 20 Sep 2005 18:22:48 -0000 1.19 +++ TeXmacs.spec 28 Sep 2005 18:49:46 -0000 1.20 @@ -1,12 +1,12 @@ Name: TeXmacs -Version: 1.0.5.8 +Version: 1.0.5.9 Release: 1%{?dist} Summary: Structured wysiwyg scientific text editor Group: Applications/Editors License: GPL URL: http://www.texmacs.org -Source: ftp://ftp.texmacs.org/pub/TeXmacs/targz/TeXmacs-1.0.5.8-src.tar.gz +Source: ftp://ftp.texmacs.org/pub/TeXmacs/targz/TeXmacs-1.0.5.9-src.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: tetex, tetex-fonts, ghostscript Buildrequires: guile-devel, desktop-file-utils, tetex, freetype-devel, XFree86-devel @@ -124,6 +124,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Sep 28 2005 Gerard Milmeister - 1.0.5.9 +- New Version 1.0.5.9 + * Tue Sep 20 2005 Gerard Milmeister - 1.0.5.8 - New Version 1.0.5.8 Index: sources =================================================================== RCS file: /cvs/extras/rpms/TeXmacs/devel/sources,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- sources 20 Sep 2005 18:22:48 -0000 1.14 +++ sources 28 Sep 2005 18:49:46 -0000 1.15 @@ -1 +1 @@ -3ebeed05713a410ce57fbddb3a540244 TeXmacs-1.0.5.8-src.tar.gz +90d04fa951e87e854ab8e51687459f30 TeXmacs-1.0.5.9-src.tar.gz From fedora-extras-commits at redhat.com Wed Sep 28 19:02:08 2005 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Wed, 28 Sep 2005 15:02:08 -0400 Subject: rpms/TeXmacs/FC-4 TeXmacs.spec,1.20,1.21 sources,1.14,1.15 Message-ID: <200509281902.j8SJ28Hv013453@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/TeXmacs/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13414/FC-4 Modified Files: TeXmacs.spec sources Log Message: new version 1.0.5.9 Index: TeXmacs.spec =================================================================== RCS file: /cvs/extras/rpms/TeXmacs/FC-4/TeXmacs.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- TeXmacs.spec 20 Sep 2005 18:27:42 -0000 1.20 +++ TeXmacs.spec 28 Sep 2005 19:02:06 -0000 1.21 @@ -1,12 +1,12 @@ Name: TeXmacs -Version: 1.0.5.8 +Version: 1.0.5.9 Release: 1%{?dist} Summary: Structured wysiwyg scientific text editor Group: Applications/Editors License: GPL URL: http://www.texmacs.org -Source: ftp://ftp.texmacs.org/pub/TeXmacs/targz/TeXmacs-1.0.5.8-src.tar.gz +Source: ftp://ftp.texmacs.org/pub/TeXmacs/targz/TeXmacs-1.0.5.9-src.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: tetex, tetex-fonts, ghostscript Buildrequires: guile-devel, desktop-file-utils, tetex, freetype-devel, XFree86-devel @@ -124,6 +124,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Sep 28 2005 Gerard Milmeister - 1.0.5.9 +- New Version 1.0.5.9 + * Tue Sep 20 2005 Gerard Milmeister - 1.0.5.8 - New Version 1.0.5.8 Index: sources =================================================================== RCS file: /cvs/extras/rpms/TeXmacs/FC-4/sources,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- sources 20 Sep 2005 18:27:43 -0000 1.14 +++ sources 28 Sep 2005 19:02:06 -0000 1.15 @@ -1 +1 @@ -3ebeed05713a410ce57fbddb3a540244 TeXmacs-1.0.5.8-src.tar.gz +90d04fa951e87e854ab8e51687459f30 TeXmacs-1.0.5.9-src.tar.gz From fedora-extras-commits at redhat.com Wed Sep 28 19:02:01 2005 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Wed, 28 Sep 2005 15:02:01 -0400 Subject: rpms/TeXmacs/FC-3 TeXmacs.spec,1.10,1.11 sources,1.10,1.11 Message-ID: <200509281902.j8SJ2Vrs013457@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/TeXmacs/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13414/FC-3 Modified Files: TeXmacs.spec sources Log Message: new version 1.0.5.9 Index: TeXmacs.spec =================================================================== RCS file: /cvs/extras/rpms/TeXmacs/FC-3/TeXmacs.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- TeXmacs.spec 20 Sep 2005 18:27:59 -0000 1.10 +++ TeXmacs.spec 28 Sep 2005 19:01:39 -0000 1.11 @@ -1,12 +1,12 @@ Name: TeXmacs -Version: 1.0.5.8 +Version: 1.0.5.9 Release: 1%{?dist} Summary: Structured wysiwyg scientific text editor Group: Applications/Editors License: GPL URL: http://www.texmacs.org -Source: ftp://ftp.texmacs.org/pub/TeXmacs/targz/TeXmacs-1.0.5.8-src.tar.gz +Source: ftp://ftp.texmacs.org/pub/TeXmacs/targz/TeXmacs-1.0.5.9-src.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: tetex, tetex-fonts, ghostscript Buildrequires: guile-devel, desktop-file-utils, tetex, freetype-devel, XFree86-devel @@ -124,6 +124,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Sep 28 2005 Gerard Milmeister - 1.0.5.9 +- New Version 1.0.5.9 + * Tue Sep 20 2005 Gerard Milmeister - 1.0.5.8 - New Version 1.0.5.8 Index: sources =================================================================== RCS file: /cvs/extras/rpms/TeXmacs/FC-3/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 20 Sep 2005 18:27:59 -0000 1.10 +++ sources 28 Sep 2005 19:01:59 -0000 1.11 @@ -1 +1 @@ -3ebeed05713a410ce57fbddb3a540244 TeXmacs-1.0.5.8-src.tar.gz +90d04fa951e87e854ab8e51687459f30 TeXmacs-1.0.5.9-src.tar.gz From fedora-extras-commits at redhat.com Wed Sep 28 19:16:07 2005 From: fedora-extras-commits at redhat.com (Shahms King (shahms)) Date: Wed, 28 Sep 2005 15:16:07 -0400 Subject: rpms/python-quixote/FC-4 .cvsignore, 1.4, 1.5 python-quixote.spec, 1.5, 1.6 sources, 1.4, 1.5 Message-ID: <200509281916.j8SJG7eN013621@cvs-int.fedora.redhat.com> Author: shahms Update of /cvs/extras/rpms/python-quixote/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13598 Modified Files: .cvsignore python-quixote.spec sources Log Message: Update to new upstream version 2.2 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/python-quixote/FC-4/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 8 Sep 2005 23:14:10 -0000 1.4 +++ .cvsignore 28 Sep 2005 19:16:05 -0000 1.5 @@ -1 +1 @@ -Quixote-2.1.tar.gz +Quixote-2.2.tar.gz Index: python-quixote.spec =================================================================== RCS file: /cvs/extras/rpms/python-quixote/FC-4/python-quixote.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- python-quixote.spec 8 Sep 2005 23:14:10 -0000 1.5 +++ python-quixote.spec 28 Sep 2005 19:16:05 -0000 1.6 @@ -3,7 +3,7 @@ %define srcname Quixote Name: python-quixote -Version: 2.1 +Version: 2.2 Release: 1%{?dist} Summary: A highly Pythonic Web application framework @@ -70,6 +70,9 @@ %ghost %{python_sitearch}/quixote/html/*.pyo %changelog +* Wed Sep 28 2005 Shahms E. King 2.2-1 +- update to new upstream 2.2 + * Thu Sep 08 2005 Shahms E. King 2.1-1 - update to new upstream 2.1 - add dist tag Index: sources =================================================================== RCS file: /cvs/extras/rpms/python-quixote/FC-4/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 8 Sep 2005 23:14:10 -0000 1.4 +++ sources 28 Sep 2005 19:16:05 -0000 1.5 @@ -1 +1 @@ -21134661449e3b2e26139a0acc4d3b52 Quixote-2.1.tar.gz +58b2db7d7e377fbcb834fccc7fcf50cf Quixote-2.2.tar.gz From fedora-extras-commits at redhat.com Wed Sep 28 19:16:43 2005 From: fedora-extras-commits at redhat.com (Shahms King (shahms)) Date: Wed, 28 Sep 2005 15:16:43 -0400 Subject: rpms/python-quixote/devel .cvsignore, 1.4, 1.5 python-quixote.spec, 1.5, 1.6 sources, 1.4, 1.5 Message-ID: <200509281916.j8SJGhIC013698@cvs-int.fedora.redhat.com> Author: shahms Update of /cvs/extras/rpms/python-quixote/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13673 Modified Files: .cvsignore python-quixote.spec sources Log Message: Update to new upstream version 2.2 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/python-quixote/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 8 Sep 2005 23:14:11 -0000 1.4 +++ .cvsignore 28 Sep 2005 19:16:41 -0000 1.5 @@ -1 +1 @@ -Quixote-2.1.tar.gz +Quixote-2.2.tar.gz Index: python-quixote.spec =================================================================== RCS file: /cvs/extras/rpms/python-quixote/devel/python-quixote.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- python-quixote.spec 8 Sep 2005 23:14:11 -0000 1.5 +++ python-quixote.spec 28 Sep 2005 19:16:41 -0000 1.6 @@ -3,7 +3,7 @@ %define srcname Quixote Name: python-quixote -Version: 2.1 +Version: 2.2 Release: 1%{?dist} Summary: A highly Pythonic Web application framework @@ -70,6 +70,9 @@ %ghost %{python_sitearch}/quixote/html/*.pyo %changelog +* Wed Sep 28 2005 Shahms E. King 2.2-1 +- update to new upstream 2.2 + * Thu Sep 08 2005 Shahms E. King 2.1-1 - update to new upstream 2.1 - add dist tag Index: sources =================================================================== RCS file: /cvs/extras/rpms/python-quixote/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 8 Sep 2005 23:14:11 -0000 1.4 +++ sources 28 Sep 2005 19:16:41 -0000 1.5 @@ -1 +1 @@ -21134661449e3b2e26139a0acc4d3b52 Quixote-2.1.tar.gz +58b2db7d7e377fbcb834fccc7fcf50cf Quixote-2.2.tar.gz From fedora-extras-commits at redhat.com Wed Sep 28 19:58:45 2005 From: fedora-extras-commits at redhat.com (Elliot Lee (sopwith)) Date: Wed, 28 Sep 2005 15:58:45 -0400 Subject: fedora-release fedora-release.spec,1.13,1.14 Message-ID: <200509281958.j8SJwjar013907@cvs-int.fedora.redhat.com> Author: sopwith Update of /cvs/fedora/fedora-release In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13888 Modified Files: fedora-release.spec Log Message: catch compiled python files, etc. Index: fedora-release.spec =================================================================== RCS file: /cvs/fedora/fedora-release/fedora-release.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- fedora-release.spec 3 Jun 2005 16:29:44 -0000 1.13 +++ fedora-release.spec 28 Sep 2005 19:58:43 -0000 1.14 @@ -28,7 +28,6 @@ %setup -q -n fedora-release-%{version} -a 1 %build -python -c "import py_compile; py_compile.compile('eula.py')" make -C release-notes/FC4 MAINDIR=`pwd` pushd release-notes/FC4 @@ -61,7 +60,7 @@ mkdir -p -m 755 $RPM_BUILD_ROOT/%{_defaultdocdir}/HTML cp -ap figs *.css *.html img css stylesheet-images \ $RPM_BUILD_ROOT/%{_defaultdocdir}/HTML -install -m 644 RELEASE-NOTES-en.html $RPM_BUILD_ROOT/%{_defaultdocdir}/HTML/index.html +install -m 644 index.html $RPM_BUILD_ROOT/%{_defaultdocdir}/HTML/index.html mkdir -p -m 755 $RPM_BUILD_ROOT/etc/sysconfig/rhn mkdir -p -m 755 $RPM_BUILD_ROOT/etc/yum.repos.d @@ -98,7 +97,7 @@ %doc eula.txt GPL autorun-template %config %attr(0644,root,root) /etc/issue %config %attr(0644,root,root) /etc/issue.net -/usr/share/firstboot/modules/eula.py +/usr/share/firstboot/modules/eula.py* /usr/share/eula/eula.en_US %{_defaultdocdir}/HTML /etc/pki/rpm-gpg/* From fedora-extras-commits at redhat.com Wed Sep 28 20:26:58 2005 From: fedora-extras-commits at redhat.com (Elliot Lee (sopwith)) Date: Wed, 28 Sep 2005 16:26:58 -0400 Subject: owners owners.list,1.270,1.271 Message-ID: <200509282026.j8SKQwN4015495@cvs-int.fedora.redhat.com> Author: sopwith Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15473 Modified Files: owners.list Log Message: Remove ownership of packages that have bouncing e-mail addresses AND no bugzilla accounts... Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.270 retrieving revision 1.271 diff -u -r1.270 -r1.271 --- owners.list 28 Sep 2005 16:30:50 -0000 1.270 +++ owners.list 28 Sep 2005 20:26:55 -0000 1.271 @@ -173,7 +173,7 @@ Fedora Extras|fbida|FrameBuffer Imageviewer|adrian at lisas.de|extras-qa at fedoraproject.org| Fedora Extras|fedora-rpmdevtools|Fedora RPM Development Tools|ville.skytta at iki.fi|extras-qa at fedoraproject.org| Fedora Extras|fedora-usermgmt|Fedora tools for user management|enrico.scholz at informatik.tu-chemnitz.de|extras-qa at fedoraproject.org| -Fedora Extras|feh|Fast command line image viewer using Imlib2|a.kurtz at hardsun.net|extras-qa at fedoraproject.org| +Fedora Extras|feh|Fast command line image viewer using Imlib2|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| Fedora Extras|fftw3|Fast Fourier Transform library|qspencer at ieee.org|extras-qa at fedoraproject.org| Fedora Extras|fftw|Fast Fourier Transform library|compton at pcompton.com|extras-qa at fedoraproject.org| Fedora Extras|fig2ps|Utility for converting xfig pictures to PS/PDF|qspencer at ieee.org|extras-qa at fedoraproject.org| @@ -259,9 +259,9 @@ Fedora Extras|gnofract4d|Gnofract 4D is a Gnome-based program to draw fractals|pmatilai at laiskiainen.org|extras-qa at fedoraproject.org| Fedora Extras|gnomad2|Manager for digital audio players|triad at df.lth.se|extras-qa at fedoraproject.org| Fedora Extras|gnome-applet-netmon|GNOME Network Load Applet|ghenry at suretecsystems.com|extras-qa at fedoraproject.org| -Fedora Extras|gnome-applet-netspeed|GNOME applet that shows traffic on a network device|a.kurtz at hardsun.net|extras-qa at fedoraproject.org| +Fedora Extras|gnome-applet-netspeed|GNOME applet that shows traffic on a network device|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| Fedora Extras|gnome-applet-rhythmbox|A GNOME panel applet to control Rhythmbox's playback|ivazquez at ivazquez.net|extras-qa at fedoraproject.org| -Fedora Extras|gnome-applet-sensors|Gnome panel applet for hardware sensors|a.kurtz at hardsun.net|extras-qa at fedoraproject.org| +Fedora Extras|gnome-applet-sensors|Gnome panel applet for hardware sensors|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| Fedora Extras|gnome-applet-timer|A countdown timer applet for the GNOME panel|wickerpms at arcor.de|extras-qa at fedoraproject.org| Fedora Extras|gnome-blog|GNOME panel object for posting blog entries|bdpepple at ameritech.net|extras-qa at fedoraproject.org| Fedora Extras|gnome-common|Useful things common to building gnome packages from scratch|toshio at tiki-lounge.com|extras-qa at fedoraproject.org| @@ -410,7 +410,7 @@ Fedora Extras|libcdio|A CD-ROM input and control library|adrian at lisas.de|extras-qa at fedoraproject.org| Fedora Extras|libchewing|Traditional Chinese phonetic input method library|petersen at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|libcmml|Library for handling Continuous Media Markup Language|thomas at apestaart.org|extras-qa at fedoraproject.org| -Fedora Extras|libdaemon|libdaemon is a lightweight C library that eases the writing of UNIX daemons|a.kurtz at hardsun.net|extras-qa at fedoraproject.org| +Fedora Extras|libdaemon|libdaemon is a lightweight C library that eases the writing of UNIX daemons|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| Fedora Extras|libdnet|Simple portable interface to lowlevel networking routines|oliver at linux-kernel.at|extras-qa at fedoraproject.org| Fedora Extras|libebml|The Extensible Binary Meta Language library|anvil at livna.org|extras-qa at fedoraproject.org| Fedora Extras|libesmtp|SMTP client library|pawsa at theochem.kth.se|extras-qa at fedoraproject.org| @@ -1104,7 +1104,7 @@ Fedora Extras|xmms-acme|XMMS plugin to use special multimedia keys in GNOME or through acme|matthias at rpmforge.net|extras-qa at fedoraproject.org| Fedora Extras|xmms-alarm|xmms General plugin for using xmms as an alarm clock|ville.skytta at iki.fi|extras-qa at fedoraproject.org| Fedora Extras|xmms-arts|X MultiMedia System output plugin for the aRts sound system|matthias at rpmforge.net|extras-qa at fedoraproject.org| -Fedora Extras|xmms-cdread|Digital audio CD input plugin for XMMS|msalim at cs.indiana.edu|extras-qa at fedoraproject.org| +Fedora Extras|xmms-cdread|Digital audio CD input plugin for XMMS|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| Fedora Extras|xmms-crossfade|A crossfade output plugin for XMMS|matthias at rpmforge.net|extras-qa at fedoraproject.org| Fedora Extras|xmms-flac|XMMS plugin needed to play FLAC (Free Lossless Audio Codec) files|matthias at rpmforge.net|extras-qa at fedoraproject.org| Fedora Extras|xmms-lirc|Plugin to use LIRC supported infrared devices in XMMS|matthias at rpmforge.net|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Wed Sep 28 21:31:25 2005 From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields)) Date: Wed, 28 Sep 2005 17:31:25 -0400 Subject: web/html/docs/mirror - New directory Message-ID: <200509282131.j8SLVPuS017083@cvs-int.fedora.redhat.com> Author: pfrields Update of /cvs/fedora/web/html/docs/mirror In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17069/mirror Log Message: Directory /cvs/fedora/web/html/docs/mirror added to the repository From fedora-extras-commits at redhat.com Wed Sep 28 21:32:28 2005 From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields)) Date: Wed, 28 Sep 2005 17:32:28 -0400 Subject: web/html/docs/mirror/stylesheet-images - New directory Message-ID: <200509282132.j8SLWSwu017108@cvs-int.fedora.redhat.com> Author: pfrields Update of /cvs/fedora/web/html/docs/mirror/stylesheet-images In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17094/stylesheet-images Log Message: Directory /cvs/fedora/web/html/docs/mirror/stylesheet-images added to the repository From fedora-extras-commits at redhat.com Wed Sep 28 21:35:16 2005 From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields)) Date: Wed, 28 Sep 2005 17:35:16 -0400 Subject: web/html/docs/beta/mirror-tutorial - New directory Message-ID: <200509282135.j8SLZG2j017168@cvs-int.fedora.redhat.com> Author: pfrields Update of /cvs/fedora/web/html/docs/beta/mirror-tutorial In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17154/mirror-tutorial Log Message: Directory /cvs/fedora/web/html/docs/beta/mirror-tutorial added to the repository From fedora-extras-commits at redhat.com Wed Sep 28 21:36:12 2005 From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields)) Date: Wed, 28 Sep 2005 17:36:12 -0400 Subject: web/html/docs/beta/mirror-tutorial/stylesheet-images - New directory Message-ID: <200509282136.j8SLaCPu017207@cvs-int.fedora.redhat.com> Author: pfrields Update of /cvs/fedora/web/html/docs/beta/mirror-tutorial/stylesheet-images In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17183/stylesheet-images Log Message: Directory /cvs/fedora/web/html/docs/beta/mirror-tutorial/stylesheet-images added to the repository From fedora-extras-commits at redhat.com Wed Sep 28 21:37:04 2005 From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields)) Date: Wed, 28 Sep 2005 17:37:04 -0400 Subject: web/html/docs/beta/mirror-tutorial fedora.css, NONE, 1.1 generated-index.html, NONE, 1.1 index.html, NONE, 1.1 ln-legalnotice.html, NONE, 1.1 rv-revhistory.html, NONE, 1.1 sn-client-config.html, NONE, 1.1 sn-planning-and-setup.html, NONE, 1.1 sn-server-config.html, NONE, 1.1 Message-ID: <200509282137.j8SLb44w017291@cvs-int.fedora.redhat.com> Author: pfrields Update of /cvs/fedora/web/html/docs/beta/mirror-tutorial In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17233/mirror-tutorial Added Files: fedora.css generated-index.html index.html ln-legalnotice.html rv-revhistory.html sn-client-config.html sn-planning-and-setup.html sn-server-config.html Log Message: Added mirror tutorial BETA --- NEW FILE fedora.css --- /* CSS for Red Hat Linux Project docs from the Documentation Project Written by Tammy Fox and Garrett LeSage Copyright 2003 Tammy Fox, Garrett LeSage, and Red Hat, Inc. License: GPL */ li p { display: inline; } div.table table { width: 95%; background-color: #DCDCDC; color: #000000; border-spacing: 0; } div.table table th { border: 1px solid #A9A9A9; background-color: #A9A9A9; color: #000000; } div.table table td { border: 1px solid #A9A9A9; background-color: #DCDCDC; color: #000000; padding: 0.5em; margin-bottom: 0.5em; margin-top: 2px; } div.note table, div.tip table, div.important table, div.caution table, div.warning table { width: 95%; border: 2px solid #D0D0B0; background-color: #FAF9E0; color: #000000; /* padding inside table area */ padding: 0.5em; margin-bottom: 0.5em; margin-top: 0.5em; } .qandaset table { border-collapse: collapse; } .qandaset { } .qandaset tr.question { } .qandaset tr.question td { font-weight: bold; padding: 1em 1em 0; } .qandaset tr.answer td { padding: 0.25em 1em 1.5em; } .qandaset tr.question td, .qandaset tr.answer td { } hr { border: 0; border-bottom: 1px solid #ccc; } h1, h2, h3, h4 { font-family: luxi sans,sans-serif; color: #22437f; font-weight: bold; } h1 { font-size: 1.75em; } h2 { font-size: 1.25em; } h3 { font-size: 1.1em; } a:link { color: #900; } a:visited { color: #48468f; } a:hover { color: #f20; } code.screen, pre.screen { font-family: monospace; font-size: 1em; display: block; padding: 10px; border: 1px solid #bbb; background-color: #eee; color: #000; overflow: auto; border-radius: 2.5px; -moz-border-radius: 2.5px; margin: 0.5em 2em; } div.example { padding: 10px; border: 1px solid #bbb; margin: 0.5em 2em; } .procedure ol li { margin-bottom: 0.5em; } .procedure ol li li { /* prevent inheritance */ margin-bottom: 0em; } .itemizedlist ul li { margin-bottom: 0.5em; } .itemizedlist ul li li { /* prevent inheritance */ margin-bottom: 0em; } --- NEW FILE generated-index.html --- Index
          Index
          Prev   

          Index

          A

          anaconda, Copying the Original Distribution
          autofs, Setting Up autofs
          automounter map, Setting Up autofs

          D

          dependencies, How to Solve Dependencies
          distribution, The Distribution Structure

          E

          exploded tree, Copying the Original Distribution

          M

          map
          automounter (see automounter map)
          mirror, About Mirrors
          up! stream, About Mirrors
          l>

          R

          repository
          yum, Configuring Repositories
          RPM, The Distribution Structure

          Y

          yum, How to Solve Dependencies
        Prev   
        4. Client Configuration Home 
        --- NEW FILE index.html --- Mirror Tutorial - BETA
        Mirror Tutorial - BETA
           Next

        Mi! rror Tutorial - BETA

        Paul W. Frields

        Copyright © 2004 Paul W. Frields

        1. Introduction
        1.1. Purpose
        1.2. Audience
        1.3. About Mirrors
        1.4. Additional Resources
        1.5. Acknowledgements
        2. Planning and Setup
        2.1. The Distribution Structure!
        2.2. Copying the Original Distribution
        2.3. Trimming Branches
        2.4. Downloading the Files
        2.4.1. Download Using HTTP or FTP
        2.4.2. The rsync Command
        2.4.3. Downloading Using rsync
        2.5. Maintaining Your Mirror
        3. Se! rver C iguration Planning
        3.1. How to Solve Dependencies
        3.2. Configuring Repositories
        3.2.1. yum-arch
        3.2.2. createrepo
        3.2.3. Repository Locations
        3.3. Configuring NFS
        4. Client Configuration
        4.1. Configuring system-config-packages
        4.1.1. Setting Up autofs
        4.1.2. /usr/share/applications/system-config-packages
        4.1.3. The rpm --aid Switch
        Index

        1. Introduction

        1.1. Pur! pose

        This tutorial presents a number of related topics that allow an administrator to seamlessly integrate mirroring and update services for Fedora Core. You can use these services to provision a classroom, laboratory, or office. These service provisions also increase ease of use and enhance user experience, adding to the perceived value of non-proprietary operating systems and software.

        [Tip]Reporting Document Errors

        To report an error or omission in this document, file a bug report in Bugzilla at http://bugzilla.redhat.com/. When you file your bug, select "Fedora Documentation" as the Product, and select the title of this document as the Component. The version of this document is mirror-tutorial-0.31 (2005-08-29).

        The maintainers of this document will automatically receive your bug report. On behalf of the entire Fedora community, thank you for helping us make improvements.

        1.2. Audience

        You will find this tutorial more useful if you are a system administrator, or a Fedora Core “power user” familiar with the following topics:

        • Fedora Core system installation

        • Basic Internet protocols (HTTP/Web, FTP)

        • Using a command line interface

        1.3. About Mirrors

        A mirror is a server that provides a copy of one or more collections of files. Mirroring a site reduces traffic to the original source site, thus spreading the stress and bandwidth costs of many users across many sites. Side benefits of running a local mirror include very fast access through the local network, providing custom services to local users, and increasing your skills in managing Internet services.

        The site from which you retrieve files to build your mirror is called an upstream mirror. If possible, choose an upstream mirror that is located close to you geographically. This reduces unnecessary traffic across transcontinental sections of the Internet, where bandwidth is limited and expensive. Use only upstream mirrors that are intended for public access, unless you have permission from the upstream mirror site administrator.

        1.4. Additional Resources

        For more information on installing Fedora Core see the Fedora Core Installation Guide at http://fedora.redhat.com/docs/fedora-install-guide-en/. For more information on basic Internet protocols, see http://library.albany.edu/internet/internet.html, or search Google at http://www.google.com/. For more general information about mirrors, see http://en.wikipedia.org/wiki/Mirror_(computing).

        1.5. Acknowledgements

        Karsten Wade provided editorial services, keeping the style crisp and consistent.

           Next
           2. Planning and Setup
        --- NEW FILE ln-legalnotice.html --- Legal Notice

        Permission is granted to copy, distribute, and/or modify this document under the terms of the GNU Free Documentation License, Version 1.2 or any later version published by the Free Software Foundation; with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts. A copy of the license is available at http://www.gnu.org/licenses/fdl.html.

        This document may be copied and distributed in any medium, either commercially or noncommercially, provided that the GNU Free Documentation License (FDL), the copyright notices, and the license notice saying the GNU FDL applies to the document are reproduced in all copies, and that you add no other conditions whatsoever to those of the GNU FDL.

        Garrett LeSage created the admonition graphics (note, tip, important, caution, and warning). Tommy Reynolds created the callout graphics. They all may be freely redistributed with documentation produced for the Fedora Project.

        mirror-tutorial-0.31 (2005-08-29)

        Red Hat, Red Hat Network, the Red Hat "Shadow Man" logo, RPM, Maximum RPM, the RPM logo, Linux Library, PowerTools, Linux Undercover, RHmember, RHmember More, Rough Cuts, Rawhide and all Red Hat-based trademarks and logos are trademarks or registered trademarks of Red Hat, Inc. in the United States and other countries.

        Linux is a registered trademark of Linus Torvalds.

        Motif and UNIX are registered trademarks of The Open Group.

        Intel and Pentium are registered trademarks of Intel Corporation. Itanium and Celeron are trademarks of Intel Corporation.

        AMD, AMD Athlon, AMD Duron, and AMD K6 are trademarks of Advanced Micro Devices, Inc.

        Windows is a registered trademark of Microsoft Corporation.

        SSH and Secure Shell are trademarks of SSH Communications Security, Inc.

        FireWire is a trademark of Apple Computer Corporation.

        All other trademarks and copyrights referred to are the property of their respective owners.

        --- NEW FILE rv-revhistory.html ---
        Revision History
        Revision 0.22004-08-31PaulWFrields

        Initial version for editorial process.

        Revision 0.212004-09-02PaulWFrields

        Revised screen sections to use inline tags as discussed on fedora-docs-list; minor error corrections.

        Revision 0.222004-09-06PaulWFrields

        Style editing.

        Revision 0.232004-09-08PaulWFrields

        Additional style editing.

        Revision 0.242004-09-09PaulWFrields

        Brought introduction section in line with Fedora Documentation Project standards.

        Revision 0.252004-10-13PaulWFrields

        Incorporated all suggested changes by KWade.

        Revision 0.262004-12-01PaulWFrields

        Updated repository setup to include createrepo.

        Revision 0.272004-12-01PaulWFrields

        Minor corrections.

        Revision 0.282005-01-30PaulWFrields

        Minor corrections.

        Revision 0.292005-07-22PaulWFrields

        Minor note on yum versioning for repodata; fixed entities ref.

        Revision 0.302005-08-01PaulWFrields

        Add entities and draft notice.

        Revision 0.312005-08-29PaulWFrields

        Use bug reporting entity, add BETA classification.

        --- NEW FILE sn-client-config.html --- 4. Client Configuration
        4. Client Configuration
        Prev   ! Next

        4. Client Configuration

        You must also correctly configure the client workstations that use your mirror. Using the mirror as a source for RPM packages, clients may have seamless access for installing basic software through system-config-packages, solving RPM package installations at the command line, and pulling bug fix and security errata updates.

        4.1. Configuring system-config-packages

        Users typically run the system-config-packages application from the GUI menu, by choosing System Settings, Add/Remove Applications. This program allows the user to change the stock installation, provided no updates have taken place yet that interfere.

        Often, system-config-packages stops functioning optimally after certain updates are installed. This is because system-config-packages solves dependencies based on the stock distribution. It is impossible for system-config-packages to predict version numbers of updates. If you intend to carry updates on your mirror, you should be aware that installing certain updates causes system-config-packages to lose its effectiveness. Some sites do not mirror all updates due to configuration management concerns. The guidance in this section is especially useful in those scenarios.

        [Tip]yum and system-config-packages

        If you plan to carry updates on your mirror, as most administrators do, you will probably not use system-config-packages much. Once the installed package versions become out of sync with the original distribution versions, yum becomes much more useful. The preferred method for installing a package in that case would be yum install package_name. See Section 3.1, “How to Solve Dependencies” for more information.

        4.1.1. Setting Up autofs

        The autofs facility allows a Fedora Core system to mount file systems on demand. The /etc/auto.master file contains an automounter map . On Fedora Core, the automounter map is a list of additional definition files that should be loaded, one for each directory in the map. An example line from /etc/auto.master is shown below: 

        /misc  /etc/auto.misc  --timeout=60

        The first term in the line is the directory which is reserved for automounting. The second term is the automount file which should be consulted to determine any maps for that directory. The third term in the example indicates that if a map under /misc is not busy for 60 seconds, it is unmounted.

        The /etc/auto.misc file contains entries similar to the following example. 

        remote  -ro,soft,intr  host.foobar.org:/pub

        This line is contained in the automounter map file for the /misc directory. The first term is a key which is the name of a directory that appears upon demand. The second term is actually a list of options, identical to those that would be used for a real mount command. The final term is the file system (local or remote) to mount. In the above example, if the user of this station accesses the directory /misc/remote, an NFS mount is automatically performed. The user's command appears to hesitate, depending on how fast the NFS server responds. Then /misc/remote appears to be full of whatever content is on host.foobar.org in the /pub NFS share.

        You can use this function to provide NFS access to the stock distribution for Fedora Core. Choose a directory to map in the /etc/auto.master file, and match it to a corresponding automounter map file. The easiest way to do this is to simply remove the comment # from the front of the line attaching /misc to /etc/auto.misc. The default timeout should be sufficient.

        Make an entry in /etc/auto.misc similar to this. You can have multiple entries, each one with a different key. For instance, each key could be mapped to a different version of Fedora Core that you have available on the local mirror. 

        fc4  -ro,soft,intr  mirror.mydomain.org:/var/ftp/pub/linux/fedora/core/4

        Now restart the autofs service: 

        /sbin/service autofs restart

        To access the stock distribution for Fedora Core 4 the user can simply type cd /misc/fc4. The share is automatically mounted and the files simply appear in that local directory.

        4.1.2. /usr/share/applications/system-config-packages

        Now that autofs has been configured, your client workstations need to be configured so that system-config-packages points to the mirror's NFS share. Edit the /usr/share/applications/system-config-packages file's Exec= line to add a switch pointing to the share: 

        Exec=/usr/bin/system-config-packages --tree=/misc/fc4/i386/os

        When users choose System Settings, Add/Remove Applications from the GUI main menu, the system now automatically resolves package dependencies from the mirror. The restrictions stated above in yum and system-config-packages apply.

        4.1.3. The rpm --aid Switch

        The --aid switch for the rpm command also automatically solves dependencies. It performs this function based on the rpmdb-fedora package. That package is a preset database for a system that has every RPM package in the Fedora Core distribution installed. Even if a system does not itself have every package installed, it can consult the rpmdb-fedora package database to see what such a system would look like. By using the --aid switch, clients can issue a single rpm --install --aid command against an original Fedora Core package, and have all dependencies automatically installed as well.

        Two steps are required for this process. First, install the rpmdb-fedora package: 

        rpm --install /misc/fc4/i386/os/Fedora/RPMS/rpmdb-fedora-*.rpm

        Then, edit the file /etc/rpm/macros.solve, which is part of the rpmdb-fedora package. Change the following lines to enable package resolution: 

        %_solve_pkgsdir  /misc/fc4/i386/os/Fedora/RPMS/
%_solve_name_fmt  %{?_solve_pkgsdir}%%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm

        Users now issue a single command to install any package from the stock distribution, and all dependencies are solved for them. For example: 

        rpm --install --aid /misc/fc4/i386/os/Fedora/RPMS/kdeutils-*.rpm

        If a user forgets the --aid switch, they still receive hints. Normally rpm displays a slightly cryptic list of capability requirements, instead of straightforward package names. If you edit /etc/rpm/macros.solve as shown, rpm displays a list of required package names instead.

        Package dependency solutions using --aid are also restricted as shown above in yum and system-config-packages.

        Prev   Next
        3. Server Configuration Planning Home Index
        --- NEW FILE sn-planning-and-setup.html --- 2. Planning and Setup
        2. Planning and Setup
        Prev   Next

        2. Planning and Setup

        2.1. The Distribution Structure

        The Fedora distribution, which is the collection of all Fedora-related files, uses the directory tree in Example 1, “Fedora directory tree”. It may include multiple versions of Fedora Core. The tree design makes "trimming" of unnecessary or undesired files easier. When setting up a mirror, duplicate this tree exactly, or as closely as possible. Doing so makes automating nightly updates easier. 

        fedora
+-- linux
    +-- core
        |-- 1 
        |   ... 
        +-- 4 
        |   +-- SRPMS 
        |   +-- i386 
        |   |   +-- debug 
        |   |   +-- iso 
        |   |   +-- os 
        |   |       +-- Fedora 
        |   |       +-- SRPMS 
        |   |       +-- images 
        |   |       +-- isolinux 
        |   +-- x86_64 
        +-- development 
        |      ...
        +-- test 
        |      ...
        +-- updates 
            +-- 1 
            |   ... 
            +-- 4 
            |   +-- SRPMS 
            |   +-- i386 
            |   +-- x86_64 
            +-- testing 
                +-- 1 
                |   ... 
                +-- 4 
                    +-- SRPMS 
                    +-- i386 
                    +-- x86_64

        Example 1. Fedora directory tree

        [Note]Naming conventions

        Throughout the rest of the document, /var/ftp/pub/mirror represents the folder where all your mirrored files are stored. You may substitute a different location. This location simplifies sharing your mirror, due to the shipping configuration of Fedora Core. See Section 3, “Server Configuration Planning” for more information. The site name mirror.example.com represents the upstream mirror.

        The fedora/linux/core/4/arch/os directory contains a copy of all the original distribution files for Fedora Core 4. They are the same files found on the DVD and CD-ROM version of the distribution. The Fedora subfolder contains all the files that are necessary for installation, including the entire collection of Fedora Core RPM packages. The images folder contains copies of any floppy diskette or CD-ROM images that boot a system into installation or rescue modes. The fedora/linux/core/4/arch/iso folder contains images of the CD-ROM version of the distribution.

        [Note]RPM packages

        RPM, originally the Red Hat Package Manager and now the RPM Package Manager, is not just a file format. RPM is also a system which tracks and interconnects software and version information. The RPM system is quite popular, and many other Linux distributions use RPM as well. Read more information on RPM at http://www.rpm.org/. This document contains helpful hints on making the most of RPM, in Section 3, “Server Configuration Planning” and Section 4, “Client Configuration”.

        The SRPMS folders under architecture-specific branches are links which point to the main SRPMS folder for that distribution. For example, fedora/linux/core/2/i386/os/SRPMS is a link which points to fedora/linux/core/2/SRPMS.

        A Fedora mirror consists of at least the original ISO images or the distribution files. If possible, include both, provided you have sufficient disk space and/or bandwidth.

        2.2. Copying the Original Distribution

        If you already have reliable CD-ROM installation discs of a distribution, reduce your initial bandwidth and time spent mirroring by copying the files from the discs to your server. Copy all files from Installation Disc 1 into the fedora/linux/core/4/arch/os folder. Then copy all files from the Fedora folder of each of the remaining Installation discs into the fedora/linux/core/4/arch/os/Fedora folder on the server.

        Copy all the files from the SRPMS folder on each of the “Sources” discs to the fedora/linux/core/4/SRPMS folder on the server. Make a link in the os folder that occurs under each architecture. Follow this example: 

        cd /var/ftp/pub/mirror/fedora/linux/core/4/i386/os/Fedora
ln ../../SRPMS SRPMS

        The documentation for anaconda, the Fedora Core installation program, calls this directory structure an exploded tree. This is because the package data on each CD is extracted, or exploded, to a large directory tree with a predetermined structure. The anaconda installer expects this structure to some extent.

        If you only include CD images, create a mirror suitable for installation services by mounting each CD image under the arch/os/ directory. Make a directory for each disc, naming them disc1, disc2, and so on. Mount each disc on the appropriate folder, and add entries to /etc/fstab to perform this mount automatically in case of a reboot. Each entry looks like this: 

        /path/i386/iso/FC4-i386-disc1.iso  /path/i386/os/disc1  iso9660  defaults  0 0

        The anaconda application automatically detects these folders and uses them properly. In addition, system configuration tools such as system-config-packages also continue to work properly when pointed at the parent of the ISO image mount points.

        There are drawbacks to using CD ISO images in this fashion. For instance, no one directory contains the entire distribution of RPM packages. Soft links circumvent this problem, but your server security policies may not permit them. Fedora Core also comes in a ISO format DVD image, which alleviates this problem. Users who do not have DVD burning hardware, however, cannot use this image to make discs for their own use.

        You only need a single line in /etc/fstab for mounting the Fedora Core DVD ISO image. The entry looks like this: 

        /path/i386/iso/FC4-i386-DVD.iso  /path/i386/os  iso9660  defaults  0 0

        2.3. Trimming Branches

        You may omit almost any branch of the tree that you do not plan to use. Consider carefully the impact of excluding that folder. Branches you might trim from your mirror include:

        Older versions of Fedora Core (any numbered directory).

        Before you exclude an old version, ensure this does not adversely affect any of your users. These adverse affects can come in many forms. For example, the level of support for certain hardware sometimes changes between releases of Fedora Core. Users who cannot install a previous version may not be able to use Fedora Core. Your users might need to perform software-related tasks such as building packages for different Fedora Core releases. Always remain aware of the needs of your users during the planning stage.

        Folders for architectures your site does not support.

        If you do not have any x86-64 hosts to support, trimming these folders eliminates several gigabytes of extra files. If you support x86-64 hosts later, though, you must restore mirroring of these branches.

        The development folder (formerly “Rawhide”).

        This folder contains all the latest “bleeding-edge” packages from the Fedora Project. If you participate in active Fedora development, you should not trim this branch. Fedora development moves at a rapid pace and requires frequent updates to the latest development package versions. However, the frequent updates cause your mirror to download significant amounts of material during the regular update cycle.

        The testing folders.

        These branches contain updates that are being subjected to quality assurance through public testing, as well as the test or “pre-release” versions of the Fedora Core distribution. The testing folder under the main core tree is where test versions of the distribution, such as Fedora Core 4 test1, are kept. (Users of Fedora Core test distributions are often directed to use the development branch to update packages.) The testing folder, under updates, contains package updates that have not yet passed the public testing phase.

        The debug folders.

        These folders contain packages that enable developers and skilled users to interpret data created when a program crashes or encounters a bug. If you participate actively in Fedora development, you should not trim these folders. If you trim this branch, you may still download individual packages as needed from a nearby public mirror site.

        The SRPMS folders (and links thereto).

        These folders contain the original source for all the binary RPM packages in the distribution. You may download these packages individually as needed to save space on your local mirror.

        Unless your site closely manages workstation configuration, you should probably not trim any of the updates branches for the distributions you support. These locations contain packages handling bug fixes, security patches, and errata updates which your users probably want.

        2.4. Downloading the Files

        Locate a public mirror site for Fedora Core by referring to the main project site's mirror page, http://fedora.redhat.com/projects/docs/. Once you have selected a nearby mirror site, note what services it offers (FTP, HTTP, and/or rsync). A mirror is usually servicing a large number of users. Choose off-peak hours, when possible, to download a large set of files. Be aware of any timezone differences when estimating off-peak hours.

        2.4.1. Download Using HTTP or FTP

        To download via HTTP or FTP, use the wget command. wget recurses subdirectories automatically and pulls down entire trees of data with a single command. If you are not careful, however, it is possible to pull down much more data than you intended. The following commands mirror the entire current Fedora Core distribution: 

        cd /var/ftp/pub/mirror 
wget --mirror -np -nH --cut-dirs=2 http://mirror.example.com/pub/mirror/fedora/linux/core/4/

        Note the options used above:

        • --mirror turns on recursion (descends into all subdirectories), and duplicates file timestamps;

        • -np prevents wget from ascending into the parent directory;

        • -nH prevents wget from writing a directory named after the host (in this case, mirror.example.com);

        • --cut-dirs=n truncates the first n directories in the path. In the example above, --cut-dirs=2 prevents wget from writing the /pub/mirror portion of the path into your mirror.

        The same syntax works for both HTTP and FTP mirrors. It is possible that you may download some extraneous files if the HTTP site formats its pages for browser viewing. These files can be safely deleted, but return each time the mirror updates unless you exclude them using special options. See the wget man pages for more information.

        2.4.2. The rsync Command

        Use the rsync command to synchronize a set of files and/or directories with a remote host. It operates in much the same way as rcp, but it is usually faster. One reason for the speed is that rsync has a special protocol that evaluates and skips files (or portions of files) that are already downloaded.

        Begin by identifying the modules available on the upstream mirror site you have chosen. Note that the double colon “::” is always used after the host name to separate it from the rest of the rsync path. The following command generates a list of “modules” on the upstream mirror. 

        rsync mirror.example.org::

        These modules are roughly equivalent to top-level directories, and they follow the same rules. To list any subdirectory of the upstream mirror, add the directory path to the command above. For example, on many mirrors, the fedora-linux-core module is equivalent to the fedora/linux/core path found at the Fedora Project main download server. To list the contents of the Fedora Core 4 distribution folder on the upstream server, issue the following command. Do not forget the trailing slash “/”. Without it, you only receive a listing of a folder name that matches the last component of the remote path. 

        rsync mirror.example.org::fedora-linux-core/4/

        2.4.3. Downloading Using rsync

        To download via rsync, add a destination path on your system to the end of the command line. The resulting tree of files from the listing you perform are downloaded to the local path you specify. Remember, if you leave off the trailing slash on the remote path, then the last component of that path is created as a folder, and its contents are copied. 

        rsync filehouse.example.org::files/misc/ /var/ftp/pub/misc/

        When downloading using rsync for mirror purposes, use some of the command line switches to improve performance and feedback. The switches -PHav enable the following rsync features:

        • -P — recover partially-downloaded files, and show a progress meter

        • -H — preserve hard links

        • -a — recurse all directories, and preserve as much file information as possible, including timestamps, ownership, permissions, device files (if you are running as root), and soft links

        • -v — give verbose feedback to the screen

        Remove the -v switch if you run this mirroring process as part of a script, or have no need to monitor progress. The following example mirrors all available versions of Fedora Core from an upstream site.

        [Caution]Example command downloads many gigabytes of files

        This command downloads many gigabytes of files, and is intended for use as an example only. Do not run this command if you do not understand the consequences. 

        rsync -PHav mirror.example.org::fedora-linux-core/4/ /var/ftp/pub/mirror/fedora/core/4

        The -n switch performs a “dry run” using the other given parameters. Use this switch to test any rsync command if you are unsure what files you will receive. See also Possible data loss.

        The -z switch enables compression during the rsync process. The server compresses data before transmission, and the client decompresses the data before writing it to disk.

        [Tip]Compression using rsync

        The vast majority of the Fedora Core distribution consists of RPM files, which are already compressed data. Therefore, additional compression does not save time, and instead induces an unnecessary load on the upstream mirror CPU. As a courtesy, do not use the -z switch for this purpose.

        The next section features some additional switches that can be used to automatically trim branches from the tree of downloaded folders. With proper usage, they result in a mirror that is exactly as organized and full-featured as any high-volume public upstream site.

        [Warning]Possible data loss

        If you are not exceedingly careful in using these switches, it is possible to delete large portions of your mirrored data. Fixing this problem might simply require performing the copying steps outlined in Section 2.2, “Copying the Original Distribution” above. On the other hand, if you are also careless about your destination path, and you are running as root, you could put your entire system at risk. Know your environment before using these switches:

        • What is your current working directory? Use pwd to find out, if you are unsure.

        • Are you logged in as root? If you are using SELinux extensions, what is your current security context?

        • Have you tested this command using the -n switch (see Section 2.4.3, “Downloading Using rsync”)?

        Use the --exclude switch, along with a simple pattern, to disallow download of certain files and/or folders. For instance, --exclude "*.iso" excludes the download of any file whose name ends with the string ".iso".

        Use the --delete switch, again with a pattern, to remove any file from the local system which does not have a match on the upstream mirror. This switch prevents unwanted file debris from cropping up in your mirror. You can also use it to retroactively trim branches of the tree which you no longer wish to maintain or download.

        Wildcards are permitted with rsync commands, including the asterisk *, question mark ?, and brackets [ ]. The question mark and brackets work as in the shell; the former matches any single character, while the brackets define a set of characters to be matched. Asterisks are especially powerful when combined with a portion of a file name. The double asterisk ** pattern matches any character, including slashes; a single asterisk * matches any character, but stops at a slash. Therefore, be judicious about using either. The double asterisk is very useful for mirroring a tree that includes multiple instances of directories and files that contain a pattern. A good example is mirroring several versions of Fedora Core, where certain folder names appear in every version.

        [Tip]Pattern matching wildcards

        Use double asterisks to trim out directories that repeat throughout a mirrored tree. For example, when mirroring for a site that only uses i386 architecture machines, you may trim all files and folders marked for x86_64 architecture, using the switch --exclude "**x86_64**". This matches not only folders marked x86_64, but also files such as ISO images for x86_64, which are indicated by file names such as FC4-x86_64-disc1.iso.

        Process a long list of exclusions and deletions with the --exclude-from and --delete-from options. Follow each tag with a file name that includes a list of patterns, one per line, to be matched by the appropriate option.

        These syntax hints only scratch the surface of rsync, but suffice to make your first mirror. Once you have selected your site and formulated your excludes and deletes, run your rsync command with the -n option. Redirect output to a file so you can examine the resulting list of files in the editor or pager of your choice.

        The following example mirrors the entire Fedora Core 4 distribution, with --exclude options that avoid downloading:

        The -n switch is included for testing purposes. Backslashes at the ends of lines indicate this example is a single command line. 

        rsync -Pan --delete --exclude "**x86_64**" --exclude "**headers**" \
  --exclude "**debug**" --exclude "**iso**" \
  mirror.example.com::fedora-linux-core/4/ \
  /var/ftp/pub/mirror/fedora/core/4

        2.5. Maintaining Your Mirror

        Fedora mirrors are even more useful when they are more than just a snapshot of the distribution at release time. Most mirror administrators also choose to carry updates and errata packages. Repositories of updates or development trees change daily, and your mirror should reflect these changes.

        [Important]rsync etiquette

        If you plan to do regular updates of your mirror that include large amounts of data, you should ask permission from the administrator of the upstream mirror. Downloading nightly package updates for the official releases of Fedora Core 4 should not require notification, as they are rarely more than a few megabytes. However, the development tree routinely turns over several hundred megabytes nightly. Take these factors into consideration before putting any maintenance scripts into effect.

        Once your rsync command is working as desire, you may want to place it in a nightly cron script. The cron system allows you to schedule regularly-occurring jobs on your system. The intervals are highly configurable, but a nightly run keeps your mirror synchronized with updates and errata. Make sure your nightly cron job follows some simple guidelines:

        • If your upstream mirror only synchronizes once or twice daily, run your job after the upstream mirror completes its update. This insures your mirror not only gets the freshest material, but also does not interfere with the upstream server's bandwidth while it runs its job. If you do not know this time, it is usually safe to plan your downloads for pre-dawn hours.

        • Be sure you have sufficient disk space for additional packages. The updates tree in particular grows over time as more errata packages are released.

        • Always test your script thoroughly before allowing it to run automatically. Use a -n or -v switch in the rsync command line for testing, and then remove it once you have completed testing. Remember that the results are e-mailed to your account on your system unless you specify differently. Read the crontab(5) man pages for additional information, with the command man 5 crontab.

        Prev   Next
        Mirror Tutorial - BETA Home 3. Server Configuration Planning
        --- NEW FILE sn-server-config.html --- 3. Server Configuration Planning
        3. Server Configuration Planning
        Prev   Next

        3. Server Configuration Planning

        Decide what services your mirror will offer to clients. There are at least three services useful for providing Fedora installation and update services: HTTP, FTP, and NFS. Some or all of these services can be used for offering post-installation functions such as updates or installing additional packages.

        Install the vsftpd package for FTP services. Install the httpd package to use the Apache HTTP server. Most Fedora Core systems already have the nfs-utils package installed, which contains the NFS server.

        To start a service, use the /sbin/service service start command. To enable that server by default at boot time, use the chkconfig service on command.

        One recommended method is to download all mirrored files into /var/ftp/pub, add a link in /var/www/html that points to /var/ftp/pub, and share out /var/ftp/pub via NFS as well. FTP and HTTP services do not require any further configuration to work properly. However, you should evaluate your site's security needs before enabling them. NFS service configuration is explained below in Section 3.3, “Configuring NFS”.

        To share out the public FTP area via HTTP, issue the following command: 

        ln -s /var/ftp/pub /var/www/html/pub

        Your clients may now visit any area of your mirror by using the URL http://server.mydomain.org/pub/path. To create an NFS share, add a line to /etc/exports. This example shares out the Fedora Core 4 i386 stock distribution with read-only access for any host in the mydomain.org domain. 

        /var/ftp/pub/linux/fedora/core/4/i386/os  *.mydomain.org(ro,sync,root_squash)

        To reread the NFS server configuration files and export the new share, use the following command: 

        exportfs -ar

        Refer to Section 3.3, “Configuring NFS” for a list of commands for starting services both on demand and at boot time.

        3.1. How to Solve Dependencies

        Every RPM package has a header that contains all the vital information about that package. This information includes name, version and release, contents, the capabilities provided by the package, and any prerequisites. These prerequisites may include dependencies. A dependency is a requirement for one or more additional packages.

        Packages installed without satisfying their dependencies may not work correctly. Dependencies may create a problem for users who are trying to install a single package. Manually determining and resolving dependencies is difficult. Fedora Core provides the yum utility for solving these dependencies automatically, providing an improved user experience.

        The Yellow Dog Updater Modified, or yum, is a Python-based system for computing and solving RPM dependencies. A yum client retrieves a cache of headers from its repository server, as well as a list of available RPM packages and their exact locations on the server. It can do this via HTTP or FTP, as well as using standard file system calls (either local or remote via NFS). The client computes solutions to any package dependencies using the downloaded header information, and simply requests all necessary RPM packages once it has finished. The yum command relies on rpm functions to perform many of the computations involved in the process.

        A drawback to yum is that the first time it is run, it must download a header for every package installed on the system in order to determine available updates. However, running a local mirror nullifies this drawback. The yum command can, of course, download many megabytes of headers almost instantly on a standard Ethernet LAN. The yum utility is the most popular update method for Fedora Core.

        For more information about using yum, refer to http://fedora.redhat.com/docs/yum/.

        3.2. Configuring Repositories

        A yum repository is a collection of packages on a server which supports yum clients. Repositories can serve both types of clients if desired.

        To set up a yum repository, you must write a directory that contains information which the clients require to resolve RPM dependencies. The directory's name depends on the version of yum it supports. It is permissible to have both kinds of repository information in a single repository.

        To support older yum clients, use the yum-arch command. To support current yum clients, use the createrepo command.

        [Important]Supporting Fedora Core 3 and beyond

        Fedora Core 3 ships with a newer version of yum. To support Fedora Core 3 yum clients, you must use createrepo on your server's repositories.

        3.2.1. yum-arch

        A directory which supports older versions of yum (before 2.2) is named headers. It is created by using the command yum-arch, which is run against the directory under which you want the headers directory to appear. The yum-arch program searches recursively through that directory and any subdirectories for RPM packages, and includes them in the header data. 

        yum-arch -l -s /var/ftp/pub/linux/fedora/core/4/i386/os

        The -l switch follows symbolic links. The -s switch includes SRPMS (source RPM packages) in the header list. The command above creates the yum header cache in the directory /var/ftp/pub/linux/fedora/core/4/i386/os/headers.

        3.2.2. createrepo

        The createrepo command creates repository information to support newer versions of yum (and possibly other repository client programs). The createrepo command stores this data in a folder named repodata. Just as with yum-arch, run createrepo against the directory under which you want the repodata directory to appear. The createrepo program also searches recursively for RPM packages to include in the repository data.

        The following command creates the repository data in the directory /var/ftp/pub/linux/fedora/core/4/i386/os/repodata. 

        createrepo /var/ftp/pub/linux/fedora/core/4/i386/os

        You may not be able to foresee all the possible uses for your server's repositories. To minimize problems for your clients, create both kinds of repository data for any repositories.

        3.2.3. Repository Locations

        Typically yum-arch or createrepo is run against at least the following locations:

        • The stock distribution; for example, /var/ftp/pub/linux/fedora/core/4/i386/os/. For yum-arch use the -l and -s options to follow the linked directory SRPMS and include the source packages therein.

        • Official updates to the distribution; for example, /var/ftp/pub/linux/fedora/core/updates/4/. Once again, for yum-arch use -l and/or -s if appropriate.

        3.3. Configuring NFS

        Some client-side utilities also resolve dependencies automatically. These utilities require more detailed configuration of the client workstation. For more information, see Section 4, “Client Configuration” below. These utilities, however, require standard file system access to package collections. For this reason, you may require NFS on your mirror. Configuration of the client depends in large part on how you decide to implement NFS sharing on the mirror.

        It is difficult to share subdirectories of other shared directories. Therefore, think of your mirror as offering many services, each one to be considered for NFS sharing. For example, share both the stock distribution of Fedora Core 2 and the stock distribution of Fedora Core 3.

        The client side tools discussed later can use a directory of ISO images or an exploded tree of package data (see Section 2.2, “Copying the Original Distribution”). You may share out any or all of these, provided your shares do not clash as described above.

        To share via NFS, edit the /etc/exports file. A typical share, exported with read-only access for any host on any network, looks like this: 

        /mnt/media *(ro,all_squash,async)

        The all_squash option ensures that no users accessing the share using their local root account receive equivalent access on the share. This feature keeps some small measure of security even on a public share, since a file readable only by root on the server is not readable by an NFS client. The async option allows asynchronous read/writes, which is not dangerous in this case because the share is read-only. The * is a host designator, in this case matching any host name or IP address. You may wish to restrict this share to your internal network. You may declare either a matching name or IP address specification. You can find more detailed information by reading the man pages for the /etc/exports file by using the command man 5 exports.

        [Important]Access control format

        Be certain that you do not have a space between the host specification and the option listing in parentheses ( ). A space causes the NFS daemon to consider that entry as two separate access controls. In the example above, a space causes the first access control to match all hosts and allow write access, which is the default! The second access control is never reached because the first matches any host first.

        To share the proper directories from your mirror, use one of the following forms. To share your exploded tree, export the directory that contains the Fedora folder (note the capitalization). For i386 architectures: 

        /var/ftp/pub/linux/fedora/core/4/i386/os *(ro,all_squash,async)

        To share a directory full of ISO images, export that directory: 

        /var/ftp/pub/linux/fedora/core/4/i386/iso *(ro,all_squash,async)

        Once you have edited the /etc/exports file, make sure that the NFS server is installed and started properly on the mirror. The portmap and nfs-utils packages must be installed. Configure them to be turned on at boot time by default. 

        /sbin/chkconfig portmap on
/sbin/chkconfig nfslock on
/sbin/chkconfig nfs on

        To check if any of these services are currently running, use the /sbin/service service_name status command: 

        /sbin/service portmap status
/sbin/service nfslock status
/sbin/service nfs status

        To restart a service, use the /sbin/service service_name restart command: 

        /sbin/service portmap restart
/sbin/service nfslock restart
/sbin/service nfs restart

        If any service is not started, use the command /sbin/service service_name start to start it, as in the following examples: 

        /sbin/service portmap start
/sbin/service nfslock start
/sbin/service nfs start

        To change your exports when the NFS service is already running, use the command /usr/sbin/exportfs -ar. The command /usr/sbin/showmount -e displays a list of the current NFS exports on the local host machine.

        Prev   Next
        2. Planning and Setup Home 4. Client Configuration
        From fedora-extras-commits at redhat.com Wed Sep 28 21:37:05 2005 From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields)) Date: Wed, 28 Sep 2005 17:37:05 -0400 Subject: web/html/docs/beta/mirror-tutorial/stylesheet-images 1.png, NONE, 1.1 10.png, NONE, 1.1 11.png, NONE, 1.1 12.png, NONE, 1.1 13.png, NONE, 1.1 14.png, NONE, 1.1 15.png, NONE, 1.1 2.png, NONE, 1.1 3.png, NONE, 1.1 4.png, NONE, 1.1 5.png, NONE, 1.1 6.png, NONE, 1.1 7.png, NONE, 1.1 8.png, NONE, 1.1 9.png, NONE, 1.1 caution.png, NONE, 1.1 important.png, NONE, 1.1 note.png, NONE, 1.1 tip.png, NONE, 1.1 warning.png, NONE, 1.1 Message-ID: <200509282137.j8SLb5ee017296@cvs-int.fedora.redhat.com> Author: pfrields Update of /cvs/fedora/web/html/docs/beta/mirror-tutorial/stylesheet-images In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17233/mirror-tutorial/stylesheet-images Added Files: 1.png 10.png 11.png 12.png 13.png 14.png 15.png 2.png 3.png 4.png 5.png 6.png 7.png 8.png 9.png caution.png important.png note.png tip.png warning.png Log Message: Added mirror tutorial BETA From fedora-extras-commits at redhat.com Wed Sep 28 21:56:43 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Wed, 28 Sep 2005 17:56:43 -0400 Subject: rpms/koffice/devel koffice-qt3.3.5.patch,1.3,1.4 Message-ID: <200509282156.j8SLuiZp017417@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/koffice/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17395 Modified Files: koffice-qt3.3.5.patch Log Message: - even more qt fixes koffice-qt3.3.5.patch: Index: koffice-qt3.3.5.patch =================================================================== RCS file: /cvs/extras/rpms/koffice/devel/koffice-qt3.3.5.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- koffice-qt3.3.5.patch 28 Sep 2005 14:47:48 -0000 1.3 +++ koffice-qt3.3.5.patch 28 Sep 2005 21:56:41 -0000 1.4 @@ -42,3 +42,13 @@ - kispreviewview.h - +--- krita/ui/wdgnewimage.ui.orig 2005-09-28 23:53:58.000000000 +0200 ++++ krita/ui/wdgnewimage.ui 2005-09-28 23:54:20.000000000 +0200 +@@ -320,7 +320,6 @@ + + knuminput.h + knuminput.h +- kiscmbidlist.h + kcolorcombo.h + + From fedora-extras-commits at redhat.com Wed Sep 28 22:21:34 2005 From: fedora-extras-commits at redhat.com (Karsten Wade (kwade)) Date: Wed, 28 Sep 2005 18:21:34 -0400 Subject: CVSROOT avail,1.13,1.14 Message-ID: <200509282221.j8SMLYIP018948@cvs-int.fedora.redhat.com> Author: kwade Update of /cvs/fedora/CVSROOT In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18929 Modified Files: avail Log Message: Some traction on this guide? Index: avail =================================================================== RCS file: /cvs/fedora/CVSROOT/avail,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- avail 19 Sep 2005 22:45:16 -0000 1.13 +++ avail 28 Sep 2005 22:21:32 -0000 1.14 @@ -51,5 +51,6 @@ avail | pfrields | web/html/participate/documentation-faq/ avail | pfrields | web/html/participate/documentation-guide/ avail | pfrields,mjohnson | web/html/participate/documentation-quick-start/ +avail | pfrields | web/html/participate/developers-guide/ From fedora-extras-commits at redhat.com Thu Sep 29 04:21:49 2005 From: fedora-extras-commits at redhat.com (Aaron Kurtz (dragoon)) Date: Thu, 29 Sep 2005 00:21:49 -0400 Subject: owners owners.list,1.271,1.272 Message-ID: <200509290421.j8T4LniV027750@cvs-int.fedora.redhat.com> Author: dragoon Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27731 Modified Files: owners.list Log Message: Changing back projects now that bugzilla account is proper Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.271 retrieving revision 1.272 diff -u -r1.271 -r1.272 --- owners.list 28 Sep 2005 20:26:55 -0000 1.271 +++ owners.list 29 Sep 2005 04:21:47 -0000 1.272 @@ -173,7 +173,7 @@ Fedora Extras|fbida|FrameBuffer Imageviewer|adrian at lisas.de|extras-qa at fedoraproject.org| Fedora Extras|fedora-rpmdevtools|Fedora RPM Development Tools|ville.skytta at iki.fi|extras-qa at fedoraproject.org| Fedora Extras|fedora-usermgmt|Fedora tools for user management|enrico.scholz at informatik.tu-chemnitz.de|extras-qa at fedoraproject.org| -Fedora Extras|feh|Fast command line image viewer using Imlib2|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| +Fedora Extras|feh|Fast command line image viewer using Imlib2|a.kurtz at hardsun.net|extras-qa at fedoraproject.org| Fedora Extras|fftw3|Fast Fourier Transform library|qspencer at ieee.org|extras-qa at fedoraproject.org| Fedora Extras|fftw|Fast Fourier Transform library|compton at pcompton.com|extras-qa at fedoraproject.org| Fedora Extras|fig2ps|Utility for converting xfig pictures to PS/PDF|qspencer at ieee.org|extras-qa at fedoraproject.org| @@ -259,9 +259,9 @@ Fedora Extras|gnofract4d|Gnofract 4D is a Gnome-based program to draw fractals|pmatilai at laiskiainen.org|extras-qa at fedoraproject.org| Fedora Extras|gnomad2|Manager for digital audio players|triad at df.lth.se|extras-qa at fedoraproject.org| Fedora Extras|gnome-applet-netmon|GNOME Network Load Applet|ghenry at suretecsystems.com|extras-qa at fedoraproject.org| -Fedora Extras|gnome-applet-netspeed|GNOME applet that shows traffic on a network device|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| +Fedora Extras|gnome-applet-netspeed|GNOME applet that shows traffic on a network device|a.kurtz at hardsun.net|extras-qa at fedoraproject.org| Fedora Extras|gnome-applet-rhythmbox|A GNOME panel applet to control Rhythmbox's playback|ivazquez at ivazquez.net|extras-qa at fedoraproject.org| -Fedora Extras|gnome-applet-sensors|Gnome panel applet for hardware sensors|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| +Fedora Extras|gnome-applet-sensors|Gnome panel applet for hardware sensors|a.kurtz at hardsun.net|extras-qa at fedoraproject.org| Fedora Extras|gnome-applet-timer|A countdown timer applet for the GNOME panel|wickerpms at arcor.de|extras-qa at fedoraproject.org| Fedora Extras|gnome-blog|GNOME panel object for posting blog entries|bdpepple at ameritech.net|extras-qa at fedoraproject.org| Fedora Extras|gnome-common|Useful things common to building gnome packages from scratch|toshio at tiki-lounge.com|extras-qa at fedoraproject.org| @@ -410,7 +410,7 @@ Fedora Extras|libcdio|A CD-ROM input and control library|adrian at lisas.de|extras-qa at fedoraproject.org| Fedora Extras|libchewing|Traditional Chinese phonetic input method library|petersen at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|libcmml|Library for handling Continuous Media Markup Language|thomas at apestaart.org|extras-qa at fedoraproject.org| -Fedora Extras|libdaemon|libdaemon is a lightweight C library that eases the writing of UNIX daemons|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| +Fedora Extras|libdaemon|libdaemon is a lightweight C library that eases the writing of UNIX daemons|a.kurtz at hardsun.net|extras-qa at fedoraproject.org| Fedora Extras|libdnet|Simple portable interface to lowlevel networking routines|oliver at linux-kernel.at|extras-qa at fedoraproject.org| Fedora Extras|libebml|The Extensible Binary Meta Language library|anvil at livna.org|extras-qa at fedoraproject.org| Fedora Extras|libesmtp|SMTP client library|pawsa at theochem.kth.se|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Thu Sep 29 09:32:29 2005 From: fedora-extras-commits at redhat.com (Mark Cox (mjc)) Date: Thu, 29 Sep 2005 05:32:29 -0400 Subject: fedora-security/audit fc4,1.64,1.65 Message-ID: <200509290932.j8T9WTaa003524@cvs-int.fedora.redhat.com> Author: mjc Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3503 Modified Files: fc4 Log Message: Away yesterday, so catch up on fc4 issues Index: fc4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc4,v retrieving revision 1.64 retrieving revision 1.65 diff -u -r1.64 -r1.65 --- fc4 27 Sep 2005 09:36:51 -0000 1.64 +++ fc4 29 Sep 2005 09:32:27 -0000 1.65 @@ -1,8 +1,9 @@ -Up to date CVE as of CVE email 20050926 -Up to date FC4 as of 20050926 +Up to date CVE as of CVE email 20050928 +Up to date FC4 as of 20050928 ** are items that need attention +2005-3089 ** firefox 2005-3055 VULNERABLE (kernel) 2005-3054 ** php 2005-3053 backport (kernel) [since FEDORA-2005-820] patch-2.6.12.5 @@ -27,6 +28,7 @@ 2005-2796 version (squid, fixed 2.5.STABLE11) [since FEDORA-2005-913] was backport since FEDORA-2005-851 2005-2794 version (squid, fixed 2.5.STABLE11) [since FEDORA-2005-913] was backport since FEDORA-2005-851 2005-2728 backport (httpd, fixed 2.0.55-dev) [since FEDORA-2005-849] +2005-2710 version (helixplayer, fixed 1.0.6) [since FEDORA-2005-940] 2005-2707 VULNERABLE (thunderbird) 2005-2707 version (firefox, fixed 1.0.7) [since FEDORA-2005-926] 2005-2707 version (mozilla, fixed 1.7.12) [since FEDORA-2005-927] From fedora-extras-commits at redhat.com Thu Sep 29 12:43:09 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 29 Sep 2005 08:43:09 -0400 Subject: rpms/sbcl/FC-4 sources,1.3,1.4 .cvsignore,1.3,1.4 Message-ID: <200509291243.j8TCh92W008198@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/sbcl/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8177 Modified Files: sources .cvsignore Log Message: update x86 (local) bootstrap Index: sources =================================================================== RCS file: /cvs/extras/rpms/sbcl/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 28 Sep 2005 01:23:45 -0000 1.3 +++ sources 29 Sep 2005 12:43:06 -0000 1.4 @@ -1,4 +1,4 @@ f594f18813c08f262a6df9a36288adcb sbcl-0.9.5-source.tar.bz2 3a72d0785ce0a8e02f9af632c2a4f217 sbcl-0.8.15-powerpc-linux-binary.tar.bz2 67ec41e624a3f2ad7f6f3cde1bd001d3 sbcl-0.9.4-x86-64-linux-binary.tar.bz2 -947d1cde2c1c80416b5f9fb4e4c81383 sbcl-0.9.4-x86-linux-binary.tar.bz2 +cb01b462b517889723eeaf63b5474c70 sbcl-0.9.5-x86-linux-binary.tar.bz2 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/sbcl/FC-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 28 Sep 2005 01:23:45 -0000 1.3 +++ .cvsignore 29 Sep 2005 12:43:06 -0000 1.4 @@ -1,4 +1,4 @@ sbcl-0.9.5-source.tar.bz2 sbcl-0.8.15-powerpc-linux-binary.tar.bz2 sbcl-0.9.4-x86-64-linux-binary.tar.bz2 -sbcl-0.9.4-x86-linux-binary.tar.bz2 +sbcl-0.9.5-x86-linux-binary.tar.bz2 From fedora-extras-commits at redhat.com Thu Sep 29 13:06:38 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Thu, 29 Sep 2005 09:06:38 -0400 Subject: rpms/perl-Class-Inspector/devel .cvsignore, 1.2, 1.3 perl-Class-Inspector.spec, 1.3, 1.4 sources, 1.2, 1.3 Message-ID: <200509291306.j8TD6c4F009648@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-Class-Inspector/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9630 Modified Files: .cvsignore perl-Class-Inspector.spec sources Log Message: Upstream update. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Class-Inspector/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 13 Sep 2005 15:29:10 -0000 1.2 +++ .cvsignore 29 Sep 2005 13:06:13 -0000 1.3 @@ -1 +1 @@ -Class-Inspector-1.12.tar.gz +Class-Inspector-1.13.tar.gz Index: perl-Class-Inspector.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Class-Inspector/devel/perl-Class-Inspector.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- perl-Class-Inspector.spec 13 Sep 2005 16:20:43 -0000 1.3 +++ perl-Class-Inspector.spec 29 Sep 2005 13:06:13 -0000 1.4 @@ -1,6 +1,6 @@ Name: perl-Class-Inspector -Version: 1.12 -Release: 2%{?dist} +Version: 1.13 +Release: 1%{?dist} Summary: Get information about a class and its structure License: GPL or Artistic Group: Development/Libraries @@ -48,6 +48,9 @@ %{_mandir}/man3/* %changelog +* Thu Sep 29 2005 Ralf Corsepius - 1.13-1 +- Upstream update. + * Tue Sep 13 2005 Ralf Corsepius - Fix another typo in %%summary. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Class-Inspector/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 13 Sep 2005 15:29:10 -0000 1.2 +++ sources 29 Sep 2005 13:06:13 -0000 1.3 @@ -1 +1 @@ -c49feb019c32a720d64c887b05022a4b Class-Inspector-1.12.tar.gz +ffce59a030a0c2d3234d285be96530e0 Class-Inspector-1.13.tar.gz From fedora-extras-commits at redhat.com Thu Sep 29 13:11:41 2005 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Thu, 29 Sep 2005 09:11:41 -0400 Subject: rpms/abcm2ps/devel .cvsignore, 1.2, 1.3 abcm2ps.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200509291311.j8TDBfit009784@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/abcm2ps/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9759 Modified Files: .cvsignore abcm2ps.spec sources Log Message: new version 4.11.6 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/abcm2ps/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 26 Sep 2005 17:36:04 -0000 1.2 +++ .cvsignore 29 Sep 2005 13:11:39 -0000 1.3 @@ -1,2 +1,2 @@ -abcm2ps-4.11.4.tar.gz -abcplus_en-1.0.3.zip +abcm2ps-4.11.6.tar.gz +abcplus_en-1.0.4-beta1.zip Index: abcm2ps.spec =================================================================== RCS file: /cvs/extras/rpms/abcm2ps/devel/abcm2ps.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- abcm2ps.spec 27 Sep 2005 16:20:00 -0000 1.2 +++ abcm2ps.spec 29 Sep 2005 13:11:39 -0000 1.3 @@ -1,13 +1,13 @@ Name: abcm2ps -Version: 4.11.4 -Release: 2%{?dist} +Version: 4.11.6 +Release: 1%{?dist} Summary: A program to typeset ABC tunes into Postscript Group: Applications/Multimedia License: GPL URL: http://moinejf.free.fr -Source0: http://moinejf.free.fr/abcm2ps-4.11.4.tar.gz -Source1: http://abcplus.sourceforge.net/abcplus_en-1.0.3.zip +Source0: http://moinejf.free.fr/abcm2ps-4.11.6.tar.gz +Source1: http://abcplus.sourceforge.net/abcplus_en-1.0.4-beta1.zip BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description @@ -52,6 +52,9 @@ %changelog +* Thu Sep 29 2005 Gerard Milmeister - 4.11.6 +- New Version 4.11.6 + * Thu Sep 8 2005 Gerard Milmeister - 4.11.4-2 - Updated description Index: sources =================================================================== RCS file: /cvs/extras/rpms/abcm2ps/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 26 Sep 2005 17:36:04 -0000 1.2 +++ sources 29 Sep 2005 13:11:39 -0000 1.3 @@ -1,2 +1,2 @@ -296c0ff7527234a1b9bbf44b70731fb4 abcm2ps-4.11.4.tar.gz -221c256a7102244d1509be209601586e abcplus_en-1.0.3.zip +bc4065da488b2bd208044bdfddedbb6e abcm2ps-4.11.6.tar.gz +f1c1c75c690452d4dfb80f4046898cf4 abcplus_en-1.0.4-beta1.zip From fedora-extras-commits at redhat.com Thu Sep 29 13:11:48 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Thu, 29 Sep 2005 09:11:48 -0400 Subject: rpms/perl-Class-Inspector/FC-4 .cvsignore, 1.2, 1.3 perl-Class-Inspector.spec, 1.3, 1.4 sources, 1.2, 1.3 Message-ID: <200509291311.j8TDBmbK009811@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-Class-Inspector/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9788 Modified Files: .cvsignore perl-Class-Inspector.spec sources Log Message: Upstream update. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Class-Inspector/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 13 Sep 2005 15:29:10 -0000 1.2 +++ .cvsignore 29 Sep 2005 13:11:46 -0000 1.3 @@ -1 +1 @@ -Class-Inspector-1.12.tar.gz +Class-Inspector-1.13.tar.gz Index: perl-Class-Inspector.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Class-Inspector/FC-4/perl-Class-Inspector.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- perl-Class-Inspector.spec 13 Sep 2005 16:20:43 -0000 1.3 +++ perl-Class-Inspector.spec 29 Sep 2005 13:11:46 -0000 1.4 @@ -1,6 +1,6 @@ Name: perl-Class-Inspector -Version: 1.12 -Release: 2%{?dist} +Version: 1.13 +Release: 1%{?dist} Summary: Get information about a class and its structure License: GPL or Artistic Group: Development/Libraries @@ -48,6 +48,9 @@ %{_mandir}/man3/* %changelog +* Thu Sep 29 2005 Ralf Corsepius - 1.13-1 +- Upstream update. + * Tue Sep 13 2005 Ralf Corsepius - Fix another typo in %%summary. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Class-Inspector/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 13 Sep 2005 15:29:10 -0000 1.2 +++ sources 29 Sep 2005 13:11:46 -0000 1.3 @@ -1 +1 @@ -c49feb019c32a720d64c887b05022a4b Class-Inspector-1.12.tar.gz +ffce59a030a0c2d3234d285be96530e0 Class-Inspector-1.13.tar.gz From fedora-extras-commits at redhat.com Thu Sep 29 13:12:19 2005 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Thu, 29 Sep 2005 09:12:19 -0400 Subject: rpms/abcm2ps/FC-3 .cvsignore, 1.2, 1.3 abcm2ps.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200509291312.j8TDCn2L009897@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/abcm2ps/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9850/FC-3 Modified Files: .cvsignore abcm2ps.spec sources Log Message: new version 4.11.6 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/abcm2ps/FC-3/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 26 Sep 2005 17:36:04 -0000 1.2 +++ .cvsignore 29 Sep 2005 13:12:17 -0000 1.3 @@ -1,2 +1,2 @@ -abcm2ps-4.11.4.tar.gz -abcplus_en-1.0.3.zip +abcm2ps-4.11.6.tar.gz +abcplus_en-1.0.4-beta1.zip Index: abcm2ps.spec =================================================================== RCS file: /cvs/extras/rpms/abcm2ps/FC-3/abcm2ps.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- abcm2ps.spec 27 Sep 2005 16:19:54 -0000 1.2 +++ abcm2ps.spec 29 Sep 2005 13:12:17 -0000 1.3 @@ -1,13 +1,13 @@ Name: abcm2ps -Version: 4.11.4 -Release: 2%{?dist} +Version: 4.11.6 +Release: 1%{?dist} Summary: A program to typeset ABC tunes into Postscript Group: Applications/Multimedia License: GPL URL: http://moinejf.free.fr -Source0: http://moinejf.free.fr/abcm2ps-4.11.4.tar.gz -Source1: http://abcplus.sourceforge.net/abcplus_en-1.0.3.zip +Source0: http://moinejf.free.fr/abcm2ps-4.11.6.tar.gz +Source1: http://abcplus.sourceforge.net/abcplus_en-1.0.4-beta1.zip BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description @@ -52,6 +52,9 @@ %changelog +* Thu Sep 29 2005 Gerard Milmeister - 4.11.6 +- New Version 4.11.6 + * Thu Sep 8 2005 Gerard Milmeister - 4.11.4-2 - Updated description Index: sources =================================================================== RCS file: /cvs/extras/rpms/abcm2ps/FC-3/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 26 Sep 2005 17:36:04 -0000 1.2 +++ sources 29 Sep 2005 13:12:17 -0000 1.3 @@ -1,2 +1,2 @@ -296c0ff7527234a1b9bbf44b70731fb4 abcm2ps-4.11.4.tar.gz -221c256a7102244d1509be209601586e abcplus_en-1.0.3.zip +bc4065da488b2bd208044bdfddedbb6e abcm2ps-4.11.6.tar.gz +f1c1c75c690452d4dfb80f4046898cf4 abcplus_en-1.0.4-beta1.zip From fedora-extras-commits at redhat.com Thu Sep 29 13:12:19 2005 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Thu, 29 Sep 2005 09:12:19 -0400 Subject: rpms/abcm2ps/FC-4 .cvsignore, 1.2, 1.3 abcm2ps.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200509291312.j8TDCnHT009902@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/abcm2ps/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9850/FC-4 Modified Files: .cvsignore abcm2ps.spec sources Log Message: new version 4.11.6 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/abcm2ps/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 26 Sep 2005 17:36:04 -0000 1.2 +++ .cvsignore 29 Sep 2005 13:12:17 -0000 1.3 @@ -1,2 +1,2 @@ -abcm2ps-4.11.4.tar.gz -abcplus_en-1.0.3.zip +abcm2ps-4.11.6.tar.gz +abcplus_en-1.0.4-beta1.zip Index: abcm2ps.spec =================================================================== RCS file: /cvs/extras/rpms/abcm2ps/FC-4/abcm2ps.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- abcm2ps.spec 27 Sep 2005 16:19:54 -0000 1.2 +++ abcm2ps.spec 29 Sep 2005 13:12:17 -0000 1.3 @@ -1,13 +1,13 @@ Name: abcm2ps -Version: 4.11.4 -Release: 2%{?dist} +Version: 4.11.6 +Release: 1%{?dist} Summary: A program to typeset ABC tunes into Postscript Group: Applications/Multimedia License: GPL URL: http://moinejf.free.fr -Source0: http://moinejf.free.fr/abcm2ps-4.11.4.tar.gz -Source1: http://abcplus.sourceforge.net/abcplus_en-1.0.3.zip +Source0: http://moinejf.free.fr/abcm2ps-4.11.6.tar.gz +Source1: http://abcplus.sourceforge.net/abcplus_en-1.0.4-beta1.zip BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description @@ -52,6 +52,9 @@ %changelog +* Thu Sep 29 2005 Gerard Milmeister - 4.11.6 +- New Version 4.11.6 + * Thu Sep 8 2005 Gerard Milmeister - 4.11.4-2 - Updated description Index: sources =================================================================== RCS file: /cvs/extras/rpms/abcm2ps/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 26 Sep 2005 17:36:04 -0000 1.2 +++ sources 29 Sep 2005 13:12:17 -0000 1.3 @@ -1,2 +1,2 @@ -296c0ff7527234a1b9bbf44b70731fb4 abcm2ps-4.11.4.tar.gz -221c256a7102244d1509be209601586e abcplus_en-1.0.3.zip +bc4065da488b2bd208044bdfddedbb6e abcm2ps-4.11.6.tar.gz +f1c1c75c690452d4dfb80f4046898cf4 abcplus_en-1.0.4-beta1.zip From fedora-extras-commits at redhat.com Thu Sep 29 13:21:40 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Thu, 29 Sep 2005 09:21:40 -0400 Subject: rpms/perl-Class-Autouse/FC-4 .cvsignore, 1.2, 1.3 perl-Class-Autouse.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200509291321.j8TDLeOm010049@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-Class-Autouse/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10026 Modified Files: .cvsignore perl-Class-Autouse.spec sources Log Message: Upstream update. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Class-Autouse/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 15 Sep 2005 03:49:33 -0000 1.2 +++ .cvsignore 29 Sep 2005 13:21:38 -0000 1.3 @@ -1 +1 @@ -Class-Autouse-1.20.tar.gz +Class-Autouse-1.21.tar.gz Index: perl-Class-Autouse.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Class-Autouse/FC-4/perl-Class-Autouse.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-Class-Autouse.spec 15 Sep 2005 03:54:30 -0000 1.2 +++ perl-Class-Autouse.spec 29 Sep 2005 13:21:38 -0000 1.3 @@ -1,6 +1,6 @@ Name: perl-Class-Autouse -Version: 1.20 -Release: 2%{?dist} +Version: 1.21 +Release: 1%{?dist} Summary: Run-time class loading on first method call License: GPL or Artistic Group: Development/Libraries @@ -12,7 +12,7 @@ BuildArch: noarch BuildRequires: perl(Test::More) >= 0.47 -BuildRequires: perl(Carp) >= 1.03 +BuildRequires: perl(Carp) BuildRequires: perl(File::Spec) >= 0.82 BuildRequires: perl(List::Util) >= 1.11 @@ -53,6 +53,10 @@ %{_mandir}/man3/* %changelog +* Wed Sep 28 2005 Ralf Corsepius - 1.21-1 +- Upstream update. +- Fix bogus dep on perl(Carp). + * Thu Sep 15 2005 Ralf Corsepius - 1.20-2 - Spec cleanup. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Class-Autouse/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 15 Sep 2005 03:49:33 -0000 1.2 +++ sources 29 Sep 2005 13:21:38 -0000 1.3 @@ -1 +1 @@ -746a4f415dd8c7267bcec07841022275 Class-Autouse-1.20.tar.gz +3bf4fadd8349e57d6af0961b6565c74f Class-Autouse-1.21.tar.gz From fedora-extras-commits at redhat.com Thu Sep 29 13:26:12 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Thu, 29 Sep 2005 09:26:12 -0400 Subject: rpms/koffice/devel koffice.spec,1.9,1.10 Message-ID: <200509291326.j8TDQCr4010116@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/koffice/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10097 Modified Files: koffice.spec Log Message: - get devel working Index: koffice.spec =================================================================== RCS file: /cvs/extras/rpms/koffice/devel/koffice.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- koffice.spec 28 Sep 2005 09:37:56 -0000 1.9 +++ koffice.spec 29 Sep 2005 13:26:10 -0000 1.10 @@ -54,6 +54,7 @@ BuildRequires: doxygen BuildRequires: graphviz-devel BuildRequires: aspell-devel +BuildRequireS: libacl-devel %description KOffice - Integrated Office Suite @@ -743,6 +744,7 @@ * Wed Sep 28 2005 Andreas Bierfert 1.4.1-6 - add patch for qt-3.3.5 problem +- get devel working * Tue Sep 27 2005 Andreas Bierfert 1.4.1-5 From fedora-extras-commits at redhat.com Thu Sep 29 14:00:47 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Thu, 29 Sep 2005 10:00:47 -0400 Subject: rpms/koffice/devel koffice-qt3.3.5.patch,1.4,1.5 Message-ID: <200509291400.j8TE0lNS010266@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/koffice/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10233 Modified Files: koffice-qt3.3.5.patch Log Message: - more qt3.3.5 fixes koffice-qt3.3.5.patch: Index: koffice-qt3.3.5.patch =================================================================== RCS file: /cvs/extras/rpms/koffice/devel/koffice-qt3.3.5.patch,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- koffice-qt3.3.5.patch 28 Sep 2005 21:56:41 -0000 1.4 +++ koffice-qt3.3.5.patch 29 Sep 2005 14:00:45 -0000 1.5 @@ -52,3 +52,14 @@ kcolorcombo.h +--- krita/ui/wdgcolorsettings.ui.orig 2005-09-29 15:58:11.000000000 +0200 ++++ krita/ui/wdgcolorsettings.ui 2005-09-29 15:58:38.000000000 +0200 +@@ -361,8 +361,4 @@ + radioPerceptual + + +- +- kiscmbidlist.h +- kiscmbidlist.h +- + From fedora-extras-commits at redhat.com Thu Sep 29 14:39:53 2005 From: fedora-extras-commits at redhat.com (Gavin Henry (ghenry)) Date: Thu, 29 Sep 2005 10:39:53 -0400 Subject: rpms/perl-Apache-LogRegex/devel Makefile,1.1,1.2 Message-ID: <200509291439.j8TEdr9r011813@cvs-int.fedora.redhat.com> Author: ghenry Update of /cvs/extras/rpms/perl-Apache-LogRegex/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11794 Modified Files: Makefile Log Message: Still had meld in the Makefile. Index: Makefile =================================================================== RCS file: /cvs/extras/rpms/perl-Apache-LogRegex/devel/Makefile,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- Makefile 21 Aug 2005 00:09:41 -0000 1.1 +++ Makefile 29 Sep 2005 14:39:50 -0000 1.2 @@ -1,6 +1,6 @@ # Makefile for source rpm: perl-Apache-LogRegex # $Id$ -NAME := meld +NAME := perl-Apache-LogRegex SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common From fedora-extras-commits at redhat.com Thu Sep 29 17:06:01 2005 From: fedora-extras-commits at redhat.com (Karsten Wade (kwade)) Date: Thu, 29 Sep 2005 13:06:01 -0400 Subject: CVSROOT avail,1.14,1.15 Message-ID: <200509291706.j8TH6u2F016456@cvs-int.fedora.redhat.com> Author: kwade Update of /cvs/fedora/CVSROOT In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16432 Modified Files: avail Log Message: Final slashes are evil? Index: avail =================================================================== RCS file: /cvs/fedora/CVSROOT/avail,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- avail 28 Sep 2005 22:21:32 -0000 1.14 +++ avail 29 Sep 2005 17:05:58 -0000 1.15 @@ -48,9 +48,9 @@ avail | mjc,bressers,jorton,notting,sopwith,katzj | fedora-security avail | pfrields | web/html/projects/docs -avail | pfrields | web/html/participate/documentation-faq/ -avail | pfrields | web/html/participate/documentation-guide/ -avail | pfrields,mjohnson | web/html/participate/documentation-quick-start/ -avail | pfrields | web/html/participate/developers-guide/ +avail | pfrields | web/html/participate/documentation-faq +avail | pfrields | web/html/participate/documentation-guide +avail | pfrields,mjohnson | web/html/participate/documentation-quick-start +avail | pfrields | web/html/participate/developers-guide From fedora-extras-commits at redhat.com Thu Sep 29 17:08:36 2005 From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields)) Date: Thu, 29 Sep 2005 13:08:36 -0400 Subject: web/html/participate/developers-guide sn-cvs-config.php, NONE, 1.1 sn-cvs-cvscommands.php, NONE, 1.1 sn-cvs-preparation.php, NONE, 1.1 ch-console-access.php, 1.1.1.1, 1.2 ch-cvs.php, 1.1.1.1, 1.2 ch-guidelines.php, 1.1.1.1, 1.2 ch-menus.php, 1.1.1.1, 1.2 ch-package-versions.php, 1.1.1.1, 1.2 ch-rpm-building.php, 1.1.1.1, 1.2 ch-ui-guidelines.php, 1.1.1.1, 1.2 index.php, 1.1.1.1, 1.2 ln-legalnotice.php, 1.1.1.1, 1.2 s1-rpm-guidelines.php, 1.1.1.1, 1.2 s1-rpm-more-guidelines.php, 1.1.1.1, 1.2 s1-ui-get-details.php, 1.1.1.1, 1.2 s1-ui-get-religion.php, 1.1.1.1, 1.2 s1-ui-gnome-guidelines.php, 1.1.1.1, 1.2 s1-ui-more-suggestions.php, 1.1.1.1, 1.2 s1-ui-scaling.php, 1.1.1.1, 1.2 Message-ID: <200509291709.j8TH9Bnx016513@cvs-int.fedora.redhat.com> Author: pfrields Update of /cvs/fedora/web/html/participate/developers-guide In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16475 Modified Files: ch-console-access.php ch-cvs.php ch-guidelines.php ch-menus.php ch-package-versions.php ch-rpm-building.php ch-ui-guidelines.php index.php ln-legalnotice.php s1-rpm-guidelines.php s1-rpm-more-guidelines.php s1-ui-get-details.php s1-ui-get-religion.php s1-ui-gnome-guidelines.php s1-ui-more-suggestions.php s1-ui-scaling.php Added Files: sn-cvs-config.php sn-cvs-cvscommands.php sn-cvs-preparation.php Log Message: Update to UTF-8, adding new CVS sections ***** Error reading new file: [Errno 2] No such file or directory: 'sn-cvs-config.php' ***** Error reading new file: [Errno 2] No such file or directory: 'sn-cvs-cvscommands.php' ***** Error reading new file: [Errno 2] No such file or directory: 'sn-cvs-preparation.php' Index: ch-console-access.php =================================================================== RCS file: /cvs/fedora/web/html/participate/developers-guide/ch-console-access.php,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- ch-console-access.php 30 Mar 2005 17:47:23 -0000 1.1.1.1 +++ ch-console-access.php 29 Sep 2005 17:08:19 -0000 1.2 @@ -7,29 +7,29 @@ ?> -
        Chapter?6.?Enabling Console Access
        Prev???Next

        Chapter?6.?Enabling Console Access

        - Some applications, such as Log Viewer and other +

        Chapter 6. Enabling Console Access
        Prev   Next

        Chapter 6. Enabling Console Access

        + Some applications, such as Log Viewer and other applications in the Configuration Tools Project need root privileges to run. To prompt the user for the root password, configure the correct PAM - files to use consolehelper. This example uses the - program redhat-logviewer as an example. Replace it with + files to use consolehelper. This example uses the + program redhat-logviewer as an example. Replace it with the name of your program. -

        1. At a shell prompt, change to the /usr/bin/ +

          1. At a shell prompt, change to the /usr/bin/ directory, and make a symbolic link from the name of the application - to /usr/bin/consolehelper. For example:

            -ln -s consolehelper redhat-logviewer
+	  to /usr/bin/consolehelper. For example:
            +ln -s consolehelper redhat-logviewer

          2. As root, create the file - /etc/security/console.apps/app-name, + /etc/security/console.apps/app-name, such as - /etc/security/console.apps/redhat-logviewer, + /etc/security/console.apps/redhat-logviewer, with the following lines:

            -USER=root
+USER=root
 PROGRAM=/usr/share/redhat-logviewer/redhat-logviewer.py
-SESSION=true
+SESSION=true

          3. Create the PAM configuration file - /etc/pam.d/redhat-logviewer with the following + /etc/pam.d/redhat-logviewer with the following lines:

            -#%PAM-1.0
+#%PAM-1.0
 auth       sufficient   /lib/security/pam_rootok.so
 auth       sufficient   /lib/security/pam_timestamp.so
 auth       required     /lib/security/pam_stack.so service=system-auth
@@ -37,40 +37,40 @@
 session    optional     /lib/security/pam_xauth.so
 session    optional     /lib/security/pam_timestamp.so
 account    required     /lib/security/pam_permit.so
-

          - When a user executes the command redhat-logviewer, it - calls consolehelper, which in turn calls - userhelper to authenticate the user with PAM. If the +

        + When a user executes the command redhat-logviewer, it + calls consolehelper, which in turn calls + userhelper to authenticate the user with PAM. If the user enters the correct root password, the user is authenticated, and authentication is remember for the user on the same tty for five minutes.

        When using Make to install the package and when configuring the files to build the RPM package, to make sure these files are installed in the correct location, create the - /etc/security/console.apps/redhat-logviewer file as - redhat-logviewer.console and the - /etc/pam.d/redhat-logviewer file as - redhat-logviewer.pam. In the - Makefile, add the following variables declarations: + /etc/security/console.apps/redhat-logviewer file as + redhat-logviewer.console and the + /etc/pam.d/redhat-logviewer file as + redhat-logviewer.pam. In the + Makefile, add the following variables declarations: 

        -PAMD_DIR        =    /etc/pam.d
+PAMD_DIR        =    /etc/pam.d
 SECURITY_DIR    =    /etc/security/console.apps
-PKGNAME         =    redhat-logviewer
+PKGNAME         =    redhat-logviewer

        - In the install section of the - Makefile, add the following lines: + In the install section of the + Makefile, add the following lines: 

        -install ${PKGNAME}.pam $(INSTROOT)$(PAMD_DIR)/${PKGNAME}
-install ${PKGNAME}.console $(INSTROOT)$(SECURITY_DIR)/${PKGNAME}
+install ${PKGNAME}.pam $(INSTROOT)$(PAMD_DIR)/${PKGNAME}
+install ${PKGNAME}.console $(INSTROOT)$(SECURITY_DIR)/${PKGNAME}

        - Finally, in the redhat-logviewer.spec file, add the - following lines under the %files section + Finally, in the redhat-logviewer.spec file, add the + following lines under the %files section so that the files are installed with the RPM and are in the file list for the package: 

        -%attr(0644,root,root) %config(noreplace) /etc/security/console.apps/%{name}
-%attr(0644,root,root) %config(noreplace) /etc/pam.d/%{name}
-
        Prev?Up?Next
        5.6.?Scaling It Down?Home?Chapter?7.?Adding Applications to the Menus
        +%attr(0644,root,root) %config(noreplace) /etc/security/console.apps/%{name} +%attr(0644,root,root) %config(noreplace) /etc/pam.d/%{name} +
        Prev   Next
        5.6. Scaling It Down Home Chapter 7. Adding Applications to the Menus
        -
        Chapter?3.?CVS
        Prev???Next

        Chapter?3.?CVS

        - CVS, or Concurrent Versions System, provides a framework for multiple - users to edit the same files. As you can imagine, if a group of users - edits the files in a single directory, chaos would reign. Using CVS, - however, a group of people can safely work on the same set of files. CVS - keeps the master copy of the files, and it records who changed what and - when in a central repository. If conflicts arise, CVS lets you know. CVS - is usually used so that programmers can share code, but it also works well - for documentation. -

        3.1.?How CVS Works

        - In most cases, each set of files that make up a package or project is - stored as a module on the CVS server. -

        - When working with files from CVS, you checkout a - copy of the module on your local file system. After modifying one or - more files, you commit them back to the central - CVS repository server. -

        - When you commit changes, only changes to files the server knows about - are committed. In other words, if you created a file in your local - checkout of a module, the new file is not automatically uploaded to the - server. You must add the file to the repository - and then commit it. If you remove a file from your local checkout of a - module, you must specify that you want to remove it from the repository - on the CVS server and then commit the removal of the file. -

        - The specific commands to perform these actions are discussed in Section?3.3, “Basic CVS Commands”. -

        - If someone has modified the file between the last time you grabbed the - file from CVS and when you try to commit a change, it tried to merge the - changes into the master copy of the CVS server. If the content you - changed is in a different location in the file than the content changed - by someone else, chances are, the commit action will go through without - a conflict. If someone modified the same content - as the content you just changed and tried to commit, you will see a - message that a file conflict has occurred. Thus, you need to - update your files frequently. It is a good - practice to update them right before you start modifying a file. Refer - to Section?3.3.7, “Resolving Conflicts” for instructions - on resolving conflicts. -

        Prev?Up?Next
        Chapter?2.?Package Versions?Home?3.2.?Configuring CVS on Your System
        +
        Chapter 3. CVS
        Prev   Next

        Chapter 3. CVS

        + The Concurrent Versions System (CVS) + provides a framework where multiple users can edit the same files. + As you can imagine, if a group of users edits the files in a single + directory, chaos would reign. Using CVS, + however, a group of people can safely work on the same set of files. + CVS keeps the master copy of the files, + and it records who changed what and when in a central repository. If + conflicts arise, CVS lets you know. + CVS is often used so that programmers can + share code, but it also works well for documentation. +

        3.1. How CVS Works

        + In most cases, each set of files that make up a package or project + is stored as a module on the CVS server. +

        + When working with files from CVS, you + checkout a copy of the module on your local + file system. After modifying one or more files, you + commit them back to the central + CVS repository server. +

        + With CVS you may edit a file without + first getting permission or locking the file. The + concurrent part of the + CVS name comes from its ability to + allow several different people to edit different parts of the same + file. As long as none of the changes overlap, + CVS can correctly record their changes. + In case of duplicate changes, they are clearly marked in the files + and the authors must resolve the issue among themselves. +

        + When you commit changes, only changes to files the server knows + about are committed. In other words, if you created a file in your + local checkout of a module, the new file is not automatically + uploaded to the server. You must add the + file to the repository and then commit it. If you remove a file + from your local checkout of a module, you must specify that you + want to remove it from the repository on the CVS server and then + commit the removal of the file. +

        + The specific commands to perform these actions are discussed in + Section 3.4, “Basic CVS Commands”. +

        + If someone has modified the file between the last time you grabbed + the file from CVS and when you try to commit a change, + CVS will try to merge the changes into + the master copy of the CVS server. If + the content you changed is in a different location in the file + than the content changed by someone else, chances are, the commit + action will go through without a conflict. + If someone modified the same content as the content you just + changed and tried to commit, you will see a message that a file + conflict has occurred. Thus, you need to + update your files frequently. It is a good + practice to update them right before you start modifying a file. + Refer to Section 3.4.8, “Resolving Conflicts” for + instructions on resolving conflicts. +

        Prev   Next
        Chapter 2. Package Versions Home 3.2. Preparing For CVS Use
        -
        Chapter?1.?General Guidelines
        Prev???Next

        Chapter?1.?General Guidelines

        - Developers for the Fedora project must adhere to the following rules: +

        Chapter 1. General Guidelines
        Prev   Next

        Chapter 1. General Guidelines

        + Developers for the Fedora Project must adhere to the following rules:

        1. If you are not the owner of a package, email the owner before making any changes.

        2. Never rebuild a package with the exact same name-epoch-version-release number. Mnemonic: Never say - n-e-v-r again.

        Prev?Up?Next
        Fedora Project Developer's Guide?Home?Chapter?2.?Package Versions
        + n-e-v-r again.

      Prev   Next
      Fedora Core Developer's Guide Home Chapter 2. Package Versions
      -
      Chapter?7.?Adding Applications to the Menus
      Prev???

      Chapter?7.?Adding Applications to the Menus

      +

      Chapter 7. Adding Applications to the Menus
      Prev   

      Chapter 7. Adding Applications to the Menus

      If you want users to be able to find your application, you need to add it - to the Main Menu. The Main Menu in + to the Main Menu. The Main Menu in GNOME and KDE are generated from the same desktop files so that they have the same menus. This feature is useful because only one desktop file needs to be installed. The desktop file must be installed in the - /usr/share/applications/ directory, must have a + /usr/share/applications/ directory, must have a specific format, and must be in UTF-8 format. For example: 

      -[Desktop Entry]
+[Desktop Entry]
 Name=System Logs
 Name[it]=Log di sistema
 Comment=Examine system log files
@@ -27,100 +27,100 @@
 Type=Application
 Terminal=false
 Encoding=UTF-8
-
+

      This example does not show all translations of the name and comment, but you can see the format of the file and translations from it. The - Categories field specifies which menu + Categories field specifies which menu group the application should appear under. In this example, the entry is - under System Tools. + under System Tools.

      The file should follow the specification outlined at http://www.freedesktop.org/standards/desktop-entry-spec/. The - Categories field is used as described + Categories field is used as described in the specification at http://www.freedesktop.org/standards/menu-spec/, though Fedora Core doesn't yet use the XML format described in that spec.

      If you are not sure your desktop file is written correctly, - install the desktop-file-utils package. This + install the desktop-file-utils package. This package contains the command - desktop-file-validate. To use it, execute the command + desktop-file-validate. To use it, execute the command followed by the location of your desktop file. If the file contains all the required fields, the command will return nothing; otherwise, it will return an error message. For example, the following error message is displayed if the Encoding field is missing: 

      -Error, file /tmp/redhat-logviewer.desktop does not contain the "Encoding"
+Error, file /tmp/redhat-logviewer.desktop does not contain the "Encoding"
 key. This is a required field for all desktop files.
-

      +

      Save the file as - application-name.desktop, - such as redhat-logviewer.desktop, and the following - to the spec file under the %files + application-name.desktop, + such as redhat-logviewer.desktop, and the following + to the spec file under the %files section: 

      -%attr(0644,root,root) %{_datadir}/applications/%{name}.desktop
+%attr(0644,root,root) %{_datadir}/applications/%{name}.desktop

      Also add the following line to the install section of the - Makefile to to make sure it is installed in the + Makefile to to make sure it is installed in the correct place: 

      -install ${PKGNAME}.desktop $(INSTROOT)/usr/share/applications/${PKGNAME}.desktop
+install ${PKGNAME}.desktop $(INSTROOT)/usr/share/applications/${PKGNAME}.desktop

      - If an upstream package already comes with a .desktop - file that installs to /usr/share/applications/, you + If an upstream package already comes with a .desktop + file that installs to /usr/share/applications/, you may not need to do anything (especially because Fedora Core uses mostly the same menu layout as upstream GNOME). However, if you need to modify the - upstream .desktop file, the - desktop-file-utils package contains a tool called - desktop-file-install. This tool can be used in the - %install section of an RPM to munge the - upstream .desktop file in various ways. Here is an example from - gnome-system-monitor: + upstream .desktop file, the + desktop-file-utils package contains a tool called + desktop-file-install. This tool can be used in the + %install section of an RPM to munge the + upstream .desktop file in various ways. Here is an example from + gnome-system-monitor: 

      -      
+      
         desktop-file-install --vendor gnome --delete-original       \
           --dir $RPM_BUILD_ROOT%{_datadir}/applications             \
           --add-category X-Red-Hat-Base                             \
           $RPM_BUILD_ROOT%{_datadir}/applications/*
-       
+

      In the above example, the following changes are made:

      • - The .desktop file is renamed to have the vendor "gnome" prefixed - to its filename. .desktop files should have a namespace prefix + The .desktop file is renamed to have the vendor "gnome" prefixed + to its filename. .desktop files should have a namespace prefix to avoid collisions.

      • - The --delete-original option - means that in addition to creating a new .desktop file, + The --delete-original option + means that in addition to creating a new .desktop file, the original file is removed.

      • - The category X-Red-Hat-Base is - added to the Categories field. + The category X-Red-Hat-Base is + added to the Categories field.

      In addition to letting you add/remove categories and so forth, - desktop-file-install will automatically validate the - .desktop file. -

      7.1.?Red Hat Categories

      + desktop-file-install will automatically validate the + .desktop file. +

      7.1. Red Hat Categories

      There are two special categories, - X-Red-Hat-Base and - X-Red-Hat-Extra. These distinguish + X-Red-Hat-Base and + X-Red-Hat-Extra. These distinguish between menu items that appear in the base menus, and those that appear - in the "More Foo" menus. For example, the "Internet" and "More Internet - Applications" menus. The rule is that only one application of a given + in the "More Foo" menus. For example, the "Internet" and "More Internet + Applications" menus. The rule is that only one application of a given class of application may have the - X-Red-Hat-Base category. For example, - one and only one web browser may be in "Internet", - other web browsers must be in "More Internet Applications." As a - secondary rule, "geeky" or obscure applications may always be in the - X-Red-Hat-Extra category. Essentially, - the X-Red-Hat-Base should be reserved + X-Red-Hat-Base category. For example, + one and only one web browser may be in "Internet", + other web browsers must be in "More Internet Applications." As a + secondary rule, "geeky" or obscure applications may always be in the + X-Red-Hat-Extra category. Essentially, + the X-Red-Hat-Base should be reserved for a nice set of default applications for nontechnical end users.

      - The best guideline: use X-Red-Hat-Extra + The best guideline: use X-Red-Hat-Extra by default, and if you want to use - X-Red-Hat-Base, make your case on - . -

      Prev?Up?
      Chapter?6.?Enabling Console Access?Home?
      + X-Red-Hat-Base, make your case on + . +

      Prev   
      Chapter 6. Enabling Console Access Home 
      -
      Chapter?2.?Package Versions
      Prev???Next

      Chapter?2.?Package Versions

      +

      Chapter 2. Package Versions
      Prev   Next

      Chapter 2. Package Versions

      The following rules apply:

      1. Stable releases are allowed until the feature freeze date.

      2. Stable snapshots are generally OK, but there has to be a good reason why you want to use the stable snapshot instead of the stable release plus patches. This is generally more acceptable for larger, - well-maintained projects such as gcc, - gdb).

      3. Alpha releases are usually not OK. Obviously, there are some + well-maintained projects such as gcc, + gdb).

      4. Alpha releases are usually not OK. Obviously, there are some packages whose upstream maintainers have never changed their - versions from -alpha. Basically, + versions from -alpha. Basically, this guideline applies when there is a previous stable version available. -

      5. Beta releases are generally not OK. Refer to Section?2.1, “Beta Exceptions”.

      6. Development/beta snapshots are generally not OK.

      2.1.?Beta Exceptions

      +

    17. Beta releases are generally not OK. Refer to Section 2.1, “Beta Exceptions”.

    18. Development/beta snapshots are generally not OK.

      19. 2.1. Beta Exceptions

      For large important packages with a maintained developer base, shipping beta/pre-release versions is OK during a development cycle, provided all of the following are met: @@ -39,7 +39,7 @@ new things to our users not just because they are newer, but because they provide either feature enhancements or better stability (bug fixes). -

      Prev?Up?Next
      Chapter?1.?General Guidelines?Home?Chapter?3.?CVS
      +

      Prev   Next
      Chapter 1. General Guidelines Home Chapter 3. CVS
      -
      Chapter?4.?Building RPM Packages
      Prev???Next

      Chapter?4.?Building RPM Packages

      +

      Chapter 4. Building RPM Packages
      Prev   Next

      Chapter 4. Building RPM Packages

      This chapter attempts to discuss how to build RPMs so that the package - conforms to Fedora project standards. It does not attempt to explain everything + conforms to Fedora Project standards. It does not attempt to explain everything there is to know about RPM or building RPMs.

      - A good source for learning more about RPM is the Red Hat RPM - Guide by Eric Foster-Johnson; Red Hat Press. -

      4.1.?Spec File

      + A good source for learning more about RPM is the Red Hat RPM + Guide by Eric Foster-Johnson; Red Hat Press. +

      4.1. Spec File

      This section describes how the spec file should be written. 

      -Name: foo
+Name: foo
 Summary:  The foo package does foo
 Version: 1.0
 Release: 1
@@ -54,13 +54,13 @@
 /sbin/ldconfig
 
 %preun 
-if [ "$1" = 0 ]; then 
+if [ "$1" = 0 ]; then 
   /sbin/service foo stop > /dev/null 2>&1 
   /sbin/chkconfig --del foo 
 fi
 
 %postun 
-if [ "$1" -ge "1" ]; then 
+if [ "$1" -ge "1" ]; then 
   /sbin/service foo condrestart > /dev/null 2>&1 
   /sbin/ldconfig 
 fi
@@ -75,42 +75,42 @@
 %changelog 
 
 * Mon Jun 16 2003 Some One <one at example.com>
-— fixed the broken frobber (#86434)
-
      Name

      The name of the package.

      Summary

      A short summary of the purpose of the package, should not +— fixed the broken frobber (#86434) +

      Name

      The name of the package.

      Summary

      A short summary of the purpose of the package, should not include the name of the package in the summary as this is - redundant information.

      Version

      The version of the package. Should match the version of the - (main) tarball of the source. If the "real" version has dashes in - it, replace them with underscores.

      Release

      This is the Fedora project release count for the package. Each time it - is modified for the Fedora project (sent through the build system) this number + redundant information.

      Version

      The version of the package. Should match the version of the + (main) tarball of the source. If the "real" version has dashes in + it, replace them with underscores.

      Release

      This is the Fedora Project release count for the package. Each time it + is modified for the Fedora Project (sent through the build system) this number must be incremented. NEVER rebuild a package without incrementing this number, as this gives a totally false impression to the user — that the package has not changed at all. Whenever a package is rebuilt, it changes, even if the source - code was not updated.

      License

      One of GPL, LGPL, BSD(-like), Artistic, etc. Most old packages - erroneously call this the "Copyright" field. This is incorrect but + code was not updated.

      License

      One of GPL, LGPL, BSD(-like), Artistic, etc. Most old packages + erroneously call this the "Copyright" field. This is incorrect but the two are synonyms for each other. Fix old packages to have the - correct tag if found.

      Group

      This must be one of the canonical groups from the - /usr/share/doc/rpm-<version>/GROUPS - file. Do not make up group names.

      URL

      The Web address for the package, if one exists.

      Source

      Start numbering the sources at 0 - (Source0 , - Source1, etc.). A tag of - Source is implicitly source + correct tag if found.

      Group

      This must be one of the canonical groups from the + /usr/share/doc/rpm-<version>/GROUPS + file. Do not make up group names.

      URL

      The Web address for the package, if one exists.

      Source

      Start numbering the sources at 0 + (Source0 , + Source1, etc.). A tag of + Source is implicitly source 0. Include the full URL or path to the source package if necessary. If a filename without a URL or path is given as the - source, the file should be in the SOURCES + source, the file should be in the SOURCES directory under your top level directory — - /usr/src/redhat/SOURCES/ by default or define - the top level directory in your ~/.rpmmacros - file.

      Use the special macros %name - and %version where possible so + /usr/src/redhat/SOURCES/ by default or define + the top level directory in your ~/.rpmmacros + file.

      Use the special macros %name + and %version where possible so that updating these particular fields automatically update the - source field.

      Patch

      Start numbering patch files with 0 - (Patch0, - Patch1, etc.). To make patches, + source field.

      Patch

      Start numbering patch files with 0 + (Patch0, + Patch1, etc.). To make patches, name them in the format - <name>-<version>-<whatisfixed>.patch. - Do not use the %name and - %version macros here; chances are + <name>-<version>-<whatisfixed>.patch. + Do not use the %name and + %version macros here; chances are these patches may be needed even when you upgrade the package source code after generating the initial patch, and it will probably apply without modifications. If you use the macros, you @@ -122,100 +122,100 @@ this will the tons of little changes we have to make in our own packages be integrated upstream over time.

      To create a patch, follow this process:

      1. Enter the directory where the source code for the package is, and copy the original file to the same name as the file - with the <whatisfixed> string + with the <whatisfixed> string appended to it. For example, if the the old file was called - sourcecode.c, copy it to - sourcecode.c.iconfix.

      2. Then, make your edits/changes/fixes to the file - sourcecode.c.

      3. Go into the directory one level above the sourcecode, - usually the directory ../BUILD. Use the - gendiff command from the - rpm package to generate the patch + sourcecode.c, copy it to + sourcecode.c.iconfix.

      4. Then, make your edits/changes/fixes to the file + sourcecode.c.

      5. Go into the directory one level above the sourcecode, + usually the directory ../BUILD. Use the + gendiff command from the + rpm package to generate the patch file:

        -gendiff <source-dir> <fixed-extension> > ../SOURCES/<source-dir>-<fixed-extension>.patch
+gendiff <source-dir> <fixed-extension> > ../SOURCES/<source-dir>-<fixed-extension>.patch

        For example, if the source code is in the directory - program-1.0/, and the backup file was - appended with the string iconfix, the + program-1.0/, and the backup file was + appended with the string iconfix, the command would be as follows: 

        -gendiff sourcecode-1.0 .iconfix > ../SOURCES/sourcecode-1.0-iconfix.patch
-
      Buildroot

      Make sure you use the special - %{_tmppath} macro. Do not - hard code /tmp/ or - /var/tmp/ because users or the build system +gendiff sourcecode-1.0 .iconfix > ../SOURCES/sourcecode-1.0-iconfix.patch +

      Buildroot

      Make sure you use the special + %{_tmppath} macro. Do not + hard code /tmp/ or + /var/tmp/ because users or the build system may have configured RPM to put temporary files elsewhere or may declared a different location for temporary files. Use the name and version macros so that two different versions of the package - can be built at the same time without collisions.

      Requires

      If your package requires other packages to be on the system at + can be built at the same time without collisions.

      Requires

      If your package requires other packages to be on the system at the time of installation, list them here. Include versions if necessary (for example, somepackage >= 2.0). Multiple entries must be separated by a space or a comma. Explicit file dependencies may be listed rather than package dependencies by giving the full path - (for example, /sbin/chkconfig).

      Prereq

      Similar to Requires, except + (for example, /sbin/chkconfig).

      Prereq

      Similar to Requires, except that this tag lists packages or files that are required to be present before the package is actually installed. Very important if you are packaging something that needs to make use of other - programs in %pre or - %post sections.

      BuildPrereq

      If your package needs other packages installed to build, list + programs in %pre or + %post sections.

      BuildPrereq

      If your package needs other packages installed to build, list them after this tag. Examples include - gtk2-devel and - db3-devel.

      %description

      Make your description as complete as possible, but not more + gtk2-devel and + db3-devel.

      %description

      Make your description as complete as possible, but not more than 10-15 lines of text. If other packages are necessary, or this package works with others, it is probably wise to describe the - specifics of that operation here.

      %prep

      This phase should unpack the source code and apply any patches + specifics of that operation here.

      %prep

      This phase should unpack the source code and apply any patches necessary for the build. Additionally, if autoconf and/or automake needs to be rerun, do so here. You usually unpack source code with - the %setup macro, and usually - provide the -q flag so that it is quiet while + the %setup macro, and usually + provide the -q flag so that it is quiet while unpacking: 

      -%setup -q
-

      Other options to %setup - include:

      • -a - <num>, - where <num> is the number +%setup -q +

        Other options to %setup + include:

        • -a + <num>, + where <num> is the number given the source file such as 0 for source0, means that only the source files specifies should be unpacked. The files are unpacked after changing to the - directory.

        • -b - <num>, - where <num> is the number + directory.

        • -b + <num>, + where <num> is the number given the source file such as 0 for source0, means that only the source files specifies should be unpacked. The files are unpacked before changing to the - directory.

        • -c is used to create the - directory before unpacking the sources.

        • -n - <name> can be - used to specify the directory name

        • -D specifies that the + directory.

        • -c is used to create the + directory before unpacking the sources.

        • -n + <name> can be + used to specify the directory name

        • -D specifies that the directory should not be deleted before unpacking.

        While applying patches, be sure to provide the - -b argument followed by the string you used in + -b argument followed by the string you used in the name of the patch file: 

        -%patch0 -p1 -b .<fixupstring>
-
      %build

      Include the command necessary to build the program in this - section (for example, make). -

      Always use the %configure +%patch0 -p1 -b .<fixupstring> +

      %build

      Include the command necessary to build the program in this + section (for example, make). +

      Always use the %configure macro where possible. This macro expands to automatically configure properly packaged programs that use autoconf and automake. It sets up all the paths and optimized CFLAGS correctly for whatever version of Fedora Core you are building on. If you need to provide extra flags, do so after the - %configure entry. Example: + %configure entry. Example: 

      -%configure --extra-flag=yes
-
      %install

      Include all the command needed to install the package.

      Usually you want to clean out any old buildroots that might be +%configure --extra-flag=yes +

      %install

      Include all the command needed to install the package.

      Usually you want to clean out any old buildroots that might be lying around before actually installing files into it:

      -rm -fr %{buildroot}
-
      %makeinstall

      Like the %configure macro, - the %makeinstall macro correctly +rm -fr %{buildroot} +

      %makeinstall

      Like the %configure macro, + the %makeinstall macro correctly installs a autoconf/automake style package into your - buildroot. Use it where possible.

      %clean

      Supply a command to clean up your buildroot. Usually the - command rm -fr %{buildroot} - suffices.

      %post

      Include anything that needs to happen immediately after + buildroot. Use it where possible.

      %clean

      Supply a command to clean up your buildroot. Usually the + command rm -fr %{buildroot} + suffices.

      %post

      Include anything that needs to happen immediately after package installation. For example, if the package includes an initscript that needs to be run to start the service. Another - example is if the ldconfig command needs to be + example is if the ldconfig command needs to be run after installing or upgrading any system libraries. Provide - the full path to the commands.

      %preun

      Similar to the %post section, + the full path to the commands.

      %preun

      Similar to the %post section, but run right before a package is removed. For example, it can check what the package reference count is. This is important to know whether you are upgrading a package (which involves @@ -225,22 +225,22 @@ to the number of packages with that name still installed). When it is being uninstalled, it will return 0.

      If you are going to stop a service and remove it from use in your %preun section, you want to make sure you are really removing - the package, and not just upgrading.

      %postun

      Similar to the %preun + the package, and not just upgrading.

      %postun

      Similar to the %preun section, but run after a package is removed. In this example, the service is restarted if and only if it remains on the system. We - do this in the postuninstall phase of the "old" package. If the + do this in the postuninstall phase of the "old" package. If the reference count on the package name is greater than or equal to one, we know the package is still on the system (for example, it was upgraded, not removed), and the service is restarted if it was - already running with the condrestart - directive.

      [Warning]Warning

      + already running with the condrestart + directive.

      [Warning]Warning

      All script sections of an RPM, including - %pre, - %preun, - %post, - %postun should + %pre, + %preun, + %post, + %postun should never output to standard error or standard - out. Redirect those messages to /dev/null + out. Redirect those messages to /dev/null if they can not be avoided. If the package is installed in a batch fashion, via a graphical RPM tool, or via an automated system, the user never sees those messages. Do @@ -248,80 +248,80 @@ one of these sections for giving the user additional instructions after an RPM has been installed. For the same reasons, scripts should never be - interactive.

      %files

      List the files that should be included in the package. The - files listed here are displayed when the rpm - -ql command is issued for the package.

      A package should not put a file in a directory that it does + interactive.

      %files

      List the files that should be included in the package. The + files listed here are displayed when the rpm + -ql command is issued for the package.

      A package should not put a file in a directory that it does not own and that none of its dependencies own. If this happens, the file is removed when the package is removed, but the directory is not.

      Another common mistake is to put a file in a directory that another package owns without adding a dependency on that - package. For example, assume mypkg owns the - /foo/ directory and - yourpkg owns the - /foo/bar file. If both packages are installed - and then mypkg is removed, the - /foo directory is not removed because it is - not empty. And when yourpkg is removed, the + package. For example, assume mypkg owns the + /foo/ directory and + yourpkg owns the + /foo/bar file. If both packages are installed + and then mypkg is removed, the + /foo directory is not removed because it is + not empty. And when yourpkg is removed, the file is removed, but the directory is not.

      In summary, make sure the package owns all the directories it uses or you depend on packages that do.

      Use the FHS transparent macros that are defined on a per-platform basis so the package is portable back to older versions of Fedora Core if the locations for these special directories change.

      Other macros for directories include: -

      • %{_bindir} — - bin directory for the system

      • %{_mandir} — - the default directory for manual pages

      • %{_datadir} — - the default share directory location

      • %{_defaultdocdir} — - the default directory for documentation

      The %defattr macro +

      • %{_bindir} — + bin directory for the system

      • %{_mandir} — + the default directory for manual pages

      • %{_datadir} — + the default share directory location

      • %{_defaultdocdir} — + the default directory for documentation

      The %defattr macro specifies what the default permissions, user, and group are for files - found in the %files section. In + found in the %files section. In almost every case specify the following:

      -%defattr(-,root,root,-)
-

      It is is in the form (file - permissions, owner, - group, directory - permissions). If a dash (-) is +%defattr(-,root,root,-) +

      It is is in the form (file + permissions, owner, + group, directory + permissions). If a dash (-) is specified for any field, whatever the actual permissions/ownership of the file in the buildroot are at packaging time are used instead.

      If necessary, specify attributes on a particular file can also be specified to make sure they are correct. For instance, to make sure a file has the mode - 0400:

      -%attr(0400,root,root) /etc/readonlyrootfile
+	      0400:
      +%attr(0400,root,root) /etc/readonlyrootfile
 
      If the file is a directory, it can be marked as a directory
-	      with the %dir prefix.
-	      %dir is only required if the
+	      with the %dir prefix.
+	      %dir is only required if the
 	      directory only (and not the files under it) should be packaged
 	      (or package the files under it with different flags). 
 	      Listing a directory only includes the directory, not the file in
 	      it and not any of its subdirectories.
 	    
      -%dir %{_datadir}/%{name}
+%dir %{_datadir}/%{name}
 
      If the file is a documentation file, mark it with the
-	      %doc prefix. The paths are
+	      %doc prefix. The paths are
 	      relative to the RPM build directory. For example:
 	    
      -%doc doc/*
+%doc doc/*
 
      If it is a configuration file it should be marked as
 	      follows:
      -%config <filename>
+%config <filename>
 
      
 	      If the configuration file should not be replaced when the RPM is
 	      upgraded, mark it as follows:
 	    
      -%config(noreplace) <filename>
+%config(noreplace) <filename>
 
      
 	      For files that should be included in the list of files so that
 	      they are uninstalled when the package is removed but may not exist
 	      until they are created during post-install should be marked as
 	      follows:
 	    
      -%config(missingok) <filename>
-
      %changelog

      Supply a changelog entry whenever a change to a package is +%config(missingok) <filename> +

      %changelog

      Supply a changelog entry whenever a change to a package is made. It must be in proper format as shown in the example. Be as - descriptive as possible; sentences such as fixed - bug does not example what has been fixed. If the + descriptive as possible; sentences such as fixed + bug does not example what has been fixed. If the changes include a fix for a bug filed in Bugzilla, include the - Bugzilla number in the changelog entry.

      Prev?Up?Next
      3.3.?Basic CVS Commands?Home?4.2.?Guidelines
      + Bugzilla number in the changelog entry.

      Prev   Next
      3.4. Basic CVS Commands Home 4.2. Guidelines
      -
      Chapter?5.?User Interface Guidelines
      Prev???Next

      Chapter?5.?User Interface Guidelines

      +

      Chapter 5. User Interface Guidelines
      Prev   Next

      Chapter 5. User Interface Guidelines

      If you just start reading the reference manual for a GUI toolkit and typing in code, the result will be pretty sad. Imagine implementing a compiler without reading any papers or textbooks on the subject. UI design @@ -19,22 +19,22 @@ more thought up front about who's going to use it, for what tasks, and how the software could make their day more pleasant and efficient. There's no reason command line applications have to be cryptic and annoying; compare - "classic ftp" to lftp. + "classic ftp" to lftp.

      - Caring about good design isn't just for people who write the "pixels on - the screen" part of the software, either. The backend should be designed + Caring about good design isn't just for people who write the "pixels on + the screen" part of the software, either. The backend should be designed to support the frontend, rather than being designed in isolation.

      Finally, caring about good design isn't just for programmers. The whole development process should take it into account. -

      5.1.?Read the CliffNotes?

      +

      5.1. Read the CliffNotes®

      Start with User Interface Design for Programmers, by Joel Spolsky. This book is short, entertaining, and covers the main points. There's a sort of rough draft or abridged version online or you can buy it from your favorite bookstore. The printed book is worth it for the extra material, and just for ease of reading, but the online version is fine too. -

      Prev?Up?Next
      4.3.?More RPM Building Hints?Home?5.2.?The GNOME Guidelines
      +

      Prev   Next
      4.3. More RPM Building Hints Home 5.2. The GNOME Guidelines
      -
      Fedora Project Developer's Guide
      ???Next

      Fedora Project Developer's Guide

      Tammy Fox

      Havoc Pennington

      Copyright ? 2003 Red Hat, Inc., Tammy Fox, Havoc Pennington

      Table of Conte! nts

      1. General Guidelines
      2. Package Versions
      2.1. Beta Exceptions
      3. CVS
      3.1. How CVS Works
      3.2. Configuring CVS on Your System
      3.3. Basic CVS Commands
      3.3.1. Checking Out Modules
      3.3.1.1. Checking Out Branches of Modules
      3.3.2. Updating Files
      3.3.3. Committing Files
      3.3.4. Adding Files
      3.3.5. Removing Files
      3.3.6. Status of Files
      3.3.7. Resolving Conflicts
      3.3.8. Summary
      4. Building RPM Packages
      4.1. Spec File
      4.2. Guidelines
      4.3. More RPM Building Hints
      5. User Interface Guidelines
      5.1. Read the CliffNotes?
      5.2. The GNOME Guidelines
      5.3. Get Religion
      ! 5.4. Get Details
      5.5. More Suggestions
      5.6. Scaling It Down
      6. Enabling Console Access
      7. Adding Applications to the Menus
      7.1. Red Hat Categories
      ???Next
      ???Chapter?1.?General Guidelines
      +
      Fedora Core Developer's Guide
         Next

      Fedora Core Developer's Guide

      Tammy Fox

      Havoc Pennington

      Copyright © 2003 Red Hat, Inc., Tammy Fox, Havoc Pennington

      Table of Co! ntents

      1. General Guidelines
      2. Package Versions
      2.1. Beta Exceptions
      3. CVS
      3.1. How CVS Works
      3.2. Preparing For CVS Use
      3.2.1. Is CVS Installed On Your System
      3.2.2. Generating SSH Keys
      3.3. Configuring For CVS Access
      3.3.1. Avoiding Repetitive Typing
      3.3.2. Configuring for Read-Only CVS Access
      3.3.3. Configuring Read/Write CVS Access
      3.4. Basic CVS Commands
      3.4.1. Checking Out Modules
      3.4.1.1. Checking Out Branches of Modules
      3.4.2. Updating Files
      3.4.3. Committing Files
      3.4.4. Adding Files
      3.4.5. Managing Binary Files
      3.4.6. Removing Files
      3.4.7. Status of Files
      3.4.8. Resolving Conflicts
      3.4.9. Summary
      4. Building RPM Packages
      4.1. Spec File
      4.2! . Guidelines
      4.3. More RPM Building Hints
      5. User Interface Guidelines
      5.1. Read the CliffNotes®
      5.2. The GNOME Guidelines
      5.3. Get Religion
      5.4. Get Details
      5.5. More Suggestions
      5.6. Scaling It Down
      6. Enabling Console Access
      7. Adding Applications to the Men! us
      7.1. Red Hat Categories
         Next
         Chapter 1. General Guidelines

      Garrett LeSage created the admonition graphics (note, tip, important, - caution, and warning). They may be freely redistributed with documentation - produced for the Fedora project. + caution, and warning). + Tommy Reynolds created the callout graphics. + They all may be freely redistributed with documentation + produced for the Fedora Project.

      developers-guide-0.1.2 (2003-10-02)

      - Red Hat, Red Hat Network, the Red Hat "Shadow Man" logo, RPM, Maximum RPM, the RPM logo, Linux + Red Hat, Red Hat Network, the Red Hat "Shadow Man" logo, RPM, Maximum RPM, the RPM logo, Linux Library, PowerTools, Linux Undercover, RHmember, RHmember More, Rough Cuts, Rawhide and all Red Hat-based trademarks and logos are trademarks or registered trademarks of Red Hat, Inc. in the United States and other countries. @@ -35,7 +37,7 @@

      Motif and UNIX are registered trademarks of The Open Group.

      - Intel and Pentium are a registered trademarks of Intel Corporation. Itanium + Intel and Pentium are registered trademarks of Intel Corporation. Itanium and Celeron are trademarks of Intel Corporation.

      AMD, AMD Athlon, AMD Duron, and AMD K6 are trademarks of Advanced Micro Index: s1-rpm-guidelines.php =================================================================== RCS file: /cvs/fedora/web/html/participate/developers-guide/s1-rpm-guidelines.php,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- s1-rpm-guidelines.php 30 Mar 2005 17:47:23 -0000 1.1.1.1 +++ s1-rpm-guidelines.php 29 Sep 2005 17:08:19 -0000 1.2 @@ -7,21 +7,21 @@ ?> -

      4.2.?Guidelines
      Prev?Chapter?4.?Building RPM Packages?Next

      4.2.?Guidelines

      +

      4.2. Guidelines
      Prev Chapter 4. Building RPM Packages Next

      4.2. Guidelines

      Adhere to the follow rules to make sure the package is packaged properly. This should be used as a checklist:

      1. Every package must have a unique version number (per epoch)

      2. The RPM package filename must be in the n-v-r (name, version, release) format and must contain the architecture for the package. The proper format is - <name>-<version>-<release>.<arch>.rpm. - For example, pkgname-1.24-2.i386.rpm is a proper + <name>-<version>-<release>.<arch>.rpm. + For example, pkgname-1.24-2.i386.rpm is a proper RPM filename.

      3. The n-v-r in the filename must be the same as the n-v-r in the spec file.

      4. If the package is changed in any way, including changing the signature or recompiling, the version or release must be incremented.

      5. The package may obsolete itself.

      6. If a file from the package conflicts with a file from another - package in the Fedora project, the package must use - Conflicts: to specify it in the spec + package in the Fedora Project, the package must use + Conflicts: to specify it in the spec file.

      7. The file list for the package must contain all the files in the package so that all files are removed when the package is removed.

      8. The package may not use interactive pre-install, post-install, @@ -29,18 +29,18 @@ prompted at anytime during the install, upgrade, or removal — Everything must be completely automated.

      9. The package must not write anything to standard error or standard out. Redirect any messages to - /dev/null if they are not necessary, or write + /dev/null if they are not necessary, or write them to a log file.

      10. When specifying a group in the spec file, it must be one from - /usr/share/doc/rpm-<version>/GROUPS. It + /usr/share/doc/rpm-<version>/GROUPS. It there is not an exact match, use the closest match. Do not invent a new group name.

      11. The package can not just unarchive the files in the post-install script. This defeats the purpose of using RPM.

      12. If a file is moved from one binary package to another, the new package with the file must specified the old package in the spec file with the - Conflicts: option.

      13. If a newer RPM does not have a binary package that the older + Conflicts: option.

      14. If a newer RPM does not have a binary package that the older SRPMS produced, the binary package not produced anymore must be - specified with the Obsoletes: - option in the new spec file.

      Prev?Up?Next
      Chapter?4.?Building RPM Packages?Home?4.3.?More RPM Building Hints
      + specified with the Obsoletes: + option in the new spec file.

      Prev Up Next
      Chapter 4. Building RPM Packages Home 4.3. More RPM Building Hints
      -
      4.3.?More RPM Building Hints
      Prev?Chapter?4.?Building RPM Packages?Next

      4.3.?More RPM Building Hints

      +

      4.3. More RPM Building Hints
      Prev Chapter 4. Building RPM Packages Next

      4.3. More RPM Building Hints

      This section contains some additional troubleshooting tips:

      1. %{_libdir} is tricky.

        Use %{_prefix}/lib for data files, and %{_libdir} for libraries. There is a slew of non-trivial FHS issues here as well.

      2. Building as nobody with %files -f file.list

        Make sure you have a %defattr(-,root,root) in place, or - user/group will not be correct.

        A %defattr(-,root,root) will be - honored anywhere in a %files + user/group will not be correct.

        A %defattr(-,root,root) will be + honored anywhere in a %files list.

        The Principle of Least Surprise sez' put it at the beginning of file.list.

      3. * %{prefix} is not %{_prefix}

        The macro %{prefix} is a side effect macro, silently added when Prefix: whatever is parsed, while the macro %{_prefix} is what is used in configure prefix=%{_prefix} There's also extensive and conventional use of %prefix in Gnome and other packaging.

      4. Fix/mangle the file manifest in %install, not %files. Fixing the file manifest in %install will (eventually) permit constructs like:

        -%files
+%files
 %{_bindir}/*
-...
+...

        and eventually:

        -%files
-/
+%files
+/

        The risk, of course, is that packages will be polluted by unknown files which cause file conflicts down the road. I believe (but other opinions and traditional wisdom differ) that %files - should be made as compact as possible.

      Prev?Up?Next
      4.2.?Guidelines?Home?Chapter?5.?User Interface Guidelines
      + should be made as compact as possible.

      Prev Up Next
      4.2. Guidelines Home Chapter 5. User Interface Guidelines
      -
      5.4.?Get Details
      Prev?Chapter?5.?User Interface Guidelines?Next

      5.4.?Get Details

      - Designing from Both Sides of the Screen by Ellen - Isaacs and Alan Walendowski is a very practical "How To" book, similar +

      5.4. Get Details
      Prev Chapter 5. User Interface Guidelines Next

      5.4. Get Details

      + Designing from Both Sides of the Screen by Ellen + Isaacs and Alan Walendowski is a very practical "How To" book, similar in spirit to Joel's book but more detailed and not aimed exclusively at programmers.

      @@ -28,11 +28,11 @@ between the designer and programmer, and how to balance UI goals with time, resource, and engineering constraints.

      - Alan Cooper's About Face 2.0 is comparable to - Designing from Both Sides of the Screen in that - it's a practical "How To" and reference manual, so if you want more + Alan Cooper's About Face 2.0 is comparable to + Designing from Both Sides of the Screen in that + it's a practical "How To" and reference manual, so if you want more advice on concrete methodologies, have a look. -

      Prev?Up?Next
      5.3.?Get Religion?Home?5.5.?More Suggestions
      +

      Prev Up Next
      5.3. Get Religion Home 5.5. More Suggestions
      -
      5.3.?Get Religion
      Prev?Chapter?5.?User Interface Guidelines?Next

      5.3.?Get Religion

      +

      5.3. Get Religion
      Prev Chapter 5. User Interface Guidelines Next

      5.3. Get Religion

      For a less applied, more big-picture book, you might be interested in - Alan Cooper's The Inmates are Running the Asylum, + Alan Cooper's The Inmates are Running the Asylum, which is in part an extended (and fun to read) rant, but also contains some interesting case studies, examples, and practical suggestions.

      @@ -17,14 +17,14 @@ about development team organization, project management, etc. as well as technical suggestions.

      - Alan Cooper has a more practical, "how-to" style book as well, called - About Face 2.0 - be sure to get the brand-new 2.0 + Alan Cooper has a more practical, "how-to" style book as well, called + About Face 2.0 - be sure to get the brand-new 2.0 edition, rather than the now-somewhat-dated original.

      - Everyone on earth recommends The Design of Everyday - Things, by Donald Norman. This is another good book + Everyone on earth recommends The Design of Everyday + Things, by Donald Norman. This is another good book to check out. -

      Prev?Up?Next
      5.2.?The GNOME Guidelines?Home?5.4.?Get Details
      +

      Prev Up Next
      5.2. The GNOME Guidelines Home 5.4. Get Details
      -
      5.2.?The GNOME Guidelines
      Prev?Chapter?5.?User Interface Guidelines?Next

      5.2.?The GNOME Guidelines

      - Read the GNOME Human Interface Guidelines. These +

      5.2. The GNOME Guidelines
      Prev Chapter 5. User Interface Guidelines Next

      5.2. The GNOME Guidelines

      + Read the GNOME Human Interface Guidelines. These are pretty good guidelines developed by some interaction design professionals, and are the best guidelines to come from the open source - community so far. Until we have official Fedora project guidelines, + community so far. Until we have official Fedora Project guidelines, following the GNOME guidelines will probably result in a substantially better UI than making up your own. And our tools will be consistent with each other and at least one desktop environment. @@ -29,7 +29,7 @@ widgets properly, and such. Don't get too bogged down in this and neglect the big picture. You can be fully guideline-compliant and still have an application that doesn't make any sense. -

      Prev?Up?Next
      Chapter?5.?User Interface Guidelines?Home?5.3.?Get Religion
      +

      Prev Up Next
      Chapter 5. User Interface Guidelines Home 5.3. Get Religion
      -
      5.5.?More Suggestions
      Prev?Chapter?5.?User Interface Guidelines?Next

      5.5.?More Suggestions

      +

      5.5. More Suggestions
      Prev Chapter 5. User Interface Guidelines Next

      5.5. More Suggestions

      Some places to start:

      1. GNOME Usability Project

      2. Suggested readings from the Isaacs and Walendowski book

      3. Tog's - First Principles

      4. Maximizing - Human Performance

      5. Personas

      Prev?Up?Next
      5.4.?Get Details?Home?5.6.?Scaling It Down
      + First Principles

    19. Maximizing + Human Performance

    20. Personas

      21. Prev Up Next
      5.4. Get Details Home 5.6. Scaling It Down
      -
      5.6.?Scaling It Down
      Prev?Chapter?5.?User Interface Guidelines?Next

      5.6.?Scaling It Down

      - These books talk about things like your development - team, your dedicated graphic - artist, and your professional interaction - designer. Since you may or may not have all of these available, +

      5.6. Scaling It Down
      Prev Chapter 5. User Interface Guidelines Next

      5.6. Scaling It Down

      + These books talk about things like your development + team, your dedicated graphic + artist, and your professional interaction + designer. Since you may or may not have all of these available, here are some simple tasks you can do on your own: -

      • Come up with what Joel calls "imaginary users"/"scenarios" and - Alan Cooper calls "personas" - describe the prototypical person who +

        • Come up with what Joel calls "imaginary users"/"scenarios" and + Alan Cooper calls "personas" - describe the prototypical person who will use the software. Or if there are several very different possible users, write that down too. Maybe you need to have two paths through the UI for different audiences.

        • Write down the goals of your target users; what are they trying to get done? Set some clear direction for your software. Create a - list of tasks the software will support.

        • Don't assume a priori that if you're writing the "XYZ tool" that + list of tasks the software will support.

        • Don't assume a priori that if you're writing the "XYZ tool" that the tool must be one window opened from one menu entry. Maybe supporting your list of tasks should involve file manager extensions, applets, web frontend, wizards, etc. Your goal should be - to support all the tasks appropriately somewhere in Fedora project, - not to "write an XYZ tool."

        • Do at least a quick and easy UI specification before you write + to support all the tasks appropriately somewhere in Fedora Project, + not to "write an XYZ tool."

        • Do at least a quick and easy UI specification before you write code. Joel's book, and the Isaacs and Walendowski, discuss how to write such a spec. It doesn't need to be lengthy. Refer to the following examples:

        • Post any or all of the above to the website and/or development mailing lists. @@ -32,18 +32,18 @@ you do or don't have a particular UI feature.

        • As you write code, try to stick to the guidelines that are just as easy to follow as not follow; get the pixel spacing right, use clear plain language in messages, and that sort of thing.

        • Be sure to use libraries when appropriate, such as GTK+ and Qt. Avoid - toolkits that don't properly fit in to Fedora project (such as Motif, Tk, or + toolkits that don't properly fit in to Fedora Project (such as Motif, Tk, or Swing). Libraries will handle some important details for you.

        • If you use a GUI builder to create resource files, tweaking UI details will be a whole lot less annoying. (With GTK+2 for example, load dialogs from .glade files at runtime, using libglade.) This way - you can rearrange the UI without changing all the code.

        • Don't be afraid to do some quick "user testing" on non-technical + you can rearrange the UI without changing all the code.

        • Don't be afraid to do some quick "user testing" on non-technical people. You can get useful information quickly, this need not be a high-overhead undertaking.

        • Categorizing your tasks using the 2x2 matrix in Chapter 6 of the Isaacs and Walendowski book is quick to do and very valuable; you - might think of this as the old API design rule, "make easy things - easy and hard things possible," applied to the user interface - instead of the application interface.

        • Feel free to email with - comments, questions, or proposals.

      Prev?Up?Next
      5.5.?More Suggestions?Home?Chapter?6.?Enabling Console Access
      + might think of this as the old API design rule, "make easy things + easy and hard things possible," applied to the user interface + instead of the application interface.

    21. Feel free to email with + comments, questions, or proposals.

      22. Prev Up Next
      5.5. More Suggestions Home Chapter 6. Enabling Console Access
      Author: rdieter Update of /cvs/extras/rpms/sbcl/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16599 Modified Files: sbcl.spec Log Message: * Thu Sep 29 2005 Rex Dieter 0.9.5-15 - enable sb-thread - set EXTRA_CFLAGS to so optflags are used for building contrib/ too - hope that a rebuild will include missing sb-posix (bz #169506) Index: sbcl.spec =================================================================== RCS file: /cvs/extras/rpms/sbcl/FC-4/sbcl.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- sbcl.spec 28 Sep 2005 16:43:29 -0000 1.22 +++ sbcl.spec 29 Sep 2005 17:10:35 -0000 1.23 @@ -3,20 +3,21 @@ Name: sbcl Summary: Steel Bank Common Lisp Version: 0.9.5 -Release: 14%{?dist} +Release: 15%{?dist} License: BSD/MIT Group: Development/Languages URL: http://sbcl.sourceforge.net/ Source0: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-%{version}-source.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -#ExclusiveArch: %{ix86} x86_64 -ExclusiveArch: ppc +ExclusiveArch: %{ix86} x86_64 -Source1: customize-target-features.lisp +# Pre-generated html docs (not used) +#Source1: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-%{version}-html.tar.bz2 +Source2: customize-target-features.lisp ## x86 section -#Source10: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.4-x86-linux-binary.tar.bz2 +#Source10: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.5-x86-linux-binary.tar.bz2 %ifarch %{ix86} %define sbcl_arch x86 BuildRequires: sbcl @@ -70,6 +71,11 @@ %prep %setup -q %{?sbcl_bootstrap_src} +# Handle pre-generated docs +if [ -d %{name}-%{version}/doc/manual ]; then + mv %{name}-%{version}/doc/manual/* doc/manual/ +fi + #sed -i -e "s|/usr/local/lib/sbcl/|%{_libdir}/sbcl/|" src/runtime/runtime.c #or patch to use SBCL_HOME env var %patch1 -p0 -b .default-sbcl-home @@ -80,11 +86,13 @@ %patch6 -p1 -b .verbose-build %patch7 -p1 -b .stdlib_h +# Enable sb-thread %ifarch %{ix86} x86_64 #sed -i -e "s|; :sb-thread|:sb-thread|" base-target-features.lisp-expr -#cp %{SOURCE1} ./customize-target-features.lisp +cp %{SOURCE2} ./customize-target-features.lisp %endif +# "install" local bootstrap %if "%{?sbcl_bootstrap_src}" != "%{nil}" mkdir sbcl-bootstrap pushd sbcl-*-linux @@ -93,24 +101,26 @@ popd %endif -# CVS crud -find . -name CVS -type d | xargs rm -rf -find . -name '.cvsignore' | xargs rm -f # fix permissions (some have eXecute bit set) find . -name '*.c' | xargs chmod 644 %build -export DEFAULT_SBCL_HOME=%{_libdir}/sbcl +# setup local bootstrap %if "%{?sbcl_bootstrap_src}" != "%{nil}" export SBCL_HOME=`pwd`/sbcl-bootstrap/lib/sbcl export PATH=`pwd`/sbcl-bootstrap/bin:${PATH} +%endif +# my_setarch, to set personality, (about) the same as setarch -R, +# but usable on fc3 too %{__cc} -o my_setarch %{optflags} %{SOURCE100} %define my_setarch ./my_setarch -%endif +# trick contrib/ modules to use optflags too +export EXTRA_CFLAGS="$RPM_OPT_FLAGS" +export DEFAULT_SBCL_HOME=%{_libdir}/sbcl %{?sbcl_arch:export SBCL_ARCH=%{sbcl_arch}} %{?setarch} %{?my_setarch} ./make.sh %{?bootstrap} @@ -133,16 +143,20 @@ rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT{%{_bindir},%{_libdir},%{_mandir}} -unset SBCL_HOME ||: -export INSTALL_ROOT=$RPM_BUILD_ROOT%{_prefix} -export LIB_DIR=$RPM_BUILD_ROOT%{_libdir} -sh ./install.sh + +unset SBCL_HOME +export INSTALL_ROOT=$RPM_BUILD_ROOT%{_prefix} +export LIB_DIR=$RPM_BUILD_ROOT%{_libdir} +sh ./install.sh ## Unpackaged files rm -rf $RPM_BUILD_ROOT%{_docdir}/sbcl rm -f $RPM_BUILD_ROOT%{_infodir}/dir -# from make check -find $RPM_BUILD_ROOT -name 'test-passed' | xargs rm -f +# CVS crud +find $RPM_BUILD_ROOT -name CVS -type d | xargs rm -rf +find $RPM_BUILD_ROOT -name .cvsignore | xargs rm -f +# 'test-passed' files from make check (leave these in, for now -- Rex) +# find $RPM_BUILD_ROOT -name 'test-passed' | xargs rm -f %post @@ -174,6 +188,11 @@ %changelog +* Thu Sep 29 2005 Rex Dieter 0.9.5-15 +- enable sb-thread +- set EXTRA_CFLAGS to so optflags are used for building contrib/ too +- hope that a rebuild will include missing sb-posix (bz #169506) + * Wed Sep 28 2005 Rex Dieter 0.9.5-14 - more ppc work From fedora-extras-commits at redhat.com Thu Sep 29 17:29:45 2005 From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields)) Date: Thu, 29 Sep 2005 13:29:45 -0400 Subject: web/html/docs/fedora-install-guide-en/fc4 ch-upgrading-system.php, NONE, 1.1 rv-revhistory.php, NONE, 1.1 sn-upgrading-bootloader.php, NONE, 1.1 ch-abouttoinstall.php, 1.2, 1.3 ch-acknowledgements.php, 1.2, 1.3 ch-beginninginstallation.php, 1.2, 1.3 ch-bootloader.php, 1.2, 1.3 ch-disk-partitioning.php, 1.2, 1.3 ch-firstboot.php, 1.2, 1.3 ch-installer-locale.php, 1.2, 1.3 ch-installing-packages.php, 1.2, 1.3 ch-installtypes.php, 1.2, 1.3 ch-intro.php, 1.2, 1.3 ch-networkconfig.php, 1.2, 1.3 ch-next-steps.php, 1.2, 1.3 ch-other-install-methods.php, 1.2, 1.3 ch-packageselection.php, 1.2, 1.3 ch-rootpassword.php, 1.3, 1.4 ch-security-config.php, 1.2, 1.3 ch-timezone.php, 1.3, 1.4 fedora-install-guide-en.tar.gz, 1.1, 1.2 generated-index.php, 1.2, 1.3 index.php, 1.2, 1.3 installtype-notes.php, 1.2, 1.3 ln-legalnotice.php, 1.2, 1.3 sn-before-begin.php, 1.2, 1.3 sn-booting-from-pxe.php, 1.2, 1.3 sn-bootloader-advanced.php, 1.2, 1.3 sn-bootloader-others.php, 1.2, 1.3 sn-bootloader-password.php, 1.2, 1.3 sn-community-help.php, 1.2, 1.3 ! sn-community.php, 1.2, 1.3 sn-computer-hostname.php, 1.2, 1.3 sn-disk-druid.php, 1.2, 1.3 sn-extreme-packagegroups.php, 1.2, 1.3 sn-firstboot-additional-cds.php, 1.2, 1.3 sn-firstboot-datetime.php, 1.2, 1.3 sn-firstboot-display.php, 1.2, 1.3 sn-firstboot-soundcard.php, 1.2, 1.3 sn-firstboot-systemuser.php, 1.2, 1.3 sn-installer-keyboard.php, 1.2, 1.3 sn-installing-from-harddrive.php, 1.2, 1.3 sn-lang-packages.php, 1.2, 1.3 sn-network-misc-settings.php, 1.2, 1.3 sn-packagegroups.php, 1.2, 1.3 sn-partitioning-general.php, 1.2, 1.3 sn-selinux.php, 1.2, 1.3 sn-using-otherbootmedia.php, 1.2, 1.3 sn-utc.php, 1.3, 1.4 Message-ID: <200509291729.j8THTjxQ016849@cvs-int.fedora.redhat.com> Author: pfrields Update of /cvs/fedora/web/html/docs/fedora-install-guide-en/fc4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16778 Modified Files: ch-abouttoinstall.php ch-acknowledgements.php ch-beginninginstallation.php ch-bootloader.php ch-disk-partitioning.php ch-firstboot.php ch-installer-locale.php ch-installing-packages.php ch-installtypes.php ch-intro.php ch-networkconfig.php ch-next-steps.php ch-other-install-methods.php ch-packageselection.php ch-rootpassword.php ch-security-config.php ch-timezone.php fedora-install-guide-en.tar.gz generated-index.php index.php installtype-notes.php ln-legalnotice.php sn-before-begin.php sn-booting-from-pxe.php sn-bootloader-advanced.php sn-bootloader-others.php sn-bootloader-password.php sn-community-help.php sn-community.php sn-computer-hostname.php sn-disk-druid.php sn-extreme-packagegroups.php sn-firstboot-additional-cds.php sn-firstboot-datetime.php sn-firstboot-display.php sn-firstboot-soundcard.php sn-firstboot-systemuser.php sn-installer-keyboard.php sn-installing-from-harddrive.php sn-lang-packages.php sn-network-misc-settings.php sn-packagegroups.php sn-partitioning-general.php sn-selinux.php sn-using-otherbootmedia.php sn-utc.php Added Files: ch-upgrading-system.php rv-revhistory.php sn-upgrading-bootloader.php Log Message: Republish to export revision history pursuant to new XSL ***** Error reading new file: [Errno 2] No such file or directory: 'ch-upgrading-system.php' ***** Error reading new file: [Errno 2] No such file or directory: 'rv-revhistory.php' ***** Error reading new file: [Errno 2] No such file or directory: 'sn-upgrading-bootloader.php' Index: ch-abouttoinstall.php =================================================================== RCS file: /cvs/fedora/web/html/docs/fedora-install-guide-en/fc4/ch-abouttoinstall.php,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ch-abouttoinstall.php 12 Jun 2005 08:52:19 -0000 1.2 +++ ch-abouttoinstall.php 29 Sep 2005 17:29:43 -0000 1.3 @@ -7,14 +7,14 @@ ?> -
      Chapter 13. About to Install
      Prev   Next

      Chapter 13. About to Install

      +

      Chapter 13. About to Install
      Prev   Next

      Chapter 13. About to Install

      No changes are made to your computer until you click the - Next button. If you abort the installation + Next button. If you abort the installation process after that point, the Fedora Core system will be incomplete and unusable. To return to previous screens to make different choices, - select Back. To abort the installation, turn + select Back. To abort the installation, turn off the computer. -

      [Important]Aborting Installation

      +

      [Important]Aborting Installation

      In certain situations, you may be unable to return to previous screens. Fedora Core notifies you of this restriction and allows you to abort the installation program. You may reboot with the @@ -22,15 +22,15 @@

      About to install screen.

      Figure 13.1. About to Install Screen

      - Click Next to begin the installation. + Click Next to begin the installation.

      If your installation requires more than one disc, Fedora Core displays a list of all discs required to complete the process. If you do not have all of the necessary discs, select - Reboot to abort the installation. Otherwise, - choose Continue to proceed with installation. -

      Prev Up Next
      12.4. Everything or - Minimal Installations Home Chapter 14. Installing Packages
      + Reboot to abort the installation. Otherwise, + choose Continue to proceed with installation. +

      Prev   Next
      12.4. Everything or + Minimal Installations Home Chapter 14. Installing Packages
      -
      Chapter 17. Acknowledgements
      Prev   Next

      Chapter 17. Acknowledgements

      +

      Chapter 17. Acknowledgements
      Prev   Next

      Chapter 17. Acknowledgements

      Many useful comments and suggestions were provided by Rahul Sundaram and the Anaconda team. -

      Prev Up Next
      16.3. Joining The Fedora Community Home Index
      +

      Prev   Next
      16.3. Joining The Fedora Community Home Index
      -
      Chapter 1. Beginning the Installation
      Prev   Next

      Chapter 1. Beginning the Installation

      +

      Chapter 1. Beginning the Installation
      Prev   Next

      Chapter 1. Beginning the Installation

      To begin installation of Fedora Core, boot the computer from the boot media. You may install from CD or DVD discs, USB pen drives, hard drives, or network servers. -

      [Note]Installation from Diskettes

      +

      [Note]Installation from Diskettes

      There is no option to install Fedora Core from diskettes.

      - The BIOS (Basic Input/Output System) + The BIOS (Basic Input/Output System) on your computer must support the type of boot media you select. The BIOS controls access to some hardware devices during boot time. Any computer that meets the minimum recommended specification for Fedora Core @@ -22,7 +22,7 @@ flash media are newer technologies, but many computers can use them as boot media. Some network cards and chipsets include support for network booting with - PXE. PXE (pronounced "pixie") + PXE. PXE (pronounced "pixie") allows a computer to load boot files from a network server instead of directly-connected hardware.

      @@ -30,49 +30,49 @@ configure the BIOS, consult the documentation provided by the manufacturer. Detailed information on hardware specifications and configuration is beyond the scope of this document. -

      [Note]Aborting the Installation

      +

      [Note]Aborting the Installation

      To abort the installation process at any time before the - Installing Packages screen, either press - Ctrl-Alt-Del + Installing Packages screen, either press + Ctrl-Alt-Del or power off the computer with the power switch. Fedora makes no changes to your computer until package installation begins. -

      1.1. Booting from Disc

      +

      1.1. Booting from Disc

      To boot your computer from disc: -

      1. Switch on the computer.

      2. Insert the first disc into the CD or DVD drive.

      3. A boot screen appears, with a boot: +

        1. Switch on the computer.

        2. Insert the first disc into the CD or DVD drive.

        3. A boot screen appears, with a boot: prompt at the bottom.

        Fedora Core boot screen.

        Figure 1.1. Boot Screen

        - If you hit Enter, the installation runs in + If you hit Enter, the installation runs in default mode. In the default mode, the installation runs from CD or DVD discs, and uses a graphical interface if possible. To - change the installation mode, at the boot: - prompt, type linux followed by one or more + change the installation mode, at the boot: + prompt, type linux followed by one or more of the following options:

        • To install from a hard drive or network server, add the - directive askmethod. + directive askmethod.

        • To use a text interface, add the directive - text. + text.

        • To retry installation because the installation aborted at an early stage, add the directive - acpi=off. + acpi=off.

        Refer to the Release Notes for additional options that may help if you encounter problems with the installation program. A current copy of the Release Notes is always available at http://fedora.redhat.com/docs/.

        - When you issue a command at the boot: prompt, the + When you issue a command at the boot: prompt, the first stage of the installation program starts. After it loads, the following screen appears:

        Media test screen.

        Figure 1.2. Media Test Screen

        - Select OK to test the disc, or select - Skip to proceed with the installation + Select OK to test the disc, or select + Skip to proceed with the installation without testing the disc. -

        [Caution]Testing Discs

        +

        [Caution]Testing Discs

        Test any discs which you have not previously tested. A disc error during the installation process may force you to restart the entire procedure. @@ -82,24 +82,24 @@

        Media check result.

        Figure 1.3. Media Check Result

        - Select OK. The following screen appears: + Select OK. The following screen appears:

        Next disc or continue.

        Figure 1.4. Next Disc Screen

        - Select Test to test the next disc in the - set, or Continue to proceed with the + Select Test to test the next disc in the + set, or Continue to proceed with the installation.

        After you test your discs and select - Continue, or if you choose to skip testing, + Continue, or if you choose to skip testing, the main graphical installation program loads.

        To boot from the disc, but install from another device or a - network server, use the linux askmethod - command at the boot: prompt. Fedora Core also includes + network server, use the linux askmethod + command at the boot: prompt. Fedora Core also includes a boot-only CD for this purpose, which is stored on the first Fedora Core installation disc as an ISO file, - images/boot.iso. + images/boot.iso.

        To convert the ISO file into a physical CD, use the option in your CD-writing program that burns a CD image file to a CD. If you @@ -108,12 +108,12 @@ for instructions. If you are using Linux, use the following command to burn a CD image file to a blank recordable CD: 

        -cdrecord --device=cdwriter-device -tao -eject image-file.iso
-
        [Note]BIOS Boot Order

        +cdrecord --device=cdwriter-device -tao -eject image-file.iso +

        [Note]BIOS Boot Order

        The BIOS contains settings that control the order of boot devices. If your PC boots from a device other than the Fedora Core boot media, check the BIOS boot configuration. -

        Prev Up Next
        2. Before You Begin Home 1.2. Using Other Removable Media
        +

        Prev   Next
        2. Before You Begin Home 1.2. Using Other Removable Media
        -
        Chapter 7. Boot Loader
        Prev   Next

        Chapter 7. Boot Loader

        - A boot loader is a small program that reads +

        Chapter 7. Boot Loader
        Prev   Next

        Chapter 7. Boot Loader

        + A boot loader is a small program that reads and launches the operating system. Fedora Core uses the - GRUB boot loader by default. If you have + GRUB boot loader by default. If you have multiple operating systems, the boot loader determines which one to boot, usually by offering a menu.

        @@ -18,28 +18,28 @@ operating system may install its own preferred boot loader, or you may have installed a third-party boot loader.If your boot loader does not recognize Linux partitions, you may not be able to boot - Fedora Core. Use GRUB as your boot loader to + Fedora Core. Use GRUB as your boot loader to boot Linux and most other operating systems. Follow the directions - in this section to install GRUB. -

        [Warning]Installing GRUB

        + in this section to install GRUB. +

        [Warning]Installing GRUB

        If you install GRUB, it may overwrite your existing boot loader.

        The following screen displays boot loader configuration options.

        Boot loader configuration screen

        Figure 7.1.  Boot Loader Configuration Screen -

        7.1. Keeping Your Existing Boot Loader Settings

        +

        7.1. Keeping Your Existing Boot Loader Settings

        By default, the installation program installs GRUB in the - master boot record, or MBR, of the device for the root + master boot record, or MBR, of the device for the root file system. To change or decline installation of a new boot - loader, select the Change boot loader + loader, select the Change boot loader button. The dialog shown in Figure 7.2, “Change Boot Loader” allows you to avoid installing or changing your existing boot loader settings. -

        Change boot loader dialog

        Figure 7.2. Change Boot Loader

        [Important]Boot Loader Required

        - Your computer must have GRUB or another boot loader installed +

        Change boot loader dialog

        Figure 7.2. Change Boot Loader

        [Important]Boot Loader Required

        + Your computer must have GRUB or another boot loader installed in order to start, unless you create a separate startup disk to boot from. -

        Prev Up Next
        6.3. Disk Druid Home 7.2.  +

        Prev   Next
        6.3. Disk Druid Home 7.2.  Booting Additional Operating Systems
        Index: ch-disk-partitioning.php =================================================================== RCS file: /cvs/fedora/web/html/docs/fedora-install-guide-en/fc4/ch-disk-partitioning.php,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ch-disk-partitioning.php 12 Jun 2005 08:52:19 -0000 1.2 +++ ch-disk-partitioning.php 29 Sep 2005 17:29:43 -0000 1.3 @@ -7,7 +7,7 @@ ?> -
        Chapter 6. Disk Partitioning
        Prev   Next

        Chapter 6. Disk Partitioning

        +

        Chapter 6. Disk Partitioning
        Prev   Next

        Chapter 6. Disk Partitioning

        If you are new to Linux, you may want to use the automatic partitioning method. If you are a more experienced Linux user, use the manual partitioning method for more control over your system @@ -15,24 +15,24 @@ partitions.

        disk partitioning setup screen

        Figure 6.1.  Disk Partitioning Setup Screen -

        6.1. Choosing a Partitioning Method

        6.1.1. Setting Up Partitions Automatically

        - Choose Automatic partitioning at the +

        6.1. Choosing a Partitioning Method

        6.1.1. Setting Up Partitions Automatically

        + Choose Automatic partitioning at the partitioning menu to use a preset partitioning layout. - Disk Druid then displays additional + Disk Druid then displays additional options:

        automatic partitioning screen

        Figure 6.2.  Automatic Partitioning Setup Screen -

        Remove all Linux partitions on this - system

        - Removes all ext2, - ext3, and Linux - swap partitions from all hard disks -

        Remove all partitions on this - system

        +

        Remove all Linux partitions on this + system

        + Removes all ext2, + ext3, and Linux + swap partitions from all hard disks +

        Remove all partitions on this + system

        Removes all partitions from all hard disks -

        Keep all partitions and use only existing free - space

        +

        Keep all partitions and use only existing free + space

        Uses only the unpartitioned space on the hard disk(s) to install Fedora Core

        @@ -43,25 +43,25 @@ selected. Any disks you select are used for Linux partitions according to the option selected above. The option selection is global, and you may not select a different option for each disk. -

        [Note]Device Names

        +

        [Note]Device Names

        If you are confused about the device names used in this box, consult the Linux Partition-HOWTO at http://www.tldp.org/HOWTO/Partition/partition-2.html.

        To review the automatic partition configuration, select the - Review checkbox. + Review checkbox.

        If you remove any existing partitions, the installation program asks you to confirm this choice. After you review and approve - the partition configuration, select Next + the partition configuration, select Next to continue to the next installation step. Proceed with Chapter 7, Boot Loader. -

        6.1.2. Setting Up Partitions Manually

        +

        6.1.2. Setting Up Partitions Manually

        To manually set up all disk partitions, choose - Manually partition with Disk Druid. Choose + Manually partition with Disk Druid. Choose this method if you require a special partition configuration. If you are familiar with how disk partitions and the Linux file system work, move on to Section 6.3, “Disk Druid”. Otherwise, read Section 6.2, “General Information on Partitions”. -

        Prev Up Next
        5.2. Special Considerations Home 6.2. General Information on Partitions
        +

        Prev   Next
        5.2. Special Considerations Home 6.2. General Information on Partitions
        -
        Chapter 15. First Boot
        Prev   Next

        Chapter 15. First Boot

        - The Setup Agent launches the first time - that you start a new Fedora Core system. Use Setup - Agent to configure the system for use before you log +

        Chapter 15. First Boot
        Prev   Next

        Chapter 15. First Boot

        + The Setup Agent launches the first time + that you start a new Fedora Core system. Use Setup + Agent to configure the system for use before you log in.

        Welcome screen.

        Figure 15.1. Welcome Screen

        - Select Next to start the Setup - Agent. -

        [Note]GUI Required

        - Setup Agent requires a graphical + Select Next to start the Setup + Agent. +

        [Note]GUI Required

        + Setup Agent requires a graphical interface. If none is available, configure these options manually after you log in. -

        15.1. License Agreement

        +

        15.1. License Agreement

        This screen displays the overall licensing terms for Fedora Core. Each software package in Fedora Core is covered by its own license which has - been approved by the Open Source Initiative (OSI). For more information + been approved by the Open Source Initiative (OSI). For more information about the OSI, refer to http://www.opensource.org/.

        License agreement screen.

        Figure 15.2. License Agreement Screen

        - To proceed, select Yes, I agree to the License - Agreement and then select - Next. -

        Prev Up Next
        Chapter 14. Installing Packages Home 15.2. Date and Time
        + To proceed, select Yes, I agree to the License + Agreement and then select + Next. +

        Prev   Next
        Chapter 14. Installing Packages Home 15.2. Date and Time
        -
        Chapter 3. Identifying Your Locale
        Prev   Next

        Chapter 3. Identifying Your Locale

        +

        Chapter 3. Identifying Your Locale
        Prev   Next

        Chapter 3. Identifying Your Locale

        If the installation system fails to identify the display hardware on your computer, it displays text screens rather than the default graphical interface. The text screens provide the same functions as the standard screens. Later in the installation process you can manually specify your display hardware. -

        [Important]Important

        +

        [Important]Important

        Network installations with HTTP and FTP always use text screens on systems with less than 128Mb of memory. -

        3.1. Language Selection

        +

        3.1. Language Selection

        The installation program displays a list of languages supported by Fedora.

        Language selection screen.

        Figure 3.1. Language Selection Screen

        Highlight the correct language on the list and select - Next. -

        [Note]Installing Support For Additional Languages

        + Next. +

        [Note]Installing Support For Additional Languages

        To select support for additional languages, customize the installation at the package selection stage. For more information, refer to Section 12.3, “Additional Language Support”. -

        Prev Up Next
        2.2. Installation from a Hard Drive Home 3.2. Keyboard Configuration
        +

        Prev   Next
        2.2. Installation from a Hard Drive Home 3.2. Keyboard Configuration
        -
        Chapter 14. Installing Packages
        Prev   Next

        Chapter 14. Installing Packages

        +

        Chapter 14. Installing Packages
        Prev   Next

        Chapter 14. Installing Packages

        Fedora Core reports the installation progress on the screen as it writes the selected packages to your system. Network and DVD installations require no further action. If you are using CDs to install, Fedora Core prompts you to change discs periodically. After you insert a disc, - select OK to resume the installation. + select OK to resume the installation.

        Installing packages screen.

        Figure 14.1. Installing Packages Screen

        - After installation completes, select Reboot + After installation completes, select Reboot to restart your computer. Fedora Core ejects any loaded discs before the computer reboots. -

        Prev Up Next
        Chapter 13. About to Install Home Chapter 15. First Boot
        +

        Prev   Next
        Chapter 13. About to Install Home Chapter 15. First Boot
        -
        Chapter 5. Installation Types
        Prev   Next

        Chapter 5. Installation Types

        - An installation type is a label +

        Chapter 5. Installation Types
        Prev   Next

        Chapter 5. Installation Types

        + An installation type is a label that roughly describes how you will use your Fedora system. Several installation types are already defined in the Fedora Core installation program. Choose the appropriate installation type to streamline the @@ -17,34 +17,34 @@ These choices include partitioning of your hard disks, and software packages to be installed. All installation types allow you to customize these selections. -

        5.1. Choosing an Installation Type

        + </p><div class=

        5.1. Choosing an Installation Type

        Installation type screen. -

        Figure 5.1. Installation Type Screen

        Personal Desktop

        + ">

        Figure 5.1. Installation Type Screen

        Personal Desktop

        This is the default installation type. It provides a graphical working environment with an office suite, Internet applications and multimedia software. -

        Workstation

        +

        Workstation

        This installation type includes the software installed on a - Personal Desktop, and adds software for + Personal Desktop, and adds software for development and systems administration. Choose this installation type if you plan to compile software from source code. -

        Server

        +

        Server

        This installation type provides network servers such as the Apache Web server and the Samba suite of services, and administration tools. This installation type provides no graphical environment by default. -

        Custom

        +

        Custom

        This installation type does not provide any disk partitioning layout for you. It also does not include any - additional software beyond a Personal - Desktop. If you perform a - Custom installation, the installation + additional software beyond a Personal + Desktop. If you perform a + Custom installation, the installation program will present dialogs for these selections during the installation process.

        - Click Next once you have made a selection. -

        Prev Up Next
        4.2. Upgrading Boot Loader Configuration Home 5.2. Special Considerations
        + Click Next once you have made a selection. +

        Prev   Next
        4.2. Upgrading Boot Loader Configuration Home 5.2. Special Considerations
        -
        Introduction
        Prev   Next

        Introduction

        +

        Introduction
        Prev   Next

        Introduction

        Fedora Core is a complete desktop and server operating system created entirely with open source software. -

        [Caution]Fedora Core Lifecycle

        +

        [Caution]Fedora Core Lifecycle

        Fedora Core is a rapidly evolving system which follows the latest technical developments. Fedora Core may not be appropriate for use in critical applications in your organization. @@ -24,10 +24,10 @@

        This document does not detail all of the features of the installation system. -

        1. Background

        +

        1. Background

        The Fedora Project, which produces and maintains Fedora Core, is a collaboration - between Red Hat, Inc. and the - free and open source software + between Red Hat, Inc. and the + free and open source software (FOSS) community. The Fedora Project also provides Fedora Extras, additional software packaged for installation on a Fedora Core system.

        @@ -35,7 +35,7 @@ http://www.opensource.org/ and http://www.gnu.org/philosophy/free-sw.html for more information about open source software. -

        Prev Up Next
        Fedora Core 4 Installation Guide Home 2. Before You Begin
        +

        Prev   Next
        Fedora Core 4 Installation Guide Home 2. Before You Begin
        -
        Chapter 8. Network Configuration
        Prev   Next

        Chapter 8. Network Configuration

        +

        Chapter 8. Network Configuration
        Prev   Next

        Chapter 8. Network Configuration

        Use this screen to customize the network settings of your Fedora system.

        Manual network configuration of a Fedora system is often not - required. Many networks have a DHCP (Dynamic Host Configuration + required. Many networks have a DHCP (Dynamic Host Configuration Protocol) service that automatically supplies connected systems with configuration data. By default, Fedora Core activates all network interfaces on your computer and configures them to use DHCP. @@ -22,20 +22,20 @@ only accept systems which have the correct security credentials.

        Network configuration screen. -

        Figure 8.1. Network Configuration Screen

        8.1. Network Devices

        + ">

        Figure 8.1. Network Configuration Screen

        8.1. Network Devices

        Fedora displays a list of network interfaces detected on your - computer. Each interface must have a unique IP - address on the network to which it is attached. The interface - may receive this address from the network DHCP service. + computer. Each interface must have a unique IP + address on the network to which it is attached. The interface + may receive this address from the network DHCP service.

        To manually assign an IP address, highlight the interface on the - Network Device list and select - Edit. Fedora then displays a network + Network Device list and select + Edit. Fedora then displays a network configuration dialog. Deselect the - Configure using DHCP checkbox, so that it is - empty. Enter the IP Address and the - appropriate Netmask for the interface. Then - select OK. + Configure using DHCP checkbox, so that it is + empty. Enter the IP Address and the + appropriate Netmask for the interface. Then + select OK.

        If your computer will be a server, do not use DHCP. Manually configure networking instead. Manual network configuration allows @@ -43,18 +43,18 @@ down.

        Specify whether an interface should be automatically activated at - boot time with the Active on Boot checkbox + boot time with the Active on Boot checkbox for that device. You may manually activate a network interface at any time after the system has booted. -

        [Note]Modem Configuration

        - The Network Configuration screen does not - list modems. Configure these devices after installation - with either the Internet Configuration - Wizard or Network - Cnfiguration utility. The settings for your +

        [Note]Modem Configuration

        + The Network Configuration screen does not + list modems. Configure these devices after installation + with either the Internet Configuration + Wizard or Network + Cnfiguration utility. The settings for your modem are specific to your particular Internet Service Provider (ISP). -

        Prev Up Next
        7.4.  +

        Prev   Next
        7.4.  Advanced Boot loader Options  Home 8.2. Computer Hostname
        Index: ch-next-steps.php =================================================================== RCS file: /cvs/fedora/web/html/docs/fedora-install-guide-en/fc4/ch-next-steps.php,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ch-next-steps.php 12 Jun 2005 08:52:19 -0000 1.2 +++ ch-next-steps.php 29 Sep 2005 17:29:43 -0000 1.3 @@ -7,10 +7,10 @@ ?> -
        Chapter 16. Your Next Steps
        Prev   Next

        Chapter 16. Your Next Steps

        +

        Chapter 16. Your Next Steps
        Prev   Next

        Chapter 16. Your Next Steps

        Fedora Core provides you with a complete operating system with a vast range of capabilities, supported by a large community. -

        16.1. Documentation on the Web

        +

        16.1. Documentation on the Web

        Documentation for Fedora Core is available from the Fedora Project Website:

        @@ -30,7 +30,7 @@ information on any topic by using Google:

        http://www.google.com/linux/ -

        Prev Up Next
        15.6. Additional CDs Home 16.2. Community Support
        +

        Prev   Next
        15.6. Additional CDs Home 16.2. Community Support
        -
        Chapter 2. Other Installation Methods
        Prev   Next

        Chapter 2. Other Installation Methods

        +

        Chapter 2. Other Installation Methods
        Prev   Next

        Chapter 2. Other Installation Methods

        The installation method screen below appears if one of the following is true:

        1. You booted with PXE, or USB media.

        2. - You entered the askmethod option at the - boot: prompt. + You entered the askmethod option at the + boot: prompt.

        Installation method screen.

        Figure 2.1. Installation Method Screen

        Highlight the appropriate installation method on the list, and - select OK. -

        [Note]CD/DVD Activity

        + select OK. +

        [Note]CD/DVD Activity

        If a Fedora disc is in your computer's CD or DVD drive, the installation program loads its next stage from that disc. The installation program downloads package data from the source you choose. -

        2.1. Installation from a Network Server

        +

        2.1. Installation from a Network Server

        You may install Fedora Core from a network server using FTP, HTTP, or - NFS protocols. -

        2.1.1. TCP/IP Configuration

        + NFS protocols. +

        2.1.1. TCP/IP Configuration

        By default, the installation program uses DHCP to automatically provide the network settings. If your network has no DHCP - server, clear the checkbox labeled Use dynamic IP - configuration and enter the settings manually. - Select OK to continue. + server, clear the checkbox labeled Use dynamic IP + configuration and enter the settings manually. + Select OK to continue.

        TCP/IP configuration dialog.

        Figure 2.2. Configure TCP/IP Dialog

        These settings apply only during the installation process. The installation program allows you to configure the final network configuration later. -

        2.1.2. Network Service Setup

        +

        2.1.2. Network Service Setup

        The FTP, HTTP, and NFS service setup dialogs are very similar. Each requires the name or IP address of the server, and a directory where the installation tree resides. @@ -48,13 +48,13 @@ FTP setup dialog. ">

        Figure 2.3. FTP Setup Dialog

        The FTP service setup dialog also has an option for - non-anonymous FTP. If your FTP server does + non-anonymous FTP. If your FTP server does not provide anonymous access, select this check box, and provide an account name and password in the following dialog. Select - OK to continue. + OK to continue.

        Non-anonymous FTP account dialog. -

        Figure 2.4. Non-anonymous FTP Account Dialog

        Prev Up Next
        1.3. Booting from the Network using PXE Home 2.2. Installation from a Hard Drive
        + ">

        Figure 2.4. Non-anonymous FTP Account Dialog

        Prev   Next
        1.3. Booting from the Network using PXE Home 2.2. Installation from a Hard Drive
        -
        Chapter 12. Package Selection
        Prev   Next

        Chapter 12. Package Selection

        +

        Chapter 12. Package Selection
        Prev   Next

        Chapter 12. Package Selection

        Fedora uses the installation type to select a set of software packages for your system. Refer to Chapter 5, Installation Types for more information. You can accept this default set of packages, or customize it to fit your preferences. If you choose - the Custom installation type, Fedora displays - the screen for Package Group Selection + the Custom installation type, Fedora displays + the screen for Package Group Selection automatically. -

        [Tip]Changing Your Mind

        +

        [Tip]Changing Your Mind

        The installation type and packages that you select are not permanent. After you boot your system, use the - Package Management tool to make + Package Management tool to make different software selections for your system. To run this tool, - from the main menu, select Desktop->System Settings->Add/Remove Applications. -

        12.1. Package Installation Defaults

        + from the main menu, select Desktop->System Settings->Add/Remove Applications. +

        12.1. Package Installation Defaults

        A summary of the default package selection is displayed.

        Package installation defaults screen.

        Figure 12.1. Package Installation Defaults Screen

        - To accept the default package selection, select Install - the default software packages. Select - Next to continue, and proceed to Chapter 13, About to Install. + To accept the default package selection, select Install + the default software packages. Select + Next to continue, and proceed to Chapter 13, About to Install.

        - To view or change the packages, select Customize - software packages to be installed. Select - Next to continue, and proceed to Section 12.2, “Package Group Selection”. -

        Prev Up Next
        Chapter 11. Set the Root Password Home 12.2. Package Group Selection
        + To view or change the packages, select Customize + software packages to be installed. Select + Next to continue, and proceed to Section 12.2, “Package Group Selection”. +

        Prev   Next
        Chapter 11. Set the Root Password Home 12.2. Package Group Selection
        initCommon(); -$template->displayHeader(); - -?> - -
        Chapter 11. Set the Root Password
        Prev   Next

        Chapter 11. Set the Root Password

        - Fedora uses a special account named root for system - administration. The root +Chapter 11. Set the Root Password

        Chapter 11. Set the Root Password
        Prev   Next

        Chapter 11. Set the Root Password

        + Fedora uses a special account named root for system + administration. The root account on every Linux system is only limited by SELinux. It is not subject to any other normal account restrictions. As the system owner or administrator, you may sometimes require unrestricted access to configure or modify the system. In those cases, use the - root account. + root account.

        [Important]Using the root - Account

        - Avoid logging in to Fedora Core as root when possible. Any - administration tools which require root privileges will prompt you + Account">

        [Important]Using the root + Account

        + Avoid logging in to Fedora Core as root when possible. Any + administration tools which require root privileges will prompt you for the password.

        - The Fedora installation program requires the root password to be at least six characters - long. Because the root + The Fedora installation program requires the root password to be at least six characters + long. Because the root account may potentially control any part of the system, use the following guidelines to create a good password:

        • @@ -37,23 +28,23 @@

        The following are examples of good passwords:

        • - f9*@1Ls99A + f9*@1Ls99A

        • - HL8$391%%rb + HL8$391%%rb

        • - Iwtb,10^th + Iwtb,10^th

        - Enter the root password - into the Root Password field. Fedora displays + Enter the root password + into the Root Password field. Fedora displays the characters as asterisks for security. Type the same password - into the Confirm field to ensure it is set + into the Confirm field to ensure it is set correctly.

        Set root password screen.

        Figure 11.1. Set Root Password Screen

        - After you set the root password, select Next + After you set the root password, select Next to proceed. -

        Prev Up Next
        10.2. Universal Co-ordinated Time (UTC) Home Chapter 12. Package Selection
        +

        Prev   Next
        10.2. Universal Co-ordinated Time (UTC) Home Chapter 12. Package Selection
        -
        Chapter 9. Security Configuration
        Prev   Next

        Chapter 9. Security Configuration

        +

        Chapter 9. Security Configuration
        Prev   Next

        Chapter 9. Security Configuration

        The default security configuration for Fedora Core protects your system without restricting any of the functions of a desktop or laptop computer. If you are installing a server, you may need to alter @@ -15,10 +15,10 @@

        Security configuration screen.

        Figure 9.1. Security Configuration Screen

        - Select Next to proceed after you review the + Select Next to proceed after you review the security configuration and make any necessary changes. -

        9.1. Firewall

        - The firewall built into Fedora Core +

        9.1. Firewall

        + The firewall built into Fedora Core checks every incoming and outgoing network connection on your machine against a set of rules. These rules specify which types of connections are permitted and which are denied. @@ -34,12 +34,12 @@ complete, you can enable access to other services as well.

        Avoid disabling the firewall. If you believe it is necessary to - do so, select No firewall. -

        [Tip]Changing the Firewall Settings

        + do so, select No firewall. +

        [Tip]Changing the Firewall Settings

        To change these settings later, from the main menu, choose - Desktop->System Settings->Security - Level and Firewall. -

        Prev Up Next
        8.3. Miscellaneous Settings Home 9.2. SELinux
        + Desktop->System Settings->Security + Level and Firewall. +

        Prev   Next
        8.3. Miscellaneous Settings Home 9.2. SELinux
        initCommon(); -$template->displayHeader(); - -?> - -
        Chapter 10. Time Zone Selection
        Prev   Next

        Chapter 10. Time Zone Selection

        +Chapter 10. Time Zone Selection

        Chapter 10. Time Zone Selection
        Prev   Next

        Chapter 10. Time Zone Selection

        This screen allows you to specify the correct time zone for the location of your computer. Specify a time zone even if you plan to - use NTP (Network Time Protocol) to maintain the accuracy of + use NTP (Network Time Protocol) to maintain the accuracy of the system clock. -

        10.1. Selecting a Time Zone

        +

        10.1. Selecting a Time Zone

        Fedora displays on the screen two methods for selecting the time zone.

        @@ -21,13 +12,13 @@ To select a time zone using the map, select the yellow dot that represents the city nearest to your location. When you place the arrow on a dot, Fedora displays the name of the city below the map. - Once you select a dot, it becomes a red <span><b class=X to + Once you select a dot, it becomes a red X to indicate your selection.

        To select a time zone using the list, select the name of the city nearest to your location. The cities are listed in alphabetical order. -

        Prev Up Next
        9.2. SELinux Home 10.2. Universal Co-ordinated Time (UTC)
        +

        Prev   Next
        9.2. SELinux Home 10.2. Universal Co-ordinated Time (UTC)
        -
        Index
        Prev   

        Index

        B

        BIOS (Basic Input/Output System), Beginning the Installation
        boot loader, Upgrading Boot Loader Configuration
        (see also GRUB)
        upgrading, Upgrading Boot Loader Configuration

        C

        CUPS (Common UNIX Printing System), Special Considerations

        D

        DHCP (Dynamic Host Configuration Protocol), Networking, Network Configuration, Network Devices
        Disk Druid, Disk Druid
        DNS (Domain Name Service), Miscellaneous Settings
        domain name, Computer Hostname

        E

        ext2 (see file systems)
        ext3 (see file system) (see file systems)

        F

        file system, Partition Types
        ext3, Partition Types
        NTFS, Disk Druid
        vfat, Disk Druid
        >file systems
        ext2, Installation from a Hard Drive
        ext3, Installation from a Hard Drive
        vfat, Installation from a Hard Drive
        firewall, Firewall
        FOSS (free and open source software), Background
        free software (see FOSS)

        G

        gateway, Miscellaneous Settings
        GMT (Greenwich Mean Time) (see UTC)

        H

        hostname, Computer Hostname

        I

        installation type, Installation Types
        IP address, Network Devices

        L

        LVM, Understanding LVM, Disk Druid
        physical volume, Understanding LVM
        understanding, Understanding LVM
        volume group, Understanding LVM

        M

        master boot record, Keeping Your Existing Boot Loader Settings, +
        Index
        Prev   

        Index

        B

        BIOS (Basic Input/Output System), Beginning the Installation
        boot loader, Upgrading Boot Loader Configuration
        (see also GRUB)
        upgrading, Upgrading Boot Loader Configuration

        C

        CUPS (Common UNIX Printing System), Special C! onsiderations

        D

        DHCP (Dynamic Host Configuration Protocol), Networking, Network Configuration, Network Devices
        Disk Druid, Disk Druid
        DNS (Domain Name Service), Miscellaneous Settings
        domain name, Computer Hostname

        E

        ext2 (see file systems)
        ext3 (see file system) (see file systems)

        F

        file system, Partition Types
        ext3, Partition Types
        NTFS, Disk Druid
        vfat, Di! sk Dru /a>
        file systems
        ext2, Installation from a Hard Drive
        ext3, Installation from a Hard Drive
        vfat, Installation from a Hard Drive
        firewall, Firewall
        FOSS (free and open source software), Background
        free software (see FOSS)

        G

        gateway, Miscellaneous Settings
        GMT (Greenwich Mean Time) (see UTC)

        H

        hostname, Computer Hostname

        I

        installation type, Installation Types
        IP address, Network Devices

        L

        LVM, Understanding LVM, Disk Druid
        physical volume, Understanding LVM
        understanding, Understanding LVM
        volume group, Understanding LVM

        M

        master boot record, Keeping Your Existing Boot Loader Settings, Advanced Boot loader Options -
        modem, Network Devices
        mount point, General Information on Partitions

        N

        NFS (Network File System)
        install from, Installation from a Network Server
        service installed, Special Considerations
        NTFS (see file system)
        NTP (Network Time Protocol), Time Zone Selection, Date and Time

        O

        open source (see FOSS)
        OSI (Open Source Initiative), License Agreement

        P

        package groups, Package Group Selection
        partition
        /home, Disk Druid
        /root, General Information on Partitions
        adding, Disk Druid
        deleting, Disk Druid
        editing, Disk Druid
        illegal, Disk Druid
        root, General Information on Partitions, Disk Druid
        type, Partition Types
        (see also file system)
        PXE (Pre-boot eXecution Environment), Beginning the Installation, Booting from the Network using PXE

        R

        RAID, Disk ! Druid
        root account, ! Set th oot Password
        router (see gateway)

        S

        SELinux, SELinux
        SMTP (Simple Mail Transfer Protocol), Special Considerations
        SSH (Secure SHell), Special Considerations

        U

        UTC (Universal Co-ordinated time), Universal Co-ordinated Time (UTC)

        V

        vfat (see file system) (see file systems)
        Prev Up 
        Chapter 17. Acknowledgem! ents Home 
        +
        modem, Network Devices
        mount point, General Information on Partitions

        N

        NFS (Network File System)
        install from, Installation from a Network Server
        service installed, Special Considerations
        NTFS (see file system)
        NTP (Network Time Protocol), Time Zone Selection, Date and Time

        O

        open source (see FOSS)
        OSI (Open Source Initiative), License Agreement

        P

        package groups, Package Group Selection
        partition
        /home, Disk Druid
        /root, General Information on Partitions
        adding, Disk Druid
        deleting, Disk Druid
        editing, Disk Druid
        illegal, Disk Druid
        root, General Information on Partitions, Disk Druid
        type, Partition Types
        (see also file system)
        PXE (Pre-boot eXecution Environment), Beginning the Installation, Booting from the Network using PXE

        R

        RAID, Disk ! Druid
        root account, ! Set th oot Password
        router (see gateway)

        S

        SELinux, SELinux
        SMTP (Simple Mail Transfer Protocol), Special Considerations
        SSH (Secure SHell), Special Considerations

        U

        UTC (Universal Co-ordinated time), Universal Co-ordinated Time (UTC)

        V

        vfat (see file system) (see file systems)
        Prev   
        Chapter 17. Acknowledgements Home 
        -
        Fedora Core 4 Installation Guide
           Next

        Fedora Core 4 Installation Guide

        Stuart Ellis

        Paul W. Frields

        Copyright © 2005 Red Hat, Inc., Stuart Ellis, Paul W. Frields

        Revision History
        Revision 0.6.22005-04-30StuartEllis
        -

        - First commission to CVS, plus very minor parent file edits -

        -
        Revision 0.6.32005-05-10PaulWFrields
        -

        - Style editing, removed "nextsteps" from build -

        -
        Revision 0.72005-05-15StuartEllis
        -

        - Additional style editing and indexing -

        -
        Revision 1.0rc12005-06-08KarstenWade
        -

        - Publication edit and declaration of release candidate -

        -
        Revision 1.02005-06-10KarstenWade
        -

        - Release version -

        -

        Table of Contents

        Introduction
        1. Background
        2. Before You Begin
        2.1. Networking
        2.2. Installing Fedora Core as a Server
        2.3. Installing from a Network Server
        2.4. Installing Fedora Core on a Managed Network
        1. Beginning the Installation
        1.1. Booting from Disc
        1.2. Using Other Removable Media
        1.2.1. Preparing the Boot Media
        1.2.2. Booting from the Media
        1.3. Booting from the Network using PXE
        2. Other Installation Methods
        2.1. Installation from a Network S! erver
        2.1.1. TCP/IP Configuration
        2.1.2. Network Service Setup
        2.2. Installation from a Hard Drive
        3. Identifying Your Locale
        3.1. Language Selection
        3.2. Keyboard Configuration
        4. Upgrading an Existing System
        4.1. Upgrade Examine
        4.2. Upgrading Boot Loader Conf! iguration
        5. Installation Types
        5.1. Choosing an Installation Type
        5.2. Special Considerations
        6. Disk Partitioning
        6.1. Choosing a Partitioning Method
        6.1.1. Setting Up Partitions Automatically
        6.1.2. Setting Up Partitions Manually
        6! .2. General Information on Partitions
        6.2.1. Partition Types
        6.2.2. Understanding LVM
        6.3. Disk Druid
        7. Boot Loader
        7.1. Keeping Your Existing Boot Loader Settings
        7.2. +
        Fedora Core 4 Installation Guide
           Next

        Fedora Core 4 Installation Guide

        Stuart Ellis

        Paul W. Frields

        Copyright © 2005 Red Hat, Inc., Stuart Ellis, Paul W. Frields

        Table of Contents

        Introduction
        1. Background
        2. Before You Begin
        2.1. Networking
        2.2. Installing Fedora Core as a Server
        2.3. Installing from a Network Server
        2.4. Installing Fedora Core on a Managed Network
        1. Beginning the Installation
        1.1. Booting from Disc
        1.2. Using Other Removable Media
        1.2.1. Preparing the Boot Media
        1.2.2. Booting from the Media
        1.3. Booting from the Network using PXE
        2. Other Installation Methods
        2.1. Installation from a Network Server
        2.1.1. TCP/IP Configuration
        2.1.2. Network Service Setup
        2.2. Installation from a Hard Drive
        3. Identifying Your Locale
        3.1. Language Selection
        3.2. Keyboard Configuration
        4. Upgrading an Existing System
        4.1. Upgrade Examine
        4.2. Upgrading Boot Loader Configuration
        !
        < >
        5. Installation Types
        5.1. Choosing an Installation Type
        5.2. Special Considerations
        6. Disk Partitioning
        6.1. Choosing a Partitioning Method
        6.1.1. Setting Up Partitions Automatically
        6.1.2. Setting Up Partitions Manually
        6.2. General Information on Partitio! ns
        6.2.1. Partition Types
        6.2.2. Understanding LVM
        6.3. Disk Druid
        7. Boot Loader
        7.1. Keeping Your Existing Boot Loader Settings
        7.2. Booting Additional Operating Systems
        7.3. Setting a Boot Loader Password
        7.4. Advanced Boot loader Options -
        8. Network Configuration
        8.1. Network Devices
        8.2. Computer Hostname
        8.3. Miscellaneous Settings
        9. Security Configuration
        9.1. Firewall
        9.2. SELinux
        10. Time Zone Selection
        10.1. Selecting a Time Zone
        10.2. Universal Co-ordinated Time (UTC)
        11. Set the Root Password
        12. Package Selection
        12.1. Package Installation Defaults
        12.2. Package Group Selection
        12.3. Additional Language Support
        12.4. Everything or - Minimal Installations
        13. About to Install
        14. Installing Packages
        15. First Boot
        15.1. License Agreement
        15.2. Date and Time
        15.3. Display
        15.4. System User
        15.5. Sound Card
        15.6. Additional CDs
        16. Your Next Steps
        16.1. Documentation on the Web
        16.2. Community Support
        16.3. Joining The Fedora Community
        17. Acknowledgements
        Index
        +
        8. Network Configuration
        8.1. Network Devices
        8.2. Computer Hostname
        8.3. Miscellaneous Settings
        9. Security Configuration
        9.1. Firewall
        9.2. SELinux
        10. Time Zone Selection
        10.1. Selecting a Time Zone
        10.2. Universal Co-ordinated Time (UTC)
        11. Set the Root Password
        12. Package Selection
        12.1. Package Installation Defaults
        12.2. Package Group Selection
        12.3. Additional Language Support
        12.4. Everything or + Minimal Installations
        13. About to Install
        14. Installing Packages
        15. First Boot
        15.1. License Agreement
        15.2. Date and Time
        15.3. Display
        15.4. System User
        15.5. Sound Card
        15.6. Additional CDs
        !
        16. Your Next Steps
        16.1. Documentation on the Web
        16.2. Community Support
        16.3. Joining The Fedora Community
        17. Acknowledgements
        Index
           Next
           Introduction
           Next
           Introduction
        -
        5.2. Special Considerations
        Prev Chapter 5. Installation Types Next

        5.2. Special Considerations

        +

        5.2. Special Considerations
        Prev Chapter 5. Installation Types Next

        5.2. Special Considerations

        All Fedora Core installations include the following network services:

        • - email through SMTP (Simple Mail Transfer + email through SMTP (Simple Mail Transfer Protocol)

        • - network file sharing through NFS (Network File + network file sharing through NFS (Network File System)

        • - printing through CUPS + printing through CUPS (Common UNIX Printing System)

        • - remote login through SSH + remote login through SSH (Secure SHell)

        Some automated processes on your Fedora system use the email @@ -30,12 +30,12 @@ component is disabled by default. You may configure your Fedora system after installation to offer email, NFS, or print services. The SSH service is enabled by default. -

        [Tip]Minimal installations

        +

        [Tip]Minimal installations

        To install a minimum of software, choose the - Custom installation type. On the - Package Group Selection screen, select the - Minimal package group. The only services - included in a Minimal installation are + Custom installation type. On the + Package Group Selection screen, select the + Minimal package group. The only services + included in a Minimal installation are email, printing, NFS, and SSH. This type of installation may be useful for firewalls or other specialized systems on which limited service is an advantage. Index: ln-legalnotice.php =================================================================== RCS file: /cvs/fedora/web/html/docs/fedora-install-guide-en/fc4/ln-legalnotice.php,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ln-legalnotice.php 12 Jun 2005 08:52:19 -0000 1.2 +++ ln-legalnotice.php 29 Sep 2005 17:29:43 -0000 1.3 @@ -22,7 +22,7 @@

        Garrett LeSage created the admonition graphics (note, tip, important, caution, and warning). - Tommy Reynolds created the callout graphics. + Tommy Reynolds created the callout graphics. They all may be freely redistributed with documentation produced for the Fedora Project.

        Index: sn-before-begin.php =================================================================== RCS file: /cvs/fedora/web/html/docs/fedora-install-guide-en/fc4/sn-before-begin.php,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sn-before-begin.php 12 Jun 2005 08:52:19 -0000 1.2 +++ sn-before-begin.php 29 Sep 2005 17:29:43 -0000 1.3 @@ -7,12 +7,12 @@ ?> -

        2. Before You Begin
        Prev Introduction Next

        2. Before You Begin

        +

        2. Before You Begin
        Prev Introduction Next

        2. Before You Begin

        To install Fedora Core from discs, you need four installation CDs, or the installation DVD. There are separate disc sets for each supported - architecture. Currently, Fedora Core supports the - i386, ppc, and - x86_64 architectures. These architectures + architecture. Currently, Fedora Core supports the + i386, ppc, and + x86_64 architectures. These architectures are described below:

        i386

        Intel x86-compatible processors, including Intel Pentium and @@ -40,9 +40,9 @@ The Release Notes are available on the first disc in HTML and plain text format. The latest versions of this Installation Guide and the Release Notes can always be found at http://fedora.redhat.com/docs/. -

        2.1. Networking

        +

        2.1. Networking

        By default, Fedora Core systems attempt to discover correct connection - settings for the attached network using DHCP (Dynamic Host Control + settings for the attached network using DHCP (Dynamic Host Control Protocol). Your network may include a DHCP provider which delivers settings to other systems on demand. The DHCP provider may be a router or wireless access point for the network, or a @@ -50,18 +50,18 @@

        In some circumstances you may need to provide information about your network during the installation process. Refer to Section 2.3, “Installing from a Network Server” and Section 2.4, “Installing Fedora Core on a Managed Network” for more information. -

        [Note]Modem Configuration

        +

        [Note]Modem Configuration

        The installation system for Fedora Core does not configure modems. If your computer has a modem, configure the dialing settings after you complete the installation and reboot. -

        2.2. Installing Fedora Core as a Server

        +

        2.2. Installing Fedora Core as a Server

        Fedora Core includes software for a complete range of network services. To install a system with the most common network services, - select the Server installation type during + select the Server installation type during the installation. Refer to Chapter 5, Installation Types for more information. You may also select individual software packages during installation, or install them later. -

        2.3. Installing from a Network Server

        +

        2.3. Installing from a Network Server

        To install Fedora Core using a network installation server you will need to know the following:

        • @@ -73,24 +73,24 @@ the path to the installation files

        A network installation requires boot media, unless you are using - PXE (Pre-boot eXecution Environment) to + PXE (Pre-boot eXecution Environment) to boot your computer. Boot your computer using either an installation DVD, the first installation CD, a boot CD, or a prepared USB storage device.

        - PXE (also referred to as netboot) is a + PXE (also referred to as netboot) is a standard that enables PCs to use files on a server as a boot device. Fedora Core includes utilities that allow it to function as a PXE server for other computers.

        Booting your computer is explained in the next section, Chapter 1, Beginning the Installation. -

        2.4. Installing Fedora Core on a Managed Network

        - Some corporate networks include a directory - service that manages user accounts for the +

        2.4. Installing Fedora Core on a Managed Network

        + Some corporate networks include a directory + service that manages user accounts for the organization. Fedora Core systems can join a Kerberos, NIS, Hesiod, or Microsoft® Windows® domain as part of the installation process. Fedora Core can also use LDAP directories. -

        [Caution]Consult Network Administrators

        +

        [Caution]Consult Network Administrators

        If you are installing outside of your home, always consult the administrators before installing a Fedora Core system on an existing network. They can provide correct network and authentication Index: sn-booting-from-pxe.php =================================================================== RCS file: /cvs/fedora/web/html/docs/fedora-install-guide-en/fc4/sn-booting-from-pxe.php,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sn-booting-from-pxe.php 12 Jun 2005 08:52:19 -0000 1.2 +++ sn-booting-from-pxe.php 29 Sep 2005 17:29:43 -0000 1.3 @@ -7,13 +7,13 @@ ?> -

        1.3. Booting from the Network using PXE
        Prev Chapter 1. Beginning the Installation Next

        1.3. Booting from the Network using PXE

        - To boot with PXE, you need a properly configured server, and a +

        1.3. Booting from the Network using PXE
        Prev Chapter 1. Beginning the Installation Next

        1.3. Booting from the Network using PXE

        + To boot with PXE, you need a properly configured server, and a network interface in your computer that supports PXE.

        Configure the computer to boot from the network interface. This - option is in the BIOS, and may be labeled Network - Boot or Boot Services. Once you + option is in the BIOS, and may be labeled Network + Boot or Boot Services. Once you properly configure PXE booting, the computer can boot the Fedora installation system without any other media.

        @@ -31,7 +31,7 @@ Red Hat Network Installer screen. ">

        Figure 1.5. Welcome to Red Hat Network Installer

        Choose a network installation option to continue. -

        [Note]PXE Troubleshooting

        +

        [Note]PXE Troubleshooting

        If your PC does not boot from the netboot server, ensure that the BIOS is configured to boot first from the correct network interface. Some BIOS systems specify the network interface as a Index: sn-bootloader-advanced.php =================================================================== RCS file: /cvs/fedora/web/html/docs/fedora-install-guide-en/fc4/sn-bootloader-advanced.php,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sn-bootloader-advanced.php 12 Jun 2005 08:52:19 -0000 1.2 +++ sn-bootloader-advanced.php 29 Sep 2005 17:29:43 -0000 1.3 @@ -11,15 +11,15 @@ Advanced Boot loader Options

        Prev Chapter 7. Boot Loader Next

        7.4.  Advanced Boot loader Options -

        +

        The default boot options are adequate for most situations. The - installation program writes the GRUB + installation program writes the GRUB boot loader in the - master boot record (MBR), + master boot record (MBR), overwriting any existing boot loader.

        Tto keep your current boot loader in the MBR, use - the advanced settings to place GRUB in + the advanced settings to place GRUB in the first sector of the partition holding the Linux root file system.

        @@ -28,22 +28,22 @@ than Fedora Core expects. On a few systems, Fedora Core may not configure the disk drive geometry for large disks correctly because of a broken BIOS. To work around this problem, mark the - Force LBA32 checkbox. + Force LBA32 checkbox.

        The Linux kernel usually auto-detects its environment correctly, and no additional kernel parameters are needed. However, you may provide any needed kernel parameter using the advanced boot loader options. -

        [Note]Kernel Parameters

        +

        [Note]Kernel Parameters

        For a partial list of the kernel command line parameters, type - the following command in a terminal window: man - bootparam. For a comprehensive and authoritative + the following command in a terminal window: man + bootparam. For a comprehensive and authoritative list, refer to the documentation provided in the kernel sources.

        - To alter any of these settings, mark the Configure - advanced boot loader options checkbox. Select - Next and the menu shown in Figure 7.5, “Advanced Boot Options” appears. -

        [Note]Optional Menu

        + To alter any of these settings, mark the Configure + advanced boot loader options checkbox. Select + Next and the menu shown in Figure 7.5, “Advanced Boot Options” appears. +

        [Note]Optional Menu

        Fedora Core displays the following advanced boot options menu only if the advanced configuration checkbox described above has been selected. Index: sn-bootloader-others.php =================================================================== RCS file: /cvs/fedora/web/html/docs/fedora-install-guide-en/fc4/sn-bootloader-others.php,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sn-bootloader-others.php 12 Jun 2005 08:52:19 -0000 1.2 +++ sn-bootloader-others.php 29 Sep 2005 17:29:43 -0000 1.3 @@ -11,35 +11,35 @@ Booting Additional Operating Systems

        Prev Chapter 7. Boot Loader Next

        7.2.  Booting Additional Operating Systems -

        +

        If you have other operating systems already installed, Fedora Core attempts to automatically detect and configure - GRUB to boot them. You may manually + GRUB to boot them. You may manually configure any additional operating systems if - GRUB does not detect them. To + GRUB does not detect them. To add, remove, or change the detected operating system settings, use the options provided.

        - Add + Add

        - Press the Add button to include an + Press the Add button to include an additional operating system in GRUB. Fedora Core displays the dialog shown in Figure 7.3, “Adding Operating Systems to the Boot Menu”.

        Select the disk partition which contains the bootable operating system from the drop-down list and give the entry - a label. GRUB displays this + a label. GRUB displays this label in its boot menu.

        - Edit + Edit

        To change an entry in the GRUB boot menu, select the entry - and then select Edit. + and then select Edit.

        - Delete + Delete

        To remove an entry from the GRUB boot menu, select the entry - and then select Delete. + and then select Delete.

        Adding entries to the GRUB boot menu.

        Figure 7.3. Adding Operating Systems to the Boot Menu

        Prev Up Next
        Chapter 7. Boot Loader Home 7.3.  Setting a Boot Loader Password
        Index: sn-bootloader-password.php =================================================================== RCS file: /cvs/fedora/web/html/docs/fedora-install-guide-en/fc4/sn-bootloader-password.php,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sn-bootloader-password.php 12 Jun 2005 08:52:19 -0000 1.2 +++ sn-bootloader-password.php 29 Sep 2005 17:29:43 -0000 1.3 @@ -11,47 +11,47 @@ Setting a Boot Loader Password
        Prev Chapter 7. Boot Loader Next

        7.3.  Setting a Boot Loader Password -

        - GRUB reads many file systems without +

        + GRUB reads many file systems without the help of an operating system. An operator can interrupt the booting sequence to choose a different operating system to boot, change boot options, or recover from a system error. However, these functions may introduce serious security risks in some environments. You can add a password to - GRUB so that the operator must enter + GRUB so that the operator must enter the password to interrupt the normal boot sequence. -

        [Tip]GRUB Passwords Not Required

        - You may not require a GRUB password +

        [Tip]GRUB Passwords Not Required

        + You may not require a GRUB password if your system only has trusted operators, or is physically secured with controlled console access.

        However, if there is a chance someone can get physical access to the keyboard and monitor of your computer, that person can - reboot the system and access GRUB. + reboot the system and access GRUB. This is where a password is helpful.

        - To set a boot password, select the Use a boot loader - password checkbox. The Change - password button will become active. Select - Change password to display the dialog + To set a boot password, select the Use a boot loader + password checkbox. The Change + password button will become active. Select + Change password to display the dialog below. Type the desired password, and then confirm it by typing it again in the spaces provided. -

        Entering and confirming a boot password

        Figure 7.4. Entering A Boot Password

        [Tip]Choose a Good Password

        +

        Entering and confirming a boot password

        Figure 7.4. Entering A Boot Password

        [Tip]Choose a Good Password

        Choose a password that is easy for you to remember but hard for others to guess. -

        [Warning]Forgotten GRUB Passwords

        - GRUB stores the password in encrypted +

        [Warning]Forgotten GRUB Passwords

        + GRUB stores the password in encrypted form, so it cannot be read or recovered. If you forget the boot password, boot the system normally and then change the password entry in the - /boot/grub/grub.conf file. If you cannot + /boot/grub/grub.conf file. If you cannot boot, you may be able to use the "rescue" mode on the first Fedora Core installation disc to reset the GRUB password.

        - If you do need to change the GRUB - password, use the grub-md5-crypt utility. For - information on using this utility, use the command man - grub-md5-crypt in a terminal window to read the manual + If you do need to change the GRUB + password, use the grub-md5-crypt utility. For + information on using this utility, use the command man + grub-md5-crypt in a terminal window to read the manual pages.

        Prev Up Next
        7.2.  Booting Additional Operating Systems Index: sn-community-help.php =================================================================== RCS file: /cvs/fedora/web/html/docs/fedora-install-guide-en/fc4/sn-community-help.php,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sn-community-help.php 12 Jun 2005 08:52:19 -0000 1.2 +++ sn-community-help.php 29 Sep 2005 17:29:43 -0000 1.3 @@ -7,7 +7,7 @@ ?> -
        16.2. Community Support
        Prev Chapter 16. Your Next Steps Next

        16.2. Community Support

        +

        16.2. Community Support
        Prev Chapter 16. Your Next Steps Next

        16.2. Community Support

        Members of the Fedora community provides support through mailing lists, web forums and Linux User Groups (LUGs) across the world.

        Index: sn-community.php =================================================================== RCS file: /cvs/fedora/web/html/docs/fedora-install-guide-en/fc4/sn-community.php,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sn-community.php 12 Jun 2005 08:52:19 -0000 1.2 +++ sn-community.php 29 Sep 2005 17:29:43 -0000 1.3 @@ -7,7 +7,7 @@ ?> -

        16.3. Joining The Fedora Community
        Prev Chapter 16. Your Next Steps Next

        16.3. Joining The Fedora Community

        +

        16.3. Joining The Fedora Community
        Prev Chapter 16. Your Next Steps Next

        16.3. Joining The Fedora Community

        The Fedora Project is driven by the individuals that contribute to it. Community members provide support and documentation to other users, help to improve the software included in Fedora Core by testing, and develop new software Index: sn-computer-hostname.php =================================================================== RCS file: /cvs/fedora/web/html/docs/fedora-install-guide-en/fc4/sn-computer-hostname.php,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sn-computer-hostname.php 12 Jun 2005 08:52:19 -0000 1.2 +++ sn-computer-hostname.php 29 Sep 2005 17:29:43 -0000 1.3 @@ -7,17 +7,17 @@ ?> -

        8.2. Computer Hostname
        Prev Chapter 8. Network Configuration Next

        8.2. Computer Hostname

        +

        8.2. Computer Hostname
        Prev Chapter 8. Network Configuration Next

        8.2. Computer Hostname

        On some networks, the DHCP provider also provides the name of the - computer, or hostname. To specify the - hostname, select Manual and type the complete + computer, or hostname. To specify the + hostname, select Manual and type the complete name in the box. The complete hostname includes both the name of the machine and the name of the domain of which it is a member, - such as machine1.example.com. The + such as machine1.example.com. The machine name (or "short hostname") is - machine1, and the domain name is - example.com. -

        [Tip]Valid Hostnames

        + machine1, and the domain name is + example.com. +

        [Tip]Valid Hostnames

        You may give your system any name provided that the full hostname is unique. The hostname may include letters, numbers and hyphens. Index: sn-disk-druid.php =================================================================== RCS file: /cvs/fedora/web/html/docs/fedora-install-guide-en/fc4/sn-disk-druid.php,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sn-disk-druid.php 12 Jun 2005 08:52:19 -0000 1.2 +++ sn-disk-druid.php 29 Sep 2005 17:29:43 -0000 1.3 @@ -7,63 +7,63 @@ ?> -

        6.3. Disk Druid
        Prev Chapter 6. Disk Partitioning Next

        6.3. Disk Druid

        - Disk - Druid is an interactive program for +

        6.3. Disk Druid
        Prev Chapter 6. Disk Partitioning Next

        6.3. Disk Druid

        + Disk + Druid is an interactive program for editing disk partitions. Users run it only within the Fedora Core - installation system. Disk Druid supports RAID and - LVM to provide more extensible + installation system. Disk Druid supports RAID and + LVM to provide more extensible and reliable data storage.

        disk setup screen

        Figure 6.3.  Disk Setup Screen

        - Disk Druid displays the following + Disk Druid displays the following actions in the installation program: -

        New

        - Select this option to add a partition or LVM physical volume to the disk. In the - Add partition dialog, choose a mount +

        New

        + Select this option to add a partition or LVM physical volume to the disk. In the + Add partition dialog, choose a mount point and a partition type. If you have more than one disk on the system, choose which disks the partition may inhabit. Indicate a size in megabytes for the partition. -

        [Important]Illegal Partitions

        - The /bin/, - /dev/, /etc/, - /lib/, /proc/, - /root/, and - /sbin/ directories may not be used - for separate partitions in Disk - Druid. These directories reside on the - / (root) partition. +

        [Important]Illegal Partitions

        + The /bin/, + /dev/, /etc/, + /lib/, /proc/, + /root/, and + /sbin/ directories may not be used + for separate partitions in Disk + Druid. These directories reside on the + / (root) partition.

        - The /boot partition may not reside on + The /boot partition may not reside on an LVM volume group. Create the - /boot partition before configuring + /boot partition before configuring any volume groups.

        You may also choose from three options for sizing your partition: -

        Fixed size

        +

        Fixed size

        Use a fixed size as close to your entry as possible. -

        Fill all space up to

        +

        Fill all space up to

        Grow the partition to a maximum size of your choice. -

        Fill to maximum allowable - size

        +

        Fill to maximum allowable + size

        Grow the partition until it fills the remainder of the selected disks. -

        [Note]Partition Sizes

        +

        [Note]Partition Sizes

        The actual partition on the disk may be slightly smaller or larger than your choice. Disk geometry issues cause this effect, not an error or bug.

        After you enter the details for your partition, select - OK to continue. -

        Edit

        + OK to continue. +

        Edit

        Select this option to edit an existing partition, - LVM volume group, or an LVM physical volume that + LVM volume group, or an LVM physical volume that is not yet part of a volume group. To change the size of a LVM physical volume partition, first remove it from any volume groups. -

        [Warning]Removing LVM Physical Volumes

        +

        [Warning]Removing LVM Physical Volumes

        If you remove an LVM physical volume from a volume group, you will erase any logical volumes it contains.

        @@ -77,15 +77,15 @@

      4. provide a mount point for non-Linux partitions such as those used on some Windows operating systems -

        5. [Note]Windows Partitions

        +

        [Note]Windows Partitions

        You may not label Windows partitions that use the - - NTFS file system with a + + NTFS file system with a mount point in the Fedora Core installer. You may label - - vfat - (FAT16 or - FAT32) + + vfat + (FAT16 or + FAT32) partitions with a mount point.

        If you need to make drastic changes to @@ -99,50 +99,50 @@ and user data, it is easier to upgrade your system. The installation program allows you to erase or retain data on specific partitions. If your user data is on a separate - /home partition, you may + /home partition, you may retain that data while erasing system partitions such as - /boot. -

        Delete

        + /boot. +

        Delete

        Select this option to erase an existing partition - or LVM physical volume. To delete an LVM + or LVM physical volume. To delete an LVM physical volume, first delete any volume groups of which that physical volume is a member.

        - If you make a mistake, use the Reset + If you make a mistake, use the Reset option to abandon all the changes you have made. -

        Reset

        - Select this option to force Disk - Druid to abandon all changes made to disk +

        Reset

        + Select this option to force Disk + Druid to abandon all changes made to disk partitions. -

        RAID

        - Select this button to set up software RAID on your Fedora system. -

        Create a software RAID - partition

        +

        RAID

        + Select this button to set up software RAID on your Fedora system. +

        Create a software RAID + partition

        Choose this option to add a partition for software RAID. This option is the only choice available if your disk contains no software RAID partitions. -

        Create a RAID device

        +

        Create a RAID device

        Choose this option to construct a RAID device from two or more existing software RAID partitions. This option is available if two or more software RAID partitions have been configured. -

        Clone a drive to create a RAID - device

        +

        Clone a drive to create a RAID + device

        Choose this option to set up a RAID - mirror of an existing disk. + mirror of an existing disk. This option is available if two or more disks are attached to the system. -

        LVM

        - Select this button to set up LVM on your Fedora system. First create at least one +

        LVM

        + Select this button to set up LVM on your Fedora system. First create at least one partition or software RAID device as an LVM physical volume, - using the New dialog. + using the New dialog.

        To assign one or more physical volumes to a volume group, first name the volume group. Then select the physical volumes to be used in the volume group. Finally, configure logical volumes on any volume groups using the - Add, Edit and - Delete options. + Add, Edit and + Delete options.

        You may not remove a physical volume from a volume group if doing so would leave insufficient space for that group's @@ -158,7 +158,7 @@ 5 GB physical volumes.

        After you finish setting up and reviewing your partition - configuration, select Next to continue the + configuration, select Next to continue the installation process.

        Prev Up Next
        6.2. General Information on Partitions Home Chapter 7. Boot Loader
        Index: sn-extreme-packagegroups.php =================================================================== RCS file: /cvs/fedora/web/html/docs/fedora-install-guide-en/fc4/sn-extreme-packagegroups.php,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sn-extreme-packagegroups.php 12 Jun 2005 08:52:19 -0000 1.2 +++ sn-extreme-packagegroups.php 29 Sep 2005 17:29:43 -0000 1.3 @@ -7,32 +7,32 @@ ?> -
        12.4. Everything or - Minimal Installations
        Prev Chapter 12. Package Selection Next

        12.4. Everything or - Minimal Installations

        +

        12.4. Everything or + Minimal Installations
        Prev Chapter 12. Package Selection Next

        12.4. Everything or + Minimal Installations

        Two of the groups under the heading of - Miscellaneous are incompatible with the + Miscellaneous are incompatible with the others. If you select either of these groups, your other group selections become invalid.

        - If you select Everything, Fedora Core installs + If you select Everything, Fedora Core installs all of the packages provided. Although Fedora Core installs many additional network services in this package group, some are not enabled after installation. This option may be useful for some testing and development purposes. -

        [Caution]Storage Requirements

        - The Everything installation fills +

        [Caution]Storage Requirements

        + The Everything installation fills approximately 6.9Gb of free disk space, and temporarily requires an additional 175Mb of disk space during the installation process. Refer to the Release Notes for more information about storage requirements.

        - The Minimal package group provides only the + The Minimal package group provides only the essential packages to create a bootable system. This package group provides no graphical interface.

        After you choose the desired packages, select - Next to proceed. Fedora Core checks your + Next to proceed. Fedora Core checks your selection, and automatically adds any extra packages required to use the software you select.

        Prev Up Next
        12.3. Additional Language Support Home Chapter 13. About to Install
        Index: sn-firstboot-additional-cds.php =================================================================== RCS file: /cvs/fedora/web/html/docs/fedora-install-guide-en/fc4/sn-firstboot-additional-cds.php,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sn-firstboot-additional-cds.php 12 Jun 2005 08:52:19 -0000 1.2 +++ sn-firstboot-additional-cds.php 29 Sep 2005 17:29:43 -0000 1.3 @@ -7,22 +7,22 @@ ?> -
        15.6. Additional CDs
        Prev Chapter 15. First Boot Next

        15.6. Additional CDs

        +

        15.6. Additional CDs
        Prev Chapter 15. First Boot Next

        15.6. Additional CDs

        This screen allows you to load prepared discs for installing third-party software. However, you cannot use it to install additional packages from the Fedora Core discs. -

        [Tip]Adding Software

        +

        [Tip]Adding Software

        To add software packages from the Fedora Core discs, use the - Package Manager utility after you log - in. From the main menu, select Desktop->System Settings->Add/Remove Applications. + Package Manager utility after you log + in. From the main menu, select Desktop->System Settings->Add/Remove Applications.

        Additional CDs screen.

        Figure 15.9. Additional CDs Screen

        - Click Next to proceed to the final screen. + Click Next to proceed to the final screen.

        Finish setup screen.

        Figure 15.10. Finish Setup Screen

        - Click Next to proceed to the login screen. + Click Next to proceed to the login screen. Your Fedora Core system is now ready for use.

        Prev Up Next
        15.5. Sound Card Home Chapter 16. Your Next Steps
        Index: sn-firstboot-datetime.php =================================================================== RCS file: /cvs/fedora/web/html/docs/fedora-install-guide-en/fc4/sn-firstboot-datetime.php,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sn-firstboot-datetime.php 12 Jun 2005 08:52:19 -0000 1.2 +++ sn-firstboot-datetime.php 29 Sep 2005 17:29:43 -0000 1.3 @@ -7,10 +7,10 @@ ?> -
        15.2. Date and Time
        Prev Chapter 15. First Boot Next

        15.2. Date and Time

        +

        15.2. Date and Time
        Prev Chapter 15. First Boot Next

        15.2. Date and Time

        If your system does not have Internet access or a network time server, manually set the date and time for your system on this - screen. Otherwise, use NTP (Network Time Protocol) + screen. Otherwise, use NTP (Network Time Protocol) servers to maintain the accuracy of the clock. NTP provides time synchronization service to computers on the same network. The Internet contains many computers that offer public NTP services. @@ -20,40 +20,40 @@

        Date and time screen.

        Figure 15.3. Date and Time Screen

        - Select the Network Time Protocol tab to + Select the Network Time Protocol tab to configure your system to use NTP servers instead. -

        [Tip]Setting the Clock

        +

        [Tip]Setting the Clock

        To change these settings later, from the main menu, choose - Desktop->System Settings->Date & Time. + Desktop->System Settings->Date & Time.

        To configure your system to use network time servers, select the - Enable Network Time Protocol option. This - option disables the settings on the Date and - Time tab and enables the other settings on this + Enable Network Time Protocol option. This + option disables the settings on the Date and + Time tab and enables the other settings on this screen.

        Date and time screen.

        Figure 15.4. Date and Time Screen

        By default, Fedora Core is configured to use three separate groups, or - pools, of time servers. Time server pools + pools, of time servers. Time server pools create redundancy, so if one time server is unavailable, your system will synchronize with another server.

        To use an additional time server, either select it from the - Server drop-down box, or type the DNS name in - the box, and select Add. To remove a server + Server drop-down box, or type the DNS name in + the box, and select Add. To remove a server or server pool from the list, select the name and click - Delete. The drop-down box already has two + Delete. The drop-down box already has two listings as examples, which are servers provided by Red Hat.

        If the hardware clock in your computer is highly inaccurate, you may turn off your local time source entirely. To turn off the - local time source, select Show advanced - options and then deselect the Use Local - Time Source option. If you turn off your local time + local time source, select Show advanced + options and then deselect the Use Local + Time Source option. If you turn off your local time source, the NTP servers take priority over the internal clock.

        - If you enable the Enable NTP Broadcast + If you enable the Enable NTP Broadcast advanced option, Fedora Core will attempt to automatically locate time servers on the network.

        Prev Up Next
        Chapter 15. First Boot Home 15.3. Display
        Index: sn-firstboot-display.php =================================================================== RCS file: /cvs/fedora/web/html/docs/fedora-install-guide-en/fc4/sn-firstboot-display.php,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sn-firstboot-display.php 12 Jun 2005 08:52:19 -0000 1.2 +++ sn-firstboot-display.php 29 Sep 2005 17:29:43 -0000 1.3 @@ -7,35 +7,35 @@ ?> -
        15.3. Display
        Prev Chapter 15. First Boot Next

        15.3. Display

        - The Setup Agent automatically attempts +

        15.3. Display
        Prev Chapter 15. First Boot Next

        15.3. Display

        + The Setup Agent automatically attempts to identify the graphics card and monitor for your computer. It uses this information to calculate the correct - Resolution and Color - Depth settings. + Resolution and Color + Depth settings.

        Display screen.

        Figure 15.5. Display Screen

        If you need to change the monitor, select - Configure to display a list of manufacturers. + Configure to display a list of manufacturers. Select the manufacturer of your monitor on the list, and hit the - + key or select the triangle next to the name to + + key or select the triangle next to the name to view supported models. Choose the correct model from the list and - select OK. If none of the listed models + select OK. If none of the listed models match your monitor, select the closest match from either the - Generic CRT Display list or the - Generic LCD Display list. + Generic CRT Display list or the + Generic LCD Display list.

        Monitor dialog.

        Figure 15.6. Monitor Dialog

        To change a display setting, select - Resolution or Color - Depth, and select a new value from the drop-down - list. The Setup Agent only shows the + Resolution or Color + Depth, and select a new value from the drop-down + list. The Setup Agent only shows the settings that are valid for your hardware. -

        [Tip]Resetting the display

        +

        [Tip]Resetting the display

        To reconfigure your system after the installation has completed, - from the main menu, choose Desktop->System Settings->Display. + from the main menu, choose Desktop->System Settings->Display.

        Prev Up Next
        15.2. Date and Time Home 15.4. System User
        -
        15.5. Sound Card
        Prev Chapter 15. First Boot Next

        15.5. Sound Card

        - The Setup Agent automatically attempts +

        15.5. Sound Card
        Prev Chapter 15. First Boot Next

        15.5. Sound Card

        + The Setup Agent automatically attempts to identify the sound card in your computer.

        Sound card screen.

        Figure 15.8. Sound Card Screen

        - Click Play Test Sound to check the sound + Click Play Test Sound to check the sound card configuration. If the configuration is correct, Fedora Core plays a sound sequence. If your sound card is identified, but you do not hear the sound, check your speakers and try again. @@ -22,10 +22,10 @@ cards after the installation process is complete. Manual sound hardware configuration is beyond the scope of this document. -

        [Tip]Changing the Sound Card

        +

        [Tip]Changing the Sound Card

        Fedora Core will automatically attempt to detect a new sound card if you add one to your system. If you need to launch the detection - process manually, from the main menu, choose Desktop->System Settings->Soundcard Detection. + process manually, from the main menu, choose Desktop->System Settings->Soundcard Detection.

        Prev Up Next
        15.4. System User Home 15.6. Additional CDs
        -
        15.4. System User
        Prev Chapter 15. First Boot Next

        15.4. System User

        +

        15.4. System User
        Prev Chapter 15. First Boot Next

        15.4. System User

        Create a user account for yourself with this screen. Always use this account to log in to your Fedora Core system, rather than using the - root account. + root account.

        System user screen.

        Figure 15.7. System User Screen

        Enter a user name and your full name, and then enter your chosen - password. Type your password once more in the Confirm - Password box to ensure that it is correct. Refer to + password. Type your password once more in the Confirm + Password box to ensure that it is correct. Refer to Chapter 11, Set the Root Password for guidelines on selecting a secure password. -

        [Tip]Creating extra user accounts

        +

        [Tip]Creating extra user accounts

        To add additional user accounts to your system after the installation is complete, from the main menu, choose - Desktop->System Settings->Users & Groups. + Desktop->System Settings->Users & Groups.

        To configure Fedora Core to use network services for authentication or - user information, select Use Network - Login.... + user information, select Use Network + Login....

        After you configure login services, select - Next to proceed. + Next to proceed.

        Prev Up Next
        15.3. Display Home 15.5. Sound Card
        -
        3.2. Keyboard Configuration
        Prev Chapter 3. Identifying Your Locale Next

        3.2. Keyboard Configuration

        +

        3.2. Keyboard Configuration
        Prev Chapter 3. Identifying Your Locale Next

        3.2. Keyboard Configuration

        The installation program display a list of the keyboard layouts supported by Fedora:

        Keyboard configuration screen.

        Figure 3.2. Keyboard Configuration Screen

        Highlight the correct layout on the list, and select - Next. -

        Prev Up Next
        Chapter 3. Identifying Your Locale Home Chapter 4. Upgrading an Existing System
        + Next. +

        Prev Up Next
        Chapter 3. Identifying Your Locale Home Chapter 4. Upgrading an Existing System
        -
        2.2. Installation from a Hard Drive
        Prev Chapter 2. Other Installation Methods Next

        2.2. Installation from a Hard Drive

        +

        2.2. Installation from a Hard Drive
        Prev Chapter 2. Other Installation Methods Next

        2.2. Installation from a Hard Drive

        You may install from a hard drive that contains the ISO image files for the Fedora discs. The hard drive may be internal to the computer or attached by USB. The partition on the hard drive - holding the ISO files must be formatted with the ext2, ext3 or vfat file system. In Fedora, - vfat includes a range + holding the ISO files must be formatted with the ext2, ext3 or vfat file system. In Fedora, + vfat includes a range of file systems, such as FAT-16 and FAT-32, found on most - removable media. External hard drives usually contain vfat (FAT-32) file systems. - Some Microsoft Windows systems also use vfat file systems on internal + removable media. External hard drives usually contain vfat (FAT-32) file systems. + Some Microsoft Windows systems also use vfat file systems on internal hard disk partitions. -

        [Note]FAT-16, FAT-32, and vfat

        +

        [Note]FAT-16, FAT-32, and vfat

        Before you begin installation from a hard drive, check the partition type to ensure that Fedora can read it. To check a - partition's file system under Windows, use the Disk - Management tool. To check a partition's file - system under Linux, use the fdisk utility. + partition's file system under Windows, use the Disk + Management tool. To check a partition's file + system under Linux, use the fdisk utility.

        You cannot use ISO files on partitions controlled by LVM (Logical Volume Management). Refer to Section 6.2, “General Information on Partitions” for more information about @@ -34,17 +34,17 @@ ">

        Figure 2.5. Select Partition Screen

        Select the partition containing the ISO files from the list of available partitions. Internal IDE drive device names begin with - /dev/hd. SCSI or USB drive device names - begin with /dev/sd. Each individual drive - has its own letter, for example /dev/hda. + /dev/hd. SCSI or USB drive device names + begin with /dev/sd. Each individual drive + has its own letter, for example /dev/hda. Each partition on a drive is numbered, for example - /dev/sda1. + /dev/sda1.

        - Also specify the Directory holding images. + Also specify the Directory holding images. Enter the full directory path from the drive that contains the ISO image files.

        - Select OK to continue. + Select OK to continue.

        Prev Up Next
        Chapter 2. Other Installation Methods Home Chapter 3. Identifying Your Locale
        -
        12.3. Additional Language Support
        Prev Chapter 12. Package Selection Next

        12.3. Additional Language Support

        +

        12.3. Additional Language Support
        Prev Chapter 12. Package Selection Next

        12.3. Additional Language Support

        Your Fedora Core system automatically supports the language that you selected at the start of the installation process. To include support for additional languages, select the packages for those - languages from the Language Support package + languages from the Language Support package group. -

        [Warning]Language Selection

        +

        [Warning]Language Selection

        Select every language that you need for your system. Adding support for a language after installation is difficult, and not recommended. -

        Prev Up Next
        12.2. Package Group Selection Home 12.4. Everything or - Minimal Installations
        +

        Prev Up Next
        12.2. Package Group Selection Home 12.4. Everything or + Minimal Installations
        -
        8.3. Miscellaneous Settings
        Prev Chapter 8. Network Configuration Next

        8.3. Miscellaneous Settings

        +

        8.3. Miscellaneous Settings
        Prev Chapter 8. Network Configuration Next

        8.3. Miscellaneous Settings

        To manually configure a network interface, you may also provide other network settings for your computer. All of these settings are the IP addresses of other systems on the network.

        - A gateway is the device that provides access to other networks. - Gateways are also referred to as routers. If your system + A gateway is the device that provides access to other networks. + Gateways are also referred to as routers. If your system connects to other networks through a gateway, enter its IP address - in the Gateway box. + in the Gateway box.

        - Most software relies on the DNS (Domain Name Service) + Most software relies on the DNS (Domain Name Service) provider to locate machines and services on the network. DNS converts hostnames to IP addresses and vice versa. A Fedora Core system may use more than one DNS server. If the primary DNS server does not respond, the computer sends any query to the secondary DNS server, and so on. To assign DNS servers, type their IP addresses - into the Primary, - Secondary, or Tertiary DNS - Server boxes. + into the Primary, + Secondary, or Tertiary DNS + Server boxes.

        - Click Next once you are satisfied with the + Click Next once you are satisfied with the network settings for your system.

        Prev Up Next
        8.2. Computer Hostname Home Chapter 9. Security Configuration
        Index: sn-packagegroups.php =================================================================== RCS file: /cvs/fedora/web/html/docs/fedora-install-guide-en/fc4/sn-packagegroups.php,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sn-packagegroups.php 12 Jun 2005 08:52:19 -0000 1.2 +++ sn-packagegroups.php 29 Sep 2005 17:29:43 -0000 1.3 @@ -7,8 +7,8 @@ ?> -
        12.2. Package Group Selection
        Prev Chapter 12. Package Selection Next

        12.2. Package Group Selection

        - Fedora Core divides included software into package groups that make +

        12.2. Package Group Selection
        Prev Chapter 12. Package Selection Next

        12.2. Package Group Selection

        + Fedora Core divides included software into package groups that make software selection easier.

        Package group selection screen. @@ -19,11 +19,11 @@ installed unless the checkbox next to the group is selected. </p><p> To change which packages within a selected group will be - installed, select the <span><b class=Details link next to + installed, select the Details link next to the name of the group. Fedora Core automatically installs - Base Packages of a group if the group is - selected. Change the selection of Optional - Packages by using the checkbox next to the name of + Base Packages of a group if the group is + selected. Change the selection of Optional + Packages by using the checkbox next to the name of the individual package.

        Fedora Core lists with each group the number of packages currently Index: sn-partitioning-general.php =================================================================== RCS file: /cvs/fedora/web/html/docs/fedora-install-guide-en/fc4/sn-partitioning-general.php,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sn-partitioning-general.php 12 Jun 2005 08:52:19 -0000 1.2 +++ sn-partitioning-general.php 29 Sep 2005 17:29:43 -0000 1.3 @@ -7,12 +7,12 @@ ?> -

        6.2. General Information on Partitions
        Prev Chapter 6. Disk Partitioning Next

        6.2. General Information on Partitions

        +

        6.2. General Information on Partitions
        Prev Chapter 6. Disk Partitioning Next

        6.2. General Information on Partitions

        A Fedora Core system has at least three partitions:

        • - A data partition mounted at /boot + A data partition mounted at /boot

        • - A data partition mounted at / + A data partition mounted at /

        • A swap partition

        @@ -21,71 +21,71 @@ are not sure what to choose, use the Automatic Partitioning method shown in Section 6.1, “Choosing a Partitioning Method”.

        - Data partitions have a mount point. The mount point + Data partitions have a mount point. The mount point indicates the directory whose contents reside on that partition. A partition with no mount point is not accessible by users. Data not located on any other partition resides in the - / (or root) partition. -

        [Important]Root and /root

        - The / (or - + / (or root) partition. +

        [Important]Root and /root

        + The / (or + root) partition is the top of the directory structure. The - - /root (sometimes pronounced + + /root (sometimes pronounced "slash-root") directory is the home directory of the user account for system administration.

        In the minimum configuration shown above:

        • - All data under the /boot/ directory - resides on the /boot partition. For - example, the file /boot/grub/grub.conf - resides on the /boot partition. + All data under the /boot/ directory + resides on the /boot partition. For + example, the file /boot/grub/grub.conf + resides on the /boot partition.

        • - Any file outside of the /boot partition, - such as /etc/passwd, resides on the - / partition. + Any file outside of the /boot partition, + such as /etc/passwd, resides on the + / partition.

        Subdirectories may be assigned to partitions as well. Some - administrators create both /usr and - /usr/local partitions. In that case, files - under /usr/local/, such as - /usr/local/bin/foo, will be on the - /usr/local partition. Any other files in - /usr/, such as - /usr/bin/foo, will be in the - /usr partition. + administrators create both /usr and + /usr/local partitions. In that case, files + under /usr/local/, such as + /usr/local/bin/foo, will be on the + /usr/local partition. Any other files in + /usr/, such as + /usr/bin/foo, will be in the + /usr partition.

        If you create many partitions instead of one large - / partition, upgrades become easier. Refer - to the description of Disk Druid's + / partition, upgrades become easier. Refer + to the description of Disk Druid's Edit option for more information. -

        6.2.1. Partition Types

        - Every partition has a partition type, to indicate the format of the file system on that +

        6.2.1. Partition Types

        + Every partition has a partition type, to indicate the format of the file system on that partition. The file system enables Linux to organize, search, and retrieve files stored on that partition. Use the - ext3 file + ext3 file system for data partitions, unless you have specific needs that require another type of file system. -

        6.2.2. Understanding LVM

        +

        6.2.2. Understanding LVM

        LVM (Logical Volume Management) partitions provide a number of advantages over standard partitions. LVM partitions are - formatted as - physical volumes. One or more physical - volumes are combined to form a volume group. Each volume + formatted as + physical volumes. One or more physical + volumes are combined to form a volume group. Each volume group's total storage is then divided into one or more - - logical volumes. The logical volumes + + logical volumes. The logical volumes function much like standard data partitions. They have a file - system type, such as ext3, and a mount point. + system type, such as ext3, and a mount point.

        An administrator may grow or shrink logical volumes without destroying data, unlike standard disk partitions. If the physical volumes in a volume group are on separate drives then administrators may also spread a logical volume across multiple disks and RAID arrays. -

        [Note]Automatic Partitioning and LVM

        +

        [Note]Automatic Partitioning and LVM

        The Automatic Partitioning option creates partitions as LVM volumes.

        Prev Up Next
        Chapter 6. Disk Partitioning Home 6.3. Disk Druid
        Index: sn-selinux.php =================================================================== RCS file: /cvs/fedora/web/html/docs/fedora-install-guide-en/fc4/sn-selinux.php,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sn-selinux.php 12 Jun 2005 08:52:19 -0000 1.2 +++ sn-selinux.php 29 Sep 2005 17:29:43 -0000 1.3 @@ -7,8 +7,8 @@ ?> -
        9.2. SELinux
        Prev Chapter 9. Security Configuration Next

        9.2. SELinux

        - The SELinux (Security Enhanced +

        9.2. SELinux
        Prev Chapter 9. Security Configuration Next

        9.2. SELinux

        + The SELinux (Security Enhanced Linux) framework is part of Fedora Core. SELinux limits the actions of both users and programs by enforcing security policies throughout the operating system. Without SELinux, software bugs or configuration @@ -23,27 +23,27 @@ functions. The targeted policies reduce or eliminate any inconvenience SELinux might cause users. Set the SELinux mode to one of the following: -

        Active

        +

        Active

        Select this mode to use the targeted SELinux policy on your Fedora system. This is the default mode for Fedora installations. -

        Warn

        +

        Warn

        Because SELinux is a new technology, this diagnostic mode is provided. In this mode, the system is configured with SELinux, but a breach of security policies only causes an error message to appear. No activities are actually prohibited when SELinux is installed in this mode. You may - change the SELinux mode to Active at any + change the SELinux mode to Active at any time after booting. -

        Disabled

        +

        Disabled

        If you choose this mode for SELinux, Fedora does not configure the access control system at all. To make SELinux active later, from the main menu, select - Desktop->System Settings->Security Level and Firewall. -

        [Tip]Changing the SELinux policy

        + Desktop->System Settings->Security Level and Firewall. +

        [Tip]Changing the SELinux policy

        SELinux is unique in that it cannot be bypassed, even by the system administrators. To change the behavior of SELinux after - installation, from the main menu, choose Desktop->System Settings->Security Level and Firewall. + installation, from the main menu, choose Desktop->System Settings->Security Level and Firewall.

        Prev Up Next
        Chapter 9. Security Configuration Home Chapter 10. Time Zone Selection
        -
        1.2. Using Other Removable Media
        Prev Chapter 1. Beginning the Installation Next

        1.2. Using Other Removable Media

        +

        1.2. Using Other Removable Media
        Prev Chapter 1. Beginning the Installation Next

        1.2. Using Other Removable Media

        To use a USB device such as a pen drive or Compact Flash card as boot media, write the supplied image file to the device. The media must be large enough to contain the image. -

        1.2.1. Preparing the Boot Media

        [Warning]Data Loss

        +

        1.2.1. Preparing the Boot Media

        [Warning]Data Loss

        This procedure destroys data on the media. Back up any important information before you begin. Some models of USB media use additional partitions @@ -19,14 +19,14 @@ procedure may make it difficult or impossible to access these special areas on your boot media.

        - The images/diskboot.img file on the first + The images/diskboot.img file on the first Fedora Core installation disc is a boot image designed for USB media. This file also appears on FTP and Web sites providing Fedora Core.

        Several software utilities are available for Windows and Linux that can write image files to a device. Linux includes the - dd command for this purpose. To write an - image file to boot media with dd on a current + dd command for this purpose. To write an + image file to boot media with dd on a current version of Fedora Core:

        1. Locate the image file. @@ -41,20 +41,20 @@ In the terminal window, type the following command: 

          -dd if=diskboot.img of=/dev/sda1
+dd if=diskboot.img of=/dev/sda1

          -

        1.2.2. Booting from the Media

        +

        1.2.2. Booting from the Media

        Boot your computer with the prepared media:

        1. Attach or insert the media.

        2. Switch on the computer.

        3. - A boot screen appears, with a boot: prompt + A boot screen appears, with a boot: prompt at the bottom. To begin, simply press the - Enter key. -

        [Note]BIOS Boot Order

        + Enter key. +

        [Note]BIOS Boot Order

        The BIOS contains settings that control the order of boot devices. If your PC boots from a device other than the Fedora Core boot media, check the BIOS boot configuration. Index: sn-utc.php =================================================================== RCS file: /cvs/fedora/web/html/docs/fedora-install-guide-en/fc4/sn-utc.php,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sn-utc.php 12 Jun 2005 16:49:32 -0000 1.3 +++ sn-utc.php 29 Sep 2005 17:29:43 -0000 1.4 @@ -1,29 +1,20 @@ -initCommon(); -$template->displayHeader(); - -?> - -

        10.2. Universal Co-ordinated Time (UTC)
        Prev Chapter 10. Time Zone Selection Next

        10.2. Universal Co-ordinated Time (UTC)

        - Universal Co-ordinated Time is also known as - Greenwich Mean Time (GMT). +10.2. Universal Co-ordinated Time (UTC)

        10.2. Universal Co-ordinated Time (UTC)
        Prev Chapter 10. Time Zone Selection Next

        10.2. Universal Co-ordinated Time (UTC)

        + Universal Co-ordinated Time is also known as + Greenwich Mean Time (GMT).

        If Fedora Core is the only operating system on your computer, select - System clock uses UTC. The system clock is a + System clock uses UTC. The system clock is a piece of hardware on your computer system. Fedora Core uses the timezone setting to determine the offset between the local time and UTC on the system clock. This behavior is standard for UNIX-like operating systems. -

        [Caution]Windows and the System Clock

        - Do not enable the System clock uses UTC +

        [Caution]Windows and the System Clock

        + Do not enable the System clock uses UTC option if your machine also runs Microsoft Windows. Microsoft operating systems change the BIOS clock to match local time rather than UTC. This may cause unexpected behavior under Fedora Core.

        - Select Next to proceed. + Select Next to proceed.

        Prev Up Next
        Chapter 10. Time Zone Selection Home Chapter 11. Set the Root Password
        Author: jpo Update of /cvs/extras/rpms/tetex-xcolor/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16946 Modified Files: .cvsignore sources tetex-xcolor.spec Log Message: Update to 2.04. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/tetex-xcolor/FC-3/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 8 Jun 2005 18:12:05 -0000 1.4 +++ .cvsignore 29 Sep 2005 17:41:52 -0000 1.5 @@ -1 +1 @@ -xcolor-2.03.zip +xcolor-2.04.zip Index: sources =================================================================== RCS file: /cvs/extras/rpms/tetex-xcolor/FC-3/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 8 Jun 2005 18:12:05 -0000 1.4 +++ sources 29 Sep 2005 17:41:52 -0000 1.5 @@ -1 +1 @@ -14dfb0f476ca9655d419ea2d91997117 xcolor-2.03.zip +12ab88d97912f9cc7e22a676af9b882e xcolor-2.04.zip Index: tetex-xcolor.spec =================================================================== RCS file: /cvs/extras/rpms/tetex-xcolor/FC-3/tetex-xcolor.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- tetex-xcolor.spec 8 Jun 2005 18:12:05 -0000 1.3 +++ tetex-xcolor.spec 29 Sep 2005 17:41:52 -0000 1.4 @@ -5,16 +5,16 @@ %define texpkgdoc %{_texmf}/doc/latex/%{texpkg} Name: tetex-%{texpkg} -Version: 2.03 +Version: 2.04 Release: 1%{?dist} Summary: Driver-independent color extensions for LaTeX and pdfLaTeX Group: Applications/Publishing License: LaTeX Project Public License URL: http://www.ctan.org/tex-archive/help/Catalogue/entries/xcolor.html -# DANTE generates CTAN packages tarballs on-the-fly +# DANTE generates CTAN packages zipfiles on-the-fly # ftp://ftp.dante.de/tex-archive/macros/latex/contrib/xcolor.zip -Source0: xcolor-2.03.zip +Source0: xcolor-2.04.zip BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -35,6 +35,7 @@ %prep %setup -q -n %{texpkg} +sed -i -e 's/\r$//' README ChangeLog %build latex xcolor.ins @@ -45,7 +46,7 @@ %install rm -rf $RPM_BUILD_ROOT - + install -d -m 755 $RPM_BUILD_ROOT{%{texpkgdir},%{texpkgdoc}} install -d -m 755 $RPM_BUILD_ROOT%{_texmf}/dvips/%{texpkg} install -p -m 644 *.sty *.def $RPM_BUILD_ROOT%{texpkgdir}/ @@ -72,6 +73,9 @@ %changelog +* Thu Sep 29 2005 Jose Pedro Oliveira - 2.04-1 +- Update to 2.04. + * Wed Jun 8 2005 Jose Pedro Oliveira - 2.03-1 - Update to 2.03. - Dist tag. From fedora-extras-commits at redhat.com Thu Sep 29 17:59:35 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 29 Sep 2005 13:59:35 -0400 Subject: rpms/sbcl/FC-3 .cvsignore, 1.3, 1.4 sbcl-0.9.4-LIB_DIR.patch, 1.2, 1.3 sbcl.spec, 1.16, 1.17 sources, 1.3, 1.4 Message-ID: <200509291759.j8THxZRG017121@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/sbcl/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17093 Modified Files: .cvsignore sbcl-0.9.4-LIB_DIR.patch sbcl.spec sources Log Message: * Thu Sep 29 2005 Rex Dieter 0.9.5-15 - enable sb-thread - set EXTRA_CFLAGS to so optflags are used for building contrib/ too - hope that a rebuild will include missing sb-posix (bz #169506) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/sbcl/FC-3/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 28 Sep 2005 01:23:44 -0000 1.3 +++ .cvsignore 29 Sep 2005 17:59:33 -0000 1.4 @@ -1,4 +1,4 @@ sbcl-0.9.5-source.tar.bz2 sbcl-0.8.15-powerpc-linux-binary.tar.bz2 sbcl-0.9.4-x86-64-linux-binary.tar.bz2 -sbcl-0.9.4-x86-linux-binary.tar.bz2 +sbcl-0.9.5-x86-linux-binary.tar.bz2 sbcl-0.9.4-LIB_DIR.patch: Index: sbcl-0.9.4-LIB_DIR.patch =================================================================== RCS file: /cvs/extras/rpms/sbcl/FC-3/sbcl-0.9.4-LIB_DIR.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sbcl-0.9.4-LIB_DIR.patch 13 Sep 2005 16:50:44 -0000 1.2 +++ sbcl-0.9.4-LIB_DIR.patch 29 Sep 2005 17:59:33 -0000 1.3 @@ -31,7 +31,7 @@ echo "SBCL has been installed:" echo " binary $BUILD_ROOT$INSTALL_ROOT/bin/sbcl" -echo " core and contribs in $BUILD_ROOT$INSTALL_ROOT/lib/sbcl/" -+echo " core and contribs in $BUILD_ROOT$LIB_DIR" ++echo " core and contribs in $BUILD_ROOT$LIB_DIR/sbcl" # Installing manual & misc bits of documentation # Index: sbcl.spec =================================================================== RCS file: /cvs/extras/rpms/sbcl/FC-3/sbcl.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- sbcl.spec 28 Sep 2005 01:23:44 -0000 1.16 +++ sbcl.spec 29 Sep 2005 17:59:33 -0000 1.17 @@ -3,7 +3,7 @@ Name: sbcl Summary: Steel Bank Common Lisp Version: 0.9.5 -Release: 8%{?dist} +Release: 15%{?dist} License: BSD/MIT Group: Development/Languages @@ -12,8 +12,12 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) ExclusiveArch: %{ix86} x86_64 +# Pre-generated html docs (not used) +#Source1: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-%{version}-html.tar.bz2 +Source2: customize-target-features.lisp + ## x86 section -#Source10: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.4-x86-linux-binary.tar.bz2 +#Source10: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.5-x86-linux-binary.tar.bz2 %ifarch %{ix86} %define sbcl_arch x86 BuildRequires: sbcl @@ -31,7 +35,7 @@ ## ppc section # Latest powerpc-linux bootstrap, busted: # buildsys.fedoraproject.org/logs/development/1131-sbcl-0.9.4-14.fc5/ppc/build.log -#Source30: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.8.15-powerpc-linux-binary.tar.bz2 +Source30: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.8.15-powerpc-linux-binary.tar.bz2 # another possible ppc bootstrap to try #Source31: http://clozure.com/openmcl/ftp/openmcl-linuxppc-all-0.14.3.tar.gz %ifarch ppc @@ -47,12 +51,16 @@ Patch2: sbcl-0.9.5-personality.patch Patch3: sbcl-0.9.5-optflags.patch Patch4: sbcl-0.9.4-LIB_DIR.patch +Patch5: sbcl-0.9.5-make-config-fix.patch +Patch6: sbcl-0.9.5-verbose-build.patch +Patch7: sbcl-0.9.5-stdlib_h.patch Requires(post): /sbin/install-info Requires(preun): /sbin/install-info # doc generation BuildRequires: ghostscript BuildRequires: texinfo +BuildRequires: time %description Steel Bank Common Lisp (SBCL) is a Open Source development environment @@ -63,24 +71,28 @@ %prep %setup -q %{?sbcl_bootstrap_src} +# Handle pre-generated docs +if [ -d %{name}-%{version}/doc/manual ]; then + mv %{name}-%{version}/doc/manual/* doc/manual/ +fi + #sed -i -e "s|/usr/local/lib/sbcl/|%{_libdir}/sbcl/|" src/runtime/runtime.c #or patch to use SBCL_HOME env var %patch1 -p0 -b .default-sbcl-home %patch2 -p1 -b .personality %patch3 -p1 -b .optflags %patch4 -p1 -b .LIB_DIR +%patch5 -p1 -b .make-config-fix +%patch6 -p1 -b .verbose-build +%patch7 -p1 -b .stdlib_h -# http://article.gmane.org/gmane.lisp.steel-bank.general/340 -# enable threads (was only for >= 2.6, but code has checks to disable for <= 2.4) -## FIXME(?): per section 2.2 of INSTALL, should create/use customize-target-features.lisp -## to customize features -- Rex -#define kernel_ver %(uname -r | cut -d- -f1 | cut -d. -f-2 ) -#if "%{?kernel_ver}" >= "2.6" +# Enable sb-thread %ifarch %{ix86} x86_64 #sed -i -e "s|; :sb-thread|:sb-thread|" base-target-features.lisp-expr +cp %{SOURCE2} ./customize-target-features.lisp %endif -#endif +# "install" local bootstrap %if "%{?sbcl_bootstrap_src}" != "%{nil}" mkdir sbcl-bootstrap pushd sbcl-*-linux @@ -89,26 +101,28 @@ popd %endif -# CVS crud -find . -name CVS -type d | xargs rm -rf -find . -name '.cvsignore' | xargs rm -f # fix permissions (some have eXecute bit set) find . -name '*.c' | xargs chmod 644 %build -export DEFAULT_SBCL_HOME=%{_libdir}/sbcl +# setup local bootstrap %if "%{?sbcl_bootstrap_src}" != "%{nil}" export SBCL_HOME=`pwd`/sbcl-bootstrap/lib/sbcl export PATH=`pwd`/sbcl-bootstrap/bin:${PATH} +%endif +# my_setarch, to set personality, (about) the same as setarch -R, +# but usable on fc3 too %{__cc} -o my_setarch %{optflags} %{SOURCE100} %define my_setarch ./my_setarch -%endif +# trick contrib/ modules to use optflags too +export EXTRA_CFLAGS="$RPM_OPT_FLAGS" +export DEFAULT_SBCL_HOME=%{_libdir}/sbcl %{?sbcl_arch:export SBCL_ARCH=%{sbcl_arch}} -%{?setarch} %{?my_setarch} ./make.sh %{?bootstrap} +%{?setarch} %{?my_setarch} sh -x ./make.sh %{?bootstrap} # docs make -C doc/manual html info @@ -116,7 +130,12 @@ %check || : pushd tests +# Only x86 builds are expected to pass all +%ifarch %{ix86} x86_64 %{?setarch} sh ./run-tests.sh +%else +%{?setarch} sh ./run-tests.sh ||: +%endif popd @@ -124,16 +143,20 @@ rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT{%{_bindir},%{_libdir},%{_mandir}} -unset SBCL_HOME ||: -export INSTALL_ROOT=$RPM_BUILD_ROOT%{_prefix} -export LIB_DIR=$RPM_BUILD_ROOT%{_libdir} -sh ./install.sh + +unset SBCL_HOME +export INSTALL_ROOT=$RPM_BUILD_ROOT%{_prefix} +export LIB_DIR=$RPM_BUILD_ROOT%{_libdir} +sh -x ./install.sh ## Unpackaged files rm -rf $RPM_BUILD_ROOT%{_docdir}/sbcl rm -f $RPM_BUILD_ROOT%{_infodir}/dir -# from make check -find $RPM_BUILD_ROOT -name 'test-passed' | xargs rm -f +# CVS crud +find $RPM_BUILD_ROOT -name CVS -type d | xargs rm -rf +find $RPM_BUILD_ROOT -name .cvsignore | xargs rm -f +# 'test-passed' files from make check (leave these in, for now -- Rex) +# find $RPM_BUILD_ROOT -name 'test-passed' | xargs rm -f %post @@ -165,6 +188,14 @@ %changelog +* Thu Sep 29 2005 Rex Dieter 0.9.5-15 +- enable sb-thread +- set EXTRA_CFLAGS to so optflags are used for building contrib/ too +- hope that a rebuild will include missing sb-posix (bz #169506) + +* Wed Sep 28 2005 Rex Dieter 0.9.5-14 +- more ppc work + * Tue Sep 27 2005 Rex Dieter 0.9.5-8 - respin (fc3/fc4) Index: sources =================================================================== RCS file: /cvs/extras/rpms/sbcl/FC-3/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 28 Sep 2005 01:23:44 -0000 1.3 +++ sources 29 Sep 2005 17:59:33 -0000 1.4 @@ -1,4 +1,4 @@ f594f18813c08f262a6df9a36288adcb sbcl-0.9.5-source.tar.bz2 3a72d0785ce0a8e02f9af632c2a4f217 sbcl-0.8.15-powerpc-linux-binary.tar.bz2 67ec41e624a3f2ad7f6f3cde1bd001d3 sbcl-0.9.4-x86-64-linux-binary.tar.bz2 -947d1cde2c1c80416b5f9fb4e4c81383 sbcl-0.9.4-x86-linux-binary.tar.bz2 +cb01b462b517889723eeaf63b5474c70 sbcl-0.9.5-x86-linux-binary.tar.bz2 From fedora-extras-commits at redhat.com Thu Sep 29 18:00:00 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 29 Sep 2005 14:00:00 -0400 Subject: rpms/sbcl/FC-3 sbcl-0.9.5-make-config-fix.patch, NONE, 1.1 sbcl-0.9.5-stdlib_h.patch, NONE, 1.1 sbcl-0.9.5-verbose-build.patch, NONE, 1.1 Message-ID: <200509291800.j8TI003M017158@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/sbcl/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17132 Added Files: sbcl-0.9.5-make-config-fix.patch sbcl-0.9.5-stdlib_h.patch sbcl-0.9.5-verbose-build.patch Log Message: import new patches sbcl-0.9.5-make-config-fix.patch: --- NEW FILE sbcl-0.9.5-make-config-fix.patch --- --- sbcl-0.9.5/make-config.sh.make-config-fix 2005-09-21 10:00:33.000000000 -0500 +++ sbcl-0.9.5/make-config.sh 2005-09-28 11:42:29.135788304 -0500 @@ -208,7 +208,7 @@ # cross-compilers! # # FIXME: integrate to grovel-features, mayhaps - $GNUMAKE -C tools-for-build determine-endianness -I src/runtime + $GNUMAKE -C tools-for-build determine-endianness -I ../src/runtime tools-for-build/determine-endianness >> $ltf elif [ "$sbcl_arch" = "ppc" -a "$sbcl_os" = "linux" ]; then # Use a C program to detect which kind of glibc we're building on, @@ -217,8 +217,8 @@ # # FIXME: integrate to grovel-features., maypahps printf ' :stack-allocatable-closures' >> $ltf - $GNUMAKE -C tools-for-build where-is-mcontext -I src/runtime - tools-for-build/where-is-mcontext > src/runtime/ppc-linux-mcontext.h + $GNUMAKE -C tools-for-build where-is-mcontext -I ../src/runtime + tools-for-build/where-is-mcontext > src/runtime/ppc-linux-mcontext.h || echo "error running where-is-mcontext" elif [ "$sbcl_arch" = "ppc" -a "$sbcl_os" = "darwin" ]; then printf ' :stack-allocatable-closures' >> $ltf # We provide a dlopen shim, so a little lie won't hurt sbcl-0.9.5-stdlib_h.patch: --- NEW FILE sbcl-0.9.5-stdlib_h.patch --- --- sbcl-0.9.5/tools-for-build/where-is-mcontext.c.stdlib_h 2005-07-14 15:24:19.000000000 -0500 +++ sbcl-0.9.5/tools-for-build/where-is-mcontext.c 2005-09-28 10:36:32.090350648 -0500 @@ -20,6 +20,7 @@ #include #include +#include #include int main (int argc, char *argv[]) { sbcl-0.9.5-verbose-build.patch: --- NEW FILE sbcl-0.9.5-verbose-build.patch --- --- sbcl-0.9.5/make.sh.verbose-build 2005-09-21 10:00:33.000000000 -0500 +++ sbcl-0.9.5/make.sh 2005-09-28 11:42:06.353251776 -0500 @@ -70,7 +70,7 @@ # If you're cross-compiling, you should probably just walk through the # make-config.sh script by hand doing the right thing on both the host # and target machines. -sh make-config.sh +sh -x make-config.sh ||: # Enforce the source policy for no bogus whitespace tools-for-build/canonicalize-whitespace @@ -102,11 +102,11 @@ # Or, if you can set up the files somewhere shared (with NFS, AFS, or # whatever) between the host machine and the target machine, the basic # procedure above should still work, but you can skip the "copy" steps. -time sh make-host-1.sh -time sh make-target-1.sh -time sh make-host-2.sh -time sh make-target-2.sh -time sh make-target-contrib.sh +time sh -x make-host-1.sh +time sh -x make-target-1.sh +time sh -x make-host-2.sh +time sh -x make-target-2.sh +time sh -x make-target-contrib.sh NCONTRIBS=`find contrib -name Makefile -print | wc -l` NPASSED=`find contrib -name test-passed -print | wc -l` From fedora-extras-commits at redhat.com Thu Sep 29 18:03:23 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 29 Sep 2005 14:03:23 -0400 Subject: rpms/sbcl/FC-3 customize-target-features.lisp,NONE,1.1 Message-ID: <200509291803.j8TI3NMH018608@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/sbcl/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18596 Added Files: customize-target-features.lisp Log Message: import --- NEW FILE customize-target-features.lisp --- (lambda (features) (flet ((enable (x) (pushnew x features)) (disable (x) (setf features (remove x features)))) ;; Threading support, available on x86/x86-64 Linux only. (enable :sb-thread))) From fedora-extras-commits at redhat.com Thu Sep 29 18:15:32 2005 From: fedora-extras-commits at redhat.com (Ed Hill (edhill)) Date: Thu, 29 Sep 2005 14:15:32 -0400 Subject: rpms/netcdf/FC-4 netcdf.spec,1.9,1.10 Message-ID: <200509291815.j8TIFWmC019082@cvs-int.fedora.redhat.com> Author: edhill Update of /cvs/extras/rpms/netcdf/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19027/rpms/netcdf/FC-4 Modified Files: netcdf.spec Log Message: add FFLAGS="-fPIC" so that the F90 parts of the static library can be used to create dynamic libs Index: netcdf.spec =================================================================== RCS file: /cvs/extras/rpms/netcdf/FC-4/netcdf.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- netcdf.spec 13 Jun 2005 18:41:13 -0000 1.9 +++ netcdf.spec 29 Sep 2005 18:15:30 -0000 1.10 @@ -1,6 +1,6 @@ Name: netcdf Version: 3.6.0 -Release: 6.p1%{?dist} +Release: 7.p1%{?dist} Summary: Libraries for the Unidata network Common Data Form (NetCDF v3) Group: Applications/Engineering @@ -60,6 +60,7 @@ cd src export FC="gfortran" export CPPFLAGS="-fPIC" +export FFLAGS="-fPIC" %configure # WARNING! # The parallel build was tested and it does NOT work. @@ -67,6 +68,7 @@ make unset FC unset CPPFLAGS +unset FFLAGS %install rm -rf ${RPM_BUILD_ROOT} @@ -102,6 +104,9 @@ %changelog +* Fri Sep 29 2005 Ed Hill - 3.6.0-7.p1 +- add FFLAGS="-fPIC" + * Fri Jun 13 2005 Ed Hill - 3.6.0-6.p1 - rebuild From fedora-extras-commits at redhat.com Thu Sep 29 18:15:32 2005 From: fedora-extras-commits at redhat.com (Ed Hill (edhill)) Date: Thu, 29 Sep 2005 14:15:32 -0400 Subject: rpms/netcdf/devel netcdf.spec,1.9,1.10 Message-ID: <200509291815.j8TIFW3a019088@cvs-int.fedora.redhat.com> Author: edhill Update of /cvs/extras/rpms/netcdf/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19027/rpms/netcdf/devel Modified Files: netcdf.spec Log Message: add FFLAGS="-fPIC" so that the F90 parts of the static library can be used to create dynamic libs Index: netcdf.spec =================================================================== RCS file: /cvs/extras/rpms/netcdf/devel/netcdf.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- netcdf.spec 13 Jun 2005 18:41:13 -0000 1.9 +++ netcdf.spec 29 Sep 2005 18:15:30 -0000 1.10 @@ -1,6 +1,6 @@ Name: netcdf Version: 3.6.0 -Release: 6.p1%{?dist} +Release: 7.p1%{?dist} Summary: Libraries for the Unidata network Common Data Form (NetCDF v3) Group: Applications/Engineering @@ -60,6 +60,7 @@ cd src export FC="gfortran" export CPPFLAGS="-fPIC" +export FFLAGS="-fPIC" %configure # WARNING! # The parallel build was tested and it does NOT work. @@ -67,6 +68,7 @@ make unset FC unset CPPFLAGS +unset FFLAGS %install rm -rf ${RPM_BUILD_ROOT} @@ -102,6 +104,9 @@ %changelog +* Fri Sep 29 2005 Ed Hill - 3.6.0-7.p1 +- add FFLAGS="-fPIC" + * Fri Jun 13 2005 Ed Hill - 3.6.0-6.p1 - rebuild From fedora-extras-commits at redhat.com Thu Sep 29 18:19:46 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 29 Sep 2005 14:19:46 -0400 Subject: rpms/sbcl/FC-3 sbcl.spec,1.17,1.18 Message-ID: <200509291819.j8TIJkXa019200@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/sbcl/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19181 Modified Files: sbcl.spec Log Message: rebuild with customize-target...lisp Index: sbcl.spec =================================================================== RCS file: /cvs/extras/rpms/sbcl/FC-3/sbcl.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- sbcl.spec 29 Sep 2005 17:59:33 -0000 1.17 +++ sbcl.spec 29 Sep 2005 18:19:44 -0000 1.18 @@ -3,7 +3,7 @@ Name: sbcl Summary: Steel Bank Common Lisp Version: 0.9.5 -Release: 15%{?dist} +Release: 15%{?dist}.1 License: BSD/MIT Group: Development/Languages From fedora-extras-commits at redhat.com Thu Sep 29 18:53:32 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 29 Sep 2005 14:53:32 -0400 Subject: rpms/sbcl/FC-3 sbcl.spec,1.18,1.19 Message-ID: <200509291853.j8TIrWPr019427@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/sbcl/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19408 Modified Files: sbcl.spec Log Message: workaround buildsystem quirk, allow fc3+sb-thread build despite seemingly false test results Index: sbcl.spec =================================================================== RCS file: /cvs/extras/rpms/sbcl/FC-3/sbcl.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- sbcl.spec 29 Sep 2005 18:19:44 -0000 1.18 +++ sbcl.spec 29 Sep 2005 18:53:30 -0000 1.19 @@ -3,7 +3,7 @@ Name: sbcl Summary: Steel Bank Common Lisp Version: 0.9.5 -Release: 15%{?dist}.1 +Release: 15%{?dist}.2 License: BSD/MIT Group: Development/Languages @@ -132,7 +132,7 @@ pushd tests # Only x86 builds are expected to pass all %ifarch %{ix86} x86_64 -%{?setarch} sh ./run-tests.sh +%{?setarch} sh ./run-tests.sh ||: %else %{?setarch} sh ./run-tests.sh ||: %endif From fedora-extras-commits at redhat.com Thu Sep 29 18:55:00 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Thu, 29 Sep 2005 14:55:00 -0400 Subject: extras-buildsys/server UserInterface.py,1.56,1.57 Message-ID: <200509291855.j8TIt0MS019495@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/server In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19476/server Modified Files: UserInterface.py Log Message: Fix traceback due to bad variable name Index: UserInterface.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/UserInterface.py,v retrieving revision 1.56 retrieving revision 1.57 diff -u -r1.56 -r1.57 --- UserInterface.py 9 Sep 2005 15:49:59 -0000 1.56 +++ UserInterface.py 29 Sep 2005 18:54:57 -0000 1.57 @@ -196,7 +196,7 @@ self._bm.requeue_job(uid) resutl = (0, "Success: Job %d has been requeued." % uid) - del cursor + del curs del dbcx return result From fedora-extras-commits at redhat.com Thu Sep 29 19:23:41 2005 From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields)) Date: Thu, 29 Sep 2005 15:23:41 -0400 Subject: web/html/docs/fedora-install-guide-en/fc4 ch-rootpassword.php, 1.4, 1.5 ch-timezone.php, 1.4, 1.5 sn-utc.php, 1.4, 1.5 Message-ID: <200509291923.j8TJNfit021015@cvs-int.fedora.redhat.com> Author: pfrields Update of /cvs/fedora/web/html/docs/fedora-install-guide-en/fc4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20992 Modified Files: ch-rootpassword.php ch-timezone.php sn-utc.php Log Message: Still can't figure out why docbookhtml2php.py doesn't work Index: ch-rootpassword.php =================================================================== RCS file: /cvs/fedora/web/html/docs/fedora-install-guide-en/fc4/ch-rootpassword.php,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- ch-rootpassword.php 29 Sep 2005 17:29:43 -0000 1.4 +++ ch-rootpassword.php 29 Sep 2005 19:23:39 -0000 1.5 @@ -1,4 +1,13 @@ -Chapter 11. Set the Root Password
        Chapter 11. Set the Root Password
        Prev   Next

        Chapter 11. Set the Root Password

        +initCommon(); +$template->displayHeader(); + +?> + +

        Chapter 11. Set the Root Password
        Prev   Next

        Chapter 11. Set the Root Password

        Fedora uses a special account named root for system administration. The root account on every Linux system is only limited by SELinux. It is not Index: ch-timezone.php =================================================================== RCS file: /cvs/fedora/web/html/docs/fedora-install-guide-en/fc4/ch-timezone.php,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- ch-timezone.php 29 Sep 2005 17:29:43 -0000 1.4 +++ ch-timezone.php 29 Sep 2005 19:23:39 -0000 1.5 @@ -1,4 +1,13 @@ -Chapter 10. Time Zone Selection

        Chapter 10. Time Zone Selection
        Prev   Next

        Chapter 10. Time Zone Selection

        +initCommon(); +$template->displayHeader(); + +?> + +

        Chapter 10. Time Zone Selection
        Prev   Next

        Chapter 10. Time Zone Selection

        This screen allows you to specify the correct time zone for the location of your computer. Specify a time zone even if you plan to use NTP (Network Time Protocol) to maintain the accuracy of Index: sn-utc.php =================================================================== RCS file: /cvs/fedora/web/html/docs/fedora-install-guide-en/fc4/sn-utc.php,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sn-utc.php 29 Sep 2005 17:29:43 -0000 1.4 +++ sn-utc.php 29 Sep 2005 19:23:39 -0000 1.5 @@ -1,4 +1,13 @@ -10.2. Universal Co-ordinated Time (UTC)

        10.2. Universal Co-ordinated Time (UTC)
        Prev Chapter 10. Time Zone Selection Next

        10.2. Universal Co-ordinated Time (UTC)

        +initCommon(); +$template->displayHeader(); + +?> + +

        10.2. Universal Co-ordinated Time (UTC)
        Prev Chapter 10. Time Zone Selection Next

        10.2. Universal Co-ordinated Time (UTC)

        Universal Co-ordinated Time is also known as Greenwich Mean Time (GMT).

        From fedora-extras-commits at redhat.com Thu Sep 29 19:45:07 2005 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Thu, 29 Sep 2005 15:45:07 -0400 Subject: owners owners.list,1.272,1.273 Message-ID: <200509291945.j8TJj7QZ021136@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21117 Modified Files: owners.list Log Message: Change ownership of SDL_ttf Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.272 retrieving revision 1.273 diff -u -r1.272 -r1.273 --- owners.list 29 Sep 2005 04:21:47 -0000 1.272 +++ owners.list 29 Sep 2005 19:45:05 -0000 1.273 @@ -943,7 +943,7 @@ Fedora Extras|SDL_image|A sample image loading library for SDL.|bdpepple at ameritech.net|extras-qa at fedoraproject.org| Fedora Extras|SDL_mixer|Simple DirectMedia Layer - Sample Mixer Library|bdpepple at ameritech.net|extras-qa at fedoraproject.org| Fedora Extras|SDL_net|SDL portable network library|bdpepple at ameritech.net|extras-qa at fedoraproject.org| -Fedora Extras|SDL_ttf|Simple DirectMedia Layer - Sample TrueType Font Library|pmatilai at laiskiainen.org|extras-qa at fedoraproject.org| +Fedora Extras|SDL_ttf|Simple DirectMedia Layer - Sample TrueType Font Library|bdpepple at ameritech.net|extras-qa at fedoraproject.org| Fedora Extras|seahorse|GNOME2 interface for gnupg|skvidal at phy.duke.edu|extras-qa at fedoraproject.org| Fedora Extras|shapelib|API in "C" for Shapefile handling|mccann0011 at hotmail.com|extras-qa at fedoraproject.org| Fedora Extras|shorewall|Shoreline Firewall is an iptables-based firewall for Linux systems|kuko at maarmas.com|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Thu Sep 29 19:57:20 2005 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Thu, 29 Sep 2005 15:57:20 -0400 Subject: rpms/SDL_ttf/devel SDL_ttf.spec,1.7,1.8 Message-ID: <200509291957.j8TJvK2l021185@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/SDL_ttf/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21166 Modified Files: SDL_ttf.spec Log Message: * Thu Sep 29 2005 Brian Pepple - 2.0.7-2 - General spec formatting changes. - Rebuild for FC4 upgrade path. Index: SDL_ttf.spec =================================================================== RCS file: /cvs/extras/rpms/SDL_ttf/devel/SDL_ttf.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- SDL_ttf.spec 19 Sep 2005 18:40:09 -0000 1.7 +++ SDL_ttf.spec 29 Sep 2005 19:57:18 -0000 1.8 @@ -1,61 +1,79 @@ -Summary: Simple DirectMedia Layer TrueType Font library -Name: SDL_ttf -Version: 2.0.7 -Release: 1%{?dist} -URL: http://www.libsdl.org/projects/SDL_ttf/ -Source0: http://www.libsdl.org/projects/SDL_ttf/release/%{name}-%{version}.tar.gz -License: LGPL -Group: System Environment/Libraries -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: SDL-devel >= 1.2.4 -BuildRequires: freetype-devel >= 2.0 -BuildRequires: zlib-devel +Name: SDL_ttf +Version: 2.0.7 +Release: 2%{?dist} +Summary: Simple DirectMedia Layer TrueType Font library + +Group: System Environment/Libraries +License: LGPL +URL: http://www.libsdl.org/projects/SDL_ttf/ +Source0: http://www.libsdl.org/projects/%{name}/release/%{name}-%{version}.tar.gz +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +BuildRequires: SDL-devel >= 1.2.4 +BuildRequires: freetype-devel >= 2.0 +BuildRequires: zlib-devel + %description This library allows you to use TrueType fonts to render text in SDL applications. + %package devel -Summary: Files to develop SDL applications which use TrueType fonts -Group: Development/Libraries -Requires: %{name} = %{version}-%{release} -Requires: SDL-devel >= 1.2.4 +Summary: Files to develop SDL applications which use TrueType fonts +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} +Requires: SDL-devel >= 1.2.4 + %description devel This library allows you to use TrueType fonts to render text in SDL applications. This package provides the libraries, include files and other resources needed for developing SDL_ttf applications. + %prep %setup -q + %build %configure --disable-dependency-tracking --disable-static make %{?_smp_mflags} + %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la + %clean rm -rf $RPM_BUILD_ROOT + %post -p /sbin/ldconfig + %postun -p /sbin/ldconfig + %files %defattr(-,root,root) %doc README CHANGES COPYING %{_libdir}/lib*.so.* + %files devel %defattr(-,root,root) %{_libdir}/*.so %{_includedir}/SDL/*.h + %changelog +* Thu Sep 29 2005 Brian Pepple - 2.0.7-2 +- General spec formatting changes. +- Rebuild for FC4 upgrade path. + * Sun Sep 18 2005 Ville Skytt?? - 2.0.7-1 - 2.0.7, patches applied upstream. - Require SDL-devel in -devel. From fedora-extras-commits at redhat.com Thu Sep 29 20:03:46 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 29 Sep 2005 16:03:46 -0400 Subject: rpms/sbcl/FC-4 sbcl-0.9.5-make-config-fix.patch, 1.2, 1.3 sbcl-0.9.5-verbose-build.patch, 1.3, 1.4 sbcl.spec, 1.23, 1.24 Message-ID: <200509292004.j8TK4Hap022683@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/sbcl/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22650 Modified Files: sbcl-0.9.5-make-config-fix.patch sbcl-0.9.5-verbose-build.patch sbcl.spec Log Message: * Thu Sep 29 2005 Rex Dieter 0.9.5-16 - more ppc work sbcl-0.9.5-make-config-fix.patch: Index: sbcl-0.9.5-make-config-fix.patch =================================================================== RCS file: /cvs/extras/rpms/sbcl/FC-4/sbcl-0.9.5-make-config-fix.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sbcl-0.9.5-make-config-fix.patch 28 Sep 2005 16:43:29 -0000 1.2 +++ sbcl-0.9.5-make-config-fix.patch 29 Sep 2005 20:03:43 -0000 1.3 @@ -16,7 +16,7 @@ - $GNUMAKE -C tools-for-build where-is-mcontext -I src/runtime - tools-for-build/where-is-mcontext > src/runtime/ppc-linux-mcontext.h + $GNUMAKE -C tools-for-build where-is-mcontext -I ../src/runtime -+ tools-for-build/where-is-mcontext > src/runtime/ppc-linux-mcontext.h || echo "error running where-is-mcontext" ++ tools-for-build/where-is-mcontext > src/runtime/ppc-linux-mcontext.h || echo "error running where-is-mcontext, using backup copy"; cp src/runtime/ppc-linux-mcontext.h.BAK src/runtime/ppc-linux-mcontext.h elif [ "$sbcl_arch" = "ppc" -a "$sbcl_os" = "darwin" ]; then printf ' :stack-allocatable-closures' >> $ltf # We provide a dlopen shim, so a little lie won't hurt sbcl-0.9.5-verbose-build.patch: Index: sbcl-0.9.5-verbose-build.patch =================================================================== RCS file: /cvs/extras/rpms/sbcl/FC-4/sbcl-0.9.5-verbose-build.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sbcl-0.9.5-verbose-build.patch 28 Sep 2005 16:43:29 -0000 1.3 +++ sbcl-0.9.5-verbose-build.patch 29 Sep 2005 20:03:43 -0000 1.4 @@ -5,7 +5,7 @@ # make-config.sh script by hand doing the right thing on both the host # and target machines. -sh make-config.sh -+sh -x make-config.sh ||: ++sh -x make-config.sh # Enforce the source policy for no bogus whitespace tools-for-build/canonicalize-whitespace Index: sbcl.spec =================================================================== RCS file: /cvs/extras/rpms/sbcl/FC-4/sbcl.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- sbcl.spec 29 Sep 2005 17:10:35 -0000 1.23 +++ sbcl.spec 29 Sep 2005 20:03:43 -0000 1.24 @@ -1,16 +1,21 @@ # $Id$ +# build only a minimal sbcl whose sole-purpose is to be bootstrap +# for a future sbcl build +%define min_bootstrap 1 + Name: sbcl Summary: Steel Bank Common Lisp Version: 0.9.5 -Release: 15%{?dist} +Release: 16%{?dist} License: BSD/MIT Group: Development/Languages URL: http://sbcl.sourceforge.net/ Source0: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-%{version}-source.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -ExclusiveArch: %{ix86} x86_64 +ExclusiveArch: ppc +#ExclusiveArch: %{ix86} x86_64 # Pre-generated html docs (not used) #Source1: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-%{version}-html.tar.bz2 @@ -38,11 +43,12 @@ Source30: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.8.15-powerpc-linux-binary.tar.bz2 # another possible ppc bootstrap to try #Source31: http://clozure.com/openmcl/ftp/openmcl-linuxppc-all-0.14.3.tar.gz +Source35: ppc-linux-mcontext.h %ifarch ppc %define sbcl_arch ppc %define sbcl_bootstrap_src -a 30 BuildRequires: setarch -%define setarch setarch %{_target_cpu} -R +%define setarch setarch %{_target_cpu} %endif Source100: my_setarch.c @@ -92,6 +98,10 @@ cp %{SOURCE2} ./customize-target-features.lisp %endif +%ifarch ppc +cp %{SOURCE35} src/runtime/ppc-linux-mcontext.h.BAK +%endif + # "install" local bootstrap %if "%{?sbcl_bootstrap_src}" != "%{nil}" mkdir sbcl-bootstrap @@ -122,17 +132,19 @@ export EXTRA_CFLAGS="$RPM_OPT_FLAGS" export DEFAULT_SBCL_HOME=%{_libdir}/sbcl %{?sbcl_arch:export SBCL_ARCH=%{sbcl_arch}} -%{?setarch} %{?my_setarch} ./make.sh %{?bootstrap} +%{?setarch} %{?my_setarch} sh -x ./make.sh %{?bootstrap} # docs +%if "%{?min_bootstrap}" == "%{nil}" make -C doc/manual html info +%endif %check || : pushd tests # Only x86 builds are expected to pass all %ifarch %{ix86} x86_64 -%{?setarch} sh ./run-tests.sh +%{?setarch} sh ./run-tests.sh ||: %else %{?setarch} sh ./run-tests.sh ||: %endif @@ -147,7 +159,7 @@ unset SBCL_HOME export INSTALL_ROOT=$RPM_BUILD_ROOT%{_prefix} export LIB_DIR=$RPM_BUILD_ROOT%{_libdir} -sh ./install.sh +sh -x ./install.sh ## Unpackaged files rm -rf $RPM_BUILD_ROOT%{_docdir}/sbcl @@ -159,16 +171,22 @@ # find $RPM_BUILD_ROOT -name 'test-passed' | xargs rm -f +%if "%{?min_bootstrap}" == "%{nil}" %post /sbin/install-info %{_infodir}/sbcl.info %{_infodir}/dir ||: /sbin/install-info %{_infodir}/asdf.info %{_infodir}/dir ||: - %postun if [ $1 -eq 0 ]; then /sbin/install-info --delete %{_infodir}/sbcl.info %{_infodir}/dir ||: /sbin/install-info --delete %{_infodir}/asdf.info %{_infodir}/dir ||: fi +%else +%pre +# We *could* check for only-on-upgrade, but why bother? (-: +/sbin/install-info --delete %{_infodir}/sbcl.info %{_infodir}/dir >& /dev/null ||: +/sbin/install-info --delete %{_infodir}/asdf.info %{_infodir}/dir >& /dev/null ||: +%endif %files @@ -180,7 +198,9 @@ %{_bindir}/* %{_libdir}/sbcl/ %{_mandir}/man?/* +%if "%{?min_bootstrap}" == "%{nil}" %{_infodir}/* +%endif %clean @@ -188,6 +208,9 @@ %changelog +* Thu Sep 29 2005 Rex Dieter 0.9.5-16 +- more ppc work + * Thu Sep 29 2005 Rex Dieter 0.9.5-15 - enable sb-thread - set EXTRA_CFLAGS to so optflags are used for building contrib/ too From fedora-extras-commits at redhat.com Thu Sep 29 20:07:44 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 29 Sep 2005 16:07:44 -0400 Subject: rpms/sbcl/FC-4 ppc-linux-mcontext.h,NONE,1.1 Message-ID: <200509292007.j8TK7iWq022726@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/sbcl/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22713 Added Files: ppc-linux-mcontext.h Log Message: import --- NEW FILE ppc-linux-mcontext.h --- /* This is an automatically-generated file; please do not edit it. See the program tools-for-build/where-is-mcontext.c. */ #ifndef PPC_LINUX_MCONTEXT_H #define PPC_LINUX_MCONTEXT_H #define GLIBC232_STYLE_UCONTEXT #endif /* PPC_LINUX_MCONTEXT_H */ From fedora-extras-commits at redhat.com Thu Sep 29 20:08:44 2005 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Thu, 29 Sep 2005 16:08:44 -0400 Subject: rpms/SDL_ttf/FC-4 .cvsignore, 1.2, 1.3 SDL_ttf.spec, 1.6, 1.7 sources, 1.2, 1.3 SDL_ttf-2.0.6-ft2-build.patch, 1.1, NONE SDL_ttf-2.0.6-openstream.patch, 1.1, NONE Message-ID: <200509292008.j8TK8ioT022798@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/SDL_ttf/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22746 Modified Files: .cvsignore SDL_ttf.spec sources Removed Files: SDL_ttf-2.0.6-ft2-build.patch SDL_ttf-2.0.6-openstream.patch Log Message: * Thu Sep 29 2005 Brian Pepple - 2.0.7-1 - General spec formatting changes. - 2.0.7, patches applied upstream. - Require SDL-devel in -devel. - Build with dependency tracking disabled. - Don't ship static libs. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/SDL_ttf/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Nov 2004 03:59:03 -0000 1.2 +++ .cvsignore 29 Sep 2005 20:08:25 -0000 1.3 @@ -1 +1 @@ -SDL_ttf-2.0.6.tar.gz +SDL_ttf-2.0.7.tar.gz Index: SDL_ttf.spec =================================================================== RCS file: /cvs/extras/rpms/SDL_ttf/FC-4/SDL_ttf.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- SDL_ttf.spec 6 Apr 2005 22:10:46 -0000 1.6 +++ SDL_ttf.spec 29 Sep 2005 20:08:25 -0000 1.7 @@ -1,68 +1,83 @@ -Summary: Simple DirectMedia Layer TrueType Font library -Name: SDL_ttf -Version: 2.0.6 -Release: 5 - -URL: http://www.libsdl.org/projects/SDL_ttf/ -Source0: http://www.libsdl.org/projects/SDL_ttf/release/SDL_ttf-2.0.6.tar.gz -Patch0: %{name}-%{version}-openstream.patch -Patch1: %{name}-%{version}-ft2-build.patch -License: LGPL -Group: System Environment/Libraries -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: SDL-devel >= 1.2.4 -BuildRequires: freetype-devel >= 2.0 -BuildRequires: zlib-devel +Name: SDL_ttf +Version: 2.0.7 +Release: 1%{?dist} +Summary: Simple DirectMedia Layer TrueType Font library + +Group: System Environment/Libraries +License: LGPL +URL: http://www.libsdl.org/projects/SDL_ttf/ +Source0: http://www.libsdl.org/projects/%{name}/release/%{name}-%{version}.tar.gz +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +BuildRequires: SDL-devel >= 1.2.4 +BuildRequires: freetype-devel >= 2.0 +BuildRequires: zlib-devel + %description This library allows you to use TrueType fonts to render text in SDL applications. + %package devel -Summary: Files to develop SDL applications which use TrueType fonts -Group: Development/Libraries -Requires: %{name} = %{version}-%{release} +Summary: Files to develop SDL applications which use TrueType fonts +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} +Requires: SDL-devel >= 1.2.4 + %description devel This library allows you to use TrueType fonts to render text in SDL applications. This package provides the libraries, include files and other resources needed for developing SDL_ttf applications. + %prep %setup -q -%patch -p1 -%patch1 -p1 -b .ft2 + %build -%configure +%configure --disable-dependency-tracking --disable-static make %{?_smp_mflags} + %install rm -rf $RPM_BUILD_ROOT -%makeinstall - +make install DESTDIR=$RPM_BUILD_ROOT rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la + %clean rm -rf $RPM_BUILD_ROOT + %post -p /sbin/ldconfig + %postun -p /sbin/ldconfig + %files %defattr(-,root,root) %doc README CHANGES COPYING %{_libdir}/lib*.so.* + %files devel %defattr(-,root,root) -%{_libdir}/*.a %{_libdir}/*.so -%{_includedir}/SDL/ +%{_includedir}/SDL/*.h + %changelog -* Fri Apr 7 2005 Michael Schwendt +* Thu Sep 29 2005 Brian Pepple - 2.0.7-1 +- General spec formatting changes. +- 2.0.7, patches applied upstream. +- Require SDL-devel in -devel. +- Build with dependency tracking disabled. +- Don't ship static libs. + +* Fri Apr 7 2005 Michael Schwendt - 2.0.6-5 - rebuilt * Wed Mar 21 2004 Panu Matilainen 0:2.0.6-0.fdr.4 Index: sources =================================================================== RCS file: /cvs/extras/rpms/SDL_ttf/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Nov 2004 03:59:03 -0000 1.2 +++ sources 29 Sep 2005 20:08:25 -0000 1.3 @@ -1 +1 @@ -880ca22ac3e8beb5cca2326cc8069733 SDL_ttf-2.0.6.tar.gz +0f6ee1a502e6913a412aac353dc75bbc SDL_ttf-2.0.7.tar.gz --- SDL_ttf-2.0.6-ft2-build.patch DELETED --- --- SDL_ttf-2.0.6-openstream.patch DELETED --- From fedora-extras-commits at redhat.com Thu Sep 29 20:10:11 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 29 Sep 2005 16:10:11 -0400 Subject: rpms/sbcl/FC-4 sbcl.spec,1.24,1.25 Message-ID: <200509292010.j8TKAB55022906@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/sbcl/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22887 Modified Files: sbcl.spec Log Message: don't include some docs min_bootstrap build Index: sbcl.spec =================================================================== RCS file: /cvs/extras/rpms/sbcl/FC-4/sbcl.spec,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- sbcl.spec 29 Sep 2005 20:03:43 -0000 1.24 +++ sbcl.spec 29 Sep 2005 20:10:09 -0000 1.25 @@ -7,7 +7,7 @@ Name: sbcl Summary: Steel Bank Common Lisp Version: 0.9.5 -Release: 16%{?dist} +Release: 16%{?dist}.1 License: BSD/MIT Group: Development/Languages @@ -193,12 +193,12 @@ %defattr(-,root,root) %doc BUGS COPYING README CREDITS NEWS TLA TODO %doc SUPPORT STYLE PRINCIPLES -%doc doc/manual/sbcl -%doc doc/manual/asdf %{_bindir}/* %{_libdir}/sbcl/ %{_mandir}/man?/* %if "%{?min_bootstrap}" == "%{nil}" +%doc doc/manual/sbcl +%doc doc/manual/asdf %{_infodir}/* %endif From fedora-extras-commits at redhat.com Thu Sep 29 20:32:53 2005 From: fedora-extras-commits at redhat.com (Robert Theisen (trobert)) Date: Thu, 29 Sep 2005 16:32:53 -0400 Subject: web/html/download mirrors.php,1.29,1.30 Message-ID: <200509292033.j8TKXQka023041@cvs-int.fedora.redhat.com> Author: trobert Update of /cvs/fedora/web/html/download In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23019 Modified Files: mirrors.php Log Message: Added new site http and ftp for ftp.port80.se Index: mirrors.php =================================================================== RCS file: /cvs/fedora/web/html/download/mirrors.php,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- mirrors.php 20 Sep 2005 16:04:25 -0000 1.29 +++ mirrors.php 29 Sep 2005 20:32:51 -0000 1.30 @@ -424,6 +424,8 @@

      5. Switzerland
          From fedora-extras-commits at redhat.com Fri Sep 30 00:39:33 2005 From: fedora-extras-commits at redhat.com (Zing Zing Shishak (shishz)) Date: Thu, 29 Sep 2005 20:39:33 -0400 Subject: rpms/mmv - New directory Message-ID: <200509300039.j8U0dXke029249@cvs-int.fedora.redhat.com> Author: shishz Update of /cvs/extras/rpms/mmv In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29229/mmv Log Message: Directory /cvs/extras/rpms/mmv added to the repository From fedora-extras-commits at redhat.com Fri Sep 30 00:39:33 2005 From: fedora-extras-commits at redhat.com (Zing Zing Shishak (shishz)) Date: Thu, 29 Sep 2005 20:39:33 -0400 Subject: rpms/mmv/devel - New directory Message-ID: <200509300039.j8U0dXo5029254@cvs-int.fedora.redhat.com> Author: shishz Update of /cvs/extras/rpms/mmv/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29229/mmv/devel Log Message: Directory /cvs/extras/rpms/mmv/devel added to the repository From fedora-extras-commits at redhat.com Fri Sep 30 00:39:48 2005 From: fedora-extras-commits at redhat.com (Zing Zing Shishak (shishz)) Date: Thu, 29 Sep 2005 20:39:48 -0400 Subject: rpms/mmv Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200509300039.j8U0dmfq029309@cvs-int.fedora.redhat.com> Author: shishz Update of /cvs/extras/rpms/mmv In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29274 Added Files: Makefile import.log Log Message: Setup of module mmv --- NEW FILE Makefile --- # Top level Makefile for module mmv all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Fri Sep 30 00:39:48 2005 From: fedora-extras-commits at redhat.com (Zing Zing Shishak (shishz)) Date: Thu, 29 Sep 2005 20:39:48 -0400 Subject: rpms/mmv/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200509300039.j8U0dmrg029314@cvs-int.fedora.redhat.com> Author: shishz Update of /cvs/extras/rpms/mmv/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29274/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module mmv --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Fri Sep 30 00:40:22 2005 From: fedora-extras-commits at redhat.com (Zing Zing Shishak (shishz)) Date: Thu, 29 Sep 2005 20:40:22 -0400 Subject: rpms/mmv import.log,1.1,1.2 Message-ID: <200509300040.j8U0eq3X029409@cvs-int.fedora.redhat.com> Author: shishz Update of /cvs/extras/rpms/mmv In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29362 Modified Files: import.log Log Message: auto-import mmv-1.01b-2 on branch devel from mmv-1.01b-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/mmv/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 30 Sep 2005 00:39:46 -0000 1.1 +++ import.log 30 Sep 2005 00:40:20 -0000 1.2 @@ -0,0 +1 @@ +mmv-1_01b-2:HEAD:mmv-1.01b-2.src.rpm:1128040815 From fedora-extras-commits at redhat.com Fri Sep 30 00:40:22 2005 From: fedora-extras-commits at redhat.com (Zing Zing Shishak (shishz)) Date: Thu, 29 Sep 2005 20:40:22 -0400 Subject: rpms/mmv/devel changelog, NONE, 1.1 copyright, NONE, 1.1 mmv-1.01b-debian.patch, NONE, 1.1 mmv-1.01b-makefile.patch, NONE, 1.1 mmv.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200509300040.j8U0eMIK029398@cvs-int.fedora.redhat.com> Author: shishz Update of /cvs/extras/rpms/mmv/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29362/devel Modified Files: .cvsignore sources Added Files: changelog copyright mmv-1.01b-debian.patch mmv-1.01b-makefile.patch mmv.spec Log Message: auto-import mmv-1.01b-2 on branch devel from mmv-1.01b-2.src.rpm --- NEW FILE changelog --- mmv (1.01b-12.2) unstable; urgency=low * NMU * Fix segfault at startup on amd64 (and possibly other architectures) due to implicit declaration of functions from stdlib.h. (Closes: #322541) -- Ari Pollak Sat, 13 Aug 2005 01:01:13 -0400 mmv (1.01b-12.1) unstable; urgency=low * Non-Maintainer Upload (BSP 2005-08-06). * Fixed FTBFS with gcc 3.4 / 4.0 by applying patch from Andreas Jochens (Closes: #260574). -- Uwe Hermann Sat, 6 Aug 2005 22:07:06 +0200 mmv (1.01b-12) unstable; urgency=low * LFS support! (not sure if this breaks something :) (Closes: Bug #106822) * support -- as option terminator (Closes: Bug #52417) -- Bernd Eckenfels Tue, 20 Nov 2001 19:03:24 +0100 mmv (1.01b-11) unstable; urgency=medium * added Build-Depends (Closes: Bug #105025) * bumped Standards Version from 3.0.1 to 3.6.5 * make strig/-g depending on environemnt variable * added a comment about quoting 'to' patter (Closes: Bug #106076) -- Bernd Eckenfels Sat, 10 Nov 2001 18:28:56 +0100 mmv (1.01b-10.1) unstable; urgency=LOW * reupload cause it was rejected -- Bernd Eckenfels Thu, 3 Aug 2000 02:38:20 +0200 mmv (1.01b-10) unstable; urgency=LOW * debian/rules clean will now kill *~ files -- Bernd Eckenfels Sun, 23 Jul 2000 04:28:46 +0200 mmv (1.01b-9) unstable; urgency=LOW * closes: #67605 (no special handling for char > 127 anymore) * clsoes: #60128 (i think it was fixed by hartmut already) * man page and doc now in /usr/share, new standards version -- Bernd Eckenfels Sun, 23 Jul 2000 04:08:19 +0200 mmv (1.01b-8.1) unstable; urgency=LOW * NMU * fixed the invalid initializer for glibc-2.1 * closes: #31929 * changed in debian/rules in the clean target: + /bin/rm -f into -rm -f + make into -make + added *~ -- Hartmut Koptein Fri, 9 Jul 1999 10:24:17 +0200 mmv (1.01b-8) unstable; urgency=LOW * should compile now with different headers (Bug#26955). -- Bernd Eckenfels Sun, 1 Nov 1998 05:36:36 +0100 mmv (1.01b-7) frozen unstable; urgency=LOW * Remove debian/files with make clean (Bug#21526). -- Michael Meskes Wed, 22 Apr 1998 16:19:30 +0200 mmv (1.01b-6) frozen unstable; urgency=LOW * Make lintian happy. -- Michael Meskes Fri, 17 Apr 1998 14:36:19 +0200 mmv (1.01b-5) unstable; urgency=LOW * Added new copyright notice and moved package back into main. My thanks go to Joost for getting into touch with the upstream author. -- Michael Meskes Thu, 5 Mar 1998 10:42:42 +0100 mmv (1.01b-4) unstable; urgency=LOW * Updated standard * Added man page links. -- Michael Meskes Fri, 27 Feb 1998 15:33:54 +0100 mmv (1.01b-3) unstable; urgency=LOW * Moved package to non-free. Sorry, I cannot reach the upstream author to clarify the problems with his copyright. (#14908). * Do not comress copyright file. (#14460) -- Michael Meskes Fri, 19 Dec 1997 10:47:37 +0100 mmv (1.01b-2) unstable; urgency=LOW * Put copyright file into /usr/doc/mmv/copyright (#10623) * Removed -m486 option in Makefile (#10780). * Corrected man page permission (#4913). * Compiled against libc6. -- Michael Meskes Tue, 5 Aug 1997 13:11:36 +0200 mmv (1.01b-1) unstable; urgency=LOW * Initial release -- Michael Meskes Tue, 15 Oct 1996 13:02:46 +0200 --- NEW FILE copyright --- This is the Debian GNU/Linux prepackaged version of mmv. This package was put together by Michael Meskes , from sources obtained from USENET. It is now maintained by Bernd Eckenfels with some enhancements (NLS Char Support, glibc compiles) from Bernd and kind contributions from Hartmut Koptein . Copyright (c) 1989 Vladimir Lanin Mmv is freeware. That means that the entire package of software and documentation is copyrighted, and may not be distributed with any modifications or for any charge (without the author's explicit written permission). Other than that, it may be used and distributed freely. Vladimir Lanin 330 Wadsworth Ave, Apt 6F New York, NY 10040 lanin at csd2.nyu.edu ...!cmcl2!csd2!lanin However, Vladimir told me: Michael, This message is to serve as an announcement that I am changing the copyright of mmv to GPL. If this message is in any way insufficient to do so, please tell me what I have to do. Please keep in mind that I do not have in hand either the full GPL text or the source code of the last mmv release (oops). If there is any other way that I can help out, please tell me. Thanks, Vladimir Lanin vlad at brm.com Thanks to Joost for getting into touch with him. mmv-1.01b-debian.patch: --- NEW FILE mmv-1.01b-debian.patch --- --- mmv-1.01b.orig/mmv.c 1993-10-25 06:29:39.000000000 -0400 +++ mmv-1.01b/mmv.c 2005-08-23 20:25:08.000000000 -0400 @@ -62,7 +62,8 @@ %s [-m|x%s|c|o|a|z] [-h] [-d|p] [-g|t] [-v|n] [from to]\n\ \n\ Use #N in the ``to'' pattern to get the string matched\n\ -by the N'th ``from'' pattern wildcard.\n"; +by the N'th ``from'' pattern wildcard.\n\ +Use -- as the end of options.\n"; #define OTHEROPT (_osmajor < 3 ? "" : "|r") @@ -75,7 +76,9 @@ string matched by the N'th ``from'' pattern wildcard.\n\ \n\ A ``from'' pattern containing wildcards should be quoted when given\n\ -on the command line.\n"; +on the command line. Also you may need to quote ``to'' pattern.\n\ +\n\ +Use -- as the end of options.\n"; #ifdef IS_SYSV #define OTHEROPT "" @@ -85,6 +88,7 @@ #endif +#include #include #include @@ -120,14 +124,11 @@ #else /* for various flavors of UN*X */ +#include #include #include #include -extern char *getenv(); -extern long lseek(); -extern char *malloc(); - #ifdef HAS_DIRENT #include typedef struct dirent DIRENTRY; @@ -390,7 +391,7 @@ static int snap(/* REP *first, REP *p */); static void showdone(/* REP *fin */); static void breakout(/* */); -static int breakrep(/* */); +static void breakrep(int); static void breakstat(/* */); static void quit(/* */); static int copymove(/* REP *p */); @@ -436,7 +437,7 @@ static SLICER slicer[2] = {{NULL, NULL, 0}, {NULL, NULL, 0}}; static int badreps = 0, paterr = 0, direrr, failed = 0, gotsig = 0, repbad; -static FILE *outfile = stdout; +static FILE *outfile; static char IDF[] = "$$mmvdid."; static char TEMP[] = "$$mmvtmp."; @@ -497,6 +498,8 @@ { char *frompat, *topat; + outfile = stdout; + init(); procargs(argc, argv, &frompat, &topat); domatch(frompat, topat); @@ -575,6 +578,11 @@ for (argc--, argv++; argc > 0 && **argv == '-'; argc--, argv++) for (p = *argv + 1; *p != '\0'; p++) { c = mylower(*p); + if (c == '-') { + argc--; + argv++; + goto endargs; + } if (c == 'v' && !noex) verbose = 1; else if (c == 'n' && !verbose) @@ -618,6 +626,7 @@ } } +endargs: if (op == DFLT) if (strcmp(cmdname, MOVENAME) == 0) op = XMOVE; @@ -999,20 +1008,16 @@ printf(TRAILESC, from, to, ESC); return(-1); } +#ifdef IS_MSDOS default: if ( -#ifdef IS_MSDOS c <= ' ' || c >= 127 || strchr(":/\\*?[]=+;,\"|<>", c) != NULL -#else - c & 0x80 -#endif ) { printf("%s -> %s : illegal character '%c' (0x%02X).\n", from, to, c, c); return(-1); } -#ifdef IS_MSDOS if (isupper(c)) *p = c + ('a' - 'A'); #endif @@ -2578,10 +2583,10 @@ } -static int breakrep() +static void breakrep(int signum) { gotsig = 1; - return(1); + return; } @@ -2624,7 +2629,7 @@ static int copy(ff, len) FILEINFO *ff; - long len; + off_t len; { char buf[BUFSIZE], c; int f, t, k, mode, perm; @@ -2672,7 +2677,7 @@ return(-1); } if (op & APPEND) - lseek(t, 0L, 2); + lseek(t, (off_t)0, SEEK_END); #ifdef IS_MSDOS if (op & ZAPPEND && filelength(t) != 0) { if (lseek(t, -1L, 1) == -1L || read(t, &c, 1) != 1) { @@ -2684,10 +2689,10 @@ lseek(t, -1L, 1); } #endif - if ((op & APPEND) && len != -1L) { + if ((op & APPEND) && len != (off_t)-1) { while ( len != 0 && - (k = read(f, buf, len > BUFSIZE ? BUFSIZE : (unsigned)len)) > 0 && + (k = read(f, buf, (len > BUFSIZE) ? BUFSIZE : (size_t)len)) > 0 && write(t, buf, k) == k ) len -= k; --- mmv-1.01b.orig/mmv.1 1990-09-11 15:59:24.000000000 -0400 +++ mmv-1.01b/mmv.1 2005-08-23 20:29:59.000000000 -0400 @@ -2,7 +2,7 @@ .\" To print the MS-DOS version, use option -rO2. .\" Under System V, take out the '.\" ' from the next line. .\" .nr O 1 -.TH MMV 1 "November 20, 1989 (v1.0)" +.TH MMV 1 "November 20, 2001 (v1.0lfs)" .ie !'\nO'2' \{\ .SH NAME mmv \- move/copy/append/link multiple files by wildcard patterns @@ -28,6 +28,7 @@ [\fB-d\fP|\fBp\fP] [\fB-g\fP|\fBt\fP] [\fB-v\fP|\fBn\fP] +[\fB--\fP] [\fBfrom to\fP] .if '\nO'2' \{\ .br @@ -56,7 +57,8 @@ and gives the user the choice of either proceeding by avoiding the offending parts or aborting. - +.I mmv does support large files (LFS) but it does *NOT* support +sparse files (i.e. it explodes them). .ce The Task Options .PP @@ -332,8 +334,9 @@ .IR mmv , it is usually necessary to enclose the command-line .I from -pattern -in quotes. +and +.I to +patterns in quotes. \} .ce mmv-1.01b-makefile.patch: --- NEW FILE mmv-1.01b-makefile.patch --- --- mmv-1.01b.orig/Makefile 1994-11-04 19:24:55.000000000 -0500 +++ mmv-1.01b/Makefile 2005-08-23 21:52:47.000000000 -0400 @@ -1,16 +1,16 @@ # Possible defines in CONF: # IS_MSDOS IS_SYSV IS_V7 IS_BSD HAS_DIRENT HAS_RENAME MV_DIR -CC =gcc -traditional +CC =gcc LD =$(CC) CONF =-DIS_SYSV -DHAS_DIRENT -DHAS_RENAME -CFLAGS =-O2 -m486 $(CONF) -LDFLAGS =-s -N +CFLAGS =-O2 $(CONF) +LDFLAGS =$(LDCONF) #IBIN =$(LOCAL)$(ARCH)/bin #IMAN =$(LOCAL)$(ANY)/man IBIN=$(DESTDIR)/usr/bin/ -IMAN=$(DESTDIR)/usr/man/ +IMAN=$(DESTDIR)/usr/share/man/ mmv: mmv.o @@ -20,5 +20,5 @@ install: $(DEST)$(IBIN)/mmv install: $(DEST)$(IMAN)/man1/mmv.1 -$(DEST)$(IBIN)/mmv: mmv; cp $? $@ -$(DEST)$(IMAN)/man1/mmv.1: mmv.1; cp $? $@ +$(DEST)$(IBIN)/mmv: mmv; install -D -p $? $@ +$(DEST)$(IMAN)/man1/mmv.1: mmv.1; install -D -p $? $@ --- NEW FILE mmv.spec --- Name: mmv Version: 1.01b Release: 2 Summary: Move/copy/append/link multiple files Group: Applications/File License: GPL URL: http://packages.qa.debian.org/m/mmv.html Source0: http://ftp.debian.org/debian/pool/main/m/mmv/mmv_1.01b.orig.tar.gz Source1: copyright Source2: changelog Patch0: mmv-1.01b-debian.patch Patch1: mmv-1.01b-makefile.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description This is mmv, a program to move/copy/append/link multiple files according to a set of wildcard patterns. This multiple action is performed safely, i.e. without any unexpected deletion of files due to collisions of target names with existing filenames or with other target names. Furthermore, before doing anything, mmv attempts to detect any errors that would result from the entire set of actions specified and gives the user the choice of either aborting before beginning, or proceeding by avoiding the offending parts. %prep %setup -q -n mmv-1.01b.orig %patch0 -p1 %patch1 -p1 cp -p %{SOURCE1} . cp -p %{SOURCE2} . %build make CONF="$RPM_OPT_FLAGS -fpie" LDCONF="-pie" %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT ln -s mmv $RPM_BUILD_ROOT/%{_bindir}/mcp ln -s mmv $RPM_BUILD_ROOT/%{_bindir}/mad ln -s mmv $RPM_BUILD_ROOT/%{_bindir}/mln %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc ANNOUNCE ARTICLE READ.ME copyright changelog %{_bindir}/mmv %{_bindir}/mcp %{_bindir}/mad %{_bindir}/mln %{_mandir}/man1/* %changelog * Wed Sep 28 2005 Zing - 1.01b-2 - QA from Aurelien Bompard - don't change source name - symlink mcp/mad/mln * Tue Aug 23 2005 Zing - 1.01b-1 - initial RPM release - pull from debian mmv_1.01b-12.2 - build executable as a PIE Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/mmv/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 30 Sep 2005 00:39:46 -0000 1.1 +++ .cvsignore 30 Sep 2005 00:40:20 -0000 1.2 @@ -0,0 +1 @@ +mmv_1.01b.orig.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/mmv/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 30 Sep 2005 00:39:46 -0000 1.1 +++ sources 30 Sep 2005 00:40:20 -0000 1.2 @@ -0,0 +1 @@ +1b2135ab2f17bdfa9e08debbb3c46ad8 mmv_1.01b.orig.tar.gz From fedora-extras-commits at redhat.com Fri Sep 30 00:46:48 2005 From: fedora-extras-commits at redhat.com (Zing Zing Shishak (shishz)) Date: Thu, 29 Sep 2005 20:46:48 -0400 Subject: owners owners.list,1.273,1.274 Message-ID: <200509300046.j8U0kmPG029475@cvs-int.fedora.redhat.com> Author: shishz Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29456 Modified Files: owners.list Log Message: add mmv Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.273 retrieving revision 1.274 diff -u -r1.273 -r1.274 --- owners.list 29 Sep 2005 19:45:05 -0000 1.273 +++ owners.list 30 Sep 2005 00:46:46 -0000 1.274 @@ -514,6 +514,7 @@ Fedora Extras|milter-greylist|Milter for greylisting, the next step in the spam control war|enrico.scholz at informatik.tu-chemnitz.de|extras-qa at fedoraproject.org| Fedora Extras|mknbi|Utility for creating network bootable images|anvil at livna.org|extras-qa at fedoraproject.org| Fedora Extras|mlmmj|Mailserver-independent ezmlm-like mailing list manager|mfleming+rpm at enlartenment.com|extras-qa at fedoraproject.org| +Fedora Extras|mmv|Move/copy/append/link multiple files|shishz at hotpop.com|extras-qa at fedoraproject.org| Fedora Extras|mock|Builds packages inside chroots|skvidal at phy.duke.edu|extras-qa at fedoraproject.org| Fedora Extras|mod_annodex|Apache module for server-side support of annodex media|thomas at apestaart.org|extras-qa at fedoraproject.org| Fedora Extras|mod_auth_pam|PAM authentication module for Apache|ivazquez at ivazquez.net|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Fri Sep 30 06:17:46 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Fri, 30 Sep 2005 02:17:46 -0400 Subject: owners owners.list,1.274,1.275 Message-ID: <200509300617.j8U6HkYg006104@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6085 Modified Files: owners.list Log Message: Assign Panu's packages to extras-orphan, remove vice and wine (never shipped). Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.274 retrieving revision 1.275 diff -u -r1.274 -r1.275 --- owners.list 30 Sep 2005 00:46:46 -0000 1.274 +++ owners.list 30 Sep 2005 06:17:43 -0000 1.275 @@ -11,7 +11,7 @@ Fedora Extras|aalib|An ASCII art library|anvil at livna.org|extras-qa at fedoraproject.org| Fedora Extras|abcde|A Better CD Encoder|ville.skytta at iki.fi|extras-qa at fedoraproject.org| Fedora Extras|abcm2ps|A program to typeset ABC tunes into Postscript|gemi at bluewin.ch|extras-qa at fedoraproject.org| -Fedora Extras|abe|A scrolling, platform-jumping, ancient pyramid exploring game|pmatilai at laiskiainen.org|extras-qa at fedoraproject.org| +Fedora Extras|abe|A scrolling, platform-jumping, ancient pyramid exploring game|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| Fedora Extras|abicheck|ABI checking tool|bugs.michael at gmx.net|extras-qa at fedoraproject.org| Fedora Extras|abiword|The AbiWord word processor|uwog at uwog.net|extras-qa at fedoraproject.org| Fedora Extras|adns|Advanced, easy to use, asynchronous-capable DNS client library|colin at fedoraproject.org|extras-qa at fedoraproject.org| @@ -31,7 +31,7 @@ Fedora Extras|apel|A Portable Emacs Library|tagoh at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|apg|Automated Password Generator for random password generation|compton at pcompton.com|extras-qa at fedoraproject.org| Fedora Extras|apmud|Power Management daemon for Apple laptops|dwmw2 at redhat.com|extras-qa at fedoraproject.org| -Fedora Extras|apt|Debian's Advanced Packaging Tool with RPM support|pmatilai at laiskiainen.org|extras-qa at fedoraproject.org| +Fedora Extras|apt|Debian's Advanced Packaging Tool with RPM support|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|pmatilai at laiskiainen.org Fedora Extras|aqhbci-qt-tools|Setup wizard and debugger for the HBCI backend for the Aqbanking library|notting at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|arc|Arc archiver|Nicolas.Mailhot at laPoste.net|extras-qa at fedoraproject.org| Fedora Extras|asciidoc|AsciiDoc text document fomatter|chrisw at osdl.org|extras-qa at fedoraproject.org| @@ -256,7 +256,7 @@ Fedora Extras|gmime|GMime library -- creation and parsing of MIME-messages|fedora at leemhuis.info|extras-qa at fedoraproject.org| Fedora Extras|gmpc|GNOME frontend for the MPD|gauret at free.fr|extras-qa at fedoraproject.org| Fedora Extras|gnet2|A simple network library built upon glib|ivazquez at ivazquez.net|extras-qa at fedoraproject.org| -Fedora Extras|gnofract4d|Gnofract 4D is a Gnome-based program to draw fractals|pmatilai at laiskiainen.org|extras-qa at fedoraproject.org| +Fedora Extras|gnofract4d|Gnofract 4D is a Gnome-based program to draw fractals|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| Fedora Extras|gnomad2|Manager for digital audio players|triad at df.lth.se|extras-qa at fedoraproject.org| Fedora Extras|gnome-applet-netmon|GNOME Network Load Applet|ghenry at suretecsystems.com|extras-qa at fedoraproject.org| Fedora Extras|gnome-applet-netspeed|GNOME applet that shows traffic on a network device|a.kurtz at hardsun.net|extras-qa at fedoraproject.org| @@ -487,7 +487,7 @@ Fedora Extras|loudmouth|Jabber programming library written in C|bdpepple at ameritech.net|extras-qa at fedoraproject.org| Fedora Extras|lout|A document formatting system|tcallawa at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|lrmi|Library for calling real mode BIOS routines|ville.skytta at iki.fi|extras-qa at fedoraproject.org| -Fedora Extras|lua|A powerful light-weight programming language|pmatilai at laiskiainen.org|extras-qa at fedoraproject.org| +Fedora Extras|lua|A powerful light-weight programming language|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| Fedora Extras|lvcool|Utility to cool Athlon processor during idle on Via KT133 or KX133 chipsets|wtogami at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|lyx|WYSIWYM (What You See Is What You Mean) document processor|rdieter at math.unl.edu|extras-qa at fedoraproject.org| Fedora Extras|lzo|A data compression library with very fast (de)compression|anvil at livna.org|extras-qa at fedoraproject.org| @@ -935,7 +935,7 @@ Fedora Extras|scim-tomoe|Tomoe module for SCIM for Japanese handwritten input|ryo-dairiki at users.sourceforge.net|extras-qa at fedoraproject.org| Fedora Extras|scmxx|Exchange data with Siemens mobile phones|andreas at bawue.net|extras-qa at fedoraproject.org| Fedora Extras|scons|An Open Source software construction tool|gemi at bluewin.ch|extras-qa at fedoraproject.org| -Fedora Extras|scorched3d|A game based loosely on the classic DOS game Scorched Earth|pmatilai at laiskiainen.org|extras-qa at fedoraproject.org| +Fedora Extras|scorched3d|A game based loosely on the classic DOS game Scorched Earth|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| Fedora Extras|screem|A website development enviroment|compton at pcompton.com|extras-qa at fedoraproject.org| Fedora Extras|scribus|DeskTop Publishing app in QT|compton at pcompton.com|extras-qa at fedoraproject.org| Fedora Extras|scribus-templates|This package includes additional templates for Scribus|compton at pcompton.com|extras-qa at fedoraproject.org| @@ -983,7 +983,7 @@ Fedora Extras|sylpheed-claws-plugins|Additional plugins for sylpheed-claws|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org| Fedora Extras|sylpheed|GTK+ based, lightweight, and fast email client|bugs.michael at gmx.net|extras-qa at fedoraproject.org| Fedora Extras|syck|YAML for C, Python, and PHP|oliver at linux-kernel.at|extras-qa at fedoraproject.org| -Fedora Extras|synaptic|Graphical frontend for APT package manager|pmatilai at laiskiainen.org|extras-qa at fedoraproject.org| +Fedora Extras|synaptic|Graphical frontend for APT package manager|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|pmatilai at laiskiainen.org Fedora Extras|synce|For bugs related to the synce component|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org| Fedora Extras|synergy|Mouse and keyboard sharing utility|matthias at rpmforge.net|extras-qa at fedoraproject.org| Fedora Extras|syslog-ng|Syslog replacement daemon|jpo at di.uminho.pt|extras-qa at fedoraproject.org| @@ -1047,18 +1047,16 @@ Fedora Extras|utrac|Universal Text Recognizer and Converter|aportal at univ-montp2.fr|extras-qa at fedoraproject.org| Fedora Extras|uudeview|Applications for uuencoding, uudecoding, ..|adrian at lisas.de|extras-qa at fedoraproject.org| Fedora Extras|verbiste|French conjugation system|icon at linux.duke.edu|extras-qa at fedoraproject.org| -Fedora Extras|vice|Versatile Commodore Emulator|pmatilai at laiskiainen.org|extras-qa at fedoraproject.org| Fedora Extras|viruskiller|Frantic shooting game where viruses invade your computer|matthias at rpmforge.net|extras-qa at fedoraproject.org| Fedora Extras|vnc-ltsp-config|Easy Enabler of VNC remote LTSP desktops|rdieter at math.unl.edu|extras-qa at fedoraproject.org| Fedora Extras|vnstat|Console-based network traffic monitor|adrian at lisas.de|extras-qa at fedoraproject.org| Fedora Extras|vpnc|IPSec VPN client compatible with Cisco equipment|tmraz at redhat.com|extras-qa at fedoraproject.org|wtogami at redhat.com Fedora Extras|w3c-markup-validator|W3C Markup Validator|ville.skytta at iki.fi|extras-qa at fedoraproject.org| Fedora Extras|w3m-el|W3m interface for Emacs|tagoh at redhat.com|extras-qa at fedoraproject.org| -Fedora Extras|wbxml2|Library and tools to parse, encode and handle WBXML documents|pmatilai at laiskiainen.org|extras-qa at fedoraproject.org| +Fedora Extras|wbxml2|Library and tools to parse, encode and handle WBXML documents|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| Fedora Extras|wesnoth|Battle for Wesnoth is a fantasy turn-based strategy game|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|bugs.michael at gmx.net Fedora Extras|whowatch|Displays informations about the users currently logged in|nos at utelsystems.com|extras-qa at fedoraproject.org| Fedora Extras|WindowMaker|A fast, feature rich Window manager|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org| -Fedora Extras|wine|A Windows 16/32 bit emulator|pmatilai at laiskiainen.org|extras-qa at fedoraproject.org| Fedora Extras|wlassistant|Wireless network management tool|tcallawa at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|wmCalClock|A Calendar clock with antialiased text|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org| Fedora Extras|wmapmload|Wmapmload monitors your apm status in an lcd display fashion|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org| @@ -1066,8 +1064,8 @@ Fedora Extras|wv2|A library which allows access to Microsoft?? Word files|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org| Fedora Extras|wv|MSWord 6/7/8/9 binary file format to HTML converter|gauret at free.fr|extras-qa at fedoraproject.org| Fedora Extras|wxGTK|GTK+ port of the wxWidgets GUI library|anvil at livna.org|extras-qa at fedoraproject.org| -Fedora Extras|wxPythonGTK2|wxPython is a GUI toolkit for the Python programming language|pmatilai at laiskiainen.org|extras-qa at fedoraproject.org| -Fedora Extras|wxPython|wxPython is a GUI toolkit for the Python programming language|pmatilai at laiskiainen.org|extras-qa at fedoraproject.org| +Fedora Extras|wxPythonGTK2|wxPython is a GUI toolkit for the Python programming language|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| +Fedora Extras|wxPython|wxPython is a GUI toolkit for the Python programming language|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| Fedora Extras|x3270|An X Window System based IBM 3278/3279 terminal emulator|karsten at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|xaliclock|A clock for the X Window System|kaboom at oobleck.net|extras-qa at fedoraproject.org| Fedora Extras|xbase|XBase compatible database library and tools|tcallawa at redhat.com|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Fri Sep 30 07:09:13 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Fri, 30 Sep 2005 03:09:13 -0400 Subject: rpms/koffice/devel koffice-qt3.3.5.patch,1.5,1.6 Message-ID: <200509300709.j8U79iRu007554@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/koffice/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7506 Modified Files: koffice-qt3.3.5.patch Log Message: - more qt... :( koffice-qt3.3.5.patch: Index: koffice-qt3.3.5.patch =================================================================== RCS file: /cvs/extras/rpms/koffice/devel/koffice-qt3.3.5.patch,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- koffice-qt3.3.5.patch 29 Sep 2005 14:00:45 -0000 1.5 +++ koffice-qt3.3.5.patch 30 Sep 2005 07:09:11 -0000 1.6 @@ -63,3 +63,13 @@ - kiscmbidlist.h - +--- krita/ui/wdglayerbox.ui.orig 2005-09-30 09:06:31.000000000 +0200 ++++ krita/ui/wdglayerbox.ui 2005-09-30 09:07:13.000000000 +0200 +@@ -250,7 +250,6 @@ + + + +- kiscmbcomposite.h + knuminput.h + knuminput.h + klistbox.h From fedora-extras-commits at redhat.com Fri Sep 30 08:07:29 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Fri, 30 Sep 2005 04:07:29 -0400 Subject: rpms/koffice/devel koffice-qt3.3.5.patch,1.6,1.7 Message-ID: <200509300808.j8U88DQZ009345@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/koffice/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9320 Modified Files: koffice-qt3.3.5.patch Log Message: - and even more qt koffice-qt3.3.5.patch: Index: koffice-qt3.3.5.patch =================================================================== RCS file: /cvs/extras/rpms/koffice/devel/koffice-qt3.3.5.patch,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- koffice-qt3.3.5.patch 30 Sep 2005 07:09:11 -0000 1.6 +++ koffice-qt3.3.5.patch 30 Sep 2005 08:07:27 -0000 1.7 @@ -73,3 +73,13 @@ knuminput.h knuminput.h klistbox.h +--- krita/plugins/screenshot/ksnapshotwidget.ui.orig 2005-09-30 10:05:38.000000000 +0200 ++++ krita/plugins/screenshot/ksnapshotwidget.ui 2005-09-30 10:05:55.000000000 +0200 +@@ -332,7 +332,4 @@ + SmallIconSet + + +- +- ksnapshotthumb.h +- + From fedora-extras-commits at redhat.com Fri Sep 30 08:40:54 2005 From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh)) Date: Fri, 30 Sep 2005 04:40:54 -0400 Subject: rpms/uim/devel .cvsignore, 1.9, 1.10 sources, 1.8, 1.9 uim.spec, 1.19, 1.20 Message-ID: <200509300840.j8U8es0Z009753@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/extras/rpms/uim/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9729 Modified Files: .cvsignore sources uim.spec Log Message: update Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/uim/devel/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 17 Aug 2005 09:08:58 -0000 1.9 +++ .cvsignore 30 Sep 2005 08:40:52 -0000 1.10 @@ -8,3 +8,4 @@ uim-0.4.7.tar.gz uim-0.4.7.1.tar.gz uim-0.4.8.tar.gz +uim-0.4.9.1.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/uim/devel/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 17 Aug 2005 09:08:58 -0000 1.8 +++ sources 30 Sep 2005 08:40:52 -0000 1.9 @@ -1 +1 @@ -f3e48b6ded979d029db9c342a0aa809a uim-0.4.8.tar.gz +0e2625cc926917d7864c4d0c341c535a uim-0.4.9.1.tar.gz Index: uim.spec =================================================================== RCS file: /cvs/extras/rpms/uim/devel/uim.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- uim.spec 17 Aug 2005 12:08:43 -0000 1.19 +++ uim.spec 30 Sep 2005 08:40:52 -0000 1.20 @@ -4,7 +4,7 @@ Summary: A multilingual input method library Name: uim -Version: 0.4.8 +Version: 0.4.9.1 Release: 1%{?dist} License: GPL/BSD Group: System Environment/Libraries @@ -290,17 +290,20 @@ %{_datadir}/uim/skk*.scm %changelog -* Wed Aug 17 2005 Akira TAGOH - 0.4.8-1.fc5 +* Fri Sep 30 2005 Akira TAGOH - 0.4.9.1-1 - New upstream release. -* Thu Aug 4 2005 Akira TAGOH - 0.4.7.1-2.fc5 +* Wed Aug 17 2005 Akira TAGOH - 0.4.8-1 +- New upstream release. + +* Thu Aug 4 2005 Akira TAGOH - 0.4.7.1-2 - removed Requires: Canna-devel from uim-canna. this is no longer needed since 0.4.6-4. (Warren Togami, #165088) -* Wed Aug 3 2005 Akira TAGOH - 0.4.7.1-1.fc5 +* Wed Aug 3 2005 Akira TAGOH - 0.4.7.1-1 - New upstream release. -* Tue Jul 12 2005 Akira TAGOH - 0.4.7-1.fc5 +* Tue Jul 12 2005 Akira TAGOH - 0.4.7-1 - New upstream release. - removed the patches. fixed in upstream. - uim-0.4.6-multilib.patch From fedora-extras-commits at redhat.com Fri Sep 30 08:42:12 2005 From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh)) Date: Fri, 30 Sep 2005 04:42:12 -0400 Subject: common tobuild,1.2223,1.2224 Message-ID: <200509300842.j8U8gCss009817@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9798 Modified Files: tobuild Log Message: request build of rpms/uim/devel uim-0_4_9_1-1_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2223 retrieving revision 1.2224 diff -u -r1.2223 -r1.2224 --- tobuild 22 Sep 2005 05:16:53 -0000 1.2223 +++ tobuild 30 Sep 2005 08:42:10 -0000 1.2224 @@ -38,3 +38,4 @@ gemi rpms/clisp/FC-3 clisp-2_34-5_fc3 fc3 katzj rpms/perl-Class-Trigger/devel perl-Class-Trigger-0_09-3_fc5 devel orion rpms/python-matplotlib/FC-4 python-matplotlib-0_84-1_fc4 fc4 +tagoh rpms/uim/devel uim-0_4_9_1-1_fc5 devel From fedora-extras-commits at redhat.com Fri Sep 30 08:44:57 2005 From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh)) Date: Fri, 30 Sep 2005 04:44:57 -0400 Subject: common tobuild,1.2224,1.2225 Message-ID: <200509300844.j8U8ivTs009850@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9828 Modified Files: tobuild Log Message: doh Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2224 retrieving revision 1.2225 diff -u -r1.2224 -r1.2225 --- tobuild 30 Sep 2005 08:42:10 -0000 1.2224 +++ tobuild 30 Sep 2005 08:44:55 -0000 1.2225 @@ -38,4 +38,3 @@ gemi rpms/clisp/FC-3 clisp-2_34-5_fc3 fc3 katzj rpms/perl-Class-Trigger/devel perl-Class-Trigger-0_09-3_fc5 devel orion rpms/python-matplotlib/FC-4 python-matplotlib-0_84-1_fc4 fc4 -tagoh rpms/uim/devel uim-0_4_9_1-1_fc5 devel From fedora-extras-commits at redhat.com Fri Sep 30 09:06:10 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Fri, 30 Sep 2005 05:06:10 -0400 Subject: rpms/koffice/devel koffice-qt3.3.5.patch,1.7,1.8 Message-ID: <200509300906.j8U96e7H011294@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/koffice/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11270 Modified Files: koffice-qt3.3.5.patch Log Message: - even more qt (how invented this filename ;) ?) koffice-qt3.3.5.patch: Index: koffice-qt3.3.5.patch =================================================================== RCS file: /cvs/extras/rpms/koffice/devel/koffice-qt3.3.5.patch,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- koffice-qt3.3.5.patch 30 Sep 2005 08:07:27 -0000 1.7 +++ koffice-qt3.3.5.patch 30 Sep 2005 09:06:08 -0000 1.8 @@ -83,3 +83,13 @@ - ksnapshotthumb.h - +--- krita/plugins/convolutionfilters/kis_custom_convolution_filter_configuration_base_widget.ui.orig 2005-09-30 11:04:10.000000000 +0200 ++++ krita/plugins/convolutionfilters/kis_custom_convolution_filter_configuration_base_widget.ui 2005-09-30 11:04:51.000000000 +0200 +@@ -186,7 +186,4 @@ + + + +- +- kismatrixwidget.h +- + From fedora-extras-commits at redhat.com Fri Sep 30 09:48:25 2005 From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh)) Date: Fri, 30 Sep 2005 05:48:25 -0400 Subject: rpms/uim/FC-4 .cvsignore, 1.9, 1.10 sources, 1.8, 1.9 uim.spec, 1.15, 1.16 Message-ID: <200509300948.j8U9mPMt011432@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/extras/rpms/uim/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11409 Modified Files: .cvsignore sources uim.spec Log Message: update Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/uim/FC-4/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 17 Aug 2005 12:13:01 -0000 1.9 +++ .cvsignore 30 Sep 2005 09:48:23 -0000 1.10 @@ -8,3 +8,4 @@ uim-0.4.7.tar.gz uim-0.4.7.1.tar.gz uim-0.4.8.tar.gz +uim-0.4.9.1.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/uim/FC-4/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 17 Aug 2005 12:13:01 -0000 1.8 +++ sources 30 Sep 2005 09:48:23 -0000 1.9 @@ -1 +1 @@ -f3e48b6ded979d029db9c342a0aa809a uim-0.4.8.tar.gz +0e2625cc926917d7864c4d0c341c535a uim-0.4.9.1.tar.gz Index: uim.spec =================================================================== RCS file: /cvs/extras/rpms/uim/FC-4/uim.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- uim.spec 17 Aug 2005 12:13:01 -0000 1.15 +++ uim.spec 30 Sep 2005 09:48:23 -0000 1.16 @@ -4,7 +4,7 @@ Summary: A multilingual input method library Name: uim -Version: 0.4.8 +Version: 0.4.9.1 Release: 1%{?dist} License: GPL/BSD Group: System Environment/Libraries @@ -290,17 +290,20 @@ %{_datadir}/uim/skk*.scm %changelog -* Wed Aug 17 2005 Akira TAGOH - 0.4.8-1.fc4 +* Fri Sep 30 2005 Akira TAGOH - 0.4.9.1-1 - New upstream release. -* Thu Aug 4 2005 Akira TAGOH - 0.4.7.1-2.fc4 +* Wed Aug 17 2005 Akira TAGOH - 0.4.8-1 +- New upstream release. + +* Thu Aug 4 2005 Akira TAGOH - 0.4.7.1-2 - removed Requires: Canna-devel from uim-canna. this is no longer needed since 0.4.6-4. (Warren Togami, #165088) -* Wed Aug 3 2005 Akira TAGOH - 0.4.7.1-1.fc4 +* Wed Aug 3 2005 Akira TAGOH - 0.4.7.1-1 - New upstream release. -* Tue Jul 12 2005 Akira TAGOH - 0.4.7-1.fc4 +* Tue Jul 12 2005 Akira TAGOH - 0.4.7-1 - New upstream release. - removed the patches. fixed in upstream. - uim-0.4.6-multilib.patch From fedora-extras-commits at redhat.com Fri Sep 30 10:11:31 2005 From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh)) Date: Fri, 30 Sep 2005 06:11:31 -0400 Subject: rpms/uim/FC-3 .cvsignore,1.8,1.9 sources,1.7,1.8 uim.spec,1.8,1.9 Message-ID: <200509301011.j8UABVUp012930@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/extras/rpms/uim/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12907 Modified Files: .cvsignore sources uim.spec Log Message: update Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/uim/FC-3/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 17 Aug 2005 12:20:51 -0000 1.8 +++ .cvsignore 30 Sep 2005 10:11:29 -0000 1.9 @@ -7,3 +7,4 @@ uim-0.4.7.tar.gz uim-0.4.7.1.tar.gz uim-0.4.8.tar.gz +uim-0.4.9.1.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/uim/FC-3/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 17 Aug 2005 12:20:51 -0000 1.7 +++ sources 30 Sep 2005 10:11:29 -0000 1.8 @@ -1 +1 @@ -f3e48b6ded979d029db9c342a0aa809a uim-0.4.8.tar.gz +0e2625cc926917d7864c4d0c341c535a uim-0.4.9.1.tar.gz Index: uim.spec =================================================================== RCS file: /cvs/extras/rpms/uim/FC-3/uim.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- uim.spec 17 Aug 2005 12:18:05 -0000 1.8 +++ uim.spec 30 Sep 2005 10:11:29 -0000 1.9 @@ -4,7 +4,7 @@ Summary: A multilingual input method library Name: uim -Version: 0.4.8 +Version: 0.4.9.1 Release: 1%{?dist} License: GPL/BSD Group: System Environment/Libraries @@ -290,17 +290,20 @@ %{_datadir}/uim/skk*.scm %changelog -* Wed Aug 17 2005 Akira TAGOH - 0.4.8-1.fc3 +* Fri Sep 30 2005 Akira TAGOH - 0.4.9.1-1 - New upstream release. -* Thu Aug 4 2005 Akira TAGOH - 0.4.7.1-2.fc3 +* Wed Aug 17 2005 Akira TAGOH - 0.4.8-1 +- New upstream release. + +* Thu Aug 4 2005 Akira TAGOH - 0.4.7.1-2 - removed Requires: Canna-devel from uim-canna. this is no longer needed since 0.4.6-4. (Warren Togami, #165088) -* Wed Aug 3 2005 Akira TAGOH - 0.4.7.1-1.fc3 +* Wed Aug 3 2005 Akira TAGOH - 0.4.7.1-1 - New upstream release. -* Tue Jul 12 2005 Akira TAGOH - 0.4.7-1.fc3 +* Tue Jul 12 2005 Akira TAGOH - 0.4.7-1 - New upstream release. - removed the patches. fixed in upstream. - uim-0.4.6-multilib.patch From fedora-extras-commits at redhat.com Fri Sep 30 10:54:42 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Fri, 30 Sep 2005 06:54:42 -0400 Subject: rpms/perl-Apache-LogRegex/FC-4 Makefile,1.2,1.3 Message-ID: <200509301054.j8UAsgJJ013087@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/perl-Apache-LogRegex/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13054/FC-4 Modified Files: Makefile Log Message: Fix broken CVS Makefiles. Index: Makefile =================================================================== RCS file: /cvs/extras/rpms/perl-Apache-LogRegex/FC-4/Makefile,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- Makefile 23 Sep 2005 08:56:12 -0000 1.2 +++ Makefile 30 Sep 2005 10:54:40 -0000 1.3 @@ -1,6 +1,6 @@ # Makefile for source rpm: perl-Apache-LogRegex # $Id$ -NAME := perl-Apache-LogRegex +NAME := perl-Apache-LogRegex SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common From fedora-extras-commits at redhat.com Fri Sep 30 10:54:42 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Fri, 30 Sep 2005 06:54:42 -0400 Subject: rpms/perl-Apache-LogRegex/devel Makefile,1.2,1.3 Message-ID: <200509301054.j8UAsgSX013093@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/perl-Apache-LogRegex/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13054/devel Modified Files: Makefile Log Message: Fix broken CVS Makefiles. Index: Makefile =================================================================== RCS file: /cvs/extras/rpms/perl-Apache-LogRegex/devel/Makefile,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- Makefile 29 Sep 2005 14:39:50 -0000 1.2 +++ Makefile 30 Sep 2005 10:54:40 -0000 1.3 @@ -1,6 +1,6 @@ # Makefile for source rpm: perl-Apache-LogRegex # $Id$ -NAME := perl-Apache-LogRegex +NAME := perl-Apache-LogRegex SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common From fedora-extras-commits at redhat.com Fri Sep 30 12:27:03 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Fri, 30 Sep 2005 08:27:03 -0400 Subject: rpms/koffice/devel koffice-qt3.3.5.patch,1.8,1.9 Message-ID: <200509301227.j8UCR3gM016175@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/koffice/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16153 Modified Files: koffice-qt3.3.5.patch Log Message: - more... koffice-qt3.3.5.patch: Index: koffice-qt3.3.5.patch =================================================================== RCS file: /cvs/extras/rpms/koffice/devel/koffice-qt3.3.5.patch,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- koffice-qt3.3.5.patch 30 Sep 2005 09:06:08 -0000 1.8 +++ koffice-qt3.3.5.patch 30 Sep 2005 12:27:00 -0000 1.9 @@ -93,3 +93,13 @@ - kismatrixwidget.h - +--- krita/plugins/colorspaceconversion/wdgconvertcolorspace.ui.orig 2005-09-30 14:25:16.000000000 +0200 ++++ krita/plugins/colorspaceconversion/wdgconvertcolorspace.ui 2005-09-30 14:25:47.000000000 +0200 +@@ -265,7 +265,4 @@ + radioPerceptual + + +- +- kiscmbidlist.h +- + From fedora-extras-commits at redhat.com Fri Sep 30 12:55:31 2005 From: fedora-extras-commits at redhat.com (Alain Portal (Dionysos)) Date: Fri, 30 Sep 2005 08:55:31 -0400 Subject: owners owners.list,1.275,1.276 Message-ID: <200509301255.j8UCtVBm016289@cvs-int.fedora.redhat.com> Author: Dionysos Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16270/owners Modified Files: owners.list Log Message: Add gpsim package. Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.275 retrieving revision 1.276 diff -u -r1.275 -r1.276 --- owners.list 30 Sep 2005 06:17:43 -0000 1.275 +++ owners.list 30 Sep 2005 12:55:29 -0000 1.276 @@ -286,6 +286,7 @@ Fedora Extras|gpgme03|GnuPG Made Easy interface library|dennis at dgilmore.net|extras-qa at fedoraproject.org| Fedora Extras|gpgme|GnuPG Made Easy|rdieter at math.unl.edu|extras-qa at fedoraproject.org| Fedora Extras|gpredict|Real-time satellite tracking and orbit prediction program|ivazquez at ivazquez.net|extras-qa at fedoraproject.org| +Fedora Extras|gpsim|A simulator for Microchip (TM) PIC (TM) microcontrollers|aportal at univ-montp2.fr|extras-qa at fedoraproject.org| Fedora Extras|gputils|Development utilities for Microchip (TM) PIC (TM) microcontrollers|aportal at univ-montp2.fr|extras-qa at fedoraproject.org| Fedora Extras|gquilt|A PyGTK wrapper for quilt|jwboyer at jdub.homelinux.org|extras-qa at fedoraproject.org| Fedora Extras|gqview|Image browser and viewer|bugs.michael at gmx.net|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Fri Sep 30 12:58:22 2005 From: fedora-extras-commits at redhat.com (Alain Portal (Dionysos)) Date: Fri, 30 Sep 2005 08:58:22 -0400 Subject: rpms/gpsim - New directory Message-ID: <200509301258.j8UCwMMF016370@cvs-int.fedora.redhat.com> Author: Dionysos Update of /cvs/extras/rpms/gpsim In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16346/gpsim Log Message: Directory /cvs/extras/rpms/gpsim added to the repository From fedora-extras-commits at redhat.com Fri Sep 30 12:58:23 2005 From: fedora-extras-commits at redhat.com (Alain Portal (Dionysos)) Date: Fri, 30 Sep 2005 08:58:23 -0400 Subject: rpms/gpsim/devel - New directory Message-ID: <200509301258.j8UCwNAE016375@cvs-int.fedora.redhat.com> Author: Dionysos Update of /cvs/extras/rpms/gpsim/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16346/gpsim/devel Log Message: Directory /cvs/extras/rpms/gpsim/devel added to the repository From fedora-extras-commits at redhat.com Fri Sep 30 12:58:35 2005 From: fedora-extras-commits at redhat.com (Alain Portal (Dionysos)) Date: Fri, 30 Sep 2005 08:58:35 -0400 Subject: rpms/gpsim Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200509301258.j8UCwZlK016426@cvs-int.fedora.redhat.com> Author: Dionysos Update of /cvs/extras/rpms/gpsim In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16391 Added Files: Makefile import.log Log Message: Setup of module gpsim --- NEW FILE Makefile --- # Top level Makefile for module gpsim all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Fri Sep 30 12:58:36 2005 From: fedora-extras-commits at redhat.com (Alain Portal (Dionysos)) Date: Fri, 30 Sep 2005 08:58:36 -0400 Subject: rpms/gpsim/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200509301258.j8UCwa57016431@cvs-int.fedora.redhat.com> Author: Dionysos Update of /cvs/extras/rpms/gpsim/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16391/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module gpsim --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Fri Sep 30 12:59:05 2005 From: fedora-extras-commits at redhat.com (Alain Portal (Dionysos)) Date: Fri, 30 Sep 2005 08:59:05 -0400 Subject: rpms/gpsim import.log,1.1,1.2 Message-ID: <200509301259.j8UCxZ9F016507@cvs-int.fedora.redhat.com> Author: Dionysos Update of /cvs/extras/rpms/gpsim In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16464 Modified Files: import.log Log Message: auto-import gpsim-0.21.4-5 on branch devel from gpsim-0.21.4-5.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/gpsim/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 30 Sep 2005 12:58:33 -0000 1.1 +++ import.log 30 Sep 2005 12:59:03 -0000 1.2 @@ -0,0 +1 @@ +gpsim-0_21_4-5:HEAD:gpsim-0.21.4-5.src.rpm:1128085108 From fedora-extras-commits at redhat.com Fri Sep 30 12:59:06 2005 From: fedora-extras-commits at redhat.com (Alain Portal (Dionysos)) Date: Fri, 30 Sep 2005 08:59:06 -0400 Subject: rpms/gpsim/devel gpsim.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200509301259.j8UCxa3J016511@cvs-int.fedora.redhat.com> Author: Dionysos Update of /cvs/extras/rpms/gpsim/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16464/devel Modified Files: .cvsignore sources Added Files: gpsim.spec Log Message: auto-import gpsim-0.21.4-5 on branch devel from gpsim-0.21.4-5.src.rpm --- NEW FILE gpsim.spec --- Name: gpsim Version: 0.21.4 Release: 5%{?dist} Summary: A simulator for Microchip (TM) PIC (TM) microcontrollers Summary(fr): Un simulateur pour les microcontr??leurs PIC (TM) Microchip (TM) Group: Development/Debuggers License: GPL URL: http://www.dattalo.com/gnupic/gpsim.html Source: http://www.dattalo.com/gnupic/gpsim-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: gtk+extra = 1.1.0 BuildRequires: gtk+extra-devel = 1.1.0, flex, readline-devel %description gpsim is a simulator for Microchip (TM) PIC (TM) microcontrollers. It supports most devices in Microchip's 12-bit, 14bit, and 16-bit core families. In addition, gpsim supports dynamically loadable modules such as LED's, LCD's, resistors, etc. to extend the simulation environment beyond the PIC. %description -l fr gpsim est un simulateur pour les microcontr??leurs PIC (TM) Microchip (TM). Il g??re la plupart des microcontr??leurs des familles 12, 14 et 16 bits. gpsim g??re ??galement les modules chargeables dynamiquement tels que les LED, afficheurs LCD, r??sistances, etc. afin d'??tendre l'environnement de simulation des PIC. %package devel Summary: Libraries and files headers for gpsim Summary(fr): Biblioth??ques et fichiers d'en-t??tes pour gpsim Group: Development/Libraries Requires: %{name} = %{version}-%{release} %description devel The %{name}-devel package includes the static libraries, header files, and documentation for compiling programs that use the gpsim library. %description -l fr devel Le paquetage %{name}-devel contient les biblioth??ques statiques, les fichiers d'en-t??tes et la documentation n??cessaires ?? la compilation des programmes qui utilisent la biblioth??que gpsim. %prep %setup -q %{__chmod} a-x examples/12bit/p12x.inc examples/14bit/sine.asm %{__sed} -i -e 's/\r$//' examples/14bit/sine.asm %build %configure make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT %clean rm -rf $RPM_BUILD_ROOT %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files %defattr(-,root,root,-) %doc ANNOUNCE AUTHORS COPYING ChangeLog HISTORY NEWS %doc README README.EXAMPLES README.MODULES TODO %doc doc/gpsim.lyx doc/gpsim.pdf %doc examples/ %{_bindir}/* %{_libdir}/*.so.* %files devel %defattr(-,root,root,-) %{_libdir}/*.a %{_libdir}/*.so %exclude %{_libdir}/*.la %{_includedir}/* %changelog * 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. * 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 * Tue Sep 13 2005 Alain Portal 0.21.4-2 - License is GPL - Add french summary and description * Mon Sep 12 2005 Alain Portal 0.21.4-1 - New version * Mon Nov 8 2004 Alain Portal 0:0.21.2-0.fdr.2 - Add BuildRequires flex, readline-devel * Wed Oct 27 2004 Alain Portal 0:0.21.2-0.fdr.1 - Initial Fedora RPM Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gpsim/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 30 Sep 2005 12:58:34 -0000 1.1 +++ .cvsignore 30 Sep 2005 12:59:03 -0000 1.2 @@ -0,0 +1 @@ +gpsim-0.21.4.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/gpsim/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 30 Sep 2005 12:58:34 -0000 1.1 +++ sources 30 Sep 2005 12:59:03 -0000 1.2 @@ -0,0 +1 @@ +42dafc3ce0b1dba8f9d2daa2a3708baf gpsim-0.21.4.tar.gz From fedora-extras-commits at redhat.com Fri Sep 30 13:28:56 2005 From: fedora-extras-commits at redhat.com (Joshua W. Boyer (jwboyer)) Date: Fri, 30 Sep 2005 09:28:56 -0400 Subject: rpms/gaim-meanwhile/devel gaim-meanwhile.spec,1.4,1.5 Message-ID: <200509301328.j8UDSuKM018048@cvs-int.fedora.redhat.com> Author: jwboyer Update of /cvs/extras/rpms/gaim-meanwhile/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17994/devel Modified Files: gaim-meanwhile.spec Log Message: Avoid upcomming API breakage with meanwhile package Index: gaim-meanwhile.spec =================================================================== RCS file: /cvs/extras/rpms/gaim-meanwhile/devel/gaim-meanwhile.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- gaim-meanwhile.spec 15 Jul 2005 18:24:37 -0000 1.4 +++ gaim-meanwhile.spec 30 Sep 2005 13:28:54 -0000 1.5 @@ -7,12 +7,12 @@ License: GPL Group: Applications/Internet Version: 1.2.4 -Release: 2%{?dist} +Release: 3%{?dist} Source: http://dl.sf.net/meanwhile/gaim-meanwhile-%{version}.tar.gz URL: http://meanwhile.sourceforge.net BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gaim >= 1.2.1, meanwhile-devel >= 0.4.2 -Requires: gaim >= 1.2.1 +Requires: gaim >= 1.2.1, meanwhile < 0.5.0 %description Gaim plugin to use the meanwhile Lotus Sametime library @@ -39,6 +39,9 @@ %{_datadir}/pixmaps/gaim/ %changelog +* Fri Sep 30 2005 - jwboyer at jdub.homelinux.org 1.2.4-3 +- Add dependency on meanwhile < 0.5.0 to avoid upcomming API breakage + * Fri Jul 15 2005 - jwboyer at jdub.homelinux.org 1.2.4-2 - Bump release for rebuild From fedora-extras-commits at redhat.com Fri Sep 30 13:28:50 2005 From: fedora-extras-commits at redhat.com (Joshua W. Boyer (jwboyer)) Date: Fri, 30 Sep 2005 09:28:50 -0400 Subject: rpms/gaim-meanwhile/FC-3 gaim-meanwhile.spec,1.4,1.5 Message-ID: <200509301329.j8UDTKs1018051@cvs-int.fedora.redhat.com> Author: jwboyer Update of /cvs/extras/rpms/gaim-meanwhile/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17994/FC-3 Modified Files: gaim-meanwhile.spec Log Message: Avoid upcomming API breakage with meanwhile package Index: gaim-meanwhile.spec =================================================================== RCS file: /cvs/extras/rpms/gaim-meanwhile/FC-3/gaim-meanwhile.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- gaim-meanwhile.spec 15 Jul 2005 18:24:37 -0000 1.4 +++ gaim-meanwhile.spec 30 Sep 2005 13:28:48 -0000 1.5 @@ -7,12 +7,12 @@ License: GPL Group: Applications/Internet Version: 1.2.4 -Release: 2%{?dist} +Release: 3%{?dist} Source: http://dl.sf.net/meanwhile/gaim-meanwhile-%{version}.tar.gz URL: http://meanwhile.sourceforge.net BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gaim >= 1.2.1, meanwhile-devel >= 0.4.2 -Requires: gaim >= 1.2.1 +Requires: gaim >= 1.2.1, meanwhile < 0.5.0 %description Gaim plugin to use the meanwhile Lotus Sametime library @@ -39,6 +39,9 @@ %{_datadir}/pixmaps/gaim/ %changelog +* Fri Sep 30 2005 - jwboyer at jdub.homelinux.org 1.2.4-3 +- Add dependency on meanwhile < 0.5.0 to avoid upcomming API breakage + * Fri Jul 15 2005 - jwboyer at jdub.homelinux.org 1.2.4-2 - Bump release for rebuild From fedora-extras-commits at redhat.com Fri Sep 30 13:28:51 2005 From: fedora-extras-commits at redhat.com (Joshua W. Boyer (jwboyer)) Date: Fri, 30 Sep 2005 09:28:51 -0400 Subject: rpms/gaim-meanwhile/FC-4 gaim-meanwhile.spec,1.4,1.5 Message-ID: <200509301329.j8UDTLeO018054@cvs-int.fedora.redhat.com> Author: jwboyer Update of /cvs/extras/rpms/gaim-meanwhile/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17994/FC-4 Modified Files: gaim-meanwhile.spec Log Message: Avoid upcomming API breakage with meanwhile package Index: gaim-meanwhile.spec =================================================================== RCS file: /cvs/extras/rpms/gaim-meanwhile/FC-4/gaim-meanwhile.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- gaim-meanwhile.spec 15 Jul 2005 18:24:37 -0000 1.4 +++ gaim-meanwhile.spec 30 Sep 2005 13:28:48 -0000 1.5 @@ -7,12 +7,12 @@ License: GPL Group: Applications/Internet Version: 1.2.4 -Release: 2%{?dist} +Release: 3%{?dist} Source: http://dl.sf.net/meanwhile/gaim-meanwhile-%{version}.tar.gz URL: http://meanwhile.sourceforge.net BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gaim >= 1.2.1, meanwhile-devel >= 0.4.2 -Requires: gaim >= 1.2.1 +Requires: gaim >= 1.2.1, meanwhile < 0.5.0 %description Gaim plugin to use the meanwhile Lotus Sametime library @@ -39,6 +39,9 @@ %{_datadir}/pixmaps/gaim/ %changelog +* Fri Sep 30 2005 - jwboyer at jdub.homelinux.org 1.2.4-3 +- Add dependency on meanwhile < 0.5.0 to avoid upcomming API breakage + * Fri Jul 15 2005 - jwboyer at jdub.homelinux.org 1.2.4-2 - Bump release for rebuild From fedora-extras-commits at redhat.com Fri Sep 30 14:03:14 2005 From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields)) Date: Fri, 30 Sep 2005 10:03:14 -0400 Subject: web/html/docs/jargon-buster fedora-glossary.php, 1.2, 1.3 index.php, 1.2, 1.3 ln-legalnotice.php, 1.2, 1.3 rv-revhistory.php, 1.1, 1.2 Message-ID: <200509301403.j8UE3EEp019577@cvs-int.fedora.redhat.com> Author: pfrields Update of /cvs/fedora/web/html/docs/jargon-buster In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19554 Modified Files: fedora-glossary.php index.php ln-legalnotice.php rv-revhistory.php Log Message: Updated to 1.9.4, some content fixes (#160265) Index: fedora-glossary.php =================================================================== RCS file: /cvs/fedora/web/html/docs/jargon-buster/fedora-glossary.php,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- fedora-glossary.php 7 Sep 2005 13:10:42 -0000 1.2 +++ fedora-glossary.php 30 Sep 2005 14:03:11 -0000 1.3 @@ -53,8 +53,8 @@

          Use BitTorrent to download Fedora Core by downloading and opening a torrent file. The official - Fedora Core torrent tracker is located at http://torrent.dulug.duke.edu/. Download a torrent - file there to begin downloading a release of Fedora Core. + Fedora Core torrent tracker is located at http://torrent.fedoraproject.org/. Download a + torrent file there to begin downloading a release of Fedora Core.

          Bluecurve

          Bluecurve™ is a theme which unifies the look and feel of the Fedora desktop. Bluecurve was @@ -443,13 +443,6 @@ by a Red Hat Network subscription and up to 24x7 support with one-hour response. Refer to http://www.redhat.com/software/rhel/ for more information about Red Hat Enterprise Linux. -

          redhat-config-packages

          - The redhat-config-packages - utility is a package installation for new Fedora Core systems which - have no software updates installed yet. Since most - administrators and users update their system software - regularly, redhat-config-packages - is not often used. Users should instead use the yum utility to install new software.

          rhgb

          Red Hat Graphical Boot, or rhgb, is an @@ -501,7 +494,14 @@ RPM package. If you want to read or modify a program's source, use its SRPM. You do not need any SRPMs to install or use software. -

          See Also RPM.

          up2date

          +

          See Also RPM.

          system-config-packages

          + The system-config-packages + utility is a package installation for new Fedora Core systems which + have no software updates installed yet. Since most + administrators and users update their system software + regularly, system-config-packages + is not often used. Users should instead use the yum utility to install new software. +

          up2date

          The up2date application is a complete system for managing and updating software on Red Hat Enterprise Linux and Fedora systems. It has both command line and gui Index: index.php =================================================================== RCS file: /cvs/fedora/web/html/docs/jargon-buster/index.php,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- index.php 7 Sep 2005 13:10:42 -0000 1.2 +++ index.php 30 Sep 2005 14:03:11 -0000 1.3 @@ -7,7 +7,7 @@ ?> -

          Fedora Jargon Buster
             Next

          Fedora Jargon Buster

          Dave Pawson

          Tammy Fox

          Paul W. Frields

          Copyright © 2003, 2004, 2005 Dave Pawson, Pa! ul W. Frields, Red Hat, Inc.

          Glossary

          +

          Fedora Jargon Buster
             Next

          Fedora Jargon Buster

          Dave Pawson

          Tammy Fox

          Paul W. Frields

          Copyright © 2003, 2004, 2005 Dave Pawson, Pa! ul W. Frields, Red Hat, Inc.

          Glossary

          This document clarifies some of the terms used on various lists, web pages, and IRC, when talking about Fedora. Many thanks to the people on the fedora-list and at Red Hat for their input. @@ -16,7 +16,7 @@ at http://bugzilla.redhat.com/. When you file your bug, select "Fedora Documentation" as the Product, and select the title of this document as the Component. The version of this document is - jargon-buster-1.9.3 (2005-09-07). + jargon-buster-1.9.4 (2005-09-30).

          The maintainers of this document will automatically receive your bug report. On behalf of the entire Fedora community, thank you for helping us make Index: ln-legalnotice.php =================================================================== RCS file: /cvs/fedora/web/html/docs/jargon-buster/ln-legalnotice.php,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ln-legalnotice.php 7 Sep 2005 13:10:42 -0000 1.2 +++ ln-legalnotice.php 30 Sep 2005 14:03:11 -0000 1.3 @@ -26,7 +26,7 @@ They all may be freely redistributed with documentation produced for the Fedora Project.

          - jargon-buster-1.9.3 (2005-09-07) + jargon-buster-1.9.4 (2005-09-30)

          Red Hat, Red Hat Network, the Red Hat "Shadow Man" logo, RPM, Maximum RPM, the RPM logo, Linux Library, PowerTools, Linux Undercover, RHmember, RHmember More, Rough Cuts, Index: rv-revhistory.php =================================================================== RCS file: /cvs/fedora/web/html/docs/jargon-buster/rv-revhistory.php,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- rv-revhistory.php 7 Sep 2005 13:10:42 -0000 1.1 +++ rv-revhistory.php 30 Sep 2005 14:03:11 -0000 1.2 @@ -66,6 +66,10 @@

          Style editing.

          +
        6. Revision 1.9.430 Sep 2005PaulWFrields
        +

        + Some term fixes (#160265). +

        Author: toshio Update of /cvs/extras/rpms/foremost In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27387/foremost Log Message: Directory /cvs/extras/rpms/foremost added to the repository From fedora-extras-commits at redhat.com Fri Sep 30 19:43:04 2005 From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio)) Date: Fri, 30 Sep 2005 15:43:04 -0400 Subject: rpms/foremost/devel - New directory Message-ID: <200509301943.j8UJh4Q1027412@cvs-int.fedora.redhat.com> Author: toshio Update of /cvs/extras/rpms/foremost/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27387/foremost/devel Log Message: Directory /cvs/extras/rpms/foremost/devel added to the repository From fedora-extras-commits at redhat.com Fri Sep 30 19:43:19 2005 From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio)) Date: Fri, 30 Sep 2005 15:43:19 -0400 Subject: rpms/foremost Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200509301943.j8UJhJ75027471@cvs-int.fedora.redhat.com> Author: toshio Update of /cvs/extras/rpms/foremost In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27436 Added Files: Makefile import.log Log Message: Setup of module foremost --- NEW FILE Makefile --- # Top level Makefile for module foremost all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Fri Sep 30 19:43:20 2005 From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio)) Date: Fri, 30 Sep 2005 15:43:20 -0400 Subject: rpms/foremost/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200509301943.j8UJhKNq027474@cvs-int.fedora.redhat.com> Author: toshio Update of /cvs/extras/rpms/foremost/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27436/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module foremost --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Fri Sep 30 19:43:52 2005 From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio)) Date: Fri, 30 Sep 2005 15:43:52 -0400 Subject: rpms/foremost import.log,1.1,1.2 Message-ID: <200509301944.j8UJiMAs027563@cvs-int.fedora.redhat.com> Author: toshio Update of /cvs/extras/rpms/foremost In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27515 Modified Files: import.log Log Message: auto-import foremost-1.0-4 on branch devel from foremost-1.0-4.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/foremost/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 30 Sep 2005 19:43:17 -0000 1.1 +++ import.log 30 Sep 2005 19:43:50 -0000 1.2 @@ -0,0 +1 @@ +foremost-1_0-4:HEAD:foremost-1.0-4.src.rpm:1128109424 From fedora-extras-commits at redhat.com Fri Sep 30 19:43:52 2005 From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio)) Date: Fri, 30 Sep 2005 15:43:52 -0400 Subject: rpms/foremost/devel COPYING, NONE, 1.1 foremost-config.patch, NONE, 1.1 foremost.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200509301943.j8UJhq0O027548@cvs-int.fedora.redhat.com> Author: toshio Update of /cvs/extras/rpms/foremost/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27515/devel Modified Files: .cvsignore sources Added Files: COPYING foremost-config.patch foremost.spec Log Message: auto-import foremost-1.0-4 on branch devel from foremost-1.0-4.src.rpm --- NEW FILE COPYING --- GNU GENERAL PUBLIC LICENSE Version 2, June 1991 Copyright (C) 1989, 1991 Free Software Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, 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. foremost-config.patch: --- NEW FILE foremost-config.patch --- --- foremost-1.0/Makefile.bak 2005-09-29 08:31:07.000000000 -0700 +++ foremost-1.0/Makefile 2005-09-29 08:48:31.000000000 -0700 @@ -44,7 +44,7 @@ # Definitions we'll need later (and that should rarely change) HEADER_FILES = main.h ole.h extract.h -SRC = main.c state.c helpers.c config.c cli.c engine.c dir.c extract.c api.c +SRC = main.c state.c helpers.c config.c.in cli.c engine.c dir.c extract.c api.c OBJ = main.o state.o helpers.o config.o cli.o engine.o dir.o extract.o api.o DOCS = Makefile README CHANGES $(MAN_PAGES) foremost.conf WINDOC = README.txt CHANGES.txt @@ -111,6 +111,9 @@ # This section must be updated each time you add an algorithm #--------------------------------------------------------------------- +config.c: config.c.in + sed "s?@CONFDIR@?$(CONF)?" < $< > $@ + foremost: $(OBJ) $(CC) $(OBJ) -o $(NAME) $(LINK_OPT) --- foremost-1.0/config.c.in.bak 2005-09-29 08:31:17.000000000 -0700 +++ foremost-1.0/config.c.in 2005-09-29 08:40:22.000000000 -0700 @@ -0,0 +1,302 @@ + +#include "main.h" + +int translate(char *str) +{ + char next; + char *rd=str,*wr=str,*bad; + char temp[1+3+1]; + char ch; + + if(!*rd) //If it's a null string just return + { + return 0; + } + + while (*rd) + { +/* Is it an escaped character ? */ + if (*rd=='\\') + { + rd++; + switch(*rd) + { + case '\\': + *rd++; + *wr++='\\'; + break; + case 'a': + *rd++; + *wr++='\a'; + break; + case 's': + *rd++; + *wr++=' '; + break; + case 'n': + *rd++; + *wr++='\n'; + break; + case 'r': + *rd++; + *wr++='\r'; + break; + case 't': + *rd++; + *wr++='\t'; + break; + case 'v': + *rd++; + *wr++='\v'; + break; +/* Hexadecimal/Octal values are treated in one place using strtoul() */ + case 'x': + case '0': case '1': case '2': case '3': + next = *(rd+1); + if (next < 48 || (57 < next && next < 65) || + (70 < next && next < 97) || next > 102) + break; //break if not a digit or a-f, A-F + next = *(rd+2); + if (next < 48 || (57 < next && next < 65) || + (70 < next && next < 97) || next > 102) + break; //break if not a digit or a-f, A-F + + temp[0]='0'; bad=temp; + strncpy(temp+1,rd,3); + temp[4] = '\0'; + ch=strtoul(temp,&bad,0); + if (*bad=='\0') + { + *wr++=ch; + rd+=3; + } /* else INVALID CHARACTER IN INPUT ('\\' followed by *rd) */ + break; + default: /* INVALID CHARACTER IN INPUT (*rd)*/ + *wr++='\\'; + break; + } + } +/* Unescaped characters go directly to the output */ + else *wr++=*rd++; + } + *wr = '\0'; //Null terminate the string that we just created... + return wr-str; +} + + +char* skipWhiteSpace(char* str) +{ + while (isspace(str[0])) + str++; + return str; +} + + +int extractSearchSpecData(f_state *state,char **tokenarray) +{ + +/* Process a normal line with 3-4 tokens on it + token[0] = suffix + token[1] = case sensitive + token[2] = size to snarf + token[3] = begintag + token[4] = endtag (optional) + token[5] = search for footer from back of buffer flag and other options (whew!) +*/ + +/* Allocate the memory for these lines.... */ + +s_spec *s=&search_spec[state->num_builtin]; + + s->suffix = malloc(MAX_SUFFIX_LENGTH*sizeof(char)); + s->header = malloc(MAX_STRING_LENGTH*sizeof(char)); + s->footer = malloc(MAX_STRING_LENGTH*sizeof(char)); + s->type= CONF; + if (!strncasecmp(tokenarray[0], + FOREMOST_NOEXTENSION_SUFFIX, + strlen(FOREMOST_NOEXTENSION_SUFFIX))) + { + s->suffix[0] = ' '; + s->suffix[1] = 0; + } + else + { + +/* Assign the current line to the SearchSpec object */ + memcpy(s->suffix,tokenarray[0],MAX_SUFFIX_LENGTH); + } + +/* Check for case sensitivity */ + s->case_sen = (!strncasecmp(tokenarray[1],"y",1) || + !strncasecmp(tokenarray[1],"yes",3)); + + s->max_len = atoi(tokenarray[2]); + +/* Determine which search type we want to use for this needle */ + s->searchtype = SEARCHTYPE_FORWARD; + if (!strncasecmp(tokenarray[5],"REVERSE",strlen("REVERSE"))) + { + + s->searchtype = SEARCHTYPE_REVERSE; + } + else if (!strncasecmp(tokenarray[5],"NEXT",strlen("NEXT"))) + { + s->searchtype = SEARCHTYPE_FORWARD_NEXT; + } +// this is the default, but just if someone wants to provide this value just to be sure + else if (!strncasecmp(tokenarray[5],"FORWARD",strlen("FORWARD"))) + { + s->searchtype = SEARCHTYPE_FORWARD; + } + +/* Done determining searchtype */ + +/* We copy the tokens and translate them from the file format. + The translate() function does the translation and returns + the length of the argument being translated */ + + s->header_len = translate(tokenarray[3]); + memcpy(s->header,tokenarray[3],s->header_len); + s->footer_len = translate(tokenarray[4]); + memcpy(s->footer,tokenarray[4],s->footer_len); + + + init_bm_table(s->header,s->header_bm_table,s->header_len, s->case_sen,s->searchtype); + init_bm_table(s->footer,s->footer_bm_table,s->footer_len,s->case_sen,s->searchtype); + + return TRUE; +} + +int process_line(f_state *s, char *buffer, int line_number) +{ + + char* buf = buffer; + char* token; + char** tokenarray = (char **) malloc(6*sizeof(char[MAX_STRING_LENGTH])); + int i = 0, len = strlen(buffer); + +/* Any line that ends with a CTRL-M (0x0d) has been processed + by a DOS editor. We will chop the CTRL-M to ignore it */ + if (buffer[len-2] == 0x0d && buffer[len-1] == 0x0a) + { + buffer[len-2] = buffer[len-1]; + buffer[len-1] = buffer[len]; + } + + buf = (char*) skipWhiteSpace(buf); + token = strtok(buf," \t\n"); + +/* Any line that starts with a '#' is a comment and can be skipped */ + if(token == NULL || token[0] == '#') + { + return TRUE; + } + +/* Check for the wildcard */ + if (!strncasecmp(token,"wildcard",9)) + { + if ((token = strtok(NULL," \t\n")) != NULL) + { + translate(token); + } + else + { + return TRUE; + } + + if (strlen(token) > 1) + { + fprintf(stderr,"Warning: Wildcard can only be one character," + " but you specified %zu characters.\n" + " Using the first character, \"%c\", as the wildcard.\n", + strlen(token),token[0]); + } + + wildcard = token[0]; + return TRUE; + } + + while (token && (i < NUM_SEARCH_SPEC_ELEMENTS)) + { + tokenarray[i] = token; + i++; + token = strtok(NULL," \t\n"); + } + + switch(NUM_SEARCH_SPEC_ELEMENTS-i) + { + case 2: + tokenarray[NUM_SEARCH_SPEC_ELEMENTS-1] = ""; + tokenarray[NUM_SEARCH_SPEC_ELEMENTS-2] = ""; + break; + case 1: + tokenarray[NUM_SEARCH_SPEC_ELEMENTS-1] = ""; + break; + case 0: + break; + default: + fprintf(stderr,"\nERROR: In line %d of the configuration file.\n",line_number); + return FALSE; + return TRUE; + + } + + if(!extractSearchSpecData(s,tokenarray)) + { + fprintf(stderr, + "\nERROR: Unknown error on line %d of the configuration file.\n",line_number); + } + s->num_builtin++; + + + + return TRUE; +} + + +int load_config_file(f_state *s) +{ + FILE *f; + char* buffer = (char *)malloc(MAX_STRING_LENGTH * sizeof(char)); + off_t line_number = 0; + +#ifdef __DEBUG + printf ("About to open config file %s%s", get_config_file(s), NEWLINE); +#endif + + if ((f = fopen(get_config_file(s),"r")) == NULL) + { + /*Can't find a conf in the current directory + * So lets try the /usr/local/etc*/ + + +#ifdef __WIN32 + set_config_file(s,"/Program Files/foremost/foremost.conf"); +#else + set_config_file(s,"@CONFDIR@/foremost.conf"); +#endif + if ((f = fopen(get_config_file(s),"r")) == NULL) + { + print_error(s,get_config_file(s),strerror(errno)); + free(buffer); + return TRUE; + } + + } + + while (fgets(buffer,MAX_STRING_LENGTH,f)) + { + ++line_number; + if (!process_line(s,buffer,line_number)) + { + free(buffer); + fclose(f); + return TRUE; + + } + } + + fclose(f); + free(buffer); + return FALSE; +} --- NEW FILE foremost.spec --- Name: foremost Version: 1.0 Release: 4%{?dist} Summary: Recover files by "carving" them from a raw disk Group: Applications/File License: GPL URL: http://foremost.sf.net # Upstream isn't versioning their tarballs! They list the md5sum of their # present tarball on the web page so this should make it easier to decide if # they've updated without me noticing. # MD5Sum: # 6e77f71e4003e06de394d500a1d972c7 foremost-1.0.tar.gz Source0: http://foremost.sourceforge.net/pkg/foremost-1.0.tar.gz Source1: COPYING Patch0: foremost-config.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description Foremost recovers files files based on their headers, footers, and internal data structures. This process is commonly referred to as data carving. Foremost can work on a raw disk drive or image file generated by dd. The headers and footers can be specified by a configuration file or you can use command line switches to specify built-in file types. These built-in types look at the data structures of a given file format allowing for a more reliable and faster recovery. %prep %setup -q %patch0 -p1 -b .config sed -i 's/^RAW_FLAGS =.*/RAW_FLAGS = %{optflags}/' Makefile cp %{SOURCE1} . %build # Binary files were left in the distributed tarball. make clean make %{?_smp_mflags} CONF=%{_sysconfdir} %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT%{_bindir} mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir} make install BIN=$RPM_BUILD_ROOT%{_bindir} MAN=$RPM_BUILD_ROOT%{_mandir}/man1 \ CONF=$RPM_BUILD_ROOT%{_sysconfdir} chmod 0644 $RPM_BUILD_ROOT%{_sysconfdir}/foremost.conf %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc README CHANGES COPYING %{_bindir}/* %{_mandir}/man1/* %config(noreplace) %{_sysconfdir}/* %changelog * Thu Sep 29 2005 Toshio Kuratomi 1.0-4 - Fix permissions on installed foremost.conf file. * Thu Sep 29 2005 Toshio Kuratomi 1.0-3 - Reenable the install of foremost.conf as the program complains without it. - Patch to fix the location of foremost.conf. * Tue Sep 13 2005 Toshio Kuratomi 1.0-2 - New foremost has been released with multi-disk image support and my gcc4 warning fixes. - Upstream isn't versioning their tarballs. Made a note of the present MD5Sum to make it easier to compare against upstream's and tell when they've updated their tarball. * Sat Aug 27 2005 Toshio Kuratomi 1.0-1 - Initial version for Fedora Extras. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/foremost/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 30 Sep 2005 19:43:17 -0000 1.1 +++ .cvsignore 30 Sep 2005 19:43:50 -0000 1.2 @@ -0,0 +1 @@ +foremost-1.0.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/foremost/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 30 Sep 2005 19:43:17 -0000 1.1 +++ sources 30 Sep 2005 19:43:50 -0000 1.2 @@ -0,0 +1 @@ +6e77f71e4003e06de394d500a1d972c7 foremost-1.0.tar.gz From fedora-extras-commits at redhat.com Fri Sep 30 19:48:52 2005 From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio)) Date: Fri, 30 Sep 2005 15:48:52 -0400 Subject: owners owners.list,1.276,1.277 Message-ID: <200509301948.j8UJmqHY027624@cvs-int.fedora.redhat.com> Author: toshio Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27605 Modified Files: owners.list Log Message: Add foremost Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.276 retrieving revision 1.277 diff -u -r1.276 -r1.277 --- owners.list 30 Sep 2005 12:55:29 -0000 1.276 +++ owners.list 30 Sep 2005 19:48:50 -0000 1.277 @@ -192,6 +192,7 @@ Fedora Extras|fnfx|Hotkey functions for Toshiba laptops|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org| Fedora Extras|fontforge|An outline and bitmap font editor|otaylor at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|foobillard|A free OpenGL game of playing billard|mitr at redhat.com|extras-qa at fedoraproject.org| +Fedora Extras|formost|Program that recovers files by carving them from a raw disk|toshio at tiki-lounge.com|extras-qa at fedoraproject.org| Fedora Extras|fortune-mod|A program which will display a fortune|sheltren at cs.ucsb.edu|extras-qa at fedoraproject.org| Fedora Extras|fpc|Free Pascal Compiler|joost at cnoc.nl|extras-qa at fedoraproject.org| Fedora Extras|fping|Scriptable, parallelized ping-like utility|kaboom at oobleck.net|extras-qa at fedoraproject.org|